airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject svn commit: r1429828 - /airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
Date Mon, 07 Jan 2013 14:52:07 GMT
Author: chathuri
Date: Mon Jan  7 14:52:06 2013
New Revision: 1429828

URL: http://svn.apache.org/viewvc?rev=1429828&view=rev
Log:
fixing AIRAVATA-700

Modified:
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java?rev=1429828&r1=1429827&r2=1429828&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
Mon Jan  7 14:52:06 2013
@@ -231,14 +231,14 @@ public class DescriptorEditorDialog exte
 				}
 	    		break;
 	    	case APPLICATION:
-	    		ApplicationDescription a = (ApplicationDescription) getSelected();
-	    		String[] s = dlist.get(a).split("\\$");
-	    		ApplicationDescriptionDialog aDescriptionDialog = new ApplicationDescriptionDialog(engine,false,a,s[1],s[0]);
-	    		aDescriptionDialog.setLocationRelativeTo(this.engine.getGUI().getFrame());
-	    		aDescriptionDialog.open();
-			if (aDescriptionDialog.isApplicationDescCreated()) {
-				loadDescriptors();
-			}
+                ApplicationDescription a = (ApplicationDescription) getSelected();
+                String[] s = dlist.get(a).split("\\$");
+                ApplicationDescriptionDialog aDescriptionDialog = new ApplicationDescriptionDialog(engine,
false, a, s[1], s[0]);
+                aDescriptionDialog.setLocationRelativeTo(this.engine.getGUI().getFrame());
+                aDescriptionDialog.open();
+                if (aDescriptionDialog.isApplicationDescCreated()) {
+                    loadDescriptors();
+                }
 			break;
     	}
 	}
@@ -277,7 +277,7 @@ public class DescriptorEditorDialog exte
 		return descriptorList.getModel().getElementAt(descriptorList.getSelectedIndex());
 	}
 	protected boolean askQuestion(String title, String question) {
-        return JOptionPane.showConfirmDialog(null, question, title, JOptionPane.YES_NO_OPTION)
== JOptionPane.YES_OPTION;
+        return JOptionPane.showConfirmDialog(this, question, title, JOptionPane.YES_NO_OPTION)
== JOptionPane.YES_OPTION;
     }
     private boolean deleteDescriptor() throws AiravataAPIInvocationException{
     	String title=null;
@@ -309,18 +309,21 @@ public class DescriptorEditorDialog exte
 	    	    	case HOST:
 	    	    		HostDescription h = (HostDescription) getSelected();
 	    	        	getRegistry().getApplicationManager().deleteHostDescription(h.getType().getHostName());
+                        loadDescriptors();
 	    	    		break;
 	    	    	case SERVICE:
 	    	        	ServiceDescription d = (ServiceDescription) getSelected();
 	    	        	getRegistry().getApplicationManager().deleteServiceDescription(d.getType().getName());
+                        loadDescriptors();
 	    	    		break;
 	    	    	case APPLICATION:
 	    	    		ApplicationDescription a = (ApplicationDescription) getSelected();
 	    	    		String[] s = dlist.get(a).split("\\$");
 	    	        	getRegistry().getApplicationManager().deleteApplicationDescription(s[0], s[1],
a.getType().getApplicationName().getStringValue());
-	    	    		break;
+	    	    		loadDescriptors();
+                        break;
             	}
-				loadDescriptors();
+//				loadDescriptors();
         }
         return true;
     }



Mime
View raw message