[jbosstools-commits] JBoss Tools SVN: r10762 - in workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools: b2j/wizard and 2 other directories.

Author: Grid.Qian Date: 2008-10-09 03:36:13 -0400 (Thu, 09 Oct 2008) New Revision: 10762 Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/BPMN2JPDL.java workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/GraphicalFileGenerator.java workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/TranslateHelper.java workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/wizard/B2JExportWizard.java workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/BPMNToUtil.java workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizard.java workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/GeneratedFileLocationPage.java Log: JBIDE-2842: fix some ui bugs Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/BPMN2JPDL.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/BPMN2JPDL.java 2008-10-09 06:41:40 UTC (rev 10761) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/BPMN2JPDL.java 2008-10-09 07:36:13 UTC (rev 10762) @@ -96,7 +96,7 @@ try { TranslateHelper.createFiles(fileLocation, bpmnFileName, strForProcessDefs, jpdlFileNames, - B2JMessages.Jpdl_Process_Definition_Name); + B2JMessages.Jpdl_Process_Definition_Name, false); } catch (Exception e) { errors.add(B2JMessages.Translate_Error_JpdlFile_CanNotWrite + e.getMessage()); Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/GraphicalFileGenerator.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/GraphicalFileGenerator.java 2008-10-09 06:41:40 UTC (rev 10761) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/GraphicalFileGenerator.java 2008-10-09 07:36:13 UTC (rev 10762) @@ -84,7 +84,7 @@ try { TranslateHelper.createFiles(fileLocation, bpmnFileName, strForGpdDefs, gpdFileNames, - B2JMessages.Gpd_Definition_Name); + B2JMessages.Gpd_Definition_Name, false); } catch (Exception e) { errors.add(B2JMessages.Translate_Error_GpdFile_CanNotWrite + e.getMessage()); Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/TranslateHelper.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/TranslateHelper.java 2008-10-09 06:41:40 UTC (rev 10761) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/TranslateHelper.java 2008-10-09 07:36:13 UTC (rev 10762) @@ -59,21 +59,21 @@ * create translated files from dom strings */ public static File[] createFiles(String parentFolder, String bpmnFileName, - String[] strsForGenerate, String[] fileFolders, String fileName) - throws IOException { + String[] strsForGenerate, String[] fileFolders, String fileName, + boolean isOverWrite) throws IOException { File jpdlFolder = BPMNToUtil.createFile(parentFolder, - B2JMessages.Jpdl_Suffix, null); - File diagramFolder = BPMNToUtil.createFile(jpdlFolder.getAbsolutePath(), - bpmnFileName, null); + B2JMessages.Jpdl_Suffix, null, isOverWrite); + File diagramFolder = BPMNToUtil.createFile( + jpdlFolder.getAbsolutePath(), bpmnFileName, null, isOverWrite); File[] files = new File[strsForGenerate.length]; File processFolder = null; int i = 0; for (String str : strsForGenerate) { - processFolder = BPMNToUtil.createFile(diagramFolder.getAbsolutePath(), - fileFolders[i], null); + processFolder = BPMNToUtil.createFile(diagramFolder + .getAbsolutePath(), fileFolders[i], null, isOverWrite); files[i] = BPMNToUtil.createFile(processFolder.getAbsolutePath(), - fileName, str); + fileName, str, isOverWrite); i++; } return files; @@ -126,7 +126,7 @@ return isOk; } - + /* * select the elements from process. These elements have no transitions sub * element or have transtions to end-state. @@ -135,18 +135,22 @@ List<Element> list = new ArrayList<Element>(); if (processRoot.element(B2JMessages.Jpdl_End_Element_Name) != null) { - Element endState = processRoot.element(B2JMessages.Jpdl_End_Element_Name); + Element endState = processRoot + .element(B2JMessages.Jpdl_End_Element_Name); for (Object ele : processRoot.elements()) { - Element subEle = ((Element) ele).element(B2JMessages.Jpdl_Transition_Element); + Element subEle = ((Element) ele) + .element(B2JMessages.Jpdl_Transition_Element); if (subEle != null - && endState.attributeValue(B2JMessages.Dom_Element_Name).equals( - subEle.attributeValue(B2JMessages.To))) { + && endState + .attributeValue(B2JMessages.Dom_Element_Name) + .equals(subEle.attributeValue(B2JMessages.To))) { list.add((Element) ele); } } } else { for (Object ele : processRoot.elements()) { - if (((Element) ele).element(B2JMessages.Jpdl_Transition_Element) == null) { + if (((Element) ele) + .element(B2JMessages.Jpdl_Transition_Element) == null) { list.add((Element) ele); } } @@ -201,7 +205,8 @@ String width, String height) { Element ele = DomXmlWriter.addElement(parentEle, name); DomXmlWriter.addAttribute(ele, B2JMessages.Width_Attribute_Name, width); - DomXmlWriter.addAttribute(ele, B2JMessages.Height_Attribute_Name, height); + DomXmlWriter.addAttribute(ele, B2JMessages.Height_Attribute_Name, + height); return ele; } Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/wizard/B2JExportWizard.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/wizard/B2JExportWizard.java 2008-10-09 06:41:40 UTC (rev 10761) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/wizard/B2JExportWizard.java 2008-10-09 07:36:13 UTC (rev 10762) @@ -36,7 +36,7 @@ private List<String> strForGpdList = new ArrayList<String>(); private List<String> generatedFoldersList = new ArrayList<String>(); - public void createGeneratedFile() { + public void createGeneratedFile(boolean isOverWrite) { String[] jpdlFolderNames = new String[this.generatedFoldersList.size()]; int i = 0; @@ -58,7 +58,7 @@ try { TranslateHelper.createFiles(location, bpmnFileName, strs, jpdlFolderNames, - B2JMessages.Jpdl_Process_Definition_Name); + B2JMessages.Jpdl_Process_Definition_Name, isOverWrite); } catch (Exception e) { BpmnToPlugin.getDefault().logError(e.getMessage()); } @@ -73,7 +73,7 @@ } try { TranslateHelper.createFiles(location, bpmnFileName, strs, - jpdlFolderNames, B2JMessages.Gpd_Definition_Name); + jpdlFolderNames, B2JMessages.Gpd_Definition_Name, isOverWrite); } catch (Exception e) { BpmnToPlugin.getDefault().logError(e.getMessage()); } Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/BPMNToUtil.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/BPMNToUtil.java 2008-10-09 06:41:40 UTC (rev 10761) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/BPMNToUtil.java 2008-10-09 07:36:13 UTC (rev 10762) @@ -50,14 +50,14 @@ * create a file */ public static File createFile(String parentFolder, String fileName, - String inputStr) throws IOException { + String inputStr, boolean isOverWrite) throws IOException { File child = new File(parentFolder, fileName); if (inputStr == null) { - if (!child.exists()) { + if (!child.exists() || isOverWrite) { child.mkdir(); } } else { - if (!child.exists()) { + if (!child.exists() || isOverWrite) { child.createNewFile(); } FileWriter childWriter = new FileWriter(child); @@ -143,8 +143,7 @@ /* * get bpmn pool id list from a dom document */ - public static Map<String, String> getPoolIDsFromDocument( - Document document) { + public static Map<String, String> getPoolIDsFromDocument(Document document) { Map<String, String> poolIDMap = new HashMap<String, String>(); Element diagram = document.getRootElement(); for (Object pool : diagram.elements(B2JMessages.Bpmn_Pool_Element_Name)) { @@ -157,28 +156,28 @@ } return poolIDMap; } - - + public static Composite createComposite(Composite parent, int numColumns) { Composite composite = new Composite(parent, SWT.NULL); - + GridLayout layout = new GridLayout(); layout.numColumns = numColumns; composite.setLayout(layout); composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); return composite; } - + @SuppressWarnings("unchecked") public static boolean checkSelectedResources(ISelection selectedResources) { boolean res = true; if (selectedResources instanceof IStructuredSelection - && !selectedResources.isEmpty()) { - IStructuredSelection ss = (IStructuredSelection)selectedResources; - for (Iterator it = ss.iterator(); it.hasNext(); ){ + && !selectedResources.isEmpty()) { + IStructuredSelection ss = (IStructuredSelection) selectedResources; + for (Iterator it = ss.iterator(); it.hasNext();) { Object o = it.next(); if (o instanceof IFile) { - if (!((IFile)o).getFileExtension().equalsIgnoreCase("bpmn")) { + if (!((IFile) o).getFileExtension() + .equalsIgnoreCase("bpmn")) { res = false; break; } Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizard.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizard.java 2008-10-09 06:41:40 UTC (rev 10761) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizard.java 2008-10-09 07:36:13 UTC (rev 10762) @@ -111,6 +111,7 @@ try { idMap = BPMNToUtil.getPoolIDsFromDocument(getDocument( bpmnFileParentPath, bpmnFileName)); + poolIdList.clear(); } catch (Exception e) { errorList.add(0, NLS.bind( B2JMessages.Translate_Error_File_CanNotRead, @@ -139,7 +140,8 @@ } public boolean performFinish() { - createGeneratedFile(); + + createGeneratedFile(locationPage.isOverWrite()); refreshWorkspace(); return true; } @@ -154,7 +156,7 @@ /* * write the generated strings to the files */ - public abstract void createGeneratedFile(); + public abstract void createGeneratedFile(boolean b); /* * get the path of the eclipse workspace container Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/GeneratedFileLocationPage.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/GeneratedFileLocationPage.java 2008-10-09 06:41:40 UTC (rev 10761) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/GeneratedFileLocationPage.java 2008-10-09 07:36:13 UTC (rev 10762) @@ -26,6 +26,8 @@ import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -46,7 +48,9 @@ private ISelection currentSelection; private Button button; private IWizard wizard; + private boolean isOverWrite; + protected GeneratedFileLocationPage(String pageName, String title, String description) { super(pageName); @@ -98,6 +102,12 @@ button .setText(B2JMessages.Bpmn_GeneratedFile_Location_WizardPage_CheckBox); button.setFont(parent.getFont()); + button.addSelectionListener(new SelectionListener(){ + public void widgetDefaultSelected(SelectionEvent arg0) { + } + public void widgetSelected(SelectionEvent arg0) { + isOverWrite = button.getSelection(); + }}); return button; } @@ -150,7 +160,16 @@ public void setSelection(ISelection currentSelection) { this.currentSelection = currentSelection; } + + public boolean isOverWrite() { + return isOverWrite; + } + + public void setOverWrite(boolean isOverWrite) { + this.isOverWrite = isOverWrite; + } + } class ProFilter extends ViewerFilter {