From: <aki...@us...> - 2006-12-22 21:25:53
|
Revision: 1214 http://svn.sourceforge.net/gridarta/?rev=1214&view=rev Author: akirschbaum Date: 2006-12-22 13:25:53 -0800 (Fri, 22 Dec 2006) Log Message: ----------- Remove unused code. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainControl.java trunk/crossfire/src/cfeditor/IGUIConstants.java trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java Removed Paths: ------------- trunk/crossfire/resource/conf/typenumbers.xml Deleted: trunk/crossfire/resource/conf/typenumbers.xml =================================================================== --- trunk/crossfire/resource/conf/typenumbers.xml 2006-12-22 21:25:11 UTC (rev 1213) +++ trunk/crossfire/resource/conf/typenumbers.xml 2006-12-22 21:25:53 UTC (rev 1214) @@ -1,162 +0,0 @@ -<?xml version="1.0" standalone="yes" ?> -<!-- - ################################################################# - # This file contains the typenumbers with their associated # - # names, from the file "define.h" in the crossfire package. # - # This file should be updated when new types have been defined. # - ################################################################# ---> -<!DOCTYPE typenumbers [ - <!ELEMENT typenumbers (type*)> - - <!ELEMENT type EMPTY> - <!ATTLIST type number CDATA #REQUIRED - name CDATA #REQUIRED> -]> - -<typenumbers> - <type number="0" name="*NONE*" /> - <type number="1" name="PLAYER" /> - <type number="2" name="TRANSPORT" /> - <type number="3" name="ROD" /> - <type number="4" name="TREASURE" /> - <type number="5" name="POTION" /> - <type number="6" name="FOOD" /> - <type number="7" name="POISON" /> - <type number="8" name="BOOK" /> - <type number="9" name="CLOCK" /> - <!--<type number="10" name="FBULLET" />--> - <!--<type number="11" name="FBALL" />--> - <type number="12" name="LIGHTNING" /> - <type number="13" name="ARROW" /> - <type number="14" name="BOW" /> - <type number="15" name="WEAPON" /> - <type number="16" name="ARMOUR" /> - <type number="17" name="PEDESTAL" /> - <type number="18" name="ALTAR" /> - <!--<type number="19" name="CONFUSION" />--> - <type number="20" name="LOCKED_DOOR" /> - <type number="21" name="SPECIAL_KEY" /> - <type number="22" name="MAP" /> - <type number="23" name="DOOR" /> - <type number="24" name="KEY" /> - <!--<type number="25" name="MMISSILE" />--> - <type number="26" name="TIMED_GATE" /> - <type number="27" name="TRIGGER" /> - <type number="28" name="GRIMREAPER" /> - <type number="29" name="MAGIC_EAR" /> - <type number="30" name="TRIGGER_BUTTON" /> - <type number="31" name="TRIGGER_ALTAR" /> - <type number="32" name="TRIGGER_PEDESTAL" /> - <type number="33" name="SHIELD" /> - <type number="34" name="HELMET" /> - <type number="35" name="HORN" /> - <type number="36" name="MONEY" /> - <type number="37" name="CLASS" /> - <type number="38" name="GRAVESTONE" /> - <type number="39" name="AMULET" /> - <type number="40" name="PLAYERMOVER" /> - <type number="41" name="TELEPORTER" /> - <type number="42" name="CREATOR" /> - <type number="43" name="SKILL" /> - <type number="44" name="EXPERIENCE" /> - <type number="45" name="EARTHWALL" /> - <type number="46" name="GOLEM" /> - <!--<type number="47" name="BOMB" />--> - <type number="48" name="THROWN_OBJ" /> - <type number="49" name="BLINDNESS" /> - <type number="50" name="GOD" /> - <type number="51" name="DETECTOR" /> - <type number="52" name="TRIGGER_MARKER" /> - <type number="53" name="DEAD_OBJECT" /> - <type number="54" name="DRINK" /> - <type number="55" name="MARKER" /> - <type number="56" name="HOLY_ALTAR" /> - <type number="57" name="PLAYER_CHANGER" /> - <type number="58" name="BATTLEGROUND" /> - <type number="59" name="PEACEMAKER" /> - <type number="60" name="GEM" /> - <!--<type number="61" name="FIRECHEST" />--> - <type number="62" name="FIREWALL" /> - <type number="63" name="ANVIL" /> - <type number="64" name="CHECK_INV" /> - <type number="65" name="MOOD_FLOOR" /> - <type number="66" name="EXIT" /> - <type number="67" name="ENCOUNTER" /> - <type number="68" name="SHOP_FLOOR" /> - <type number="69" name="SHOP_MAT" /> - <type number="70" name="RING" /> - <type number="71" name="FLOOR" /> - <type number="72" name="FLESH" /> - <type number="73" name="INORGANIC" /> - <type number="74" name="SKILL_TOOL" /> - <type number="75" name="LIGHTER" /> - <type number="76" name="TRAP_PART" /> - <type number="77" name="WALL" /> - <type number="78" name="LIGHT_SOURCE" /> - <type number="79" name="MISC_OBJECT" /> - <type number="80" name="MONSTER" /> - <type number="81" name="SPAWN_GENERATOR" /> - <type number="82" name="LAMP" /> - <type number="83" name="DUPLICATOR" /> - <type number="84" name="TOOL" /> - <type number="85" name="SPELLBOOK" /> - <type number="86" name="BUILDFAC" /> - <type number="87" name="CLOAK" /> - <!--<type number="88" name="CONE" />--> - <!--<type number="89" name="AURA" />--> - <type number="90" name="SPINNER" /> - <type number="91" name="GATE" /> - <type number="92" name="BUTTON" /> - <type number="93" name="CF_HANDLE" /> - <type number="94" name="HOLE" /> - <type number="95" name="TRAPDOOR" /> - <!--<type number="96" name="WORD_OF_RECALL" />--> - <!--<type number="97" name="PARAIMAGE" />--> - <type number="98" name="SIGN" /> - <type number="99" name="BOOTS" /> - <type number="100" name="GLOVES" /> - <type number="101" name="SPELL" /> - <type number="102" name="SPELL_EFFECT" /> - <type number="103" name="CONVERTER" /> - <type number="104" name="BRACERS" /> - <type number="105" name="POISONING" /> - <type number="106" name="SAVEBED" /> - <type number="107" name="POISONCLOUD" /> - <type number="108" name="FIREHOLES" /> - <type number="109" name="WAND" /> - <!--<type number="110" name="ABILITY" />--> - <type number="111" name="SCROLL" /> - <type number="112" name="DIRECTOR" /> - <type number="113" name="GIRDLE" /> - <type number="114" name="FORCE" /> - <type number="115" name="POTION_EFFECT" /> - - <type number="121" name="CLOSE_CON" /> - <type number="122" name="CONTAINER" /> - <type number="123" name="ARMOUR_IMPROVER" /> - <type number="124" name="WEAPON_IMPROVER" /> - - <type number="130" name="SKILLSCROLL" /> - - <type number="138" name="DEEP_SWAMP" /> - <type number="139" name="IDENTIFY_ALTAR" /> - - <!--<type number="141" name="CANCELLATION" />--> - - <type number="150" name="MENU" /> - <!--<type number="151" name="BALL_LIGHTNING" />--> - - <!--<type number="153" name="SWARM_SPELL" />--> - <type number="154" name="RUNE" /> - <type number="155" name="TRAP" /> - <type number="156" name="POWER_CRYSTAL" /> - <type number="157" name="CORPSE" /> - <type number="158" name="DISEASE" /> - <type number="159" name="SYMPTOM" /> - <type number="160" name="BUILDER" /> - <type number="161" name="MATERIAL" /> - <type number="162" name="GPS" /> - <type number="163" name="ITEM_TRANSFORMER" /> - <type number="164" name="QUEST" /> -</typenumbers> Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-22 21:25:11 UTC (rev 1213) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-22 21:25:53 UTC (rev 1214) @@ -253,10 +253,6 @@ animationObjects = new AnimationObjects(); faceObjects = new FaceObjects(); - // read in the type & type field definitions - archetypeParser.loadTypeNumbers(); - //loadTypeDef(); - // load the list with archtype-data from "types.txt" typeList = new CFArchTypeList(); Modified: trunk/crossfire/src/cfeditor/IGUIConstants.java =================================================================== --- trunk/crossfire/src/cfeditor/IGUIConstants.java 2006-12-22 21:25:11 UTC (rev 1213) +++ trunk/crossfire/src/cfeditor/IGUIConstants.java 2006-12-22 21:25:53 UTC (rev 1214) @@ -141,8 +141,6 @@ // name of the configuration files: String SPELL_FILE = "spells.xml"; // spell-numbers - String TYPENR_FILE = "typenumbers.xml"; // type-numbers - String TYPEDEF_FILE = "types.xml"; // type-definitions String ARCH_FILE = "archetypes"; // file with all arches Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java =================================================================== --- trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java 2006-12-22 21:25:11 UTC (rev 1213) +++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java 2006-12-22 21:25:53 UTC (rev 1214) @@ -37,11 +37,6 @@ import net.sf.gridarta.gameobject.anim.DuplicateAnimationException; import net.sf.gridarta.io.IOUtils; import org.apache.log4j.Logger; -import org.jdom.DataConversionException; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.JDOMException; -import org.jdom.input.SAXBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -59,9 +54,6 @@ /** Logger. */ private static final Logger log = Logger.getLogger(ArchetypeParser.class); - // table with type numbers as keys (Integer), and type names as values (String) - private Map<Integer,String> archTypeNumbers; - private final CMainControl mainControl; /** @@ -70,86 +62,8 @@ */ public ArchetypeParser(final CMainControl mainControl) { this.mainControl = mainControl; - archTypeNumbers = null; } - /** - * Parse the typenumbers file (associate names with type numbers) - * Type numbers and names are stored as key-value pairs in the - * Hashtable 'archTypeNumbers'. - */ - public void loadTypeNumbers() { - archTypeNumbers = new HashMap<Integer,String>(); - - try { - // open reading stream to the spells xml file - final String baseDir = IGUIConstants.CONFIG_DIR; - final BufferedReader reader = IOUtils.createReader(baseDir, IGUIConstants.TYPENR_FILE); - try { - - // parse xml document - final SAXBuilder builder = new SAXBuilder(); - builder.setValidation(true); - final Document doc = builder.build(reader); - - // retrieve the spell data from the xml - final Element root = doc.getRootElement(); - if (root == null || !"typenumbers".equalsIgnoreCase(root.getName())) { - log.warn("File '" + IGUIConstants.TYPENR_FILE + "' lacks root element 'typenumbers'."); - } else { - final List types = root.getChildren("type"); - if (types == null || types.size() == 0) { - log.warn("File '" + IGUIConstants.TYPENR_FILE + "' has no content."); - } else { - // process all 'type' elements from the xml file - int i; - for (i = 0; i < types.size(); i++) { - final Element typeElem = (Element) types.get(i); - - if (typeElem.getAttribute("number") == null) { - log.warn("In File '" + IGUIConstants.TYPENR_FILE + "': Found 'type' element without 'number'"); - } else if (typeElem.getAttribute("name") == null) { - log.warn("In File '" + IGUIConstants.TYPENR_FILE + "': Found 'type' element without 'name'"); - } else { - try { - // parse type number and -name, then add it to the table 'archTypeNumbers' - archTypeNumbers.put(typeElem.getAttribute("number").getIntValue(), typeElem.getAttribute("name").getValue()); - } catch (final DataConversionException de) { - log.error("In '" + IGUIConstants.TYPENR_FILE + "':\n type number '" + typeElem.getAttribute("number").getValue() + "' is not an integer."); - } - } - } - - // loading successful - if (log.isInfoEnabled()) { - log.info("" + i + " typenumbers loaded."); - } - } - } - } finally { - reader.close(); - } - } catch (final JDOMException e) { - log.error("Parsing error in '" + IGUIConstants.TYPENR_FILE + "'", e); - } catch (final FileNotFoundException e) { - log.error("Cannot read file '" + IGUIConstants.TYPENR_FILE + "'!", e); - } catch (final IOException e) { - log.error("Error while reading file '" + IGUIConstants.TYPENR_FILE + "'!", e); - } - } - - /** - * Lookup the name of an archtype. - * @param index type number - * @return name of this type, as defined in "typenumbers.xml" - */ - public String getArchTypeName(final int index) { - if (archTypeNumbers != null && archTypeNumbers.containsKey(index)) { - return archTypeNumbers.get(index); - } - return "*UNKNOWN" + index + "*"; // this type is unknown - } - /** {@inheritDoc} */ public void parseArchetype(final String fname, @NotNull final String panelName, @NotNull final String folderName) { //Open the file for reading This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |