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

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

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

Log Message:
-----------
Move unified class ArchAttribType to gridarta source.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CAttribDialog.java
    trunk/crossfire/src/cfeditor/CFArchAttrib.java
    trunk/crossfire/src/cfeditor/CFArchType.java
    trunk/daimonin/src/daieditor/CAttribDialog.java
    trunk/daimonin/src/daieditor/CFArchAttrib.java
    trunk/daimonin/src/daieditor/CFArchType.java

Added Paths:
-----------
    trunk/src/app/net/sf/gridarta/gameobject/ArchAttribType.java

Removed Paths:
-------------
    trunk/crossfire/src/cfeditor/gameobject/ArchAttribType.java
    trunk/daimonin/src/daieditor/gameobject/ArchAttribType.java

Modified: trunk/crossfire/src/cfeditor/CAttribDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/CAttribDialog.java	2006-12-10 18:10:58 UTC (rev 1027)
+++ trunk/crossfire/src/cfeditor/CAttribDialog.java	2006-12-10 18:29:56 UTC (rev 1028)
@@ -24,7 +24,6 @@
 
 package cfeditor;
 
-import cfeditor.gameobject.ArchAttribType;
 import cfeditor.gameobject.ArchetypeSet;
 import cfeditor.gameobject.GameObject;
 import java.awt.BorderLayout;
@@ -85,6 +84,7 @@
 import javax.swing.text.Style;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyleContext;
+import net.sf.gridarta.gameobject.ArchAttribType;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.NamedObject;
 import net.sf.gridarta.gameobject.NamedObjects;

Modified: trunk/crossfire/src/cfeditor/CFArchAttrib.java
===================================================================
--- trunk/crossfire/src/cfeditor/CFArchAttrib.java	2006-12-10 18:10:58 UTC (rev 1027)
+++ trunk/crossfire/src/cfeditor/CFArchAttrib.java	2006-12-10 18:29:56 UTC (rev 1028)
@@ -24,11 +24,11 @@
 
 package cfeditor;
 
-import cfeditor.gameobject.ArchAttribType;
 import java.io.BufferedReader;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.StringReader;
+import net.sf.gridarta.gameobject.ArchAttribType;
 import org.apache.log4j.Logger;
 import org.jdom.Attribute;
 import org.jdom.DataConversionException;

Modified: trunk/crossfire/src/cfeditor/CFArchType.java
===================================================================
--- trunk/crossfire/src/cfeditor/CFArchType.java	2006-12-10 18:10:58 UTC (rev 1027)
+++ trunk/crossfire/src/cfeditor/CFArchType.java	2006-12-10 18:29:56 UTC (rev 1028)
@@ -24,11 +24,11 @@
 
 package cfeditor;
 
-import cfeditor.gameobject.ArchAttribType;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import net.sf.gridarta.gameobject.ArchAttribType;
 import org.apache.log4j.Logger;
 import org.jdom.Attribute;
 import org.jdom.Element;

Deleted: trunk/crossfire/src/cfeditor/gameobject/ArchAttribType.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/ArchAttribType.java	2006-12-10 18:10:58 UTC (rev 1027)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchAttribType.java	2006-12-10 18:29:56 UTC (rev 1028)
@@ -1,78 +0,0 @@
-/*
- * Daimonin Java Editor.
- * Copyright (C) 2005  Christian Hujer
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- */
-
-package cfeditor.gameobject;
-
-/**
- * Enumeration for Archetype Attribute Types.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
- */
-public enum ArchAttribType {
-
-    /** Boolean -&gt; Checkbox. */
-    BOOL,
-
-    /** Boolean -&gt; Checkbox, with customized true/false values. */
-    BOOL_SPEC,
-
-    /** Integer -&gt; Textfield. */
-    INT,
-
-    /** Long -&gt; Textfield. */
-    LONG,
-
-    /** Float -&gt; Textfield. */
-    FLOAT,
-
-    /** String -&gt; Textfield. */
-    STRING,
-
-    /** Text -&gt; Textarea. */
-    TEXT,
-
-    /** Fixed String -&gt; (No input). */
-    FIXED,
-
-    /** Spell -&gt; Spell number (Combobox). */
-    SPELL,
-
-    /** ZSpell -&gt; Spell number (except that 0 is always 0, not magic bullet). */
-    ZSPELL,
-
-    /** Bitmask -&gt; Special input with popup frame. */
-    BITMASK,
-
-    /** List -&gt; Combobox. */
-    LIST,
-
-    /** Treasure -&gt; treasurelist (Textfield and Tree). */
-    TREASURE,
-
-    /** Double List -&gt; 2 × Combobox. */
-    DBLLIST,
-
-    /** Face name -&gt; Textfield and Tree. */
-    FACENAME,
-
-    /** Animation name -&gt; Textfield and Tree. */
-    ANIMNAME
-
-} // enum ArchAttribType

Modified: trunk/daimonin/src/daieditor/CAttribDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/CAttribDialog.java	2006-12-10 18:10:58 UTC (rev 1027)
+++ trunk/daimonin/src/daieditor/CAttribDialog.java	2006-12-10 18:29:56 UTC (rev 1028)
@@ -24,7 +24,6 @@
 
 package daieditor;
 
-import daieditor.gameobject.ArchAttribType;
 import daieditor.gameobject.GameObject;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
