Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
Openblocks
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
letsgoING
ArduBlock Source
Openblocks
Commits
345837eb
Commit
345837eb
authored
Jan 24, 2022
by
Anian Bühler
Browse files
Options
Downloads
Patches
Plain Diff
initial commit
parent
4084f464
Branches
Branches containing commit
No related tags found
1 merge request
!1
Dev preferences
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/edu/mit/blocks/controller/WorkspaceController.java
+7
-1
7 additions, 1 deletion
...n/java/edu/mit/blocks/controller/WorkspaceController.java
with
7 additions
and
1 deletion
src/main/java/edu/mit/blocks/controller/WorkspaceController.java
+
7
−
1
View file @
345837eb
...
@@ -414,6 +414,7 @@ public class WorkspaceController {
...
@@ -414,6 +414,7 @@ public class WorkspaceController {
if
(
langDefDirty
)
{
if
(
langDefDirty
)
{
loadBlockLanguage
(
langDefRoot
);
loadBlockLanguage
(
langDefRoot
);
}
}
workspace
.
loadWorkspaceFrom
(
null
,
langDefRoot
,
"default"
);
//added "default" by letsgoING
workspace
.
loadWorkspaceFrom
(
null
,
langDefRoot
,
"default"
);
//added "default" by letsgoING
workspaceLoaded
=
true
;
workspaceLoaded
=
true
;
}
}
...
@@ -442,6 +443,11 @@ public class WorkspaceController {
...
@@ -442,6 +443,11 @@ public class WorkspaceController {
* @param path String file path of the programming project to load
* @param path String file path of the programming project to load
*/
*/
public
void
loadProjectFromPath
(
final
String
path
)
throws
IOException
public
void
loadProjectFromPath
(
final
String
path
)
throws
IOException
{
loadProjectFromPath
(
path
,
"default"
);
}
public
void
loadProjectFromPath
(
final
String
path
,
String
mode
)
throws
IOException
{
{
final
DocumentBuilderFactory
factory
=
DocumentBuilderFactory
.
newInstance
();
final
DocumentBuilderFactory
factory
=
DocumentBuilderFactory
.
newInstance
();
factory
.
setNamespaceAware
(
true
);
factory
.
setNamespaceAware
(
true
);
...
@@ -458,7 +464,7 @@ public class WorkspaceController {
...
@@ -458,7 +464,7 @@ public class WorkspaceController {
//also load drawers, or any custom drawers from file. if no custom drawers
//also load drawers, or any custom drawers from file. if no custom drawers
//are present in root, then the default set of drawers is loaded from
//are present in root, then the default set of drawers is loaded from
//langDefRoot
//langDefRoot
workspace
.
loadWorkspaceFrom
(
projectRoot
,
langDefRoot
,
"default"
);
//added "default" by letsgoING
workspace
.
loadWorkspaceFrom
(
projectRoot
,
langDefRoot
,
mode
);
//added "default" by letsgoING
workspaceLoaded
=
true
;
workspaceLoaded
=
true
;
}
catch
(
ParserConfigurationException
e
)
{
}
catch
(
ParserConfigurationException
e
)
{
throw
new
RuntimeException
(
e
);
throw
new
RuntimeException
(
e
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment