[jboss-svn-commits] JBL Code SVN: r6717 - labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Oct 10 06:35:14 EDT 2006
Author: michael.neale at jboss.com
Date: 2006-10-10 06:34:48 -0400 (Tue, 10 Oct 2006)
New Revision: 6717
Modified:
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/BaseMannersTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Chosen.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Context.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Count.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Hobby.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/LastSeat.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Path.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Seating.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Sex.java
Log:
changed it to use Integer not int everywhere
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/BaseMannersTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/BaseMannersTest.java 2006-10-10 10:13:27 UTC (rev 6716)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/BaseMannersTest.java 2006-10-10 10:34:48 UTC (rev 6717)
@@ -176,7 +176,7 @@
contextColumn.addConstraint( getLiteralConstraint( contextColumn,
"state",
- new Integer( Context.START_UP ),
+ Context.START_UP ,
this.integerEqualEvaluator ) );
rule.addPattern( contextColumn );
@@ -220,22 +220,22 @@
String guestName = guest.getName();
Seating seating = new Seating( count.getValue(),
- 0,
+ new Integer(0),
true,
- 1,
+ new Integer(1),
guestName,
- 1,
+ new Integer(1),
guestName );
drools.assertObject( seating );
Path path = new Path( count.getValue(),
- 1,
+ new Integer(1),
guestName );
drools.assertObject( path );
- count.setValue( count.getValue() + 1 );
+ count.setValue( new Integer(count.getValue().intValue() + 1) );
drools.modifyObject( tuple.get( countDeclaration ),
count );
@@ -309,7 +309,7 @@
contextColumn.addConstraint( getLiteralConstraint( contextColumn,
"state",
- new Integer( Context.ASSIGN_SEATS ),
+ Context.ASSIGN_SEATS ,
this.integerEqualEvaluator ) );
rule.addPattern( contextColumn );
@@ -481,8 +481,8 @@
Context context = (Context) drools.get( contextDeclaration );
Count count = (Count) drools.get( countDeclaration );
- int seatId = ((Integer) drools.get( seatingIdDeclaration )).intValue();
- int seatingRightSeat = ((Integer) drools.get( seatingRightSeatDeclaration )).intValue();
+ Integer seatId = ((Integer) drools.get( seatingIdDeclaration ));
+ Integer seatingRightSeat = ((Integer) drools.get( seatingRightSeatDeclaration ));
String leftGuestName = (String) drools.get( leftGuestNameDeclaration );
String rightGuestName = (String) drools.get( seatingRightGuestNameDeclaration );
@@ -493,12 +493,12 @@
false,
seatingRightSeat,
rightGuestName,
- seatingRightSeat + 1,
+ new Integer(seatingRightSeat.intValue() + 1),
leftGuestName );
drools.assertObject( seating );
Path path = new Path( count.getValue(),
- seatingRightSeat + 1,
+ new Integer(seatingRightSeat.intValue() + 1),
leftGuestName );
drools.assertObject( path );
@@ -508,7 +508,7 @@
rightGuestHobby );
drools.assertObject( chosen );
- count.setValue( count.getValue() + 1 );
+ count.setValue( new Integer(count.getValue().intValue() + 1) );
// if ( count.getValue() == 5 ) {
// drools.retractObject( tuple.getFactHandleForDeclaration( countDeclaration ) );
@@ -573,7 +573,7 @@
contextColumn.addConstraint( getLiteralConstraint( contextColumn,
"state",
- new Integer( Context.MAKE_PATH ),
+ Context.MAKE_PATH ,
this.integerEqualEvaluator ) );
rule.addPattern( contextColumn );
@@ -657,8 +657,8 @@
Rule rule = drools.getRule();
Tuple tuple = drools.getTuple();
- int id = ((Integer) drools.get( seatingIdDeclaration )).intValue();
- int seat = ((Integer) drools.get( pathSeatDeclaration )).intValue();
+ Integer id = ((Integer) drools.get( seatingIdDeclaration ));
+ Integer seat = ((Integer) drools.get( pathSeatDeclaration ));
String guestName = (String) drools.get( pathGuestNameDeclaration );
Path path = new Path( id,
@@ -713,7 +713,7 @@
contextColumn.addConstraint( getLiteralConstraint( contextColumn,
"state",
- new Integer( Context.MAKE_PATH ),
+ Context.MAKE_PATH ,
this.integerEqualEvaluator ) );
rule.addPattern( contextColumn );
@@ -805,7 +805,7 @@
contextColumn.addConstraint( getLiteralConstraint( contextColumn,
"state",
- new Integer( Context.CHECK_DONE ),
+ Context.CHECK_DONE ,
this.integerEqualEvaluator ) );
rule.addPattern( contextColumn );
@@ -895,7 +895,7 @@
contextColumn.addConstraint( getLiteralConstraint( contextColumn,
"state",
- new Integer( Context.CHECK_DONE ),
+ Context.CHECK_DONE ,
this.integerEqualEvaluator ) );
rule.addPattern( contextColumn );
@@ -959,7 +959,7 @@
contextColumn.addConstraint( getLiteralConstraint( contextColumn,
"state",
- new Integer( Context.PRINT_RESULTS ),
+ Context.PRINT_RESULTS,
this.integerEqualEvaluator ) );
rule.addPattern( contextColumn );
@@ -1029,7 +1029,7 @@
if ( !"seat".equals( st.nextToken() ) ) {
throw new IOException( "expected 'seat' in: " + line );
}
- list.add( new LastSeat( new Integer( st.nextToken() ).intValue() ) );
+ list.add( new LastSeat( new Integer( st.nextToken() ) ) );
}
if ( "context".equals( type ) ) {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Chosen.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Chosen.java 2006-10-10 10:13:27 UTC (rev 6716)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Chosen.java 2006-10-10 10:34:48 UTC (rev 6717)
@@ -26,7 +26,7 @@
*/
private static final long serialVersionUID = -169447202790860427L;
- private int id;
+ private Integer id;
private String guestName;
@@ -36,7 +36,7 @@
}
- public Chosen(final int id,
+ public Chosen(final Integer id,
final String guestName,
final Hobby hobby) {
this.id = id;
@@ -44,7 +44,7 @@
this.hobby = hobby;
}
- public int getId() {
+ public Integer getId() {
return this.id;
}
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Context.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Context.java 2006-10-10 10:13:27 UTC (rev 6716)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Context.java 2006-10-10 10:34:48 UTC (rev 6717)
@@ -25,15 +25,15 @@
*
*/
private static final long serialVersionUID = -5876473269153584875L;
- public static final int START_UP = 0;
- public static final int ASSIGN_SEATS = 1;
- public static final int MAKE_PATH = 2;
- public static final int CHECK_DONE = 3;
- public static final int PRINT_RESULTS = 4;
+ public static final Integer START_UP = new Integer(0);
+ public static final Integer ASSIGN_SEATS = new Integer(1);
+ public static final Integer MAKE_PATH = new Integer(2);
+ public static final Integer CHECK_DONE = new Integer(3);
+ public static final Integer PRINT_RESULTS = new Integer(4);
public static final String[] stateStrings = {"START_UP", "ASSIGN_SEATS", "MAKE_PATH", "CHECK_DONE", "PRINT_RESULTS"};
- private int state;
+ private Integer state;
public Context() {
}
@@ -46,24 +46,24 @@
}
}
- public Context(final int state) {
+ public Context(final Integer state) {
this.state = state;
}
- public void setState(final int state) {
+ public void setState(final Integer state) {
this.state = state;
}
- public boolean isState(final int state) {
+ public boolean isState(final Integer state) {
return this.state == state;
}
- public int getState() {
+ public Integer getState() {
return this.state;
}
public String getStringValue() {
- return Context.stateStrings[this.state];
+ return Context.stateStrings[this.state.intValue()];
}
public String toString() {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Count.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Count.java 2006-10-10 10:13:27 UTC (rev 6716)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Count.java 2006-10-10 10:34:48 UTC (rev 6717)
@@ -16,21 +16,21 @@
package org.drools.examples.manners;
public class Count {
- private int value;
+ private Integer value;
public Count() {
}
- public Count(final int value) {
+ public Count(final Integer value) {
super();
this.value = value;
}
- public int getValue() {
+ public Integer getValue() {
return this.value;
}
- public void setValue(final int value) {
+ public void setValue(final Integer value) {
this.value = value;
}
@@ -51,7 +51,7 @@
}
public int hashCode() {
- return this.value;
+ return this.value.intValue();
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Hobby.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Hobby.java 2006-10-10 10:13:27 UTC (rev 6716)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Hobby.java 2006-10-10 10:34:48 UTC (rev 6717)
@@ -24,21 +24,21 @@
public static final String[] hobbyStrings = new String[]{Hobby.stringH1, Hobby.stringH2, Hobby.stringH3, Hobby.stringH4, Hobby.stringH5};
- public static final Hobby H1 = new Hobby( 1 );
- public static final Hobby H2 = new Hobby( 2 );
- public static final Hobby H3 = new Hobby( 3 );
- public static final Hobby H4 = new Hobby( 4 );
- public static final Hobby H5 = new Hobby( 5 );
+ public static final Hobby H1 = new Hobby( new Integer(1) );
+ public static final Hobby H2 = new Hobby( new Integer(2) );
+ public static final Hobby H3 = new Hobby( new Integer(3) );
+ public static final Hobby H4 = new Hobby( new Integer(4) );
+ public static final Hobby H5 = new Hobby( new Integer(5) );
private String hobbyStr;
- private int hobbyIndex;
+ private Integer hobbyIndex;
public Hobby() {
}
- private Hobby(final int hobby) {
- this.hobbyIndex = hobby - 1;
- this.hobbyStr = Hobby.hobbyStrings[this.hobbyIndex];
+ private Hobby(final Integer hobby) {
+ this.hobbyIndex = new Integer(hobby.intValue() - 1);
+ this.hobbyStr = Hobby.hobbyStrings[this.hobbyIndex.intValue()];
}
public String getHobby() {
@@ -70,7 +70,7 @@
}
public int hashCode() {
- return this.hobbyIndex;
+ return this.hobbyIndex.intValue();
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/LastSeat.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/LastSeat.java 2006-10-10 10:13:27 UTC (rev 6716)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/LastSeat.java 2006-10-10 10:34:48 UTC (rev 6717)
@@ -24,16 +24,16 @@
*
*/
private static final long serialVersionUID = -3331801742327121724L;
- private int seat;
+ private Integer seat;
public LastSeat() {
}
- public LastSeat(final int seat) {
+ public LastSeat(final Integer seat) {
this.seat = seat;
}
- public int getSeat() {
+ public Integer getSeat() {
return this.seat;
}
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Path.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Path.java 2006-10-10 10:13:27 UTC (rev 6716)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Path.java 2006-10-10 10:34:48 UTC (rev 6717)
@@ -16,22 +16,22 @@
package org.drools.examples.manners;
public class Path {
- private int id;
+ private Integer id;
private String guestName;
- private int seat;
+ private Integer seat;
public Path() {
}
- public Path(final int id,
- final int seat,
+ public Path(final Integer id,
+ final Integer seat,
final String guestName) {
this.id = id;
this.seat = seat;
this.guestName = guestName;
}
- public int getSeat() {
+ public Integer getSeat() {
return this.seat;
}
@@ -39,7 +39,7 @@
return this.guestName;
}
- public int getId() {
+ public Integer getId() {
return this.id;
}
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java 2006-10-10 10:13:27 UTC (rev 6716)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java 2006-10-10 10:34:48 UTC (rev 6717)
@@ -67,14 +67,14 @@
//workingMemory.addEventListener(listener );
- final InputStream is = getClass().getResourceAsStream( "/manners128.dat" );
+ final InputStream is = getClass().getResourceAsStream( "/manners64.dat" );
final List list = getInputObjects( is );
for ( final Iterator it = list.iterator(); it.hasNext(); ) {
final Object object = it.next();
workingMemory.assertObject( object );
}
- workingMemory.assertObject( new Count( 1 ) );
+ workingMemory.assertObject( new Count( new Integer(1) ) );
final long start = System.currentTimeMillis();
workingMemory.fireAllRules();
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Seating.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Seating.java 2006-10-10 10:13:27 UTC (rev 6716)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Seating.java 2006-10-10 10:34:48 UTC (rev 6717)
@@ -25,9 +25,9 @@
*/
private static final long serialVersionUID = -21267542036195318L;
- private int id, pid;
+ private Integer id, pid;
- private int leftSeat, rightSeat;
+ private Integer leftSeat, rightSeat;
private String leftGuestName, rightGuestName;
@@ -36,12 +36,12 @@
public Seating() {
}
- public Seating(final int id,
- final int pid,
+ public Seating(final Integer id,
+ final Integer pid,
final boolean pathDone,
- final int leftSeat,
+ final Integer leftSeat,
final String leftGuestName,
- final int rightSeat,
+ final Integer rightSeat,
final String rightGuestName) {
super();
this.id = id;
@@ -61,7 +61,7 @@
this.pathDone = pathDone;
}
- public int getId() {
+ public Integer getId() {
return this.id;
}
@@ -69,11 +69,11 @@
return this.leftGuestName;
}
- public int getLeftSeat() {
+ public Integer getLeftSeat() {
return this.leftSeat;
}
- public int getPid() {
+ public Integer getPid() {
return this.pid;
}
@@ -81,7 +81,7 @@
return this.rightGuestName;
}
- public int getRightSeat() {
+ public Integer getRightSeat() {
return this.rightSeat;
}
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Sex.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Sex.java 2006-10-10 10:13:27 UTC (rev 6716)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Sex.java 2006-10-10 10:34:48 UTC (rev 6717)
@@ -16,24 +16,24 @@
package org.drools.examples.manners;
public class Sex {
- public static final Sex M = new Sex( 0 );
- public static final Sex F = new Sex( 1 );
+ public static final Sex M = new Sex( new Integer(0) );
+ public static final Sex F = new Sex( new Integer(1) );
public static final String stringM = "m";
public static final String stringF = "f";
public static final String[] sexList = new String[]{Sex.stringM, Sex.stringF};
- private int sex;
+ private Integer sex;
public Sex() {
}
- private Sex(final int sex) {
+ private Sex(final Integer sex) {
this.sex = sex;
}
public String getSex() {
- return Sex.sexList[this.sex];
+ return Sex.sexList[this.sex.intValue()];
}
public final static Sex resolve(final String sex) {
@@ -55,7 +55,7 @@
}
public int hashCode() {
- return this.sex;
+ return this.sex.intValue();
}
}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list