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/12 18:22:31 UTC
svn commit: r1360751 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
registrybrowser/nodes/ ui/ ui/dialogs/descriptors/
Author: samindaw
Date: Thu Jul 12 16:22:30 2012
New Revision: 1360751
URL: http://svn.apache.org/viewvc?rev=1360751&view=rev
Log:
advance option update
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java?rev=1360751&r1=1360750&r2=1360751&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java Thu Jul 12 16:22:30 2012
@@ -59,7 +59,7 @@ public class ApplicationDeploymentDescri
@Override
public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return "Applications";
+ return "Deployments";
}
@Override
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java?rev=1360751&r1=1360750&r2=1360751&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java Thu Jul 12 16:22:30 2012
@@ -439,15 +439,19 @@ public class XBayaGUI implements EventLi
GraphCanvas graphCanvas = graphCanvases.get(index);
if (graphCanvas.isWorkflowChanged()){
int result = JOptionPane.showConfirmDialog(frame, "'"+graphCanvas.getWorkflow().getName()+"' has been modified. Save changes?", "Save Workflow", JOptionPane.YES_NO_CANCEL_OPTION);
- if (result==JOptionPane.YES_OPTION){
- graphFiler.saveWorkflow(graphCanvas);
- if (graphCanvas.isWorkflowChanged()){
- //if cancelled while trying to save
+ try {
+ if (result==JOptionPane.YES_OPTION){
+ graphFiler.saveWorkflow(graphCanvas);
+ if (graphCanvas.isWorkflowChanged()){
+ //if cancelled while trying to save
+ return;
+ }
+ }else if (result!=JOptionPane.NO_OPTION){
+ //if cancel clicked
return;
}
- }else if (result!=JOptionPane.NO_OPTION){
- //if cancel clicked
- return;
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
graphCanvases.remove(index);
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=1360751&r1=1360750&r2=1360751&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 Thu Jul 12 16:22:30 2012
@@ -138,9 +138,9 @@ public class ApplicationDescriptionHostA
});
XBayaLabel lbljobType = new XBayaLabel("Job Type",cmbJobType);
- XBayaLabel lblProjectAccountNumber = new XBayaLabel("Project Account Number",txtProjectAccountNumber);
+ XBayaLabel lblProjectAccountNumber = new XBayaLabel("Project Account Number *",txtProjectAccountNumber);
XBayaLabel lblProjectAccountDescription = new XBayaLabel("Project Account Description",txtProjectAccountDescription);
- XBayaLabel lblQueueType = new XBayaLabel("Queue Type",txtQueueType);
+ XBayaLabel lblQueueType = new XBayaLabel("Queue Type *",txtQueueType);
XBayaLabel lblMaxWallTime = new XBayaLabel("Max Wall Time",txtMaxWallTime);
lblCpuCount = new XBayaLabel("CPU Count",txtCpuCount);
lblProcessorPerNode = new XBayaLabel("Processor Per Node", txtProcessorsPerNode);
@@ -188,7 +188,7 @@ public class ApplicationDescriptionHostA
jobTypes.add(JobTypeType.OPEN_MP);
jobTypes.add(JobTypeType.MPI);
jobTypes.add(JobTypeType.SERIAL);
- jobTypes.add(JobTypeType.SINGLE);
+// jobTypes.add(JobTypeType.SINGLE);
}
return jobTypes;
}
@@ -281,18 +281,25 @@ public class ApplicationDescriptionHostA
return getGramApplicationDescriptionType().getProjectAccount();
}
-
+ private String getPropValue(int num){
+ if (num==0){
+ return "";
+ }else{
+ return String.valueOf(num);
+ }
+ }
+
private void loadApplicationDescriptionAdvancedOptions() {
GramApplicationDeploymentType gadType = getGramApplicationDescriptionType();
if (gadType.getJobType()!=null) {
cmbJobType.setSelectedItem(gadType
.getJobType().toString());
}
- txtMaxWallTime.setText(String.valueOf(gadType.getMaxWallTime()));
- txtCpuCount.setText(String.valueOf(gadType.getCpuCount()));
- txtProcessorsPerNode.setText(String.valueOf(gadType.getProcessorsPerNode()));
- txtMinMemory.setText(String.valueOf(gadType.getMinMemory()));
- txtMaxMemory.setText(String.valueOf(gadType.getMaxMemory()));
+ txtMaxWallTime.setText(getPropValue(gadType.getMaxWallTime()));
+ txtCpuCount.setText(getPropValue(gadType.getCpuCount()));
+ txtProcessorsPerNode.setText(getPropValue(gadType.getProcessorsPerNode()));
+ txtMinMemory.setText(getPropValue(gadType.getMinMemory()));
+ txtMaxMemory.setText(getPropValue(gadType.getMaxMemory()));
ProjectAccountType projectAccount = getProjectAccountType();
txtProjectAccountNumber.setText(projectAccount.getProjectAccountNumber()==null? "":projectAccount.getProjectAccountNumber());