Revision: 8356
http://languagetool.svn.sourceforge.net/languagetool/?rev=8356&view=rev
Author: dnaber
Date: 2012-11-11 13:29:30 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
translate the error message about the server not being started + fix try/catch
so the error is actually displayed to the user
Modified Paths:
--------------
trunk/JLanguageTool/src/main/java/org/languagetool/gui/Main.java
trunk/JLanguageTool/src/main/java/org/languagetool/server/HTTPSServer.java
trunk/JLanguageTool/src/main/java/org/languagetool/server/HTTPServer.java
trunk/JLanguageTool/src/main/resources/org/languagetool/MessagesBundle.properties
Modified: trunk/JLanguageTool/src/main/java/org/languagetool/gui/Main.java
===================================================================
--- trunk/JLanguageTool/src/main/java/org/languagetool/gui/Main.java
2012-11-11 13:14:38 UTC (rev 8355)
+++ trunk/JLanguageTool/src/main/java/org/languagetool/gui/Main.java
2012-11-11 13:29:30 UTC (rev 8356)
@@ -371,11 +371,12 @@
private void maybeStartServer() {
if (config.getRunServer()) {
- httpServer = new HTTPServer(new HTTPServerConfig(config.getServerPort(),
false), true);
try {
+ final HTTPServerConfig serverConfig = new
HTTPServerConfig(config.getServerPort(), false);
+ httpServer = new HTTPServer(serverConfig, true);
httpServer.run();
} catch (PortBindingException e) {
- final String message = e.getMessage() + "\n\n" +
org.languagetool.tools.Tools.getFullStackTrace(e);
+ final String message = e.getMessage();
JOptionPane.showMessageDialog(null, message, "Error",
JOptionPane.ERROR_MESSAGE);
}
}
Modified:
trunk/JLanguageTool/src/main/java/org/languagetool/server/HTTPSServer.java
===================================================================
--- trunk/JLanguageTool/src/main/java/org/languagetool/server/HTTPSServer.java
2012-11-11 13:14:38 UTC (rev 8355)
+++ trunk/JLanguageTool/src/main/java/org/languagetool/server/HTTPSServer.java
2012-11-11 13:29:30 UTC (rev 8356)
@@ -21,6 +21,8 @@
import com.sun.net.httpserver.HttpsConfigurator;
import com.sun.net.httpserver.HttpsParameters;
import com.sun.net.httpserver.HttpsServer;
+import org.languagetool.JLanguageTool;
+import org.languagetool.gui.Tools;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
@@ -32,6 +34,7 @@
import java.net.BindException;
import java.net.InetSocketAddress;
import java.security.KeyStore;
+import java.util.ResourceBundle;
import java.util.Set;
import static org.languagetool.server.HTTPServerConfig.DEFAULT_HOST;
@@ -64,12 +67,13 @@
((HttpsServer)server).setHttpsConfigurator(configurator);
server.createContext("/", new
LanguageToolHttpHandler(config.isVerbose(), allowedIps, runInternally));
} catch (BindException e) {
- throw new PortBindingException(
- "LanguageTool HTTPS server could not be started on host '" + host +
"', port " + port
- + " - maybe something else is running on that port already?", e);
+ final ResourceBundle messages = JLanguageTool.getMessageBundle();
+ final String message = Tools.makeTexti18n(messages,
"https_server_start_failed", host, Integer.toString(port));
+ throw new PortBindingException(message, e);
} catch (Exception e) {
- throw new RuntimeException(
- "LanguageTool HTTPS server could not be started on host '" + host +
"', port " + port, e);
+ final ResourceBundle messages = JLanguageTool.getMessageBundle();
+ final String message = Tools.makeTexti18n(messages,
"https_server_start_failed_unknown_reason", host, Integer.toString(port));
+ throw new RuntimeException(message, e);
}
}
Modified:
trunk/JLanguageTool/src/main/java/org/languagetool/server/HTTPServer.java
===================================================================
--- trunk/JLanguageTool/src/main/java/org/languagetool/server/HTTPServer.java
2012-11-11 13:14:38 UTC (rev 8355)
+++ trunk/JLanguageTool/src/main/java/org/languagetool/server/HTTPServer.java
2012-11-11 13:29:30 UTC (rev 8356)
@@ -19,9 +19,12 @@
package org.languagetool.server;
import com.sun.net.httpserver.HttpServer;
+import org.languagetool.JLanguageTool;
+import org.languagetool.gui.Tools;
import java.io.IOException;
import java.net.InetSocketAddress;
+import java.util.ResourceBundle;
import java.util.Set;
import static org.languagetool.server.HTTPServerConfig.DEFAULT_HOST;
@@ -94,9 +97,9 @@
}
server.createContext("/", new
LanguageToolHttpHandler(config.isVerbose(), allowedIps, runInternally));
} catch (Exception e) {
- throw new PortBindingException(
- "LanguageTool HTTP server could not be started on host '" + host +
"', port " + port
- + " - maybe something else is running on that port already?", e);
+ final ResourceBundle messages = JLanguageTool.getMessageBundle();
+ final String message = Tools.makeTexti18n(messages,
"http_server_start_failed", host, Integer.toString(port));
+ throw new PortBindingException(message, e);
}
}
Modified:
trunk/JLanguageTool/src/main/resources/org/languagetool/MessagesBundle.properties
===================================================================
---
trunk/JLanguageTool/src/main/resources/org/languagetool/MessagesBundle.properties
2012-11-11 13:14:38 UTC (rev 8355)
+++
trunk/JLanguageTool/src/main/resources/org/languagetool/MessagesBundle.properties
2012-11-11 13:29:30 UTC (rev 8356)
@@ -262,3 +262,9 @@
ja = Japanese
language_not_supported = Error: Sorry, the document language "{0}" is not
supported by LanguageTool.
+
+http_server_start_failed = LanguageTool HTTP server could not be started on
host "{0}", port {1} - maybe something else is running on that port already?
+
+https_server_start_failed = LanguageTool HTTPS server could not be started on
host "{0}", port {1} - maybe something else is running on that port already?
+
+https_server_start_failed_unknown_reason = LanguageTool HTTPS server could not
be started on host "{0}", port {1}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_nov
_______________________________________________
Languagetool-commits mailing list
Languagetool-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-commits
