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/10 00:35:35 UTC
svn commit: r1359434 - in /incubator/airavata/trunk/modules:
airavata-client/src/main/java/org/apache/airavata/client/impl/
xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/
Author: samindaw
Date: Mon Jul 9 22:35:34 2012
New Revision: 1359434
URL: http://svn.apache.org/viewvc?rev=1359434&view=rev
Log:
updates on labels and some refactoring
Modified:
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplatesNode.java
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java?rev=1359434&r1=1359433&r2=1359434&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java Mon Jul 9 22:35:34 2012
@@ -126,7 +126,7 @@ public class ExecutionManagerImpl implem
public DefaultExecutionContext createDefaultExecutionContext() throws AiravataAPIInvocationException {
DefaultExecutionContext ec = new DefaultExecutionContext();
ec.addNotifiable(new LoggingNotification());
- ec.setRegistryService(client.getRegistry());
+ ec.setRegistryService(getClient().getRegistry());
return ec;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java?rev=1359434&r1=1359433&r2=1359434&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java Mon Jul 9 22:35:34 2012
@@ -28,11 +28,13 @@ import javax.swing.Icon;
import javax.swing.JTree;
import javax.swing.tree.TreeNode;
+import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.xbaya.model.registrybrowser.XBayaWorkflowExperiment;
import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
public class XBayaWorkflowExperimentNode extends AbstractAiravataTreeNode {
private XBayaWorkflowExperiment experiment;
+ private String workflowExecutionName;
public XBayaWorkflowExperimentNode(XBayaWorkflowExperiment experiment, TreeNode parent) {
super(parent);
@@ -46,7 +48,17 @@ public class XBayaWorkflowExperimentNode
@Override
public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return getExperiment().getExperimentId();
+ if (workflowExecutionName==null) {
+ try {
+ workflowExecutionName = getRegistry().getWorkflowExecutionName(getExperiment().getExperimentId());
+ } catch (RegistryException e) {
+ e.printStackTrace();
+ }
+ if (workflowExecutionName==null){
+ workflowExecutionName="["+getExperiment().getExperimentId()+"]";
+ }
+ }
+ return workflowExecutionName;
}
@Override
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplatesNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplatesNode.java?rev=1359434&r1=1359433&r2=1359434&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplatesNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplatesNode.java Mon Jul 9 22:35:34 2012
@@ -49,7 +49,7 @@ public class XBayaWorkflowTemplatesNode
@Override
public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return "Workflow templates";
+ return "Workflow Templates";
}
@Override