airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1356802 - in /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya: registrybrowser/nodes/ ui/dialogs/descriptors/ ui/menues/
Date Tue, 03 Jul 2012 15:59:47 GMT
Author: samindaw
Date: Tue Jul  3 15:59:45 2012
New Revision: 1356802

URL: http://svn.apache.org/viewvc?rev=1356802&view=rev
Log:
https://issues.apache.org/jira/browse/AIRAVATA-509 : fix globus host data not showing when
editing host desc issue

Modified:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.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/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java?rev=1356802&r1=1356801&r2=1356802&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java
Tue Jul  3 15:59:45 2012
@@ -86,7 +86,7 @@ public class HostDescriptionNode extends
     }
     
 	private boolean editHostDescription(JTree tree) {
-		HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getXBayaEngine(),false,getHostDescription());
+		HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getXBayaEngine().getConfiguration().getJcrComponentRegistry().getRegistry(),false,getHostDescription());
 		hostDescriptionDialog.open();
 		if (hostDescriptionDialog.isHostCreated()) {
 		    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=1356802&r1=1356801&r2=1356802&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
Tue Jul  3 15:59:45 2012
@@ -84,7 +84,7 @@ public class HostDescriptionsNode extend
             deleteHostDescription(tree);
             return true;
         } else if (action.equals(AddAction.ID)) {
-            HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getXBayaEngine());
+            HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getXBayaEngine().getConfiguration().getJcrComponentRegistry().getRegistry());
             hostDescriptionDialog.open();
             if (hostDescriptionDialog.isHostCreated()) {
                 refresh();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java?rev=1356802&r1=1356801&r2=1356802&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java
Tue Jul  3 15:59:45 2012
@@ -41,21 +41,15 @@ import javax.swing.event.ListSelectionLi
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableModel;
-import javax.xml.namespace.QName;
 
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
-import org.apache.airavata.schemas.gfac.DataType;
-import org.apache.airavata.schemas.gfac.InputParameterType;
 import org.apache.airavata.schemas.gfac.NameValuePairType;
-import org.apache.airavata.schemas.gfac.OutputParameterType;
-import org.apache.airavata.schemas.gfac.ParameterType;
 import org.apache.airavata.xbaya.ui.widgets.GridPanel;
 import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
 import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
-import org.apache.xmlbeans.XmlCursor;
 
 public class ApplicationDescriptionAdvancedOptionDialog extends JDialog {
     private static final long serialVersionUID = 3920479739097405014L;
@@ -71,6 +65,7 @@ public class ApplicationDescriptionAdvan
     private JButton btnDeleteVariable;
     private JButton okButton;
     private AiravataRegistry registry;
+	private XBayaTextField txtWorkingDir;
 
     /**
      * Launch the application.
@@ -152,9 +147,11 @@ public class ApplicationDescriptionAdvan
         lblLocations.setFont(new Font("Tahoma", Font.BOLD, 11));
 
         txtOutputDir = new XBayaTextField();
-
         XBayaLabel lblOutputDirectory = new XBayaLabel("Output directory",txtOutputDir);
 
+        txtWorkingDir = new XBayaTextField();
+        XBayaLabel lblWorkingDir = new XBayaLabel("Working directory",txtWorkingDir);
+        
         JLabel lblProgramData = new JLabel("Program data");
         lblProgramData.setFont(new Font("Tahoma", Font.BOLD, 11));
 
@@ -232,6 +229,9 @@ public class ApplicationDescriptionAdvan
         leftPanel.add(lblOutputDirectory);
         leftPanel.add(txtOutputDir);
         leftPanel.add(lblProgramData);
+        leftPanel.add(txtWorkingDir);
+        leftPanel.add(lblWorkingDir);
+        
         leftPanel.add(new JLabel());
         leftPanel.add(lblStdin);
         leftPanel.add(txtSTDIN);
@@ -240,7 +240,7 @@ public class ApplicationDescriptionAdvan
         leftPanel.add(lblStderr);
         leftPanel.add(txtSTDERR);
         
-        SwingUtil.layoutToGrid(leftPanel.getSwingComponent(), 7, 2, SwingUtil.WEIGHT_NONE,
1);
+        SwingUtil.layoutToGrid(leftPanel.getSwingComponent(), 9, 2, SwingUtil.WEIGHT_NONE,
1);
         
         GridPanel rightPanel = new GridPanel();
         rightPanel.add(lblEnvironmentalVariables);

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java?rev=1356802&r1=1356801&r2=1356802&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java
Tue Jul  3 15:59:45 2012
@@ -352,7 +352,7 @@ public class ApplicationDescriptionDialo
             lnkNewHost.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
                     try {
-                        HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine);
+                        HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getRegistry());
                         hostDescriptionDialog.setLocationRelativeTo(getContentPane());
                         hostDescriptionDialog.open();
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java?rev=1356802&r1=1356801&r2=1356802&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java
Tue Jul  3 15:59:45 2012
@@ -48,7 +48,6 @@ public class ApplicationDescriptionHostA
     private XBayaTextField txtProjectAccountNumber;
     private XBayaTextField txtProjectAccountDescription;
     private XBayaTextField txtQueueType;
-    private XBayaTextField txtStaticWorkingDirectory;
     private XBayaTextField txtMaxWallTime = new XBayaTextField();
     private XBayaTextField txtMinMemory = new XBayaTextField();
     private XBayaTextField txtMaxMemory = new XBayaTextField();
@@ -115,7 +114,6 @@ public class ApplicationDescriptionHostA
 		txtProjectAccountNumber = new XBayaTextField();
 		txtProjectAccountDescription = new XBayaTextField();
 
-        txtStaticWorkingDirectory = new XBayaTextField();
         txtQueueType = new XBayaTextField();
         txtMaxWallTime = new XBayaTextField();
         txtMinMemory = new XBayaTextField();
@@ -130,7 +128,6 @@ public class ApplicationDescriptionHostA
 		XBayaLabel lbljobType = new XBayaLabel("Job Type",cmbJobType);
 		XBayaLabel lblProjectAccountNumber = new XBayaLabel("Project Account Number",txtProjectAccountNumber);
 		XBayaLabel lblProjectAccountDescription = new XBayaLabel("Project Account Description",txtProjectAccountDescription);
-        XBayaLabel lblStaticWorkingDirectory = new XBayaLabel("Static Working Directory",txtStaticWorkingDirectory);
         XBayaLabel lblQueueType = new XBayaLabel("Queue Type",txtQueueType);
 		XBayaLabel lblMaxWallTime = new XBayaLabel("Max Wall Time",txtMaxWallTime);
 		XBayaLabel lblCpuCount = new XBayaLabel("CPU Count",txtCpuCount);
@@ -144,8 +141,6 @@ public class ApplicationDescriptionHostA
 		panel.add(txtProjectAccountNumber);
 		panel.add(lblProjectAccountDescription);
 		panel.add(txtProjectAccountDescription);
-        panel.add(lblStaticWorkingDirectory);
-        panel.add(txtStaticWorkingDirectory);
 		panel.add(lblQueueType);
 		panel.add(txtQueueType);
         panel.add(lblMaxWallTime);
@@ -161,7 +156,7 @@ public class ApplicationDescriptionHostA
 		panel.getSwingComponent().setBorder(BorderFactory.createEtchedBorder());
         buttonPane.getSwingComponent().setBorder(BorderFactory.createEtchedBorder());
 
-        SwingUtil.layoutToGrid(panel.getSwingComponent(), 10, 2, SwingUtil.WEIGHT_NONE, 1);
+        SwingUtil.layoutToGrid(panel.getSwingComponent(), 9, 2, SwingUtil.WEIGHT_NONE, 1);
         
         buttonPane.add(okButton);
         buttonPane.add(cancelButton);
@@ -236,10 +231,6 @@ public class ApplicationDescriptionHostA
 			getGramApplicationDescriptionType().setProcessorsPerNode(
 					Integer.parseInt(txtProcessorsPerNode.getText()));
 		}
-        if (isValueNotEmpty(txtStaticWorkingDirectory.getText())) {
-            getGramApplicationDescriptionType().setStaticWorkingDirectory(
-                    txtStaticWorkingDirectory.getText());
-        }
 		if (isValueNotEmpty(txtMinMemory.getText())) {
 			getGramApplicationDescriptionType().setMinMemory(
 					Integer.parseInt(txtMinMemory.getText()));
@@ -286,7 +277,6 @@ public class ApplicationDescriptionHostA
 					.getJobType().toString());
 		}
     	txtMaxWallTime.setText(String.valueOf(gadType.getMaxWallTime()));
-		txtStaticWorkingDirectory.setText(gadType.getStaticWorkingDirectory()==null? "":String.valueOf(gadType.getStaticWorkingDirectory()));
         txtCpuCount.setText(String.valueOf(gadType.getCpuCount()));
         txtProcessorsPerNode.setText(String.valueOf(gadType.getProcessorsPerNode()));
         txtMinMemory.setText(String.valueOf(gadType.getMinMemory()));

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java?rev=1356802&r1=1356801&r2=1356802&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
Tue Jul  3 15:59:45 2012
@@ -188,7 +188,7 @@ public class DescriptorEditorDialog exte
     	switch (descriptorType){
 	    	case HOST:
 	    		HostDescription h = (HostDescription) getSelected();
-	    		HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine,false,h);
+	    		HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getRegistry(),false,h);
 	    		hostDescriptionDialog.setLocationRelativeTo(this.engine.getGUI().getFrame());
 	    		hostDescriptionDialog.open();
 	    		if (hostDescriptionDialog.isHostCreated()) {
@@ -219,7 +219,7 @@ public class DescriptorEditorDialog exte
     private void newDescriptor() {
     	switch (descriptorType){
 	    	case HOST:
-	    		HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine);
+	    		HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getRegistry());
 	    		hostDescriptionDialog.open();
 	    		if (hostDescriptionDialog.isHostCreated()){
 	    			loadDescriptors();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java?rev=1356802&r1=1356801&r2=1356802&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
Tue Jul  3 15:59:45 2012
@@ -43,7 +43,6 @@ import org.apache.airavata.commons.gfac.
 import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.schemas.gfac.GlobusHostType;
 import org.apache.airavata.schemas.gfac.HostDescriptionType;
-import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.ui.widgets.GridPanel;
 import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
 import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
@@ -80,7 +79,7 @@ public class HostDescriptionDialog exten
     
     private HostDescription originalHostDescription;
     
-    private XBayaEngine engine;
+//    private XBayaEngine engine;
 
 	private JComboBox cmbResourceProtocol;
 
@@ -93,16 +92,15 @@ public class HostDescriptionDialog exten
 	private static final String REMOTE_PROTOCOL_STR_HADOOP="Hadoop";
 	
     
-    public HostDescriptionDialog(XBayaEngine engine) {
-    	this(engine,true,null);
+    public HostDescriptionDialog(AiravataRegistry registry) {
+    	this(registry,true,null);
     }
     
     /**
      * @param engine XBaya workflow engine
      */
-    public HostDescriptionDialog(XBayaEngine engine, boolean newHost, HostDescription originalHostDescription)
{
+    public HostDescriptionDialog(AiravataRegistry registry, boolean newHost, HostDescription
originalHostDescription) {
         setNewHost(newHost);
-        setEngine(engine);
         setOriginalHostDescription(originalHostDescription);
         addWindowListener(new WindowAdapter() {
             @Override
@@ -122,7 +120,7 @@ public class HostDescriptionDialog exten
 //				}
             }
         });
-        setRegistry(engine.getConfiguration().getJcrComponentRegistry().getRegistry());
+        setRegistry(registry);
         initGUI();
     }
 
@@ -283,15 +281,16 @@ public class HostDescriptionDialog exten
 
 	private GridPanel createGlobusRemoteProtocolPanel() {
 		GridPanel globusPanel = new GridPanel();
-        this.GridFTPTextField = new XBayaTextField();
-        this.globusGateKeeperTextField = new XBayaTextField();
-        globusGateKeeperLabel = new XBayaLabel("GRAM Endpoint", this.globusGateKeeperTextField);
       
-        gridFTPLabel = new XBayaLabel("Grid FTP Endpoint", this.GridFTPTextField);
+        if (GridFTPTextField==null) {
+			this.GridFTPTextField = new XBayaTextField();
+			this.globusGateKeeperTextField = new XBayaTextField();
+			globusGateKeeperLabel = new XBayaLabel("GRAM Endpoint", this.globusGateKeeperTextField);
       
+	        gridFTPLabel = new XBayaLabel("Grid FTP Endpoint", this.GridFTPTextField);
+		}
         globusPanel.add(globusGateKeeperLabel);
         globusPanel.add(globusGateKeeperTextField);
         globusPanel.add(gridFTPLabel);
         globusPanel.add(GridFTPTextField);
-//        globusPanel.getContentPanel().setBorder(BorderFactory.createEtchedBorder());
         SwingUtil.layoutToGrid(globusPanel.getSwingComponent(), 2, 2, SwingUtil.WEIGHT_NONE,
1);
         return globusPanel;
 	}
@@ -405,7 +404,7 @@ public class HostDescriptionDialog exten
 			getRegistry().saveHostDescription(desc);
 			setHostCreated(true);
 		} catch (RegistryException e) {
-			getEngine().getGUI().getErrorWindow().error(e);
+			setError(e.getLocalizedMessage());
 		}
     }
 
