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

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

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

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

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

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-03 17:56:16 UTC (rev 833)
+++ trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2006-12-03 19:04:08 UTC (rev 834)
@@ -169,15 +169,15 @@
                                 IGUIConstants.DIALOG_INSETS,
                                 IGUIConstants.DIALOG_INSETS)));
 
-        createPanelLine(mapPanel, mapName, 16, mapControl.getMapName(), "Name:   ");
-        createPanelLine(mapPanel, mapRegion, 16, map.getMapRegion(), "Region:   ");
+        mapPanel.add(createPanelLine(mapName, 16, mapControl.getMapName(), "Name:   "));
+        mapPanel.add(createPanelLine(mapRegion, 16, map.getMapRegion(), "Region:   "));
         final Size2D mapSize = mapControl.getMapSize();
-        createPanelLine(mapPanel, levelWidthField, 10, String.valueOf(mapSize.getWidth()), "Width:   ");
-        createPanelLine(mapPanel, levelHeightField, 10, String.valueOf(mapSize.getHeight()), "Height:   ");
-        createPanelCBox(mapPanel, checkboxUnique, map.isUnique(), " Unique Map");
-        createPanelCBox(mapPanel, checkboxOutdoor, map.isOutdoor(), " Outdoor Map");
-        createPanelCBox(mapPanel, checkboxFixedReset, map.isFixedReset(), " Fixed Reset");
-        createPanelCBox(mapPanel, checkboxNosmooth, map.isNosmooth(), " Nosmooth Map");
+        mapPanel.add(createPanelLine(levelWidthField, 10, String.valueOf(mapSize.getWidth()), "Width:   "));
+        mapPanel.add(createPanelLine(levelHeightField, 10, String.valueOf(mapSize.getHeight()), "Height:   "));
+        mapPanel.add(createPanelCBox(checkboxUnique, map.isUnique(), " Unique Map"));
+        mapPanel.add(createPanelCBox(checkboxOutdoor, map.isOutdoor(), " Outdoor Map"));
+        mapPanel.add(createPanelCBox(checkboxFixedReset, map.isFixedReset(), " Fixed Reset"));
+        mapPanel.add(createPanelCBox(checkboxNosmooth, map.isNosmooth(), " Nosmooth Map"));
 
         // set constraints
         c.fill = GridBagConstraints.BOTH;
@@ -198,25 +198,25 @@
         scrollPane2.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
         scrollPane2.getViewport().setScrollMode(JViewport.SIMPLE_SCROLL_MODE);
 
-        createPanelLine(optionPanel2, fieldEnterX, 10, String.valueOf(map.getEnterX()), "Enter X:   ");
-        createPanelLine(optionPanel2, fieldEnterY, 10, String.valueOf(map.getEnterY()), "Enter Y:   ");
-        createPanelLine(optionPanel2, fieldDifficulty, 10, String.valueOf(map.getDifficulty()), "Difficulty:   ");
-        createPanelLine(optionPanel2, fieldDarkness, 10, String.valueOf(map.getDarkness()), "Darkness:   ");
-        createPanelLine(optionPanel2, fieldSwapTime, 10, String.valueOf(map.getSwapTime()), "Swap Time:   ");
-        createPanelLine(optionPanel2, fieldResetTimeout, 10, String.valueOf(map.getResetTimeout()), "Reset Timeout:   ");
+        optionPanel2.add(createPanelLine(fieldEnterX, 10, String.valueOf(map.getEnterX()), "Enter X:   "));
+        optionPanel2.add(createPanelLine(fieldEnterY, 10, String.valueOf(map.getEnterY()), "Enter Y:   "));
+        optionPanel2.add(createPanelLine(fieldDifficulty, 10, String.valueOf(map.getDifficulty()), "Difficulty:   "));
+        optionPanel2.add(createPanelLine(fieldDarkness, 10, String.valueOf(map.getDarkness()), "Darkness:   "));
+        optionPanel2.add(createPanelLine(fieldSwapTime, 10, String.valueOf(map.getSwapTime()), "Swap Time:   "));
+        optionPanel2.add(createPanelLine(fieldResetTimeout, 10, String.valueOf(map.getResetTimeout()), "Reset Timeout:   "));
 
-        createPanelLine(optionPanel2, fieldShopitems, 10, map.getShopItems(), "Shop Type:   ");
-        createPanelLine(optionPanel2, fieldShopgreed, 10, String.valueOf(map.getShopGreed()), "Shop Greed:   ");
-        createPanelLine(optionPanel2, fieldShopmax, 10, String.valueOf(map.getShopMax()), "Upper Price Limit:   ");
-        createPanelLine(optionPanel2, fieldShopmin, 10, String.valueOf(map.getShopMin()), "Lower Price Limit:   ");
-        createPanelLine(optionPanel2, fieldShoprace, 10, map.getShopRace(), "Shop Race:   ");
+        optionPanel2.add(createPanelLine(fieldShopitems, 10, map.getShopItems(), "Shop Type:   "));
+        optionPanel2.add(createPanelLine(fieldShopgreed, 10, String.valueOf(map.getShopGreed()), "Shop Greed:   "));
+        optionPanel2.add(createPanelLine(fieldShopmax, 10, String.valueOf(map.getShopMax()), "Upper Price Limit:   "));
+        optionPanel2.add(createPanelLine(fieldShopmin, 10, String.valueOf(map.getShopMin()), "Lower Price Limit:   "));
+        optionPanel2.add(createPanelLine(fieldShoprace, 10, map.getShopRace(), "Shop Race:   "));
 
-        createPanelLine(optionPanel2, fieldTemperature, 10, String.valueOf(map.getTemp()), "Temperature:   ");
-        createPanelLine(optionPanel2, fieldPressure, 10, String.valueOf(map.getPressure()), "Pressure:   ");
-        createPanelLine(optionPanel2, fieldHumidity, 10, String.valueOf(map.getHumid()), "Humidity:   ");
-        createPanelLine(optionPanel2, fieldWindspeed, 10, String.valueOf(map.getWindspeed()), "Wind Speed:   ");
-        createPanelLine(optionPanel2, fieldWindDirection, 10, String.valueOf(map.getWinddir()), "Wind Direction:   ");
-        createPanelLine(optionPanel2, fieldSkySetting, 10, String.valueOf(map.getSky()), "Sky Setting:   ");
+        optionPanel2.add(createPanelLine(fieldTemperature, 10, String.valueOf(map.getTemp()), "Temperature:   "));
+        optionPanel2.add(createPanelLine(fieldPressure, 10, String.valueOf(map.getPressure()), "Pressure:   "));
+        optionPanel2.add(createPanelLine(fieldHumidity, 10, String.valueOf(map.getHumid()), "Humidity:   "));
+        optionPanel2.add(createPanelLine(fieldWindspeed, 10, String.valueOf(map.getWindspeed()), "Wind Speed:   "));
+        optionPanel2.add(createPanelLine(fieldWindDirection, 10, String.valueOf(map.getWinddir()), "Wind Direction:   "));
+        optionPanel2.add(createPanelLine(fieldSkySetting, 10, String.valueOf(map.getSky()), "Sky Setting:   "));
 
         optionPanel.add(scrollPane2);
 
@@ -281,12 +281,12 @@
                                 IGUIConstants.DIALOG_INSETS,
                                 IGUIConstants.DIALOG_INSETS)));
 
-        createPanelLine(tilePathPanel, fieldTilePath[0] = new JTextField(), 16, map.getTilePath(0), "North:   ");
-        createPanelLine(tilePathPanel, fieldTilePath[1] = new JTextField(), 16, map.getTilePath(1), "East:   ");
-        createPanelLine(tilePathPanel, fieldTilePath[2] = new JTextField(), 16, map.getTilePath(2), "South:   ");
-        createPanelLine(tilePathPanel, fieldTilePath[3] = new JTextField(), 16, map.getTilePath(3), "West:   ");
-        createPanelLine(tilePathPanel, fieldTilePath[4] = new JTextField(), 16, map.getTilePath(4), "Top:   ");
-        createPanelLine(tilePathPanel, fieldTilePath[5] = new JTextField(), 16, map.getTilePath(5), "Bottom:   ");
+        tilePathPanel.add(createPanelLine(fieldTilePath[0] = new JTextField(), 16, map.getTilePath(0), "North:   "));
+        tilePathPanel.add(createPanelLine(fieldTilePath[1] = new JTextField(), 16, map.getTilePath(1), "East:   "));
+        tilePathPanel.add(createPanelLine(fieldTilePath[2] = new JTextField(), 16, map.getTilePath(2), "South:   "));
+        tilePathPanel.add(createPanelLine(fieldTilePath[3] = new JTextField(), 16, map.getTilePath(3), "West:   "));
+        tilePathPanel.add(createPanelLine(fieldTilePath[4] = new JTextField(), 16, map.getTilePath(4), "Top:   "));
+        tilePathPanel.add(createPanelLine(fieldTilePath[5] = new JTextField(), 16, map.getTilePath(5), "Bottom:   "));
 
         // set constraints
         c.weightx = 1.0;
@@ -358,41 +358,37 @@
     }
 
     /**
-     * create an "attribute"-line (format: <label> <textfield>) and insert it
-     * into the given parent layout
-     * @param parent      parent panel where line gets inserted
+     * Create an "attribute"-line (format: &lt;label&gt; &lt;textfield&gt;)
      * @param textField   textfield
      * @param n           lenght of textfield
      * @param defaultText initial text in textfield
-     * @param label       (attribute-)label
+     * @param labelKey    (attribute-)label key
+     * @return created panel
      */
-    void createPanelLine(final JPanel parent, final JTextField textField, final int n,
-                         final String defaultText, final String label) {
+    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(label));  // create label (attr. name)
+        lineLayout.add(new JLabel(labelKey));  // create label (attr. name)
         //textField = new JTextField(n);      // create text field
         textField.setColumns(n);
         textField.setText(defaultText);     // insert default text
         lineLayout.add(textField);          // add textf. to line
-        parent.add(lineLayout);             // add line to parent layout
+        return lineLayout;
     }
 
     /**
-     * create a checkbox-line and insert it into the given parent layout.
-     * similar to createPanelLine
-     * @param parent   parent panel where checkbox gets inserted
+     * Create a checkbox-line, similar to createPanelLine.
      * @param checkBox checkbox
      * @param state    initial state
-     * @param label    (attribute-)label
+     * @param labelKey (attribute-)label key
+     * @return created panel
      */
