[rfc][icedtea-web] Minor NetxPanel clean-up

[Jiri Vanek]

Well I was s unable to verify that this change is correct, so I have tried to find why it should be wrong.
And I have found no evil done, so I'm for to push it.

Jsut one funny thing to expalin maybe (although it is quite  obvious from code):

 > 	(exitOnFailure): Remove always-false field.

 > -    private boolean exitOnFailure = true;

 > -    public NetxPanel(URL documentURL, PluginParameters params,
 > -                     boolean exitOnFailure) {
 > -        this(documentURL, params);
 > -        this.exitOnFailure = exitOnFailure;

 > -                NetxPanel panel = new NetxPanel(doc, params, false);


You probably do not know why i was initially added?

Thanx for clean up

J.




On 04/16/2013 10:46 PM, Adam Domurad wrote:
> This causes exceptions to be printed to console more clearly in two ways:
>
>      1. It does not swallow launch exceptions in NetxPanel#runLoader, and the launch exception is printed instead of a spurious NPE.
>      2. It sets the applet status to an error status in the exception path, preventing from further applet loading code, which would thrown an exception.
>
> There is also some minor cleanup of a dead code path and a (quite) obsolete comment.
>
> 2013-XX-XX  Adam Domurad <adomurad at redhat.com>
>
>          * netx/net/sourceforge/jnlp/NetxPanel.java
>          (exitOnFailure): Remove always-false field.
>          (NetxPanel): Remove overloaded constructor
>          (runLoader): Do not swallow LaunchException's. Remove dead
>          exitOnFailure code-path. Set applet status to APPLET_ERROR on
>          exception.
>          * plugin/icedteanp/java/sun/applet/PluginAppletPanelFactory.java
>          (createPanel): Update call to NetxPanel constructor.
>
>
> Happy hacking,
> -Adam
>
>
> netx-panel-minor-cleanup.patch
>
>
> diff --git a/netx/net/sourceforge/jnlp/NetxPanel.java b/netx/net/sourceforge/jnlp/NetxPanel.java
> --- a/netx/net/sourceforge/jnlp/NetxPanel.java
> +++ b/netx/net/sourceforge/jnlp/NetxPanel.java
> @@ -46,7 +46,6 @@ import sun.awt.SunToolkit;
>   public class NetxPanel extends AppletViewerPanel implements SplashController {
>       private final PluginParameters parameters;
>       private PluginBridge bridge = null;
> -    private boolean exitOnFailure = true;
>       private AppletInstance appInst = null;
>       private SplashController splashController;
>       private boolean appletAlive;
> @@ -79,13 +78,6 @@ public class NetxPanel extends AppletVie
>                   uKeyToTG.put(uniqueKey, tg);
>               }
>           }
> -    }
> -
> -    // overloaded constructor, called when initialized via plugin
> -    public NetxPanel(URL documentURL, PluginParameters params,
> -                     boolean exitOnFailure) {
> -        this(documentURL, params);
> -        this.exitOnFailure = exitOnFailure;
>           this.appletAlive = true;
>       }
>
> @@ -117,28 +109,12 @@ public class NetxPanel extends AppletVie
>               dispatchAppletEvent(APPLET_LOADING, null);
>               status = APPLET_LOAD;
>
> -            Launcher l = new Launcher(exitOnFailure);
> +            Launcher l = new Launcher(false);
>
> -            try {
> -                appInst = (AppletInstance) l.launch(bridge, this);
> -            } catch (LaunchException e) {
> -                // Assume user has indicated he does not trust the
> -                // applet.
> -                if (exitOnFailure)
> -                    System.exit(1);
> -            }
> +            // May throw LaunchException:
> +            appInst = (AppletInstance) l.launch(bridge, this);
>               applet = appInst.getApplet();
>
> -            //On the other hand, if you create an applet this way, it'll work
> -            //fine. Note that you might to open visibility in sun.applet.AppletPanel
> -            //for this to work (the loader field, and getClassLoader).
> -            //loader = getClassLoader(getCodeBase(), getClassLoaderCacheKey());
> -            //applet = createApplet(loader);
> -
> -            // This shows that when using NetX's JNLPClassLoader, keyboard input
> -            // won't make it to the applet, whereas using sun.applet.AppletClassLoader
> -            // works just fine.
> -
>               if (applet != null) {
>                   // Stick it in the frame
>                   applet.setStub(this);
> @@ -149,12 +125,13 @@ public class NetxPanel extends AppletVie
>               }
>           } catch (Exception e) {
>               this.appletAlive = false;
> +            status = APPLET_ERROR;
>               e.printStackTrace();
>               replaceSplash(SplashUtils.getErrorSplashScreen(getWidth(), getHeight(), e));
>           } finally {
>               // PR1157: This needs to occur even in the case of an exception
>               // so that the applet's event listeners are signaled.
> -            // Once PluginAppletViewer.AppletEventListener is signaled PluginAppletViewer it can properly stop waiting
> +            // Once PluginAppletViewer.AppletEventListener is signaled PluginAppletViewer can properly stop waiting
>               // in PluginAppletViewer.waitForAppletInit
>               dispatchAppletEvent(APPLET_LOADING_COMPLETED, null);
>           }
> diff --git a/plugin/icedteanp/java/sun/applet/PluginAppletPanelFactory.java b/plugin/icedteanp/java/sun/applet/PluginAppletPanelFactory.java
> --- a/plugin/icedteanp/java/sun/applet/PluginAppletPanelFactory.java
> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletPanelFactory.java
> @@ -85,7 +85,7 @@ class PluginAppletPanelFactory {
>                                      final PluginParameters params) {
>           final NetxPanel panel = AccessController.doPrivileged(new PrivilegedAction<NetxPanel>() {
>               public NetxPanel run() {
> -                NetxPanel panel = new NetxPanel(doc, params, false);
> +                NetxPanel panel = new NetxPanel(doc, params);
>                   NetxPanel.debug("Using NetX panel");
>                   PluginDebug.debug(params.toString());
>                   return panel;