@@ -452,11 +451,11 @@ public class HostDescriptionDialog exten
 		this.originalHostDescription = originalHostDescription;
 	}
 
-	public XBayaEngine getEngine() {
-		return engine;
-	}
-
-	public void setEngine(XBayaEngine engine) {
-		this.engine = engine;
-	}
+//	public XBayaEngine getEngine() {
+//		return engine;
+//	}
+//
+//	public void setEngine(XBayaEngine engine) {
+//		this.engine = engine;
+//	}
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java?rev=1356802&r1=1356801&r2=1356802&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
Tue Jul  3 15:59:45 2012
@@ -47,8 +47,8 @@ import org.apache.airavata.xbaya.core.id
 import org.apache.airavata.xbaya.registry.RegistryAccesser;
 import org.apache.airavata.xbaya.ui.dialogs.component.URLRegistryWindow;
 import org.apache.airavata.xbaya.ui.dialogs.descriptors.ApplicationDescriptionDialog;
+import org.apache.airavata.xbaya.ui.dialogs.descriptors.DeploymentDescriptionDialog;
 import org.apache.airavata.xbaya.ui.dialogs.descriptors.HostDescriptionDialog;
-import org.apache.airavata.xbaya.ui.dialogs.descriptors.ServiceDescriptionDialog;
 import org.apache.airavata.xbaya.ui.experiment.RegistryLoaderWindow;
 import org.apache.airavata.xbaya.ui.graph.GraphCanvas;
 import org.apache.airavata.xbaya.ui.widgets.ToolbarButton;