-    void createPanelCBox(final JPanel parent, final JCheckBox checkBox,
-                         final boolean state, final String label) {
+    private static JPanel createPanelCBox(final JCheckBox checkBox, final boolean state, final String labelKey) {
         final JPanel lineLayout = new JPanel(new FlowLayout(FlowLayout.CENTER)); // layout for this line
-        //checkBox = new JCheckBox(label);  // create checkbox
-        checkBox.setText(label);
+        //checkBox = new JCheckBox(labelKey);  // create checkbox
+        checkBox.setText(labelKey);
         checkBox.setSelected(state);      // set to current state
         lineLayout.add(checkBox);         // add checkbox to line
-        parent.add(lineLayout);           // add line to parent layout
+        return lineLayout;
     }
 
     /**


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

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

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

Revision: 833
          http://svn.sourceforge.net/gridarta/?rev=833&view=rev
Author:   akirschbaum
Date:     2006-12-03 09:56:16 -0800 (Sun, 03 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-03 17:46:47 UTC (rev 832)
+++ trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2006-12-03 17:56:16 UTC (rev 833)
@@ -70,80 +70,80 @@
 
     private final CMainControl mainControl;
 
-    private final MapControl m_level;
+    private final MapControl mapControl;
 
     // input components, see MapArchObject for expl. of purpose
-    private final JTextArea m_textArea;                             // the msg text/arch text
+    private final JTextArea mapDescription;                             // the msg text/arch text
 
-    private final JTextArea m_loreArea;                             // the lore text
+    private final JTextArea mapLore;                             // the lore text
 
-    private final JTextField m_nameField = new JTextField(); // name of arch
+    private final JTextField mapName = new JTextField(); // name of arch
 
-    private final JTextField m_regionField = new JTextField(); // map's region
+    private final JTextField mapRegion = new JTextField(); // map's region
 
-    private final JTextField m_levelWidthField = new JTextField(); // len x
+    private final JTextField levelWidthField = new JTextField(); // len x
 
-    private final JTextField m_levelHeightField = new JTextField(); // len y
+    private final JTextField levelHeightField = new JTextField(); // len y
 
-    private final JCheckBox m_unique = new JCheckBox();  // map unique
+    private final JCheckBox checkboxUnique = new JCheckBox();  // map unique
 
-    private final JCheckBox m_outdoor = new JCheckBox();  // map outdoor
+    private final JCheckBox checkboxOutdoor = new JCheckBox();  // map outdoor
 
-    private final JCheckBox m_fixedReset = new JCheckBox();  // fixed reset
+    private final JCheckBox checkboxFixedReset = new JCheckBox();  // fixed reset
 
-    private final JCheckBox m_nosmooth = new JCheckBox();  // map nosmooth
+    private final JCheckBox checkboxNosmooth = new JCheckBox();  // map nosmooth
 
-    private final JTextField m_enterX = new JTextField(); // enter x
+    private final JTextField fieldEnterX = new JTextField(); // enter x
 
-    private final JTextField m_enterY = new JTextField(); // enter y
+    private final JTextField fieldEnterY = new JTextField(); // enter y
 
-    private final JTextField m_swapTime = new JTextField(); // swap time
+    private final JTextField fieldSwapTime = new JTextField(); // swap time
 
-    private final JTextField m_resetTimeout = new JTextField(); // reset timeout
+    private final JTextField fieldResetTimeout = new JTextField(); // reset timeout
 
-    private final JTextField m_difficulty = new JTextField(); // map difficulty
+    private final JTextField fieldDifficulty = new JTextField(); // map difficulty
 
-    private final JTextField m_darkness = new JTextField(); // darkness
+    private final JTextField fieldDarkness = new JTextField(); // darkness
 
-    private final JTextField[] m_tilePath = new JTextField[IGUIConstants.DIRECTIONS]; // tile paths
+    private final JTextField[] fieldTilePath = new JTextField[IGUIConstants.DIRECTIONS]; // tile paths
 
-    private final JTextField m_shopitems = new JTextField(); // shopitems
+    private final JTextField fieldShopitems = new JTextField(); // shopitems
 
-    private final JTextField m_shopgreed = new JTextField(); // shopgreed
+    private final JTextField fieldShopgreed = new JTextField(); // shopgreed
 
-    private final JTextField m_shopmax = new JTextField(); // shop maximum price
+    private final JTextField fieldShopmax = new JTextField(); // shop maximum price
 
-    private final JTextField m_shopmin = new JTextField(); // shop minimum price
+    private final JTextField fieldShopmin = new JTextField(); // shop minimum price
 
-    private final JTextField m_shoprace = new JTextField(); // shop's preferred race
+    private final JTextField fieldShoprace = new JTextField(); // shop's preferred race
 
-    private final JTextField m_temp = new JTextField(); // temperature
+    private final JTextField fieldTemperature = new JTextField(); // temperature
 
-    private final JTextField m_pressure = new JTextField(); // pressure
+    private final JTextField fieldPressure = new JTextField(); // pressure
 
-    private final JTextField m_humid = new JTextField(); // humidity
+    private final JTextField fieldHumidity = new JTextField(); // humidity
 
-    private final JTextField m_windspeed = new JTextField(); // wind speed
+    private final JTextField fieldWindspeed = new JTextField(); // wind speed
 
-    private final JTextField m_winddir = new JTextField(); // wind direction
+    private final JTextField fieldWindDirection = new JTextField(); // wind direction
 
-    private final JTextField m_sky = new JTextField(); // sky setting
+    private final JTextField fieldSkySetting = new JTextField(); // sky setting
 
     private static final long serialVersionUID = 1L;
 
     /**
      * Constructs the map-options dialog.
-     * @param mainControl     The controller of this dialog.
+     * @param mainControl The controller of this dialog.
      * @param parentFrame The parent frame of this dialog.
-     * @param level       The level whose properties are shown/edited.
+     * @param mapControl  The level whose properties are shown/edited.
      */
-    public MapPropertiesDialog(final CMainControl mainControl, final Frame parentFrame, final MapControl level) {
+    public MapPropertiesDialog(final CMainControl mainControl, final Frame parentFrame, final MapControl mapControl) {
         // set title
-        super(parentFrame, "" + level.getMapNameWithoutMusic() + " - Map Properties");
-        final MapArchObject map = level.getMapModel().getMapArchObject();  // map arch object
+        super(parentFrame, "" + mapControl.getMapNameWithoutMusic() + " - Map Properties");
+        final MapArchObject map = mapControl.getMapModel().getMapArchObject();  // map arch object
 
         this.mainControl = mainControl;   // main control
-        m_level = level;       // map control
+        this.mapControl = mapControl;       // map control
 
         getContentPane().setLayout(new BorderLayout());
 
@@ -169,15 +169,15 @@
                                 IGUIConstants.DIALOG_INSETS,
                                 IGUIConstants.DIALOG_INSETS)));
 
-        createPanelLine(mapPanel, m_nameField, 16, m_level.getMapName(), "Name:   ");
-        createPanelLine(mapPanel, m_regionField, 16, map.getMapRegion(), "Region:   ");
-        final Size2D mapSize = m_level.getMapSize();
-        createPanelLine(mapPanel, m_levelWidthField, 10, String.valueOf(mapSize.getWidth()), "Width:   ");
-        createPanelLine(mapPanel, m_levelHeightField, 10, String.valueOf(mapSize.getHeight()), "Height:   ");
-        createPanelCBox(mapPanel, m_unique, map.isUnique(), " Unique Map");
-        createPanelCBox(mapPanel, m_outdoor, map.isOutdoor(), " Outdoor Map");
-        createPanelCBox(mapPanel, m_fixedReset, map.isFixedReset(), " Fixed Reset");
-        createPanelCBox(mapPanel, m_nosmooth, map.isNosmooth(), " Nosmooth Map");
+        createPanelLine(mapPanel, mapName, 16, mapControl.getMapName(), "Name:   ");
+        createPanelLine(mapPanel, mapRegion, 16, map.getMapRegion(), "Region:   ");
+        final Size2D mapSize = mapControl.getMapSize();
+        createPanelLine(mapPanel, levelWidthField, 10, String.valueOf(mapSize.getWidth()), "Width:   ");
+        createPanelLine(mapPanel, levelHeightField, 10, String.valueOf(mapSize.getHeight()), "Height:   ");
+        createPanelCBox(mapPanel, checkboxUnique, map.isUnique(), " Unique Map");
+        createPanelCBox(mapPanel, checkboxOutdoor, map.isOutdoor(), " Outdoor Map");
+        createPanelCBox(mapPanel, checkboxFixedReset, map.isFixedReset(), " Fixed Reset");
+        createPanelCBox(mapPanel, checkboxNosmooth, map.isNosmooth(), " Nosmooth Map");
 
         // set constraints
         c.fill = GridBagConstraints.BOTH;
@@ -198,25 +198,25 @@
         scrollPane2.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
         scrollPane2.getViewport().setScrollMode(JViewport.SIMPLE_SCROLL_MODE);
 
-        createPanelLine(optionPanel2, m_enterX, 10, String.valueOf(map.getEnterX()), "Enter X:   ");
-        createPanelLine(optionPanel2, m_enterY, 10, String.valueOf(map.getEnterY()), "Enter Y:   ");
-        createPanelLine(optionPanel2, m_difficulty, 10, String.valueOf(map.getDifficulty()), "Difficulty:   ");
-        createPanelLine(optionPanel2, m_darkness, 10, String.valueOf(map.getDarkness()), "Darkness:   ");
-        createPanelLine(optionPanel2, m_swapTime, 10, String.valueOf(map.getSwapTime()), "Swap Time:   ");
-        createPanelLine(optionPanel2, m_resetTimeout, 10, String.valueOf(map.getResetTimeout()), "Reset Timeout:   ");
+        createPanelLine(optionPanel2, fieldEnterX, 10, String.valueOf(map.getEnterX()), "Enter X:   ");
+        createPanelLine(optionPanel2, fieldEnterY, 10, String.valueOf(map.getEnterY()), "Enter Y:   ");
+        createPanelLine(optionPanel2, fieldDifficulty, 10, String.valueOf(map.getDifficulty()), "Difficulty:   ");
+        createPanelLine(optionPanel2, fieldDarkness, 10, String.valueOf(map.getDarkness()), "Darkness:   ");
+        createPanelLine(optionPanel2, fieldSwapTime, 10, String.valueOf(map.getSwapTime()), "Swap Time:   ");
+        createPanelLine(optionPanel2, fieldResetTimeout, 10, String.valueOf(map.getResetTimeout()), "Reset Timeout:   ");
 
-        createPanelLine(optionPanel2, m_shopitems, 10, map.getShopItems(), "Shop Type:   ");
-        createPanelLine(optionPanel2, m_shopgreed, 10, String.valueOf(map.getShopGreed()), "Shop Greed:   ");
-        createPanelLine(optionPanel2, m_shopmax, 10, String.valueOf(map.getShopMax()), "Upper Price Limit:   ");
-        createPanelLine(optionPanel2, m_shopmin, 10, String.valueOf(map.getShopMin()), "Lower Price Limit:   ");
-        createPanelLine(optionPanel2, m_shoprace, 10, map.getShopRace(), "Shop Race:   ");
+        createPanelLine(optionPanel2, fieldShopitems, 10, map.getShopItems(), "Shop Type:   ");
+        createPanelLine(optionPanel2, fieldShopgreed, 10, String.valueOf(map.getShopGreed()), "Shop Greed:   ");
+        createPanelLine(optionPanel2, fieldShopmax, 10, String.valueOf(map.getShopMax()), "Upper Price Limit:   ");
+        createPanelLine(optionPanel2, fieldShopmin, 10, String.valueOf(map.getShopMin()), "Lower Price Limit:   ");
+        createPanelLine(optionPanel2, fieldShoprace, 10, map.getShopRace(), "Shop Race:   ");
 
