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/05/17 20:04:49 UTC
svn commit: r1339755 - in
/incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
graph/gui/GraphCanvas.java gui/XBayaToolBar.java
Author: samindaw
Date: Thu May 17 18:04:49 2012
New Revision: 1339755
URL: http://svn.apache.org/viewvc?rev=1339755&view=rev
Log:
patching branch with parallel to trunk fix - rev 1339582
Modified:
incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java
incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java
Modified: incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java?rev=1339755&r1=1339754&r2=1339755&view=diff
==============================================================================
--- incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java (original)
+++ incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java Thu May 17 18:04:49 2012
@@ -235,6 +235,7 @@ public class GraphCanvas implements XBay
updateSize();
this.panel.repaint();
updateOriginalWorkflowElement();
+ executionModeChanged(engine.getConfiguration());
}
/**
Modified: incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java?rev=1339755&r1=1339754&r2=1339755&view=diff
==============================================================================
--- incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java (original)
+++ incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java Thu May 17 18:04:49 2012
@@ -279,8 +279,10 @@ public class XBayaToolBar implements XBa
tempToolbarButtons.putAll(toolbarButtons);
for (String groupId : groupIds) {
tempToolbarButtons.remove(groupId);
- List<ToolbarButton> buttons = toolbarButtons.get(groupId);
- addButtonsToToolbar(buttons);
+ if (toolbarButtons.containsKey(groupId) && toolbarButtons.get(groupId)!=null) {
+ List<ToolbarButton> buttons = toolbarButtons.get(groupId);
+ addButtonsToToolbar(buttons);
+ }
}
for (String groupId : tempToolbarButtons.keySet()) {
List<ToolbarButton> buttons = tempToolbarButtons.get(groupId);