@@ -197,10 +197,11 @@ public class XBayaMenuItem implements XB
 //	        
 //        xbayaMenuItem.add(newMenu);
         xbayaMenuItem.add(newWorkflowTabItem);
+//        xbayaMenuItem.add(this.registerServiceDesc);
         xbayaMenuItem.add(registerHostDesc);
         xbayaMenuItem.add(registerApplicationDesc);
         xbayaMenuItem.add(this.openWorkflowItem);
-        
+
         xbayaMenuItem.addSeparator();
         
         xbayaMenuItem.add(clearWorkflowItem);
@@ -309,10 +310,12 @@ public class XBayaMenuItem implements XB
             public void actionPerformed(ActionEvent e) {
                 if (XBayaUtil.acquireJCRRegistry(engine)) {
                     try {
-                        ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(
-                                engine.getConfiguration().getJcrComponentRegistry()
-                                        .getRegistry());
-                        serviceDescriptionDialog.open();
+//                    	DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getRegistry());
+//                    	serviceDescriptionDialog.open();
+//                        ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(
+//                                engine.getConfiguration().getJcrComponentRegistry()
+//                                        .getRegistry());
+//                        serviceDescriptionDialog.open();
                     } catch (Exception e1) {
                         engine.getGUI().getErrorWindow().error(e1);
                     }
@@ -354,7 +357,7 @@ public class XBayaMenuItem implements XB
                 if (XBayaUtil.acquireJCRRegistry(engine)) {
                     try {
                         HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(
-                                engine);
+                        		engine.getConfiguration().getJcrComponentRegistry().getRegistry());
                         hostDescriptionDialog.open();
                     } catch (Exception e1) {
                         engine.getGUI().getErrorWindow().error(e1);



Mime
View raw message