diff options
| -rw-r--r-- | src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java | 22 | ||||
| -rw-r--r-- | src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java | 6 |
2 files changed, 13 insertions, 15 deletions
diff --git a/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java b/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java index a53a1c1..078c293 100644 --- a/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java +++ b/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java @@ -1426,18 +1426,16 @@ int processAltApps(ArrayList<AlternateAppearanceRetained> globalAltApps, RenderA for (int i = 0; i < size; i++) { ViewSpecificGroupRetained v = (ViewSpecificGroupRetained)vsgs.get(i); int index = keys[i]; - if (index == -1) { - int csize = v.cachedViewList.size(); - for (int j = 0; j< csize; j++) { - ArrayList l = (ArrayList)v.cachedViewList.get(j); - l.clear(); - } - v.cachedViewList.clear(); - } - else { - ArrayList l = (ArrayList) v.cachedViewList.remove(index); - l.clear(); - } + if (index == -1) { + int csize = v.cachedViewList.size(); + for (int j = 0; j < csize; j++) { + v.cachedViewList.get(j).clear(); + } + v.cachedViewList.clear(); + } + else { + v.cachedViewList.remove(index).clear(); + } } } } diff --git a/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java b/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java index cb2e304..c38a431 100644 --- a/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java +++ b/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java @@ -40,7 +40,7 @@ class ViewSpecificGroupRetained extends GroupRetained { // Used by leaf objects particularly GAs // Updated in a MT Safe manner and also used by RenderBin - ArrayList cachedViewList = new ArrayList(); + ArrayList<ArrayList<View>> cachedViewList = new ArrayList<ArrayList<View>>(); // The object that contains the dynamic HashKey - a string type object // Used in scoping @@ -633,8 +633,8 @@ class ViewSpecificGroupRetained extends GroupRetained { super.removeNodeData(s); } - void updateCachedInformation(int component, View view, int index ) { - ArrayList list = (ArrayList) cachedViewList.get(index); +void updateCachedInformation(int component, View view, int index) { + ArrayList<View> list = cachedViewList.get(index); /* System.err.println("updateCachedInformation v = "+this+" index = "+index+" list = "+list+" cachedViewList.size() = "+cachedViewList.size()); |