clean up

Author: umjammer

pom.xml

@@ -233,9 +233,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>vavi</groupId>
+      <groupId>com.github.umjammer</groupId>
       <artifactId>vavi-commons</artifactId>
-      <version>1.1.8-SNAPSHOT</version>
+      <version>1.1.8</version>
     </dependency>
     <dependency>
       <groupId>com.github.umjammer</groupId>
@@ -255,12 +255,6 @@
       <version>2.1.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.2</version>
-      <scope>test</scope>
-    </dependency>
 
     <dependency>
       <groupId>org.junit.jupiter</groupId>

src/main/java/vavi/awt/image/ico/ACON.java

@@ -8,8 +8,10 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.logging.Level;
 
 import vavi.io.LittleEndianDataInputStream;
+import vavi.util.Debug;
 import vavi.util.win32.Chunk;
 import vavi.util.win32.RIFF;
 
@@ -35,11 +37,6 @@ public static String getExtention() {
         return "ani";
     }
 
-    /** for debug */
-    protected void printData() {
-        System.err.println("---- data ----");
-    }
-
     /** */
     private anih header;
 
@@ -87,30 +84,23 @@ protected void printData() {
 
     /** */
     public class anih extends Chunk {
+
         /** */
         int size;
-
         /** */
         int frames;
-
         /** */
         int steps;
-
         /** */
         int x;
-
         /** */
         int y;
-
         /** */
         int bits;
-
         /** */
         int plains;
-
         /** */
         int jifrate;
-
         /** */
         int flags;
 
@@ -128,23 +118,23 @@ public void setData(InputStream is) throws IOException {
             plains = ledis.readInt();
             jifrate = ledis.readInt();
             flags = ledis.readInt();
-            printData();
+Debug.println(Level.FINE, this);
             icons = new WindowsIcon[frames];
             count = 0;
 
             header = this;
         }
 
-        protected void printData() {
-            System.err.println("size: " + size);
-            System.err.println("frames: " + frames);
-            System.err.println("steps: " + steps);
-            System.err.println("x: " + x);
-            System.err.println("y: " + y);
-            System.err.println("bits: " + bits);
-            System.err.println("plains: " + plains);
-            System.err.println("jifrate: " + jifrate);
-            System.err.println("flags: " + flags);
+        @Override public String toString() {
+            return "size: " + size
+                    + "frames: " + frames
+                    + "steps: " + steps
+                    + "x: " + x
+                    + "y: " + y
+                    + "bits: " + bits
+                    + "plains: " + plains
+                    + "jifrate: " + jifrate
+                    + "flags: " + flags;
         }
     }
 

src/test/java/vavi/awt/image/bmp/ACONTest.java

@@ -15,6 +15,7 @@
 import org.junit.jupiter.api.Test;
 
 import vavi.awt.image.ico.ACON;
+import vavi.util.Debug;
 
 
 /**
@@ -29,7 +30,7 @@ class ACONTest {
     void test() throws Exception {
         InputStream is = new BufferedInputStream(ACON.class.getResourceAsStream("/test.ico"));
         ACON ani = ACON.readFrom(is, ACON.class);
-System.err.println("ACON: " + ani);
+Debug.println("ACON: " + ani);
     }
 
     // ----
@@ -38,7 +39,7 @@ void test() throws Exception {
     public static void main(String[] args) throws Exception {
         InputStream is = new BufferedInputStream(Files.newInputStream(Paths.get(args[0])));
         ACON ani = ACON.readFrom(is, ACON.class);
-System.err.println("ACON: " + ani);
+Debug.println("ACON: " + ani);
     }
 }
 

src/test/resources/logging.properties

@@ -7,4 +7,4 @@ java.util.logging.ConsoleHandler.formatter=vavi.util.logging.VaviFormatter
 #sun.awt.level=INFO
 #sun.lwawt.level=INFO
 #javax.swing.level=INFO
-vavi.util.level=FINE
+#vavi.util.level=FINE