consolidte method usage

anti43 · Jan 28, 2013 · db4bfb2 · db4bfb2
1 parent eab47ee
commit db4bfb2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/enoa/connection/NoaConnection.java b/src/enoa/connection/NoaConnection.java
@@ -322,7 +322,7 @@ public void run() {
             if (LocalSettings.hasProperty(LocalSettings.OFFICE_COMMAND)) {
                FileExecutor.run(LocalSettings.getProperty(LocalSettings.OFFICE_COMMAND));
             } else {
-               FileExecutor.run(getOOArgs(path, port));
+              NoaConnectionLocalServer.startOOServerIfNotRunning(path, port);
             }
          }
       };
@@ -343,8 +343,9 @@ protected static String[] getOOArgs(String path, int port) {
                  "--nolockcheck",
                  "--nocrashreport",
                  "--nodefault",
-                 (Main.osIsWindows ? "--accept=socket,host=0.0.0.0,port=" + port + ";urp;StarOffice.Service"
-                 : "--accept='socket,host=0.0.0.0,port=" + port + ";urp;StarOffice.Service'")};
+                 (Main.osIsWindows ? "--accept=socket,host=0.0.0.0,port=8100;urp;StarOffice.Service;"
+                 : "--accept='socket,host=0.0.0.0,port=8100;urp;StarOffice.Service'")
+      };
    }
 
    /**

diff --git a/src/enoa/connection/NoaConnectionLocalServer.java b/src/enoa/connection/NoaConnectionLocalServer.java
@@ -254,7 +254,11 @@ public void run() {
             if (LocalSettings.hasProperty(LocalSettings.OFFICE_COMMAND)) {
                FileExecutor.run(LocalSettings.getProperty(LocalSettings.OFFICE_COMMAND));
             } else {
-               FileExecutor.run(getOOArgs(path, port));
+               try {
+                  startOOServer(path, port);
+               } catch (IOException iOException) {
+                  Log.Debug(iOException);
+               }
             }
          }
       };