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

Timestamp:

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

Author:

dmik

Message:

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

Location:

trunk/icedtea-web/plugin/icedteanp/os2

Files:

• OS_OS2_WinOS2.cc (modified) (1 diff)
• java/sun/applet/PluginMainBase.java (modified) (3 diffs)

trunk/icedtea-web/plugin/icedteanp/os2/OS_OS2_WinOS2.cc

@@ -41 +41 @@
 #include <winuser32.h> // CreateFakeWindowEx and friends
 
+#include "IcedTeaNPPlugin.h"
 #include "IcedTeaPluginUtils.h"
 

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

@@ -44 +44 @@
 import java.io.IOException;
 
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
+import net.sourceforge.jnlp.util.logging.JavaConsole;
+import net.sourceforge.jnlp.util.logging.OutputController;
+
 class PluginMainBase {
 
@@ -50 +54 @@
 
     static boolean checkArgs(String args[]) {
-        if (args.length == 2) {
+        if (args.length >= 2) {
             inPipe = Integer.valueOf(args[0]).intValue();
             outPipe = Integer.valueOf(args[1]).intValue();
-            if (inPipe >= 0 && outPipe >= 0)
+            if (inPipe >= 0 && outPipe >= 0) {
+                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;
+            }
         }
-        System.err.println("Invalid pipe descriptors provided. Refusing to proceed.");
+        OutputController.getLogger().log(OutputController.Level.ERROR_ALL, "Invalid pipe descriptors provided. Refusing to proceed.");
         return false;
     }
@@ -67 +80 @@
         FileDescriptor outPipeFD = new FileDescriptor();
         fdAccess.set(outPipeFD, outPipe);
-        try {
-            streamHandler = new PluginStreamHandler(new FileInputStream(inPipeFD), new FileOutputStream(outPipeFD));
-            PluginDebug.debug("Streams initialized");
-        } catch (IOException ioe) {
-            ioe.printStackTrace();
-        }
+        streamHandler = new PluginStreamHandler(new FileInputStream(inPipeFD), new FileOutputStream(outPipeFD));
+        PluginDebug.debug("Streams initialized");
         return streamHandler;
     }