[Arianne-commits] stendhal/tiled/src/tiled/mapeditor/widget LayerEditPanel.java, 1.10, 1.11 MemMonitor.java, 1.7, 1.8 MiniMapViewer.java, 1.9, 1.10 ResizePanel.java, 1.6, 1.7 TilesetChooserTabbedPane.java, 1.9, 1.10 BrushMenu.java, 1.9, 1.10 TMenuItem.java, 1.5, 1.6 TButton.java, 1.5, 1.6 TilePalettePanel.java, 1.10, 1.11 MapEditPanel.java, 1.11, 1.12 ImageViewPanel.java, 1.5, 1.6 MainMenu.java, 1.11, 1.12 ColorButton.java, 1.5, 1.6 BrushPreview.java, 1.7, 1.8 TileGroupButton.java, 1.5, 1.6 StatusBar.java, 1.5, 1.6 VerticalStaticJPanel.java, 1.5, 1.6

[Astrid S. <ast...@us...>]

Update of /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12658/tiled/src/tiled/mapeditor/widget

Modified Files:
	LayerEditPanel.java MemMonitor.java MiniMapViewer.java 
	ResizePanel.java TilesetChooserTabbedPane.java BrushMenu.java 
	TMenuItem.java TButton.java TilePalettePanel.java 
	MapEditPanel.java ImageViewPanel.java MainMenu.java 
	ColorButton.java BrushPreview.java TileGroupButton.java 
	StatusBar.java VerticalStaticJPanel.java 
Log Message:
code format
sorry booched it a bit yesterday

Index: TilePalettePanel.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/TilePalettePanel.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TilePalettePanel.java	19 Jan 2008 11:55:20 -0000	1.10
--- TilePalettePanel.java	18 Mar 2008 19:30:33 -0000	1.11
***************
*** 18,22 ****
  package tiled.mapeditor.widget;
  
! import java.awt.*;
  import java.awt.event.MouseEvent;
  import java.util.ArrayList;
--- 18,29 ----
  package tiled.mapeditor.widget;
  
! import java.awt.AlphaComposite;
! import java.awt.Color;
! import java.awt.Dimension;
! import java.awt.Graphics;
! import java.awt.Graphics2D;
! import java.awt.Point;
! import java.awt.Polygon;
! import java.awt.Rectangle;
  import java.awt.event.MouseEvent;
  import java.util.ArrayList;
***************
*** 28,35 ****
  import javax.swing.event.MouseInputListener;
  
! import tiled.core.*;
  import tiled.mapeditor.MapEditor;
  import tiled.mapeditor.dialog.PropertiesDialog;
! import tiled.mapeditor.util.*;
  import tiled.util.Util;
  
--- 35,45 ----
  import javax.swing.event.MouseInputListener;
  
! import tiled.core.StatefulTile;
! import tiled.core.Tile;
! import tiled.core.TileSet;
  import tiled.mapeditor.MapEditor;
  import tiled.mapeditor.dialog.PropertiesDialog;
! import tiled.mapeditor.util.TileSelectionEvent;
! import tiled.mapeditor.util.TileSelectionListener;
  import tiled.util.Util;
  
***************
*** 135,138 ****
--- 145,149 ----
  
  	/** paints the component. */
+ 	@Override
  	public void paint(Graphics g) {
  		paintBackground(g);
***************
*** 235,238 ****
--- 246,250 ----
  	}
  
