- Minor update in one of the Image class constructors

pborissow · pborissow · commit 5577f1f0bd7a · 2016-08-12T22:25:46.000Z
- Updated the equals() method in the javaxt.utils.Value class to better handle BigDecimals.
 - Added toString() method to the Function class.

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-core@791 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff
diff --git a/src/javaxt/io/Image.java b/src/javaxt/io/Image.java
@@ -66,8 +66,9 @@ public Image(String PathToImageFile){
         this(new java.io.File(PathToImageFile));
     }
     
-    public Image(java.io.File File){
-        createBufferedImage(File);
+    public Image(java.io.File file){
+        try{ createBufferedImage(new FileInputStream(file)); }
+        catch(Exception e){}
     }
 
     public Image(java.io.InputStream InputStream){
@@ -547,27 +548,12 @@ public void addImage(javaxt.io.Image in, int x, int y, boolean expand){
     }
 
 
-  //**************************************************************************
-  //** createBufferedImage
-  //**************************************************************************
-  /** Used to create a BufferedImage from a File */
-
-    private void createBufferedImage(java.io.File file){
-        try{
-            createBufferedImage(new FileInputStream(file));
-        }
-        catch(Exception e){
-            //printError(e);
-        }
-    }
-
-
   //**************************************************************************
   //** createBufferedImage
   //**************************************************************************
   /** Used to create a BufferedImage from a InputStream */
     
-    private void createBufferedImage(java.io.InputStream input){
+    private void createBufferedImage(java.io.InputStream input) {
         try{
             //bufferedImage = ImageIO.read(input);
 
@@ -592,7 +578,7 @@ private void createBufferedImage(java.io.InputStream input){
             }
 
 
-            input.close(); 
+            input.close();
         }
         catch(Exception e){
             //e.printStackTrace();
diff --git a/src/javaxt/sql/Function.java b/src/javaxt/sql/Function.java
@@ -45,4 +45,8 @@ public boolean hasValues(){
     public Object[] getValues(){
         return values;
     }
+    
+    public String toString(){
+        return function;
+    }
 }
diff --git a/src/javaxt/utils/Value.java b/src/javaxt/utils/Value.java
@@ -269,6 +269,22 @@ public boolean equals(Object obj){
         else{
             if (value==null) return false;
         }
+        
+        
+      //Special case for BigDecimal. BigDecimal objects equal only if they are 
+      //equal in value and scale. Thus 2.0 is not equal to 2.00 when compared 
+      //using the equals() method. The following code removes this ambiguity.
+        if (!obj.equals(value)){
+            if (obj.getClass().equals(value.getClass())){
+                if (obj.getClass().equals(java.math.BigDecimal.class)){
+                    java.math.BigDecimal bd1 = (java.math.BigDecimal) obj;
+                    java.math.BigDecimal bd2 = (java.math.BigDecimal) value;
+                    return bd1.stripTrailingZeros().equals(bd2.stripTrailingZeros());
+                }
+            }
+        }
+        
+        
         return obj.equals(value);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,8 @@ public boolean hasValues(){`
`45`	`45`	`public Object[] getValues(){`
`46`	`46`	`return values;`
`47`	`47`	`}`
	`48`	`+`
	`49`	`+ public String toString(){`
	`50`	`+ return function;`
	`51`	`+ }`
`48`	`52`	`}`