Merge branch '0.7'

Conflicts:
	.hgignore
	src/tiled/mapeditor/MapEditor.java
	src/tiled/view/IsoMapView.java

Author: bjorn

.hgignore

@@ -1,11 +1,13 @@
-syntax: glob
-*.class
-*.jar
-build/*
-intellij/*
+syntax: glob
+*.class
+*.jar
+build/*
+docs/*
+intellij/*
+docs/api/*
+releases/*.zip
 \.orig\..*$
 \.orig$
 \.chg\..*$
 \.rej$
 \.conflict\~$
-docs/api/*

CHANGES

@@ -1,5 +1,12 @@
+0.7.2 - November 30th, 2008
+
 * Added support for associating an image with a map object
 * Fixed not being able to move an object group
+* Fixed unable to select small map objects
+* Fixed references to external tilesets that are not in the same directory
+* Fixed some files missing from tiled-core.jar
+* Updated The Mana World plugin to detect the collision layer correctly
+* Updated minimum Java version to 1.5
 
 0.7.1 - September 2nd, 2008
 

TODO

@@ -1,6 +1,6 @@
 ROADMAP TO FUTURE RELEASES
 
-0.7.2
+0.7.3
 * Check that tile palette panel doesn't keep listening after being replaced
 * Update translations for dialog.saveas.confirm.mismatch
 * Make continuous layout and tiles per row behaviour configurable

plugins/json/build.xml

@@ -10,7 +10,7 @@
   <target name="dist" description="Generate the JSON writer plugin">
     <!-- Create the build directory structure used by compile -->
     <mkdir dir="${build}"/>
-    <javac source="1.4" target="1.4" srcdir="${src}" destdir="${build}" classpath="${dist}/tiled.jar"/>
+    <javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}" classpath="${dist}/tiled.jar"/>
     <jar
       jarfile="${dist}/plugins/json.jar"
       manifest="MANIFEST.MF"

plugins/json/src/org/json/CookieList.java

@@ -51,7 +51,7 @@ public static JSONObject toJSONObject(String string)
      */
     public static String toString(JSONObject o) {
         boolean      b = false;
-        Iterator     keys = o.keys();
+        Iterator<String>     keys = o.keys();
         String       s;
         StringBuffer sb = new StringBuffer();
         while (keys.hasNext()) {

plugins/json/src/org/json/HTTP.java

@@ -107,7 +107,7 @@ public static JSONObject toJSONObject(String string) throws ParseException {
      *  information. 
      */
     public static String toString(JSONObject o) throws NoSuchElementException {
-        Iterator     keys = o.keys();
+        Iterator<String>     keys = o.keys();
         String       s;
         StringBuffer sb = new StringBuffer();
         if (o.has("Status-Code") && o.has("Reason-Phrase")) {

plugins/json/src/org/json/JSONArray.java

@@ -47,14 +47,14 @@ public class JSONArray {
     /**
      * The getArrayList where the JSONArray's properties are kept.
      */
-    private ArrayList myArrayList;
+    private ArrayList<Object> myArrayList;
 
 
     /**
      * Construct an empty JSONArray.
      */
     public JSONArray() {
-        myArrayList = new ArrayList();
+        myArrayList = new ArrayList<Object>();
     }
 
 
@@ -113,8 +113,8 @@ public JSONArray(String string) throws ParseException {
      * Construct a JSONArray from a Collection.
      * @param collection     A Collection.
      */
-    public JSONArray(Collection collection) {
-        myArrayList = new ArrayList(collection);
+    public JSONArray(Collection<Object> collection) {
+        myArrayList = new ArrayList<Object>(collection);
     }
 
 
@@ -139,7 +139,7 @@ public Object get(int index) throws NoSuchElementException {
      * Get the ArrayList which is holding the elements of the JSONArray.
      * @return      The ArrayList.
      */
-    ArrayList getArrayList() {
+    ArrayList<Object> getArrayList() {
         return myArrayList;
     }
 

plugins/json/src/org/json/JSONObject.java

@@ -92,7 +92,7 @@ public String toString() {
     /**
      * The hash map where the JSONObject's properties are kept.
      */
-    private HashMap myHashMap;
+    private HashMap<String, Object> myHashMap;
 
     /**
      * It is sometimes more convenient and less ambiguous to have a NULL
@@ -106,7 +106,7 @@ public String toString() {
      * Construct an empty JSONObject.
      */
     public JSONObject() {
-        myHashMap = new HashMap();
+        myHashMap = new HashMap<String, Object>();
     }
 
 
@@ -175,8 +175,8 @@ public JSONObject(String string) throws ParseException {
      * @param map A map object that can be used to initialize the contents of
      *  the JSONObject.
      */
-    public JSONObject(Map map) {
-        myHashMap = new HashMap(map);
+    public JSONObject(Map<String, Object> map) {
+        myHashMap = new HashMap<String, Object>(map);
     }
 
 
@@ -278,7 +278,7 @@ public double getDouble(String key)
      * Get the HashMap the holds that contents of the JSONObject.
      * @return The getHashMap.
      */
-     HashMap getHashMap() {
+     HashMap<String, Object> getHashMap() {
         return myHashMap;
      }
 
@@ -373,7 +373,7 @@ public boolean isNull(String key) {
      *
      * @return An iterator of the keys.
      */
-    public Iterator keys() {
+    public Iterator<String> keys() {
         return myHashMap.keySet().iterator();
     }
 
@@ -396,7 +396,7 @@ public int length() {
      */
     public JSONArray names() {
         JSONArray ja = new JSONArray();
-        Iterator  keys = keys();
+        Iterator<String>  keys = keys();
         while (keys.hasNext()) {
             ja.put(keys.next());
         }
@@ -805,7 +805,7 @@ public JSONArray toJSONArray(JSONArray names) {
      *  with <code>}</code>&nbsp;<small>(right brace)</small>.
      */
     public String toString() {
-        Iterator     keys = keys();
+        Iterator<String>     keys = keys();
         Object       o = null;
         String       s;
         StringBuffer sb = new StringBuffer();
@@ -864,7 +864,7 @@ public String toString(int indentFactor) {
      */
     String toString(int indentFactor, int indent) {
         int          i;
-        Iterator     keys = keys();
+        Iterator<String>     keys = keys();
         String       pad = "";
         StringBuffer sb = new StringBuffer();
         indent += indentFactor;

plugins/json/src/org/json/XML.java

@@ -266,7 +266,7 @@ public static String toString(Object o, String tagName) {
         JSONArray    ja;
         JSONObject   jo;
         String       k;
-        Iterator     keys;
+        Iterator<String>     keys;
         int          len;
         String       s;
         Object       v;

plugins/json/src/org/json/XMLTokener.java

@@ -16,10 +16,10 @@ public class XMLTokener extends JSONTokener
    /** The table of entity values. It initially contains Character values for
     * amp, apos, gt, lt, quot.
     */
-   private static final HashMap entity;
+   private static final HashMap<String, Character> entity;
 
    static {
-       entity = new HashMap(8);
+       entity = new HashMap<String, Character>(8);
        entity.put("amp",  XML.AMP);
        entity.put("apos", XML.APOS);
        entity.put("gt",   XML.GT);

src/tiled/io/xml/XMLMapTransformer.java

@@ -817,7 +817,7 @@ private Map unmarshal(InputStream in) throws Exception {
             builder.setEntityResolver(entityResolver);
             InputSource insrc = new InputSource(in);
             insrc.setSystemId(xmlPath);
-            insrc.setEncoding("UTF8");
+            insrc.setEncoding("UTF-8");
             doc = builder.parse(insrc);
         } catch (SAXException e) {
             e.printStackTrace();

src/tiled/io/xml/XMLMapWriter.java

@@ -16,6 +16,7 @@
 import java.awt.Image;
 import java.awt.Rectangle;
 import java.io.*;
+import java.nio.charset.Charset;
 import java.util.*;
 import java.util.prefs.Preferences;
 import java.util.zip.GZIPOutputStream;
@@ -58,7 +59,7 @@ public void writeMap(Map map, String filename) throws Exception {
             os = new GZIPOutputStream(os);
         }
 
-        Writer writer = new OutputStreamWriter(os);
+        Writer writer = new OutputStreamWriter(os, Charset.forName("UTF-8"));
         XMLWriter xmlWriter = new XMLWriter(writer);
 
         xmlWriter.startDocument();
@@ -81,7 +82,7 @@ public void writeMap(Map map, String filename) throws Exception {
      */
     public void writeTileset(TileSet set, String filename) throws Exception {
         OutputStream os = new FileOutputStream(filename);
-        Writer writer = new OutputStreamWriter(os);
+        Writer writer = new OutputStreamWriter(os, Charset.forName("UTF-8"));
         XMLWriter xmlWriter = new XMLWriter(writer);
 
         xmlWriter.startDocument();
@@ -93,7 +94,7 @@ public void writeTileset(TileSet set, String filename) throws Exception {
 
 
     public void writeMap(Map map, OutputStream out) throws Exception {
-        Writer writer = new OutputStreamWriter(out);
+        Writer writer = new OutputStreamWriter(out,Charset.forName("UTF-8"));
         XMLWriter xmlWriter = new XMLWriter(writer);
 
         xmlWriter.startDocument();
@@ -104,7 +105,7 @@ public void writeMap(Map map, OutputStream out) throws Exception {
     }
 
     public void writeTileset(TileSet set, OutputStream out) throws Exception {
-        Writer writer = new OutputStreamWriter(out);
+        Writer writer = new OutputStreamWriter(out, Charset.forName("UTF-8"));
         XMLWriter xmlWriter = new XMLWriter(writer);
 
         xmlWriter.startDocument();
@@ -164,7 +165,7 @@ private static void writeProperties(Properties props, XMLWriter w) throws
             IOException
     {
         if (!props.isEmpty()) {
-            final SortedSet propertyKeys = new TreeSet();
+            final SortedSet<Object> propertyKeys = new TreeSet<Object>();
             propertyKeys.addAll(props.keySet());
             w.startElement("properties");
             for (Object propertyKey : propertyKeys) {
@@ -259,13 +260,12 @@ private void writeTileset(TileSet set, XMLWriter w, String wp)
         String name = set.getName();
 
         w.startElement("tileset");
+        w.writeAttribute("firstgid", set.getFirstGid());
 
         if (name != null) {
             w.writeAttribute("name", name);
         }
 
-        w.writeAttribute("firstgid", set.getFirstGid());
-
         if (tilebmpFile != null) {
             w.writeAttribute("tilewidth", set.getTileWidth());
             w.writeAttribute("tileheight", set.getTileHeight());
@@ -296,7 +296,7 @@ private void writeTileset(TileSet set, XMLWriter w, String wp)
             w.endElement();
 
             // Write tile properties when necessary.
-            Iterator tileIterator = set.iterator();
+            Iterator<Object> tileIterator = set.iterator();
 
             while (tileIterator.hasNext()) {
                 Tile tile = (Tile) tileIterator.next();
@@ -345,7 +345,7 @@ private void writeTileset(TileSet set, XMLWriter w, String wp)
             }
 
             // Check to see if there is a need to write tile elements
-            Iterator tileIterator = set.iterator();
+            Iterator<Object> tileIterator = set.iterator();
             boolean needWrite = !set.isOneForOne();
 
             if (!tileSetImages) {