gridarta-commit Mailing List for gridarta (Page 6)

Brought to you by: akirschbaum, christianhujer, derdanny

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

You can subscribe to this list here.

2006	Jan	Feb	Mar	Apr	May (103)	Jun (121)	Jul (16)	Aug (67)	Sep (126)	Oct (161)	Nov (164)	Dec (588)
2007	Jan (394)	Feb (181)	Mar (131)	Apr (180)	May (255)	Jun (11)	Jul (79)	Aug (70)	Sep (274)	Oct (138)	Nov (195)	Dec (8)
2008	Jan (3)	Feb (142)	Mar (162)	Apr (124)	May (148)	Jun (157)	Jul (425)	Aug (373)	Sep (264)	Oct (315)	Nov (225)	Dec (6)
2009	Jan (67)	Feb (78)	Mar (279)	Apr (294)	May (92)	Jun (65)	Jul (134)	Aug (41)	Sep (138)	Oct (125)	Nov (126)	Dec (122)
2010	Jan (15)	Feb (48)	Mar (9)	Apr (195)	May (373)	Jun (507)	Jul (42)	Aug (16)	Sep (38)	Oct (81)	Nov (64)	Dec (18)
2011	Jan (13)	Feb (12)	Mar (39)	Apr (1)	May (2)	Jun (27)	Jul (27)	Aug (31)	Sep (14)	Oct (102)	Nov (20)	Dec (37)
2012	Jan (22)	Feb (1)	Mar (1)	Apr (2)	May (2)	Jun (18)	Jul (6)	Aug (1)	Sep (1)	Oct	Nov	Dec
2013	Jan (1)	Feb (2)	Mar (1)	Apr (1)	May (47)	Jun (7)	Jul (107)	Aug	Sep	Oct (112)	Nov (31)	Dec (17)
2014	Jan (29)	Feb (111)	Mar (34)	Apr	May (1)	Jun	Jul	Aug	Sep	Oct (2)	Nov (18)	Dec (10)

Flat | Threaded

<< < 1 .. 4 5 6 7 8 .. 380 > >> (Page 6 of 380)

[Gridarta-commit] SF.net SVN: gridarta:[9610] trunk/src/plugin/src/main/java/net/sf/gridarta/ plugin/Plugin.java

From: <aki...@us...> - 2014-02-22 07:37:45

Revision: 9610
          http://sourceforge.net/p/gridarta/code/9610
Author:   akirschbaum
Date:     2014-02-22 07:37:38 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
Inline function.

Modified Paths:
--------------
    trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java

Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java
===================================================================
--- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java	2014-02-22 07:33:29 UTC (rev 9609)
+++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java	2014-02-22 07:37:38 UTC (rev 9610)
@@ -381,11 +381,12 @@
 
     /**
      * Changes the type of a plugin parameter.
-     * @param index the plugin parameter's index
+     * @param pluginParameter the plugin parameter
      * @param newType the new type
      * @throws NoSuchParameterException if the index is invalid
      */
-    public void convertType(final int index, @NotNull final String newType) throws NoSuchParameterException {
+    public void convertType(@NotNull final PluginParameter<G, A, R, ?> pluginParameter, @NotNull final String newType) throws NoSuchParameterException {
+        final int index = parameters.indexOf(pluginParameter);
         final PluginParameter<G, A, R, ?> newParameter = pluginParameterFactory.createParameter(newType, codec.toXML(parameters.get(index)));
         final PluginParameter<G, A, R, ?> oldParameter = parameters.set(index, newParameter);
         oldParameter.removePluginParameterListener(pluginParameterListener);
@@ -394,16 +395,6 @@
     }
 
     /**
-     * Changes the type of a plugin parameter.
-     * @param pluginParameter the plugin parameter
-     * @param newType the new type
-     * @throws NoSuchParameterException if the index is invalid
-     */
-    public void convertType(@NotNull final PluginParameter<G, A, R, ?> pluginParameter, @NotNull final String newType) throws NoSuchParameterException {
-        convertType(parameters.indexOf(pluginParameter), newType);
-    }
-
-    /**
      * Returns whether the plugin contents have been modified since last save.
      * @return whether the plugin contents have been modified since last save
      */

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

[Gridarta-commit] SF.net SVN: gridarta:[9609] trunk/src/plugin/src/main/java/net/sf/gridarta/ plugin/Plugin.java

From: <aki...@us...> - 2014-02-22 07:33:35

Revision: 9609
          http://sourceforge.net/p/gridarta/code/9609
Author:   akirschbaum
Date:     2014-02-22 07:33:29 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
Inline variable.

Modified Paths:
--------------
    trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java

Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java
===================================================================
--- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java	2014-02-22 07:33:01 UTC (rev 9608)
+++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java	2014-02-22 07:33:29 UTC (rev 9609)
@@ -400,8 +400,7 @@
      * @throws NoSuchParameterException if the index is invalid
      */
     public void convertType(@NotNull final PluginParameter<G, A, R, ?> pluginParameter, @NotNull final String newType) throws NoSuchParameterException {
-        final int index = parameters.indexOf(pluginParameter);
-        convertType(index, newType);
+        convertType(parameters.indexOf(pluginParameter), newType);
     }
 
     /**

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

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

From: <aki...@us...> - 2014-02-22 07:33:04

Revision: 9608
          http://sourceforge.net/p/gridarta/code/9608
Author:   akirschbaum
Date:     2014-02-22 07:33:01 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
Do not ignore caught exception.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
    trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/NoSuchParameterException.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java	2014-02-22 07:26:49 UTC (rev 9607)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java	2014-02-22 07:33:01 UTC (rev 9608)
@@ -403,7 +403,7 @@
                 try {
                     plugin.convertType(parameter, newParameterType);
                 } catch (final NoSuchParameterException ex) {
-                    LOG.warn("Cannot create parameter for type " + newParameterType);
+                    LOG.warn("Cannot create parameter for " + ex.getMessage());
                 }
             }
 

Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/NoSuchParameterException.java
===================================================================
--- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/NoSuchParameterException.java	2014-02-22 07:26:49 UTC (rev 9607)
+++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/NoSuchParameterException.java	2014-02-22 07:33:01 UTC (rev 9608)
@@ -37,7 +37,7 @@
      * @param type the missing parameter type
      */
     public NoSuchParameterException(@NotNull final String type) {
-        super(type);
+        super("type " + type);
     }
 
     /**

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

[Gridarta-commit] SF.net SVN: gridarta:[9607] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/PluginEditor.java

From: <aki...@us...> - 2014-02-22 07:26:52

Revision: 9607
          http://sourceforge.net/p/gridarta/code/9607
Author:   akirschbaum
Date:     2014-02-22 07:26:49 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
Replace if statements with guards.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java	2014-02-22 07:25:59 UTC (rev 9606)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java	2014-02-22 07:26:49 UTC (rev 9607)
@@ -391,16 +391,20 @@
 
             @Override
             public void itemStateChanged(@NotNull final ItemEvent e) {
-                if (e.getStateChange() == ItemEvent.SELECTED) {
-                    final String newParameterType = (String) e.getItem();
-                    if (!parameter.getParameterType().equals(newParameterType)) {
-                        try {
-                            plugin.convertType(parameter, newParameterType);
-                        } catch (final NoSuchParameterException ex) {
-                            LOG.warn("Cannot create parameter for type " + newParameterType);
-                        }
-                    }
+                if (e.getStateChange() != ItemEvent.SELECTED) {
+                    return;
                 }
+
+                final String newParameterType = (String) e.getItem();
+                if (parameter.getParameterType().equals(newParameterType)) {
+                    return;
+                }
+
+                try {
+                    plugin.convertType(parameter, newParameterType);
+                } catch (final NoSuchParameterException ex) {
+                    LOG.warn("Cannot create parameter for type " + newParameterType);
+                }
             }
 
         });

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

[Gridarta-commit] SF.net SVN: gridarta:[9606] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/PluginEditor.java

From: <aki...@us...> - 2014-02-22 07:26:07

Revision: 9606
          http://sourceforge.net/p/gridarta/code/9606
Author:   akirschbaum
Date:     2014-02-22 07:25:59 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
Merge duplicated code.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java	2014-02-22 07:19:23 UTC (rev 9605)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java	2014-02-22 07:25:59 UTC (rev 9606)
@@ -392,11 +392,12 @@
             @Override
             public void itemStateChanged(@NotNull final ItemEvent e) {
                 if (e.getStateChange() == ItemEvent.SELECTED) {
-                    if (!parameter.getParameterType().equals(e.getItem())) {
+                    final String newParameterType = (String) e.getItem();
+                    if (!parameter.getParameterType().equals(newParameterType)) {
                         try {
-                            plugin.convertType(parameter, (String) e.getItem());
+                            plugin.convertType(parameter, newParameterType);
                         } catch (final NoSuchParameterException ex) {
-                            LOG.warn("Cannot create parameter for type " + e.getItem());
+                            LOG.warn("Cannot create parameter for type " + newParameterType);
                         }
                     }
                 }

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

[Gridarta-commit] SF.net SVN: gridarta:[9605] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin

From: <aki...@us...> - 2014-02-22 07:19:28

Revision: 9605
          http://sourceforge.net/p/gridarta/code/9605
Author:   akirschbaum
Date:     2014-02-22 07:19:23 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
Do not extend JComboBox.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java

Removed Paths:
-------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java	2014-02-22 07:04:58 UTC (rev 9604)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java	2014-02-22 07:19:23 UTC (rev 9605)
@@ -29,12 +29,15 @@
 import java.awt.Insets;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.util.HashMap;
 import java.util.Map;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -47,7 +50,6 @@
 import javax.swing.event.DocumentListener;
 import net.sf.gridarta.gui.dialog.plugin.parameter.ParameterDescriptionEditor;
 import net.sf.gridarta.gui.dialog.plugin.parameter.ParameterNameEditor;
-import net.sf.gridarta.gui.dialog.plugin.parameter.ParameterTypeEditor;
 import net.sf.gridarta.gui.dialog.plugin.parameter.PluginParameterView;
 import net.sf.gridarta.gui.dialog.plugin.parameter.PluginParameterViewFactory;
 import net.sf.gridarta.model.archetype.Archetype;
@@ -62,6 +64,8 @@
 import net.sf.japi.swing.action.ActionBuilder;
 import net.sf.japi.swing.action.ActionBuilderFactory;
 import net.sf.japi.swing.action.ActionMethod;
+import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 import org.fife.ui.rtextarea.RTextScrollPane;
@@ -70,6 +74,12 @@
 public class PluginEditor<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
 
     /**
+     * The Logger for printing log messages.
+     */
+    @NotNull
+    private static final Category LOG = Logger.getLogger(PluginEditor.class);
+
+    /**
      * Action Builder.
      */
     @NotNull
@@ -103,7 +113,7 @@
     private final Map<PluginParameter<G, A, R, ?>, ParameterDescriptionEditor<G, A, R>> parameterDescriptionEditors = new HashMap<PluginParameter<G, A, R, ?>, ParameterDescriptionEditor<G, A, R>>();
 
     @NotNull
-    private final Map<PluginParameter<G, A, R, ?>, ParameterTypeEditor<G, A, R>> parameterTypeEditors = new HashMap<PluginParameter<G, A, R, ?>, ParameterTypeEditor<G, A, R>>();
+    private final Map<PluginParameter<G, A, R, ?>, Component> parameterTypeEditors = new HashMap<PluginParameter<G, A, R, ?>, Component>();
 
     @NotNull
     private final Map<PluginParameter<G, A, R, ?>, PluginParameterView<G, A, R>> parameterViews = new HashMap<PluginParameter<G, A, R, ?>, PluginParameterView<G, A, R>>();
@@ -375,7 +385,24 @@
             return existingParameterTypeEditor;
         }
 
-        final ParameterTypeEditor<G, A, R> newParameterTypeEditor = new ParameterTypeEditor<G, A, R>(pluginModel, plugin, parameter);
+        final JComboBox newParameterTypeEditor = new JComboBox(pluginModel.getTypes());
+        newParameterTypeEditor.setSelectedItem(parameter.getParameterType());
+        newParameterTypeEditor.addItemListener(new ItemListener() {
+
+            @Override
+            public void itemStateChanged(@NotNull final ItemEvent e) {
+                if (e.getStateChange() == ItemEvent.SELECTED) {
+                    if (!parameter.getParameterType().equals(e.getItem())) {
+                        try {
+                            plugin.convertType(parameter, (String) e.getItem());
+                        } catch (final NoSuchParameterException ex) {
+                            LOG.warn("Cannot create parameter for type " + e.getItem());
+                        }
+                    }
+                }
+            }
+
+        });
         parameterTypeEditors.put(parameter, newParameterTypeEditor);
         newTableComponent(newParameterTypeEditor);
         return newParameterTypeEditor;

Deleted: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java	2014-02-22 07:04:58 UTC (rev 9604)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java	2014-02-22 07:19:23 UTC (rev 9605)
@@ -1,67 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2011 The Gridarta Developers.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package net.sf.gridarta.gui.dialog.plugin.parameter;
-
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import javax.swing.JComboBox;
-import net.sf.gridarta.model.archetype.Archetype;
-import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.maparchobject.MapArchObject;
-import net.sf.gridarta.plugin.Plugin;
-import net.sf.gridarta.plugin.PluginModel;
-import net.sf.gridarta.plugin.parameter.NoSuchParameterException;
-import net.sf.gridarta.plugin.parameter.PluginParameter;
-import org.apache.log4j.Category;
-import org.apache.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
-
-public class ParameterTypeEditor<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JComboBox {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * The Logger for printing log messages.
-     */
-    @NotNull
-    private static final Category LOG = Logger.getLogger(ParameterTypeEditor.class);
-
-    public ParameterTypeEditor(@NotNull final PluginModel<G, A, R> pluginModel, @NotNull final Plugin<G, A, R> plugin, @NotNull final PluginParameter<G, A, R, ?> parameter) {
-        super(pluginModel.getTypes());
-        setSelectedItem(parameter.getParameterType());
-        addItemListener(new ItemListener() {
-
-            @Override
-            public void itemStateChanged(@NotNull final ItemEvent e) {
-                if (e.getStateChange() == ItemEvent.SELECTED) {
-                    if (!parameter.getParameterType().equals(e.getItem())) {
-                        try {
-                            plugin.convertType(parameter, (String) e.getItem());
-                        } catch (final NoSuchParameterException ex) {
-                            LOG.warn("Cannot create parameter for type " + e.getItem());
-                        }
-                    }
-                }
-            }
-
-        });
-    }
-
-}

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

[Gridarta-commit] SF.net SVN: gridarta:[9604] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/parameter/ArchParameterView.java

From: <aki...@us...> - 2014-02-22 07:05:04

Revision: 9604
          http://sourceforge.net/p/gridarta/code/9604
Author:   akirschbaum
Date:     2014-02-22 07:04:58 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
Fix unchecked warning.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java	2014-02-21 23:04:11 UTC (rev 9603)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java	2014-02-22 07:04:58 UTC (rev 9604)
@@ -80,9 +80,7 @@
             @Override
             public void itemStateChanged(final ItemEvent e) {
                 if (e.getStateChange() == ItemEvent.SELECTED) {
-                    //JComboBox does not use type parameters
-                    @SuppressWarnings("unchecked")
-                    final Archetype<G, A, R> archetype = (Archetype<G, A, R>) value.getSelectedItem();
+                    final Archetype<?, ?, ?> archetype = (Archetype<?, ?, ?>) value.getSelectedItem();
                     parameter.setStringValue(archetype.getArchetypeName());
                 }
             }

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

[Gridarta-commit] SF.net SVN: gridarta:[9603] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java

From: <aki...@us...> - 2014-02-21 23:04:16

Revision: 9603
          http://sourceforge.net/p/gridarta/code/9603
Author:   akirschbaum
Date:     2014-02-21 23:04:11 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Fully initialize ArchComboBoxEditor in its constructor.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java	2014-02-21 22:58:26 UTC (rev 9602)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java	2014-02-21 23:04:11 UTC (rev 9603)
@@ -61,25 +61,7 @@
     @NotNull
     private final ArchComboBoxModel<G, A, R> archComboBoxModel;
 
-    /**
-     * The {@link ObjectChooser} for selecting archetypes from opened maps.
-     */
     @NotNull
-    private final ObjectChooser<G, A, R> objectChooser;
-
-    /**
-     * The {@link GameObjectAttributesModel} for selecting archetypes from
-     * opened maps.
-     */
-    @NotNull
-    private final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel;
-
-    /**
-     * Whether the GUI has been built.
-     */
-    private boolean built;
-
-    @NotNull
     private final Container editorPanel = new JPanel(new GridBagLayout());
 
     @NotNull
@@ -111,20 +93,7 @@
     public ArchComboBoxEditor(@NotNull final JComboBox comboBox, @NotNull final ArchComboBoxModel<G, A, R> archComboBoxModel, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, @NotNull final FaceObjectProviders faceObjectProviders) {
         this.comboBox = comboBox;
         this.archComboBoxModel = archComboBoxModel;
-        this.objectChooser = objectChooser;
-        this.gameObjectAttributesModel = gameObjectAttributesModel;
         this.faceObjectProviders = faceObjectProviders;
-    }
-
-    public void lockEditor() {
-        locked = true;
-    }
-
-    public void unlockEditor() {
-        locked = false;
-    }
-
-    private void buildPanel() {
         final GridBagConstraints gbc = new GridBagConstraints();
         gbc.gridx = 0;
         gbc.gridy = 0;
@@ -226,6 +195,14 @@
         comboBox.setBackground(CommonConstants.BG_COLOR);
     }
 
