Revision: 5945 http://sourceforge.net/p/jump-pilot/code/5945 Author: edso Date: 2018-09-25 14:04:17 +0000 (Tue, 25 Sep 2018) Log Message: ----------- finetuning macos integration
Modified Paths: -------------- core/trunk/src/com/vividsolutions/jump/workbench/ui/WorkbenchFrame.java Modified: core/trunk/src/com/vividsolutions/jump/workbench/ui/WorkbenchFrame.java =================================================================== --- core/trunk/src/com/vividsolutions/jump/workbench/ui/WorkbenchFrame.java 2018-09-25 13:47:47 UTC (rev 5944) +++ core/trunk/src/com/vividsolutions/jump/workbench/ui/WorkbenchFrame.java 2018-09-25 14:04:17 UTC (rev 5945) @@ -2404,28 +2404,30 @@ } } - String[] packageNames = new String[] { "java.awt.desktop", "com.apple.eawt" }; + String[] defaultPackageNames = new String[] { "java.awt.desktop", "com.apple.eawt" }; private Class findClass(String className) { - return findClass(className, packageNames); + return findClass(className, null); } private Class findClass(String className, String[] packageNameList) { + if (packageNameList == null || packageNameList.length < 1) + packageNameList = defaultPackageNames; // since java9 apple java extensions moved into package "java.awt.desktop" - for (String packageName : packageNames) { - Logger.debug("Looking for apple handler '" + className + "' .."); + for (String packageName : packageNameList) { + Logger.debug("Looking for class '" + className + "' .."); String fullClassName = packageName + "." + className; try { Logger.debug("Try '" + fullClassName + "' .."); return Class.forName(fullClassName); } catch (ClassNotFoundException e) { - Logger.debug("class not avail '" + fullClassName + "'"); + Logger.debug("Class not avail '" + fullClassName + "'"); continue; } } return null; } - + @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { if ("openFiles".equals(method.getName())) { _______________________________________________ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel