From: Niki Roo <roo.niki@gmail.com>
Date: Thu, 24 Mar 2016 15:57:54 +0000 (+0100)
Subject: Compat Java 1.5+ (again)
X-Git-Tag: v1.0-beta3~5
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=08fbe0fb5e86bc7f1bec0a0b9e2d06290a70b212;p=jvcard.git

Compat Java 1.5+ (again)
---

diff --git a/Makefile b/Makefile
index 68b1b0d..6781581 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,23 @@
 # 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
 
-# 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/
+	touch bin/5
 
-6: lanterna files
+bin/6: lanterna files
 	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/
+	touch bin/7
 
-files:
+files: src/be/nikiroo/jvcard/*/* src/be/nikiroo/jvcard/*
 	find src/be/ -name '*.java' > files
 
 lanterna:
diff --git a/src/be/nikiroo/jvcard/TypeInfo.java b/src/be/nikiroo/jvcard/TypeInfo.java
index c5b812c..847cc25 100644
--- a/src/be/nikiroo/jvcard/TypeInfo.java
+++ b/src/be/nikiroo/jvcard/TypeInfo.java
@@ -7,7 +7,7 @@ package be.nikiroo.jvcard;
  *
  */
 @SuppressWarnings("rawtypes")
-public class TypeInfo extends BaseClass {
+public class TypeInfo extends BaseClass<TypeInfo> {
 	private String name;
 	private String value;
 
@@ -54,4 +54,4 @@ public class TypeInfo extends BaseClass {
 	public String getState() {
 		return ("" + name + value).replace(' ', '_');
 	}
-}
\ No newline at end of file
+}