+    public void lockEditor() {
+        locked = true;
+    }
+
+    public void unlockEditor() {
+        locked = false;
+    }
+
     @Override
     public void selectAll() {
         // TODO Auto-generated method stub
@@ -235,10 +212,6 @@
     @NotNull
     @Override
     public Component getEditorComponent() {
-        if (!built) {
-            buildPanel();
-            built = true;
-        }
         return editorPanel;
     }
 

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

[Gridarta-commit] SF.net SVN: gridarta:[9602] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/parameter/ArchParameterView.java

From: <aki...@us...> - 2014-02-21 22:58:29

Revision: 9602
          http://sourceforge.net/p/gridarta/code/9602
Author:   akirschbaum
Date:     2014-02-21 22:58:26 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Reorder code.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java	2014-02-21 22:58:01 UTC (rev 9601)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java	2014-02-21 22:58:26 UTC (rev 9602)
@@ -66,9 +66,9 @@
      * @noinspection TypeMayBeWeakened
      */
     public ArchParameterView(@NotNull final ArchetypeParameter<G, A, R> parameter, @NotNull final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final FaceObjectProviders faceObjectProviders) {
-        value.setMaximumRowCount(4);
         final ArchComboBoxModel<G, A, R> archComboBoxModel = new ArchComboBoxModel<G, A, R>(archetypeSet);
         final ArchComboBoxEditor<G, A, R> archComboBoxEditor = new ArchComboBoxEditor<G, A, R>(value, archComboBoxModel, objectChooser, gameObjectAttributesModel, faceObjectProviders);
+        value.setMaximumRowCount(4);
         value.setRenderer(new ArchComboBoxCellRenderer(archComboBoxEditor, faceObjectProviders));
         value.setModel(archComboBoxModel);
         value.setEditable(true);

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

[Gridarta-commit] SF.net SVN: gridarta:[9601] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/parameter/ArchParameterView.java

From: <aki...@us...> - 2014-02-21 22:58:07

Revision: 9601
          http://sourceforge.net/p/gridarta/code/9601
Author:   akirschbaum
Date:     2014-02-21 22:58:01 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Inline variables.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java	2014-02-21 22:53:37 UTC (rev 9600)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java	2014-02-21 22:58:01 UTC (rev 9601)
@@ -25,7 +25,6 @@
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
-import javax.swing.ListCellRenderer;
 import net.sf.gridarta.gui.panel.gameobjectattributes.GameObjectAttributesModel;
 import net.sf.gridarta.gui.panel.objectchooser.ObjectChooser;
 import net.sf.gridarta.model.archetype.Archetype;
@@ -70,13 +69,11 @@
         value.setMaximumRowCount(4);
         final ArchComboBoxModel<G, A, R> archComboBoxModel = new ArchComboBoxModel<G, A, R>(archetypeSet);
         final ArchComboBoxEditor<G, A, R> archComboBoxEditor = new ArchComboBoxEditor<G, A, R>(value, archComboBoxModel, objectChooser, gameObjectAttributesModel, faceObjectProviders);
-        final ListCellRenderer cellRenderer = new ArchComboBoxCellRenderer(archComboBoxEditor, faceObjectProviders);
-        value.setRenderer(cellRenderer);
+        value.setRenderer(new ArchComboBoxCellRenderer(archComboBoxEditor, faceObjectProviders));
         value.setModel(archComboBoxModel);
         value.setEditable(true);
         value.setEditor(archComboBoxEditor);
-        final Dimension d = value.getPreferredSize();
-        value.setPreferredSize(new Dimension(d.width, archComboBoxEditor.getEditorComponent().getPreferredSize().height));
+        value.setPreferredSize(new Dimension(value.getPreferredSize().width, archComboBoxEditor.getEditorComponent().getPreferredSize().height));
         value.setSelectedItem(parameter.getValue());
         value.addItemListener(new ItemListener() {
 

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

[Gridarta-commit] SF.net SVN: gridarta:[9600] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/parameter

From: <aki...@us...> - 2014-02-21 22:53:42

Revision: 9600
          http://sourceforge.net/p/gridarta/code/9600
Author:   akirschbaum
Date:     2014-02-21 22:53:37 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Remove ArchComboBox.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java

Removed Paths:
-------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java

Deleted: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java	2014-02-21 22:38:57 UTC (rev 9599)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java	2014-02-21 22:53:37 UTC (rev 9600)
@@ -1,93 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2011 The Gridarta Developers.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package net.sf.gridarta.gui.dialog.plugin.parameter;
-
-import java.awt.Dimension;
-import javax.swing.JComboBox;
-import javax.swing.ListCellRenderer;
-import net.sf.gridarta.gui.panel.gameobjectattributes.GameObjectAttributesModel;
-import net.sf.gridarta.gui.panel.objectchooser.ObjectChooser;
-import net.sf.gridarta.model.archetype.Archetype;
-import net.sf.gridarta.model.archetypeset.ArchetypeSet;
-import net.sf.gridarta.model.face.FaceObjectProviders;
-import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.maparchobject.MapArchObject;
-import org.apache.log4j.Category;
-import org.apache.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
-
-public class ArchComboBox<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JComboBox {
-
-    /**
-     * The Logger for printing log messages.
-     */
-    @NotNull
-    private static final Category LOG = Logger.getLogger(ArchComboBox.class);
-
-    /**
-     * The serial version UID.
-     */
-    private static final long serialVersionUID = 1L;
-
-    @NotNull
-    private final ArchComboBoxEditor<G, A, R> archComboBoxEditor;
-
-    @NotNull
-    private final ArchComboBoxModel<G, A, R> archComboBoxModel;
-
-    /**
-     * Creates a new instance.
-     * @param gameObjectAttributesModel the game object attributes model for
-     * selecting archetypes from opened maps
-     * @param archetypeSet the archetype set to choose from
-     * @param objectChooser the object chooser for selecting archetypes from
-     * opened maps
-     * @param faceObjectProviders the face object providers for looking up
-     * faces
-     */
-    public ArchComboBox(@NotNull final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final FaceObjectProviders faceObjectProviders) {
-        setMaximumRowCount(4);
-        archComboBoxModel = new ArchComboBoxModel<G, A, R>(archetypeSet);
-        archComboBoxEditor = new ArchComboBoxEditor<G, A, R>(this, archComboBoxModel, objectChooser, gameObjectAttributesModel, faceObjectProviders);
-        final ListCellRenderer cellRenderer = new ArchComboBoxCellRenderer(archComboBoxEditor, faceObjectProviders);
-        //setPrototypeDisplayValue(cellRenderer.sizeTester);
-        setRenderer(cellRenderer);
-        setModel(archComboBoxModel);
-        setEditable(true);
-        setEditor(archComboBoxEditor);
-        final Dimension d = getPreferredSize();
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("Preferred size: " + d);
-        }
-        setPreferredSize(new Dimension(d.width, archComboBoxEditor.getEditorComponent().getPreferredSize().height));
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("NEW Preferred size: " + getPreferredSize());
-        }
-    }
-
-    public void editorEntryChange() {
-        archComboBoxEditor.lockEditor();
-        final Archetype<G, A, R> nearestMatch = archComboBoxModel.getNearestMatch(archComboBoxEditor.getEditor().getText());
-        setSelectedItem(nearestMatch);
-        archComboBoxEditor.setItem(nearestMatch);
-        archComboBoxEditor.unlockEditor();
-    }
-
-}

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java	2014-02-21 22:38:57 UTC (rev 9599)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java	2014-02-21 22:53:37 UTC (rev 9600)
@@ -33,6 +33,7 @@
 import javax.swing.AbstractButton;
 import javax.swing.ComboBoxEditor;
 import javax.swing.JButton;
+import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
@@ -55,7 +56,7 @@
 public class ArchComboBoxEditor<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements ComboBoxEditor {
 
     @NotNull
-    private final ArchComboBox<G, A, R> archComboBox;
+    private final JComboBox comboBox;
 
     @NotNull
     private final ArchComboBoxModel<G, A, R> archComboBoxModel;
@@ -107,8 +108,8 @@
      * @param faceObjectProviders the face object providers for looking up
      * faces
      */
-    public ArchComboBoxEditor(@NotNull final ArchComboBox<G, A, R> archComboBox, @NotNull final ArchComboBoxModel<G, A, R> archComboBoxModel, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, @NotNull final FaceObjectProviders faceObjectProviders) {
-        this.archComboBox = archComboBox;
+    public ArchComboBoxEditor(@NotNull final JComboBox comboBox, @NotNull final ArchComboBoxModel<G, A, R> archComboBoxModel, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, @NotNull final FaceObjectProviders faceObjectProviders) {
+        this.comboBox = comboBox;
         this.archComboBoxModel = archComboBoxModel;
         this.objectChooser = objectChooser;
         this.gameObjectAttributesModel = gameObjectAttributesModel;
@@ -143,7 +144,7 @@
                 final BaseObject<G, A, R, ?> gameObject = objectChooser.getSelection();
                 if (gameObject != null) {
                     final Archetype<G, A, R> ao = archComboBoxModel.getNearestMatch(gameObject.getArchetype().getArchetypeName());
-                    archComboBox.setSelectedItem(ao);
+                    comboBox.setSelectedItem(ao);
                     setItem(ao);
                 }
             }
@@ -157,7 +158,7 @@
                 final BaseObject<G, A, R, ?> gameObject = gameObjectAttributesModel.getSelectedGameObject();
                 if (gameObject != null) {
                     final Archetype<G, A, R> ao = archComboBoxModel.getNearestMatch(gameObject.getArchetype().getArchetypeName());
-                    archComboBox.setSelectedItem(ao);
+                    comboBox.setSelectedItem(ao);
                     setItem(ao);
                 }
             }
@@ -204,17 +205,17 @@
 
             @Override
             public void changedUpdate(final DocumentEvent e) {
-                archComboBox.editorEntryChange();
+                editorEntryChange();
             }
 
             @Override
             public void insertUpdate(final DocumentEvent e) {
-                archComboBox.editorEntryChange();
+                editorEntryChange();
             }
 
             @Override
             public void removeUpdate(final DocumentEvent e) {
-                archComboBox.editorEntryChange();
+                editorEntryChange();
             }
         });
         popup.setLayout(new FlowLayout());
@@ -222,7 +223,7 @@
         popup.setBorder(new LineBorder(Color.black));
         popup.add(icon);
         popup.setFocusable(false);
-        archComboBox.setBackground(CommonConstants.BG_COLOR);
+        comboBox.setBackground(CommonConstants.BG_COLOR);
     }
 
     @Override
@@ -288,4 +289,12 @@
         return editor;
     }
 
+    public void editorEntryChange() {
+        lockEditor();
+        final Archetype<G, A, R> nearestMatch = archComboBoxModel.getNearestMatch(editor.getText());
+        comboBox.setSelectedItem(nearestMatch);
+        setItem(nearestMatch);
+        unlockEditor();
+    }
+
 }

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java	2014-02-21 22:38:57 UTC (rev 9599)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java	2014-02-21 22:53:37 UTC (rev 9600)
@@ -19,11 +19,13 @@
 
 package net.sf.gridarta.gui.dialog.plugin.parameter;
 
+import java.awt.Dimension;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
+import javax.swing.ListCellRenderer;
 import net.sf.gridarta.gui.panel.gameobjectattributes.GameObjectAttributesModel;
 import net.sf.gridarta.gui.panel.objectchooser.ObjectChooser;
 import net.sf.gridarta.model.archetype.Archetype;
@@ -43,7 +45,7 @@
      * The component for editing the parameter's value.
      */
     @NotNull
-    private final JComboBox value;
+    private final JComboBox value = new JComboBox();
 
     /**
      * The component for editing the parameter's configuration. An {@link
@@ -65,7 +67,16 @@
      * @noinspection TypeMayBeWeakened
      */
     public ArchParameterView(@NotNull final ArchetypeParameter<G, A, R> parameter, @NotNull final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final FaceObjectProviders faceObjectProviders) {
-        value = new ArchComboBox<G, A, R>(gameObjectAttributesModel, archetypeSet, objectChooser, faceObjectProviders);
+        value.setMaximumRowCount(4);
+        final ArchComboBoxModel<G, A, R> archComboBoxModel = new ArchComboBoxModel<G, A, R>(archetypeSet);
+        final ArchComboBoxEditor<G, A, R> archComboBoxEditor = new ArchComboBoxEditor<G, A, R>(value, archComboBoxModel, objectChooser, gameObjectAttributesModel, faceObjectProviders);
+        final ListCellRenderer cellRenderer = new ArchComboBoxCellRenderer(archComboBoxEditor, faceObjectProviders);
+        value.setRenderer(cellRenderer);
+        value.setModel(archComboBoxModel);
+        value.setEditable(true);
+        value.setEditor(archComboBoxEditor);
+        final Dimension d = value.getPreferredSize();
+        value.setPreferredSize(new Dimension(d.width, archComboBoxEditor.getEditorComponent().getPreferredSize().height));
         value.setSelectedItem(parameter.getValue());
         value.addItemListener(new ItemListener() {
 

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

[Gridarta-commit] SF.net SVN: gridarta:[9599] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/parameter

From: <aki...@us...> - 2014-02-21 22:39:02

Revision: 9599
          http://sourceforge.net/p/gridarta/code/9599
Author:   akirschbaum
Date:     2014-02-21 22:38:57 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Do not export ActionListener interface from PluginParameterView implementations.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java	2014-02-21 22:28:30 UTC (rev 9598)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java	2014-02-21 22:38:57 UTC (rev 9599)
@@ -35,22 +35,16 @@
 /**
  * A {@link PluginParameterView} for an {@link BooleanParameter}.
  */
-public class BooleanParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R>, ActionListener {
+public class BooleanParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
 
     /**
-     * The {@link BooleanParameter} that is shown.
+     * The component for editing the parameter's value.
      */
     @NotNull
-    private final BooleanParameter<G, A, R> parameter;
-
-    /**
-     * The component for editing the {@link #parameter}'s value.
-     */
-    @NotNull
     private final AbstractButton value = new JCheckBox();
 
     /**
-     * The component for editing the {@link #parameter}'s configuration.
+     * The component for editing the parameter's configuration.
      */
     @NotNull
     private final AbstractButton config = new JButton("...");
@@ -60,12 +54,33 @@
      * @param parameter the boolean parameter that is shown
      */
     public BooleanParameterView(@NotNull final BooleanParameter<G, A, R> parameter) {
-        this.parameter = parameter;
-        value.setActionCommand("toggle");
-        value.addActionListener(this);
+        value.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(@NotNull final ActionEvent e) {
+                if (value.isSelected()) {
+                    parameter.setValue(Boolean.TRUE);
+                    value.setText(parameter.getTrueText());
+                } else {
+                    parameter.setValue(Boolean.FALSE);
+                    value.setText(parameter.getFalseText());
+                }
+            }
+
+        });
+
         config.setBorderPainted(false);
-        config.setActionCommand("config");
-        config.addActionListener(this);
+        config.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(@NotNull final ActionEvent e) {
+                final String yes = JOptionPane.showInputDialog("Checked text", parameter.getTrueText());
+                final String no = JOptionPane.showInputDialog("Unchecked text", parameter.getFalseText());
+                parameter.setTrueText(yes);
+                parameter.setFalseText(no);
+            }
+
+        });
     }
 
     /**
@@ -86,26 +101,4 @@
         return value;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void actionPerformed(@NotNull final ActionEvent e) {
-        if (e.getActionCommand().equals("toggle")) {
-            if (value.isSelected()) {
-                parameter.setValue(Boolean.TRUE);
-                value.setText(parameter.getTrueText());
-            } else {
-                parameter.setValue(Boolean.FALSE);
-                value.setText(parameter.getFalseText());
-            }
-        }
-        if (e.getActionCommand().equals("config")) {
-            final String yes = JOptionPane.showInputDialog("Checked text", parameter.getTrueText());
-            final String no = JOptionPane.showInputDialog("Unchecked text", parameter.getFalseText());
-            parameter.setTrueText(yes);
-            parameter.setFalseText(no);
-        }
-    }
-
 }

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java	2014-02-21 22:28:30 UTC (rev 9598)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java	2014-02-21 22:38:57 UTC (rev 9599)
@@ -38,7 +38,7 @@
 /**
  * A {@link PluginParameterView} for a {@link DoubleParameter}.
  */
