Änderungen an der Einbindung externer Ressourcen für Javascript Editor (Windows-Pfade)

Silent-Fred · Silent-Fred · commit e730cfac3272 · 2016-07-02T17:14:53.000+02:00
diff --git a/build.xml b/build.xml
@@ -89,7 +89,7 @@
 			</classpath>
 		</javac>
 
-		<!-- Copy over none Java-Files -->
+		<!-- Copy over non Java-Files -->
 		<copy todir="${BuildPath}/build/classes">
 			<fileset dir="${BuildPath}/project/src">
 				<exclude name="**/*.java" />
diff --git a/src/de/kuehweg/sqltool/dialog/component/editor/StatementEditorComponent.java b/src/de/kuehweg/sqltool/dialog/component/editor/StatementEditorComponent.java
@@ -31,7 +31,6 @@
 import de.kuehweg.sqltool.common.DialogDictionary;
 import de.kuehweg.sqltool.common.UserPreferencesManager;
 import de.kuehweg.sqltool.dialog.action.StatementEditorFindAction;
-import de.kuehweg.sqltool.dialog.util.WebViewBundledResourceErrorDetection;
 import de.kuehweg.sqltool.dialog.util.WebViewWithHSQLDBBugfix;
 import de.kuehweg.sqltool.itrysql.ResourceLocator;
 import javafx.beans.value.ChangeListener;
@@ -152,12 +151,12 @@ public void changed(final ObservableValue<? extends State> observable, final Sta
 			}
 		});
 
-		if (new WebViewBundledResourceErrorDetection().runningOnJavaVersionWithBundledJavascriptDeficiencies()
-				&& new ResourceLocator().looksLikeBundledApplication()) {
+		final ResourceLocator locator = new ResourceLocator();
+		try {
 			javascriptEditor.getEngine()
-					.load(new ResourceLocator().getExternalFormForExplodedResourceInBundle(resource));
-		} else {
-			javascriptEditor.getEngine().load(getClass().getResource(resource).toExternalForm());
+					.load(locator.getExternalFormForExplodedResourceInBundle(resource).toExternalForm());
+		} catch (final Exception e) {
+			installEditorTextArea();
 		}
 	}
 
diff --git a/src/de/kuehweg/sqltool/dialog/component/editor/StatementEditorCycle.java b/src/de/kuehweg/sqltool/dialog/component/editor/StatementEditorCycle.java
@@ -52,14 +52,8 @@ public Class<? extends StatementEditor> next() {
 		return statementEditorClasses.get(cycle);
 	}
 
-	public void oopsNotSupportedInThisVersion(final Class<? extends StatementEditor> defectiveStatementEditorClass) {
-		statementEditorClasses.remove(defectiveStatementEditorClass);
-		if (statementEditorClasses.isEmpty()) {
-			statementEditorClasses.add(TextAreaBasedEditor.class);
-		}
-	}
-
 	public int numberOfOptions() {
 		return statementEditorClasses.size();
 	}
+
 }
diff --git a/src/de/kuehweg/sqltool/dialog/util/WebViewBundledResourceErrorDetection.java b/src/de/kuehweg/sqltool/dialog/util/WebViewBundledResourceErrorDetection.java
@@ -77,12 +77,4 @@ private int readUpdateVersion() {
 	public boolean runningOnJavaVersionWithRenderingDeficiencies() {
 		return majorVersion == JAVA_8 && updateVersion > 40 && updateVersion < 72;
 	}
-
-	public boolean runningOnJavaVersionWithBundledJavascriptDeficiencies() {
-		// FIXME Wird laut Bugtracking erst in Java 9 behoben sein - da bislang
-		// aber ungetestet, wird hier davon ausgegangen, dass es halt überhaupt
-		// nicht funktioniert.
-		return true;
-	}
-
 }
diff --git a/src/de/kuehweg/sqltool/itrysql/ResourceLocator.java b/src/de/kuehweg/sqltool/itrysql/ResourceLocator.java
@@ -26,25 +26,23 @@
 
 package de.kuehweg.sqltool.itrysql;
 
-import java.nio.file.Paths;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
 
 /**
  * @author Michael Kühweg
  */
 public class ResourceLocator {
 
-	public String getExternalFormForExplodedResourceInBundle(final String name) {
-		if (looksLikeBundledApplication()) {
-			return Paths.get(whoAmI()).getParent() + "/libs" + name;
-		}
-		return name;
+	public URL getExternalFormForExplodedResourceInBundle(final String name) throws MalformedURLException {
+		final URL me = whoAmI();
+		final File file = new File(me.getPath());
+		final String parentPath = file.getParent();
+		return new URL(me.getProtocol(), me.getHost(), me.getPort(), parentPath + "/libs" + name);
 	}
 
-	public boolean looksLikeBundledApplication() {
-		return whoAmI().toLowerCase().endsWith(".jar");
-	}
-
-	private String whoAmI() {
-		return getClass().getProtectionDomain().getCodeSource().getLocation().toExternalForm();
+	public URL whoAmI() {
+		return getClass().getProtectionDomain().getCodeSource().getLocation();
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -52,14 +52,8 @@ public Class<? extends StatementEditor> next() {`
`52`	`52`	`return statementEditorClasses.get(cycle);`
`53`	`53`	`}`
`54`	`54`
`55`		`- public void oopsNotSupportedInThisVersion(final Class<? extends StatementEditor> defectiveStatementEditorClass) {`
`56`		`- statementEditorClasses.remove(defectiveStatementEditorClass);`
`57`		`- if (statementEditorClasses.isEmpty()) {`
`58`		`- statementEditorClasses.add(TextAreaBasedEditor.class);`
`59`		`- }`
`60`		`- }`
`61`		`-`
`62`	`55`	`public int numberOfOptions() {`
`63`	`56`	`return statementEditorClasses.size();`
`64`	`57`	`}`
	`58`	`+`
`65`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,4 @@ private int readUpdateVersion() {`
`77`	`77`	`public boolean runningOnJavaVersionWithRenderingDeficiencies() {`
`78`	`78`	`return majorVersion == JAVA_8 && updateVersion > 40 && updateVersion < 72;`
`79`	`79`	`}`
`80`		`-`
`81`		`- public boolean runningOnJavaVersionWithBundledJavascriptDeficiencies() {`
`82`		`- // FIXME Wird laut Bugtracking erst in Java 9 behoben sein - da bislang`
`83`		`- // aber ungetestet, wird hier davon ausgegangen, dass es halt überhaupt`
`84`		`- // nicht funktioniert.`
`85`		`- return true;`
`86`		`- }`
`87`		`-`
`88`	`80`	`}`