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/07/05 17:59:32 UTC
svn commit: r1357708 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
registrybrowser/nodes/ServiceDescriptionsNode.java
ui/dialogs/descriptors/DescriptorEditorDialog.java
ui/menues/EditMenuItem.java
Author: samindaw
Date: Thu Jul 5 15:59:32 2012
New Revision: 1357708
URL: http://svn.apache.org/viewvc?rev=1357708&view=rev
Log:
remove app edit
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.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/menues/EditMenuItem.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java?rev=1357708&r1=1357707&r2=1357708&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java Thu Jul 5 15:59:32 2012
@@ -36,7 +36,7 @@ import org.apache.airavata.xbaya.ui.acti
import org.apache.airavata.xbaya.ui.actions.registry.browser.AddAction;
import org.apache.airavata.xbaya.ui.actions.registry.browser.DeleteAction;
import org.apache.airavata.xbaya.ui.actions.registry.browser.RefreshAction;
-import org.apache.airavata.xbaya.ui.dialogs.descriptors.ServiceDescriptionDialog;
+import org.apache.airavata.xbaya.ui.dialogs.descriptors.DeploymentDescriptionDialog;
public class ServiceDescriptionsNode extends AbstractAiravataTreeNode {
private ServiceDescriptions serviceDescriptions;
@@ -58,7 +58,7 @@ public class ServiceDescriptionsNode ext
@Override
public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return "Application Services";
+ return "Applications";
}
@Override
@@ -84,8 +84,10 @@ public class ServiceDescriptionsNode ext
deleteServiceDescription(tree);
return true;
} else if (action.equals(AddAction.ID)) {
- ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(getRegistry());
- serviceDescriptionDialog.open();
+ DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(getRegistry());
+ serviceDescriptionDialog.open();
+// ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(getRegistry());
+// serviceDescriptionDialog.open();
if (serviceDescriptionDialog.isServiceCreated()) {
refresh();
reloadTreeNode(tree, this);
@@ -96,8 +98,8 @@ public class ServiceDescriptionsNode ext
}
private void deleteServiceDescription(JTree tree) throws Exception {
- if (askQuestion("Service descriptions",
- "Are you sure that you want to remove all service descriptions in this registry?")) {
+ if (askQuestion("Applications",
+ "Are you sure that you want to remove all applications in this registry?")) {
AiravataRegistry registry = getRegistry();
List<ServiceDescription> descriptions = getServiceDescriptions().getDescriptions();
for (ServiceDescription descriptionWrap : descriptions) {
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=1357708&r1=1357707&r2=1357708&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 Thu Jul 5 15:59:32 2012
@@ -197,8 +197,10 @@ public class DescriptorEditorDialog exte
break;
case SERVICE:
ServiceDescription d = (ServiceDescription) getSelected();
- ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(getRegistry(),false,d);
- serviceDescriptionDialog.open();
+ DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(getRegistry(),false,d);
+ serviceDescriptionDialog.open();
+// ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(getRegistry(),false,d);
+// serviceDescriptionDialog.open();
if (serviceDescriptionDialog.isServiceCreated()) {
loadDescriptors();
}
@@ -226,8 +228,10 @@ public class DescriptorEditorDialog exte
}
break;
case SERVICE:
- ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(getRegistry());
- serviceDescriptionDialog.open();
+ DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(getRegistry());
+ serviceDescriptionDialog.open();
+// ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(getRegistry());
+// serviceDescriptionDialog.open();
if (serviceDescriptionDialog.isServiceCreated()){
loadDescriptors();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java?rev=1357708&r1=1357707&r2=1357708&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java Thu Jul 5 15:59:32 2012
@@ -93,7 +93,7 @@ public class EditMenuItem {
editMenu.add(editHostDescription);
editMenu.add(editServiceDescription);
- editMenu.add(editApplicationDescription);
+// editMenu.add(editApplicationDescription);
}
private JMenuItem createWorkflowDescriptionItem() {
@@ -142,7 +142,7 @@ public class EditMenuItem {
}
private JMenuItem createEditServiceDescription() {
- JMenuItem menuItem = new JMenuItem("Service Descriptions...");
+ JMenuItem menuItem = new JMenuItem("Applications...");
menuItem.addActionListener(new AbstractAction() {
public void actionPerformed(ActionEvent e) {
if (XBayaUtil.acquireJCRRegistry(engine)) {