You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jt...@apache.org on 2018/09/18 03:50:11 UTC

[incubator-netbeans-html4j] branch master updated (85cb22a -> 98b478e)

This is an automated email from the ASF dual-hosted git repository.

jtulach pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-html4j.git.


    from 85cb22a  Properly construct delegating visitor to make sure all annotations are copied
     new 0957c5b  Only ask for the Method addURL when the lib/jfxrt.jar file exists
     new 98b478e  Removing unused imports

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/org/netbeans/html/boot/fx/FXGCPresenter.java    | 4 ++--
 boot-fx/src/main/java/org/netbeans/html/boot/fx/FXPresenter.java  | 4 ++--
 .../src/test/java/org/netbeans/html/context/spi/ContextsTest.java | 8 +-------
 3 files changed, 5 insertions(+), 11 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists


[incubator-netbeans-html4j] 01/02: Only ask for the Method addURL when the lib/jfxrt.jar file exists

Posted by jt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-html4j.git

commit 0957c5b62cf29dab7c89b3761792078541b761d2
Author: Jaroslav Tulach <ja...@apidesign.org>
AuthorDate: Tue Sep 18 05:44:03 2018 +0200

    Only ask for the Method addURL when the lib/jfxrt.jar file exists
---
 boot-fx/src/main/java/org/netbeans/html/boot/fx/FXGCPresenter.java | 4 ++--
 boot-fx/src/main/java/org/netbeans/html/boot/fx/FXPresenter.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boot-fx/src/main/java/org/netbeans/html/boot/fx/FXGCPresenter.java b/boot-fx/src/main/java/org/netbeans/html/boot/fx/FXGCPresenter.java
index 330b13a..03f1594 100644
--- a/boot-fx/src/main/java/org/netbeans/html/boot/fx/FXGCPresenter.java
+++ b/boot-fx/src/main/java/org/netbeans/html/boot/fx/FXGCPresenter.java
@@ -41,10 +41,10 @@ public final class FXGCPresenter extends AbstractFXPresenter {
                 Class<?> c = Class.forName("javafx.application.Platform");
                 // OK, on classpath
             } catch (ClassNotFoundException classNotFoundException) {
-                Method m = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
-                m.setAccessible(true);
                 File f = new File(System.getProperty("java.home"), "lib/jfxrt.jar");
                 if (f.exists()) {
+                    Method m = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
+                    m.setAccessible(true);
                     URL l = f.toURI().toURL();
                     m.invoke(ClassLoader.getSystemClassLoader(), l);
                 }
diff --git a/boot-fx/src/main/java/org/netbeans/html/boot/fx/FXPresenter.java b/boot-fx/src/main/java/org/netbeans/html/boot/fx/FXPresenter.java
index 1554113..4777a86 100644
--- a/boot-fx/src/main/java/org/netbeans/html/boot/fx/FXPresenter.java
+++ b/boot-fx/src/main/java/org/netbeans/html/boot/fx/FXPresenter.java
@@ -41,10 +41,10 @@ public final class FXPresenter extends AbstractFXPresenter {
                 Class<?> c = Class.forName("javafx.application.Platform");
                 // OK, on classpath
             } catch (ClassNotFoundException classNotFoundException) {
-                Method m = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
-                m.setAccessible(true);
                 File f = new File(System.getProperty("java.home"), "lib/jfxrt.jar");
                 if (f.exists()) {
+                    Method m = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
+                    m.setAccessible(true);
                     URL l = f.toURI().toURL();
                     m.invoke(ClassLoader.getSystemClassLoader(), l);
                 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists


[incubator-netbeans-html4j] 02/02: Removing unused imports

Posted by jt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-html4j.git

commit 98b478e3998344aa0e469b64d8cc8250683d0ef4
Author: Jaroslav Tulach <ja...@apidesign.org>
AuthorDate: Tue Sep 18 05:47:59 2018 +0200

    Removing unused imports
---
 .../src/test/java/org/netbeans/html/context/spi/ContextsTest.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/context/src/test/java/org/netbeans/html/context/spi/ContextsTest.java b/context/src/test/java/org/netbeans/html/context/spi/ContextsTest.java
index 59bbb79..36c9c4b 100644
--- a/context/src/test/java/org/netbeans/html/context/spi/ContextsTest.java
+++ b/context/src/test/java/org/netbeans/html/context/spi/ContextsTest.java
@@ -18,14 +18,8 @@
  */
 package org.netbeans.html.context.spi;
 
-import javax.xml.ws.ServiceMode;
-import net.java.html.BrwsrCtx;
 import org.openide.util.lookup.ServiceProvider;
-import static org.testng.Assert.*;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
+import static org.testng.Assert.assertEquals;
 import org.testng.annotations.Test;
 
 /**


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists