You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/05/09 19:39:41 UTC
svn commit: r1336309 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
component/gui/JCRRegistryWindow.java experiment/gui/ExperimentMenu.java
menues/registry/RegistryMenuItem.java util/XBayaUtil.java
Author: samindaw
Date: Wed May 9 17:39:41 2012
New Revision: 1336309
URL: http://svn.apache.org/viewvc?rev=1336309&view=rev
Log:
refactor for future benefit
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/registry/RegistryMenuItem.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java?rev=1336309&r1=1336308&r2=1336309&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java Wed May 9 17:39:41 2012
@@ -31,11 +31,9 @@ import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JLabel;
-import javax.swing.JPanel;
import javax.swing.JPasswordField;
import org.apache.airavata.xbaya.XBayaConfiguration;
-import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.component.registry.ComponentRegistryLoader;
import org.apache.airavata.xbaya.component.registry.JCRComponentRegistry;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java?rev=1336309&r1=1336308&r2=1336309&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java Wed May 9 17:39:41 2012
@@ -31,8 +31,8 @@ import javax.swing.JMenuItem;
import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.component.gui.JCRRegistryWindow;
import org.apache.airavata.xbaya.registry.RegistryAccesser;
+import org.apache.airavata.xbaya.util.XBayaUtil;
public class ExperimentMenu {
@@ -85,13 +85,9 @@ public class ExperimentMenu {
this.configureRegistryItem = new JMenuItem("Configure Registry");
configureRegistryItem.setMnemonic(KeyEvent.VK_C);
configureRegistryItem.addActionListener(new AbstractAction() {
- private JCRRegistryWindow window;
-
public void actionPerformed(ActionEvent e) {
- if (this.window == null) {
- this.window = new JCRRegistryWindow(ExperimentMenu.this.engine);
- }
- this.window.show();
+ XBayaEngine xbayaEngine = ExperimentMenu.this.engine;
+ XBayaUtil.updateJCRRegistryInfo(xbayaEngine);
}
});
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/registry/RegistryMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/registry/RegistryMenuItem.java?rev=1336309&r1=1336308&r2=1336309&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/registry/RegistryMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/registry/RegistryMenuItem.java Wed May 9 17:39:41 2012
@@ -29,13 +29,14 @@ import javax.swing.JMenu;
import javax.swing.JMenuItem;
import org.apache.airavata.xbaya.XBayaConfiguration;
-import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.XBayaConfiguration.XBayaExecutionMode;
+import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.component.gui.JCRRegistryWindow;
import org.apache.airavata.xbaya.gui.ToolbarButton;
import org.apache.airavata.xbaya.gui.XBayaExecutionModeListener;
import org.apache.airavata.xbaya.gui.XBayaToolBar;
import org.apache.airavata.xbaya.menues.MenuIcons;
+import org.apache.airavata.xbaya.util.XBayaUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -88,19 +89,16 @@ public class RegistryMenuItem implements
}
-
private JMenuItem createJCRRegistryItem() {
JMenuItem item = new JMenuItem("Setup JCR Registry...",MenuIcons.JCR_ICON);
item.setMnemonic(KeyEvent.VK_J);
AbstractAction action = new AbstractAction() {
- private JCRRegistryWindow window;
public void actionPerformed(ActionEvent e) {
- if (this.window == null) {
- this.window = new JCRRegistryWindow(engine);
- }
- this.window.show();
+ XBayaEngine xbayaEngine = engine;
+ XBayaUtil.updateJCRRegistryInfo(xbayaEngine);
}
+
};
item.addActionListener(action);
toolbarButtonJCR = getToolBar().addToolbarButton(REGISTRY_ACTIONS, item.getText(), MenuIcons.JCR_ICON, item.getText(), action, 1);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java?rev=1336309&r1=1336308&r2=1336309&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java Wed May 9 17:39:41 2012
@@ -63,7 +63,6 @@ import org.apache.axis2.util.XMLUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
import org.xmlpull.infoset.XmlElement;
@@ -149,11 +148,16 @@ public class XBayaUtil {
public static boolean acquireJCRRegistry(XBayaEngine engine) {
XBayaConfiguration configuration = engine.getConfiguration();
if (configuration.getJcrComponentRegistry() == null) {
- JCRRegistryWindow window = new JCRRegistryWindow(engine);
- window.show();
+ updateJCRRegistryInfo(engine);
}
return engine.getConfiguration().getJcrComponentRegistry() != null;
}
+
+ public static void updateJCRRegistryInfo(XBayaEngine xbayaEngine) {
+ JCRRegistryWindow window = new JCRRegistryWindow(xbayaEngine);
+ window.show();
+ }
+
public static Object getInputsForForEachNode(final ForEachNode forEachNode,
final LinkedList<String> listOfValues, Map<Node, Invoker> invokerMap) throws XBayaException {
Node forEachInputNode = forEachNode.getInputPort(0).getFromNode();