Compat Java 1.5+ (again)

diff --git a/Makefile b/Makefile
index 68b1b0d4ed9937f28be08e154eeb76c45246946b..678158102695efbb9f490c665597a3f1a68b0126 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,23 @@
 # default target: create the jar file
 # default target: create the jar file

-ALL: jar
+ALL: bin/5 jvcard.jar

 
 

-# always re-generate the files list
-.PHONY: classes files 5 6 7 jar
-
-jar: classes
+jvcard.jar: bin/be/nikiroo/jvcard/*/* bin/be/nikiroo/jvcard/*

        echo TODO: jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | cut -d'"' -f2`.jar
        cp jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | cut -d'"' -f2`.jar jvcard.jar
 
        echo TODO: jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | cut -d'"' -f2`.jar
        cp jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | cut -d'"' -f2`.jar jvcard.jar
 

-# Default java version: 1.5
-classes: 5
-
-5: lanterna files
+bin/5: lanterna files

        javac -cp bin/ -encoding UTF-8 -Xlint -source 5 @files -d bin/
        javac -cp bin/ -encoding UTF-8 -Xlint -source 5 @files -d bin/

+       touch bin/5

 
 

-6: lanterna files
+bin/6: lanterna files

        javac -cp bin/ -encoding UTF-8 -Xlint -source 6 @files -d bin/
        javac -cp bin/ -encoding UTF-8 -Xlint -source 6 @files -d bin/

+       touch bin/6

 
 

-7: lanterna files
+bin/7: lanterna files

        javac -cp bin/ -encoding UTF-8 -Xlint -source 7 @files -d bin/
        javac -cp bin/ -encoding UTF-8 -Xlint -source 7 @files -d bin/

+       touch bin/7

 
 

-files:
+files: src/be/nikiroo/jvcard/*/* src/be/nikiroo/jvcard/*

        find src/be/ -name '*.java' > files
 
 lanterna:
        find src/be/ -name '*.java' > files
 
 lanterna:

diff --git a/src/be/nikiroo/jvcard/TypeInfo.java b/src/be/nikiroo/jvcard/TypeInfo.java
index c5b812cc89939ae556f3b62f48bb7c234ce6ac11..847cc25189a65ee1e58291fce5d7813193b11e83 100644 (file)
--- a/src/be/nikiroo/jvcard/TypeInfo.java
+++ b/src/be/nikiroo/jvcard/TypeInfo.java
@@ -7,7 +7,7 @@ package be.nikiroo.jvcard;
  *
  */
 @SuppressWarnings("rawtypes")
  *
  */
 @SuppressWarnings("rawtypes")

-public class TypeInfo extends BaseClass {
+public class TypeInfo extends BaseClass<TypeInfo> {

        private String name;
        private String value;
 
        private String name;
        private String value;
 


@@ -54,4 +54,4 @@ public class TypeInfo extends BaseClass {
        public String getState() {
                return ("" + name + value).replace(' ', '_');
        }
        public String getState() {
                return ("" + name + value).replace(' ', '_');
        }

-}
\ No newline at end of file
+}