You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2011/09/08 23:43:26 UTC
svn commit: r1166918 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
graph/system/gui/OutputNodeGUI.java gui/AboutWindow.java
monitor/gui/MonitorPanel.java test/BrowserTestCase.java
util/BrowserLauncher.java
Author: lahiru
Date: Thu Sep 8 21:43:25 2011
New Revision: 1166918
URL: http://svn.apache.org/viewvc?rev=1166918&view=rev
Log:
removing BrowserLauncher and use utils class.
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BrowserTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/BrowserLauncher.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputNodeGUI.java?rev=1166918&r1=1166917&r2=1166918&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputNodeGUI.java Thu Sep 8 21:43:25 2011
@@ -25,10 +25,11 @@ import java.awt.Color;
import java.net.MalformedURLException;
import java.net.URL;
+import org.apache.airavata.common.exception.UtilsException;
+import org.apache.airavata.common.utils.BrowserLauncher;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.graph.system.OutputNode;
-import org.apache.airavata.xbaya.util.BrowserLauncher;
public class OutputNodeGUI extends ConfigurableNodeGUI {
@@ -68,10 +69,7 @@ public class OutputNodeGUI extends Confi
URL url = new URL(description);
// no exception -> valid url lets try to open it
BrowserLauncher.openURL(url);
- } catch (MalformedURLException e) {
- // do nothing since this is not a url we just ignor it
-
- } catch (XBayaException e) {
+ } catch (Exception e) {
// do nothing since this is an optional attempt
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java?rev=1166918&r1=1166917&r2=1166918&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java Thu Sep 8 21:43:25 2011
@@ -32,11 +32,11 @@ import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkEvent.EventType;
import javax.swing.event.HyperlinkListener;
+import org.apache.airavata.common.utils.BrowserLauncher;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.XBayaVersion;
-import org.apache.airavata.xbaya.util.BrowserLauncher;
import xsul5.MLogger;
import xsul5.XmlConstants;
@@ -94,7 +94,7 @@ public class AboutWindow {
URL url = event.getURL();
try {
BrowserLauncher.openURL(url.toString());
- } catch (XBayaException e) {
+ } catch (Exception e) {
AboutWindow.this.engine.getErrorWindow().error(AboutWindow.this.dialog.getDialog(),
e.getMessage(), e);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java?rev=1166918&r1=1166917&r2=1166918&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java Thu Sep 8 21:43:25 2011
@@ -40,12 +40,12 @@ import javax.swing.event.TableModelListe
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
+import org.apache.airavata.common.utils.BrowserLauncher;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.gui.XBayaComponent;
import org.apache.airavata.xbaya.monitor.MonitorEventData;
import org.apache.airavata.xbaya.monitor.MonitorUtil;
-import org.apache.airavata.xbaya.util.BrowserLauncher;
import org.apache.airavata.xbaya.util.SwingUtil;
import org.xmlpull.infoset.XmlElement;
@@ -196,7 +196,7 @@ public class MonitorPanel implements XBa
String url = MonitorUtil.getLocation(message);
try {
BrowserLauncher.openURL(url);
- } catch (XBayaException e) {
+ } catch (Exception e) {
MonitorPanel.this.engine.getErrorWindow().error(e.getMessage(), e);
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BrowserTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BrowserTestCase.java?rev=1166918&r1=1166917&r2=1166918&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BrowserTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BrowserTestCase.java Thu Sep 8 21:43:25 2011
@@ -23,8 +23,8 @@ package org.apache.airavata.xbaya.test;
import junit.framework.TestCase;
+import org.apache.airavata.common.utils.BrowserLauncher;
import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.util.BrowserLauncher;
public class BrowserTestCase extends TestCase {
@@ -32,7 +32,7 @@ public class BrowserTestCase extends Tes
* @throws XBayaException
*
*/
- public void testBrowserLauncher() throws XBayaException {
+ public void testBrowserLauncher() throws Exception {
BrowserLauncher.openURL("http://www.google.com");
}
}
\ No newline at end of file