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

[Gridarta-commit] SF.net SVN: gridarta: [884] trunk/crossfire/src/cfeditor

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

Revision: 884
          http://svn.sourceforge.net/gridarta/?rev=884&view=rev
Author:   akirschbaum
Date:     2006-12-04 11:48:44 -0800 (Mon, 04 Dec 2006)

Log Message:
-----------
Rename method name.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java
    trunk/crossfire/src/cfeditor/map/MapControl.java

Modified: trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:47:17 UTC (rev 883)
+++ trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:48:44 UTC (rev 884)
@@ -419,7 +419,7 @@
         }
 
         // if the mapsize has been modified, see if we should ask for a confirm
-        if (!mapControl.isCutoffSave(mapSize)) {
+        if (!mapControl.isCutoffSafe(mapSize)) {
             if (!askConfirmResize(mapSize)) {
                 // resizing has been cancelled
                 mapSize = mapControl.getMapSize();

Modified: trunk/crossfire/src/cfeditor/map/MapControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/MapControl.java	2006-12-04 19:47:17 UTC (rev 883)
+++ trunk/crossfire/src/cfeditor/map/MapControl.java	2006-12-04 19:48:44 UTC (rev 884)
@@ -363,7 +363,7 @@
         return mapModel.isPointValid(pos);
     }
 
-    public boolean isCutoffSave(final Size2D size) {
+    public boolean isCutoffSafe(final Size2D size) {
         return mapModel.isCutoffSafe(size);
     }
 


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

[Gridarta-commit] SF.net SVN: gridarta: [883] trunk/crossfire/src/cfeditor/gui/map/ MapPropertiesDialog.java

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

Revision: 883
          http://svn.sourceforge.net/gridarta/?rev=883&view=rev
Author:   akirschbaum
Date:     2006-12-04 11:47:17 -0800 (Mon, 04 Dec 2006)

Log Message:
-----------
Whitespace changes.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java

Modified: trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:46:55 UTC (rev 882)
+++ trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:47:17 UTC (rev 883)
@@ -427,8 +427,7 @@
         }
 
         // now that all is well, write the new values into the maparch
-        mainControl.setLevelProperties(mapControl, mapDescription.getText(), mapLore.getText(),
-                mapName.getText(), mapSize);
+        mainControl.setLevelProperties(mapControl, mapDescription.getText(), mapLore.getText(), mapName.getText(), mapSize);
 
         final MapArchObject map = mapControl.getMapArch();
 


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

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

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

Revision: 882
          http://svn.sourceforge.net/gridarta/?rev=882&view=rev
Author:   akirschbaum
Date:     2006-12-04 11:46:55 -0800 (Mon, 04 Dec 2006)

Log Message:
-----------
Unify comments and order of statements.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java
    trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java

Modified: trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:37:49 UTC (rev 881)
+++ trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:46:55 UTC (rev 882)
@@ -90,8 +90,6 @@
 
     private final JCheckBox checkboxOutdoor = new JCheckBox();  // map outdoor
 
-    private final JCheckBox checkboxFixedReset = new JCheckBox();  // fixed reset
-
     private final JCheckBox checkboxNosmooth = new JCheckBox();  // map nosmooth
 
     private final JFormattedTextField fieldEnterX = new JFormattedTextField(); // enter x
@@ -106,6 +104,8 @@
 
     private final JFormattedTextField fieldDarkness = new JFormattedTextField(); // darkness
 
+    private final JCheckBox checkboxFixedReset = new JCheckBox();  // fixed reset
+
     private final JTextField[] fieldTilePath = new JTextField[IGUIConstants.DIRECTIONS]; // tile paths
 
     private final JTextField fieldShopitems = new JTextField(); // shopitems
@@ -356,24 +356,29 @@
     private boolean modifyMapProperties() {
         boolean modifyTilepaths = false; // true when map tile-paths were modified
 
-        // tmp variables for parsing
-        final int width, height;
-        final int enterX, enterY;
-        final int resetTimeout, swapTime;
-        final int difficulty, darkness;
-        final int temperature, pressure, humidity;
-        final int windSpeed, windDirection, skySetting;
+        // first check if the entries are all okay
+        final int darkness;
+        final int difficulty;
+        final int swapTime;
+        final int resetTimeout;
+        final int temperature;
+        final int pressure;
+        final int humidity;
+        final int windSpeed;
+        final int windDirection;
+        final int skySetting;
         final double shopGreedd;
-        final int shopMax, shopMin;
-        final String shopItems, shopRace;
+        final int shopMin, shopMax;
+        final String shopItems;
+        final String shopRace;
         final String region;
-
-        // first check if the entries are all okay
         Size2D mapSize;
+        final int enterX;
+        final int enterY;
         try {
             // try to parse everything
-            width = parseProperty(levelWidthField.getText(), "Width");
-            height = parseProperty(levelHeightField.getText(), "Height");
+            final int width = parseProperty(levelWidthField.getText(), "Width");
+            final int height = parseProperty(levelHeightField.getText(), "Height");
             enterX = parseProperty(fieldEnterX.getText(), "Enter X");
             enterY = parseProperty(fieldEnterY.getText(), "Enter Y");
             swapTime = parseProperty(fieldSwapTime.getText(), "Swap Time");
@@ -433,10 +438,10 @@
         map.setResetTimeout(resetTimeout);
         map.setSwapTime(swapTime);
         map.setDifficulty(difficulty);
+        map.setFixedReset(checkboxFixedReset.isSelected());
         map.setDarkness(darkness);
         map.setUnique(checkboxUnique.isSelected());
         map.setOutdoor(checkboxOutdoor.isSelected());
-        map.setFixedReset(checkboxFixedReset.isSelected());
         map.setNosmooth(checkboxNosmooth.isSelected());
 
         map.setShopItems(shopItems);

Modified: trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:37:49 UTC (rev 881)
+++ trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:46:55 UTC (rev 882)
@@ -98,13 +98,12 @@
 
     private final JFormattedTextField fieldResetTimeout = new JFormattedTextField(); // reset timeout
 
-    private final JFormattedTextField fieldDifficulty = new JFormattedTextField(); // map fieldDifficulty
+    private final JFormattedTextField fieldDifficulty = new JFormattedTextField(); // map difficulty
 
-    private final JFormattedTextField fieldDarkness = new JFormattedTextField(); // fieldDarkness
+    private final JFormattedTextField fieldDarkness = new JFormattedTextField(); // darkness
 
     private final JCheckBox checkboxFixedReset = new JCheckBox();  // fixed reset
 
-    // only for ISO:
     private final JCheckBox checkboxNoSave = new JCheckBox();
 
     private final JCheckBox checkboxNoMagic = new JCheckBox();
@@ -383,8 +382,8 @@
         final int swapTime;
         final int resetTimeout;
         Size2D mapSize;
-        final int enterY;
         final int enterX;
+        final int enterY;
         try {
             // try to parse everything
             final int width = parseProperty(levelWidthField.getText(), "Width");
@@ -448,7 +447,6 @@
         map.setDarkness(darkness);
         map.setOutdoor(checkboxOutdoor.isSelected());
 
-        // these flags are for daimonin only
         map.setNoSave(checkboxNoSave.isSelected());
         map.setNoMagic(checkboxNoMagic.isSelected());
         map.setNoPriest(checkboxNoPriest.isSelected());


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

[Gridarta-commit] SF.net SVN: gridarta: [881] trunk/crossfire/src/cfeditor/gui/map/ MapPropertiesDialog.java

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

Revision: 881
          http://svn.sourceforge.net/gridarta/?rev=881&view=rev
Author:   akirschbaum
Date:     2006-12-04 11:37:49 -0800 (Mon, 04 Dec 2006)

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

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java

Modified: trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:34:18 UTC (rev 880)
+++ trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:37:49 UTC (rev 881)
@@ -369,6 +369,7 @@
         final String region;
 
         // first check if the entries are all okay
+        Size2D mapSize;
         try {
             // try to parse everything
             width = parseProperty(levelWidthField.getText(), "Width");
@@ -398,6 +399,7 @@
                 ACTION_FACTORY.showMessageDialog(this, "mapErrorIllegalSize");
                 return false;
             }
+            mapSize = new Size2D(width, height);
             if (darkness < 0 || darkness > 5) {
                 ACTION_FACTORY.showMessageDialog(this, "mapErrorInvalidDarkness");
                 return false;
@@ -412,17 +414,16 @@
         }
 
         // if the mapsize has been modified, see if we should ask for a confirm
-        Size2D size = new Size2D(width, height);
-        if (!mapControl.isCutoffSave(size)) {
-            if (!askConfirmResize(size)) {
+        if (!mapControl.isCutoffSave(mapSize)) {
+            if (!askConfirmResize(mapSize)) {
                 // resizing has been cancelled
-                size = mapControl.getMapSize();
+                mapSize = mapControl.getMapSize();
             }
         }
 
         // now that all is well, write the new values into the maparch
         mainControl.setLevelProperties(mapControl, mapDescription.getText(), mapLore.getText(),
-                mapName.getText(), size);
+                mapName.getText(), mapSize);
 
         final MapArchObject map = mapControl.getMapArch();
 


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

[Gridarta-commit] SF.net SVN: gridarta: [880] trunk/daimonin/src/daieditor/gui/map/ MapPropertiesDialog.java

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

Revision: 880
          http://svn.sourceforge.net/gridarta/?rev=880&view=rev
Author:   akirschbaum
Date:     2006-12-04 11:34:18 -0800 (Mon, 04 Dec 2006)

Log Message:
-----------
Rename variable names.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java

Modified: trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:31:01 UTC (rev 879)
+++ trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:34:18 UTC (rev 880)
@@ -102,28 +102,28 @@
 
     private final JFormattedTextField fieldDarkness = new JFormattedTextField(); // fieldDarkness
 
-    private final JCheckBox fixedReset = new JCheckBox();  // fixed reset
+    private final JCheckBox checkboxFixedReset = new JCheckBox();  // fixed reset
 
     // only for ISO:
-    private final JCheckBox noSave = new JCheckBox();
+    private final JCheckBox checkboxNoSave = new JCheckBox();
 
-    private final JCheckBox noMagic = new JCheckBox();
+    private final JCheckBox checkboxNoMagic = new JCheckBox();
 
-    private final JCheckBox noPriest = new JCheckBox();
+    private final JCheckBox checkboxNoPriest = new JCheckBox();
 
-    private final JCheckBox noSummon = new JCheckBox();
+    private final JCheckBox checkboxNoSummon = new JCheckBox();
 
-    private final JCheckBox noHarm = new JCheckBox();
+    private final JCheckBox checkboxNoHarm = new JCheckBox();
 
-    private final JCheckBox noFixedLogin = new JCheckBox();
+    private final JCheckBox checkboxNoFixedLogin = new JCheckBox();
 
-    private final JCheckBox permDeath = new JCheckBox();
+    private final JCheckBox checkboxPermDeath = new JCheckBox();
 
-    private final JCheckBox ultraDeath = new JCheckBox();
+    private final JCheckBox checkboxUltraDeath = new JCheckBox();
 
-    private final JCheckBox ultimateDeath = new JCheckBox();
+    private final JCheckBox checkboxUltimateDeath = new JCheckBox();
 
-    private final JCheckBox pvp = new JCheckBox();
+    private final JCheckBox checkboxPvp = new JCheckBox();
 
     /** JButton for ok. */
     private final JButton okButton = new JButton(ACTION_FACTORY.createAction(false, "mapOkay", this));
@@ -237,16 +237,16 @@
         optionPanel.add(createPanelLine(fieldSwapTime, 10, map.getSwapTime(), "mapSwapTime"));
         optionPanel.add(createPanelLine(fieldResetTimeout, 10, map.getResetTimeout(), "mapResetTimeout"));
 
-        optionPanel.add(createPanelCBox(noSave, map.isNoSave(), "mapNoSave"));
-        optionPanel.add(createPanelCBox(noMagic, map.isNoMagic(), "mapNoMagic"));
-        optionPanel.add(createPanelCBox(noPriest, map.isNoPriest(), "mapNoPrayers"));
-        optionPanel.add(createPanelCBox(noHarm, map.isNoHarm(), "mapNoHarm"));
-        optionPanel.add(createPanelCBox(noSummon, map.isNoSummon(), "mapNoSumm"));
-        optionPanel.add(createPanelCBox(noFixedLogin, map.isFixedLogin(), "mapFixedLogin"));
-        optionPanel.add(createPanelCBox(permDeath, map.isPermDeath(), "mapPermDeath"));
-        optionPanel.add(createPanelCBox(ultraDeath, map.isUltraDeath(), "mapUltraDeath"));
-        optionPanel.add(createPanelCBox(ultimateDeath, map.isUltimateDeath(), "mapInstantDeath"));
-        optionPanel.add(createPanelCBox(pvp, map.isPvp(), "mapPvP"));
+        optionPanel.add(createPanelCBox(checkboxNoSave, map.isNoSave(), "mapNoSave"));
+        optionPanel.add(createPanelCBox(checkboxNoMagic, map.isNoMagic(), "mapNoMagic"));
+        optionPanel.add(createPanelCBox(checkboxNoPriest, map.isNoPriest(), "mapNoPrayers"));
+        optionPanel.add(createPanelCBox(checkboxNoHarm, map.isNoHarm(), "mapNoHarm"));
+        optionPanel.add(createPanelCBox(checkboxNoSummon, map.isNoSummon(), "mapNoSumm"));
+        optionPanel.add(createPanelCBox(checkboxNoFixedLogin, map.isFixedLogin(), "mapFixedLogin"));
+        optionPanel.add(createPanelCBox(checkboxPermDeath, map.isPermDeath(), "mapPermDeath"));
+        optionPanel.add(createPanelCBox(checkboxUltraDeath, map.isUltraDeath(), "mapUltraDeath"));
+        optionPanel.add(createPanelCBox(checkboxUltimateDeath, map.isUltimateDeath(), "mapInstantDeath"));
+        optionPanel.add(createPanelCBox(checkboxPvp, map.isPvp(), "mapPvP"));
 
         final JScrollPane scrollPane = new JScrollPane(optionPanel);
         scrollPane.setBorder(createTitledBorder("mapOptions"));
@@ -299,7 +299,7 @@
         gbc.fill = GridBagConstraints.NONE;
         p2.add(createPanelCBox(checkboxOutdoor, map.isOutdoor(), "mapOutdoor"), gbc);
         gbc.gridwidth = GridBagConstraints.REMAINDER;
-        p2.add(createPanelCBox(fixedReset, map.isFixedReset(), "mapFixedReset"), gbc);
+        p2.add(createPanelCBox(checkboxFixedReset, map.isFixedReset(), "mapFixedReset"), gbc);
 
         gbc.weightx = 2.0;
         gbc.fill = GridBagConstraints.HORIZONTAL;
@@ -444,21 +444,21 @@
         map.setResetTimeout(resetTimeout);
         map.setSwapTime(swapTime);
         map.setDifficulty(difficulty);
-        map.setFixedReset(fixedReset.isSelected());
+        map.setFixedReset(checkboxFixedReset.isSelected());
         map.setDarkness(darkness);
         map.setOutdoor(checkboxOutdoor.isSelected());
 
         // these flags are for daimonin only
-        map.setNoSave(noSave.isSelected());
-        map.setNoMagic(noMagic.isSelected());
-        map.setNoPriest(noPriest.isSelected());
-        map.setNoHarm(noHarm.isSelected());
-        map.setNoSummon(noSummon.isSelected());
-        map.setFixedLogin(noFixedLogin.isSelected());
-        map.setPermDeath(permDeath.isSelected());
-        map.setUltraDeath(ultraDeath.isSelected());
-        map.setUltimateDeath(ultimateDeath.isSelected());
-        map.setPvp(pvp.isSelected());
+        map.setNoSave(checkboxNoSave.isSelected());
+        map.setNoMagic(checkboxNoMagic.isSelected());
+        map.setNoPriest(checkboxNoPriest.isSelected());
+        map.setNoHarm(checkboxNoHarm.isSelected());
+        map.setNoSummon(checkboxNoSummon.isSelected());
+        map.setFixedLogin(checkboxNoFixedLogin.isSelected());
+        map.setPermDeath(checkboxPermDeath.isSelected());
+        map.setUltraDeath(checkboxUltraDeath.isSelected());
+        map.setUltimateDeath(checkboxUltimateDeath.isSelected());
+        map.setPvp(checkboxPvp.isSelected());
 
         mapTilePane.modifyMapProperties();
 
@@ -502,18 +502,18 @@
         fieldDifficulty.setText(Integer.toString(map.getDifficulty()));
 
         checkboxOutdoor.setSelected(map.isOutdoor());
-        fixedReset.setSelected(map.isFixedReset());
+        checkboxFixedReset.setSelected(map.isFixedReset());
 
-        noSave.setSelected(map.isNoSave());
-        noMagic.setSelected(map.isNoMagic());
-        noPriest.setSelected(map.isNoPriest());
-        noHarm.setSelected(map.isNoHarm());
-        noSummon.setSelected(map.isNoSummon());
-        noFixedLogin.setSelected(map.isFixedLogin());
-        permDeath.setSelected(map.isPermDeath());
-        ultraDeath.setSelected(map.isUltraDeath());
-        ultimateDeath.setSelected(map.isUltimateDeath());
-        pvp.setSelected(map.isPvp());
+        checkboxNoSave.setSelected(map.isNoSave());
+        checkboxNoMagic.setSelected(map.isNoMagic());
+        checkboxNoPriest.setSelected(map.isNoPriest());
+        checkboxNoHarm.setSelected(map.isNoHarm());
+        checkboxNoSummon.setSelected(map.isNoSummon());
+        checkboxNoFixedLogin.setSelected(map.isFixedLogin());
+        checkboxPermDeath.setSelected(map.isPermDeath());
+        checkboxUltraDeath.setSelected(map.isUltraDeath());
+        checkboxUltimateDeath.setSelected(map.isUltimateDeath());
+        checkboxPvp.setSelected(map.isPvp());
     }
 
     /**


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

[Gridarta-commit] SF.net SVN: gridarta: [879] trunk/daimonin/src/daieditor/gui/map/ MapPropertiesDialog.java

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

Revision: 879
          http://svn.sourceforge.net/gridarta/?rev=879&view=rev
Author:   akirschbaum
Date:     2006-12-04 11:31:01 -0800 (Mon, 04 Dec 2006)

Log Message:
-----------
Unify spelling.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java

Modified: trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:27:04 UTC (rev 878)
+++ trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:31:01 UTC (rev 879)
@@ -389,8 +389,8 @@
             // try to parse everything
             final int width = parseProperty(levelWidthField.getText(), "Width");
             final int height = parseProperty(levelHeightField.getText(), "Height");
-            enterX = parseProperty(fieldEnterX.getText(), "Enter x");
-            enterY = parseProperty(fieldEnterY.getText(), "Enter y");
+            enterX = parseProperty(fieldEnterX.getText(), "Enter X");
+            enterY = parseProperty(fieldEnterY.getText(), "Enter Y");
             swapTime = parseProperty(fieldSwapTime.getText(), "Swap Time");
             resetTimeout = parseProperty(fieldResetTimeout.getText(), "Reset Timeout");
             difficulty = parseProperty(fieldDifficulty.getText(), "Difficulty");


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

[Gridarta-commit] SF.net SVN: gridarta: [878] trunk/crossfire/src/cfeditor/gui/map/ MapPropertiesDialog.java

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

Revision: 878
          http://svn.sourceforge.net/gridarta/?rev=878&view=rev
Author:   akirschbaum
Date:     2006-12-04 11:27:04 -0800 (Mon, 04 Dec 2006)

Log Message:
-----------
Rename variable names.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java

Modified: trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:21:44 UTC (rev 877)
+++ trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:27:04 UTC (rev 878)
@@ -358,47 +358,47 @@
 
         // tmp variables for parsing
         final int width, height;
-        final int t_enter_x, t_enter_y;
-        final int t_reset_timeout, t_swap_time;
-        final int t_difficulty, t_darkness;
-        final int t_temp, t_pressure, t_humid;
-        final int t_winds, t_windd, t_sky;
-        final double t_shopgreed;
-        final int t_shopmax, t_shopmin;
-        final String t_shopitems, t_shoprace;
-        final String t_region;
+        final int enterX, enterY;
+        final int resetTimeout, swapTime;
+        final int difficulty, darkness;
+        final int temperature, pressure, humidity;
+        final int windSpeed, windDirection, skySetting;
+        final double shopGreedd;
+        final int shopMax, shopMin;
+        final String shopItems, shopRace;
+        final String region;
 
         // first check if the entries are all okay
         try {
             // try to parse everything
             width = parseProperty(levelWidthField.getText(), "Width");
             height = parseProperty(levelHeightField.getText(), "Height");
-            t_enter_x = parseProperty(fieldEnterX.getText(), "Enter X");
-            t_enter_y = parseProperty(fieldEnterY.getText(), "Enter Y");
-            t_swap_time = parseProperty(fieldSwapTime.getText(), "Swap Time");
-            t_reset_timeout = parseProperty(fieldResetTimeout.getText(), "Reset Timeout");
-            t_difficulty = parseProperty(fieldDifficulty.getText(), "Difficulty");
-            t_darkness = parseProperty(fieldDarkness.getText(), "Darkness");
-            t_region = mapRegion.getText();
+            enterX = parseProperty(fieldEnterX.getText(), "Enter X");
+            enterY = parseProperty(fieldEnterY.getText(), "Enter Y");
+            swapTime = parseProperty(fieldSwapTime.getText(), "Swap Time");
+            resetTimeout = parseProperty(fieldResetTimeout.getText(), "Reset Timeout");
+            difficulty = parseProperty(fieldDifficulty.getText(), "Difficulty");
+            darkness = parseProperty(fieldDarkness.getText(), "Darkness");
+            region = mapRegion.getText();
 
-            t_shopitems = fieldShopitems.getText();
-            t_shoprace = fieldShoprace.getText();
-            t_shopmax = parseProperty(fieldShopmax.getText(), "Shop Maximum");
-            t_shopmin = parseProperty(fieldShopmin.getText(), "Shop Minimum");
-            t_shopgreed = parsePropertyToDouble(fieldShopgreed.getText(), "Shop Greed");
-            t_temp = parseProperty(fieldTemperature.getText(), "Temperature");
-            t_pressure = parseProperty(fieldPressure.getText(), "Pressure");
-            t_humid = parseProperty(fieldHumidity.getText(), "Humidity");
-            t_winds = parseProperty(fieldWindspeed.getText(), "Wind Speed");
-            t_windd = parseProperty(fieldWindDirection.getText(), "Wind Direction");
-            t_sky = parseProperty(fieldSkySetting.getText(), "Sky Setting");
+            shopItems = fieldShopitems.getText();
+            shopRace = fieldShoprace.getText();
+            shopMax = parseProperty(fieldShopmax.getText(), "Shop Maximum");
+            shopMin = parseProperty(fieldShopmin.getText(), "Shop Minimum");
+            shopGreedd = parsePropertyToDouble(fieldShopgreed.getText(), "Shop Greed");
+            temperature = parseProperty(fieldTemperature.getText(), "Temperature");
+            pressure = parseProperty(fieldPressure.getText(), "Pressure");
+            humidity = parseProperty(fieldHumidity.getText(), "Humidity");
+            windSpeed = parseProperty(fieldWindspeed.getText(), "Wind Speed");
+            windDirection = parseProperty(fieldWindDirection.getText(), "Wind Direction");
+            skySetting = parseProperty(fieldSkySetting.getText(), "Sky Setting");
 
             // Now do some sanity checks:
             if (width < 1 || height < 1) {
                 ACTION_FACTORY.showMessageDialog(this, "mapErrorIllegalSize");
                 return false;
             }
-            if (t_darkness < 0 || t_darkness > 5) {
+            if (darkness < 0 || darkness > 5) {
                 ACTION_FACTORY.showMessageDialog(this, "mapErrorInvalidDarkness");
                 return false;
             }
@@ -426,30 +426,30 @@
 
         final MapArchObject map = mapControl.getMapArch();
 
-        map.setMapRegion(t_region);
-        map.setEnterX(t_enter_x);
-        map.setEnterY(t_enter_y);
-        map.setResetTimeout(t_reset_timeout);
-        map.setSwapTime(t_swap_time);
-        map.setDifficulty(t_difficulty);
-        map.setDarkness(t_darkness);
+        map.setMapRegion(region);
+        map.setEnterX(enterX);
+        map.setEnterY(enterY);
+        map.setResetTimeout(resetTimeout);
+        map.setSwapTime(swapTime);
+        map.setDifficulty(difficulty);
+        map.setDarkness(darkness);
         map.setUnique(checkboxUnique.isSelected());
         map.setOutdoor(checkboxOutdoor.isSelected());
         map.setFixedReset(checkboxFixedReset.isSelected());
         map.setNosmooth(checkboxNosmooth.isSelected());
 
-        map.setShopItems(t_shopitems);
-        map.setShopRace(t_shoprace);
-        map.setShopMin(t_shopmin);
-        map.setShopMax(t_shopmax);
-        map.setShopGreed(t_shopgreed);
+        map.setShopItems(shopItems);
+        map.setShopRace(shopRace);
+        map.setShopMin(shopMin);
+        map.setShopMax(shopMax);
+        map.setShopGreed(shopGreedd);
 
-        map.setTemp(t_temp);
-        map.setPressure(t_pressure);
-        map.setHumid(t_humid);
-        map.setWindspeed(t_winds);
-        map.setWinddir(t_windd);
-        map.setSky(t_sky);
+        map.setTemp(temperature);
+        map.setPressure(pressure);
+        map.setHumid(humidity);
+        map.setWindspeed(windSpeed);
+        map.setWinddir(windDirection);
+        map.setSky(skySetting);
 
         // update tilepaths
         for (int i = 0; i < IGUIConstants.DIRECTIONS; i++) {


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

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

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

Revision: 877
          http://svn.sourceforge.net/gridarta/?rev=877&view=rev
Author:   akirschbaum
Date:     2006-12-04 11:21:44 -0800 (Mon, 04 Dec 2006)

Log Message:
-----------
Move text messages into message file.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java
    trunk/crossfire/src/cfeditor/messages.properties
    trunk/daimonin/src/daieditor/messages.properties
    trunk/src/app/net/sf/gridarta/messages.properties

Modified: trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:17:14 UTC (rev 876)
+++ trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:21:44 UTC (rev 877)
@@ -189,15 +189,15 @@
     private JPanel createMapPanel(final MapArchObject map) {
         final JPanel panel = new JPanel(new GridLayout(0, 1));
 
-        panel.add(createPanelLine(mapName, 16, mapControl.getMapName(), "Name"));
-        panel.add(createPanelLine(mapRegion, 16, map.getMapRegion(), "Region"));
+        panel.add(createPanelLine(mapName, 16, mapControl.getMapName(), "mapName"));
+        panel.add(createPanelLine(mapRegion, 16, map.getMapRegion(), "mapRegion"));
         final Size2D mapSize = mapControl.getMapSize();
-        panel.add(createPanelLine(levelWidthField, 10, String.valueOf(mapSize.getWidth()), "Width"));
-        panel.add(createPanelLine(levelHeightField, 10, String.valueOf(mapSize.getHeight()), "Height"));
-        panel.add(createPanelCBox(checkboxUnique, map.isUnique(), " Unique Map"));
-        panel.add(createPanelCBox(checkboxOutdoor, map.isOutdoor(), " Outdoor Map"));
-        panel.add(createPanelCBox(checkboxFixedReset, map.isFixedReset(), " Fixed Reset"));
-        panel.add(createPanelCBox(checkboxNosmooth, map.isNosmooth(), " Nosmooth Map"));
+        panel.add(createPanelLine(levelWidthField, 10, String.valueOf(mapSize.getWidth()), "mapWidth"));
+        panel.add(createPanelLine(levelHeightField, 10, String.valueOf(mapSize.getHeight()), "mapHeight"));
+        panel.add(createPanelCBox(checkboxUnique, map.isUnique(), "mapUniqueMap"));
+        panel.add(createPanelCBox(checkboxOutdoor, map.isOutdoor(), "mapOutdoorMap"));
+        panel.add(createPanelCBox(checkboxFixedReset, map.isFixedReset(), "mapFixedReset"));
+        panel.add(createPanelCBox(checkboxNosmooth, map.isNosmooth(), "mapNosmoothMap"));
 
         return panel;
     }
@@ -206,12 +206,12 @@
     private JPanel createParametersPanel(final MapArchObject map) {
         final JPanel panel = new JPanel(new GridLayout(0, 1));
 
-        panel.add(createPanelLine(fieldEnterX, 10, String.valueOf(map.getEnterX()), "Enter X"));
-        panel.add(createPanelLine(fieldEnterY, 10, String.valueOf(map.getEnterY()), "Enter Y"));
-        panel.add(createPanelLine(fieldDifficulty, 10, String.valueOf(map.getDifficulty()), "Difficulty"));
-        panel.add(createPanelLine(fieldDarkness, 10, String.valueOf(map.getDarkness()), "Darkness"));
-        panel.add(createPanelLine(fieldSwapTime, 10, String.valueOf(map.getSwapTime()), "Swap Time"));
-        panel.add(createPanelLine(fieldResetTimeout, 10, String.valueOf(map.getResetTimeout()), "Reset Timeout"));
+        panel.add(createPanelLine(fieldEnterX, 10, String.valueOf(map.getEnterX()), "mapEnterX"));
+        panel.add(createPanelLine(fieldEnterY, 10, String.valueOf(map.getEnterY()), "mapEnterY"));
+        panel.add(createPanelLine(fieldDifficulty, 10, String.valueOf(map.getDifficulty()), "mapDifficulty"));
+        panel.add(createPanelLine(fieldDarkness, 10, String.valueOf(map.getDarkness()), "mapDarkness"));
+        panel.add(createPanelLine(fieldSwapTime, 10, String.valueOf(map.getSwapTime()), "mapSwapTime"));
+        panel.add(createPanelLine(fieldResetTimeout, 10, String.valueOf(map.getResetTimeout()), "mapResetTimeout"));
 
         return panel;
     }
@@ -220,11 +220,11 @@
     private JPanel createShopPanel(final MapArchObject map) {
         final JPanel panel = new JPanel(new GridLayout(0, 1));
 
-        panel.add(createPanelLine(fieldShopitems, 10, map.getShopItems(), "Shop Type"));
-        panel.add(createPanelLine(fieldShopgreed, 10, String.valueOf(map.getShopGreed()), "Shop Greed"));
-        panel.add(createPanelLine(fieldShopmax, 10, String.valueOf(map.getShopMax()), "Upper Price Limit"));
-        panel.add(createPanelLine(fieldShopmin, 10, String.valueOf(map.getShopMin()), "Lower Price Limit"));
-        panel.add(createPanelLine(fieldShoprace, 10, map.getShopRace(), "Shop Race"));
+        panel.add(createPanelLine(fieldShopitems, 10, map.getShopItems(), "mapShopType"));
+        panel.add(createPanelLine(fieldShopgreed, 10, String.valueOf(map.getShopGreed()), "mapShopGreed"));
+        panel.add(createPanelLine(fieldShopmax, 10, String.valueOf(map.getShopMax()), "mapUpperPriceLimit"));
+        panel.add(createPanelLine(fieldShopmin, 10, String.valueOf(map.getShopMin()), "mapLowerPriceLimit"));
+        panel.add(createPanelLine(fieldShoprace, 10, map.getShopRace(), "mapShopRace"));
 
         return panel;
     }
@@ -233,12 +233,12 @@
     private JPanel createWeatherPanel(final MapArchObject map) {
         final JPanel panel = new JPanel(new GridLayout(0, 1));
 
-        panel.add(createPanelLine(fieldTemperature, 10, String.valueOf(map.getTemp()), "Temperature"));
-        panel.add(createPanelLine(fieldPressure, 10, String.valueOf(map.getPressure()), "Pressure"));
-        panel.add(createPanelLine(fieldHumidity, 10, String.valueOf(map.getHumid()), "Humidity"));
-        panel.add(createPanelLine(fieldWindspeed, 10, String.valueOf(map.getWindspeed()), "Wind Speed"));
-        panel.add(createPanelLine(fieldWindDirection, 10, String.valueOf(map.getWinddir()), "Wind Direction"));
-        panel.add(createPanelLine(fieldSkySetting, 10, String.valueOf(map.getSky()), "Sky Setting"));
+        panel.add(createPanelLine(fieldTemperature, 10, String.valueOf(map.getTemp()), "mapTemperature"));
+        panel.add(createPanelLine(fieldPressure, 10, String.valueOf(map.getPressure()), "mapPressure"));
+        panel.add(createPanelLine(fieldHumidity, 10, String.valueOf(map.getHumid()), "mapHumidity"));
+        panel.add(createPanelLine(fieldWindspeed, 10, String.valueOf(map.getWindspeed()), "mapWindSpeed"));
+        panel.add(createPanelLine(fieldWindDirection, 10, String.valueOf(map.getWinddir()), "mapWindDirection"));
+        panel.add(createPanelLine(fieldSkySetting, 10, String.valueOf(map.getSky()), "mapSkySetting"));
 
         return panel;
     }
@@ -269,12 +269,12 @@
     private JPanel createTilePathPanel(final MapArchObject map) {
         final JPanel panel = new JPanel(new GridLayout(IGUIConstants.DIRECTIONS, 2));
 
-        panel.add(createPanelLine(fieldTilePath[0] = new JTextField(), 16, map.getTilePath(0), "North"));
-        panel.add(createPanelLine(fieldTilePath[1] = new JTextField(), 16, map.getTilePath(1), "East"));
-        panel.add(createPanelLine(fieldTilePath[2] = new JTextField(), 16, map.getTilePath(2), "South"));
-        panel.add(createPanelLine(fieldTilePath[3] = new JTextField(), 16, map.getTilePath(3), "West"));
-        panel.add(createPanelLine(fieldTilePath[4] = new JTextField(), 16, map.getTilePath(4), "Top"));
-        panel.add(createPanelLine(fieldTilePath[5] = new JTextField(), 16, map.getTilePath(5), "Bottom"));
+        panel.add(createPanelLine(fieldTilePath[0] = new JTextField(), 16, map.getTilePath(0), "mapNorth"));
+        panel.add(createPanelLine(fieldTilePath[1] = new JTextField(), 16, map.getTilePath(1), "mapEast"));
+        panel.add(createPanelLine(fieldTilePath[2] = new JTextField(), 16, map.getTilePath(2), "mapSouth"));
+        panel.add(createPanelLine(fieldTilePath[3] = new JTextField(), 16, map.getTilePath(3), "mapWest"));
+        panel.add(createPanelLine(fieldTilePath[4] = new JTextField(), 16, map.getTilePath(4), "mapTop"));
+        panel.add(createPanelLine(fieldTilePath[5] = new JTextField(), 16, map.getTilePath(5), "mapBottom"));
 
         return panel;
     }
@@ -311,7 +311,7 @@
      */
     private static JPanel createPanelLine(final JTextField textField, final int n, final String defaultText, final String labelKey) {
         final JPanel lineLayout = new JPanel(new FlowLayout(FlowLayout.RIGHT)); // layout for this line
-        lineLayout.add(new JLabel(labelKey));
+        lineLayout.add(new JLabel(ACTION_FACTORY.getString(labelKey)));
         textField.setColumns(n);
         textField.setText(defaultText);
         lineLayout.add(textField);
@@ -327,8 +327,8 @@
      * @return created panel
      */
     private static JPanel createPanelLine(final JFormattedTextField textField, final int n, final Number defaultValue, final String labelKey) {
-        final JPanel lineLayout = new JPanel(new FlowLayout(FlowLayout.RIGHT)); // layout for this line
-        lineLayout.add(new JLabel(labelKey));
+        final JPanel lineLayout = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+        lineLayout.add(new JLabel(ACTION_FACTORY.getString(labelKey)));
         textField.setColumns(n);
         textField.setValue(defaultValue);
         lineLayout.add(textField);
@@ -343,7 +343,7 @@
      * @return created Checkbox
      */
     private static JCheckBox createPanelCBox(final JCheckBox checkBox, final boolean state, final String labelKey) {
-        checkBox.setText(labelKey);
+        checkBox.setText(ACTION_FACTORY.getString(labelKey));
         checkBox.setSelected(state);
         return checkBox;
     }
@@ -395,25 +395,19 @@
 
             // Now do some sanity checks:
             if (width < 1 || height < 1) {
-                mainControl.showMessage(
-                        "Illegal Value",
-                        "Level dimensions must be greater than zero.");
+                ACTION_FACTORY.showMessageDialog(this, "mapErrorIllegalSize");
                 return false;
             }
-            if (t_darkness > 5) {
-                mainControl.showMessage(
-                        "Illegal Value",
-                        "Darkness level must be in range 0-5.");
+            if (t_darkness < 0 || t_darkness > 5) {
+                ACTION_FACTORY.showMessageDialog(this, "mapErrorInvalidDarkness");
                 return false;
             }
             if (mapName.getText().length() == 0) {
-                mainControl.showMessage(
-                        "missing Map Name",
-                        "You must specify a Map Name.");
+                ACTION_FACTORY.showMessageDialog(this, "mapErrorMissingMapName");
                 return false;
             }
         } catch (final GridderException e) {
-            mainControl.showMessage("Invalid Entry", e.getMessage());
+            ACTION_FACTORY.showMessageDialog(this, "mapErrorInvalidEntry", e.getMessage());
             return false;
         }
 

Modified: trunk/crossfire/src/cfeditor/messages.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages.properties	2006-12-04 19:17:14 UTC (rev 876)
+++ trunk/crossfire/src/cfeditor/messages.properties	2006-12-04 19:21:44 UTC (rev 877)
@@ -9,3 +9,23 @@
 mapWeatherTabTitle=Weather
 mapTextTabTitle=Description
 mapLoreTabTitle=Lore
+mapErrorInvalidDarkness.title=Invalid Value
+mapErrorInvalidDarkness.message=Darkness level must be in range 0-5.
+
+mapRegion=Region
+mapUniqueMap=Unique map
+mapOutdoorMap=Outdoor map
+mapNosmoothMap=Nosmooth map
+mapShopType=Shop type
+mapShopGreed=Greed
+mapUpperPriceLimit=Upper price limit
+mapLowerPriceLimit=Lower price limit
+mapShopRace=Race
+mapTemperature=Temperature
+mapPressure=Pressure
+mapHumidity=Humidity
+mapWindSpeed=Wind speed
+mapWindDirection=Wind direction
+mapSkySetting=Sky setting
+mapTop=Top
+mapBottom=Bottom

Modified: trunk/daimonin/src/daieditor/messages.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages.properties	2006-12-04 19:17:14 UTC (rev 876)
+++ trunk/daimonin/src/daieditor/messages.properties	2006-12-04 19:21:44 UTC (rev 877)
@@ -161,17 +161,9 @@
 loadDuplicateArch.message=Warning!\n\nDuplicate arch: ''{0}''\nFile: ''{1}''\nI will ignore this duplicate.
 
 mapMap=Map
-mapName=Name
 mapSound=Background sound
 mapOutdoor=Outdoor
-mapFixedReset=Fixed Reset
 mapOptions=Options
-mapEnterX=Enter X
-mapEnterY=Enter Y
-mapDifficulty=Difficulty
-mapDarkness=Darkness
-mapSwapTime=Swap Time
-mapResetTimeout=Reset Timeout
 mapNoSave=No Save
 mapNoMagic=No Magic
 mapNoPrayers=No Prayers
@@ -183,10 +175,6 @@
 mapInstantDeath=Instant Death
 mapPvP=PvP Enabled
 mapText=Map Text
-mapNorth=North
-mapEast=East
-mapSouth=South
-mapWest=West
 mapNorthEast=Northeast
 mapNorthWest=Northwest
 mapSouthEast=Southeast
@@ -212,12 +200,6 @@
 mapErrorFatalPath.message=Can''t get path\nFatal Error:\n{0}
 mapErrorFatalWrite.title=Can''t Write Map
 mapErrorFatalWrite.message=Can''t write map\nFatal Error:\n{0}
-mapErrorIllegalSize.title=Illegal Value
-mapErrorIllegalSize.message=Level dimensions must be greater than zero.
-mapErrorMissingMapName.title=Missing Map Name.
-mapErrorMissingMapName.message=You must specify a map name.
-mapErrorInvalidEntry.title=Invalid Entry
-mapErrorInvalidEntry.message=Invalid Entry:\n{0}
 mapErrorArchOutOfGrid.title=Arch out of map
 mapErrorArchOutOfGrid.message=Removing arch out of map bounds
 mapErrorDifferentSize.title=Different size

Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties	2006-12-04 19:17:14 UTC (rev 876)
+++ trunk/src/app/net/sf/gridarta/messages.properties	2006-12-04 19:21:44 UTC (rev 877)
@@ -42,6 +42,25 @@
 mapTilesTabTitle=Map tiles
 mapShrink.title=Confirm shrinking map
 mapShrink.message=You selected a new map size of {0,number,integer} \xD7 {1,number,integer}. If the map was\nresized in this way, some objects would get cut off and deleted.\nAre you really sure you want this?
+mapErrorMissingMapName.title=Missing Map Name
+mapErrorMissingMapName.message=You must specify a map name.
+mapErrorInvalidEntry.title=Invalid Entry
+mapErrorInvalidEntry.message=Invalid Entry:\n{0}
+mapErrorIllegalSize.title=Illegal Value
+mapErrorIllegalSize.message=Level dimensions must be greater than zero.
+# attribute fields:
+mapName=Name
+mapSwapTime=Swap Time
+mapFixedReset=Fixed Reset
+mapEnterX=Enter X
+mapEnterY=Enter Y
+mapDifficulty=Difficulty
+mapDarkness=Darkness
+mapResetTimeout=Reset Timeout
+mapNorth=North
+mapEast=East
+mapSouth=South
+mapWest=West
 
 # Other Strings
 mapWidth=Width


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

[Gridarta-commit] SF.net SVN: gridarta: [876] trunk/daimonin/src/daieditor/gui/map/ MapPropertiesDialog.java

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

Revision: 876
          http://svn.sourceforge.net/gridarta/?rev=876&view=rev
Author:   akirschbaum
Date:     2006-12-04 11:17:14 -0800 (Mon, 04 Dec 2006)

Log Message:
-----------
Remove useless comment.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java

Modified: trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java	2006-12-04 00:28:54 UTC (rev 875)
+++ trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java	2006-12-04 19:17:14 UTC (rev 876)
@@ -350,8 +350,8 @@
      * @return created panel
      */
     private static JPanel createPanelLine(final JFormattedTextField textField, final int n, final int defaultValue, final String labelKey) {
-        final JPanel lineLayout = new JPanel(new FlowLayout(FlowLayout.RIGHT)); // layout for this line
-        lineLayout.add(new JLabel(ACTION_FACTORY.getString(labelKey)));  // create label (attr. name)
+        final JPanel lineLayout = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+        lineLayout.add(new JLabel(ACTION_FACTORY.getString(labelKey)));
         textField.setColumns(n);
         textField.setValue(defaultValue);
         lineLayout.add(textField);


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

[Gridarta-commit] SF.net SVN: gridarta: [875] trunk/crossfire/src/cfeditor

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

Revision: 875
          http://svn.sourceforge.net/gridarta/?rev=875&view=rev
Author:   akirschbaum
Date:     2006-12-03 16:28:54 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Replace x/y coordinate by Point.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/AutojoinList.java
    trunk/crossfire/src/cfeditor/map/DefaultMapModel.java

Modified: trunk/crossfire/src/cfeditor/AutojoinList.java
===================================================================
--- trunk/crossfire/src/cfeditor/AutojoinList.java	2006-12-04 00:21:18 UTC (rev 874)
+++ trunk/crossfire/src/cfeditor/AutojoinList.java	2006-12-04 00:28:54 UTC (rev 875)
@@ -189,45 +189,44 @@
      * archetype name of the correct arch to be inserted is returned.
      * This method must be called from the appropriate element of the
      * AutojoinList, best use the link from the default arch.
-     * @param x   Location of the insert point on the map
-     * @param y   Location of the insert point on the map
+     * @param point Location of the insert point on the map
      * @param map Data model of the map
-     * @return the archetype name of the (default) arch to be inserted at x, y
-     *         <code>null</code> if there's already an arch of this list on x, y
+     * @return the archetype name of the (default) arch to be inserted at point
+     *         <code>null</code> if there's already an arch of this list on point
      */
-    public String joinInsert(final MapModel map, final int x, final int y) {
+    public String joinInsert(final MapModel map, final Point point) {
         int newIndex = 0;      // return value, see above
 
-        // if there already is an arch of this list at x, y -> abort
-        if (findArchOfJoinlist(map, x, y) != null) {
+        // if there already is an arch of this list at point -> abort
+        if (findArchOfJoinlist(map, point) != null) {
             return null; // we don't want same arches over each other
         }
 
         // now do the joining in all four directions:
         GameObject arch;
-        if (map.isPointValid(new Point(x, y - 1))) {
-            if ((arch = findArchOfJoinlist(map, x, y - 1)) != null) {
+        if (map.isPointValid(new Point(point.x, point.y - 1))) {
+            if ((arch = findArchOfJoinlist(map, new Point(point.x, point.y - 1))) != null) {
                 newIndex = addDir(newIndex, NORTH);
                 connectArch(arch, archnames[addDir(getIndex(arch.getArchetypeName()), SOUTH)]);
             }
         }
 
-        if (map.isPointValid(new Point(x + 1, y))) {
-            if ((arch = findArchOfJoinlist(map, x + 1, y)) != null) {
+        if (map.isPointValid(new Point(point.x + 1, point.y))) {
+            if ((arch = findArchOfJoinlist(map, new Point(point.x + 1, point.y))) != null) {
                 newIndex = addDir(newIndex, EAST);
                 connectArch(arch, archnames[addDir(getIndex(arch.getArchetypeName()), WEST)]);
             }
         }
 
-        if (map.isPointValid(new Point(x, y + 1))) {
-            if ((arch = findArchOfJoinlist(map, x, y + 1)) != null) {
+        if (map.isPointValid(new Point(point.x, point.y + 1))) {
+            if ((arch = findArchOfJoinlist(map, new Point(point.x, point.y + 1))) != null) {
                 newIndex = addDir(newIndex, SOUTH);
                 connectArch(arch, archnames[addDir(getIndex(arch.getArchetypeName()), NORTH)]);
             }
         }
 
-        if (map.isPointValid(new Point(x - 1, y))) {
-            if ((arch = findArchOfJoinlist(map, x - 1, y)) != null) {
+        if (map.isPointValid(new Point(point.x - 1, point.y))) {
+            if ((arch = findArchOfJoinlist(map, new Point(point.x - 1, point.y))) != null) {
                 newIndex = addDir(newIndex, WEST);
                 connectArch(arch, archnames[addDir(getIndex(arch.getArchetypeName()), EAST)]);
             }
@@ -241,34 +240,33 @@
      * All arches around the insert point get adjusted.
      * This method must be called from the appropriate element of the
      * AutojoinList, best use the link from the default arch.
-     * @param x   Location of the insert point on the map
-     * @param y   Location of the insert point on the map
+     * @param point Location of the insert point on the map
      * @param map Data model of the map
      */
-    public void joinDelete(final MapModel map, final int x, final int y) {
+    public void joinDelete(final MapModel map, final Point point) {
         GameObject arch; // temp. arch
 
         // do the joining in all four directions:
-        if (map.isPointValid(new Point(x, y - 1))) {
-            if ((arch = findArchOfJoinlist(map, x, y - 1)) != null) {
+        if (map.isPointValid(new Point(point.x, point.y - 1))) {
+            if ((arch = findArchOfJoinlist(map, new Point(point.x, point.y - 1))) != null) {
                 connectArch(arch, archnames[removeDir(getIndex(arch.getArchetypeName()), SOUTH)]);
             }
         }
 
-        if (map.isPointValid(new Point(x + 1, y))) {
-            if ((arch = findArchOfJoinlist(map, x + 1, y)) != null) {
+        if (map.isPointValid(new Point(point.x + 1, point.y))) {
+            if ((arch = findArchOfJoinlist(map, new Point(point.x + 1, point.y))) != null) {
                 connectArch(arch, archnames[removeDir(getIndex(arch.getArchetypeName()), WEST)]);
             }
         }
 
-        if (map.isPointValid(new Point(x, y + 1))) {
-            if ((arch = findArchOfJoinlist(map, x, y + 1)) != null) {
+        if (map.isPointValid(new Point(point.x, point.y + 1))) {
+            if ((arch = findArchOfJoinlist(map, new Point(point.x, point.y + 1))) != null) {
                 connectArch(arch, archnames[removeDir(getIndex(arch.getArchetypeName()), NORTH)]);
             }
         }
 
-        if (map.isPointValid(new Point(x - 1, y))) {
-            if ((arch = findArchOfJoinlist(map, x - 1, y)) != null) {
+        if (map.isPointValid(new Point(point.x - 1, point.y))) {
+            if ((arch = findArchOfJoinlist(map, new Point(point.x - 1, point.y))) != null) {
                 connectArch(arch, archnames[removeDir(getIndex(arch.getArchetypeName()), EAST)]);
             }
         }
@@ -323,16 +321,15 @@
     }
 
     /**
-     * Looks for an arch at map-position (x, y) which is part
+     * Looks for an arch at map-position point which is part
      * of this AutojoinList.
      * @param map the data model of the map
-     * @param x   location to search
-     * @param y   location to search
+     * @param point location to search
      * @return arch which is part of this joinlist, null if no such arch exists
      */
-    @Nullable private GameObject findArchOfJoinlist(final MapModel map, final int x, final int y) {
+    @Nullable private GameObject findArchOfJoinlist(final MapModel map, final Point point) {
         // we look through the arches at the given location (top to bottom):
-        for (final GameObject tmpArch : map.getMapSquare(new Point(x, y)).reverse()) {
+        for (final GameObject tmpArch : map.getMapSquare(point).reverse()) {
             if (stack.getArchetype(tmpArch.getArchetypeName()).getJoinList() == this) {
                 return tmpArch; // we found an arch
             }

Modified: trunk/crossfire/src/cfeditor/map/DefaultMapModel.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-12-04 00:21:18 UTC (rev 874)
+++ trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-12-04 00:28:54 UTC (rev 875)
@@ -246,7 +246,7 @@
         if (mainControl.getAutojoin() && join == JOIN_ENABLE && mainControl.getJoinlist() != null
                 && newarch.getJoinList() != null && !newarch.isMulti()) {
             // do autojoining if enabled
-            archName = newarch.getJoinList().joinInsert(this, pos.x, pos.y);
+            archName = newarch.getJoinList().joinInsert(this, pos);
             if (archName == null) {
                 return false; // only one autojoin type per square allowed
             }
@@ -475,7 +475,7 @@
                 if (mainControl.getAutojoin() && join == JOIN_ENABLE && mainControl.getJoinlist() != null
                         && temp.getJoinList() != null && !temp.isMulti()) {
                     // remove connections to the deleted arch
-                    temp.getJoinList().joinDelete(this, pos.x, pos.y);
+                    temp.getJoinList().joinDelete(this, pos);
                 }
 
                 break;


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

[Gridarta-commit] SF.net SVN: gridarta: [874] trunk/crossfire/src/cfeditor

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

Revision: 874
          http://svn.sourceforge.net/gridarta/?rev=874&view=rev
Author:   akirschbaum
Date:     2006-12-03 16:21:18 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Replace x/y coordinate by Point.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMapViewBasic.java
    trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java

Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-12-04 00:19:41 UTC (rev 873)
+++ trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-12-04 00:21:18 UTC (rev 874)
@@ -491,9 +491,9 @@
         return mapMousePos;
     }
 
-    public void setMapMousePos(final int x, final int y) {
-        mapMousePos.x = x;
-        mapMousePos.y = y;
+    public void setMapMousePos(final Point point) {
+        mapMousePos.x = point.x;
+        mapMousePos.y = point.y;
     }
 
     /** The mouse listener for the view. */

Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-04 00:19:41 UTC (rev 873)
+++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-04 00:21:18 UTC (rev 874)
@@ -474,13 +474,13 @@
             renderTransform.inverseTransform(point, point);
         } catch (final NoninvertibleTransformException e) {
         }
-        mapViewBasic.setMapMousePos(-1, -1);
+        mapViewBasic.setMapMousePos(new Point(-1, -1));
 
         final Point mpoint = new Point();
         mpoint.x = mapViewBasic.getMapMousePos().x;
         mpoint.y = mapViewBasic.getMapMousePos().y;
         if (point.x >= 0 && point.x < mapViewBasic.getMapSize().getWidth() * 32 && point.y >= 0 && point.y < mapViewBasic.getMapSize().getHeight() * 32) {
-            mapViewBasic.setMapMousePos(point.x / 32, point.y / 32);
+            mapViewBasic.setMapMousePos(new Point(point.x / 32, point.y / 32));
         }
 
         mpoint.x = mapViewBasic.getMapMousePos().x;


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

[Gridarta-commit] SF.net SVN: gridarta: [873] trunk/crossfire/src/cfeditor

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

Revision: 873
          http://svn.sourceforge.net/gridarta/?rev=873&view=rev
Author:   akirschbaum
Date:     2006-12-03 16:19:41 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Replace x/y coordinate by Point.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/crossfire/src/cfeditor/CMapViewBasic.java
    trunk/crossfire/src/cfeditor/MapViewIFrame.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2006-12-04 00:16:10 UTC (rev 872)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2006-12-04 00:19:41 UTC (rev 873)
@@ -1249,7 +1249,7 @@
             if (exitPos.x == 0 && exitPos.y == 0) {
                 showMessage("Destination Invalid", "This exit points nowhere.");
             } else if (currentMap.isPointValid(exitPos)) {
-                currentMap.getMapViewFrame().setHotspot(exitPos.x, exitPos.y);
+                currentMap.getMapViewFrame().setHotspot(exitPos);
             } else {
                 showMessage("Destination Invalid", "The destination of this exit is outside the map.");
             }
@@ -1290,7 +1290,7 @@
                 exitPos.x = currentMap.getMapModel().getMapArchObject().getEnterX();
                 exitPos.y = currentMap.getMapModel().getMapArchObject().getEnterY();
             }
-            currentMap.getMapViewFrame().setHotspot(exitPos.x, exitPos.y);  // set hotspot
+            currentMap.getMapViewFrame().setHotspot(exitPos);  // set hotspot
 
             // Update the main view so the new map instantly pops up.
             mainView.update(mainView.getGraphics());

Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-12-04 00:16:10 UTC (rev 872)
+++ trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-12-04 00:19:41 UTC (rev 873)
@@ -256,16 +256,16 @@
      * @param dx x-coordinate
      * @param dy y-coordinate
      */
-    public void setHotspot(final int dx, final int dy) {
+    public void setHotspot(final Point point) {
         // set the highlighted spot:
-        mapMouseRightPos.x = dx;
-        mapMouseRightPos.y = dy;
+        mapMouseRightPos.x = point.x;
+        mapMouseRightPos.y = point.y;
         mapMouseRightOff.x = 0;
         mapMouseRightOff.y = 0;
 
         // set scroll position accordingly to center on target
-        final Rectangle scrollto = new Rectangle((dx + 1) * 32 + 16 - getViewport().getViewRect().width / 2,
-                (dy + 1) * 32 + 16 - getViewport().getViewRect().height / 2,
+        final Rectangle scrollto = new Rectangle((point.x + 1) * 32 + 16 - getViewport().getViewRect().width / 2,
+                (point.y + 1) * 32 + 16 - getViewport().getViewRect().height / 2,
                 getViewport().getViewRect().width,
                 getViewport().getViewRect().height);
         if (scrollto.x + scrollto.width > getViewport().getViewSize().width) {

Modified: trunk/crossfire/src/cfeditor/MapViewIFrame.java
===================================================================
--- trunk/crossfire/src/cfeditor/MapViewIFrame.java	2006-12-04 00:16:10 UTC (rev 872)
+++ trunk/crossfire/src/cfeditor/MapViewIFrame.java	2006-12-04 00:19:41 UTC (rev 873)
@@ -170,8 +170,8 @@
         return view.getHighlightOffset();
     }
 
-    public void setHotspot(final int dx, final int dy) {
-        view.setHotspot(dx, dy);
+    public void setHotspot(final Point point) {
+        view.setHotspot(point);
     }
 
     public void printFullImage(final String filename) throws IOException {


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

[Gridarta-commit] SF.net SVN: gridarta: [872] trunk/daimonin/src/daieditor

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

Revision: 872
          http://svn.sourceforge.net/gridarta/?rev=872&view=rev
Author:   akirschbaum
Date:     2006-12-03 16:16:10 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Replace x/y coordinate by Point.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMapTileList.java

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2006-12-04 00:10:39 UTC (rev 871)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2006-12-04 00:16:10 UTC (rev 872)
@@ -785,8 +785,8 @@
         mainView.showArchPanelQuickObject(gameObject);
     }
 
-    boolean insertArchToMap(final GameObject newarch, final String archname, final GameObject next, final int mapx, final int mapy) {
-        return currentMap.getMapModel().insertArchToMap(newarch, archname, next, new Point(mapx, mapy));
+    boolean insertArchToMap(final GameObject newarch, final String archname, final GameObject next, final Point point) {
+        return currentMap.getMapModel().insertArchToMap(newarch, archname, next, point);
     }
 
     /**

Modified: trunk/daimonin/src/daieditor/CMapTileList.java
===================================================================
--- trunk/daimonin/src/daieditor/CMapTileList.java	2006-12-04 00:10:39 UTC (rev 871)
+++ trunk/daimonin/src/daieditor/CMapTileList.java	2006-12-04 00:16:10 UTC (rev 872)
@@ -32,6 +32,7 @@
 import java.awt.Component;
 import java.awt.GridLayout;
 import java.awt.Insets;
+import java.awt.Point;
 import java.awt.Rectangle;
 import static java.awt.event.InputEvent.SHIFT_MASK;
 import java.awt.event.MouseEvent;
@@ -207,10 +208,10 @@
 
                 final int listIndex = getListIndex(e);
                 if (listIndex >= list.getModel().getSize()) {
-                    mainControl.insertArchToMap(newarch, archname, null, currentSquare.getMapX(), currentSquare.getMapY());
+                    mainControl.insertArchToMap(newarch, archname, null, new Point(currentSquare.getMapX(), currentSquare.getMapY()));
                 } else {
                     final GameObject entry = (GameObject) model.getElementAt(listIndex);
-                    mainControl.insertArchToMap(newarch, archname, entry, currentSquare.getMapX(), currentSquare.getMapY());
+                    mainControl.insertArchToMap(newarch, archname, entry, new Point(currentSquare.getMapX(), currentSquare.getMapY()));
                 }
 
                 // refresh


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

[Gridarta-commit] SF.net SVN: gridarta: [871] trunk/crossfire/src/cfeditor

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

Revision: 871
          http://svn.sourceforge.net/gridarta/?rev=871&view=rev
Author:   akirschbaum
Date:     2006-12-03 16:10:39 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Replace x/y coordinate by Point.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMapViewBasic.java
    trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
    trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java

Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-12-04 00:09:26 UTC (rev 870)
+++ trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-12-04 00:10:39 UTC (rev 871)
@@ -778,7 +778,7 @@
                 }
 
                 // paint the highlight-icon
-                renderer.setHighlightTile(/*((JComponent)renderer).getGraphics(), */mapLoc.x, mapLoc.y);
+                renderer.setHighlightTile(/*((JComponent)renderer).getGraphics(), */mapLoc);
 
                 if (renderer.isPickmap()) {
                     final GameObject arch = mapControl.getBottomArchObject(mapLoc);

Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-04 00:09:26 UTC (rev 870)
+++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-04 00:10:39 UTC (rev 871)
@@ -383,11 +383,11 @@
     }
 
 
-    public void setHighlightTile(final int x, final int y) {
+    public void setHighlightTile(final Point point) {
         if (isPickmap()) {
-            paintHighlightTile(getGraphics(), new Point(x, y));
+            paintHighlightTile(getGraphics(), point);
         } else {
-            paintHighlightTile(backBuffer.getGraphics(), new Point(x, y));
+            paintHighlightTile(backBuffer.getGraphics(), point);
             repaint();
         }
     }

Modified: trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java	2006-12-04 00:09:26 UTC (rev 870)
+++ trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java	2006-12-04 00:10:39 UTC (rev 871)
@@ -43,7 +43,7 @@
 
     void modelChanged();
 
-    void setHighlightTile(int x, int y);
+    void setHighlightTile(Point point);
 
     boolean resizeBackBuffer();
 


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

[Gridarta-commit] SF.net SVN: gridarta: [870] trunk/crossfire/src/cfeditor/gui/map

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

Revision: 870
          http://svn.sourceforge.net/gridarta/?rev=870&view=rev
Author:   akirschbaum
Date:     2006-12-03 16:09:26 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Replace x/y coordinate by Point.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
    trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java

Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-04 00:07:06 UTC (rev 869)
+++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-04 00:09:26 UTC (rev 870)
@@ -379,15 +379,15 @@
         }
 
         // if tile is highlighted, draw the highlight icon
-        paintHighlightTile(grfx, point.x, point.y);
+        paintHighlightTile(grfx, point);
     }
 
 
     public void setHighlightTile(final int x, final int y) {
         if (isPickmap()) {
-            paintHighlightTile(getGraphics(), x, y);
+            paintHighlightTile(getGraphics(), new Point(x, y));
         } else {
-            paintHighlightTile(backBuffer.getGraphics(), x, y);
+            paintHighlightTile(backBuffer.getGraphics(), new Point(x, y));
             repaint();
         }
     }
@@ -399,7 +399,7 @@
      * @param y    map coords of the square
      * @param grfx graphics context to draw in
      */
-    public void paintHighlightTile(final Graphics grfx, final int x, final int y) {
+    public void paintHighlightTile(final Graphics grfx, final Point point) {
         // if tile is highlighted, draw the highlight icon:
         if (mapViewBasic.isHighlight() && mapViewBasic.getMapMouseRightPos().y != -1 && mapViewBasic.getMapMouseRightPos().x != -1) {
             // get rect. coords of highlighted area: top(left) and bot(tomright) corner
@@ -409,8 +409,8 @@
             final int boty = Math.max(mapViewBasic.getMapMouseRightPos().y, mapViewBasic.getMapMouseRightPos().y + mapViewBasic.getHighlightOffset().y);
 
             // Highlight the selected square
-            if (x >= topx && x <= botx && y >= topy && y <= boty) {
-                mainControl.getMapSelIcon().paintIcon(this, grfx, x * 32, y * 32);
+            if (point.x >= topx && point.x <= botx && point.y >= topy && point.y <= boty) {
+                mainControl.getMapSelIcon().paintIcon(this, grfx, point.x * 32, point.y * 32);
             }
         }
     }

Modified: trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java	2006-12-04 00:07:06 UTC (rev 869)
+++ trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java	2006-12-04 00:09:26 UTC (rev 870)
@@ -41,8 +41,6 @@
 
     boolean isPickmap();
 
-    void paintHighlightTile(Graphics grfx, int x, int y);
-
     void modelChanged();
 
     void setHighlightTile(int x, int y);


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

[Gridarta-commit] SF.net SVN: gridarta: [869] trunk/crossfire/src/cfeditor

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

Revision: 869
          http://svn.sourceforge.net/gridarta/?rev=869&view=rev
Author:   akirschbaum
Date:     2006-12-03 16:07:06 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Replace x/y coordinate by Point.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMapViewBasic.java
    trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
    trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java

Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-12-04 00:02:05 UTC (rev 868)
+++ trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-12-04 00:07:06 UTC (rev 869)
@@ -456,7 +456,7 @@
                 for (int i = tile.length - 1; i >= 0; i--) {
                     // paint the tiles
                     if (mapControl.getMapModel().isPointValid(tile[i])) {
-                        renderer.paintTile(tile[i].x, tile[i].y);
+                        renderer.paintTile(tile[i]);
                     }
                     if (log.isDebugEnabled()) {
                         log.debug("redraw: (" + tile[i].x + ", " + tile[i].y + ")");

Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-04 00:02:05 UTC (rev 868)
+++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-04 00:07:06 UTC (rev 869)
@@ -303,7 +303,7 @@
      * @param x map coordinates for the tile to draw
      * @param y map coordinates for the tile to draw
      */
-    public void paintTile(final int x, final int y) {
+    public void paintTile(final Point point) {
         final Graphics grfx;
         if (isPickmap()) {
             grfx = getGraphics(); // graphics context for drawing in the mapview
@@ -316,18 +316,18 @@
         final CFilterControl filter = mainControl.getFilterControl();
         filter.newSquare();
         // first, draw the object's faces:
-        if (!mapControl.getMapModel().containsArchObject(new Point(x, y))) {
+        if (!mapControl.getMapModel().containsArchObject(point)) {
             // draw the empty-tile icon (direcly to the mapview)
             if (isPickmap) {
                 grfx.setColor(IGUIConstants.BG_COLOR);
-                grfx.fillRect(x * 32 + borderOffset, y * 32 + borderOffset, 32, 32);
+                grfx.fillRect(point.x * 32 + borderOffset, point.y * 32 + borderOffset, 32, 32);
             } else {
-                mainControl.getUnknownTileIcon().paintIcon(this, grfx, x * 32, y * 32);
+                mainControl.getUnknownTileIcon().paintIcon(this, grfx, point.x * 32, point.y * 32);
             }
         } else {
             tmpGrfx.fillRect(0, 0, 32, 32);
             // loop through all arches on that square and draw em
-            for (final GameObject node : mapControl.getMapModel().getMapSquare(new Point(x, y))) {
+            for (final GameObject node : mapControl.getMapModel().getMapSquare(point)) {
                 filter.objectInSquare(node);
                 if (!filter.canShow(node)) {
                     continue;
@@ -365,21 +365,21 @@
         }
         // We have been drawing to the tmp. buffer, now convert it to
         // an ImageIcon and paint it into the mapview:
-        if (mapControl.getMapModel().containsArchObject(new Point(x, y))) {
+        if (mapControl.getMapModel().containsArchObject(point)) {
             tmpIcon.setImage(tmpImage);
-            tmpIcon.paintIcon(this, grfx, x * 32, y * 32);
+            tmpIcon.paintIcon(this, grfx, point.x * 32, point.y * 32);
         }
 
         // if grid is active, draw grid lines (right and bottom)
         if (mapViewBasic.isGridVisible()) {
             // horizontal:
-            grfx.drawLine(x * 32, y * 32, x * 32, y * 32 + 32);
+            grfx.drawLine(point.x * 32, point.y * 32, point.x * 32, point.y * 32 + 32);
             // vertical:
-            grfx.drawLine(x * 32, y * 32, x * 32 + 32, y * 32);
+            grfx.drawLine(point.x * 32, point.y * 32, point.x * 32 + 32, point.y * 32);
         }
 
         // if tile is highlighted, draw the highlight icon
-        paintHighlightTile(grfx, x, y);
+        paintHighlightTile(grfx, point.x, point.y);
     }
 
 

Modified: trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java	2006-12-04 00:02:05 UTC (rev 868)
+++ trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java	2006-12-04 00:07:06 UTC (rev 869)
@@ -35,7 +35,7 @@
 
     BufferedImage getFullImage();
 
-    void paintTile(int x, int y);
+    void paintTile(Point point);
 
     Point getTileLocationAt(Point point);
 


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

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

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

Revision: 868
          http://svn.sourceforge.net/gridarta/?rev=868&view=rev
Author:   akirschbaum
Date:     2006-12-03 16:02:05 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Whitespace and comment changes.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java
    trunk/daimonin/src/daieditor/gui/map/LevelRenderer.java

Modified: trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java	2006-12-03 23:55:55 UTC (rev 867)
+++ trunk/crossfire/src/cfeditor/gui/map/LevelRenderer.java	2006-12-04 00:02:05 UTC (rev 868)
@@ -50,4 +50,5 @@
     boolean resizeBackBuffer();
 
     void freeBackBuffer();
-}
+
+} // interface LevelRenderer

Modified: trunk/daimonin/src/daieditor/gui/map/LevelRenderer.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/LevelRenderer.java	2006-12-03 23:55:55 UTC (rev 867)
+++ trunk/daimonin/src/daieditor/gui/map/LevelRenderer.java	2006-12-04 00:02:05 UTC (rev 868)
@@ -25,5 +25,7 @@
 import javax.swing.JComponent;
 
 public abstract class LevelRenderer extends JComponent {
+
     public abstract BufferedImage getFullImage();
+
 } // class LevelRenderer


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

[Gridarta-commit] SF.net SVN: gridarta: [867] trunk/crossfire/src/cfeditor/CMapViewBasic.java

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

Revision: 867
          http://svn.sourceforge.net/gridarta/?rev=867&view=rev
Author:   akirschbaum
Date:     2006-12-03 15:55:55 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Remove deprecated method.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMapViewBasic.java

Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-12-03 23:54:08 UTC (rev 866)
+++ trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-12-03 23:55:55 UTC (rev 867)
@@ -899,10 +899,6 @@
             return needRedraw;
         }
 
-        @Deprecated private Point[] insertMapArchToPickmap(final int mapx, final int mapy) {
-            return insertMapArchToPickmap(new Point(mapx, mapy));
-        }
-
         /**
          * This method is only called for pickmaps. Take the currently
          * highlighted arch on the map (if any) and insert it on this pickmap.


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

[Gridarta-commit] SF.net SVN: gridarta: [866] trunk/crossfire/src/cfeditor

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

Revision: 866
          http://svn.sourceforge.net/gridarta/?rev=866&view=rev
Author:   akirschbaum
Date:     2006-12-03 15:54:08 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Remove deprecated method.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMapViewBasic.java
    trunk/crossfire/src/cfeditor/MapViewIFrame.java

Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-12-03 23:52:46 UTC (rev 865)
+++ trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-12-03 23:54:08 UTC (rev 866)
@@ -331,10 +331,6 @@
         frame.updateTitle();
     }
 
-    @Deprecated void setMapAndArchPosition(final int archid, final int x, final int y) {
-        setMapAndArchPosition(archid, new Point(x, y));
-    }
-
     void setMapAndArchPosition(final int archid, final Point pos) {
         mapMouseRightPos.setLocation(pos);
         if (pos.x == -1 || pos.y == -1) {

Modified: trunk/crossfire/src/cfeditor/MapViewIFrame.java
===================================================================
--- trunk/crossfire/src/cfeditor/MapViewIFrame.java	2006-12-03 23:52:46 UTC (rev 865)
+++ trunk/crossfire/src/cfeditor/MapViewIFrame.java	2006-12-03 23:54:08 UTC (rev 866)
@@ -190,10 +190,6 @@
         view.changedFlagNotify();
     }
 
-    @Deprecated void setMapAndArchPosition(final int archid, final int x, final int y) {
-        setMapAndArchPosition(archid, new Point(x, y));
-    }
-
     void setMapAndArchPosition(final int archid, final Point pos) {
         view.setMapAndArchPosition(archid, pos);
     }


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

[Gridarta-commit] SF.net SVN: gridarta: [865] trunk/crossfire/src/cfeditor/map/ DefaultMapModel.java

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

Revision: 865
          http://svn.sourceforge.net/gridarta/?rev=865&view=rev
Author:   akirschbaum
Date:     2006-12-03 15:52:46 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Remove deprecated method.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/map/DefaultMapModel.java

Modified: trunk/crossfire/src/cfeditor/map/DefaultMapModel.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-12-03 23:52:13 UTC (rev 864)
+++ trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-12-03 23:52:46 UTC (rev 865)
@@ -166,14 +166,6 @@
      * Return the bottom {@link GameObject} in the given location.
      * @return the GameObject, or null if no object is present
      */
-    @Deprecated @Nullable public GameObject getBottomArchObject(final int x, final int y) {
-        return getBottomArchObject(new Point(x, y));
-    }
-
-    /**
-     * Return the bottom {@link GameObject} in the given location.
-     * @return the GameObject, or null if no object is present
-     */
     @Nullable public GameObject getBottomArchObject(final Point pos) {
         if (!isPointValid(pos)) {
             return 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: [864] trunk/crossfire/src/cfeditor/map/ DefaultMapModel.java

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

Revision: 864
          http://svn.sourceforge.net/gridarta/?rev=864&view=rev
Author:   akirschbaum
Date:     2006-12-03 15:52:13 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Remove deprecated method.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/map/DefaultMapModel.java

Modified: trunk/crossfire/src/cfeditor/map/DefaultMapModel.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-12-03 23:51:19 UTC (rev 863)
+++ trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-12-03 23:52:13 UTC (rev 864)
@@ -182,10 +182,6 @@
         return mapGrid[pos.x][pos.y].getFirst();
     }
 
-    @Deprecated public GameObject getTopArchObject(final int x, final int y) {
-        return getTopArchObject(new Point(x, y));
-    }
-
     /**
      * Return the topmost {@link GameObject} in the given location.
      * @return the GameObject, or null if no object is present


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

[Gridarta-commit] SF.net SVN: gridarta: [863] trunk/crossfire/src/cfeditor

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

Revision: 863
          http://svn.sourceforge.net/gridarta/?rev=863&view=rev
Author:   akirschbaum
Date:     2006-12-03 15:51:19 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Remove deprecated method.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
    trunk/crossfire/src/cfeditor/map/DefaultMapModel.java
    trunk/crossfire/src/cfeditor/map/MapModel.java

Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-03 23:49:00 UTC (rev 862)
+++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-03 23:51:19 UTC (rev 863)
@@ -216,7 +216,7 @@
         for (int y = 0; y < mapViewBasic.getMapSize().getHeight(); y++) {
             for (int x = 0; x < mapViewBasic.getMapSize().getWidth(); x++) {
                 filter.newSquare();
-                if (!mapControl.getMapModel().containsArchObject(x, y)) {
+                if (!mapControl.getMapModel().containsArchObject(new Point(x, y))) {
                     // empty square
                     if (isPickmap) {
                         grfx.fillRect(x * 32 + borderOffset, y * 32 + borderOffset, 32, 32);
@@ -316,7 +316,7 @@
         final CFilterControl filter = mainControl.getFilterControl();
         filter.newSquare();
         // first, draw the object's faces:
-        if (!mapControl.getMapModel().containsArchObject(x, y)) {
+        if (!mapControl.getMapModel().containsArchObject(new Point(x, y))) {
             // draw the empty-tile icon (direcly to the mapview)
             if (isPickmap) {
                 grfx.setColor(IGUIConstants.BG_COLOR);
@@ -365,7 +365,7 @@
         }
         // We have been drawing to the tmp. buffer, now convert it to
         // an ImageIcon and paint it into the mapview:
-        if (mapControl.getMapModel().containsArchObject(x, y)) {
+        if (mapControl.getMapModel().containsArchObject(new Point(x, y))) {
             tmpIcon.setImage(tmpImage);
             tmpIcon.paintIcon(this, grfx, x * 32, y * 32);
         }

Modified: trunk/crossfire/src/cfeditor/map/DefaultMapModel.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-12-03 23:49:00 UTC (rev 862)
+++ trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-12-03 23:51:19 UTC (rev 863)
@@ -199,11 +199,6 @@
     }
 
     /** Check whether a given location contains at least one GameObject. */
-    @Deprecated public boolean containsArchObject(final int x, final int y) {
-        return containsArchObject(new Point(x, y));
-    }
-
-    /** Check whether a given location contains at least one GameObject. */
     public boolean containsArchObject(final Point pos) {
         return isPointValid(pos) && !mapGrid[pos.x][pos.y].isEmpty();
     }

Modified: trunk/crossfire/src/cfeditor/map/MapModel.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/MapModel.java	2006-12-03 23:49:00 UTC (rev 862)
+++ trunk/crossfire/src/cfeditor/map/MapModel.java	2006-12-03 23:51:19 UTC (rev 863)
@@ -46,8 +46,6 @@
 
     void levelCloseNotify();
 
-    boolean containsArchObject(int x, int y);
-
     boolean containsArchObject(Point pos);
 
     String getMapName();


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

[Gridarta-commit] SF.net SVN: gridarta: [862] trunk/crossfire/src/cfeditor/map

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

Revision: 862
          http://svn.sourceforge.net/gridarta/?rev=862&view=rev
Author:   akirschbaum
Date:     2006-12-03 15:49:00 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Remove deprecated method.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/map/DefaultMapModel.java
    trunk/crossfire/src/cfeditor/map/MapModel.java

Modified: trunk/crossfire/src/cfeditor/map/DefaultMapModel.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-12-03 23:48:23 UTC (rev 861)
+++ trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-12-03 23:49:00 UTC (rev 862)
@@ -232,10 +232,6 @@
         return true;
     }
 
-    @Deprecated public boolean addArchToMap(final String archName, final int xx, final int yy, final boolean allowDouble, final boolean join, final boolean insertBelow) {
-        return addArchToMap(archName, new Point(xx, yy), allowDouble, join, insertBelow);
-    }
-
     /**
      * Add a new arch to the map. Including multi tile arches. This function
      * allows only to choose from the default arches (->archName).

Modified: trunk/crossfire/src/cfeditor/map/MapModel.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/MapModel.java	2006-12-03 23:48:23 UTC (rev 861)
+++ trunk/crossfire/src/cfeditor/map/MapModel.java	2006-12-03 23:49:00 UTC (rev 862)
@@ -30,7 +30,6 @@
      */
     boolean isMultiArchFittingToMap(String archname, Point pos, boolean allowDouble);
 
-    @Deprecated boolean addArchToMap(String archname, int xx, int yy, boolean allowDouble, boolean join, boolean insertBelow);
     boolean addArchToMap(String archname, Point pos, boolean allowDouble, boolean join, boolean insertBelow);
 
     boolean insertArchToMap(GameObject newarch, String archname, GameObject next, Point pos, boolean join);


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

[Gridarta-commit] SF.net SVN: gridarta: [861] trunk/crossfire/src/cfeditor/map

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

Revision: 861
          http://svn.sourceforge.net/gridarta/?rev=861&view=rev
Author:   akirschbaum
Date:     2006-12-03 15:48:23 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Remove deprecated method.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/map/DefaultMapModel.java
    trunk/crossfire/src/cfeditor/map/MapModel.java

Modified: trunk/crossfire/src/cfeditor/map/DefaultMapModel.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-12-03 23:47:34 UTC (rev 860)
+++ trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-12-03 23:48:23 UTC (rev 861)
@@ -307,9 +307,6 @@
         return true;
     }
 
-    @Deprecated public boolean insertArchToMap(final GameObject newarch, final String archName, final GameObject next, final int mapx, final int mapy, final boolean join) {
-        return insertArchToMap(newarch, archName, next, new Point(mapx, mapy), join);
-    }
     /**
      * Insert a new arch to the map at a specified position. This function
      * allows either to choose from the default arches (->archName) or to insert

Modified: trunk/crossfire/src/cfeditor/map/MapModel.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/MapModel.java	2006-12-03 23:47:34 UTC (rev 860)
+++ trunk/crossfire/src/cfeditor/map/MapModel.java	2006-12-03 23:48:23 UTC (rev 861)
@@ -33,7 +33,6 @@
     @Deprecated boolean addArchToMap(String archname, int xx, int yy, boolean allowDouble, boolean join, boolean insertBelow);
     boolean addArchToMap(String archname, Point pos, boolean allowDouble, boolean join, boolean insertBelow);
 
-    @Deprecated boolean insertArchToMap(GameObject newarch, String archname, GameObject next, int mapx, int mapy, boolean join);
     boolean insertArchToMap(GameObject newarch, String archname, GameObject next, Point pos, boolean join);
 
     void deleteMapArch(int id, Point pos, boolean refreshMap, boolean join);


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

[Gridarta-commit] SF.net SVN: gridarta: [860] trunk/crossfire/src/cfeditor/map

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

Revision: 860
          http://svn.sourceforge.net/gridarta/?rev=860&view=rev
Author:   akirschbaum
Date:     2006-12-03 15:47:34 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Remove deprecated method.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/map/DefaultMapModel.java
    trunk/crossfire/src/cfeditor/map/MapModel.java

Modified: trunk/crossfire/src/cfeditor/map/DefaultMapModel.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-12-03 23:46:54 UTC (rev 859)
+++ trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-12-03 23:47:34 UTC (rev 860)
@@ -478,10 +478,6 @@
         return null;
     }
 
-    @Deprecated public void deleteMapArch(final int id, final int xx, final int yy, final boolean refreshMap, final boolean join) {
-        deleteMapArch(id, new Point(xx, yy), refreshMap, join);
-    }
-
     /**
      * Delete an existing arch from the map. (If the specified arch doesn't
      * exist, nothing happens.) (This includes deletion of multiparts and

Modified: trunk/crossfire/src/cfeditor/map/MapModel.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/MapModel.java	2006-12-03 23:46:54 UTC (rev 859)
+++ trunk/crossfire/src/cfeditor/map/MapModel.java	2006-12-03 23:47:34 UTC (rev 860)
@@ -36,7 +36,6 @@
     @Deprecated boolean insertArchToMap(GameObject newarch, String archname, GameObject next, int mapx, int mapy, boolean join);
     boolean insertArchToMap(GameObject newarch, String archname, GameObject next, Point pos, boolean join);
 
-    @Deprecated void deleteMapArch(int id, int xx, int yy, boolean refreshMap, boolean join);
     void deleteMapArch(int id, Point pos, boolean refreshMap, boolean join);
 
     @Nullable GameObject getMapArch(int id, Point pos);


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