-public class DoubleParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R>, ActionListener {
+public class DoubleParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
 
     /**
      * The {@link DoubleParameter} that is shown.
@@ -77,8 +77,24 @@
             }
         });
         config.setBorderPainted(false);
-        config.setActionCommand("Config");
-        config.addActionListener(this);
+        config.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(final ActionEvent e) {
+                final String min = JOptionPane.showInputDialog("Minimum value:", parameter.getMin());
+                final String max = JOptionPane.showInputDialog("Maximum value:", parameter.getMax());
+                try {
+                    parameter.setMax(Double.parseDouble(max));
+                    parameter.setMin(Double.parseDouble(min));
+                    ((SpinnerNumberModel) value.getModel()).setMinimum(parameter.getMin());
+                    ((SpinnerNumberModel) value.getModel()).setMaximum(parameter.getMax());
+                    updateTooltip();
+                } catch (final Exception ex) {
+                    JOptionPane.showMessageDialog(null, "Could not change Double configuration");
+                }
+            }
+
+        });
         updateTooltip();
     }
 
@@ -110,24 +126,4 @@
         value.setToolTipText(toolTip);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void actionPerformed(@NotNull final ActionEvent e) {
-        if (e.getActionCommand().equals("Config")) {
-            final String min = JOptionPane.showInputDialog("Minimum value:", parameter.getMin());
-            final String max = JOptionPane.showInputDialog("Maximum value:", parameter.getMax());
-            try {
-                parameter.setMax(Double.parseDouble(max));
-                parameter.setMin(Double.parseDouble(min));
-                ((SpinnerNumberModel) value.getModel()).setMinimum(parameter.getMin());
-                ((SpinnerNumberModel) value.getModel()).setMaximum(parameter.getMax());
-                updateTooltip();
-            } catch (final Exception ex) {
-                JOptionPane.showMessageDialog(null, "Could not change Double configuration");
-            }
-        }
-    }
-
 }

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java	2014-02-21 22:28:30 UTC (rev 9598)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java	2014-02-21 22:38:57 UTC (rev 9599)
@@ -38,7 +38,7 @@
 /**
  * A {@link PluginParameterView} for an {@link IntegerParameter}.
  */
-public class IntegerParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R>, ActionListener {
+public class IntegerParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
 
     /**
      * The {@link IntegerParameter} that is shown.
@@ -73,8 +73,24 @@
             }
         });
         config.setBorderPainted(false);
-        config.setActionCommand("Config");
-        config.addActionListener(this);
+        config.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(final ActionEvent e) {
+                final String min = JOptionPane.showInputDialog("Minimum value:", parameter.getMin());
+                final String max = JOptionPane.showInputDialog("Maximum value:", parameter.getMax());
+                try {
+                    parameter.setMax(Integer.parseInt(max));
+                    parameter.setMin(Integer.parseInt(min));
+                    ((SpinnerNumberModel) value.getModel()).setMinimum(parameter.getMin());
+                    ((SpinnerNumberModel) value.getModel()).setMaximum(parameter.getMax());
+                    updateTooltip();
+                } catch (final Exception ex) {
+                    JOptionPane.showMessageDialog(null, "Could not change integer configuration");
+                }
+            }
+
+        });
         updateTooltip();
     }
 
@@ -105,24 +121,4 @@
         value.setToolTipText(toolTip);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void actionPerformed(@NotNull final ActionEvent e) {
-        if (e.getActionCommand().equals("Config")) {
-            final String min = JOptionPane.showInputDialog("Minimum value:", parameter.getMin());
-            final String max = JOptionPane.showInputDialog("Maximum value:", parameter.getMax());
-            try {
-                parameter.setMax(Integer.parseInt(max));
-                parameter.setMin(Integer.parseInt(min));
-                ((SpinnerNumberModel) value.getModel()).setMinimum(parameter.getMin());
-                ((SpinnerNumberModel) value.getModel()).setMaximum(parameter.getMax());
-                updateTooltip();
-            } catch (final Exception ex) {
-                JOptionPane.showMessageDialog(null, "Could not change integer configuration");
-            }
-        }
-    }
-
 }

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

[Gridarta-commit] SF.net SVN: gridarta:[9598] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/parameter

From: <aki...@us...> - 2014-02-21 22:28:35

Revision: 9598
          http://sourceforge.net/p/gridarta/code/9598
Author:   akirschbaum
Date:     2014-02-21 22:28:30 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Simplify code.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java	2014-02-21 22:17:26 UTC (rev 9597)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java	2014-02-21 22:28:30 UTC (rev 9598)
@@ -40,20 +40,14 @@
 public class ArchParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
 
     /**
-     * The {@link ArchetypeParameter} that is shown.
+     * The component for editing the parameter's value.
      */
     @NotNull
-    private final ArchetypeParameter<G, A, R> parameter;
-
-    /**
-     * The component for editing the {@link #parameter}'s value.
-     */
-    @NotNull
     private final JComboBox value;
 
     /**
-     * The component for editing the {@link #parameter}'s configuration. An
-     * {@link ArchetypeParameter} does not support configuration.
+     * The component for editing the parameter's configuration. An {@link
+     * ArchetypeParameter} does not support configuration.
      */
     @NotNull
     private final JComponent config = new JPanel();
@@ -68,10 +62,10 @@
      * opened maps
      * @param faceObjectProviders the face object providers for looking up
      * faces
+     * @noinspection TypeMayBeWeakened
      */
     public ArchParameterView(@NotNull final ArchetypeParameter<G, A, R> parameter, @NotNull final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final FaceObjectProviders faceObjectProviders) {
         value = new ArchComboBox<G, A, R>(gameObjectAttributesModel, archetypeSet, objectChooser, faceObjectProviders);
-        this.parameter = parameter;
         value.setSelectedItem(parameter.getValue());
         value.addItemListener(new ItemListener() {
 
@@ -81,7 +75,7 @@
                     //JComboBox does not use type parameters
                     @SuppressWarnings("unchecked")
                     final Archetype<G, A, R> archetype = (Archetype<G, A, R>) value.getSelectedItem();
-                    ArchParameterView.this.parameter.setStringValue(archetype.getArchetypeName());
+                    parameter.setStringValue(archetype.getArchetypeName());
                 }
             }
         });

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java	2014-02-21 22:17:26 UTC (rev 9597)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java	2014-02-21 22:28:30 UTC (rev 9598)
@@ -73,7 +73,7 @@
 
             @Override
             public void stateChanged(final ChangeEvent e) {
-                DoubleParameterView.this.parameter.setValue((Double) ((SpinnerNumberModel) value.getModel()).getNumber());
+                parameter.setValue((Double) ((SpinnerNumberModel) value.getModel()).getNumber());
             }
         });
         config.setBorderPainted(false);

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java	2014-02-21 22:17:26 UTC (rev 9597)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java	2014-02-21 22:28:30 UTC (rev 9598)
@@ -69,7 +69,7 @@
 
             @Override
             public void stateChanged(final ChangeEvent e) {
-                IntegerParameterView.this.parameter.setValue((Integer) ((SpinnerNumberModel) value.getModel()).getNumber());
+                parameter.setValue((Integer) ((SpinnerNumberModel) value.getModel()).getNumber());
             }
         });
         config.setBorderPainted(false);

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java	2014-02-21 22:17:26 UTC (rev 9597)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java	2014-02-21 22:28:30 UTC (rev 9598)
@@ -39,20 +39,14 @@
 public class MapParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
 
     /**
-     * The {@link MapParameter} that is shown.
+     * The component for editing the parameter's value.
      */
     @NotNull
-    private final MapParameter<G, A, R> parameter;
-
-    /**
-     * The component for editing the {@link #parameter}'s value.
-     */
-    @NotNull
     private final JComboBox value = new JComboBox();
 
     /**
-     * The component for editing the {@link #parameter}'s configuration. A
-     * {@link MapParameter} does not support configuration.
+     * The component for editing the parameter's configuration. A {@link
+     * MapParameter} does not support configuration.
      */
     @NotNull
     private final JComponent config = new JPanel();
@@ -63,7 +57,6 @@
      * @param mapManager the map manager for selecting maps
      */
     public MapParameterView(@NotNull final MapParameter<G, A, R> parameter, @NotNull final MapManager<G, A, R> mapManager) {
-        this.parameter = parameter;
         value.setModel(new MapParameterComboBoxModel<G, A, R>(mapManager));
         value.setRenderer(new MapParameterCellRenderer(mapManager));
         value.addItemListener(new ItemListener() {
@@ -72,7 +65,7 @@
             public void itemStateChanged(final ItemEvent e) {
                 if (e.getStateChange() == ItemEvent.SELECTED) {
                     if (value.getSelectedIndex() == 0) {
-                        MapParameterView.this.parameter.setValueToCurrent();
+                        parameter.setValueToCurrent();
                     } else {
                         final MapControl<?, ?, ?> mapControl = (MapControl<?, ?, ?>) value.getSelectedItem();
                         final String stringValue;
@@ -82,12 +75,12 @@
                             final MapFile mapFile = mapControl.getMapModel().getMapFile();
                             stringValue = mapFile == null ? "" : mapFile.getMapPath().getPath();
                         }
-                        MapParameterView.this.parameter.setStringValue(stringValue);
+                        parameter.setStringValue(stringValue);
                     }
                 }
             }
         });
-        value.setSelectedItem(this.parameter.getValue());
+        value.setSelectedItem(parameter.getValue());
     }
 
     /**

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java	2014-02-21 22:17:26 UTC (rev 9597)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java	2014-02-21 22:28:30 UTC (rev 9598)
@@ -37,19 +37,13 @@
 public class StringParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
 
     /**
-     * The {@link StringParameter} that is shown.
+     * The component for editing the parameter's value.
      */
     @NotNull
-    private final StringParameter<G, A, R> parameter;
-
-    /**
-     * The component for editing the {@link #parameter}'s value.
-     */
-    @NotNull
     private final JTextComponent value = new JTextField();
 
     /**
-     * The component for editing the {@link #parameter}'s configuration. A
+     * The component for editing the parameter's configuration. A
      * {@link StringParameter} does not support configuration.
      */
     @NotNull
@@ -60,24 +54,24 @@
      * @param parameter the string parameter that is shown
      */
     public StringParameterView(@NotNull final StringParameter<G, A, R> parameter) {
-        this.parameter = parameter;
         value.getDocument().addDocumentListener(new DocumentListener() {
 
             @Override
             public void changedUpdate(final DocumentEvent e) {
-                updateParameterValue();
+                parameter.setValue(value.getText());
             }
 
             @Override
             public void insertUpdate(final DocumentEvent e) {
-                updateParameterValue();
+                parameter.setValue(value.getText());
             }
 
             @Override
             public void removeUpdate(final DocumentEvent e) {
-                updateParameterValue();
+                parameter.setValue(value.getText());
             }
         });
+        value.setText(parameter.getValue());
     }
 
     /**
@@ -95,15 +89,7 @@
     @NotNull
     @Override
     public JComponent getValueComponent() {
-        value.setText(parameter.getValue());
         return value;
     }
 
-    /**
-     * Updates {@link #parameter} from {@link #value}.
-     */
-    private void updateParameterValue() {
-        parameter.setValue(value.getText());
-    }
-
 }

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

[Gridarta-commit] SF.net SVN: gridarta:[9597] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/parameter

From: <aki...@us...> - 2014-02-21 22:17:32

Revision: 9597
          http://sourceforge.net/p/gridarta/code/9597
Author:   akirschbaum
Date:     2014-02-21 22:17:26 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Remove TooltipSpinner.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java

Removed Paths:
-------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/TooltipSpinner.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java	2014-02-21 22:12:33 UTC (rev 9596)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java	2014-02-21 22:17:26 UTC (rev 9597)
@@ -19,7 +19,6 @@
 
 package net.sf.gridarta.gui.dialog.plugin.parameter;
 
-import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import javax.swing.AbstractButton;
@@ -27,7 +26,6 @@
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.JSpinner;
-import javax.swing.SpinnerModel;
 import javax.swing.SpinnerNumberModel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -36,7 +34,6 @@
 import net.sf.gridarta.model.maparchobject.MapArchObject;
 import net.sf.gridarta.plugin.parameter.DoubleParameter;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * A {@link PluginParameterView} for a {@link DoubleParameter}.
@@ -67,7 +64,7 @@
      */
     public DoubleParameterView(@NotNull final DoubleParameter<G, A, R> parameter) {
         this.parameter = parameter;
-        value = new TooltipSpinner(new SpinnerNumberModel(0.0, parameter.getMin(), parameter.getMax(), (parameter.getMax() - parameter.getMin()) / 100.0));
+        value = new JSpinner(new SpinnerNumberModel(0.0, parameter.getMin(), parameter.getMax(), (parameter.getMax() - parameter.getMin()) / 100.0));
         try {
             value.setValue(parameter.getValue());
         } catch (final IllegalArgumentException e) {
@@ -133,49 +130,4 @@
         }
     }
 
