[jboss-svn-commits] JBL Code SVN: r29109 - labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/preferences.

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

Author: KrisVerlaenen
Date: 2009-08-28 08:59:34 -0400 (Fri, 28 Aug 2009)
New Revision: 29109

Modified:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/preferences/DroolsRuntimeDialog.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/preferences/DroolsRuntimesBlock.java
Log:
JBIDE-4522: Drools Installed Runtimes preference page allows the same names for runtimes
 - filtering out existing runtime names

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/preferences/DroolsRuntimeDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/preferences/DroolsRuntimeDialog.java	2009-08-28 11:59:11 UTC (rev 29108)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/preferences/DroolsRuntimeDialog.java	2009-08-28 12:59:34 UTC (rev 29109)
@@ -1,6 +1,7 @@
 package org.drools.eclipse.preferences;
 
 import java.io.File;
+import java.util.List;
 
 import org.drools.eclipse.util.DroolsRuntime;
 import org.drools.eclipse.util.DroolsRuntimeManager;
@@ -27,6 +28,8 @@
 	private DroolsRuntime runtime;
 	private Text nameText;
 	private Text pathText;
+	private List<DroolsRuntime> runtimes;
+	
 	private Listener textModifyListener = new Listener() {
         public void handleEvent(Event e) {
             boolean valid = validate();
@@ -34,9 +37,10 @@
         }
     };
     
-	public DroolsRuntimeDialog(Shell parent) {
+	public DroolsRuntimeDialog(Shell parent, List<DroolsRuntime> runtimes) {
 		super(parent);
         setBlockOnOpen(true);
+        this.runtimes = runtimes;
     }
     
     protected Control createDialogArea(Composite parent) {
@@ -124,6 +128,13 @@
 		if (name == null || "".equals(name.trim())) {
 			return false;
 		}
+		if (runtime == null || !name.equals(runtime.getName())) {
+			for (DroolsRuntime runtime: runtimes) {
+				if (name.equals(runtime.getName())) {
+					return false;
+				}
+			}
+		}
 		String location = pathText.getText();
 		if (location != null) {
 			File file = new File(location);

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/preferences/DroolsRuntimesBlock.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/preferences/DroolsRuntimesBlock.java	2009-08-28 11:59:11 UTC (rev 29108)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/preferences/DroolsRuntimesBlock.java	2009-08-28 12:59:34 UTC (rev 29109)
@@ -240,7 +240,7 @@
 	}
 	
 	private void addDroolsRuntime() {
-		DroolsRuntimeDialog dialog = new DroolsRuntimeDialog(getShell());
+		DroolsRuntimeDialog dialog = new DroolsRuntimeDialog(getShell(), droolsRuntimes);
 		if (dialog.open() == Window.OK) {
 			DroolsRuntime result = dialog.getResult();
 			if (result != null) {
@@ -258,7 +258,7 @@
 		if (runtime == null) {
 			return;
 		}
-		DroolsRuntimeDialog dialog = new DroolsRuntimeDialog(getShell());
+		DroolsRuntimeDialog dialog = new DroolsRuntimeDialog(getShell(), droolsRuntimes);
 		dialog.setDroolsRuntime(runtime);
 		if (dialog.open() == Window.OK) {
 			DroolsRuntime result = dialog.getResult();