gridarta-commit — svn commit digest list (high traffic)

[Gridarta-commit] SF.net SVN: gridarta:[8260] trunk/src/app/net/sf/gridarta/model/ mapviewsettings/MapViewSettings.java

[<aki...@us...>]

Revision: 8260
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8260&view=rev
Author:   akirschbaum
Date:     2010-06-07 07:40:23 +0000 (Mon, 07 Jun 2010)

Log Message:
-----------
Explicitly initialize fields.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/model/mapviewsettings/MapViewSettings.java

Modified: trunk/src/app/net/sf/gridarta/model/mapviewsettings/MapViewSettings.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/mapviewsettings/MapViewSettings.java	2010-06-06 23:52:54 UTC (rev 8259)
+++ trunk/src/app/net/sf/gridarta/model/mapviewsettings/MapViewSettings.java	2010-06-07 07:40:23 UTC (rev 8260)
@@ -49,22 +49,22 @@
     /**
      * The visibility of the grid.
      */
-    private boolean gridVisible;
+    private boolean gridVisible = false;
 
     /**
      * Whether smoothing display is active.
      */
-    private boolean smoothing;
+    private boolean smoothing = false;
 
     /**
      * Whether double faces should be drawn double height.
      */
-    private boolean doubleFaces;
+    private boolean doubleFaces = false;
 
     /**
      * Bit field of edit types to show transparent.
      */
-    private int alphaType;
+    private int alphaType = 0;
 
     /**
      * Bit field of edit types to show only.
@@ -80,13 +80,13 @@
      * The transparency settings.
      */
     // TODO: use this field (it looks unused but usage is planned)
-    private ViewGameObjectMatcherManager transparencyManager;
+    private ViewGameObjectMatcherManager transparencyManager = null;
 
     /**
      * The visibility settings.
      */
     // TODO: use this field (it looks unused but usage is planned)
-    private ViewGameObjectMatcherManager visibilityManager;
+    private ViewGameObjectMatcherManager visibilityManager = null;
 
     /**
      * The MapViewSettingsListeners to inform of changes.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8259] trunk/src/app/net/sf/gridarta/model/io/ AbstractMapArchObjectParser.java

[<aki...@us...>]

Revision: 8259
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8259&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:52:54 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Suppress warning.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/model/io/AbstractMapArchObjectParser.java

Modified: trunk/src/app/net/sf/gridarta/model/io/AbstractMapArchObjectParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/io/AbstractMapArchObjectParser.java	2010-06-06 23:49:39 UTC (rev 8258)
+++ trunk/src/app/net/sf/gridarta/model/io/AbstractMapArchObjectParser.java	2010-06-06 23:52:54 UTC (rev 8259)
@@ -111,6 +111,7 @@
                                 throw new InvalidMapFormatException("unexpected map attribute: '" + line + "'");
                             }
                         } catch (final NumberFormatException ignored) {
+                            //noinspection ThrowInsideCatchBlockWhichIgnoresCaughtException
                             throw new InvalidMapFormatException("unexpected map attribute: '" + line + "'");
                         }
                     } else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8258] trunk/src/app/net/sf/gridarta/gui/script/ ScriptController.java

[<aki...@us...>]

Revision: 8258
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8258&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:49:39 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Suppress warning.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gui/script/ScriptController.java

Modified: trunk/src/app/net/sf/gridarta/gui/script/ScriptController.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/script/ScriptController.java	2010-06-06 23:48:48 UTC (rev 8257)
+++ trunk/src/app/net/sf/gridarta/gui/script/ScriptController.java	2010-06-06 23:49:39 UTC (rev 8258)
@@ -169,6 +169,7 @@
         this.scriptExecutor = scriptExecutor;
         scriptModelParser = new ScriptModelParser<G, A, R>(pluginParameterFactory);
         scriptModelLoader = new ScriptModelLoader<G, A, R>(scriptModelParser);
+        //noinspection ResultOfObjectAllocationIgnored
         new ScriptManagerFactory<G, A, R>(this, scriptModel, pluginParameterViewFactory, pluginParameterFactory, systemIcons);
         ActionUtils.newAction(ACTION_BUILDER, "Plugin", this, "savePlugins");
         ActionUtils.newAction(ACTION_BUILDER, "Plugin", this, "importPlugin");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8257] trunk/src/app/net/sf/gridarta/textedit/ scripteditor/CFPythonPopup.java

[<aki...@us...>]

Revision: 8257
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8257&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:48:48 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Add @NotNull annotation.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java

Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java	2010-06-06 23:47:36 UTC (rev 8256)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java	2010-06-06 23:48:48 UTC (rev 8257)
@@ -212,6 +212,7 @@
         ScriptEditControl.registerActivePopup(this);
     }
 
+    @NotNull
     public JPopupMenu getMenu() {
         return menu;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8256] trunk/src/app/net/sf/gridarta/gui/map/ maptilepane/AbstractMapTilePane.java

[<aki...@us...>]

Revision: 8256
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8256&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:47:36 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Make function static.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java

Modified: trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java	2010-06-06 23:45:28 UTC (rev 8255)
+++ trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java	2010-06-06 23:47:36 UTC (rev 8256)
@@ -156,7 +156,7 @@
      * @return the new instance
      */
     @NotNull
-    private TileLink newTileLink(@NotNull final String key, @NotNull final MapLink[] mapLinks, final int revLink) {
+    private static TileLink newTileLink(@NotNull final String key, @NotNull final MapLink[] mapLinks, final int revLink) {
         final String name = ACTION_BUILDER.getString(key);
         if (name == null) {
             throw new IllegalArgumentException("resource key '" + key + "' does not exist");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8255] trunk/src/app/net/sf/gridarta/model/ treasurelist

[<aki...@us...>]

Revision: 8255
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8255&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:45:28 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Inline getters.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureListTreasureObj.java
    trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureTreeNode.java

Modified: trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureListTreasureObj.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureListTreasureObj.java	2010-06-06 23:44:34 UTC (rev 8254)
+++ trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureListTreasureObj.java	2010-06-06 23:45:28 UTC (rev 8255)
@@ -94,7 +94,7 @@
         }
 
         final TreasureListTreasureObj treasureListTreasureObj = (TreasureListTreasureObj) treasureObj;
-        listType = treasureListTreasureObj.getListType();
+        listType = treasureListTreasureObj.listType;
     }
 
 } // class TreasureListTreasureObj

