Merge pull request #146 from spyhunter99/137

#137 fix for jdk7 issues

Author: MKergall

osmdroid-android/src/main/java/org/osmdroid/bonuspack/kml/KmlDocument.java

@@ -16,6 +16,7 @@
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.LinkedList;
+import java.util.Map;
 import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -623,7 +624,7 @@ public boolean saveAsKML(Writer writer){
 	}
 
 	public void writeKMLStyles(Writer writer){
-		for (HashMap.Entry<String, StyleSelector> entry : mStyles.entrySet()) {
+		for (Map.Entry<String, StyleSelector> entry : mStyles.entrySet()) {
 			String styleId = entry.getKey();
 			StyleSelector styleSelector = entry.getValue();
 			styleSelector.writeAsKML(writer, styleId);

osmdroid-android/src/main/java/org/osmdroid/bonuspack/kml/KmlFeature.java

@@ -3,6 +3,8 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.osmdroid.bonuspack.overlays.Marker;
 import org.osmdroid.bonuspack.overlays.Polygon;
@@ -128,7 +130,7 @@ public String getExtendedDataAsText(){
 		if (mExtendedData == null)
 			return null;
 		StringBuilder result = new StringBuilder();
-		for (HashMap.Entry<String, String> entry : mExtendedData.entrySet()) {
+		for (Map.Entry<String, String> entry : mExtendedData.entrySet()) {
 			String name = entry.getKey();
 			String value = entry.getValue();
 			result.append(name+"="+value+"<br>\n");
@@ -156,7 +158,7 @@ protected boolean writeKMLExtendedData(Writer writer){
 			return true;
 		try {
 			writer.write("<ExtendedData>\n");
-			for (HashMap.Entry<String, String> entry : mExtendedData.entrySet()) {
+			for (Map.Entry<String, String> entry : mExtendedData.entrySet()) {
 				String name = entry.getKey();
 				String value = entry.getValue();
 				writer.write("<Data name=\""+name+"\"><value>"+StringEscapeUtils.escapeXml10(value)+"</value></Data>\n");

osmdroid-android/src/main/java/org/osmdroid/bonuspack/kml/KmlPlacemark.java

@@ -138,7 +138,7 @@ protected JsonObject geoJSONProperties(){
 				json.addProperty("name", mName);
 			}
 			if (mExtendedData != null){
-				for (HashMap.Entry<String, String> entry : mExtendedData.entrySet()) {
+				for (Map.Entry<String, String> entry : mExtendedData.entrySet()) {
 					String name = entry.getKey();
 					String value = entry.getValue();
 					json.addProperty(name, value);

osmdroid-android/src/main/java/org/osmdroid/bonuspack/kml/StyleMap.java

@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.util.HashMap;
+import java.util.Map;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -37,7 +38,7 @@ public Style getNormalStyle(KmlDocument doc){
 	@Override public void writeAsKML(Writer writer, String styleId){
 		try {
 			writer.write("<StyleMap id=\'"+styleId+"\'>\n");
-			for (HashMap.Entry<String, String> entry : mPairs.entrySet()) {
+			for (Map.Entry<String, String> entry : mPairs.entrySet()) {
 				String key = entry.getKey();
 				String styleUrl = entry.getValue();
 				writer.write("<Pair><key>"+key+"</key><styleUrl>"+styleUrl+"</styleUrl></Pair>\n");