aboutsummaryrefslogtreecommitdiffstats
path: root/src/classes
diff options
context:
space:
mode:
Diffstat (limited to 'src/classes')
-rw-r--r--src/classes/share/javax/media/j3d/Canvas3D.java10
-rw-r--r--src/classes/share/javax/media/j3d/RenderBin.java6
-rw-r--r--src/classes/share/javax/media/j3d/Renderer.java12
3 files changed, 14 insertions, 14 deletions
diff --git a/src/classes/share/javax/media/j3d/Canvas3D.java b/src/classes/share/javax/media/j3d/Canvas3D.java
index 6037d2a..c32b37e 100644
--- a/src/classes/share/javax/media/j3d/Canvas3D.java
+++ b/src/classes/share/javax/media/j3d/Canvas3D.java
@@ -760,8 +760,8 @@ ArrayList<RenderAtomListInfo> dirtyRenderAtomList = new ArrayList<RenderAtomList
// List of (Rm, rInfo) pair of individual dlists that need to be rebuilt
ArrayList dirtyDlistPerRinfoList = new ArrayList();
- ArrayList displayListResourceFreeList = new ArrayList();
- ArrayList textureIdResourceFreeList = new ArrayList();
+ArrayList<Integer> displayListResourceFreeList = new ArrayList<Integer>();
+ArrayList<Integer> textureIdResourceFreeList = new ArrayList<Integer>();
// an unique bit to identify this canvas
int canvasBit = 0;
@@ -4810,7 +4810,7 @@ ArrayList<RenderAtomListInfo> dirtyRenderAtomList = new ArrayList<RenderAtomList
// handle free resource in the FreeList
void freeResourcesInFreeList(Context ctx) {
- Iterator it;
+ Iterator<Integer> it;
ArrayList list;
int i, val;
GeometryArrayRetained geo;
@@ -4819,7 +4819,7 @@ ArrayList<RenderAtomListInfo> dirtyRenderAtomList = new ArrayList<RenderAtomList
// don't use shared ctx
if (displayListResourceFreeList.size() > 0) {
for (it = displayListResourceFreeList.iterator(); it.hasNext();) {
- val = ((Integer) it.next()).intValue();
+ val = it.next().intValue();
if (val <= 0) {
continue;
}
@@ -4830,7 +4830,7 @@ ArrayList<RenderAtomListInfo> dirtyRenderAtomList = new ArrayList<RenderAtomList
if (textureIdResourceFreeList.size() > 0) {
for (it = textureIdResourceFreeList.iterator(); it.hasNext();) {
- val = ((Integer) it.next()).intValue();
+ val = it.next().intValue();
if (val <= 0) {
continue;
}
diff --git a/src/classes/share/javax/media/j3d/RenderBin.java b/src/classes/share/javax/media/j3d/RenderBin.java
index bc8cc3d..4cc2bfc 100644
--- a/src/classes/share/javax/media/j3d/RenderBin.java
+++ b/src/classes/share/javax/media/j3d/RenderBin.java
@@ -190,7 +190,7 @@ ArrayList<RenderAtom> positionDirtyList = new ArrayList<RenderAtom>(5);
private Comparator transparencySortComparator = null;
private ArrayList toBeAddedTextureResourceFreeList = new ArrayList(5);
- private ArrayList displayListResourceFreeList = new ArrayList(5);
+private ArrayList<Integer> displayListResourceFreeList = new ArrayList<Integer>(5);
// a list of top level OrderedGroups
ArrayList orderedBins = new ArrayList(5);
@@ -947,7 +947,7 @@ ArrayList<RenderAtomListInfo> removeDlistPerRinfo = new ArrayList<RenderAtomList
Integer id;
size = displayListResourceFreeList.size();
for (i = 0; i < size; i++) {
- id = (Integer)displayListResourceFreeList.get(i);
+ id = displayListResourceFreeList.get(i);
VirtualUniverse.mc.freeDisplayListId(id);
}
@@ -1258,7 +1258,7 @@ ArrayList<RenderAtomListInfo> removeDlistPerRinfo = new ArrayList<RenderAtomList
Integer displayListIDObj;
for (int j=0; j <size; j++) {
- displayListIDObj = (Integer) displayListResourceFreeList.get(j);
+ displayListIDObj = displayListResourceFreeList.get(j);
// It doesn't harm to free the same ID twice, the
// underlying graphics library just ignore the second request
rdr.displayListResourceFreeList.add(displayListIDObj);
diff --git a/src/classes/share/javax/media/j3d/Renderer.java b/src/classes/share/javax/media/j3d/Renderer.java
index ae96806..5afabdc 100644
--- a/src/classes/share/javax/media/j3d/Renderer.java
+++ b/src/classes/share/javax/media/j3d/Renderer.java
@@ -136,9 +136,9 @@ ArrayList<RenderAtomListInfo> dirtyRenderAtomList = new ArrayList<RenderAtomList
ArrayList dirtyDlistPerRinfoList = new ArrayList();
- // Texture and display list that should be freed
- ArrayList textureIdResourceFreeList = new ArrayList();
- ArrayList displayListResourceFreeList = new ArrayList();
+// Texture and display list that should be freed
+ArrayList<Integer> textureIdResourceFreeList = new ArrayList<Integer>();
+ArrayList<Integer> displayListResourceFreeList = new ArrayList<Integer>();
// Texture that should be reload
ArrayList textureReloadList = new ArrayList();
@@ -1697,7 +1697,7 @@ ArrayList<RenderAtomListInfo> dirtyRenderAtomList = new ArrayList<RenderAtomList
// handle free resource in the FreeList
void freeResourcesInFreeList(Canvas3D cv) {
- Iterator it;
+ Iterator<Integer> it;
boolean isFreeTex = (textureIdResourceFreeList.size() > 0);
boolean isFreeDL = (displayListResourceFreeList.size() > 0);
ArrayList list;
@@ -1711,7 +1711,7 @@ ArrayList<RenderAtomListInfo> dirtyRenderAtomList = new ArrayList<RenderAtomList
if (isFreeDL) {
for (it = displayListResourceFreeList.iterator(); it.hasNext();) {
- val = ((Integer) it.next()).intValue();
+ val = it.next().intValue();
if (val <= 0) {
continue;
}
@@ -1721,7 +1721,7 @@ ArrayList<RenderAtomListInfo> dirtyRenderAtomList = new ArrayList<RenderAtomList
}
if (isFreeTex) {
for (it = textureIdResourceFreeList.iterator(); it.hasNext();) {
- val = ((Integer) it.next()).intValue();
+ val = it.next().intValue();
if (val <= 0) {
continue;
}