Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[5661] trunk
|
From: <aki...@us...> - 2008-11-02 18:15:29
|
Revision: 5661
http://gridarta.svn.sourceforge.net/gridarta/?rev=5661&view=rev
Author: akirschbaum
Date: 2008-11-02 18:15:26 +0000 (Sun, 02 Nov 2008)
Log Message:
-----------
Rename variable name.
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 2008-11-02 18:14:07 UTC (rev 5660)
+++ trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java 2008-11-02 18:15:26 UTC (rev 5661)
@@ -491,48 +491,47 @@
// now that all is well, write the new values into the map arch object
- final MapArchObject map = mapControl.getMapModel().getMapArchObject();
-
final MapModel<GameObject, MapArchObject, Archetype> mapModel = mapControl.getMapModel();
try {
mapModel.beginTransaction("Map properties"); // TODO: I18N/L10N
- map.beginTransaction();
+ final MapArchObject mapArchObject = mapModel.getMapArchObject();
+ mapArchObject.beginTransaction();
try {
final String mapNameString = mapName.getText();
mapModel.resizeMap(mapSize);
- map.setText(mapDescription.getText());
- map.setLore(mapLore.getText());
- map.setMapName(mapNameString);
+ mapArchObject.setText(mapDescription.getText());
+ mapArchObject.setLore(mapLore.getText());
+ mapArchObject.setMapName(mapNameString);
- map.setRegion(region);
- map.setEnterX(enterX);
- map.setEnterY(enterY);
- map.setResetTimeout(resetTimeout);
- map.setBackgroundMusic(backgroundMusic);
- map.setSwapTime(swapTime);
- map.setDifficulty(difficulty);
- map.setFixedReset(checkboxFixedReset.isSelected());
- map.setDarkness(darkness);
- map.setUnique(checkboxUnique.isSelected());
- map.setOutdoor(checkboxOutdoor.isSelected());
- map.setNosmooth(checkboxNosmooth.isSelected());
+ mapArchObject.setRegion(region);
+ mapArchObject.setEnterX(enterX);
+ mapArchObject.setEnterY(enterY);
+ mapArchObject.setResetTimeout(resetTimeout);
+ mapArchObject.setBackgroundMusic(backgroundMusic);
+ mapArchObject.setSwapTime(swapTime);
+ mapArchObject.setDifficulty(difficulty);
+ mapArchObject.setFixedReset(checkboxFixedReset.isSelected());
+ mapArchObject.setDarkness(darkness);
+ mapArchObject.setUnique(checkboxUnique.isSelected());
+ mapArchObject.setOutdoor(checkboxOutdoor.isSelected());
+ mapArchObject.setNosmooth(checkboxNosmooth.isSelected());
- map.setShopItems(shopItems);
- map.setShopRace(shopRace);
- map.setShopMin(shopMin);
- map.setShopMax(shopMax);
- map.setShopGreed(shopGreedd);
+ mapArchObject.setShopItems(shopItems);
+ mapArchObject.setShopRace(shopRace);
+ mapArchObject.setShopMin(shopMin);
+ mapArchObject.setShopMax(shopMax);
+ mapArchObject.setShopGreed(shopGreedd);
- map.setTemp(temperature);
- map.setPressure(pressure);
- map.setHumid(humidity);
- map.setWindspeed(windSpeed);
- map.setWinddir(windDirection);
- map.setSky(skySetting);
+ mapArchObject.setTemp(temperature);
+ mapArchObject.setPressure(pressure);
+ mapArchObject.setHumid(humidity);
+ mapArchObject.setWindspeed(windSpeed);
+ mapArchObject.setWinddir(windDirection);
+ mapArchObject.setSky(skySetting);
mapTilePane.modifyMapProperties();
} finally {
- map.endTransaction();
+ mapArchObject.endTransaction();
}
} finally {
mapModel.endTransaction();
Modified: trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java 2008-11-02 18:14:07 UTC (rev 5660)
+++ trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java 2008-11-02 18:15:26 UTC (rev 5661)
@@ -472,41 +472,40 @@
// now that all is well, write the new values into the map arch object
- final MapArchObject map = mapControl.getMapModel().getMapArchObject();
-
final MapModel<GameObject, MapArchObject, Archetype> mapModel = mapControl.getMapModel();
mapModel.beginTransaction("Map properties"); // TODO: I18N/L10N
try {
- map.beginTransaction();
+ final MapArchObject mapArchObject = mapModel.getMapArchObject();
+ mapArchObject.beginTransaction();
try {
final String mapNameString = mapName.getText() + (mapSound.getText().length() > 0 ? '§' + mapSound.getText() + "|0|-1" : "");
mapModel.resizeMap(mapSize);
- map.setText(mapDescription.getText());
- map.setMapName(mapNameString);
+ mapArchObject.setText(mapDescription.getText());
+ mapArchObject.setMapName(mapNameString);
- map.setEnterX(enterX);
- map.setEnterY(enterY);
- map.setResetTimeout(resetTimeout);
- map.setSwapTime(swapTime);
- map.setDifficulty(difficulty);
- map.setFixedReset(checkboxFixedReset.isSelected());
- map.setDarkness(darkness);
- map.setOutdoor(checkboxOutdoor.isSelected());
+ mapArchObject.setEnterX(enterX);
+ mapArchObject.setEnterY(enterY);
+ mapArchObject.setResetTimeout(resetTimeout);
+ mapArchObject.setSwapTime(swapTime);
+ mapArchObject.setDifficulty(difficulty);
+ mapArchObject.setFixedReset(checkboxFixedReset.isSelected());
+ mapArchObject.setDarkness(darkness);
+ mapArchObject.setOutdoor(checkboxOutdoor.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());
+ mapArchObject.setNoSave(checkboxNoSave.isSelected());
+ mapArchObject.setNoMagic(checkboxNoMagic.isSelected());
+ mapArchObject.setNoPriest(checkboxNoPriest.isSelected());
+ mapArchObject.setNoHarm(checkboxNoHarm.isSelected());
+ mapArchObject.setNoSummon(checkboxNoSummon.isSelected());
+ mapArchObject.setFixedLogin(checkboxNoFixedLogin.isSelected());
+ mapArchObject.setPermDeath(checkboxPermDeath.isSelected());
+ mapArchObject.setUltraDeath(checkboxUltraDeath.isSelected());
+ mapArchObject.setUltimateDeath(checkboxUltimateDeath.isSelected());
+ mapArchObject.setPvp(checkboxPvp.isSelected());
mapTilePane.modifyMapProperties();
} finally {
- map.endTransaction();
+ mapArchObject.endTransaction();
}
} finally {
mapModel.endTransaction();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