Modified: trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureTreeNode.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureTreeNode.java	2010-06-06 23:44:34 UTC (rev 8254)
+++ trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureTreeNode.java	2010-06-06 23:45:28 UTC (rev 8255)
@@ -71,7 +71,7 @@
             // this is a list, let's see if there are children
             boolean hasChildren = false; // true when this list has real children
             for (final TreasureTreeNode treasureTreeNode : new EnumerationIterator<TreasureTreeNode>(children())) {
-                if (treasureTreeNode.getTreasureObj().isRealChild()) {
+                if (treasureTreeNode.content.isRealChild()) {
                     hasChildren = true; // found a real child
                     break;
                 }
@@ -113,7 +113,7 @@
 
         // calculate the sum of all chances
         for (final TreasureTreeNode treasureTreeNode : new EnumerationIterator<TreasureTreeNode>(children())) {
-            final TreasureObj treasureObj = treasureTreeNode.getTreasureObj();
+            final TreasureObj treasureObj = treasureTreeNode.content;
             sumChances += treasureObj.initChance();
         }
 
@@ -121,7 +121,7 @@
 
         // now apply the correcting factor to all chances
         for (final TreasureTreeNode treasureTreeNode : new EnumerationIterator<TreasureTreeNode>(children())) {
-            final TreasureObj treasureObj = treasureTreeNode.getTreasureObj();
+            final TreasureObj treasureObj = treasureTreeNode.content;
             treasureObj.correctChance(corrector);
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8254] trunk

[<aki...@us...>]

Revision: 8254
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8254&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:44:34 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Add final modifiers.

Modified Paths:
--------------
    trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/scripts/DefaultScriptedEvent.java
    trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserView.java
    trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
    trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursor.java
    trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewAction.java
    trunk/src/app/net/sf/gridarta/gui/mapdesktop/WindowAction.java
    trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java
    trunk/src/app/net/sf/gridarta/gui/utils/DirectionComponent.java
    trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java
    trunk/src/app/net/sf/gridarta/textedit/textarea/TextAreaPainter.java

Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/scripts/DefaultScriptedEvent.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/scripts/DefaultScriptedEvent.java	2010-06-06 23:40:46 UTC (rev 8253)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/scripts/DefaultScriptedEvent.java	2010-06-06 23:44:34 UTC (rev 8254)
@@ -196,7 +196,7 @@
      * {@inheritDoc}
      */
     @Override
-    protected void setEventData(@NotNull final String pluginName, @NotNull final String scriptPath, @NotNull final String options) {
+    protected final void setEventData(@NotNull final String pluginName, @NotNull final String scriptPath, @NotNull final String options) {
         final int eventType = getEventType();
         event.setObjectText("");
         event.setAttributeString(subtypeAttribute, Integer.toString(eventType));

Modified: trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserView.java	2010-06-06 23:40:46 UTC (rev 8253)
+++ trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserView.java	2010-06-06 23:44:34 UTC (rev 8254)
@@ -281,7 +281,7 @@
      * Selects an archetype panel. Does nothing if the panel does not exist.
      * @param selectedPanel the archetype panel to show
      */
-    public void setSelectedPanel(@NotNull final ArchetypePanel<G, A, R> selectedPanel) {
+    public final void setSelectedPanel(@NotNull final ArchetypePanel<G, A, R> selectedPanel) {
         final int selectedIndex = tabDesktop.indexOfComponent(selectedPanel);
         if (selectedIndex == -1 || selectedIndex == tabDesktop.getSelectedIndex()) {
             return;

Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java	2010-06-06 23:40:46 UTC (rev 8253)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java	2010-06-06 23:44:34 UTC (rev 8254)
@@ -1021,7 +1021,7 @@
      *         return null.
      */
     @Nullable
-    Component buildAttribute() {
+    private Component buildAttribute() {
         boolean initialCall = false;
 
         if (tabbedPane == null) {

Modified: trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursor.java	2010-06-06 23:40:46 UTC (rev 8253)
+++ trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursor.java	2010-06-06 23:44:34 UTC (rev 8254)
@@ -281,7 +281,7 @@
     /**
      * Cursor gets deactivated. All selections get lost.
      */
-    public void deactivate() {
+    public final void deactivate() {
         final boolean hasChanged = onMap;
         mapGrid.beginTransaction();
         try {

Modified: trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewAction.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewAction.java	2010-06-06 23:40:46 UTC (rev 8253)
+++ trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewAction.java	2010-06-06 23:44:34 UTC (rev 8254)
@@ -95,7 +95,7 @@
     /**
      * Update the action's state to match the current edit type settings.
      */
-    public void updateAction() {
+    public final void updateAction() {
         checkBoxMenuItem.setSelected(mapViewSettings.isEditType(editType));
     }
 

Modified: trunk/src/app/net/sf/gridarta/gui/mapdesktop/WindowAction.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapdesktop/WindowAction.java	2010-06-06 23:40:46 UTC (rev 8253)
+++ trunk/src/app/net/sf/gridarta/gui/mapdesktop/WindowAction.java	2010-06-06 23:44:34 UTC (rev 8254)
@@ -177,7 +177,7 @@
      * Accelerator to use.
      * @param index index (with 1 for first entry)
      */
-    public void setIndex(final int index) {
+    public final void setIndex(final int index) {
         this.index = index;
         if (0 <= index && index <= 10) {
             putValue(MNEMONIC_KEY, KeyStroke.getKeyStroke(Integer.toString(index % 10)).getKeyCode());

Modified: trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java	2010-06-06 23:40:46 UTC (rev 8253)
+++ trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java	2010-06-06 23:44:34 UTC (rev 8254)
@@ -286,7 +286,7 @@
      * {@inheritDoc}
      */
     @Override
-    public boolean isPickmapActive() {
+    public final boolean isPickmapActive() {
         return activeTab == pickmapChooserControl;
     }
 
@@ -346,7 +346,7 @@
      */
     @Nullable
     @Override
-    public BaseObject<G, A, R, ?> getSelection() {
+    public final BaseObject<G, A, R, ?> getSelection() {
         return activeTab == null ? null : activeTab.getSelection();
     }
 

Modified: trunk/src/app/net/sf/gridarta/gui/utils/DirectionComponent.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/DirectionComponent.java	2010-06-06 23:40:46 UTC (rev 8253)
+++ trunk/src/app/net/sf/gridarta/gui/utils/DirectionComponent.java	2010-06-06 23:44:34 UTC (rev 8254)
@@ -118,7 +118,7 @@
      * Enables/disables the direction buttons for a given archetype.
      * @param enableButtons whether the buttons are enabled
      */
-    protected void updateEnabled(final boolean enableButtons) {
+    protected final void updateEnabled(final boolean enableButtons) {
         this.enableButtons = enableButtons;
         updateEnabled();
     }
@@ -127,7 +127,7 @@
      * Sets the selected direction.
      * @param direction the direction
      */
-    public void updateDirection(@Nullable final Integer direction) {
+    public final void updateDirection(@Nullable final Integer direction) {
         final AbstractButton selectedButton = directions.get(direction);
         if (selectedButton != null) {
             selectedButton.setSelected(true);

Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java	2010-06-06 23:40:46 UTC (rev 8253)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java	2010-06-06 23:44:34 UTC (rev 8254)
@@ -735,7 +735,7 @@
      * Sets the document this text area is editing.
      * @param document the document
      */
-    public void setDocument(@Nullable final SyntaxDocument document) {
+    public final void setDocument(@Nullable final SyntaxDocument document) {
         if (this.document == document) {
             return;
         }

Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/TextAreaPainter.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/TextAreaPainter.java	2010-06-06 23:40:46 UTC (rev 8253)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/TextAreaPainter.java	2010-06-06 23:44:34 UTC (rev 8254)
@@ -324,7 +324,7 @@
      * {@inheritDoc}
      */
     @Override
-    public void setFont(@NotNull final Font font) {
+    public final void setFont(@NotNull final Font font) {
         super.setFont(font);
         fontMetrics = getFontMetrics(font);
         textArea.recalculateVisibleLines();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8253] trunk/src/app/net/sf/gridarta/model/archetype/ AbstractArchetypeSet.java

[<aki...@us...>]

Revision: 8253
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8253&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:40:46 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Extract code into function.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java

Modified: trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java	2010-06-06 23:38:25 UTC (rev 8252)
+++ trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java	2010-06-06 23:40:46 UTC (rev 8253)
@@ -259,38 +259,7 @@
             try {
                 final BufferedWriter out = new BufferedWriter(osw);
                 try {
-                    progress.setLabel(ACTION_BUILDER.getString("archCollectArches"), archetypes.size());
-                    int artifactCount = 0;
-                    int count = 0;
-                    for (final R arch : archetypes) {
-                        if (arch.isArtifact()) {
-                            artifactCount++;
-                            continue;
-                        }
-                        if (arch.isUndefinedArchetype()) {
-                            continue;
-                        }
-
-                        if (arch.isTail()) {
-                            continue;
-                        }
-
-                        if (arch.getArchetypeName().equals(ArchetypeParser.START_ARCH_NAME)) {
-                            collectStartArch(arch, out);
-                            count++;
-                        } else {
-                            count += collectArch(arch, out);
-                        }
-
-                        if (count % 100 == 0) {
-                            progress.setValue(count);
-                        }
-                    }
-
-                    if ((count + artifactCount) - getArchetypeCount() != 0) {
-                        ACTION_BUILDER.showMessageDialog(progress.getParentComponent(), "archCollectWarningMissed", getArchetypeCount() - count - artifactCount);
-                    }
-                    progress.setValue(archetypes.size());
+                    collect(progress, out);
                 } finally {
                     out.close();
                 }
@@ -303,6 +272,47 @@
     }
 
     /**
+     * Collects the archetypes.
+     * @param progress the progress to report progress to
+     * @param writer the writer to write the archetypes to
+     * @throws IOException in case of I/O problems during collection
+     */
+    private void collect(@NotNull final Progress progress, @NotNull final Writer writer) throws IOException {
+        progress.setLabel(ACTION_BUILDER.getString("archCollectArches"), archetypes.size());
+        int artifactCount = 0;
+        int count = 0;
+        for (final R arch : archetypes) {
+            if (arch.isArtifact()) {
+                artifactCount++;
+                continue;
+            }
+            if (arch.isUndefinedArchetype()) {
+                continue;
+            }
+
+            if (arch.isTail()) {
+                continue;
+            }
+
+            if (arch.getArchetypeName().equals(ArchetypeParser.START_ARCH_NAME)) {
+                collectStartArch(arch, writer);
+                count++;
+            } else {
+                count += collectArch(arch, writer);
+            }
+
+            if (count % 100 == 0) {
+                progress.setValue(count);
+            }
+        }
+
+        if ((count + artifactCount) - getArchetypeCount() != 0) {
+            ACTION_BUILDER.showMessageDialog(progress.getParentComponent(), "archCollectWarningMissed", getArchetypeCount() - count - artifactCount);
+        }
+        progress.setValue(archetypes.size());
+    }
+
+    /**
      * Processes the special archetype {@link ArchetypeParser#START_ARCH_NAME}.
      * @param archetype the archetype
      * @param out the writer collecting into


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8252] trunk/src/app/net/sf/gridarta/model/archetype/ AbstractArchetypeSet.java

[<aki...@us...>]

Revision: 8252
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8252&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:38:25 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Remove comments.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java

Modified: trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java	2010-06-06 23:37:20 UTC (rev 8251)
+++ trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java	2010-06-06 23:38:25 UTC (rev 8252)
@@ -253,7 +253,6 @@
     @Override
     public void collect(@NotNull final Progress progress, @NotNull final File collectedDirectory) throws IOException {
         final File file = new File(collectedDirectory, archFile);
-        // now open the output-stream
         final FileOutputStream fos = new FileOutputStream(file);
         try {
             final OutputStreamWriter osw = new OutputStreamWriter(fos, IOUtils.MAP_ENCODING);
@@ -262,9 +261,8 @@
                 try {
                     progress.setLabel(ACTION_BUILDER.getString("archCollectArches"), archetypes.size());
                     int artifactCount = 0;
-                    int count = 0; // count how much arches we've collected
+                    int count = 0;
                     for (final R arch : archetypes) {
-                        // exclude arches generated from artifacts file from collection
                         if (arch.isArtifact()) {
                             artifactCount++;
                             continue;
@@ -278,7 +276,6 @@
                         }
 
                         if (arch.getArchetypeName().equals(ArchetypeParser.START_ARCH_NAME)) {
-                            // process map arch
                             collectStartArch(arch, out);
                             count++;
                         } else {
@@ -290,7 +287,6 @@
                         }
                     }
 
-                    // check if we still missed any arches
                     if ((count + artifactCount) - getArchetypeCount() != 0) {
                         ACTION_BUILDER.showMessageDialog(progress.getParentComponent(), "archCollectWarningMissed", getArchetypeCount() - count - artifactCount);
                     }
@@ -315,9 +311,6 @@
     private static void collectStartArch(@NotNull final Archetype<?, ?, ?> archetype, @NotNull final Writer out) throws IOException {
         out.append("Object ").append(archetype.getArchetypeName()).append('\n');
 
-        // 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 (archetype.getArchetypeName().equals(ArchetypeParser.START_ARCH_NAME)) {
             out.append("x ").append(Integer.toString(archetype.getMultiX())).append('\n');
             out.append("y ").append(Integer.toString(archetype.getMultiY())).append('\n');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8251] trunk/src/app/net/sf/gridarta/model/map/ maparchobject/AbstractMapArchObject.java

[<aki...@us...>]

Revision: 8251
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8251&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:37:20 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Suppress warning.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/model/map/maparchobject/AbstractMapArchObject.java

Modified: trunk/src/app/net/sf/gridarta/model/map/maparchobject/AbstractMapArchObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/map/maparchobject/AbstractMapArchObject.java	2010-06-06 23:36:33 UTC (rev 8250)
+++ trunk/src/app/net/sf/gridarta/model/map/maparchobject/AbstractMapArchObject.java	2010-06-06 23:37:20 UTC (rev 8251)
@@ -611,6 +611,7 @@
     public A clone() {
         final AbstractMapArchObject<A> clone;
         try {
+            //noinspection OverriddenMethodCallDuringObjectConstruction
             clone = (AbstractMapArchObject<A>) super.clone();
         } catch (final CloneNotSupportedException ex) {
             throw new AssertionError(ex);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8250] trunk/src/app/net/sf/gridarta/model/map/ maparchobject/AbstractMapArchObject.java

[<aki...@us...>]

Revision: 8250
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8250&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:36:33 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Fix unchecked cast warning.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/model/map/maparchobject/AbstractMapArchObject.java

Modified: trunk/src/app/net/sf/gridarta/model/map/maparchobject/AbstractMapArchObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/map/maparchobject/AbstractMapArchObject.java	2010-06-06 23:35:44 UTC (rev 8249)
+++ trunk/src/app/net/sf/gridarta/model/map/maparchobject/AbstractMapArchObject.java	2010-06-06 23:36:33 UTC (rev 8250)
@@ -415,7 +415,7 @@
      */
     @Override
     public void setState(@NotNull final A mapArchObject) {
-        final AbstractMapArchObject<A> abstractMapArchObject = (AbstractMapArchObject<A>) mapArchObject;
+        final AbstractMapArchObject<?> abstractMapArchObject = (AbstractMapArchObject<?>) mapArchObject;
         setText(abstractMapArchObject.msgText.toString());
         setMapSize(abstractMapArchObject.mapSize);
         setMapName(abstractMapArchObject.mapName);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8249] trunk

[<aki...@us...>]

Revision: 8249
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8249&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:35:44 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Add comments.

Modified Paths:
--------------
    trunk/gridarta.ipr
    trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java

Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr	2010-06-06 23:30:47 UTC (rev 8248)
+++ trunk/gridarta.ipr	2010-06-06 23:35:44 UTC (rev 8249)
@@ -348,7 +348,7 @@
         <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
           <option name="TOP_LEVEL_CLASS_OPTIONS">
             <value>
-              <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+              <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="package" />
               <option name="REQUIRED_TAGS" value="@author" />
             </value>
           </option>

Modified: trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java	2010-06-06 23:30:47 UTC (rev 8248)
+++ trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java	2010-06-06 23:35:44 UTC (rev 8249)
@@ -44,21 +44,25 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+/**
+ * Default {@link FileControl} implementation. Asks the user for directions.
+ * @author Andreas Kirschbaum
+ */
 public class DefaultFileControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements FileControl<G, A, R> {
 
     /**
-     * Action Builder.
+     * The {@link ActionBuilder}.
      */
     private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
 
     /**
-     * The global settings instance.
+     * The {@link GlobalSettings}.
      */
     @NotNull
     private final GlobalSettings globalSettings;
 
     /**
-     * The archetype set.
+     * The {@link ArchetypeSet}.
      */
     @NotNull
     private final ArchetypeSet<G, A, R> archetypeSet;
@@ -70,7 +74,7 @@
     private final MapImageCache<G, A, R> mapImageCache;
 
     /**
-     * The map manager.
+     * The {@link MapManager}.
      */
     @NotNull
     private final MapManager<G, A, R> mapManager;
@@ -88,19 +92,19 @@
     private final Component parent;
 
     /**
-     * The map file filter.
+     * The {@link FileFilter} for selecting map files.
      */
     @NotNull
     private final FileFilter mapFileFilter;
 
     /**
-     * The script file filter.
+     * The {@link FileFilter} for selecting script files.
      */
     @NotNull
     private final FileFilter scriptFileFilter;
 
     /**
-     * The new map dialog factory.
+     * The {@link NewMapDialogFactory}.
      */
     @NotNull
     private final NewMapDialogFactory<G, A, R> newMapDialogFactory;
@@ -118,7 +122,8 @@
     private final ScriptEditControl scriptEditControl;
 
     /**
-     * JFileChooser for opening a file.
+     * The {@link JFileChooser} for opening a file. Set to <code>null</code> if
+     * not yet created.
      */
     @Nullable
     private JFileChooser fileChooser = null;
@@ -131,8 +136,8 @@
      * @param mapManager the map manager
      * @param mapViewsManager the map views manager
      * @param parent the parent component for showing dialog boxes
-     * @param mapFileFilter the map file filter
-     * @param scriptFileFilter the script file filter
+     * @param mapFileFilter the file filter for selecting map files
+     * @param scriptFileFilter the file filter for selecting script files
      * @param newMapDialogFactory the new map dialog factory
      * @param scriptExtension the file extension for script files
      * @param scriptEditControl the script edit control to forward to
@@ -190,7 +195,7 @@
 
     /**
      * The user wants to open a file. The file filters and preselected file
-     * filter are set accordingly to <var>mapFilter</var>.
+     * filter are set accordingly to <code>mapFilter</code>.
      * @param mapFilter set to <code>true</code> if the user probably wants to
      * open a map, <code>false</code> otherwise
      */
@@ -316,6 +321,11 @@
         return true;
     }
 
+    /**
+     * Displays a "save as" dialog.
+     * @param mapControl the map control for the dialog
+     * @return the selected file or <code>null</code> if cancelled
+     */
     @Nullable
     private File saveMapAs(@NotNull final MapControl<G, A, R> mapControl) {
         final JFileChooser saveFileChooser = new JFileChooser();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8248] trunk/src/app/net/sf/gridarta/mapmanager/ DefaultFileControl.java

[<aki...@us...>]

Revision: 8248
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8248&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:30:47 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Fix warnings.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java

Modified: trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java	2010-06-06 23:28:45 UTC (rev 8247)
+++ trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java	2010-06-06 23:30:47 UTC (rev 8248)
@@ -152,19 +152,22 @@
     }
 
     /**
-     * Create the JFileChooser for opening a file.
+     * Creates the {@link JFileChooser} for opening a file.
+     * @return the new file chooser
      */
-    private void createFileChooser() {
-        fileChooser = new JFileChooser();
-        fileChooser.setDialogTitle(ACTION_BUILDER.getString("fileDialog.title"));
-        fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
-        fileChooser.setMultiSelectionEnabled(true);
-        fileChooser.addChoosableFileFilter(scriptFileFilter);
-        fileChooser.addChoosableFileFilter(mapFileFilter);
+    @NotNull
+    private JFileChooser createFileChooser() {
+        final JFileChooser tmpFileChooser = new JFileChooser();
+        tmpFileChooser.setDialogTitle(ACTION_BUILDER.getString("fileDialog.title"));
+        tmpFileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
+        tmpFileChooser.setMultiSelectionEnabled(true);
+        tmpFileChooser.addChoosableFileFilter(scriptFileFilter);
+        tmpFileChooser.addChoosableFileFilter(mapFileFilter);
         if (globalSettings.getMapsDirectory().exists()) {
-            FileChooserUtils.setCurrentDirectory(fileChooser, globalSettings.getMapsDirectory());
+            FileChooserUtils.setCurrentDirectory(tmpFileChooser, globalSettings.getMapsDirectory());
         }
-        fileChooser.setAccessory(new MapPreviewAccessory(mapImageCache, fileChooser));
+        tmpFileChooser.setAccessory(new MapPreviewAccessory(mapImageCache, tmpFileChooser));
+        return tmpFileChooser;
     }
 
     /**
@@ -193,15 +196,16 @@
      */
     private void openFile(final boolean mapFilter) {
         if (fileChooser == null) {
-            createFileChooser();
+            fileChooser = createFileChooser();
         }
+        final JFileChooser tmpFileChooser = fileChooser;
         if (mapFilter) {
-            fileChooser.setFileFilter(mapFileFilter);
+            tmpFileChooser.setFileFilter(mapFileFilter);
         } else {
-            fileChooser.setFileFilter(scriptFileFilter);
+            tmpFileChooser.setFileFilter(scriptFileFilter);
         }
-        FileChooserUtils.sanitizeCurrentDirectory(fileChooser);
-        final int returnVal = fileChooser.showOpenDialog(parent);
+        FileChooserUtils.sanitizeCurrentDirectory(tmpFileChooser);
+        final int returnVal = tmpFileChooser.showOpenDialog(parent);
         if (returnVal != JFileChooser.APPROVE_OPTION) {
             return;
         }
@@ -213,8 +217,8 @@
         }
 
         globalSettings.setChangedDir(true); // user has chosen an active dir
-        final File dir = fileChooser.getCurrentDirectory();
-        final File[] files = fileChooser.getSelectedFiles();
+        final File dir = tmpFileChooser.getCurrentDirectory();
+        final File[] files = tmpFileChooser.getSelectedFiles();
         for (final File file : files) {
             final boolean isScriptFile = file.getName().toLowerCase().endsWith(scriptExtension);
             if (file.isFile()) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8247] trunk/src/app/net/sf/gridarta

[<aki...@us...>]

Revision: 8247
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8247&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:28:45 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Explicitly initialize fields.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxEditor.java
    trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java
    trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java
    trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java
    trunk/src/app/net/sf/gridarta/model/map/maparchobject/AbstractMapArchObject.java
    trunk/src/app/net/sf/gridarta/script/parameter/ArchParameter.java
    trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/CTokenMarker.java

Modified: trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxEditor.java	2010-06-06 23:24:49 UTC (rev 8246)
+++ trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxEditor.java	2010-06-06 23:28:45 UTC (rev 8247)
@@ -68,7 +68,7 @@
 
     private JTextComponent editor = null;
 
-    private JPopupMenu popup;
+    private JPopupMenu popup = null;
 
     private volatile boolean locked = false;
 

Modified: trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java	2010-06-06 23:24:49 UTC (rev 8246)
+++ trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java	2010-06-06 23:28:45 UTC (rev 8247)
@@ -120,7 +120,8 @@
     /**
      * JFileChooser for opening a file.
      */
-    private JFileChooser fileChooser;
+    @Nullable
+    private JFileChooser fileChooser = null;
 
     /**
      * Creates a new instance.

Modified: trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java	2010-06-06 23:24:49 UTC (rev 8246)
+++ trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java	2010-06-06 23:28:45 UTC (rev 8247)
@@ -42,7 +42,7 @@
      * The {@link ErrorViewCollector} for reporting errors.
      */
     @Nullable
-    private ErrorViewCollector errorViewCollector;
+    private ErrorViewCollector errorViewCollector = null;
 
     /**
      * The {@link Archetype} being built. Set to <code>null</code> when not

Modified: trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java	2010-06-06 23:24:49 UTC (rev 8246)
+++ trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java	2010-06-06 23:28:45 UTC (rev 8247)
@@ -87,7 +87,7 @@
      * @val <code>false</code> when Archetypes were loaded from individual
      * .arc-files
      */
-    private boolean loadedFromArchive;
+    private boolean loadedFromArchive = false;
 
     /**
      * The archetypes used for game objects which reference undefined

Modified: trunk/src/app/net/sf/gridarta/model/map/maparchobject/AbstractMapArchObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/map/maparchobject/AbstractMapArchObject.java	2010-06-06 23:24:49 UTC (rev 8246)
+++ trunk/src/app/net/sf/gridarta/model/map/maparchobject/AbstractMapArchObject.java	2010-06-06 23:28:45 UTC (rev 8247)
@@ -81,12 +81,12 @@
     /**
      * The x coordinate for entering the map.
      */
-    private int enterX;
+    private int enterX = 0;
 
     /**
      * The y coordinate for entering the map.
      */
-    private int enterY;
+    private int enterY = 0;
 
     /**
      * If set, this is an outdoor map.
@@ -96,29 +96,29 @@
     /**
      * The number of ticks that need to elapse before this map will be reset.
      */
-    private int resetTimeout;
+    private int resetTimeout = 0;
 
     /**
      * The number of ticks that must elapse after tha map has not been used
      * before it gets swapped out.
      */
-    private int swapTime;
+    private int swapTime = 0;
 
     /**
      * The map difficulty. If zero, server calculates something.
      */
-    private int difficulty;
+    private int difficulty = 0;
 
     /**
      * If nonzero, the map reset time will not be updated when someone enters /
      * exits the map.
      */
-    private boolean fixedReset;
+    private boolean fixedReset = false;
 
     /**
      * The light / darkness of map (overall). Zero means fully bright.
      */
-    private int darkness;
+    private int darkness = 0;
 
     /**
      * The map tile paths used for map tiling. 0 = north, 1 = east, 2 = south, 3
@@ -144,7 +144,7 @@
      * @invariant transactionDepth > 0 || transactionThread == null
      */
     @Nullable
-    private transient Thread transactionThread;
+    private transient Thread transactionThread = null;
 
     /**
      * Set if any attribute has changed inside the current transaction.

Modified: trunk/src/app/net/sf/gridarta/script/parameter/ArchParameter.java
===================================================================
--- trunk/src/app/net/sf/gridarta/script/parameter/ArchParameter.java	2010-06-06 23:24:49 UTC (rev 8246)
+++ trunk/src/app/net/sf/gridarta/script/parameter/ArchParameter.java	2010-06-06 23:28:45 UTC (rev 8247)
@@ -38,7 +38,7 @@
     @NotNull
     private final ArchetypeSet<G, A, R> archetypeSet;
 
-    private String valueString;
+    private String valueString = null;
 
     public ArchParameter(@NotNull final ArchetypeSet<G, A, R> archetypeSet) {
         this.archetypeSet = archetypeSet;

Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/CTokenMarker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/CTokenMarker.java	2010-06-06 23:24:49 UTC (rev 8246)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/CTokenMarker.java	2010-06-06 23:28:45 UTC (rev 8247)
@@ -35,9 +35,9 @@
      */
     private final KeywordMap keywords;
 
-    private int lastOffset;
+    private int lastOffset = 0;
 
-    private int lastKeyword;
+    private int lastKeyword = 0;
 
     /**
      * Create a new instance using default keywords.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8246] trunk/src/app/net/sf/gridarta/textedit/textarea

[<aki...@us...>]

Revision: 8246
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8246&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:24:49 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Remove unused code.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/textedit/textarea/TextAreaPainter.java

Removed Paths:
-------------
    trunk/src/app/net/sf/gridarta/textedit/textarea/Highlight.java

Deleted: trunk/src/app/net/sf/gridarta/textedit/textarea/Highlight.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/Highlight.java	2010-06-06 23:19:21 UTC (rev 8245)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/Highlight.java	2010-06-06 23:24:49 UTC (rev 8246)
@@ -1,48 +0,0 @@
-/*
- * TextAreaPainter.java - Paints the text area
- * Copyright (C) 1999 Slava Pestov
- * Copyright (C) 2000-2010 The Gridarta Developers.
- *
- * You may use and modify this package for any purpose. Redistribution is
- * permitted, in both source and binary form, provided that this notice
- * remains intact in all source distributions of this package.
- */
-
-package net.sf.gridarta.textedit.textarea;
-
-import java.awt.Graphics;
-import java.awt.event.MouseEvent;
-
-/**
- * Interface for highlight painters to be added to {@link TextAreaPainter}s. A
- * highlight painter may highlight parts of lines, or may provide tooltips.
- * @author Slava Pestov
- * @author <a href="mailto:and...@gm...">Andreas Vogl</a>
- */
-public interface Highlight {
-
-    /**
-     * Called after the highlight painter has been added.
-     * @param textArea the text area
-     * @param next the painter this one should delegate to
-     */
-    void init(JEditTextArea textArea, Highlight next);
-
-    /**
-     * This should delegate to the next highlight painter, then paint the
-     * highlight.
-     * @param gfx the graphics context
-     * @param line the line number
-     * @param y the y co-ordinate of the line
-     */
-    void paintHighlight(Graphics gfx, int line, int y);
-
-    /**
-     * Returns the tool tip to display at the specified location. If this
-     * highlighter doesn't know what to display, it should delegate to the next
-     * highlight painter.
-     * @param evt the mouse event
-     * @return the tool tip text to display
-     */
-    String getToolTipText(MouseEvent evt);
-}

Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/TextAreaPainter.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/TextAreaPainter.java	2010-06-06 23:19:21 UTC (rev 8245)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/TextAreaPainter.java	2010-06-06 23:24:49 UTC (rev 8246)
@@ -17,7 +17,6 @@
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Rectangle;
-import java.awt.event.MouseEvent;
 import java.awt.font.FontRenderContext;
 import java.awt.font.TextLayout;
 import java.util.Collections;
@@ -196,12 +195,6 @@
     private int defaultCharWidth = 0;
 
     /**
-     * The most recently added highlight painter.
-     */
-    @Nullable
-    private Highlight highlights = null;
-
-    /**
      * Creates a new repaint manager. This should be not be called directly.
      * @param textArea the associated text area that is painted
      * @param defaults the text attributes to use
@@ -292,51 +285,6 @@
     }
 
     /**
-     * Sets the caret color.
-     * @param caretColor the caret color
-     */
-    public void setCaretColor(@NotNull final Color caretColor) {
-        this.caretColor = caretColor;
-        invalidateSelectedLines();
-    }
-
-    /**
-     * Sets the selection color.
-     * @param selectionColor the selection color
-     */
-    public void setSelectionColor(@NotNull final Color selectionColor) {
-        this.selectionColor = selectionColor;
-        invalidateSelectedLines();
-    }
-
-    /**
-     * Sets the line highlight color.
-     * @param lineHighlightColor the line highlight color
-     */
-    public void setLineHighlightColor(@NotNull final Color lineHighlightColor) {
-        this.lineHighlightColor = lineHighlightColor;
-        invalidateSelectedLines();
-    }
-
-    /**
-     * Enables or disables current line highlighting.
-     * @param lineHighlight whether current line highlight should be enabled
-     */
-    public void setLineHighlightEnabled(final boolean lineHighlight) {
-        this.lineHighlight = lineHighlight;
-        invalidateSelectedLines();
-    }
-
-    /**
-     * Sets the bracket highlight color.
-     * @param bracketHighlightColor the bracket highlight color
-     */
-    public void setBracketHighlightColor(@NotNull final Color bracketHighlightColor) {
-        this.bracketHighlightColor = bracketHighlightColor;
-        invalidateLine(textArea.getBracketLine());
-    }
-
-    /**
      * Returns whether bracket highlighting is enabled. When bracket
      * highlighting is enabled, the bracket matching the one before the caret
      * (if any) is highlighted.
@@ -347,17 +295,6 @@
     }
 
     /**
-     * Enables or disables bracket highlighting. When bracket highlighting is
-     * enabled, the bracket matching the one before the caret (if any) is
-     * highlighted.
-     * @param bracketHighlight whether bracket highlighting should be enabled
-     */
-    public void setBracketHighlightEnabled(final boolean bracketHighlight) {
-        this.bracketHighlight = bracketHighlight;
-        invalidateLine(textArea.getBracketLine());
-    }
-
-    /**
      * Returns whether the caret should be drawn as a block.
      * @return whether the caret should be drawn as a block
      */
@@ -366,33 +303,6 @@
     }
 
     /**
-     * Sets whether the caret should be drawn as a block.
-     * @param blockCaret whether the caret should be drawn as a block
-     */
-    public void setBlockCaretEnabled(final boolean blockCaret) {
-        this.blockCaret = blockCaret;
-        invalidateSelectedLines();
-    }
-
-    /**
-     * Sets the EOL marker color.
-     * @param eolMarkerColor the EOL marker color
-     */
-    public void setEOLMarkerColor(@NotNull final Color eolMarkerColor) {
-        this.eolMarkerColor = eolMarkerColor;
-        repaint();
-    }
-
-    /**
-     * Sets whether EOL markers are to be drawn.
-     * @param eolMarkers whether EOL markers should be drawn
-     */
-    public void setEOLMarkersPainted(final boolean eolMarkers) {
-        this.eolMarkers = eolMarkers;
-        repaint();
-    }
-
-    /**
      * Sets whether invalid lines are to be painted as red tildes.
      * @param paintInvalid whether invalid lines should be drawn
      */
@@ -402,27 +312,6 @@
     }
 
     /**
-     * Adds a custom highlight painter. Any number of highlight painters may be
-     * added. The most recently added paints get the highest priority.
-     * @param highlight the highlight painter
-     */
-    public void addCustomHighlight(@NotNull final Highlight highlight) {
-        highlight.init(textArea, highlights);
-        highlights = highlight;
-        repaint();
-    }
-
-    /**
-     * Returns the tool tip to display at the specified location.
-     * @param event the mouse event
-     */
-    @Override
-    @Nullable
-    public String getToolTipText(@NotNull final MouseEvent event) {
-        return highlights != null ? highlights.getToolTipText(event) : null;
-    }
-
-    /**
      * Returns the font metrics used by this component.
      * @return the font metrics
      */
@@ -638,10 +527,6 @@
             paintLineHighlight(gfx, line, y);
         }
 
-        if (highlights != null) {
-            highlights.paintHighlight(gfx, line, y);
-        }
-
         if (bracketHighlight && line == textArea.getBracketLine()) {
             paintBracketHighlight(gfx, line, y);
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8245] trunk/src/app/net/sf/gridarta/model/baseobject/ AbstractBaseObject.java

[<aki...@us...>]

Revision: 8245
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8245&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:19:21 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Suppress warnings.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java

Modified: trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java	2010-06-06 23:17:01 UTC (rev 8244)
+++ trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java	2010-06-06 23:19:21 UTC (rev 8245)
@@ -391,12 +391,14 @@
 
     /**
      * {@inheritDoc}
+     * @noinspection AbstractMethodOverridesAbstractMethod // needed because of public modifier
      */
     @Override
     public abstract void notifyBeginChange();
 
     /**
      * {@inheritDoc}
+     * @noinspection AbstractMethodOverridesAbstractMethod // needed because of public modifier
      */
     @Override
     public abstract void notifyEndChange();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8244] trunk/src/app/net/sf/gridarta

[<aki...@us...>]

Revision: 8244
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8244&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:17:01 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Suppress warnings.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gui/archetypechooser/DisplayMode.java
    trunk/src/app/net/sf/gridarta/gui/connectionview/View.java
    trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java
    trunk/src/app/net/sf/gridarta/gui/newmap/AbstractNewMapDialog.java
    trunk/src/app/net/sf/gridarta/gui/utils/DirectionComponent.java
    trunk/src/app/net/sf/gridarta/model/scripts/UndefinedEventArchetypeException.java

Modified: trunk/src/app/net/sf/gridarta/gui/archetypechooser/DisplayMode.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/archetypechooser/DisplayMode.java	2010-06-06 23:13:51 UTC (rev 8243)
+++ trunk/src/app/net/sf/gridarta/gui/archetypechooser/DisplayMode.java	2010-06-06 23:17:01 UTC (rev 8244)
@@ -30,6 +30,7 @@
  * chooser. It defines both a {@link DefaultListCellRenderer} and a {@link
  * Comparator} for sorting the list entries.
  * @author Andreas Kirschbaum
+ * @noinspection AbstractClassExtendsConcreteClass
  */
 public abstract class DisplayMode<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends DefaultListCellRenderer implements Comparator<Archetype<G, A, R>> {
 

Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/View.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/View.java	2010-06-06 23:13:51 UTC (rev 8243)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/View.java	2010-06-06 23:17:01 UTC (rev 8244)
@@ -52,6 +52,7 @@
  * @todo better react on changes, don't always scan the whole map
  * @todo attach
  * @serial exclude
+ * @noinspection AbstractClassExtendsConcreteClass
  */
 public abstract class View<K, G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JPanel {
 

Modified: trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java	2010-06-06 23:13:51 UTC (rev 8243)
+++ trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java	2010-06-06 23:17:01 UTC (rev 8244)
@@ -59,6 +59,7 @@
  * @author <a href="mailto:mic...@no...">Michael Toennies</a>
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
  * @author Andreas Kirschbaum
+ * @noinspection AbstractClassExtendsConcreteClass
  */
 public abstract class AbstractMapTilePane<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JPanel {
 

Modified: trunk/src/app/net/sf/gridarta/gui/newmap/AbstractNewMapDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/newmap/AbstractNewMapDialog.java	2010-06-06 23:13:51 UTC (rev 8243)
+++ trunk/src/app/net/sf/gridarta/gui/newmap/AbstractNewMapDialog.java	2010-06-06 23:17:01 UTC (rev 8244)
@@ -57,6 +57,7 @@
  * @author <a href="mailto:mic...@no...">Michael Toennies</a>
  * @author <a href="mailto:and...@gm...">Andreas Vogl</a>
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @noinspection AbstractClassExtendsConcreteClass
  */
 public abstract class AbstractNewMapDialog<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JOptionPane {
 

Modified: trunk/src/app/net/sf/gridarta/gui/utils/DirectionComponent.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/DirectionComponent.java	2010-06-06 23:13:51 UTC (rev 8243)
+++ trunk/src/app/net/sf/gridarta/gui/utils/DirectionComponent.java	2010-06-06 23:17:01 UTC (rev 8244)
@@ -43,6 +43,7 @@
  * @author <a href="mailto:and...@gm...">Andreas Vogl</a>
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
  * @author Andreas Kirschbaum
+ * @noinspection AbstractClassExtendsConcreteClass
  */
 public abstract class DirectionComponent extends JPanel {
 

Modified: trunk/src/app/net/sf/gridarta/model/scripts/UndefinedEventArchetypeException.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/scripts/UndefinedEventArchetypeException.java	2010-06-06 23:13:51 UTC (rev 8243)
+++ trunk/src/app/net/sf/gridarta/model/scripts/UndefinedEventArchetypeException.java	2010-06-06 23:17:01 UTC (rev 8244)
@@ -25,6 +25,7 @@
  * The class <code>UndefinedEventArchetypeException</code> is thrown when an
  * event game object cannot be created.
  * @author Andreas Kirschbaum
+ * @noinspection AbstractClassExtendsConcreteClass,AbstractClassWithoutAbstractMethods
  */
 public abstract class UndefinedEventArchetypeException extends Exception {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8243] trunk/src/app/net/sf/gridarta/model/match/ MutableNameGameObjectMatcher.java

[<aki...@us...>]

Revision: 8243
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8243&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:13:51 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Remove unneeded throws clauses.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/model/match/MutableNameGameObjectMatcher.java

Modified: trunk/src/app/net/sf/gridarta/model/match/MutableNameGameObjectMatcher.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/match/MutableNameGameObjectMatcher.java	2010-06-06 23:12:36 UTC (rev 8242)
+++ trunk/src/app/net/sf/gridarta/model/match/MutableNameGameObjectMatcher.java	2010-06-06 23:13:51 UTC (rev 8243)
@@ -45,10 +45,8 @@
     /**
      * Creates a <code>MutableNameGameObjectMatcher</code>.
      * @param name the archetype name to match against
-     * @throws NullPointerException in case <code><var>name</var> ==
-     * null</code>
      */
-    public MutableNameGameObjectMatcher(@NotNull final String name) throws NullPointerException {
+    public MutableNameGameObjectMatcher(@NotNull final String name) {
         this.name = name;
     }
 
@@ -72,10 +70,8 @@
     /**
      * Sets the archetype name to match.
      * @param name the archetype name to match against
-     * @throws NullPointerException in case <code><var>name</var> ==
-     * null</code>
      */
-    public void setName(@NotNull final String name) throws NullPointerException {
+    public void setName(@NotNull final String name) {
         this.name = name;
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8242] trunk/src/app/net/sf/gridarta/model/io/ FlatFileIterator.java

[<aki...@us...>]

Revision: 8242
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8242&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:12:36 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Simplify code.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/model/io/FlatFileIterator.java

Modified: trunk/src/app/net/sf/gridarta/model/io/FlatFileIterator.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/io/FlatFileIterator.java	2010-06-06 23:09:20 UTC (rev 8241)
+++ trunk/src/app/net/sf/gridarta/model/io/FlatFileIterator.java	2010-06-06 23:12:36 UTC (rev 8242)
@@ -23,6 +23,7 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * An {@link Iterator} that iterates non-recursively over the contents of a
@@ -32,8 +33,15 @@
 public class FlatFileIterator implements Iterator<File> {
 
     /**
+     * An empty array of {@link File Files}.
+     */
+    @NotNull
+    private static final File[] EMPTY_FILE_ARRAY = new File[0];
+
+    /**
      * The files to return.
      */
+    @NotNull
     private final File[] files;
 
     /**
@@ -46,18 +54,17 @@
      * @param dir the directory to list
      */
     public FlatFileIterator(final File dir) {
-        files = dir.listFiles();
-        if (files != null) {
-            Arrays.sort(files);
-            skipSpecialNames();
-        }
+        final File[] tmp = dir.listFiles();
+        files = tmp == null ? EMPTY_FILE_ARRAY : tmp;
+        Arrays.sort(files);
+        skipSpecialNames();
     }
 
     /* {@inheritDoc} */
 
     @Override
     public boolean hasNext() {
-        return files != null && pos < files.length;
+        return pos < files.length;
     }
 
     /**
@@ -65,14 +72,11 @@
      */
     @Override
     public File next() {
-        final File result;
-        try {
-            result = files[pos++];
-        } catch (final NullPointerException ex) {
+        if (pos >= files.length) {
             throw new NoSuchElementException();
-        } catch (final ArrayIndexOutOfBoundsException ex) {
-            throw new NoSuchElementException();
         }
+
+        final File result = files[pos++];
         skipSpecialNames();
         return result;
     }
@@ -85,6 +89,9 @@
         throw new UnsupportedOperationException();
     }
 
+    /**
+     * Skips special files that should be always ignored.
+     */
     private void skipSpecialNames() {
         while (pos < files.length && files[pos].getName().equalsIgnoreCase(".svn")) {
             pos++;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8241] trunk/src/app/net/sf/gridarta/gui/map/mapview/ MapViewBasic.java

[<aki...@us...>]

Revision: 8241
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8241&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:09:20 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Simplify code.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java

Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java	2010-06-06 23:08:04 UTC (rev 8240)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java	2010-06-06 23:09:20 UTC (rev 8241)
@@ -109,9 +109,10 @@
         @Override
         public void mapCursorChangedPos(@NotNull final MapCursorEvent e) {
             final MapCursor mapCursor = e.getSource();
-            if (mapCursor.isActive()) {
-                final Rectangle rec = renderer.getSquareBounds(mapCursor.getLocation());
-                renderer.scrollRectToVisible(rec);
+            final Point cursorLocation = mapCursor.getLocation();
+            if (cursorLocation != null) {
+                final Rectangle rectangle = renderer.getSquareBounds(cursorLocation);
+                renderer.scrollRectToVisible(rectangle);
             }
         }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8208] trunk/src

[<aki...@us...>]

Revision: 8208
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8208&view=rev
Author:   akirschbaum
Date:     2010-06-06 22:10:07 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Suppress warnings.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/MainControl.java
    trunk/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java
    trunk/src/test/net/sf/gridarta/validation/AbstractValidatorTest.java

Modified: trunk/src/app/net/sf/gridarta/MainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/MainControl.java	2010-06-06 22:07:50 UTC (rev 8207)
+++ trunk/src/app/net/sf/gridarta/MainControl.java	2010-06-06 22:10:07 UTC (rev 8208)
@@ -22,6 +22,7 @@
 /**
  * Interface used as preferences location.
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @noinspection InterfaceNeverImplemented,MarkerInterface
  */
 public interface MainControl {
 

Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java	2010-06-06 22:07:50 UTC (rev 8207)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java	2010-06-06 22:10:07 UTC (rev 8208)
@@ -208,6 +208,7 @@
     /**
      * If an action implements this interface, it should not be repeated.
      * Instead, it will handle the repetition itself.
+     * @noinspection MarkerInterface,PublicInnerClass
      */
     public interface NonRepeatable {
 

Modified: trunk/src/test/net/sf/gridarta/validation/AbstractValidatorTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/validation/AbstractValidatorTest.java	2010-06-06 22:07:50 UTC (rev 8207)
+++ trunk/src/test/net/sf/gridarta/validation/AbstractValidatorTest.java	2010-06-06 22:10:07 UTC (rev 8208)
@@ -36,16 +36,19 @@
 
     /**
      * {@inheritDoc}
+     * @noinspection ProhibitedExceptionDeclared
      */
     @Override
     public void setUp() throws Exception {
         super.setUp();
+        //noinspection EmptyClass
         oUT = new AbstractValidator("") {
         };
     }
 
     /**
      * {@inheritDoc}
+     * @noinspection ProhibitedExceptionDeclared
      */
     @Override
     public void tearDown() throws Exception {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8215] trunk/src/app/net/sf/gridarta/gui/map/ mapactions/MapActions.java

[<aki...@us...>]

Revision: 8215
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8215&view=rev
Author:   akirschbaum
Date:     2010-06-06 22:24:27 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Rename variable name.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java

Modified: trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java	2010-06-06 22:24:08 UTC (rev 8214)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java	2010-06-06 22:24:27 UTC (rev 8215)
@@ -722,7 +722,7 @@
         } catch (final RelativePathOnUnsavedMapException ex) {
             ACTION_BUILDER.showMessageDialog(parent, "enterExitNotSaved");
             return false;
-        } catch (final SameMapException e) {
+        } catch (final SameMapException ignored) {
             // path points to the same map
             if (destinationPoint != null) {
                 showLocation(currentMapView, destinationPoint);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8209] trunk/src/app/net/sf/gridarta/gui/map/renderer

[<aki...@us...>]

Revision: 8209
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8209&view=rev
Author:   akirschbaum
Date:     2010-06-06 22:13:04 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Fix warning.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractSimpleIsoMapRenderer.java
    trunk/src/app/net/sf/gridarta/gui/map/renderer/SimpleIsoMapRenderer.java

Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractSimpleIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractSimpleIsoMapRenderer.java	2010-06-06 22:10:07 UTC (rev 8208)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractSimpleIsoMapRenderer.java	2010-06-06 22:13:04 UTC (rev 8209)
@@ -190,13 +190,6 @@
     /**
      * {@inheritDoc}
      */
-    @Override
-    public void closeNotify() {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     @NotNull
     @Override
     public Rectangle getSquareBounds(@NotNull final Point p) {

Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/SimpleIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/SimpleIsoMapRenderer.java	2010-06-06 22:10:07 UTC (rev 8208)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/SimpleIsoMapRenderer.java	2010-06-06 22:13:04 UTC (rev 8209)
@@ -124,4 +124,11 @@
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void closeNotify() {
+    }
+
 } // class SimpleIsoMapRenderer


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8211] trunk/src

[<aki...@us...>]

Revision: 8211
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8211&view=rev
Author:   akirschbaum
Date:     2010-06-06 22:16:57 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Add private modifiers.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java
    trunk/src/app/net/sf/gridarta/model/exitconnector/DefaultExitConnectorModel.java
    trunk/src/test/net/sf/gridarta/gui/map/test/TestMapControlCreator.java

Modified: trunk/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java	2010-06-06 22:14:05 UTC (rev 8210)
+++ trunk/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java	2010-06-06 22:16:57 UTC (rev 8211)
@@ -44,7 +44,7 @@
      * Attribute Element Name.
      */
     @NotNull
-    public static final String XML_ELEMENT_ATTRIBUTE = "attribute";
+    private static final String XML_ELEMENT_ATTRIBUTE = "attribute";
 
     /**
      * Required Element Name.
@@ -80,7 +80,7 @@
      * The "arch" attribute name of a {@link #XML_ELEMENT_ATTRIBUTE} element.
      */
     @NotNull
-    public static final String XML_ATTRIBUTE_ARCH = "arch";
+    private static final String XML_ATTRIBUTE_ARCH = "arch";
 
     /**
      * The "value" attribute name of a {@link #XML_ELEMENT_ATTRIBUTE} element.

Modified: trunk/src/app/net/sf/gridarta/model/exitconnector/DefaultExitConnectorModel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/exitconnector/DefaultExitConnectorModel.java	2010-06-06 22:14:05 UTC (rev 8210)
+++ trunk/src/app/net/sf/gridarta/model/exitconnector/DefaultExitConnectorModel.java	2010-06-06 22:16:57 UTC (rev 8211)
@@ -38,7 +38,7 @@
     /**
      * The default value for {@link #PASTE_EXIT_NAME_KEY}.
      */
-    public static final boolean PASTE_EXIT_NAME_DEFAULT = true;
+    private static final boolean PASTE_EXIT_NAME_DEFAULT = true;
 
     /**
      * The preferences key for "auto create exit".
@@ -48,7 +48,7 @@
     /**
      * The default value for {@link #AUTO_CREATE_EXIT_KEY}.
      */
-    public static final boolean AUTO_CREATE_EXIT_DEFAULT = true;
+    private static final boolean AUTO_CREATE_EXIT_DEFAULT = true;
 
     /**
      * The preferences key for "exit archetype".
@@ -58,7 +58,7 @@
     /**
      * The default value for {@link #EXIT_ARCHETYPE_NAME_KEY}.
      */
-    public static final String EXIT_ARCHETYPE_NAME_DEFAULT = "invis_exit";
+    private static final String EXIT_ARCHETYPE_NAME_DEFAULT = "invis_exit";
 
     /**
      * The {@link Preferences}.

Modified: trunk/src/test/net/sf/gridarta/gui/map/test/TestMapControlCreator.java
===================================================================
--- trunk/src/test/net/sf/gridarta/gui/map/test/TestMapControlCreator.java	2010-06-06 22:14:05 UTC (rev 8210)
+++ trunk/src/test/net/sf/gridarta/gui/map/test/TestMapControlCreator.java	2010-06-06 22:16:57 UTC (rev 8211)
@@ -468,7 +468,7 @@
      * @param mapSquare the map square
      * @param gameObjects the game object
      */
-    public static void checkContentsString(@NotNull final MapSquare<TestGameObject, TestMapArchObject, TestArchetype> mapSquare, @NotNull final String... gameObjects) {
+    private static void checkContentsString(@NotNull final MapSquare<TestGameObject, TestMapArchObject, TestArchetype> mapSquare, @NotNull final String... gameObjects) {
         int i = 0;
         for (final TestGameObject gameObject : mapSquare) {
             final String gameObjectName = gameObject.getBestName();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[8240] trunk/src/app/net/sf/gridarta/gui/map/mapview/ MapViewBasic.java

[<aki...@us...>]

Revision: 8240
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8240&view=rev
Author:   akirschbaum
Date:     2010-06-06 23:08:04 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Remove unused code.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java

Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java	2010-06-06 23:07:17 UTC (rev 8239)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java	2010-06-06 23:08:04 UTC (rev 8240)
@@ -274,19 +274,6 @@
     }
 
     /**
-     * Returns the cursor square.
-     * @return the cursor square or <code>null</code> if no current cursor
-     */
-    @Nullable
-    public MapSquare<G, A, R> getCursorSquare() {
-        try {
-            return mapModel.getMapSquare(mapCursor.getLocation());
-        } catch (final ArrayIndexOutOfBoundsException e) {
-            return null;
-        }
-    }
-
-    /**
      * Must be called when this renderer is not used anymore. It un-registers all
      * listeners.
      */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.