From: <chr...@us...> - 2006-12-17 22:40:38
|
Revision: 1177 http://svn.sourceforge.net/gridarta/?rev=1177&view=rev Author: christianhujer Date: 2006-12-17 14:40:38 -0800 (Sun, 17 Dec 2006) Log Message: ----------- Fixed imports and some javadoc issues. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CArchPanel.java trunk/crossfire/src/cfeditor/CArchPanelPan.java trunk/crossfire/src/cfeditor/CFArchTypeList.java trunk/crossfire/src/cfeditor/CFTreasureListTree.java trunk/crossfire/src/cfeditor/CMainStatusbar.java trunk/crossfire/src/cfeditor/CMainToolbar.java trunk/crossfire/src/cfeditor/CMainView.java trunk/crossfire/src/cfeditor/CMapTileList.java trunk/crossfire/src/cfeditor/CMapViewBasic.java trunk/crossfire/src/cfeditor/CNewMapDialog.java trunk/crossfire/src/cfeditor/CopyBuffer.java trunk/crossfire/src/cfeditor/MapViewIFrame.java trunk/crossfire/src/cfeditor/ReplaceDialog.java trunk/crossfire/src/cfeditor/Spells.java trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java trunk/crossfire/src/cfeditor/gameobject/anim/AnimationObject.java trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java trunk/crossfire/src/cfeditor/gui/map/MapCursorControl.java trunk/daimonin/src/daieditor/CFJavaEditor.java trunk/daimonin/src/daieditor/CFTreasureListTree.java trunk/daimonin/src/daieditor/CMainStatusbar.java trunk/daimonin/src/daieditor/CMapViewBasic.java trunk/daimonin/src/daieditor/ReplaceDialog.java trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java trunk/daimonin/src/daieditor/gui/map/MapCursorControl.java trunk/daimonin/src/daieditor/gui/map/MapUserListener.java trunk/daimonin/src/daieditor/gui/map/tools/ToolSelectorPane.java Modified: trunk/crossfire/src/cfeditor/CArchPanel.java =================================================================== --- trunk/crossfire/src/cfeditor/CArchPanel.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/CArchPanel.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -26,11 +26,8 @@ import cfeditor.gameobject.GameObject; import java.awt.BorderLayout; -import java.awt.Component; import java.awt.Dimension; import java.awt.Toolkit; -import java.util.ArrayList; -import java.util.List; import javax.swing.BorderFactory; import javax.swing.JPanel; import javax.swing.JSplitPane; Modified: trunk/crossfire/src/cfeditor/CArchPanelPan.java =================================================================== --- trunk/crossfire/src/cfeditor/CArchPanelPan.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/CArchPanelPan.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -30,8 +30,6 @@ import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -43,7 +41,6 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JViewport; -import javax.swing.ListModel; import javax.swing.ListSelectionModel; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; Modified: trunk/crossfire/src/cfeditor/CFArchTypeList.java =================================================================== --- trunk/crossfire/src/cfeditor/CFArchTypeList.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/CFArchTypeList.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -30,9 +30,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Iterator; import net.sf.gridarta.io.IOUtils; import org.apache.log4j.Logger; import org.jdom.Attribute; Modified: trunk/crossfire/src/cfeditor/CFTreasureListTree.java =================================================================== --- trunk/crossfire/src/cfeditor/CFTreasureListTree.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/CFTreasureListTree.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -43,7 +43,6 @@ import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JDialog; -import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JSplitPane; Modified: trunk/crossfire/src/cfeditor/CMainStatusbar.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainStatusbar.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/CMainStatusbar.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -40,8 +40,8 @@ import net.sf.gridarta.gui.map.MapCursorEvent; import net.sf.gridarta.gui.map.MapCursorListener; import net.sf.japi.swing.ActionFactory; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.NotNull; /** * <code>CMainStatusbar</code> implements the main statusbar of the Modified: trunk/crossfire/src/cfeditor/CMainToolbar.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainToolbar.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/CMainToolbar.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -28,9 +28,9 @@ import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.InputEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.InputEvent; import java.util.Enumeration; import java.util.Vector; import javax.swing.ButtonGroup; Modified: trunk/crossfire/src/cfeditor/CMainView.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainView.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/CMainView.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -31,8 +31,8 @@ import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; -import java.awt.Rectangle; import java.awt.Point; +import java.awt.Rectangle; import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.WindowAdapter; @@ -52,8 +52,8 @@ import javax.swing.JOptionPane; import javax.swing.JSplitPane; import javax.swing.JTabbedPane; -import javax.swing.UIManager; import javax.swing.SwingConstants; +import javax.swing.UIManager; import javax.swing.event.InternalFrameEvent; import javax.swing.event.InternalFrameListener; import net.sf.gridarta.gui.GSplitPane; @@ -162,7 +162,6 @@ /** * Constructs the main view and registers the given main controller. - * @param mainControl the controller of this view */ CMainView() { super(IGUIConstants.APP_NAME + " - " + IGUIConstants.APP_WINDOW_TITLE); Modified: trunk/crossfire/src/cfeditor/CMapTileList.java =================================================================== --- trunk/crossfire/src/cfeditor/CMapTileList.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/CMapTileList.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -35,9 +35,9 @@ import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.InputEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.InputEvent; import java.util.Date; import javax.swing.BorderFactory; import javax.swing.DefaultListCellRenderer; @@ -45,15 +45,14 @@ import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.SwingConstants; -import javax.swing.ScrollPaneConstants; import static javax.swing.JViewport.SIMPLE_SCROLL_MODE; +import javax.swing.ScrollPaneConstants; import static javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER; import static javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER; +import javax.swing.SwingConstants; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import net.sf.gridarta.gameobject.GameObjectContainer; -import net.sf.gridarta.gui.map.MapCursor; import net.sf.gridarta.gui.map.MapCursorEvent; import net.sf.gridarta.gui.map.MapCursorListener; import org.jetbrains.annotations.NotNull; Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java =================================================================== --- trunk/crossfire/src/cfeditor/CMapViewBasic.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/CMapViewBasic.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -31,10 +31,10 @@ import cfeditor.map.MapModel; import java.awt.Point; import java.awt.Rectangle; +import java.awt.event.InputEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; -import java.awt.event.InputEvent; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -581,7 +581,6 @@ * This method is only called for pickmaps. Take the currently * highlighted arch on the map (if any) and insert it on this pickmap. * @param pos tile-coordinates in pickmap - * @return array of coordinates for tiles that need to be redrawn */ private void insertMapArchToPickmap(final Point pos) { final MapControl currentMap = mainControl.getCurrentMap(); Modified: trunk/crossfire/src/cfeditor/CNewMapDialog.java =================================================================== --- trunk/crossfire/src/cfeditor/CNewMapDialog.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/CNewMapDialog.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -28,10 +28,10 @@ import cfeditor.map.MapArchObject; import java.awt.Component; import java.awt.FlowLayout; -import java.util.Calendar; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.Insets; +import java.util.Calendar; import javax.swing.Box; import javax.swing.BoxLayout; import javax.swing.JButton; Modified: trunk/crossfire/src/cfeditor/CopyBuffer.java =================================================================== --- trunk/crossfire/src/cfeditor/CopyBuffer.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/CopyBuffer.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -26,15 +26,14 @@ package cfeditor; import cfeditor.gameobject.GameObject; -import cfeditor.map.DefaultMapModel; import cfeditor.map.MapArchObject; import cfeditor.map.MapControl; import cfeditor.map.MapModel; import java.awt.Point; import java.awt.Rectangle; import java.util.HashSet; -import net.sf.gridarta.Size2D; import net.sf.gridarta.MainControl; +import net.sf.gridarta.Size2D; import net.sf.gridarta.map.MapSquare; import org.apache.log4j.Logger; import org.jetbrains.annotations.NotNull; Modified: trunk/crossfire/src/cfeditor/MapViewIFrame.java =================================================================== --- trunk/crossfire/src/cfeditor/MapViewIFrame.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/MapViewIFrame.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -24,7 +24,6 @@ package cfeditor; -import cfeditor.gameobject.GameObject; import cfeditor.gui.MapView; import cfeditor.map.MapControl; import java.awt.BorderLayout; Modified: trunk/crossfire/src/cfeditor/ReplaceDialog.java =================================================================== --- trunk/crossfire/src/cfeditor/ReplaceDialog.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/ReplaceDialog.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -28,7 +28,6 @@ import cfeditor.map.MapControl; import java.awt.FlowLayout; import java.awt.Point; -import java.awt.Rectangle; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.util.ArrayList; @@ -45,7 +44,6 @@ import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.WindowConstants; -import net.sf.gridarta.Size2D; import net.sf.gridarta.map.MapSquare; import net.sf.japi.swing.ActionFactory; Modified: trunk/crossfire/src/cfeditor/Spells.java =================================================================== --- trunk/crossfire/src/cfeditor/Spells.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/Spells.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -27,7 +27,6 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileReader; -import java.io.FileWriter; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java =================================================================== --- trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -52,8 +52,8 @@ import net.sf.gridarta.io.IOUtils; import net.sf.japi.swing.Progress; import org.apache.log4j.Logger; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.NotNull; /** * The <code>ArchetypeSet</code> contains all the Archetypes. Modified: trunk/crossfire/src/cfeditor/gameobject/anim/AnimationObject.java =================================================================== --- trunk/crossfire/src/cfeditor/gameobject/anim/AnimationObject.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/gameobject/anim/AnimationObject.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -27,8 +27,8 @@ import java.io.Serializable; import javax.swing.ImageIcon; +import net.sf.gridarta.gameobject.NamedObject; import net.sf.gridarta.gameobject.anim.AbstractAnimationObject; -import net.sf.gridarta.gameobject.NamedObject; /** * A single animation object. Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -38,14 +38,8 @@ import java.awt.Image; import java.awt.Point; import java.awt.Rectangle; -import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionAdapter; -import java.awt.event.MouseMotionListener; -import java.awt.geom.NoninvertibleTransformException; import java.awt.image.BufferedImage; -import java.util.Vector; import javax.swing.ImageIcon; -import javax.swing.JComponent; import net.sf.gridarta.Size2D; import net.sf.gridarta.gui.map.MapGrid; import net.sf.gridarta.gui.map.MapGridEvent; @@ -407,6 +401,8 @@ /** * Resize the backing buffer to the new grid size. + * It will only be resized if the map is not a pickmap. + * @return <code>true</code> if the back buffer was resized, otherwise <code>false</code>. */ private boolean resizeBackBuffer() { if (isPickmap) { Modified: trunk/crossfire/src/cfeditor/gui/map/MapCursorControl.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/map/MapCursorControl.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/crossfire/src/cfeditor/gui/map/MapCursorControl.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -266,8 +266,8 @@ final boolean hasCursor = mapCursor != null && mapCursor.isActive(); - for (int direction = 0; direction < directionsGo.length; direction++) { - ACTION_FACTORY.getAction(directionsGo[direction]).setEnabled(hasCursor); + for (final String aDirectionsGo : directionsGo) { + ACTION_FACTORY.getAction(aDirectionsGo).setEnabled(hasCursor); } aSelectTile.setEnabled(hasCursor); aStartStopDrag.setEnabled(hasCursor); Modified: trunk/daimonin/src/daieditor/CFJavaEditor.java =================================================================== --- trunk/daimonin/src/daieditor/CFJavaEditor.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/daimonin/src/daieditor/CFJavaEditor.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -25,11 +25,11 @@ package daieditor; import static daieditor.CMainControl.PREFS_LANGUAGE; +import java.io.BufferedReader; import java.io.File; -import java.io.BufferedReader; +import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; -import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.List; import java.util.Locale; Modified: trunk/daimonin/src/daieditor/CFTreasureListTree.java =================================================================== --- trunk/daimonin/src/daieditor/CFTreasureListTree.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/daimonin/src/daieditor/CFTreasureListTree.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -48,7 +48,6 @@ import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JDialog; -import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JSplitPane; Modified: trunk/daimonin/src/daieditor/CMainStatusbar.java =================================================================== --- trunk/daimonin/src/daieditor/CMainStatusbar.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/daimonin/src/daieditor/CMainStatusbar.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -40,8 +40,8 @@ import net.sf.gridarta.gui.map.MapCursorEvent; import net.sf.gridarta.gui.map.MapCursorListener; import net.sf.japi.swing.ActionFactory; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.NotNull; /** * <code>CMainStatusbar</code> implements the main statusbar of the Modified: trunk/daimonin/src/daieditor/CMapViewBasic.java =================================================================== --- trunk/daimonin/src/daieditor/CMapViewBasic.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/daimonin/src/daieditor/CMapViewBasic.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -56,8 +56,8 @@ import net.sf.gridarta.map.MapModelListener; import net.sf.gridarta.map.MapSquare; import org.apache.log4j.Logger; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.NotNull; /** * <code>CMapViewBasic</code> is the true mapview object. However, it is not Modified: trunk/daimonin/src/daieditor/ReplaceDialog.java =================================================================== --- trunk/daimonin/src/daieditor/ReplaceDialog.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/daimonin/src/daieditor/ReplaceDialog.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -44,8 +44,8 @@ import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.WindowConstants; +import net.sf.gridarta.MainControl; import net.sf.gridarta.map.MapSquare; -import net.sf.gridarta.MainControl; import net.sf.japi.swing.ActionFactory; /** Modified: trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java =================================================================== --- trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -36,9 +36,9 @@ import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStreamWriter; -import java.io.InputStream; import net.sf.gridarta.gameobject.face.AbstractFaceObjects; import net.sf.japi.swing.ActionFactory; import net.sf.japi.swing.Progress; Modified: trunk/daimonin/src/daieditor/gui/map/MapCursorControl.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/MapCursorControl.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/daimonin/src/daieditor/gui/map/MapCursorControl.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -265,8 +265,8 @@ final boolean hasCursor = mapCursor != null && mapCursor.isActive(); - for (int direction = 0; direction < directionsGo.length; direction++) { - ACTION_FACTORY.getAction(directionsGo[direction]).setEnabled(hasCursor); + for (final String aDirectionsGo : directionsGo) { + ACTION_FACTORY.getAction(aDirectionsGo).setEnabled(hasCursor); } aSelectTile.setEnabled(hasCursor); aStartStopDrag.setEnabled(hasCursor); Modified: trunk/daimonin/src/daieditor/gui/map/MapUserListener.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/MapUserListener.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/daimonin/src/daieditor/gui/map/MapUserListener.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -28,10 +28,10 @@ import daieditor.gui.map.tools.ToolSelectorPane; import daieditor.map.MapControl; import java.awt.Point; +import java.awt.event.InputEvent; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; -import java.awt.event.InputEvent; import net.sf.gridarta.gui.map.MapCursor; import org.jetbrains.annotations.Nullable; Modified: trunk/daimonin/src/daieditor/gui/map/tools/ToolSelectorPane.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/tools/ToolSelectorPane.java 2006-12-17 21:30:18 UTC (rev 1176) +++ trunk/daimonin/src/daieditor/gui/map/tools/ToolSelectorPane.java 2006-12-17 22:40:38 UTC (rev 1177) @@ -2,8 +2,8 @@ import daieditor.gui.map.event.MouseOpEvent; import java.awt.BorderLayout; +import java.awt.event.InputEvent; import java.awt.event.MouseEvent; -import java.awt.event.InputEvent; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTabbedPane; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |