Repository: airavata Updated Branches: refs/heads/master 395c7901c -> bd275a9a1
Removed all non support operations from the XBaya UI Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e01f24f7 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e01f24f7 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e01f24f7 Branch: refs/heads/master Commit: e01f24f7eba3b802df2ce878f49247364daea79a Parents: 2710f99 Author: shamrath <[email protected]> Authored: Wed Apr 15 17:45:25 2015 -0400 Committer: shamrath <[email protected]> Committed: Wed Apr 15 17:45:25 2015 -0400 ---------------------------------------------------------------------- .../airavata/xbaya/ui/menues/RunMenuItem.java | 45 +++++++------------- .../airavata/xbaya/ui/menues/XBayaMenu.java | 18 ++++---- 2 files changed, 25 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e01f24f7/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java index d2fd4ca..db5628a 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java @@ -53,36 +53,23 @@ import org.slf4j.LoggerFactory; public class RunMenuItem implements EventListener, XBayaExecutionModeListener{ private XBayaEngine engine; - private JMenu runMenu; - // private JMenuItem launchDynamicWorkflowItem; - private JMenuItem launchXBayaInterpreterItem; - private JMenuItem configMonitorItem; - private JMenuItem resumeMonitoringItem; - private JMenuItem pauseMonitoringItem; - private JMenuItem resetMonitoringItem; private static final Logger logger = LoggerFactory.getLogger(RunMenuItem.class); - private static final String EXECUTE_ACTIONS = "run_actions"; private static final String EXECUTE_MONITOR_ACTIONS = "monitor_actions"; private XBayaToolBar toolBar; - private ToolbarButton toolbarButtonRunWorkflow; - private ToolbarButton toolbarButtonPauseMonitor; - private ToolbarButton toolbarButtonResumeMonitor; - private JMenuItem stopWorkflowItem; - private ToolbarButton toolbarButtonStopWorkflow; /** @@ -115,11 +102,11 @@ public class RunMenuItem implements EventListener, XBayaExecutionModeListener{ private void createWorkflowMenu() { // this.launchDynamicWorkflowItem = createLaunchDynamicWorkflowItem(); createLaunchXBayaInterpreterItem(); - this.configMonitorItem = createConfigMonitoring(); - this.resumeMonitoringItem = createResumeMonitoring(); - this.pauseMonitoringItem = createPauseMonitoring(); - this.resetMonitoringItem = createResetMonitoring(); - stopWorkflowItem = createStopWorkflow(); +// this.configMonitorItem = createConfigMonitoring(); +// this.resumeMonitoringItem = createResumeMonitoring(); +// this.pauseMonitoringItem = createPauseMonitoring(); +// this.resetMonitoringItem = createResetMonitoring(); +// stopWorkflowItem = createStopWorkflow(); runMenu = new JMenu("Run"); runMenu.setMnemonic(KeyEvent.VK_R); @@ -128,14 +115,14 @@ public class RunMenuItem implements EventListener, XBayaExecutionModeListener{ // runMenu.add(launchDynamicWorkflowItem); runMenu.addSeparator(); - runMenu.add(stopWorkflowItem); +// runMenu.add(stopWorkflowItem); runMenu.addSeparator(); - runMenu.add(this.resumeMonitoringItem); - runMenu.add(this.pauseMonitoringItem); - runMenu.add(this.resetMonitoringItem); - runMenu.add(this.configMonitorItem); +// runMenu.add(this.resumeMonitoringItem); +// runMenu.add(this.pauseMonitoringItem); +// runMenu.add(this.resetMonitoringItem); +// runMenu.add(this.configMonitorItem); runMenu.addMenuListener(new MenuListener(){ @Override @@ -144,12 +131,12 @@ public class RunMenuItem implements EventListener, XBayaExecutionModeListener{ public void menuDeselected(MenuEvent e) {} @Override public void menuSelected(MenuEvent e) { - stopWorkflowItem.setEnabled(isWorkflowRunning()); +// stopWorkflowItem.setEnabled(isWorkflowRunning()); } }); setupMonitors(); - startStopButtonStateUpdater(); +// startStopButtonStateUpdater(); executionModeChanged(engine.getConfiguration()); } @@ -296,7 +283,7 @@ public class RunMenuItem implements EventListener, XBayaExecutionModeListener{ */ public void eventReceived(Event event) { Event.Type type = event.getType(); - if (type.equals(Event.Type.MONITOR_CONFIGURATION_CHANGED)) { +/* if (type.equals(Event.Type.MONITOR_CONFIGURATION_CHANGED)) { // MonitorConfiguration configuration = this.engine.getMonitor().getConfiguration(); // boolean valid = configuration.isValid(); boolean valid = true; @@ -313,7 +300,7 @@ public class RunMenuItem implements EventListener, XBayaExecutionModeListener{ resetMonitoringItem.setVisible(false); } toolbarButtonPauseMonitor.setEnabled(pauseMonitoringItem.isVisible()); - toolbarButtonResumeMonitor.setEnabled(resumeMonitoringItem.isVisible()); + toolbarButtonResumeMonitor.setEnabled(resumeMonitoringItem.isVisible());*/ } public XBayaToolBar getToolBar() { @@ -334,8 +321,8 @@ public class RunMenuItem implements EventListener, XBayaExecutionModeListener{ @Override public void executionModeChanged(XBayaConfiguration config) { - toolbarButtonRunWorkflow.setVisible(config.getXbayaExecutionMode()==XBayaExecutionMode.IDE); - toolbarButtonStopWorkflow.setVisible(config.getXbayaExecutionMode()==XBayaExecutionMode.IDE); +// toolbarButtonRunWorkflow.setVisible(config.getXbayaExecutionMode()==XBayaExecutionMode.IDE); +// toolbarButtonStopWorkflow.setVisible(config.getXbayaExecutionMode()==XBayaExecutionMode.IDE); } private void startStopButtonStateUpdater() { http://git-wip-us.apache.org/repos/asf/airavata/blob/e01f24f7/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java index 3eb385a..89f7b58 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java @@ -46,15 +46,15 @@ public class XBayaMenu implements XBayaComponent,XBayaExecutionModeListener{ private EditMenuItem editMenuItem; - private ViewMenuItem viewMenuItem; +// private ViewMenuItem viewMenuItem; private RunMenuItem runMenuItem; private RegistryMenuItem registryMenuItem; - private AmazonEC2MenuItem amazonEC2MenuItem; +// private AmazonEC2MenuItem amazonEC2MenuItem; - private ApplicationMenuItem applicationMenuItem; +// private ApplicationMenuItem applicationMenuItem; // private ToolsMenuItem toolsMenuItem; @@ -77,12 +77,12 @@ public class XBayaMenu implements XBayaComponent,XBayaExecutionModeListener{ private void initMenu() { xBayaMenuItem = new XBayaMenuItem(getEngine(),getToolBar()); editMenuItem = new EditMenuItem(getEngine()); - amazonEC2MenuItem = new AmazonEC2MenuItem(getEngine()); - viewMenuItem = new ViewMenuItem(getEngine()); +// amazonEC2MenuItem = new AmazonEC2MenuItem(getEngine()); +// viewMenuItem = new ViewMenuItem(getEngine()); runMenuItem = new RunMenuItem(getEngine(), getToolBar()); registryMenuItem = new RegistryMenuItem(getEngine(),getToolBar()); // toolsMenuItem = new ToolsMenuItem(getEngine()); - applicationMenuItem = new ApplicationMenuItem(getEngine()); +// applicationMenuItem = new ApplicationMenuItem(getEngine()); createMenuBar(); executionModeChanged(getEngine().getConfiguration()); } @@ -103,12 +103,12 @@ public class XBayaMenu implements XBayaComponent,XBayaExecutionModeListener{ this.menuBar = new JMenuBar(); menuBar.add(xBayaMenuItem.getMenu()); menuBar.add(editMenuItem.getMenu()); - menuBar.add(viewMenuItem.getMenu()); +// menuBar.add(viewMenuItem.getMenu()); menuBar.add(runMenuItem.getMenu()); // menuBar.add(toolsMenuItem.getMenu()); menuBar.add(registryMenuItem.getMenu()); - menuBar.add(amazonEC2MenuItem.getMenu()); - menuBar.add(applicationMenuItem.getMenu()); +// menuBar.add(amazonEC2MenuItem.getMenu()); +// menuBar.add(applicationMenuItem.getMenu()); // Space before Help this.menuBar.add(Box.createHorizontalGlue());