-        createPanelLine(optionPanel2, m_temp, 10, String.valueOf(map.getTemp()), "Temperature:   ");
-        createPanelLine(optionPanel2, m_pressure, 10, String.valueOf(map.getPressure()), "Pressure:   ");
-        createPanelLine(optionPanel2, m_humid, 10, String.valueOf(map.getHumid()), "Humidity:   ");
-        createPanelLine(optionPanel2, m_windspeed, 10, String.valueOf(map.getWindspeed()), "Wind Speed:   ");
-        createPanelLine(optionPanel2, m_winddir, 10, String.valueOf(map.getWinddir()), "Wind Direction:   ");
-        createPanelLine(optionPanel2, m_sky, 10, String.valueOf(map.getSky()), "Sky Setting:   ");
+        createPanelLine(optionPanel2, fieldTemperature, 10, String.valueOf(map.getTemp()), "Temperature:   ");
+        createPanelLine(optionPanel2, fieldPressure, 10, String.valueOf(map.getPressure()), "Pressure:   ");
+        createPanelLine(optionPanel2, fieldHumidity, 10, String.valueOf(map.getHumid()), "Humidity:   ");
+        createPanelLine(optionPanel2, fieldWindspeed, 10, String.valueOf(map.getWindspeed()), "Wind Speed:   ");
+        createPanelLine(optionPanel2, fieldWindDirection, 10, String.valueOf(map.getWinddir()), "Wind Direction:   ");
+        createPanelLine(optionPanel2, fieldSkySetting, 10, String.valueOf(map.getSky()), "Sky Setting:   ");
 
         optionPanel.add(scrollPane2);
 
@@ -226,14 +226,14 @@
         c.weightx = 1.0;
         c.weighty = 1.0;
         c.gridwidth = GridBagConstraints.REMAINDER; //end row
-        m_loreArea = new JTextArea();
+        mapLore = new JTextArea();
         gridbag.setConstraints(tabPane, c);
 
         tabPane.addTab("Options", optionPanel);
-        m_loreArea.setText(m_level.getMapLore());
-        m_loreArea.setCaretPosition(0);
-        m_loreArea.setBorder(BorderFactory.createEmptyBorder(1, 4, 0, 0));
-        final JScrollPane lscrollPane = new JScrollPane(m_loreArea);
+        mapLore.setText(mapControl.getMapLore());
+        mapLore.setCaretPosition(0);
+        mapLore.setBorder(BorderFactory.createEmptyBorder(1, 4, 0, 0));
+        final JScrollPane lscrollPane = new JScrollPane(mapLore);
         lscrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
         lscrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
         lscrollPane.setPreferredSize(new Dimension(20, 20));
@@ -253,11 +253,11 @@
                                 IGUIConstants.DIALOG_INSETS)));
 
         final JPanel labelPanel = new JPanel(new BorderLayout(1, 1));
-        m_textArea = new JTextArea(4, 4);
-        m_textArea.setText(m_level.getMapText());
-        m_textArea.setCaretPosition(0);
-        m_textArea.setBorder(BorderFactory.createEmptyBorder(1, 4, 0, 0));
-        final JScrollPane scrollPane = new JScrollPane(m_textArea);
+        mapDescription = new JTextArea(4, 4);
+        mapDescription.setText(mapControl.getMapText());
+        mapDescription.setCaretPosition(0);
+        mapDescription.setBorder(BorderFactory.createEmptyBorder(1, 4, 0, 0));
+        final JScrollPane scrollPane = new JScrollPane(mapDescription);
         scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
 
         labelPanel.add(scrollPane, BorderLayout.CENTER);
@@ -281,12 +281,12 @@
                                 IGUIConstants.DIALOG_INSETS,
                                 IGUIConstants.DIALOG_INSETS)));
 
-        createPanelLine(tilePathPanel, m_tilePath[0] = new JTextField(), 16, map.getTilePath(0), "North:   ");
-        createPanelLine(tilePathPanel, m_tilePath[1] = new JTextField(), 16, map.getTilePath(1), "East:   ");
-        createPanelLine(tilePathPanel, m_tilePath[2] = new JTextField(), 16, map.getTilePath(2), "South:   ");
-        createPanelLine(tilePathPanel, m_tilePath[3] = new JTextField(), 16, map.getTilePath(3), "West:   ");
-        createPanelLine(tilePathPanel, m_tilePath[4] = new JTextField(), 16, map.getTilePath(4), "Top:   ");
-        createPanelLine(tilePathPanel, m_tilePath[5] = new JTextField(), 16, map.getTilePath(5), "Bottom:   ");
+        createPanelLine(tilePathPanel, fieldTilePath[0] = new JTextField(), 16, map.getTilePath(0), "North:   ");
+        createPanelLine(tilePathPanel, fieldTilePath[1] = new JTextField(), 16, map.getTilePath(1), "East:   ");
+        createPanelLine(tilePathPanel, fieldTilePath[2] = new JTextField(), 16, map.getTilePath(2), "South:   ");
+        createPanelLine(tilePathPanel, fieldTilePath[3] = new JTextField(), 16, map.getTilePath(3), "West:   ");
+        createPanelLine(tilePathPanel, fieldTilePath[4] = new JTextField(), 16, map.getTilePath(4), "Top:   ");
+        createPanelLine(tilePathPanel, fieldTilePath[5] = new JTextField(), 16, map.getTilePath(5), "Bottom:   ");
 
         // set constraints
         c.weightx = 1.0;
