Author: mes
Date: 2011-10-25 12:28:46 -0700 (Tue, 25 Oct 2011)
New Revision: 27298
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/OpenBrowser.java
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/OpenBrowserImpl.java
Log:
updated to openURL command to return false if it can't open the url
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/OpenBrowser.java
===================================================================
---
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/OpenBrowser.java
2011-10-25 18:38:08 UTC (rev 27297)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/OpenBrowser.java
2011-10-25 19:28:46 UTC (rev 27298)
@@ -56,6 +56,7 @@
/**
* Opens a web browser pointing to the specified URL.
* @param url A string URL that should be opened in the web browser.
+ * @return Whether the browser opened successfully or not.
*/
- void openURL(String url);
+ boolean openURL(String url);
}
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/OpenBrowserImpl.java
===================================================================
---
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/OpenBrowserImpl.java
2011-10-25 18:38:08 UTC (rev 27297)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/OpenBrowserImpl.java
2011-10-25 19:28:46 UTC (rev 27298)
@@ -49,8 +49,13 @@
import org.cytoscape.property.CyProperty;
import org.cytoscape.util.swing.OpenBrowser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class OpenBrowserImpl implements OpenBrowser {
+ private final Logger logger =
LoggerFactory.getLogger(OpenBrowserImpl.class);
+
private final Properties props;
private final static String UNIX_PATH = "htmlview";
@@ -68,7 +73,7 @@
*
* @param url DOCUMENT ME!
*/
- public void openURL(String url) {
+ public boolean openURL(String url) {
String defBrowser =
props.getProperty(OpenBrowser.DEF_WEB_BROWSER_PROP_NAME);
String osName = System.getProperty("os.name");
@@ -87,21 +92,27 @@
}
}
- System.out.println("Opening URL by command \"" + cmd +
"\"");
+ logger.debug("Opening URL by command \"" + cmd + "\"");
Process p = Runtime.getRuntime().exec(cmd);
try {
int exitCode = p.waitFor();
- if (exitCode != 0)
- System.err.println("Open browser
command (" + cmd + ") failed!");
+ if (exitCode != 0) {
+ logger.warn("Open browser command (" +
cmd + ") failed!");
+ return false;
+ }
} catch (InterruptedException ex) {
- ex.printStackTrace();
+ logger.warn("Open browser exception",ex);
+ return false;
}
} catch (IOException ioe) {
- ioe.printStackTrace();
+ logger.warn("Open browser IOException",ioe);
+ return false;
}
+
+ return true;
}
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
