From: <chr...@us...> - 2006-12-09 17:24:33
|
Revision: 983 http://svn.sourceforge.net/gridarta/?rev=983&view=rev Author: christianhujer Date: 2006-12-09 09:24:34 -0800 (Sat, 09 Dec 2006) Log Message: ----------- Added missing nullability annotations. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainControl.java trunk/crossfire/src/cfeditor/CMainStatusbar.java trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java trunk/daimonin/src/daieditor/CMainControl.java trunk/daimonin/src/daieditor/CMainStatusbar.java trunk/daimonin/src/daieditor/CMapViewBasic.java trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-09 17:22:37 UTC (rev 982) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-09 17:24:34 UTC (rev 983) @@ -500,12 +500,12 @@ } /** {@inheritDoc} */ - public void addArchPanel(final String name) { + public void addArchPanel(@NotNull final String name) { mainView.addArchPanel(name); } /** {@inheritDoc} */ - public int addArchPanelCombo(final String name) { + public int addArchPanelCombo(@NotNull final String name) { return mainView.addArchPanelCombo(name); } Modified: trunk/crossfire/src/cfeditor/CMainStatusbar.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainStatusbar.java 2006-12-09 17:22:37 UTC (rev 982) +++ trunk/crossfire/src/cfeditor/CMainStatusbar.java 2006-12-09 17:24:34 UTC (rev 983) @@ -41,6 +41,7 @@ import net.sf.gridarta.gui.map.MapCursorListener; import net.sf.japi.swing.ActionFactory; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.NotNull; /** * <code>CMainStatusbar</code> implements the main statusbar of the @@ -165,11 +166,11 @@ return null; } - public void mapCursorChangedPos(final MapCursorEvent e) { + public void mapCursorChangedPos(@NotNull final MapCursorEvent e) { mapCursorChanged(e.getSource()); } - public void mapCursorChangedMode(final MapCursorEvent e) { + public void mapCursorChangedMode(@NotNull final MapCursorEvent e) { mapCursorChanged(e.getSource()); } Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java =================================================================== --- trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java 2006-12-09 17:22:37 UTC (rev 982) +++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java 2006-12-09 17:24:34 UTC (rev 983) @@ -53,6 +53,7 @@ import net.sf.japi.swing.Progress; import org.apache.log4j.Logger; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.NotNull; /** * The <code>ArchetypeSet</code> contains all the Archetypes. @@ -618,7 +619,7 @@ } /** {@inheritDoc} */ - public void collect(final Progress progress, final File dir) throws IOException { + public void collect(@NotNull final Progress progress, @NotNull final File dir) throws IOException { final File dfile = new File(dir, IGUIConstants.ARCH_FILE); // now open the output-stream final DataOutputStream out = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(dfile))); Modified: trunk/daimonin/src/daieditor/CMainControl.java =================================================================== --- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-09 17:22:37 UTC (rev 982) +++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-09 17:24:34 UTC (rev 983) @@ -791,12 +791,12 @@ } /** {@inheritDoc} */ - public void addArchPanel(final String name) { + public void addArchPanel(@NotNull final String name) { mainView.addArchPanel(name); } /** {@inheritDoc} */ - public int addArchPanelCombo(final String name) { + public int addArchPanelCombo(@NotNull final String name) { return mainView.addArchPanelCombo(name); } Modified: trunk/daimonin/src/daieditor/CMainStatusbar.java =================================================================== --- trunk/daimonin/src/daieditor/CMainStatusbar.java 2006-12-09 17:22:37 UTC (rev 982) +++ trunk/daimonin/src/daieditor/CMainStatusbar.java 2006-12-09 17:24:34 UTC (rev 983) @@ -41,6 +41,7 @@ import net.sf.gridarta.gui.map.MapCursorListener; import net.sf.japi.swing.ActionFactory; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.NotNull; /** * <code>CMainStatusbar</code> implements the main statusbar of the @@ -165,11 +166,11 @@ return null; } - public void mapCursorChangedPos(final MapCursorEvent e) { + public void mapCursorChangedPos(@NotNull final MapCursorEvent e) { mapCursorChanged(e.getSource()); } - public void mapCursorChangedMode(final MapCursorEvent e) { + public void mapCursorChangedMode(@NotNull final MapCursorEvent e) { mapCursorChanged(e.getSource()); } Modified: trunk/daimonin/src/daieditor/CMapViewBasic.java =================================================================== --- trunk/daimonin/src/daieditor/CMapViewBasic.java 2006-12-09 17:22:37 UTC (rev 982) +++ trunk/daimonin/src/daieditor/CMapViewBasic.java 2006-12-09 17:24:34 UTC (rev 983) @@ -57,6 +57,7 @@ import net.sf.gridarta.map.MapSquare; import org.apache.log4j.Logger; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.NotNull; /** * <code>CMapViewBasic</code> is the true mapview object. However, it is not @@ -441,7 +442,7 @@ //} // class CPaintOp - public void mapCursorChangedPos(final MapCursorEvent e) { + public void mapCursorChangedPos(@NotNull final MapCursorEvent e) { final MapCursor mapCursor = e.getSource(); if (mapCursor.isActive()) { final Rectangle rec = renderer.getTileBounds(mapCursor.getLocation()); @@ -449,7 +450,7 @@ } } - public void mapCursorChangedMode(final MapCursorEvent e) { + public void mapCursorChangedMode(@NotNull final MapCursorEvent e) { // Ignore mode change events } Modified: trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java 2006-12-09 17:22:37 UTC (rev 982) +++ trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java 2006-12-09 17:24:34 UTC (rev 983) @@ -441,12 +441,12 @@ } /** {@inheritDoc} */ - public void mapGridChanged(final MapGridEvent e) { + public void mapGridChanged(@NotNull final MapGridEvent e) { repaint(); } /** {@inheritDoc} */ - public void mapGridResized(final MapGridEvent e) { + public void mapGridResized(@NotNull final MapGridEvent e) { mapSize = e.getSource().getSize(); calculateOrigin(); repaint(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-09 18:02:17
|
Revision: 985 http://svn.sourceforge.net/gridarta/?rev=985&view=rev Author: christianhujer Date: 2006-12-09 10:02:03 -0800 (Sat, 09 Dec 2006) Log Message: ----------- Fixed declaration problems in javadoc references. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMapTileList.java trunk/crossfire/src/cfeditor/CMapViewBasic.java trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java trunk/daimonin/src/daieditor/CMapTileList.java Modified: trunk/crossfire/src/cfeditor/CMapTileList.java =================================================================== --- trunk/crossfire/src/cfeditor/CMapTileList.java 2006-12-09 17:33:36 UTC (rev 984) +++ trunk/crossfire/src/cfeditor/CMapTileList.java 2006-12-09 18:02:03 UTC (rev 985) @@ -38,7 +38,6 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.Date; -import java.util.Iterator; import javax.swing.BorderFactory; import javax.swing.DefaultListCellRenderer; import javax.swing.DefaultListModel; @@ -287,8 +286,8 @@ /** * Set the display to the currently selected map tile. - * @param map Map to get display for (includes selection information) - * @param gameObject selected GameObject + * @param mapControl Map to get display for (includes selection information) + * @param gameObject selected GameObject */ public void setMapTileList(final MapControl mapControl, final GameObject gameObject) { list.setEnabled(false); Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java =================================================================== --- trunk/crossfire/src/cfeditor/CMapViewBasic.java 2006-12-09 17:33:36 UTC (rev 984) +++ trunk/crossfire/src/cfeditor/CMapViewBasic.java 2006-12-09 18:02:03 UTC (rev 985) @@ -40,7 +40,6 @@ import java.io.IOException; import java.util.Iterator; import javax.imageio.ImageIO; -import javax.swing.JComponent; import javax.swing.JScrollPane; import javax.swing.JViewport; import net.sf.gridarta.EditOperation; @@ -255,8 +254,7 @@ * Highlight the tile at given coordinates (just as * if it had been selected with leftclick). Besides, the mapview is * always centered on the coordinates as far as possible. - * @param dx x-coordinate - * @param dy y-coordinate + * @param point Coordinates to set hotsopt to. */ public void setHotspot(final Point point) { // set the highlighted spot: Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java 2006-12-09 17:33:36 UTC (rev 984) +++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java 2006-12-09 18:02:03 UTC (rev 985) @@ -298,8 +298,7 @@ * Important: This method currently works only for standard * (rectangular) view. Iso has overlapping tiles which makes this a lot * more difficult. :( - * @param x map coordinates for the tile to draw - * @param y map coordinates for the tile to draw + * @param point Map coordinates for the tile to draw. */ public void paintTile(final Point point) { final Graphics grfx; @@ -393,8 +392,7 @@ /** * If the given map-square is highlighted, the highligh-icon is drawn * on that square. - * @param x map coords of the square - * @param y map coords of the square + * @param point Map coordinates of the square to highlight * @param grfx graphics context to draw in */ public void paintHighlightTile(final Graphics grfx, final Point point) { Modified: trunk/daimonin/src/daieditor/CMapTileList.java =================================================================== --- trunk/daimonin/src/daieditor/CMapTileList.java 2006-12-09 17:33:36 UTC (rev 984) +++ trunk/daimonin/src/daieditor/CMapTileList.java 2006-12-09 18:02:03 UTC (rev 985) @@ -318,8 +318,8 @@ /** * Set the display to the currently selected map tile. - * @param map Map to get display for (includes selection information) - * @param gameObject selected GameObject + * @param mapControl Map to get display for (includes selection information) + * @param gameObject selected GameObject */ public void setMapTileList(final MapControl mapControl, final GameObject gameObject) { list.setEnabled(false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-09 18:42:35
|
Revision: 987 http://svn.sourceforge.net/gridarta/?rev=987&view=rev Author: christianhujer Date: 2006-12-09 10:42:35 -0800 (Sat, 09 Dec 2006) Log Message: ----------- Fixed several javadoc issues. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CAttribDialog.java trunk/crossfire/src/cfeditor/ReplaceDialog.java trunk/crossfire/src/cfeditor/gameobject/GameObject.java trunk/daimonin/src/daieditor/CArchPanelPan.java trunk/daimonin/src/daieditor/CAttribDialog.java trunk/daimonin/src/daieditor/CPreview.java trunk/daimonin/src/daieditor/ProcessRunner.java trunk/daimonin/src/daieditor/ReplaceDialog.java trunk/daimonin/src/daieditor/ScriptArchData.java trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java trunk/daimonin/src/daieditor/gameobject/GameObject.java trunk/daimonin/src/daieditor/gameobject/anim/AnimationObjects.java trunk/daimonin/src/daieditor/gameobject/match/GameObjectMatchers.java trunk/daimonin/src/daieditor/gameobject/match/MutableOrGameObjectMatcher.java trunk/daimonin/src/daieditor/gui/AboutDialog.java trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java trunk/daimonin/src/daieditor/gui/map/LevelRenderer.java trunk/daimonin/src/daieditor/gui/map/MapCursorControl.java trunk/daimonin/src/daieditor/gui/map/MapPreviewAccessory.java trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java trunk/daimonin/src/daieditor/gui/map/MapTilePane.java trunk/daimonin/src/daieditor/gui/map/MapViewSettings.java trunk/daimonin/src/daieditor/gui/map/tools/VoidTool.java trunk/daimonin/src/daieditor/gui/prefs/ResPrefs.java trunk/daimonin/src/daieditor/io/CMapReader.java trunk/src/app/net/sf/gridarta/gameobject/GameObject.java trunk/src/app/net/sf/gridarta/gameobject/GameObjectContainer.java Modified: trunk/crossfire/src/cfeditor/CAttribDialog.java =================================================================== --- trunk/crossfire/src/cfeditor/CAttribDialog.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/crossfire/src/cfeditor/CAttribDialog.java 2006-12-09 18:42:35 UTC (rev 987) @@ -839,7 +839,6 @@ /** * Action method for help. - * @used */ public void attribHelp() { new Help(mainControl.getMainView(), type.createHtmlDocu()).setVisible(true); @@ -847,7 +846,6 @@ /** * Action method for ok. - * @used */ public void attribOk() { if (applySettings()) { @@ -857,7 +855,6 @@ /** * Action method for apply. - * @used */ public void attribApply() { applySettings(); @@ -865,7 +862,6 @@ /** * Action method for cancel. - * @used */ public void attribCancel() { setValue(cancelButton); @@ -883,7 +879,6 @@ /** * Action method for summary. Switches the cardlayout to the summary list * of all nonzero attributes. - * @used */ public void attribSummary() { // interface is displayed, switch to summary @@ -968,7 +963,6 @@ /** * Turns the summary off. * Switches to the input-interface for all attributes and the summary list of all nonzero attributes. - * @used */ public void attribEdit() { summaryEditButton.setAction(summaryAction); Modified: trunk/crossfire/src/cfeditor/ReplaceDialog.java =================================================================== --- trunk/crossfire/src/cfeditor/ReplaceDialog.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/crossfire/src/cfeditor/ReplaceDialog.java 2006-12-09 18:42:35 UTC (rev 987) @@ -395,7 +395,6 @@ /** * Action method for Ok button. - * @used */ public void replaceOk() { final String matchString = replaceInput1.getText().trim(); @@ -435,7 +434,6 @@ /** * Action method for Cancel button. - * @used */ public void replaceCancel() { dialog.setVisible(false); Modified: trunk/crossfire/src/cfeditor/gameobject/GameObject.java =================================================================== --- trunk/crossfire/src/cfeditor/gameobject/GameObject.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/crossfire/src/cfeditor/gameobject/GameObject.java 2006-12-09 18:42:35 UTC (rev 987) @@ -735,7 +735,7 @@ * @param eventList JList from the MapArchPanel (script tab) which displays * the events * @param mapanel the MapArchPanel - * @XXX this method knows things it should never know, it is evil! + * @xxx this method knows things it should never know, it is evil! */ public void modifyEventScript(final String eventType, final int task, final JList eventList, final CMapArchPanel mapanel) { if (script != null) { Modified: trunk/daimonin/src/daieditor/CArchPanelPan.java =================================================================== --- trunk/daimonin/src/daieditor/CArchPanelPan.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/CArchPanelPan.java 2006-12-09 18:42:35 UTC (rev 987) @@ -145,7 +145,6 @@ /** * Action method for the popup menu to edit a default arch. - * @used */ public void editPopup() { final GameObject arch = getArchListObject(); Modified: trunk/daimonin/src/daieditor/CAttribDialog.java =================================================================== --- trunk/daimonin/src/daieditor/CAttribDialog.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/CAttribDialog.java 2006-12-09 18:42:35 UTC (rev 987) @@ -899,7 +899,6 @@ /** * Action method for help. - * @used */ public void attribHelp() { new Help(mainControl.getMainView(), type.createHtmlDocu()).setVisible(true); @@ -907,7 +906,6 @@ /** * Action method for ok. - * @used */ public void attribOk() { if (applySettings()) { @@ -917,7 +915,6 @@ /** * Action method for apply. - * @used */ public void attribApply() { applySettings(); @@ -925,7 +922,6 @@ /** * Action method for cancel. - * @used */ public void attribCancel() { setValue(cancelButton); @@ -943,7 +939,6 @@ /** * Action method for summary. Switches the cardlayout to the summary list * of all nonzero attributes. - * @used */ public void attribSummary() { // interface is displayed, switch to summary @@ -1048,7 +1043,6 @@ /** * Turns the summary off. * Switches to the input-interface for all attributes and the summary list of all nonzero attributes. - * @used */ public void attribEdit() { summaryEditButton.setAction(summaryAction); Modified: trunk/daimonin/src/daieditor/CPreview.java =================================================================== --- trunk/daimonin/src/daieditor/CPreview.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/CPreview.java 2006-12-09 18:42:35 UTC (rev 987) @@ -113,7 +113,6 @@ /** * Zoom to 24x24. - * @used */ @ActionMethod public void zoom0() { setScale(48, 23); @@ -121,7 +120,6 @@ /** * Zoom to 12.5%. - * @used */ @ActionMethod public void zoom12() { setScale(0.125); @@ -129,7 +127,6 @@ /** * Zoom to 25%. - * @used */ @ActionMethod public void zoom25() { setScale(0.25); @@ -137,7 +134,6 @@ /** * Zoom to 50%. - * @used */ @ActionMethod public void zoom50() { setScale(0.5); @@ -145,7 +141,6 @@ /** * Zoom to 100%. - * @used */ @ActionMethod public void zoom100() { setScale(1.0); @@ -153,7 +148,6 @@ /** * Zoom to 150%. - * @used */ @ActionMethod public void zoom150() { setScale(1.5); @@ -161,7 +155,6 @@ /** * Zoom to 200%. - * @used */ @ActionMethod public void zoom200() { setScale(2.0); @@ -169,7 +162,6 @@ /** * Zoom to 250%. - * @used */ @ActionMethod public void zoom250() { setScale(2.5); @@ -177,7 +169,6 @@ /** * Zoom to 300%. - * @used */ @ActionMethod public void zoom300() { setScale(3.0); @@ -185,7 +176,6 @@ /** * Zoom to 400%. - * @used */ @ActionMethod public void zoom400() { setScale(4.0); @@ -193,7 +183,6 @@ /** * Zoom save. - * @used */ @ActionMethod public void zoomSave() { final JFileChooser chooser = new JFileChooser(); @@ -222,7 +211,6 @@ /** * Close the preview. - * @used */ @ActionMethod public void zoomClose() { frame.dispose(); @@ -230,7 +218,6 @@ /** * Zoom Algorithm: Default. - * @used */ @ActionMethod public void zoomAlgDefault() { setAlgorithm(SCALE_DEFAULT); @@ -238,7 +225,6 @@ /** * Zoom Algorithm: Fast. - * @used */ @ActionMethod public void zoomAlgFast() { setAlgorithm(SCALE_FAST); @@ -246,7 +232,6 @@ /** * Zoom Algorithm: Smooth. - * @used */ @ActionMethod public void zoomAlgSmooth() { setAlgorithm(SCALE_SMOOTH); @@ -254,7 +239,6 @@ /** * Zoom Algorithm: Replicate. - * @used */ @ActionMethod public void zoomAlgReplicate() { setAlgorithm(SCALE_REPLICATE); @@ -262,7 +246,6 @@ /** * Zoom Algorithm: Area Averaging. - * @used */ @ActionMethod public void zoomAlgAreaAveraging() { setAlgorithm(SCALE_AREA_AVERAGING); Modified: trunk/daimonin/src/daieditor/ProcessRunner.java =================================================================== --- trunk/daimonin/src/daieditor/ProcessRunner.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/ProcessRunner.java 2006-12-09 18:42:35 UTC (rev 987) @@ -219,7 +219,6 @@ /** * Action method for starting. - * @used */ public void controlStart() { synchronized (lock) { @@ -259,7 +258,6 @@ /** * Action method for stopping. - * @used */ public void controlStop() { if (process != null) { @@ -271,7 +269,6 @@ /** * Action method for clearing the log. - * @used */ public void controlClear() { stdtxt.setText(""); Modified: trunk/daimonin/src/daieditor/ReplaceDialog.java =================================================================== --- trunk/daimonin/src/daieditor/ReplaceDialog.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/ReplaceDialog.java 2006-12-09 18:42:35 UTC (rev 987) @@ -405,7 +405,6 @@ /** * Action method for Ok button. - * @used */ public void replaceOk() { final String matchString = replaceInput1.getText().trim(); @@ -445,7 +444,6 @@ /** * Action method for Cancel button. - * @used */ public void replaceCancel() { dialog.setVisible(false); Modified: trunk/daimonin/src/daieditor/ScriptArchData.java =================================================================== --- trunk/daimonin/src/daieditor/ScriptArchData.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/ScriptArchData.java 2006-12-09 18:42:35 UTC (rev 987) @@ -106,7 +106,10 @@ private boolean changed; - /** Constructor */ + /** + * Creates a ScriptArchData. + * @param owner Owner of this ScriptArchData. + */ public ScriptArchData(final GameObject owner) { this.owner = owner; if (eventTypeBox == null) { @@ -238,7 +241,7 @@ } /** - * Try to create a reasonable default script name for lazy users :-) + * Try to create a reasonable default script name for lazy users :-). * @param archName the best suitable name for the arch (see GameObject.getBestName()) * @return a nice default script name without whitespaces */ @@ -548,7 +551,7 @@ } /** - * (Note that empty ScriptArchData objects always are removed ASAP) + * (Note that empty ScriptArchData objects always are removed ASAP). * @return true when this ScriptArchData contains no events */ public boolean isEmpty() { @@ -574,7 +577,7 @@ private final GameObject event; // Our event object /** - * Construct a ScriptedEvent of given type (This is used for map-loading) + * Creates a ScriptedEvent of given type (This is used for map-loading). * @param event */ ScriptedEvent(final GameObject event) { @@ -582,7 +585,7 @@ } /** - * Construct a fully initialized ScriptedEvent + * Creates a fully initialized ScriptedEvent. * @param eventType * @param pluginName * @param options @@ -817,10 +820,10 @@ private ScriptArchData scriptArchData; /** - * Constructor - * @param isOkButton true for ok-buttons - * @param frame frame this listener belongs to - * @param scriptArchData this is only set for the ok-button of "create new" frame, otherwise null + * Creates a PathbuttonListener. + * @param isOkButton true for ok-buttons + * @param frame frame this listener belongs to + * @param scriptArchData this is only set for the ok-button of "create new" frame, otherwise null */ PathButtonListener(final boolean isOkButton, final JDialog frame, @Nullable final ScriptArchData scriptArchData) { this.isOkButton = isOkButton; Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java =================================================================== --- trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java 2006-12-09 18:42:35 UTC (rev 987) @@ -59,7 +59,7 @@ private final CMainControl mainControl; /** - * Constructor + * Creates an ArchetypeParser. * @param mainControl main control */ public ArchetypeParser(final CMainControl mainControl) { Modified: trunk/daimonin/src/daieditor/gameobject/GameObject.java =================================================================== --- trunk/daimonin/src/daieditor/gameobject/GameObject.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/gameobject/GameObject.java 2006-12-09 18:42:35 UTC (rev 987) @@ -701,7 +701,7 @@ * @param eventList JList from the MapArchPanel (script tab) which displays * the events * @param mapanel the MapArchPanel - * @XXX this method knows things it should never know, it is evil! + * @xxx this method knows things it should never know, it is evil! */ public boolean modifyEventScript(final int eventType, final int task, final JList eventList, final CMapArchPanel mapanel) { final boolean changed = script.modifyEventScript(eventType, task, eventList); Modified: trunk/daimonin/src/daieditor/gameobject/anim/AnimationObjects.java =================================================================== --- trunk/daimonin/src/daieditor/gameobject/anim/AnimationObjects.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/gameobject/anim/AnimationObjects.java 2006-12-09 18:42:35 UTC (rev 987) @@ -165,7 +165,7 @@ } /** - * Adds name-path pair to <var>animHashTable</var> + * Adds name-path pair to <var>animHashTable</var>. * @param name Name of the object * @param path Path of directory containing the arc file */ @@ -174,7 +174,7 @@ } /** - * Returns Animation Path Tree + * Returns Animation Path Tree. * @return <var>animHashTable</var> */ public Map<String, String> getAnimPathTree() { @@ -197,7 +197,7 @@ } /** - * Reads Animation Tree from Stream + * Reads Animation Tree from Stream. * @param reader Input stream * @throws IOException in case of I/O errors */ Modified: trunk/daimonin/src/daieditor/gameobject/match/GameObjectMatchers.java =================================================================== --- trunk/daimonin/src/daieditor/gameobject/match/GameObjectMatchers.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/gameobject/match/GameObjectMatchers.java 2006-12-09 18:42:35 UTC (rev 987) @@ -53,6 +53,7 @@ * Create a TypeNrsArcHObjectMatcher from XML. * @param el XML Node to create from * @return TypeNrsGameObjectMatcher for XML Node + * @throws XPathExpressionException in case of XPath problems (shouldn't happen). */ public NamedGameObjectMatcher parseMatcher(final Element el) throws XPathExpressionException { final String currentLanguage = Locale.getDefault().getLanguage(); Modified: trunk/daimonin/src/daieditor/gameobject/match/MutableOrGameObjectMatcher.java =================================================================== --- trunk/daimonin/src/daieditor/gameobject/match/MutableOrGameObjectMatcher.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/gameobject/match/MutableOrGameObjectMatcher.java 2006-12-09 18:42:35 UTC (rev 987) @@ -41,7 +41,7 @@ private List<GameObjectMatcher> gameObjectMatchers = new ArrayList<GameObjectMatcher>(); /** - * Create a MMutableOrGameObjectMatcher + * Create a MMutableOrGameObjectMatcher. * @param defaultState default matching state when {@link #gameObjectMatchers} is empty */ public MutableOrGameObjectMatcher(final boolean defaultState) { @@ -62,7 +62,8 @@ } /** - * Add an ArGameObjectMatcher * The supplied ArGameObjectMatchers only really added if it isn't already included, e.g. {@link #containsArchObjectMatcher(GameObjectMatcher)} returns <code>false</code>. + * Add an ArGameObjectMatcher. + * The supplied ArGameObjectMatchers only really added if it isn't already included, e.g. {@link #containsArchObjectMatcher(GameObjectMatcher)} returns <code>false</code>. * @param gameObjectMatcher ArchGameObjectMatcheradd */ public void addArchObjectMatcher(final GameObjectMatcher gameObjectMatcher) { @@ -72,14 +73,17 @@ } /** - * Remove an ArchGameObjectMatcher * @param gameObjectMatcher ArchGameObjectMatcherremove + * Remove an ArchGameObjectMatcher. + * @param gameObjectMatcher ArchGameObjectMatcherremove */ public void removeArchObjectMatcher(final GameObjectMatcher gameObjectMatcher) { gameObjectMatchers.remove(gameObjectMatcher); } /** - * Check whether a certain ArchGameObjectMatchercontained in this MutaMutableOrGameObjectMatcher * @return <code>true</code> if archgameObjectMatchercontained in this, otherwise <code>false</code> + * Check whether a certain ArchGameObjectMatchercontained in this MutaMutableOrGameObjectMatcher. + * @param gameObjectMatcher GameObjectMatcher to check. + * @return <code>true</code> if archgameObjectMatchercontained in this, otherwise <code>false</code> */ public boolean containsArchObjectMatcher(final GameObjectMatcher gameObjectMatcher) { return gameObjectMatchers.contains(gameObjectMatcher); Modified: trunk/daimonin/src/daieditor/gui/AboutDialog.java =================================================================== --- trunk/daimonin/src/daieditor/gui/AboutDialog.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/gui/AboutDialog.java 2006-12-09 18:42:35 UTC (rev 987) @@ -23,6 +23,7 @@ import net.sf.japi.swing.ActionFactory; /** + * The AboutDialog displays information about the editor like properties, licenses and developers. * TODO Refactor to use less memory * TODO extract JAPI class * TODO change ActionFactory Modified: trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java 2006-12-09 18:42:35 UTC (rev 987) @@ -51,7 +51,9 @@ import org.jetbrains.annotations.Nullable; /** - * This is the default renderer of a map. It visualizes selections and validation errors. + * This is the default renderer of a map. + * It visualizes selections and validation errors. + * @author <a href="mailto:ch...@ri...">Christian Hujer</a>. */ public class DefaultLevelRenderer extends LevelRenderer implements MapGridListener { @@ -74,7 +76,7 @@ /** Time of last core painting (includes selection painting). */ private transient long lastCorePaint; - /** The origin is the point in the north-west corner */ + /** The origin is the point in the north-west corner. */ private Point origin = new Point(); private MapModel mapModel; @@ -88,14 +90,18 @@ /** The MapSquares that are known to contain errors. */ private Map<MapSquare<? extends net.sf.gridarta.gameobject.GameObject>,ValidationError> erraneousMapSquares; - /** Used to avoid creation millions of points */ + /** Used to avoid creation millions of points. */ private final Point tmpPoint = new Point(); - /** If true selection and grid will not be painted */ + /** If true selection and grid will not be painted. */ private boolean paintOnlyMap; /** - * Constructor + * Creates a DefaultLevelRenderer. + * @param mainControl MainControl, used for getting icons and similar. + * @param mapControl MapControl of the map to render. + * @param pickmap Set to <code>true</code> for pickmaps. + * @param mapGrid Grid to render. */ public DefaultLevelRenderer(final CMainControl mainControl, final MapControl mapControl, final boolean pickmap, final MapGrid mapGrid) { this.mainControl = mainControl; @@ -172,7 +178,8 @@ } /** - * @return whether rendered map is a pickmap + * Returns whether the associated map is a pickmap. + * @return <code>true</code> if the associated map is a pickmap, otherwise <code>false</code>. */ public boolean isPickmap() { return isPickmap; @@ -453,7 +460,7 @@ } /** - * Set draw mode + * Set draw mode. * @param paintOnlyMap <code>true</code>: grid and selections will not be painted * @note This is only a fast hack. Don't look too much at it. */ Modified: trunk/daimonin/src/daieditor/gui/map/LevelRenderer.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/LevelRenderer.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/gui/map/LevelRenderer.java 2006-12-09 18:42:35 UTC (rev 987) @@ -35,7 +35,8 @@ public abstract class LevelRenderer extends JComponent { /** - * @return an image of the entire mapview + * Returns an image of the entire mapview. + * @return An image of the entire mapview. */ public abstract BufferedImage getFullImage(); Modified: trunk/daimonin/src/daieditor/gui/map/MapCursorControl.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/MapCursorControl.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/gui/map/MapCursorControl.java 2006-12-09 18:42:35 UTC (rev 987) @@ -34,12 +34,17 @@ /** * This class processes events from the cursor menu. * Moving the cursor, selecting map tiles/arches, inserting/deleting arches and open arch property dialog is supported. + * @author <a href="mailto:dlv...@gm...">Daniel Viegas</a> */ public class MapCursorControl { - CMainControl mainControl; + /** The MainControl. */ + private final CMainControl mainControl; - + /** + * Create a MapCursorControl. + * @param mainControl MainControl to use (used for getting the current map etc.) + */ public MapCursorControl(final CMainControl mainControl) { this.mainControl = mainControl; } @@ -167,7 +172,7 @@ } /** - * Select arch below or above selected arch + * Select arch below or above selected arch. * @param above if <code>true</code> arch above is selected otherwise arch below is selected */ private void selectArch(final boolean above) { Modified: trunk/daimonin/src/daieditor/gui/map/MapPreviewAccessory.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/MapPreviewAccessory.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/gui/map/MapPreviewAccessory.java 2006-12-09 18:42:35 UTC (rev 987) @@ -181,7 +181,11 @@ return mapControl; } - /** Get preview from #MapControl */ + /** + * Returns the preview image for a map file. + * @param file File to get preview for + * @return Preview for the file or <code>null</code> if the file has no preview. + */ @Nullable private ImageIcon getPreview(final File file) { final MapControl mapControl = getMapControl(file); final ImageIcon imageIcon; @@ -196,7 +200,11 @@ return imageIcon; } - /** Get icon from #MapControl */ + /** + * Returns the icon for a map file. + * @param file File to get Icon for + * @return Icon for the file or <code>null</code> if the file has no icon. + */ @Nullable private ImageIcon getIcon(final File file) { final MapControl mapControl = getMapControl(file); final ImageIcon imageIcon; Modified: trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java 2006-12-09 18:42:35 UTC (rev 987) @@ -210,7 +210,10 @@ return mainPanel; } - /** Create the mapHelpPanel. */ + /** + * Create the mapHelpPanel. + * @return Newly created mapHelpPanel. + */ private JComponent createMapHelpPanel() { //JPanel mapHelp = new JPanel(); //mapHelp.add(new JButton(ACTION_FACTORY.createAction(true, "mapHelp", this))); @@ -218,7 +221,11 @@ return new JButton(ACTION_FACTORY.createAction(true, "mapHelp", this)); } - /** Create the mapDataPanel. */ + /** + * Create the mapDataPanel. + * @param map MapArchObject to create panel for. + * @return Newly created mapDataPanel. + */ private JComponent createMapDataPanel(final MapArchObject map) { mapDescription.setText(map.getText()); mapDescription.setCaretPosition(0); @@ -229,7 +236,11 @@ return scrollPane; } - /** Create the optionsPanel. */ + /** + * Create the optionsPanel. + * @param map MapArchObject to create panel for. + * @return Newly created optionsPanel. + */ private JComponent createOptionsPanel(final MapArchObject map) { final JPanel optionPanel = new JPanel(new GridLayout(0, 2)); @@ -256,7 +267,11 @@ return scrollPane; } - /** Create the mapPanel. */ + /** + * Create the mapPanel. + * @param map MapArchObject to create panel for. + * @return Newly created mapPanel. + */ private JComponent createMapPanel(final MapArchObject map) { final JPanel mapPanel = new JPanel(new GridBagLayout()); final GridBagConstraints labelGbc = new GridBagConstraints(); @@ -345,7 +360,7 @@ } /** - * Create an "attribute"-line (format: <label> <textfield>) + * Create an "attribute"-line (format: <label> <textfield>). * @param textField formatted textfield * @param n lenght of textfield * @param defaultValue initial value in formatted textfield @@ -486,7 +501,7 @@ return r; // everything okay } - /** Reset all map properties to the saved values in the maparch */ + /** Reset all map properties to the saved values in the maparch. */ private void restoreMapProperties() { final MapArchObject map = mapControl.getMapArch(); @@ -520,6 +535,7 @@ /** * Open a popup and ask user to confirm his map-resizing selection. This * popup dialog disables all other windows (and threads). + * @param size New size for the map. * @return true if user confirmed, false if user cancelled resize */ private boolean askConfirmResize(final Size2D size) { Modified: trunk/daimonin/src/daieditor/gui/map/MapTilePane.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/MapTilePane.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/gui/map/MapTilePane.java 2006-12-09 18:42:35 UTC (rev 987) @@ -363,7 +363,6 @@ /** * Action method for reverting to stored path. - * @used */ public void mapTileRevert() { setText(original); @@ -371,7 +370,6 @@ /** * Action method for deleting the path. - * @used */ public void mapTileClear() { setText(""); @@ -379,7 +377,6 @@ /** * Action method for choosing the path. - * @used */ public void mapTileChoose() { final JFileChooser chooser = new JFileChooser(relativeReference.getParentFile()); @@ -478,7 +475,6 @@ /** * Action method for tiles attaching automatically. - * @used */ public void mapTilesAttach() { attachTiledMap(); @@ -486,7 +482,6 @@ /** * Action method for tiles clearing paths. - * @used */ public void mapTilesClear() { for (int i = 0; i < 8; i++) { Modified: trunk/daimonin/src/daieditor/gui/map/MapViewSettings.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/MapViewSettings.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/gui/map/MapViewSettings.java 2006-12-09 18:42:35 UTC (rev 987) @@ -91,7 +91,7 @@ } /** - * Set the visibility of the grid + * Set the visibility of the grid. * @param gridVisible new visibility of the grid (<code>true</code> for making the grid visible, <code>false</code> for inivisible) */ public void setGridVisible(final boolean gridVisible) { Modified: trunk/daimonin/src/daieditor/gui/map/tools/VoidTool.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/tools/VoidTool.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/gui/map/tools/VoidTool.java 2006-12-09 18:42:35 UTC (rev 987) @@ -7,10 +7,8 @@ */ public class VoidTool extends BasicAbstractTool { - public static final VoidTool instance = new VoidTool(); - /** - * Create a BasicAbstractTool. + * Create a VoidTool. */ public VoidTool() { super("void"); Modified: trunk/daimonin/src/daieditor/gui/prefs/ResPrefs.java =================================================================== --- trunk/daimonin/src/daieditor/gui/prefs/ResPrefs.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/gui/prefs/ResPrefs.java 2006-12-09 18:42:35 UTC (rev 987) @@ -142,7 +142,6 @@ /** * Toggle action method for loading arches from collection. * @param loadArchColl whether to load arches from collection - * @used */ public void setOptionsLoadArchColl(final boolean loadArchColl) { archField.setEnabled(!loadArchColl); @@ -151,7 +150,6 @@ /** * Toggle action method for loading arches from collection. * @return whether arches are loaded from collection - * @used */ public boolean isOptionsLoadArchColl() { return !archField.isEnabled(); Modified: trunk/daimonin/src/daieditor/io/CMapReader.java =================================================================== --- trunk/daimonin/src/daieditor/io/CMapReader.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/daimonin/src/daieditor/io/CMapReader.java 2006-12-09 18:42:35 UTC (rev 987) @@ -48,6 +48,7 @@ */ public final class CMapReader extends AbstractMapReader<GameObject, MapArchObject> { + /** Logger. */ private static final Logger log = Logger.getLogger(CMapReader.class); /** Modified: trunk/src/app/net/sf/gridarta/gameobject/GameObject.java =================================================================== --- trunk/src/app/net/sf/gridarta/gameobject/GameObject.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/src/app/net/sf/gridarta/gameobject/GameObject.java 2006-12-09 18:42:35 UTC (rev 987) @@ -659,6 +659,10 @@ */ public abstract G createArch(); + /** + * Appens a tail to this GameObject. + * @param tail Tail to append. + */ public abstract void addTailPart(final G tail); /** Modified: trunk/src/app/net/sf/gridarta/gameobject/GameObjectContainer.java =================================================================== --- trunk/src/app/net/sf/gridarta/gameobject/GameObjectContainer.java 2006-12-09 18:26:33 UTC (rev 986) +++ trunk/src/app/net/sf/gridarta/gameobject/GameObjectContainer.java 2006-12-09 18:42:35 UTC (rev 987) @@ -100,6 +100,8 @@ /** The basic iterator. */ private Iterator<G> delegate = contents.iterator(); + + /** Current element (last element returned by {@link #next()}). */ private G current; /** {@inheritDoc} */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-09 19:23:17
|
Revision: 988 http://svn.sourceforge.net/gridarta/?rev=988&view=rev Author: christianhujer Date: 2006-12-09 11:23:17 -0800 (Sat, 09 Dec 2006) Log Message: ----------- Fixed javadoc problems with missing period. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CArchPanelPan.java trunk/crossfire/src/cfeditor/CMainControl.java trunk/crossfire/src/cfeditor/CMainStatusbar.java trunk/crossfire/src/cfeditor/CMapTileList.java trunk/crossfire/src/cfeditor/ResourceFileManager.java trunk/crossfire/src/cfeditor/gui/ArchComboBox.java trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java trunk/crossfire/src/cfeditor/gui/ScriptEditor.java trunk/crossfire/src/cfeditor/gui/ScriptManager.java trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java trunk/crossfire/src/cfeditor/map/DefaultMapModel.java trunk/crossfire/src/cfeditor/map/MapArchObject.java trunk/crossfire/src/cfeditor/map/MapControl.java trunk/crossfire/src/cfeditor/menu/BasicAction.java trunk/crossfire/src/cfeditor/menu/BasicMenuEntry.java trunk/crossfire/src/cfeditor/menu/CheckBoxMenuEntry.java trunk/crossfire/src/cfeditor/menu/FilterCheckBoxEntry.java trunk/crossfire/src/cfeditor/menu/MenuChangeEvent.java trunk/crossfire/src/cfeditor/menu/MenuEntry.java trunk/crossfire/src/cfeditor/menu/MenuGroup.java trunk/crossfire/src/cfeditor/menu/MenuHelper.java trunk/crossfire/src/cfeditor/menu/MenuListener.java trunk/crossfire/src/cfeditor/menu/MenuManager.java trunk/crossfire/src/cfeditor/menu/SeparatorMenuEntry.java trunk/crossfire/src/cfeditor/menu/SimpleMenuEntry.java trunk/crossfire/src/cfeditor/menu/SimpleMenuLocation.java trunk/crossfire/src/cfeditor/parameter/ArchParameter.java trunk/crossfire/src/cfeditor/parameter/ArchParameterView.java trunk/crossfire/src/cfeditor/parameter/BooleanParameter.java trunk/crossfire/src/cfeditor/parameter/BooleanParameterView.java trunk/crossfire/src/cfeditor/parameter/DoubleParameter.java trunk/crossfire/src/cfeditor/parameter/DoubleParameterView.java trunk/crossfire/src/cfeditor/parameter/FilterParameter.java trunk/crossfire/src/cfeditor/parameter/FilterParameterView.java trunk/crossfire/src/cfeditor/parameter/IntegerParameter.java trunk/crossfire/src/cfeditor/parameter/IntegerParameterView.java trunk/crossfire/src/cfeditor/parameter/MapParameter.java trunk/crossfire/src/cfeditor/parameter/MapParameterView.java trunk/crossfire/src/cfeditor/parameter/ParameterDescriptionEditor.java trunk/crossfire/src/cfeditor/parameter/ParameterNameEditor.java trunk/crossfire/src/cfeditor/parameter/ParameterTypeEditor.java trunk/crossfire/src/cfeditor/parameter/StringParameter.java trunk/crossfire/src/cfeditor/parameter/StringParameterView.java trunk/daimonin/src/daieditor/CArchPanelPan.java trunk/daimonin/src/daieditor/CFArchAttrib.java trunk/daimonin/src/daieditor/CFArchTypeList.java trunk/daimonin/src/daieditor/CMainControl.java trunk/daimonin/src/daieditor/CMainStatusbar.java trunk/daimonin/src/daieditor/CMainView.java trunk/daimonin/src/daieditor/CMapTileList.java trunk/daimonin/src/daieditor/CMapViewBasic.java trunk/daimonin/src/daieditor/CNewMapDialog.java trunk/daimonin/src/daieditor/CPickmapPanel.java trunk/daimonin/src/daieditor/IGUIConstants.java trunk/daimonin/src/daieditor/MultiPositionData.java trunk/daimonin/src/daieditor/ReplaceDialog.java trunk/daimonin/src/daieditor/ResourceFileManager.java trunk/daimonin/src/daieditor/gameobject/match/ViewGameObjectMatcherManager.java Modified: trunk/crossfire/src/cfeditor/CArchPanelPan.java =================================================================== --- trunk/crossfire/src/cfeditor/CArchPanelPan.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/CArchPanelPan.java 2006-12-09 19:23:17 UTC (rev 988) @@ -56,7 +56,7 @@ /** Controller of this subview. */ private final CMainControl mainControl; - /** List of index-archname pairs */ + /** List of index-archname pairs. */ private List<PanelEntry> archList = new ArrayList<PanelEntry>(); private final JList theList; Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-09 19:23:17 UTC (rev 988) @@ -151,10 +151,10 @@ /** Name of used Image Set (null = none). */ private String imageSet; - /** Do we load arches from the collected archives? */ + /** Do we load arches from the collected archives. */ private boolean loadFromArchive = true; - /** Time for an automated docu popup? */ + /** Time for an automated docu popup. */ private boolean autoPopupDocu = false; /** Buffer managing copy data. */ @@ -294,7 +294,7 @@ } /** - * Get information on the current state of tileEdit: + * Get information on the current state of tileEdit. * Are tiles of type 'v' displayed? * @param v are tiles of this type displayed? * @return <code>true</code> if these tiles are currently displayed Modified: trunk/crossfire/src/cfeditor/CMainStatusbar.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainStatusbar.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/CMainStatusbar.java 2006-12-09 19:23:17 UTC (rev 988) @@ -77,7 +77,7 @@ /** The label that shows the memory status. */ private final JLabel memory; - /** Temporary used to get map coordinates */ + /** Temporary used to get map coordinates. */ private final Point mouseMapTmp = new Point(); /** @@ -206,7 +206,7 @@ } /** - * Set new mouse and map coordinates to mouse label + * Set new mouse and map coordinates to mouse label. * @param e Event that was fired from #MapCursor */ private void mousePosChanged(final MouseEvent e) { Modified: trunk/crossfire/src/cfeditor/CMapTileList.java =================================================================== --- trunk/crossfire/src/cfeditor/CMapTileList.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/CMapTileList.java 2006-12-09 19:23:17 UTC (rev 988) @@ -87,7 +87,7 @@ /** The currently selected MapSquare. */ private transient Point currentSquare = null; - /** Build Panel */ + /** Build Panel. */ public CMapTileList(final CMainControl mainControl, final CMainView mainView) { this.mainControl = mainControl; this.mainView = mainView; Modified: trunk/crossfire/src/cfeditor/ResourceFileManager.java =================================================================== --- trunk/crossfire/src/cfeditor/ResourceFileManager.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/ResourceFileManager.java 2006-12-09 19:23:17 UTC (rev 988) @@ -23,7 +23,7 @@ package cfeditor; /** - * TODO + * Contains constants for resource file names and directories. * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public final class ResourceFileManager { Modified: trunk/crossfire/src/cfeditor/gui/ArchComboBox.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/ArchComboBox.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/gui/ArchComboBox.java 2006-12-09 19:23:17 UTC (rev 988) @@ -40,12 +40,6 @@ import org.apache.log4j.Logger; import org.jetbrains.annotations.Nullable; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class ArchComboBox extends JComboBox { private static final Logger log = Logger.getLogger(ArchComboBox.class); @@ -88,12 +82,6 @@ editor.unlockEditor(); } - /** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class ArchComboBoxEditor implements ComboBoxEditor { JPanel editorPanel = null; @@ -285,12 +273,6 @@ } - /** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class ArchComboBoxModel extends AbstractListModel implements ComboBoxModel { private Object value = null; Modified: trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java 2006-12-09 19:23:17 UTC (rev 988) @@ -63,12 +63,6 @@ import javax.swing.ImageIcon; import javax.swing.JTabbedPane; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class CloseableTabbedPane extends JTabbedPane { //--- Data field(s) --- Modified: trunk/crossfire/src/cfeditor/gui/ScriptEditor.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/ScriptEditor.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/gui/ScriptEditor.java 2006-12-09 19:23:17 UTC (rev 988) @@ -45,12 +45,6 @@ import javax.swing.table.TableModel; import org.apache.log4j.Logger; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class ScriptEditor extends JPanel { private static final Logger log = Logger.getLogger(ScriptEditor.class); @@ -115,7 +109,7 @@ private static final long serialVersionUID = 1L; /** - * Create a visual JComponent used to edit the given script + * Create a visual JComponent used to edit the given script. * @param script the script object to edit */ public ScriptEditor(final CScriptModel script) { Modified: trunk/crossfire/src/cfeditor/gui/ScriptManager.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/ScriptManager.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/gui/ScriptManager.java 2006-12-09 19:23:17 UTC (rev 988) @@ -32,12 +32,6 @@ import org.apache.log4j.Logger; import org.jetbrains.annotations.Nullable; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class ScriptManager extends JFrame { private static final Logger log = Logger.getLogger(ScriptManager.class); @@ -55,7 +49,10 @@ private static final long serialVersionUID = 1L; - /** @throws java.awt.HeadlessException */ + /** + * Creates a ScriptManager. + * @param scriptController ScriptController to base this ScriptManager on. + */ public ScriptManager(final CScriptController scriptController) { super("Editor plugins management"); this.ctrl = scriptController; Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java 2006-12-09 19:23:17 UTC (rev 988) @@ -96,6 +96,13 @@ private final AffineTransform renderTransform; + /** + * Creates a DefaultLevelRenderer. + * @param mapViewBasic MapView to render. + * @param mainControl MainControl, used e.g. for icons. + * @param mapControl MapControl of the map to render. + * @param pickmap <code>true</code> if the rendered map is a pickmap, otherwise <code>false</code> + */ /** Constructor */ public DefaultLevelRenderer(final CMapViewBasic mapViewBasic, final CMainControl mainControl, final MapControl mapControl, final boolean pickmap) { this.mapViewBasic = mapViewBasic; @@ -132,7 +139,7 @@ this.addMouseMotionListener(doScrollRectToVisible); } - /** This method is called when the look and feel has changed */ + /** This method is called when the look and feel has changed. */ public void updateLookAndFeel() { // update background color of window if (!isPickmap) { @@ -141,7 +148,8 @@ } /** - * @return whether rendered map is a pickmap + * Returns whether the rendered map is a pickmap. + * @return <code>true</code> if the rendered map is a pickmap, otherwise <code>false</code>. */ public boolean isPickmap() { return isPickmap; Modified: trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java 2006-12-09 19:23:17 UTC (rev 988) @@ -20,7 +20,6 @@ package cfeditor.gui.map; -import java.awt.Graphics; import java.awt.Point; import java.awt.image.BufferedImage; import javax.swing.JComponent; @@ -37,7 +36,8 @@ public abstract void updateLookAndFeel(); /** - * @return an image of the entire mapview + * Returns an image of the entire mapview. + * @return An image of the entire mapview. */ public abstract BufferedImage getFullImage(); Modified: trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java 2006-12-09 19:23:17 UTC (rev 988) @@ -32,10 +32,7 @@ import cfeditor.map.MapControl; import java.awt.BorderLayout; import java.awt.FlowLayout; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; import java.awt.GridLayout; -import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JDialog; @@ -43,7 +40,6 @@ import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; -import javax.swing.JScrollPane; import javax.swing.JTabbedPane; import javax.swing.JTextArea; import javax.swing.JTextField; @@ -302,7 +298,7 @@ } /** - * Create an "attribute"-line (format: <label> <textfield>) + * Create an "attribute"-line (format: <label> <textfield>). * @param textField textfield * @param n lenght of textfield * @param defaultText initial text in textfield @@ -319,7 +315,7 @@ } /** - * Create an "attribute"-line (format: <label> <textfield>) + * Create an "attribute"-line (format: <label> <textfield>). * @param textField formatted textfield * @param n lenght of textfield * @param defaultValue initial value in formatted textfield @@ -541,7 +537,7 @@ return r; // everything okay } - /** Reset all map properties to the saved values in the maparch */ + /** Reset all map properties to the saved values in the maparch. */ private void restoreMapProperties() { final MapArchObject map = mapControl.getMapArch(); Modified: trunk/crossfire/src/cfeditor/map/DefaultMapModel.java =================================================================== --- trunk/crossfire/src/cfeditor/map/DefaultMapModel.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/map/DefaultMapModel.java 2006-12-09 19:23:17 UTC (rev 988) @@ -35,7 +35,6 @@ import java.awt.Point; import java.util.List; import net.sf.gridarta.Size2D; -import net.sf.gridarta.gameobject.Archetype; import net.sf.gridarta.map.AbstractMapModel; import org.apache.log4j.Logger; import org.jetbrains.annotations.NotNull; @@ -491,7 +490,7 @@ /** * Scan the elements at a given square and check the match status of - * default named filter for that square + * default named filter for that square. * @param config the NamedFilterconfig to use * @param x square location (x coordinate) * @param y square location (y coordinate) @@ -503,7 +502,7 @@ /** * Scans the elements at a given square and check the match status of given - * filter for that square + * filter for that square. * @param filter The filter to use * @param config The filterconfig * @param x square location (x coordinate) Modified: trunk/crossfire/src/cfeditor/map/MapArchObject.java =================================================================== --- trunk/crossfire/src/cfeditor/map/MapArchObject.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/map/MapArchObject.java 2006-12-09 19:23:17 UTC (rev 988) @@ -305,7 +305,10 @@ msgText.delete(0, msgText.length()); } - /** @return the maptext */ + /** + * Returns the map text. + * @return The map text. + */ @NotNull public String getText() { return msgText.toString(); } @@ -319,7 +322,10 @@ loreText.append(text); } - /** @return the map lore text */ + /** + * Returns the map lore. + * @return The map lore. + */ public String getLore() { return loreText.toString(); } Modified: trunk/crossfire/src/cfeditor/map/MapControl.java =================================================================== --- trunk/crossfire/src/cfeditor/map/MapControl.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/map/MapControl.java 2006-12-09 19:23:17 UTC (rev 988) @@ -193,6 +193,14 @@ return mapModel.addArchToMap(archname, pos, allowDouble, join, insertBelow); } + /** + * Wrapper method for addArchToMap, always inserting new objects on top. + * @param archname Name of the archetype to add. + * @param pos Position of the newly created GameObject. + * @param allowDouble Whether multiple objects on the same square should be allowed (<code>true</code> to allow, <code>false</code> to forbid). + * @param join Whether autojoining should be applied (<code>true</code> to apply autojoining, <code>false</code> to disable it). + * @return Whether the object was added successfully. + */ /** wrapper method for addArchToMap, always inserting new arches on top */ public boolean addArchToMap(final String archname, final Point pos, final boolean allowDouble, final boolean join) { return addArchToMap(archname, pos, allowDouble, join, false); @@ -352,7 +360,10 @@ mapModel.resizeMap(size); } - /** @return The level name. */ + /** + * Returns the name of this map. + * @return The name of this map. + */ public String getMapName() { return mapModel.getMapName(); } Modified: trunk/crossfire/src/cfeditor/menu/BasicAction.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/BasicAction.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/menu/BasicAction.java 2006-12-09 19:23:17 UTC (rev 988) @@ -13,12 +13,6 @@ import javax.swing.KeyStroke; import org.apache.log4j.Logger; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class BasicAction extends AbstractAction { private static final Logger log = Logger.getLogger(BasicAction.class); Modified: trunk/crossfire/src/cfeditor/menu/BasicMenuEntry.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/BasicMenuEntry.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/menu/BasicMenuEntry.java 2006-12-09 19:23:17 UTC (rev 988) @@ -21,12 +21,6 @@ import javax.swing.KeyStroke; import org.apache.log4j.Logger; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public abstract class BasicMenuEntry extends MenuEntry implements ActionListener { private static final Logger log = Logger.getLogger(BasicMenuEntry.class); Modified: trunk/crossfire/src/cfeditor/menu/CheckBoxMenuEntry.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/CheckBoxMenuEntry.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/menu/CheckBoxMenuEntry.java 2006-12-09 19:23:17 UTC (rev 988) @@ -16,12 +16,6 @@ import javax.swing.JToggleButton; import org.apache.log4j.Logger; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class CheckBoxMenuEntry extends BasicMenuEntry { private final Logger log = Logger.getLogger(CheckBoxMenuEntry.class); @@ -32,7 +26,10 @@ private MenuGroup group = null; - /** @param name */ + /** + * Creates a CheckBoxMenuEntry. + * @param name Name for this CheckBoxMenuEntry. + */ public CheckBoxMenuEntry(final String name) { super(name); } Modified: trunk/crossfire/src/cfeditor/menu/FilterCheckBoxEntry.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/FilterCheckBoxEntry.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/menu/FilterCheckBoxEntry.java 2006-12-09 19:23:17 UTC (rev 988) @@ -9,12 +9,6 @@ import cfeditor.filter.FilterConfig; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class FilterCheckBoxEntry extends CheckBoxMenuEntry { private final FilterConfig config; Modified: trunk/crossfire/src/cfeditor/menu/MenuChangeEvent.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/MenuChangeEvent.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/menu/MenuChangeEvent.java 2006-12-09 19:23:17 UTC (rev 988) @@ -6,7 +6,6 @@ package cfeditor.menu; -/** <p></p> */ public class MenuChangeEvent { /** Notifies a change in a MenuEntry content. */ Modified: trunk/crossfire/src/cfeditor/menu/MenuEntry.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/MenuEntry.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/menu/MenuEntry.java 2006-12-09 19:23:17 UTC (rev 988) @@ -17,7 +17,7 @@ /** The manager of this menu. */ private MenuManager manager; - /** Should this menu be shown? */ + /** Should this menu be shown. */ private boolean visible = true; /** A special entry designing a separator. */ Modified: trunk/crossfire/src/cfeditor/menu/MenuGroup.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/MenuGroup.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/menu/MenuGroup.java 2006-12-09 19:23:17 UTC (rev 988) @@ -7,12 +7,6 @@ package cfeditor.menu; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class MenuGroup { private CheckBoxMenuEntry checked = null; Modified: trunk/crossfire/src/cfeditor/menu/MenuHelper.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/MenuHelper.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/menu/MenuHelper.java 2006-12-09 19:23:17 UTC (rev 988) @@ -10,12 +10,6 @@ import java.util.Set; import javax.swing.JMenuBar; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class MenuHelper { private MenuHelper() { Modified: trunk/crossfire/src/cfeditor/menu/MenuListener.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/MenuListener.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/menu/MenuListener.java 2006-12-09 19:23:17 UTC (rev 988) @@ -6,7 +6,7 @@ package cfeditor.menu; -/** Used to notify of changes in a MenuEntry or a MenuLocation */ +/** Used to notify of changes in a MenuEntry or a MenuLocation. */ public interface MenuListener { /** Modified: trunk/crossfire/src/cfeditor/menu/MenuManager.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/MenuManager.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/menu/MenuManager.java 2006-12-09 19:23:17 UTC (rev 988) @@ -12,7 +12,6 @@ import java.util.Set; import org.apache.log4j.Logger; -/** <p></p> */ public class MenuManager { private final Logger log = Logger.getLogger(MenuManager.class); Modified: trunk/crossfire/src/cfeditor/menu/SeparatorMenuEntry.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/SeparatorMenuEntry.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/menu/SeparatorMenuEntry.java 2006-12-09 19:23:17 UTC (rev 988) @@ -11,26 +11,29 @@ import javax.swing.JSeparator; import javax.swing.SwingConstants; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class SeparatorMenuEntry extends MenuEntry { - /** @return a simple JMenu separator */ + /** + * Returns a simple JMenu separator. + * @return A simple JMenu separator. + */ @Override public JComponent getMenuBarComponent() { return new JSeparator(SwingConstants.VERTICAL); } - /** @return a simple JMenu separator */ + /** + * Returns a simple JMenu separator. + * @return A simple JMenu separator. + */ @Override public JComponent getMenuItemComponent() { // TODO Auto-generated method stub return new JSeparator(); } - /** @return a simple JMenu separator */ + /** + * Returns a simple JMenu separator. + * @return A simple JMenu separator. + */ @Override public JComponent getToolbarComponent() { // TODO Auto-generated method stub return new JSeparator(); Modified: trunk/crossfire/src/cfeditor/menu/SimpleMenuEntry.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/SimpleMenuEntry.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/menu/SimpleMenuEntry.java 2006-12-09 19:23:17 UTC (rev 988) @@ -14,12 +14,6 @@ import org.apache.log4j.Logger; import org.jetbrains.annotations.Nullable; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class SimpleMenuEntry extends BasicMenuEntry { private Icon icon; Modified: trunk/crossfire/src/cfeditor/menu/SimpleMenuLocation.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/SimpleMenuLocation.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/menu/SimpleMenuLocation.java 2006-12-09 19:23:17 UTC (rev 988) @@ -11,10 +11,9 @@ import java.util.Set; /** + * This class handles a menu location the simplest way, + * by mapping all handled menu entries to an ArrayList. * @author tchize - * <p/> - * This class handles a menu location the simplest way, - * by mapping all handled menu entries to an ArrayList */ public class SimpleMenuLocation implements MenuLocation { @@ -32,37 +31,38 @@ this.name = name; } - /** @see MenuLocation#addMenuEntry(MenuEntry) */ + /** {@inheritDoc} */ public void addMenuEntry(final MenuEntry entry) { synchronized (entries) { entries.add(entry); } } - /** @see MenuLocation#removeMenuEntry(MenuEntry) */ + /** {@inheritDoc} */ public void removeMenuEntry(final MenuEntry entry) { synchronized (entries) { entries.remove(entry); } } - /** @see MenuLocation#getName() */ + /** {@inheritDoc} */ public String getName() { return name; } - /** @see MenuLocation#contains(MenuEntry) */ + /** {@inheritDoc} */ public boolean contains(final MenuEntry entry) { return entries.contains(entry); } - /** @see MenuLocation#getMenuEntries() */ + /** {@inheritDoc} */ public Set<MenuEntry> getMenuEntries() { synchronized (entries) { return (Set<MenuEntry>) entries.clone(); } } + /** {@inheritDoc} */ public void setMenuManager(final MenuManager menuManager) { // do nothing, we don't care about our manager (for now) } Modified: trunk/crossfire/src/cfeditor/parameter/ArchParameter.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/ArchParameter.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/ArchParameter.java 2006-12-09 19:23:17 UTC (rev 988) @@ -15,12 +15,6 @@ import org.jdom.Element; import org.jetbrains.annotations.Nullable; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class ArchParameter extends PluginParameter { private String valueString; Modified: trunk/crossfire/src/cfeditor/parameter/ArchParameterView.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/ArchParameterView.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/ArchParameterView.java 2006-12-09 19:23:17 UTC (rev 988) @@ -15,12 +15,6 @@ import javax.swing.JComponent; import javax.swing.JPanel; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class ArchParameterView implements PluginParameterView { private final JPanel config = new JPanel(); Modified: trunk/crossfire/src/cfeditor/parameter/BooleanParameter.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/BooleanParameter.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/BooleanParameter.java 2006-12-09 19:23:17 UTC (rev 988) @@ -11,15 +11,9 @@ import cfeditor.PluginParameterView; import org.jdom.Element; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class BooleanParameter extends PluginParameter { - private class BooleanConfig { + private static class BooleanConfig { private String trueText = "Yes"; Modified: trunk/crossfire/src/cfeditor/parameter/BooleanParameterView.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/BooleanParameterView.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/BooleanParameterView.java 2006-12-09 19:23:17 UTC (rev 988) @@ -16,21 +16,8 @@ import javax.swing.JComponent; import javax.swing.JOptionPane; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class BooleanParameterView implements PluginParameterView, ActionListener { - /** - * @author tchize - * <p/> - * Extends JSpinner to work around it's tooltip bug This bug has been fixed - * since Java 5.0 but we need this workaround for java 4.x users. - */ - private final JCheckBox value; private final JButton config; Modified: trunk/crossfire/src/cfeditor/parameter/DoubleParameter.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/DoubleParameter.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/DoubleParameter.java 2006-12-09 19:23:17 UTC (rev 988) @@ -11,12 +11,6 @@ import cfeditor.PluginParameterView; import org.jdom.Element; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class DoubleParameter extends PluginParameter { private class DoubleConfig { Modified: trunk/crossfire/src/cfeditor/parameter/DoubleParameterView.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/DoubleParameterView.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/DoubleParameterView.java 2006-12-09 19:23:17 UTC (rev 988) @@ -22,23 +22,15 @@ import javax.swing.event.ChangeListener; import org.apache.log4j.Logger; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class DoubleParameterView implements PluginParameterView, ActionListener { private static final Logger log = Logger.getLogger(DoubleParameterView.class); /** + * Extends JSpinner to work around it's tooltip bug This bug has been fixed + * since Java 5.0 but we need this workaround for java 4.x users. * @author tchize - * <p/> - * Extends JSpinner to work around it's tooltip bug This bug has been fixed - * since Java 5.0 but we need this workaround for java 4.x users. */ - private class TooltipSpinner extends JSpinner { private static final long serialVersionUID = 1L; Modified: trunk/crossfire/src/cfeditor/parameter/FilterParameter.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/FilterParameter.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/FilterParameter.java 2006-12-09 19:23:17 UTC (rev 988) @@ -13,12 +13,6 @@ import cfeditor.filter.NamedFilterList; import org.jdom.Element; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class FilterParameter extends PluginParameter { public FilterParameter() { Modified: trunk/crossfire/src/cfeditor/parameter/FilterParameterView.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/FilterParameterView.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/FilterParameterView.java 2006-12-09 19:23:17 UTC (rev 988) @@ -15,12 +15,6 @@ import javax.swing.JComponent; import javax.swing.JPanel; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class FilterParameterView implements PluginParameterView { /* (non-Javadoc) Modified: trunk/crossfire/src/cfeditor/parameter/IntegerParameter.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/IntegerParameter.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/IntegerParameter.java 2006-12-09 19:23:17 UTC (rev 988) @@ -11,12 +11,6 @@ import cfeditor.PluginParameterView; import org.jdom.Element; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class IntegerParameter extends PluginParameter { private class IntegerConfig { Modified: trunk/crossfire/src/cfeditor/parameter/IntegerParameterView.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/IntegerParameterView.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/IntegerParameterView.java 2006-12-09 19:23:17 UTC (rev 988) @@ -22,23 +22,15 @@ import javax.swing.event.ChangeListener; import org.apache.log4j.Logger; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class IntegerParameterView implements PluginParameterView, ActionListener { private static final Logger log = Logger.getLogger(IntegerParameterView.class); /** + * Extends JSpinner to work around it's tooltip bug This bug has been fixed + * since Java 5.0 but we need this workaround for java 4.x users. * @author tchize - * <p/> - * Extends JSpinner to work around it's tooltip bug This bug has been fixed - * since Java 5.0 but we need this workaround for java 4.x users. */ - private class TooltipSpinner extends JSpinner { private static final long serialVersionUID = -797350272052837471L; Modified: trunk/crossfire/src/cfeditor/parameter/MapParameter.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/MapParameter.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/MapParameter.java 2006-12-09 19:23:17 UTC (rev 988) @@ -13,17 +13,8 @@ import cfeditor.map.MapControl; import org.jdom.Element; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class MapParameter extends PluginParameter { - /** - * - */ public MapParameter() { super(); parameterType = getParameterType(); Modified: trunk/crossfire/src/cfeditor/parameter/MapParameterView.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/MapParameterView.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/MapParameterView.java 2006-12-09 19:23:17 UTC (rev 988) @@ -22,12 +22,6 @@ import javax.swing.JPanel; import org.apache.log4j.Logger; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class MapParameterView implements PluginParameterView { private static final Logger log = Logger.getLogger(MapParameterView.class); @@ -77,12 +71,6 @@ return this.config; } - /** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class MyCellRenderer extends DefaultListCellRenderer { private static final long serialVersionUID = 1L; @@ -108,12 +96,6 @@ } } - /** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class MyComboBoxModel extends DefaultComboBoxModel { private final Object currentMap = new Object(); Modified: trunk/crossfire/src/cfeditor/parameter/ParameterDescriptionEditor.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/ParameterDescriptionEditor.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/ParameterDescriptionEditor.java 2006-12-09 19:23:17 UTC (rev 988) @@ -12,12 +12,6 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class ParameterDescriptionEditor extends JTextField { private final PluginParameter parameter; Modified: trunk/crossfire/src/cfeditor/parameter/ParameterNameEditor.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/ParameterNameEditor.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/ParameterNameEditor.java 2006-12-09 19:23:17 UTC (rev 988) @@ -12,12 +12,6 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class ParameterNameEditor extends JTextField { private final PluginParameter parameter; Modified: trunk/crossfire/src/cfeditor/parameter/ParameterTypeEditor.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/ParameterTypeEditor.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/ParameterTypeEditor.java 2006-12-09 19:23:17 UTC (rev 988) @@ -14,12 +14,6 @@ import java.awt.event.ItemListener; import javax.swing.JComboBox; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class ParameterTypeEditor extends JComboBox { private final PluginParameter parameter; Modified: trunk/crossfire/src/cfeditor/parameter/StringParameter.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/StringParameter.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/StringParameter.java 2006-12-09 19:23:17 UTC (rev 988) @@ -12,12 +12,6 @@ import org.apache.log4j.Logger; import org.jdom.Element; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class StringParameter extends PluginParameter { private static final Logger log = Logger.getLogger(StringParameter.class); Modified: trunk/crossfire/src/cfeditor/parameter/StringParameterView.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/StringParameterView.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/crossfire/src/cfeditor/parameter/StringParameterView.java 2006-12-09 19:23:17 UTC (rev 988) @@ -17,12 +17,6 @@ import javax.swing.text.Document; import org.apache.log4j.Logger; -/** - * @author tchize - * <p/> - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ public class StringParameterView implements PluginParameterView { private static final Logger log = Logger.getLogger(StringParameterView.class); Modified: trunk/daimonin/src/daieditor/CArchPanelPan.java =================================================================== --- trunk/daimonin/src/daieditor/CArchPanelPan.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/daimonin/src/daieditor/CArchPanelPan.java 2006-12-09 19:23:17 UTC (rev 988) @@ -62,7 +62,7 @@ /** Controller of this subview. */ private final CMainControl mainControl; - /** List of index-archname pairs */ + /** List of index-archname pairs. */ private List<PanelEntry> archList = new ArrayList<PanelEntry>(); private final JList theList; Modified: trunk/daimonin/src/daieditor/CFArchAttrib.java =================================================================== --- trunk/daimonin/src/daieditor/CFArchAttrib.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/daimonin/src/daieditor/CFArchAttrib.java 2006-12-09 19:23:17 UTC (rev 988) @@ -74,7 +74,7 @@ private String section; // name of the section this attribute is in - /** Constructor */ + /** Constructor. */ public CFArchAttrib() { nameOld = ""; nameNew = ""; Modified: trunk/daimonin/src/daieditor/CFArchTypeList.java =================================================================== --- trunk/daimonin/src/daieditor/CFArchTypeList.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/daimonin/src/daieditor/CFArchTypeList.java 2006-12-09 19:23:17 UTC (rev 988) @@ -350,8 +350,9 @@ } /** + * Returns the number of CFArchTypes in the list. + * The default type is not counted. * @return Number of CFArchTypes in the list. - * (Not counting the default type.) */ public int getLength() { return archTypeList.size(); Modified: trunk/daimonin/src/daieditor/CMainControl.java =================================================================== --- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-09 19:23:17 UTC (rev 988) @@ -241,10 +241,10 @@ // active dir since the program started private boolean hasChangedDir = false; - /** Do we load arches from the collected archives? */ + /** Do we load arches from the collected archives. */ private boolean loadFromArchive = true; - /** Time for an automated docu popup? */ + /** Time for an automated docu popup. */ private boolean autoPopupDocu = false; /** Whether to display double arches like stacked walls in stacked version. */ @@ -584,7 +584,7 @@ } /** - * Get information on the current state of tileEdit: + * Get information on the current state of tileEdit. * Are tiles of type 'v' displayed? * @param v are tiles of this type displayed? * @return <code>true</code> if these tiles are currently displayed @@ -605,8 +605,8 @@ } /** - * @return true when a tileEdit value is set, so that not - * all tiles are displayed. + * Returns whether a tileEdit value is set so that not all tiles are displayed. + * @return <code>true</code> if a tileEdit value is set, otherwise <code>false</code>. */ public boolean isTileEditSet() { return (tileEdit & TILE_EDIT_NONE) == 0 && tileEdit != 0; @@ -1245,8 +1245,8 @@ } /** - * browse first through the default arch list and attach map arches to it - * then browse through the face list and try to find the pictures + * Browse first through the default arch list and attach map arches to it + * then browse through the face list and try to find the pictures. */ public void collectTempList(final List<GameObject> objects, final String uri) { final StringBuilder noarch = new StringBuilder(); @@ -2042,7 +2042,6 @@ return archetypeParser; } - /** @param map */ public void mapSizeChanged(final net.sf.gridarta.map.MapModel map) { if (prefs.getBoolean(PREFS_VALIDATOR_AUTO, PREFS_VALIDATOR_AUTO_DEFAULT)) { checkMap(map); @@ -2084,7 +2083,7 @@ } /** - * Get controller of copybuffer + * Get controller of copybuffer. * @return Controller of copybuffer */ public MapControl getCopyMapCtrl() { Modified: trunk/daimonin/src/daieditor/CMainStatusbar.java =================================================================== --- trunk/daimonin/src/daieditor/CMainStatusbar.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/daimonin/src/daieditor/CMainStatusbar.java 2006-12-09 19:23:17 UTC (rev 988) @@ -77,7 +77,7 @@ /** The label that shows the memory status. */ private final JLabel memory; - /** Temporary used to get map coordinates */ + /** Temporary used to get map coordinates. */ private final Point mouseMapTmp = new Point(); /** @@ -206,7 +206,7 @@ } /** - * Set new mouse and map coordinates to mouse label + * Set new mouse and map coordinates to mouse label. * @param e Event that was fired from #MapCursor */ private void mousePosChanged(final MouseEvent e) { Modified: trunk/daimonin/src/daieditor/CMainView.java =================================================================== --- trunk/daimonin/src/daieditor/CMainView.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/daimonin/src/daieditor/CMainView.java 2006-12-09 19:23:17 UTC (rev 988) @@ -254,7 +254,10 @@ } } - /** @return true when pickmap is active, false when archlist is active */ + /** + * Returns whether a pickmap is active. + * @return <code>true</code> if a pickmap is active, <code>false</code> if the archlist is active. + */ public boolean isPickmapActive() { return pickmapActive; } @@ -265,11 +268,12 @@ } /** + * Returns the active arch in the left-side panel. + * This can either be a default arch from the archlist, or + * a custom arch from a pickmap. + * IMPORTANT: The returned GameObject is not a clone. A copy + * must be generated before inserting such an arch to the map. * @return the active arch in the left-side panel. - * This can either be a default arch from the archlist, or - * a custom arch from a pickmap. - * IMPORTANT: The returned GameObject is not a clone. A copy - * must be generated before inserting such an arch to the map. */ @Nullable public GameObject getArchPanelHighlight() { @@ -301,11 +305,12 @@ } /** + * Returns the selected arches in the left-side panel. + * This can either be default arches, or + * custom arches from a pickmap. + * IMPORTANT: The returned GameObject list contains no clone. A copy + * must be generated before inserting such arches to the map. * @return the selected arches in the left-side panel. - * This can either be default arches, or - * custom arches from a pickmap. - * IMPORTANT: The returned GameObject list contains no clone. A copy - * must be generated before inserting such arches to the map. */ @Nullable public List<GameObject> getArchPanelSelection() { @@ -334,7 +339,10 @@ archPanel.showArchPanelQuickObject(gameObject); } - /** @return the panel with all pickmaps */ + /** + * Returns the JTabbedPane with all pickmaps. + * @return The JTabbedPane with all pickmaps. + */ public JTabbedPane getPickmapPanel() { return pickmapPanel; } @@ -442,7 +450,7 @@ refresh3(); } - /** refresh the map arch panel (bottom window) */ + /** Refresh the map arch panel (bottom window). */ void refreshMapArchPanel() { mapArchPanel.refresh(); } Modified: trunk/daimonin/src/daieditor/CMapTileList.java =================================================================== --- trunk/daimonin/src/daieditor/CMapTileList.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/daimonin/src/daieditor/CMapTileList.java 2006-12-09 19:23:17 UTC (rev 988) @@ -89,7 +89,7 @@ /** The currently selected MapSquare. */ private transient MapSquare<GameObject> currentSquare; - /** Build Panel */ + /** Build Panel. */ public CMapTileList(final CMainControl mainControl, final CMainView mainView) { this.mainControl = mainControl; this.mainView = mainView; Modified: trunk/daimonin/src/daieditor/CMapViewBasic.java =================================================================== --- trunk/daimonin/src/daieditor/CMapViewBasic.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/daimonin/src/daieditor/CMapViewBasic.java 2006-12-09 19:23:17 UTC (rev 988) @@ -178,14 +178,14 @@ } /** - * is there a highlighted area in this mapview? - * @return true if there is a highlighted area + * Returns whether there is a highlighted area in this mapview. + * @return <code>true</code> if there is a highlighted area, otherwise <code>false</code>. */ public boolean isHighlight() { return mapCursor.isActive(); } - /** turn the highlight off */ + /** Turn the highlight off. */ public void unHighlight() { if (mapCursor.isActive()) { mapCursor.deactivate(); Modified: trunk/daimonin/src/daieditor/CNewMapDialog.java =================================================================== --- trunk/daimonin/src/daieditor/CNewMapDialog.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/daimonin/src/daieditor/CNewMapDialog.java 2006-12-09 19:23:17 UTC (rev 988) @@ -91,7 +91,7 @@ /** The controller of this new level dialog view. */ private final CMainControl mainControl; - /** type of map to create: pickmap or normal map? */ + /** Type of map to create: pickmap or normal map. */ private final MapType mapType; /** Desired filename for new map, null if not specified. */ Modified: trunk/daimonin/src/daieditor/CPickmapPanel.java =================================================================== --- trunk/daimonin/src/daieditor/CPickmapPanel.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/daimonin/src/daieditor/CPickmapPanel.java 2006-12-09 19:23:17 UTC (rev 988) @@ -52,7 +52,7 @@ /** Action Factory. */ private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("daieditor"); - /** static instance of this class */ + /** Singleton instance of this class. */ private static CPickmapPanel instance; private final CMainControl mainControl; // main control reference @@ -67,7 +67,9 @@ /** The current active pickmap ontop. */ private MapControl currentPickMap; - /** Constructor */ + /** + * Creates a CPickmapPanel. + */ public CPickmapPanel() { mainControl = CMainControl.getInstance(); instance = this; @@ -75,28 +77,33 @@ currentPickMap = null; } - /** @return instance of this class */ + /** + * Returns the Singleton instance of this class. + * @return The Singleton instance of this class. + */ public static CPickmapPanel getInstance() { return instance; } /** - * @return true when loading process of pickmaps is complete, - * and at least one pickmap is available. + * Returns whether loading of pickmaps is complete and at least one pickmap is available. + * @return <code>true</code> if loading of pickmaps is complete and at least one pickmap is available, otherwise <code>false</code>. */ public boolean isLoadComplete() { return loadComplete; } /** - * @return currently active pickmap (is on top), - * or null if there is no pickmap + * Returns the currently active pickmap (is on top). + * @return The currently active pickmap or <code>null</code> if there is no pickmap. */ public MapControl getCurrentPickmap() { return currentPickMap; } - /** load all pickmaps and build the pickmap-panel in the process */ + /** + * Loads all pickmaps and builds the pickmap-panel. + */ public void loadPickmaps() { // the main-panel for pickmaps: tabpane = mainControl.getMainView().getPickmapPanel(); @@ -272,7 +279,7 @@ } /** - * Get a pickmap in the JTabbedPane by the index + * Get a pickmap in the JTabbedPane by the index. * @param index index number * @return the map */ @@ -281,7 +288,7 @@ } /** - * Set pickmap with given tab index to be the active one (ontop) + * Set pickmap with given tab index to be the active one (ontop). * @param index tab index */ public void setActivePickmap(final int index) { @@ -290,7 +297,7 @@ } } - /** update info which pickmap is currently on top */ + /** Update info which pickmap is currently on top. */ private void updateActivePickmap() { if (tabpane == null) { @@ -325,7 +332,7 @@ } /** - * Add the PickmapSelectionListener to the pickmap tabbed panel + * Add the PickmapSelectionListener to the pickmap tabbed panel. * @param pickpane the panel with pickmaps * @todo this method's name is a Bad Thing */ @@ -334,7 +341,7 @@ } /** - * Add the ArchNPickChangeListener to the panel containing both + * Add the ArchNPickChangeListener to the panel containing both. * arcglist and pickmaps. * @param pane the left-side panel * @todo this method's name is a Bad Thing @@ -345,7 +352,7 @@ // ------------------------ nested and inner classes ------------------------ - /** listener class to keep track of the currently active pickmap */ + /** Listener class to keep track of the currently active pickmap. */ private final class PickmapSelectionListener implements ChangeListener { private final String activePickmap; // file-name of active pickmap @@ -381,7 +388,7 @@ private int selectedIndex; // current state of selection /** - * Constructor + * Creates an ArchNPickChangeListener. * @param mainView the main view * @param pane the JTabbedPane containing both archlist and pickmaps */ Modified: trunk/daimonin/src/daieditor/IGUIConstants.java =================================================================== --- trunk/daimonin/src/daieditor/IGUIConstants.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/daimonin/src/daieditor/IGUIConstants.java 2006-12-09 19:23:17 UTC (rev 988) @@ -38,8 +38,8 @@ public interface IGUIConstants { /** - * Internal version number of the included online-documentation <br> - * increasing the number causes an automated popup of the docu + * Internal version number of the included online-documentation. + * Increasing the number causes an automated popup of the docu * when users upgrade their editor and run for the first time */ int DOCU_VERSION = 1; Modified: trunk/daimonin/src/daieditor/MultiPositionData.java =================================================================== --- trunk/daimonin/src/daieditor/MultiPositionData.java 2006-12-09 18:42:35 UTC (rev 987) +++ trunk/daimonin/src/daieditor/MultiPosi... [truncated message content] |
From: <chr...@us...> - 2006-12-09 19:32:58
|
Revision: 989 http://svn.sourceforge.net/gridarta/?rev=989&view=rev Author: christianhujer Date: 2006-12-09 11:32:58 -0800 (Sat, 09 Dec 2006) Log Message: ----------- Some CArchPanel unification. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CArchPanel.java trunk/daimonin/src/daieditor/CArchPanel.java Modified: trunk/crossfire/src/cfeditor/CArchPanel.java =================================================================== --- trunk/crossfire/src/cfeditor/CArchPanel.java 2006-12-09 19:23:17 UTC (rev 988) +++ trunk/crossfire/src/cfeditor/CArchPanel.java 2006-12-09 19:32:58 UTC (rev 989) @@ -87,7 +87,6 @@ public CArchPanel(final CMainControl mainControl) { super(new BorderLayout()); this.mainControl = mainControl; - final CSettings settings = CSettings.getInstance(IGUIConstants.APP_NAME); selectedArch = null; tabDesktop = new JTabbedPane(SwingConstants.TOP); @@ -106,6 +105,7 @@ // calculate default value in case there is no settings file final Dimension screen = Toolkit.getDefaultToolkit().getScreenSize(); + final CSettings settings = CSettings.getInstance(IGUIConstants.APP_NAME); final int divLocation = Integer.parseInt(settings.getProperty(ARCHPANEL_LOCATION_KEY, String.valueOf((int) (0.77 * 0.9 * screen.getHeight())))); splitPane.setDividerLocation(divLocation); @@ -222,7 +222,7 @@ } void refresh() { - archQuickPanel.refresh(); // refresh quickview + archQuickPanel.refresh(); repaint(); } Modified: trunk/daimonin/src/daieditor/CArchPanel.java =================================================================== --- trunk/daimonin/src/daieditor/CArchPanel.java 2006-12-09 19:23:17 UTC (rev 988) +++ trunk/daimonin/src/daieditor/CArchPanel.java 2006-12-09 19:32:58 UTC (rev 989) @@ -84,10 +84,8 @@ public CArchPanel(final CMainControl mainControl) { super(new BorderLayout()); this.mainControl = mainControl; - selectedPanel = null; + selectedArch = null; - setSelectedArch(null); - tabDesktop = new JTabbedPane(SwingConstants.TOP); tabDesktop.setBorder(BorderFactory.createEmptyBorder(IGUIConstants.SPACE_PICKARCH_TOP, 0, 0, 0)); archQuickPanel = new CArchQuickView(mainControl); @@ -169,11 +167,6 @@ selectedPanel = newnode.getData(); } - void refresh() { - archQuickPanel.refresh(); // why is this not working??? Look in CArchQuickView... - repaint(); - } - /** * Get name of selected Arch. * @return Name of selected arch in arch panel @@ -190,7 +183,15 @@ this.selectedArch = selectedArch; } - /** Getter of <code>toolSelectorPane</code>. */ + void refresh() { + archQuickPanel.refresh(); + repaint(); + } + + /** + * Returns the tool selector pane. + * @return The tool selector pane. + */ public ToolSelectorPane getToolSelectorPane() { return toolSelectorPane; } @@ -209,11 +210,6 @@ this.title = title; } - public PanelNode(final PanelNode node) { - this.data = node.data; - this.title = node.title; - } - public String getTitle() { return title; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-09 19:39:28
|
Revision: 990 http://svn.sourceforge.net/gridarta/?rev=990&view=rev Author: christianhujer Date: 2006-12-09 11:39:28 -0800 (Sat, 09 Dec 2006) Log Message: ----------- Some CArchPanelPan unification. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CArchPanelPan.java trunk/daimonin/src/daieditor/CArchPanelPan.java Modified: trunk/crossfire/src/cfeditor/CArchPanelPan.java =================================================================== --- trunk/crossfire/src/cfeditor/CArchPanelPan.java 2006-12-09 19:32:58 UTC (rev 989) +++ trunk/crossfire/src/cfeditor/CArchPanelPan.java 2006-12-09 19:39:28 UTC (rev 990) @@ -135,8 +135,7 @@ @Nullable private GameObject getArchListObject(final int index) { GameObject archetype = null; if (index != -1) { - final String archname = theList.getSelectedValue().toString(); - archetype = mainControl.getArchetypeSet().getArchetype(archname); + archetype = mainControl.getArchetypeSet().getArchetype((String) theList.getSelectedValue()); } return archetype; } @@ -180,14 +179,6 @@ return panelDesktop; } - JList getList() { - return theList; - } - - DefaultListModel getModel() { - return model; - } - public List<PanelEntry> getPanelEntries() { return archList; } @@ -214,10 +205,6 @@ return catList; } - void refresh() { - repaint(); - } - void showArchList() { final int index = jbox.getSelectedIndex(); @@ -267,9 +254,9 @@ super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); final ArchetypeSet archetypeSet = mainControl.getArchetypeSet(); - final String archetypeName = value.toString(); + final String archetypeName = (String) value; final GameObject archetype = archetypeSet.getArchetype(archetypeName); - if (isSelected) { + if (isSelected) { // XXX it is not a good idea to query the selection information at this place. archPanel.setSelectedArch(archetypeName); mainControl.setStatusText(archetypeName); } Modified: trunk/daimonin/src/daieditor/CArchPanelPan.java =================================================================== --- trunk/daimonin/src/daieditor/CArchPanelPan.java 2006-12-09 19:32:58 UTC (rev 989) +++ trunk/daimonin/src/daieditor/CArchPanelPan.java 2006-12-09 19:39:28 UTC (rev 990) @@ -165,14 +165,11 @@ * @return GameObject or <code>null</code> if <var>index</var> was <code>-1</code> */ @Nullable private GameObject getArchListObject(final int index) { + GameObject archetype = null; if (index != -1) { - try { - return mainControl.getArchetypeSet().getArchetype((String) theList.getSelectedValue()); - } catch (final NullPointerException e) { - /* ignore */ - } + archetype = mainControl.getArchetypeSet().getArchetype((String) theList.getSelectedValue()); } - return null; + return archetype; } /** @@ -274,7 +271,7 @@ final GameObject archetype = archetypeSet.getArchetype(archetypeName); if (isSelected) { // XXX it is not a good idea to query the selection information at this place. archPanel.setSelectedArch(archetypeName); - mainControl.setStatusText(value.toString()); + mainControl.setStatusText(archetypeName); } setText(archetypeName); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-09 20:07:50
|
Revision: 992 http://svn.sourceforge.net/gridarta/?rev=992&view=rev Author: christianhujer Date: 2006-12-09 12:07:50 -0800 (Sat, 09 Dec 2006) Log Message: ----------- Some CAttribBitmask unification. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CAttribBitmask.java trunk/daimonin/src/daieditor/CAttribBitmask.java Modified: trunk/crossfire/src/cfeditor/CAttribBitmask.java =================================================================== --- trunk/crossfire/src/cfeditor/CAttribBitmask.java 2006-12-09 19:55:32 UTC (rev 991) +++ trunk/crossfire/src/cfeditor/CAttribBitmask.java 2006-12-09 20:07:50 UTC (rev 992) @@ -28,10 +28,7 @@ import java.awt.GridLayout; import java.util.List; import javax.swing.JCheckBox; -import static javax.swing.JOptionPane.OK_CANCEL_OPTION; -import static javax.swing.JOptionPane.OK_OPTION; -import static javax.swing.JOptionPane.PLAIN_MESSAGE; -import static javax.swing.JOptionPane.showConfirmDialog; +import javax.swing.JOptionPane; import javax.swing.JPanel; import org.apache.log4j.Logger; import org.jdom.Attribute; @@ -44,6 +41,7 @@ * Attacktype, spellpath and material are such bitmasks. They are disguised for * the user, with the help of the attribute dialog. * @author <a href="mailto:and...@gm...">Andreas Vogl</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public final class CAttribBitmask { @@ -55,26 +53,29 @@ */ private static final int MAX_CHARS_PER_LINE = 35; // 50 - private final String[] bitName; // array of the names of bitmask-entries + /** Names of the bitmask-entries. */ + private final String[] bitName; - private final int maxvalue; // max. possible value + /** Maximum possible value. */ + private final int maxvalue; - private final int number; // number of bitmask entrys (not counting zero) + /** Number of bitmask entries (not counting zero). */ + private final int number; /** * Constructor of a bitmask from XML element. - * @param root xml bitmask element + * @param bitmasksElement xml bitmask element */ - public CAttribBitmask(final Element root) { + public CAttribBitmask(final Element bitmasksElement) { - List entries = root.getChildren("entry"); + List entries = bitmasksElement.getChildren("entry"); if (entries != null && entries.size() > 0) { Element elem; // find highest bit number int maxBit = 0; - for (int i = 0; entries != null && i < entries.size(); i++) { - elem = (Element) entries.get(i); + for (final Object entry : entries) { + elem = (Element) entry; final Attribute a; if ((a = elem.getAttribute("bit")) == null || elem.getAttribute("name") == null) { log.warn("Parse error: Found bitmask entry without 'bit' or 'name'."); @@ -91,7 +92,7 @@ } } } - entries = root.getChildren("entry"); // retake list, in case we detached some elements + entries = bitmasksElement.getChildren("entry"); // retake list, in case we detached some elements // initialize array bitName = new String[maxBit + 2]; @@ -111,7 +112,7 @@ } if (log.isDebugEnabled()) { - String s = "bitmask '" + root.getAttribute("name") + "':"; + String s = "bitmask '" + bitmasksElement.getAttribute("name") + "':"; for (int i = 0; i < bitName.length; i++) { s = s + " " + i + " = " + bitName[i]; } @@ -195,7 +196,7 @@ checkbox[i].setSelected(isActive(i + 1, guiAttr.getValue())); gridPanel.add(checkbox[i]); } - if (showConfirmDialog(parentComponent, gridPanel, title, OK_CANCEL_OPTION, PLAIN_MESSAGE) == OK_OPTION) { + if (JOptionPane.showConfirmDialog(parentComponent, gridPanel, title, JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE) == JOptionPane.OK_OPTION) { int newValue = 0; for (int i = 0; i < number; i++) { if (checkbox[i].isSelected()) { Modified: trunk/daimonin/src/daieditor/CAttribBitmask.java =================================================================== --- trunk/daimonin/src/daieditor/CAttribBitmask.java 2006-12-09 19:55:32 UTC (rev 991) +++ trunk/daimonin/src/daieditor/CAttribBitmask.java 2006-12-09 20:07:50 UTC (rev 992) @@ -53,18 +53,26 @@ */ private static final int MAX_CHARS_PER_LINE = 35; // 50 - private final String[] bitName; // array of the names of bitmask-entries + /** Names of the bitmask-entries. */ + private final String[] bitName; - private final int number; // number of bitmask entrys (not counting zero) + /** Maximum possible value. */ + private final int maxvalue; + /** Number of bitmask entries (not counting zero). */ + private final int number; + /** * Constructor of a bitmask from XML element. + * @param xpath XPath for XPath evaluation * @param bitmasksElement xml bitmask element + * @throws XPathExpressionException in case of XPath evaluation errors */ public CAttribBitmask(final XPath xpath, final Element bitmasksElement) throws XPathExpressionException { final NodeListIterator<Element> entries = new NodeListIterator<Element>(xpath, bitmasksElement, "bmentry|entry"); number = entries.size(); bitName = new String[number + 1]; + maxvalue = (1 << (bitName.length + 1)) - 1; bitName[0] = "<none>"; for (final Element elem : entries) { bitName[Integer.parseInt(elem.getAttribute("bit")) + 1] = elem.getAttribute("name"); @@ -93,6 +101,11 @@ return bitName[0]; } + // value too big? + if (value > maxvalue) { + log.warn("bitmask value " + value + " is too big."); + } + final StringBuilder sb = new StringBuilder(); boolean notFirst = false; int linelength = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-09 20:23:00
|
Revision: 993 http://svn.sourceforge.net/gridarta/?rev=993&view=rev Author: christianhujer Date: 2006-12-09 12:22:57 -0800 (Sat, 09 Dec 2006) Log Message: ----------- Some CAttribDialog unification. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CAttribDialog.java trunk/daimonin/src/daieditor/CAttribDialog.java Modified: trunk/crossfire/src/cfeditor/CAttribDialog.java =================================================================== --- trunk/crossfire/src/cfeditor/CAttribDialog.java 2006-12-09 20:07:50 UTC (rev 992) +++ trunk/crossfire/src/cfeditor/CAttribDialog.java 2006-12-09 20:22:57 UTC (rev 993) @@ -93,6 +93,8 @@ /** * CAttribDialog poses the GUI for Crossfire object attributes. * @author <a href="mailto:and...@gm...">Andreas Vogl</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> + * @fixme I suck */ public final class CAttribDialog extends JOptionPane implements FocusListener { @@ -115,6 +117,8 @@ private JComboBox typesel; // selection box for type + private JLabel imagePanel; // panel for object's face (png) + private final GameObject gameObject; private final Archetype<GameObject> archetype; @@ -198,7 +202,8 @@ //typeNr = 0; // for invalid types, we take "type 0" type = tmp; boolean typeFound = false; - for (int i = 0; tmp != null && !typeFound; tmp = tmp.getNext(), i++) { + int i = 0; + for (; tmp != null; tmp = tmp.getNext()) { if (tmp.getTypeNr() == this.gameObject.getArchTypNr()) { if (tmp.getTypeAttr() == null) { // no type-attributes, so we only compared type-numbers @@ -241,8 +246,10 @@ if (typeFound) { type = tmp; // save reference to the type-data listNr = i; // save position in list + break; } } + i++; } // get the type data @@ -366,7 +373,7 @@ */ private JComboBox buildArrayBox(final CFArchAttrib attr, final List<?> listData) { // build the array of list-items - final String []array = new String[(int) (listData.size() / 2.)]; + final String[] array = new String[(int) (listData.size() / 2.0)]; boolean hasSelection = false; int active = gameObject.getAttributeInt(attr.getNameOld()); @@ -407,7 +414,7 @@ gbc.weightx = 0.0; gbc.weighty = 3.0; gbc.gridheight = 3; - final JLabel imagePanel=new JLabel(mainControl.getArchetypeSet().getFace(gameObject.getFaceNr())); + imagePanel = new JLabel(mainControl.getArchetypeSet().getFace(gameObject.getFaceNr())); imagePanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10)); header.add(imagePanel, gbc); gbc.gridheight = 1; @@ -457,8 +464,8 @@ final JScrollPane scrollPane = new JScrollPane(inv); scrollPane.getViewport().setScrollMode(JViewport.SIMPLE_SCROLL_MODE); - scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER); + scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); scrollPane.setSize(80, 70); return scrollPane; @@ -501,6 +508,8 @@ * the section is empty, null is returned. * @param secId the identifier of the section * @return a <code>Component</code> containing the attribute panel + * (currently always a JScrollPane) + * @todo I'm still 263 lines long, please make me shorter. */ @Nullable private Component makeAttribPanel(final int secId) { int number = 0; // number of attributes in this section @@ -597,7 +606,6 @@ case BOOL_SPEC: { // parse values for customized bool final String trueVal = type.getAttr()[i].getMisc()[0]; - if (trueVal.equals("0")) { final String attrString = gameObject.getAttributeString(type.getAttr()[i].getNameOld()); input = new JCheckBox(type.getAttr()[i].getNameNew(), (attrString.length() == 0 || attrString.equals("0"))); @@ -873,7 +881,7 @@ * @param msg message text */ private void popupHelp(final String title, final String msg) { - JOptionPane.showMessageDialog(this, msg, "help: " + title, JOptionPane.PLAIN_MESSAGE); + showMessageDialog(this, msg, "Help: " + title, PLAIN_MESSAGE); } /** @@ -900,7 +908,7 @@ case BOOL_SPEC: { final boolean value = ((DialogAttrib<JCheckBox>) attr).input.isSelected(); // true/false if (value) { - doc.insertString(doc.getLength(), "<" + attr.ref.getNameNew() + ">\n", docStyle); + doc.insertString(doc.getLength(), '<' + attr.ref.getNameNew() + ">\n", docStyle); } } break; @@ -909,14 +917,14 @@ case FLOAT: { final String value = ((DialogAttrib<JFormattedTextField>) attr).input.getText(); // the attrib value if (value != null && value.length() > 0 && !value.equals("0")) { - doc.insertString(doc.getLength(), attr.ref.getNameNew() + " = " + value + "\n", docStyle); + doc.insertString(doc.getLength(), attr.ref.getNameNew() + " = " + value + '\n', docStyle); } } break; case STRING: { final String value = ((DialogAttrib<JTextField>) attr).input.getText(); // the attrib value if (value != null && value.length() > 0) { - doc.insertString(doc.getLength(), attr.ref.getNameNew() + " = " + value + "\n", docStyle); + doc.insertString(doc.getLength(), attr.ref.getNameNew() + " = " + value + '\n', docStyle); } } break; @@ -925,21 +933,21 @@ case LIST: { final String value = ((DialogAttrib<JComboBox>) attr).input.getSelectedItem().toString().trim(); // the attrib value if (value != null && value.length() > 0 && !value.startsWith("<")) { - doc.insertString(doc.getLength(), attr.ref.getNameNew() + " = " + value + "\n", docStyle); + doc.insertString(doc.getLength(), attr.ref.getNameNew() + " = " + value + '\n', docStyle); } } break; case BITMASK: { final String value = ((BitmaskAttrib) attr).input.getText().trim(); if (value != null && value.length() > 0 && !value.startsWith("<")) { - doc.insertString(doc.getLength(), attr.ref.getNameNew() + " = " + value + "\n", docStyle); + doc.insertString(doc.getLength(), attr.ref.getNameNew() + " = " + value + '\n', docStyle); } } break; case TREASURE: { final String value = ((DialogAttrib<JTextField>) attr).input.getText().trim(); // the attrib value if (value != null && value.length() > 0 && !value.equals(CFTreasureListTree.NONE_SYM)) { - doc.insertString(doc.getLength(), attr.ref.getNameNew() + " = " + value + "\n", docStyle); + doc.insertString(doc.getLength(), attr.ref.getNameNew() + " = " + value + '\n', docStyle); } } break; @@ -991,7 +999,7 @@ case BOOL: { // a boolean attribute (flag) if (((DialogAttrib<JCheckBox>) attr).input.isSelected() != (archetype.getAttributeInt(attr.ref.getNameOld()) == 1)) { - newArchText = newArchText + attr.ref.getNameOld() + " " + (((DialogAttrib<JCheckBox>) attr).input.isSelected() ? 1 : 0) + "\n"; + newArchText = newArchText + attr.ref.getNameOld() + ' ' + (((DialogAttrib<JCheckBox>) attr).input.isSelected() ? 1 : 0) + '\n'; } } break; @@ -1005,7 +1013,7 @@ } // now see if we need to write it into the archtext or not if ((valString.equals("0") && !(archetype.getAttributeString(attr.ref.getNameOld()).length() == 0)) || (!valString.equals("0") && !archetype.getAttributeString(attr.ref.getNameOld()).equals(valString))) { - newArchText = newArchText + attr.ref.getNameOld() + " " + valString + "\n"; + newArchText = newArchText + attr.ref.getNameOld() + ' ' + valString + '\n'; } } break; @@ -1031,7 +1039,7 @@ case INT: { final int value = ((Number) ((DialogAttrib<JFormattedTextField>) attr).input.getValue()).intValue(); if (archetype.getAttributeInt(attr.ref.getNameOld()) != value) { - newArchText = newArchText + attr.ref.getNameOld() + " " + value + "\n"; + newArchText = newArchText + attr.ref.getNameOld() + ' ' + value + '\n'; } } break; @@ -1187,7 +1195,7 @@ // we assume the default gameObject is "right" and we are "wrong". The typedefs aren't that trustworthy. // BUT - if the gameObject has a changed type, the archetype has lost it's credibility. // So, in this special case, the fixed attribute applies always. - newArchText = newArchText + type.getAttr()[i].getNameOld() + " " + type.getAttr()[i].getNameNew() + "\n"; + newArchText = newArchText + type.getAttr()[i].getNameOld() + ' ' + type.getAttr()[i].getNameNew() + '\n'; } } } @@ -1233,6 +1241,7 @@ mainControl.getCurrentMap().repaint(); // repaint map } } + imagePanel.setIcon(mainControl.getArchetypeSet().getFace(gameObject.getFaceNr())); if (newMsg != null) { // set new msg text only when it is not equal to default gameObject @@ -1432,6 +1441,7 @@ popupHelp(attrib.getNameNew(), attrib.getText()); } else { assert false; + log.warn("Help without help context!"); } } @@ -1556,7 +1566,7 @@ } /** {@inheritDoc} */ - public void windowClosing(final WindowEvent e) { + @Override public void windowClosing(final WindowEvent e) { gameObject.addObjectText(allErrors.trim()); // nuke the popup dialog Modified: trunk/daimonin/src/daieditor/CAttribDialog.java =================================================================== --- trunk/daimonin/src/daieditor/CAttribDialog.java 2006-12-09 20:07:50 UTC (rev 992) +++ trunk/daimonin/src/daieditor/CAttribDialog.java 2006-12-09 20:22:57 UTC (rev 993) @@ -205,9 +205,6 @@ boolean typeFound = false; int i = 0; for (final CFArchType tmp : typelist) { - if (typeFound) { - break; - } if (tmp.getTypeNr() == this.gameObject.getArchTypNr()) { if (tmp.getTypeAttr() == null) { // no type-attributes, so we only compared type-numbers @@ -228,7 +225,7 @@ log.debug(" arch: '" + attrValue + "', type: '" + tmp.getTypeAttr()[t + 1] + "'"); } - if (!attrValue.equals(tmp.getTypeAttr()[t + 1]) && !("0".equals(tmp.getTypeAttr()[t + 1]) && attrValue.length() == 0)) { + if (!attrValue.equals(tmp.getTypeAttr()[t + 1]) && !(tmp.getTypeAttr()[t + 1].equals("0") && attrValue.length() == 0)) { match = false; if (log.isDebugEnabled()) { log.debug("-> attr: " + tmp.getTypeAttr()[t] + " NO match"); @@ -250,6 +247,7 @@ if (typeFound) { type = tmp; // save reference to the type-data listNr = i; // save position in list + break; } } i++; @@ -379,8 +377,8 @@ int active = gameObject.getAttributeInt(attr.getNameOld()); for (int i = 0; i < array.length; i++) { - array[i] = (String) listData.get((i << 1) + 1); // put string to array - if (!hasSelection && (Integer) listData.get(i << 1) == active) { + array[i] = (String) listData.get(i * 2 + 1); // put string to array + if (!hasSelection && (Integer) listData.get(i * 2) == active) { hasSelection = true; // the selection is valid active = i; // set selection to this index in the array } @@ -577,7 +575,7 @@ isText = true; // text section (need special embedding without additional scrollbars) newAttr = new DialogAttrib<JTextArea>(attrib); String text = ""; - if ("msg".equalsIgnoreCase(nameOld)) { + if (nameOld.equalsIgnoreCase("msg")) { if (archetype.getMsgText() != null && archetype.getMsgText().length() > 0 && (gameObject.getMsgText() == null || gameObject.getMsgText().trim().length() == 0)) { text = archetype.getMsgText(); @@ -607,7 +605,7 @@ case BOOL_SPEC: { // parse values for customized bool final String trueVal = attrib.getMisc()[0]; - if ("0".equals(trueVal)) { + if (trueVal.equals("0")) { final String attrString = gameObject.getAttributeString(nameOld); input = new JCheckBox(attrib.getNameNew(), attrString.length() == 0 || "0".equals(attrString)); } else { @@ -968,7 +966,7 @@ case LONG: case FLOAT: { final String value = ((DialogAttrib<JFormattedTextField>) attr).input.getText(); // the attrib value - if (value != null && value.length() > 0 && !"0".equals(value)) { + if (value != null && value.length() > 0 && !value.equals("0")) { doc.insertString(doc.getLength(), attr.ref.getNameNew() + " = " + value + '\n', docStyle); } } @@ -1029,6 +1027,7 @@ break; default: assert false : "Unknown type: " + attr.ref.getDataType(); + break; } } } catch (final BadLocationException e) { @@ -1503,7 +1502,7 @@ popupHelp(attrib.getNameNew(), attrib.getText()); } else { assert false; - System.err.println("Help without help context!"); + log.warn("Help without help context!"); } } @@ -1681,7 +1680,7 @@ if (deselected == null) { deselected = frame.type.getTypeName(); } - if (showConfirmDialog(frame, "Do you really want to change the type of this\nobject from \"" + deselected + "\" to \"" + newType.getTypeName() + "\"?", "Confirm", YES_NO_OPTION, INFORMATION_MESSAGE) == YES_OPTION) { + if (JOptionPane.showConfirmDialog(frame, "Do you really want to change the type of this\nobject from \"" + deselected + "\" to \"" + newType.getTypeName() + "\"?", "Confirm", JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE) == JOptionPane.YES_OPTION) { // change is confirmed, now get it on... frame.type = newType; // set new type structure This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-09 20:26:36
|
Revision: 994 http://svn.sourceforge.net/gridarta/?rev=994&view=rev Author: christianhujer Date: 2006-12-09 12:26:37 -0800 (Sat, 09 Dec 2006) Log Message: ----------- Made CFArchTypeList implement Iterable. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CFArchTypeList.java trunk/daimonin/src/daieditor/CFArchTypeList.java Modified: trunk/crossfire/src/cfeditor/CFArchTypeList.java =================================================================== --- trunk/crossfire/src/cfeditor/CFArchTypeList.java 2006-12-09 20:22:57 UTC (rev 993) +++ trunk/crossfire/src/cfeditor/CFArchTypeList.java 2006-12-09 20:26:37 UTC (rev 994) @@ -54,7 +54,7 @@ * accessible. * @author <a href="mailto:and...@gm...">Andreas Vogl</a> */ -public final class CFArchTypeList { +public final class CFArchTypeList implements Iterable<CFArchType> { private static final Logger log = Logger.getLogger(CFArchTypeList.class); @@ -350,6 +350,11 @@ return listTable; } + /** {@inheritDoc} */ + public Iterator<CFArchType> iterator() { + return archTypeList.iterator(); + } + /** * Read the spells from "spells.xml" into the arrays 'spellName' * and 'spellNum'. This method is called at startup Modified: trunk/daimonin/src/daieditor/CFArchTypeList.java =================================================================== --- trunk/daimonin/src/daieditor/CFArchTypeList.java 2006-12-09 20:22:57 UTC (rev 993) +++ trunk/daimonin/src/daieditor/CFArchTypeList.java 2006-12-09 20:26:37 UTC (rev 994) @@ -332,6 +332,7 @@ return listTable; } + /** {@inheritDoc} */ public Iterator<CFArchType> iterator() { return archTypeList.iterator(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-09 20:54:55
|
Revision: 995 http://svn.sourceforge.net/gridarta/?rev=995&view=rev Author: christianhujer Date: 2006-12-09 12:54:55 -0800 (Sat, 09 Dec 2006) Log Message: ----------- Added IntelliJ IDEA project files. Added Paths: ----------- trunk/crossfire/crossfire.iml trunk/daimonin/daimonin.iml trunk/gridarta.iml trunk/gridarta.ipr Added: trunk/crossfire/crossfire.iml =================================================================== --- trunk/crossfire/crossfire.iml (rev 0) +++ trunk/crossfire/crossfire.iml 2006-12-09 20:54:55 UTC (rev 995) @@ -0,0 +1,241 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="DependecySynchronizer" /> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/classes" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> + <excludeFolder url="file://$MODULE_DIR$/lib" /> + <excludeFolder url="file://$MODULE_DIR$/patches" /> + <excludeFolder url="file://$MODULE_DIR$/resource" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="gridarta" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib/jdom.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib/bsh-classgen.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib/bsh-commands.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib/bsh-util.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib/bsh-core.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="library" name="japi" level="project" /> + <orderEntry type="library" name="log4j-1.2.13" level="project" /> + <orderEntry type="library" name="junit-4.1" level="project" /> + <orderEntryProperties /> + </component> + <component name="copyright"> + <Base> + <setting name="state" value="2" /> + </Base> + <LanguageOptions name="$TEMPLATE$"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="4" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="CSS"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="HTML"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="JAVA"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="JSP"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="JavaScript"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="Properties"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="XML"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + </component> +</module> + Property changes on: trunk/crossfire/crossfire.iml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + LF Added: trunk/daimonin/daimonin.iml =================================================================== --- trunk/daimonin/daimonin.iml (rev 0) +++ trunk/daimonin/daimonin.iml 2006-12-09 20:54:55 UTC (rev 995) @@ -0,0 +1,204 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="BuildJarSettings"> + <containerInfo /> + <setting name="jarUrl" value="file://$MODULE_DIR$/daimonin.jar" /> + <setting name="buildJar" value="true" /> + <setting name="mainClass" value="" /> + </component> + <component name="DependecySynchronizer" /> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/classes" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/resource" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" packagePrefix="test" /> + <excludeFolder url="file://$MODULE_DIR$/debug" /> + <excludeFolder url="file://$MODULE_DIR$/devlib" /> + <excludeFolder url="file://$MODULE_DIR$/metrics" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="gridarta" /> + <orderEntry type="library" name="japi" level="project" /> + <orderEntry type="library" name="log4j-1.2.13" level="project" /> + <orderEntry type="library" name="junit-4.1" level="project" /> + <orderEntryProperties /> + </component> + <component name="copyright"> + <Base> + <setting name="state" value="2" /> + </Base> + <LanguageOptions name="$TEMPLATE$"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="4" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="CSS"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="HTML"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="JAVA"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="JSP"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="JavaScript"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="Properties"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="XML"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + </component> +</module> + Property changes on: trunk/daimonin/daimonin.iml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + LF Added: trunk/gridarta.iml =================================================================== --- trunk/gridarta.iml (rev 0) +++ trunk/gridarta.iml 2006-12-09 20:54:55 UTC (rev 995) @@ -0,0 +1,197 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="DependecySynchronizer" /> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/classes" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/app" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" packagePrefix="test" /> + <excludeFolder url="file://$MODULE_DIR$/crossfire" /> + <excludeFolder url="file://$MODULE_DIR$/daimonin" /> + <excludeFolder url="file://$MODULE_DIR$/dest" /> + <excludeFolder url="file://$MODULE_DIR$/src/doc" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" name="japi" level="project" /> + <orderEntry type="library" name="log4j-1.2.13" level="project" /> + <orderEntry type="library" name="junit-4.1" level="project" /> + <orderEntryProperties /> + </component> + <component name="copyright"> + <Base> + <setting name="state" value="2" /> + </Base> + <LanguageOptions name="$TEMPLATE$"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="4" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="CSS"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="HTML"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="JAVA"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="JSP"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="JavaScript"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="Properties"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="XML"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + </component> +</module> + Property changes on: trunk/gridarta.iml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + LF Added: trunk/gridarta.ipr =================================================================== --- trunk/gridarta.ipr (rev 0) +++ trunk/gridarta.ipr 2006-12-09 20:54:55 UTC (rev 995) @@ -0,0 +1,924 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4" relativePaths="false"> + <component name="AntConfiguration"> + <defaultAnt bundledAnt="true" /> + </component> + <component name="BuildJarProjectSettings"> + <option name="BUILD_JARS_ON_MAKE" value="false" /> + </component> + <component name="CharacterBrowser"> + <option name="fontName" value="Monospaced" /> + </component> + <component name="CodeStyleProjectProfileManger"> + <option name="PROJECT_PROFILE" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + </component> + <component name="CodeStyleSettingsManager"> + <option name="PER_PROJECT_SETTINGS"> + <value> + <option name="LINE_SEPARATOR" value=" " /> + <option name="INDENT_CASE_FROM_SWITCH" value="false" /> + <option name="BLANK_LINES_BEFORE_PACKAGE" value="1" /> + <option name="BLANK_LINES_AROUND_FIELD" value="1" /> + <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" /> + <option name="GENERATE_FINAL_LOCALS" value="true" /> + <option name="GENERATE_FINAL_PARAMETERS" value="true" /> + <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="1000" /> + <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="100" /> + <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND"> + <value /> + </option> + <option name="IMPORT_LAYOUT_TABLE"> + <value> + <package name="" withSubpackages="true" /> + </value> + </option> + <option name="RIGHT_MARGIN" value="160" /> + <option name="IF_BRACE_FORCE" value="3" /> + <option name="DOWHILE_BRACE_FORCE" value="3" /> + <option name="WHILE_BRACE_FORCE" value="3" /> + <option name="FOR_BRACE_FORCE" value="3" /> + <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" /> + <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" /> + <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" /> + <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" /> + <option name="HTML_TEXT_WRAP" value="0" /> + <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" /> + <option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="" /> + <option name="HTML_DO_NOT_ALIGN_CHILDREN_OF_MIN_LINES" value="10000" /> + <option name="METHOD_ANNOTATION_WRAP" value="1" /> + <option name="CLASS_ANNOTATION_WRAP" value="1" /> + <option name="FIELD_ANNOTATION_WRAP" value="1" /> + <option name="ENUM_CONSTANTS_WRAP" value="2" /> + </value> + </option> + <option name="USE_PER_PROJECT_SETTINGS" value="true" /> + </component> + <component name="CompilerConfiguration"> + <option name="DEFAULT_COMPILER" value="Javac" /> + <option name="DEPLOY_AFTER_MAKE" value="0" /> + <resourceExtensions> + <entry name=".+\.(properties|xml|html|dtd|tld)" /> + <entry name=".+\.(gif|png|jpeg|jpg)" /> + </resourceExtensions> + <wildcardResourcePatterns> + <entry name="?*.properties" /> + <entry name="?*.xml" /> + <entry name="?*.gif" /> + <entry name="?*.png" /> + <entry name="?*.jpeg" /> + <entry name="?*.jpg" /> + <entry name="?*.html" /> + <entry name="?*.dtd" /> + <entry name="?*.tld" /> + </wildcardResourcePatterns> + </component> + <component name="DataSourceManagerImpl" /> + <component name="DependenciesAnalyzeManager"> + <option name="myForwardDirection" value="false" /> + </component> + <component name="DependencyValidationManager" /> + <component name="EclipseCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="EclipseEmbeddedCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="EntryPointsManager"> + <entry_points /> + </component> + <component name="ExportToHTMLSettings"> + <option name="PRINT_LINE_NUMBERS" value="false" /> + <option name="OPEN_IN_BROWSER" value="false" /> + <option name="OUTPUT_DIRECTORY" /> + </component> + <component name="GUI Designer component loader factory" /> + <component name="IdProvider" IDEtalkID="2C998304C446463F0F811673874877B6" /> + <component name="InspectionProjectProfileManager"> + <option name="PROJECT_PROFILE" value="Project Default" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + <scopes /> + <profiles> + <profile version="1.0" is_locked="false"> + <option name="myName" value="Javadoc Issues" /> + <option name="myLocal" value="false" /> + <used_levels> + <error> + <option name="myName" value="ERROR" /> + <option name="myVal" value="400" /> + </error> + <warning> + <option name="myName" value="WARNING" /> + <option name="myVal" value="300" /> + </warning> + <information> + <option name="myName" value="INFO" /> + <option name="myVal" value="200" /> + </information> + <server> + <option name="myName" value="SERVER PROBLEM" /> + <option name="myVal" value="100" /> + </server> + </used_levels> + <inspection_tool class="CheckEmptyScriptTag" level="WARNING" enabled="false" /> + <inspection_tool class="FunctionWithInconsistentReturnsJS" level="WARNING" enabled="false" /> + <inspection_tool class="InfiniteLoopStatement" level="WARNING" enabled="false" /> + <inspection_tool class="UnusedMessageFormatParameter" level="WARNING" enabled="false" /> + <inspection_tool class="ConstantIfStatementJS" level="WARNING" enabled="false" /> + <inspection_tool class="FacesModelInspection" level="ERROR" enabled="false" /> + <inspection_tool class="UnhandledExceptionInJSP" level="WARNING" enabled="false" /> + <inspection_tool class="SillyAssignmentJS" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryLabelOnBreakStatement" level="WARNING" enabled="false" /> + <inspection_tool class="ShiftOutOfRangeJS" level="WARNING" enabled="false" /> + <inspection_tool class="JSUnresolvedVariable" level="INFO" enabled="false" /> + <inspection_tool class="DuplicateThrows" level="WARNING" enabled="false" /> + <inspection_tool class="ELValidationInJSP" level="WARNING" enabled="false" /> + <inspection_tool class="ConstantConditionalExpressionJS" level="WARNING" enabled="false" /> + <inspection_tool class="PointlessBooleanExpression" level="WARNING" enabled="false"> + <option name="m_ignoreExpressionsContainingConstants" value="false" /> + </inspection_tool> + <inspection_tool class="GwtInconsistentI18nInterface" level="ERROR" enabled="false" /> + <inspection_tool class="StringToString" level="WARNING" enabled="false" /> + <inspection_tool class="AnalyzingStaticVariables" level="ERROR" enabled="false"> + <option name="CHECKED_TYPES" value="javax.servlet.http.HttpSession;com.ulcjava.base.application.ULCProxy" /> + </inspection_tool> + <inspection_tool class="BoundFieldAssignment" level="WARNING" enabled="false" /> + <inspection_tool class="NullArgumentToVariableArgMethod" level="WARNING" enabled="false" /> + <inspection_tool class="JSUndeclaredVariable" level="INFO" enabled="false" /> + <inspection_tool class="PersistenceModelErrorInspection" level="ERROR" enabled="false" /> + <inspection_tool class="LoopStatementsThatDontLoop" level="WARNING" enabled="false" /> + <inspection_tool class="RedundantThrows" level="WARNING" enabled="false" /> + <inspection_tool class="StrutsValidatorFormInspection" level="ERROR" enabled="false" /> + <inspection_tool class="UnnecessaryLabelOnBreakStatementJS" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryLocalVariableJS" level="WARNING" enabled="false"> + <option name="m_ignoreImmediatelyReturnedVariables" value="false" /> + <option name="m_ignoreAnnotatedVariables" value="false" /> + </inspection_tool> + <inspection_tool class="EjbDomInspection" level="ERROR" enabled="false" /> + <inspection_tool class="RedundantTypeArguments" level="WARNING" enabled="false" /> + <inspection_tool class="UnresolvedPropertyKey" level="ERROR" enabled="false" /> + <inspection_tool class="EjbWarningInspection" level="WARNING" enabled="false" /> + <inspection_tool class="EjbQlInspection" level="ERROR" enabled="false" /> + <inspection_tool class="Glassfish" level="ERROR" enabled="false" /> + <inspection_tool class="ConstantConditions" level="WARNING" enabled="false"> + <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" /> + </inspection_tool> + <inspection_tool class="GwtServiceNotRegistered" level="ERROR" enabled="false" /> + <inspection_tool class="EjbErrorInspection" level="ERROR" enabled="false" /> + <inspection_tool class="PersistenceDataSourceORMInspection" level="ERROR" enabled="false" /> + <inspection_tool class="CanBeFinal" level="WARNING" enabled="false"> + <option name="REPORT_CLASSES" value="false" /> + <option name="REPORT_METHODS" value="false" /> + <option name="REPORT_FIELDS" value="true" /> + </inspection_tool> + <inspection_tool class="NoScrollPane" level="WARNING" enabled="false" /> + <inspection_tool class="JSUnresolvedFunction" level="INFO" enabled="false" /> + <inspection_tool class="InstantiatingObjectToGetClassObject" level="WARNING" enabled="false" /> + <inspection_tool class="ReturnFromFinallyBlockJS" level="WARNING" enabled="false" /> + <inspection_tool class="UnusedAssignment" level="WARNING" enabled="false"> + <option name="REPORT_PREFIX_EXPRESSIONS" value="false" /> + <option name="REPORT_POSTFIX_EXPRESSIONS" value="true" /> + <option name="REPORT_REDUNDANT_INITIALIZER" value="true" /> + </inspection_tool> + <inspection_tool class="AnalyzingVariableNaming" level="WARNING" enabled="false"> + <option name="IGNORE_SERIAL_VERSION_UID" value="true" /> + <option name="CHECK_STATIC_FINAL_FIELDS" value="true" /> + <option name="CHECK_STATIC_FIELDS" value="true" /> + <option name="CHECK_FIELDS" value="true" /> + <option name="CHECK_PARAMETERS" value="true" /> + </inspection_tool> + <inspection_tool class="WebProperties" level="ERROR" enabled="false" /> + <inspection_tool class="PointlessArithmeticExpressionJS" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryConditionalExpression" level="WARNING" enabled="false" /> + <inspection_tool class="StringConcatenationInsideStringBufferAppend" level="WARNING" enabled="false" /> + <inspection_tool class="AnalyzingJLSModifierOrder" level="WARNING" enabled="false" /> + <inspection_tool class="AntDuplicateImportedTargetsInspection" level="WARNING" enabled="false" /> + <inspection_tool class="UNUSED_SYMBOL" level="WARNING" enabled="false"> + <option name="LOCAL_VARIABLE" value="true" /> + <option name="FIELD" value="true" /> + <option name="METHOD" value="true" /> + <option name="CLASS" value="true" /> + <option name="PARAMETER" value="true" /> + <option name="INJECTION_ANNOS"> + <value> + <list size="0" /> + </value> + </option> + </inspection_tool> + <inspection_tool class="CssOverwrittenProperties" level="WARNING" enabled="false" /> + <inspection_tool class="WeakerAccess" level="WARNING" enabled="false"> + <option name="SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value="true" /> + <option name="SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value="true" /> + <option name="SUGGEST_PRIVATE_FOR_INNERS" value="false" /> + </inspection_tool> + <inspection_tool class="CheckJsfComponentUnderViewTag" level="INFO" enabled="false" /> + <inspection_tool class="UnnecessarySemicolon" level="WARNING" enabled="false" /> + <inspection_tool class="ShiftOutOfRange" level="WARNING" enabled="false" /> + <inspection_tool class="DefaultFileTemplate" level="WARNING" enabled="false"> + <option name="CHECK_FILE_HEADER" value="true" /> + <option name="CHECK_TRY_CATCH_SECTION" value="true" /> + <option name="CHECK_METHOD_BODY" value="true" /> + </inspection_tool> + <inspection_tool class="PointlessArithmeticExpression" level="WARNING" enabled="false"> + <option name="m_ignoreExpressionsContainingConstants" value="false" /> + </inspection_tool> + <inspection_tool class="UnnecessaryTemporaryOnConversionToString" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryContinue" level="WARNING" enabled="false" /> + <inspection_tool class="SameReturnValue" level="WARNING" enabled="false" /> + <inspection_tool class="UnusedLabel" level="WARNING" enabled="false" /> + <inspection_tool class="NoButtonGroup" level="WARNING" enabled="false" /> + <inspection_tool class="GWTStyleCheck" level="ERROR" enabled="false" /> + <inspection_tool class="NonSerializableServiceParameters" level="ERROR" enabled="false" /> + <inspection_tool class="CloneCallsSuperClone" level="WARNING" enabled="false" /> + <inspection_tool class="ReturnFromFinallyBlock" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryBoxing" level="WARNING" enabled="false" /> + <inspection_tool class="UnreachableCodeJS" level="WARNING" enabled="false" /> + <inspection_tool class="CheckValidXmlInScriptTagBody" level="ERROR" enabled="false" /> + <inspection_tool class="ManualArrayCopy" level="WARNING" enabled="false" /> + <inspection_tool class="Weblogic" level="ERROR" enabled="false" /> + <inspection_tool class="PersistenceDataSourceORMDomInspection" level="ERROR" enabled="false" /> + <inspection_tool class="FallthroughInSwitchStatementJS" level="WARNING" enabled="false" /> + <inspection_tool class="IgnoreResultOfCall" level="WARNING" enabled="false"> + <option name="m_reportAllNonLibraryCalls" value="false" /> + <option name="callCheckString" value="java.io.InputStream,read,java.io.InputStream,skip,java.lang.StringBuffer,toString,java.lang.StringBuilder,toString,java.lang.String,.*,java.math.BigInteger,.*,java.math.BigDecimal,.*,java.net.InetAddress,.*" /> + </inspection_tool> + <inspection_tool class="ThrowFromFinallyBlock" level="WARNING" enabled="false" /> + <inspection_tool class="RedundantCast" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryReturn" level="WARNING" enabled="false" /> + <inspection_tool class="FinalStaticMethod" level="WARNING" enabled="false" /> + <inspection_tool class="SuspiciousMethodCalls" level="WARNING" enabled="false" /> + <inspection_tool class="HTML" level="WARNING" enabled="false"> + <option name="myAdditionalHtmlTags" value="embed,nobr,noembed,comment,script" /> + <option name="myAdditionalHtmlAttributes" value="type,wmode,src,width,height" /> + <option name="myCheckHtmlTags" value="true" /> + <option name="myCheckHtmlAttributes" value="true" /> + </inspection_tool> + <inspection_tool class="UnnecessaryUnboxing" level="WARNING" enabled="false" /> + <inspection_tool class="SameParameterValue" level="WARNING" enabled="false" /> + <inspection_tool class="NoExplicitFinalizeCalls" level="WARNING" enabled="false" /> + <inspection_tool class="FinalPrivateMethod" level="WARNING" enabled="false" /> + <inspection_tool class="AnalyzingRedundantFieldInitialization" level="WARNING" enabled="false" /> + <inspection_tool class="ReservedWordUsedAsNameJS" level="WARNING" enabled="false" /> + <inspection_tool class="ExtendsAnnotation" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryReturnJS" level="WARNING" enabled="false" /> + <inspection_tool class="ConstantIfStatement" level="WARNING" enabled="false" /> + <inspection_tool class="ComponentNotRegistered" level="WARNING" enabled="false"> + <option name="CHECK_ACTIONS" value="true" /> + <option name="IGNORE_NON_PUBLIC" value="true" /> + </inspection_tool> + <inspection_tool class="UnnecessaryLabelOnContinueStatement" level="WARNING" enabled="false" /> + <inspection_tool class="NoLabelFor" level="WARNING" enabled="false" /> + <inspection_tool class="SynchronizeOnNonFinalField" level="WARNING" enabled="false" /> + <inspection_tool class="AnalyzingLoggingWithoutLogLevelCheck" level="WARNING" enabled="false"> + <option name="CHECK_DEBUG" value="true" /> + <option name="CHECK_INFO" value="true" /> + <option name="IGNORE_SIMPLE_STATEMENTS" value="true" /> + </inspection_tool> + <inspection_tool class="AntDuplicateTargetsInspection" level="ERROR" enabled="false" /> + <inspection_tool class="NullableProblems" level="WARNING" enabled="false"> + <option name="REPORT_NULLABLE_METHOD_OVERRIDES_NOTNULL" value="true" /> + <option name="REPORT_NOT_ANNOTATED_METHOD_OVERRIDES_NOTNULL" value="true" /> + <option name="REPORT_NOTNULL_PARAMETER_OVERRIDES_NULLABLE" value="true" /> + <option name="REPORT_NOT_ANNOTATED_PARAMETER_OVERRIDES_NOTNULL" value="true" /> + </inspection_tool> + <inspection_tool class="ReferencesToClassesFromDefaultPackagesInJSPFile" level="ERROR" enabled="false" /> + <inspection_tool class="TrivialIf" level="WARNING" enabled="false" /> + <inspection_tool class="AntMissingPropertiesFileInspection" level="ERROR" enabled="false" /> + <inspection_tool class="ObjectEqualsNull" level="WARNING" enabled="false" /> + <inspection_tool class="GwtToHtmlReferences" level="ERROR" enabled="false" /> + <inspection_tool class="EmptyFinallyBlock" level="WARNING" enabled="false" /> + <inspection_tool class="MismatchedCollectionQueryUpdate" level="WARNING" enabled="false" /> + <inspection_tool class="EmptyStatementBody" level="WARNING" enabled="false"> + <option name="m_reportEmptyBlocks" value="false" /> + </inspection_tool> + <inspection_tool class="StringEquality" level="WARNING" enabled="false" /> + <inspection_tool class="RequiredAttributes" level="WARNING" enabled="false"> + <option name="myAdditionalRequiredHtmlAttributes" value="" /> + </inspection_tool> + <inspection_tool class="TrivialConditionalJS" level="WARNING" enabled="false" /> + <inspection_tool class="OneButtonGroup" level="WARNING" enabled="false" /> + <inspection_tool class="StrutsTilesInspection" level="ERROR" enabled="false" /> + <inspection_tool class="ReflectionForUnavailableAnnotation" level="WARNING" enabled="false" /> + <inspection_tool class="IncompatibleMaskJS" level="WARNING" enabled="false" /> + <inspection_tool class="NonJREEmulationClassesInClientCode" level="ERROR" enabled="false" /> + <inspection_tool class="OctalLiteral" level="WARNING" enabled="false" /> + <inspection_tool class="AnalyzingRedundantModifier" level="WARNING" enabled="false"> + <option name="CHECK_FINAL_METHODS" value="true" /> + <option name="CHECK_PUBLIC_INTERFACE_METHODS" value="true" /> + <option name="CHECK_TRANSIENT_STATIC_FIELDS" value="true" /> + </inspection_tool> + <inspection_tool class="WhileCanBeForeach" level="WARNING" enabled="false" /> + <inspection_tool class="InfiniteRecursion" level="WARNING" enabled="false" /> + <inspection_tool class="Geronimo" level="ERROR" enabled="false" /> + <inspection_tool class="InfiniteLoopJS" level="WARNING" enabled="false" /> + <inspection_tool class="SelfIncludingJspFiles" level="ERROR" enabled="false" /> + <inspection_tool class="CssNoGenericFontName" level="WARNING" enabled="false" /> + <inspection_tool class="ThisExpressionReferencesGlobalObjectJS" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryLabelJS" level="WARNING" enabled="false" /> + <inspection_tool class="EmptyCatchBlock" level="WARNING" enabled="false"> + <option name="m_includeComments" value="true" /> + <option name="m_ignoreTestCases" value="true" /> + </inspection_tool> + <inspection_tool class="Dependency" level="ERROR" enabled="false" /> + <inspection_tool class="UnnecessaryLocalVariable" level="WARNING" enabled="false"> + <option name="m_ignoreImmediatelyReturnedVariables" value="false" /> + <option name="m_ignoreAnnotatedVariables" value="false" /> + </inspection_tool> + <inspection_tool class="UnnecessaryTemporaryOnConversionFromString" level="WARNING" enabled="false" /> + <inspection_tool class="WrongPackageStatement" level="WARNING" enabled="false" /> + <inspection_tool class="EmptyStatementBodyJS" level="WARNING" enabled="false"> + <option name="m_reportEmptyBlocks" value="false" /> + </inspection_tool> + <inspection_tool class="ThrowFromFinallyBlockJS" level="WARNING" enabled="false" /> + <inspection_tool class="PersistenceORMDomInspection" level="ERROR" enabled="false" /> + <inspection_tool class="ForCanBeForeach" level="WARNING" enabled="false" /> + <inspection_tool class="TypeParameterExtendsObject" level="WARNING" enabled="false" /> + <inspection_tool class="FieldCanBeLocal" level="WARNING" enabled="false" /> + <inspection_tool class="UNCHECKED_WARNING" level="WARNING" enabled="false" /> + <inspection_tool class="LoopStatementThatDoesntLoopJS" level="WARNING" enabled="false" /> + <inspection_tool class="SuspiciousNameCombination" level="WARNING" enabled="false"> + <group names="x,width,left,right" /> + <group names="y,height,top,bottom" /> + </inspection_tool> + <inspection_tool class="FinalizeCallsSuperFinalize" level="WARNING" enabled="false"> + <option name="m_ignoreForObjectSubclasses" value="false" /> + </inspection_tool> + <inspection_tool class="MalformedRegex" level="WARNING" enabled="false" /> + <inspection_tool class="TrivialIfJS" level="WARNING" enabled="false" /> + <inspection_tool class="SimplifiableConditionalExpression" level="WARNING" enabled="false" /> + <inspection_tool class="IncompatibleMask" level="WARNING" enabled="false" /> + <inspection_tool class="UNUSED_IMPORT" level="WARNING" enabled="false" /> + <inspection_tool class="DuplicateCaseLabelJS" level="WARNING" enabled="false" /> + <inspection_tool class="PersistenceModelWarningInspection" level="WARNING" enabled="false" /> + <inspection_tool class="PointlessBitwiseExpressionJS" level="WARNING" enabled="false"> + <option name="m_ignoreExpressionsContainingConstants" value="false" /> + </inspection_tool> + <inspection_tool class="SimplifiableIfStatement" level="WARNING" enabled="false" /> + <inspection_tool class="BooleanConstructor" level="WARNING" enabled="false" /> + <inspection_tool class="ExtendsObject" level="WARNING" enabled="false" /> + <inspection_tool class="RedundantArrayCreation" level="WARNING" enabled="false" /> + <inspection_tool class="PersistenceQlInspection" level="ERROR" enabled="false" /> + <inspection_tool class="UnnecessaryLabelOnContinueStatementJS" level="WARNING" enabled="false" /> + <inspection_tool class="CheckImageSize" level="WARNING" enabled="false" /> + <inspection_tool class="EmptyMethod" level="WARNING" enabled="false"> + <option name="EXCLUDE_ANNOS"> + <value> + <list size="0" /> + </value> + </option> + </inspection_tool> + <inspection_tool class="PersistenceDomInspection" level="ERROR" enabled="false" /> + <inspection_tool class="EmptyTryBlock" level="WARNING" enabled="false" /> + <inspection_tool class="MalformedFormatString" level="WARNING" enabled="false" /> + <inspection_tool class="ComponentRegistrationProblems" level="ERROR" enabled="false"> + <option name="CHECK_PLUGIN_XML" value="true" /> + <option name="CHECK_JAVA_CODE" value="true" /> + <option name="CHECK_ACTIONS" value="true" /> + </inspection_tool> + <inspection_tool class="PointlessBooleanExpressionJS" level="WARNING" enabled="false" /> + <inspection_tool class="CssUnitlessNumber" level="WARNING" enabled="false" /> + <inspection_tool class="ExceptionCaughtLocallyJS" level="WARNING" enabled="false" /> + <inspection_tool class="ConstantConditionalExpression" level="WARNING" enabled="false" /> + <inspection_tool class="MissingMnemonic" level="WARNING" enabled="false" /> + <inspection_tool class="CloneDeclaresCloneNotSupported" level="WARNING" enabled="false" /> + <inspection_tool class="MalformedXPath" level="WARNING" enabled="false" /> + <inspection_tool class="AccessStaticViaInstance" level="WARNING" enabled="false" /> + <inspection_tool class="UnusedParameters" level="WARNING" enabled="false" /> + <inspection_tool class="DuplicateMnemonic" level="WARNING" enabled="false" /> + <inspection_tool class="StringConstructor" level="WARNING" enabled="false"> + <option name="ignoreSubstringArguments" value="false" /> + </inspection_tool> + <inspection_tool class="GWTRemoteServiceAsyncCheck" level="ERROR" enabled="false" /> + <inspection_tool class="ContinueOrBreakFromFinallyBlockJS" level="WARNING" enabled="false" /> + <inspection_tool class="MismatchedArrayReadWrite" level="WARNING" enabled="false" /> + <inspection_tool class="UnusedReturnValue" level="WARNING" enabled="false" /> + <inspection_tool class="SillyAssignment" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryContinueJS" level="WARNING" enabled="false" /> + <inspection_tool class="FinallyBlockCannotCompleteNormally" level="WARNING" enabled="false" /> + <inspection_tool class="BadExpressionStatementJS" level="WARNING" enabled="false" /> + <inspection_tool class="PrimitiveArrayArgumentToVariableArgMethod" level="WARNING" enabled="false" /> + <inspection_tool class="InfiniteRecursionJS" level="WARNING" enabled="false" /> + <inspection_tool class="PointlessBitwiseExpression" level="WARNING" enabled="false"> + <option name="m_ignoreExpressionsContainingConstants" value="false" /> + </inspection_tool> + <inspection_tool class="StrutsValidatorInspection" level="ERROR" enabled="false" /> + <inspection_tool class="ContinueOrBreakFromFinallyBlock" level="WARNING" enabled="false" /> + <inspection_tool class="DuplicatePropertyOnObjectJS" level="WARNING" enabled="false" /> + <inspection_tool class="JBoss" level="ERROR" enabled="false" /> + <inspection_tool class="UnusedDeclaration" level="WARNING" enabled="false"> + <option name="ADD_MAINS_TO_ENTRIES" value="true" /> + <option name="ADD_JUNIT_TO_ENTRIES" value="true" /> + <option name="ADD_EJB_TO_ENTRIES" value="true" /> + <option name="ADD_APPLET_TO_ENTRIES" value="true" /> + <option name="ADD_SERVLET_TO_ENTRIES" value="true" /> + <option name="ADD_NONJAVA_TO_ENTRIES" value="true" /> + </inspection_tool> + <inspection_tool class="Deprecation" level="WARNING" enabled="false" /> + <inspection_tool class="StrutsInspection" level="ERROR" enabled="false" /> + <inspection_tool class="MissingDeprecatedAnnotation" level="WARNING" enabled="true" /> + <inspection_tool class="JavaDoc" level="WARNING" enabled="true"> + <option name="TOP_LEVEL_CLASS_OPTIONS"> + <value> + <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" /> + <option name="REQUIRED_TAGS" value="@author" /> + </value> + </option> + <option name="INNER_CLASS_OPTIONS"> + <value> + <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" /> + <option name="REQUIRED_TAGS" value="" /> + </value> + </option> + <option name="METHOD_OPTIONS"> + <value> + <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" /> + <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" /> + </value> + </option> + <option name="FIELD_OPTIONS"> + <value> + <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" /> + <option name="REQUIRED_TAGS" value="" /> + </value> + </option> + <option name="IGNORE_DEPRECATED" value="false" /> + <option name="IGNORE_JAVADOC_PERIOD" value="false" /> + <option name="myAdditionalJavadocTags" value="todo,note,todo,xxx,note,todo,fixme,fixme,warning,invariant,retval,pre" /> + ... [truncated message content] |
From: <chr...@us...> - 2006-12-10 12:28:33
|
Revision: 1000 http://svn.sourceforge.net/gridarta/?rev=1000&view=rev Author: christianhujer Date: 2006-12-10 04:28:32 -0800 (Sun, 10 Dec 2006) Log Message: ----------- Fixed several javadoc issues. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainStatusbar.java trunk/crossfire/src/cfeditor/CMapArchPanel.java trunk/crossfire/src/cfeditor/CMapTileList.java trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java trunk/crossfire/src/cfeditor/gui/MapView.java trunk/crossfire/src/cfeditor/gui/StackLayout.java trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java trunk/crossfire/src/cfeditor/io/CMapWriter.java trunk/crossfire/src/cfeditor/map/DefaultMapModel.java trunk/crossfire/src/cfeditor/map/MapModel.java trunk/crossfire/src/cfeditor/menu/AggregateMenuLocation.java trunk/crossfire/src/cfeditor/menu/LocationMenuEntry.java trunk/crossfire/src/cfeditor/menu/MenuEntry.java trunk/crossfire/src/cfeditor/menu/MenuHelper.java trunk/crossfire/src/cfeditor/menu/MenuListener.java trunk/crossfire/src/cfeditor/menu/MenuLocation.java trunk/crossfire/src/cfeditor/menu/SimpleMenuLocation.java trunk/daimonin/src/daieditor/CFArchTypeList.java trunk/daimonin/src/daieditor/CMainControl.java trunk/daimonin/src/daieditor/CMainStatusbar.java trunk/daimonin/src/daieditor/CMainView.java trunk/daimonin/src/daieditor/CMapArchPanel.java trunk/daimonin/src/daieditor/CMapTileList.java trunk/daimonin/src/daieditor/CPickmapPanel.java trunk/daimonin/src/daieditor/CopyBuffer.java trunk/daimonin/src/daieditor/MapViewIFrame.java trunk/daimonin/src/daieditor/ScriptArchData.java trunk/daimonin/src/daieditor/gameobject/GameObject.java Modified: trunk/crossfire/src/cfeditor/CMainStatusbar.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainStatusbar.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/CMainStatusbar.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -174,7 +174,10 @@ mapCursorChanged(e.getSource()); } - /** Set coordinates of MapCursor to cursor label and the offset when in drag mode. */ + /** + * Set coordinates of MapCursor to cursor label and the offset when in drag mode. + * @param mapCursor MapCursor to set coordinates from. + */ private void mapCursorChanged(final MapCursor mapCursor) { final String formatCursor; if (mapCursor.isActive()) { Modified: trunk/crossfire/src/cfeditor/CMapArchPanel.java =================================================================== --- trunk/crossfire/src/cfeditor/CMapArchPanel.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/CMapArchPanel.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -545,7 +545,10 @@ textPanel.add(sta); } - /** Set up the script panel tab. */ + /** + * Set up the script panel tab. + * @return Newly created script panel. + */ private JPanel createScriptPanel() { eventList = new JList(); Modified: trunk/crossfire/src/cfeditor/CMapTileList.java =================================================================== --- trunk/crossfire/src/cfeditor/CMapTileList.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/CMapTileList.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -87,7 +87,11 @@ /** The currently selected MapSquare. */ private transient Point currentSquare = null; - /** Build Panel. */ + /** + * Create a CMapTileList. + * @param mainControl MainControl, used for some icons. + * @param mainView View to attach to. + */ public CMapTileList(final CMainControl mainControl, final CMainView mainView) { this.mainControl = mainControl; this.mainView = mainView; @@ -236,7 +240,10 @@ return listIndex; } - /** Get the selected arch within the list (currently selected tile). */ + /** + * Returns the selected GameObject within this list (currently selected square). + * @return The selected GameObject within this list. + */ @Nullable public GameObject getMapTileSelection() { return (GameObject) list.getSelectedValue(); } Modified: trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -175,7 +175,14 @@ } } - /** Verifies if x and y are within the icon's borders. */ + /** + * Returns whether <var>xEvent</var> and <var>yEvent</var> are within the icon's borders. + * @param xEvent X coordinate from an event. + * @param yEvent Y coordinate from an event. + * @return whether <var>xEvent</var> and <var>yEvent</var> are within the icon's borders. + * @retval <code>true</code> if <var>xEvent</var> and <var>yEvent</var> are within the icon's border. + * @retval <code>false</code> otherwise (<var>xEvent</var> or <var>yEvent</var> or both are outside the icon's border). + */ public boolean contains(final int xEvent, final int yEvent) { return !(!(xEvent >= x) || !(xEvent <= x + width)) && !(!(yEvent >= y) || !(yEvent <= y + height)); } Modified: trunk/crossfire/src/cfeditor/gui/MapView.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/MapView.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/gui/MapView.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -30,6 +30,7 @@ * displaying the mapview. Now the communication "frame -> basic mapview" is no * problem, but "basic mapview -> frame" can only be realized with this * interface. + * @author unknown */ public interface MapView { Modified: trunk/crossfire/src/cfeditor/gui/StackLayout.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/StackLayout.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/gui/StackLayout.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -33,6 +33,7 @@ /** * A layoutManager which stacks components one on top of the other, * regardless of their size. + * @author unknown */ public class StackLayout implements LayoutManager { Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -55,7 +55,8 @@ /** * The component that does the actual rendering of tiles in the palette. - * Flat version + * Flat version. + * @author unknown (probably Ragnor) */ public final class DefaultLevelRenderer extends LevelRenderer { Modified: trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -181,7 +181,11 @@ setMessage(layoutHack); } - /** Create the map panel. */ + /** + * Create the map panel. + * @param map MapArchObject to create map panel for. + * @return Newly created map panel. + */ private JPanel createMapPanel(final MapArchObject map) { final JPanel panel = new JPanel(new GridLayout(0, 1)); @@ -198,7 +202,11 @@ return panel; } - /** Create the parameters panel. */ + /** + * Create the parameters panel. + * @param map MapArchObject to create parameters panel for. + * @return Newly created parameters panel. + */ private JPanel createParametersPanel(final MapArchObject map) { final JPanel panel = new JPanel(new GridLayout(0, 1)); @@ -212,7 +220,11 @@ return panel; } - /** Create the shop panel. */ + /** + * Create the shop panel. + * @param map MapArchObject to create shop panel for. + * @return Newly created shop panel. + */ private JPanel createShopPanel(final MapArchObject map) { final JPanel panel = new JPanel(new GridLayout(0, 1)); @@ -225,7 +237,11 @@ return panel; } - /** Create the weather panel. */ + /** + * Create the weather panel. + * @param map MapArchObject to create weather panel for. + * @return Newly created weather panel. + */ private JPanel createWeatherPanel(final MapArchObject map) { final JPanel panel = new JPanel(new GridLayout(0, 1)); @@ -239,7 +255,11 @@ return panel; } - /** Create map lore panel. */ + /** + * Create the lore panel. + * @param map MapArchObject to create lore panel for. + * @return Newly created lore panel. + */ private JPanel createMapLorePanel(final MapArchObject map) { final JPanel panel = new JPanel(new GridLayout(0, 1)); @@ -250,7 +270,11 @@ return panel; } - /** Create map text panel. */ + /** + * Create the map text panel. + * @param map MapArchObject to create map text panel for. + * @return Newly created map text panel. + */ private JPanel createMapTextPanel(final MapArchObject map) { final JPanel panel = new JPanel(new BorderLayout(1, 1)); @@ -261,7 +285,11 @@ return panel; } - /** Create tile path panel. */ + /** + * Create the tile path panel. + * @param map MapArchObject to create tile path panel for. + * @return Newly created tile path panel. + */ private JPanel createTilePathPanel(final MapArchObject map) { final JPanel panel = new JPanel(new GridLayout(IGUIConstants.DIRECTIONS, 2)); @@ -580,6 +608,7 @@ /** * Open a popup and ask user to confirm his map-resizing selection. This * popup dialog disables all other windows (and threads). + * @param size New size. * @return true if user confirmed, false if user cancelled resize */ private boolean askConfirmResize(final Size2D size) { Modified: trunk/crossfire/src/cfeditor/io/CMapWriter.java =================================================================== --- trunk/crossfire/src/cfeditor/io/CMapWriter.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/io/CMapWriter.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -474,6 +474,7 @@ /** * Add a new key to {@link #keys}. The order in which the keys are added is * the order in which the objects fields are written out. + * @param key Key to add. */ private static void addKey(final String key) { keys.put(key, idKey++); Modified: trunk/crossfire/src/cfeditor/map/DefaultMapModel.java =================================================================== --- trunk/crossfire/src/cfeditor/map/DefaultMapModel.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/map/DefaultMapModel.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -147,6 +147,7 @@ /** * Return the bottom {@link GameObject} in the given location. + * @param pos Position of the map square to get the bottom GameObject from. * @return the GameObject, or null if no object is present */ @Nullable public GameObject getBottomArchObject(final Point pos) { @@ -159,6 +160,7 @@ /** * Return the topmost {@link GameObject} in the given location. + * @param pos Position of the map square to get the top GameObject from. * @return the GameObject, or null if no object is present */ public GameObject getTopArchObject(final Point pos) { @@ -384,8 +386,9 @@ /** * Get the arch from the inventory of a given object with the specified * 'id'. - * @param gameObject game object to search for - * @return the specified arch, or null if not found + * @param node GameObject to search in. + * @param gameObject GameObject to search for. + * @return The specified GameObject, or <code>null</code> if not found. */ @Nullable public GameObject findInvObject(@NotNull final GameObject node, final GameObject gameObject) { for (final GameObject arch : node.getHead()) { Modified: trunk/crossfire/src/cfeditor/map/MapModel.java =================================================================== --- trunk/crossfire/src/cfeditor/map/MapModel.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/map/MapModel.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -112,7 +112,9 @@ void levelCloseNotify(); /** - * Check whether a given location contains at least one GameObject. + * Returns whether a given location contains at least one GameObject. + * @param pos Position of the MapSquare (location) to check. + * @return <code>true</code> if <var>pos</var> has at least one GameObject, otherwise <code>false</code>. */ boolean containsArchObject(Point pos); Modified: trunk/crossfire/src/cfeditor/menu/AggregateMenuLocation.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/AggregateMenuLocation.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/menu/AggregateMenuLocation.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -102,6 +102,7 @@ * Gets the MenuLocation with a given name. * @param location The location name. This should not include the * AggregateMenuLocation name as parent. It is a relative path. + * @return The MenuLocation with the given name or <code>null</code> if there is no such menu location. */ @Nullable public MenuLocation getMenuLocation(final String location) { final WrappedMenuLocation wml = subMenus.get(location); Modified: trunk/crossfire/src/cfeditor/menu/LocationMenuEntry.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/LocationMenuEntry.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/menu/LocationMenuEntry.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -17,6 +17,7 @@ * This menu entry map all existing Menu entries at a given location. * If any of the entries at that location changes, LocationMenuEntry * notifies the Manager it has changed too. + * @author unknown (probably tchize). */ public class LocationMenuEntry extends BasicMenuEntry implements MenuListener { @@ -59,7 +60,10 @@ } } - /** Return the MenuLocation this entry maps. */ + /** + * Returns the MenuLocation name this entry maps. + * @return The MenuLocation name this entry maps. + */ public String getMenuLocation() { return location; } Modified: trunk/crossfire/src/cfeditor/menu/MenuEntry.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/MenuEntry.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/menu/MenuEntry.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -10,7 +10,8 @@ /** * Basic MenuEntry. Subclasses of MenuEntry should - * at least implement getMenuComponent() + * at least implement getMenuComponent(). + * @author unknown (probably tchize). */ public abstract class MenuEntry { Modified: trunk/crossfire/src/cfeditor/menu/MenuHelper.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/MenuHelper.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/menu/MenuHelper.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -18,6 +18,7 @@ /** * This creates a JMenuBar from the MenuEntries at a given location. + * @param location The MenuLocation to create the JMenuBar for. * @return the newly created JMenuBar */ public static JMenuBar getLocationBar(final MenuLocation location) { Modified: trunk/crossfire/src/cfeditor/menu/MenuListener.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/MenuListener.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/menu/MenuListener.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -6,7 +6,10 @@ package cfeditor.menu; -/** Used to notify of changes in a MenuEntry or a MenuLocation. */ +/** + * Used to notify of changes in a MenuEntry or a MenuLocation. + * @author unknown (probably tchize) + */ public interface MenuListener { /** Modified: trunk/crossfire/src/cfeditor/menu/MenuLocation.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/MenuLocation.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/menu/MenuLocation.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -43,6 +43,10 @@ */ Set getMenuEntries(); - /** Set the menuManager managing this MenuLocation. */ + /** + * Sets the MenuManager managing this MenuLocation. + * @param menuManager The MenuManager managing this MenuLocation. + */ void setMenuManager(MenuManager menuManager); + } Modified: trunk/crossfire/src/cfeditor/menu/SimpleMenuLocation.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/SimpleMenuLocation.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/crossfire/src/cfeditor/menu/SimpleMenuLocation.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -24,6 +24,7 @@ /** * Simple basic constructor. Initialize the menu entries List as an empty * list and set the location name. + * @param name Name of this Menu location. */ public SimpleMenuLocation(final String name) { super(); Modified: trunk/daimonin/src/daieditor/CFArchTypeList.java =================================================================== --- trunk/daimonin/src/daieditor/CFArchTypeList.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/daimonin/src/daieditor/CFArchTypeList.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -212,6 +212,9 @@ /** * Parse a list vector from an xml list element. * @param root element to parse + * @return List with data parsed from <var>root</var> + * @todo improve this comment + * @throws XPathExpressionException In case of XPath issues (should never happen). */ private List<?> parseListFromElement(final Element root) throws XPathExpressionException { // XXX The list created here contains altering types: Integer for even, String for odd indices. Modified: trunk/daimonin/src/daieditor/CMainControl.java =================================================================== --- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -303,7 +303,10 @@ validators = createMapValidators(); } - /** Initialize the map validators. */ + /** + * Initializes the map validators. + * @return A MapValidator that delegates to other map validators. + */ private DelegatingMapValidator createMapValidators() { final DelegatingMapValidator mapValidators = new DelegatingMapValidator(); mapValidators.add( @@ -1247,6 +1250,8 @@ /** * Browse first through the default arch list and attach map arches to it * then browse through the face list and try to find the pictures. + * @param objects List of GameObjects to collect. + * @param uri URI they were read from (for error messages). */ public void collectTempList(final List<GameObject> objects, final String uri) { final StringBuilder noarch = new StringBuilder(); @@ -1318,6 +1323,7 @@ /** * Invoked when user wants to save a level to certain file. * @param level map control of the map to be saved + * @return <code>true</code> if the user confirmed saving the map and the map was saved successfully, otherwise <code>false</code> */ public boolean saveLevelAsWanted(final MapControl level) { if (level == null) { @@ -1995,7 +2001,11 @@ /** List with recents. */ private LinkedList<Recent> recents = new LinkedList<Recent>(); - /** Adds a file to the recent files. */ + /** + * Adds a file to the recent files. + * @param title Title of the recent entry, e.g. map title. + * @param filename Filename of the recent entry, e.g. map filename. + */ private void addRecent(final String title, final String filename) { final Recent recent = new Recent(title, filename); recents.remove(recent); // remove old entry to get new entry at first pos. Modified: trunk/daimonin/src/daieditor/CMainStatusbar.java =================================================================== --- trunk/daimonin/src/daieditor/CMainStatusbar.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/daimonin/src/daieditor/CMainStatusbar.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -174,7 +174,10 @@ mapCursorChanged(e.getSource()); } - /** Set coordinates of MapCursor to cursor label and the offset when in drag mode. */ + /** + * Set coordinates of MapCursor to cursor label and the offset when in drag mode. + * @param mapCursor MapCursor to set coordinates from. + */ private void mapCursorChanged(final MapCursor mapCursor) { final String formatCursor; if (mapCursor.isActive()) { Modified: trunk/daimonin/src/daieditor/CMainView.java =================================================================== --- trunk/daimonin/src/daieditor/CMainView.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/daimonin/src/daieditor/CMainView.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -202,6 +202,7 @@ * @param prefs Preferences * @param defwidth default width * @param defheight default height + * @return Center panel. */ private JPanel createCenterPanel(final Preferences prefs, final int defwidth, final int defheight) { final JPanel centerPanel = new JPanel(new BorderLayout()); Modified: trunk/daimonin/src/daieditor/CMapArchPanel.java =================================================================== --- trunk/daimonin/src/daieditor/CMapArchPanel.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/daimonin/src/daieditor/CMapArchPanel.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -660,7 +660,10 @@ textPanel.add(sta); } - /** Set up the script panel tab. */ + /** + * Creates a script panel. + * @return newly created script panel. + */ private JPanel createScriptPanel() { eventList = new JList(); Modified: trunk/daimonin/src/daieditor/CMapTileList.java =================================================================== --- trunk/daimonin/src/daieditor/CMapTileList.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/daimonin/src/daieditor/CMapTileList.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -89,6 +89,11 @@ /** The currently selected MapSquare. */ private transient MapSquare<GameObject> currentSquare; + /** + * Creates a CMapTileList. + * @param mainControl MainControl, used for icons. + * @param mainView MainView, used for updating UI. + */ /** Build Panel. */ public CMapTileList(final CMainControl mainControl, final CMainView mainView) { this.mainControl = mainControl; @@ -274,7 +279,10 @@ return listIndex; } - /** Get the selected arch within the list (currently selected tile). */ + /** + * Returns the currently selected GameObject within this list (currently selected MapSquare). + * @return The currently selected GameObject. + */ public GameObject getMapTileSelection() { return (GameObject) list.getSelectedValue(); } Modified: trunk/daimonin/src/daieditor/CPickmapPanel.java =================================================================== --- trunk/daimonin/src/daieditor/CPickmapPanel.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/daimonin/src/daieditor/CPickmapPanel.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -208,9 +208,10 @@ /** * Add a new pickmap. - * @param objects list of objects or <code>null</code> for empty - * @param maparch the maparch of the pickmap - * @param index tab index to insert, -1 means add to the end + * @param objects list of objects or <code>null</code> for empty + * @param maparch the maparch of the pickmap + * @param mapFile File to load the pickmap from. + * @param index tab index to insert, -1 means add to the end * @return basic mapview */ private CMapViewBasic newPickmap(final List<GameObject> objects, final MapArchObject maparch, final File mapFile, final int index) { @@ -266,12 +267,13 @@ } /** - * Get tab index of a pickmap in the JTabbedPane by absolut file name. + * Get tab index of a pickmap in the JTabbedPane by absolut file filename. + * @param filename Filename of the pickmap. * @return tab index of pickmap, or -1 if it doesn't exist */ - public int getPickmapTabIndexByName(final String name) { + public int getPickmapTabIndexByName(final String filename) { for (int i = 0; i < pickmaps.size(); i++) { - if (pickmaps.get(i).getMapFileName().equals(name)) { + if (pickmaps.get(i).getMapFileName().equals(filename)) { return i; } } Modified: trunk/daimonin/src/daieditor/CopyBuffer.java =================================================================== --- trunk/daimonin/src/daieditor/CopyBuffer.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/daimonin/src/daieditor/CopyBuffer.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -238,6 +238,8 @@ * @param mapControl MapControl of the active map we paste on * @param fillBelow if true, the filling content is placed *below* the * existing map + * @param seed MapControl of the random objects or <code>null</code> to use the currently selected Archetype. + * @param rand Percentage of filling (e.g. 100 for 100%, 10 for 10%). */ public void fill(final MapControl mapControl, final boolean fillBelow, final MapControl seed, final int rand) { @@ -459,6 +461,11 @@ /** * Add an archetype to the destination map. Inserts a new object instance * for default archetypes, and a clone for non-default archetypes. + * @param mapControl MapControl of the map the object should be added to. + * @param gameObject GameObject to add. + * @param pos Position to add GameObject at. + * @param allowDouble <code>true</code> for allowing similar GameObjects on the same square, <code>false</code> to disallow. + * @param fillBelow <code>true</code> if the GameObject should be added below all others, <code>false</code> for above. */ private void addArchToMap(final MapControl mapControl, final GameObject gameObject, final Point pos, final boolean allowDouble, final boolean fillBelow) { if (gameObject.isArchetype()) { Modified: trunk/daimonin/src/daieditor/MapViewIFrame.java =================================================================== --- trunk/daimonin/src/daieditor/MapViewIFrame.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/daimonin/src/daieditor/MapViewIFrame.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -139,7 +139,10 @@ } } - /** Get the Window Action. */ + /** + * Returns the Action for selecting this Window. + * @return The Action for selecting this Window. + */ public WindowAction getWindowAction() { return windowAction; } Modified: trunk/daimonin/src/daieditor/ScriptArchData.java =================================================================== --- trunk/daimonin/src/daieditor/ScriptArchData.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/daimonin/src/daieditor/ScriptArchData.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -323,12 +323,13 @@ /** * A popup is opened and the user can create a new scripting event - * which gets attached to this arch. - * @param panelList JList from the MapArchPanel (script tab) which displays the events + * which gets attached to this gameObject. + * @param panelList JList from the MapArchPanel (script tab) which displays the events + * @param gameObject GameObject to add event to. * @return <code>true</code> if a script was added, <code>false</code> if the user cancelled */ - public boolean addEventScript(final JList panelList, final GameObject arch) { - final String archName = arch.getBestName(); + public boolean addEventScript(final JList panelList, final GameObject gameObject) { + final String archName = gameObject.getBestName(); // create a reasonable default script name for lazy users :-) final String defScriptName = chooseDefaultScriptName(archName); @@ -446,6 +447,7 @@ /** * The user has chosen to create a new event, now it is to be done. * @param frame the parent window of the create-new-event dialog + * @return <code>true</code> if the new event was successfully created, otherwise <code>false</code>. */ public boolean createNewEvent(final JDialog frame) { final CMainControl mainControl = CMainControl.getInstance(); // main control @@ -578,7 +580,7 @@ /** * Creates a ScriptedEvent of given type (This is used for map-loading). - * @param event + * @param event GameObject that describes the event. */ ScriptedEvent(final GameObject event) { this.event = event; @@ -586,10 +588,10 @@ /** * Creates a fully initialized ScriptedEvent. - * @param eventType - * @param pluginName - * @param options - * @param filePath + * @param eventType Type of the event. + * @param pluginName Name of the plugin. + * @param filePath Path to the file for this event. + * @param options Options for this event. */ ScriptedEvent(final int eventType, final String pluginName, final String filePath, final String options) { event = new GameObject(); // FIXME: This arch has no default arch Modified: trunk/daimonin/src/daieditor/gameobject/GameObject.java =================================================================== --- trunk/daimonin/src/daieditor/gameobject/GameObject.java 2006-12-10 12:24:38 UTC (rev 999) +++ trunk/daimonin/src/daieditor/gameobject/GameObject.java 2006-12-10 12:28:32 UTC (rev 1000) @@ -465,9 +465,9 @@ * Set The "face >name>" field of a object. We need this for fast * access. We set here the string name, the face number and we will handle * invalid/double names including comparing with a default arch. - * @param name + * @param name Real face name. */ - public boolean setRealFace(final String name) { + public void setRealFace(final String name) { final String face = getArchetype().getFaceRealName(); /* no name? we always use def arch face */ @@ -478,7 +478,6 @@ } else { setFaceRealName(name); } - return true; } /** @@ -566,12 +565,18 @@ } } - /** Get the normal face. */ + /** + * Returns the normal face for this GameObject. + * @return The normal face for this GameObject. + */ public ImageIcon getNormalImage() { return normalFace; } - /** Get the transparent face. */ + /** + * Returns a transparent variant of the face for this GameObject. + * @return The transparent face for this GameObject. + */ public ImageIcon getTransparentImage() { return transFace; } @@ -701,6 +706,7 @@ * @param eventList JList from the MapArchPanel (script tab) which displays * the events * @param mapanel the MapArchPanel + * @return <code>true</code> if the event script was changed, otherwise <code>fals</code>. * @xxx this method knows things it should never know, it is evil! */ public boolean modifyEventScript(final int eventType, final int task, final JList eventList, final CMapArchPanel mapanel) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-10 13:07:32
|
Revision: 1002 http://svn.sourceforge.net/gridarta/?rev=1002&view=rev Author: christianhujer Date: 2006-12-10 05:07:31 -0800 (Sun, 10 Dec 2006) Log Message: ----------- Added missing @Override annotations. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMapViewBasic.java trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java trunk/crossfire/src/cfeditor/gameobject/GameObject.java trunk/crossfire/src/cfeditor/gameobject/face/FaceObject.java trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java trunk/crossfire/src/cfeditor/io/CMapReader.java trunk/crossfire/src/cfeditor/io/CMapWriter.java trunk/crossfire/src/cfeditor/map/DefaultMapModel.java trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java trunk/daimonin/src/daieditor/gameobject/GameObject.java trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java trunk/daimonin/src/daieditor/gui/map/SimpleLevelRenderer.java trunk/daimonin/src/daieditor/io/CMapReader.java trunk/daimonin/src/daieditor/io/CMapWriter.java trunk/src/app/net/sf/gridarta/gameobject/GameObject.java Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java =================================================================== --- trunk/crossfire/src/cfeditor/CMapViewBasic.java 2006-12-10 12:32:29 UTC (rev 1001) +++ trunk/crossfire/src/cfeditor/CMapViewBasic.java 2006-12-10 13:07:31 UTC (rev 1002) @@ -508,7 +508,7 @@ private Point[] needRedraw = null; // array of tile coords which need to be redrawn /** {@inheritDoc} */ - public void mousePressed(final MouseEvent e) { + @Override public void mousePressed(final MouseEvent e) { changedFlagNotify(); // set flag: map has changed final Point clickPoint = e.getPoint(); final Point mapLoc = renderer.getTileLocationAt(clickPoint, null); @@ -575,7 +575,7 @@ } /** {@inheritDoc} */ - public void mouseReleased(final MouseEvent event) { + @Override public void mouseReleased(final MouseEvent event) { final int buttonNr; // Number of released mouse button if (event.getModifiers() == MouseEvent.BUTTON1_MASK) { @@ -595,7 +595,7 @@ } /** {@inheritDoc} */ - public void mouseExited(final MouseEvent event) { + @Override public void mouseExited(final MouseEvent event) { // endFill(); } Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java =================================================================== --- trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java 2006-12-10 12:32:29 UTC (rev 1001) +++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java 2006-12-10 13:07:31 UTC (rev 1002) @@ -116,7 +116,7 @@ return faceListCount; } - protected void handleDuplicate(final GameObject archetype) { + @Override protected void handleDuplicate(final GameObject archetype) { log.warn("addArchToList: duplicate archetype '" + archetype.getArchetypeName() + "'"); } Modified: trunk/crossfire/src/cfeditor/gameobject/GameObject.java =================================================================== --- trunk/crossfire/src/cfeditor/gameobject/GameObject.java 2006-12-10 12:32:29 UTC (rev 1001) +++ trunk/crossfire/src/cfeditor/gameobject/GameObject.java 2006-12-10 13:07:31 UTC (rev 1002) @@ -122,7 +122,7 @@ } /** {@inheritDoc} */ - public int calculateEditType(final int checkType) { + @Override public int calculateEditType(final int checkType) { // ATTENTION! BE VERY CAREFUL WHEN YOU TRY TO UNIFY MORE OF THIS WITH DAIMONIN! /* if one of the types in checkType already is in editType, // we exclude that one @@ -365,7 +365,7 @@ return multi != null ? multi.getMinY() : 0; } - public void addTailPart(final GameObject tail) { + @Override public void addTailPart(final GameObject tail) { initMultiData(); tail.multi = multi; multi.addPart(tail); @@ -377,7 +377,7 @@ * * @return the head of the object */ - public GameObject getHead() { + @Override public GameObject getHead() { return multi != null ? multi.getHead() : this; } @@ -392,7 +392,7 @@ } /** {@inheritDoc} */ - @Nullable public GameObject getMultiNext() { + @Override @Nullable public GameObject getMultiNext() { return multi != null ? multi.getNext(this) : null; } @@ -401,7 +401,7 @@ * is often used as way to find multi-heads. * @return number of parts */ - public int getMultiRefCount() { + @Override public int getMultiRefCount() { return multi != null ? multi.getMultiRefCount() : 0; } @@ -416,7 +416,7 @@ } // ----- end multi-arch get/set ----- - public int getArchTypNr() { + @Override public int getArchTypNr() { return archType; } @@ -465,7 +465,7 @@ * {@inheritDoc} * @todo this method is too slow - find a faster way */ - @NotNull public String diffArchText(@NotNull String atxt, final boolean ignoreValues) { + @Override @NotNull public String diffArchText(@NotNull String atxt, final boolean ignoreValues) { int j; if (!atxt.endsWith("\n")) { @@ -872,7 +872,7 @@ } /** {@inheritDoc} */ - public GameObject createArch() { + @Override public GameObject createArch() { if (!isArchetype()) { return getArchetype().createArch(); } Modified: trunk/crossfire/src/cfeditor/gameobject/face/FaceObject.java =================================================================== --- trunk/crossfire/src/cfeditor/gameobject/face/FaceObject.java 2006-12-10 12:32:29 UTC (rev 1001) +++ trunk/crossfire/src/cfeditor/gameobject/face/FaceObject.java 2006-12-10 13:07:31 UTC (rev 1002) @@ -153,11 +153,11 @@ } } - public String getPath() { + @Override public String getPath() { return path; } - public void setPath(final String path) { + @Override public void setPath(final String path) { this.path = path; } Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java 2006-12-10 12:32:29 UTC (rev 1001) +++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java 2006-12-10 13:07:31 UTC (rev 1002) @@ -141,7 +141,7 @@ } /** This method is called when the look and feel has changed. */ - public void updateLookAndFeel() { + @Override public void updateLookAndFeel() { // update background color of window if (!isPickmap) { tmpGrfx.setColor(getBackground()); @@ -157,7 +157,7 @@ } /** {@inheritDoc} */ - public BufferedImage getFullImage() { + @Override public BufferedImage getFullImage() { final Size2D mapSize = mapControl.getMapSize(); final int mapWidth = 32 * mapSize.getWidth(); final int mapHeight = 32 * mapSize.getHeight(); @@ -185,7 +185,7 @@ } } - public void modelChanged() { + @Override public void modelChanged() { if (isPickmap) { //pickmaps don't have double buffers //maybe later could have them share one single buffer ? @@ -309,7 +309,7 @@ * more difficult. :( * @param point Map coordinates for the tile to draw. */ - public void paintTile(final Point point) { + @Override public void paintTile(final Point point) { final Graphics grfx; if (isPickmap) { grfx = getGraphics(); // graphics context for drawing in the mapview @@ -389,7 +389,7 @@ } - public void setHighlightTile(final Point point) { + @Override public void setHighlightTile(final Point point) { if (isPickmap) { paintHighlightTile(getGraphics(), point); } else { @@ -465,7 +465,7 @@ } /** {@inheritDoc} */ - @Nullable public Point getTileLocationAt(@NotNull final Point point, @Nullable final Point retPoint) { + @Override @Nullable public Point getTileLocationAt(@NotNull final Point point, @Nullable final Point retPoint) { try { renderTransform.inverseTransform(point, point); } catch (final NoninvertibleTransformException e) { @@ -491,7 +491,7 @@ return new Point(xm, ym); } - public boolean resizeBackBuffer() { + @Override public boolean resizeBackBuffer() { if (isPickmap) { return false; } @@ -518,7 +518,7 @@ * * @see LevelRenderer#freeMapBuffer() */ - public void freeBackBuffer() { + @Override public void freeBackBuffer() { backBuffer = null; tmpGrfx = null; tmpIcon = null; Modified: trunk/crossfire/src/cfeditor/io/CMapReader.java =================================================================== --- trunk/crossfire/src/cfeditor/io/CMapReader.java 2006-12-10 12:32:29 UTC (rev 1001) +++ trunk/crossfire/src/cfeditor/io/CMapReader.java 2006-12-10 13:07:31 UTC (rev 1002) @@ -80,7 +80,7 @@ } /** {@inheritDoc} */ - protected MapArchObject createMapArchObject() { + @Override protected MapArchObject createMapArchObject() { return new MapArchObject(); } @@ -92,7 +92,7 @@ * @throws IOException in case the file couldn't be read or is in wrong format * @todo create a separate exception for the wrong format */ - @NotNull public List<GameObject> decodeMapFile() throws IOException { + @Override @NotNull public List<GameObject> decodeMapFile() throws IOException { final List<GameObject> objects = super.decodeMapFile(); // finally... here we go // last action: if the map is bigger than the specified size in @@ -117,7 +117,7 @@ * @todo Find out whether effectively also trimming msg contents didn't break anything. */ // Note for programmers from Daimonin: Crossfire still has to support "More" which was used for multipart objects in the past. - @Nullable protected GameObject readArch(String thisLine) throws IOException { + @Override @Nullable protected GameObject readArch(String thisLine) throws IOException { boolean msgflag = false; boolean archflag = false; boolean archmore = false; Modified: trunk/crossfire/src/cfeditor/io/CMapWriter.java =================================================================== --- trunk/crossfire/src/cfeditor/io/CMapWriter.java 2006-12-10 12:32:29 UTC (rev 1001) +++ trunk/crossfire/src/cfeditor/io/CMapWriter.java 2006-12-10 13:07:31 UTC (rev 1002) @@ -69,7 +69,7 @@ * @param y Y position of gameObject (0 if <var>gameObject</var> is inside an inventory) * @throws IOException in case of I/O problems */ - protected void writeGameObject(final GameObject gameObject, final int x, final int y) throws IOException { + @Override protected void writeGameObject(final GameObject gameObject, final int x, final int y) throws IOException { final Archetype<GameObject> archetype = gameObject.getArchetype(); // Collect all fields to write. Modified: trunk/crossfire/src/cfeditor/map/DefaultMapModel.java =================================================================== --- trunk/crossfire/src/cfeditor/map/DefaultMapModel.java 2006-12-10 12:32:29 UTC (rev 1001) +++ trunk/crossfire/src/cfeditor/map/DefaultMapModel.java 2006-12-10 13:07:31 UTC (rev 1002) @@ -479,7 +479,7 @@ } /** {@inheritDoc} */ - public void resizeMap(@NotNull final Size2D newSize) { + @Override public void resizeMap(@NotNull final Size2D newSize) { super.resizeMap(newSize); // an important last point: if there is a highlighted area in a region // that got cut off - unhilight it! Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java =================================================================== --- trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2006-12-10 12:32:29 UTC (rev 1001) +++ trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2006-12-10 13:07:31 UTC (rev 1002) @@ -114,7 +114,7 @@ return face; } - protected void handleDuplicate(final GameObject archetype) { + @Override protected void handleDuplicate(final GameObject archetype) { ACTION_FACTORY.showMessageDialog(mainControl.getMainView(), "loadDuplicateArch", archetype.getArchetypeName(), currentFile); //throw new DuplicateArchetypeException(data); } Modified: trunk/daimonin/src/daieditor/gameobject/GameObject.java =================================================================== --- trunk/daimonin/src/daieditor/gameobject/GameObject.java 2006-12-10 12:32:29 UTC (rev 1001) +++ trunk/daimonin/src/daieditor/gameobject/GameObject.java 2006-12-10 13:07:31 UTC (rev 1002) @@ -141,7 +141,7 @@ * {@inheritDoc} * @deprecated use arch object matchers, this method will be removed */ - @Deprecated public int calculateEditType(final int checkType) { + @Override @Deprecated public int calculateEditType(final int checkType) { // ATTENTION! BE VERY CAREFUL WHEN YOU TRY TO UNIFY MORE OF THIS WITH CROSSFIRE! /* if one of the types in checkType already is in editType, // we exclude that one @@ -286,7 +286,7 @@ return multi != null ? multi.getMinY() : 0; } - public void addTailPart(final GameObject tail) { + @Override public void addTailPart(final GameObject tail) { initMultiData(); tail.multi = multi; multi.addPart(tail); @@ -298,7 +298,7 @@ * * @return the head of the object */ - public GameObject getHead() { + @Override public GameObject getHead() { return multi != null ? multi.getHead() : this; } @@ -313,7 +313,7 @@ } /** {@inheritDoc} */ - @Nullable public GameObject getMultiNext() { + @Override @Nullable public GameObject getMultiNext() { return multi != null ? multi.getNext(this) : null; } @@ -349,7 +349,7 @@ * @todo rename me, "Ref" is a term in Java short for "Reference" and this * is not about "References" but about multi-tile arches. */ - public int getMultiRefCount() { + @Override public int getMultiRefCount() { return multi != null ? multi.getMultiRefCount() : 0; } @@ -364,7 +364,7 @@ } // ----- end multi-arch get/set ----- - public int getArchTypNr() { + @Override public int getArchTypNr() { return archType; } @@ -437,7 +437,7 @@ * {@inheritDoc} * @todo this method is too slow - find a faster way */ - @NotNull public String diffArchText(@NotNull final String atxt, final boolean ignoreValues) { + @Override @NotNull public String diffArchText(@NotNull final String atxt, final boolean ignoreValues) { final StringBuilder result = new StringBuilder(); for (final String line : atxt.split("\\s*\n")) { if (ignoreValues) { @@ -809,7 +809,7 @@ } /** {@inheritDoc} */ - public GameObject createArch() { + @Override public GameObject createArch() { if (!isArchetype()) { return getArchetype().createArch(); } Modified: trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java 2006-12-10 12:32:29 UTC (rev 1001) +++ trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java 2006-12-10 13:07:31 UTC (rev 1002) @@ -428,7 +428,7 @@ } /** {@inheritDoc} */ - @Nullable public Point getTileLocationAt(@NotNull final Point point, @Nullable final Point retPoint) { + @Override @Nullable public Point getTileLocationAt(@NotNull final Point point, @Nullable final Point retPoint) { final int x0 = point.x - origin.x; final int y0 = point.y - origin.y; Modified: trunk/daimonin/src/daieditor/gui/map/SimpleLevelRenderer.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/SimpleLevelRenderer.java 2006-12-10 12:32:29 UTC (rev 1001) +++ trunk/daimonin/src/daieditor/gui/map/SimpleLevelRenderer.java 2006-12-10 13:07:31 UTC (rev 1002) @@ -179,7 +179,7 @@ } } - @Nullable public Point getTileLocationAt(@NotNull final Point point, @Nullable final Point retPoint) { + @Override @Nullable public Point getTileLocationAt(@NotNull final Point point, @Nullable final Point retPoint) { throw new IllegalStateException(); } Modified: trunk/daimonin/src/daieditor/io/CMapReader.java =================================================================== --- trunk/daimonin/src/daieditor/io/CMapReader.java 2006-12-10 12:32:29 UTC (rev 1001) +++ trunk/daimonin/src/daieditor/io/CMapReader.java 2006-12-10 13:07:31 UTC (rev 1002) @@ -70,7 +70,7 @@ } /** {@inheritDoc} */ - protected MapArchObject createMapArchObject() { + @Override protected MapArchObject createMapArchObject() { return new MapArchObject(); } @@ -82,7 +82,7 @@ * @throws IOException in case the file couldn't be read or is in wrong format * @todo create a separate exception for the wrong format */ - @NotNull public List<GameObject> decodeMapFile() throws IOException { + @Override @NotNull public List<GameObject> decodeMapFile() throws IOException { final List<GameObject> objects = super.decodeMapFile(); CMainControl.getInstance().collectTempList(objects, uri); CMainControl.getInstance().getArchetypeParser().sortTempList(objects); @@ -102,7 +102,7 @@ * @todo Attributes not relevant during map parsing shouldn't be evaluated here, but in GameObject / ArchetypeParser instead. */ // Note for programmers from Crossfire: Daimonin need not support "More". - @Nullable protected GameObject readArch(String thisLine) throws IOException { + @Override @Nullable protected GameObject readArch(String thisLine) throws IOException { boolean msgflag = false; boolean archflag = false; GameObject gameObject = null; Modified: trunk/daimonin/src/daieditor/io/CMapWriter.java =================================================================== --- trunk/daimonin/src/daieditor/io/CMapWriter.java 2006-12-10 12:32:29 UTC (rev 1001) +++ trunk/daimonin/src/daieditor/io/CMapWriter.java 2006-12-10 13:07:31 UTC (rev 1002) @@ -71,7 +71,7 @@ * @param y Y position of gameObject (0 if <var>gameObject</var> is inside an inventory) * @throws IOException in case of I/O problems */ - protected void writeGameObject(final GameObject gameObject, final int x, final int y) throws IOException { + @Override protected void writeGameObject(final GameObject gameObject, final int x, final int y) throws IOException { final Archetype<GameObject> archetype = gameObject.getArchetype(); // ok, we start with the standard parts... this is valid for all types Modified: trunk/src/app/net/sf/gridarta/gameobject/GameObject.java =================================================================== --- trunk/src/app/net/sf/gridarta/gameobject/GameObject.java 2006-12-10 12:32:29 UTC (rev 1001) +++ trunk/src/app/net/sf/gridarta/gameobject/GameObject.java 2006-12-10 13:07:31 UTC (rev 1002) @@ -617,7 +617,7 @@ * @return X coordinate on map * @see #getMapY() */ - public int getMapX() { + @Override public int getMapX() { return mapx; } @@ -628,7 +628,7 @@ * @return Y coordinate on map * @see #getMapX() */ - public int getMapY() { + @Override public int getMapY() { return mapy; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-10 14:13:43
|
Revision: 1009 http://svn.sourceforge.net/gridarta/?rev=1009&view=rev Author: christianhujer Date: 2006-12-10 06:13:43 -0800 (Sun, 10 Dec 2006) Log Message: ----------- Hardened error policy. Strengthened constructor visibility. Removed redundant final declarations. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CPickmapPanel.java trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java trunk/crossfire/src/cfeditor/gui/prefs/ResPrefs.java trunk/crossfire/src/cfeditor/menu/AggregateMenuLocation.java trunk/crossfire/src/cfeditor/parameter/DoubleParameterView.java trunk/crossfire/src/cfeditor/parameter/IntegerParameterView.java trunk/daimonin/src/daieditor/CPickmapPanel.java trunk/daimonin/src/daieditor/gameobject/face/FaceFacade.java trunk/gridarta.ipr trunk/src/app/net/sf/gridarta/gameobject/GameObjectContainer.java trunk/src/app/net/sf/gridarta/gameobject/RecursiveGameObjectIterator.java trunk/src/doc/dev/codeStyle.xhtml Modified: trunk/crossfire/src/cfeditor/CPickmapPanel.java =================================================================== --- trunk/crossfire/src/cfeditor/CPickmapPanel.java 2006-12-10 13:54:10 UTC (rev 1008) +++ trunk/crossfire/src/cfeditor/CPickmapPanel.java 2006-12-10 14:13:43 UTC (rev 1009) @@ -326,7 +326,7 @@ private final String activePickmap; // file-name of active pickmap - public PickmapSelectionListener(final JTabbedPane pane) { + private PickmapSelectionListener(final JTabbedPane pane) { tabpane = pane; activePickmap = null; } @@ -359,7 +359,7 @@ * @param mainView the main view * @param pane the JTabbedPane containing both archlist and pickmaps */ - public ArchNPickChangeListener(final CMainView mainView, final JTabbedPane pane) { + private ArchNPickChangeListener(final CMainView mainView, final JTabbedPane pane) { this.mainView = mainView; tabpane = pane; selectedIndex = tabpane.getSelectedIndex(); Modified: trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java 2006-12-10 13:54:10 UTC (rev 1008) +++ trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java 2006-12-10 14:13:43 UTC (rev 1009) @@ -140,7 +140,7 @@ //--- Constructor(s) --- - public ClosingIcon(final ImageIcon icon) { + protected ClosingIcon(final ImageIcon icon) { this.icon = icon; if (icon != null) { Modified: trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java 2006-12-10 13:54:10 UTC (rev 1008) +++ trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java 2006-12-10 14:13:43 UTC (rev 1009) @@ -32,7 +32,6 @@ import static java.util.Arrays.binarySearch; import static java.util.Arrays.sort; import java.util.Locale; -import java.util.prefs.Preferences; import javax.swing.Box; import static javax.swing.Box.createHorizontalBox; import static javax.swing.Box.createVerticalBox; @@ -74,6 +73,7 @@ /** * Create a GUIPrefs pane. + * @param mainControl MainControl (used for accessing settings). */ public GUIPrefs(final CMainControl mainControl) { this.mainControl = mainControl; Modified: trunk/crossfire/src/cfeditor/gui/prefs/ResPrefs.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/prefs/ResPrefs.java 2006-12-10 13:54:10 UTC (rev 1008) +++ trunk/crossfire/src/cfeditor/gui/prefs/ResPrefs.java 2006-12-10 14:13:43 UTC (rev 1009) @@ -31,7 +31,6 @@ import java.awt.Container; import java.awt.FlowLayout; import static java.util.Arrays.sort; -import java.util.prefs.Preferences; import javax.swing.Box; import static javax.swing.Box.createHorizontalBox; import static javax.swing.Box.createVerticalBox; @@ -152,7 +151,6 @@ /** * Toggle action method for loading arches from collection. * @param loadArchColl whether to load arches from collection - * @used */ public void setOptionsLoadArchColl(final boolean loadArchColl) { archField.setEnabled(!loadArchColl); @@ -161,7 +159,6 @@ /** * Toggle action method for loading arches from collection. * @return whether arches are loaded from collection - * @used */ public boolean isOptionsLoadArchColl() { return !archField.isEnabled(); Modified: trunk/crossfire/src/cfeditor/menu/AggregateMenuLocation.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/AggregateMenuLocation.java 2006-12-10 13:54:10 UTC (rev 1008) +++ trunk/crossfire/src/cfeditor/menu/AggregateMenuLocation.java 2006-12-10 14:13:43 UTC (rev 1009) @@ -21,7 +21,7 @@ private final MenuLocation location; - public WrappedMenuLocation(final MenuLocation location, final String parentName) { + private WrappedMenuLocation(final MenuLocation location, final String parentName) { this.location = location; name = parentName + "." + location.getName(); } Modified: trunk/crossfire/src/cfeditor/parameter/DoubleParameterView.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/DoubleParameterView.java 2006-12-10 13:54:10 UTC (rev 1008) +++ trunk/crossfire/src/cfeditor/parameter/DoubleParameterView.java 2006-12-10 14:13:43 UTC (rev 1009) @@ -35,11 +35,11 @@ private static final long serialVersionUID = 1L; - public TooltipSpinner() { + private TooltipSpinner() { super(); } - public TooltipSpinner(final SpinnerModel model) { + private TooltipSpinner(final SpinnerModel model) { super(model); } Modified: trunk/crossfire/src/cfeditor/parameter/IntegerParameterView.java =================================================================== --- trunk/crossfire/src/cfeditor/parameter/IntegerParameterView.java 2006-12-10 13:54:10 UTC (rev 1008) +++ trunk/crossfire/src/cfeditor/parameter/IntegerParameterView.java 2006-12-10 14:13:43 UTC (rev 1009) @@ -35,11 +35,11 @@ private static final long serialVersionUID = -797350272052837471L; - public TooltipSpinner() { + private TooltipSpinner() { super(); } - public TooltipSpinner(final SpinnerModel model) { + private TooltipSpinner(final SpinnerModel model) { super(model); } Modified: trunk/daimonin/src/daieditor/CPickmapPanel.java =================================================================== --- trunk/daimonin/src/daieditor/CPickmapPanel.java 2006-12-10 13:54:10 UTC (rev 1008) +++ trunk/daimonin/src/daieditor/CPickmapPanel.java 2006-12-10 14:13:43 UTC (rev 1009) @@ -359,7 +359,7 @@ private final String activePickmap; // file-name of active pickmap - public PickmapSelectionListener(final JTabbedPane pane) { + private PickmapSelectionListener(final JTabbedPane pane) { tabpane = pane; activePickmap = null; } @@ -394,7 +394,7 @@ * @param mainView the main view * @param pane the JTabbedPane containing both archlist and pickmaps */ - public ArchNPickChangeListener(final CMainView mainView, final JTabbedPane pane) { + private ArchNPickChangeListener(final CMainView mainView, final JTabbedPane pane) { this.mainView = mainView; tabpane = pane; selectedIndex = tabpane.getSelectedIndex(); Modified: trunk/daimonin/src/daieditor/gameobject/face/FaceFacade.java =================================================================== --- trunk/daimonin/src/daieditor/gameobject/face/FaceFacade.java 2006-12-10 13:54:10 UTC (rev 1008) +++ trunk/daimonin/src/daieditor/gameobject/face/FaceFacade.java 2006-12-10 14:13:43 UTC (rev 1009) @@ -54,7 +54,7 @@ * Converts a pixel by increasing the transparency. * {@inheritDoc} */ - @Override public final int filterRGB(final int x, final int y, final int rgb) { + @Override public int filterRGB(final int x, final int y, final int rgb) { // This is sufficient since alpha channel isn't used in the graphics this is required for. return rgb >>> 24 == 0 ? rgb : rgb & 0x00FFFFFF | 0x80000000; } @@ -68,7 +68,7 @@ * Converts every second pixel by making it transparent. * {@inheritDoc} */ - @Override public final int filterRGB(final int x, final int y, final int rgb) { + @Override public int filterRGB(final int x, final int y, final int rgb) { return (x + y) % 2 == 1 ? rgb : rgb & 0x00FFFFFF; } Modified: trunk/gridarta.ipr =================================================================== --- trunk/gridarta.ipr 2006-12-10 13:54:10 UTC (rev 1008) +++ trunk/gridarta.ipr 2006-12-10 14:13:43 UTC (rev 1009) @@ -567,7 +567,6 @@ </inspection_tool> <inspection_tool class="CheckJsfComponentUnderViewTag" level="INFO" enabled="false" /> <inspection_tool class="UnnecessarySemicolon" level="WARNING" enabled="false" /> - <inspection_tool class="ShiftOutOfRange" level="WARNING" enabled="false" /> <inspection_tool class="DefaultFileTemplate" level="WARNING" enabled="false"> <option name="CHECK_FILE_HEADER" value="true" /> <option name="CHECK_TRY_CATCH_SECTION" value="true" /> @@ -609,8 +608,6 @@ </inspection_tool> <inspection_tool class="UnnecessaryUnboxing" level="WARNING" enabled="false" /> <inspection_tool class="SameParameterValue" level="WARNING" enabled="false" /> - <inspection_tool class="NoExplicitFinalizeCalls" level="WARNING" enabled="false" /> - <inspection_tool class="FinalPrivateMethod" level="WARNING" enabled="false" /> <inspection_tool class="AnalyzingRedundantFieldInitialization" level="WARNING" enabled="false" /> <inspection_tool class="ReservedWordUsedAsNameJS" level="WARNING" enabled="false" /> <inspection_tool class="ExtendsAnnotation" level="WARNING" enabled="false" /> @@ -673,7 +670,6 @@ <option name="m_includeComments" value="true" /> <option name="m_ignoreTestCases" value="true" /> </inspection_tool> - <inspection_tool class="Dependency" level="ERROR" enabled="false" /> <inspection_tool class="UnnecessaryLocalVariable" level="WARNING" enabled="false"> <option name="m_ignoreImmediatelyReturnedVariables" value="false" /> <option name="m_ignoreAnnotatedVariables" value="false" /> @@ -694,13 +690,9 @@ <group names="x,width,left,right" /> <group names="y,height,top,bottom" /> </inspection_tool> - <inspection_tool class="FinalizeCallsSuperFinalize" level="WARNING" enabled="false"> - <option name="m_ignoreForObjectSubclasses" value="false" /> - </inspection_tool> <inspection_tool class="MalformedRegex" level="WARNING" enabled="false" /> <inspection_tool class="TrivialIfJS" level="WARNING" enabled="false" /> <inspection_tool class="SimplifiableConditionalExpression" level="WARNING" enabled="false" /> - <inspection_tool class="IncompatibleMask" level="WARNING" enabled="false" /> <inspection_tool class="UNUSED_IMPORT" level="WARNING" enabled="false" /> <inspection_tool class="DuplicateCaseLabelJS" level="WARNING" enabled="false" /> <inspection_tool class="PersistenceModelWarningInspection" level="WARNING" enabled="false" /> @@ -752,9 +744,6 @@ <inspection_tool class="BadExpressionStatementJS" level="WARNING" enabled="false" /> <inspection_tool class="PrimitiveArrayArgumentToVariableArgMethod" level="WARNING" enabled="false" /> <inspection_tool class="InfiniteRecursionJS" level="WARNING" enabled="false" /> - <inspection_tool class="PointlessBitwiseExpression" level="WARNING" enabled="false"> - <option name="m_ignoreExpressionsContainingConstants" value="false" /> - </inspection_tool> <inspection_tool class="StrutsValidatorInspection" level="ERROR" enabled="false" /> <inspection_tool class="ContinueOrBreakFromFinallyBlock" level="WARNING" enabled="false" /> <inspection_tool class="DuplicatePropertyOnObjectJS" level="WARNING" enabled="false" /> @@ -799,8 +788,34 @@ <option name="IGNORE_JAVADOC_PERIOD" value="false" /> <option name="myAdditionalJavadocTags" value="todo,note,todo,xxx,note,todo,fixme,fixme,warning,invariant,retval,pre" /> </inspection_tool> - <inspection_tool class="MissingOverrideAnnotation" level="WARNING" enabled="true" /> + <inspection_tool class="MissingOverrideAnnotation" level="ERROR" enabled="true" /> <inspection_tool class="AbstractMethodWithMissingImplementations" level="WARNING" enabled="true" /> + <inspection_tool class="EqualsAndHashcode" level="ERROR" enabled="true" /> + <inspection_tool class="Dependency" level="ERROR" enabled="false" /> + <inspection_tool class="FinalizeNotProtected" level="ERROR" enabled="true" /> + <inspection_tool class="NoExplicitFinalizeCalls" level="ERROR" enabled="true" /> + <inspection_tool class="FinalizeCallsSuperFinalize" level="ERROR" enabled="true"> + <option name="m_ignoreForObjectSubclasses" value="false" /> + </inspection_tool> + <inspection_tool class="OnDemandImport" level="ERROR" enabled="true" /> + <inspection_tool class="JavaLangImport" level="ERROR" enabled="true" /> + <inspection_tool class="SamePackageImport" level="ERROR" enabled="true" /> + <inspection_tool class="RedundantImport" level="ERROR" enabled="true" /> + <inspection_tool class="InstanceofThis" level="ERROR" enabled="true" /> + <inspection_tool class="ReplaceAssignmentWithOperatorAssignment" level="ERROR" enabled="true"> + <option name="ignoreLazyOperators" value="true" /> + <option name="ignoreObscureOperators" value="false" /> + </inspection_tool> + <inspection_tool class="AssignmentToCatchBlockParameter" level="ERROR" enabled="true" /> + <inspection_tool class="ShiftOutOfRange" level="ERROR" enabled="true" /> + <inspection_tool class="PointlessBitwiseExpression" level="ERROR" enabled="true"> + <option name="m_ignoreExpressionsContainingConstants" value="false" /> + </inspection_tool> + <inspection_tool class="IncompatibleMask" level="ERROR" enabled="true" /> + <inspection_tool class="FinalMethodInFinalClass" level="ERROR" enabled="true" /> + <inspection_tool class="FinalPrivateMethod" level="ERROR" enabled="true" /> + <inspection_tool class="ProtectedMemberInFinalClass" level="ERROR" enabled="true" /> + <inspection_tool class="PublicConstructorInNonPublicClass" level="ERROR" enabled="true" /> </profile> <profile version="1.0" is_locked="false"> <option name="myName" value="Project Default" /> Modified: trunk/src/app/net/sf/gridarta/gameobject/GameObjectContainer.java =================================================================== --- trunk/src/app/net/sf/gridarta/gameobject/GameObjectContainer.java 2006-12-10 13:54:10 UTC (rev 1008) +++ trunk/src/app/net/sf/gridarta/gameobject/GameObjectContainer.java 2006-12-10 14:13:43 UTC (rev 1009) @@ -409,7 +409,7 @@ * Create a reverse iterator. * @param list to iterate over in reverse order */ - public ReverseIterator(final List<T> list) { + private ReverseIterator(final List<T> list) { delegate = list.listIterator(list.size()); } Modified: trunk/src/app/net/sf/gridarta/gameobject/RecursiveGameObjectIterator.java =================================================================== --- trunk/src/app/net/sf/gridarta/gameobject/RecursiveGameObjectIterator.java 2006-12-10 13:54:10 UTC (rev 1008) +++ trunk/src/app/net/sf/gridarta/gameobject/RecursiveGameObjectIterator.java 2006-12-10 14:13:43 UTC (rev 1009) @@ -20,7 +20,7 @@ * Create a recursive GameObject Iterator. * @param container GameObjectContainer to start with */ - public RecursiveGameObjectIterator(final GameObjectContainer container) { + RecursiveGameObjectIterator(final GameObjectContainer container) { current = container.iterator(); } Modified: trunk/src/doc/dev/codeStyle.xhtml =================================================================== --- trunk/src/doc/dev/codeStyle.xhtml 2006-12-10 13:54:10 UTC (rev 1008) +++ trunk/src/doc/dev/codeStyle.xhtml 2006-12-10 14:13:43 UTC (rev 1009) @@ -77,8 +77,58 @@ Inspections <ul> <li> + Abstraction issues + <dl> + <dt>'instanceof' check for 'this'</dt> + <dd> + This most likely is a failure to understand object oriented programming. + Such constructs must be replaced by proper polymorphism. + </dd> + </dl> + </li> + <li> + Assignment issues + <dl> + <dt>Assignment replaceable with operator assignment</dt> + <dd> + Operator assignments should be used wherever applicable because they are easier to read: It's faster to see and understand that the new variable value is based on a modification of the original value, not a completely new value. + <br /> + Conditional operators are currently ignored because <code>foo |= bar();</code> is not the same as <code>foo = foo || bar();</code> because the behaviour regarding side-effects in <code>bar()</code> is changed. + </dd> + <dt>Assignment to catch block parameter</dt> + <dd> + This reports things like <code>catch (FooException e) { e = ...; }</code> as they are either errors or, if not, at least very confusing. + </dd> + </dl> + </li> + <li> + Bitwise operation issues + <dl> + <dt>Incompatible bitwise mask operation</dt> + <dd> + Bitwise mask expressions which are guaranteed to always evaluate to true or false most likely are logical errors. + Example: <code>(var & constant1) == constant2</code>. + </dd> + <dt>Pointless bitwise expression</dt> + <dd> + Pointless expressions that and with zero, or with zero or shift with zero most likely are logical errors. + </dd> + <dt>Shift operation by inappropriate constant</dt> + <dd> + Shifts with shift values out of range (0..31 for int, 0..63 for long) most likely are logical errors. + </dd> + </dl> + </li> + <li> Class structure <dl> + <dt>'final' method in 'final' class</dt> + <dd> + This is unneccessary and may be confusing. + Methods in final classes are always implicitely final. + A method should only be explicitely declared final if the context is "the class might be subclasses, but this method is not designed to be overridden". + Thus if a method in a final class is explicitely declared final, it may lead to the conclusion that the class was declared final by mistake. + </dd> <dt>Missing @Deprecated annotation</dt> <dd> Makes sure that deprecated members that are documented as deprecated in Javadoc (<code>@deprecated</code> javadoc tag) are also annotated as <code>@Deprecated</code> in the source code. @@ -99,9 +149,36 @@ That is useful for finding typos when wanting to override a method. E.g. if you override <code>toString()</code> using <code>@Override public String tostring()</code> (not the typo), the compiler will be able to report this as an error. </dd> + <dt>'private' method declared 'final'</dt> + <dd> + Private methods are implicitely final. + Explicitely declaring them final looks like the method should be public or protected instead. + </dd> + <dt>'protected' member in 'final' class</dt> + <dd> + Final classes cannot be subclassed. + Protected members are explicitely visible for subclasses. + Because of that, protected members in final classes are an oxymoron that indicates an error. + </dd> + <dt>'public' constructor in non-public class</dt> + <dd> + If the class is not visible, the constructor isn't either. + Declaring the constructor of higher accessibility than its class is pointless and most likely an error. + </dd> </dl> </li> <li> + Finalization issues + <dl> + <dt>'finalize()' called explicitely</dt> + <dd>finalize() must only be called by the garbage collector, but not application software.</dd> + <dt>'finalize()' does not call 'super.finalize()'</dt> + <dd>This always is an error as this prevents the superclass from performing its own finalization code.</dd> + <dt>'finalize()' not declared 'protected'</dt> + <dd>This is an error because 'finalize()' must not be public because it never needs to be called directly.</dd> + </dl> + </li> + <li> General <dl> <dt>Declaration has javadoc problems</dt> @@ -118,9 +195,29 @@ <dd> Makes sure that references in javadoc comments (<code>{@link ...}</code> and eventually <code>@see ...</code>) can be resolved. </dd> + <dt>equals() and hashCode() not paired</dt> + <dd> + Due to their contract, equals() and hashCode() must always be paired. + If one of them is overridden, so must be the other. + </dd> </dl> </li> <li> + Imports + <dl> + <dt>* import</dt> + <dd> + * imports are forbidden in Gridarta. + </dd> + <dt>Import from same package</dt> + <dt>java.lang import</dt> + <dt>Redundant import</dt> + <dd> + Redundant or pointless imports are forbidden in Gridarta. + </dd> + </dl> + </li> + <li> Inheritance issues <dl> <dt>Abstract method with missing implementations</dt> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-10 15:46:11
|
Revision: 1016 http://svn.sourceforge.net/gridarta/?rev=1016&view=rev Author: christianhujer Date: 2006-12-10 07:46:05 -0800 (Sun, 10 Dec 2006) Log Message: ----------- Hardened policy. Documentation follows soon. Modified Paths: -------------- trunk/crossfire/src/cfeditor/AutojoinList.java trunk/crossfire/src/cfeditor/CFTreasureListTree.java trunk/crossfire/src/cfeditor/CGUIUtils.java trunk/crossfire/src/cfeditor/CMainControl.java trunk/crossfire/src/cfeditor/CMainMenu.java trunk/crossfire/src/cfeditor/CMainToolbar.java trunk/crossfire/src/cfeditor/CResourceLoader.java trunk/crossfire/src/cfeditor/CopyBuffer.java trunk/crossfire/src/cfeditor/IGUIConstants.java trunk/crossfire/src/cfeditor/PluginParameter.java trunk/crossfire/src/cfeditor/filter/NamedFilterList.java trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java trunk/crossfire/src/cfeditor/gui/prefs/ResPrefs.java trunk/crossfire/src/cfeditor/menu/BasicMenuEntry.java trunk/daimonin/src/daieditor/CFTreasureListTree.java trunk/daimonin/src/daieditor/CMainControl.java trunk/daimonin/src/daieditor/CMapViewBasic.java trunk/daimonin/src/daieditor/IGUIConstants.java trunk/daimonin/src/daieditor/ProcessRunner.java trunk/daimonin/src/daieditor/action.properties trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java trunk/daimonin/src/daieditor/gameobject/match/AttribGameObjectMatcher.java trunk/daimonin/src/daieditor/gameobject/match/NamedGameObjectMatcher.java trunk/daimonin/src/daieditor/gui/ConnectionView.java trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java trunk/daimonin/src/daieditor/gui/map/MapCursorControl.java trunk/daimonin/src/daieditor/gui/map/SimpleLevelRenderer.java trunk/daimonin/src/daieditor/gui/map/event/MouseOpEvent.java trunk/daimonin/src/daieditor/messages.properties trunk/daimonin/src/daieditor/messages_sv.properties trunk/daimonin/src/test/daieditor/gui/map/MapCursorTest.java trunk/gridarta.ipr trunk/src/app/net/sf/gridarta/gameobject/GameObject.java trunk/src/app/net/sf/gridarta/gameobject/NamedTreeNode.java trunk/src/app/net/sf/gridarta/gui/map/MapCursor.java trunk/src/app/net/sf/gridarta/help/Help.java trunk/src/app/net/sf/gridarta/map/MapModelEvent.java trunk/src/app/net/sf/gridarta/map/MapSquare.java Modified: trunk/crossfire/src/cfeditor/AutojoinList.java =================================================================== --- trunk/crossfire/src/cfeditor/AutojoinList.java 2006-12-10 15:41:34 UTC (rev 1015) +++ trunk/crossfire/src/cfeditor/AutojoinList.java 2006-12-10 15:46:05 UTC (rev 1016) @@ -45,7 +45,7 @@ private static final Logger log = Logger.getLogger(AutojoinList.class); - private static final String filename = "autojoin.txt"; // file with autojoin lists + private static final String FILENAME = "autojoin.txt"; // file with autojoin lists // bitmask constants for archnames index private static final int NORTH = 1; @@ -100,7 +100,7 @@ // open the resource file final String baseDir = IGUIConstants.CONFIG_DIR; - final BufferedReader stream = IOUtils.createReader(baseDir, filename); + final BufferedReader stream = IOUtils.createReader(baseDir, FILENAME); try { // read the file @@ -137,9 +137,9 @@ success = true; // we did it! } else if (count > 16) { - log.warn("In file " + filename + ": List with more than 16 valid entries!"); + log.warn("In file " + FILENAME + ": List with more than 16 valid entries!"); } else if (archstack.getArchetypeCount() >= 1) { - log.warn("In file " + filename + ": List with less than 16 valid entries!"); + log.warn("In file " + FILENAME + ": List with less than 16 valid entries!"); } sectionFlag = false; } else if (count < 16) { @@ -152,12 +152,12 @@ if (!archetype.isMulti()) { count++; // no multipart, this one's okay } else { - log.warn("In file " + filename + ": Arch '" + line + "' is a multipart."); + log.warn("In file " + FILENAME + ": Arch '" + line + "' is a multipart."); } } else { // (If no arches exist at all, errormessages are suppressed here) if (archstack.getArchetypeCount() >= 1) { - log.warn("In file " + filename + ": Arch '" + line + "' not found."); + log.warn("In file " + FILENAME + ": Arch '" + line + "' not found."); } } } else { @@ -171,11 +171,11 @@ } } catch (final FileNotFoundException e) { if (log.isInfoEnabled()) { - log.info("Autojoin definitions file '" + filename + "' not found."); + log.info("Autojoin definitions file '" + FILENAME + "' not found."); } return false; } catch (final IOException e) { - log.warn("Read error in file '" + filename + "'."); + log.warn("Read error in file '" + FILENAME + "'."); return false; } Modified: trunk/crossfire/src/cfeditor/CFTreasureListTree.java =================================================================== --- trunk/crossfire/src/cfeditor/CFTreasureListTree.java 2006-12-10 15:41:34 UTC (rev 1015) +++ trunk/crossfire/src/cfeditor/CFTreasureListTree.java 2006-12-10 15:46:05 UTC (rev 1016) @@ -739,8 +739,10 @@ public static final int ARCH = 2; + @SuppressWarnings({"ConstantNamingConvention"}) public static final int YES = 3; + @SuppressWarnings({"ConstantNamingConvention"}) public static final int NO = 4; public static final int FOLDER = 5; Modified: trunk/crossfire/src/cfeditor/CGUIUtils.java =================================================================== --- trunk/crossfire/src/cfeditor/CGUIUtils.java 2006-12-10 15:41:34 UTC (rev 1015) +++ trunk/crossfire/src/cfeditor/CGUIUtils.java 2006-12-10 15:46:05 UTC (rev 1016) @@ -139,7 +139,7 @@ */ public static ImageIcon getGrayScaled(final ImageIcon icon) { // Use the static instance to do the grayscaling - return staticInstance._getGrayScaled(icon); + return staticInstance.getGrayScaledImpl(icon); } public static JComponent getBox(final JComponent c) { @@ -153,7 +153,7 @@ * @param icon The colour icon to be grayscaled. * @return The given icon as grayscaled version. */ - private ImageIcon _getGrayScaled(final ImageIcon icon) { + private ImageIcon getGrayScaledImpl(final ImageIcon icon) { final CGrayScaleFilter filter = new CGrayScaleFilter(); final ImageProducer imageProducer = new FilteredImageSource(icon.getImage().getSource(), filter); final Image grayIcon = Toolkit.getDefaultToolkit().createImage(imageProducer); Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-10 15:41:34 UTC (rev 1015) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-10 15:46:05 UTC (rev 1016) @@ -43,7 +43,6 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import javax.swing.ImageIcon; import javax.swing.JFileChooser; @@ -54,7 +53,6 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.filechooser.FileFilter; import net.sf.gridarta.MainControl; -import net.sf.gridarta.Size2D; import net.sf.gridarta.gameobject.Collectable; import net.sf.gridarta.gameobject.Collector; import net.sf.gridarta.gui.HideFileFilterProxy; @@ -357,20 +355,20 @@ /** Set all global settings from the preferences. */ public void readGlobalSettings() { - imageSet = new String(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(USE_IMAGESET, "base")); + imageSet = CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(USE_IMAGESET, "base"); if (imageSet.equalsIgnoreCase("none")) { imageSet = null; } initDirs(); - loadFromArchive = new Boolean(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(LOAD_ARCH_COLL, "true")).booleanValue(); + loadFromArchive = Boolean.valueOf(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(LOAD_ARCH_COLL, "true")); - getMainView().setMapTileListBottom(new Boolean(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(CMainView.MAP_TILE_LIST_BOTTOM_KEY, Boolean.toString(CMainView.MAP_TILE_LIST_BOTTOM_DEFAULT))).booleanValue()); + getMainView().setMapTileListBottom(Boolean.valueOf(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(CMainView.MAP_TILE_LIST_BOTTOM_KEY, Boolean.toString(CMainView.MAP_TILE_LIST_BOTTOM_DEFAULT)))); - setLockAllPickmaps(new Boolean(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(PICKMAPS_LOCKED, "false")).booleanValue()); + setLockAllPickmaps(Boolean.valueOf(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(PICKMAPS_LOCKED, "false"))); // docu version - if (IGUIConstants.DOCU_VERSION > (new Integer(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(DOCU_VERSION_KEY, "0"))).intValue()) { + if (IGUIConstants.DOCU_VERSION > new Integer(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(DOCU_VERSION_KEY, "0"))) { // remember to open docu autoPopupDocu = true; // update docu version right now, because we want the help popup only one time @@ -1074,8 +1072,8 @@ * Create an image of the specified map and save it as file. * In this method, the filename is already given, so the image * is created directly (if possible). - * @param filename Name of the png image file to create. - * @param mapControl The controller of map to save. + * @param filename Name of the png image file to create. + * @param mapControl The controller of map to save. */ public void createImageWanted(final MapControl mapControl, final String filename) { @@ -1371,6 +1369,7 @@ } /** "Cut" was selected from the Edit menu. */ + @SuppressWarnings({"InstanceMethodNamingConvention"}) public void cut() { if (currentMap == null || currentMap.getMapViewFrame() == null) { return; // this should never be possible, but I just wanna make sure... @@ -1657,10 +1656,6 @@ return tileEdit; } - public CFArchTypeList getTypelist() { - return typeList; - } - public AutojoinList getJoinlist() { return joinList; } Modified: trunk/crossfire/src/cfeditor/CMainMenu.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainMenu.java 2006-12-10 15:41:34 UTC (rev 1015) +++ trunk/crossfire/src/cfeditor/CMainMenu.java 2006-12-10 15:46:05 UTC (rev 1016) @@ -58,96 +58,92 @@ private AggregateMenuLocation currentmapLocation; - private SimpleMenuLocation menu_analyze; + private JMenu windowMenu; - private JMenu menu_window; + private SimpleMenuEntry close; - private SimpleMenuEntry m_close; + private SimpleMenuEntry revert; - private SimpleMenuEntry m_revert; + private SimpleMenuEntry save; - private SimpleMenuEntry m_save; + private SimpleMenuEntry saveAs; - private SimpleMenuEntry m_saveAs; + private SimpleMenuEntry createImg; - private SimpleMenuEntry m_createImg; + private SimpleMenuEntry collectArch; - private SimpleMenuEntry m_collectArch; + private SimpleMenuEntry spellC; - private SimpleMenuEntry m_spellC; + private SimpleMenuEntry viewTreasure; - private SimpleMenuEntry m_viewTreasure; + private CheckBoxMenuEntry autojoin; - private JMenuItem m_scriptMenu; + private CheckBoxMenuEntry gridToggle; - private CheckBoxMenuEntry m_autojoin; + private SimpleMenuEntry properties; - private CheckBoxMenuEntry m_gridToggle; + private SimpleMenuEntry enterExit; - private SimpleMenuEntry m_properties; + private SimpleMenuEntry enterNorth; - private SimpleMenuEntry m_enterExit; + private SimpleMenuEntry enterEast; - private SimpleMenuEntry m_enterNorth; + private SimpleMenuEntry enterWest; - private SimpleMenuEntry m_enterEast; + private SimpleMenuEntry enterSouth; - private SimpleMenuEntry m_enterWest; + private SimpleMenuEntry enterUpper; - private SimpleMenuEntry m_enterSouth; + private SimpleMenuEntry enterLower; - private SimpleMenuEntry m_enterUpper; + private CheckBoxMenuEntry showTiles; - private SimpleMenuEntry m_enterLower; + private CheckBoxMenuEntry lockPickmaps; - private CheckBoxMenuEntry m_showTiles; + private SimpleMenuEntry newPickmap; - private CheckBoxMenuEntry m_lockPickmaps; + private SimpleMenuEntry deletePickmap; - private SimpleMenuEntry m_newPickmap; + private SimpleMenuEntry loadPickmap; - private SimpleMenuEntry m_deletePickmap; + private SimpleMenuEntry savePickmap; - private SimpleMenuEntry m_loadPickmap; + private SimpleMenuEntry revertPickmap; - private SimpleMenuEntry m_savePickmap; + private SimpleMenuEntry clear; - private SimpleMenuEntry m_revertPickmap; + private SimpleMenuEntry cut; - private SimpleMenuEntry m_clear; + private SimpleMenuEntry copy; - private SimpleMenuEntry m_cut; + private SimpleMenuEntry paste; - private SimpleMenuEntry m_copy; + private SimpleMenuEntry replace; - private SimpleMenuEntry m_paste; + private SimpleMenuEntry fillAbove; - private SimpleMenuEntry m_replace; + private SimpleMenuEntry fillBelow; - private SimpleMenuEntry m_fill_above; + private CheckBoxMenuEntry monster; - private SimpleMenuEntry m_fill_below; + private CheckBoxMenuEntry exit; - private CheckBoxMenuEntry se_monster; + private CheckBoxMenuEntry background; - private CheckBoxMenuEntry se_exit; + private CheckBoxMenuEntry door; - private CheckBoxMenuEntry se_background; + private CheckBoxMenuEntry wall; - private CheckBoxMenuEntry se_door; + private CheckBoxMenuEntry equip; - private CheckBoxMenuEntry se_wall; + private CheckBoxMenuEntry treasure; - private CheckBoxMenuEntry se_equip; + private CheckBoxMenuEntry connected; - private CheckBoxMenuEntry se_treasure; + private JMenuItem newWindow; - private CheckBoxMenuEntry se_connected; + private JMenuItem closeAll; - private JMenuItem m_newWindow; - - private JMenuItem m_closeAll; - /*private JCheckBoxMenuItem[] m_analyze_show_filters; private JCheckBoxMenuItem m_analyze_show_activate; private JCheckBoxMenuItem m_analyze_show_invert; @@ -190,14 +186,14 @@ } private void buildCurrentMapMenu() { - currentmapLocation.addMenuEntry(m_save); - currentmapLocation.addMenuEntry(m_saveAs); - currentmapLocation.addMenuEntry(m_createImg); - currentmapLocation.addMenuEntry(m_revert); - currentmapLocation.addMenuEntry(m_autojoin); - currentmapLocation.addMenuEntry(m_properties); - currentmapLocation.addMenuEntry(m_fill_above); - currentmapLocation.addMenuEntry(m_fill_below); + currentmapLocation.addMenuEntry(save); + currentmapLocation.addMenuEntry(saveAs); + currentmapLocation.addMenuEntry(createImg); + currentmapLocation.addMenuEntry(revert); + currentmapLocation.addMenuEntry(autojoin); + currentmapLocation.addMenuEntry(properties); + currentmapLocation.addMenuEntry(fillAbove); + currentmapLocation.addMenuEntry(fillBelow); } /** @@ -205,123 +201,123 @@ */ private void buildFileMenu() { final MenuManager menuManager = MenuManager.getMenuManager(); - final SimpleMenuLocation menu_file = new SimpleMenuLocation("main.file"); - menuManager.addMenuLocation(menu_file); - mainLocation.addMenuLocation(menu_file); + final SimpleMenuLocation fileMenu = new SimpleMenuLocation("main.file"); + menuManager.addMenuLocation(fileMenu); + mainLocation.addMenuLocation(fileMenu); final LocationMenuEntry entry = new LocationMenuEntry("main.file", "File"); menuManager.addMenuEntry("main", entry); entry.setMnemonic('F'); - final SimpleMenuEntry m_new = new SimpleMenuEntry("New..."); - m_new.setIcon(CGUIUtils.getIcon(IGUIConstants.NEW_LEVEL_SMALLICON)); - m_new.setMnemonic('N'); - m_new.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, Event.CTRL_MASK)); - m_new.addActionListener( + final SimpleMenuEntry newME = new SimpleMenuEntry("New..."); + newME.setIcon(CGUIUtils.getIcon(IGUIConstants.NEW_LEVEL_SMALLICON)); + newME.setMnemonic('N'); + newME.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, Event.CTRL_MASK)); + newME.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.createNew(); } }); - menuManager.addMenuEntry("main.file", m_new); + menuManager.addMenuEntry("main.file", newME); - final SimpleMenuEntry m_open = new SimpleMenuEntry("Open..."); - m_open.setIcon(CGUIUtils.getIcon(IGUIConstants.OPEN_LEVEL_SMALLICON)); - m_open.setMnemonic('O'); - m_open.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, Event.CTRL_MASK)); - m_open.addActionListener( + final SimpleMenuEntry open = new SimpleMenuEntry("Open..."); + open.setIcon(CGUIUtils.getIcon(IGUIConstants.OPEN_LEVEL_SMALLICON)); + open.setMnemonic('O'); + open.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, Event.CTRL_MASK)); + open.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.open(); } }); - menuManager.addMenuEntry("main.file", m_open); + menuManager.addMenuEntry("main.file", open); - m_close = new SimpleMenuEntry("Close"); - m_close.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); - m_close.setMnemonic('C'); - m_close.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F4, Event.CTRL_MASK)); - m_close.addActionListener( + close = new SimpleMenuEntry("Close"); + close.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); + close.setMnemonic('C'); + close.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F4, Event.CTRL_MASK)); + close.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.close(); } }); - menuManager.addMenuEntry("main.file", m_close); + menuManager.addMenuEntry("main.file", close); menuManager.addMenuEntry("main.file", SimpleMenuEntry.getSeparator()); - m_save = new SimpleMenuEntry("Save"); - m_save.setIcon(CGUIUtils.getIcon(IGUIConstants.SAVE_LEVEL_SMALLICON)); - m_save.setMnemonic('S'); - m_save.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, Event.CTRL_MASK)); - m_save.addActionListener( + save = new SimpleMenuEntry("Save"); + save.setIcon(CGUIUtils.getIcon(IGUIConstants.SAVE_LEVEL_SMALLICON)); + save.setMnemonic('S'); + save.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, Event.CTRL_MASK)); + save.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.save(); } }); - menuManager.addMenuEntry("main.file", m_save); + menuManager.addMenuEntry("main.file", save); - m_saveAs = new SimpleMenuEntry("Save as..."); - m_saveAs.setIcon(CGUIUtils.getIcon(IGUIConstants.SAVE_LEVEL_AS_SMALLICON)); - m_saveAs.setMnemonic('A'); - m_saveAs.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_A, Event.CTRL_MASK)); - m_saveAs.addActionListener( + saveAs = new SimpleMenuEntry("Save as..."); + saveAs.setIcon(CGUIUtils.getIcon(IGUIConstants.SAVE_LEVEL_AS_SMALLICON)); + saveAs.setMnemonic('A'); + saveAs.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_A, Event.CTRL_MASK)); + saveAs.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.saveAs(); } }); - menuManager.addMenuEntry("main.file", m_saveAs); + menuManager.addMenuEntry("main.file", saveAs); - m_revert = new SimpleMenuEntry("Revert"); - m_revert.setMnemonic('R'); - m_revert.setIcon(CGUIUtils.getIcon(IGUIConstants.REVERT_ICON)); - m_revert.addActionListener( + revert = new SimpleMenuEntry("Revert"); + revert.setMnemonic('R'); + revert.setIcon(CGUIUtils.getIcon(IGUIConstants.REVERT_ICON)); + revert.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.revert(); } }); - menuManager.addMenuEntry("main.file", m_revert); + menuManager.addMenuEntry("main.file", revert); - m_createImg = new SimpleMenuEntry("Create image"); - m_createImg.setMnemonic('I'); - m_createImg.setIcon(CGUIUtils.getIcon(IGUIConstants.CREATE_IMAGE_SMALLICON)); - m_createImg.addActionListener( + createImg = new SimpleMenuEntry("Create image"); + createImg.setMnemonic('I'); + createImg.setIcon(CGUIUtils.getIcon(IGUIConstants.CREATE_IMAGE_SMALLICON)); + createImg.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.createImg(); } }); - menuManager.addMenuEntry("main.file", m_createImg); + menuManager.addMenuEntry("main.file", createImg); menuManager.addMenuEntry("main.file", SimpleMenuEntry.getSeparator()); - final SimpleMenuEntry m_options = new SimpleMenuEntry("Options..."); - m_options.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); - m_options.setMnemonic('P'); - m_options.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, Event.ALT_MASK)); - m_options.addActionListener( + final SimpleMenuEntry options = new SimpleMenuEntry("Options..."); + options.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); + options.setMnemonic('P'); + options.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, Event.ALT_MASK)); + options.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.options(); } }); - menuManager.addMenuEntry("main.file", m_options); + menuManager.addMenuEntry("main.file", options); menuManager.addMenuEntry("main.file", SimpleMenuEntry.getSeparator()); - final SimpleMenuEntry m_exit = new SimpleMenuEntry("Exit"); - m_exit.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); - m_exit.setMnemonic('X'); - m_exit.addActionListener( + final SimpleMenuEntry exit = new SimpleMenuEntry("Exit"); + exit.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); + exit.setMnemonic('X'); + exit.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.exit(); } }); - menuManager.addMenuEntry("main.file", m_exit); + menuManager.addMenuEntry("main.file", exit); add(entry.getMenuBarComponent()); } @@ -330,129 +326,129 @@ */ private void buildEditMenu() { final MenuManager menuManager = MenuManager.getMenuManager(); - final SimpleMenuLocation menu_edit = new SimpleMenuLocation("main.edit"); - mainLocation.addMenuLocation(menu_edit); - menuManager.addMenuLocation(menu_edit); + final SimpleMenuLocation editMenu = new SimpleMenuLocation("main.edit"); + mainLocation.addMenuLocation(editMenu); + menuManager.addMenuLocation(editMenu); final LocationMenuEntry entry = new LocationMenuEntry("main.edit", "Edit"); menuManager.addMenuEntry("main", entry); entry.setMnemonic('E'); // Clear: - m_clear = new SimpleMenuEntry("Clear"); - m_clear.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); - m_clear.addActionListener(new ActionListener() { + clear = new SimpleMenuEntry("Clear"); + clear.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); + clear.addActionListener(new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.clear(); } }); - menuManager.addMenuEntry("main.edit", m_clear); + menuManager.addMenuEntry("main.edit", clear); // Cut: - m_cut = new SimpleMenuEntry("Cut"); - m_cut.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); - m_cut.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.CTRL_MASK)); - m_cut.addActionListener( + cut = new SimpleMenuEntry("Cut"); + cut.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); + cut.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.CTRL_MASK)); + cut.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.cut(); } }); - menuManager.addMenuEntry("main.edit", m_cut); + menuManager.addMenuEntry("main.edit", cut); // Copy: - m_copy = new SimpleMenuEntry("Copy"); - m_copy.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); - m_copy.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, Event.CTRL_MASK)); - m_copy.addActionListener( + copy = new SimpleMenuEntry("Copy"); + copy.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); + copy.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, Event.CTRL_MASK)); + copy.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.copy(); } }); - menuManager.addMenuEntry("main.edit", m_copy); + menuManager.addMenuEntry("main.edit", copy); // Paste: - m_paste = new SimpleMenuEntry("Paste"); - m_paste.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); - m_paste.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, Event.CTRL_MASK)); - m_paste.addActionListener( + paste = new SimpleMenuEntry("Paste"); + paste.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); + paste.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, Event.CTRL_MASK)); + paste.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.paste(); } }); - menuManager.addMenuEntry("main.edit", m_paste); + menuManager.addMenuEntry("main.edit", paste); menuManager.addMenuEntry("main.edit", SimpleMenuEntry.getSeparator()); // Replace: - m_replace = new SimpleMenuEntry("Replace"); - m_replace.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); - m_replace.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_R, Event.CTRL_MASK)); - m_replace.addActionListener( + replace = new SimpleMenuEntry("Replace"); + replace.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); + replace.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_R, Event.CTRL_MASK)); + replace.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.replace(); } }); - menuManager.addMenuEntry("main.edit", m_replace); + menuManager.addMenuEntry("main.edit", replace); // Fill: - m_fill_above = new SimpleMenuEntry("Fill Above"); - m_fill_above.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); - m_fill_above.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F, Event.CTRL_MASK)); - m_fill_above.addActionListener( + fillAbove = new SimpleMenuEntry("Fill Above"); + fillAbove.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); + fillAbove.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F, Event.CTRL_MASK)); + fillAbove.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.fillAbove(); } }); - menuManager.addMenuEntry("main.edit", m_fill_above); + menuManager.addMenuEntry("main.edit", fillAbove); // Fill: - m_fill_below = new SimpleMenuEntry("Fill Below"); - m_fill_below.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); - m_fill_below.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F, Event.CTRL_MASK | Event.SHIFT_MASK)); - m_fill_below.addActionListener( + fillBelow = new SimpleMenuEntry("Fill Below"); + fillBelow.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); + fillBelow.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F, Event.CTRL_MASK | Event.SHIFT_MASK)); + fillBelow.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.fillBelow(); } }); - menuManager.addMenuEntry("main.edit", m_fill_below); + menuManager.addMenuEntry("main.edit", fillBelow); // Random Fill: - final SimpleMenuEntry m_rand_fill_above = new SimpleMenuEntry("Random Fill Above"); - m_rand_fill_above.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); - m_rand_fill_above.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_D, Event.CTRL_MASK)); - m_rand_fill_above.addActionListener( + final SimpleMenuEntry randFillAbove = new SimpleMenuEntry("Random Fill Above"); + randFillAbove.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); + randFillAbove.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_D, Event.CTRL_MASK)); + randFillAbove.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.randFillAbove(); } }); - menuManager.addMenuEntry("main.edit", m_rand_fill_above); + menuManager.addMenuEntry("main.edit", randFillAbove); // Random Fill: - final SimpleMenuEntry m_rand_fill_below = new SimpleMenuEntry("Random Fill Below"); - m_rand_fill_below.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); - m_rand_fill_below.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_D, Event.CTRL_MASK | Event.SHIFT_MASK)); - m_rand_fill_below.addActionListener( + final SimpleMenuEntry randFillBelow = new SimpleMenuEntry("Random Fill Below"); + randFillBelow.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); + randFillBelow.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_D, Event.CTRL_MASK | Event.SHIFT_MASK)); + randFillBelow.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.randFillBelow(); } }); - menuManager.addMenuEntry("main.edit", m_rand_fill_below); + menuManager.addMenuEntry("main.edit", randFillBelow); add(entry.getMenuBarComponent()); } private void buildViewMenu() { final MenuManager menuManager = MenuManager.getMenuManager(); - final SimpleMenuLocation menu_view = new SimpleMenuLocation("main.view"); - mainLocation.addMenuLocation(menu_view); - menuManager.addMenuLocation(menu_view); + final SimpleMenuLocation viewMenu = new SimpleMenuLocation("main.view"); + mainLocation.addMenuLocation(viewMenu); + menuManager.addMenuLocation(viewMenu); final LocationMenuEntry entry = new LocationMenuEntry("main.view", "View"); menuManager.addMenuEntry("main", entry); entry.setMnemonic('V'); @@ -478,12 +474,12 @@ menuManager.addMenuEntry("main.view", SimpleMenuEntry.getSeparator()); - se_monster = new CheckBoxMenuEntry("Show Monsters"); - se_monster.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_MONSTER)); - se_monster.addActionListener( + monster = new CheckBoxMenuEntry("Show Monsters"); + monster.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_MONSTER)); + monster.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - if (se_monster.isChecked()) { + if (monster.isChecked()) { mainControl.selectEditType(IGUIConstants.TILE_EDIT_MONSTER); } else { mainControl.unsetTileEdit(IGUIConstants.TILE_EDIT_MONSTER); @@ -491,14 +487,14 @@ mainControl.refreshCurrentMap(); } }); - menuManager.addMenuEntry("main.view", se_monster); + menuManager.addMenuEntry("main.view", monster); - se_exit = new CheckBoxMenuEntry("Show Exits"); - se_exit.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_EXIT)); - se_exit.addActionListener( + exit = new CheckBoxMenuEntry("Show Exits"); + exit.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_EXIT)); + exit.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - if (se_exit.isChecked()) { + if (exit.isChecked()) { mainControl.selectEditType(IGUIConstants.TILE_EDIT_EXIT); } else { mainControl.unsetTileEdit(IGUIConstants.TILE_EDIT_EXIT); @@ -506,14 +502,14 @@ mainControl.refreshCurrentMap(); } }); - menuManager.addMenuEntry("main.view", se_exit); + menuManager.addMenuEntry("main.view", exit); - se_background = new CheckBoxMenuEntry("Show Background"); - se_background.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_BACKGROUND)); - se_background.addActionListener( + background = new CheckBoxMenuEntry("Show Background"); + background.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_BACKGROUND)); + background.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - if (se_background.isChecked()) { + if (background.isChecked()) { mainControl.selectEditType(IGUIConstants.TILE_EDIT_BACKGROUND); } else { mainControl.unsetTileEdit(IGUIConstants.TILE_EDIT_BACKGROUND); @@ -521,14 +517,14 @@ mainControl.refreshCurrentMap(); } }); - menuManager.addMenuEntry("main.view", se_background); + menuManager.addMenuEntry("main.view", background); - se_door = new CheckBoxMenuEntry("Show Doors & Keys"); - se_door.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_DOOR)); - se_door.addActionListener( + door = new CheckBoxMenuEntry("Show Doors & Keys"); + door.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_DOOR)); + door.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - if (se_door.isChecked()) { + if (door.isChecked()) { mainControl.selectEditType(IGUIConstants.TILE_EDIT_DOOR); } else { mainControl.unsetTileEdit(IGUIConstants.TILE_EDIT_DOOR); @@ -536,13 +532,13 @@ mainControl.refreshCurrentMap(); } }); - menuManager.addMenuEntry("main.view", se_door); - se_wall = new CheckBoxMenuEntry("Show Wall"); - se_wall.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_WALL)); - se_wall.addActionListener( + menuManager.addMenuEntry("main.view", door); + wall = new CheckBoxMenuEntry("Show Wall"); + wall.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_WALL)); + wall.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - if (se_wall.isChecked()) { + if (wall.isChecked()) { mainControl.selectEditType(IGUIConstants.TILE_EDIT_WALL); } else { mainControl.unsetTileEdit(IGUIConstants.TILE_EDIT_WALL); @@ -550,13 +546,13 @@ mainControl.refreshCurrentMap(); } }); - menuManager.addMenuEntry("main.view", se_wall); - se_equip = new CheckBoxMenuEntry("Show Equipment"); - se_equip.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_EQUIP)); - se_equip.addActionListener( + menuManager.addMenuEntry("main.view", wall); + equip = new CheckBoxMenuEntry("Show Equipment"); + equip.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_EQUIP)); + equip.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - if (se_equip.isChecked()) { + if (equip.isChecked()) { mainControl.selectEditType(IGUIConstants.TILE_EDIT_EQUIP); } else { mainControl.unsetTileEdit(IGUIConstants.TILE_EDIT_EQUIP); @@ -564,13 +560,13 @@ mainControl.refreshCurrentMap(); } }); - menuManager.addMenuEntry("main.view", se_equip); - se_treasure = new CheckBoxMenuEntry("Show Treasure"); - se_treasure.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_TREASURE)); - se_treasure.addActionListener( + menuManager.addMenuEntry("main.view", equip); + treasure = new CheckBoxMenuEntry("Show Treasure"); + treasure.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_TREASURE)); + treasure.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - if (se_treasure.isChecked()) { + if (treasure.isChecked()) { mainControl.selectEditType(IGUIConstants.TILE_EDIT_TREASURE); } else { mainControl.unsetTileEdit(IGUIConstants.TILE_EDIT_TREASURE); @@ -578,13 +574,13 @@ mainControl.refreshCurrentMap(); } }); - menuManager.addMenuEntry("main.view", se_treasure); - se_connected = new CheckBoxMenuEntry("Show Connected"); - se_connected.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_CONNECTED)); - se_connected.addActionListener( + menuManager.addMenuEntry("main.view", treasure); + connected = new CheckBoxMenuEntry("Show Connected"); + connected.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_CONNECTED)); + connected.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - if (se_connected.isChecked()) { + if (connected.isChecked()) { mainControl.selectEditType(IGUIConstants.TILE_EDIT_CONNECTED); } else { mainControl.unsetTileEdit(IGUIConstants.TILE_EDIT_CONNECTED); @@ -592,311 +588,311 @@ mainControl.refreshCurrentMap(); } }); - menuManager.addMenuEntry("main.view", se_connected); + menuManager.addMenuEntry("main.view", connected); menuManager.addMenuEntry("main.view", SimpleMenuEntry.getSeparator()); - final SimpleMenuEntry m_show_all = new SimpleMenuEntry("Reset View"); - m_show_all.addActionListener( + final SimpleMenuEntry showAll = new SimpleMenuEntry("Reset View"); + showAll.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { // set tileEdit to zero (-> show all) mainControl.setTileEdit(0); - se_monster.setChecked(false); - se_exit.setChecked(false); - se_background.setChecked(false); - se_door.setChecked(false); - se_wall.setChecked(false); - se_equip.setChecked(false); - se_treasure.setChecked(false); - se_connected.setChecked(false); + monster.setChecked(false); + exit.setChecked(false); + background.setChecked(false); + door.setChecked(false); + wall.setChecked(false); + equip.setChecked(false); + treasure.setChecked(false); + connected.setChecked(false); mainControl.refreshCurrentMap(); // redraw map } }); - menuManager.addMenuEntry("main.view", m_show_all); + menuManager.addMenuEntry("main.view", showAll); add(entry.getMenuBarComponent()); } private void buildMapMenu() { - final SimpleMenuLocation menu_map = new SimpleMenuLocation("main.map"); + final SimpleMenuLocation mapMenu = new SimpleMenuLocation("main.map"); final LocationMenuEntry entry = new LocationMenuEntry("main.map", "Map"); final MenuManager menuManager = MenuManager.getMenuManager(); - menuManager.addMenuLocation(menu_map); - mainLocation.addMenuLocation(menu_map); + menuManager.addMenuLocation(mapMenu); + mainLocation.addMenuLocation(mapMenu); entry.setMnemonic('M'); menuManager.addMenuEntry("main", entry); - m_autojoin = new CheckBoxMenuEntry("Auto-Joining"); - m_autojoin.setMnemonic('A'); - m_autojoin.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_J, Event.CTRL_MASK)); - m_autojoin.setChecked(mainControl.getAutojoin()); - m_autojoin.addActionListener( + autojoin = new CheckBoxMenuEntry("Auto-Joining"); + autojoin.setMnemonic('A'); + autojoin.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_J, Event.CTRL_MASK)); + autojoin.setChecked(mainControl.getAutojoin()); + autojoin.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { // toggle autojoining state on/off - mainControl.setAutojoin(m_autojoin.isChecked()); + mainControl.setAutojoin(autojoin.isChecked()); } }); - menuManager.addMenuEntry("main.map", m_autojoin); + menuManager.addMenuEntry("main.map", autojoin); menuManager.addMenuEntry("main.map", SimpleMenuEntry.getSeparator()); - m_gridToggle = new CheckBoxMenuEntry("Show Grid"); - m_gridToggle.setMnemonic('G'); - m_gridToggle.setChecked(mainControl.isGridVisible()); + gridToggle = new CheckBoxMenuEntry("Show Grid"); + gridToggle.setMnemonic('G'); + gridToggle.setChecked(mainControl.isGridVisible()); - m_gridToggle.addActionListener( + gridToggle.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.setGridVisible(m_gridToggle.isChecked()); + mainControl.setGridVisible(gridToggle.isChecked()); } }); - menuManager.addMenuEntry("main.map", m_gridToggle); + menuManager.addMenuEntry("main.map", gridToggle); - m_enterExit = new SimpleMenuEntry("Enter Exit"); - m_enterExit.setMnemonic('E'); - m_enterExit.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_E, Event.CTRL_MASK)); - m_enterExit.addActionListener( + enterExit = new SimpleMenuEntry("Enter Exit"); + enterExit.setMnemonic('E'); + enterExit.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_E, Event.CTRL_MASK)); + enterExit.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.enterExit(); } }); - menuManager.addMenuEntry("main.map", m_enterExit); + menuManager.addMenuEntry("main.map", enterExit); menuManager.addMenuEntry("main.map", SimpleMenuEntry.getSeparator()); - m_enterNorth = new SimpleMenuEntry("Enter North Map"); - m_enterNorth.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_UP, Event.CTRL_MASK)); - m_enterNorth.addActionListener( + enterNorth = new SimpleMenuEntry("Enter North Map"); + enterNorth.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_UP, Event.CTRL_MASK)); + enterNorth.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.enterTileWanted(IGUIConstants.NORTH); } }); - menuManager.addMenuEntry("main.map", m_enterNorth); + menuManager.addMenuEntry("main.map", enterNorth); - m_enterEast = new SimpleMenuEntry("Enter East Map"); - m_enterEast.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, Event.CTRL_MASK)); - m_enterEast.addActionListener( + enterEast = new SimpleMenuEntry("Enter East Map"); + enterEast.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, Event.CTRL_MASK)); + enterEast.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.enterTileWanted(IGUIConstants.EAST); } }); - menuManager.addMenuEntry("main.map", m_enterEast); + menuManager.addMenuEntry("main.map", enterEast); - m_enterSouth = new SimpleMenuEntry("Enter South Map"); - m_enterSouth.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, Event.CTRL_MASK)); - m_enterSouth.addActionListener( + enterSouth = new SimpleMenuEntry("Enter South Map"); + enterSouth.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, Event.CTRL_MASK)); + enterSouth.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.enterTileWanted(IGUIConstants.SOUTH); } }); - menuManager.addMenuEntry("main.map", m_enterSouth); + menuManager.addMenuEntry("main.map", enterSouth); - m_enterWest = new SimpleMenuEntry("Enter West Map"); - m_enterWest.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, Event.CTRL_MASK)); - m_enterWest.addActionListener( + enterWest = new SimpleMenuEntry("Enter West Map"); + enterWest.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, Event.CTRL_MASK)); + enterWest.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.enterTileWanted(IGUIConstants.WEST); } }); - menuManager.addMenuEntry("main.map", m_enterWest); + menuManager.addMenuEntry("main.map", enterWest); - m_enterUpper = new SimpleMenuEntry("Enter Upper Map"); - m_enterUpper.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, Event.CTRL_MASK)); - m_enterUpper.addActionListener( + enterUpper = new SimpleMenuEntry("Enter Upper Map"); + enterUpper.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, Event.CTRL_MASK)); + enterUpper.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.enterTileWanted(IGUIConstants.TOP); } }); - menuManager.addMenuEntry("main.map", m_enterUpper); + menuManager.addMenuEntry("main.map", enterUpper); - m_enterLower = new SimpleMenuEntry("Enter Lower Map"); - m_enterLower.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, Event.CTRL_MASK)); - m_enterLower.addActionListener( + enterLower = new SimpleMenuEntry("Enter Lower Map"); + enterLower.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, Event.CTRL_MASK)); + enterLower.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.enterTileWanted(IGUIConstants.BOTTOM); } }); - menuManager.addMenuEntry("main.map", m_enterLower); + menuManager.addMenuEntry("main.map", enterLower); menuManager.addMenuEntry("main.map", SimpleMenuEntry.getSeparator()); - m_showTiles = new CheckBoxMenuEntry("Show Tiles around"); - m_showTiles.addActionListener( + showTiles = new CheckBoxMenuEntry("Show Tiles around"); + showTiles.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.toggleShowTiles(); } }); - menuManager.addMenuEntry("main.map", m_showTiles); + menuManager.addMenuEntry("main.map", showTiles); menuManager.addMenuEntry("main.map", SimpleMenuEntry.getSeparator()); - m_properties = new SimpleMenuEntry("Map Properties"); - m_properties.setMnemonic('P'); - m_properties.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M, Event.CTRL_MASK)); - m_properties.addActionListener( + properties = new SimpleMenuEntry("Map Properties"); + properties.setMnemonic('P'); + properties.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M, Event.CTRL_MASK)); + properties.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { mainControl.mapProperties(); } }); - menuManager.addMenuEntry("main.map", m_properties); + menuManager.addMenuEntry("main.map", properties); add(entry.getMenuBarComponent()); } private void buildPickmapsMenu() { - final SimpleMenuLocation menu_pickmaps = new SimpleMenuLocation("main.pickmaps"); + final SimpleMenuLocation pickmapsMenu = new SimpleMenuLocation("main.pickmaps"); final LocationMenuEntry entry = new LocationMenuEntry("main.pickmaps", "Pickmaps"); final MenuManager menuManager = MenuManager.getMenuManager(); - mainLocation.addMenuLocation(menu_pickmaps); - menuManager.addMenuLocation(menu_pickmaps); + mainLocation.addMenuLocation(pickmapsMenu); + menuManager.addMenuLocation(pickmapsMenu); entry.setMnemonic('P'); menuManager.addMenuEntry("main", entry); - m_lockPickmaps = new CheckBoxMenuEntry("Lock All Pickmaps"); - m_lockPickmaps.setMnemonic('L'); - m_lockPickmaps.setChecked(Boolean.valueOf(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty( + lockPickmaps = new CheckBoxMenuEntry("Lock All Pickmaps"); + lockPickmaps.setMnemonic('L'); + lockPickmaps.setChecked(Boolean.valueOf(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty( CMainControl.PICKMAPS_LOCKED, "false"))); - m_lockPickmaps.addActionListener( + lockPickmaps.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { // lock pickmaps - mainControl.setLockAllPickmaps(m_lockPickmaps.isChecked()); - m_newPickmap.setEnabled(!m_lockPickmaps.isChecked()); + mainControl.setLockAllPickmaps(lockPickmaps.isChecked()); + newPickmap.setEnabled(!lockPickmaps.isChecked()); final boolean isArchLoadComplete = mainControl.getArchetypeSet().getLoadStatus() == ArchetypeSet.LoadStatus.COMPLETE; if (isArchLoadComplete) { - m_deletePickmap.setEnabled(!m_lockPickmaps.isChecked()); - m_loadPickmap.setEnabled(!m_lockPickmaps.isChecked()); - m_savePickmap.setEnabled(!m_lockPickmaps.isChecked()); - m_revertPickmap.setEnabled(!m_lockPickmaps.isChecked()); + deletePickmap.setEnabled(!lockPickmaps.isChecked()); + loadPickmap.setEnabled(!lockPickmaps.isChecked()); + savePickmap.setEnabled(!lockPickmaps.isChecked()); + revertPickmap.setEnabled(!lockPickmaps.isChecked()); } else { - m_deletePickmap.setEnabled(false); - m_loadPickmap.setEnabled(false); - m_savePickmap.setEnabled(false); - m_revertPickmap.setEnabled(false); + deletePickmap.setEnabled(false); + loadPickmap.setEnabled(false); + savePickmap.setEnabled(false); + revertPickmap.setEnabled(false); } // store this in the settings - CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(CMainControl.PICKMAPS_LOCKED, m_lockPickmaps.isChecked() ? "true" : "false"); + CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(CMainControl.PICKMAPS_LOCKED, lockPickmaps.isChecked() ? "true" : "false"); } }); - menuManager.addMenuEntry("main.pickmaps", m_lockPickmaps); + menuManager.addMenuEntry("main.pickmaps", lockPickmaps); menuManager.addMenuEntry("main.pickmaps", SimpleMenuEntry.getSeparator()); - m_newPickmap = new SimpleMenuEntry("Add New Pickmap"); - m_newPickmap.setMnemonic('N'); - m_newPickmap.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); - m_newPickmap.addActionListener( + newPickmap = new SimpleMenuEntry("Add New Pickmap"); + newPickmap.setMnemonic('N'); + newPickmap.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); + newPickmap.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { // create new pickmap mainControl.addNewPickmap(); } }); - menuManager.addMenuEntry("main.pickmaps", m_newPickmap); + menuManager.addMenuEntry("main.pickmaps", newPickmap); - m_deletePickmap = new SimpleMenuEntry("Close Active Pickmap"); - m_deletePickmap.setMnemonic('C'); - m_deletePickmap.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); - m_deletePickmap.addActionListener( + deletePickmap = new SimpleMenuEntry("Close Active Pickmap"); + deletePickmap.setMnemonic('C'); + deletePickmap.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); + deletePickmap.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { // close pickmap mainControl.closePickmap(); } }); - menuManager.addMenuEntry("main.pickmaps", m_deletePickmap); + menuManager.addMenuEntry("main.pickmaps", deletePickmap); menuManager.addMenuEntry("main.pickmaps", SimpleMenuEntry.getSeparator()); - m_loadPickmap = new SimpleMenuEntry("Open Active Pickmap as Map"); - m_loadPickmap.setMnemonic('O'); - m_loadPickmap.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); - m_loadPickmap.addActionListener( + loadPickmap = new SimpleMenuEntry("Open Active Pickmap as Map"); + loadPickmap.setMnemonic('O'); + loadPickmap.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); + loadPickmap.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { // load pickmap as normal map mainControl.openPickmapMap(); } }); - menuManager.addMenuEntry("main.pickmaps", m_loadPickmap); + menuManager.addMenuEntry("main.pickmaps", loadPickmap); - m_savePickmap = new SimpleMenuE... [truncated message content] |
From: <chr...@us...> - 2006-12-10 17:24:30
|
Revision: 1022 http://svn.sourceforge.net/gridarta/?rev=1022&view=rev Author: christianhujer Date: 2006-12-10 09:24:25 -0800 (Sun, 10 Dec 2006) Log Message: ----------- Fixed a memory leak in daimonin. Hopefully also fixed it for crossfire. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainView.java trunk/daimonin/src/daieditor/CMainView.java Modified: trunk/crossfire/src/cfeditor/CMainView.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainView.java 2006-12-10 17:03:05 UTC (rev 1021) +++ trunk/crossfire/src/cfeditor/CMainView.java 2006-12-10 17:24:25 UTC (rev 1022) @@ -531,6 +531,12 @@ mapViews.remove(mapView); mapView.closeNotify(); mapDesktop.remove(mapView); + // This is important: Removing a JInternalFrame from a JDesktopPane doesn't deselect it. + // Thus it will still be referenced. To prevent a closed map from being referenced by Swing, + // we check whether it's selected and if so deselect it. + if (mapDesktop.getSelectedFrame() == mapView) { + mapDesktop.setSelectedFrame(null); + } mapView.dispose(); mapDesktop.repaint(); Modified: trunk/daimonin/src/daieditor/CMainView.java =================================================================== --- trunk/daimonin/src/daieditor/CMainView.java 2006-12-10 17:03:05 UTC (rev 1021) +++ trunk/daimonin/src/daieditor/CMainView.java 2006-12-10 17:24:25 UTC (rev 1022) @@ -494,6 +494,12 @@ mapViews.remove(mapView); mapDesktop.remove(mapView); + // This is important: Removing a JInternalFrame from a JDesktopPane doesn't deselect it. + // Thus it will still be referenced. To prevent a closed map from being referenced by Swing, + // we check whether it's selected and if so deselect it. + if (mapDesktop.getSelectedFrame() == mapView) { + mapDesktop.setSelectedFrame(null); + } mapView.dispose(); mapDesktop.repaint(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-10 19:07:55
|
Revision: 1030 http://svn.sourceforge.net/gridarta/?rev=1030&view=rev Author: christianhujer Date: 2006-12-10 11:07:55 -0800 (Sun, 10 Dec 2006) Log Message: ----------- Hardened policy. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainControl.java trunk/crossfire/src/cfeditor/gameobject/GameObject.java trunk/crossfire/src/cfeditor/map/DefaultMapModel.java trunk/crossfire/src/cfeditor/map/MapModel.java trunk/crossfire/src/cfeditor/menu/MenuHelper.java trunk/daimonin/src/daieditor/gameobject/GameObject.java trunk/daimonin/src/daieditor/map/DefaultMapModel.java trunk/daimonin/src/daieditor/map/MapModel.java trunk/gridarta.ipr Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-10 18:40:10 UTC (rev 1029) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-10 19:07:55 UTC (rev 1030) @@ -1692,6 +1692,7 @@ /** * Runs the garbage collection. */ + @SuppressWarnings({"InstanceMethodNamingConvention"}) public void gc() { System.gc(); refreshMenusAndToolbars(); Modified: trunk/crossfire/src/cfeditor/gameobject/GameObject.java =================================================================== --- trunk/crossfire/src/cfeditor/gameobject/GameObject.java 2006-12-10 18:40:10 UTC (rev 1029) +++ trunk/crossfire/src/cfeditor/gameobject/GameObject.java 2006-12-10 19:07:55 UTC (rev 1030) @@ -420,8 +420,8 @@ return archType; } - public void setArchTypNr(final int type) { - archType = type; + public void setArchTypNr(final int typNr) { + archType = typNr; } /* Set the default face. Number is index of face list */ Modified: trunk/crossfire/src/cfeditor/map/DefaultMapModel.java =================================================================== --- trunk/crossfire/src/cfeditor/map/DefaultMapModel.java 2006-12-10 18:40:10 UTC (rev 1029) +++ trunk/crossfire/src/cfeditor/map/DefaultMapModel.java 2006-12-10 19:07:55 UTC (rev 1030) @@ -256,7 +256,7 @@ } /** {@inheritDoc} */ - public boolean insertArchToMap(GameObject newArch, String archName, final GameObject next, final Point pos, final boolean join) { + public boolean insertArchToMap(GameObject newObject, String archName, final GameObject next, final Point pos, final boolean join) { // map coords must be valid if (!isPointValid(pos)) { return false; @@ -265,20 +265,20 @@ if (next == null || !next.isInContainer()) { // put arch on the map - if (newArch == null || newArch.isArchetype()) { + if (newObject == null || newObject.isArchetype()) { // just make sure we never insert an uninitialized default arch from the stack - if (newArch != null && newArch.isArchetype()) { - archName = newArch.getArchetypeName(); + if (newObject != null && newObject.isArchetype()) { + archName = newObject.getArchetypeName(); } // insert a new instance of the default arch (number 'archName') if (!addArchToMap(archName, pos, true, join, false)) { return false; } } else { - // insert the given 'newArch' (multis not allowed here yet - sorry) - if (!newArch.isMulti()) { - newArch = newArch.createClone(pos.x, pos.y); // create a clone - addGameObjectToMap(newArch, false); // insert it to the map + // insert the given 'newObject' (multis not allowed here yet - sorry) + if (!newObject.isMulti()) { + newObject = newObject.createClone(pos.x, pos.y); // create a clone + addGameObjectToMap(newObject, false); // insert it to the map } else { return false; // tried to insert multi (probably from pickmap) } @@ -298,16 +298,16 @@ } else { // insert the new arch into the inventory of a map arch final GameObject invnew; // new arch to be inserted - if (newArch == null || newArch.isArchetype()) { - if (newArch != null && newArch.isArchetype()) { - archName = newArch.getArchetypeName(); + if (newObject == null || newObject.isArchetype()) { + if (newObject != null && newObject.isArchetype()) { + archName = newObject.getArchetypeName(); } // create a new copy of a default arch invnew = getArchetype(archName).createArch(); } else { // create clone from a pickmap - if (!newArch.isMulti()) { - invnew = newArch.createClone(pos.x, pos.y); + if (!newObject.isMulti()) { + invnew = newObject.createClone(pos.x, pos.y); } else { return false; } Modified: trunk/crossfire/src/cfeditor/map/MapModel.java =================================================================== --- trunk/crossfire/src/cfeditor/map/MapModel.java 2006-12-10 18:40:10 UTC (rev 1029) +++ trunk/crossfire/src/cfeditor/map/MapModel.java 2006-12-10 19:07:55 UTC (rev 1030) @@ -54,14 +54,14 @@ /** * Insert a new arch to the map at a specified position. This function * allows either to choose from the default arches (->archName) or to insert - * a copy from an existing arch (->newarch). It also works for + * a copy from an existing arch (->newObject). It also works for * container-inventory. - * @param newarch A clone copy of this GameObject gets inserted to the map. + * @param newObject A clone copy of this GameObject gets inserted to the map. * It can be an arch directly from a pickmap or even a - * default arch. if ('newarch'==null) the default arch + * default arch. if ('newObject'==null) the default arch * 'archName' gets inserted * @param archName Name of a default arch to get inserted. This value gets - * used ONLY when 'newarch' is null + * used ONLY when 'newObject' is null * @param next the new arch gets inserted before 'next' if * ('next'==null) the arch gets inserted at bottom * -> 'next' must be an arch from the map! (or null) @@ -69,7 +69,7 @@ * @param join if set to JOIN_ENABLE auto-joining is supported * @return true if insertion was successful */ - boolean insertArchToMap(GameObject newarch, String archName, GameObject next, Point pos, boolean join); + boolean insertArchToMap(GameObject newObject, String archName, GameObject next, Point pos, boolean join); /** * Delete an existing arch from the map. (If the specified arch doesn't Modified: trunk/crossfire/src/cfeditor/menu/MenuHelper.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/MenuHelper.java 2006-12-10 18:40:10 UTC (rev 1029) +++ trunk/crossfire/src/cfeditor/menu/MenuHelper.java 2006-12-10 19:07:55 UTC (rev 1030) @@ -22,11 +22,11 @@ * @return the newly created JMenuBar */ public static JMenuBar getLocationBar(final MenuLocation location) { - final JMenuBar bar = new JMenuBar(); + final JMenuBar menuBar = new JMenuBar(); final Set s = location.getMenuEntries(); for (final Object value : s) { - bar.add(((MenuEntry) value).getMenuBarComponent()); + menuBar.add(((MenuEntry) value).getMenuBarComponent()); } - return bar; + return menuBar; } } Modified: trunk/daimonin/src/daieditor/gameobject/GameObject.java =================================================================== --- trunk/daimonin/src/daieditor/gameobject/GameObject.java 2006-12-10 18:40:10 UTC (rev 1029) +++ trunk/daimonin/src/daieditor/gameobject/GameObject.java 2006-12-10 19:07:55 UTC (rev 1030) @@ -373,8 +373,8 @@ return null; } - public void setArchTypNr(final int type) { - archType = type; + public void setArchTypNr(final int typNr) { + archType = typNr; } /** {@inheritDoc} */ Modified: trunk/daimonin/src/daieditor/map/DefaultMapModel.java =================================================================== --- trunk/daimonin/src/daieditor/map/DefaultMapModel.java 2006-12-10 18:40:10 UTC (rev 1029) +++ trunk/daimonin/src/daieditor/map/DefaultMapModel.java 2006-12-10 19:07:55 UTC (rev 1030) @@ -32,7 +32,6 @@ import java.awt.Point; import java.awt.Toolkit; import java.util.List; -import net.sf.gridarta.gameobject.Archetype; import net.sf.gridarta.map.AbstractMapModel; import net.sf.gridarta.map.MapSquare; import net.sf.japi.swing.ActionFactory; @@ -171,7 +170,7 @@ * {@inheritDoc} * @xxx I'm too complex */ - public boolean insertArchToMap(GameObject newArch, String archName, final GameObject next, final Point pos) { + public boolean insertArchToMap(GameObject newObject, String archName, final GameObject next, final Point pos) { // map coords must be valid if (!isPointValid(pos)) { return false; @@ -180,20 +179,20 @@ if (next == null || !next.isInContainer()) { // put arch on the map - if (newArch == null || newArch.isArchetype()) { + if (newObject == null || newObject.isArchetype()) { // just make sure we never insert an uninitialized default arch from the stack - if (newArch != null && newArch.isArchetype()) { - archName = newArch.getArchetypeName(); + if (newObject != null && newObject.isArchetype()) { + archName = newObject.getArchetypeName(); } // insert a new instance of the default arch (number 'archName') if (!addArchToMap(archName, pos, true, false)) { return false; } } else { - // insert the given 'newArch' (multis not allowed here yet - sorry) - if (!newArch.isMulti()) { - newArch = newArch.createClone(pos.x, pos.y); // create a clone - addGameObjectToMap(newArch, false); // insert it to the map + // insert the given 'newObject' (multis not allowed here yet - sorry) + if (!newObject.isMulti()) { + newObject = newObject.createClone(pos.x, pos.y); // create a clone + addGameObjectToMap(newObject, false); // insert it to the map } else { return false; // tried to insert multi (probably from pickmap) } @@ -213,16 +212,16 @@ } else { // insert the new arch into the inventory of a map arch final GameObject invnew; // new arch to be inserted - if (newArch == null || newArch.isArchetype()) { - if (newArch != null && newArch.isArchetype()) { - archName = newArch.getArchetypeName(); + if (newObject == null || newObject.isArchetype()) { + if (newObject != null && newObject.isArchetype()) { + archName = newObject.getArchetypeName(); } // create a new copy of a default arch invnew = getArchetype(archName).createArch(); } else { // create clone from a pickmap - if (!newArch.isMulti()) { - invnew = newArch.createClone(pos.x, pos.y); + if (!newObject.isMulti()) { + invnew = newObject.createClone(pos.x, pos.y); } else { return false; } Modified: trunk/daimonin/src/daieditor/map/MapModel.java =================================================================== --- trunk/daimonin/src/daieditor/map/MapModel.java 2006-12-10 18:40:10 UTC (rev 1029) +++ trunk/daimonin/src/daieditor/map/MapModel.java 2006-12-10 19:07:55 UTC (rev 1030) @@ -49,21 +49,21 @@ /** * Insert a new arch to the map at a specified position. This function * allows either to choose from the default arches (->archName) or to insert - * a copy from an existing arch (->newarch). It also works for + * a copy from an existing arch (->newObject). It also works for * container-inventory. - * @param newarch A clone copy of this GameObject gets inserted to the map. + * @param newObject A clone copy of this GameObject gets inserted to the map. * It can be an arch directly from a pickmap or even a - * default arch. if ('newarch'==null) the default arch + * default arch. if ('newObject'==null) the default arch * 'archName' gets inserted * @param archName Name of a default arch to get inserted. This value gets - * used ONLY when 'newarch' is null + * used ONLY when 'newObject' is null * @param next the new arch gets inserted before 'next' if * ('next'==null) the arch gets inserted at bottom * -> 'next' must be an arch from the map! (or null) * @param pos map position to insert the new arch * @return true if insertion was successful */ - boolean insertArchToMap(GameObject newarch, String archName, GameObject next, Point pos); + boolean insertArchToMap(GameObject newObject, String archName, GameObject next, Point pos); /** * Get the first exit on the MapSquare described by <var>hspot</var>. Modified: trunk/gridarta.ipr =================================================================== --- trunk/gridarta.ipr 2006-12-10 18:40:10 UTC (rev 1029) +++ trunk/gridarta.ipr 2006-12-10 19:07:55 UTC (rev 1030) @@ -891,6 +891,30 @@ <option name="nameCheckString" value="is,can,has,should,could,will,shall,check,contains,equals,startsWith,endsWith" /> </inspection_tool> <inspection_tool class="RedundantSuppression" level="ERROR" enabled="true" /> + <inspection_tool class="UpperCaseFieldNameNotConstant" level="ERROR" enabled="true" /> + <inspection_tool class="NonExceptionNameEndsWithException" level="ERROR" enabled="true" /> + <inspection_tool class="ParameterNameDiffersFromOverriddenParameter" level="ERROR" enabled="true"> + <option name="m_ignoreSingleCharacterNames" value="false" /> + <option name="m_ignoreOverridesOfLibraryMethods" value="false" /> + </inspection_tool> + <inspection_tool class="QuestionableName" level="ERROR" enabled="true"> + <option name="nameCheckString" value="foo,bar,baz" /> + </inspection_tool> + <inspection_tool class="StaticMethodNamingConvention" level="ERROR" enabled="true"> + <option name="m_regex" value="[a-z][A-Za-z\d]*" /> + <option name="m_minLength" value="3" /> + <option name="m_maxLength" value="32" /> + </inspection_tool> + <inspection_tool class="StaticVariableNamingConvention" level="ERROR" enabled="true"> + <option name="m_regex" value="[a-z][A-Za-z\d]*" /> + <option name="m_minLength" value="5" /> + <option name="m_maxLength" value="32" /> + </inspection_tool> + <inspection_tool class="TypeParameterNamingConvention" level="ERROR" enabled="true"> + <option name="m_regex" value="[A-Z\d]" /> + <option name="m_minLength" value="1" /> + <option name="m_maxLength" value="1" /> + </inspection_tool> </profile> <profile version="1.0" is_locked="false"> <option name="myName" value="Project Default" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-10 20:01:46
|
Revision: 1038 http://svn.sourceforge.net/gridarta/?rev=1038&view=rev Author: christianhujer Date: 2006-12-10 12:01:45 -0800 (Sun, 10 Dec 2006) Log Message: ----------- Next round of hardening the policy. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CAttribDialog.java trunk/crossfire/src/cfeditor/CMainControl.java trunk/crossfire/src/cfeditor/CMainView.java trunk/crossfire/src/cfeditor/CopyBuffer.java trunk/crossfire/src/cfeditor/gameobject/anim/AnimationObject.java trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java trunk/crossfire/src/cfeditor/map/MapArchObject.java trunk/daimonin/src/daieditor/CAttribDialog.java trunk/daimonin/src/daieditor/gameobject/face/FaceFacade.java trunk/gridarta.ipr Modified: trunk/crossfire/src/cfeditor/CAttribDialog.java =================================================================== --- trunk/crossfire/src/cfeditor/CAttribDialog.java 2006-12-10 19:59:50 UTC (rev 1037) +++ trunk/crossfire/src/cfeditor/CAttribDialog.java 2006-12-10 20:01:45 UTC (rev 1038) @@ -1131,6 +1131,8 @@ } else { defValue = 0; } + // The following floating point equality comparison is okay and known not to cause problems. + //noinspection FloatingPointEquality if (value != defValue) { newArchText = newArchText + attr.ref.getNameOld() + " " + value + "\n"; } Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-10 19:59:50 UTC (rev 1037) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-10 20:01:45 UTC (rev 1038) @@ -1371,7 +1371,6 @@ } /** "Cut" was selected from the Edit menu. */ - @SuppressWarnings({"InstanceMethodNamingConvention"}) public void cut() { if (currentMap == null || currentMap.getMapViewFrame() == null) { return; // this should never be possible, but I just wanna make sure... Modified: trunk/crossfire/src/cfeditor/CMainView.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainView.java 2006-12-10 19:59:50 UTC (rev 1037) +++ trunk/crossfire/src/cfeditor/CMainView.java 2006-12-10 20:01:45 UTC (rev 1038) @@ -187,8 +187,8 @@ final int divLocation = Integer.parseInt(settings.getProperty(DIVIDER_LOCATION_KEY, "" + (int) (defwidth * 0.17))); // get the old location and size - final int x = Integer.parseInt(settings.getProperty(WINDOW_X, "" + (int) ((screen.getWidth() - defwidth) / 2.))); - final int y = Integer.parseInt(settings.getProperty(WINDOW_Y, "" + (int) ((screen.getHeight() - defheight) / 2.))); + final int x = Integer.parseInt(settings.getProperty(WINDOW_X, "" + (int) ((screen.getWidth() - defwidth) / 2.0))); + final int y = Integer.parseInt(settings.getProperty(WINDOW_Y, "" + (int) ((screen.getHeight() - defheight) / 2.0))); final int width = Integer.parseInt(settings.getProperty(WINDOW_WIDTH, "" + defwidth)); final int height = Integer.parseInt(settings.getProperty(WINDOW_HEIGHT, "" + defheight)); Modified: trunk/crossfire/src/cfeditor/CopyBuffer.java =================================================================== --- trunk/crossfire/src/cfeditor/CopyBuffer.java 2006-12-10 19:59:50 UTC (rev 1037) +++ trunk/crossfire/src/cfeditor/CopyBuffer.java 2006-12-10 20:01:45 UTC (rev 1038) @@ -120,7 +120,6 @@ * Excecuting the Cut command. * @param mapControl MapControl of the active map where we copy from */ - @SuppressWarnings({"InstanceMethodNamingConvention"}) public void cut(final MapControl mapControl) { copyNCut(mapControl, Mode.DO_CUT); } Modified: trunk/crossfire/src/cfeditor/gameobject/anim/AnimationObject.java =================================================================== --- trunk/crossfire/src/cfeditor/gameobject/anim/AnimationObject.java 2006-12-10 19:59:50 UTC (rev 1037) +++ trunk/crossfire/src/cfeditor/gameobject/anim/AnimationObject.java 2006-12-10 20:01:45 UTC (rev 1038) @@ -28,6 +28,7 @@ import java.io.Serializable; import javax.swing.ImageIcon; import net.sf.gridarta.gameobject.anim.AbstractAnimationObject; +import net.sf.gridarta.gameobject.NamedObject; /** * A single animation object. @@ -127,8 +128,8 @@ } /** {@inheritDoc} */ - public int compareTo(final AnimationObject o) { - return animName.compareTo(o.animName); + @Override public int compareTo(final NamedObject o) { + return animName.compareTo(((AnimationObject) o).animName); } } // class AnimationObject Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java 2006-12-10 19:59:50 UTC (rev 1037) +++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java 2006-12-10 20:01:45 UTC (rev 1038) @@ -124,7 +124,7 @@ tmpIcon = new ImageIcon(); borderOffset = !pickmap ? 32 : 0; - renderTransform = new AffineTransform(1f, 0f, 0f, 1f, (float) borderOffset, (float) borderOffset); + renderTransform = new AffineTransform(1.0f, 0.0f, 0.0f, 1.0f, (float) borderOffset, (float) borderOffset); highLightMask = new Color[]{ new Color(1.0f, 0.0f, 0.0f, 0.33f), new Color(0.0f, 1.0f, 0.0f, 0.33f), Modified: trunk/crossfire/src/cfeditor/map/MapArchObject.java =================================================================== --- trunk/crossfire/src/cfeditor/map/MapArchObject.java 2006-12-10 19:59:50 UTC (rev 1037) +++ trunk/crossfire/src/cfeditor/map/MapArchObject.java 2006-12-10 20:01:45 UTC (rev 1038) @@ -529,6 +529,8 @@ if (shopitems.length() > 0) { appendable.append("shopitems ").append(shopitems).append("\n"); } + // The following floating point equality comparison is assumed to be okay + //noinspection FloatingPointEquality if (shopgreed != 0) { appendable.append("shopgreed ").append(String.valueOf(shopgreed)).append("\n"); } Modified: trunk/daimonin/src/daieditor/CAttribDialog.java =================================================================== --- trunk/daimonin/src/daieditor/CAttribDialog.java 2006-12-10 19:59:50 UTC (rev 1037) +++ trunk/daimonin/src/daieditor/CAttribDialog.java 2006-12-10 20:01:45 UTC (rev 1038) @@ -1088,6 +1088,8 @@ case FLOAT: { // an int attribute if ("0".equals(((DialogAttrib<JFormattedTextField>) attr).input.getText())) { + // The following floating point equality comparison is okay and known not to cause problems. + //noinspection FloatingPointEquality if (archetype.getAttributeDouble(attr.ref.getNameOld()) != 0) { newArchText = newArchText + attr.ref.getNameOld() + " " + (dType == ArchAttribType.FLOAT ? "0.0" : "0") + "\n"; } @@ -1110,6 +1112,8 @@ break; case FLOAT: { final double value = ((Number) ((DialogAttrib<JFormattedTextField>) attr).input.getValue()).doubleValue(); + // The following floating point equality comparison is okay and known not to cause problems. + //noinspection FloatingPointEquality if (archetype.getAttributeDouble(attr.ref.getNameOld()) != value) { newArchText = newArchText + attr.ref.getNameOld() + ' ' + value + '\n'; } Modified: trunk/daimonin/src/daieditor/gameobject/face/FaceFacade.java =================================================================== --- trunk/daimonin/src/daieditor/gameobject/face/FaceFacade.java 2006-12-10 19:59:50 UTC (rev 1037) +++ trunk/daimonin/src/daieditor/gameobject/face/FaceFacade.java 2006-12-10 20:01:45 UTC (rev 1038) @@ -69,7 +69,7 @@ * {@inheritDoc} */ @Override public int filterRGB(final int x, final int y, final int rgb) { - return (x + y) % 2 == 1 ? rgb : rgb & 0x00FFFFFF; + return (x + y) % 2 != 0 ? rgb : rgb & 0x00FFFFFF; } }; // GRID_FILTER Modified: trunk/gridarta.ipr =================================================================== --- trunk/gridarta.ipr 2006-12-10 19:59:50 UTC (rev 1037) +++ trunk/gridarta.ipr 2006-12-10 20:01:45 UTC (rev 1038) @@ -102,8 +102,8 @@ <component name="GUI Designer component loader factory" /> <component name="IdProvider" IDEtalkID="2C998304C446463F0F811673874877B6" /> <component name="InspectionProjectProfileManager"> - <option name="PROJECT_PROFILE" value="Project Default" /> - <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + <option name="PROJECT_PROFILE" value="No errors allowed here" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="true" /> <scopes /> <profiles> <profile version="1.0" is_locked="false"> @@ -453,7 +453,7 @@ <option name="myAdditionalJavadocTags" value="todo,note,todo,xxx,note,todo,fixme,fixme,warning,invariant,retval,pre" /> </inspection_tool> </profile> - <profile version="1.0" is_locked="false"> + <profile version="1.0" is_locked="true"> <option name="myName" value="No errors allowed here" /> <option name="myLocal" value="false" /> <used_levels> @@ -493,11 +493,11 @@ </inspection_tool> <inspection_tool class="GwtInconsistentI18nInterface" level="ERROR" enabled="false" /> <inspection_tool class="StringToString" level="WARNING" enabled="false" /> - <inspection_tool class="AnalyzingStaticVariables" level="ERROR" enabled="false"> + <inspection_tool class="AnalyzingStaticVariables" level="ERROR" enabled="true"> <option name="CHECKED_TYPES" value="javax.servlet.http.HttpSession;com.ulcjava.base.application.ULCProxy" /> </inspection_tool> <inspection_tool class="BoundFieldAssignment" level="WARNING" enabled="false" /> - <inspection_tool class="NullArgumentToVariableArgMethod" level="WARNING" enabled="false" /> + <inspection_tool class="NullArgumentToVariableArgMethod" level="WARNING" enabled="true" /> <inspection_tool class="JSUndeclaredVariable" level="INFO" enabled="false" /> <inspection_tool class="PersistenceModelErrorInspection" level="ERROR" enabled="false" /> <inspection_tool class="LoopStatementsThatDontLoop" level="WARNING" enabled="false" /> @@ -514,7 +514,7 @@ <inspection_tool class="EjbWarningInspection" level="WARNING" enabled="false" /> <inspection_tool class="EjbQlInspection" level="ERROR" enabled="false" /> <inspection_tool class="Glassfish" level="ERROR" enabled="false" /> - <inspection_tool class="ConstantConditions" level="WARNING" enabled="false"> + <inspection_tool class="ConstantConditions" level="WARNING" enabled="true"> <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" /> </inspection_tool> <inspection_tool class="GwtServiceNotRegistered" level="ERROR" enabled="false" /> @@ -529,7 +529,7 @@ <inspection_tool class="JSUnresolvedFunction" level="INFO" enabled="false" /> <inspection_tool class="InstantiatingObjectToGetClassObject" level="WARNING" enabled="false" /> <inspection_tool class="ReturnFromFinallyBlockJS" level="WARNING" enabled="false" /> - <inspection_tool class="UnusedAssignment" level="WARNING" enabled="false"> + <inspection_tool class="UnusedAssignment" level="WARNING" enabled="true"> <option name="REPORT_PREFIX_EXPRESSIONS" value="false" /> <option name="REPORT_POSTFIX_EXPRESSIONS" value="true" /> <option name="REPORT_REDUNDANT_INITIALIZER" value="true" /> @@ -590,7 +590,7 @@ <inspection_tool class="Weblogic" level="ERROR" enabled="false" /> <inspection_tool class="PersistenceDataSourceORMDomInspection" level="ERROR" enabled="false" /> <inspection_tool class="FallthroughInSwitchStatementJS" level="WARNING" enabled="false" /> - <inspection_tool class="IgnoreResultOfCall" level="WARNING" enabled="false"> + <inspection_tool class="IgnoreResultOfCall" level="WARNING" enabled="true"> <option name="m_reportAllNonLibraryCalls" value="false" /> <option name="callCheckString" value="java.io.InputStream,read,java.io.InputStream,skip,java.lang.StringBuffer,toString,java.lang.StringBuilder,toString,java.lang.String,.*,java.math.BigInteger,.*,java.math.BigDecimal,.*,java.net.InetAddress,.*" /> </inspection_tool> @@ -598,7 +598,7 @@ <inspection_tool class="RedundantCast" level="WARNING" enabled="false" /> <inspection_tool class="UnnecessaryReturn" level="WARNING" enabled="false" /> <inspection_tool class="FinalStaticMethod" level="WARNING" enabled="false" /> - <inspection_tool class="SuspiciousMethodCalls" level="WARNING" enabled="false" /> + <inspection_tool class="SuspiciousMethodCalls" level="WARNING" enabled="true" /> <inspection_tool class="HTML" level="WARNING" enabled="false"> <option name="myAdditionalHtmlTags" value="embed,nobr,noembed,comment,script" /> <option name="myAdditionalHtmlAttributes" value="type,wmode,src,width,height" /> @@ -623,7 +623,7 @@ <option name="IGNORE_SIMPLE_STATEMENTS" value="true" /> </inspection_tool> <inspection_tool class="AntDuplicateTargetsInspection" level="ERROR" enabled="false" /> - <inspection_tool class="NullableProblems" level="WARNING" enabled="false"> + <inspection_tool class="NullableProblems" level="WARNING" enabled="true"> <option name="REPORT_NULLABLE_METHOD_OVERRIDES_NOTNULL" value="true" /> <option name="REPORT_NOT_ANNOTATED_METHOD_OVERRIDES_NOTNULL" value="true" /> <option name="REPORT_NOTNULL_PARAMETER_OVERRIDES_NULLABLE" value="true" /> @@ -632,21 +632,21 @@ <inspection_tool class="ReferencesToClassesFromDefaultPackagesInJSPFile" level="ERROR" enabled="false" /> <inspection_tool class="TrivialIf" level="WARNING" enabled="false" /> <inspection_tool class="AntMissingPropertiesFileInspection" level="ERROR" enabled="false" /> - <inspection_tool class="ObjectEqualsNull" level="WARNING" enabled="false" /> + <inspection_tool class="ObjectEqualsNull" level="WARNING" enabled="true" /> <inspection_tool class="GwtToHtmlReferences" level="ERROR" enabled="false" /> <inspection_tool class="EmptyFinallyBlock" level="WARNING" enabled="false" /> - <inspection_tool class="MismatchedCollectionQueryUpdate" level="WARNING" enabled="false" /> - <inspection_tool class="EmptyStatementBody" level="WARNING" enabled="false"> + <inspection_tool class="MismatchedCollectionQueryUpdate" level="WARNING" enabled="true" /> + <inspection_tool class="EmptyStatementBody" level="WARNING" enabled="true"> <option name="m_reportEmptyBlocks" value="false" /> </inspection_tool> - <inspection_tool class="StringEquality" level="WARNING" enabled="false" /> + <inspection_tool class="StringEquality" level="WARNING" enabled="true" /> <inspection_tool class="RequiredAttributes" level="WARNING" enabled="false"> <option name="myAdditionalRequiredHtmlAttributes" value="" /> </inspection_tool> <inspection_tool class="TrivialConditionalJS" level="WARNING" enabled="false" /> <inspection_tool class="OneButtonGroup" level="WARNING" enabled="false" /> <inspection_tool class="StrutsTilesInspection" level="ERROR" enabled="false" /> - <inspection_tool class="ReflectionForUnavailableAnnotation" level="WARNING" enabled="false" /> + <inspection_tool class="ReflectionForUnavailableAnnotation" level="WARNING" enabled="true" /> <inspection_tool class="IncompatibleMaskJS" level="WARNING" enabled="false" /> <inspection_tool class="NonJREEmulationClassesInClientCode" level="ERROR" enabled="false" /> <inspection_tool class="OctalLiteral" level="WARNING" enabled="false" /> @@ -655,7 +655,7 @@ <option name="CHECK_PUBLIC_INTERFACE_METHODS" value="true" /> <option name="CHECK_TRANSIENT_STATIC_FIELDS" value="true" /> </inspection_tool> - <inspection_tool class="InfiniteRecursion" level="WARNING" enabled="false" /> + <inspection_tool class="InfiniteRecursion" level="WARNING" enabled="true" /> <inspection_tool class="Geronimo" level="ERROR" enabled="false" /> <inspection_tool class="InfiniteLoopJS" level="WARNING" enabled="false" /> <inspection_tool class="SelfIncludingJspFiles" level="ERROR" enabled="false" /> @@ -680,11 +680,11 @@ <inspection_tool class="FieldCanBeLocal" level="WARNING" enabled="false" /> <inspection_tool class="UNCHECKED_WARNING" level="WARNING" enabled="false" /> <inspection_tool class="LoopStatementThatDoesntLoopJS" level="WARNING" enabled="false" /> - <inspection_tool class="SuspiciousNameCombination" level="WARNING" enabled="false"> + <inspection_tool class="SuspiciousNameCombination" level="WARNING" enabled="true"> <group names="x,width,left,right" /> <group names="y,height,top,bottom" /> </inspection_tool> - <inspection_tool class="MalformedRegex" level="WARNING" enabled="false" /> + <inspection_tool class="MalformedRegex" level="WARNING" enabled="true" /> <inspection_tool class="TrivialIfJS" level="WARNING" enabled="false" /> <inspection_tool class="SimplifiableConditionalExpression" level="WARNING" enabled="false" /> <inspection_tool class="UNUSED_IMPORT" level="WARNING" enabled="false" /> @@ -709,7 +709,7 @@ </inspection_tool> <inspection_tool class="PersistenceDomInspection" level="ERROR" enabled="false" /> <inspection_tool class="EmptyTryBlock" level="WARNING" enabled="false" /> - <inspection_tool class="MalformedFormatString" level="WARNING" enabled="false" /> + <inspection_tool class="MalformedFormatString" level="WARNING" enabled="true" /> <inspection_tool class="ComponentRegistrationProblems" level="ERROR" enabled="false"> <option name="CHECK_PLUGIN_XML" value="true" /> <option name="CHECK_JAVA_CODE" value="true" /> @@ -721,7 +721,7 @@ <inspection_tool class="ConstantConditionalExpression" level="WARNING" enabled="false" /> <inspection_tool class="MissingMnemonic" level="WARNING" enabled="false" /> <inspection_tool class="CloneDeclaresCloneNotSupported" level="WARNING" enabled="false" /> - <inspection_tool class="MalformedXPath" level="WARNING" enabled="false" /> + <inspection_tool class="MalformedXPath" level="WARNING" enabled="true" /> <inspection_tool class="AccessStaticViaInstance" level="WARNING" enabled="false" /> <inspection_tool class="UnusedParameters" level="WARNING" enabled="false" /> <inspection_tool class="DuplicateMnemonic" level="WARNING" enabled="false" /> @@ -730,12 +730,12 @@ </inspection_tool> <inspection_tool class="GWTRemoteServiceAsyncCheck" level="ERROR" enabled="false" /> <inspection_tool class="ContinueOrBreakFromFinallyBlockJS" level="WARNING" enabled="false" /> - <inspection_tool class="MismatchedArrayReadWrite" level="WARNING" enabled="false" /> + <inspection_tool class="MismatchedArrayReadWrite" level="WARNING" enabled="true" /> <inspection_tool class="UnusedReturnValue" level="WARNING" enabled="false" /> <inspection_tool class="UnnecessaryContinueJS" level="WARNING" enabled="false" /> <inspection_tool class="FinallyBlockCannotCompleteNormally" level="WARNING" enabled="false" /> <inspection_tool class="BadExpressionStatementJS" level="WARNING" enabled="false" /> - <inspection_tool class="PrimitiveArrayArgumentToVariableArgMethod" level="WARNING" enabled="false" /> + <inspection_tool class="PrimitiveArrayArgumentToVariableArgMethod" level="WARNING" enabled="true" /> <inspection_tool class="InfiniteRecursionJS" level="WARNING" enabled="false" /> <inspection_tool class="StrutsValidatorInspection" level="ERROR" enabled="false" /> <inspection_tool class="ContinueOrBreakFromFinallyBlock" level="WARNING" enabled="false" /> @@ -915,6 +915,797 @@ <option name="m_minLength" value="1" /> <option name="m_maxLength" value="1" /> </inspection_tool> + <inspection_tool class="ComparisonToNaN" level="ERROR" enabled="true" /> + <inspection_tool class="ConfusingFloatingPointLiteral" level="ERROR" enabled="true" /> + <inspection_tool class="ComparisonOfShortAndChar" level="ERROR" enabled="true" /> + <inspection_tool class="ConstantMathCall" level="ERROR" enabled="true" /> + <inspection_tool class="DivideByZero" level="ERROR" enabled="true" /> + <inspection_tool class="BigDecimalEquals" level="ERROR" enabled="true" /> + <inspection_tool class="FloatingPointEquality" level="ERROR" enabled="true" /> + <inspection_tool class="LongLiteralsEndingWithLowercaseL" level="ERROR" enabled="true" /> + <inspection_tool class="BadOddness" level="ERROR" enabled="true" /> + <inspection_tool class="UnnecessaryQualifierForThis" level="WARNING" enabled="false" /> + <inspection_tool class="MultipleDeclaration" level="WARNING" enabled="false" /> + <inspection_tool class="ParameterOfConcreteClass" level="WARNING" enabled="false" /> + <inspection_tool class="ThreadPriority" level="WARNING" enabled="false" /> + <inspection_tool class="ExtendsUtilityClass" level="WARNING" enabled="false" /> + <inspection_tool class="TooBroadScope" level="WARNING" enabled="false"> + <option name="m_allowConstructorAsInitializer" value="false" /> + <option name="m_onlyLookAtBlocks" value="false" /> + </inspection_tool> + <inspection_tool class="AssignmentUsedAsCondition" level="WARNING" enabled="false" /> + <inspection_tool class="StringConcatenation" level="WARNING" enabled="false"> + <option name="ignoreAsserts" value="false" /> + <option name="ignoreSystemOuts" value="false" /> + <option name="ignoreSystemErrs" value="false" /> + </inspection_tool> + <inspection_tool class="AssertsWithoutMessages" level="WARNING" enabled="false" /> + <inspection_tool class="RandomDoubleForRandomInteger" level="WARNING" enabled="false" /> + <inspection_tool class="TestMethodWithoutAssertion" level="WARNING" enabled="false" /> + <inspection_tool class="SerialPersistentFieldsWithWrongSignature" level="WARNING" enabled="false" /> + <inspection_tool class="StringBufferReplaceableByStringBuilder" level="WARNING" enabled="false" /> + <inspection_tool class="UnterminatedStatementJS" level="WARNING" enabled="false" /> + <inspection_tool class="CastToConcreteClass" level="WARNING" enabled="false" /> + <inspection_tool class="EmptyFinallyBlockJS" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryFullyQualifiedName" level="WARNING" enabled="false"> + <option name="m_ignoreJavadoc" value="false" /> + </inspection_tool> + <inspection_tool class="ReturnOfCollectionField" level="WARNING" enabled="false"> + <option name="ignorePrivateMethods" value="true" /> + </inspection_tool> + <inspection_tool class="VarargParameter" level="WARNING" enabled="false" /> + <inspection_tool class="CachedNumberConstructorCall" level="WARNING" enabled="false" /> + <inspection_tool class="ProtectedField" level="WARNING" enabled="false" /> + <inspection_tool class="BadExceptionDeclared" level="WARNING" enabled="false"> + <option name="exceptionCheckString" value="java.lang.Throwable,java.lang.Exception,java.lang.Error,java.lang.RuntimeException,java.lang.NullPointerException,java.lang.ClassCastException,java.lang.ArrayIndexOutOfBoundsException" /> + <option name="ignoreTestCases" value="false" /> + </inspection_tool> + <inspection_tool class="NotifyWithoutCorrespondingWait" level="WARNING" enabled="false" /> + <inspection_tool class="AnonymousClassVariableHidesContainingMethodVariable" level="WARNING" enabled="false" /> + <inspection_tool class="DeserializableClassInSecureContext" level="WARNING" enabled="false" /> + <inspection_tool class="SystemGetenv" level="WARNING" enabled="false" /> + <inspection_tool class="StaticCallOnSubclass" level="WARNING" enabled="true" /> + <inspection_tool class="SystemExit" level="WARNING" enabled="false" /> + <inspection_tool class="ClassWithoutConstructor" level="WARNING" enabled="false" /> + <inspection_tool class="BreakStatement" level="WARNING" enabled="false" /> + <inspection_tool class="UnconditionalWait" level="WARNING" enabled="false" /> + <inspection_tool class="CyclomaticComplexity" level="WARNING" enabled="false"> + <option name="m_limit" value="10" /> + </inspection_tool> + <inspection_tool class="UnusedImport" level="WARNING" enabled="false" /> + <inspection_tool class="ConstantOnLHSOfComparison" level="WARNING" enabled="false" /> + <inspection_tool class="StaticVariableUninitializedUse" level="WARNING" enabled="false"> + <option name="m_ignorePrimitives" value="false" /> + </inspection_tool> + <inspection_tool class="ReturnOfDateField" level="WARNING" enabled="false" /> + <inspection_tool class="StringTokenizer" level="WARNING" enabled="false" /> + <inspection_tool class="NestedSwitchStatementJS" level="WARNING" enabled="false" /> + <inspection_tool class="FinalClass" level="WARNING" enabled="false" /> + <inspection_tool class="LabeledStatement" level="WARNING" enabled="false" /> + <inspection_tool class="NotifyCalledOnCondition" level="WARNING" enabled="false" /> + <inspection_tool class="MisspelledEquals" level="WARNING" enabled="true" /> + <inspection_tool class="ConditionalExpressionJS" level="WARNING" enabled="false" /> + <inspection_tool class="ThreadRun" level="WARNING" enabled="false" /> + <inspection_tool class="HardcodedLineSeparators" level="WARNING" enabled="false" /> + <inspection_tool class="SwitchStatementWithNoDefaultBranchJS" level="WARNING" enabled="false" /> + <inspection_tool class="NegatedIfStatementJS" level="WARNING" enabled="false" /> + <inspection_tool class="DivideByZeroJS" level="WARNING" enabled="false" /> + <inspection_tool class="XHTMLIncompatabilitiesJS" level="WARNING" enabled="false" /> + <inspection_tool class="AutoUnboxing" level="WARNING" enabled="false" /> + <inspection_tool class="NonSynchronizedMethodOverridesSynchronizedMethod" level="WARNING" enabled="false" /> + <inspection_tool class="CharacterComparison" level="WARNING" enabled="false" /> + <inspection_tool class="MethodReturnOfConcreteClass" level="WARNING" enabled="false" /> + <inspection_tool class="ResultSetIndexZero" level="WARNING" enabled="true" /> + <inspection_tool class="ConstantOnRHSOfComparison" level="WARNING" enabled="false" /> + <inspection_tool class="AnonymousFunctionJS" level="WARNING" enabled="false" /> + <inspection_tool class="MagicNumber" level="WARNING" enabled="false"> + <option name="m_ignoreInHashCode" value="true" /> + </inspection_tool> + <inspection_tool class="ParameterHidingMemberVariable" level="WARNING" enabled="false"> + <option name="m_ignoreInvisibleFields" value="true" /> + <option name="m_ignoreStaticMethodParametersHidingInstanceFields" value="false" /> + <option name="m_ignoreForConstructors" value="false" /> + <option name="m_ignoreForPropertySetters" value="false" /> + <option name="m_ignoreForAbstractMethods" value="false" /> + </inspection_tool> + <inspection_tool class="SynchronizeOnThis" level="WARNING" enabled="false" /> + <inspection_tool class="HibernateResource" level="WARNING" enabled="false" /> + <inspection_tool class="DefaultNotLastCaseInSwitchJS" level="WARNING" enabled="false" /> + <inspection_tool class="SingleCharacterStartsWith" level="WARNING" enabled="false" /> + <inspection_tool class="InstanceVariableInitialization" level="WARNING" enabled="false"> + <option name="m_ignorePrimitives" value="false" /> + </inspection_tool> + <inspection_tool class="SwitchStatementWithTooManyBranches" level="WARNING" enabled="false"> + <option name="m_limit" value="10" /> + </inspection_tool> + <inspection_tool class="UtilityClassWithoutPrivateConstructor" level="WARNING" enabled="false"> + <option name="ignoreClassesWithOnlyMain" value="false" /> + </inspection_tool> + <inspection_tool class="ThrowCaughtLocally" level="WARNING" enabled="false"> + <option name="ignoreRethrownExceptions" value="false" /> + </inspection_tool> + <inspection_tool class="EqualsUsesNonFinalVariable" level="WARNING" enabled="true" /> + <inspection_tool class="CyclomaticComplexityJS" level="WARNING" enabled="false"> + <option name="m_limit" value="10" /> + </inspection_tool> + <inspection_tool class="ObjectEquality" level="WARNING" enabled="true"> + <option name="m_ignoreEnums" value="true" /> + <option name="m_ignoreClassObjects" value="false" /> + <option name="m_ignorePrivateConstructors" value="false" /> + </inspection_tool> + <inspection_tool class="EqualsWhichDoesntCheckParameterClass" level="WARNING" enabled="true" /> + <inspection_tool class="ExceptionFromCatchWhichDoesntWrap" level="WARNING" enabled="false"> + <option name="ignoreGetMessage" value="false" /> + </inspection_tool> + <inspection_tool class="RedundantThrowsDeclaration" level="WARNING" enabled="false" /> + <inspection_tool class="ChainedEqualityJS" level="WARNING" enabled="false" /> + <inspection_tool class="MultiplyOrDivideByPowerOfTwo" level="WARNING" enabled="false" /> + <inspection_tool class="RuntimeExec" level="WARNING" enabled="false" /> + <inspection_tool class="StringLiteralBreaksHTMLJS" level="WARNING" enabled="false" /> + <inspection_tool class="SerializableWithUnconstructableAncestor" level="WARNING" enabled="false" /> + <inspection_tool class="AssertStatement" level="WARNING" enabled="false" /> + <inspection_tool class="MissortedModifiers" level="WARNING" enabled="false"> + <option name="m_requireAnnotationsFirst" value="true" /> + </inspection_tool> + <inspection_tool class="SubtractionInCompareTo" level="WARNING" enabled="true" /> + <inspection_tool class="SleepWhileHoldingLock" level="WARNING" enabled="false" /> + <inspection_tool class="Singleton" level="WARNING" enabled="false" /> + <inspection_tool class="FieldRepeatedlyAccessed" level="WARNING" enabled="false"> + <option name="m_ignoreFinalFields" value="false" /> + </inspection_tool> + <inspection_tool class="UnnecessaryFinalOnParameter" level="WARNING" enabled="false" /> + <inspection_tool class="RedundantMethodOverride" level="WARNING" enabled="false" /> + <inspection_tool class="TestMethodInProductCode" level="WARNING" enabled="false" /> + <inspection_tool class="ThreadDeathRethrown" level="WARNING" enabled="false" /> + <inspection_tool class="OverlyStrongTypeCast" level="WARNING" enabled="false" /> + <inspection_tool class="LocalVariableOfConcreteClass" level="WARNING" enabled="false" /> + <inspection_tool class="RedundantImplements" level="WARNING" enabled="false" /> + <inspection_tool class="IfStatementWithTooManyBranches" level="WARNING" enabled="false"> + <option name="m_limit" value="3" /> + </inspection_tool> + <inspection_tool class="AssignmentToStaticFieldFromInstanceMethod" level="WARNING" enabled="false" /> + <inspection_tool class="NestingDepth" level="WARNING" enabled="false"> + <option name="m_limit" value="5" /> + </inspection_tool> + <inspection_tool class="StringCompareTo" level="WARNING" enabled="false" /> + <inspection_tool class="EqualityComparisonWithCoercionJS" level="WARNING" enabled="false" /> + <inspection_tool class="ReturnThis" level="WARNING" enabled="false" /> + <inspection_tool class="StringToUpperWithoutLocale" level="WARNING" enabled="false" /> + <inspection_tool class="VoidExpressionJS" level="WARNING" enabled="false" /> + <inspection_tool class="BusyWait" level="WARNING" enabled="false" /> + <inspection_tool class="WithStatementJS" level="WARNING" enabled="false" /> + <inspection_tool class="ReplaceAssignmentWithOperatorAssignmentJS" level="WARNING" enabled="false" /> + <inspection_tool class="UtilityClass" level="WARNING" enabled="false" /> + <inspection_tool class="CollectionAddedToSelf" level="WARNING" enabled="true" /> + <inspection_tool class="AbstractClassExtendsConcreteClass" level="WARNING" enabled="false" /> + <inspection_tool class="InstanceVariableOfConcreteClass" level="WARNING" enabled="false" /> + <inspection_tool class="StaticCollection" level="WARNING" enabled="false"> + <option name="m_ignoreWeakCollections" value="false" /> + </inspection_tool> + <inspection_tool class="CommaExpressionJS" level="WARNING" enabled="false" /> + <inspection_tool class="IntegerDivisionInFloatingPointContext" level="WARNING" enabled="false" /> + <inspection_tool class="CovariantEquals" level="WARNING" enabled="true" /> + <inspection_tool class="DuplicateConditionJS" level="WARNING" enabled="false" /> + <inspection_tool class="ReadResolveAndWriteReplaceProtected" level="WARNING" enabled="false" /> + <inspection_tool class="InterfaceNeverImplemented" level="WARNING" enabled="false"> + <option name="ignoreInterfacesThatOnlyDeclareConstants" value="false" /> + </inspection_tool> + <inspection_tool class="LengthOneStringsInConcatenation" level="WARNING" enabled="false" /> + <inspection_tool class="ThreadYield" level="WARNING" enabled="false" /> + <inspection_tool class="DeclareCollectionAsInterface" level="WARNING" enabled="false"> + <option name="ignoreLocalVariables" value="false" /> + <option name="ignorePrivateMethodsAndFields" value="false" /> + </inspection_tool> + <inspection_tool class="WaitNotInLoop" level="WARNING" enabled="false" /> + <inspection_tool class="ClassInitializer" level="WARNING" enabled="false" /> + <inspection_tool class="NonShortCircuitBoolean" level="WARNING" enabled="true" /> + <inspection_tool class="NestedConditionalExpressionJS" level="WARNING" enabled="false" /> + <inspection_tool class="PrivateMemberAccessBetweenOuterAndInnerClass" level="WARNING" enabled="false" /> + <inspection_tool class="NonThreadSafeLazyInitialization" level="WARNING" enabled="false" /> + <inspection_tool class="DuplicatePropertyInspection" level="WARNING" enabled="false"> + <option name="CURRENT_FILE" value="true" /> + <option name="MODULE_WITH_DEPENDENCIES" value="false" /> + <option name="CHECK_DUPLICATE_VALUES" value="true" /> + <option name="CHECK_DUPLICATE_KEYS" value="true" /> + <option name="CHECK_DUPLICATE_KEYS_WITH_DIFFERENT_VALUES" value="true" /> + </inspection_tool> + <inspection_tool class="PointlessIndexOfComparison" level="WARNING" enabled="false" /> + <inspection_tool class="OctalAndDecimalIntegersMixed" level="WARNING" enabled="false" /> + <inspection_tool class="CallToSimpleSetterInClass" level="WARNING" enabled="false"> + <option name="ignoreSetterCallsOnOtherObjects" value="false" /> + </inspection_tool> + <inspection_tool class="MethodOverridesPrivateMethod" level="WARNING" enabled="false" /> + <inspection_tool class="FallthruInSwitchStatement" level="WARNING" enabled="false" /> + <inspection_tool class="CallToNativeMethodWhileLocked" level="WARNING" enabled="false" /> + <inspection_tool class="NestedAssignmentJS" level="WARNING" enabled="false" /> + <inspection_tool class="SwitchStatement" level="WARNING" enabled="false" /> + <inspection_tool class="CustomClassloader" level="WARNING" enabled="false" /> + <inspection_tool class="NestedConditionalExpression" level="WARNING" enabled="false" /> + <inspection_tool class="AwaitWithoutCorrespondingSignal" level="WARNING" enabled="false" /> + <inspection_tool class="DuplicateCondition" level="WARNING" enabled="false"> + <option name="ignoreMethodCalls" value="false" /> + </inspection_tool> + <inspection_tool class="MethodWithMultipleLoops" level="WARNING" enabled="false" /> + <inspection_tool class="NonCommentSourceStatements" level="WARNING" enabled="false"> + <option name="m_limit" value="30" /> + </inspection_tool> + <inspection_tool class="HashCodeUsesNonFinalVariable" level="WARNING" enabled="true" /> + <inspection_tool class="Since15" level="ERROR" enabled="false" /> + <inspection_tool class="NegatedIfElse" level="WARNING" enabled="false"> + <option name="m_ignoreNegatedNullComparison" value="true" /> + </inspection_tool> + <inspection_tool class="ReuseOfLocalVariable" level="WARNING" enabled="false" /> + <inspection_tool class="SerializableInnerClassWithNonSerializableOuterClass" level="WARNING" enabled="false"> + <option name="m_ignoreSerializableDueToInheritance" value="true" /> + </inspection_tool> + <inspection_tool class="ConstantOnLHSOfComparisonJS" level="WARNING" enabled="false" /> + <inspection_tool class="DebuggerStatementJS" level="WARNING" enabled="false" /> + <inspection_tool class="IncrementDecrementUsedAsExpression" level="WARNING" enabled="false" /> + <inspection_tool class="IfStatementWithIdenticalBranchesJS" level="WARNING" enabled="false" /> + <inspection_tool class="MethodOverloadsParentMethod" level="WARNING" enabled="false" /> + <inspection_tool class="MethodNameSameAsClassName" level="WARNING" enabled="false" /> + <inspection_tool class="ChannelResource" level="WARNING" enabled="false" /> + <inspection_tool class="InnerHTMLJS" level="WARNING" enabled="false" /> + <inspection_tool class="InnerClassOnInterface" level="WARNING" enabled="false"> + <option name="m_ignoreInnerInterfaces" value="false" /> + </inspection_tool> + <inspection_tool class="CastToIncompatibleInterface" level="WARNING" enabled="true" /> + <inspection_tool class="MultipleTypedDeclaration" level="WARNING" enabled="false" /> + <inspection_tool class="JNDIResource" level="WARNING" enabled="false" /> + <inspection_tool class="OverlyComplexBooleanExpression" level="WARNING" enabled="false"> + <option name="m_limit" value="3" /> + <option name="m_ignorePureConjunctionsDisjunctions" value="true" /> + </inspection_tool> + <inspection_tool class="ThreadDumpStack" level="WARNING" enabled="false" /> + <inspection_tool class="UseOfAnotherObjectsPrivateField" level="WARNING" enabled="false" /> + <inspection_tool class="ConditionalExpressionWithIdenticalBranchesJS" level="WARNING" enabled="false" /> + <inspection_tool class="Annotation" level="WARNING" enabled="false" /> + <inspection_tool class="UseOfAWTPeerClass" level="WARNING" enabled="false" /> + <inspection_tool class="OverlyComplexBooleanExpressionJS" level="WARNING" enabled="false"> + <option name="m_limit" value="3" /> + </inspection_tool> + <inspection_tool class="InnerClassVariableHidesOuterClassVariable" level="WARNING" enabled="false"> + <option name="m_ignoreInvisibleFields" value="true" /> + </inspection_tool> + <inspection_tool class="NonSerializableObjectPassedToObjectStream" level="WARNING" enabled="false" /> + <inspection_tool class="StringEqualsIgnoreCase" level="WARNING" enabled="false" /> + <inspection_tool class="ContinueStatementWithLabel" level="WARNING" enabled="false" /> + <inspection_tool class="LocalVariableNamingConventionJS" level="WARNING" enabled="false"> + <option name="m_regex" value="[a-z][A-Za-z]*" /> + <option name="m_minLength" value="1" /> + <option name="m_maxLength" value="32" /> + </inspection_tool> + <inspection_tool class="ParameterNamingConventionJS" level="WARNING" enabled="false"> + <option name="m_regex" value="[a-z][A-Za-z]*" /> + <option name="m_minLength" value="1" /> + <option name="m_maxLength" value="32" /> + </inspection_tool> + <inspection_tool class="AssignmentToForLoopParameterJS" level="WARNING" enabled="false" /> + <inspection_tool class="CheckedExceptionClass" level="WARNING" enabled="false" /> + <inspection_tool class="CastThatLosesPrecision" level="WARNING" enabled="false" /> + <inspection_tool class="StringBufferField" level="WARNING" enabled="false" /> + <inspection_tool class="SwitchStatementWithConfusingDeclaration" level="WARNING" enabled="false" /> + <inspection_tool class="OverlyComplexArithmeticExpression" level="WARNING" enabled="false"> + <option name="m_limit" value="6" /> + </inspection_tool> + <inspection_tool class="JUnitAbstractTestClassNamingConvention" level="WARNING" enabled="false"> + <option name="m_regex" value="[A-Z][A-Za-z\d]*TestCase" /> + <option name="m_minLength" value="12" /> + <option name="m_maxLength" value="64" /> + </inspection_tool> + <inspection_tool class="UnnecessaryModuleDependencyInspection" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryParentheses" level="WARNING" enabled="false" /> + <inspection_tool class="IncrementDecrementResultUsedJS" level="WARNING" enabled="false" /> + <inspection_tool class="TestCaseInProductCode" level="WARNING" enabled="false" /> + <inspection_tool class="ChainedEquality" level="WARNING" enabled="false" /> + <inspection_tool class="SuppressionAnnotation" level="WARNING" enabled="false" /> + <inspection_tool class="OctalIntegerJS" level="WARNING" enabled="false" /> + <inspection_tool class="SerializableClassInSecureContext" level="WARNING" enabled="false" /> + <inspection_tool class="NonBlockStatementBodyJS" level="WARNING" enabled="false" /> + <inspection_tool class="InterfaceWithOnlyOneDirectInheritor" level="WARNING" enabled="false" /> + <inspection_tool class="NestedMethodCall" level="WARNING" enabled="false"> + <option name="m_ignoreFieldInitializations" value="true" /> + </inspection_tool> + <inspection_tool class="FieldAccessedSynchronizedAndUnsynchronized" level="WARNING" enabled="false"> + <option name="countGettersAndSetters" value="false" /> + </inspection_tool> + <inspection_tool class="OverloadedVarargsMethod" level="WARNING" enabled="false" /> + <inspection_tool class="CatchGenericClass" level="WARNING" enabled="false" /> + <inspection_tool class="ParametersPerFunctionJS" level="WARNING" enabled="false"> + <option name="m_limit" value="5" /> + </inspection_tool> + <inspection_tool class="ZeroLengthArrayInitialization" level="WARNING" enabled="false" /> + <inspection_tool class="PackageVisibleField" level="WARNING" enabled="false" /> + <inspection_tool class="AbstractClassWithOnlyOneDirectInheritor" level="WARNING" enabled="false" /> + <inspection_tool class="OverridableMethodCallDuringObjectConstruction" level="WARNING" enabled="false" /> + <inspection_tool class="StaticNonFinalField" level="WARNING" enabled="false" /> + <inspection_tool class="DynamicallyGeneratedCodeJS" level="WARNING" enabled="false" /> + <inspection_tool class="TimeToString" level="WARNING" enabled="false" /> + <inspection_tool class="SubstringZero" level="WARNING" enabled="false" /> + <inspection_tool class="ObsoleteCollection" level="WARNING" enabled="false" /> + <inspection_tool class="ClassWithoutNoArgConstructor" level="WARNING" enabled="false"> + <option name="m_ignoreClassesWithNoConstructors" value="true" /> + </inspection_tool> + <inspection_tool class="PublicField" level="WARNING" enabled="false" /> + <inspection_tool class="ConstantDeclaredInAbstractClass" level="WARNING" enabled="false" /> + <inspection_tool class="TooBroadCatch" level="WARNING" enabled="false" /> + <inspection_tool class="ThrownExceptionsPerMethod" level="WARNING" enabled="false"> + <option name="m_limit" value="3" /> + </inspection_tool> + <inspection_tool class="MethodOnlyUsedFromInnerClass" level="WARNING" enabled="false"> + <option name="ignoreMethodsAccessedFromAnonymousClass" value="false" /> + </inspection_tool> + <inspection_tool class="ResultOfObjectAllocationIgnored" level="WARNING" enabled="true" /> + <inspection_tool class="OverriddenMethodCallInConstructor" level="WARNING" enabled="false" /> + <inspection_tool class="PublicStaticArrayField" level="WARNING" enabled="false" /> + <inspection_tool class="AwaitNotInLoop" level="WARNING" enabled="false" /> + <inspection_tool class="UnsecureRandomNumberGeneration" level="WARNING" enabled="false" /> + <inspection_tool class="NestedFunctionJS" level="WARNING" enabled="false"> + <option name="m_includeAnonymousFunctions" value="false" /> + </inspection_tool> + <inspection_tool class="ParametersPerMethod" level="WARNING" enabled="false"> + <option name="m_limit" value="5" /> + </inspection_tool> + <inspection_tool class="InstanceofIncompatibleInterface" level="WARNING" enabled="true" /> + <inspection_tool class="AnonymousClassMethodCount" level="WARNING" enabled="false"> + <option name="m_limit" value="1" /> + </inspection_tool> + <inspection_tool class="WaitOrAwaitWithoutTimeout" level="WARNING" enabled="false" /> + <inspection_tool class="ClassComplexity" level="WARNING" enabled="false"> + <option name="m_limit" value="80" /> + </inspection_tool> + <inspection_tool class="ExtendsThread" level="WARNING" enabled="false" /> + <inspection_tool class="EqualsBetweenInconvertibleTypes" level="WARNING" enabled="true" /> + <inspection_tool class="InstanceofInterfaces" level="WARNING" enabled="false" /> + <inspection_tool class="StringEquals" level="WARNING" enabled="false" /> + <inspection_tool class="MagicNumberJS" level="WARNING" enabled="false" /> + <inspection_tool class="MisspelledTearDown" level="WARNING" enabled="false" /> + <inspection_tool class="NegatedConditionalExpressionJS" level="WARNING" enabled="false" /> + <inspection_tool class="TestCaseWithConstructor" level="WARNING" enabled="false" /> + <inspection_tool class="MisspelledHashcode" level="WARNING" enabled="true" /> + <inspection_tool class="EnumSwitchStatementWhichMissesCases" level="WARNING" enabled="false"> + <option name="ignoreSwitchStatementsWithDefault" value="false" /> + </inspection_tool> + <inspection_tool class="BlockStatementJS" level="WARNING" enabled="false" /> + <inspection_tool class="ClassReferencesSubclass" level="WARNING" enabled="false" /> + <inspection_tool class="SetupCallsSuperSetup" level="WARNING" enabled="false" /> + <inspection_tool class="UnconstructableTestCase" level="WARNING" enabled="false" /> + <inspection_tool class="AssignmentResultUsedJS" level="WARNING" enabled="false" /> + <inspection_tool class="ClassWithoutLogger" level="WARNING" enabled="false"> + <option name="loggerClassName" value="java.util.logging.Logger" /> + <option name="ignoreSuperLoggers" value="false" /> + </inspection_tool> + <inspection_tool class="VolatileLongOrDoubleField" level="WARNING" enabled="false" /> + <inspection_tool class="AnnotationClass" level="WARNING" enabled="false" /> + <inspection_tool class="TailRecursionJS" level="WARNING" enabled="false" /> + <inspection_tool class="StringBufferMustHaveInitialCapacity" level="WARNING" enabled="false" /> + <inspection_tool class="MethodMayBeStatic" level="WARNING" enabled="false"> + <option name="m_onlyPrivateOrFinal" value="false" /> + <option name="m_ignoreEmptyMethods" value="true" /> + </inspection_tool> + <inspection_tool class="TypeParameterHidesVisibleType" level="WARNING" enabled="false" /> + <inspection_tool class="DateToString" level="WARNING" enabled="false" /> + <inspection_tool class="OverloadedMethodsWithSameNumberOfParameters" level="WARNING" enabled="false" /> + <inspection_tool class="NestedSwitchStatement" level="WARNING" enabled="false" /> + <inspection_tool class="CStyleArrayDeclaration" level="WARNING" enabled="false" /> + <inspection_tool class="NakedNotify" level="WARNING" enabled="false" /> + <inspection_tool class="SwitchStatementDensity" level="WARNING" enabled="false"> + <option name="m_limit" value="20" /> + </inspection_tool> + <inspection_tool class="RefusedBequest" level="WARNING" enabled="false"> + <option name="ignoreEmptySuperMethods" value="false" /> + </inspection_tool> + <inspection_tool class="NonSerializableWithSerialVersionUIDField" level="WARNING" enabled="false" /> + <inspection_tool class="SwitchStatementWithTooFewBranches" level="WARNING" enabled="false"> + <option name="m_limit" value="2" /> + </inspection_tool> + <inspection_tool class="ForeachStatement" level="WARNING" enabled="false" /> + <inspection_tool class="NestingDepthJS" level="WARNING" enabled="false"> + <option name="m_limit" value="5" /> + </inspection_tool> + <inspection_tool class="AnonymousInnerClassMayBeStatic" level="WARNING" enabled="false" /> + <inspection_tool class="CheckForOutOfMemoryOnLargeArrayAllocation" level="WARNING" enabled="false"> + <option name="m_limit" value="64" /> + </inspection_tool> + <inspection_tool class="JDBCPrepareStatementWithNonConstantString" level="WARNING" enabled="false" /> + <inspection_tool class="NonStaticFinalLogger" level="WARNING" enabled="false"> + <option name="loggerClassName" value="java.util.logging.Logger" /> + </inspection_tool> + <inspection_tool class="NoopMethodInAbstractClass" level="WARNING" enabled="false" /> + <inspection_tool class="SystemGC" level="WARNING" enabled="false" /> + <inspection_tool class="NonFinalFieldOfException" level="WARNING" enabled="false" /> + <inspection_tool class="ConditionSignal" level="WARNING" enabled="false" /> + <inspection_tool class="NestedTryStatement" level="WARNING" enabled="false" /> + <inspection_tool class="JDBCExecuteWithNonConstantString" level="WARNING" enabled="false" /> + <inspection_tool class="SystemSetSecurityManager" level="WARNING" enabled="false" /> + <inspection_tool class="ProtectedInnerClass" level="WARNING" enabled="false" /> + <inspection_tool class="BreakStatementWithLabelJS" level="WARNING" enabled="false" /> + <inspection_tool class="Finalize" level="WARNING" enabled="false" /> + <inspection_tool class="SignalWithoutCorrespondingAwait" level="WARNING" enabled="false" /> + <inspection_tool class="ControlFlowStatementWithoutBraces" level="WARNING" enabled="false" /> + <inspection_tool class="ThreadWithDefaultRunMethod" level="WARNING" enabled="false" /> + <inspection_tool class="ConfusingFloatingPointLiteralJS" level="WARNING" enabled="false" /> + <inspection_tool class="ClassEscapesItsScope" level="WARNING" enabled="false" /> + <inspection_tool class="InstantiationOfUtilityClass" level="WARNING" enabled="true" /> + <inspection_tool class="WhileLoopSpinsOnField" level="WARNING" enabled="false" /> + <inspection_tool class="IfStatementWithIdenticalBranches" level="WARNING" enabled="false" /> + <inspection_tool class="TestMethodIsPublicVoidNoArg" level="WARNING" enabled="false" /> + <inspection_tool class="ObjectToString" level="WARNING" enabled="true" /> + <inspection_tool class="LocalVariableHidingMemberVariable" level="WARNING" enabled="false"> + <option name="m_ignoreInvisibleFields" value="true" /> + <option name="m_ignoreStaticMethods" value="true" /> + </inspection_tool> + <inspection_tool class="MultipleReturnPointsPerMethod" level="WARNING" enabled="false"> + <option name="m_limit" value="1" /> + </inspection_tool> + <inspection_tool class="BreakStatementWithLabel" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryBlockStatement" level="WARNING" enabled="false" /> + <inspection_tool class="CloneInNonCloneableClass" level="WARNING" enabled="false" /> + <inspection_tool class="AbstractMethodOverridesConcreteMethod" level="WARNING" enabled="false" /> + <inspection_tool class="ReadObjectAndWriteObjectPrivate" level="WARNING" enabled="false" /> + <inspection_tool class="ThreadStopSuspendResume" level="WARNING" enabled="false" /> + <inspection_tool class="LengthOneStringInIndexOf" level="WARNING" enabled="false" /> + <inspection_tool class="VolatileArrayField" level="WARNING" enabled="false" /> + <inspection_tool class="LiteralAsArgToStringEquals" level="WARNING" enabled="false" /> + <inspection_tool class="NativeMethods" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryFinalOnLocalVariable" level="WARNING" enabled="false" /> + <inspection_tool class="AnonymousClassComplexity" level="WARNING" enabled="false"> + <option name="m_limit" value="3" /> + </inspection_tool> + <inspection_tool class="InnerClassMayBeStatic" level="WARNING" enabled="false" /> + <inspection_tool class="RedundantFieldInitialization" level="WARNING" enabled="false" /> + <inspection_tool class="StaticSuite" level="WARNING" enabled="false" /> + <inspection_tool class="StringBufferToStringInConcatenation" level="WARNING" enabled="false" /> + <inspection_tool class="ConstantStringIntern" level="WARNING" enabled="false" /> + <inspection_tool class="DuplicateBooleanBranch" level="WARNING" enabled="false" /> + <inspection_tool class="MethodOverridesStaticMethod" level="WARNING" enabled="false" /> + <inspection_tool class="DesignForExtension" level="WARNING" enabled="false" /> + <inspection_tool class="UtilityClassWithPublicConstructor" level="WARNING" enabled="false" /> + <inspection_tool class="ForLoopReplaceableByWhile" level="WARNING" enabled="false"> + <option name="m_ignoreLoopsWithoutConditions" value="false" /> + </inspection_tool> + <inspection_tool class="ThrowablePrintStackTrace" level="WARNING" enabled="false" /> + <inspection_tool class="CloneableClassInSecureContext" level="WARNING" enabled="false" /> + <inspection_tool class="AssignmentToForLoopParameter" level="WARNING" enabled="false"> + <option name="m_checkForeachParameters" value="false" /> + </inspection_tool> + <inspection_tool class="ObjectAllocationIgnoredJS" level="WARNING" enabled="false" /> + <inspection_tool class="ClassNamePrefixedWithPackageName" level="WARNING" enabled="false" /> + <inspection_tool class="SSBasedInspection" level="WARNING" enabled="false" /> + <inspection_tool class="CallToSimpleGetterInClass" level="WARNING" enabled="false"> + <option name="ignoreGetterCallsOnOtherObjects" value="false" /> + </inspection_tool> + <inspection_tool class="EmptyCatchBlockJS" level="WARNING" enabled="false" /> + <inspection_tool class="ClassInheritanceDepth" level="WARNING" enabled="false"> + <option name="m_limit" value="2" /> + </inspection_tool> + <inspection_tool class="ClassNameDiffersFromFileName" level="WARNING" enabled="false" /> + <inspection_tool class="LoadLibraryWithNonConstantString" level="WARNING" enabled="false" /> + <inspection_tool class="TextLabelInSwitchStatement" level="WARNING" enabled="true" /> + <inspection_tool class="SuspiciousSystemArraycopy" level="WARNING" enabled="true" /> + <inspection_tool class="SocketResource" level="WARNING" enabled="false" /> + <inspection_tool class="LocalCanBeFinal" level="WARNING" enabled="false"> + <option name="REPORT_VARIABLES" value="true" /> + <option name="REPORT_PARAMETERS" value="true" /> + </inspection_tool> + <inspection_tool class="InstanceofCatchParameter" level="WARNING" enabled="false" /> + <inspection_tool class="ImplicitNumericConversion" level="WARNING" enabled="false"> + <option name="m_ignoreWideningConversions" value="false" /> + </inspection_tool> + <inspection_tool class="UnnecessaryInterfaceModifier" level="WARNING" enabled="false" /> + <inspection_tool class="ConfusingPlusesOrMinusesJS" level="WARNING" enabled="false" /> + <inspection_tool class="MisorderedAssertEqualsParameters" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryConstructor" level="WARNING" enabled="false" /> + <inspection_tool class="MethodNameSameAsParentName" level="WARNING" enabled="false" /> + <inspection_tool class="JavaLangReflect" level="WARNING" enabled="false" /> + <inspection_tool class="NestedAssignment" level="WARNING" enabled="false" /> + <inspection_tool class="ThisEscapedInConstructor" level="WARNING" enabled="false" /> + <inspection_tool class="WaitNotInSynchronizedContext" level="WARNING" enabled="false" /> + <inspection_tool class="UseOfProcessBuilder" level="WARNING" enabled="false" /> + <inspection_tool class="ImplicitCallToSuper" level="WARNING" enabled="false"> + <option name="m_ignoreForObjectSubclasses" value="false" /> + </inspection_tool> + <inspection_tool class="CompareToUsesNonFinalVariable" level="WARNING" enabled="true" /> + <inspection_tool class="NonSerializableFieldInSerializableClass" level="WARNING" enabled="false"> + <option name="ignoreSerializableDueToInheritance" value="true" /> + </inspection_tool> + <inspection_tool class="UnqualifiedStaticUsage" level="WARNING" enabled="false"> + <option name="m_ignoreStaticFieldAccesses" value="false" /> + <option name="m_ignoreStaticMethodCalls" value="false" /> + <option name="m_ignoreStaticAccessFromStaticContext" value="false" /> + </inspection_tool> + <inspection_tool class="CallerJS" level="WARNING" enabled="false" /> + <inspection_tool class="SimplifiableJUnitAssertion" level="WARNING" enabled="false" /> + <inspection_tool class="ObjectNotify" level="WARNING" enabled="false" /> + <inspection_tool class="CloneCallsCons... [truncated message content] |
From: <chr...@us...> - 2006-12-10 21:16:07
|
Revision: 1043 http://svn.sourceforge.net/gridarta/?rev=1043&view=rev Author: christianhujer Date: 2006-12-10 13:16:07 -0800 (Sun, 10 Dec 2006) Log Message: ----------- Hardened policy. Mainly rationalized static field access. Modified Paths: -------------- 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/CopyBuffer.java trunk/crossfire/src/cfeditor/ScriptArchData.java trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java trunk/crossfire/src/cfeditor/gui/ScriptEditor.java trunk/crossfire/src/cfeditor/gui/ScriptManager.java trunk/daimonin/src/daieditor/ReplaceDialog.java trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java trunk/daimonin/src/daieditor/gui/AboutDialog.java trunk/daimonin/src/daieditor/gui/map/MapUserListener.java trunk/daimonin/src/daieditor/gui/map/tools/ToolSelectorPane.java trunk/src/app/net/sf/gridarta/gameobject/NamedObjects.java Modified: trunk/crossfire/src/cfeditor/CMainToolbar.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainToolbar.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/crossfire/src/cfeditor/CMainToolbar.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -30,6 +30,7 @@ import java.awt.event.ActionListener; 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; @@ -37,6 +38,7 @@ import javax.swing.JPopupMenu; import javax.swing.JRadioButtonMenuItem; import javax.swing.JToolBar; +import javax.swing.SwingConstants; import org.jetbrains.annotations.Nullable; /** @@ -78,7 +80,7 @@ * @param mainControl The controller of this toolbar. */ CMainToolbar(final CMainControl mainControl) { - super(JToolBar.VERTICAL); // construct with vertical alignment + super(SwingConstants.VERTICAL); // construct with vertical alignment this.mainControl = mainControl; eIconAndLabelVisibility = Integer.parseInt(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(SHOW_ICONS_AND_LABELS_KEY, "" + SHOW_ICONS_ONLY)); @@ -86,7 +88,7 @@ addMouseListener( new MouseAdapter() { @Override public void mousePressed(final MouseEvent event) { - if ((event.getModifiers() & MouseEvent.META_MASK) != 0) { + if ((event.getModifiers() & InputEvent.META_MASK) != 0) { popupMenu.show(CMainToolbar.this, event.getX(), event.getY()); } } @@ -132,8 +134,8 @@ mainControl.createNew(); } }); - newButton.setVerticalTextPosition(JButton.BOTTOM); - newButton.setHorizontalTextPosition(JButton.CENTER); + newButton.setVerticalTextPosition(SwingConstants.BOTTOM); + newButton.setHorizontalTextPosition(SwingConstants.CENTER); buttons.addElement(newButton); add(newButton); @@ -146,8 +148,8 @@ mainControl.open(); } }); - open.setVerticalTextPosition(JButton.BOTTOM); - open.setHorizontalTextPosition(JButton.CENTER); + open.setVerticalTextPosition(SwingConstants.BOTTOM); + open.setHorizontalTextPosition(SwingConstants.CENTER); buttons.addElement(open); add(open); @@ -160,8 +162,8 @@ mainControl.save(); } }); - save.setVerticalTextPosition(JButton.BOTTOM); - save.setHorizontalTextPosition(JButton.CENTER); + save.setVerticalTextPosition(SwingConstants.BOTTOM); + save.setHorizontalTextPosition(SwingConstants.CENTER); buttons.addElement(save); add(save); @@ -174,8 +176,8 @@ mainControl.saveAs(); } }); - saveAs.setVerticalTextPosition(JButton.BOTTOM); - saveAs.setHorizontalTextPosition(JButton.CENTER); + saveAs.setVerticalTextPosition(SwingConstants.BOTTOM); + saveAs.setHorizontalTextPosition(SwingConstants.CENTER); buttons.addElement(saveAs); add(saveAs); @@ -190,8 +192,8 @@ mainControl.prevWindow(); } }); - prevWindow.setVerticalTextPosition(JButton.BOTTOM); - prevWindow.setHorizontalTextPosition(JButton.CENTER); + prevWindow.setVerticalTextPosition(SwingConstants.BOTTOM); + prevWindow.setHorizontalTextPosition(SwingConstants.CENTER); buttons.addElement(prevWindow); add(prevWindow); @@ -204,8 +206,8 @@ mainControl.nextWindow(); } }); - nextWindow.setVerticalTextPosition(JButton.BOTTOM); - nextWindow.setHorizontalTextPosition(JButton.CENTER); + nextWindow.setVerticalTextPosition(SwingConstants.BOTTOM); + nextWindow.setHorizontalTextPosition(SwingConstants.CENTER); buttons.addElement(nextWindow); add(nextWindow); Modified: trunk/crossfire/src/cfeditor/CMainView.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainView.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/crossfire/src/cfeditor/CMainView.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -43,6 +43,8 @@ import javax.swing.JOptionPane; import javax.swing.JTabbedPane; import javax.swing.UIManager; +import javax.swing.SwingConstants; +import javax.swing.JSplitPane; import javax.swing.event.InternalFrameEvent; import javax.swing.event.InternalFrameListener; import net.sf.gridarta.gui.GSplitPane; @@ -203,7 +205,7 @@ setJMenuBar(menu); // initialize pickmap panel - pickmapPanel = new JTabbedPane(JTabbedPane.TOP); + pickmapPanel = new JTabbedPane(SwingConstants.TOP); pickmapPanel.setBorder(BorderFactory.createEmptyBorder(IGUIConstants.SPACE_PICKARCH_TOP, 0, 0, 0)); CPickmapPanel.getInstance().addPickmapSelectionListener(pickmapPanel); @@ -217,7 +219,7 @@ if (!mapTileListBottom) { // the map tile list is on the right side - splitRightPane = new GSplitPane(GSplitPane.HORIZONTAL_SPLIT, mapDesktop, mapTileList); + splitRightPane = new GSplitPane(JSplitPane.HORIZONTAL_SPLIT, mapDesktop, mapTileList); splitRightPane.setDividerLocation(divLocationRight); splitRightPane.setDividerSize(BORDER_SIZE); @@ -225,14 +227,14 @@ getContentPane().add(splitRightPane, BorderLayout.CENTER); mapArchPanel = new CMapArchPanel(mainControl, this); - splitDownPane = new GSplitPane(GSplitPane.VERTICAL_SPLIT, splitRightPane, mapArchPanel); + splitDownPane = new GSplitPane(JSplitPane.VERTICAL_SPLIT, splitRightPane, mapArchPanel); splitDownPane.setDividerLocation(divLocationDown); splitDownPane.setDividerSize(BORDER_SIZE); getContentPane().add(splitDownPane, BorderLayout.CENTER); - splitPane = new GSplitPane(GSplitPane.HORIZONTAL_SPLIT, archPanel, splitDownPane); + splitPane = new GSplitPane(JSplitPane.HORIZONTAL_SPLIT, archPanel, splitDownPane); splitPane.setDividerLocation(divLocation); splitPane.setDividerSize(BORDER_SIZE); @@ -240,20 +242,20 @@ } else { // the map tile list is merged into the bottom panel mapArchPanel = new CMapArchPanel(mainControl, this); - splitRightPane = new GSplitPane(GSplitPane.HORIZONTAL_SPLIT, mapArchPanel, mapTileList); + splitRightPane = new GSplitPane(JSplitPane.HORIZONTAL_SPLIT, mapArchPanel, mapTileList); splitRightPane.setDividerLocation(divLocationRight); splitRightPane.setDividerSize(BORDER_SIZE); // split off the bottom panel - splitDownPane = new GSplitPane(GSplitPane.VERTICAL_SPLIT, mapDesktop, splitRightPane); + splitDownPane = new GSplitPane(JSplitPane.VERTICAL_SPLIT, mapDesktop, splitRightPane); splitDownPane.setDividerLocation(divLocationDown); splitDownPane.setDividerSize(BORDER_SIZE); getContentPane().add(splitDownPane, BorderLayout.CENTER); // split off the left arch panel - splitPane = new GSplitPane(GSplitPane.HORIZONTAL_SPLIT, archPanel, splitDownPane); + splitPane = new GSplitPane(JSplitPane.HORIZONTAL_SPLIT, archPanel, splitDownPane); splitPane.setDividerLocation(divLocation); splitPane.setDividerSize(BORDER_SIZE); Modified: trunk/crossfire/src/cfeditor/CMapTileList.java =================================================================== --- trunk/crossfire/src/cfeditor/CMapTileList.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/crossfire/src/cfeditor/CMapTileList.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -37,6 +37,7 @@ import java.awt.event.ActionListener; 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,6 +46,8 @@ 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 static javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER; import static javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER; @@ -102,7 +105,7 @@ list.setCellRenderer(new MyCellRenderer()); list.setBackground(Color.lightGray); final JScrollPane scrollPane = new JScrollPane(list); - scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); scrollPane.getViewport().setScrollMode(SIMPLE_SCROLL_MODE); add(scrollPane, BorderLayout.CENTER); @@ -132,8 +135,8 @@ } } }); - buttonDown.setVerticalTextPosition(JButton.BOTTOM); - buttonDown.setHorizontalTextPosition(JButton.CENTER); + buttonDown.setVerticalTextPosition(SwingConstants.BOTTOM); + buttonDown.setHorizontalTextPosition(SwingConstants.CENTER); if (!mainView.isMapTileListBottom()) { dummy.add(buttonDown, BorderLayout.EAST); } @@ -149,8 +152,8 @@ } } }); - buttonUp.setVerticalTextPosition(JButton.BOTTOM); - buttonUp.setHorizontalTextPosition(JButton.CENTER); + buttonUp.setVerticalTextPosition(SwingConstants.BOTTOM); + buttonUp.setHorizontalTextPosition(SwingConstants.CENTER); if (!mainView.isMapTileListBottom()) { dummy.add(buttonUp, BorderLayout.WEST); } else { @@ -169,7 +172,7 @@ */ list.addMouseListener(new MouseAdapter() { @Override public void mousePressed(final MouseEvent e) { - if (e.getModifiers() == MouseEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown()) { + if (e.getModifiers() == InputEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown()) { // --- left mouse button: select arch --- // first, check if this is a doubleclick final long thisClick = (new Date()).getTime(); @@ -184,7 +187,7 @@ // save values for next click lastClick = thisClick; lastClickGameObject = getMapTileSelection(); - } else if ((e.getModifiers() & MouseEvent.BUTTON3_MASK) != 0 || ((e.getModifiers() & MouseEvent.BUTTON1_MASK) != 0 && e.isShiftDown())) { + } else if ((e.getModifiers() & InputEvent.BUTTON3_MASK) != 0 || ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0 && e.isShiftDown())) { // --- right mouse button: insert arch --- if (currentSquare != null && mainControl.getArchPanelHighlight() != null) { Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java =================================================================== --- trunk/crossfire/src/cfeditor/CMapViewBasic.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/crossfire/src/cfeditor/CMapViewBasic.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -36,12 +36,14 @@ 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.Iterator; import javax.imageio.ImageIO; import javax.swing.JScrollPane; import javax.swing.JViewport; +import javax.swing.ScrollPaneConstants; import net.sf.gridarta.EditOperation; import net.sf.gridarta.Size2D; import org.apache.log4j.Logger; @@ -114,7 +116,7 @@ */ CMapViewBasic(final CMainControl mainControl, final MapControl mapControl, final MapView fi, final Point initial) { //super("Map ["+control.getMapFileName()+"]", true, true, true, true); - super(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + super(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); this.mapControl = mapControl; this.mainControl = mainControl; frame = fi; @@ -519,7 +521,7 @@ if (mapLoc != null) { // in "locked pickmaps" mode, pickmaps react only to leftclicks - if (mapControl.isPickmap() && mainControl.isLockAllPickmaps() && !(e.getModifiers() == MouseEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown())) { + if (mapControl.isPickmap() && mainControl.isLockAllPickmaps() && !(e.getModifiers() == InputEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown())) { return; } @@ -539,9 +541,9 @@ } // right mouse button: insert arch - if ((e.getModifiers() & MouseEvent.BUTTON3_MASK) != 0) { + if ((e.getModifiers() & InputEvent.BUTTON3_MASK) != 0) { insertObject(mapLoc); - } else if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) != 0) { + } else if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0) { if (e.isShiftDown()) { insertObject(mapLoc); } else if (e.isControlDown()) { @@ -577,9 +579,9 @@ @Override public void mouseReleased(final MouseEvent event) { final int buttonNr; // Number of released mouse button - if (event.getModifiers() == MouseEvent.BUTTON1_MASK) { + if (event.getModifiers() == InputEvent.BUTTON1_MASK) { buttonNr = 0; // left button - } else if (event.getModifiers() == MouseEvent.BUTTON3_MASK) { + } else if (event.getModifiers() == InputEvent.BUTTON3_MASK) { buttonNr = 2; // right button } else { buttonNr = 1; // middle @@ -615,7 +617,7 @@ temp = new Point(-1, -1); } - if (event.getModifiers() == MouseEvent.BUTTON1_MASK) { + if (event.getModifiers() == InputEvent.BUTTON1_MASK) { // Left Mouse Button: Selected area gets highlighted // Update offset (from starting-dragpoint) only when mouse moved @@ -627,7 +629,7 @@ renderer.modelChanged(); } - } else if (event.getModifiers() == MouseEvent.BUTTON3_MASK) { + } else if (event.getModifiers() == InputEvent.BUTTON3_MASK) { // Right Mouse Button: Arches get inserted all the way if (temp.x != mapMouseRightPos.x || mapMouseRightPos.y != temp.y) { mapMouseRightPos.x = temp.x; Modified: trunk/crossfire/src/cfeditor/CopyBuffer.java =================================================================== --- trunk/crossfire/src/cfeditor/CopyBuffer.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/crossfire/src/cfeditor/CopyBuffer.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -33,6 +33,7 @@ import java.awt.Rectangle; import java.util.HashSet; import net.sf.gridarta.Size2D; +import net.sf.gridarta.MainControl; import org.apache.log4j.Logger; import org.jetbrains.annotations.Nullable; @@ -320,7 +321,7 @@ // cycle through all tile coordinates which are highlighted: for (pos.x = startp.x; pos.x - startp.x <= offset.x; pos.x++) { for (pos.y = startp.y; pos.y - startp.y <= offset.y; pos.y++) { - if (density != -1 && density != 100 && density < CMainControl.rnd.nextInt(100) + 1) { + if (density != -1 && density != 100 && density < MainControl.rnd.nextInt(100) + 1) { continue; } // Insert the new arch into the map Modified: trunk/crossfire/src/cfeditor/ScriptArchData.java =================================================================== --- trunk/crossfire/src/cfeditor/ScriptArchData.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/crossfire/src/cfeditor/ScriptArchData.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -46,6 +46,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTextField; +import javax.swing.WindowConstants; import static javax.swing.WindowConstants.HIDE_ON_CLOSE; import net.sf.gridarta.textedit.scripteditor.ScriptEditControl; import net.sf.japi.util.Arrays2; @@ -724,7 +725,7 @@ if (pathFrame == null) { // initialize popup frame pathFrame = new JDialog(CMainControl.getInstance().getMainView(), "Edit Parameters", true); - pathFrame.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); + pathFrame.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); final JPanel mainPanel = new JPanel(); mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS)); Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java =================================================================== --- trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -438,7 +438,7 @@ } // if the type is still unset, then we take the default one - if (gameObject.getArchTypNr() == GameObject.TYPE_UNSET) { + if (gameObject.getArchTypNr() == net.sf.gridarta.gameobject.GameObject.TYPE_UNSET) { gameObject.setArchTypNr(archetype.getArchTypNr()); } Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java =================================================================== --- trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -700,7 +700,7 @@ } // finally we need to get the "map"-arch, which is not in the panels - final Archetype<GameObject> maparch = getArchetype(ArchetypeParser.STARTARCH_NAME); + final Archetype<GameObject> maparch = getArchetype(net.sf.gridarta.gameobject.ArchetypeParser.STARTARCH_NAME); if (maparch != null) { count++; @@ -709,7 +709,7 @@ // map object hack: x/y is normally a reference for multi // part arches - i include this hack until we rework the // arch objects with more useful script names - if (maparch.getArchetypeName().compareTo(ArchetypeParser.STARTARCH_NAME) == 0) { + if (maparch.getArchetypeName().compareTo(net.sf.gridarta.gameobject.ArchetypeParser.STARTARCH_NAME) == 0) { out.writeBytes("x " + maparch.getMultiX() + "\n"); out.writeBytes("y " + maparch.getMultiY() + "\n"); } Modified: trunk/crossfire/src/cfeditor/gui/ScriptEditor.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/ScriptEditor.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/crossfire/src/cfeditor/gui/ScriptEditor.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -37,6 +37,7 @@ import javax.swing.JScrollPane; import javax.swing.JTabbedPane; import javax.swing.JTextArea; +import javax.swing.SwingConstants; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.DocumentEvent; @@ -122,7 +123,7 @@ gbc.fill = GridBagConstraints.HORIZONTAL; gbc.weightx = 1.0; gbc.gridwidth = 2; - optionsTab.add(new JLabel("Plugin run mode", JLabel.LEFT), gbc); + optionsTab.add(new JLabel("Plugin run mode", SwingConstants.LEFT), gbc); gbc.gridwidth = 1; gbc.gridy = 1; gbc.weightx = 0.1; Modified: trunk/crossfire/src/cfeditor/gui/ScriptManager.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/ScriptManager.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/crossfire/src/cfeditor/gui/ScriptManager.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -24,6 +24,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.ListModel; +import javax.swing.ListSelectionModel; import javax.swing.border.LineBorder; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -94,7 +95,7 @@ } } }); - scripts.setSelectionMode(DefaultListSelectionModel.SINGLE_SELECTION); + scripts.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); scripts.setBorder(new LineBorder(Color.black, 1)); left.add(scripts, BorderLayout.CENTER); final JButton addScriptBtn = new JButton("New..."); Modified: trunk/daimonin/src/daieditor/ReplaceDialog.java =================================================================== --- trunk/daimonin/src/daieditor/ReplaceDialog.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/daimonin/src/daieditor/ReplaceDialog.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -45,6 +45,7 @@ import javax.swing.JTextField; import javax.swing.WindowConstants; import net.sf.gridarta.map.MapSquare; +import net.sf.gridarta.MainControl; import net.sf.japi.swing.ActionFactory; /** @@ -325,7 +326,7 @@ if (replaceListSize == 1) { randomArch = replaceList.get(0); } else { - randomArch = replaceList.get(CMainControl.rnd.nextInt(replaceList.size())); + randomArch = replaceList.get(MainControl.rnd.nextInt(replaceList.size())); } if (randomArch.isMulti()) { // multi's cannot be inserted properly, so we just put them ontop Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java =================================================================== --- trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -425,7 +425,7 @@ } gameObject.setRealFace(gameObject.getFaceRealName()); // if the type is still unset, then we take the default one - if (gameObject.getArchTypNr() == GameObject.TYPE_UNSET) { + if (gameObject.getArchTypNr() == net.sf.gridarta.gameobject.GameObject.TYPE_UNSET) { gameObject.setArchTypNr(archetype.getArchTypNr()); } Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java =================================================================== --- trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -470,7 +470,7 @@ artifactCount++; continue; } - if (arch.getArchetypeName().compareTo(ArchetypeParser.STARTARCH_NAME) == 0) { + if (arch.getArchetypeName().compareTo(net.sf.gridarta.gameobject.ArchetypeParser.STARTARCH_NAME) == 0) { // process map arch out.append("Object ").append(arch.getArchetypeName()).append('\n'); @@ -478,7 +478,7 @@ // map object hack: x/y is normally a reference for multi // part arches - i include this hack until we rework the // arch objects with more useful script names - if (arch.getArchetypeName().equals(ArchetypeParser.STARTARCH_NAME)) { + if (arch.getArchetypeName().equals(net.sf.gridarta.gameobject.ArchetypeParser.STARTARCH_NAME)) { out.append("x ").append(Integer.toString(arch.getMultiX())).append('\n'); out.append("y ").append(Integer.toString(arch.getMultiY())).append('\n'); } Modified: trunk/daimonin/src/daieditor/gui/AboutDialog.java =================================================================== --- trunk/daimonin/src/daieditor/gui/AboutDialog.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/daimonin/src/daieditor/gui/AboutDialog.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -20,6 +20,7 @@ import javax.swing.JScrollPane; import javax.swing.JTabbedPane; import javax.swing.JTextArea; +import javax.swing.SwingConstants; import net.sf.japi.swing.ActionFactory; /** @@ -70,7 +71,7 @@ } catch (final Exception e) { /* ignore */ } - final JLabel aboutTab = new JLabel(ACTION_FACTORY.format("about", System.getProperty("java.version"), buildNumber, buildDeveloper, buildTstamp), JLabel.CENTER); + final JLabel aboutTab = new JLabel(ACTION_FACTORY.format("about", System.getProperty("java.version"), buildNumber, buildDeveloper, buildTstamp), SwingConstants.CENTER); aboutTab.setName(ACTION_FACTORY.getString("aboutTab.title")); return aboutTab; } Modified: trunk/daimonin/src/daieditor/gui/map/MapUserListener.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/MapUserListener.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/daimonin/src/daieditor/gui/map/MapUserListener.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -31,6 +31,7 @@ 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; @@ -111,7 +112,7 @@ public void mousePressed(final MouseEvent e) { // in "locked pickmaps" mode, pickmaps react only to leftclicks assert mapControl != null; - if (mapControl.isPickmap() && mainControl.isLockAllPickmaps() && !(e.getModifiers() == MouseEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown())) { + if (mapControl.isPickmap() && mainControl.isLockAllPickmaps() && !(e.getModifiers() == InputEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown())) { return; } final MouseOpListener mouseOpListener = getMouseOperation(e); Modified: trunk/daimonin/src/daieditor/gui/map/tools/ToolSelectorPane.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/tools/ToolSelectorPane.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/daimonin/src/daieditor/gui/map/tools/ToolSelectorPane.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -3,6 +3,7 @@ import daieditor.gui.map.event.MouseOpEvent; import java.awt.BorderLayout; import java.awt.event.MouseEvent; +import java.awt.event.InputEvent; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTabbedPane; @@ -62,11 +63,11 @@ break; default: final int mask = event.getModifiers(); - if ((mask & MouseEvent.BUTTON1_DOWN_MASK) == MouseEvent.BUTTON1_DOWN_MASK) { + if ((mask & InputEvent.BUTTON1_DOWN_MASK) == InputEvent.BUTTON1_DOWN_MASK) { toolSelector = lmbSelector; - } else if ((mask & MouseEvent.BUTTON2_DOWN_MASK) == MouseEvent.BUTTON2_DOWN_MASK) { + } else if ((mask & InputEvent.BUTTON2_DOWN_MASK) == InputEvent.BUTTON2_DOWN_MASK) { toolSelector = mmbSelector; - } else if ((mask & MouseEvent.BUTTON3_DOWN_MASK) == MouseEvent.BUTTON3_DOWN_MASK) { + } else if ((mask & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK) { toolSelector = rmbSelector; } else { return null; Modified: trunk/src/app/net/sf/gridarta/gameobject/NamedObjects.java =================================================================== --- trunk/src/app/net/sf/gridarta/gameobject/NamedObjects.java 2006-12-10 21:13:16 UTC (rev 1042) +++ trunk/src/app/net/sf/gridarta/gameobject/NamedObjects.java 2006-12-10 21:16:07 UTC (rev 1043) @@ -154,6 +154,8 @@ }); dialog.setVisible(true); dialog.dispose(); + // This only looks inconvertible. getValue() returns an Integer here. + //noinspection EqualsBetweenInconvertibleTypes if (pane.getValue() == null || !pane.getValue().equals(0)) { return null; } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2006-12-12 03:37:38
|
Revision: 1015 http://svn.sourceforge.net/gridarta/?rev=1015&view=rev Author: akirschbaum Date: 2006-12-10 07:41:34 -0800 (Sun, 10 Dec 2006) Log Message: ----------- Do not automatically add .png to image file names. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainControl.java trunk/daimonin/src/daieditor/CMainControl.java Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-10 15:28:08 UTC (rev 1014) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-10 15:41:34 UTC (rev 1015) @@ -1077,16 +1077,13 @@ * @param filename Name of the png image file to create. * @param mapControl The controller of map to save. */ - public void createImageWanted(final MapControl mapControl, String filename) { + public void createImageWanted(final MapControl mapControl, final String filename) { if (mapControl == null) { // there is no map open (should not happen due to disabled menus) ACTION_FACTORY.showMessageDialog(mainView, "createImgNoMap"); } else { try { - if (!filename.endsWith(".png")) { - filename += ".png"; - } mapControl.getMapViewFrame().printFullImage(filename); if (log.isInfoEnabled()) { log.info(ACTION_FACTORY.format("imageCreated", filename, mapControl.getMapFileName())); Modified: trunk/daimonin/src/daieditor/CMainControl.java =================================================================== --- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-10 15:28:08 UTC (rev 1014) +++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-10 15:41:34 UTC (rev 1015) @@ -1423,7 +1423,7 @@ * is created directly (if possible). * @param filename Name of the png image file to create. */ - public void createImageWanted(String filename) { + public void createImageWanted(final String filename) { final MapControl mapControl = currentMap; // control of current map if (mapControl == null) { @@ -1431,9 +1431,6 @@ ACTION_FACTORY.showMessageDialog(mainView, "createImgNoMap"); } else { try { - if (!filename.endsWith(".png")) { - filename += ".png"; - } mapControl.getMapViewFrame().printFullImage(filename); if (log.isInfoEnabled()) { log.info(ACTION_FACTORY.format("imageCreated", filename, mapControl.getMapFileName())); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2006-12-12 03:38:15
|
Revision: 1011 http://svn.sourceforge.net/gridarta/?rev=1011&view=rev Author: akirschbaum Date: 2006-12-10 06:23:47 -0800 (Sun, 10 Dec 2006) Log Message: ----------- Rename variable name. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainControl.java trunk/daimonin/src/daieditor/CMainControl.java Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-10 14:16:46 UTC (rev 1010) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-10 14:23:47 UTC (rev 1011) @@ -1075,11 +1075,11 @@ * In this method, the filename is already given, so the image * is created directly (if possible). * @param filename Name of the png image file to create. - * @param mapc The controller of map to save. + * @param mapControl The controller of map to save. */ - public void createImageWanted(final MapControl mapc, String filename) { + public void createImageWanted(final MapControl mapControl, String filename) { - if (mapc == null) { + if (mapControl == null) { // there is no map open (should not happen due to disabled menus) ACTION_FACTORY.showMessageDialog(mainView, "createImgNoMap"); } else { @@ -1087,9 +1087,9 @@ if (!filename.endsWith(".png")) { filename += ".png"; } - mapc.getMapViewFrame().printFullImage(filename); + mapControl.getMapViewFrame().printFullImage(filename); if (log.isInfoEnabled()) { - log.info(ACTION_FACTORY.format("imageCreated", filename, mapc.getMapFileName())); + log.info(ACTION_FACTORY.format("imageCreated", filename, mapControl.getMapFileName())); } } catch (final IOException e) { ACTION_FACTORY.showMessageDialog(mainView, "createImgIOException", filename); Modified: trunk/daimonin/src/daieditor/CMainControl.java =================================================================== --- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-10 14:16:46 UTC (rev 1010) +++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-10 14:23:47 UTC (rev 1011) @@ -1424,9 +1424,9 @@ * @param filename Name of the png image file to create. */ public void createImageWanted(String filename) { - final MapControl mapc = currentMap; // control of current map + final MapControl mapControl = currentMap; // control of current map - if (mapc == null) { + if (mapControl == null) { // there is no map open (should not happen due to disabled menus) ACTION_FACTORY.showMessageDialog(mainView, "createImgNoMap"); } else { @@ -1434,9 +1434,9 @@ if (!filename.endsWith(".png")) { filename += ".png"; } - mapc.getMapViewFrame().printFullImage(filename); + mapControl.getMapViewFrame().printFullImage(filename); if (log.isInfoEnabled()) { - log.info(ACTION_FACTORY.format("imageCreated", filename, mapc.getMapFileName())); + log.info(ACTION_FACTORY.format("imageCreated", filename, mapControl.getMapFileName())); } } catch (final IOException e) { ACTION_FACTORY.showMessageDialog(mainView, "createImgIOException", filename); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2006-12-12 03:39:18
|
Revision: 1052 http://svn.sourceforge.net/gridarta/?rev=1052&view=rev Author: akirschbaum Date: 2006-12-11 12:21:20 -0800 (Mon, 11 Dec 2006) Log Message: ----------- Rename variable name. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainControl.java trunk/daimonin/src/daieditor/CMainControl.java Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-11 20:06:48 UTC (rev 1051) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-11 20:21:20 UTC (rev 1052) @@ -172,7 +172,7 @@ private CFArchTypeList typeList = null; /** Pickmaps cannot be edited while lockedPickmaps is true. */ - private boolean pickmapsLocked = false; + private boolean lockAllPickmaps = false; private FaceObjects faceObjects; @@ -410,7 +410,7 @@ */ void setGlobalSettings(final String arch, String map, final String script, final boolean baseImageSet, final boolean load, final boolean mapTileBottom) { CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(USE_IMAGESET, baseImageSet ? "base" : "none"); - CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(PICKMAPS_LOCKED, pickmapsLocked ? "true" : "false"); + CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(PICKMAPS_LOCKED, isLockAllPickmaps() ? "true" : "false"); readGlobalSettings(); refreshMenusAndToolbars(); @@ -447,7 +447,7 @@ } public boolean isLockAllPickmaps() { - return pickmapsLocked; + return lockAllPickmaps; } /** Refresh the active map view, if there is one. */ @@ -1134,8 +1134,8 @@ showPreferencesDialog(mainView, prefsGroup, false); } - void setLockAllPickmaps(final boolean state) { - pickmapsLocked = state; + void setLockAllPickmaps(final boolean lockAllPickmaps) { + this.lockAllPickmaps = lockAllPickmaps; } /** Invoked when user wants to exit from the program. */ Modified: trunk/daimonin/src/daieditor/CMainControl.java =================================================================== --- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-11 20:06:48 UTC (rev 1051) +++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-11 20:21:20 UTC (rev 1052) @@ -257,7 +257,7 @@ private CFArchTypeList typeList = null; /** Pickmaps cannot be edited while lockedPickmaps is true. */ - private boolean pickmapsLocked = false; + private boolean lockAllPickmaps = false; /** Client Control Component. */ private ProcessRunner controlClient; @@ -678,7 +678,7 @@ mainView.setMapTileListBottom(prefs.getBoolean(MAP_TILE_LIST_BOTTOM_KEY, MAP_TILE_LIST_BOTTOM_DEFAULT)); - pickmapsLocked = prefs.getBoolean(PICKMAPS_LOCKED, false); + lockAllPickmaps = prefs.getBoolean(PICKMAPS_LOCKED, false); // docu version if (IGUIConstants.DOCU_VERSION > prefs.getInt(DOCU_VERSION_KEY, 0)) { @@ -751,7 +751,7 @@ } public boolean isLockAllPickmaps() { - return pickmapsLocked; + return lockAllPickmaps; } /** Refresh the active map view, if there is one. */ @@ -1494,8 +1494,8 @@ showPreferencesDialog(mainView, prefsGroup, false); } - void setLockAllPickmaps(final boolean state) { - pickmapsLocked = state; + void setLockAllPickmaps(final boolean lockAllPickmaps) { + this.lockAllPickmaps = lockAllPickmaps; } /** Invoked to show the next tip of the day or bring the tip of the day to front. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2006-12-12 03:39:18
|
Revision: 1054 http://svn.sourceforge.net/gridarta/?rev=1054&view=rev Author: akirschbaum Date: 2006-12-11 12:54:53 -0800 (Mon, 11 Dec 2006) Log Message: ----------- Whitespace changes. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainControl.java trunk/daimonin/src/daieditor/CMainControl.java Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-11 20:27:03 UTC (rev 1053) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-11 20:54:53 UTC (rev 1054) @@ -1533,7 +1533,6 @@ * to be saved as (false). * @return true if level can be just saved, false if not */ - boolean isPlainSaveEnabled() { return currentMap != null && currentMap.isPlainSaveEnabled(); } Modified: trunk/daimonin/src/daieditor/CMainControl.java =================================================================== --- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-11 20:27:03 UTC (rev 1053) +++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-11 20:54:53 UTC (rev 1054) @@ -1916,7 +1916,6 @@ * to be saved as (false). * @return true if level can be just saved, false if not */ - boolean isPlainSaveEnabled() { return currentMap != null && currentMap.isPlainSaveEnabled(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2006-12-12 03:39:19
|
Revision: 1021 http://svn.sourceforge.net/gridarta/?rev=1021&view=rev Author: akirschbaum Date: 2006-12-10 09:03:05 -0800 (Sun, 10 Dec 2006) Log Message: ----------- WorldMaker script: do not create broken images in cache if the script is aborted. Modified Paths: -------------- trunk/crossfire/ChangeLog trunk/crossfire/resource/conf/scripts.xml trunk/crossfire/src/cfeditor/CMainControl.java trunk/daimonin/src/daieditor/CMainControl.java Modified: trunk/crossfire/ChangeLog =================================================================== --- trunk/crossfire/ChangeLog 2006-12-10 16:33:43 UTC (rev 1020) +++ trunk/crossfire/ChangeLog 2006-12-10 17:03:05 UTC (rev 1021) @@ -3,6 +3,7 @@ * Make WorldMaker script more robust: - create PictureDirectory if it does not exist - do not require a trailing / for PictureDirectory + - do not create broken images in cache if the script is aborted 2006-12-07 Andreas Kirschbaum Modified: trunk/crossfire/resource/conf/scripts.xml =================================================================== --- trunk/crossfire/resource/conf/scripts.xml 2006-12-10 16:33:43 UTC (rev 1020) +++ trunk/crossfire/resource/conf/scripts.xml 2006-12-10 17:03:05 UTC (rev 1021) @@ -20,13 +20,12 @@ return Location + PictureDirectory + getSimpleFilename(mapFilename) + ".png"; } -boolean updateMap(String mapFile, String pictureFile) { - File image = new File(pictureFile); +boolean updateMap(String mapFile, File pictureFile) { File map = new File(mapFile); if (!map.exists()) { return false; } - if (image.exists() && image.lastModified() >= map.lastModified()) { + if (pictureFile.exists() && pictureFile.lastModified() >= map.lastModified()) { return false; } print("converting " + mapFile + " to " + pictureFile + "."); @@ -90,7 +89,7 @@ currentY = StartY.intValue() + y; currentMap = Location + MapFilename + "_" + currentX + "_" + currentY; currentPicture = getPngImageFilename(currentMap); - didUpdate = updateMap(currentMap, currentPicture); + didUpdate = updateMap(currentMap, new File(currentPicture)); if ((didUpdate || firstRun) && fileExists(currentPicture)) { runCommand("pngtopnm " + currentPicture + " | pnmscale -xysize " + TileWidth + " " + TileHeight + " > /tmp/ppm.tmp"); sx = x * TileWidth.intValue(); Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-10 16:33:43 UTC (rev 1020) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-10 17:03:05 UTC (rev 1021) @@ -1081,8 +1081,12 @@ // there is no map open (should not happen due to disabled menus) ACTION_FACTORY.showMessageDialog(mainView, "createImgNoMap"); } else { + final File tmpFile = new File(file.getPath() + ".tmp"); try { - mapControl.getMapViewFrame().printFullImage(file); + mapControl.getMapViewFrame().printFullImage(tmpFile); + if (!tmpFile.renameTo(file)) { + throw new IOException("cannot rename " + tmpFile + " to " + file); + } if (log.isInfoEnabled()) { log.info(ACTION_FACTORY.format("imageCreated", file, mapControl.getMapFileName())); } Modified: trunk/daimonin/src/daieditor/CMainControl.java =================================================================== --- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-10 16:33:43 UTC (rev 1020) +++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-10 17:03:05 UTC (rev 1021) @@ -1432,8 +1432,12 @@ // there is no map open (should not happen due to disabled menus) ACTION_FACTORY.showMessageDialog(mainView, "createImgNoMap"); } else { + final File tmpFile = new File(file.getPath() + ".tmp"); try { - mapControl.getMapViewFrame().printFullImage(file); + mapControl.getMapViewFrame().printFullImage(tmpFile); + if (!tmpFile.renameTo(file)) { + throw new IOException("cannot rename " + tmpFile + " to " + file); + } if (log.isInfoEnabled()) { log.info(ACTION_FACTORY.format("imageCreated", file, mapControl.getMapFileName())); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2006-12-12 03:39:21
|
Revision: 1023 http://svn.sourceforge.net/gridarta/?rev=1023&view=rev Author: akirschbaum Date: 2006-12-10 09:38:31 -0800 (Sun, 10 Dec 2006) Log Message: ----------- Whitespace changes; add missing braces. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CAttribDialog.java trunk/crossfire/src/cfeditor/CFArchAttrib.java trunk/crossfire/src/cfeditor/CFArchType.java trunk/crossfire/src/cfeditor/CFTreasureListTree.java trunk/crossfire/src/cfeditor/CMainControl.java trunk/crossfire/src/cfeditor/CMainMenu.java trunk/crossfire/src/cfeditor/CMainView.java trunk/crossfire/src/cfeditor/CMapArchPanel.java trunk/crossfire/src/cfeditor/CMapTileList.java trunk/crossfire/src/cfeditor/CMapViewBasic.java trunk/crossfire/src/cfeditor/CopyBuffer.java trunk/crossfire/src/cfeditor/ScriptArchData.java trunk/crossfire/src/cfeditor/gameobject/GameObject.java trunk/crossfire/src/cfeditor/gui/ScriptEditor.java trunk/crossfire/src/cfeditor/gui/ScriptManager.java trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java trunk/crossfire/src/cfeditor/map/DefaultMapModel.java trunk/crossfire/src/cfeditor/menu/LocationMenuEntry.java trunk/daimonin/src/daieditor/CAttribDialog.java trunk/daimonin/src/daieditor/CFArchAttrib.java trunk/daimonin/src/daieditor/CFArchType.java trunk/daimonin/src/daieditor/CMainView.java trunk/daimonin/src/daieditor/CopyBuffer.java trunk/daimonin/src/daieditor/ReplaceDialog.java trunk/daimonin/src/daieditor/ScriptArchData.java trunk/daimonin/src/daieditor/gameobject/GameObject.java trunk/daimonin/src/daieditor/gui/map/MapTilePane.java trunk/daimonin/src/daieditor/map/MapArchObject.java trunk/teststuff/perfTest/PerfTestMapDecode.java Modified: trunk/crossfire/src/cfeditor/CAttribDialog.java =================================================================== --- trunk/crossfire/src/cfeditor/CAttribDialog.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/CAttribDialog.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -577,8 +577,7 @@ newAttr = new DialogAttrib<JTextArea>(type.getAttr()[i]); String text = ""; if (nameOld.equalsIgnoreCase("msg")) { - if (archetype.getMsgText() != null && archetype.getMsgText().length() > 0 && (gameObject.getMsgText() == null || gameObject.getMsgText().trim().length() == 0)) - { + if (archetype.getMsgText() != null && archetype.getMsgText().length() > 0 && (gameObject.getMsgText() == null || gameObject.getMsgText().trim().length() == 0)) { text = archetype.getMsgText(); } else { text = gameObject.getMsgText(); Modified: trunk/crossfire/src/cfeditor/CFArchAttrib.java =================================================================== --- trunk/crossfire/src/cfeditor/CFArchAttrib.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/CFArchAttrib.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -169,8 +169,7 @@ endingOld = a1.getValue().trim(); } - if (nameOld == null || nameOld.length() == 0 || - endingOld == null || endingOld.length() == 0) { + if (nameOld == null || nameOld.length() == 0 || endingOld == null || endingOld.length() == 0) { log.warn("In '" + IGUIConstants.TYPEDEF_FILE + "': Type " + typeName + " has text attribute missing '" + XML_KEY_ARCH_BEGIN + "' or '" + XML_KEY_ARCH_END + "'."); return false; } Modified: trunk/crossfire/src/cfeditor/CFArchType.java =================================================================== --- trunk/crossfire/src/cfeditor/CFArchType.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/CFArchType.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -306,9 +306,7 @@ for (final CFArchAttrib attrib : impType.attr) { if (!attrib.getSecName().equalsIgnoreCase("general")) { // import this attrib: - if (!attrib.getSecName().equalsIgnoreCase("general") && - !attrib.getSecName().equalsIgnoreCase("special") && - !secNames.contains(attrib.getSecName())) { + if (!attrib.getSecName().equalsIgnoreCase("general") && !attrib.getSecName().equalsIgnoreCase("special") && !secNames.contains(attrib.getSecName())) { sectionNum++; // increment number of valid sections secNames.add(attrib.getSecName()); } @@ -436,8 +434,7 @@ // create table with attributes text += "<br><br><TABLE BORDER>"; for (int i = 0; i < attr.length; i++) { - if (attr[i].getDataType() != ArchAttribType.FIXED && - !attr[i].getSecName().equalsIgnoreCase("general")) { + if (attr[i].getDataType() != ArchAttribType.FIXED && !attr[i].getSecName().equalsIgnoreCase("general")) { text += "<TR><B>"+attr[i].getNameNew()+":</B><br>"+attr[i].getText()+"</TR>"; } } Modified: trunk/crossfire/src/cfeditor/CFTreasureListTree.java =================================================================== --- trunk/crossfire/src/cfeditor/CFTreasureListTree.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/CFTreasureListTree.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -337,8 +337,7 @@ private void sortVector(final List<TreasureTreeNode> v) { for (int j = 0; j < v.size() + 1; j++) { for (int i = 0; i < v.size() - 1; i++) { - if (v.get(i).getTreasureObj().getName().compareToIgnoreCase( - v.get(i + 1).getTreasureObj().getName()) > 0) { + if (v.get(i).getTreasureObj().getName().compareToIgnoreCase( v.get(i + 1).getTreasureObj().getName()) > 0) { final TreasureTreeNode node = v.get(i); v.set(i, v.get(i + 1)); v.set(i + 1, node); Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -394,8 +394,7 @@ mapDir = new File(currentDir.getAbsolutePath()); } // if mapdir has no absolute path, set it now - if (currentDir.exists() && mapDir.getParent() == null && - !mapDir.isAbsolute() && !hasChangedDir) { + if (currentDir.exists() && mapDir.getParent() == null && !mapDir.isAbsolute() && !hasChangedDir) { mapDir = new File(currentDir.getAbsolutePath(), mapDir.getPath()); } } @@ -1168,8 +1167,7 @@ exitPos.y = exit.getAttributeInt("sp"); final String path = exit.getAttributeString("slaying"); - if (path.length() == 0 || (currentMap.getMapFile() != null && - path.equals(currentMap.getMapFile().getName()))) { + if (path.length() == 0 || (currentMap.getMapFile() != null && path.equals(currentMap.getMapFile().getName()))) { // path points to the same map if (exitPos.x == 0 && exitPos.y == 0) { ACTION_FACTORY.showMessageDialog(mainView, "enterExitNowhere"); Modified: trunk/crossfire/src/cfeditor/CMainMenu.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainMenu.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/CMainMenu.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -1266,8 +1266,7 @@ tmenu = enterLower; break; } - if (mainControl.getCurrentMap().getMapTilePath(direction) != null && - mainControl.getCurrentMap().getMapTilePath(direction).length() > 0) { + if (mainControl.getCurrentMap().getMapTilePath(direction) != null && mainControl.getCurrentMap().getMapTilePath(direction).length() > 0) { tmenu.setEnabled(true); foundATile = true; } else { Modified: trunk/crossfire/src/cfeditor/CMainView.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainView.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/CMainView.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -307,9 +307,7 @@ */ public GameObject getArchPanelHighlight() { - if ((isPickmapActive() || archPanel.getArchPanelSelection() == null) - && CPickmapPanel.getInstance().isLoadComplete() && - CPickmapPanel.getInstance().getCurrentPickmap() != null) { + if ((isPickmapActive() || archPanel.getArchPanelSelection() == null) && CPickmapPanel.getInstance().isLoadComplete() && CPickmapPanel.getInstance().getCurrentPickmap() != null) { // get the active pickmap final MapControl pmap = CPickmapPanel.getInstance().getCurrentPickmap(); Modified: trunk/crossfire/src/cfeditor/CMapArchPanel.java =================================================================== --- trunk/crossfire/src/cfeditor/CMapArchPanel.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/CMapArchPanel.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -347,8 +347,7 @@ facename = archetype.getFaceName(); } - if (archFaceField.getText() != null && - archFaceField.getText().compareTo(facename) != 0) { + if (archFaceField.getText() != null && archFaceField.getText().compareTo(facename) != 0) { needRedraw = true; } } Modified: trunk/crossfire/src/cfeditor/CMapTileList.java =================================================================== --- trunk/crossfire/src/cfeditor/CMapTileList.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/CMapTileList.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -169,8 +169,7 @@ */ list.addMouseListener(new MouseAdapter() { @Override public void mousePressed(final MouseEvent e) { - if (e.getModifiers() == MouseEvent.BUTTON1_MASK && - !e.isShiftDown() && !e.isControlDown()) { + if (e.getModifiers() == MouseEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown()) { // --- left mouse button: select arch --- // first, check if this is a doubleclick final long thisClick = (new Date()).getTime(); @@ -185,8 +184,7 @@ // save values for next click lastClick = thisClick; lastClickGameObject = getMapTileSelection(); - } else if ((e.getModifiers() & MouseEvent.BUTTON3_MASK) != 0 || - ((e.getModifiers() & MouseEvent.BUTTON1_MASK) != 0 && e.isShiftDown())) { + } else if ((e.getModifiers() & MouseEvent.BUTTON3_MASK) != 0 || ((e.getModifiers() & MouseEvent.BUTTON1_MASK) != 0 && e.isShiftDown())) { // --- right mouse button: insert arch --- if (currentSquare != null && mainControl.getArchPanelHighlight() != null) { Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java =================================================================== --- trunk/crossfire/src/cfeditor/CMapViewBasic.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/CMapViewBasic.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -519,8 +519,7 @@ if (mapLoc != null) { // in "locked pickmaps" mode, pickmaps react only to leftclicks - if (mapControl.isPickmap() && mainControl.isLockAllPickmaps() - && !(e.getModifiers() == MouseEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown())) { + if (mapControl.isPickmap() && mainControl.isLockAllPickmaps() && !(e.getModifiers() == MouseEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown())) { return; } @@ -621,9 +620,7 @@ // Update offset (from starting-dragpoint) only when mouse moved // over new tile and mouse is still on the map - if (temp.x != -1 && temp.y != -1 && - (mapMouseRightOff.x != temp.x - mapMouseRightPos.x || - mapMouseRightOff.y != temp.y - mapMouseRightPos.y)) { + if (temp.x != -1 && temp.y != -1 && (mapMouseRightOff.x != temp.x - mapMouseRightPos.x || mapMouseRightOff.y != temp.y - mapMouseRightPos.y)) { // update offset and redraw mapview mapMouseRightOff.x = temp.x - mapMouseRightPos.x; mapMouseRightOff.y = temp.y - mapMouseRightPos.y; @@ -812,8 +809,7 @@ // be a default arch (when pickmap has no selection) GameObject newarch = mainControl.getArchPanelHighlight(); - if (!mainControl.getMainView().isPickmapActive() || mapControl.isPickmap() || - (newarch != null && newarch.isArchetype())) { + if (!mainControl.getMainView().isPickmapActive() || mapControl.isPickmap() || (newarch != null && newarch.isArchetype())) { // insert default arch from archlist: if (!mapControl.addArchToMap(mainControl.getPanelArchName(), pos, allowMany, MapModel.JOIN_ENABLE)) { // mainControl.getMainView().mapPanel.setMapArchList(null); @@ -833,8 +829,7 @@ if (!allowMany) { // check if there is already an arch of that kind for (final GameObject t : mapControl.getMapModel().getMapSquare(pos)) { - if (t.getArchetypeName().equals(newarch.getArchetypeName()) && - t.getArchTypNr() == newarch.getArchTypNr()) { + if (t.getArchetypeName().equals(newarch.getArchetypeName()) && t.getArchTypNr() == newarch.getArchTypNr()) { insertAllowed = false; // there's a match - don't insert a second one } } @@ -886,8 +881,7 @@ final MapControl currentMap = mainControl.getCurrentMap(); // insertion is only allowed for valid *empty* squares - if (currentMap != null && mapControl.isPickmap() && mapControl.isPointValid(pos) - && !mapControl.containsArchObject(pos)) { + if (currentMap != null && mapControl.isPickmap() && mapControl.isPointValid(pos) && !mapControl.containsArchObject(pos)) { // get the currently selected map arch GameObject newarch = mainControl.getMainView().getMapTileSelection(); if (newarch != null) { Modified: trunk/crossfire/src/cfeditor/CopyBuffer.java =================================================================== --- trunk/crossfire/src/cfeditor/CopyBuffer.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/CopyBuffer.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -188,9 +188,7 @@ // store a clone of the gameObject in the CopyBuffer // (for multiparts, only the heads get copied into the buffer) // arches that don't match the view settings are ignored! - if ((mode == Mode.DO_CUT || mode == Mode.DO_COPY) - && gameObject.isHead() && !gameObject.isInContainer() - && (mainControl.getTileEdit() == 0 || mainControl.isTileEdit(gameObject.getEditType()))) { + if ((mode == Mode.DO_CUT || mode == Mode.DO_COPY) && gameObject.isHead() && !gameObject.isInContainer() && (mainControl.getTileEdit() == 0 || mainControl.isTileEdit(gameObject.getEditType()))) { // copy this gameObject final GameObject clone = gameObject.createClone(pos.x - startp.x, pos.y - startp.y); assert copyMapCtrl != null; @@ -199,8 +197,7 @@ // delete the gameObject if we have a "cut" or "clear" command // again, arches that don't match the view settings are ignored - if ((mode == Mode.DO_CLEAR || mode == Mode.DO_CUT) && (mainControl.getTileEdit() == 0 || - mainControl.isTileEdit(gameObject.getEditType()))) { + if ((mode == Mode.DO_CLEAR || mode == Mode.DO_CUT) && (mainControl.getTileEdit() == 0 || mainControl.isTileEdit(gameObject.getEditType()))) { // store next arch in tmp // delete gameObject (without redrawing the map) @@ -301,8 +298,7 @@ // If offset is zero and map-spot empty, a floodfill is done final GameObject arch; - if (offset.x == 0 && offset.y == 0 && - !mapControl.containsArchObject(startp)) { + if (offset.x == 0 && offset.y == 0 && !mapControl.containsArchObject(startp)) { arch = mainControl.getArchPanelHighlight(); if (arch != null) { floodfill(mapControl, startp.x, startp.y, arch); Modified: trunk/crossfire/src/cfeditor/ScriptArchData.java =================================================================== --- trunk/crossfire/src/cfeditor/ScriptArchData.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/ScriptArchData.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -508,9 +508,7 @@ final int replaceIndex = getScriptedEvent(eventType); if (replaceIndex != -1) { // collision with existing event -> ask user: replace? - if (JOptionPane.showConfirmDialog(frame, "An event of type \"" + eventType + "\" already exists for this object.\n" + - "Do you want to replace the existing event?", "Event exists", - JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE) == JOptionPane.NO_OPTION) { + if (JOptionPane.showConfirmDialog(frame, "An event of type \"" + eventType + "\" already exists for this object.\n" + "Do you want to replace the existing event?", "Event exists", JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE) == JOptionPane.NO_OPTION) { // bail out return; } @@ -563,8 +561,7 @@ } // file does not exist -> aks user: create new file? - if (JOptionPane.showConfirmDialog(frame, "Create new script '" + newScriptFile.getName() + "'?", "Confirm", - JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE) == JOptionPane.YES_OPTION) { + if (JOptionPane.showConfirmDialog(frame, "Create new script '" + newScriptFile.getName() + "'?", "Confirm", JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE) == JOptionPane.YES_OPTION) { // okay, create new script file and open it boolean couldCreateFile = false; // true when file creation successful try { Modified: trunk/crossfire/src/cfeditor/gameobject/GameObject.java =================================================================== --- trunk/crossfire/src/cfeditor/gameobject/GameObject.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/gameobject/GameObject.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -484,8 +484,7 @@ if (ignoreValues) { // cut away everything after the first space in that line // because we want to ignore the "value part": - if (line.length() > 0 && line.indexOf(" ") > 0 && - diffTextString(getObjectText(), line.substring(0, line.indexOf(" ") + 1), ignoreValues) == null) { + if (line.length() > 0 && line.indexOf(" ") > 0 && diffTextString(getObjectText(), line.substring(0, line.indexOf(" ") + 1), ignoreValues) == null) { result = result.concat(line + "\n"); } } else { @@ -840,9 +839,7 @@ // now check if it is a negation of an entry in the default arch if (line.contains(" ")) { String attr_val = line.substring(line.indexOf(" ")).trim(); - if (!(archetype.getAttributeString(attr_key, null).length() > 0 && - (attr_val.equals("0") || attr_val.equals("null") || - attr_val.equals("none")))) { + if (!(archetype.getAttributeString(attr_key, null).length() > 0 && (attr_val.equals("0") || attr_val.equals("null") || attr_val.equals("none")))) { errors += line.trim()+"\n"; // append line to the errors } } else { Modified: trunk/crossfire/src/cfeditor/gui/ScriptEditor.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/ScriptEditor.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/gui/ScriptEditor.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -217,8 +217,7 @@ } final String name = getScript().getParamName(selectedRow); - if (JOptionPane.showConfirmDialog(removeParameter, "Delete " + name + "?", - "Delete?", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) { + if (JOptionPane.showConfirmDialog(removeParameter, "Delete " + name + "?", "Delete?", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) { getScript().removeParameter(selectedRow); } } Modified: trunk/crossfire/src/cfeditor/gui/ScriptManager.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/ScriptManager.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/gui/ScriptManager.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -118,8 +118,7 @@ return; } - if (JOptionPane.showConfirmDialog(scripts, "remove script name " + m.getName(), "remove", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) - { + if (JOptionPane.showConfirmDialog(scripts, "remove script name " + m.getName(), "remove", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) { if (log.isDebugEnabled()) { log.debug("removing"); } Modified: trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -487,8 +487,7 @@ // update tilepaths for (int i = 0; i < IGUIConstants.DIRECTIONS; i++) { - if ((map.getTilePath(i) == null && (fieldTilePath[i].getText() == null || fieldTilePath[i].getText().length() == 0)) - || (map.getTilePath(i) != null && !map.getTilePath(i).equals(fieldTilePath[i].getText()))) { + if ((map.getTilePath(i) == null && (fieldTilePath[i].getText() == null || fieldTilePath[i].getText().length() == 0)) || (map.getTilePath(i) != null && !map.getTilePath(i).equals(fieldTilePath[i].getText()))) { modifyTilepaths = true; } map.setTilePath(i, fieldTilePath[i].getText()); Modified: trunk/crossfire/src/cfeditor/map/DefaultMapModel.java =================================================================== --- trunk/crossfire/src/cfeditor/map/DefaultMapModel.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/map/DefaultMapModel.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -213,8 +213,7 @@ return false; } - if (mainControl.getAutojoin() && join == JOIN_ENABLE && mainControl.getJoinlist() != null - && archetype.getJoinList() != null && !archetype.isMulti()) { + if (mainControl.getAutojoin() && join == JOIN_ENABLE && mainControl.getJoinlist() != null && archetype.getJoinList() != null && !archetype.isMulti()) { // do autojoining if enabled archName = archetype.getJoinList().joinInsert(this, pos); if (archName == null) { @@ -412,8 +411,7 @@ // do autojoining final GameObject temp = getArchetype(node.getArchetypeName()); // get defarch - if (mainControl.getAutojoin() && join == JOIN_ENABLE && mainControl.getJoinlist() != null - && temp.getJoinList() != null && !temp.isMulti()) { + if (mainControl.getAutojoin() && join == JOIN_ENABLE && mainControl.getJoinlist() != null && temp.getJoinList() != null && !temp.isMulti()) { // remove connections to the deleted arch temp.getJoinList().joinDelete(this, pos); } Modified: trunk/crossfire/src/cfeditor/menu/LocationMenuEntry.java =================================================================== --- trunk/crossfire/src/cfeditor/menu/LocationMenuEntry.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/crossfire/src/cfeditor/menu/LocationMenuEntry.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -79,8 +79,7 @@ } public void menuChanged(final MenuChangeEvent event) { - if (event.getLocation() != null - && (event.getLocation().getName().equals(location))) { + if (event.getLocation() != null && (event.getLocation().getName().equals(location))) { getMenuManager().fireMenuEntryChange(this, MenuChangeEvent.CHANGE_CONTENT); } } Modified: trunk/daimonin/src/daieditor/CAttribDialog.java =================================================================== --- trunk/daimonin/src/daieditor/CAttribDialog.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/daimonin/src/daieditor/CAttribDialog.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -576,8 +576,7 @@ newAttr = new DialogAttrib<JTextArea>(attrib); String text = ""; if (nameOld.equalsIgnoreCase("msg")) { - if (archetype.getMsgText() != null && archetype.getMsgText().length() > 0 && (gameObject.getMsgText() == null || gameObject.getMsgText().trim().length() == 0)) - { + if (archetype.getMsgText() != null && archetype.getMsgText().length() > 0 && (gameObject.getMsgText() == null || gameObject.getMsgText().trim().length() == 0)) { text = archetype.getMsgText(); } else { text = gameObject.getMsgText(); @@ -763,8 +762,7 @@ newAttr = new DialogAttrib<JComboBox[]>(attrib); // create ComboBox with parsed selection final JComboBox[] inputs = new JComboBox[2]; - if (attrib.getMisc() != null && typelist.getListTable().containsKey(attrib.getMisc()[0]) && typelist.getListTable().containsKey(attrib.getMisc()[1])) - { + if (attrib.getMisc() != null && typelist.getListTable().containsKey(attrib.getMisc()[0]) && typelist.getListTable().containsKey(attrib.getMisc()[1])) { // Hack to set preselected if available final int active = gameObject.getAttributeInt(nameOld); final int[] activepart = {active & 0x0F, active & 0xF0}; Modified: trunk/daimonin/src/daieditor/CFArchAttrib.java =================================================================== --- trunk/daimonin/src/daieditor/CFArchAttrib.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/daimonin/src/daieditor/CFArchAttrib.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -166,8 +166,7 @@ endingOld = a1.getValue().trim(); } - if (nameOld == null || nameOld.length() == 0 - || endingOld == null || endingOld.length() == 0) { + if (nameOld == null || nameOld.length() == 0 || endingOld == null || endingOld.length() == 0) { log.warn("In '" + IGUIConstants.TYPEDEF_FILE + "': Type " + typeName + " has text attribute missing '" + XML_KEY_ARCH_BEGIN + "' or '" + XML_KEY_ARCH_END + "'."); return false; } Modified: trunk/daimonin/src/daieditor/CFArchType.java =================================================================== --- trunk/daimonin/src/daieditor/CFArchType.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/daimonin/src/daieditor/CFArchType.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -295,9 +295,7 @@ for (final CFArchAttrib aAttr : impType.attr) { if (!"general".equalsIgnoreCase(aAttr.getSecName())) { // import this attrib: - if (!"general".equalsIgnoreCase(aAttr.getSecName()) - && !"special".equalsIgnoreCase(aAttr.getSecName()) - && !secNames.contains(aAttr.getSecName())) { + if (!"general".equalsIgnoreCase(aAttr.getSecName()) && !"special".equalsIgnoreCase(aAttr.getSecName()) && !secNames.contains(aAttr.getSecName())) { sectionNum++; // increment number of valid sections secNames.add(aAttr.getSecName()); } Modified: trunk/daimonin/src/daieditor/CMainView.java =================================================================== --- trunk/daimonin/src/daieditor/CMainView.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/daimonin/src/daieditor/CMainView.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -278,9 +278,7 @@ */ @Nullable public GameObject getArchPanelHighlight() { - if ((pickmapActive || archPanel.getArchPanelSelection() == null) - && CPickmapPanel.getInstance().isLoadComplete() - && CPickmapPanel.getInstance().getCurrentPickmap() != null) { + if ((pickmapActive || archPanel.getArchPanelSelection() == null) && CPickmapPanel.getInstance().isLoadComplete() && CPickmapPanel.getInstance().getCurrentPickmap() != null) { // get the active pickmap final MapControl pmap = CPickmapPanel.getInstance().getCurrentPickmap(); @@ -315,8 +313,7 @@ */ @Nullable public List<GameObject> getArchPanelSelection() { - if ((pickmapActive || archPanel.getArchPanelSelection() == null) - && CPickmapPanel.getInstance().isLoadComplete()) { + if ((pickmapActive || archPanel.getArchPanelSelection() == null) && CPickmapPanel.getInstance().isLoadComplete()) { // get the active pickmap final MapControl pmap = CPickmapPanel.getInstance().getCurrentPickmap(); if (pmap != null) { Modified: trunk/daimonin/src/daieditor/CopyBuffer.java =================================================================== --- trunk/daimonin/src/daieditor/CopyBuffer.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/daimonin/src/daieditor/CopyBuffer.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -161,9 +161,7 @@ // store a clone of the gameObject in the CopyBuffer // (for multiparts, only the heads get copied into the buffer) // arches that don't match the view settings are ignored! - if ((mode == Mode.DO_CUT || mode == Mode.DO_COPY) - && gameObject.isHead() && !gameObject.isInContainer() - && mainControl.isTileEdit(gameObject)) { + if ((mode == Mode.DO_CUT || mode == Mode.DO_COPY) && gameObject.isHead() && !gameObject.isInContainer() && mainControl.isTileEdit(gameObject)) { // copy this gameObject final GameObject clone = gameObject.createClone(posx - offset.x, posy - offset.y); assert copyMapCtrl != null; @@ -300,8 +298,7 @@ for (pos.y = 0; pos.y < mapSize.getHeight(); pos.y++) { for (final GameObject node : map.getMapSquare(pos)) { // only non multi suckers - if (!node.isTail()) - { + if (!node.isTail()) { count++; } } Modified: trunk/daimonin/src/daieditor/ReplaceDialog.java =================================================================== --- trunk/daimonin/src/daieditor/ReplaceDialog.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/daimonin/src/daieditor/ReplaceDialog.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -319,9 +319,7 @@ final int replaceListSize = replaceList == null ? 0 : replaceList.size(); for (final MapSquare<GameObject> square : entireMap ? mapControl.getMapModel() : mapViewIFrame.getView().getSelectedSquares()) { for (final GameObject node : square) { - if (!node.isMulti() - && (matchCriteria == MATCH_ARCH_NAME && node.getArchetypeName() != null && node.getArchetypeName().equalsIgnoreCase(matchString) - || matchCriteria == MATCH_OBJ_NAME && node.getBestName().equalsIgnoreCase(matchString))) { + if (!node.isMulti() && (matchCriteria == MATCH_ARCH_NAME && node.getArchetypeName() != null && node.getArchetypeName().equalsIgnoreCase(matchString) || matchCriteria == MATCH_OBJ_NAME && node.getBestName().equalsIgnoreCase(matchString))) { if (replaceListSize > 0 && !deleteOnly) { GameObject randomArch; if (replaceListSize == 1) { Modified: trunk/daimonin/src/daieditor/ScriptArchData.java =================================================================== --- trunk/daimonin/src/daieditor/ScriptArchData.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/daimonin/src/daieditor/ScriptArchData.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -470,8 +470,7 @@ final GameObject replaceObject = getScriptedEvent(eventType); if (replaceObject != null) { // collision with existing event -> ask user: replace? - if (JOptionPane.showConfirmDialog(frame, "An event of type \"" + typeName(eventType) + "\" already exists for this object.\n" + "Do you want to replace the existing event?", "Event exists", - JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE) == JOptionPane.NO_OPTION) { + if (JOptionPane.showConfirmDialog(frame, "An event of type \"" + typeName(eventType) + "\" already exists for this object.\n" + "Do you want to replace the existing event?", "Event exists", JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE) == JOptionPane.NO_OPTION) { // bail out return false; } @@ -522,8 +521,7 @@ } // file does not exist -> aks user: create new file? - if (JOptionPane.showConfirmDialog(frame, "Create new script '" + newScriptFile.getName() + "'?", "Confirm", - JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE) == JOptionPane.YES_OPTION) { + if (JOptionPane.showConfirmDialog(frame, "Create new script '" + newScriptFile.getName() + "'?", "Confirm", JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE) == JOptionPane.YES_OPTION) { // okay, create new script file and open it boolean couldCreateFile = false; // true when file creation successful try { Modified: trunk/daimonin/src/daieditor/gameobject/GameObject.java =================================================================== --- trunk/daimonin/src/daieditor/gameobject/GameObject.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/daimonin/src/daieditor/gameobject/GameObject.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -786,10 +786,9 @@ // now check if it is a negation of an entry in the default arch if (line.contains(" ")) { String attr_val = line.substring(line.indexOf(" ")).trim(); - if (!(archetype.getAttributeString(attrKey, null).length() > 0 && - (attr_val.equals("0") || attr_val.equals("null") || - attr_val.equals("none")))) + if (!(archetype.getAttributeString(attrKey, null).length() > 0 && (attr_val.equals("0") || attr_val.equals("null") || attr_val.equals("none")))) { errors += line.trim()+"\n"; // append line to the errors + } } else { errors += line.trim()+"\n"; // append line to the errors } Modified: trunk/daimonin/src/daieditor/gui/map/MapTilePane.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/MapTilePane.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/daimonin/src/daieditor/gui/map/MapTilePane.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -575,8 +575,7 @@ tileHeaders[tileLink[i][ii][0]].map = level; repeatFlag = true; } else { - if (ACTION_FACTORY.showQuestionDialog(this, "mapErrorInvalid", tile_link_name[i], tileHeaders[i].linkPath, tile_link_name[tileLink[i][ii][0]], tile_link_name[tileLink[i][ii][1]], tileHeaders[i].maparch.getTilePath(tileLink[i][ii][1]), link)) - { + if (ACTION_FACTORY.showQuestionDialog(this, "mapErrorInvalid", tile_link_name[i], tileHeaders[i].linkPath, tile_link_name[tileLink[i][ii][0]], tile_link_name[tileLink[i][ii][1]], tileHeaders[i].maparch.getTilePath(tileLink[i][ii][1]), link)) { return; } } @@ -803,8 +802,7 @@ // update tilepaths boolean modifyTilepaths = false; // true when map tile-paths were modified for (int i = 0; i < 8; i++) { - if (map.getTilePath(i) == null && (tilePaths[i].getText() == null || tilePaths[i].getText().length() == 0) || (map.getTilePath(i) != null && !map.getTilePath(i).equals(tilePaths[i].getText()))) - { + if (map.getTilePath(i) == null && (tilePaths[i].getText() == null || tilePaths[i].getText().length() == 0) || (map.getTilePath(i) != null && !map.getTilePath(i).equals(tilePaths[i].getText()))) { modifyTilepaths = true; } map.setTilePath(i, tilePaths[i].getText()); Modified: trunk/daimonin/src/daieditor/map/MapArchObject.java =================================================================== --- trunk/daimonin/src/daieditor/map/MapArchObject.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/daimonin/src/daieditor/map/MapArchObject.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -390,8 +390,7 @@ } } else { // ARCH: not found yet // looking for the map arch - if (line.toLowerCase().regionMatches(0, "arch ", 0, 5) - && line.toLowerCase().endsWith(" map")) { + if (line.toLowerCase().regionMatches(0, "arch ", 0, 5) && line.toLowerCase().endsWith(" map")) { archflag = true; } } Modified: trunk/teststuff/perfTest/PerfTestMapDecode.java =================================================================== --- trunk/teststuff/perfTest/PerfTestMapDecode.java 2006-12-10 17:24:25 UTC (rev 1022) +++ trunk/teststuff/perfTest/PerfTestMapDecode.java 2006-12-10 17:38:31 UTC (rev 1023) @@ -345,8 +345,9 @@ final int hash = word.hashCode(); int hashIndex; for (hashIndex = 0; hashIndex < hashes.length; hashIndex++) { - if (hashes[hashIndex] == hash) + if (hashes[hashIndex] == hash) { break; + } } switch (hashIndex) { case 0: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2006-12-12 03:39:21
|
Revision: 1006 http://svn.sourceforge.net/gridarta/?rev=1006&view=rev Author: akirschbaum Date: 2006-12-10 05:44:20 -0800 (Sun, 10 Dec 2006) Log Message: ----------- Fix executable property. Property Changed: ---------------- trunk/crossfire/build.xml trunk/daimonin/debug/LinuxDebug.sh trunk/daimonin/resource/icons/development/Application24.gif trunk/daimonin/resource/icons/development/Host16.gif trunk/daimonin/resource/icons/development/Host24.gif trunk/daimonin/resource/icons/development/Jar16.gif trunk/daimonin/resource/icons/development/Server16.gif trunk/daimonin/resource/icons/development/Server24.gif trunk/daimonin/resource/icons/general/About16.gif trunk/daimonin/resource/icons/general/Bookmarks16.gif trunk/daimonin/resource/icons/general/Copy16.gif trunk/daimonin/resource/icons/general/Cut16.gif trunk/daimonin/resource/icons/general/Delete16.gif trunk/daimonin/resource/icons/general/Edit16.gif trunk/daimonin/resource/icons/general/Find16.gif trunk/daimonin/resource/icons/general/Help16.gif trunk/daimonin/resource/icons/general/History16.gif trunk/daimonin/resource/icons/general/New16.gif trunk/daimonin/resource/icons/general/Open16.gif trunk/daimonin/resource/icons/general/Paste16.gif trunk/daimonin/resource/icons/general/Preferences16.gif trunk/daimonin/resource/icons/general/Preferences24.gif trunk/daimonin/resource/icons/general/Properties16.gif trunk/daimonin/resource/icons/general/Redo16.gif trunk/daimonin/resource/icons/general/Refresh16.gif trunk/daimonin/resource/icons/general/Remove16.gif trunk/daimonin/resource/icons/general/Replace16.gif trunk/daimonin/resource/icons/general/Save16.gif trunk/daimonin/resource/icons/general/Save24.gif trunk/daimonin/resource/icons/general/SaveAll16.gif trunk/daimonin/resource/icons/general/SaveAs16.gif trunk/daimonin/resource/icons/general/Search16.gif trunk/daimonin/resource/icons/general/Search24.gif trunk/daimonin/resource/icons/general/Stop16.gif trunk/daimonin/resource/icons/general/TipOfTheDay16.gif trunk/daimonin/resource/icons/general/TipOfTheDay24.gif trunk/daimonin/resource/icons/general/Undo16.gif trunk/daimonin/resource/icons/general/Zoom16.gif trunk/daimonin/resource/icons/general/ZoomIn16.gif trunk/daimonin/resource/icons/general/ZoomOut16.gif trunk/daimonin/resource/icons/media/Play16.gif trunk/daimonin/resource/icons/media/Stop16.gif trunk/daimonin/resource/icons/navigation/Back16.gif trunk/daimonin/resource/icons/navigation/Down16.gif trunk/daimonin/resource/icons/navigation/Forward16.gif trunk/daimonin/resource/icons/navigation/Up16.gif Property changes on: trunk/crossfire/build.xml ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/debug/LinuxDebug.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/daimonin/resource/icons/development/Application24.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/development/Host16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/development/Host24.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/development/Jar16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/development/Server16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/development/Server24.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/About16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Bookmarks16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Copy16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Cut16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Delete16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Edit16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Find16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Help16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/History16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/New16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Open16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Paste16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Preferences16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Preferences24.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Properties16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Redo16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Refresh16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Remove16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Replace16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Save16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Save24.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/SaveAll16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/SaveAs16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Search16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Search24.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Stop16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/TipOfTheDay16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/TipOfTheDay24.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Undo16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/Zoom16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/ZoomIn16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/general/ZoomOut16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/media/Play16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/media/Stop16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/navigation/Back16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/navigation/Down16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/navigation/Forward16.gif ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/daimonin/resource/icons/navigation/Up16.gif ___________________________________________________________________ Name: svn:executable - * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |