Progress on WriterMode. Project export package now create

deterministically-ordered JSON. Should make nicer diffs.

hacked-libtiled/tiled/core/Map.java

@@ -29,7 +29,9 @@
 package tiled.core;
 
 import java.awt.Rectangle;
-import java.util.*;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Vector;
 
 /**
  * The Map class is the focal point of the <code>tiled.core</code> package.

hacked-libtiled/tiled/core/MapObject.java

@@ -28,10 +28,12 @@
 
 package tiled.core;
 
-import java.awt.*;
-import java.util.Properties;
+import java.awt.Image;
+import java.awt.Rectangle;
 import java.io.File;
 import java.io.IOException;
+import java.util.Properties;
+
 import javax.imageio.ImageIO;
 
 /**

hacked-libtiled/tiled/core/ObjectGroup.java

@@ -33,8 +33,8 @@ import java.awt.Shape;
 import java.awt.geom.Area;
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.Rectangle2D;
-import java.util.LinkedList;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 
 /**

hacked-libtiled/tiled/core/Tile.java

@@ -28,7 +28,6 @@
 
 package tiled.core;
 
-import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.util.Properties;
 

hacked-libtiled/tiled/io/TMXMapReader.java

@@ -38,7 +38,6 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
-import java.io.StringReader;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

hacked-libtiled/tiled/io/TMXMapWriter.java

@@ -30,14 +30,32 @@ package tiled.io;
 
 import java.awt.Color;
 import java.awt.Rectangle;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.nio.charset.Charset;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.Vector;
 import java.util.zip.DeflaterOutputStream;
 import java.util.zip.GZIPOutputStream;
 
-import tiled.core.*;
+import tiled.core.AnimatedTile;
 import tiled.core.Map;
+import tiled.core.MapLayer;
+import tiled.core.MapObject;
+import tiled.core.ObjectGroup;
+import tiled.core.Sprite;
+import tiled.core.Tile;
+import tiled.core.TileLayer;
+import tiled.core.TileSet;
 import tiled.io.xml.XMLWriter;
 import tiled.util.Base64;
 

hacked-libtiled/tiled/io/xml/XMLWriter.java

@@ -28,9 +28,8 @@
 
 package tiled.io.xml;
 
-import java.lang.String;
-import java.io.Writer;
 import java.io.IOException;
+import java.io.Writer;
 import java.util.Stack;
 
 /**

hacked-libtiled/tiled/util/BasicTileCutter.java

@@ -29,7 +29,6 @@
 package tiled.util;
 
 import java.awt.Dimension;
-import java.awt.Image;
 import java.awt.image.BufferedImage;
 
 /**

hacked-libtiled/tiled/util/ImageHelper.java

@@ -33,6 +33,7 @@ import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+
 import javax.imageio.ImageIO;
 
 /**

hacked-libtiled/tiled/util/TileCutter.java

@@ -29,7 +29,6 @@
 package tiled.util;
 
 import java.awt.Dimension;
-import java.awt.Image;
 import java.awt.image.BufferedImage;
 
 /**

hacked-libtiled/tiled/view/MapRenderer.java

@@ -27,10 +27,10 @@
 
 package tiled.view;
 
-import tiled.core.TileLayer;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
 
-import java.awt.*;
-import java.awt.image.BufferedImageOp;
+import tiled.core.TileLayer;
 
 /**
  * An interface defining methods to render a map.

hacked-libtiled/tiled/view/OrthogonalRenderer.java

@@ -27,14 +27,15 @@
 
 package tiled.view;
 
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+
 import tiled.core.Map;
 import tiled.core.Tile;
 import tiled.core.TileLayer;
 
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-
 /**
  * The orthogonal map renderer. This is the most basic map renderer, dealing
  * with maps that use rectangular tiles.