Fix Eclipse 3.5 warnings

h2/src/main/org/h2/value/DataType.java

@@ -25,7 +25,6 @@ import java.util.UUID;
 
 import org.h2.constant.ErrorCode;
 import org.h2.constant.SysProperties;
-import org.h2.engine.Constants;
 import org.h2.engine.SessionInterface;
 import org.h2.jdbc.JdbcBlob;
 import org.h2.jdbc.JdbcClob;
@@ -195,14 +194,6 @@ public class DataType {
         for (int i = 0; i < Value.TYPE_COUNT; i++) {
             TYPES_BY_VALUE_TYPE.add(null);
         }
-        //## Java 1.4 begin ##
-        if (TYPE_BOOLEAN != Types.BOOLEAN) {
-            new Exception("Types.BOOLEAN: " + Types.BOOLEAN).printStackTrace();
-        }
-        if (TYPE_DATALINK != Types.DATALINK) {
-            new Exception("Types.DATALINK: " + Types.DATALINK).printStackTrace();
-        }
-        //## Java 1.4 end ##
         add(Value.NULL, Types.NULL, "Null",
                 new DataType(),
                 new String[]{"NULL"},
@@ -829,10 +820,7 @@ public class DataType {
             return ValueNull.INSTANCE;
         }
         if (type == Value.JAVA_OBJECT) {
-            // serialize JAVA_OBJECT, even if the type is known
-            if (Constants.SERIALIZE_JAVA_OBJECTS) {
-                return ValueJavaObject.getNoCopy(ObjectUtils.serialize(x));
-            }
+            return ValueJavaObject.getNoCopy(ObjectUtils.serialize(x));
         }
         if (x instanceof String) {
             return ValueString.get((String) x);
@@ -888,10 +876,7 @@ public class DataType {
             }
             return ValueArray.get(v);
         } else {
-            if (Constants.SERIALIZE_JAVA_OBJECTS) {
-                return ValueJavaObject.getNoCopy(ObjectUtils.serialize(x));
-            }
-            throw Message.getSQLException(ErrorCode.UNKNOWN_DATA_TYPE_1, x.getClass().getName());
+            return ValueJavaObject.getNoCopy(ObjectUtils.serialize(x));
         }
     }
 

h2/src/main/org/h2/value/Value.java

@@ -20,7 +20,6 @@ import java.sql.Types;
 
 import org.h2.constant.ErrorCode;
 import org.h2.constant.SysProperties;
-import org.h2.engine.Constants;
 import org.h2.message.Message;
 import org.h2.store.DataHandler;
 import org.h2.tools.SimpleResultSet;
@@ -901,20 +900,14 @@ public abstract class Value {
             // TODO document that +Infinity, -Infinity throw an exception and NaN returns 0
             throw Message.getSQLException(ErrorCode.NUMERIC_VALUE_OUT_OF_RANGE);
         }
-        if (Constants.CONVERT_TO_LONG_ROUND) {
-            return Math.round(x);
-        }
-        return (long) x;
+        return Math.round(x);
     }
 
     private long convertToLong(BigDecimal x) throws SQLException {
         if (x.compareTo(MAX_LONG_DECIMAL) > 0 || x.compareTo(Value.MIN_LONG_DECIMAL) < 0) {
             throw Message.getSQLException(ErrorCode.NUMERIC_VALUE_OUT_OF_RANGE);
         }
-        if (Constants.CONVERT_TO_LONG_ROUND) {
-            return x.setScale(0, BigDecimal.ROUND_HALF_UP).longValue();
-        }
-        return x.longValue();
+        return x.setScale(0, BigDecimal.ROUND_HALF_UP).longValue();
     }
 
     /**

h2/src/main/org/h2/value/ValueDouble.java

@@ -71,8 +71,7 @@ public class ValueDouble extends Value {
             return "POWER(0, -1)";
         } else if (value == Double.NEGATIVE_INFINITY) {
             return "(-POWER(0, -1))";
-        } else if (value != value) {
-            // NaN
+        } else if (Double.isNaN(value)) {
             return "SQRT(-1)";
         }
         return getString();

h2/src/main/org/h2/value/ValueFloat.java

@@ -70,7 +70,7 @@ public class ValueFloat extends Value {
             return "POWER(0, -1)";
         } else if (value == Float.NEGATIVE_INFINITY) {
             return "(-POWER(0, -1))";
-        } else if (value != value) {
+        } else if (Double.isNaN(value)) {
             // NaN
             return "SQRT(-1)";
         }