[jboss-svn-commits] JBL Code SVN: r26320 - in labs/jbossrules/trunk: drools-compiler/src/test/java/org/drools/testframework and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Apr 30 11:05:17 EDT 2009
Author: tirelli
Date: 2009-04-30 11:05:15 -0400 (Thu, 30 Apr 2009)
New Revision: 26320
Modified:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/WorkingMemoryEntryPoint.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/command/GetFactHandlesCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/command/impl/CommandBasedStatefulKnowledgeSession.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooWorkingMemory.java
labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java
Log:
Fixing generics syntax
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/WorkingMemoryEntryPoint.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/WorkingMemoryEntryPoint.java 2009-04-30 11:20:17 UTC (rev 26319)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/WorkingMemoryEntryPoint.java 2009-04-30 15:05:15 UTC (rev 26320)
@@ -88,7 +88,7 @@
*
* @return
*/
- Collection< ? extends Object > getObjects();
+ Collection< Object > getObjects();
/**
* Returns all facts from the current session that are accepted by the given <code>ObjectFilter</code>.
@@ -97,14 +97,14 @@
*
* @return
*/
- Collection< ? extends Object > getObjects(ObjectFilter filter);
+ Collection< Object > getObjects(ObjectFilter filter);
/**
* Returns all <code>FactHandle</code>s from the current session.
*
* @return
*/
- Collection< ? extends FactHandle> getFactHandles();
+ <T extends FactHandle> Collection< T > getFactHandles();
/**
* Returns all <code>FactHandle</code>s from the current session for which the facts are accepted by
@@ -114,5 +114,5 @@
*
* @return
*/
- Collection< ? extends FactHandle> getFactHandles(ObjectFilter filter);
+ <T extends FactHandle> Collection< T > getFactHandles(ObjectFilter filter);
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2009-04-30 11:20:17 UTC (rev 26319)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2009-04-30 15:05:15 UTC (rev 26320)
@@ -552,12 +552,12 @@
return null;
}
- public Collection< ? extends Object> getObjects() {
+ public Collection< Object > getObjects() {
// TODO Auto-generated method stub
return null;
}
- public Collection< ? extends Object> getObjects(ObjectFilter filter) {
+ public Collection< Object > getObjects(ObjectFilter filter) {
// TODO Auto-generated method stub
return null;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java 2009-04-30 11:20:17 UTC (rev 26319)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java 2009-04-30 15:05:15 UTC (rev 26320)
@@ -507,25 +507,25 @@
return this.objectStore.getObjectForHandle( (InternalFactHandle) factHandle );
}
- public Collection< ? extends FactHandle> getFactHandles() {
+ public <T extends org.drools.runtime.rule.FactHandle> Collection< T > getFactHandles() {
return new ObjectStoreWrapper( this.objectStore,
null,
ObjectStoreWrapper.FACT_HANDLE );
}
- public Collection< ? extends FactHandle> getFactHandles(org.drools.runtime.ObjectFilter filter) {
+ public <T extends org.drools.runtime.rule.FactHandle> Collection< T > getFactHandles(org.drools.runtime.ObjectFilter filter) {
return new ObjectStoreWrapper( this.objectStore,
filter,
ObjectStoreWrapper.FACT_HANDLE );
}
- public Collection< ? > getObjects() {
+ public Collection< Object > getObjects() {
return new ObjectStoreWrapper( this.objectStore,
null,
ObjectStoreWrapper.OBJECT );
}
- public Collection< ? > getObjects(org.drools.runtime.ObjectFilter filter) {
+ public Collection< Object > getObjects(org.drools.runtime.ObjectFilter filter) {
return new ObjectStoreWrapper( this.objectStore,
filter,
ObjectStoreWrapper.OBJECT );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2009-04-30 11:20:17 UTC (rev 26319)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2009-04-30 15:05:15 UTC (rev 26320)
@@ -304,25 +304,25 @@
// return new FutureAdapter( this.session.asyncFireAllRules() );
// }
- public Collection< ? extends FactHandle> getFactHandles() {
+ public <T extends org.drools.runtime.rule.FactHandle> Collection< T > getFactHandles() {
return new ObjectStoreWrapper( session.getObjectStore(),
null,
ObjectStoreWrapper.FACT_HANDLE );
}
- public Collection< ? extends FactHandle> getFactHandles(org.drools.runtime.ObjectFilter filter) {
+ public <T extends org.drools.runtime.rule.FactHandle> Collection< T > getFactHandles(org.drools.runtime.ObjectFilter filter) {
return new ObjectStoreWrapper( session.getObjectStore(),
filter,
ObjectStoreWrapper.FACT_HANDLE );
}
- public Collection< ? > getObjects() {
+ public Collection< Object > getObjects() {
return new ObjectStoreWrapper( session.getObjectStore(),
null,
ObjectStoreWrapper.OBJECT );
}
- public Collection< ? > getObjects(org.drools.runtime.ObjectFilter filter) {
+ public Collection< Object > getObjects(org.drools.runtime.ObjectFilter filter) {
return new ObjectStoreWrapper( session.getObjectStore(),
filter,
ObjectStoreWrapper.OBJECT );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/command/GetFactHandlesCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/command/GetFactHandlesCommand.java 2009-04-30 11:20:17 UTC (rev 26319)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/command/GetFactHandlesCommand.java 2009-04-30 15:05:15 UTC (rev 26320)
@@ -10,7 +10,7 @@
public class GetFactHandlesCommand
implements
- Command<Collection< ? extends FactHandle>> {
+ Command<Collection< FactHandle >> {
private ObjectFilter filter = null;
@@ -21,7 +21,7 @@
this.filter = filter;
}
- public Collection< ? extends FactHandle> execute(ReteooWorkingMemory session) {
+ public Collection< FactHandle > execute(ReteooWorkingMemory session) {
ReteooStatefulSession reteooStatefulSession = (ReteooStatefulSession) session;
if ( filter != null ) {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/command/impl/CommandBasedStatefulKnowledgeSession.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/command/impl/CommandBasedStatefulKnowledgeSession.java 2009-04-30 11:20:17 UTC (rev 26319)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/command/impl/CommandBasedStatefulKnowledgeSession.java 2009-04-30 15:05:15 UTC (rev 26320)
@@ -254,20 +254,20 @@
return this.commandService.execute( new GetFactHandleCommand( object ) );
}
- public Collection< ? extends FactHandle> getFactHandles() {
- return this.commandService.execute( new GetFactHandlesCommand() );
+ public <T extends org.drools.runtime.rule.FactHandle> Collection< T > getFactHandles() {
+ return (Collection<T>) this.commandService.execute( new GetFactHandlesCommand() );
}
- public Collection< ? extends FactHandle> getFactHandles(ObjectFilter filter) {
- return this.commandService.execute( new GetFactHandlesCommand( filter ) );
+ public <T extends org.drools.runtime.rule.FactHandle> Collection< T > getFactHandles(ObjectFilter filter) {
+ return (Collection<T>) this.commandService.execute( new GetFactHandlesCommand( filter ) );
}
- public Collection< ? extends Object> getObjects() {
+ public Collection< Object > getObjects() {
return getObjects( null );
}
- public Collection< ? extends Object > getObjects(ObjectFilter filter) {
+ public Collection< Object > getObjects(ObjectFilter filter) {
Collection result = commandService.execute( new GetObjectsCommand( filter ) );
return result;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooWorkingMemory.java 2009-04-30 11:20:17 UTC (rev 26319)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooWorkingMemory.java 2009-04-30 15:05:15 UTC (rev 26320)
@@ -359,19 +359,19 @@
return this;
}
- public Collection< ? extends FactHandle> getFactHandles() {
+ public <T extends org.drools.runtime.rule.FactHandle> Collection< T > getFactHandles() {
throw new UnsupportedOperationException("this is implementedby StatefulKnowledgeImpl");
}
- public Collection< ? extends FactHandle> getFactHandles(ObjectFilter filter) {
+ public <T extends org.drools.runtime.rule.FactHandle> Collection< T > getFactHandles(ObjectFilter filter) {
throw new UnsupportedOperationException("this is implementedby StatefulKnowledgeImpl");
}
- public Collection< ? extends Object> getObjects() {
+ public Collection< Object > getObjects() {
throw new UnsupportedOperationException("this is implementedby StatefulKnowledgeImpl");
}
- public Collection< ? extends Object> getObjects(ObjectFilter filter) {
+ public Collection< Object > getObjects(ObjectFilter filter) {
throw new UnsupportedOperationException("this is implementedby StatefulKnowledgeImpl");
}
Modified: labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java 2009-04-30 11:20:17 UTC (rev 26319)
+++ labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java 2009-04-30 15:05:15 UTC (rev 26320)
@@ -447,12 +447,12 @@
return null;
}
- public Collection< ? extends Object> getObjects() {
+ public Collection< Object> getObjects() {
// TODO Auto-generated method stub
return null;
}
- public Collection< ? extends Object> getObjects(ObjectFilter filter) {
+ public Collection< Object> getObjects(ObjectFilter filter) {
// TODO Auto-generated method stub
return null;
}
More information about the jboss-svn-commits
mailing list