[jboss-svn-commits] JBL Code SVN: r25845 - in labs/jbossrules/trunk: drools-compiler/src/main/java/org/drools/compiler and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Mar 27 01:07:52 EDT 2009
Author: mark.proctor at jboss.com
Date: 2009-03-27 01:07:52 -0400 (Fri, 27 Mar 2009)
New Revision: 25845
Modified:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/ResourceType.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/changeset/ChangeSetTest.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/impl/KnowledgeAgentImpl.java
Log:
-changed ChangeSet to CHANGE_SET
-Added toStrings() on ResourceType
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/ResourceType.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/ResourceType.java 2009-03-27 02:56:32 UTC (rev 25844)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/ResourceType.java 2009-03-27 05:07:52 UTC (rev 25845)
@@ -5,56 +5,76 @@
import java.util.Map;
public class ResourceType {
-
- private String name;
-
+
+ private String name;
+
+ private String description;
+
private static final Map<String, ResourceType> CACHE = Collections.synchronizedMap( new HashMap<String, ResourceType>() );
- public ResourceType(String name) {
- this.name = name;
- }
-
- public static ResourceType addResourceTypeToRegistry(final String resourceType) {
- ResourceType resource = new ResourceType(resourceType);
- CACHE.put(resourceType, resource);
- return resource;
- }
+ public ResourceType(String name,
+ String description) {
+ this.name = name;
+ this.description = description;
+ }
+ public static ResourceType addResourceTypeToRegistry(final String resourceType,
+ String description) {
+ ResourceType resource = new ResourceType( resourceType,
+ description );
+ CACHE.put( resourceType,
+ resource );
+ return resource;
+ }
+
/** Drools Rule Language */
- public static final ResourceType DRL = addResourceTypeToRegistry("DRL");
+ public static final ResourceType DRL = addResourceTypeToRegistry( "DRL",
+ "Drools Rule Language" );
/** Drools XML Rule Language */
- public static final ResourceType XDRL = addResourceTypeToRegistry("XDRL");
+ public static final ResourceType XDRL = addResourceTypeToRegistry( "XDRL",
+ "Drools XML Rule Language" );
/** Drools DSL */
- public static final ResourceType DSL = addResourceTypeToRegistry("DSL");
+ public static final ResourceType DSL = addResourceTypeToRegistry( "DSL",
+ "Drools DSL" );
/** Drools DSL Rule */
- public static final ResourceType DSLR = addResourceTypeToRegistry("DSLR");
+ public static final ResourceType DSLR = addResourceTypeToRegistry( "DSLR",
+ "Drools DSL Rule" );
/** Drools Rule Flow Language */
- public static final ResourceType DRF = addResourceTypeToRegistry("DRF");
+ public static final ResourceType DRF = addResourceTypeToRegistry( "DRF",
+ "Drools Rule Flow Language" );
/** Decision Table */
- public static final ResourceType DTABLE = addResourceTypeToRegistry("DTABLE");
+ public static final ResourceType DTABLE = addResourceTypeToRegistry( "DTABLE",
+ "Decision Table" );
/** Binary Package */
- public static final ResourceType PKG = addResourceTypeToRegistry("PKG");
+ public static final ResourceType PKG = addResourceTypeToRegistry( "PKG",
+ "Binary Package" );
- /** Drools Rule Language */
- public static final ResourceType BRL = addResourceTypeToRegistry("BRL");
+ /** Drools Business Rule Language */
+ public static final ResourceType BRL = addResourceTypeToRegistry( "BRL",
+ "Drools Business Rule Language" );
- /** ChangeSet */
- public static final ResourceType ChangeSet = addResourceTypeToRegistry("ChangeSet");
-
+ /** Change Set */
+ public static final ResourceType CHANGE_SET = addResourceTypeToRegistry( "CHANGE_SET",
+ "Change Set" );
+
public static ResourceType getResourceType(final String resourceType) {
- ResourceType resource = CACHE.get(resourceType);
+ ResourceType resource = CACHE.get( resourceType );
if ( resource == null ) {
throw new RuntimeException( "Unable to determine resource type " + resourceType );
}
return resource;
}
+ public String toString() {
+ return "ResourceType = '" + this.description + "'";
+ }
+
@Override
public int hashCode() {
return name.hashCode();
@@ -69,5 +89,5 @@
if ( !name.equals( other.name ) ) return false;
return true;
}
-
+
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2009-03-27 02:56:32 UTC (rev 25844)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2009-03-27 05:07:52 UTC (rev 25845)
@@ -513,7 +513,7 @@
Package pkg = (Package) DroolsStreamUtils.streamIn( is );
is.close();
addPackage( pkg );
- } else if ( ResourceType.ChangeSet.equals( type )) {
+ } else if ( ResourceType.CHANGE_SET.equals( type )) {
((InternalResource) resource).setResourceType( type );
XmlChangeSetReader reader = new XmlChangeSetReader( this.configuration.getSemanticModules() );
if ( resource instanceof ClassPathResource ) {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/changeset/ChangeSetTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/changeset/ChangeSetTest.java 2009-03-27 02:56:32 UTC (rev 25844)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/changeset/ChangeSetTest.java 2009-03-27 05:07:52 UTC (rev 25845)
@@ -87,7 +87,7 @@
KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
kbuilder.add( ResourceFactory.newClassPathResource( "changeset1Test.xml",
getClass() ),
- ResourceType.ChangeSet );
+ ResourceType.CHANGE_SET );
assertFalse( kbuilder.hasErrors() );
KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/impl/KnowledgeAgentImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/impl/KnowledgeAgentImpl.java 2009-03-27 02:56:32 UTC (rev 25844)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/impl/KnowledgeAgentImpl.java 2009-03-27 05:07:52 UTC (rev 25845)
@@ -148,7 +148,7 @@
} else {
if ( ((InternalResource) resource).getResourceType() == ResourceType.PKG ) {
changeSetState.pkgs.add( resource );
- } else if ( ((InternalResource) resource).getResourceType() == ResourceType.ChangeSet ) {
+ } else if ( ((InternalResource) resource).getResourceType() == ResourceType.CHANGE_SET ) {
// @TODO
continue;
}
@@ -166,7 +166,7 @@
}
for ( Resource resource : changeSet.getResourcesRemoved() ) {
- if ( ((InternalResource) resource).getResourceType() == ResourceType.ChangeSet ) {
+ if ( ((InternalResource) resource).getResourceType() == ResourceType.CHANGE_SET ) {
processChangeSet( resource,
changeSetState );
} else if ( changeSetState.scanDirectories && ((InternalResource) resource).isDirectory() ) {
@@ -185,7 +185,7 @@
// are we going to need kbuilder to build these resources?
for ( Resource resource : this.resources.keySet() ) {
this.listener.debug( "KnowledgeAgent ChangeSet requires KnowledgeBuilder" );
- if ( ((InternalResource) resource).getResourceType() != ResourceType.ChangeSet && ((InternalResource) resource).getResourceType() != ResourceType.PKG ) {
+ if ( ((InternalResource) resource).getResourceType() != ResourceType.CHANGE_SET && ((InternalResource) resource).getResourceType() != ResourceType.PKG ) {
changeSetState.needsKnowledgeBuilder = true;
break;
}
More information about the jboss-svn-commits
mailing list