Changeset 431 for trunk/icedtea-web/plugin/icedteanp/x11

Timestamp:

Oct 2, 2014, 1:13:59 AM (11 years ago)

Author:

dmik

Message:

icedtea-web: Adapt 1.5.1 changes to OS/2.

File:

• trunk/icedtea-web/plugin/icedteanp/x11/java/sun/applet/PluginMainBase.java (modified) (2 diffs)

trunk/icedtea-web/plugin/icedteanp/x11/java/sun/applet/PluginMainBase.java

@@ -46 +46 @@
 
     static boolean checkArgs(String args[]) {
-        if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) {
-            System.err.println("Invalid pipe names provided. Refusing to proceed.");
+        if (args.length < 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) {
+            OutputController.getLogger().log(OutputController.Level.ERROR_ALL, "Invalid pipe names provided. Refusing to proceed.");
             return false;
+        }
+        DeploymentConfiguration.move14AndOlderFilesTo15StructureCatched();
+        if (JavaConsole.isEnabled()) {
+            if ((args.length < 3) || !new File(args[2]).exists()) {
+                OutputController.getLogger().log(OutputController.Level.ERROR_ALL, "Warning, although console is on, plugin debug connection do not exists. No plugin information will be displayed in console (only java ones).");
+            } else {
+                JavaConsole.getConsole().createPluginReader(new File(args[2]));
+            }
         }
         return true;
@@ -61 +69 @@
             PluginDebug.debug("Streams initialized");
         } catch (IOException ioe) {
-            ioe.printStackTrace();
+            OutputController.getLogger().log(OutputController.Level.ERROR_ALL,ioe);
         }
         return streamHandler;