Updates and fixed to preset handling

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

diff --git a/core/src/net/sf/openrocket/preset/TypedPropertyMap.java b/core/src/net/sf/openrocket/preset/TypedPropertyMap.java
index 48d5bb945dc4dfbdbd93ec623baf1c21ff7241cc..d034c6064fdc1c4a142405c6208cc6407311cf99 100644 (file)
--- a/core/src/net/sf/openrocket/preset/TypedPropertyMap.java
+++ b/core/src/net/sf/openrocket/preset/TypedPropertyMap.java
@@ -7,74 +7,64 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 public class TypedPropertyMap {
-
+       
        private final Map<TypedKey<?>, Object> delegate;
        
        public TypedPropertyMap() {
-               delegate = new LinkedHashMap<TypedKey<?>,Object>();
+               delegate = new LinkedHashMap<TypedKey<?>, Object>();
        }
-
+       
        public int size() {
                return delegate.size();
        }
-
+       
        public boolean isEmpty() {
                return delegate.isEmpty();
        }
-
+       
        public boolean containsKey(Object key) {
                return delegate.containsKey(key);
        }
-
+       
        public boolean containsValue(Object value) {
                return delegate.containsValue(value);
        }
-
+       
        @SuppressWarnings("unchecked")
        public <T> T get(TypedKey<T> key) {
                return (T) delegate.get(key);
        }
-
+       
        @SuppressWarnings("unchecked")
        public <T> T put(TypedKey<T> key, T value) {
                return (T) delegate.put(key, value);
        }
-
+       
        public Object remove(Object key) {
                return delegate.remove(key);
        }
-
+       
        public void putAll(TypedPropertyMap other) {
-               if ( other == null ) {
+               if (other == null) {
                        return;
                }
                delegate.putAll(other.delegate);
        }
-
+       
        public void clear() {
                delegate.clear();
        }
-
+       
        public Set<TypedKey<?>> keySet() {
                return delegate.keySet();
        }
-
+       
        public Collection<Object> values() {
                return delegate.values();
        }
-
+       
        public Set<Entry<TypedKey<?>, Object>> entrySet() {
                return delegate.entrySet();
        }
-
-       @Override
-       public boolean equals(Object o) {
-               return delegate.equals(o);
-       }
-
-       @Override
-       public int hashCode() {
-               return delegate.hashCode();
-       }
        
 }