From: Astrid S. <ast...@us...> - 2008-03-18 19:31:18
|
Update of /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/brush In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12658/tiled/src/tiled/mapeditor/brush Modified Files: CustomBrush.java ShapeBrush.java TileGroupBrush.java MultiTileBrush.java RandomBrush.java Log Message: code format sorry booched it a bit yesterday Index: TileGroupBrush.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/brush/TileGroupBrush.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TileGroupBrush.java 19 Jan 2008 11:55:28 -0000 1.8 --- TileGroupBrush.java 18 Mar 2008 19:30:33 -0000 1.9 *************** *** 44,47 **** --- 44,48 ---- /** returns the bounds of the brush in tile coordinates.*/ + @Override public Rectangle getBounds() { return new Rectangle(0, 0, tileGroup.getWidth(), tileGroup.getHeight()); *************** *** 81,84 **** --- 82,86 ---- } + @Override public String toString() { return "[" + this.getClass().getName() + ":" + tileGroup + "]"; *************** *** 100,103 **** --- 102,106 ---- /** returns the used tiles. */ + @Override public List<StatefulTile> getTiles() { List<StatefulTile> tileList = new ArrayList<StatefulTile>(); Index: ShapeBrush.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/brush/ShapeBrush.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ShapeBrush.java 19 Jan 2008 11:55:27 -0000 1.7 --- ShapeBrush.java 18 Mar 2008 19:30:33 -0000 1.8 *************** *** 18,25 **** package tiled.mapeditor.brush; ! import java.awt.*; ! import java.awt.geom.*; ! import tiled.core.*; public class ShapeBrush extends AbstractBrush { --- 18,31 ---- package tiled.mapeditor.brush; ! import java.awt.Graphics; ! import java.awt.Rectangle; ! import java.awt.Shape; ! import java.awt.geom.Ellipse2D; ! import java.awt.geom.Rectangle2D; ! import tiled.core.MapLayer; ! import tiled.core.MultilayerPlane; ! import tiled.core.Tile; ! import tiled.core.TileLayer; public class ShapeBrush extends AbstractBrush { *************** *** 104,107 **** --- 110,114 ---- } + @Override public Rectangle getBounds() { return bounds; Index: RandomBrush.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/brush/RandomBrush.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RandomBrush.java 19 Jan 2008 11:55:27 -0000 1.7 --- RandomBrush.java 18 Mar 2008 19:30:34 -0000 1.8 *************** *** 68,71 **** --- 68,72 ---- * The y-coordinate where the click occurred. */ + @Override public Rectangle commitPaint(MultilayerPlane mp, int x, int y, int initLayer) { if (selectedTiles.size() == 0) { Index: MultiTileBrush.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/brush/MultiTileBrush.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MultiTileBrush.java 19 Jan 2008 11:55:27 -0000 1.9 --- MultiTileBrush.java 18 Mar 2008 19:30:34 -0000 1.10 *************** *** 44,47 **** --- 44,48 ---- /** returns the bounds of the brush in tile coordinates. */ + @Override public Rectangle getBounds() { if (cachedBounds == null) { *************** *** 88,91 **** --- 89,93 ---- /** Sets the currently selected Tiles. */ + @Override public void setTiles(List<StatefulTile> selectedTiles) { super.setTiles(selectedTiles); *************** *** 118,121 **** --- 120,124 ---- } + @Override public String toString() { StringBuilder buf = new StringBuilder(); Index: CustomBrush.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/mapeditor/brush/CustomBrush.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CustomBrush.java 19 Jan 2008 11:55:28 -0000 1.8 --- CustomBrush.java 18 Mar 2008 19:30:33 -0000 1.9 *************** *** 36,39 **** --- 36,40 ---- } + @Override public Rectangle getBounds() { return getBounds(); |