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

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

Revision: 4416
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4416&view=rev
Author:   akirschbaum
Date:     2008-07-24 18:08:20 +0000 (Thu, 24 Jul 2008)

Log Message:
-----------
Extract code into AttributeListUtils.removeAttribute().

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
    trunk/src/app/net/sf/gridarta/gui/gameobjecttexteditor/GameObjectTextEditor.java

Added Paths:
-----------
    trunk/src/app/net/sf/gridarta/gameobject/AttributeListUtils.java
    trunk/src/test/net/sf/gridarta/gameobject/
    trunk/src/test/net/sf/gridarta/gameobject/AttributeListUtilsTest.java

Added: trunk/src/app/net/sf/gridarta/gameobject/AttributeListUtils.java
===================================================================

--- trunk/src/app/net/sf/gridarta/gameobject/AttributeListUtils.java	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/gameobject/AttributeListUtils.java	2008-07-24 18:08:20 UTC (rev 4416)
@@ -0,0 +1,67 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2007 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.gameobject;
+
+import java.util.regex.Pattern;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Utility class for archetype attribute related functions.
+ * @author Andreas Kirschbaum
+ */
+public class AttributeListUtils {
+
+    /**
+     * The pattern for splitting attribute lines.
+     */
+    private static final Pattern patternEndOfLine = Pattern.compile("\\s*\n");
+
+    /**
+     * Private constructor to prevent instantiation.
+     */
+    private AttributeListUtils() {
+    }
+
+    /**
+     * Removes an attribute from an attribute list.
+     * @param attributeList the attribute list to modify
+     * @param key the attribute key to remove
+     * @return the attribute list with the given key removed
+     */
+    public static String removeAttribute(@NotNull final String attributeList, @NotNull final String key) {
+        if (attributeList.length() <= 0) {
+            return attributeList;
+        }
+
+        final String prefix = key + " ";
+
+        final String[] lines = patternEndOfLine.split(attributeList, -1);
+
+        final StringBuilder sb = new StringBuilder();
+        for (final String line : lines) {
+            if (line.length() > 0 && !line.startsWith(prefix)) {
+                sb.append(line);
+                sb.append('\n');
+            }
+        }
+        return sb.toString();
+    }
+
+} // class AttributeListUtils


Property changes on: trunk/src/app/net/sf/gridarta/gameobject/AttributeListUtils.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF

Modified: trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java	2008-07-24 10:48:57 UTC (rev 4415)
+++ trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java	2008-07-24 18:08:20 UTC (rev 4416)
@@ -852,7 +852,7 @@
     }
 
     private void applyDirectionChanges(final G gameObject, final int dir) {
-        gameObjectTextEditor.applyDirectionChanges(gameObject, dir, gameObject.getArchetype().getDirection());
+        gameObjectTextEditor.applyDirectionChanges(dir, gameObject.getArchetype().getDirection());
         applyArchPanelChanges(gameObject);
         setSelectedGameObject(gameObject);
     }

Modified: trunk/src/app/net/sf/gridarta/gui/gameobjecttexteditor/GameObjectTextEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjecttexteditor/GameObjectTextEditor.java	2008-07-24 10:48:57 UTC (rev 4415)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjecttexteditor/GameObjectTextEditor.java	2008-07-24 18:08:20 UTC (rev 4416)
@@ -28,6 +28,7 @@
 import javax.swing.text.Style;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyleContext;
+import net.sf.gridarta.gameobject.AttributeListUtils;
 import net.sf.gridarta.gameobject.GameObject;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -87,32 +88,15 @@
         archEdit.setCaretPosition(0);
     }
 
-    public void applyDirectionChanges(@NotNull final GameObject<?, ?, ?> gameObject, final int dir, final int archDir) {
-        final StringBuilder newText = new StringBuilder();
-        final String text = archEdit.getText();
-        final int len = text.length();
-
-        // exlude all possible previous direction command
-        int start = 0;
-        for (int i = 0; i < len; i++) {
-            if (text.charAt(i) == '\n') {
-                if (i - start > 0) {
-                    if (!text.regionMatches(start, "direction", 0, 9)) {
-                        newText.append(text.substring(start, i)).append('\n');
-                    }
-                }
-                start = i + 1;
-            }
-        }
-
-        // add our direction
-        // direction 0 is a special case: the server default value
-        // of a new gameObject is direction 0. So, a server defarch has direction 0
+    public void applyDirectionChanges(final int dir, final int archDir) {
+        final String archEditText = AttributeListUtils.removeAttribute(archEdit.getText(), "direction");
+        // direction 0 is a special case: the server default value of a new
+        // game object is direction 0. So, a server defarch has direction 0
         // even without a direction command in the archetype.
         if (dir == 0 && archDir == 0) {
-            archEdit.setText(newText.toString());
+            archEdit.setText(archEditText);
         } else {
-            archEdit.setText(newText.append("direction ").append(dir).append('\n').toString());
+            archEdit.setText(archEditText + "direction " + dir + "\n");
         }
     }
 

Added: trunk/src/test/net/sf/gridarta/gameobject/AttributeListUtilsTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/gameobject/AttributeListUtilsTest.java	                        (rev 0)
+++ trunk/src/test/net/sf/gridarta/gameobject/AttributeListUtilsTest.java	2008-07-24 18:08:20 UTC (rev 4416)
@@ -0,0 +1,59 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2007 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package test.net.sf.gridarta.gameobject;
+
+import net.sf.gridarta.gameobject.AttributeListUtils;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Test for {@link AttributeListUtils}.
+ * @author Andreas Kirschbaum
+ */
+@SuppressWarnings({"FeatureEnvy"})
+// This is a test. It has feature envy by definition.
+public class AttributeListUtilsTest {
+
+    /** Test case for {@link AttributeListUtils#removeAttribute(String, String)}. */
+    @Test
+    public void testRemoveAttribute() {
+        checkRemoveAttribute("", "abc", "");
+
+        checkRemoveAttribute("abc def\n", "abc", "");
+        checkRemoveAttribute("abc def\n", "ab", "abc def\n");
+        checkRemoveAttribute("abc def\n", "abcd", "abc def\n");
+
+        checkRemoveAttribute("abc def\nghi jkl\nmno pqr\n", "abc", "ghi jkl\nmno pqr\n");
+        checkRemoveAttribute("abc def\nghi jkl\nmno pqr\n", "def", "abc def\nghi jkl\nmno pqr\n");
+        checkRemoveAttribute("abc def\nghi jkl\nmno pqr\n", "ghi", "abc def\nmno pqr\n");
+        checkRemoveAttribute("abc def\nghi jkl\nmno pqr\n", "mno", "abc def\nghi jkl\n");
+
+        checkRemoveAttribute("abc def\nghi jkl\nmno pqr\n", "Abc", "abc def\nghi jkl\nmno pqr\n");
+
+        checkRemoveAttribute("abc def\n\nghi jkl\n\n", "xyz", "abc def\nghi jkl\n");
+        checkRemoveAttribute("\n\nabc def\n\n", "ghi", "abc def\n");
+        checkRemoveAttribute("\n\nabc def\n\n", "abc", "");
+    }
+
+    private static void checkRemoveAttribute(final String attributeList, final String key, final String expectedResult) {
+        Assert.assertEquals(expectedResult, AttributeListUtils.removeAttribute(attributeList, key));
+    }
+
+} // class AttributeListUtilsTest


Property changes on: trunk/src/test/net/sf/gridarta/gameobject/AttributeListUtilsTest.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF


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




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

gridarta-commit