[tiled] r561 - in branches/bjorn: . src src/tiled/mapeditor/plugin src/tiled/plugins/tmw

[svn@biggeruniverse.com]

Author: bjorn
Date: 2006-01-25 16:48:58 -0600 (Wed, 25 Jan 2006)
New Revision: 561

Added:
   branches/bjorn/src/
   branches/bjorn/src/tiled/
Removed:
   branches/bjorn/tiled/
Modified:
   branches/bjorn/build.xml
   branches/bjorn/src/tiled/mapeditor/plugin/PluginClassLoader.java
   branches/bjorn/src/tiled/plugins/tmw/TMWServerMapWriter.java
Log:
Moved main package into a src directory.


Modified: branches/bjorn/build.xml
===================================================================
--- branches/bjorn/build.xml	2005-12-07 01:55:11 UTC (rev 560)
+++ branches/bjorn/build.xml	2006-01-25 22:48:58 UTC (rev 561)
@@ -3,7 +3,7 @@
     A Java-based Tile Map Editor
   </description>
   <!-- set global properties for this build -->
-  <property name="src" location="tiled"/>
+  <property name="src" location="src"/>
   <property name="build" location="build"/>
   <property name="dist" location="dist"/>
   <property name="plugins" location="plugins"/>
@@ -77,11 +77,11 @@
   </target>
 
   <target name="core" depends="clean,compile"
-  	description="Generate a core I/O distribution for use in games, etc.">
-	<jar jarfile="${dist}/tiled-core.jar"
-	  basedir="${build}" includes="tiled/core/**/*.class,tiled/io/**"/>
+    description="Generate a core I/O distribution for use in games, etc.">
+    <jar jarfile="${dist}/tiled-core.jar"
+      basedir="${build}" includes="tiled/core/**/*.class,tiled/io/**"/>
   </target>
-  
+
   <target name="dist_dep" depends="clean,compile_dep"
     description="Generate the distribution and warn about deprecation">
     <mkdir dir="${dist}"/>

Copied: branches/bjorn/src/tiled (from rev 560, branches/bjorn/tiled)

Modified: branches/bjorn/src/tiled/mapeditor/plugin/PluginClassLoader.java
===================================================================
--- branches/bjorn/tiled/mapeditor/plugin/PluginClassLoader.java	2005-12-07 01:55:11 UTC (rev 560)
+++ branches/bjorn/src/tiled/mapeditor/plugin/PluginClassLoader.java	2006-01-25 22:48:58 UTC (rev 561)
@@ -174,19 +174,11 @@
     }
 
     public MapReader[] getReaders() {
-        MapReader[] result = new MapReader[readers.size()];
-        for (int i = 0; i < readers.size(); ++i) {
-          result[i] = (MapReader)(readers.elementAt(i));
-        }
-        return result;
+        return (MapReader[])readers.toArray(new MapReader[readers.size()]);
     }
 
     public MapWriter[] getWriters() {
-        MapWriter[] result = new MapWriter[writers.size()];
-        for (int i = 0; i < writers.size(); ++i) {
-          result[i] = (MapWriter)(writers.elementAt(i));
-        }
-        return result;
+        return (MapWriter[])writers.toArray(new MapWriter[writers.size()]);
     }
 
     public Object getReaderFor(String file) throws Exception {

Modified: branches/bjorn/src/tiled/plugins/tmw/TMWServerMapWriter.java
===================================================================
--- branches/bjorn/tiled/plugins/tmw/TMWServerMapWriter.java	2005-12-07 01:55:11 UTC (rev 560)
+++ branches/bjorn/src/tiled/plugins/tmw/TMWServerMapWriter.java	2006-01-25 22:48:58 UTC (rev 561)
@@ -13,12 +13,9 @@
 package tiled.plugins.tmw;
 
 import java.io.*;
-import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.Stack;
 
 import tiled.io.MapWriter;
-import tiled.plugins.mappy.MappyMapReader.BlkStr;
 import tiled.core.*;
 
 /**