Author: Grid.Qian Date: 2008-12-29 05:01:09 -0500 (Mon, 29 Dec 2008) New Revision: 12834 Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnToWizard.java trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/ErrorMessagesPage.java trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java Log: JBIDE-3469: change the bpmn -> jpdl wizard page logic to support to generate jpdl files directly without any settings Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java 2008-12-29 09:38:08 UTC (rev 12833) +++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java 2008-12-29 10:01:09 UTC (rev 12834) @@ -168,6 +168,10 @@ setPageComplete(false); } } + + public boolean canFlipToNextPage() { + return isPageComplete(); + } public Map<String, String> getIdMap() { return idMap; Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnToWizard.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnToWizard.java 2008-12-29 09:38:08 UTC (rev 12833) +++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnToWizard.java 2008-12-29 10:01:09 UTC (rev 12834) @@ -52,6 +52,7 @@ // bpmn pool id:name map private Map<String, String> idMap; private boolean isOverWrite = true; + private boolean isDoTranslation = false; protected String bpmnFileName; protected String bpmnFileParentPath; @@ -134,8 +135,7 @@ public IWizardPage getNextPage(IWizardPage page) { if (page.getName().equals(B2JMessages.Bpmn_Pool_Choose_WizardPage_Name)) { errorList = translateBpmnToStrings(); - errorPage.setPageComplete(true); - + isDoTranslation = true; if (errorList.size() == 0) { return locationPage; } @@ -148,6 +148,9 @@ } public boolean performFinish() { + if(!isDoTranslation){ + translateBpmnToStrings(); + } createGeneratedFile(this.isOverWrite()); refreshWorkspace(); return true; Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/ErrorMessagesPage.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/ErrorMessagesPage.java 2008-12-29 09:38:08 UTC (rev 12833) +++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/ErrorMessagesPage.java 2008-12-29 10:01:09 UTC (rev 12834) @@ -56,5 +56,9 @@ public void setListViewer(TableViewer listViewer) { this.listViewer = listViewer; } + + public boolean isPageComplete() { + return true; + } } Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java 2008-12-29 09:38:08 UTC (rev 12833) +++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java 2008-12-29 10:01:09 UTC (rev 12834) @@ -105,7 +105,7 @@ } public boolean isPageComplete() { - if (viewer != null && viewer.getSelection() == null) { + if (viewer == null || viewer.getSelection() == null) { return false; } return true;