[jboss-cvs] JBoss Messaging SVN: r3595 - in trunk/src/main/org/jboss: messaging/core/impl/filter and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Jan 20 14:26:37 EST 2008
Author: timfox
Date: 2008-01-20 14:26:37 -0500 (Sun, 20 Jan 2008)
New Revision: 3595
Modified:
trunk/src/main/org/jboss/jms/message/JBossMessage.java
trunk/src/main/org/jboss/messaging/core/impl/filter/FilterImpl.java
trunk/src/main/org/jboss/messaging/core/impl/filter/Operator.java
Log:
Removed references to jboss.util.Primitives
Modified: trunk/src/main/org/jboss/jms/message/JBossMessage.java
===================================================================
--- trunk/src/main/org/jboss/jms/message/JBossMessage.java 2008-01-18 15:15:19 UTC (rev 3594)
+++ trunk/src/main/org/jboss/jms/message/JBossMessage.java 2008-01-20 19:26:37 UTC (rev 3595)
@@ -41,7 +41,6 @@
import org.jboss.jms.exception.MessagingJMSException;
import org.jboss.logging.Logger;
import org.jboss.messaging.core.impl.MessageImpl;
-import org.jboss.util.Primitives;
import org.jboss.util.Strings;
/**
@@ -683,7 +682,7 @@
public void setBooleanProperty(String name, boolean value) throws JMSException
{
- Boolean b = Primitives.valueOf(value);
+ Boolean b = Boolean.valueOf(value);
checkProperty(name, b);
message.putHeader(name, b);
}
Modified: trunk/src/main/org/jboss/messaging/core/impl/filter/FilterImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/filter/FilterImpl.java 2008-01-18 15:15:19 UTC (rev 3594)
+++ trunk/src/main/org/jboss/messaging/core/impl/filter/FilterImpl.java 2008-01-20 19:26:37 UTC (rev 3595)
@@ -35,10 +35,11 @@
*
* Derived from JBoss MQ version by
*
-* @author <a href="mailto:Norbert.Lataille at m4x.org">Norbert Lataille</a>
-* @author <a href="mailto:jplindfo at helsinki.fi">Juha Lindfors</a>
-* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
-* @author <a href="mailto:Scott.Stark at jboss.org">Scott Stark</a>
+* @author <a href="mailto:Norbert.Lataille at m4x.org">Norbert Lataille</a>
+* @author <a href="mailto:jplindfo at helsinki.fi">Juha Lindfors</a>
+* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
+* @author <a href="mailto:Scott.Stark at jboss.org">Scott Stark</a>
+* @authro <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
* @version $Revision: 3569 $
*
Modified: trunk/src/main/org/jboss/messaging/core/impl/filter/Operator.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/filter/Operator.java 2008-01-18 15:15:19 UTC (rev 3594)
+++ trunk/src/main/org/jboss/messaging/core/impl/filter/Operator.java 2008-01-20 19:26:37 UTC (rev 3595)
@@ -24,16 +24,15 @@
import java.util.HashSet;
-import org.jboss.util.Primitives;
-
/**
-* An operator for JBM filters
+* Implementations of the operators used in JBM filter expressions
*
-* @author Norbert Lataille (Norbert.Lataille at m4x.org)
-* @author droy at boostmyscore.com
-* @author Scott.Stark at jboss.org
-* @author adrian at jboss.com
-* @version $Revision: 2681 $
+* @author Norbert Lataille (Norbert.Lataille at m4x.org)
+* @author droy at boostmyscore.com
+* @author Scott.Stark at jboss.org
+* @author adrian at jboss.com
+* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+* @version $Revision: 2681 $
*/
public class Operator
{
@@ -190,9 +189,9 @@
if (arg2 == null)
return null;
if (class2 == LONG)
- return Primitives.valueOf(((Number) arg1).longValue() == ((Number) arg2).longValue());
+ return Boolean.valueOf(((Number) arg1).longValue() == ((Number) arg2).longValue());
if (class2 == DOUBLE)
- return Primitives.valueOf(((Number) arg1).longValue() == ((Number) arg2).doubleValue());
+ return Boolean.valueOf(((Number) arg1).longValue() == ((Number) arg2).doubleValue());
return Boolean.FALSE;
case DOUBLE:
computeArgument1();
@@ -202,9 +201,9 @@
if (arg2 == null)
return null;
if (class2 == LONG)
- return Primitives.valueOf(((Number) arg1).doubleValue() == ((Number) arg2).longValue());
+ return Boolean.valueOf(((Number) arg1).doubleValue() == ((Number) arg2).longValue());
if (class2 == DOUBLE)
- return Primitives.valueOf(((Number) arg1).doubleValue() == ((Number) arg2).doubleValue());
+ return Boolean.valueOf(((Number) arg1).doubleValue() == ((Number) arg2).doubleValue());
return Boolean.FALSE;
case STRING:
case BOOLEAN:
@@ -213,7 +212,7 @@
return Boolean.FALSE;
if (class2 != class1)
throwBadObjectException(class1, class2);
- return Primitives.valueOf(arg1.equals(arg2));
+ return Boolean.valueOf(arg1.equals(arg2));
default:
throwBadObjectException(class1);
return null;
@@ -322,9 +321,9 @@
if (arg2 == null)
return null;
if (class2 == LONG)
- return Primitives.valueOf(((Number) arg1).longValue() > ((Number) arg2).longValue());
+ return Boolean.valueOf(((Number) arg1).longValue() > ((Number) arg2).longValue());
if (class2 == DOUBLE)
- return Primitives.valueOf(((Number) arg1).longValue() > ((Number) arg2).doubleValue());
+ return Boolean.valueOf(((Number) arg1).longValue() > ((Number) arg2).doubleValue());
}
else if ( class1 == DOUBLE )
{
@@ -332,9 +331,9 @@
if (arg2 == null)
return null;
if (class2 == LONG)
- return Primitives.valueOf(((Number) arg1).doubleValue() > ((Number) arg2).longValue());
+ return Boolean.valueOf(((Number) arg1).doubleValue() > ((Number) arg2).longValue());
if (class2 == DOUBLE)
- return Primitives.valueOf(((Number) arg1).doubleValue() > ((Number) arg2).doubleValue());
+ return Boolean.valueOf(((Number) arg1).doubleValue() > ((Number) arg2).doubleValue());
return Boolean.FALSE;
}
return Boolean.FALSE;
@@ -353,9 +352,9 @@
if (arg2 == null)
return null;
if (class2 == LONG)
- return Primitives.valueOf(((Number) arg1).longValue() >= ((Number) arg2).longValue());
+ return Boolean.valueOf(((Number) arg1).longValue() >= ((Number) arg2).longValue());
if (class2 == DOUBLE)
- return Primitives.valueOf(((Number) arg1).longValue() >= ((Number) arg2).doubleValue());
+ return Boolean.valueOf(((Number) arg1).longValue() >= ((Number) arg2).doubleValue());
}
else if ( class1 == DOUBLE )
{
@@ -363,9 +362,9 @@
if (arg2 == null)
return null;
if (class2 == LONG)
- return Primitives.valueOf(((Number) arg1).longValue() >= ((Number) arg2).longValue());
+ return Boolean.valueOf(((Number) arg1).longValue() >= ((Number) arg2).longValue());
if (class2 == DOUBLE)
- return Primitives.valueOf(((Number) arg1).doubleValue() >= ((Number) arg2).doubleValue());
+ return Boolean.valueOf(((Number) arg1).doubleValue() >= ((Number) arg2).doubleValue());
return Boolean.FALSE;
}
return Boolean.FALSE;
@@ -384,9 +383,9 @@
if (arg2 == null)
return null;
if (class2 == LONG)
- return Primitives.valueOf(((Number) arg1).longValue() < ((Number) arg2).longValue());
+ return Boolean.valueOf(((Number) arg1).longValue() < ((Number) arg2).longValue());
if (class2 == DOUBLE)
- return Primitives.valueOf(((Number) arg1).longValue() < ((Number) arg2).doubleValue());
+ return Boolean.valueOf(((Number) arg1).longValue() < ((Number) arg2).doubleValue());
}
else if (class1 == DOUBLE)
{
@@ -394,9 +393,9 @@
if (arg2 == null)
return null;
if (class2 == LONG)
- return Primitives.valueOf(((Number) arg1).doubleValue() < ((Number) arg2).longValue());
+ return Boolean.valueOf(((Number) arg1).doubleValue() < ((Number) arg2).longValue());
if (class2 == DOUBLE)
- return Primitives.valueOf(((Number) arg1).doubleValue() < ((Number) arg2).doubleValue());
+ return Boolean.valueOf(((Number) arg1).doubleValue() < ((Number) arg2).doubleValue());
}
return Boolean.FALSE;
@@ -415,9 +414,9 @@
if (arg2 == null)
return null;
if (class2 == LONG)
- return Primitives.valueOf(((Number) arg1).longValue() <= ((Number) arg2).longValue());
+ return Boolean.valueOf(((Number) arg1).longValue() <= ((Number) arg2).longValue());
if (class2 == DOUBLE)
- return Primitives.valueOf(((Number) arg1).longValue() <= ((Number) arg2).doubleValue());
+ return Boolean.valueOf(((Number) arg1).longValue() <= ((Number) arg2).doubleValue());
}
else if (class1 == DOUBLE)
{
@@ -425,9 +424,9 @@
if (arg2 == null)
return null;
if (class2 == LONG)
- return Primitives.valueOf(((Number) arg1).doubleValue() <= ((Number) arg2).longValue());
+ return Boolean.valueOf(((Number) arg1).doubleValue() <= ((Number) arg2).longValue());
if (class2 == DOUBLE)
- return Primitives.valueOf(((Number) arg1).doubleValue() <= ((Number) arg2).doubleValue());
+ return Boolean.valueOf(((Number) arg1).doubleValue() <= ((Number) arg2).doubleValue());
}
return Boolean.FALSE;
}
@@ -449,9 +448,9 @@
if (arg2 == null)
return null;
if (class2 == LONG)
- return Primitives.valueOf(((Number) arg1).longValue() != ((Number) arg2).longValue());
+ return Boolean.valueOf(((Number) arg1).longValue() != ((Number) arg2).longValue());
if (class2 == DOUBLE)
- return Primitives.valueOf(((Number) arg1).longValue() != ((Number) arg2).doubleValue());
+ return Boolean.valueOf(((Number) arg1).longValue() != ((Number) arg2).doubleValue());
return Boolean.FALSE;
case DOUBLE:
computeArgument1();
@@ -461,9 +460,9 @@
if (arg2 == null)
return null;
if (class2 == LONG)
- return Primitives.valueOf(((Number) arg1).doubleValue() != ((Number) arg2).longValue());
+ return Boolean.valueOf(((Number) arg1).doubleValue() != ((Number) arg2).longValue());
if (class2 == DOUBLE)
- return Primitives.valueOf(((Number) arg1).doubleValue() != ((Number) arg2).doubleValue());
+ return Boolean.valueOf(((Number) arg1).doubleValue() != ((Number) arg2).doubleValue());
return Boolean.FALSE;
case STRING:
case BOOLEAN:
@@ -472,7 +471,7 @@
return Boolean.FALSE;
if (class2 != class1)
throwBadObjectException(class1, class2);
- return Primitives.valueOf(arg1.equals(arg2) == false);
+ return Boolean.valueOf(arg1.equals(arg2) == false);
default:
throwBadObjectException(class1);
}
More information about the jboss-cvs-commits
mailing list