Merge remote-tracking branch 'hharrison/master'

3 files changed, 47 insertions, 51 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/util/packrect/Level.java b/src/jogl/classes/com/jogamp/opengl/util/packrect/Level.java
index 661e104b6..9aadfba93 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/packrect/Level.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/Level.java
@@ -47,15 +47,13 @@ public class Level {
   private int yPos;
   private LevelSet holder;
 
-  private List/*<Rect>*/ rects = new ArrayList/*<Rect>*/();
-  private List/*<Rect>*/ freeList;
+  private List<Rect> rects = new ArrayList<Rect>();
+  private List<Rect> freeList;
   private int nextAddX;
 
-  static class RectXComparator implements Comparator {
+  static class RectXComparator implements Comparator<Rect> {
     @Override
-    public int compare(Object o1, Object o2) {
-      Rect r1 = (Rect) o1;
-      Rect r2 = (Rect) o2;
+    public int compare(Rect r1, Rect r2) {
       return r1.x() - r2.x();
     }
 
@@ -64,7 +62,7 @@ public class Level {
       return this == obj;
     }
   }
-  private static final Comparator rectXComparator = new RectXComparator();
+  private static final Comparator<Rect> rectXComparator = new RectXComparator();
 
   public Level(int width, int height, int yPos, LevelSet holder) {
     this.width = width;
@@ -110,8 +108,8 @@ public class Level {
     // See whether we can add from the free list
     if (freeList != null) {
       Rect candidate = null;
-      for (Iterator iter = freeList.iterator(); iter.hasNext(); ) {
-        Rect cur = (Rect) iter.next();
+      for (Iterator<Rect> iter = freeList.iterator(); iter.hasNext(); ) {
+        Rect cur = iter.next();
         if (cur.canContain(rect)) {
           candidate = cur;
           break;
@@ -151,7 +149,7 @@ public class Level {
       nextAddX -= rect.w();
     } else {
       if (freeList == null) {
-        freeList = new ArrayList/*<Rect>*/();
+        freeList = new ArrayList<Rect>();
       }
       freeList.add(new Rect(rect.x(), rect.y(), rect.w(), height, null));
       coalesceFreeList();
@@ -173,8 +171,8 @@ public class Level {
     if (freeList == null)
       return false;
     int freeListWidth = 0;
-    for (Iterator iter = freeList.iterator(); iter.hasNext(); ) {
-      Rect cur = (Rect) iter.next();
+    for (Iterator<Rect> iter = freeList.iterator(); iter.hasNext(); ) {
+      Rect cur = iter.next();
       freeListWidth += cur.w();
     }
     // Add on the remaining space at the end
@@ -186,8 +184,8 @@ public class Level {
     Collections.sort(rects, rectXComparator);
     int nextCompactionDest = 0;
     manager.beginMovement(backingStore, backingStore);
-    for (Iterator iter = rects.iterator(); iter.hasNext(); ) {
-      Rect cur = (Rect) iter.next();
+    for (Iterator<Rect> iter = rects.iterator(); iter.hasNext(); ) {
+      Rect cur = iter.next();
       if (cur.x() != nextCompactionDest) {
         manager.move(backingStore, cur,
                      backingStore, new Rect(nextCompactionDest, cur.y(), cur.w(), cur.h(), null));
@@ -200,14 +198,14 @@ public class Level {
     manager.endMovement(backingStore, backingStore);
   }
 
-  public Iterator iterator() {
+  public Iterator<Rect> iterator() {
     return rects.iterator();
   }
 
   /** Visits all Rects contained in this Level. */
   public void visit(RectVisitor visitor) {
-    for (Iterator iter = rects.iterator(); iter.hasNext(); ) {
-      Rect rect = (Rect) iter.next();
+    for (Iterator<Rect> iter = rects.iterator(); iter.hasNext(); ) {
+      Rect rect = iter.next();
       visitor.visit(rect);
     }
   }
@@ -218,7 +216,7 @@ public class Level {
       original Rects. */
   public void updateRectangleReferences() {
     for (int i = 0; i < rects.size(); i++) {
-      Rect cur = (Rect) rects.get(i);
+      Rect cur = rects.get(i);
       Rect next = cur.getNextLocation();
       next.setPosition(cur.x(), cur.y());
       if (cur.w() != next.w() || cur.h() != next.h())
@@ -237,8 +235,8 @@ public class Level {
     Collections.sort(freeList, rectXComparator);
     int i = 0;
     while (i < freeList.size() - 1) {
-      Rect r1 = (Rect) freeList.get(i);
-      Rect r2 = (Rect) freeList.get(i+1);
+      Rect r1 = freeList.get(i);
+      Rect r2 = freeList.get(i+1);
       if (r1.maxX() + 1 == r2.x()) {
         // Coalesce r1 and r2 into one block
         freeList.remove(i+1);
@@ -248,7 +246,7 @@ public class Level {
       }
     }
     // See whether the last block bumps up against the addition point
-    Rect last = (Rect) freeList.get(freeList.size() - 1);
+    Rect last = freeList.get(freeList.size() - 1);
     if (last.maxX() + 1 == nextAddX) {
       nextAddX -= last.w();
       freeList.remove(freeList.size() - 1);
@@ -264,8 +262,8 @@ public class Level {
 
   public void dumpFreeSpace() {
     int freeListWidth = 0;
-    for (Iterator iter = freeList.iterator(); iter.hasNext(); ) {
-      Rect cur = (Rect) iter.next();
+    for (Iterator<Rect> iter = freeList.iterator(); iter.hasNext(); ) {
+      Rect cur = iter.next();
       System.err.println(" Free rectangle at " + cur);
       freeListWidth += cur.w();
     }
diff --git a/src/jogl/classes/com/jogamp/opengl/util/packrect/LevelSet.java b/src/jogl/classes/com/jogamp/opengl/util/packrect/LevelSet.java
index e14eef5ba..433421f1a 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/packrect/LevelSet.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/LevelSet.java
@@ -47,7 +47,7 @@ import java.util.*;
 
 public class LevelSet {
   // Maintained in sorted order by increasing Y coordinate
-  private List/*<Level>*/ levels = new ArrayList/*<Level>*/();
+  private List<Level> levels = new ArrayList<Level>();
   private int nextAddY;
   private int w;
   private int h;
@@ -73,7 +73,7 @@ public class LevelSet {
     // Go in reverse order through the levels seeing whether we can
     // trivially satisfy the allocation request
     for (int i = levels.size() - 1; i >= 0; --i) {
-      Level level = (Level) levels.get(i);
+      Level level = levels.get(i);
       if (level.add(rect))
         return true;
     }
@@ -82,7 +82,7 @@ public class LevelSet {
     // increases the computational complexity of the addition process,
     // but prevents us from expanding unnecessarily.
     for (int i = levels.size() - 1; i >= 0; --i) {
-      Level level = (Level) levels.get(i);
+      Level level = levels.get(i);
       if (level.couldAllocateIfCompacted(rect))
         return false;
     }
@@ -104,7 +104,7 @@ public class LevelSet {
   /** Removes the given Rect from this LevelSet. */
   public boolean remove(Rect rect) {
     for (int i = levels.size() - 1; i >= 0; --i) {
-      Level level = (Level) levels.get(i);
+      Level level = levels.get(i);
       if (level.remove(rect))
         return true;
     }
@@ -120,7 +120,7 @@ public class LevelSet {
                                Object backingStore,
                                BackingStoreManager manager) {
     for (int i = levels.size() - 1; i >= 0; --i) {
-      Level level = (Level) levels.get(i);
+      Level level = levels.get(i);
       if (level.couldAllocateIfCompacted(rect)) {
         level.compact(backingStore, manager);
         boolean res = level.add(rect);
@@ -173,8 +173,8 @@ public class LevelSet {
     int usedHeight = getUsedHeight();
     if (usedHeight == 0)
       return 0.0f;
-    for (Iterator iter = iterator(); iter.hasNext(); ) {
-      Level level = (Level) iter.next();
+    for (Iterator<Level> iter = iterator(); iter.hasNext(); ) {
+      Level level = iter.next();
       if (level.isEmpty()) {
         freeHeight += level.h();
       }
@@ -182,14 +182,14 @@ public class LevelSet {
     return (float) freeHeight / (float) usedHeight;
   }
 
-  public Iterator iterator() {
+  public Iterator<Level> iterator() {
     return levels.iterator();
   }
 
   /** Visits all Rects contained in this LevelSet. */
   public void visit(RectVisitor visitor) {
-    for (Iterator iter = levels.iterator(); iter.hasNext(); ) {
-      Level level = (Level) iter.next();
+    for (Iterator<Level> iter = levels.iterator(); iter.hasNext(); ) {
+      Level level = iter.next();
       level.visit(visitor);
     }
   }
@@ -199,8 +199,8 @@ public class LevelSet {
       update the new Rects in a newly laid-out LevelSet with the
       original Rects. */
   public void updateRectangleReferences() {
-    for (Iterator iter = levels.iterator(); iter.hasNext(); ) {
-      Level level = (Level) iter.next();
+    for (Iterator<Level> iter = levels.iterator(); iter.hasNext(); ) {
+      Level level = iter.next();
       level.updateRectangleReferences();
     }
   }
diff --git a/src/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java b/src/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java
index 2ee6a79b3..44faa44b0 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java
@@ -60,11 +60,9 @@ public class RectanglePacker {
   private int maxWidth  = -1;
   private int maxHeight = -1;
 
-  static class RectHComparator implements Comparator {
+  static class RectHComparator implements Comparator<Rect> {
     @Override
-    public int compare(Object o1, Object o2) {
-      Rect r1 = (Rect) o1;
-      Rect r2 = (Rect) o2;
+    public int compare(Rect r1, Rect r2) {
       return r2.h() - r1.h();
     }
 
@@ -73,7 +71,7 @@ public class RectanglePacker {
       return this == obj;
     }
   }
-  private static final Comparator rectHComparator = new RectHComparator();
+  private static final Comparator<Rect> rectHComparator = new RectHComparator();
 
   public RectanglePacker(BackingStoreManager manager,
                          int initialWidth,
@@ -207,11 +205,11 @@ public class RectanglePacker {
       nextLevelSet = new LevelSet(newWidth, newHeight);
 
       // Make copies of all existing rectangles
-      List/*<Rect>*/ newRects = new ArrayList/*<Rect>*/();
-      for (Iterator i1 = levels.iterator(); i1.hasNext(); ) {
-        Level level = (Level) i1.next();
-        for (Iterator i2 = level.iterator(); i2.hasNext(); ) {
-          Rect cur = (Rect) i2.next();
+      List<Rect> newRects = new ArrayList<Rect>();
+      for (Iterator<Level> i1 = levels.iterator(); i1.hasNext(); ) {
+        Level level = i1.next();
+        for (Iterator<Rect> i2 = level.iterator(); i2.hasNext(); ) {
+          Rect cur = i2.next();
           Rect newRect = new Rect(0, 0, cur.w(), cur.h(), null);
           cur.setNextLocation(newRect);
           // Hook up the reverse mapping too for easier replacement
@@ -224,8 +222,8 @@ public class RectanglePacker {
       Collections.sort(newRects, rectHComparator);
       // Try putting all of these rectangles into the new level set
       done = true;
-      for (Iterator iter = newRects.iterator(); iter.hasNext(); ) {
-        if (!nextLevelSet.add((Rect) iter.next())) {
+      for (Iterator<Rect> iter = newRects.iterator(); iter.hasNext(); ) {
+        if (!nextLevelSet.add(iter.next())) {
           done = false;
           break;
         }
@@ -273,10 +271,10 @@ public class RectanglePacker {
     Object newBackingStore = manager.allocateBackingStore(nextLevelSet.w(),
                                                           nextLevelSet.h());
     manager.beginMovement(backingStore, newBackingStore);
-    for (Iterator i1 = levels.iterator(); i1.hasNext(); ) {
-      Level level = (Level) i1.next();
-      for (Iterator i2 = level.iterator(); i2.hasNext(); ) {
-        Rect cur = (Rect) i2.next();
+    for (Iterator<Level> i1 = levels.iterator(); i1.hasNext(); ) {
+      Level level = i1.next();
+      for (Iterator<Rect> i2 = level.iterator(); i2.hasNext(); ) {
+        Rect cur = i2.next();
         manager.move(backingStore, cur,
                      newBackingStore, cur.getNextLocation());
       }