gridarta-commit Mailing List for gridarta (Page 24)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 9160
          http://gridarta.svn.sourceforge.net/gridarta/?rev=9160&view=rev
Author:   akirschbaum
Date:     2012-01-08 15:54:42 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
Remove DoubleConfig.

Modified Paths:
--------------
    trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/DoubleParameter.java

Removed Paths:
-------------
    trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/DoubleConfig.java

Deleted: trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/DoubleConfig.java
===================================================================

--- trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/DoubleConfig.java	2012-01-08 15:53:44 UTC (rev 9159)
+++ trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/DoubleConfig.java	2012-01-08 15:54:42 UTC (rev 9160)
@@ -1,51 +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;
-
-public class DoubleConfig {
-
-    /* we do not use the Double.MAX or JTextField will be *very* large. So
-     * we fall back to [0, 1] range (useful for randoms)
-     */
-    private double min = 0.0;
-
-    private double max = 1.0;
-
-    public double getMax() {
-        return max;
-    }
-
-    public void setMax(final double max) {
-        if (min <= max) {
-            this.max = max;
-        }
-    }
-
-    public double getMin() {
-        return min;
-    }
-
-    public void setMin(final double min) {
-        if (min <= max) {
-            this.min = min;
-        }
-    }
-
-}

Modified: trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/DoubleParameter.java
===================================================================
--- trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/DoubleParameter.java	2012-01-08 15:53:44 UTC (rev 9159)
+++ trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/DoubleParameter.java	2012-01-08 15:54:42 UTC (rev 9160)
@@ -29,7 +29,7 @@
 /**
  * A {@link PluginParameter} that holds a double value.
  */
-public class DoubleParameter<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends AbstractPluginParameter<G, A, R, Double, DoubleConfig> {
+public class DoubleParameter<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends AbstractPluginParameter<G, A, R, Double, Void> {
 
     /**
      * The string representation of this parameter type.
@@ -38,6 +38,18 @@
     public static final String PARAMETER_TYPE = Double.class.getName();
 
     /**
+     * The minimal allowed value.
+     */
+    private double min = 0.0;
+
+    /**
+     * The maximal allowed value. We do not use the {@link Double#MAX_VALUE} or
+     * the <code>JTextField</code> will be *very* large. So we fall back to [0,
+     * 1] range (useful for randoms).
+     */
+    private double max = 1.0;
+
+    /**
      * {@inheritDoc}
      */
     @Override
@@ -53,16 +65,14 @@
         super.fromXML(e);
         final String val = e.getChildText("value");
         setValue(NumberUtils.parseDouble(val));
-        final DoubleConfig o = new DoubleConfig();
         try {
-            o.setMin(Double.parseDouble(e.getChildTextTrim("minimum")));
+            min = Double.parseDouble(e.getChildTextTrim("minimum"));
         } catch (final NumberFormatException ignored) {
         }
         try {
-            o.setMax(Double.parseDouble(e.getChildTextTrim("maximum")));
+            max = Math.max(min, Double.parseDouble(e.getChildTextTrim("maximum")));
         } catch (final NumberFormatException ignored) {
         }
-        setConfig(o);
     }
 
     /**
@@ -92,8 +102,8 @@
         e.addContent(v);
         final Element min = new Element("minimum");
         final Element max = new Element("maximum");
-        min.addContent(Double.toString(getConfig().getMin()));
-        max.addContent(Double.toString(getConfig().getMax()));
+        min.addContent(Double.toString(this.min));
+        max.addContent(Double.toString(this.max));
         e.addContent(min);
         e.addContent(max);
         return e;
@@ -108,25 +118,41 @@
         return PARAMETER_TYPE;
     }
 
+    /**
+     * Returns the maximal allowed value.
+     * @return the maximal allowed value
+     */
     public double getMax() {
-        return getConfig().getMax();
+        return max;
     }
 
+    /**
+     * Sets the maximal allowed value.
+     * @param max the maximal allowed value
+     */
     public void setMax(final double max) {
-        getConfig().setMax(max);
-        if (getValue() > getConfig().getMax()) {
-            setValue(getConfig().getMax());
+        this.max = Math.max(min, max);
+        if (getValue() > this.max) {
+            setValue(this.max);
         }
     }
 
+    /**
+     * Returns the minimal allowed value.
+     * @return the minimal allowed value
+     */
     public double getMin() {
-        return getConfig().getMin();
+        return min;
     }
 
+    /**
+     * Sets the minimal allowed value.
+     * @param min the minimal allowed value
+     */
     public void setMin(final double min) {
-        getConfig().setMin(min);
-        if (getValue() < getConfig().getMin()) {
-            setValue(getConfig().getMin());
+        this.min = Math.min(min, max);
+        if (getValue() < this.min) {
+            setValue(this.min);
         }
     }
 

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





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)

gridarta-commit Mailing List for gridarta (Page 24)

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