@@ -84,6 +83,7 @@
 import javax.swing.text.Style;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyleContext;
+import net.sf.gridarta.gameobject.ArchAttribType;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.NamedObject;
 import net.sf.gridarta.gameobject.NamedObjects;

Modified: trunk/daimonin/src/daieditor/CFArchAttrib.java
===================================================================
--- trunk/daimonin/src/daieditor/CFArchAttrib.java	2006-12-10 18:10:58 UTC (rev 1027)
+++ trunk/daimonin/src/daieditor/CFArchAttrib.java	2006-12-10 18:29:56 UTC (rev 1028)
@@ -24,7 +24,7 @@
 
 package daieditor;
 
-import daieditor.gameobject.ArchAttribType;
+import net.sf.gridarta.gameobject.ArchAttribType;
 import org.apache.log4j.Logger;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;

Modified: trunk/daimonin/src/daieditor/CFArchType.java
===================================================================
--- trunk/daimonin/src/daieditor/CFArchType.java	2006-12-10 18:10:58 UTC (rev 1027)
+++ trunk/daimonin/src/daieditor/CFArchType.java	2006-12-10 18:29:56 UTC (rev 1028)
@@ -24,11 +24,11 @@
 
 package daieditor;
 
-import daieditor.gameobject.ArchAttribType;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import net.sf.gridarta.gameobject.ArchAttribType;
 import net.sf.japi.swing.ActionFactory;
 import net.sf.japi.xml.NodeListIterator;
 import static net.sf.japi.xml.NodeListIterator.getFirstChild;

Deleted: trunk/daimonin/src/daieditor/gameobject/ArchAttribType.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchAttribType.java	2006-12-10 18:10:58 UTC (rev 1027)
+++ trunk/daimonin/src/daieditor/gameobject/ArchAttribType.java	2006-12-10 18:29:56 UTC (rev 1028)
@@ -1,78 +0,0 @@
-/*
- * Daimonin Java Editor.
- * Copyright (C) 2005  Christian Hujer
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- */
-
-package daieditor.gameobject;
-
-/**
- * Enumeration for Archetype Attribute Types.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
- */
-public enum ArchAttribType {
-
-    /** Boolean -&gt; Checkbox. */
-    BOOL,
-
-    /** Boolean -&gt; Checkbox, with customized true/false values. */
-    BOOL_SPEC,
-
-    /** Integer -&gt; Textfield. */
-    INT,
-
-    /** Long -&gt; Textfield. */
-    LONG,
-
-    /** Float -&gt; Textfield. */
-    FLOAT,
-
-    /** String -&gt; Textfield. */
-    STRING,
-
-    /** Text -&gt; Textarea. */
-    TEXT,
-
-    /** Fixed String -&gt; (No input). */
-    FIXED,
-
-    /** Spell -&gt; Spell number (Combobox). */
-    SPELL,
-
-    /** ZSpell -&gt; Spell number (except that 0 is always 0, not magic bullet). */
-    ZSPELL,
-
-    /** Bitmask -&gt; Special input with popup frame. */
-    BITMASK,
-
-    /** List -&gt; Combobox. */
-    LIST,
-
-    /** Treasure -&gt; treasurelist (Textfield and Tree). */
-    TREASURE,
-
-    /** Double List -&gt; 2 × Combobox. */
-    DBLLIST,
-
-    /** Face name -&gt; Textfield and Tree. */
-    FACENAME,
-
-    /** Animation name -&gt; Textfield and Tree. */
-    ANIMNAME
-
-} // enum ArchAttribType

Added: trunk/src/app/net/sf/gridarta/gameobject/ArchAttribType.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/ArchAttribType.java	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/gameobject/ArchAttribType.java	2006-12-10 18:29:56 UTC (rev 1028)
@@ -0,0 +1,77 @@
+/*
+ * Gridarta Editor.
+ * Copyright (C) 2005  Christian Hujer
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+package net.sf.gridarta.gameobject;
+
+/**
+ * Enumeration for Archetype Attribute Types.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public enum ArchAttribType {
+
+    /** Boolean -&gt; Checkbox. */
+    BOOL,
+
+    /** Boolean -&gt; Checkbox, with customized true/false values. */
+    BOOL_SPEC,
+
+    /** Integer -&gt; Textfield. */
+    INT,
+
+    /** Long -&gt; Textfield. */
+    LONG,
+
+    /** Float -&gt; Textfield. */
+    FLOAT,
+
+    /** String -&gt; Textfield. */
+    STRING,
+
+    /** Text -&gt; Textarea. */
+    TEXT,
+
+    /** Fixed String -&gt; (No input). */
+    FIXED,
+
+    /** Spell -&gt; Spell number (Combobox). */
+    SPELL,
+
+    /** ZSpell -&gt; Spell number (except that 0 is always 0, not magic bullet). */
+    ZSPELL,
+
+    /** Bitmask -&gt; Special input with popup frame. */
+    BITMASK,
+
+    /** List -&gt; Combobox. */
+    LIST,
+
+    /** Treasure -&gt; treasurelist (Textfield and Tree). */
+    TREASURE,
+
+    /** Double List -&gt; 2 × Combobox. */
+    DBLLIST,
+
+    /** Face name -&gt; Textfield and Tree. */
+    FACENAME,
+
+    /** Animation name -&gt; Textfield and Tree. */
+    ANIMNAME
+
+} // enum ArchAttribType


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


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