- Tweaked logic in the Image.addImage(). Added special case for transparent GIFs. They are (incorrectly) identified as TYPE_BYTE_BINARY (12). This resulted in black and white images for images that should have been ARGB.

pborissow · pborissow · commit e3c823189cc3 · 2012-04-05T15:02:40.000Z
- Updated comments

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-core@277 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff
diff --git a/src/javaxt/io/Image.java b/src/javaxt/io/Image.java
@@ -109,7 +109,15 @@ public Image(RenderedImage img) {
   //**************************************************************************
   //** Image
   //**************************************************************************
-  /**  Used to create a new image from text. */
+  /** Used to create a new image from text. 
+   *  @param fontName Name of the font you with to use. Note that you can get
+   *  a list of available fonts like this:
+   <pre>
+    for (String fontName : GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames()){
+        System.out.println(fontName);
+    }   
+   </pre>
+   */
 
     public Image(String text, String fontName, int fontSize, int r, int g, int b){
         this(text, new Font(fontName, Font.TRUETYPE_FONT, fontSize), r,g,b);
@@ -232,16 +240,8 @@ private static String[] getFormats(String[] inputFormats){
              }
         }
         
-      //Convert the HashSet into an Array
-        int x = 0;
-        inputFormats = new String[formats.size()];
-        Iterator<String> format = formats.iterator();
-        while(format.hasNext()){
-            inputFormats[x] = format.next();
-            x++;
-        }
-
-      //Sort and return the array
+      //Sort and return the hashset as an array
+        inputFormats = formats.toArray(new String[formats.size()]);
         java.util.Collections.sort(java.util.Arrays.asList(inputFormats));
         return inputFormats;
     }
@@ -433,7 +433,10 @@ else if(y>h){
             
       //Create new image "collage"
         if (w>bufferedImage.getWidth() || h>bufferedImage.getHeight()){
-            int imageType = BufferedImage.TYPE_INT_ARGB;
+            int imageType = bufferedImage.getType();
+            if (imageType == 0 || imageType == 12) {
+                imageType = BufferedImage.TYPE_INT_ARGB;
+            }
             BufferedImage bi = new BufferedImage(w, h, imageType);
             Graphics2D g2d = bi.createGraphics();
             java.awt.Image img = bufferedImage;
diff --git a/src/javaxt/utils/Date.java b/src/javaxt/utils/Date.java
@@ -462,12 +462,11 @@ public boolean isAfter(javaxt.utils.Date Date){
   //**************************************************************************
   //** Add
   //**************************************************************************
-  /**  Used to add to (or subtract from) the current date. 
-   *   Returns a date to which a specified time interval has been added.
-   *  @param units Units of measure (e.g. hours, minutes, seconds, weeks,
+  /** Used to add to (or subtract from) the current date. Returns a date to
+   *  which a specified time interval has been added.
+   *  @param units Unit of measure (e.g. hours, minutes, seconds, days, weeks,
    *  months, years, etc.)
-   */
-    
+   */    
     public java.util.Date add(int amount, String units){
 
         Calendar cal = Calendar.getInstance();
