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 2011/12/14 22:10:54 UTC
svn commit: r1214469 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper:
ApplicationDescriptionDialog.java HostDescriptionDialog.java
Author: samindaw
Date: Wed Dec 14 21:10:54 2011
New Revision: 1214469
URL: http://svn.apache.org/viewvc?rev=1214469&view=rev
Log:
https://issues.apache.org/jira/browse/AIRAVATA-218
+ saving as globus host correctly
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
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=1214469&r1=1214468&r2=1214469&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 Dec 14 21:10:54 2011
@@ -105,7 +105,7 @@ public class ApplicationDescriptionDialo
while (true) {
boolean notFound = true;
for (ApplicationDeploymentDescription deploymentDescription : applicationDeploymentDescriptions) {
- if (deploymentDescription.getType().addNewApplicationName().getStringValue().equals(defaultName)) {
+ if (deploymentDescription.getType().getApplicationName().getStringValue().equals(defaultName)) {
notFound = false;
break;
}
@@ -354,8 +354,12 @@ public class ApplicationDescriptionDialo
}
public void setApplicationName(String applicationName) {
- ApplicationDeploymentDescriptionType.ApplicationName applicationName1 = getApplicationDescriptionType().addNewApplicationName();
- applicationName1.setStringValue(applicationName);
+// ApplicationDeploymentDescriptionType.ApplicationName applicationName1 = getApplicationDescriptionType().addNewApplicationName();
+// applicationName1.setStringValue(applicationName);
+ if (getApplicationDescriptionType().getApplicationName()==null){
+ getApplicationDescriptionType().addNewApplicationName();
+ }
+ getApplicationDescriptionType().getApplicationName().setStringValue(applicationName);
updateDialogStatus();
}
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=1214469&r1=1214468&r2=1214469&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 Dec 14 21:10:54 2011
@@ -25,6 +25,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.GlobusHostType;
+import org.apache.airavata.schemas.gfac.HostDescriptionType;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.gui.GridPanel;
import org.apache.airavata.xbaya.gui.XBayaDialog;
@@ -55,8 +56,6 @@ public class HostDescriptionDialog exten
private boolean hostCreated = false;
- private boolean isGlobusHostCreated = false;
-
private Registry registry;
/**
@@ -85,28 +84,28 @@ public class HostDescriptionDialog exten
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(gridFTP);
+ if(isGlobusHostType()) {
+ getHostDescription().getType().changeType(GlobusHostType.type);
+ setGlobusGateKeeperEPR(globusGateKeeperEPR);
+ setGridFTPEPR(gridFTP);
+ }else{
+ getHostDescription().getType().changeType(HostDescriptionType.type);
}
saveHostDescription();
hide();
}
+ private boolean isGlobusHostType() {
+ String globusGateKeeperEPR = this.globusGateKeeperTextField.getText();
+ String gridFTP = this.GridFTPTextField.getText();
+ return (!globusGateKeeperEPR.equals("") || !gridFTP.equals(""));
+ }
+
private void setGlobusGateKeeperEPR(String epr) {
- hostDescription.getType().changeType(GlobusHostType.type);
- ((GlobusHostType)hostDescription.getType()).addGlobusGateKeeperEndPoint(epr);
+ ((GlobusHostType)hostDescription.getType()).addGlobusGateKeeperEndPoint(epr);
}
private String[] getGlobusGateKeeperEPR(String epr) {
@@ -118,7 +117,6 @@ public class HostDescriptionDialog exten
}
private void setGridFTPEPR(String epr) {
- hostDescription.getType().changeType(GlobusHostType.type);
((GlobusHostType)hostDescription.getType()).addGridFTPEndPoint(epr);
}
@@ -240,17 +238,14 @@ public class HostDescriptionDialog exten
public HostDescription getHostDescription() {
if (hostDescription == null) {
- if (isGlobusHostCreated) {
- hostDescription = new HostDescription(GlobusHostType.type);
- } else {
- hostDescription = new HostDescription();
- }
+ hostDescription = new HostDescription(GlobusHostType.type);
}
return hostDescription;
}
public void saveHostDescription() {
- getRegistry().saveHostDescription(getHostDescription());
+ HostDescription desc = getHostDescription();
+ getRegistry().saveHostDescription(desc);
setHostCreated(true);
}