Permalink
Browse files

consolidte method usage

  • Loading branch information...
anti43 committed Jan 28, 2013
1 parent eab47ee commit db4bfb2f66227eedef6b2f334532cb4c1116401a
Showing with 9 additions and 4 deletions.
  1. +4 −3 src/enoa/connection/NoaConnection.java
  2. +5 −1 src/enoa/connection/NoaConnectionLocalServer.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 @@ public void run() {
"--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'")
+ };
}
/**
@@ -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);
+ }
}
}
};

0 comments on commit db4bfb2

Please sign in to comment.