[Jython-checkins] SF.net SVN: jython:[6687] trunk/jython/src/org/python/core/util

[<pj...@us...>]

Revision: 6687
          http://jython.svn.sourceforge.net/jython/?rev=6687&view=rev
Author:   pjenvey
Date:     2009-08-17 01:47:30 +0000 (Mon, 17 Aug 2009)

Log Message:
-----------
quiet warnings

Modified Paths:
--------------
    trunk/jython/src/org/python/core/util/ByteSwapper.java
    trunk/jython/src/org/python/core/util/ConcurrentHashSet.java

Modified: trunk/jython/src/org/python/core/util/ByteSwapper.java
===================================================================
--- trunk/jython/src/org/python/core/util/ByteSwapper.java	2009-08-17 01:43:09 UTC (rev 6686)
+++ trunk/jython/src/org/python/core/util/ByteSwapper.java	2009-08-17 01:47:30 UTC (rev 6687)
@@ -42,7 +42,7 @@
      * @param array the input array for type sensitive byte swapping.
      */
     public static void swap(Object array) {
-        Class arrayType = array.getClass().getComponentType();
+        Class<?> arrayType = array.getClass().getComponentType();
 
         if (arrayType.isPrimitive()) {
             if (arrayType == Boolean.TYPE) {
@@ -89,8 +89,8 @@
             b6 = (tmp >> 40) & 0xff;
             b7 = (tmp >> 48) & 0xff;
             b8 = (tmp >> 56) & 0xff;
-            tmp = b1 << 56 | b2 << 48 | b3 << 40 | b4 << 32 | b5 << 24
-                    | b6 << 16 | b7 << 8 | b8 << 0;
+            tmp = b1 << 56 | b2 << 48 | b3 << 40 | b4 << 32 | b5 << 24 | b6 << 16 | b7 << 8
+                    | b8 << 0;
 
             dtmp = Double.longBitsToDouble(tmp);
             Array.setDouble(array, i, dtmp);
@@ -167,8 +167,8 @@
             b6 = (tmp >> 40) & 0xff;
             b7 = (tmp >> 48) & 0xff;
             b8 = (tmp >> 56) & 0xff;
-            tmp = b1 << 56 | b2 << 48 | b3 << 40 | b4 << 32 | b5 << 24
-                    | b6 << 16 | b7 << 8 | b8 << 0;
+            tmp = b1 << 56 | b2 << 48 | b3 << 40 | b4 << 32 | b5 << 24 | b6 << 16 | b7 << 8
+                    | b8 << 0;
 
             Array.setLong(array, i, tmp);
         }

Modified: trunk/jython/src/org/python/core/util/ConcurrentHashSet.java
===================================================================
--- trunk/jython/src/org/python/core/util/ConcurrentHashSet.java	2009-08-17 01:43:09 UTC (rev 6686)
+++ trunk/jython/src/org/python/core/util/ConcurrentHashSet.java	2009-08-17 01:47:30 UTC (rev 6687)
@@ -40,54 +40,67 @@
         keySet = map.keySet();
     }
 
+    @Override
     public int size() {
         return map.size();
     }
 
+    @Override
     public boolean isEmpty() {
         return map.isEmpty();
     }
 
+    @Override
     public boolean contains(Object o) {
         return map.containsKey(o);
     }
 
+    @Override
     public Iterator<E> iterator() {
         return keySet.iterator();
     }
 
+    @Override
     public Object[] toArray() {
         return keySet.toArray();
     }
 
+    @Override
     public <T> T[] toArray(T[] a) {
         return keySet.toArray(a);
     }
 
+    @Override
     public boolean add(E e) {
         return map.put(e, PRESENT) == null;
     }
 
+    @Override
     public boolean remove(Object o) {
         return map.remove(o) != null;
     }
 
+    @Override
     public boolean removeAll(Collection<?> c) {
         return keySet.removeAll(c);
     }
 
+    @Override
     public boolean retainAll(Collection<?> c) {
         return keySet.retainAll(c);
     }
 
+    @Override
     public void clear() {
         map.clear();
     }
 
+    @Override
     public boolean equals(Object o) {
         return keySet.equals(o);
     }
 
+    @Override
     public int hashCode() {
         return keySet.hashCode();
     }


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