[jboss-svn-commits] JBL Code SVN: r24755 - in labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse: editors/outline and 1 other directory.

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

Author: KrisVerlaenen
Date: 2009-01-16 10:14:12 -0500 (Fri, 16 Jan 2009)
New Revision: 24755

Modified:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/DRLInfo.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/outline/RuleContentOutlinePage.java
Log:
 - fixed compile issue due to change in core

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/DRLInfo.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/DRLInfo.java	2009-01-16 11:49:18 UTC (rev 24754)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/DRLInfo.java	2009-01-16 15:14:12 UTC (rev 24755)
@@ -130,12 +130,7 @@
 
         public String getDialectName() {
             String dialectName = null;
-            for (AttributeDescr attribute: ruleDescr.getAttributes()) {
-                if ("dialect".equals(attribute.getName())) {
-                    dialectName = (String) attribute.getValue();
-                    break;
-                }
-            }
+            dialectName = ruleDescr.getAttributes().get("dialect").getValue();
             if (dialectName == null && packageDescr != null) {
                 for (AttributeDescr attribute: DRLInfo.this.packageDescr.getAttributes()) {
                     if ("dialect".equals(attribute.getName())) {

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/outline/RuleContentOutlinePage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/outline/RuleContentOutlinePage.java	2009-01-16 11:49:18 UTC (rev 24754)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/outline/RuleContentOutlinePage.java	2009-01-16 15:14:12 UTC (rev 24755)
@@ -1,7 +1,6 @@
 package org.drools.eclipse.editors.outline;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -41,7 +40,7 @@
 
     private AbstractRuleEditor editor;
     private RuleSet ruleSet = DroolsModelBuilder.createRuleSet();
-    private Map rules;
+    private Map<String, RuleDescr> rules;
 
     ///////////////////////////////////
     // Patterns that the parser uses
@@ -214,12 +213,11 @@
     	return ruleSet;
     }
     
-    private Map extractAttributes(RuleDescr ruleDescr) {
-        Map attributes = null;
+    private Map<String, String> extractAttributes(RuleDescr ruleDescr) {
+        Map<String, String> attributes = null;
         if (ruleDescr != null) {
-        	attributes = new HashMap();
-        	for (Iterator iterator = ruleDescr.getAttributes().iterator(); iterator.hasNext();) {
-        		AttributeDescr attribute = (AttributeDescr) iterator.next();
+        	attributes = new HashMap<String, String>();
+        	for (AttributeDescr attribute: ruleDescr.getAttributes().values()) {
         		if (attribute != null && attribute.getName() != null) {
         			attributes.put(attribute.getName(), attribute.getValue());
         		}
@@ -229,14 +227,13 @@
     }
 
     public void initRules() {
-    	rules = new HashMap();
+    	rules = new HashMap<String, RuleDescr>();
     	try {
     		DRLInfo drlInfo = DroolsEclipsePlugin.getDefault().parseResource(editor, true, false);
     		if (drlInfo != null) {
 		    	PackageDescr packageDescr = drlInfo.getPackageDescr();
 		    	if (packageDescr != null) {
-		    		for (Iterator iterator = packageDescr.getRules().iterator(); iterator.hasNext(); ) {
-		    			RuleDescr ruleDescr = (RuleDescr) iterator.next();
+		    		for (RuleDescr ruleDescr: packageDescr.getRules()) {
 		    			rules.put(ruleDescr.getName(), ruleDescr);
 		    		}	
 		    	}