[tiled] r568 - in branches/bjorn/src/tiled/mapeditor: . dialogs
svn@biggeruniverse.com
svn at biggeruniverse.com
Sat Feb 4 06:02:22 PST 2006
Author: bjorn
Date: 2006-02-04 08:02:21 -0600 (Sat, 04 Feb 2006)
New Revision: 568
Added:
branches/bjorn/src/tiled/mapeditor/dialogs/
Removed:
branches/bjorn/src/tiled/mapeditor/dialog/
Modified:
branches/bjorn/src/tiled/mapeditor/MapEditor.java
branches/bjorn/src/tiled/mapeditor/TilesetManager.java
branches/bjorn/src/tiled/mapeditor/dialogs/AboutDialog.java
branches/bjorn/src/tiled/mapeditor/dialogs/ConfigurationDialog.java
branches/bjorn/src/tiled/mapeditor/dialogs/ImageColorDialog.java
branches/bjorn/src/tiled/mapeditor/dialogs/NewMapDialog.java
branches/bjorn/src/tiled/mapeditor/dialogs/NewTilesetDialog.java
branches/bjorn/src/tiled/mapeditor/dialogs/ObjectDialog.java
branches/bjorn/src/tiled/mapeditor/dialogs/PluginDialog.java
branches/bjorn/src/tiled/mapeditor/dialogs/PropertiesDialog.java
branches/bjorn/src/tiled/mapeditor/dialogs/ResizeDialog.java
branches/bjorn/src/tiled/mapeditor/dialogs/SearchDialog.java
branches/bjorn/src/tiled/mapeditor/dialogs/TileDialog.java
branches/bjorn/src/tiled/mapeditor/dialogs/TileImageDialog.java
Log:
Renamed dialog package to dialogs to match trunk.
Modified: branches/bjorn/src/tiled/mapeditor/MapEditor.java
===================================================================
--- branches/bjorn/src/tiled/mapeditor/MapEditor.java 2006-02-04 13:52:19 UTC (rev 567)
+++ branches/bjorn/src/tiled/mapeditor/MapEditor.java 2006-02-04 14:02:21 UTC (rev 568)
@@ -29,13 +29,12 @@
import tiled.core.*;
import tiled.view.*;
import tiled.mapeditor.brush.*;
-import tiled.mapeditor.dialog.*;
+import tiled.mapeditor.dialogs.*;
import tiled.mapeditor.plugin.PluginClassLoader;
import tiled.mapeditor.selection.SelectionLayer;
import tiled.mapeditor.util.*;
import tiled.mapeditor.widget.*;
import tiled.mapeditor.undo.*;
-import tiled.util.TileMergeHelper;
import tiled.util.TiledConfiguration;
import tiled.util.Util;
import tiled.io.MapHelper;
@@ -45,6 +44,8 @@
/**
* The main class for the Tiled Map Editor.
+ *
+ * @version $Id$
*/
public class MapEditor implements ActionListener,
MouseListener, MouseMotionListener, MapChangeListener,
@@ -1137,7 +1138,7 @@
} else if (command.equals("Import Tileset...")) {
if (currentMap != null) {
JFileChooser ch = new JFileChooser(currentMap.getFilename());
- MapReader readers[] = (MapReader[]) pluginLoader.getReaders();
+ MapReader readers[] = pluginLoader.getReaders();
for(int i = 0; i < readers.length; i++) {
try {
ch.addChoosableFileFilter(new TiledFileFilter(
@@ -1613,7 +1614,7 @@
Tile newTile, Tile oldTile) {
if (newTile == oldTile || layer.getLocked()) return;
- Rectangle area = null;
+ Rectangle area;
TileLayer before = new TileLayer(layer);
TileLayer after;
@@ -1764,7 +1765,7 @@
ch = new JFileChooser(filename);
}
- MapWriter writers[] = (MapWriter[]) pluginLoader.getWriters();
+ MapWriter writers[] = pluginLoader.getWriters();
for(int i = 0; i < writers.length; i++) {
try {
ch.addChoosableFileFilter(new TiledFileFilter(
@@ -1866,7 +1867,7 @@
JFileChooser ch = new JFileChooser(startLocation);
try {
- MapReader readers[] = (MapReader[]) pluginLoader.getReaders();
+ MapReader readers[] = pluginLoader.getReaders();
for(int i = 0; i < readers.length; i++) {
ch.addChoosableFileFilter(new TiledFileFilter(
readers[i].getFilter(), readers[i].getName()));
Modified: branches/bjorn/src/tiled/mapeditor/TilesetManager.java
===================================================================
--- branches/bjorn/src/tiled/mapeditor/TilesetManager.java 2006-02-04 13:52:19 UTC (rev 567)
+++ branches/bjorn/src/tiled/mapeditor/TilesetManager.java 2006-02-04 14:02:21 UTC (rev 568)
@@ -25,7 +25,7 @@
import tiled.core.*;
import tiled.io.MapHelper;
import tiled.io.MapWriter;
-import tiled.mapeditor.dialog.TileDialog;
+import tiled.mapeditor.dialogs.TileDialog;
import tiled.mapeditor.util.*;
import tiled.mapeditor.plugin.PluginClassLoader;
Copied: branches/bjorn/src/tiled/mapeditor/dialogs (from rev 567, branches/bjorn/src/tiled/mapeditor/dialog)
Modified: branches/bjorn/src/tiled/mapeditor/dialogs/AboutDialog.java
===================================================================
--- branches/bjorn/src/tiled/mapeditor/dialog/AboutDialog.java 2006-02-04 13:52:19 UTC (rev 567)
+++ branches/bjorn/src/tiled/mapeditor/dialogs/AboutDialog.java 2006-02-04 14:02:21 UTC (rev 568)
@@ -10,7 +10,7 @@
* Bjorn Lindeijer <b.lindeijer at xs4all.nl>
*/
-package tiled.mapeditor.dialog;
+package tiled.mapeditor.dialogs;
import java.io.IOException;
import javax.imageio.ImageIO;
Modified: branches/bjorn/src/tiled/mapeditor/dialogs/ConfigurationDialog.java
===================================================================
--- branches/bjorn/src/tiled/mapeditor/dialog/ConfigurationDialog.java 2006-02-04 13:52:19 UTC (rev 567)
+++ branches/bjorn/src/tiled/mapeditor/dialogs/ConfigurationDialog.java 2006-02-04 14:02:21 UTC (rev 568)
@@ -10,7 +10,7 @@
* Bjorn Lindeijer <b.lindeijer at xs4all.nl>
*/
-package tiled.mapeditor.dialog;
+package tiled.mapeditor.dialogs;
import java.awt.*;
import java.awt.event.*;
Modified: branches/bjorn/src/tiled/mapeditor/dialogs/ImageColorDialog.java
===================================================================
--- branches/bjorn/src/tiled/mapeditor/dialog/ImageColorDialog.java 2006-02-04 13:52:19 UTC (rev 567)
+++ branches/bjorn/src/tiled/mapeditor/dialogs/ImageColorDialog.java 2006-02-04 14:02:21 UTC (rev 568)
@@ -10,7 +10,7 @@
* Bjorn Lindeijer <b.lindeijer at xs4all.nl>
*/
-package tiled.mapeditor.dialog;
+package tiled.mapeditor.dialogs;
import java.awt.*;
import java.awt.event.*;
Modified: branches/bjorn/src/tiled/mapeditor/dialogs/NewMapDialog.java
===================================================================
--- branches/bjorn/src/tiled/mapeditor/dialog/NewMapDialog.java 2006-02-04 13:52:19 UTC (rev 567)
+++ branches/bjorn/src/tiled/mapeditor/dialogs/NewMapDialog.java 2006-02-04 14:02:21 UTC (rev 568)
@@ -10,7 +10,7 @@
* Bjorn Lindeijer <b.lindeijer at xs4all.nl>
*/
-package tiled.mapeditor.dialog;
+package tiled.mapeditor.dialogs;
import java.awt.*;
import java.awt.event.*;
Modified: branches/bjorn/src/tiled/mapeditor/dialogs/NewTilesetDialog.java
===================================================================
--- branches/bjorn/src/tiled/mapeditor/dialog/NewTilesetDialog.java 2006-02-04 13:52:19 UTC (rev 567)
+++ branches/bjorn/src/tiled/mapeditor/dialogs/NewTilesetDialog.java 2006-02-04 14:02:21 UTC (rev 568)
@@ -10,7 +10,7 @@
* Bjorn Lindeijer <b.lindeijer at xs4all.nl>
*/
-package tiled.mapeditor.dialog;
+package tiled.mapeditor.dialogs;
import java.awt.*;
import java.awt.event.*;
Modified: branches/bjorn/src/tiled/mapeditor/dialogs/ObjectDialog.java
===================================================================
--- branches/bjorn/src/tiled/mapeditor/dialog/ObjectDialog.java 2006-02-04 13:52:19 UTC (rev 567)
+++ branches/bjorn/src/tiled/mapeditor/dialogs/ObjectDialog.java 2006-02-04 14:02:21 UTC (rev 568)
@@ -10,7 +10,7 @@
* Bjorn Lindeijer <b.lindeijer at xs4all.nl>
*/
-package tiled.mapeditor.dialog;
+package tiled.mapeditor.dialogs;
import javax.swing.JDialog;
Modified: branches/bjorn/src/tiled/mapeditor/dialogs/PluginDialog.java
===================================================================
--- branches/bjorn/src/tiled/mapeditor/dialog/PluginDialog.java 2006-02-04 13:52:19 UTC (rev 567)
+++ branches/bjorn/src/tiled/mapeditor/dialogs/PluginDialog.java 2006-02-04 14:02:21 UTC (rev 568)
@@ -10,7 +10,7 @@
* Bjorn Lindeijer <b.lindeijer at xs4all.nl>
*/
-package tiled.mapeditor.dialog;
+package tiled.mapeditor.dialogs;
import java.awt.Dimension;
import java.awt.Font;
Modified: branches/bjorn/src/tiled/mapeditor/dialogs/PropertiesDialog.java
===================================================================
--- branches/bjorn/src/tiled/mapeditor/dialog/PropertiesDialog.java 2006-02-04 13:52:19 UTC (rev 567)
+++ branches/bjorn/src/tiled/mapeditor/dialogs/PropertiesDialog.java 2006-02-04 14:02:21 UTC (rev 568)
@@ -10,7 +10,7 @@
* Bjorn Lindeijer <b.lindeijer at xs4all.nl>
*/
-package tiled.mapeditor.dialog;
+package tiled.mapeditor.dialogs;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
Modified: branches/bjorn/src/tiled/mapeditor/dialogs/ResizeDialog.java
===================================================================
--- branches/bjorn/src/tiled/mapeditor/dialog/ResizeDialog.java 2006-02-04 13:52:19 UTC (rev 567)
+++ branches/bjorn/src/tiled/mapeditor/dialogs/ResizeDialog.java 2006-02-04 14:02:21 UTC (rev 568)
@@ -10,7 +10,7 @@
* Bjorn Lindeijer <b.lindeijer at xs4all.nl>
*/
-package tiled.mapeditor.dialog;
+package tiled.mapeditor.dialogs;
import java.awt.*;
import java.awt.event.*;
Modified: branches/bjorn/src/tiled/mapeditor/dialogs/SearchDialog.java
===================================================================
--- branches/bjorn/src/tiled/mapeditor/dialog/SearchDialog.java 2006-02-04 13:52:19 UTC (rev 567)
+++ branches/bjorn/src/tiled/mapeditor/dialogs/SearchDialog.java 2006-02-04 14:02:21 UTC (rev 568)
@@ -10,7 +10,7 @@
* Bjorn Lindeijer <b.lindeijer at xs4all.nl>
*/
-package tiled.mapeditor.dialog;
+package tiled.mapeditor.dialogs;
import java.awt.*;
import java.awt.event.*;
Modified: branches/bjorn/src/tiled/mapeditor/dialogs/TileDialog.java
===================================================================
--- branches/bjorn/src/tiled/mapeditor/dialog/TileDialog.java 2006-02-04 13:52:19 UTC (rev 567)
+++ branches/bjorn/src/tiled/mapeditor/dialogs/TileDialog.java 2006-02-04 14:02:21 UTC (rev 568)
@@ -11,7 +11,7 @@
* Rainer Deyke <rainerd at eldwood.com>
*/
-package tiled.mapeditor.dialog;
+package tiled.mapeditor.dialogs;
import java.awt.*;
import java.awt.event.*;
Modified: branches/bjorn/src/tiled/mapeditor/dialogs/TileImageDialog.java
===================================================================
--- branches/bjorn/src/tiled/mapeditor/dialog/TileImageDialog.java 2006-02-04 13:52:19 UTC (rev 567)
+++ branches/bjorn/src/tiled/mapeditor/dialogs/TileImageDialog.java 2006-02-04 14:02:21 UTC (rev 568)
@@ -11,7 +11,7 @@
* Rainer Deyke <rainerd at eldwood.com>
*/
-package tiled.mapeditor.dialog;
+package tiled.mapeditor.dialogs;
import java.awt.*;
import java.awt.event.*;
More information about the tiled-commit
mailing list