+ 	@Override
  	public Dimension getPreferredSize() {
  		if (tileset == null) {
***************
*** 342,345 ****
--- 354,358 ----
  
  	/** returns tooltip text. */
+ 	@Override
  	public String getToolTipText(MouseEvent e) {
  		Tile tile = getTileAtPoint(e.getPoint().x, e.getPoint().y);

Index: StatusBar.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/StatusBar.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StatusBar.java	19 Jan 2008 11:55:19 -0000	1.5
--- StatusBar.java	18 Mar 2008 19:30:33 -0000	1.6
***************
*** 20,24 ****
  import java.awt.Dimension;
  
! import javax.swing.*;
  
  import tiled.core.Map;
--- 20,29 ----
  import java.awt.Dimension;
  
! import javax.swing.BorderFactory;
! import javax.swing.Box;
! import javax.swing.BoxLayout;
! import javax.swing.JLabel;
! import javax.swing.JPanel;
! import javax.swing.SwingConstants;
  
  import tiled.core.Map;

Index: MainMenu.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/MainMenu.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MainMenu.java	19 Jan 2008 11:55:18 -0000	1.11
--- MainMenu.java	18 Mar 2008 19:30:33 -0000	1.12
***************
*** 30,34 ****
  import tiled.core.MapLayer;
  import tiled.mapeditor.MapEditor;
! import tiled.mapeditor.actions.*;
  import tiled.mapeditor.util.MapEventAdapter;
  
--- 30,63 ----
  import tiled.core.MapLayer;
  import tiled.mapeditor.MapEditor;
! import tiled.mapeditor.actions.AddLayerAction;
! import tiled.mapeditor.actions.CancelSelectionAction;
! import tiled.mapeditor.actions.CloseAction;
! import tiled.mapeditor.actions.CopyAction;
! import tiled.mapeditor.actions.CutAction;
! import tiled.mapeditor.actions.DelLayerAction;
! import tiled.mapeditor.actions.DuplicateLayerAction;
! import tiled.mapeditor.actions.ExitApplicationAction;
! import tiled.mapeditor.actions.ImportTilesetAction;
! import tiled.mapeditor.actions.InverseSelectionAction;
! import tiled.mapeditor.actions.LayerPropertiesAction;
! import tiled.mapeditor.actions.LayerTransformAction;
! import tiled.mapeditor.actions.MapPropertiesAction;
! import tiled.mapeditor.actions.MoveLayerDownAction;
! import tiled.mapeditor.actions.MoveLayerUpAction;
! import tiled.mapeditor.actions.NewMapAction;
! import tiled.mapeditor.actions.NewTilesetAction;
! import tiled.mapeditor.actions.OpenAction;
! import tiled.mapeditor.actions.PasteAction;
! import tiled.mapeditor.actions.RedoAction;
! import tiled.mapeditor.actions.SaveAsImageAction;
! import tiled.mapeditor.actions.SaveMapAction;
! import tiled.mapeditor.actions.SelectAllAction;
! import tiled.mapeditor.actions.TilesetManagerAction;
! import tiled.mapeditor.actions.ToggleGridAction;
! import tiled.mapeditor.actions.TreeTilesetChooserAction;
! import tiled.mapeditor.actions.UndoAction;
! import tiled.mapeditor.actions.ZoomInAction;
! import tiled.mapeditor.actions.ZoomNormalAction;
! import tiled.mapeditor.actions.ZoomOutAction;
  import tiled.mapeditor.util.MapEventAdapter;
  

Index: ResizePanel.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/ResizePanel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ResizePanel.java	19 Jan 2008 11:55:20 -0000	1.6
--- ResizePanel.java	18 Mar 2008 19:30:33 -0000	1.7
***************
*** 18,26 ****
  package tiled.mapeditor.widget;
  
- import java.awt.Point;
  import java.awt.Dimension;
! import java.awt.event.*;
  
! import javax.swing.*;
  
  import tiled.core.Map;
--- 18,30 ----
  package tiled.mapeditor.widget;
  
  import java.awt.Dimension;
! import java.awt.Point;
! import java.awt.event.MouseEvent;
! import java.awt.event.MouseListener;
! import java.awt.event.MouseMotionListener;
  
! import javax.swing.BorderFactory;
! import javax.swing.JPanel;
! import javax.swing.OverlayLayout;
  
  import tiled.core.Map;
***************
*** 77,80 ****
--- 81,85 ----
  	}
  
+ 	@Override
  	public Dimension getPreferredSize() {
  		return oldDim;

Index: LayerEditPanel.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/LayerEditPanel.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** LayerEditPanel.java	19 Jan 2008 11:55:18 -0000	1.10
--- LayerEditPanel.java	18 Mar 2008 19:30:33 -0000	1.11
***************
*** 25,29 ****
  import java.awt.Rectangle;
  
! import javax.swing.*;
  import javax.swing.event.ChangeEvent;
  import javax.swing.event.ChangeListener;
--- 25,40 ----
  import java.awt.Rectangle;
  
! import javax.swing.AbstractButton;
! import javax.swing.Action;
! import javax.swing.BorderFactory;
! import javax.swing.BoxLayout;
! import javax.swing.JButton;
! import javax.swing.JLabel;
! import javax.swing.JPanel;
! import javax.swing.JScrollPane;
! import javax.swing.JSlider;
! import javax.swing.JTabbedPane;
! import javax.swing.JTable;
! import javax.swing.ListSelectionModel;
  import javax.swing.event.ChangeEvent;
  import javax.swing.event.ChangeListener;

Index: TButton.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/TButton.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TButton.java	19 Jan 2008 11:55:18 -0000	1.5
--- TButton.java	18 Mar 2008 19:30:33 -0000	1.6
***************
*** 52,55 ****
--- 52,56 ----
  	}
  
+ 	@Override
  	public void setText(String text) {
  		if (showText) {

Index: VerticalStaticJPanel.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/VerticalStaticJPanel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VerticalStaticJPanel.java	19 Jan 2008 11:55:19 -0000	1.5
--- VerticalStaticJPanel.java	18 Mar 2008 19:30:33 -0000	1.6
***************
*** 36,43 ****
--- 36,45 ----
  	}
  
+ 	@Override
  	public Dimension getMaximumSize() {
  		return new Dimension(super.getMaximumSize().width, getPreferredSize().height);
  	}
  
+ 	@Override
  	public Dimension getMinimumSize() {
  		return new Dimension(super.getMinimumSize().width, getPreferredSize().height);

Index: TMenuItem.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/TMenuItem.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TMenuItem.java	19 Jan 2008 11:55:18 -0000	1.5
--- TMenuItem.java	18 Mar 2008 19:30:33 -0000	1.6
***************
*** 48,51 ****
--- 48,52 ----
  	}
  
+ 	@Override
  	public void setIcon(Icon icon) {
  		if (showIcon) {

Index: TilesetChooserTabbedPane.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/TilesetChooserTabbedPane.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TilesetChooserTabbedPane.java	19 Jan 2008 11:55:20 -0000	1.9
--- TilesetChooserTabbedPane.java	18 Mar 2008 19:30:33 -0000	1.10
***************
*** 53,56 ****
--- 53,57 ----
  
  	/** sets the tilesets to display. */
+ 	@Override
  	public void setTilesets(List<TileSet> tilesets) {
  		// recreate the panes
***************
*** 102,105 ****
--- 103,107 ----
  
  	/** informs the editor of the new tile. */
+ 	@Override
  	public void tileSelected(TileSelectionEvent e) {
  		mapEditor.setCurrentTiles(e.getTiles());
***************
*** 107,110 ****
--- 109,113 ----
  
  	/** sets the tiles panes to the the ones from this map. */
+ 	@Override
  	public void setMap(Map currentMap) {
  		if (currentMap == null) {

Index: ColorButton.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/ColorButton.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ColorButton.java	19 Jan 2008 11:55:18 -0000	1.5
--- ColorButton.java	18 Mar 2008 19:30:33 -0000	1.6
***************
*** 41,44 ****
--- 41,45 ----
  	}
  
+ 	@Override
  	public Dimension getPreferredSize() {
  		return new Dimension(40, 15);

Index: ImageViewPanel.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/ImageViewPanel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ImageViewPanel.java	19 Jan 2008 11:55:20 -0000	1.5
--- ImageViewPanel.java	18 Mar 2008 19:30:33 -0000	1.6
***************
*** 18,22 ****
  package tiled.mapeditor.widget;
  
! import java.awt.*;
  
  import javax.swing.JPanel;
--- 18,24 ----
  package tiled.mapeditor.widget;
  
! import java.awt.Dimension;
! import java.awt.Graphics;
! import java.awt.Image;
  
  import javax.swing.JPanel;
***************
*** 36,39 ****
--- 38,42 ----
  	}
  
+ 	@Override
  	public Dimension getPreferredSize() {
  		return new Dimension(150, 150);
***************
*** 52,55 ****
--- 55,59 ----
  	}
  
+ 	@Override
  	public void paint(Graphics g) {
  		g.drawImage(image, 0, 0, null);

Index: TileGroupButton.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/TileGroupButton.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TileGroupButton.java	19 Jan 2008 11:55:18 -0000	1.5
--- TileGroupButton.java	18 Mar 2008 19:30:33 -0000	1.6
***************
*** 67,78 ****
--- 67,81 ----
  	}
  
+ 	@Override
  	public Dimension getPreferredSize() {
  		return new Dimension(width, height);
  	}
  
+ 	@Override
  	public Dimension getMaximumSize() {
  		return getPreferredSize();
  	}
  
+ 	@Override
  	public Dimension getMinimumSize() {
  		return getPreferredSize();

Index: BrushPreview.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/BrushPreview.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BrushPreview.java	19 Jan 2008 11:55:18 -0000	1.7
--- BrushPreview.java	18 Mar 2008 19:30:33 -0000	1.8
***************
*** 47,50 ****
--- 47,51 ----
  	}
  
+ 	@Override
  	protected void paintComponent(Graphics g) {
  		if (brush == null) {

Index: MapEditPanel.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/MapEditPanel.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MapEditPanel.java	17 Mar 2008 16:19:31 -0000	1.11
--- MapEditPanel.java	18 Mar 2008 19:30:33 -0000	1.12
***************
*** 18,22 ****
  package tiled.mapeditor.widget;
  
! import java.awt.*;
  import java.awt.event.MouseEvent;
  import java.awt.event.MouseListener;
--- 18,27 ----
  package tiled.mapeditor.widget;
  
! import java.awt.Color;
! import java.awt.Container;
! import java.awt.Dimension;
! import java.awt.Graphics;
! import java.awt.Point;
! import java.awt.Rectangle;
  import java.awt.event.MouseEvent;
  import java.awt.event.MouseListener;
***************
*** 101,104 ****
--- 106,110 ----
  
  	/** Draws the map. */
+ 	@Override
  	public void paintComponent(Graphics g) {
  		if (mapView != null) {
***************
*** 143,146 ****
--- 149,153 ----
  
  	/** returns the prefered size of the panel. */
+ 	@Override
  	public Dimension getPreferredSize() {
  		if (mapView != null) {

Index: MiniMapViewer.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/MiniMapViewer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MiniMapViewer.java	19 Jan 2008 11:55:19 -0000	1.9
--- MiniMapViewer.java	18 Mar 2008 19:30:33 -0000	1.10
***************
*** 18,22 ****
  package tiled.mapeditor.widget;
  
! import java.awt.*;
  import java.awt.event.MouseEvent;
  import java.awt.event.MouseListener;
--- 18,28 ----
  package tiled.mapeditor.widget;
  
! import java.awt.Color;
! import java.awt.Dimension;
! import java.awt.Graphics;
! import java.awt.Graphics2D;
! import java.awt.Image;
! import java.awt.Point;
! import java.awt.Rectangle;
  import java.awt.event.MouseEvent;
  import java.awt.event.MouseListener;
***************
*** 58,61 ****
--- 64,68 ----
  	}
  
+ 	@Override
  	public Dimension getPreferredSize() {
  		if (mapView == null) {
***************
*** 80,83 ****
--- 87,91 ----
  	}
  
+ 	@Override
  	public void paintComponent(Graphics g) {
  		if (paintingInProgress) {

Index: MemMonitor.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/MemMonitor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MemMonitor.java	19 Jan 2008 11:55:20 -0000	1.7
--- MemMonitor.java	18 Mar 2008 19:30:33 -0000	1.8
***************
*** 47,54 ****
--- 47,56 ----
  	}
  
+ 	@Override
  	public Dimension getPreferredSize() {
  		return progressBar.getPreferredSize();
  	}
  
+ 	@Override
  	public Dimension getMinimumSize() {
  		return progressBar.getMinimumSize();

Index: BrushMenu.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/widget/BrushMenu.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** BrushMenu.java	19 Jan 2008 11:55:19 -0000	1.9
--- BrushMenu.java	18 Mar 2008 19:30:33 -0000	1.10
***************
*** 73,80 ****
--- 73,82 ----
  	}
  
+ 	@Override
  	public Dimension getPreferredSize() {
  		return combobox.getPreferredSize();
  	}
  
+ 	@Override
  	public Dimension getMaximumSize() {
  		return getPreferredSize();
***************
*** 148,151 ****
--- 150,154 ----
  
  		/**  */
+ 		@Override
  		public String toString() {
  			return brush.getName();