[Gridarta-commit] SF.net SVN: gridarta:[4989] trunk

[<aki...@us...>]

Revision: 4989
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4989&view=rev
Author:   akirschbaum
Date:     2008-08-22 08:19:04 +0000 (Fri, 22 Aug 2008)

Log Message:
-----------
Order import statements.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/src/app/net/sf/gridarta/spells/SpellsUtils.java
    trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 08:12:03 UTC (rev 4988)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 08:19:04 UTC (rev 4989)
@@ -60,16 +60,14 @@
 import net.sf.gridarta.archtype.ArchetypeTypeSet;
 import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gameobject.face.FaceObjectProviders;
+import net.sf.gridarta.gameobject.match.GameObjectMatcher;
 import net.sf.gridarta.gameobject.match.MutableOrGameObjectMatcher;
 import net.sf.gridarta.gameobject.match.ViewGameObjectMatcherManager;
-import net.sf.gridarta.gameobject.match.GameObjectMatcher;
 import net.sf.gridarta.gui.LeftPanel;
 import net.sf.gridarta.gui.MainView;
+import net.sf.gridarta.gui.MapViewManager;
 import net.sf.gridarta.gui.RecentManager;
 import net.sf.gridarta.gui.SystemIcons;
-import net.sf.gridarta.gui.MapViewManager;
-import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
-import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
 import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
 import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
@@ -77,11 +75,13 @@
 import net.sf.gridarta.gui.map.tools.ToolPalette;
 import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
 import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
+import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
 import net.sf.gridarta.gui.objectchooser.ObjectChooser;
-import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
 import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
 import net.sf.gridarta.gui.prefs.MiscPrefs;
 import net.sf.gridarta.gui.prefs.UpdatePrefs;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
 import net.sf.gridarta.gui.utils.GUIUtils;
 import net.sf.gridarta.map.AutoValidator;
 import net.sf.gridarta.map.MapControl;

Modified: trunk/src/app/net/sf/gridarta/spells/SpellsUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/spells/SpellsUtils.java	2008-08-22 08:12:03 UTC (rev 4988)
+++ trunk/src/app/net/sf/gridarta/spells/SpellsUtils.java	2008-08-22 08:19:04 UTC (rev 4989)
@@ -19,26 +19,26 @@
 
 package net.sf.gridarta.spells;
 
-import org.apache.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
-import net.sf.japi.swing.ActionFactory;
-import net.sf.japi.util.filter.file.FilenameFileFilter;
-import net.sf.gridarta.io.IOUtils;
-import javax.swing.filechooser.FileFilter;
-import javax.swing.JFileChooser;
 import java.awt.Component;
+import java.io.BufferedReader;
+import java.io.EOFException;
 import java.io.File;
-import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.EOFException;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.OutputStreamWriter;
-import java.io.FileOutputStream;
+import java.util.Date;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.Date;
+import javax.swing.JFileChooser;
+import javax.swing.filechooser.FileFilter;
+import net.sf.gridarta.io.IOUtils;
+import net.sf.japi.swing.ActionFactory;
+import net.sf.japi.util.filter.file.FilenameFileFilter;
+import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>

Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-22 08:12:03 UTC (rev 4988)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-22 08:19:04 UTC (rev 4989)
@@ -31,9 +31,9 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 import javax.swing.ImageIcon;
+import javax.swing.JComboBox;
 import javax.swing.JList;
 import javax.swing.JPanel;
-import javax.swing.JComboBox;
 import javax.swing.filechooser.FileFilter;
 import net.sf.gridarta.AbstractMainControl;
 import net.sf.gridarta.AutojoinLists;
@@ -48,7 +48,6 @@
 import net.sf.gridarta.MapManager;
 import net.sf.gridarta.Size2D;
 import net.sf.gridarta.archtype.ArchetypeTypeSet;
-import net.sf.gridarta.treasurelist.CFTreasureListTree;
 import net.sf.gridarta.data.NamedTreeNode;
 import net.sf.gridarta.gameobject.AbstractArchetypeParser;
 import net.sf.gridarta.gameobject.AbstractArchetypeSet;
@@ -67,22 +66,22 @@
 import net.sf.gridarta.gameobject.match.GameObjectMatcher;
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapViewManager;
+import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
 import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
-import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
-import net.sf.gridarta.gui.gameobjectattributespanel.ScriptTab;
 import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesControl;
 import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
+import net.sf.gridarta.gui.gameobjectattributespanel.ScriptTab;
 import net.sf.gridarta.gui.map.LevelRenderer;
 import net.sf.gridarta.gui.map.MapView;
 import net.sf.gridarta.gui.map.MapViewBasic;
 import net.sf.gridarta.gui.map.RendererFactory;
 import net.sf.gridarta.gui.map.tools.ToolPalette;
 import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
+import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
 import net.sf.gridarta.gui.objectchooser.ObjectChooser;
-import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
 import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
-import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
 import net.sf.gridarta.io.GameObjectParser;
 import net.sf.gridarta.io.MapArchObjectParser;
 import net.sf.gridarta.io.MapReader;
@@ -99,6 +98,7 @@
 import net.sf.gridarta.map.MapModelListener;
 import net.sf.gridarta.map.MapSquare;
 import net.sf.gridarta.map.validation.DelegatingMapValidator;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
 import net.sf.japi.swing.misc.Progress;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.