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/10/28 12:24:54 UTC
svn commit: r1190234 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
appwrapper/ registrybrowser/model/ registrybrowser/nodes/
Author: lahiru
Date: Fri Oct 28 10:24:53 2011
New Revision: 1190234
URL: http://svn.apache.org/viewvc?rev=1190234&view=rev
Log:
changing xbaya according to new gfac schema.
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionAdvancedOptionDialog.java
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/ApplicationDescriptionRegistrationWindow.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/ServiceDescriptionDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameter.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/ParameterNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterValueNode.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionAdvancedOptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionAdvancedOptionDialog.java?rev=1190234&r1=1190233&r2=1190234&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionAdvancedOptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionAdvancedOptionDialog.java Fri Oct 28 10:24:53 2011
@@ -30,7 +30,7 @@ import javax.swing.table.DefaultTableMod
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.registry.api.Registry;
-import org.apache.airavata.schemas.gfac.ShellApplicationDeploymentType;
+import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
public class ApplicationDescriptionAdvancedOptionDialog extends JDialog {
private static final long serialVersionUID = 3920479739097405014L;
@@ -409,12 +409,12 @@ public class ApplicationDescriptionAdvan
addNewRowIfLastIsNotEmpty();
}
- public ApplicationDeploymentDescription getShellApplicationDescription() {
+ public ApplicationDeploymentDescription getApplicationDescription() {
return shellApplicationDescription;
}
- public ShellApplicationDeploymentType getShellApplicationDescriptionType() {
- return (ShellApplicationDeploymentType)shellApplicationDescription.getType();
+ public ApplicationDeploymentDescriptionType getShellApplicationDescriptionType() {
+ return (ApplicationDeploymentDescriptionType)shellApplicationDescription.getType();
}
public void setShellApplicationDescription(ApplicationDeploymentDescription shellApplicationDescription) {
@@ -432,50 +432,50 @@ public class ApplicationDescriptionAdvan
}
private void saveApplicationDescriptionAdvancedOptions() {
- getShellApplicationDescriptionType().setWorkingDir(txtWorkingDir.getText());
- getShellApplicationDescriptionType().setInputDir(txtInputDir.getText());
- getShellApplicationDescriptionType().setOutputDir(txtOutputDir.getText());
- getShellApplicationDescriptionType().setStdIn(txtSTDIN.getText());
- getShellApplicationDescriptionType().setStdOut(txtSTDOUT.getText());
- getShellApplicationDescriptionType().setStdErr(txtSTDERR.getText());
-
- getShellApplicationDescriptionType().setEnv(ShellApplicationDeploymentType.Factory.newInstance().getEnv());
- for (int i = 0; i < defaultTableModel.getRowCount(); i++) {
- String varName = (String) defaultTableModel.getValueAt(i, 0);
- if (varName != null && !varName.equals("")) {
- String varValue = (String) defaultTableModel.getValueAt(i, 1);
- getShellApplicationDescriptionType().getEnv().addNewEntry().setKey(varName);
- getShellApplicationDescriptionType().getEnv().addNewEntry().setValue(varValue);
- }
- }
+ getShellApplicationDescriptionType().setStaticWorkingDirectory(txtWorkingDir.getText());
+ getShellApplicationDescriptionType().setInputDataDirectory(txtInputDir.getText());
+ getShellApplicationDescriptionType().setOutputDataDirectory(txtOutputDir.getText());
+ getShellApplicationDescriptionType().setStandardInput(txtSTDIN.getText());
+ getShellApplicationDescriptionType().setStandardOutput(txtSTDOUT.getText());
+ getShellApplicationDescriptionType().setStandardError(txtSTDERR.getText());
+
+// getShellApplicationDescriptionType().setEnv(Apll.Factory.newInstance().getEnv());
+// for (int i = 0; i < defaultTableModel.getRowCount(); i++) {
+// String varName = (String) defaultTableModel.getValueAt(i, 0);
+// if (varName != null && !varName.equals("")) {
+// String varValue = (String) defaultTableModel.getValueAt(i, 1);
+// getShellApplicationDescriptionType().getEnv().addNewEntry().setKey(varName);
+// getShellApplicationDescriptionType().getEnv().addNewEntry().setValue(varValue);
+// }
+// }
}
private void loadApplicationDescriptionAdvancedOptions() {
- txtWorkingDir.setText(getShellApplicationDescriptionType().getWorkingDir());
- txtInputDir.setText(getShellApplicationDescriptionType().getInputDir());
- txtOutputDir.setText(getShellApplicationDescriptionType().getOutputDir());
- txtSTDIN.setText(getShellApplicationDescriptionType().getStdIn());
- txtSTDOUT.setText(getShellApplicationDescriptionType().getStdOut());
- txtSTDERR.setText(getShellApplicationDescriptionType().getStdErr());
+ txtWorkingDir.setText(getShellApplicationDescriptionType().getScratchWorkingDirectory());
+ txtInputDir.setText(getShellApplicationDescriptionType().getInputDataDirectory());
+ txtOutputDir.setText(getShellApplicationDescriptionType().getOutputDataDirectory());
+ txtSTDIN.setText(getShellApplicationDescriptionType().getStandardInput());
+ txtSTDOUT.setText(getShellApplicationDescriptionType().getStandardOutput());
+ txtSTDERR.setText(getShellApplicationDescriptionType().getStandardError());
tableModelChanging = true;
-
- ShellApplicationDeploymentType.Env.Entry[] entry = getShellApplicationDescriptionType().getEnv().getEntryArray();
-
- Map<String, String> env = null;
- for (int i = 0; i < entry.length; i++) {
- String key = getShellApplicationDescriptionType().getEnv().getEntryArray(i).getKey();
- String value = getShellApplicationDescriptionType().getEnv().getEntryArray(i).getValue();
- env.put(key, value);
- }
-
- while (defaultTableModel.getRowCount() > 0) {
- defaultTableModel.removeRow(0);
- }
- if (env != null) {
- for (String varName : env.keySet()) {
- defaultTableModel.addRow(new String[] { varName, env.get(varName) });
- }
- }
+// todo handle other parameters previous sent in the Entry Now they are defined
+// ShellApplicationDeploymentType.Env.Entry[] entry = getShellApplicationDescriptionType().getEnv().getEntryArray();
+//
+// Map<String, String> env = null;
+// for (int i = 0; i < entry.length; i++) {
+// String key = getShellApplicationDescriptionType().getEnv().getEntryArray(i).getKey();
+// String value = getShellApplicationDescriptionType().getEnv().getEntryArray(i).getValue();
+// env.put(key, value);
+// }
+
+// while (defaultTableModel.getRowCount() > 0) {
+// defaultTableModel.removeRow(0);
+// }
+// if (env != null) {
+// for (String varName : env.keySet()) {
+// defaultTableModel.addRow(new String[] { varName, env.get(varName) });
+// }
+// }
addNewRowIfLastIsNotEmpty();
tableModelChanging = false;
}
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=1190234&r1=1190233&r2=1190234&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 Fri Oct 28 10:24:53 2011
@@ -32,7 +32,7 @@ import org.apache.airavata.commons.gfac.
import org.apache.airavata.commons.gfac.type.ServiceDescription;
import org.apache.airavata.registry.api.Registry;
import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.schemas.gfac.ShellApplicationDeploymentType;
+import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.xbaya.gui.XBayaLinkButton;
public class ApplicationDescriptionDialog extends JDialog implements ActionListener {
@@ -79,12 +79,11 @@ public class ApplicationDescriptionDialo
int i = 1;
String defaultName = baseName + i;
try {
- List<ApplicationDeploymentDescription> applicationDescriptions = getRegistry()
- .searchDeploymentDescription(getServiceName(), getHostName());
+ List<ApplicationDeploymentDescription> applicationDeploymentDescriptions = getRegistry().searchDeploymentDescription(getServiceName(), getHostName());
while (true) {
boolean notFound = true;
- for (ApplicationDeploymentDescription deploymentDescription : applicationDescriptions) {
- if (deploymentDescription.getType().getName().equals(defaultName)) {
+ for (ApplicationDeploymentDescription deploymentDescription : applicationDeploymentDescriptions) {
+ if (deploymentDescription.getType().addNewApplicationName().getStringValue().equals(defaultName)) {
notFound = false;
break;
}
@@ -434,10 +433,10 @@ public class ApplicationDescriptionDialo
try {
List<HostDescription> hostDescriptions = getRegistry().searchHostDescription(".*");
for (HostDescription hostDescription : hostDescriptions) {
- if (hostDescription.getType().getName() == null) {
- cmbHostName.addItem(hostDescription.getType().getAddress());
+ if (hostDescription.getType().getHostName() == null) {
+ cmbHostName.addItem(hostDescription.getType().getHostName());
} else {
- cmbHostName.addItem(hostDescription.getType().getName());
+ cmbHostName.addItem(hostDescription.getType().getHostName());
}
}
} catch (Exception e) {
@@ -447,40 +446,38 @@ public class ApplicationDescriptionDialo
}
public ApplicationDeploymentDescription getShellApplicationDescription() {
- if (shellApplicationDescription == null) {
- shellApplicationDescription = new ApplicationDeploymentDescription(ShellApplicationDeploymentType.type);
- }
return shellApplicationDescription;
}
- public ShellApplicationDeploymentType getShellApplicationDescriptionType() {
- return (ShellApplicationDeploymentType)getShellApplicationDescription().getType();
+ public ApplicationDeploymentDescriptionType getApplicationDescriptionType() {
+ return getShellApplicationDescription().getType();
}
public String getApplicationName() {
- return getShellApplicationDescriptionType().getName();
+ return getApplicationDescriptionType().getApplicationName().getStringValue();
}
public void setApplicationName(String applicationName) {
- getShellApplicationDescriptionType().setName(applicationName);
+ ApplicationDeploymentDescriptionType.ApplicationName applicationName1 = getApplicationDescriptionType().addNewApplicationName();
+ applicationName1.setStringValue(applicationName);
updateDialogStatus();
}
public String getExecutablePath() {
- return getShellApplicationDescriptionType().getExecutable();
+ return getApplicationDescriptionType().getExecutableLocation();
}
public void setExecutablePath(String executablePath) {
- getShellApplicationDescriptionType().setExecutable(executablePath);
+ getApplicationDescriptionType().setExecutableLocation(executablePath);
updateDialogStatus();
}
public String getTempDir() {
- return getShellApplicationDescriptionType().getTmpDir();
+ return getApplicationDescriptionType().getScratchWorkingDirectory();
}
public void setTempDir(String tempDir) {
- getShellApplicationDescriptionType().setTmpDir(tempDir);
+ getApplicationDescriptionType().setScratchWorkingDirectory(tempDir);
updateDialogStatus();
}
@@ -610,4 +607,5 @@ public class ApplicationDescriptionDialo
public void setRegistry(Registry registry) {
this.registry = registry;
}
+
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionRegistrationWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionRegistrationWindow.java?rev=1190234&r1=1190233&r2=1190234&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionRegistrationWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionRegistrationWindow.java Fri Oct 28 10:24:53 2011
@@ -29,10 +29,11 @@ import javax.swing.JCheckBox;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
+import com.amazonaws.services.importexport.model.JobType;
import org.apache.airavata.common.utils.NameValidator;
import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
-import org.apache.airavata.schemas.gfac.ShellApplicationDeploymentType;
+import org.apache.airavata.schemas.gfac.*;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.gui.GridPanel;
import org.apache.airavata.xbaya.gui.XBayaComboBox;
@@ -40,6 +41,7 @@ import org.apache.airavata.xbaya.gui.XBa
import org.apache.airavata.xbaya.gui.XBayaLabel;
import org.apache.airavata.xbaya.gui.XBayaTextField;
import org.ogce.schemas.gfac.beans.ApplicationBean;
+import org.ogce.schemas.gfac.documents.ApplicationDescriptionDocument;
public class ApplicationDescriptionRegistrationWindow {
private XBayaDialog dialog;
@@ -317,38 +319,32 @@ public class ApplicationDescriptionRegis
if (!this.procsCountTextField.getText().equals("")) {
pCount = new Integer(Integer.parseInt(this.procsCountTextField.getText()));
}
- ApplicationDeploymentDescription appDesc = new ApplicationDeploymentDescription(ShellApplicationDeploymentType.type);
-
- ShellApplicationDeploymentType shellApplicationDeployment = (ShellApplicationDeploymentType) appDesc.getType();
- shellApplicationDeployment.setName(StringUtil.trimSpaceInString(this.applicationNameTextField.getText()));
- shellApplicationDeployment.setExecutable(StringUtil.trimSpaceInString(this.executableTextField.getText()));
- shellApplicationDeployment
- .setWorkingDir(StringUtil.trimSpaceInString(this.workDirectoryTextField.getText()));
- shellApplicationDeployment.setTmpDir(StringUtil.trimSpaceInString(this.tempDirTextField.getText()));
-
- ShellApplicationDeploymentType.Env.Entry[] entries = shellApplicationDeployment.getEnv().getEntryArray();
-
- Map<String, String> env = null;
- for (int i = 0; i < entries.length; i++) {
- String key = shellApplicationDeployment.getEnv().getEntryArray(i).getKey();
- String value = shellApplicationDeployment.getEnv().getEntryArray(i).getValue();
- env.put(key, value);
+ ApplicationDeploymentDescription deploymentDescription = new ApplicationDeploymentDescription();
+ ApplicationDeploymentDescriptionType appDesc = deploymentDescription.getType();
+ ApplicationDeploymentDescriptionType.ApplicationName applicationName = appDesc.addNewApplicationName();
+ applicationName.setStringValue(StringUtil.trimSpaceInString(this.applicationNameTextField.getText()));
+ appDesc.setExecutableLocation(StringUtil.trimSpaceInString(this.executableTextField.getText()));
+ appDesc.setScratchWorkingDirectory(StringUtil.trimSpaceInString(this.tempDirTextField.getText()));
+ appDesc.setStaticWorkingDirectory(StringUtil.trimSpaceInString(this.workDirectoryTextField.getText()));
+ BatchApplicationDeploymentDescriptionType appDesc1 = (BatchApplicationDeploymentDescriptionType) appDesc;
+ // this.tmpDirTextField.getText is not yet set to any value.
+ // Don't know how the job type is setting Enum has three values
+ appDesc1.getJobType();
+ if(pCount != null){
+ appDesc1.setCpuCount(pCount);
}
-
- env.put("ProjectName", projectName);
- env.put("JobType", jobType);
- env.put("Queue", queue);
- env.put("HostName", hostName);
- if (maxWallTime != null) {
- env.put("MaxWallTime", maxWallTime.toString());
- }
- if (pCount != null) {
- env.put("Pcount", pCount.toString());
+ if(maxWallTime != null){
+ appDesc1.setMaxWallTime(maxWallTime);
}
+ ProjectAccountType projectAccountType = appDesc1.addNewProjectAccount();
+ projectAccountType.setProjectAccountNumber(projectName);
+
+ QueueType queueType = appDesc1.addNewQueue();
+ queueType.setQueueName(queue);
/*--- save to registry ---*/
this.engine.getConfiguration().getJcrComponentRegistry()
- .saveDeploymentDescription(projectName, hostName, appDesc);
+ .saveDeploymentDescription(projectName, hostName, deploymentDescription);
} catch (Exception e) {
e.printStackTrace();
this.hide();
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=1190234&r1=1190233&r2=1190234&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 Fri Oct 28 10:24:53 2011
@@ -181,20 +181,20 @@ public class HostDescriptionDialog exten
}
public String getHostId() {
- return getHostDescription().getType().getName();
+ return getHostDescription().getType().getHostName();
}
public void setHostId(String hostId) {
- getHostDescription().getType().setName(hostId);
+ getHostDescription().getType().setHostName(hostId);
updateDialogStatus();
}
public String getHostLocation() {
- return getHostDescription().getType().getAddress();
+ return getHostDescription().getType().getHostAddress();
}
public void setHostLocation(String hostLocation) {
- getHostDescription().getType().setAddress(hostLocation);
+ getHostDescription().getType().setHostAddress(hostLocation);
updateDialogStatus();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java?rev=1190234&r1=1190233&r2=1190234&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java Fri Oct 28 10:24:53 2011
@@ -41,9 +41,7 @@ import javax.swing.table.TableColumn;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
import org.apache.airavata.registry.api.Registry;
import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.schemas.gfac.DataType;
-import org.apache.airavata.schemas.gfac.Parameter;
-import org.apache.airavata.schemas.gfac.ServiceDescriptionType;
+import org.apache.airavata.schemas.gfac.*;
public class ServiceDescriptionDialog extends JDialog {
@@ -359,8 +357,8 @@ public class ServiceDescriptionDialog ex
}
public void saveServiceDescription() {
- List<Parameter> inputParameters=new ArrayList<Parameter>();
- List<Parameter> outputParameters=new ArrayList<Parameter>();
+ List<InputParameterType> inputParameters=new ArrayList<InputParameterType>();
+ List<OutputParameterType> outputParameters=new ArrayList<OutputParameterType>();
for(int i=0;i<defaultTableModel.getRowCount();i++){
Parameter parameter = Parameter.Factory.newInstance();
@@ -370,20 +368,19 @@ public class ServiceDescriptionDialog ex
.getValueAt(i, 2);
String parameterDescription = (String) defaultTableModel
.getValueAt(i, 3);
- parameter.setName(parameterName);
- parameter.setDescription(parameterDescription);
-
- parameter.addNewType().setType(org.apache.airavata.schemas.gfac.DataType.Enum.forString(parameterDataType.toString()));
+ parameter.setParameterName(parameterName);
+ parameter.setParameterDescription(parameterDescription);
+ //todo how to handle Enum
if (getIOStringList()[0].equals(defaultTableModel.getValueAt(i,
0))) {
- inputParameters.add(parameter);
+ inputParameters.add((InputParameterType)parameter);
} else {
- outputParameters.add(parameter);
+ outputParameters.add((OutputParameterType)parameter);
}
}
}
- getServiceDescriptionType().setInputParametersArray(inputParameters.toArray(new Parameter[]{}));
- getServiceDescriptionType().setOutputParametersArray(outputParameters.toArray(new Parameter[]{}));
+ (getServiceDescriptionType()).setInputParametersArray(inputParameters.toArray(new InputParameterType[]{}));
+ getServiceDescriptionType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[]{}));
getRegistry().saveServiceDescription(getServiceDescription());
setServiceCreated(true);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameter.java?rev=1190234&r1=1190233&r2=1190234&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameter.java Fri Oct 28 10:24:53 2011
@@ -1,7 +1,6 @@
package org.apache.airavata.xbaya.registrybrowser.model;
import org.apache.airavata.schemas.gfac.Parameter;
-import org.apache.airavata.schemas.gfac.ParameterType;
public class ServiceParameter {
@@ -30,15 +29,11 @@ public class ServiceParameter {
}
public String getName(){
- return getParameter().getName();
+ return getParameter().getParameterName();
}
public String getDescription(){
- return getParameter().getDescription();
- }
-
- public ParameterType getType(){
- return getParameter().getType();
+ return getParameter().getParameterDescription();
}
}
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=1190234&r1=1190233&r2=1190234&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 Fri Oct 28 10:24:53 2011
@@ -103,7 +103,7 @@ public abstract class AbstractAiravataTr
leaf, row, hasFocus);
if (nodeComponent instanceof JLabel) {
JLabel lbl = (JLabel) nodeComponent;
- lbl.setText(getCaption(selected, expanded, leaf, hasFocus));
+ lbl.setText( getCaption(selected, expanded, leaf, hasFocus));
lbl.setIcon(getIcon(selected, expanded, leaf, hasFocus));
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterNode.java?rev=1190234&r1=1190233&r2=1190234&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterNode.java Fri Oct 28 10:24:53 2011
@@ -30,7 +30,7 @@ public class ParameterNode extends Abstr
if (getParameter().getValue()!=null){
return getParameter().getName()+":"+getParameter().getValue().toString();
}else{
- return getParameter().getName()+":<"+getParameter().getType().getType().toString()+">";
+ return getParameter().getName();
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterValueNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterValueNode.java?rev=1190234&r1=1190233&r2=1190234&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterValueNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterValueNode.java Fri Oct 28 10:24:53 2011
@@ -27,7 +27,7 @@ public class ParameterValueNode extends
@Override
public String getCaption(boolean selected, boolean expanded, boolean leaf,
boolean hasFocus) {
- return getParameter().getName()+":"+getParameter().getType().toString();
+ return getParameter().getParameterName();
}
@Override