Skip to content

Commit 425b7d4

Browse files
committed
Make the script loading work regaardless of git
1 parent 14989a0 commit 425b7d4

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

src/main/java/com/neuronrobotics/bowlerstudio/scripting/external/EclipseExternalEditor.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public void launch(File file, Button advanced) {
8585
try {
8686
dir=file.getParentFile();
8787
name = dir.getName();
88+
File project = new File(dir.getAbsolutePath() + delim() + ".project");
8889
try {
8990
ScriptingEngine.locateGit(file, git -> {
9091
Repository repository = git.getRepository();
@@ -95,7 +96,7 @@ public void launch(File file, Button advanced) {
9596
String branch = ScriptingEngine.getBranch(remoteURL);
9697

9798
File ignore = new File(dir.getAbsolutePath() + delim() + ".gitignore");
98-
File project = new File(dir.getAbsolutePath() + delim() + ".project");
99+
project = new File(dir.getAbsolutePath() + delim() + ".project");
99100

100101
if (dir.getAbsolutePath().contains("gist.github.com")) {
101102
String name2 = file.getName();
@@ -138,6 +139,8 @@ public void launch(File file, Button advanced) {
138139
}
139140
} catch (Exception ex) {
140141
ex.printStackTrace();
142+
//if(!project.exists() )
143+
setUpEclipseProjectFiles(dir, project, name);
141144
}
142145

143146
String ws = getEclipseWorkspace();

src/main/java/com/neuronrobotics/bowlerstudio/scripting/external/GroovyEclipseExternalEditor.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,16 @@ protected void setUpEclipseProjectFiles(File dir , File project, String name) th
5656
+ " <nature>org.eclipse.jdt.core.javanature</nature>\n" + " </natures>\n"
5757
+ "</projectDescription>";
5858
String java8Prefs="eclipse.preferences.version=1\n"
59+
+ "org.eclipse.jdt.core.builder.cleanOutputFolder=clean\n"
60+
+ "org.eclipse.jdt.core.builder.duplicateResourceTask=warning\n"
61+
+ "org.eclipse.jdt.core.builder.invalidClasspath=abort\n"
62+
+ "org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore\n"
63+
+ "org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch\n"
64+
+ "org.eclipse.jdt.core.circularClasspath=error\n"
65+
+ "org.eclipse.jdt.core.classpath.exclusionPatterns=enabled\n"
66+
+ "org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error\n"
67+
+ "org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled\n"
68+
+ "org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error\n"
5969
+ "org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\n"
6070
+ "org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate\n"
6171
+ "org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\n"
@@ -64,13 +74,16 @@ protected void setUpEclipseProjectFiles(File dir , File project, String name) th
6474
+ "org.eclipse.jdt.core.compiler.debug.lineNumber=generate\n"
6575
+ "org.eclipse.jdt.core.compiler.debug.localVariable=generate\n"
6676
+ "org.eclipse.jdt.core.compiler.debug.sourceFile=generate\n"
77+
+ "org.eclipse.jdt.core.compiler.maxProblemPerUnit=100\n"
6778
+ "org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\n"
6879
+ "org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\n"
6980
+ "org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\n"
81+
+ "org.eclipse.jdt.core.compiler.problem.incompatibleJDKLevel=ignore\n"
7082
+ "org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning\n"
7183
+ "org.eclipse.jdt.core.compiler.release=disabled\n"
7284
+ "org.eclipse.jdt.core.compiler.source=1.8\n"
73-
+ "org.eclipse.jdt.core.compiler.problem.incompatibleJDKLevel=ignore\n"
85+
+ "org.eclipse.jdt.core.incompatibleJDKLevel=ignore\n"
86+
+ "org.eclipse.jdt.core.incompleteClasspath=error"
7487
+ "\n";
7588
String launchPrefs = "eclipse.preferences.version=1\n"
7689
+ "org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=warning\n"

0 commit comments

Comments
 (0)