Changeset 3398 in josm

Timestamp:

Jul 31, 2010 5:12:26 PM (3 years ago)

Author:

bastiK

Message:

reduce number of warnings

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/OsmPrimitive.java (modified) (1 diff)
• data/osm/Storage.java (modified) (17 diffs)
• data/osm/visitor/paint/MapPainter.java (modified) (1 diff)
• data/osm/visitor/paint/SimplePaintVisitor.java (modified) (5 diffs)
• gui/dialogs/InspectPrimitiveDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -1511 +1511 @@
             builder.append("D");
         }
-        if (isFiltered()) {
-            builder.append("f");
-        }
         if (isDisabled()) {
-            builder.append("d");
+            if (isDisabledAndHidden()) {
+                builder.append("h");
+            } else {
+                builder.append("d");
+            }
         }
         if (isTagged()) {

trunk/src/org/openstreetmap/josm/data/osm/Storage.java

@@ -88 +88 @@
 public class Storage<T> extends AbstractSet<T> {
     private final Hash<? super T,? super T> hash;
-    private Object[] data;
+    private T[] data;
     private int mask;
     private int size;
@@ -111 +111 @@
         this.hash = ha;
         int cap = 1 << (int)(Math.ceil(Math.log(capacity/loadFactor) / Math.log(2)));
-        data = new Object[cap];
+        data = (T[]) new Object[cap];
         mask = data.length - 1;
         this.safeIterator = safeIterator;
@@ -118 +118 @@
     private void copyArray() {
         if (arrayCopyNecessary) {
-            Object[] newData = new Object[data.length];
+            T[] newData = (T[]) new Object[data.length];
             System.arraycopy(data, 0, newData, 0, data.length);
             data = newData;
@@ -141 +141 @@
     }
 
-    public synchronized @Override boolean contains(Object o) {
+    @Override
+    public synchronized boolean contains(Object o) {
         int bucket = getBucket(hash, (T)o);
         return bucket >= 0;
     }
 
-    public synchronized @Override boolean add(T t) {
+    @Override 
+    public synchronized boolean add(T t) {
         T orig = putUnique(t);
         return orig == t;
     }
 
-    public synchronized @Override boolean remove(Object o) {
+    @Override
+    public synchronized boolean remove(Object o) {
         T orig = removeElem((T)o);
         return orig != null;
     }
-
-    public synchronized @Override void clear() {
+    
+    @Override
+    public synchronized void clear() {
         copyArray();
         modCount++;
@@ -165 +169 @@
     }
 
-    public synchronized @Override int hashCode() {
+    @Override
+    public synchronized int hashCode() {
         int h = 0;
         for (T t : this) {
@@ -187 +192 @@
         }
 
-        T old = (T)data[bucket];
+        T old = data[bucket];
         data[bucket] = t;
 
@@ -195 +200 @@
     public synchronized T get(T t) {
         int bucket = getBucket(hash, t);
-        return bucket < 0 ? null : (T)data[bucket];
+        return bucket < 0 ? null : data[bucket];
     }
 
@@ -211 +216 @@
         }
 
-        return (T)data[bucket];
+        return data[bucket];
     }
 
@@ -222 +227 @@
 
     public <K> Map<K,T> foreignKey(Hash<K,? super T> h) {
-        return new FMap(h);
+        return new FMap<K>(h);
     }
 
@@ -246 +251 @@
         int hcode = rehash(ha.getHashCode(key));
         int bucket = hcode & mask;
-        while ((entry = (T)data[bucket]) != null) {
+        while ((entry = data[bucket]) != null) {
             if (ha.equals(key, entry))
                 return bucket;
@@ -255 +260 @@
 
     private T doRemove(int slot) {
-        T t = (T)data[slot];
+        T t = data[slot];
         assert t != null;
 
@@ -267 +272 @@
         T entry;
 
-        while ((entry = (T)data[bucket]) != null) {
+        while ((entry = data[bucket]) != null) {
             int right = rehash(hash.getHashCode(entry)) & mask;
             // if the entry should be in <hole+1,bucket-1> (circular-wise)
@@ -287 +292 @@
     private void ensureSpace() {
         if (size > data.length*loadFactor) { // rehash
-            Object[] big = new Object[data.length * 2];
+            T[] big = (T[]) new Object[data.length * 2];
             int nMask = big.length - 1;
 
-            for (Object o : data) {
+            for (T o : data) {
                 if (o == null) {
                     continue;
                 }
-                int bucket = rehash(hash.getHashCode((T)o)) & nMask;
+                int bucket = rehash(hash.getHashCode(o)) & nMask;
                 while (big[bucket] != null) {
                     bucket = (bucket+1) & nMask;
@@ -361 +366 @@
         public T get(Object key) {
             int bucket = getBucket(fHash, (K)key);
-            return bucket < 0 ? null : (T)data[bucket];
+            return bucket < 0 ? null : data[bucket];
         }
 
@@ -404 +409 @@
 
     private final class SafeReadonlyIter implements Iterator<T> {
-        final Object[] data;
+        final T[] data;
         int slot = 0;
 
-        SafeReadonlyIter(Object[] data) {
+        SafeReadonlyIter(T[] data) {
             this.data = data;
         }
@@ -418 +423 @@
         public T next() {
             if (!hasNext()) throw new NoSuchElementException();
-            return (T)data[slot++];
+            return data[slot++];
         }
 
@@ -450 +455 @@
             if (!hasNext()) throw new NoSuchElementException();
             removeSlot = slot;
-            return (T)data[slot++];
+            return data[slot++];
         }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

@@ -310 +310 @@
             GeneralPath path = new GeneralPath();
             for (Way osm: ways){
-                if (osm.isUsable() && !osm.isFiltered() && !osm.isDisabled()) {
+                if (osm.isUsable() && !osm.isDisabled()) {
                     visitVirtual(path, osm);
                 }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/SimplePaintVisitor.java

@@ -155 +155 @@
         //profilerN = 0;
         for (final OsmPrimitive osm: data.searchRelations(bbox)) {
-            if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isFiltered()) {
+            if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isDisabledAndHidden()) {
                 osm.visit(this);
                 //        profilerN++;
@@ -169 +169 @@
         //profilerN = 0;
         for (final OsmPrimitive osm:data.searchWays(bbox)){
-            if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isFiltered() && osm.isTagged()) {
+            if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isDisabledAndHidden() && osm.isTagged()) {
                 osm.visit(this);
                 //        profilerN++;
@@ -177 +177 @@
 
         for (final OsmPrimitive osm:data.searchWays(bbox)){
-            if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isFiltered() && !osm.isTagged()) {
+            if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isDisabledAndHidden() && !osm.isTagged()) {
                 osm.visit(this);
                 //        profilerN++;
@@ -207 +207 @@
         //profilerN = 0;
         for (final OsmPrimitive osm: data.searchNodes(bbox)) {
-            if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isFiltered())
+            if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isDisabledAndHidden())
             {
                 osm.visit(this);
@@ -295 +295 @@
             GeneralPath path = new GeneralPath();
             for (Way osm: ways){
-                if (osm.isUsable() && !osm.isFiltered() && !osm.isDisabled()) {
+                if (osm.isUsable() && !osm.isDisabledAndHidden() && !osm.isDisabled()) {
                     visitVirtual(path, osm);
                 }

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java

@@ -149 +149 @@
             s.append("; modified");
         }
-        if (o.isFiltered()) {
+        if (o.isDisabledAndHidden()) {
             s.append("; filtered/hidden");
         }