create changelog entry

[debian/openrocket] / core / src / net / sf / openrocket / preset / TypedKey.java

diff --git a/core/src/net/sf/openrocket/preset/TypedKey.java b/core/src/net/sf/openrocket/preset/TypedKey.java
index 74caeb4dab212bce05d178002db27243a9b853b1..c3e4473187ad88199ea11e60fd1d247230530aa3 100644 (file)
--- a/core/src/net/sf/openrocket/preset/TypedKey.java
+++ b/core/src/net/sf/openrocket/preset/TypedKey.java
@@ -1,10 +1,5 @@
 package net.sf.openrocket.preset;
 
-import net.sf.openrocket.database.Databases;
-import net.sf.openrocket.material.Material;
-import net.sf.openrocket.motor.Manufacturer;
-import net.sf.openrocket.rocketcomponent.ExternalComponent.Finish;
-import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.unit.UnitGroup;
 
 public class TypedKey<T> {
@@ -23,6 +18,11 @@ public class TypedKey<T> {
                this.unitGroup = unitGroup;
        }
 
+       @Override
+       public String toString() {
+               return "TypedKey [name=" + name + "]";
+       }
+
        public String getName() {
                return name;
        }
@@ -35,48 +35,6 @@ public class TypedKey<T> {
                return unitGroup;
        }
 
-       public Object parseFromString( String value ) {
-               if ( type.equals(Manufacturer.class)) {
-                       Manufacturer m = Manufacturer.getManufacturer(value);
-                       return m;
-               }
-               if ( type.equals(ComponentPreset.Type.class) ) {
-                       ComponentPreset.Type t = ComponentPreset.Type.valueOf(value);
-                       return t;
-               }
-               if ( type.equals(Boolean.class) ) {
-                       return Boolean.parseBoolean(value);
-               }
-               if ( type.isAssignableFrom(Double.class) ) {
-                       return Double.parseDouble(value);
-               }
-               if ( type.equals(String.class ) ) {
-                       return value;
-               }
-               if ( type.equals(Finish.class) ) {
-                       return Finish.valueOf(value);
-               }
-               if ( type.equals(Material.class) ) {
-                       // need to translate the value first!
-                       String translated_value = Application.getTranslator().get(value);
-                       Material material;
-                       material = Databases.findMaterial(Material.Type.BULK, translated_value);
-                       if ( material != null ) {
-                               return material;
-                       }
-                       material = Databases.findMaterial(Material.Type.LINE, translated_value);
-                       if ( material != null ) {
-                               return material;
-                       }
-                       material = Databases.findMaterial(Material.Type.SURFACE, translated_value);
-                       if ( material != null ) {
-                               return material;
-                       }
-                       throw new IllegalArgumentException("Invalid material " + value + " in component preset.");
-               }
-               throw new IllegalArgumentException("Inavlid type " + type.getName() + " for component preset parameter " + name);
-       }
-
        @Override
        public int hashCode() {
                final int prime = 31;