[jbosstools-commits] JBoss Tools SVN: r32596 - in branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert: src/org/jboss/tools/jbpm/convert/b2j/translate and 1 other directories.
Author: Grid.Qian
Date: 2011-07-05 04:59:27 -0400 (Tue, 05 Jul 2011)
New Revision: 32596
Modified:
branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/.settings/attachedFile.properties
branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/BPMN2JPDL.java
branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java
Log:
JBIDE-8720: fix the NPE error when no export folder selected(to 3.2.1branch)
Modified:
branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/.settings/attachedFile.properties
===================================================================
---
branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/.settings/attachedFile.properties 2011-07-05
05:58:39 UTC (rev 32595)
+++
branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/.settings/attachedFile.properties 2011-07-05
08:59:27 UTC (rev 32596)
@@ -1,2 +1 @@
# index of importer -> set(imports)
-
Modified:
branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/BPMN2JPDL.java
===================================================================
---
branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/BPMN2JPDL.java 2011-07-05
05:58:39 UTC (rev 32595)
+++
branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/BPMN2JPDL.java 2011-07-05
08:59:27 UTC (rev 32596)
@@ -122,6 +122,7 @@
}
Element diagram = bpmnDocument.getRootElement();
+
if (this.poolIDList == null || this.poolIDList.size() == 0) {
for (Object pool : diagram
.elements(Constants.Bpmn_Pool_Element_Name)) {
Modified:
branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java
===================================================================
---
branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java 2011-07-05
05:58:39 UTC (rev 32595)
+++
branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java 2011-07-05
08:59:27 UTC (rev 32596)
@@ -72,8 +72,7 @@
public void addOtherAreas(Composite composite) {
button = new Button(composite, SWT.CHECK | SWT.NONE);
- button
- .setText(B2JMessages.Bpmn_GeneratedFile_Location_WizardPage_CheckBox);
+ button.setText(B2JMessages.Bpmn_GeneratedFile_Location_WizardPage_CheckBox);
button.setFont(composite.getFont());
button.addSelectionListener(new SelectionListener() {
public void widgetDefaultSelected(SelectionEvent arg0) {
@@ -105,7 +104,8 @@
}
public boolean isPageComplete() {
- if (viewer == null || viewer.getSelection() == null) {
+ if (viewer == null || viewer.getSelection() == null
+ || viewer.getSelection().isEmpty()) {
return false;
}
return true;