@@ -401,7 +401,7 @@
      *         parameters were wrong.
      */
     private boolean modifyMapProperties() {
-        final MapArchObject map = m_level.getMapModel().getMapArchObject();  // map arch object
+        final MapArchObject map = mapControl.getMapModel().getMapArchObject();  // map arch object
         boolean modifyTilepaths = false; // true when map tile-paths were modified
 
         // tmp variables for parsing
@@ -419,27 +419,27 @@
         // first check if the entries are all okay
         try {
             // try to parse everything
-            width = parseProperty(m_levelWidthField.getText(), "Width");
-            height = parseProperty(m_levelHeightField.getText(), "Height");
-            t_enter_x = parseProperty(m_enterX.getText(), "Enter X");
-            t_enter_y = parseProperty(m_enterY.getText(), "Enter Y");
-            t_swap_time = parseProperty(m_swapTime.getText(), "Swap Time");
-            t_reset_timeout = parseProperty(m_resetTimeout.getText(), "Reset Timeout");
-            t_difficulty = parseProperty(m_difficulty.getText(), "Difficulty");
-            t_darkness = parseProperty(m_darkness.getText(), "Darkness");
-            t_region = m_regionField.getText();
+            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();
 
-            t_shopitems = m_shopitems.getText();
-            t_shoprace = m_shoprace.getText();
-            t_shopmax = parseProperty(m_shopmax.getText(), "Shop Maximum");
-            t_shopmin = parseProperty(m_shopmin.getText(), "Shop Minimum");
-            t_shopgreed = parsePropertyToDouble(m_shopgreed.getText(), "Shop Greed");
-            t_temp = parseProperty(m_temp.getText(), "Temperature");
-            t_pressure = parseProperty(m_pressure.getText(), "Pressure");
-            t_humid = parseProperty(m_humid.getText(), "Humidity");
-            t_winds = parseProperty(m_windspeed.getText(), "Wind Speed");
-            t_windd = parseProperty(m_winddir.getText(), "Wind Direction");
-            t_sky = parseProperty(m_sky.getText(), "Sky Setting");
+            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");
 
             // Now do some sanity checks:
             if (width < 1 || height < 1) {
@@ -454,7 +454,7 @@
                         "Darkness level must be in range 0-5.");
                 return false;
             }
-            if (m_nameField.getText().length() == 0) {
+            if (mapName.getText().length() == 0) {
                 mainControl.showMessage(
                         "missing Map Name",
                         "You must specify a Map Name.");
@@ -467,16 +467,16 @@
 
         // if the mapsize has been modified, see if we should ask for a confirm
         Size2D size = new Size2D(width, height);
-        if (!m_level.isCutoffSave(size)) {
+        if (!mapControl.isCutoffSave(size)) {
             if (!askConfirmResize(size)) {
                 // resizing has been cancelled
-                size = m_level.getMapSize();
+                size = mapControl.getMapSize();
             }
         }
 
         // now that all is well, write the new values into the maparch
-        mainControl.setLevelProperties(m_level, m_textArea.getText(), m_loreArea.getText(),
-                m_nameField.getText(), size);
+        mainControl.setLevelProperties(mapControl, mapDescription.getText(), mapLore.getText(),
+                mapName.getText(), size);
 
         map.setMapRegion(t_region);
         map.setEnterX(t_enter_x);
@@ -485,10 +485,10 @@
         map.setSwapTime(t_swap_time);
         map.setDifficulty(t_difficulty);
         map.setDarkness(t_darkness);
-        map.setUnique(m_unique.isSelected());
-        map.setOutdoor(m_outdoor.isSelected());
-        map.setFixedReset(m_fixedReset.isSelected());
-        map.setNosmooth(m_nosmooth.isSelected());
+        map.setUnique(checkboxUnique.isSelected());
+        map.setOutdoor(checkboxOutdoor.isSelected());
+        map.setFixedReset(checkboxFixedReset.isSelected());
+        map.setNosmooth(checkboxNosmooth.isSelected());
 
         map.setShopItems(t_shopitems);
         map.setShopRace(t_shoprace);
@@ -505,11 +505,11 @@
 
         // update tilepaths
         for (int i = 0; i < IGUIConstants.DIRECTIONS; i++) {
-            if ((map.getTilePath(i) == null && (m_tilePath[i].getText() == null || m_tilePath[i].getText().length() == 0))
-                    || (map.getTilePath(i) != null && !map.getTilePath(i).equals(m_tilePath[i].getText()))) {
+            if ((map.getTilePath(i) == null && (fieldTilePath[i].getText() == null || fieldTilePath[i].getText().length() == 0))
+                    || (map.getTilePath(i) != null && !map.getTilePath(i).equals(fieldTilePath[i].getText()))) {
                 modifyTilepaths = true;
             }
-            map.setTilePath(i, m_tilePath[i].getText());
+            map.setTilePath(i, fieldTilePath[i].getText());
         }
 
         // refresh menus if tilepaths have been modified
@@ -518,7 +518,7 @@
         }
 
         // set flag that map has changed
-        m_level.setLevelChangedFlag();
+        mapControl.setLevelChangedFlag();
 
         return true;
     }
@@ -587,42 +587,42 @@
 
     /** Reset all map properties to the saved values in the maparch */
     private void restoreMapProperties() {
-        final MapArchObject map = m_level.getMapModel().getMapArchObject();  // map arch object
+        final MapArchObject map = mapControl.getMapModel().getMapArchObject();  // map arch object
 
-        m_level.getMapModel().getMapArchObject().getText();
-        m_textArea.setText(m_level.getMapText());
-        m_loreArea.setText(m_level.getMapLore());
-        m_nameField.setText(m_level.getMapName());
-        m_regionField.setText("" + map.getMapRegion());
+        mapControl.getMapModel().getMapArchObject().getText();
+        mapDescription.setText(mapControl.getMapText());
+        mapLore.setText(mapControl.getMapLore());
+        mapName.setText(mapControl.getMapName());
+        mapRegion.setText("" + map.getMapRegion());
         final Size2D mapSize = map.getMapSize();
-        m_levelWidthField.setText(String.valueOf(mapSize.getWidth()));
-        m_levelHeightField.setText(String.valueOf(mapSize.getHeight()));
-        m_enterX.setText("" + map.getEnterX());
-        m_enterY.setText("" + map.getEnterY());
-        m_swapTime.setText("" + map.getSwapTime());
-        m_resetTimeout.setText("" + map.getResetTimeout());
-        m_darkness.setText("" + map.getDarkness());
-        m_difficulty.setText("" + map.getDifficulty());
+        levelWidthField.setText(String.valueOf(mapSize.getWidth()));
+        levelHeightField.setText(String.valueOf(mapSize.getHeight()));
+        fieldEnterX.setText("" + map.getEnterX());
+        fieldEnterY.setText("" + map.getEnterY());
+        fieldSwapTime.setText("" + map.getSwapTime());
+        fieldResetTimeout.setText("" + map.getResetTimeout());
+        fieldDarkness.setText("" + map.getDarkness());
+        fieldDifficulty.setText("" + map.getDifficulty());
 
-        m_unique.setSelected(map.isUnique());
-        m_outdoor.setSelected(map.isOutdoor());
-        m_fixedReset.setSelected(map.isFixedReset());
-        m_nosmooth.setSelected(map.isNosmooth());
+        checkboxUnique.setSelected(map.isUnique());
+        checkboxOutdoor.setSelected(map.isOutdoor());
+        checkboxFixedReset.setSelected(map.isFixedReset());
+        checkboxNosmooth.setSelected(map.isNosmooth());
 
-        m_shopitems.setText("" + map.getShopItems());
-        m_shoprace.setText("" + map.getShopRace());
-        m_shopmax.setText("" + map.getShopMax());
-        m_shopmin.setText("" + map.getShopMin());
-        m_shopgreed.setText("" + map.getShopGreed());
-        m_temp.setText("" + map.getTemp());
-        m_pressure.setText("" + map.getPressure());
-        m_humid.setText("" + map.getHumid());
-        m_windspeed.setText("" + map.getWindspeed());
-        m_winddir.setText("" + map.getWinddir());
-        m_sky.setText("" + map.getSky());
+        fieldShopitems.setText("" + map.getShopItems());
+        fieldShoprace.setText("" + map.getShopRace());
+        fieldShopmax.setText("" + map.getShopMax());
+        fieldShopmin.setText("" + map.getShopMin());
+        fieldShopgreed.setText("" + map.getShopGreed());
+        fieldTemperature.setText("" + map.getTemp());
+        fieldPressure.setText("" + map.getPressure());
+        fieldHumidity.setText("" + map.getHumid());
+        fieldWindspeed.setText("" + map.getWindspeed());
+        fieldWindDirection.setText("" + map.getWinddir());
+        fieldSkySetting.setText("" + map.getSky());
 
         for (int i = 0; i < 4; i++) {
-            m_tilePath[i].setText("" + map.getTilePath(i));
+            fieldTilePath[i].setText("" + map.getTilePath(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: [832] trunk/crossfire/src/cfeditor/gui/map/ MapPropertiesDialog.java

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

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

Log Message:
-----------
Remove unused fields.

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-03 17:25:41 UTC (rev 831)
+++ trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2006-12-03 17:46:47 UTC (rev 832)
@@ -107,7 +107,6 @@
 
     private final JTextField[] m_tilePath = new JTextField[IGUIConstants.DIRECTIONS]; // tile paths
 
-    // only for CF:
     private final JTextField m_shopitems = new JTextField(); // shopitems
 
     private final JTextField m_shopgreed = new JTextField(); // shopgreed
@@ -130,25 +129,6 @@
 
     private final JTextField m_sky = new JTextField(); // sky setting
 
-    // only for ISO:
-    private final JCheckBox m_no_magic = new JCheckBox();
-
-    private final JCheckBox m_no_priest = new JCheckBox();
-
-    private final JCheckBox m_no_summon = new JCheckBox();
-
-    private final JCheckBox m_no_harm = new JCheckBox();
-
-    private final JCheckBox m_fixed_login = new JCheckBox();
-
-    private final JCheckBox m_perm_death = new JCheckBox();
-
-    private final JCheckBox m_ultra_death = new JCheckBox();
-
-    private final JCheckBox m_ultimate_death = new JCheckBox();
-
-    private final JCheckBox m_pvp = new JCheckBox();
-
     private static final long serialVersionUID = 1L;
 
     /**


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

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

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

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

Log Message:
-----------
Unify implementation.

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

Modified: trunk/crossfire/src/cfeditor/CAttribBitmask.java
===================================================================
--- trunk/crossfire/src/cfeditor/CAttribBitmask.java	2006-12-03 17:24:26 UTC (rev 830)
+++ trunk/crossfire/src/cfeditor/CAttribBitmask.java	2006-12-03 17:25:41 UTC (rev 831)
@@ -148,43 +148,32 @@
      * @return <code>String</code> with all entries belonging to the bitmask
      */
     public String getText(final int value) {
-        final StringBuilder sb = new StringBuilder();
-        int rows = 1;      // rows of textarea
-        int columns = 1;   // columns of textarea (actually not needed)
-
-        // is bitmask empty?
         if (value <= 0) {
-            sb.append(bitName[0]);
-        } else {
-            // value too big?
-            if (value > maxvalue) {
-                log.warn("bitmask value " + value + " is too big.");
-            }
+            return bitName[0];
+        }
 
-            boolean linebreak;
-            int linelength;  // length of last line
+        // value too big?
+        if (value > maxvalue) {
+            log.warn("bitmask value " + value + " is too big.");
+        }
 
-            for (int i = 1; i < bitName.length; i++) {
-                if (isActive(i, value)) {
-                    // is a linebreak required?
-                    linelength = sb.indexOf("\n") >= 0 ? sb.substring(sb.lastIndexOf("\n")).length() : sb.length();
-                    if (linelength + bitName[i].length() + 2 > MAX_CHARS_PER_LINE) {
-                        sb.append(", \n ");
-                        linebreak = true;
-                        rows++;
+        final StringBuilder sb = new StringBuilder();
+        boolean notFirst = false;
+        int linelength = 0;
+        for (int i = 1; i < bitName.length; i++) {
+            if (isActive(i, value)) {
+                if (notFirst) {
+                    if (linelength + bitName[i].length() + 1 > MAX_CHARS_PER_LINE) {
+                        sb.append(",\n");
+                        linelength = 0;
                     } else {
-                        linebreak = false;
+                        sb.append(", ");
+                        linelength += 2;
                     }
-
-                    // append text
-                    sb.append(((sb.length() <= 1 || linebreak) ? "" : ", "));
-                    sb.append(bitName[i]);
-
-                    linelength = sb.indexOf("\n") >= 0 ? sb.substring(sb.lastIndexOf("\n")).length() : sb.length();
-                    if (linelength > columns) {
-                        columns = linelength;
-                    }
                 }
+                linelength += bitName[i].length();
+                sb.append(bitName[i]);
+                notFirst = true;
             }
         }
 


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

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

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

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

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

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/CAttribBitmask.java

Modified: trunk/daimonin/src/daieditor/CAttribBitmask.java
===================================================================
--- trunk/daimonin/src/daieditor/CAttribBitmask.java	2006-12-03 17:07:15 UTC (rev 829)
+++ trunk/daimonin/src/daieditor/CAttribBitmask.java	2006-12-03 17:24:26 UTC (rev 830)
@@ -95,6 +95,7 @@
         if (value <= 0) {
             return bitName[0];
         }
+
         final StringBuilder sb = new StringBuilder();
         boolean notFirst = false;
         int linelength = 0;
@@ -114,6 +115,7 @@
                 notFirst = true;
             }
         }
+
         return sb.toString();
     }
 


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

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

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

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

Log Message:
-----------
Use StringBuilder for string concatenation.

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

Modified: trunk/crossfire/src/cfeditor/CAttribBitmask.java
===================================================================
--- trunk/crossfire/src/cfeditor/CAttribBitmask.java	2006-12-03 17:02:44 UTC (rev 828)
+++ trunk/crossfire/src/cfeditor/CAttribBitmask.java	2006-12-03 17:07:15 UTC (rev 829)
@@ -148,13 +148,13 @@
      * @return <code>String</code> with all entries belonging to the bitmask
      */
     public String getText(final int value) {
-        String text = " "; // text string to return
+        final StringBuilder sb = new StringBuilder();
         int rows = 1;      // rows of textarea
         int columns = 1;   // columns of textarea (actually not needed)
 
         // is bitmask empty?
         if (value <= 0) {
-            text += bitName[0];
+            sb.append(bitName[0]);
         } else {
             // value too big?
             if (value > maxvalue) {
@@ -167,9 +167,9 @@
             for (int i = 1; i < bitName.length; i++) {
                 if (isActive(i, value)) {
                     // is a linebreak required?
-                    linelength = text.indexOf("\n") >= 0 ? text.substring(text.lastIndexOf("\n")).length() : text.length();
+                    linelength = sb.indexOf("\n") >= 0 ? sb.substring(sb.lastIndexOf("\n")).length() : sb.length();
                     if (linelength + bitName[i].length() + 2 > MAX_CHARS_PER_LINE) {
-                        text += ", \n ";
+                        sb.append(", \n ");
                         linebreak = true;
                         rows++;
                     } else {
@@ -177,9 +177,10 @@
                     }
 
                     // append text
-                    text += ((text.length() <= 1 || linebreak) ? "" : ", ") + bitName[i];
+                    sb.append(((sb.length() <= 1 || linebreak) ? "" : ", "));
+                    sb.append(bitName[i]);
 
-                    linelength = text.indexOf("\n") >= 0 ? text.substring(text.lastIndexOf("\n")).length() : text.length();
+                    linelength = sb.indexOf("\n") >= 0 ? sb.substring(sb.lastIndexOf("\n")).length() : sb.length();
                     if (linelength > columns) {
                         columns = linelength;
                     }
@@ -187,7 +188,7 @@
             }
         }
 
-        return text;
+        return sb.toString();
     }
 
     /**


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

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

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

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

Log Message:
-----------
Unify expressions.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CAttribBitmask.java
    trunk/daimonin/src/daieditor/CAttribBitmask.java

Modified: trunk/crossfire/src/cfeditor/CAttribBitmask.java
===================================================================
--- trunk/crossfire/src/cfeditor/CAttribBitmask.java	2006-12-03 16:59:26 UTC (rev 827)
+++ trunk/crossfire/src/cfeditor/CAttribBitmask.java	2006-12-03 17:02:44 UTC (rev 828)
@@ -119,7 +119,7 @@
             }
 
             number = bitName.length - 1;
-            maxvalue = ((int) Math.pow(2., (double) (bitName.length + 1))) - 1;
+            maxvalue = (1 << (bitName.length + 1)) - 1;
         } else {
             // Error: this is an "empty" bitmask
             log.warn("Error in \"" + IGUIConstants.TYPEDEF_FILE + "\": Found a bitmask without content!");
@@ -138,7 +138,8 @@
      * <code>false</code>
      */
     private static boolean isActive(final int index, final int mask) {
-        return ((int) (Math.pow(2., (double) (index - 1))) & mask) != 0;
+        final int bit = 1 << (index - 1);
+        return (mask & bit) == bit;
     }
 
     /**

Modified: trunk/daimonin/src/daieditor/CAttribBitmask.java
===================================================================
--- trunk/daimonin/src/daieditor/CAttribBitmask.java	2006-12-03 16:59:26 UTC (rev 827)
+++ trunk/daimonin/src/daieditor/CAttribBitmask.java	2006-12-03 17:02:44 UTC (rev 828)
@@ -82,7 +82,7 @@
      * <code>false</code>
      */
     private static boolean isActive(final int index, final int mask) {
-        final int bit = 1 << index - 1;
+        final int bit = 1 << (index - 1);
         return (mask & bit) == bit;
     }
 


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

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

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

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

Log Message:
-----------
Remove unused constructor.

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

Modified: trunk/crossfire/src/cfeditor/CAttribBitmask.java
===================================================================
--- trunk/crossfire/src/cfeditor/CAttribBitmask.java	2006-12-03 16:54:47 UTC (rev 826)
+++ trunk/crossfire/src/cfeditor/CAttribBitmask.java	2006-12-03 16:59:26 UTC (rev 827)
@@ -62,25 +62,6 @@
     private final int number;           // number of bitmask entrys (not counting zero)
 
     /**
-     * Constructor of a bitmask (DEPRECATED!)
-     * @param name array of names for the bit-entries
-     */
-    public CAttribBitmask(final String[] name) {
-        // initialize arrays
-        bitName = new String[name.length + 1];
-        //bitValue = new int[name.length+1];
-
-        // the zero-bit is always <none>
-        bitName[0] = "<none>";
-        //bitValue[0] = 0;
-
-        System.arraycopy(name, 0, bitName, 1, name.length);
-
-        number = bitName.length - 1;
-        maxvalue = ((int) Math.pow(2.0, (double) (bitName.length + 1))) - 1;
-    }
-
-    /**
      * Constructor of a bitmask from XML element.
      * @param root xml bitmask element
      */


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

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

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

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

Log Message:
-----------
Unify CArchPanelPan.

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

Modified: trunk/crossfire/src/cfeditor/CArchPanelPan.java
===================================================================
--- trunk/crossfire/src/cfeditor/CArchPanelPan.java	2006-12-03 16:48:34 UTC (rev 825)
+++ trunk/crossfire/src/cfeditor/CArchPanelPan.java	2006-12-03 16:54:47 UTC (rev 826)
@@ -24,6 +24,7 @@
 
 package cfeditor;
 
+import cfeditor.gameobject.ArchetypeSet;
 import cfeditor.gameobject.GameObject;
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -269,13 +270,15 @@
 
             /* We additionally set the JLabels icon property here.
              */
-            final GameObject archetype = mainControl.getArchetypeSet().getArchetype(value.toString());
+            final ArchetypeSet archetypeSet = mainControl.getArchetypeSet();
+            final String archetypeName = value.toString();
+            final GameObject archetype = archetypeSet.getArchetype(archetypeName);
             if (isSelected) {
-                archPanel.setSelectedArch(value.toString());
-                mainControl.setStatusText(" " + value + " ");
+                archPanel.setSelectedArch(archetypeName);
+                mainControl.setStatusText(" " + archetypeName + " ");
             }
-            assert archetype != null : "Archetype not found: " + value.toString();
-            setText(archetype.getArchetypeName());
+            assert archetype != null : "Archetype not found: " + archetypeName;
+            setText(archetypeName);
 
             if (archetype.getFaceFlag()) {
                 setIcon(mainControl.getNofaceTileIcon());


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

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

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

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

Log Message:
-----------
Unify CArchPanel.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CArchPanel.java
    trunk/crossfire/src/cfeditor/CArchPanelPan.java
    trunk/crossfire/src/cfeditor/CMainView.java
    trunk/daimonin/src/daieditor/CArchPanel.java

Modified: trunk/crossfire/src/cfeditor/CArchPanel.java
===================================================================
--- trunk/crossfire/src/cfeditor/CArchPanel.java	2006-12-03 16:36:47 UTC (rev 824)
+++ trunk/crossfire/src/cfeditor/CArchPanel.java	2006-12-03 16:48:34 UTC (rev 825)
@@ -56,8 +56,10 @@
     /** Controller of this subview. */
     private final transient CMainControl mainControl;
 
-    /** The "Import..." button. */
-
+    /**
+     * Name of the selected arch.
+     * @serial include
+     */
     private String selectedArch;
 
     /** Panel holding both archlist and pickmaps. */
@@ -115,6 +117,7 @@
             public void stateChanged(final ChangeEvent e) {
                 final JTabbedPane tabbedPane = (JTabbedPane) e.getSource();
 
+                setSelectedArch(null);
                 final PanelNode node = panelNodeList.get(tabbedPane.getSelectedIndex());
                 selectedPanel = node.getData();
                 if (selectedPanel != null) {
@@ -136,15 +139,11 @@
     }
 
     @Nullable public GameObject getArchPanelSelection() {
-        if (selectedPanel == null) {
-            return null;
-        }
-
-        return selectedPanel.getArchListObject();
+        return selectedPanel != null ? selectedPanel.getArchListObject() : null;
     }
 
-    public void showArchPanelQuickObject(final GameObject arch) {
-        archQuickPanel.showArchPanelQuickObject(arch);
+    public void showArchPanelQuickObject(final GameObject gameObject) {
+        archQuickPanel.showArchPanelQuickObject(gameObject);
     }
 
     public int addArchPanelCombo(final String name) {
@@ -206,12 +205,20 @@
         settings.setProperty(ARCHPANEL_LOCATION_KEY, String.valueOf(splitPane.getDividerLocation()));
     }
 
-    public String getPanelArch() {
+    /**
+     * Get name of selected Arch
+     * @return Name of selected arch in arch panel
+     */
+    public String getSelectedArch() {
         return selectedArch;
     }
 
-    public void setPanelArch(final String archname) {
-        selectedArch = archname;
+    /**
+     * Set selected Arch
+     * @param selectedArch name of selected arch in arch panel
+     */
+    public void setSelectedArch(final String selectedArch) {
+        this.selectedArch = selectedArch;
     }
 
     void refresh() {
@@ -223,7 +230,10 @@
 
         private final CArchPanelPan data;
 
-        private final String title;    // title of this PanelNode
+        /**
+         * Title of this node.
+         */
+        private final String title;
 
         public PanelNode(final CArchPanelPan data, final String title) {
             this.data = data;

Modified: trunk/crossfire/src/cfeditor/CArchPanelPan.java
===================================================================
--- trunk/crossfire/src/cfeditor/CArchPanelPan.java	2006-12-03 16:36:47 UTC (rev 824)
+++ trunk/crossfire/src/cfeditor/CArchPanelPan.java	2006-12-03 16:48:34 UTC (rev 825)
@@ -271,7 +271,7 @@
              */
             final GameObject archetype = mainControl.getArchetypeSet().getArchetype(value.toString());
             if (isSelected) {
-                archPanel.setPanelArch(value.toString());
+                archPanel.setSelectedArch(value.toString());
                 mainControl.setStatusText(" " + value + " ");
             }
             assert archetype != null : "Archetype not found: " + value.toString();

Modified: trunk/crossfire/src/cfeditor/CMainView.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainView.java	2006-12-03 16:36:47 UTC (rev 824)
+++ trunk/crossfire/src/cfeditor/CMainView.java	2006-12-03 16:48:34 UTC (rev 825)
@@ -375,9 +375,12 @@
         archPanel.addArchPanelArch(archname, index);
     }
 
-    // selected arch in arch panel
+    /**
+     * Return the name of the selected arch in arch panel.
+     * @return name of selected arch in arch panel
+     */
     public String getPanelArch() {
-        return archPanel.getPanelArch();
+        return archPanel.getSelectedArch();
     }
 
     /**

Modified: trunk/daimonin/src/daieditor/CArchPanel.java
===================================================================
--- trunk/daimonin/src/daieditor/CArchPanel.java	2006-12-03 16:36:47 UTC (rev 824)
+++ trunk/daimonin/src/daieditor/CArchPanel.java	2006-12-03 16:48:34 UTC (rev 825)
@@ -199,7 +199,10 @@
 
         private final CArchPanelPan data;
 
-        private final String title;    // title of this panelNode
+        /**
+         * Title of this node.
+         */
+        private final String title;
 
         public PanelNode(final CArchPanelPan data, final String title) {
             this.data = data;


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

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

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

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

Log Message:
-----------
Use ArrayList for panel list.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CArchPanel.java
    trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java

Modified: trunk/crossfire/src/cfeditor/CArchPanel.java
===================================================================
--- trunk/crossfire/src/cfeditor/CArchPanel.java	2006-12-03 16:18:27 UTC (rev 823)
+++ trunk/crossfire/src/cfeditor/CArchPanel.java	2006-12-03 16:36:47 UTC (rev 824)
@@ -29,6 +29,8 @@
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Toolkit;
+import java.util.ArrayList;
+import java.util.List;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.JSplitPane;
@@ -71,10 +73,8 @@
     private final CArchQuickView archQuickPanel;
 
     /** List of arch panels. */
-    private static PanelNode panelNodeStart;
+    private static List<PanelNode> panelNodeList = new ArrayList<PanelNode>();
 
-    private PanelNode panelNodeLast;
-
     /** The active panel. */
     private CArchPanelPan selectedPanel;
 
@@ -115,16 +115,8 @@
             public void stateChanged(final ChangeEvent e) {
                 final JTabbedPane tabbedPane = (JTabbedPane) e.getSource();
 
-                // This is weird: we need to compare against SelectedComponent,
-                // and *not* SelectedIndex. The index seemed to get all messed up during
-                // load proccess, leading to odd behaviour and sometimes wrecked panes.
-                final Component sel = tabbedPane.getSelectedComponent();
-                PanelNode node = panelNodeStart;
-                while (node != null && node.data.getPanel() != sel) {
-                    node = node.next;
-                }
-
-                selectedPanel = node.data;
+                final PanelNode node = panelNodeList.get(tabbedPane.getSelectedIndex());
+                selectedPanel = node.getData();
                 if (selectedPanel != null) {
                     selectedPanel.showArchList();
                 }
@@ -132,8 +124,8 @@
         });
     }
 
-    public static PanelNode getStartPanelNode() {
-        return panelNodeStart;
+    public static List<PanelNode> getPanelNodeList() {
+        return panelNodeList;
     }
 
     /** Move the pickmap panel in front of the default-archpanel. */
@@ -177,14 +169,7 @@
     public void addPanel(final String name) {
         final PanelNode newnode = new PanelNode(new CArchPanelPan(this, mainControl), name);
 
-        // chain it to our list of panels
-        if (panelNodeStart == null) {
-            panelNodeStart = newnode;
-        }
-        if (panelNodeLast != null) {
-            panelNodeLast.next = newnode;
-        }
-        panelNodeLast = newnode;
+        panelNodeList.add(newnode);
 
         // insert new panels in alphabetical order
         int i;
@@ -205,15 +190,15 @@
      */
     public void finishBuildProccess() {
         final Component sel = tabDesktop.getSelectedComponent();
-        PanelNode node = panelNodeStart;
-        while (node != null && node.data.getPanel() != sel) {
-            node = node.next;
+        for (final PanelNode node : panelNodeList) {
+            if (node.data.getPanel() == sel) {
+                if (node.data != null) {
+                    selectedPanel = node.data;
+                    selectedPanel.showArchList();
+                }
+                break;
+            }
         }
-
-        if (node != null && node.data != null) {
-            selectedPanel = node.data;
-            selectedPanel.showArchList();
-        }
     }
 
     void appExitNotify() {
@@ -238,14 +223,11 @@
 
         private final CArchPanelPan data;
 
-        public PanelNode next;  // next node
-
         private final String title;    // title of this PanelNode
 
         public PanelNode(final CArchPanelPan data, final String title) {
             this.data = data;
             this.title = title;
-            next = null;
         }
 
         public String getTitle() {

Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java	2006-12-03 16:18:27 UTC (rev 823)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java	2006-12-03 16:36:47 UTC (rev 824)
@@ -631,8 +631,7 @@
             // loop through all existing ArchPanels and find all arches
             // along with their display-category
             Archetype<GameObject> archetype;
-            for (CArchPanel.PanelNode node = CArchPanel.getStartPanelNode();
-                 node != null; node = node.next) {
+            for (final CArchPanel.PanelNode node : CArchPanel.getPanelNodeList()) {
 
                 final String[] numList = node.getData().getListArchNameArray();
                 final String[] catList = node.getData().getListCategoryArray(); // list of category strings


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

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

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

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

Log Message:
-----------
Make fields private.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CArchPanel.java
    trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java

Modified: trunk/crossfire/src/cfeditor/CArchPanel.java
===================================================================
--- trunk/crossfire/src/cfeditor/CArchPanel.java	2006-12-03 16:15:01 UTC (rev 822)
+++ trunk/crossfire/src/cfeditor/CArchPanel.java	2006-12-03 16:18:27 UTC (rev 823)
@@ -236,11 +236,11 @@
 
     public static final class PanelNode {
 
-        public final CArchPanelPan data;
+        private final CArchPanelPan data;
 
         public PanelNode next;  // next node
 
-        final String title;    // title of this PanelNode
+        private final String title;    // title of this PanelNode
 
         public PanelNode(final CArchPanelPan data, final String title) {
             this.data = data;
@@ -252,6 +252,10 @@
             return title;
         }
 
+        public CArchPanelPan getData() {
+            return data;
+        }
+
     } // class PanelNode
 
 } // class CArchPanel

Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java	2006-12-03 16:15:01 UTC (rev 822)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java	2006-12-03 16:18:27 UTC (rev 823)
@@ -634,8 +634,8 @@
             for (CArchPanel.PanelNode node = CArchPanel.getStartPanelNode();
                  node != null; node = node.next) {
 
-                final String[] numList = node.data.getListArchNameArray();
-                final String[] catList = node.data.getListCategoryArray(); // list of category strings
+                final String[] numList = node.getData().getListArchNameArray();
+                final String[] catList = node.getData().getListCategoryArray(); // list of category strings
 
                 // process every arch in this panel
                 for (int i = 0; i < numList.length; 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: [822] trunk

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

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

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

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CArchPanel.java
    trunk/daimonin/src/daieditor/CArchPanel.java

Modified: trunk/crossfire/src/cfeditor/CArchPanel.java
===================================================================
--- trunk/crossfire/src/cfeditor/CArchPanel.java	2006-12-03 16:08:44 UTC (rev 821)
+++ trunk/crossfire/src/cfeditor/CArchPanel.java	2006-12-03 16:15:01 UTC (rev 822)
@@ -113,12 +113,12 @@
         // we must set the list of the selected list depend on combo selection
         tabDesktop.addChangeListener(new ChangeListener() {
             public void stateChanged(final ChangeEvent e) {
-                final JTabbedPane tp = (JTabbedPane) e.getSource();
+                final JTabbedPane tabbedPane = (JTabbedPane) e.getSource();
 
                 // This is weird: we need to compare against SelectedComponent,
                 // and *not* SelectedIndex. The index seemed to get all messed up during
                 // load proccess, leading to odd behaviour and sometimes wrecked panes.
-                final Component sel = tp.getSelectedComponent();
+                final Component sel = tabbedPane.getSelectedComponent();
                 PanelNode node = panelNodeStart;
                 while (node != null && node.data.getPanel() != sel) {
                     node = node.next;

Modified: trunk/daimonin/src/daieditor/CArchPanel.java
===================================================================
--- trunk/daimonin/src/daieditor/CArchPanel.java	2006-12-03 16:08:44 UTC (rev 821)
+++ trunk/daimonin/src/daieditor/CArchPanel.java	2006-12-03 16:15:01 UTC (rev 822)
@@ -109,10 +109,10 @@
         // we must set the list of the selected list depend on combo selection
         tabDesktop.addChangeListener(new ChangeListener() {
             public void stateChanged(final ChangeEvent e) {
-                final JTabbedPane tp = (JTabbedPane) e.getSource();
+                final JTabbedPane tabbedPane = (JTabbedPane) e.getSource();
 
                 setSelectedArch(null);
-                final PanelNode node = panelNodeList.get(tp.getSelectedIndex());
+                final PanelNode node = panelNodeList.get(tabbedPane.getSelectedIndex());
                 selectedPanel = node.getData();
                 if (selectedPanel != null) {
                     selectedPanel.showArchList();


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

[Gridarta-commit] SF.net SVN: gridarta: [821] trunk/crossfire

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

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

Log Message:
-----------
Remove support for Iso-Tiles.

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

Removed Paths:
-------------
    trunk/crossfire/resource/system/igridtile.png
    trunk/crossfire/resource/system/inoarch.png
    trunk/crossfire/resource/system/inoface.png
    trunk/crossfire/resource/system/iseltile.png
    trunk/crossfire/resource/system/iunknown.png

Deleted: trunk/crossfire/resource/system/igridtile.png
===================================================================
(Binary files differ)

Deleted: trunk/crossfire/resource/system/inoarch.png
===================================================================
(Binary files differ)

Deleted: trunk/crossfire/resource/system/inoface.png
===================================================================
(Binary files differ)

Deleted: trunk/crossfire/resource/system/iseltile.png
===================================================================
(Binary files differ)

Deleted: trunk/crossfire/resource/system/iunknown.png
===================================================================
(Binary files differ)

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2006-12-03 15:56:25 UTC (rev 820)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2006-12-03 16:08:44 UTC (rev 821)
@@ -123,18 +123,8 @@
 
     private static ImageIcon nofaceTileIcon;
 
-    private static ImageIcon mapSelIconX;
-
-    private static ImageIcon mapGridIconX;
-
-    private static ImageIcon unknownTileIconX;
-
-    private static ImageIcon nofaceTileIconX;
-
     private static ImageIcon noarchTileIcon;
 
-    private static ImageIcon noarchTileIconX;
-
     private final ArchetypeSet archetypeSet; // the one and only arch list
 
     /** All open maps. */
@@ -1631,61 +1621,31 @@
     }
 
     public static ImageIcon getUnknownTileIcon() {
-        return unknownTileIconX;
+        return unknownTileIcon;
     }
 
-    public static ImageIcon getUnknownTileIconX() {
-        return unknownTileIconX;
-    }
-
     public static ImageIcon getNoarchTileIcon() {
-        return noarchTileIconX;
-    }
-
-    public static ImageIcon getNoarchTileIconF() {
         return noarchTileIcon;
     }
 
-    public static ImageIcon getNoarchTileIconX() {
-        return noarchTileIconX;
-    }
-
     public static ImageIcon getNofaceTileIcon() {
-        return nofaceTileIconX;
-    }
-
-    public static ImageIcon getNofaceTileIconF() {
         return nofaceTileIcon;
     }
 
-    public static ImageIcon getNofaceTileIconX() {
-        return nofaceTileIconX;
-    }
-
-    public static ImageIcon getMapSelIconF() {
+    public static ImageIcon getMapSelIcon() {
         return mapSelIcon;
     }
 
-    public static ImageIcon getMapSelIconX() {
-        return mapSelIconX;
-    }
-
     /**
      * Load all system tile icons into temporare variables for more convenient
      * access.
      */
     private static void loadDefTiles() {
-        mapGridIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_IGRID_TILE);
-        mapSelIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_ISEL_TILE);
-        unknownTileIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_IUNKNOWN);
-        nofaceTileIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_INOFACE);
-        noarchTileIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_INOARCH);
-
-        mapGridIconX = CGUIUtils.getSysIcon(IGUIConstants.TILE_GRID_TILE);
-        mapSelIconX = CGUIUtils.getSysIcon(IGUIConstants.TILE_SEL_TILE);
-        unknownTileIconX = CGUIUtils.getSysIcon(IGUIConstants.TILE_UNKNOWN);
-        nofaceTileIconX = CGUIUtils.getSysIcon(IGUIConstants.TILE_NOFACE);
-        noarchTileIconX = CGUIUtils.getSysIcon(IGUIConstants.TILE_NOARCH);
+        mapGridIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_GRID_TILE);
+        mapSelIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_SEL_TILE);
+        unknownTileIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_UNKNOWN);
+        nofaceTileIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_NOFACE);
+        noarchTileIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_NOARCH);
     }
 
     public void handleErrors(final GridderException error) {
@@ -1732,7 +1692,7 @@
     }
 
     public static ImageIcon getEmptyTileIcon() {
-        return nofaceTileIconX;
+        return nofaceTileIcon;
     }
 
     public MapControl[] getOpenedMaps() {

Modified: trunk/crossfire/src/cfeditor/IGUIConstants.java
===================================================================
--- trunk/crossfire/src/cfeditor/IGUIConstants.java	2006-12-03 15:56:25 UTC (rev 820)
+++ trunk/crossfire/src/cfeditor/IGUIConstants.java	2006-12-03 16:08:44 UTC (rev 821)
@@ -233,16 +233,6 @@
     String EDIT_PLUGINS_SMALLICON = "EditPluginSmallIcon.gif";
 
     // tile icons from the system dir:
-    String TILE_IGRID_TILE = "igridtile.png";
-
-    String TILE_ISEL_TILE = "iseltile.png";
-
-    String TILE_IUNKNOWN = "iunknown.png";
-
-    String TILE_INOFACE = "inoface.png";
-
-    String TILE_INOARCH = "inoarch.png";
-
     String TILE_GRID_TILE = "gridtile.png";
 
     String TILE_SEL_TILE = "seltile.png";

Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-03 15:56:25 UTC (rev 820)
+++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-03 16:08:44 UTC (rev 821)
@@ -221,7 +221,7 @@
                     if (isPickmap) {
                         grfx.fillRect(x * 32 + borderOffset, y * 32 + borderOffset, 32, 32);
                     } else {
-                        mainControl.getUnknownTileIconX().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
+                        mainControl.getUnknownTileIcon().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
                     }
                 } else {
                     for (final GameObject node : mapControl.getMapModel().getMapSquare(new Point(x, y))) {
@@ -231,12 +231,12 @@
                         }
                         if (mainControl.isTileEdit(node.getEditType()) || mainControl.getTileEdit() == 0 || isPickmap) {
                             if (node.getArchetypeName() == null) {
-                                mainControl.getNoarchTileIconX().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
+                                mainControl.getNoarchTileIcon().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
                             } else if (node.getFaceFlag()) {
-                                mainControl.getNofaceTileIconX().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
+                                mainControl.getNofaceTileIcon().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
                             } else {
                                 if (node.getFaceNr() == -1) {
-                                    mainControl.getUnknownTileIconX().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
+                                    mainControl.getUnknownTileIcon().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
                                 } else {
                                     // draw object face
                                     final ImageIcon img = archlist.getFace(node.getFaceNr());
@@ -322,7 +322,7 @@
                 grfx.setColor(IGUIConstants.BG_COLOR);
                 grfx.fillRect(x * 32 + borderOffset, y * 32 + borderOffset, 32, 32);
             } else {
-                mainControl.getUnknownTileIconX().paintIcon(this, grfx, x * 32, y * 32);
+                mainControl.getUnknownTileIcon().paintIcon(this, grfx, x * 32, y * 32);
             }
         } else {
             tmpGrfx.fillRect(0, 0, 32, 32);
@@ -334,12 +334,12 @@
                 }
                 if (mainControl.isTileEdit(node.getEditType()) || mainControl.getTileEdit() == 0) {
                     if (node.getArchetypeName() == null) {
-                        mainControl.getNoarchTileIconX().paintIcon(this, tmpGrfx, 0, 0);
+                        mainControl.getNoarchTileIcon().paintIcon(this, tmpGrfx, 0, 0);
                     } else if (node.getFaceFlag()) {
-                        mainControl.getNofaceTileIconX().paintIcon(this, tmpGrfx, 0, 0);
+                        mainControl.getNofaceTileIcon().paintIcon(this, tmpGrfx, 0, 0);
                     } else {
                         if (node.getFaceNr() == -1) {
-                            mainControl.getUnknownTileIconX().paintIcon(this, tmpGrfx, 0, 0);
+                            mainControl.getUnknownTileIcon().paintIcon(this, tmpGrfx, 0, 0);
                         } else {
                             final ImageIcon img = archlist.getFace(node.getFaceNr());
                             if (!node.isMulti() || (img.getIconWidth() == 32 && img.getIconHeight() == 32)) {
@@ -410,7 +410,7 @@
 
             // Highlight the selected square
             if (x >= topx && x <= botx && y >= topy && y <= boty) {
-                mainControl.getMapSelIconX().paintIcon(this, grfx, x * 32, y * 32);
+                mainControl.getMapSelIcon().paintIcon(this, grfx, x * 32, y * 32);
             }
         }
     }
@@ -447,7 +447,7 @@
                 // Draw the Icon:
 
                 // Rectangular view
-                mainControl.getMapSelIconX().paintIcon(this, grfx, posx * 32 + borderOffset, posy * 32 + borderOffset);
+                mainControl.getMapSelIcon().paintIcon(this, grfx, posx * 32 + borderOffset, posy * 32 + borderOffset);
 
                 if (signY == 0) {
                     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: [820] trunk

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

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

Log Message:
-----------
Make fields private.

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

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2006-12-03 15:50:35 UTC (rev 819)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2006-12-03 15:56:25 UTC (rev 820)
@@ -81,25 +81,25 @@
     /** Singleton instance reference. */
     private static CMainControl instance;
 
-    public static final String DOCU_VERSION_KEY = "docuVersion";
+    private static final String DOCU_VERSION_KEY = "docuVersion";
 
-    public static final String MAP_DIR_KEY = "mapDirectory";
+    private static final String MAP_DIR_KEY = "mapDirectory";
 
-    public static final String DEFAULT_MAP_DIR = "maps";
+    private static final String DEFAULT_MAP_DIR = "maps";
 
-    public static final String ARCH_DIR_KEY = "archDirectory";
+    private static final String ARCH_DIR_KEY = "archDirectory";
 
-    public static final String DEFAULT_ARCH_DIR = "arch";
+    private static final String DEFAULT_ARCH_DIR = "arch";
 
-    public static final String SCRIPT_DIR_KEY = "scriptDirectory";
+    private static final String SCRIPT_DIR_KEY = "scriptDirectory";
 
-    public static final String DEFAULT_SCRIPT_DIR = "script";
+    private static final String DEFAULT_SCRIPT_DIR = "script";
 
-    public static final String USE_IMAGESET = "useImageSet";
+    private static final String USE_IMAGESET = "useImageSet";
 
-    public static final String USE_FONT = "useFont";
+    private static final String USE_FONT = "useFont";
 
-    public static final String LOAD_ARCH_COLL = "loadArchFromCollection";
+    private static final String LOAD_ARCH_COLL = "loadArchFromCollection";
 
     public static final String PICKMAPS_LOCKED = "pickmapsLocked";
 

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2006-12-03 15:50:35 UTC (rev 819)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2006-12-03 15:56:25 UTC (rev 820)
@@ -214,7 +214,7 @@
 
     public static ImageIcon mapCursorIcon;
 
-    public static ImageIcon mapGridIcon;
+    private static ImageIcon mapGridIcon;
 
     public static ImageIcon unknownTileIcon;
 
@@ -287,16 +287,16 @@
     public static final boolean PREFS_VALIDATOR_AUTO_DEFAULT = false;
 
     /** The GameObjectMatcher for show only. */
-    public MutableOrGameObjectMatcher moaomShow = new MutableOrGameObjectMatcher(true);
+    private MutableOrGameObjectMatcher moaomShow = new MutableOrGameObjectMatcher(true);
 
     /** The GameObjectMatcher for alpha. */
-    public MutableOrGameObjectMatcher moaomAlpha = new MutableOrGameObjectMatcher(false);
+    private MutableOrGameObjectMatcher moaomAlpha = new MutableOrGameObjectMatcher(false);
 
     /** The ViewGameObjectMatcherManager for show only. */
-    public final ViewGameObjectMatcherManager vaommShow = new ViewGameObjectMatcherManager(moaomShow);
+    private final ViewGameObjectMatcherManager vaommShow = new ViewGameObjectMatcherManager(moaomShow);
 
     /** The ViewGameObjectMatcherManager for alpha. */
-    public final ViewGameObjectMatcherManager vaommAlpha = new ViewGameObjectMatcherManager(moaomAlpha);
+    private final ViewGameObjectMatcherManager vaommAlpha = new ViewGameObjectMatcherManager(moaomAlpha);
 
     private boolean gridVisible;
 


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

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

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

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

Log Message:
-----------
Make field private.

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

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2006-12-03 15:44:52 UTC (rev 818)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2006-12-03 15:50:35 UTC (rev 819)
@@ -194,7 +194,7 @@
     private final CMainView mainView;
 
     /** Bit field of edit types to show only. */
-    int tileEdit;
+    private int tileEdit;
 
     /** Bit field of edit types to show transparent. */
     private int alphaType;


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

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

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

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

Log Message:
-----------
Move message keys used by gridarta to gridarta messages.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/messages.properties
    trunk/src/app/net/sf/gridarta/messages.properties

Modified: trunk/daimonin/src/daieditor/messages.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages.properties	2006-12-03 14:39:08 UTC (rev 817)
+++ trunk/daimonin/src/daieditor/messages.properties	2006-12-03 15:44:52 UTC (rev 818)
@@ -289,8 +289,6 @@
 archCollectWarningMultipartTooShort.message=Collect Warning: Multipart object too short!
 archCollectWarningMissed.title=Collect Warning
 archCollectWarningMissed.message=Collect Warning: {0} arches have been missed during collect!
-archCollectErrorIOException.title=Collect Error
-archCollectErrorIOException.message=Collect Error: An I/O Exception occurred on file {0}:\n{1}
 archCollectErrorFileNotFound.title=Collect Error
 archCollectErrorFileNotFound.message=Collect Error: Cannot open input file\n{0}
 archCollectErrorFileUnexpectedEOF.title=Collect Error
@@ -896,8 +894,6 @@
 # Status Bar
 memory=({0}/{1}) Memory: {2} used, {3} free, {4} total.
 
-dialogDontShowAgain=Show this dialog again next time.
-
 #######################
 # Various Log Messages
 canonIOE=IOException while canonizing path: {0}

Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties	2006-12-03 14:39:08 UTC (rev 817)
+++ trunk/src/app/net/sf/gridarta/messages.properties	2006-12-03 15:44:52 UTC (rev 818)
@@ -7,6 +7,8 @@
 archCollectAnimations=Collecting Animations...
 archCollectImages=Collecting Images...
 archCollectDone=Collect Arches: done
+archCollectErrorIOException.title=Collect Error
+archCollectErrorIOException.message=Collect Error: An I/O Exception occurred on file {0}:\n{1}
 nameOfAnimationObject=Animation
 nameOfFaceObject=Face
 
@@ -15,6 +17,8 @@
 pickmapExists.title=Cannot Create Pickmap
 pickmapExists.message=A pickmap named {0} already exists.\nEither remove the existing one or choose a different name.
 
+dialogDontShowAgain=Show this dialog again next time.
+
 # New Map
 newMap.title=Create New Map
 newPickmap.title=Create New 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: [817] trunk/daimonin/src/daieditor

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

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

Log Message:
-----------
Re-add used message key 'enterExitIOException'.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/messages.properties
    trunk/daimonin/src/daieditor/messages_sv.properties

Modified: trunk/daimonin/src/daieditor/messages.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages.properties	2006-12-03 14:14:32 UTC (rev 816)
+++ trunk/daimonin/src/daieditor/messages.properties	2006-12-03 14:39:08 UTC (rev 817)
@@ -452,6 +452,8 @@
 enterExit.text=Enter Exit
 enterExit.mnemonic=E
 enterExit.accel=ctrl pressed NUMPAD5
+enterExitIOException.title=Invalid Path
+enterExitIOException.message=Failed to load file for path.\n{0}
 
 enterNorthMap.text=Enter North Map
 enterNorthMap.accel=ctrl pressed NUMPAD9

Modified: trunk/daimonin/src/daieditor/messages_sv.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_sv.properties	2006-12-03 14:14:32 UTC (rev 816)
+++ trunk/daimonin/src/daieditor/messages_sv.properties	2006-12-03 14:39:08 UTC (rev 817)
@@ -485,6 +485,8 @@
 enterExit.text=F\xF6lj utg\xE5ng
 enterExit.mnemonic=E
 enterExit.accel=ctrl pressed NUMPAD5
+enterExitIOException.title=Ogiltig s\xF6kv\xE4g
+enterExitIOException.message=Misslyckades \xF6ppna filen f\xF6r s\xF6kv\xE4gen.\n{0}
 
 enterNorthMap.text=G\xE5 norr
 enterNorthMap.accel=ctrl pressed NUMPAD9


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

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

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

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

Log Message:
-----------
Remove unused message key 'controlOutput'.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/messages.properties
    trunk/daimonin/src/daieditor/messages_sv.properties

Modified: trunk/daimonin/src/daieditor/messages.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages.properties	2006-12-03 14:08:58 UTC (rev 815)
+++ trunk/daimonin/src/daieditor/messages.properties	2006-12-03 14:14:32 UTC (rev 816)
@@ -614,7 +614,6 @@
 controlStart.text=Start
 controlStop.text=Stop
 controlStop.accel=ESCAPE
-controlOutput=Output
 controlServerWarning.title=Warning
 controlServerWarning.message=<html><h3>Warning!</h3><p>Java cannot cope with processes that use signal handlers doing lots of work.<br>The Daimonin Server is such a process.<br>Terminating the server using the Stop button will extremely likely<br>result in a Zombie process only killable via operating system tools.</p><p><strong>You have been warned!</strong></p></html>
 controlCloseOkay=You may safely close this window.

Modified: trunk/daimonin/src/daieditor/messages_sv.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_sv.properties	2006-12-03 14:08:58 UTC (rev 815)
+++ trunk/daimonin/src/daieditor/messages_sv.properties	2006-12-03 14:14:32 UTC (rev 816)
@@ -645,7 +645,6 @@
 controlStart.text=Starta
 controlStop.text=Stoppa
 controlStop.accel=ESCAPE
-controlOutput=Outdata
 controlServerWarning.title=Varning
 controlServerWarning.message=<html><h3>Varning!</h3><p>Java kan inte hantera processer som anv\xE4nder signalhanterare f\xF6r mycket arbete.<br>Daimoninservern \xE4r en s\xE5dan process.<br>Stopp av servern med "stoppa"-knappen kommer med stor sannolikhet<br>att resultera i en zombie-process som bara g\xE5r att ta bort med operativsystemets verktyg.</p><p><strong>Du har blivit varnad!</strong></p></html>
 controlCloseOkay=Du kan st\xE4nga f\xF6nstret nu.


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

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

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

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

Log Message:
-----------
Unify action factory use.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/CFArchType.java
    trunk/daimonin/src/daieditor/gui/MapFileFilter.java
    trunk/daimonin/src/daieditor/gui/map/tools/DeletionTool.java
    trunk/daimonin/src/daieditor/gui/map/tools/InsertionTool.java
    trunk/daimonin/src/daieditor/map/validation/AbstractValidator.java

Modified: trunk/daimonin/src/daieditor/CFArchType.java
===================================================================
--- trunk/daimonin/src/daieditor/CFArchType.java	2006-12-03 14:00:29 UTC (rev 814)
+++ trunk/daimonin/src/daieditor/CFArchType.java	2006-12-03 14:08:58 UTC (rev 815)
@@ -48,6 +48,9 @@
 
     private static final Logger log = Logger.getLogger(CFArchType.class);
 
+    /** Action Factory. */
+    private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("daieditor");
+
     /** Attribute Element Name. */
     public static final String XML_ATTRIBUTE = "attribute";
 
@@ -397,7 +400,7 @@
      * @return the full html-text to be (parsed and) displayed
      */
     public String createHtmlDocu() {
-        return ActionFactory.getFactory("daieditor").format("arcDoc.htmlText", typeName, desc != null ? desc.trim() : "", use != null ? use.trim() : "");
+        return ACTION_FACTORY.format("arcDoc.htmlText", typeName, desc != null ? desc.trim() : "", use != null ? use.trim() : "");
     }
 
     public CFArchAttrib[] getAttr() {

Modified: trunk/daimonin/src/daieditor/gui/MapFileFilter.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/MapFileFilter.java	2006-12-03 14:00:29 UTC (rev 814)
+++ trunk/daimonin/src/daieditor/gui/MapFileFilter.java	2006-12-03 14:08:58 UTC (rev 815)
@@ -37,6 +37,9 @@
  */
 public final class MapFileFilter extends EndingFileFilter {
 
+    /** Action Factory. */
+    private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("daieditor");
+
     /** Singleton instance. */
     private static final MapFileFilter instance = new MapFileFilter();
 
@@ -56,7 +59,7 @@
 
     /** Create a MapFileFilter. */
     private MapFileFilter() {
-        super(true, true, ActionFactory.getFactory("daieditor").getString("fileDialog.filter.maps"), new String[]{".lua", ".py", ".txt", ".text"});
+        super(true, true, ACTION_FACTORY.getString("fileDialog.filter.maps"), new String[]{".lua", ".py", ".txt", ".text"});
     }
 
     /**

Modified: trunk/daimonin/src/daieditor/gui/map/tools/DeletionTool.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/tools/DeletionTool.java	2006-12-03 14:00:29 UTC (rev 814)
+++ trunk/daimonin/src/daieditor/gui/map/tools/DeletionTool.java	2006-12-03 14:08:58 UTC (rev 815)
@@ -17,7 +17,7 @@
 /** MouseOpListener for deletion. */
 public class DeletionTool extends BasicAbstractTool {
 
-    /** The ActionFactory. */
+    /** Action Factory. */
     @NotNull private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("daieditor.gui.map.tools");
 
     /** The ToggleAction for toggling the deleteBelow status. */

Modified: trunk/daimonin/src/daieditor/gui/map/tools/InsertionTool.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/tools/InsertionTool.java	2006-12-03 14:00:29 UTC (rev 814)
+++ trunk/daimonin/src/daieditor/gui/map/tools/InsertionTool.java	2006-12-03 14:08:58 UTC (rev 815)
@@ -18,7 +18,7 @@
  */
 public class InsertionTool extends BasicAbstractTool {
 
-    /** The ActionFactory. */
+    /** Action Factory. */
     @NotNull private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("daieditor.gui.map.tools");
 
     /** The ToggleAction for toggling the insertBelow status. */

Modified: trunk/daimonin/src/daieditor/map/validation/AbstractValidator.java
===================================================================
--- trunk/daimonin/src/daieditor/map/validation/AbstractValidator.java	2006-12-03 14:00:29 UTC (rev 814)
+++ trunk/daimonin/src/daieditor/map/validation/AbstractValidator.java	2006-12-03 14:08:58 UTC (rev 815)
@@ -33,6 +33,9 @@
  */
 public abstract class AbstractValidator implements Validator {
 
+    /** Action Factory. */
+    private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("daieditor");
+
     /** Preferences. */
     private static final Preferences prefs = userNodeForPackage(CMainControl.class);
 
@@ -57,7 +60,7 @@
         }
         key = "Validator." + name.substring(0, name.indexOf("Checker"));
         enabled = prefs.getBoolean(key, false);
-        final String defaultEnabledString = ActionFactory.getFactory("daieditor").getString(key + ".default");
+        final String defaultEnabledString = ACTION_FACTORY.getString(key + ".default");
         defaultEnabled = Boolean.parseBoolean(defaultEnabledString);
     }
 
@@ -68,7 +71,7 @@
     protected AbstractValidator(final String key) {
         this.key = key;
         enabled = prefs.getBoolean(key, false);
-        final String defaultEnabledString = ActionFactory.getFactory("daieditor").getString(key + ".default");
+        final String defaultEnabledString = ACTION_FACTORY.getString(key + ".default");
         defaultEnabled = Boolean.parseBoolean(defaultEnabledString);
     }
 


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

[Gridarta-commit] SF.net SVN: gridarta: [814] trunk/daimonin/src/daieditor/gameobject/face/ FaceObjects.java

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

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

Log Message:
-----------
Use existing action factory instance.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java

Modified: trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java	2006-12-03 13:56:49 UTC (rev 813)
+++ trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java	2006-12-03 14:00:29 UTC (rev 814)
@@ -123,7 +123,7 @@
         try {
             treeIn = new BufferedReader(new InputStreamReader(new FileInputStream(treeFile), "us-ascii"));
         } catch (final FileNotFoundException e) {
-            ActionFactory.getFactory("daieditor").showMessageDialog(CMainControl.getInstance().getMainView(), "errCantLoadFaceTree");
+            ACTION_FACTORY.showMessageDialog(CMainControl.getInstance().getMainView(), "errCantLoadFaceTree");
         }
         final byte[] tag = "IMAGE ".getBytes(); // this is the starting string for a new png
         final StringBuilder faceB = new StringBuilder();  // face name of png


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

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

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

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

Log Message:
-----------
Add missing message key 'mapImagesOutOfMemory'.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/messages.properties

Modified: trunk/daimonin/src/daieditor/messages.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages.properties	2006-12-03 13:52:49 UTC (rev 812)
+++ trunk/daimonin/src/daieditor/messages.properties	2006-12-03 13:56:49 UTC (rev 813)
@@ -304,6 +304,7 @@
 statusSelect=Cursor x:{0,number,integer} y:{1,number,integer}  Offset x:{2,number,integer} y:{3,number,integer}
 statusNormal=Cursor x:{0,number,integer} y:{1,number,integer}
 statusCursorOff=Cursor off map
+mapImagesOutOfMemory=Out of memory creating map image
 
 #######
 # File


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

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

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

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

Log Message:
-----------
Remove unused message key.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/messages.properties
    trunk/daimonin/src/daieditor/messages_sv.properties

Modified: trunk/daimonin/src/daieditor/messages.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages.properties	2006-12-03 13:51:54 UTC (rev 811)
+++ trunk/daimonin/src/daieditor/messages.properties	2006-12-03 13:52:49 UTC (rev 812)
@@ -111,8 +111,6 @@
 enterExitClose.message=You''ve opened a new map.\nShould I close the previous one?
 enterTileNoTile.title=Destination Invalid
 enterTileNoTile.message=There is no tile map in that direction.
-enterTileInvalidPath.title=Invalid Path
-enterTileInvalidPath.message=The specified path is invalid:\n{0}
 enterTileIOException.title=Invalid Path
 enterTileIOException.message=Failed to load file for tiled map.\n{0}
 revertPickmapNotLoaded.title=Cannot revert Pickmap

Modified: trunk/daimonin/src/daieditor/messages_sv.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_sv.properties	2006-12-03 13:51:54 UTC (rev 811)
+++ trunk/daimonin/src/daieditor/messages_sv.properties	2006-12-03 13:52:49 UTC (rev 812)
@@ -108,8 +108,6 @@
 enterExitInvalidPath.message=Den angivna s\xF6kv\xE4gen \xE4r ogiltig.
 enterTileNoTile.title=M\xE5let ogiltigt
 enterTileNoTile.message=Det finns ingen karta \xE5t det h\xE5llet.
-enterTileInvalidPath.title=Ogiltig s\xF6kv\xE4g
-enterTileInvalidPath.message=Den angivna s\xF6kv\xE4gen \xE4r ogiltig.\n{0}
 enterTileIOException.title=Ogiltig s\xF6kv\xE4g
 enterTileIOException.message=Misslyckades \xF6ppna filen f\xF6r s\xF6kv\xE4gen.\n{0}
 revertPickmapNotLoaded.title=Kan inte \xE5terst\xE4lla plockkarta


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

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

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

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

Log Message:
-----------
Remove unused message key.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/messages.properties
    trunk/daimonin/src/daieditor/messages_sv.properties

Modified: trunk/daimonin/src/daieditor/messages.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages.properties	2006-12-03 13:49:41 UTC (rev 810)
+++ trunk/daimonin/src/daieditor/messages.properties	2006-12-03 13:51:54 UTC (rev 811)
@@ -107,8 +107,6 @@
 enterExitOutside.message=The destination of this exit is outside the map.
 enterExitInvalidPath.title=Invalid Path
 enterExitInvalidPath.message=The specified path is invalid.
-enterExitIOException.title=Invalid Path
-enterExitIOException.message=Failed to load file for path.\n{0}
 enterExitClose.title=Close previous map?
 enterExitClose.message=You''ve opened a new map.\nShould I close the previous one?
 enterTileNoTile.title=Destination Invalid

Modified: trunk/daimonin/src/daieditor/messages_sv.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_sv.properties	2006-12-03 13:49:41 UTC (rev 810)
+++ trunk/daimonin/src/daieditor/messages_sv.properties	2006-12-03 13:51:54 UTC (rev 811)
@@ -106,8 +106,6 @@
 enterExitOutside.message=M\xE5let f\xF6r utg\xE5ngen ligger utanf\xF6r kartan.
 enterExitInvalidPath.title=Ogiltig s\xF6kv\xE4g
 enterExitInvalidPath.message=Den angivna s\xF6kv\xE4gen \xE4r ogiltig.
-enterExitIOException.title=Ogiltig s\xF6kv\xE4g
-enterExitIOException.message=Misslyckades \xF6ppna filen f\xF6r s\xF6kv\xE4gen.\n{0}
 enterTileNoTile.title=M\xE5let ogiltigt
 enterTileNoTile.message=Det finns ingen karta \xE5t det h\xE5llet.
 enterTileInvalidPath.title=Ogiltig s\xF6kv\xE4g


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

[Gridarta-commit] SF.net SVN: gridarta: [810] trunk/daimonin/src/daieditor/gameobject/face/ FaceObjects.java

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

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

Log Message:
-----------
Use log4j.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java

Modified: trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java	2006-12-03 13:47:36 UTC (rev 809)
+++ trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java	2006-12-03 13:49:41 UTC (rev 810)
@@ -38,11 +38,10 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import net.sf.gridarta.gameobject.face.AbstractFaceObjects;
 import net.sf.japi.swing.ActionFactory;
 import net.sf.japi.swing.Progress;
+import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -54,6 +53,9 @@
     /** Size of the image buffer. */
     private static final int IMAGE_BUFFER_SIZE = 50 * 1024;
 
+    /** Logger. */
+    private static final Logger log = Logger.getLogger(FaceObjects.class);
+
     /** Action Factory. */
     private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("daieditor");
 
@@ -151,7 +153,7 @@
                 if (treeIn != null) {
                     final String originalFilename = treeIn.readLine();
                     if (originalFilename == null) {
-                        Logger.getLogger("daieditor").log(Level.WARNING, "faceObjectWithoutOriginalName", faceName);
+                        log.warn(ACTION_FACTORY.format("faceObjectWithoutOriginalName", faceName));
                     } else {
                         addFaceObject(faceName, originalFilename, actualFilename, offset, size);
                     }


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