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/11/02 19:51:35 UTC
svn commit: r1196759 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
appwrapper/ registrybrowser/ registrybrowser/nodes/
Author: lahiru
Date: Wed Nov 2 18:51:34 2011
New Revision: 1196759
URL: http://svn.apache.org/viewvc?rev=1196759&view=rev
Log:
Applying the patch for AIRAVATA-177
Thanks Heshan for the contribution
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/RegisterApplicationsMenu.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AiravataTreeNodeFactory.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionDialog.java?rev=1196759&r1=1196758&r2=1196759&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionDialog.java Wed Nov 2 18:51:34 2011
@@ -54,6 +54,7 @@ import org.apache.airavata.commons.gfac.
import org.apache.airavata.registry.api.Registry;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
+import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.gui.XBayaLinkButton;
public class ApplicationDescriptionDialog extends JDialog implements ActionListener {
@@ -76,6 +77,9 @@ public class ApplicationDescriptionDialo
private JComboBox cmbServiceName;
private JComboBox cmbHostName;
+ private XBayaEngine engine;
+
+
/**
* Launch the application.
*/
@@ -92,7 +96,7 @@ public class ApplicationDescriptionDialo
/**
* Create the dialog.
*/
- public ApplicationDescriptionDialog(Registry registry) {
+ public ApplicationDescriptionDialog(XBayaEngine engine) {
addWindowListener(new WindowAdapter() {
@Override
public void windowOpened(WindowEvent arg0) {
@@ -120,7 +124,7 @@ public class ApplicationDescriptionDialo
setApplicationName(txtAppName.getText());
}
});
- setRegistry(registry);
+ setRegistry(engine.getConfiguration().getJcrComponentRegistry().getRegistry());
iniGUI();
}
@@ -250,8 +254,11 @@ public class ApplicationDescriptionDialo
bayaLinkButton_1.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
try {
- HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getRegistry());
- hostDescriptionDialog.open();
+ HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine);
+ // TODO : do we need this?
+ //hostDescriptionDialog.open();
+ hostDescriptionDialog.show();
+
if (hostDescriptionDialog.isHostCreated()) {
loadHostDescriptions();
cmbHostName.setSelectedItem(hostDescriptionDialog.getHostLocation());
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java?rev=1196759&r1=1196758&r2=1196759&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java Wed Nov 2 18:51:34 2011
@@ -1,204 +1,182 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.appwrapper;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.util.regex.Pattern;
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
-import javax.swing.GroupLayout;
-import javax.swing.GroupLayout.Alignment;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.LayoutStyle.ComponentPlacement;
+package org.apache.airavata.xbaya.appwrapper;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.registry.api.Registry;
import org.apache.airavata.registry.api.exception.RegistryException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.airavata.schemas.gfac.GlobusHostType;
+import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.gui.GridPanel;
+import org.apache.airavata.xbaya.gui.XBayaDialog;
+import org.apache.airavata.xbaya.gui.XBayaLabel;
+import org.apache.airavata.xbaya.gui.XBayaTextField;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.util.regex.Pattern;
public class HostDescriptionDialog extends JDialog {
- private static final Logger log = LoggerFactory.getLogger(HostDescriptionDialog.class);
-
- private static final long serialVersionUID = 1423293834766468324L;
- private JTextField txtHostLocation;
- private JTextField txtHostName;
+ private XBayaEngine engine;
+
+ private XBayaDialog dialog;
+
+ private XBayaTextField hostIdTextField;
+
+ private XBayaTextField hostAddressTextField;
+
+ private XBayaTextField globusGateKeeperTextField;
+
+ private XBayaTextField GridFTPTextField;
+
private HostDescription hostDescription;
- private Registry registry;
- private JButton okButton;
+
+ private GlobusHostType globusHostType;
+
private boolean hostCreated = false;
- private JLabel lblError;
+
+ private boolean isGlobusHostCreated = false;
+
+ private Registry registry;
/**
- * Launch the application.
+ * @param engine XBaya workflow engine
*/
- public static void main(String[] args) {
- try {
- HostDescriptionDialog dialog = new HostDescriptionDialog(null);
- dialog.open();
- } catch (Exception e) {
- e.printStackTrace();
+ public HostDescriptionDialog(XBayaEngine engine) {
+ this.engine = engine;
+ setRegistry(engine.getConfiguration().getJcrComponentRegistry().getRegistry());
+ initGUI();
+ }
+
+ /**
+ * Displays the dialog.
+ */
+ public void show() {
+ this.dialog.show();
+ }
+
+ public void hide() {
+ this.dialog.hide();
+ }
+
+ private void ok() {
+ String hostId = this.hostIdTextField.getText();
+ String hostAddress = this.hostAddressTextField.getText();
+ String globusGateKeeperEPR = this.globusGateKeeperTextField.getText();
+ String gridFTP = this.GridFTPTextField.getText();
+
+ if((globusGateKeeperEPR != null) || (gridFTP != null)){
+ isGlobusHostCreated = true;
+ }
+
+ // TODO the logic here
+
+ setHostId(hostId);
+ setHostLocation(hostAddress);
+ if(globusGateKeeperEPR != null) {
+ setGlobusGateKeeperEPR(globusGateKeeperEPR);
+ }
+ if(gridFTP != null) {
+ setGridFTPEPR(globusGateKeeperEPR);
}
+
+ saveHostDescription();
+ hide();
}
- public void open() {
- setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
- setVisible(true);
+ private void setGlobusGateKeeperEPR(String epr) {
+ if (hostDescription.getType() == GlobusHostType.type) {
+ ((GlobusHostType)hostDescription).addGlobusGateKeeperEndPoint(epr);
+ }
+ }
+
+ private String[] getGlobusGateKeeperEPR(String epr) {
+ if (hostDescription.getType() == GlobusHostType.type) {
+ return ((GlobusHostType)hostDescription).getGlobusGateKeeperEndPointArray();
+ } else {
+ return null;
+ }
+ }
+
+ private void setGridFTPEPR(String epr) {
+ if (hostDescription.getType() == GlobusHostType.type) {
+ ((GlobusHostType)hostDescription).addGridFTPEndPoint(epr);
+ }
}
- protected HostDescriptionDialog getDialog() {
- return this;
+ private String[] getGridFTPEPR(String epr) {
+ if (hostDescription.getType() == GlobusHostType.type) {
+ return ((GlobusHostType)hostDescription).getGridFTPEndPointArray();
+ } else {
+ return null;
+ }
}
/**
- * Create the dialog.
+ * Initializes the GUI.
*/
- public HostDescriptionDialog(Registry registry) {
- addWindowListener(new WindowAdapter() {
- @Override
- public void windowOpened(WindowEvent arg0) {
- String baseName = "Host";
- int i = 1;
- String defaultName = baseName + i;
- try {
- while (getRegistry().getHostDescription(defaultName) != null) {
- defaultName = baseName + (++i);
- }
- } catch (RegistryException e) {
- log.error("error", e);
- }
- txtHostName.setText(defaultName);
- setHostId(txtHostName.getText());
+ private void initGUI() {
+ this.hostIdTextField = new XBayaTextField();
+ this.hostAddressTextField = new XBayaTextField();
+ this.globusGateKeeperTextField = new XBayaTextField();
+ this.GridFTPTextField = new XBayaTextField();
+
+ XBayaLabel hostIdLabel = new XBayaLabel("Host ID", this.hostIdTextField);
+ XBayaLabel hostAddressLabel = new XBayaLabel("Host Address", this.hostAddressTextField);
+ XBayaLabel globusGateKeeperLabel = new XBayaLabel("Gloubus Gate Keeper Endpoint", this.globusGateKeeperTextField);
+ XBayaLabel gridFTPLabel = new XBayaLabel("Grid FTP Endpoint", this.GridFTPTextField);
+
+ GridPanel infoPanel = new GridPanel();
+ infoPanel.add(hostIdLabel);
+ infoPanel.add(this.hostIdTextField);
+ infoPanel.add(hostAddressLabel);
+ infoPanel.add(this.hostAddressTextField);
+ infoPanel.add(globusGateKeeperLabel);
+ infoPanel.add(globusGateKeeperTextField);
+ infoPanel.add(gridFTPLabel);
+ infoPanel.add(this.GridFTPTextField);
+ infoPanel.layout(4, 2, GridPanel.WEIGHT_NONE, 1);
+
+ JButton okButton = new JButton("OK");
+ okButton.addActionListener(new AbstractAction() {
+ public void actionPerformed(ActionEvent e) {
+ ok();
}
});
- setRegistry(registry);
- initGUI();
- }
- private void initGUI() {
- setTitle("New Host Description");
- setBounds(100, 100, 455, 182);
- setModal(true);
- setLocationRelativeTo(null);
- getContentPane().setLayout(new BorderLayout());
- {
- JPanel buttonPane = new JPanel();
- buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
- getContentPane().add(buttonPane, BorderLayout.SOUTH);
- {
- okButton = new JButton("Save");
- okButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- saveHostDescription();
- close();
- }
- });
-
- lblError = new JLabel("");
- lblError.setForeground(Color.RED);
- buttonPane.add(lblError);
- okButton.setEnabled(false);
- okButton.setActionCommand("OK");
- buttonPane.add(okButton);
- getRootPane().setDefaultButton(okButton);
+ JButton cancelButton = new JButton("Cancel");
+ cancelButton.addActionListener(new AbstractAction() {
+ public void actionPerformed(ActionEvent e) {
+ hide();
}
- {
- JButton cancelButton = new JButton("Cancel");
- cancelButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- setHostCreated(false);
- close();
- }
- });
- cancelButton.setActionCommand("Cancel");
- buttonPane.add(cancelButton);
- }
- }
- {
- JPanel panel = new JPanel();
- getContentPane().add(panel, BorderLayout.CENTER);
- JLabel lblHostName = new JLabel("Host id");
- JLabel lblHostLocationip = new JLabel("Host address");
- txtHostLocation = new JTextField();
- txtHostLocation.addKeyListener(new KeyAdapter() {
- @Override
- public void keyReleased(KeyEvent e) {
- setHostLocation(txtHostLocation.getText());
- }
- });
- txtHostLocation.setColumns(10);
- txtHostName = new JTextField();
- txtHostName.addKeyListener(new KeyAdapter() {
- @Override
- public void keyReleased(KeyEvent e) {
- setHostId(txtHostName.getText());
- }
- });
- txtHostName.setColumns(10);
- GroupLayout gl_panel = new GroupLayout(panel);
- gl_panel.setHorizontalGroup(gl_panel.createParallelGroup(Alignment.LEADING).addGroup(
- gl_panel.createSequentialGroup()
- .addGap(22)
- .addGroup(
- gl_panel.createParallelGroup(Alignment.TRAILING).addComponent(lblHostName)
- .addComponent(lblHostLocationip))
- .addGap(18)
- .addGroup(
- gl_panel.createParallelGroup(Alignment.LEADING, false)
- .addComponent(txtHostLocation)
- .addComponent(txtHostName, GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE))
- .addGap(37)));
- gl_panel.setVerticalGroup(gl_panel.createParallelGroup(Alignment.LEADING).addGroup(
- gl_panel.createSequentialGroup()
- .addGap(31)
- .addGroup(
- gl_panel.createParallelGroup(Alignment.BASELINE)
- .addComponent(txtHostName, GroupLayout.PREFERRED_SIZE,
- GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
- .addComponent(lblHostName))
- .addPreferredGap(ComponentPlacement.RELATED)
- .addGroup(
- gl_panel.createParallelGroup(Alignment.BASELINE)
- .addComponent(txtHostLocation, GroupLayout.PREFERRED_SIZE,
- GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
- .addComponent(lblHostLocationip)).addGap(176)));
- gl_panel.setAutoCreateGaps(true);
- gl_panel.setAutoCreateContainerGaps(true);
- panel.setLayout(gl_panel);
- }
- setResizable(false);
- getRootPane().setDefaultButton(okButton);
+ });
+
+ JPanel buttonPanel = new JPanel();
+ buttonPanel.add(okButton);
+ buttonPanel.add(cancelButton);
+
+ this.dialog = new XBayaDialog(this.engine, "New Host Description", infoPanel, buttonPanel);
+ this.dialog.setDefaultButton(okButton);
}
public String getHostId() {
@@ -246,13 +224,13 @@ public class HostDescriptionDialog exten
} catch (Exception e) {
message = e.getLocalizedMessage();
}
- okButton.setEnabled(message == null);
- setError(message);
+ //okButton.setEnabled(message == null);
+ //setError(message);
}
- public void close() {
+/* public void close() {
getDialog().setVisible(false);
- }
+ }*/
public boolean isHostCreated() {
return hostCreated;
@@ -264,7 +242,11 @@ public class HostDescriptionDialog exten
public HostDescription getHostDescription() {
if (hostDescription == null) {
- hostDescription = new HostDescription();
+ if (isGlobusHostCreated) {
+ hostDescription = new HostDescription(GlobusHostType.type);
+ } else {
+ hostDescription = new HostDescription();
+ }
}
return hostDescription;
}
@@ -274,13 +256,13 @@ public class HostDescriptionDialog exten
setHostCreated(true);
}
- private void setError(String errorMessage) {
+/* private void setError(String errorMessage) {
if (errorMessage == null || errorMessage.trim().equals("")) {
lblError.setText("");
} else {
lblError.setText(errorMessage.trim());
}
- }
+ }*/
public Registry getRegistry() {
return registry;
@@ -289,4 +271,4 @@ public class HostDescriptionDialog exten
public void setRegistry(Registry registry) {
this.registry = registry;
}
-}
+}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/RegisterApplicationsMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/RegisterApplicationsMenu.java?rev=1196759&r1=1196758&r2=1196759&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/RegisterApplicationsMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/RegisterApplicationsMenu.java Wed Nov 2 18:51:34 2011
@@ -154,8 +154,7 @@ public class RegisterApplicationsMenu {
if (XBayaUtil.acquireJCRRegistry(engine)) {
try {
ApplicationDescriptionDialog applicationDescriptionDialog = new ApplicationDescriptionDialog(
- RegisterApplicationsMenu.this.engine.getConfiguration().getJcrComponentRegistry()
- .getRegistry());
+ RegisterApplicationsMenu.this.engine);
applicationDescriptionDialog.open();
} catch (Exception e1) {
RegisterApplicationsMenu.this.engine.getErrorWindow().error(e1);
@@ -176,9 +175,10 @@ public class RegisterApplicationsMenu {
if (XBayaUtil.acquireJCRRegistry(engine)) {
try {
HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(
- RegisterApplicationsMenu.this.engine.getConfiguration().getJcrComponentRegistry()
- .getRegistry());
- hostDescriptionDialog.open();
+ RegisterApplicationsMenu.this.engine);
+ // TODO : should remove this
+ //hostDescriptionDialog.open();
+ hostDescriptionDialog.show();
} catch (Exception e1) {
RegisterApplicationsMenu.this.engine.getErrorWindow().error(e1);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java?rev=1196759&r1=1196758&r2=1196759&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java Wed Nov 2 18:51:34 2011
@@ -82,7 +82,7 @@ public class JCRBrowserPanel extends JPa
this.add(scrollPane, BorderLayout.CENTER);
{
tree = new JTree(AiravataTreeNodeFactory.getTreeNode(getJCRRegistry() == null ? "No registry specified"
- : getJCRRegistry(), null));
+ : getEngine(), null));
tree.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java?rev=1196759&r1=1196758&r2=1196759&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java Wed Nov 2 18:51:34 2011
@@ -21,26 +21,21 @@
package org.apache.airavata.xbaya.registrybrowser.nodes;
-import java.awt.Color;
-import java.awt.Component;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
+import org.apache.airavata.registry.api.Registry;
+import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.registrybrowser.menu.AbstractBrowserActionItem;
+import org.apache.airavata.xbaya.registrybrowser.menu.RefreshAction;
-import javax.swing.Icon;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JTree;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
-
-import org.apache.airavata.registry.api.Registry;
-import org.apache.airavata.xbaya.registrybrowser.menu.AbstractBrowserActionItem;
-import org.apache.airavata.xbaya.registrybrowser.menu.RefreshAction;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
public abstract class AbstractAiravataTreeNode implements TreeNode {
@@ -53,6 +48,14 @@ public abstract class AbstractAiravataTr
setParent(parent);
}
+ protected XBayaEngine getXBayaEngine(){
+ TreeNode root=getRootNode();
+ if (root instanceof RegistryNode){
+ return ((RegistryNode)root).getEngine();
+ }
+ return null;
+ }
+
@Override
public Enumeration children() {
this.children = listOfChildren();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AiravataTreeNodeFactory.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AiravataTreeNodeFactory.java?rev=1196759&r1=1196758&r2=1196759&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AiravataTreeNodeFactory.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AiravataTreeNodeFactory.java Wed Nov 2 18:51:34 2011
@@ -21,34 +21,21 @@
package org.apache.airavata.xbaya.registrybrowser.nodes;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreeNode;
-
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.Registry;
-import org.apache.airavata.xbaya.registrybrowser.model.ApplicationDeploymentDescriptionWrap;
-import org.apache.airavata.xbaya.registrybrowser.model.ApplicationDeploymentDescriptions;
-import org.apache.airavata.xbaya.registrybrowser.model.GFacURL;
-import org.apache.airavata.xbaya.registrybrowser.model.GFacURLs;
-import org.apache.airavata.xbaya.registrybrowser.model.HostDescriptions;
-import org.apache.airavata.xbaya.registrybrowser.model.InputParameters;
-import org.apache.airavata.xbaya.registrybrowser.model.OutputParameters;
-import org.apache.airavata.xbaya.registrybrowser.model.ServiceDescriptions;
-import org.apache.airavata.xbaya.registrybrowser.model.ServiceParameter;
-import org.apache.airavata.xbaya.registrybrowser.model.ServiceParameters;
-import org.apache.airavata.xbaya.registrybrowser.model.XBayaWorkflow;
-import org.apache.airavata.xbaya.registrybrowser.model.XBayaWorkflowExperiment;
-import org.apache.airavata.xbaya.registrybrowser.model.XBayaWorkflowExperiments;
-import org.apache.airavata.xbaya.registrybrowser.model.XBayaWorkflowService;
-import org.apache.airavata.xbaya.registrybrowser.model.XBayaWorkflowTemplate;
-import org.apache.airavata.xbaya.registrybrowser.model.XBayaWorkflowTemplates;
+import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.registrybrowser.model.*;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeNode;
public class AiravataTreeNodeFactory {
public static TreeNode getTreeNode(Object o,TreeNode parent){
- if (o instanceof Registry){
+ if (o instanceof XBayaEngine){
+ return new RegistryNode((XBayaEngine)o,parent);
+ }/*else if (o instanceof Registry){
return new RegistryNode((Registry)o,parent);
- }else if (o instanceof GFacURLs){
+ }*/else if (o instanceof GFacURLs){
return new GFacURLsNode((GFacURLs)o,parent);
}else if (o instanceof GFacURL){
return new GFacURLNode((GFacURL)o,parent);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java?rev=1196759&r1=1196758&r2=1196759&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java Wed Nov 2 18:51:34 2011
@@ -21,13 +21,6 @@
package org.apache.airavata.xbaya.registrybrowser.nodes;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.Icon;
-import javax.swing.JTree;
-import javax.swing.tree.TreeNode;
-
import org.apache.airavata.common.utils.SwingUtil;
import org.apache.airavata.registry.api.Registry;
import org.apache.airavata.registry.api.exception.RegistryException;
@@ -39,6 +32,11 @@ import org.apache.airavata.xbaya.registr
import org.apache.airavata.xbaya.registrybrowser.model.ApplicationDeploymentDescriptionWrap;
import org.apache.airavata.xbaya.registrybrowser.model.ApplicationDeploymentDescriptions;
+import javax.swing.*;
+import javax.swing.tree.TreeNode;
+import java.util.Arrays;
+import java.util.List;
+
public class ApplicationDeploymentDescriptionsNode extends AbstractAiravataTreeNode {
private ApplicationDeploymentDescriptions applicationDeploymentDescriptions;
@@ -86,7 +84,7 @@ public class ApplicationDeploymentDescri
deleteApplicationDescription(tree);
return true;
} else if (action.equals(AddAction.ID)) {
- ApplicationDescriptionDialog applicationDescriptionDialog = new ApplicationDescriptionDialog(getRegistry());
+ ApplicationDescriptionDialog applicationDescriptionDialog = new ApplicationDescriptionDialog(getXBayaEngine());
applicationDescriptionDialog.open();
if (applicationDescriptionDialog.isApplicationDescCreated()) {
refresh();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java?rev=1196759&r1=1196758&r2=1196759&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java Wed Nov 2 18:51:34 2011
@@ -21,13 +21,6 @@
package org.apache.airavata.xbaya.registrybrowser.nodes;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.Icon;
-import javax.swing.JTree;
-import javax.swing.tree.TreeNode;
-
import org.apache.airavata.common.utils.SwingUtil;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.registry.api.Registry;
@@ -39,6 +32,11 @@ import org.apache.airavata.xbaya.registr
import org.apache.airavata.xbaya.registrybrowser.menu.RefreshAction;
import org.apache.airavata.xbaya.registrybrowser.model.HostDescriptions;
+import javax.swing.*;
+import javax.swing.tree.TreeNode;
+import java.util.Arrays;
+import java.util.List;
+
public class HostDescriptionsNode extends AbstractAiravataTreeNode {
private HostDescriptions hostDescriptions;
@@ -85,8 +83,8 @@ public class HostDescriptionsNode extend
deleteHostDescription(tree);
return true;
} else if (action.equals(AddAction.ID)) {
- HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getRegistry());
- hostDescriptionDialog.open();
+ HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getXBayaEngine());
+ //hostDescriptionDialog.open();
if (hostDescriptionDialog.isHostCreated()) {
refresh();
reloadTreeNode(tree, this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java?rev=1196759&r1=1196758&r2=1196759&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java Wed Nov 2 18:51:34 2011
@@ -21,30 +21,27 @@
package org.apache.airavata.xbaya.registrybrowser.nodes;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.Icon;
-import javax.swing.tree.TreeNode;
-
import org.apache.airavata.common.utils.SwingUtil;
import org.apache.airavata.registry.api.Registry;
+import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.registrybrowser.menu.AbstractBrowserActionItem;
import org.apache.airavata.xbaya.registrybrowser.menu.RefreshAction;
-import org.apache.airavata.xbaya.registrybrowser.model.ApplicationDeploymentDescriptions;
-import org.apache.airavata.xbaya.registrybrowser.model.GFacURLs;
-import org.apache.airavata.xbaya.registrybrowser.model.HostDescriptions;
-import org.apache.airavata.xbaya.registrybrowser.model.ServiceDescriptions;
-import org.apache.airavata.xbaya.registrybrowser.model.XBayaWorkflowExperiments;
-import org.apache.airavata.xbaya.registrybrowser.model.XBayaWorkflowTemplates;
+import org.apache.airavata.xbaya.registrybrowser.model.*;
+
+import javax.swing.*;
+import javax.swing.tree.TreeNode;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
public class RegistryNode extends AbstractAiravataTreeNode {
private Registry registry;
+ private XBayaEngine engine;
- public RegistryNode(Registry registry, TreeNode parent) {
+ public RegistryNode(XBayaEngine engine, TreeNode parent) {
super(parent);
- setRegistry(registry);
+ setRegistry(engine.getConfiguration().getJcrComponentRegistry().getRegistry());
+ this.engine=engine;
}
protected List<TreeNode> getChildren() {
@@ -112,4 +109,12 @@ public class RegistryNode extends Abstra
public String getActionDescription(AbstractBrowserActionItem action) {
return null;
}
+
+ public XBayaEngine getEngine() {
+ return engine;
+ }
+
+ public void setEngine(XBayaEngine engine) {
+ this.engine = engine;
+ }
}