[jboss-svn-commits] JBL Code SVN: r35600 - in labs/jbossrules/soa_branches/BRMS-5.1.1: drools-verifier/src/main/java/org/drools/verifier/data and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 20 15:00:50 EDT 2010
Author: kurt.stam at jboss.com
Date: 2010-10-20 15:00:50 -0400 (Wed, 20 Oct 2010)
New Revision: 35600
Modified:
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-verifier/src/main/java/org/drools/verifier/data/VerifierDataMaps.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-verifier/src/main/java/org/drools/verifier/data/VerifierReportImpl.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-verifier/src/main/java/org/drools/verifier/report/html/MissingRangesReportVisitor.java
labs/jbossrules/soa_branches/BRMS-5.1.1/pom.xml
Log:
BRMS-397 upgrading to google collections version 1.0.
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-verifier/src/main/java/org/drools/verifier/data/VerifierDataMaps.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-verifier/src/main/java/org/drools/verifier/data/VerifierDataMaps.java 2010-10-20 18:21:46 UTC (rev 35599)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-verifier/src/main/java/org/drools/verifier/data/VerifierDataMaps.java 2010-10-20 19:00:50 UTC (rev 35600)
@@ -52,15 +52,15 @@
private Map<String, RulePackage> packagesByName = new TreeMap<String, RulePackage>();
private Map<String, ObjectType> objectTypesByFullName = new TreeMap<String, ObjectType>();
private Map<String, Field> fieldsByObjectTypeAndFieldName = new TreeMap<String, Field>();
- private Multimap<String, Field> fieldsByObjectTypeId = new TreeMultimap<String, Field>();
- private Multimap<String, Pattern> patternsByObjectTypeId = new TreeMultimap<String, Pattern>();
- private Multimap<String, Pattern> patternsByRuleName = new TreeMultimap<String, Pattern>();
- private Multimap<String, Restriction> restrictionsByFieldId = new TreeMultimap<String, Restriction>();
+ private Multimap<String, Field> fieldsByObjectTypeId = TreeMultimap.create();
+ private Multimap<String, Pattern> patternsByObjectTypeId = TreeMultimap.create();
+ private Multimap<String, Pattern> patternsByRuleName = TreeMultimap.create();
+ private Multimap<String, Restriction> restrictionsByFieldId = TreeMultimap.create();
private Map<String, Variable> variablesByRuleAndVariableName = new TreeMap<String, Variable>();
private Map<String, EntryPoint> entryPointsByEntryId = new TreeMap<String, EntryPoint>();
private Map<String, VerifierRule> rulesByName = new TreeMap<String, VerifierRule>();
private Map<String, Import> importsByName = new TreeMap<String, Import>();
- private Multimap<String, VerifierRule> rulesByCategory = new TreeMultimap<String, VerifierRule>();
+ private Multimap<String, VerifierRule> rulesByCategory = TreeMultimap.create();
public Collection<ObjectType> getObjectTypesByRuleName(String ruleName) {
Set<ObjectType> set = new HashSet<ObjectType>();
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-verifier/src/main/java/org/drools/verifier/data/VerifierReportImpl.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-verifier/src/main/java/org/drools/verifier/data/VerifierReportImpl.java 2010-10-20 18:21:46 UTC (rev 35599)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-verifier/src/main/java/org/drools/verifier/data/VerifierReportImpl.java 2010-10-20 19:00:50 UTC (rev 35600)
@@ -42,12 +42,12 @@
private static final long serialVersionUID = 510l;
private Map<String, Gap> gapsById = new TreeMap<String, Gap>();
- private Multimap<String, Gap> gapsByFieldId = new TreeMultimap<String, Gap>();
+ private Multimap<String, Gap> gapsByFieldId = TreeMultimap.create();
private Map<String, MissingNumberPattern> missingNumberPatternsById = new TreeMap<String, MissingNumberPattern>();
- private Multimap<String, MissingNumberPattern> missingNumberPatternsByFieldId = new TreeMultimap<String, MissingNumberPattern>();
+ private Multimap<String, MissingNumberPattern> missingNumberPatternsByFieldId = TreeMultimap.create();
private List<VerifierMessageBase> messages = new ArrayList<VerifierMessageBase>();
- private Multimap<Severity, VerifierMessageBase> messagesBySeverity = new TreeMultimap<Severity, VerifierMessageBase>();
+ private Multimap<Severity, VerifierMessageBase> messagesBySeverity = TreeMultimap.create();
private VerifierData data;
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-verifier/src/main/java/org/drools/verifier/report/html/MissingRangesReportVisitor.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-verifier/src/main/java/org/drools/verifier/report/html/MissingRangesReportVisitor.java 2010-10-20 18:21:46 UTC (rev 35599)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-verifier/src/main/java/org/drools/verifier/report/html/MissingRangesReportVisitor.java 2010-10-20 19:00:50 UTC (rev 35600)
@@ -40,7 +40,8 @@
public static Collection<String> visitRestrictionsCollection(String sourceFolder,
Collection<Restriction> restrictions,
Collection<MissingRange> causes) {
- Multimap<Object, DataRow> dt = new TreeMultimap<Object, DataRow>();
+
+ Multimap<String, DataRow> dt = TreeMultimap.create();
Collection<String> stringRows = new ArrayList<String>();
for ( MissingRange cause : causes ) {
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/pom.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/pom.xml 2010-10-20 18:21:46 UTC (rev 35599)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/pom.xml 2010-10-20 19:00:50 UTC (rev 35600)
@@ -1761,7 +1761,7 @@
<dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
- <version>0.8</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
More information about the jboss-svn-commits
mailing list