[jboss-svn-commits] JBL Code SVN: r29082 - in labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main: java/org/drools/eclipse/util and 1 other directories.

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

Author: KrisVerlaenen
Date: 2009-08-26 12:16:20 -0400 (Wed, 26 Aug 2009)
New Revision: 29082

Modified:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/DroolsDebugEventHandlerView.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/DroolsRuntimeManager.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/resources/org/drools/eclipse/wizard/project/RuleLauncherSample.java.template
Log:
 - fixing debug issue in Eclipse 3.5

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/DroolsDebugEventHandlerView.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/DroolsDebugEventHandlerView.java	2009-08-26 16:09:54 UTC (rev 29081)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/DroolsDebugEventHandlerView.java	2009-08-26 16:16:20 UTC (rev 29082)
@@ -8,6 +8,7 @@
 import org.eclipse.debug.core.model.IVariable;
 import org.eclipse.debug.internal.ui.VariablesViewModelPresentation;
 import org.eclipse.debug.internal.ui.contexts.DebugContextManager;
+import org.eclipse.debug.internal.ui.views.variables.VariablesView;
 import org.eclipse.debug.ui.AbstractDebugView;
 import org.eclipse.debug.ui.IDebugModelPresentation;
 import org.eclipse.debug.ui.IDebugUIConstants;
@@ -198,9 +199,15 @@
 	}
 	
     public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-        if (!isAvailable()) {
+    	if (!isAvailable()) {
             return;
         }
+    	// In Eclipse 3.5.x, an additional selection changed event with selection null is
+    	// generated when clicking on a process instance in the process instance view
+    	// replacing this null by the actual selected element in those cases
+        if (part instanceof VariablesView) {
+        	selection = ((VariablesView) part).getCurrentSelection();
+        }
         if (selection == null) {
             setViewerInput(null);
         } else if (selection instanceof IStructuredSelection) {

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/DroolsRuntimeManager.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/DroolsRuntimeManager.java	2009-08-26 16:09:54 UTC (rev 29081)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/DroolsRuntimeManager.java	2009-08-26 16:16:20 UTC (rev 29082)
@@ -43,12 +43,24 @@
         String pluginRootString = Platform.getInstallLocation().getURL().getPath() + "plugins/";
 	    File pluginRoot = new Path(pluginRootString).toFile();
 	    files = pluginRoot.listFiles();
+	    boolean found = false;
+	    // search for eclipse jdt 3.5.x jar
 	    for (int i = 0; i < files.length; i++) {
-	        if (files[i].getAbsolutePath().indexOf("org.eclipse.jdt.core_3.4") > -1) {
+	        if (files[i].getAbsolutePath().indexOf("org.eclipse.jdt.core_3.5") > -1) {
 	        	jars.add(files[i].getAbsolutePath());
+	        	found = true;
 	        	break;
 	        }
 	    }
+	    // if not found, search for eclipse jdt 3.4.x jar
+	    if (!found) {
+		    for (int i = 0; i < files.length; i++) {
+		        if (files[i].getAbsolutePath().indexOf("org.eclipse.jdt.core_3.4") > -1) {
+		        	jars.add(files[i].getAbsolutePath());
+		        	break;
+		        }
+		    }
+	    }
 	    // copy jars to specified location
 	    if (!location.endsWith(File.separator)) {
 	    	location = location + File.separator;

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/resources/org/drools/eclipse/wizard/project/RuleLauncherSample.java.template
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/resources/org/drools/eclipse/wizard/project/RuleLauncherSample.java.template	2009-08-26 16:09:54 UTC (rev 29081)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/resources/org/drools/eclipse/wizard/project/RuleLauncherSample.java.template	2009-08-26 16:16:20 UTC (rev 29082)
@@ -15,7 +15,7 @@
 /**
  * This is a sample class to launch a rule.
  */
-public class ProcessTest {
+public class DroolsTest {
 
 	public static final void main(String[] args) {
 		try {