[jboss-svn-commits] JBL Code SVN: r15916 - in labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics: components and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 18 10:22:37 EDT 2007
Author: Rikkola
Date: 2007-10-18 10:22:37 -0400 (Thu, 18 Oct 2007)
New Revision: 15916
Modified:
labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/PackageDescrFlattener.java
labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/AnalyticsComponent.java
labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/dao/AnalyticsResultNormal.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/Redundancy.java
labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/html/MissingRangesReportVisitor.java
Log:
Removed @Override tags that eclipse created.
Modified: labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/PackageDescrFlattener.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/PackageDescrFlattener.java 2007-10-18 13:20:58 UTC (rev 15915)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/PackageDescrFlattener.java 2007-10-18 14:22:37 UTC (rev 15916)
@@ -1,6 +1,7 @@
package org.drools.analytics;
-import java.util.List;
+import java.util.Collection;
+import java.util.Stack;
import org.drools.analytics.components.AnalyticsAccessorDescr;
import org.drools.analytics.components.AnalyticsAccumulateDescr;
@@ -66,6 +67,8 @@
private Solvers solvers = new Solvers();
+ private Stack<AnalyticsComponent> components = new Stack<AnalyticsComponent>();
+
private RulePackage currentPackage = null;
private AnalyticsRule currentRule = null;
private Pattern currentPattern = null;
@@ -74,25 +77,13 @@
private Field currentField = null;
public void insert(PackageDescr packageDescr) {
- AnalyticsData data = AnalyticsDataFactory.getAnalyticsData();
- RulePackage rulePackage = data.getRulePackageByName(packageDescr
- .getName());
- if (rulePackage == null) {
- rulePackage = new RulePackage();
+ flatten(packageDescr);
- rulePackage.setName(packageDescr.getName());
- data.save(rulePackage);
- }
-
- currentPackage = rulePackage;
-
- flatten(packageDescr.getRules());
-
formPossibilities();
}
- private void flatten(List descrs) {
+ private void flatten(Collection<Object> descrs) {
for (Object o : descrs) {
BaseDescr descr = (BaseDescr) o;
@@ -313,7 +304,21 @@
}
private void flatten(PackageDescr descr) {
+ AnalyticsData data = AnalyticsDataFactory.getAnalyticsData();
+ RulePackage rulePackage = data.getRulePackageByName(descr.getName());
+
+ if (rulePackage == null) {
+ rulePackage = new RulePackage();
+
+ rulePackage.setName(descr.getName());
+ data.save(rulePackage);
+ }
+
+ currentPackage = rulePackage;
+
+ components.push(rulePackage);
flatten(descr.getRules());
+ components.pop();
}
private void flatten(RuleDescr descr) {
@@ -355,7 +360,8 @@
private int flatten(PatternDescr descr) {
AnalyticsData data = AnalyticsDataFactory.getAnalyticsData();
- AnalyticsClass clazz = data.getClassByPackageAndName(descr.getObjectType());
+ AnalyticsClass clazz = data.getClassByPackageAndName(descr
+ .getObjectType());
if (clazz == null) {
clazz = new AnalyticsClass();
clazz.setName(descr.getObjectType());
Modified: labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/AnalyticsComponent.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/AnalyticsComponent.java 2007-10-18 13:20:58 UTC (rev 15915)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/components/AnalyticsComponent.java 2007-10-18 14:22:37 UTC (rev 15916)
@@ -10,9 +10,11 @@
protected String ruleName;
protected int id;
+ protected AnalyticsComponent parent;
+ protected int orderNumber; // Order number of this instance under parent.
+
public abstract AnalyticsComponentType getComponentType();
- @Override
public int compareTo(AnalyticsComponent o) {
if (id == o.getId()) {
return 0;
@@ -36,4 +38,20 @@
public void setRuleName(String ruleName) {
this.ruleName = ruleName;
}
+
+ public AnalyticsComponent getParent() {
+ return parent;
+ }
+
+ public void setParent(AnalyticsComponent parent) {
+ this.parent = parent;
+ }
+
+ public int getOrderNumber() {
+ return orderNumber;
+ }
+
+ public void setOrderNumber(int orderNumber) {
+ this.orderNumber = orderNumber;
+ }
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/dao/AnalyticsResultNormal.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/dao/AnalyticsResultNormal.java 2007-10-18 13:20:58 UTC (rev 15915)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/dao/AnalyticsResultNormal.java 2007-10-18 14:22:37 UTC (rev 15916)
@@ -5,10 +5,8 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.TreeMap;
-import org.drools.analytics.components.Field;
import org.drools.analytics.report.components.AnalyticsMessageBase;
import org.drools.analytics.report.components.Gap;
import org.drools.analytics.report.components.MissingNumberPattern;
@@ -29,13 +27,11 @@
private List<AnalyticsMessageBase> messages = new ArrayList<AnalyticsMessageBase>();
private DataTree<AnalyticsMessageBase.Severity, AnalyticsMessageBase> messagesBySeverity = new DataTree<AnalyticsMessageBase.Severity, AnalyticsMessageBase>();
- @Override
public void save(AnalyticsMessageBase message) {
messages.add(message);
messagesBySeverity.put(message.getSeverity(), message);
}
- @Override
public Collection<AnalyticsMessageBase> getBySeverity(
AnalyticsMessageBase.Severity severity) {
Collection<AnalyticsMessageBase> result = messagesBySeverity
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-10-18 13:20:58 UTC (rev 15915)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/AnalyticsMessageBase.java 2007-10-18 14:22:37 UTC (rev 15916)
@@ -49,7 +49,6 @@
protected Cause faulty;
protected String message;
- @Override
public int compareTo(AnalyticsMessageBase o) {
if (id == o.getId()) {
return 0;
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-10-18 13:20:58 UTC (rev 15915)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/Redundancy.java 2007-10-18 14:22:37 UTC (rev 15916)
@@ -34,12 +34,10 @@
this.right = right;
}
- @Override
public CauseType getCauseType() {
return CauseType.REDUNDANCY;
}
- @Override
public int getId() {
return id;
}
Modified: labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/html/MissingRangesReportVisitor.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/html/MissingRangesReportVisitor.java 2007-10-18 13:20:58 UTC (rev 15915)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/html/MissingRangesReportVisitor.java 2007-10-18 14:22:37 UTC (rev 15916)
@@ -158,7 +158,6 @@
protected String evaluator;
protected String value;
- @Override
public int compareTo(DataRow o) {
return evaluator.compareTo(o.evaluator);
}
@@ -171,7 +170,6 @@
this.value = valueAsString;
}
- @Override
public String toString() {
return evaluator + " " + value;
}
More information about the jboss-svn-commits
mailing list