[jbosstools-commits] JBoss Tools SVN: r24101 - in branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl: wizard and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: koen.aers at jboss.com
Date: 2010-08-12 09:55:36 -0400 (Thu, 12 Aug 2010)
New Revision: 24101

Modified:
   branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/resource/SimpleProcessTest.java.template
   branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessProjectWizard.java
Log:
JBIDE-6651

Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/resource/SimpleProcessTest.java.template
===================================================================
--- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/resource/SimpleProcessTest.java.template	2010-08-12 13:09:12 UTC (rev 24100)
+++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/resource/SimpleProcessTest.java.template	2010-08-12 13:55:36 UTC (rev 24101)
@@ -10,7 +10,7 @@
 	public void testSimpleProcess() throws Exception {
 
 		// Extract a process definition from the processdefinition.xml file.
-		ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("simple/processdefinition.xml");
+		ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("simple.jpdl.xml");
 		assertNotNull("Definition should not be null", processDefinition);
 
 		// Create an instance of the process definition.

Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessProjectWizard.java
===================================================================
--- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessProjectWizard.java	2010-08-12 13:09:12 UTC (rev 24100)
+++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessProjectWizard.java	2010-08-12 13:55:36 UTC (rev 24101)
@@ -264,7 +264,7 @@
 //		if (!processesFolder.exists()) {
 //			processesFolder.create(true, true, null);
 //		}
-		IFolder folder = javaProject.getProject().getFolder("src/main/jpdl/simple");
+		IFolder folder = javaProject.getProject().getFolder("src/main/jpdl");
 		if (!folder.exists()) {
 			folder.create(true, true, null);
 		}
@@ -279,11 +279,21 @@
 		File fromDir = new File(fromPath);
 		if (!fromDir.exists()) return;
 		File[] files = fromDir.listFiles();
+		IFile destination = null;
 		for (int i = 0; i < files.length; i++) {
-			copyJbpmResource(files[i], folder);
+			if ("processdefinition.xml".equals(files[i].getName())) {
+				destination = folder.getFile("simple.jpdl.xml");
+			} else if ("gpd.xml".equals(files[i].getName())) {
+				destination = folder.getFile(".simple.gpd.xml");
+			} else if ("processimage.jpg".equals(files[i].getName())) {
+				destination = folder.getFile("simple.jpg");
+			}
+			if (destination != null) {
+				destination.create(new FileInputStream(files[i]), true, null);
+			}
 		}
 	}
-
+	
 	private void createSimpleProcessTest(IJavaProject javaProject) throws JavaModelException, IOException {
 		String resourceName = "org/jbpm/gd/jpdl/resource/SimpleProcessTest.java.template";
 		IFolder folder = javaProject.getProject().getFolder("src/test/java");