Return-Path: X-Original-To: apmail-incubator-airavata-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-airavata-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7602B9BD7 for ; Tue, 11 Oct 2011 14:19:16 +0000 (UTC) Received: (qmail 73230 invoked by uid 500); 11 Oct 2011 14:19:16 -0000 Delivered-To: apmail-incubator-airavata-commits-archive@incubator.apache.org Received: (qmail 73195 invoked by uid 500); 11 Oct 2011 14:19:16 -0000 Mailing-List: contact airavata-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: airavata-dev@incubator.apache.org Delivered-To: mailing list airavata-commits@incubator.apache.org Received: (qmail 73188 invoked by uid 99); 11 Oct 2011 14:19:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Oct 2011 14:19:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Oct 2011 14:19:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 35A7B23889DE; Tue, 11 Oct 2011 14:18:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1181802 [2/2] - in /incubator/airavata/trunk/modules: commons/registry-api/src/main/java/org/apache/airavata/registry/api/ commons/registry-api/src/main/java/org/apache/airavata/registry/api/exception/ commons/registry-api/src/main/java/or... Date: Tue, 11 Oct 2011 14:18:51 -0000 To: airavata-commits@incubator.apache.org From: lahiru@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111011141852.35A7B23889DE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/WorkflowMenu.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/WorkflowMenu.java?rev=1181802&r1=1181801&r2=1181802&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/WorkflowMenu.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/WorkflowMenu.java Tue Oct 11 14:18:50 2011 @@ -63,16 +63,10 @@ public class WorkflowMenu { private JMenuItem runJythonWorkflowItem; - private JMenuItem exitItem; - private JMenuItem launchDynamicWorkflowItem; private JMenuItem launchGridChemWorkflowItem; - private JMenuItem generateDataDrivenSubWorkflow; - - private JMenuItem partitionStreamflowItem; - private static final Logger logger = LoggerFactory.getLogger(WorkflowMenu.class); /** @@ -107,10 +101,6 @@ public class WorkflowMenu { this.launchDynamicWorkflowItem = createLaunchDynamicWorkflowItem(); this.launchGridChemWorkflowItem = createLaunchGridChemWorkflowItem(); - this.generateDataDrivenSubWorkflow = createGenerateDataDrivenSubWorkflow(); - this.partitionStreamflowItem = createPartitionStreamflow(); - this.exitItem = createExitItem(); - this.workflowMenu = new JMenu("Workflow"); this.workflowMenu.setMnemonic(KeyEvent.VK_W); @@ -129,63 +119,8 @@ public class WorkflowMenu { this.workflowMenu.add(this.launchDynamicWorkflowItem); this.workflowMenu.addSeparator(); this.workflowMenu.add(this.launchGridChemWorkflowItem); - this.workflowMenu.addSeparator(); - this.workflowMenu.add(this.generateDataDrivenSubWorkflow); - this.workflowMenu.addSeparator(); - this.workflowMenu.add(this.partitionStreamflowItem); - this.workflowMenu.addSeparator(); - this.workflowMenu.add(this.exitItem); - } - - /** - * @return - */ - private JMenuItem createPartitionStreamflow() { - JMenuItem menuItem = new JMenuItem("Partition Streamflow"); - menuItem.addActionListener(new AbstractAction() { - - @Override - public void actionPerformed(ActionEvent e) { - GraphCanvas canvas = WorkflowMenu.this.engine.getGUI().getGraphCanvas(); - try { - canvas.partition(); - } catch (XBayaException e1) { - WorkflowMenu.this.engine.getErrorWindow().error(e1); - } - } - }); - return menuItem; } - /** - * @return - */ - private JMenuItem createGenerateDataDrivenSubWorkflow() { - JMenuItem menuItem = new JMenuItem("Harvest Datadriven workflow"); - menuItem.setMnemonic(KeyEvent.VK_H); - menuItem.addActionListener(new AbstractAction() { - public void actionPerformed(ActionEvent e) { - QName dataType = null;// new QName(WSConstants.XSD_NS_URI, "string"); - - XBayaEngine engineRef = WorkflowMenu.this.engine; - String ns = JOptionPane.showInputDialog(null, "Namespace", "http://www.extreme.indiana.edu/lead/xsd");// "Namespace for the type", - // JOptionPane.QUESTION_MESSAGE); - String type = JOptionPane.showInputDialog(null, "Local name", "LEADFileIDArrayType");// "Type name", - // JOptionPane.QUESTION_MESSAGE); - if (ns == null || "".equals(ns)) { - dataType = new QName(WSConstants.XSD_NS_URI, type); - } else { - dataType = new QName(ns, type); - } - Workflow[] newWorkflows = new WorkflowHarvester().harvest(engineRef.getWorkflow(), dataType); - for (Workflow workflow : newWorkflows) { - GraphCanvas canvas = engineRef.getGUI().newGraphCanvas(true); - canvas.setWorkflow(workflow); - } - } - }); - return menuItem; - } private JMenuItem createNewWorkflowItem() { JMenuItem menuItem = new JMenuItem("New Workflow"); @@ -334,21 +269,4 @@ public class WorkflowMenu { // return item; // } - private JMenuItem createExitItem() { - JMenuItem menuItem = new JMenuItem("Exit"); - menuItem.setMnemonic(KeyEvent.VK_X); - menuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q, ActionEvent.CTRL_MASK)); - menuItem.addActionListener(new AbstractAction() { - public void actionPerformed(ActionEvent event) { - try { - WorkflowMenu.this.engine.dispose(); - } catch (XBayaException e) { - logger.error(e.getMessage(), e); - } finally { - WorkflowMenu.this.engine.getGUI().getFrame().dispose(); - } - } - }); - return menuItem; - } } \ No newline at end of file