-    /**
-     * 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
-     */
-    private static class TooltipSpinner extends JSpinner {
-
-        /**
-         * The serial version UID.
-         */
-        private static final long serialVersionUID = 1L;
-
-        /**
-         * Creates a new instance.
-         */
-        private TooltipSpinner(@NotNull final SpinnerModel model) {
-            super(model);
-        }
-
-        /**
-         * This override the JSpinner method to force the tooltip in all
-         * sub-components.
-         * @param text the tooltip to show
-         */
-        @Override
-        public void setToolTipText(@Nullable final String text) {
-            forceTooltip(this, text);
-        }
-
-        private void forceTooltip(@NotNull final JComponent c, @Nullable final String tip) {
-            if (c == this) {
-                super.setToolTipText(tip);
-            } else {
-                c.setToolTipText(tip);
-            }
-            final Component[] components = c.getComponents();
-            for (final Component component : components) {
-                if (component instanceof JComponent) {
-                    forceTooltip((JComponent) component, tip);
-                }
-            }
-        }
-
-    }
-
 }

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java	2014-02-21 22:12:33 UTC (rev 9596)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java	2014-02-21 22:17:26 UTC (rev 9597)
@@ -64,7 +64,7 @@
      */
     public IntegerParameterView(@NotNull final IntegerParameter<G, A, R> parameter) {
         this.parameter = parameter;
-        value = new TooltipSpinner(new SpinnerNumberModel((int) parameter.getValue(), parameter.getMin(), parameter.getMax(), 1));
+        value = new JSpinner(new SpinnerNumberModel((int) parameter.getValue(), parameter.getMin(), parameter.getMax(), 1));
         value.addChangeListener(new ChangeListener() {
 
             @Override

Deleted: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/TooltipSpinner.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/TooltipSpinner.java	2014-02-21 22:12:33 UTC (rev 9596)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/TooltipSpinner.java	2014-02-21 22:17:26 UTC (rev 9597)
@@ -1,65 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2011 The Gridarta Developers.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package net.sf.gridarta.gui.dialog.plugin.parameter;
-
-import java.awt.Component;
-import javax.swing.JComponent;
-import javax.swing.JSpinner;
-import javax.swing.SpinnerModel;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * 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
- */
-public class TooltipSpinner extends JSpinner {
-
-    private static final long serialVersionUID = -797350272052837471L;
-
-    public TooltipSpinner(@NotNull final SpinnerModel model) {
-        super(model);
-    }
-
-    /**
-     * This override the JSpinner method to force the tooltip in all
-     * sub-components.
-     * @param text the tooltip to show
-     */
-    @Override
-    public void setToolTipText(@NotNull final String text) {
-        forceTooltip(this, text);
-    }
-
-    private void forceTooltip(@NotNull final JComponent tooltipComponent, @NotNull final String tooltip) {
-        if (tooltipComponent == this) {
-            super.setToolTipText(tooltip);
-        } else {
-            tooltipComponent.setToolTipText(tooltip);
-        }
-        final Component[] components = tooltipComponent.getComponents();
-        for (final Component component : components) {
-            if (component instanceof JComponent) {
-                forceTooltip((JComponent) component, tooltip);
-            }
-        }
-    }
-
-}

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

[Gridarta-commit] SF.net SVN: gridarta:[9596] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/parameter

From: <aki...@us...> - 2014-02-21 22:12:42

Revision: 9596
          http://sourceforge.net/p/gridarta/code/9596
Author:   akirschbaum
Date:     2014-02-21 22:12:33 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Inline variables.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java	2014-02-21 22:05:44 UTC (rev 9595)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java	2014-02-21 22:12:33 UTC (rev 9596)
@@ -67,8 +67,7 @@
      */
     public DoubleParameterView(@NotNull final DoubleParameter<G, A, R> parameter) {
         this.parameter = parameter;
-        final SpinnerModel mdl = new SpinnerNumberModel(0.0, parameter.getMin(), parameter.getMax(), (parameter.getMax() - parameter.getMin()) / 100.0);
-        value = new TooltipSpinner(mdl);
+        value = new TooltipSpinner(new SpinnerNumberModel(0.0, parameter.getMin(), parameter.getMax(), (parameter.getMax() - parameter.getMin()) / 100.0));
         try {
             value.setValue(parameter.getValue());
         } catch (final IllegalArgumentException e) {

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java	2014-02-21 22:05:44 UTC (rev 9595)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java	2014-02-21 22:12:33 UTC (rev 9596)
@@ -21,7 +21,6 @@
 
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import javax.swing.ComboBoxModel;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
@@ -65,8 +64,7 @@
      */
     public MapParameterView(@NotNull final MapParameter<G, A, R> parameter, @NotNull final MapManager<G, A, R> mapManager) {
         this.parameter = parameter;
-        final ComboBoxModel myModel = new MapParameterComboBoxModel<G, A, R>(mapManager);
-        value.setModel(myModel);
+        value.setModel(new MapParameterComboBoxModel<G, A, R>(mapManager));
         value.setRenderer(new MapParameterCellRenderer(mapManager));
         value.addItemListener(new ItemListener() {
 

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java	2014-02-21 22:05:44 UTC (rev 9595)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java	2014-02-21 22:12:33 UTC (rev 9596)
@@ -24,7 +24,6 @@
 import javax.swing.JTextField;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
 import net.sf.gridarta.model.archetype.Archetype;
 import net.sf.gridarta.model.gameobject.GameObject;
@@ -62,8 +61,7 @@
      */
     public StringParameterView(@NotNull final StringParameter<G, A, R> parameter) {
         this.parameter = parameter;
-        final Document d = value.getDocument();
-        d.addDocumentListener(new DocumentListener() {
+        value.getDocument().addDocumentListener(new DocumentListener() {
 
             @Override
             public void changedUpdate(final DocumentEvent e) {

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

[Gridarta-commit] SF.net SVN: gridarta:[9595] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/parameter

From: <aki...@us...> - 2014-02-21 22:05:51

Revision: 9595
          http://sourceforge.net/p/gridarta/code/9595
Author:   akirschbaum
Date:     2014-02-21 22:05:44 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Move initialization from constructor to field declaration.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java	2014-02-21 22:02:34 UTC (rev 9594)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java	2014-02-21 22:05:44 UTC (rev 9595)
@@ -47,13 +47,13 @@
      * The component for editing the {@link #parameter}'s value.
      */
     @NotNull
-    private final AbstractButton value;
+    private final AbstractButton value = new JCheckBox();
 
     /**
      * The component for editing the {@link #parameter}'s configuration.
      */
     @NotNull
-    private final AbstractButton config;
+    private final AbstractButton config = new JButton("...");
 
     /**
      * Creates a new instance.
@@ -61,10 +61,8 @@
      */
     public BooleanParameterView(@NotNull final BooleanParameter<G, A, R> parameter) {
         this.parameter = parameter;
-        value = new JCheckBox();
         value.setActionCommand("toggle");
         value.addActionListener(this);
-        config = new JButton("...");
         config.setBorderPainted(false);
         config.setActionCommand("config");
         config.addActionListener(this);

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java	2014-02-21 22:02:34 UTC (rev 9594)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java	2014-02-21 22:05:44 UTC (rev 9595)
@@ -59,7 +59,7 @@
      * The component for editing the {@link #parameter}'s configuration.
      */
     @NotNull
-    private final AbstractButton config;
+    private final AbstractButton config = new JButton("...");
 
     /**
      * Creates a new instance.
@@ -80,7 +80,6 @@
                 DoubleParameterView.this.parameter.setValue((Double) ((SpinnerNumberModel) value.getModel()).getNumber());
             }
         });
-        config = new JButton("...");
         config.setBorderPainted(false);
         config.setActionCommand("Config");
         config.addActionListener(this);

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java	2014-02-21 22:02:34 UTC (rev 9594)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java	2014-02-21 22:05:44 UTC (rev 9595)
@@ -56,7 +56,7 @@
      * The component for editing the {@link #parameter}'s configuration.
      */
     @NotNull
-    private final AbstractButton config;
+    private final AbstractButton config = new JButton("...");
 
     /**
      * Creates a new instance.
@@ -72,7 +72,6 @@
                 IntegerParameterView.this.parameter.setValue((Integer) ((SpinnerNumberModel) value.getModel()).getNumber());
             }
         });
-        config = new JButton("...");
         config.setBorderPainted(false);
         config.setActionCommand("Config");
         config.addActionListener(this);

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java	2014-02-21 22:02:34 UTC (rev 9594)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java	2014-02-21 22:05:44 UTC (rev 9595)
@@ -49,7 +49,7 @@
      * The component for editing the {@link #parameter}'s value.
      */
     @NotNull
-    private final JComboBox value;
+    private final JComboBox value = new JComboBox();
 
     /**
      * The component for editing the {@link #parameter}'s configuration. A
@@ -65,7 +65,6 @@
      */
     public MapParameterView(@NotNull final MapParameter<G, A, R> parameter, @NotNull final MapManager<G, A, R> mapManager) {
         this.parameter = parameter;
-        value = new JComboBox();
         final ComboBoxModel myModel = new MapParameterComboBoxModel<G, A, R>(mapManager);
         value.setModel(myModel);
         value.setRenderer(new MapParameterCellRenderer(mapManager));

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

[Gridarta-commit] SF.net SVN: gridarta:[9594] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/parameter

From: <aki...@us...> - 2014-02-21 22:02:38

Revision: 9594
          http://sourceforge.net/p/gridarta/code/9594
Author:   akirschbaum
Date:     2014-02-21 22:02:34 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Reorder code.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapPathParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java	2014-02-21 22:01:02 UTC (rev 9593)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java	2014-02-21 22:02:34 UTC (rev 9594)
@@ -40,11 +40,10 @@
 public class ArchParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
 
     /**
-     * The component for editing the {@link #parameter}'s configuration. An
-     * {@link ArchetypeParameter} does not support configuration.
+     * The {@link ArchetypeParameter} that is shown.
      */
     @NotNull
-    private final JComponent config = new JPanel();
+    private final ArchetypeParameter<G, A, R> parameter;
 
     /**
      * The component for editing the {@link #parameter}'s value.
@@ -53,10 +52,11 @@
     private final JComboBox value;
 
     /**
-     * The {@link ArchetypeParameter} that is shown.
+     * The component for editing the {@link #parameter}'s configuration. An
+     * {@link ArchetypeParameter} does not support configuration.
      */
     @NotNull
-    private final ArchetypeParameter<G, A, R> parameter;
+    private final JComponent config = new JPanel();
 
     /**
      * Creates a new instance.

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java	2014-02-21 22:01:02 UTC (rev 9593)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java	2014-02-21 22:02:34 UTC (rev 9594)
@@ -38,6 +38,12 @@
 public class BooleanParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R>, ActionListener {
 
     /**
+     * The {@link BooleanParameter} that is shown.
+     */
+    @NotNull
+    private final BooleanParameter<G, A, R> parameter;
+
+    /**
      * The component for editing the {@link #parameter}'s value.
      */
     @NotNull
@@ -50,12 +56,6 @@
     private final AbstractButton config;
 
     /**
-     * The {@link BooleanParameter} that is shown.
-     */
-    @NotNull
-    private final BooleanParameter<G, A, R> parameter;
-
-    /**
      * Creates a new instance.
      * @param parameter the boolean parameter that is shown
      */

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java	2014-02-21 22:01:02 UTC (rev 9593)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java	2014-02-21 22:02:34 UTC (rev 9594)
@@ -44,6 +44,12 @@
 public class DoubleParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R>, ActionListener {
 
     /**
+     * The {@link DoubleParameter} that is shown.
+     */
+    @NotNull
+    private final DoubleParameter<G, A, R> parameter;
+
+    /**
      * The component for editing the {@link #parameter}'s value.
      */
     @NotNull
@@ -56,12 +62,6 @@
     private final AbstractButton config;
 
     /**
-     * The {@link DoubleParameter} that is shown.
-     */
-    @NotNull
-    private final DoubleParameter<G, A, R> parameter;
-
-    /**
      * Creates a new instance.
      * @param parameter the double parameter that is shown
      */

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java	2014-02-21 22:01:02 UTC (rev 9593)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java	2014-02-21 22:02:34 UTC (rev 9594)
@@ -41,6 +41,12 @@
 public class IntegerParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R>, ActionListener {
 
     /**
+     * The {@link IntegerParameter} that is shown.
+     */
+    @NotNull
+    private final IntegerParameter<G, A, R> parameter;
+
+    /**
      * The component for editing the {@link #parameter}'s value.
      */
     @NotNull
@@ -53,12 +59,6 @@
     private final AbstractButton config;
 
     /**
-     * The {@link IntegerParameter} that is shown.
-     */
-    @NotNull
-    private final IntegerParameter<G, A, R> parameter;
-
-    /**
      * Creates a new instance.
      * @param parameter the integer parameter that is shown
      */

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java	2014-02-21 22:01:02 UTC (rev 9593)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java	2014-02-21 22:02:34 UTC (rev 9594)
@@ -46,17 +46,17 @@
     private final MapParameter<G, A, R> parameter;
 
     /**
-     * The component for editing the {@link #parameter}'s configuration. A
-     * {@link MapParameter} does not support configuration.
+     * The component for editing the {@link #parameter}'s value.
      */
     @NotNull
-    private final JComponent config = new JPanel();
+    private final JComboBox value;
 
     /**
-     * The component for editing the {@link #parameter}'s value.
+     * The component for editing the {@link #parameter}'s configuration. A
+     * {@link MapParameter} does not support configuration.
      */
     @NotNull
-    private final JComboBox value;
+    private final JComponent config = new JPanel();
 
     /**
      * Creates a new instance.

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapPathParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapPathParameterView.java	2014-02-21 22:01:02 UTC (rev 9593)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapPathParameterView.java	2014-02-21 22:02:34 UTC (rev 9594)
@@ -40,6 +40,12 @@
 public class MapPathParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
 
     /**
+     * The component for editing the parameter's value.
+     */
+    @NotNull
+    private final JFileField value;
+
+    /**
      * The component for editing the parameter's configuration. A {@link
      * net.sf.gridarta.plugin.parameter.MapPathParameter} does not support
      * configuration.
@@ -48,12 +54,6 @@
     private final JComponent config = new JPanel();
 
     /**
-     * The component for editing the parameter's value.
-     */
-    @NotNull
-    private final JFileField value;
-
-    /**
      * Creates a new instance.
      * @param parent the parent component for the file chooser
      * @param parameter the parameter to affect

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java	2014-02-21 22:01:02 UTC (rev 9593)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java	2014-02-21 22:02:34 UTC (rev 9594)
@@ -38,6 +38,12 @@
 public class StringParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
 
     /**
+     * The {@link StringParameter} that is shown.
+     */
+    @NotNull
+    private final StringParameter<G, A, R> parameter;
+
+    /**
      * The component for editing the {@link #parameter}'s value.
      */
     @NotNull
@@ -51,12 +57,6 @@
     private final JComponent config = new JPanel();
 
     /**
-     * The {@link StringParameter} that is shown.
-     */
-    @NotNull
-    private final StringParameter<G, A, R> parameter;
-
-    /**
      * Creates a new instance.
      * @param parameter the string parameter that is shown
      */

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

[Gridarta-commit] SF.net SVN: gridarta:[9593] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/parameter

From: <aki...@us...> - 2014-02-21 22:01:06

Revision: 9593
          http://sourceforge.net/p/gridarta/code/9593
Author:   akirschbaum
Date:     2014-02-21 22:01:02 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Rename identifiers.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapPathParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapPathParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapPathParameterView.java	2014-02-21 21:57:58 UTC (rev 9592)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapPathParameterView.java	2014-02-21 22:01:02 UTC (rev 9593)
@@ -51,7 +51,7 @@
      * The component for editing the parameter's value.
      */
     @NotNull
-    private final JFileField valueComponent;
+    private final JFileField value;
 
     /**
      * Creates a new instance.
@@ -60,22 +60,22 @@
      */
     public MapPathParameterView(@NotNull final JComponent parent, @NotNull final AbstractPathParameter<G, A, R> parameter) {
         final File value = parameter.getValue();
-        valueComponent = new JFileField(parent, null, parameter.getBaseDir(), value == null ? new File("") : value, JFileChooser.FILES_AND_DIRECTORIES);
-        valueComponent.addDocumentListener(new DocumentListener() {
+        this.value = new JFileField(parent, null, parameter.getBaseDir(), value == null ? new File("") : value, JFileChooser.FILES_AND_DIRECTORIES);
+        this.value.addDocumentListener(new DocumentListener() {
 
             @Override
             public void insertUpdate(final DocumentEvent e) {
-                parameter.setFile(valueComponent.getFile());
+                parameter.setFile(MapPathParameterView.this.value.getFile());
             }
 
             @Override
             public void removeUpdate(final DocumentEvent e) {
-                parameter.setFile(valueComponent.getFile());
+                parameter.setFile(MapPathParameterView.this.value.getFile());
             }
 
             @Override
             public void changedUpdate(final DocumentEvent e) {
-                parameter.setFile(valueComponent.getFile());
+                parameter.setFile(MapPathParameterView.this.value.getFile());
             }
 
         });
@@ -87,7 +87,7 @@
     @NotNull
     @Override
     public JComponent getValueComponent() {
-        return valueComponent;
+        return value;
     }
 
     /**

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java	2014-02-21 21:57:58 UTC (rev 9592)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java	2014-02-21 22:01:02 UTC (rev 9593)
@@ -38,13 +38,13 @@
 public class StringParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
 
     /**
-     * The component for editing the {@link #linkedParameter}'s value.
+     * The component for editing the {@link #parameter}'s value.
      */
     @NotNull
     private final JTextComponent value = new JTextField();
 
     /**
-     * The component for editing the {@link #linkedParameter}'s configuration. A
+     * The component for editing the {@link #parameter}'s configuration. A
      * {@link StringParameter} does not support configuration.
      */
     @NotNull
@@ -54,14 +54,14 @@
      * The {@link StringParameter} that is shown.
      */
     @NotNull
-    private final StringParameter<G, A, R> linkedParameter;
+    private final StringParameter<G, A, R> parameter;
 
     /**
      * Creates a new instance.
      * @param parameter the string parameter that is shown
      */
     public StringParameterView(@NotNull final StringParameter<G, A, R> parameter) {
-        linkedParameter = parameter;
+        this.parameter = parameter;
         final Document d = value.getDocument();
         d.addDocumentListener(new DocumentListener() {
 
@@ -97,15 +97,15 @@
     @NotNull
     @Override
     public JComponent getValueComponent() {
-        value.setText(linkedParameter.getValue());
+        value.setText(parameter.getValue());
         return value;
     }
 
     /**
-     * Updates {@link #linkedParameter} from {@link #value}.
+     * Updates {@link #parameter} from {@link #value}.
      */
     private void updateParameterValue() {
-        linkedParameter.setValue(value.getText());
+        parameter.setValue(value.getText());
     }
 
 }

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

[Gridarta-commit] SF.net SVN: gridarta:[9592] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/parameter/StringParameterView.java

From: <aki...@us...> - 2014-02-21 21:58:05

Revision: 9592
          http://sourceforge.net/p/gridarta/code/9592
Author:   akirschbaum
Date:     2014-02-21 21:57:58 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Move code.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java	2014-02-21 21:09:10 UTC (rev 9591)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java	2014-02-21 21:57:58 UTC (rev 9592)
@@ -65,26 +65,19 @@
         final Document d = value.getDocument();
         d.addDocumentListener(new DocumentListener() {
 
-            /**
-             * Updates {@link #linkedParameter} from {@link #value}.
-             */
-            private void doIt() {
-                linkedParameter.setValue(value.getText());
-            }
-
             @Override
             public void changedUpdate(final DocumentEvent e) {
-                doIt();
+                updateParameterValue();
             }
 
             @Override
             public void insertUpdate(final DocumentEvent e) {
-                doIt();
+                updateParameterValue();
             }
 
             @Override
             public void removeUpdate(final DocumentEvent e) {
-                doIt();
+                updateParameterValue();
             }
         });
     }
@@ -108,4 +101,11 @@
         return value;
     }
 
+    /**
+     * Updates {@link #linkedParameter} from {@link #value}.
+     */
+    private void updateParameterValue() {
+        linkedParameter.setValue(value.getText());
+    }
+
 }

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

[Gridarta-commit] SF.net SVN: gridarta:[9591] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/parameter

From: <aki...@us...> - 2014-02-21 21:09:16

Revision: 9591
          http://sourceforge.net/p/gridarta/code/9591
Author:   akirschbaum
Date:     2014-02-21 21:09:10 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Update comments.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapPathParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java	2014-02-21 20:33:41 UTC (rev 9590)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java	2014-02-21 21:09:10 UTC (rev 9591)
@@ -41,6 +41,9 @@
     @NotNull
     private static final Category LOG = Logger.getLogger(ArchComboBox.class);
 
+    /**
+     * The serial version UID.
+     */
     private static final long serialVersionUID = 1L;
 
     @NotNull
@@ -51,6 +54,11 @@
 
     /**
      * Creates a new instance.
+     * @param gameObjectAttributesModel the game object attributes model for
+     * selecting archetypes from opened maps
+     * @param archetypeSet the archetype set to choose from
+     * @param objectChooser the object chooser for selecting archetypes from
+     * opened maps
      * @param faceObjectProviders the face object providers for looking up
      * faces
      */

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java	2014-02-21 20:33:41 UTC (rev 9590)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java	2014-02-21 21:09:10 UTC (rev 9591)
@@ -60,9 +60,16 @@
     @NotNull
     private final ArchComboBoxModel<G, A, R> archComboBoxModel;
 
+    /**
+     * The {@link ObjectChooser} for selecting archetypes from opened maps.
+     */
     @NotNull
     private final ObjectChooser<G, A, R> objectChooser;
 
+    /**
+     * The {@link GameObjectAttributesModel} for selecting archetypes from
+     * opened maps.
+     */
     @NotNull
     private final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel;
 
@@ -93,6 +100,10 @@
 
     /**
      * Creates a new instance.
+     * @param objectChooser the object chooser for selecting archetypes from
+     * opened maps
+     * @param gameObjectAttributesModel the game object attributes model for
+     * selecting archetypes from opened maps
      * @param faceObjectProviders the face object providers for looking up
      * faces
      */

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java	2014-02-21 20:33:41 UTC (rev 9590)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java	2014-02-21 21:09:10 UTC (rev 9591)
@@ -34,19 +34,38 @@
 import net.sf.gridarta.plugin.parameter.ArchetypeParameter;
 import org.jetbrains.annotations.NotNull;
 
+/**
+ * A {@link PluginParameterView} for an {@link ArchetypeParameter}.
+ */
 public class ArchParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
 
+    /**
+     * The component for editing the {@link #parameter}'s configuration. An
+     * {@link ArchetypeParameter} does not support configuration.
+     */
     @NotNull
     private final JComponent config = new JPanel();
 
+    /**
+     * The component for editing the {@link #parameter}'s value.
+     */
     @NotNull
     private final JComboBox value;
 
+    /**
+     * The {@link ArchetypeParameter} that is shown.
+     */
     @NotNull
     private final ArchetypeParameter<G, A, R> parameter;
 
     /**
      * Creates a new instance.
+     * @param parameter the archetype parameter that is shown
+     * @param gameObjectAttributesModel the game object attributes model for
+     * selecting archetypes from opened maps
+     * @param archetypeSet the archetype from which archetypes can be chosen
+     * @param objectChooser the object chooser for selecting archetypes from
+     * opened maps
      * @param faceObjectProviders the face object providers for looking up
      * faces
      */
@@ -68,12 +87,18 @@
         });
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @NotNull
     @Override
     public JComponent getConfigComponent() {
         return config;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @NotNull
     @Override
     public JComponent getValueComponent() {

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java	2014-02-21 20:33:41 UTC (rev 9590)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java	2014-02-21 21:09:10 UTC (rev 9591)
@@ -32,17 +32,33 @@
 import net.sf.gridarta.plugin.parameter.BooleanParameter;
 import org.jetbrains.annotations.NotNull;
 
+/**
+ * A {@link PluginParameterView} for an {@link BooleanParameter}.
+ */
 public class BooleanParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R>, ActionListener {
 
+    /**
+     * The component for editing the {@link #parameter}'s value.
+     */
     @NotNull
     private final AbstractButton value;
 
+    /**
+     * The component for editing the {@link #parameter}'s configuration.
+     */
     @NotNull
     private final AbstractButton config;
 
+    /**
+     * The {@link BooleanParameter} that is shown.
+     */
     @NotNull
     private final BooleanParameter<G, A, R> parameter;
 
+    /**
+     * Creates a new instance.
+     * @param parameter the boolean parameter that is shown
+     */
     public BooleanParameterView(@NotNull final BooleanParameter<G, A, R> parameter) {
         this.parameter = parameter;
         value = new JCheckBox();
@@ -54,18 +70,27 @@
         config.addActionListener(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @NotNull
     @Override
     public JComponent getConfigComponent() {
         return config;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @NotNull
     @Override
     public JComponent getValueComponent() {
         return value;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void actionPerformed(@NotNull final ActionEvent e) {
         if (e.getActionCommand().equals("toggle")) {

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java	2014-02-21 20:33:41 UTC (rev 9590)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java	2014-02-21 21:09:10 UTC (rev 9591)
@@ -38,17 +38,33 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+/**
+ * A {@link PluginParameterView} for a {@link DoubleParameter}.
+ */
 public class DoubleParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R>, ActionListener {
 
+    /**
+     * The component for editing the {@link #parameter}'s value.
+     */
     @NotNull
     private final JSpinner value;
 
+    /**
+     * The component for editing the {@link #parameter}'s configuration.
+     */
     @NotNull
     private final AbstractButton config;
 
+    /**
+     * The {@link DoubleParameter} that is shown.
+     */
     @NotNull
     private final DoubleParameter<G, A, R> parameter;
 
+    /**
+     * Creates a new instance.
+     * @param parameter the double parameter that is shown
+     */
     public DoubleParameterView(@NotNull final DoubleParameter<G, A, R> parameter) {
         this.parameter = parameter;
         final SpinnerModel mdl = new SpinnerNumberModel(0.0, parameter.getMin(), parameter.getMax(), (parameter.getMax() - parameter.getMin()) / 100.0);
@@ -71,24 +87,37 @@
         updateTooltip();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @NotNull
     @Override
     public JComponent getConfigComponent() {
         return config;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @NotNull
     @Override
     public JComponent getValueComponent() {
         return value;
     }
 
+    /**
+     * Updates the tooltip text of {@link #config} and {@link #value} to reflect
+     * the current parameters.
+     */
     private void updateTooltip() {
         final String toolTip = "[" + Double.toString(parameter.getMin()) + "," + Double.toString(parameter.getMax()) + "]";
         config.setToolTipText(toolTip);
         value.setToolTipText(toolTip);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void actionPerformed(@NotNull final ActionEvent e) {
         if (e.getActionCommand().equals("Config")) {
@@ -113,8 +142,14 @@
      */
     private static class TooltipSpinner extends JSpinner {
 
+        /**
+         * The serial version UID.
+         */
         private static final long serialVersionUID = 1L;
 
+        /**
+         * Creates a new instance.
+         */
         private TooltipSpinner(@NotNull final SpinnerModel model) {
             super(model);
         }

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java	2014-02-21 20:33:41 UTC (rev 9590)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java	2014-02-21 21:09:10 UTC (rev 9591)
@@ -35,17 +35,33 @@
 import net.sf.gridarta.plugin.parameter.IntegerParameter;
 import org.jetbrains.annotations.NotNull;
 
+/**
+ * A {@link PluginParameterView} for an {@link IntegerParameter}.
+ */
 public class IntegerParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R>, ActionListener {
 
+    /**
+     * The component for editing the {@link #parameter}'s value.
+     */
     @NotNull
     private final JSpinner value;
 
+    /**
+     * The component for editing the {@link #parameter}'s configuration.
+     */
     @NotNull
     private final AbstractButton config;
 
+    /**
+     * The {@link IntegerParameter} that is shown.
+     */
     @NotNull
     private final IntegerParameter<G, A, R> parameter;
 
+    /**
+     * Creates a new instance.
+     * @param parameter the integer parameter that is shown
+     */
     public IntegerParameterView(@NotNull final IntegerParameter<G, A, R> parameter) {
         this.parameter = parameter;
         value = new TooltipSpinner(new SpinnerNumberModel((int) parameter.getValue(), parameter.getMin(), parameter.getMax(), 1));
@@ -63,24 +79,36 @@
         updateTooltip();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @NotNull
     @Override
     public JComponent getConfigComponent() {
         return config;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @NotNull
     @Override
     public JComponent getValueComponent() {
         return value;
     }
 
+    /**
+     * Updates the tooltip text of {@link #config} and {@link #value} to reflect the current parameters.
+     */
     private void updateTooltip() {
         final String toolTip = "[" + Integer.toString(parameter.getMin()) + "," + Integer.toString(parameter.getMax()) + "]";
         config.setToolTipText(toolTip);
         value.setToolTipText(toolTip);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void actionPerformed(@NotNull final ActionEvent e) {
         if (e.getActionCommand().equals("Config")) {

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java	2014-02-21 20:33:41 UTC (rev 9590)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java	2014-02-21 21:09:10 UTC (rev 9591)
@@ -34,17 +34,35 @@
 import net.sf.gridarta.plugin.parameter.MapParameter;
 import org.jetbrains.annotations.NotNull;
 
+/**
+ * A {@link PluginParameterView} for a {@link MapParameter}.
+ */
 public class MapParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
 
+    /**
+     * The {@link MapParameter} that is shown.
+     */
     @NotNull
     private final MapParameter<G, A, R> parameter;
 
+    /**
+     * The component for editing the {@link #parameter}'s configuration. A
+     * {@link MapParameter} does not support configuration.
+     */
     @NotNull
     private final JComponent config = new JPanel();
 
+    /**
+     * The component for editing the {@link #parameter}'s value.
+     */
     @NotNull
     private final JComboBox value;
 
+    /**
+     * Creates a new instance.
+     * @param parameter the map parameter that is shown
+     * @param mapManager the map manager for selecting maps
+     */
     public MapParameterView(@NotNull final MapParameter<G, A, R> parameter, @NotNull final MapManager<G, A, R> mapManager) {
         this.parameter = parameter;
         value = new JComboBox();

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapPathParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapPathParameterView.java	2014-02-21 20:33:41 UTC (rev 9590)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapPathParameterView.java	2014-02-21 21:09:10 UTC (rev 9591)
@@ -39,11 +39,16 @@
  */
 public class MapPathParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
 
+    /**
+     * The component for editing the parameter's configuration. A {@link
+     * net.sf.gridarta.plugin.parameter.MapPathParameter} does not support
+     * configuration.
+     */
     @NotNull
     private final JComponent config = new JPanel();
 
     /**
-     * The button that displays the map path.
+     * The component for editing the parameter's value.
      */
     @NotNull
     private final JFileField valueComponent;

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterView.java	2014-02-21 20:33:41 UTC (rev 9590)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterView.java	2014-02-21 21:09:10 UTC (rev 9591)
@@ -26,14 +26,25 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Interface for Views that display plugin parameters.
+ * Interface for views that display plugin parameters.
  * @author tchize
  */
 public interface PluginParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
 
+    /**
+     * Returns a {@link JComponent} for editing the parameter value. In the "run
+     * plugin" dialog this is the parameter's value, in the "edit plugin" dialog
+     * it is the default value.
+     * @return the component
+     */
     @NotNull
     JComponent getValueComponent();
 
+    /**
+     * Returns a {@link JComponent} for editing the parameter configuration. It
+     * is used only in the "edit plugin" dialog.
+     * @return the component
+     */
     @NotNull
     JComponent getConfigComponent();
 

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java	2014-02-21 20:33:41 UTC (rev 9590)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java	2014-02-21 21:09:10 UTC (rev 9591)
@@ -32,22 +32,42 @@
 import net.sf.gridarta.plugin.parameter.StringParameter;
 import org.jetbrains.annotations.NotNull;
 
+/**
+ * A {@link PluginParameterView} for a {@link StringParameter}.
+ */
 public class StringParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
 
+    /**
+     * The component for editing the {@link #linkedParameter}'s value.
+     */
     @NotNull
     private final JTextComponent value = new JTextField();
 
+    /**
+     * The component for editing the {@link #linkedParameter}'s configuration. A
+     * {@link StringParameter} does not support configuration.
+     */
     @NotNull
     private final JComponent config = new JPanel();
 
+    /**
+     * The {@link StringParameter} that is shown.
+     */
     @NotNull
     private final StringParameter<G, A, R> linkedParameter;
 
+    /**
+     * Creates a new instance.
+     * @param parameter the string parameter that is shown
+     */
     public StringParameterView(@NotNull final StringParameter<G, A, R> parameter) {
         linkedParameter = parameter;
         final Document d = value.getDocument();
         d.addDocumentListener(new DocumentListener() {
 
+            /**
+             * Updates {@link #linkedParameter} from {@link #value}.
+             */
             private void doIt() {
                 linkedParameter.setValue(value.getText());
             }
@@ -69,12 +89,18 @@
         });
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @NotNull
     @Override
     public JComponent getConfigComponent() {
         return config;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @NotNull
     @Override
     public JComponent getValueComponent() {

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

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

From: <aki...@us...> - 2014-02-21 20:33:48

Revision: 9590
          http://sourceforge.net/p/gridarta/code/9590
Author:   akirschbaum
Date:     2014-02-21 20:33:41 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Rename identifiers.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
    trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java
    trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/PluginExecutor.java
    trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/SyntaxStyle.java
    trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java	2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java	2014-02-21 20:33:41 UTC (rev 9590)
@@ -88,7 +88,7 @@
     private final PluginParameterViewFactory<G, A, R> pluginParameterViewFactory;
 
     @NotNull
-    private final JPanel paramTable = new JPanel(new GridBagLayout());
+    private final JPanel parameterTable = new JPanel(new GridBagLayout());
 
     @NotNull
     private final PluginModel<G, A, R> pluginModel;
@@ -97,16 +97,16 @@
     private final Plugin<G, A, R> plugin;
 
     @NotNull
-    private final Map<PluginParameter<G, A, R, ?>, ParameterNameEditor<G, A, R>> paramNameEditors = new HashMap<PluginParameter<G, A, R, ?>, ParameterNameEditor<G, A, R>>();
+    private final Map<PluginParameter<G, A, R, ?>, ParameterNameEditor<G, A, R>> parameterNameEditors = new HashMap<PluginParameter<G, A, R, ?>, ParameterNameEditor<G, A, R>>();
 
     @NotNull
-    private final Map<PluginParameter<G, A, R, ?>, ParameterDescriptionEditor<G, A, R>> paramDescriptionEditors = new HashMap<PluginParameter<G, A, R, ?>, ParameterDescriptionEditor<G, A, R>>();
+    private final Map<PluginParameter<G, A, R, ?>, ParameterDescriptionEditor<G, A, R>> parameterDescriptionEditors = new HashMap<PluginParameter<G, A, R, ?>, ParameterDescriptionEditor<G, A, R>>();
 
     @NotNull
-    private final Map<PluginParameter<G, A, R, ?>, ParameterTypeEditor<G, A, R>> paramTypeEditors = new HashMap<PluginParameter<G, A, R, ?>, ParameterTypeEditor<G, A, R>>();
+    private final Map<PluginParameter<G, A, R, ?>, ParameterTypeEditor<G, A, R>> parameterTypeEditors = new HashMap<PluginParameter<G, A, R, ?>, ParameterTypeEditor<G, A, R>>();
 
     @NotNull
-    private final Map<PluginParameter<G, A, R, ?>, PluginParameterView<G, A, R>> paramViews = new HashMap<PluginParameter<G, A, R, ?>, PluginParameterView<G, A, R>>();
+    private final Map<PluginParameter<G, A, R, ?>, PluginParameterView<G, A, R>> parameterViews = new HashMap<PluginParameter<G, A, R, ?>, PluginParameterView<G, A, R>>();
 
     private int selectedRow = -1;
 
@@ -174,10 +174,10 @@
         final Container optionsTab = new JPanel(new GridBagLayout());
         final GridBagConstraints gbc = new GridBagConstraints();
 
-        final Container paramButtons = new JPanel();
-        paramButtons.setLayout(new StackLayout(5));
-        paramButtons.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorReRegister", this)));
-        paramButtons.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorExport", this)));
+        final Container parameterButtons = new JPanel();
+        parameterButtons.setLayout(new StackLayout(5));
+        parameterButtons.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorReRegister", this)));
+        parameterButtons.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorExport", this)));
 
         gbc.fill = GridBagConstraints.HORIZONTAL;
         gbc.gridx = 0;
@@ -218,7 +218,7 @@
         gbc.fill = GridBagConstraints.NONE;
 
         gbc.gridy = 4;
-        optionsTab.add(paramButtons, gbc);
+        optionsTab.add(parameterButtons, gbc);
 
         gbc.gridx = 0;
         gbc.gridy = 5;
@@ -241,10 +241,10 @@
             }
         });
 
-        final Container paramButtons = new JPanel();
-        paramButtons.setLayout(new StackLayout(5));
-        paramButtons.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorAddParameter", this)));
-        paramButtons.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorRemoveParameter", this)));
+        final Container parameterButtons = new JPanel();
+        parameterButtons.setLayout(new StackLayout(5));
+        parameterButtons.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorAddParameter", this)));
+        parameterButtons.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorRemoveParameter", this)));
 
         final GridBagConstraints gbc = new GridBagConstraints();
 
@@ -256,9 +256,9 @@
         gbc.anchor = GridBagConstraints.WEST;
 
         final Container parameterTab = new JPanel(new GridBagLayout());
-        parameterTab.add(new JScrollPane(paramTable), gbc);
+        parameterTab.add(new JScrollPane(parameterTable), gbc);
         gbc.gridy++;
-        parameterTab.add(paramButtons, gbc);
+        parameterTab.add(parameterButtons, gbc);
         gbc.gridy++;
         gbc.weighty = 1.0;
         gbc.fill = GridBagConstraints.BOTH;
@@ -309,7 +309,7 @@
     }
 
     public void selectTableComponent(@NotNull final Component c) {
-        final GridBagLayout l = (GridBagLayout) paramTable.getLayout();
+        final GridBagLayout l = (GridBagLayout) parameterTable.getLayout();
         final GridBagConstraints gbc = l.getConstraints(c);
         if (gbc != null) {
             selectedRow = gbc.gridy - 1;
@@ -318,16 +318,16 @@
 
     private void redrawTable() {
         final GridBagConstraints gbc = new GridBagConstraints(0, 0, 1, 1, 0.1, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 5, 0);
-        paramTable.removeAll();
-        paramTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleName.text"), gbc);
+        parameterTable.removeAll();
+        parameterTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleName.text"), gbc);
         gbc.gridx = 1;
-        paramTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleDescription.text"), gbc);
+        parameterTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleDescription.text"), gbc);
         gbc.gridx = 2;
-        paramTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleType.text"), gbc);
+        parameterTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleType.text"), gbc);
         gbc.gridx = 3;
-        paramTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleConfig.text"), gbc);
+        parameterTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleConfig.text"), gbc);
         gbc.gridx = 4;
-        paramTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleDefault.text"), gbc);
+        parameterTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleDefault.text"), gbc);
         int i = 0;
         for (final PluginParameter<G, A, R, ?> parameter : plugin) {
             gbc.gridy = i + 1;
@@ -343,73 +343,73 @@
     }
 
     @NotNull
-    private Component getParameterNameEditor(@NotNull final PluginParameter<G, A, R, ?> param) {
-        final Component existingParameterNameEditor = paramNameEditors.get(param);
+    private Component getParameterNameEditor(@NotNull final PluginParameter<G, A, R, ?> parameter) {
+        final Component existingParameterNameEditor = parameterNameEditors.get(parameter);
         if (existingParameterNameEditor != null) {
             return existingParameterNameEditor;
         }
 
-        final ParameterNameEditor<G, A, R> newParameterNameEditor = new ParameterNameEditor<G, A, R>(param);
-        paramNameEditors.put(param, newParameterNameEditor);
+        final ParameterNameEditor<G, A, R> newParameterNameEditor = new ParameterNameEditor<G, A, R>(parameter);
+        parameterNameEditors.put(parameter, newParameterNameEditor);
         newTableComponent(newParameterNameEditor);
         return newParameterNameEditor;
     }
 
     @NotNull
-    private Component getParameterDescriptionEditor(@NotNull final PluginParameter<G, A, R, ?> param) {
-        final Component existingParameterDescriptionEditor = paramDescriptionEditors.get(param);
+    private Component getParameterDescriptionEditor(@NotNull final PluginParameter<G, A, R, ?> parameter) {
+        final Component existingParameterDescriptionEditor = parameterDescriptionEditors.get(parameter);
         if (existingParameterDescriptionEditor != null) {
             return existingParameterDescriptionEditor;
         }
 
-        final ParameterDescriptionEditor<G, A, R> newParameterDescriptionEditor = new ParameterDescriptionEditor<G, A, R>(param);
+        final ParameterDescriptionEditor<G, A, R> newParameterDescriptionEditor = new ParameterDescriptionEditor<G, A, R>(parameter);
         newTableComponent(newParameterDescriptionEditor);
-        paramDescriptionEditors.put(param, newParameterDescriptionEditor);
+        parameterDescriptionEditors.put(parameter, newParameterDescriptionEditor);
         return newParameterDescriptionEditor;
     }
 
     @NotNull
-    private Component getParameterTypeEditor(@NotNull final PluginParameter<G, A, R, ?> param) {
-        final Component existingParameterTypeEditor = paramTypeEditors.get(param);
+    private Component getParameterTypeEditor(@NotNull final PluginParameter<G, A, R, ?> parameter) {
+        final Component existingParameterTypeEditor = parameterTypeEditors.get(parameter);
         if (existingParameterTypeEditor != null) {
             return existingParameterTypeEditor;
         }
 
-        final ParameterTypeEditor<G, A, R> newParameterTypeEditor = new ParameterTypeEditor<G, A, R>(pluginModel, plugin, param);
-        paramTypeEditors.put(param, newParameterTypeEditor);
+        final ParameterTypeEditor<G, A, R> newParameterTypeEditor = new ParameterTypeEditor<G, A, R>(pluginModel, plugin, parameter);
+        parameterTypeEditors.put(parameter, newParameterTypeEditor);
         newTableComponent(newParameterTypeEditor);
         return newParameterTypeEditor;
     }
 
     @NotNull
-    private PluginParameterView<G, A, R> getParameterView(@NotNull final PluginParameter<G, A, R, ?> param) {
-        final PluginParameterView<G, A, R> existingPluginParameterView = paramViews.get(param);
+    private PluginParameterView<G, A, R> getParameterView(@NotNull final PluginParameter<G, A, R, ?> parameter) {
+        final PluginParameterView<G, A, R> existingPluginParameterView = parameterViews.get(parameter);
         if (existingPluginParameterView != null) {
             return existingPluginParameterView;
         }
 
-        final PluginParameterView<G, A, R> newPluginParameterView = pluginParameterViewFactory.getView(paramTable, param);
+        final PluginParameterView<G, A, R> newPluginParameterView = pluginParameterViewFactory.getView(parameterTable, parameter);
 
         newTableComponent(newPluginParameterView.getConfigComponent());
         newTableComponent(newPluginParameterView.getValueComponent());
 
-        paramViews.put(param, newPluginParameterView);
+        parameterViews.put(parameter, newPluginParameterView);
         return newPluginParameterView;
     }
 
-    private void putRow(@NotNull final GridBagConstraints gbc, @NotNull final PluginParameter<G, A, R, ?> param) {
+    private void putRow(@NotNull final GridBagConstraints gbc, @NotNull final PluginParameter<G, A, R, ?> parameter) {
         gbc.gridx = 0;
-        paramTable.add(getParameterNameEditor(param), gbc);
+        parameterTable.add(getParameterNameEditor(parameter), gbc);
         gbc.gridx = 1;
         gbc.weightx = 0.5;
-        paramTable.add(getParameterDescriptionEditor(param), gbc);
+        parameterTable.add(getParameterDescriptionEditor(parameter), gbc);
         gbc.gridx = 2;
         gbc.weightx = 0.1;
-        paramTable.add(getParameterTypeEditor(param), gbc);
+        parameterTable.add(getParameterTypeEditor(parameter), gbc);
         gbc.gridx = 3;
-        paramTable.add(getParameterView(param).getConfigComponent(), gbc);
+        parameterTable.add(getParameterView(parameter).getConfigComponent(), gbc);
         gbc.gridx = 4;
-        paramTable.add(getParameterView(param).getValueComponent(), gbc);
+        parameterTable.add(getParameterView(parameter).getValueComponent(), gbc);
     }
 
     /**

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java	2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java	2014-02-21 20:33:41 UTC (rev 9590)
@@ -50,10 +50,10 @@
      * @param faceObjectProviders the face object providers for looking up
      * faces
      */
-    public ArchParameterView(@NotNull final ArchetypeParameter<G, A, R> param, @NotNull final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final FaceObjectProviders faceObjectProviders) {
+    public ArchParameterView(@NotNull final ArchetypeParameter<G, A, R> parameter, @NotNull final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final FaceObjectProviders faceObjectProviders) {
         value = new ArchComboBox<G, A, R>(gameObjectAttributesModel, archetypeSet, objectChooser, faceObjectProviders);
-        parameter = param;
-        value.setSelectedItem(param.getValue());
+        this.parameter = parameter;
+        value.setSelectedItem(parameter.getValue());
         value.addItemListener(new ItemListener() {
 
             @Override
@@ -62,7 +62,7 @@
                     //JComboBox does not use type parameters
                     @SuppressWarnings("unchecked")
                     final Archetype<G, A, R> archetype = (Archetype<G, A, R>) value.getSelectedItem();
-                    parameter.setStringValue(archetype.getArchetypeName());
+                    ArchParameterView.this.parameter.setStringValue(archetype.getArchetypeName());
                 }
             }
         });

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java	2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java	2014-02-21 20:33:41 UTC (rev 9590)
@@ -43,8 +43,8 @@
     @NotNull
     private final BooleanParameter<G, A, R> parameter;
 
-    public BooleanParameterView(@NotNull final BooleanParameter<G, A, R> param) {
-        parameter = param;
+    public BooleanParameterView(@NotNull final BooleanParameter<G, A, R> parameter) {
+        this.parameter = parameter;
         value = new JCheckBox();
         value.setActionCommand("toggle");
         value.addActionListener(this);

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java	2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java	2014-02-21 20:33:41 UTC (rev 9590)
@@ -49,19 +49,19 @@
     @NotNull
     private final DoubleParameter<G, A, R> parameter;
 
-    public DoubleParameterView(@NotNull final DoubleParameter<G, A, R> param) {
-        parameter = param;
-        final SpinnerModel mdl = new SpinnerNumberModel(0.0, param.getMin(), param.getMax(), (param.getMax() - param.getMin()) / 100.0);
+    public DoubleParameterView(@NotNull final DoubleParameter<G, A, R> parameter) {
+        this.parameter = parameter;
+        final SpinnerModel mdl = new SpinnerNumberModel(0.0, parameter.getMin(), parameter.getMax(), (parameter.getMax() - parameter.getMin()) / 100.0);
         value = new TooltipSpinner(mdl);
         try {
-            value.setValue(param.getValue());
+            value.setValue(parameter.getValue());
         } catch (final IllegalArgumentException e) {
         }
         value.addChangeListener(new ChangeListener() {
 
             @Override
             public void stateChanged(final ChangeEvent e) {
-                parameter.setValue((Double) ((SpinnerNumberModel) value.getModel()).getNumber());
+                DoubleParameterView.this.parameter.setValue((Double) ((SpinnerNumberModel) value.getModel()).getNumber());
             }
         });
         config = new JButton("...");

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java	2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java	2014-02-21 20:33:41 UTC (rev 9590)
@@ -45,8 +45,8 @@
     @NotNull
     private final JComboBox value;
 
-    public MapParameterView(@NotNull final MapParameter<G, A, R> param, @NotNull final MapManager<G, A, R> mapManager) {
-        parameter = param;
+    public MapParameterView(@NotNull final MapParameter<G, A, R> parameter, @NotNull final MapManager<G, A, R> mapManager) {
+        this.parameter = parameter;
         value = new JComboBox();
         final ComboBoxModel myModel = new MapParameterComboBoxModel<G, A, R>(mapManager);
         value.setModel(myModel);
@@ -57,7 +57,7 @@
             public void itemStateChanged(final ItemEvent e) {
                 if (e.getStateChange() == ItemEvent.SELECTED) {
                     if (value.getSelectedIndex() == 0) {
-                        parameter.setValueToCurrent();
+                        MapParameterView.this.parameter.setValueToCurrent();
                     } else {
                         final MapControl<?, ?, ?> mapControl = (MapControl<?, ?, ?>) value.getSelectedItem();
                         final String stringValue;
@@ -67,12 +67,12 @@
                             final MapFile mapFile = mapControl.getMapModel().getMapFile();
                             stringValue = mapFile == null ? "" : mapFile.getMapPath().getPath();
                         }
-                        parameter.setStringValue(stringValue);
+                        MapParameterView.this.parameter.setStringValue(stringValue);
                     }
                 }
             }
         });
-        value.setSelectedItem(parameter.getValue());
+        value.setSelectedItem(this.parameter.getValue());
     }
 
     /**

Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java
===================================================================
--- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java	2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java	2014-02-21 20:33:41 UTC (rev 9590)
@@ -190,13 +190,13 @@
 
     /**
      * Returns the index for a plugin parameter name.
-     * @param paramName the plugin parameter name
+     * @param parameterName the plugin parameter name
      * @return the index or {@code -1} if the parameter name does not exist
      */
-    public int getParameter(@NotNull final String paramName) {
+    public int getParameter(@NotNull final String parameterName) {
         int index = 0;
         for (final PluginParameter<G, A, R, ?> parameter : parameters) {
-            if (parameter.getName().equals(paramName)) {
+            if (parameter.getName().equals(parameterName)) {
                 return index;
             }
             index++;
@@ -281,10 +281,10 @@
         model.file = file;
         model.modified = modified;
         for (final PluginParameter<G, A, R, ?> parameter : parameters) {
-            final Element paramXml = codec.toXML(parameter);
+            final Element parameterXml = codec.toXML(parameter);
             final PluginParameter<G, A, R, ?> clonedParam;
             try {
-                clonedParam = pluginParameterFactory.createParameter(paramXml);
+                clonedParam = pluginParameterFactory.createParameter(parameterXml);
             } catch (final NoSuchParameterException ex) {
                 throw new AssertionError(ex);
             }

Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/PluginExecutor.java
===================================================================
--- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/PluginExecutor.java	2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/PluginExecutor.java	2014-02-21 20:33:41 UTC (rev 9590)
@@ -68,10 +68,10 @@
     /**
      * Executes an editor plugin.
      * @param plugin the plugin name to execute
-     * @param params the plugin parameters
+     * @param parameters the plugin parameters
      * @return whether an error occurred
      */
-    public int executePlugin(@NotNull final String plugin, @NotNull final Iterable<String> params) {
+    public int executePlugin(@NotNull final String plugin, @NotNull final Iterable<String> parameters) {
         final Plugin<G, A, R> modelTemplate = pluginModel.getPlugin(plugin);
         if (modelTemplate == null) {
             System.err.println("plugin " + plugin + " does not exist");
@@ -80,10 +80,10 @@
 
         final Plugin<G, A, R> clonedPlugin = modelTemplate.clonePlugin();
 
-        for (final String param : params) {
-            final String[] tmp = StringUtils.PATTERN_EQUAL.split(param, 2);
+        for (final String parameter : parameters) {
+            final String[] tmp = StringUtils.PATTERN_EQUAL.split(parameter, 2);
             if (tmp.length != 2) {
-                System.err.println("syntax error: " + param);
+                System.err.println("syntax error: " + parameter);
                 return 1;
             }
 
@@ -91,22 +91,22 @@
             if (index == -1) {
                 final StringBuilder sb = new StringBuilder();
                 boolean firstParameter = true;
-                for (final PluginParameter<?, ?, ?, ?> parameter : clonedPlugin) {
+                for (final PluginParameter<?, ?, ?, ?> clonedParameter : clonedPlugin) {
                     sb.append(firstParameter ? " " : ", ");
-                    sb.append(parameter.getName());
+                    sb.append(clonedParameter.getName());
                     firstParameter = false;
                 }
                 System.err.println("plugin " + plugin + " has no parameter " + tmp[0] + "; available parameters:" + sb);
                 return 1;
             }
 
-            final PluginParameter<G, A, R, ?> parameter;
+            final PluginParameter<G, A, R, ?> clonedParameter;
             try {
-                parameter = clonedPlugin.getParameter(index);
+                clonedParameter = clonedPlugin.getParameter(index);
             } catch (final NoSuchParameterException ex) {
                 throw new AssertionError(ex);
             }
-            if (!parameter.setStringValue(tmp[1])) {
+            if (!clonedParameter.setStringValue(tmp[1])) {
                 System.out.println("invalid value " + tmp[1] + " for parameter " + tmp[0]);
                 return 1;
             }

Modified: trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/SyntaxStyle.java
===================================================================
--- trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/SyntaxStyle.java	2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/SyntaxStyle.java	2014-02-21 20:33:41 UTC (rev 9590)
@@ -110,7 +110,7 @@
      */
     private Font getStyledFont(final Font font) {
         if (font == null) {
-            throw new IllegalArgumentException("font param must not be null");
+            throw new IllegalArgumentException("font parameter must not be null");
         }
 
         updateStyledFont(font);
@@ -125,7 +125,7 @@
      */
     public FontMetrics getFontMetrics(final Font font, final Graphics g) {
         if (font == null) {
-            throw new IllegalArgumentException("font param must not be null");
+            throw new IllegalArgumentException("font parameter must not be null");
         }
 
         updateStyledFont(font);

Modified: trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java
===================================================================
--- trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java	2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java	2014-02-21 20:33:41 UTC (rev 9590)
@@ -128,23 +128,23 @@
             offset2 += spacesLength1;
 
             while (it.hasNext()) {
-                final int paramLength = it.next();
-                final String[] tmp = StringUtils.PATTERN_EQUAL.split(new String(array, offset2, paramLength), 2);
+                final int parameterLength = it.next();
+                final String[] tmp = StringUtils.PATTERN_EQUAL.split(new String(array, offset2, parameterLength), 2);
                 if (tmp.length == 2) {
-                    final String param = tmp[0];
-                    final String arg = tmp[1];
+                    final String parameterString = tmp[0];
+                    final String valueString = tmp[1];
 
-                    final Parameter parameter = spec != null ? spec.getParameter(param) : null;
+                    final Parameter parameter = spec != null ? spec.getParameter(parameterString) : null;
                     final boolean parameterValid = parameter != null;
-                    final boolean valueValid = parameter == null || parameter.getParameterType().getPattern().matcher(arg).matches();
-                    addToken(param.length(), parameterValid ? parameter.getId() : Token.INVALID);
-                    addToken(1, (param.isEmpty() && !parameterValid) || (arg.isEmpty() && !valueValid) ? Token.INVALID : Token.OPERATOR);
-                    addToken(arg.length(), valueValid ? Token.NULL : Token.INVALID);
+                    final boolean valueValid = parameter == null || parameter.getParameterType().getPattern().matcher(valueString).matches();
+                    addToken(parameterString.length(), parameterValid ? parameter.getId() : Token.INVALID);
+                    addToken(1, (parameterString.isEmpty() && !parameterValid) || (valueString.isEmpty() && !valueValid) ? Token.INVALID : Token.OPERATOR);
+                    addToken(valueString.length(), valueValid ? Token.NULL : Token.INVALID);
                 } else {
                     // missing '=' sign ==> syntax error
-                    addToken(paramLength, Token.INVALID);
+                    addToken(parameterLength, Token.INVALID);
                 }
-                offset2 += paramLength;
+                offset2 += parameterLength;
 
                 final int spacesLength2 = it.next();
                 addToken(spacesLength2, Token.NULL);

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

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

From: <aki...@us...> - 2014-02-20 22:18:50

Revision: 9589
          http://sourceforge.net/p/gridarta/code/9589
Author:   akirschbaum
Date:     2014-02-20 22:18:44 +0000 (Thu, 20 Feb 2014)
Log Message:
-----------
Remove unused parameters.

Modified Paths:
--------------
    trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterFactory.java
    trunk/src/plugin/src/test/java/net/sf/gridarta/plugin/parameter/PluginParameterCodecTest.java
    trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java

Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterFactory.java
===================================================================
--- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterFactory.java	2014-02-19 21:18:16 UTC (rev 9588)
+++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterFactory.java	2014-02-20 22:18:44 UTC (rev 9589)
@@ -21,7 +21,6 @@
 
 import net.sf.gridarta.model.archetype.Archetype;
 import net.sf.gridarta.model.archetypeset.ArchetypeSet;
-import net.sf.gridarta.model.filter.NamedFilter;
 import net.sf.gridarta.model.gameobject.GameObject;
 import net.sf.gridarta.model.maparchobject.MapArchObject;
 import net.sf.gridarta.model.mapmanager.MapManager;
@@ -42,9 +41,6 @@
     private final MapManager<G, A, R> mapManager;
 
     @NotNull
-    private final NamedFilter defaultFilterList;
-
-    @NotNull
     private final ProjectSettings projectSettings;
 
     /**
@@ -54,10 +50,9 @@
     @NotNull
     private final PluginParameterCodec<G, A, R> codec = new PluginParameterCodec<G, A, R>();
 
-    public PluginParameterFactory(@NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final MapManager<G, A, R> mapManager, @NotNull final NamedFilter defaultFilterList, @NotNull final ProjectSettings projectSettings) {
+    public PluginParameterFactory(@NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final MapManager<G, A, R> mapManager, @NotNull final ProjectSettings projectSettings) {
         this.archetypeSet = archetypeSet;
         this.mapManager = mapManager;
-        this.defaultFilterList = defaultFilterList;
         this.projectSettings = projectSettings;
     }
 

Modified: trunk/src/plugin/src/test/java/net/sf/gridarta/plugin/parameter/PluginParameterCodecTest.java
===================================================================
--- trunk/src/plugin/src/test/java/net/sf/gridarta/plugin/parameter/PluginParameterCodecTest.java	2014-02-19 21:18:16 UTC (rev 9588)
+++ trunk/src/plugin/src/test/java/net/sf/gridarta/plugin/parameter/PluginParameterCodecTest.java	2014-02-20 22:18:44 UTC (rev 9589)
@@ -24,16 +24,13 @@
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.util.Collections;
 import net.sf.gridarta.model.archetype.TestArchetype;
-import net.sf.gridarta.model.filter.NamedFilter;
 import net.sf.gridarta.model.gameobject.TestGameObject;
 import net.sf.gridarta.model.maparchobject.TestMapArchObject;
 import net.sf.gridarta.model.mapcontrol.MapControl;
 import net.sf.gridarta.model.mapcontrol.TestMapControlCreator;
 import net.sf.gridarta.model.mapmodel.MapFile;
 import net.sf.gridarta.model.mapmodel.TestMapModelCreator;
-import net.sf.gridarta.model.match.NamedGameObjectMatcher;
 import net.sf.gridarta.utils.Size2D;
 import org.jdom.Document;
 import org.jdom.Element;
@@ -769,9 +766,7 @@
     private static PluginParameter<TestGameObject, TestMapArchObject, TestArchetype, ?> fromXML(@NotNull final TestMapControlCreator mapControlCreator, @NotNull final String string) throws IOException, JDOMException, NoSuchParameterException {
         final SAXBuilder builder = new SAXBuilder(false);
         final Document document = builder.build(new StringReader(string));
-        final Iterable<NamedGameObjectMatcher> matchers = Collections.emptyList();
-        final NamedFilter filterList = new NamedFilter(matchers);
-        final PluginParameterFactory<TestGameObject, TestMapArchObject, TestArchetype> parameterFactory = new PluginParameterFactory<TestGameObject, TestMapArchObject, TestArchetype>(mapControlCreator.getArchetypeSet(), mapControlCreator.getMapManager(), filterList, mapControlCreator.getProjectSettings());
+        final PluginParameterFactory<TestGameObject, TestMapArchObject, TestArchetype> parameterFactory = new PluginParameterFactory<TestGameObject, TestMapArchObject, TestArchetype>(mapControlCreator.getArchetypeSet(), mapControlCreator.getMapManager(), mapControlCreator.getProjectSettings());
         final Element element = document.getRootElement();
         return parameterFactory.createParameter(element);
     }

Modified: trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java
===================================================================
--- trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java	2014-02-19 21:18:16 UTC (rev 9588)
+++ trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java	2014-02-20 22:18:44 UTC (rev 9589)
@@ -260,7 +260,7 @@
         final Map<String, TreasureTreeNode> specialTreasureLists = loadSpecialTreasureLists(errorView, xmlHelper.getDocumentBuilder(), projectSettings);
         treasureTree = TreasureLoader.parseTreasures(errorView, specialTreasureLists, configSource, projectSettings);
         final NamedFilter defaultFilterList = new NamedFilter(Collections.<NamedGameObjectMatcher>emptyList());
-        final PluginParameterFactory<G, A, R> pluginParameterFactory = new PluginParameterFactory<G, A, R>(archetypeSet, mapManager, defaultFilterList, projectSettings);
+        final PluginParameterFactory<G, A, R> pluginParameterFactory = new PluginParameterFactory<G, A, R>(archetypeSet, mapManager, projectSettings);
         final PluginModelParser<G, A, R> pluginModelParser = new PluginModelParser<G, A, R>(pluginParameterFactory);
         pluginModel = PluginModelLoader.loadPlugins(pluginParameterFactory, pluginModelParser, errorView, scriptsFile);
     }

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

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

From: <aki...@us...> - 2014-02-19 21:18:31

Revision: 9588
          http://sourceforge.net/p/gridarta/code/9588
Author:   akirschbaum
Date:     2014-02-19 21:18:16 +0000 (Wed, 19 Feb 2014)
Log Message:
-----------
Remove implementation for plugin parameters of type net.sf.gridarta.model.filter.NamedFilterConfig as the existing implementation was but a stub.

Modified Paths:
--------------
    trunk/src/atrinik/ChangeLog
    trunk/src/crossfire/ChangeLog
    trunk/src/daimonin/ChangeLog
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterViewFactory.java
    trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterCodec.java
    trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterFactory.java
    trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterVisitor.java
    trunk/src/plugin/src/test/java/net/sf/gridarta/plugin/parameter/PluginParameterCodecTest.java

Removed Paths:
-------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/FilterParameterView.java
    trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/FilterParameter.java

Modified: trunk/src/atrinik/ChangeLog
===================================================================
--- trunk/src/atrinik/ChangeLog	2014-02-19 17:56:46 UTC (rev 9587)
+++ trunk/src/atrinik/ChangeLog	2014-02-19 21:18:16 UTC (rev 9588)
@@ -1,3 +1,9 @@
+2014-02-19  Andreas Kirschbaum
+
+	* Remove implementation for plugin parameters of type
+	net.sf.gridarta.model.filter.NamedFilterConfig as the existing
+	implementation was but a stub.
+
 2014-02-15  Andreas Kirschbaum
 
 	* Fix File|Options... to actually show the setting dialog.

Modified: trunk/src/crossfire/ChangeLog
===================================================================
--- trunk/src/crossfire/ChangeLog	2014-02-19 17:56:46 UTC (rev 9587)
+++ trunk/src/crossfire/ChangeLog	2014-02-19 21:18:16 UTC (rev 9588)
@@ -1,3 +1,9 @@
+2014-02-19  Andreas Kirschbaum
+
+	* Remove implementation for plugin parameters of type
+	net.sf.gridarta.model.filter.NamedFilterConfig as the existing
+	implementation was but a stub.
+
 2014-02-15  Andreas Kirschbaum
 
 	* Fix File|Options... to actually show the setting dialog.

Modified: trunk/src/daimonin/ChangeLog
===================================================================
--- trunk/src/daimonin/ChangeLog	2014-02-19 17:56:46 UTC (rev 9587)
+++ trunk/src/daimonin/ChangeLog	2014-02-19 21:18:16 UTC (rev 9588)
@@ -1,3 +1,9 @@
+2014-02-19  Andreas Kirschbaum
+
+	* Remove implementation for plugin parameters of type
+	net.sf.gridarta.model.filter.NamedFilterConfig as the existing
+	implementation was but a stub.
+
 2014-02-15  Andreas Kirschbaum
 
 	* Fix File|Options... to actually show the setting dialog.

Deleted: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/FilterParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/FilterParameterView.java	2014-02-19 17:56:46 UTC (rev 9587)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/FilterParameterView.java	2014-02-19 21:18:16 UTC (rev 9588)
@@ -1,62 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2011 The Gridarta Developers.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package net.sf.gridarta.gui.dialog.plugin.parameter;
-
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import net.sf.gridarta.gui.filter.MenuItemCreator;
-import net.sf.gridarta.model.archetype.Archetype;
-import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.maparchobject.MapArchObject;
-import net.sf.gridarta.plugin.parameter.FilterParameter;
-import org.jetbrains.annotations.NotNull;
-
-public class FilterParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
-
-    @NotNull
-    private final JComponent value;
-
-    @NotNull
-    private final JComponent config = new JPanel();
-
-    public FilterParameterView(@NotNull final FilterParameter<G, A, R> param) {
-        value = new MenuItemCreator(param.getValue()).getMenuItem();
-        value.setName("Choose filters");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @NotNull
-    @Override
-    public JComponent getValueComponent() {
-        return value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @NotNull
-    @Override
-    public JComponent getConfigComponent() {
-        return config;
-    }
-
-}

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterViewFactory.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterViewFactory.java	2014-02-19 17:56:46 UTC (rev 9587)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterViewFactory.java	2014-02-19 21:18:16 UTC (rev 9588)
@@ -31,7 +31,6 @@
 import net.sf.gridarta.plugin.parameter.ArchetypeParameter;
 import net.sf.gridarta.plugin.parameter.BooleanParameter;
 import net.sf.gridarta.plugin.parameter.DoubleParameter;
-import net.sf.gridarta.plugin.parameter.FilterParameter;
 import net.sf.gridarta.plugin.parameter.IntegerParameter;
 import net.sf.gridarta.plugin.parameter.MapParameter;
 import net.sf.gridarta.plugin.parameter.MapPathParameter;
@@ -94,12 +93,6 @@
 
         @NotNull
         @Override
-        public PluginParameterView<G, A, R> visit(@NotNull final FilterParameter<G, A, R> parameter) {
-            return new FilterParameterView<G, A, R>(parameter);
-        }
-
-        @NotNull
-        @Override
         public PluginParameterView<G, A, R> visit(@NotNull final IntegerParameter<G, A, R> parameter) {
             return new IntegerParameterView<G, A, R>(parameter);
         }

Deleted: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/FilterParameter.java
===================================================================
--- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/FilterParameter.java	2014-02-19 17:56:46 UTC (rev 9587)
+++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/FilterParameter.java	2014-02-19 21:18:16 UTC (rev 9588)
@@ -1,73 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2010 The Gridarta Developers.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package net.sf.gridarta.plugin.parameter;
-
-import net.sf.gridarta.model.archetype.Archetype;
-import net.sf.gridarta.model.filter.NamedFilter;
-import net.sf.gridarta.model.filter.NamedFilterConfig;
-import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.maparchobject.MapArchObject;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class FilterParameter<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends AbstractStringPluginParameter<G, A, R, NamedFilterConfig> {
-
-    @NotNull
-    public static final String PARAMETER_TYPE = NamedFilterConfig.class.getName();
-
-    @NotNull
-    private final NamedFilter defaultFilterList;
-
-    /**
-     * Creates a new instance.
-     */
-    public FilterParameter(@NotNull final NamedFilter defaultFilterList) {
-        super("");
-        this.defaultFilterList = defaultFilterList;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Nullable
-    @Override
-    public NamedFilterConfig getValue() {
-        return null; // XXX: not implemented
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @NotNull
-    @Override
-    public <T> T visit(@NotNull final PluginParameterVisitor<G, A, R, T> visitor) {
-        return visitor.visit(this);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @NotNull
-    @Override
-    public String getParameterType() {
-        return PARAMETER_TYPE;
-    }
-
-}

Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterCodec.java
===================================================================
--- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterCodec.java	2014-02-19 17:56:46 UTC (rev 9587)
+++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterCodec.java	2014-02-19 21:18:16 UTC (rev 9588)
@@ -20,8 +20,6 @@
 package net.sf.gridarta.plugin.parameter;
 
 import net.sf.gridarta.model.archetype.Archetype;
-import net.sf.gridarta.model.filter.FilterParser;
-import net.sf.gridarta.model.filter.NamedFilterConfig;
 import net.sf.gridarta.model.gameobject.GameObject;
 import net.sf.gridarta.model.maparchobject.MapArchObject;
 import org.jdom.Element;
@@ -105,14 +103,6 @@
 
         @NotNull
         @Override
-        public Element visit(@NotNull final FilterParameter<G, A, R> parameter) {
-            final Element e = toXML(parameter);
-            e.addContent(new FilterParser().toXML(parameter.getValue()));
-            return e;
-        }
-
-        @NotNull
-        @Override
         public Element visit(@NotNull final IntegerParameter<G, A, R> parameter) {
             final Element e = toXML(parameter);
             final Element v = new Element("value");
@@ -211,15 +201,6 @@
 
         @NotNull
         @Override
-        public PluginParameter<G, A, R, ?> visit(@NotNull final FilterParameter<G, A, R> parameter) {
-            fromXML(parameter);
-            final NamedFilterConfig conf = parameter.getValue();
-            new FilterParser().fromXML(e, conf);
-            return parameter;
-        }
-
-        @NotNull
-        @Override
         public PluginParameter<G, A, R, ?> visit(@NotNull final IntegerParameter<G, A, R> parameter) {
             fromXML(parameter);
             try {

Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterFactory.java
===================================================================
--- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterFactory.java	2014-02-19 17:56:46 UTC (rev 9587)
+++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterFactory.java	2014-02-19 21:18:16 UTC (rev 9588)
@@ -101,9 +101,6 @@
         if (type.equals(MapPathParameter.PARAMETER_TYPE)) {
             return new MapPathParameter<G, A, R>(projectSettings.getMapsDirectory());
         }
-        if (type.equals(FilterParameter.PARAMETER_TYPE)) {
-            return new FilterParameter<G, A, R>(defaultFilterList);
-        }
         throw new NoSuchParameterException(type);
     }
 
@@ -116,7 +113,7 @@
 
     @NotNull
     public String[] getTypes() {
-        return new String[] { StringParameter.PARAMETER_TYPE, IntegerParameter.PARAMETER_TYPE, DoubleParameter.PARAMETER_TYPE, BooleanParameter.PARAMETER_TYPE, ArchetypeParameter.PARAMETER_TYPE, MapParameter.PARAMETER_TYPE, FilterParameter.PARAMETER_TYPE, MapPathParameter.PARAMETER_TYPE, };
+        return new String[] { StringParameter.PARAMETER_TYPE, IntegerParameter.PARAMETER_TYPE, DoubleParameter.PARAMETER_TYPE, BooleanParameter.PARAMETER_TYPE, ArchetypeParameter.PARAMETER_TYPE, MapParameter.PARAMETER_TYPE, MapPathParameter.PARAMETER_TYPE, };
     }
 
 }

Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterVisitor.java
===================================================================
--- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterVisitor.java	2014-02-19 17:56:46 UTC (rev 9587)
+++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterVisitor.java	2014-02-19 21:18:16 UTC (rev 9588)
@@ -56,14 +56,6 @@
     T visit(@NotNull DoubleParameter<G, A, R> parameter);
 
     /**
-     * Called for {@link FilterParameter} instances.
-     * @param parameter the parameter instance
-     * @return an implementation-specific return value
-     */
-    @NotNull
-    T visit(@NotNull FilterParameter<G, A, R> parameter);
-
-    /**
      * Called for {@link IntegerParameter} instances.
      * @param parameter the parameter instance
      * @return an implementation-specific return value

Modified: trunk/src/plugin/src/test/java/net/sf/gridarta/plugin/parameter/PluginParameterCodecTest.java
===================================================================
--- trunk/src/plugin/src/test/java/net/sf/gridarta/plugin/parameter/PluginParameterCodecTest.java	2014-02-19 17:56:46 UTC (rev 9587)
+++ trunk/src/plugin/src/test/java/net/sf/gridarta/plugin/parameter/PluginParameterCodecTest.java	2014-02-19 21:18:16 UTC (rev 9588)
@@ -27,7 +27,6 @@
 import java.util.Collections;
 import net.sf.gridarta.model.archetype.TestArchetype;
 import net.sf.gridarta.model.filter.NamedFilter;
-import net.sf.gridarta.model.filter.NamedFilterConfig;
 import net.sf.gridarta.model.gameobject.TestGameObject;
 import net.sf.gridarta.model.maparchobject.TestMapArchObject;
 import net.sf.gridarta.model.mapcontrol.MapControl;
@@ -211,62 +210,6 @@
     }
 
     /**
-     * Checks that a {@link FilterParameter} instance is correctly encoded.
-     * @throws IOException if the test fails
-     */
-    @Ignore
-    @Test
-    public void testFilterToXml1() throws IOException {
-        final Iterable<NamedGameObjectMatcher> matchers = Collections.emptyList();
-        final NamedFilter namedFilter = new NamedFilter(matchers);
-        final PluginParameter<TestGameObject, TestMapArchObject, TestArchetype, ?> parameter = new FilterParameter<TestGameObject, TestMapArchObject, TestArchetype>(namedFilter);
-        parameter.setName("Name");
-        parameter.setDescription("Description");
-        final StringBuilder sb = new StringBuilder();
-        sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n");
-        sb.append("<parameter>\r\n");
-        sb.append("  <name>Name</name>\r\n");
-        sb.append("  <description>Description</description>\r\n");
-        sb.append("  <type>net.sf.gridarta.model.filter.NamedFilterConfig</type>\r\n");
-        sb.append("  <value>\r\n");
-        sb.append("    <enabled>false</enabled>\r\n");
-        sb.append("    <inverted>false</inverted>\r\n");
-        sb.append("  </value>\r\n");
-        sb.append("</parameter>\r\n");
-        sb.append("\r\n");
-        Assert.assertEquals(sb.toString(), toXML(parameter));
-    }
-
-    /**
-     * Checks that a {@link FilterParameter} instance is correctly encoded.
-     * @throws IOException if the test fails
-     */
-    @Ignore
-    @Test
-    public void testFilterToXml2() throws IOException {
-        final Iterable<NamedGameObjectMatcher> matchers = Collections.emptyList();
-        final NamedFilter namedFilter = new NamedFilter(matchers);
-        final PluginParameter<TestGameObject, TestMapArchObject, TestArchetype, ?> parameter = new FilterParameter<TestGameObject, TestMapArchObject, TestArchetype>(namedFilter);
-        final NamedFilterConfig config = namedFilter.createConfig();
-        config.setInverted(true);
-        config.setEnabled(true);
-        //XXX:parameter.setValue(config);
-        final StringBuilder sb = new StringBuilder();
-        sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n");
-        sb.append("<parameter>\r\n");
-        sb.append("  <name>[name]</name>\r\n");
-        sb.append("  <description>[description]</description>\r\n");
-        sb.append("  <type>net.sf.gridarta.model.filter.NamedFilterConfig</type>\r\n");
-        sb.append("  <value>\r\n");
-        sb.append("    <enabled>true</enabled>\r\n");
-        sb.append("    <inverted>true</inverted>\r\n");
-        sb.append("  </value>\r\n");
-        sb.append("</parameter>\r\n");
-        sb.append("\r\n");
-        Assert.assertEquals(sb.toString(), toXML(parameter));
-    }
-
-    /**
      * Checks that an {@link IntegerParameter} instance is correctly encoded.
      * @throws IOException if the test fails
      */
@@ -671,76 +614,6 @@
     }
 
     /**
-     * Checks that a {@link FilterParameter} is correctly decoded.
-     * @throws IOException if the test fails
-     * @throws JDOMException if the test fails
-     * @throws NoSuchParameterException if the test fails
-     */
-    @Ignore
-    @Test
-    public void testFilterFromXml1() throws IOException, JDOMException, NoSuchParameterException {
-        final StringBuilder sb = new StringBuilder();
-        sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n");
-        sb.append("<parameter>\r\n");
-        sb.append("  <name>Name</name>\r\n");
-        sb.append("  <description>Description</description>\r\n");
-        sb.append("  <type>net.sf.gridarta.model.filter.NamedFilterConfig</type>\r\n");
-        sb.append("  <value>\r\n");
-        sb.append("    <enabled>false</enabled>\r\n");
-        sb.append("    <inverted>false</inverted>\r\n");
-        sb.append("  </value>\r\n");
-        sb.append("</parameter>\r\n");
-        sb.append("\r\n");
-        final TestMapControlCreator mapControlCreator = new TestMapControlCreator();
-        final PluginParameter<TestGameObject, TestMapArchObject, TestArchetype, ?> parameter = fromXML(mapControlCreator, sb.toString());
-        Assert.assertTrue(parameter instanceof FilterParameter);
-        //noinspection TypeMayBeWeakened
-        final FilterParameter<?, ?, ?> filterParameter = (FilterParameter<?, ?, ?>) parameter;
-        Assert.assertEquals("Name", parameter.getName());
-        Assert.assertEquals("net.sf.gridarta.model.filter.NamedFilterConfig", parameter.getParameterType());
-        Assert.assertEquals("Description", parameter.getDescription());
-        final NamedFilterConfig value = filterParameter.getValue();
-        Assert.assertNotNull(value);
-        Assert.assertFalse(value.isEnabled());
-        Assert.assertFalse(value.isInverted());
-    }
-
-    /**
-     * Checks that a {@link FilterParameter} is correctly decoded.
-     * @throws IOException if the test fails
-     * @throws JDOMException if the test fails
-     * @throws NoSuchParameterException if the test fails
-     */
-    @Ignore
-    @Test
-    public void testFilterFromXml2() throws IOException, JDOMException, NoSuchParameterException {
-        final StringBuilder sb = new StringBuilder();
-        sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n");
-        sb.append("<parameter>\r\n");
-        sb.append("  <name>Name</name>\r\n");
-        sb.append("  <description>Description</description>\r\n");
-        sb.append("  <type>net.sf.gridarta.model.filter.NamedFilterConfig</type>\r\n");
-        sb.append("  <value>\r\n");
-        sb.append("    <enabled>true</enabled>\r\n");
-        sb.append("    <inverted>true</inverted>\r\n");
-        sb.append("  </value>\r\n");
-        sb.append("</parameter>\r\n");
-        sb.append("\r\n");
-        final TestMapControlCreator mapControlCreator = new TestMapControlCreator();
-        final PluginParameter<TestGameObject, TestMapArchObject, TestArchetype, ?> parameter = fromXML(mapControlCreator, sb.toString());
-        Assert.assertTrue(parameter instanceof FilterParameter);
-        //noinspection TypeMayBeWeakened
-        final FilterParameter<?, ?, ?> filterParameter = (FilterParameter<?, ?, ?>) parameter;
-        Assert.assertEquals("Name", parameter.getName());
-        Assert.assertEquals("net.sf.gridarta.model.filter.NamedFilterConfig", parameter.getParameterType());
-        Assert.assertEquals("Description", parameter.getDescription());
-        final NamedFilterConfig value = filterParameter.getValue();
-        Assert.assertNotNull(value);
-        Assert.assertTrue(value.isEnabled());
-        Assert.assertTrue(value.isInverted());
-    }
-
-    /**
      * Checks that an {@link IntegerParameter} is correctly decoded.
      * @throws IOException if the test fails
      * @throws JDOMException if the test fails

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

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

From: <aki...@us...> - 2014-02-19 17:56:53

Revision: 9587
          http://sourceforge.net/p/gridarta/code/9587
Author:   akirschbaum
Date:     2014-02-19 17:56:46 +0000 (Wed, 19 Feb 2014)
Log Message:
-----------
Silently create missing parent directories when saving map files.

Modified Paths:
--------------
    trunk/src/model/src/main/java/net/sf/gridarta/model/mapcontrol/DefaultMapControl.java

Added Paths:
-----------
    trunk/src/model/src/test/java/net/sf/gridarta/model/mapcontrol/DefaultMapControlTest.java

Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/mapcontrol/DefaultMapControl.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/mapcontrol/DefaultMapControl.java	2014-02-19 06:14:25 UTC (rev 9586)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/mapcontrol/DefaultMapControl.java	2014-02-19 17:56:46 UTC (rev 9587)
@@ -146,6 +146,10 @@
      * @throws IOException if encoding fails
      */
     private void encodeMapFile(@NotNull final File file) throws IOException {
+        final File dir = file.getParentFile();
+        if (dir != null && !dir.exists() && !dir.mkdirs()) {
+            throw new IOException("cannot create directory: " + dir);
+        }
         final OutputStream outputStream = new FileOutputStream(file);
         try {
             final Writer writer = new OutputStreamWriter(outputStream, IOUtils.MAP_ENCODING);

Added: trunk/src/model/src/test/java/net/sf/gridarta/model/mapcontrol/DefaultMapControlTest.java
===================================================================
--- trunk/src/model/src/test/java/net/sf/gridarta/model/mapcontrol/DefaultMapControlTest.java	                        (rev 0)
+++ trunk/src/model/src/test/java/net/sf/gridarta/model/mapcontrol/DefaultMapControlTest.java	2014-02-19 17:56:46 UTC (rev 9587)
@@ -0,0 +1,58 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2011 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.model.mapcontrol;
+
+import java.io.File;
+import java.io.IOException;
+import net.sf.gridarta.model.archetype.TestArchetype;
+import net.sf.gridarta.model.gameobject.TestGameObject;
+import net.sf.gridarta.model.maparchobject.TestMapArchObject;
+import net.sf.gridarta.model.mapmodel.MapFile;
+import net.sf.gridarta.utils.Size2D;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Regression tests for {@link DefaultMapControl}.
+ * @author Andreas Kirschbaum
+ */
+public class DefaultMapControlTest {
+
+    /**
+     * Checks that {@link MapControl#save()} does not fail if the path to the
+     * map file does not yet exist.
+     * @throws InterruptedException if the test fails
+     * @throws IOException if the test fails
+     */
+    @Test
+    public void testSave1() throws IOException, InterruptedException {
+        final TestMapControlCreator mapControlCreator = new TestMapControlCreator();
+        final File mapsDirectory = mapControlCreator.createMapsDirectory();
+        try {
+            final MapFile mapFile = mapControlCreator.getPathManager().getMapFile(new File(mapControlCreator.getProjectSettings().getMapsDirectory(), "path1/path2/mapfile"));
+            final MapControl<TestGameObject, TestMapArchObject, TestArchetype> mapControl = mapControlCreator.newMapControl(mapFile, "name", new Size2D(1, 1));
+            mapControl.save(); // save map must not fail even if the destination dir does not yet exist
+            Assert.assertTrue(mapFile.getFile().exists());
+        } finally {
+            TestMapControlCreator.deleteTempDir(mapsDirectory);
+        }
+    }
+
+}


Property changes on: trunk/src/model/src/test/java/net/sf/gridarta/model/mapcontrol/DefaultMapControlTest.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

From: <aki...@us...> - 2014-02-19 06:14:31

Revision: 9586
          http://sourceforge.net/p/gridarta/code/9586
Author:   akirschbaum
Date:     2014-02-19 06:14:25 +0000 (Wed, 19 Feb 2014)
Log Message:
-----------
Fix IndexListener.indexingFinished() event generation.

Modified Paths:
--------------
    trunk/src/model/src/main/java/net/sf/gridarta/model/index/AbstractIndex.java
    trunk/src/model/src/main/java/net/sf/gridarta/model/index/Index.java
    trunk/src/model/src/main/java/net/sf/gridarta/model/index/MapsIndexer.java
    trunk/src/model/src/test/java/net/sf/gridarta/model/index/MapsIndexerTest.java

Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/index/AbstractIndex.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/index/AbstractIndex.java	2014-02-18 20:52:07 UTC (rev 9585)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/index/AbstractIndex.java	2014-02-19 06:14:25 UTC (rev 9586)
@@ -285,6 +285,16 @@
      * {@inheritDoc}
      */
     @Override
+    public boolean hasPending() {
+        synchronized (sync) {
+            return !pending.isEmpty();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public boolean isModified() {
         synchronized (sync) {
             return modified;

Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/index/Index.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/index/Index.java	2014-02-18 20:52:07 UTC (rev 9585)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/index/Index.java	2014-02-19 06:14:25 UTC (rev 9586)
@@ -115,6 +115,12 @@
     V removePending();
 
     /**
+     * Returns whether at least one pending value exists.
+     * @return whether at least one pending value exists
+     */
+    boolean hasPending();
+
+    /**
      * Returns whether the state was modified since last save.
      * @return whether the state was modified
      */

Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/index/MapsIndexer.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/index/MapsIndexer.java	2014-02-18 20:52:07 UTC (rev 9585)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/index/MapsIndexer.java	2014-02-19 06:14:25 UTC (rev 9586)
@@ -334,7 +334,7 @@
      */
     public void waitForIdle() throws InterruptedException {
         synchronized (syncState) {
-            while (state != State.IDLE) {
+            while (state != State.IDLE || mapsIndex.hasPending()) {
                 syncState.wait(1000L);
             }
         }
@@ -565,7 +565,9 @@
             LOG.debug("state=" + state);
         }
 
-        mapsIndex.indexingFinished();
+        if (state == State.IDLE) {
+            mapsIndex.indexingFinished();
+        }
     }
 
 }

Modified: trunk/src/model/src/test/java/net/sf/gridarta/model/index/MapsIndexerTest.java
===================================================================
--- trunk/src/model/src/test/java/net/sf/gridarta/model/index/MapsIndexerTest.java	2014-02-18 20:52:07 UTC (rev 9585)
+++ trunk/src/model/src/test/java/net/sf/gridarta/model/index/MapsIndexerTest.java	2014-02-19 06:14:25 UTC (rev 9586)
@@ -23,12 +23,15 @@
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicInteger;
 import net.sf.gridarta.model.archetype.TestArchetype;
 import net.sf.gridarta.model.gameobject.TestGameObject;
 import net.sf.gridarta.model.maparchobject.TestMapArchObject;
+import net.sf.gridarta.model.mapcontrol.MapControl;
 import net.sf.gridarta.model.mapcontrol.TestMapControlCreator;
 import net.sf.gridarta.model.mapmodel.MapFile;
 import net.sf.gridarta.model.settings.ProjectSettings;
+import net.sf.gridarta.utils.Size2D;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Assert;
 import org.junit.Test;
@@ -64,6 +67,68 @@
     }
 
     /**
+     * Checks that {@link IndexListener#finalize()} is called once after
+     * indexing has completed.
+     * @throws InterruptedException if the test fails
+     * @throws IOException if the test fails
+     */
+    @Test
+    public void test2() throws InterruptedException, IOException {
+        final TestMapControlCreator mapControlCreator = new TestMapControlCreator();
+        final File mapsDirectory = mapControlCreator.createMapsDirectory("map1:Map1", "path/map2:Map Name2");
+        try {
+            final MapsIndex index = new MapsIndex();
+            final AtomicInteger indexingFinished = new AtomicInteger();
+            final IndexListener<MapFile> indexListener = new IndexListener<MapFile>() {
+
+                @Override
+                public void valueAdded(@NotNull final MapFile value) {
+                }
+
+                @Override
+                public void valueRemoved(@NotNull final MapFile value) {
+                }
+
+                @Override
+                public void nameChanged() {
+                }
+
+                @Override
+                public void pendingChanged() {
+                }
+
+                @Override
+                public void indexingFinished() {
+                    indexingFinished.incrementAndGet();
+                }
+
+            };
+            index.addIndexListener(indexListener);
+            final MapsIndexer<TestGameObject, TestMapArchObject, TestArchetype> indexer = new MapsIndexer<TestGameObject, TestMapArchObject, TestArchetype>(index, mapControlCreator.getMapManager(), mapControlCreator.getProjectSettings());
+            indexer.start();
+            indexer.waitForIdle();
+            Assert.assertEquals(1, indexingFinished.getAndSet(0));
+
+            // create new map => indexer does not yet index it
+            final MapFile mapFile = mapControlCreator.getPathManager().getMapFile(new File(mapControlCreator.getProjectSettings().getMapsDirectory(), "mapfile"));
+            final MapControl<TestGameObject, TestMapArchObject, TestArchetype> mapControl = mapControlCreator.newMapControl(mapFile, "name3", new Size2D(1, 1));
+            indexer.waitForIdle();
+            Assert.assertEquals(0, indexingFinished.getAndSet(0));
+
+            // save new map => indexer must index it
+            mapControl.save();
+            indexer.waitForIdle();
+            Assert.assertEquals(1, indexingFinished.getAndSet(0));
+            Assert.assertEquals(3, index.findPartialName("").size());
+            assertEquals(index.findPartialName("Map1"), mapsDirectory, "map1");
+            assertEquals(index.findPartialName("Map Name2"), mapsDirectory, "path/map2");
+            assertEquals(index.findPartialName("name3"), mapsDirectory, "mapfile");
+        } finally {
+            TestMapControlCreator.deleteTempDir(mapsDirectory);
+        }
+    }
+
+    /**
      * Checks that a {@link Collection} of {@link File Files} contains exactly
      * one expected value. Fails the test otherwise.
      * @param mapPaths the collection of files
@@ -71,7 +136,7 @@
      * @param mapPath the map path (relative to mapsDirectory) of the expected
      * value
      */
-    private static void assertEquals(@NotNull final Collection<MapFile> mapPaths, @NotNull final File mapsDirectory, @NotNull final String mapPath) {
+    public static void assertEquals(@NotNull final Collection<MapFile> mapPaths, @NotNull final File mapsDirectory, @NotNull final String mapPath) {
         Assert.assertEquals(1, mapPaths.size());
         final Iterator<MapFile> it = mapPaths.iterator();
         final MapFile mapFile = it.next();

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

Flat | Threaded

<< < 1 .. 4 5 6 7 8 .. 380 > >> (Page 6 of 380)