[jboss-svn-commits] JBL Code SVN: r17423 - in labs/jbossrules/trunk/drools-analytics/src/main: java/org/drools/analytics/report/components and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Dec 28 09:24:17 EST 2007


Author: Rikkola
Date: 2007-12-28 09:24:17 -0500 (Fri, 28 Dec 2007)
New Revision: 17423

Modified:
   labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/AnalyticsComponentType.java
   labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/Consequence.java
   labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/Field.java
   labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/LiteralRestriction.java
   labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/OperatorDescr.java
   labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/Restriction.java
   labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/AnalyticsMessageBase.java
   labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/Cause.java
   labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/MissingNumberPattern.java
   labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/Redundancy.java
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/incoherence/Patterns.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/incoherence/Restrictions.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Notes.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Warnings.drl
Log:
Removed Java 5 code from rules.

Modified: labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/AnalyticsComponentType.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/AnalyticsComponentType.java	2007-12-28 11:45:45 UTC (rev 17422)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/AnalyticsComponentType.java	2007-12-28 14:24:17 UTC (rev 17423)
@@ -4,28 +4,34 @@
  * 
  * @author Toni Rikkola
  */
-public enum AnalyticsComponentType {
-	NOTHING,
-	CLASS, 
-	FIELD, 
-	RULE, 
-	CONSTRAINT, 
-	VARIABLE, 
-	PATTERN, 
-	PATTERN_POSSIBILITY, 
-	RULE_POSSIBILITY,
-	RESTRICTION, 
-	OPERATOR, 
-	FIELD_CLASS_LINK, 
-	COLLECT, 
-	ACCUMULATE, 
-	FROM, 
-	EVAL, 
-	PREDICATE, 
-	METHOD_ACCESSOR, 
-	FIELD_ACCESSOR, 
-	FUNCTION_CALL, 
-	ACCESSOR, 
-	RULE_PACKAGE, 
-	CONSEQUENCE
+public class AnalyticsComponentType{
+	public static final AnalyticsComponentType NOTHING = new AnalyticsComponentType(0);
+	public static final AnalyticsComponentType CLASS = new AnalyticsComponentType(1);
+	public static final AnalyticsComponentType FIELD = new AnalyticsComponentType(2);
+	public static final AnalyticsComponentType RULE = new AnalyticsComponentType(3);
+	public static final AnalyticsComponentType CONSTRAINT = new AnalyticsComponentType(4);
+	public static final AnalyticsComponentType VARIABLE = new AnalyticsComponentType(5);
+	public static final AnalyticsComponentType PATTERN = new AnalyticsComponentType(6);
+	public static final AnalyticsComponentType PATTERN_POSSIBILITY = new AnalyticsComponentType(7);
+	public static final AnalyticsComponentType RULE_POSSIBILITY = new AnalyticsComponentType(8);
+	public static final AnalyticsComponentType RESTRICTION =new AnalyticsComponentType(9);
+	public static final AnalyticsComponentType OPERATOR = new AnalyticsComponentType(10);
+	public static final AnalyticsComponentType FIELD_CLASS_LINK = new AnalyticsComponentType(11);
+	public static final AnalyticsComponentType COLLECT = new AnalyticsComponentType(12);
+	public static final AnalyticsComponentType ACCUMULATE = new AnalyticsComponentType(13);
+	public static final AnalyticsComponentType FROM = new AnalyticsComponentType(14);
+	public static final AnalyticsComponentType EVAL = new AnalyticsComponentType(15);
+	public static final AnalyticsComponentType PREDICATE = new AnalyticsComponentType(16);
+	public static final AnalyticsComponentType METHOD_ACCESSOR = new AnalyticsComponentType(17);
+	public static final AnalyticsComponentType FIELD_ACCESSOR = new AnalyticsComponentType(18);
+	public static final AnalyticsComponentType FUNCTION_CALL = new AnalyticsComponentType(19);
+	public static final AnalyticsComponentType ACCESSOR = new AnalyticsComponentType(20);
+	public static final AnalyticsComponentType RULE_PACKAGE = new AnalyticsComponentType(21);
+	public static final AnalyticsComponentType CONSEQUENCE = new AnalyticsComponentType(22);
+
+	private final int index;
+
+	private AnalyticsComponentType(int i) {
+		index = i;
+	}
 }

Modified: labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/Consequence.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/Consequence.java	2007-12-28 11:45:45 UTC (rev 17422)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/Consequence.java	2007-12-28 14:24:17 UTC (rev 17423)
@@ -2,11 +2,17 @@
 
 import org.drools.analytics.report.components.Cause;
 
+public interface Consequence extends Cause {
 
-public interface Consequence extends Cause{
+	public static class ConsequenceType {
 
-	public static enum ConsequenceType {
-		TEXT
+		public static final ConsequenceType TEXT = new ConsequenceType(0);
+
+		private final int index;
+
+		private ConsequenceType(int i) {
+			index = i;
+		}
 	}
 
 	public int getId();

Modified: labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/Field.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/Field.java	2007-12-28 11:45:45 UTC (rev 17422)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/Field.java	2007-12-28 14:24:17 UTC (rev 17423)
@@ -8,18 +8,23 @@
  */
 public class Field extends AnalyticsComponent implements Cause {
 
-	public static enum FieldType {
-		BOOLEAN("boolean"), STRING("String"), INT("int"), DOUBLE("double"), DATE(
-				"Date"), VARIABLE("Variable"), OBJECT("Object");
+	public static class FieldType {
+		public static final FieldType BOOLEAN = new FieldType("boolean");
+		public static final FieldType STRING = new FieldType( "String");
+		public static final FieldType INT = new FieldType( "int");
+		public static final FieldType DOUBLE = new FieldType( "double");
+		public static final FieldType DATE = new FieldType( "Date");
+		public static final FieldType VARIABLE = new FieldType( "Variable");
+		public static final FieldType OBJECT = new FieldType( "Object");
 
-		private String string;
+		private final String string;
 
 		private FieldType(String string) {
 			this.string = string;
 		}
 
 		@Override
-		public String toString() {
+		public   String toString() {
 			return string;
 		}
 	}

Modified: labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/LiteralRestriction.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/LiteralRestriction.java	2007-12-28 11:45:45 UTC (rev 17422)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/LiteralRestriction.java	2007-12-28 14:24:17 UTC (rev 17423)
@@ -47,10 +47,10 @@
 							+ restriction.getValueType() + " was compared to "
 							+ valueType);
 		}
-		switch (valueType) {
-		case DATE:
+
+		if (valueType == Field.FieldType.DATE) {
 			return dateValue.compareTo(restriction.getDateValue());
-		case DOUBLE:
+		} else if (valueType == Field.FieldType.DOUBLE) {
 			if (doubleValue > restriction.getDoubleValue()) {
 				return 1;
 			} else if (doubleValue < restriction.getDoubleValue()) {
@@ -58,7 +58,7 @@
 			} else {
 				return 0;
 			}
-		case INT:
+		} else if (valueType == Field.FieldType.INT) {
 			if (intValue > restriction.getIntValue()) {
 				return 1;
 			} else if (intValue < restriction.getIntValue()) {
@@ -66,30 +66,25 @@
 			} else {
 				return 0;
 			}
-		case STRING:
+		} else if (valueType == Field.FieldType.STRING) {
 			return stringValue.compareTo(restriction.getValueAsString());
-		default:
-			throw new DataFormatException(
-					"Value types did not match. Value type "
-							+ restriction.getValueType() + " was compared to "
-							+ valueType);
 		}
+
+		throw new DataFormatException("Value types did not match. Value type "
+				+ restriction.getValueType() + " was compared to " + valueType);
 	}
 
 	public Object getValueAsObject() {
-		switch (valueType) {
-		case BOOLEAN:
+		if (valueType == Field.FieldType.BOOLEAN) {
 			return Boolean.valueOf(booleanValue);
-		case DATE:
+		} else if (valueType == Field.FieldType.DATE) {
 			return dateValue;
-		case DOUBLE:
+		} else if (valueType == Field.FieldType.DOUBLE) {
 			return Double.valueOf(doubleValue);
-		case INT:
+		} else if (valueType == Field.FieldType.INT) {
 			return Integer.valueOf(intValue);
-
-		default:
-			return stringValue;
 		}
+		return stringValue;
 	}
 
 	public String getValueAsString() {

Modified: labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/OperatorDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/OperatorDescr.java	2007-12-28 11:45:45 UTC (rev 17422)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/OperatorDescr.java	2007-12-28 14:24:17 UTC (rev 17423)
@@ -11,8 +11,15 @@
 
 	private static int index = 0;
 
-	public static enum Type {
-		AND, OR
+	public static class Type {
+		public static final Type AND = new Type(0);
+		public static final Type OR = new Type(1);
+
+		private final int index;
+
+		private Type(int i) {
+			index = i;
+		}
 	};
 
 	private Type type;

Modified: labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/Restriction.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/Restriction.java	2007-12-28 11:45:45 UTC (rev 17422)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/Restriction.java	2007-12-28 14:24:17 UTC (rev 17423)
@@ -9,8 +9,19 @@
  */
 public abstract class Restriction extends AnalyticsComponent implements Cause {
 
-	public static enum RestrictionType {
-		LITERAL, VARIABLE, QUALIFIED_IDENTIFIER, RETURN_VALUE_RESTRICTION
+	public static class RestrictionType {
+		public static final RestrictionType LITERAL = new RestrictionType(0);
+		public static final RestrictionType VARIABLE = new RestrictionType(1);
+		public static final RestrictionType QUALIFIED_IDENTIFIER = new RestrictionType(
+				2);
+		public static final RestrictionType RETURN_VALUE_RESTRICTION = new RestrictionType(
+				3);
+
+		private final int index;
+
+		private RestrictionType(int i) {
+			index = i;
+		}
 	}
 
 	private static int index = 0;

Modified: labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/AnalyticsMessageBase.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/AnalyticsMessageBase.java	2007-12-28 11:45:45 UTC (rev 17422)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/AnalyticsMessageBase.java	2007-12-28 14:24:17 UTC (rev 17423)
@@ -1,10 +1,11 @@
 package org.drools.analytics.report.components;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Collection;
 
 /**
- *
+ * 
  * @author Toni Rikkola
  */
 abstract public class AnalyticsMessageBase implements Serializable,
@@ -13,18 +14,26 @@
 
 	private static int index = 0;
 
-	public static enum Severity {
-		NOTE("Note", "Notes"), WARNING("Warning", "Warnings"), ERROR("Error",
-				"Errors");
+	public static class Severity implements Comparable<Severity> {
+		public static final Severity NOTE = new Severity(0, "Note", "Notes");
+		public static final Severity WARNING = new Severity(1, "Warning",
+				"Warnings");
+		public static final Severity ERROR = new Severity(2, "Error", "Errors");
 
-		private String singular;
-		private String tuple;
+		private final int index;
+		private final String singular;
+		private final String tuple;
 
-		private Severity(String singular, String tuple) {
+		private Severity(int i, String singular, String tuple) {
+			this.index = i;
 			this.singular = singular;
 			this.tuple = tuple;
 		}
 
+		private int getIndex() {
+			return index;
+		}
+
 		public String getSingular() {
 			return singular;
 		}
@@ -33,14 +42,46 @@
 			return tuple;
 		}
 
+		public static Collection<Severity> values() {
+			Collection<Severity> all = new ArrayList<Severity>();
+
+			all.add(NOTE);
+			all.add(WARNING);
+			all.add(ERROR);
+
+			return all;
+		}
+
 		@Override
 		public String toString() {
 			return singular;
 		}
+
+		public int compareTo(Severity s) {
+
+			if (s.getIndex() == this.index) {
+				return 0;
+			}
+
+			return (s.getIndex() < this.index ? -1 : 1);
+		}
 	}
 
-	public static enum MessageType {
-		NOT_SPECIFIED, RANGE_CHECK, MISSING_EQUALITY, REDUNDANCY, SUBSUMPTION, MISSING_COMPONENT, OPTIMISATION, INCOHERENCE
+	public static class MessageType {
+		public static final MessageType NOT_SPECIFIED = new MessageType(0);
+		public static final MessageType RANGE_CHECK = new MessageType(1);
+		public static final MessageType MISSING_EQUALITY = new MessageType(2);
+		public static final MessageType REDUNDANCY = new MessageType(3);
+		public static final MessageType SUBSUMPTION = new MessageType(4);
+		public static final MessageType MISSING_COMPONENT = new MessageType(5);
+		public static final MessageType OPTIMISATION = new MessageType(6);
+		public static final MessageType INCOHERENCE = new MessageType(7);
+
+		private final int index;
+
+		private MessageType(int i) {
+			index = i;
+		}
 	}
 
 	protected Severity severity;

Modified: labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/Cause.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/Cause.java	2007-12-28 11:45:45 UTC (rev 17422)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/Cause.java	2007-12-28 14:24:17 UTC (rev 17423)
@@ -5,22 +5,28 @@
  * @author Toni Rikkola
  */
 public interface Cause {
-	public enum CauseType {
-		RULE,
-		FIELD,
-		GAP,
-		PATTERN,
-		RESTRICTION,
-		PATTERN_POSSIBILITY,
-		RULE_POSSIBILITY,
-		RANGE_CHECK_CAUSE, 
-		REDUNDANCY, 
-		EVAL,
-		PREDICATE, 
-		CONSTRAINT, 
-		CONSEQUENCE
+	public class CauseType {
+		public static final CauseType RULE = new CauseType(0);
+		public static final CauseType FIELD = new CauseType(1);
+		public static final CauseType GAP = new CauseType(2);
+		public static final CauseType PATTERN = new CauseType(3);
+		public static final CauseType RESTRICTION = new CauseType(4);
+		public static final CauseType PATTERN_POSSIBILITY = new CauseType(5);
+		public static final CauseType RULE_POSSIBILITY = new CauseType(6);
+		public static final CauseType RANGE_CHECK_CAUSE = new CauseType(7);
+		public static final CauseType REDUNDANCY = new CauseType(8);
+		public static final CauseType EVAL = new CauseType(9);
+		public static final CauseType PREDICATE = new CauseType(10);
+		public static final CauseType CONSTRAINT = new CauseType(11);
+		public static final CauseType CONSEQUENCE = new CauseType(12);
+
+		private final int index;
+
+		private CauseType(int i) {
+			index = i;
+		}
 	}
-	
+
 	public int getId();
 
 	public CauseType getCauseType();

Modified: labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/MissingNumberPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/MissingNumberPattern.java	2007-12-28 11:45:45 UTC (rev 17422)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/MissingNumberPattern.java	2007-12-28 14:24:17 UTC (rev 17423)
@@ -46,10 +46,9 @@
 	}
 
 	public Object getValueAsObject() {
-		switch (valueType) {
-		case BOOLEAN:
+		if (valueType == Field.FieldType.BOOLEAN) {
 			return Boolean.valueOf(value);
-		case DATE:
+		} else if (valueType == Field.FieldType.DATE) {
 			try {
 				String fmt = System.getProperty("drools.dateformat");
 				if (fmt == null) {
@@ -60,14 +59,13 @@
 			} catch (ParseException e) {
 				e.printStackTrace();
 			}
-		case DOUBLE:
+		} else if (valueType == Field.FieldType.DOUBLE) {
 			return Double.valueOf(value);
-		case INT:
+		} else if (valueType == Field.FieldType.INT) {
 			return Integer.valueOf(value);
-
-		default:
-			return value;
 		}
+
+		return value;
 	}
 
 	public Field.FieldType getValueType() {

Modified: labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/Redundancy.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/Redundancy.java	2007-12-28 11:45:45 UTC (rev 17422)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/Redundancy.java	2007-12-28 14:24:17 UTC (rev 17423)
@@ -11,8 +11,15 @@
  */
 public class Redundancy implements Cause {
 
-	public enum RedundancyType {
-		WEAK, STRONG
+	public static class RedundancyType {
+		public static final RedundancyType WEAK = new RedundancyType(0);
+		public static final RedundancyType STRONG = new RedundancyType(0);
+
+		private final int index;
+
+		private RedundancyType(int i) {
+			index = i;
+		}
 	}
 
 	private static int index = 0;

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/incoherence/Patterns.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/incoherence/Patterns.drl	2007-12-28 11:45:45 UTC (rev 17422)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/incoherence/Patterns.drl	2007-12-28 14:24:17 UTC (rev 17423)
@@ -73,7 +73,7 @@
 			id == $rp.ruleId
 		)
 	then 
-		Collection<Cause> list = new ArrayList<Cause>();
+		Collection list = new ArrayList();
 		list.add( $p1 );
 		list.add( $p2 );
 		
@@ -139,7 +139,7 @@
 			id == $rp.ruleId
 		)
 	then 
-		Collection<Cause> list = new ArrayList<Cause>();
+		Collection list = new ArrayList();
 		list.add( $p1 );
 		list.add( $p2 );
 		
@@ -204,7 +204,7 @@
 			id == $rp.ruleId
 		)
 	then 
-		Collection<Cause> list = new ArrayList<Cause>();
+		Collection list = new ArrayList();
 		list.add( $p1 );
 		list.add( $p2 );
 		
@@ -269,7 +269,7 @@
 			id == $rp.ruleId
 		)
 	then 
-		Collection<Cause> list = new ArrayList<Cause>();
+		Collection list = new ArrayList();
 		list.add( $p1 );
 		list.add( $p2 );
 		
@@ -335,7 +335,7 @@
 			id == $rp.ruleId
 		)
 then 
-		Collection<Cause> list = new ArrayList<Cause>();
+		Collection list = new ArrayList();
 		list.add( $p1 );
 		list.add( $p2 );
 		
@@ -401,7 +401,7 @@
 			id == $rp.ruleId
 		)
 then 
-		Collection<Cause> list = new ArrayList<Cause>();
+		Collection list = new ArrayList();
 		list.add( $p1 );
 		list.add( $p2 );
 		
@@ -466,7 +466,7 @@
 			id == $rp.ruleId
 		)
 then 
-		Collection<Cause> list = new ArrayList<Cause>();
+		Collection list = new ArrayList();
 		list.add( $p1 );
 		list.add( $p2 );
 		
@@ -532,7 +532,7 @@
 			id == $rp.ruleId
 		)
 then 
-		Collection<Cause> list = new ArrayList<Cause>();
+		Collection list = new ArrayList();
 		list.add( $p1 );
 		list.add( $p2 );
 		

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/incoherence/Restrictions.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/incoherence/Restrictions.drl	2007-12-28 11:45:45 UTC (rev 17422)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/incoherence/Restrictions.drl	2007-12-28 14:24:17 UTC (rev 17423)
@@ -54,7 +54,7 @@
 		
 		$p :Pattern( id == $pp.patternId )
 	then 
-		Collection<Cause> list = new ArrayList<Cause>();
+		Collection list = new ArrayList();
 		list.add( $r1 );
 		list.add( $r2 );
 		
@@ -100,7 +100,7 @@
 
 		$p :Pattern( id == $pp.patternId )
 	then 
-		Collection<Cause> list = new ArrayList<Cause>();
+		Collection list = new ArrayList();
 		list.add( $r1 );
 		list.add( $r2 );
 		
@@ -146,7 +146,7 @@
 	
 		$p :Pattern( id == $pp.patternId )
 	then 
-		Collection<Cause> list = new ArrayList<Cause>();
+		Collection list = new ArrayList();
 		list.add( $r1 );
 		list.add( $r2 );
 		
@@ -192,7 +192,7 @@
 
 		$p :Pattern( id == $pp.patternId )
 	then 
-		Collection<Cause> list = new ArrayList<Cause>();
+		Collection list = new ArrayList();
 		list.add( $r1 );
 		list.add( $r2 );
 		
@@ -238,7 +238,7 @@
 	
 		$p :Pattern( id == $pp.patternId )
 	then 
-		Collection<Cause> list = new ArrayList<Cause>();
+		Collection list = new ArrayList();
 		list.add( $r1 );
 		list.add( $r2 );
 		
@@ -285,7 +285,7 @@
 		
 		$p :Pattern( id == $pp.patternId )
 	then 
-		Collection<Cause> list = new ArrayList<Cause>();
+		Collection list = new ArrayList();
 		list.add( $r1 );
 		list.add( $r2 );
 		
@@ -329,7 +329,7 @@
 	
 		$p :Pattern( id == $pp.patternId )
 	then 
-		Collection<Cause> list = new ArrayList<Cause>();
+		Collection list = new ArrayList();
 		list.add( $r1 );
 		list.add( $r2 );
 		

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Notes.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Notes.drl	2007-12-28 11:45:45 UTC (rev 17422)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Notes.drl	2007-12-28 14:24:17 UTC (rev 17423)
@@ -39,7 +39,7 @@
 			items contains $r.right 
 		)
 	then
-		Collection<Cause> causes = new ArrayList<Cause>();
+		Collection causes = new ArrayList();
 		causes.add( $r.getLeft() );
 		causes.add( $r.getRight() );
 		
@@ -66,7 +66,7 @@
 			items contains $r.right 
 		)
 	then
-		Collection<Cause> causes = new ArrayList<Cause>();
+		Collection causes = new ArrayList();
 		causes.add( $r.getLeft() );
 		causes.add( $r.getRight() );
 		

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Warnings.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Warnings.drl	2007-12-28 11:45:45 UTC (rev 17422)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Warnings.drl	2007-12-28 14:24:17 UTC (rev 17423)
@@ -60,7 +60,7 @@
 		)
 		
 	then
-		Collection<Cause> causes = new ArrayList<Cause>();
+		Collection causes = new ArrayList();
 		causes.add( $rulePossibilityRedundancy.getLeft() );
 		causes.add( $rulePossibilityRedundancy.getRight() );
 		
@@ -119,7 +119,7 @@
 		)
 		
 	then
-		Collection<Cause> causes = new ArrayList<Cause>();
+		Collection causes = new ArrayList();
 		causes.add( $rulePossibilityRedundancy.getLeft() );
 		causes.add( $rulePossibilityRedundancy.getRight() );
 		




More information about the jboss-svn-commits mailing list