[jboss-svn-commits] JBL Code SVN: r26245 - in labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools: wizards and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: john.graham at jboss.org
Date: 2009-04-24 11:55:23 -0400 (Fri, 24 Apr 2009)
New Revision: 26245

Modified:
   labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java
   labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorResourcesPage.java
Log:
JBRULES-2026

Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java	2009-04-24 15:20:15 UTC (rev 26244)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java	2009-04-24 15:55:23 UTC (rev 26245)
@@ -4,7 +4,6 @@
 import java.io.FileOutputStream;
 import java.io.PrintWriter;
 import java.net.URL;
-import java.rmi.server.UID;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -261,7 +260,8 @@
 		for (int i = 0; i < nodes.length; i++) {
 			String contents = getResourceContents(nodes[i]);
 			IPath path = new Path(Activator.getDefault().getStateLocation().toOSString() + 
-								  File.separator + new UID().toString());
+								  File.separator + "t" + //$NON-NLS-1$
+								  String.valueOf(System.currentTimeMillis()));
 			if (!path.toFile().mkdir()) {
 				throw new Exception("Could not create directory " + path.toOSString()); //$NON-NLS-1$
 			}
@@ -283,6 +283,8 @@
 			metaFile.deleteOnExit();
 			GuvnorMetadataUtils.writeGuvnorMetadataProps(metaFile, getGuvnorMetadataProps(nodes[i]));
 			res.add(metaFile.getAbsolutePath());
+			// Put at least a 1ms gap in generated dir names above
+			Thread.sleep(1, 0);
 		}
 		return res;
 	}

Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorResourcesPage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorResourcesPage.java	2009-04-24 15:20:15 UTC (rev 26244)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorResourcesPage.java	2009-04-24 15:55:23 UTC (rev 26245)
@@ -115,10 +115,23 @@
 			List<String> resources = new ArrayList<String>();
 			List<TreeObject> nodes = selection.toList();
 			for (TreeObject o:nodes) {
-				resources.add(o.getFullPath());
+				if (o.getNodeType() == TreeObject.Type.RESOURCE) {
+					resources.add(o.getFullPath());
+				}
 			}
 			GuvWizardModel model = ((IGuvnorWizard)super.getWizard()).getModel();
-			model.setResources(resources);
+			if (resources.size() > 0) {
+				model.setResources(resources);
+			} else {
+				model.setResources(null);
+			}
 		}
+		super.getWizard().getContainer().updateButtons();
 	}
+
+	@Override
+	public boolean canFlipToNextPage() {
+		GuvWizardModel model = ((IGuvnorWizard)super.getWizard()).getModel();
+		return model.getResources() != null && model.getResources().size() > 0;
+	}
 }