j3dutils: add all missing @Override annotations

Signed-off-by: Harvey Harrison <[email protected]>

13 files changed, 49 insertions, 0 deletions

diff --git a/src/classes/share/com/sun/j3d/loaders/LoaderBase.java b/src/classes/share/com/sun/j3d/loaders/LoaderBase.java
index 100b0ab..ec12cb4 100644
--- a/src/classes/share/com/sun/j3d/loaders/LoaderBase.java
+++ b/src/classes/share/com/sun/j3d/loaders/LoaderBase.java
@@ -84,6 +84,7 @@ public abstract class LoaderBase implements Loader {
      * Note: Users of setBaseUrl() would then use load(URL)
      * as opposed to load(String).
      */
+    @Override
     public void setBaseUrl(URL url) {
 	baseUrl = url;
     }
@@ -97,6 +98,7 @@ public abstract class LoaderBase implements Loader {
      * Note: Users of setBasePath() would then use load(String)
      * as opposed to load(URL).
      */
+    @Override
     public void setBasePath(String pathName) {
 	basePath = pathName;
     }
@@ -104,6 +106,7 @@ public abstract class LoaderBase implements Loader {
     /**
      * Returns the current base URL setting.
      */
+    @Override
     public URL getBaseUrl() {
 	return baseUrl;
     }
@@ -111,6 +114,7 @@ public abstract class LoaderBase implements Loader {
     /**
      * Returns the current base path setting.
      */
+    @Override
     public String getBasePath() {
 	return basePath;
     }
@@ -119,6 +123,7 @@ public abstract class LoaderBase implements Loader {
      * This method sets the load flags for the file.  The flags should
      * equal 0 by default (which tells the loader to only load geometry).
      */
+    @Override
     public void setFlags(int flags) {
 	loadFlags = flags;
     }
@@ -126,6 +131,7 @@ public abstract class LoaderBase implements Loader {
     /**
      * Returns the current loading flags setting.
      */
+    @Override
     public int getFlags() {
 	return loadFlags;
     }
diff --git a/src/classes/share/com/sun/j3d/loaders/SceneBase.java b/src/classes/share/com/sun/j3d/loaders/SceneBase.java
index 8f5885d..bb3794d 100644
--- a/src/classes/share/com/sun/j3d/loaders/SceneBase.java
+++ b/src/classes/share/com/sun/j3d/loaders/SceneBase.java
@@ -167,6 +167,7 @@ public class SceneBase implements Scene {
      * This method returns the BranchGroup containing the overall
      * scene loaded by the loader.
      */
+    @Override
     public BranchGroup getSceneGroup() {
 	return sceneGroup;
     }
@@ -179,6 +180,7 @@ public class SceneBase implements Scene {
      * information for the given ViewPlatform and the ViewPlatform
      * holds an view-specific information, such as Field of View.
      */
+    @Override
     public TransformGroup[] getViewGroups() {
 	if (viewVector.isEmpty())
 	    return null;
@@ -192,6 +194,7 @@ public class SceneBase implements Scene {
      * field of view values for each corresponding entry in the array of
      * view groups returned by the method getViewGroups.
      */
+    @Override
     public float[] getHorizontalFOVs() {
 	if (hfovVector.isEmpty())
 	    return null;
@@ -213,6 +216,7 @@ public class SceneBase implements Scene {
     /**
      * This method returns an array of all Lights defined in the file.
      */
+    @Override
     public Light[] getLightNodes() {
 	if (lightVector.isEmpty())
 	    return null;
@@ -229,6 +233,7 @@ public class SceneBase implements Scene {
      * such names as the DEF names of Vrml or filenames of subjects (as
      * in Lightwave 3D).
      */
+    @Override
     public Hashtable getNamedObjects() {
 	return namedObjects;
     }
@@ -238,6 +243,7 @@ public class SceneBase implements Scene {
      * This method returns an array of all Background nodes defined in the
      * file.
      */
+    @Override
     public Background[] getBackgroundNodes() {
 	if (backgroundVector.isEmpty())
 	    return null;
@@ -251,6 +257,7 @@ public class SceneBase implements Scene {
      * This method returns an array of all Fog nodes defined in the
      * file.
      */
+    @Override
     public Fog[] getFogNodes() {
 	if (fogVector.isEmpty())
 	    return null;
@@ -264,6 +271,7 @@ public class SceneBase implements Scene {
      * This method returns a group containing all of the Behavior nodes
      * in the scene.
      */
+    @Override
     public Behavior[] getBehaviorNodes() {
 	if (behaviorVector.isEmpty())
 	    return null;
@@ -278,6 +286,7 @@ public class SceneBase implements Scene {
      * This method returns an array of all of the Sound nodes defined
      * in the file.
      */
+    @Override
     public Sound[] getSoundNodes() {
 	if (soundVector.isEmpty())
 	    return null;
@@ -291,6 +300,7 @@ public class SceneBase implements Scene {
      * This method returns the text description of the file.  If no
      * such description exists, this method should return null.
      */
+    @Override
     public String getDescription() {
 	return description;
     }
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java b/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java
index b4d328c..ea8e048 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java
@@ -98,6 +98,7 @@ class J3dLwoParser extends LwoParser {
 	    super(url, debugVals);
     }
 
+    @Override
     void getSurf(int length) throws FileNotFoundException {
 	super.getSurf(length);
     }
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java
index 6c640b5..dd3a755 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java
@@ -222,6 +222,7 @@ class LWOBFileReader extends BufferedInputStream {
 
 
 
+    @Override
     public int read() throws IOException {
       marker++;
       return super.read();
@@ -229,6 +230,7 @@ class LWOBFileReader extends BufferedInputStream {
 
 
 
+    @Override
     public int read(byte[] buffer, int offset, int count) throws IOException {
       int ret = super.read(buffer, offset, count);
       if (ret != -1) marker += ret;
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java
index 6bc7855..aa5a4ff 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java
@@ -69,6 +69,7 @@ class LightIntensityPathInterpolator extends FloatValueInterpolator {
      * @param criteria enumeration of criteria that have triggered this wakeup
      */
 
+    @Override
     public void processStimulus(Enumeration criteria) {
         // Handle stimulus
 
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java b/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java
index cacd1c9..300e0e2 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java
@@ -133,6 +133,7 @@ public class Lw3dLoader extends TextfileParser implements Loader {
      * users should specify an alternate base path with the setBaseUrl(URL)
      * method.
      */
+    @Override
     public Scene load(URL url) throws FileNotFoundException,
                            IncorrectFormatException, ParsingErrorException {
 
@@ -158,6 +159,7 @@ public class Lw3dLoader extends TextfileParser implements Loader {
      * otherwise users should specify an alternate base path with
      * the setBasePath(String) method.
      */
+    @Override
     public Scene load(String fileName) throws FileNotFoundException,
                           IncorrectFormatException, ParsingErrorException {
 
@@ -174,6 +176,7 @@ public class Lw3dLoader extends TextfileParser implements Loader {
      * containing the scene.  Any data files referenced by the Reader should
      * be located in the user's current working directory.
      */
+    @Override
     public Scene load(Reader reader) throws FileNotFoundException,
                             IncorrectFormatException, ParsingErrorException {
 
@@ -455,6 +458,7 @@ public class Lw3dLoader extends TextfileParser implements Loader {
      * associated files starting from the same directory as the
      * file passed into the load(URL) method.
      */
+    @Override
     public void setBaseUrl(URL url) {
 	baseUrl = url;
     }
@@ -463,6 +467,7 @@ public class Lw3dLoader extends TextfileParser implements Loader {
      * This method sets the base path to be used when searching for all
      * data files within a Lightwave scene.
      */
+    @Override
     public void setBasePath(String pathName) {
 	// This routine standardizes path names so that all pathnames
 	// will have standard file separators, they'll end in a separator
@@ -481,6 +486,7 @@ public class Lw3dLoader extends TextfileParser implements Loader {
     /**
      * Returns the current base URL setting.
      */
+    @Override
     public URL getBaseUrl() {
 	return baseUrl;
     }
@@ -488,6 +494,7 @@ public class Lw3dLoader extends TextfileParser implements Loader {
     /**
      * Returns the current base path setting.
      */
+    @Override
     public String getBasePath() {
 	return basePath;
     }
@@ -496,6 +503,7 @@ public class Lw3dLoader extends TextfileParser implements Loader {
      * This method sets the load flags for the file.  The flags should
      * equal 0 by default (which tells the loader to only load geometry).
      */
+    @Override
     public void setFlags(int flags) {
 	loadFlags = flags;
     }
@@ -503,6 +511,7 @@ public class Lw3dLoader extends TextfileParser implements Loader {
     /**
      * Returns the current loading flags setting.
      */
+    @Override
     public int getFlags() {
 	return loadFlags;
     }
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java
index 26cfa17..bef9f5d 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java
@@ -151,6 +151,7 @@ class LwsCamera extends TextfileParser implements LwsPrimitive {
     /**
      * Returns TransformGroup of camera
      */
+    @Override
     public TransformGroup getObjectNode()
     {
 	return objectTransform;
@@ -159,6 +160,7 @@ class LwsCamera extends TextfileParser implements LwsPrimitive {
     /**
      * Returns animation behaviors for camera
      */
+    @Override
     public Vector getObjectBehaviors()
     {
 	debugOutputLn(TRACE, "getObjectBehaviors()");
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java
index b7c29a0..b8ff1b8 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java
@@ -124,11 +124,13 @@ class LwsEnvelopeLightIntensity extends LwsEnvelope {
     }
 
 
+    @Override
     Behavior getBehaviors() {
 	return behaviors;
     }
 
 
+    @Override
     LwsEnvelopeFrame getFirstFrame() {
 	if (numFrames > 0)
 	    return frames[0];
@@ -137,6 +139,7 @@ class LwsEnvelopeLightIntensity extends LwsEnvelope {
     }
 
 
+    @Override
     void printVals() {
 	debugOutputLn(VALUES, "   name = " + name);
 	debugOutputLn(VALUES, "   numChannels = " + numChannels);
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java
index 2316c2f..bd800dd 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java
@@ -250,6 +250,7 @@ class LwsLight extends TextfileParser implements LwsPrimitive {
 	}
     }
 
+    @Override
     public TransformGroup getObjectNode()
 	{
 	    return objectTransform;
@@ -259,6 +260,7 @@ class LwsLight extends TextfileParser implements LwsPrimitive {
 	return light;
     }
 
+    @Override
     public Vector getObjectBehaviors()
 	{
 	    debugOutputLn(TRACE, "getObjectBehaviors()");
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java
index da640ec..555655e 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java
@@ -541,6 +541,7 @@ class LwsObject extends TextfileParser implements LwsPrimitive {
     /**
      * Return the TransformGroup that holds this object file
      */
+    @Override
     public TransformGroup getObjectNode() {
 	return objectTransform;
     }
@@ -550,6 +551,7 @@ class LwsObject extends TextfileParser implements LwsPrimitive {
      * are grouped separately from the geometry so that they can be handled
      * differently by the parent application.
      */
+    @Override
     public Vector getObjectBehaviors()
     {
 	debugOutputLn(TRACE, "getObjectBehaviors()");
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java b/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java
index 380bcc7..b52e1bf 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java
@@ -90,6 +90,7 @@ class SwitchPathInterpolator extends FloatValueInterpolator {
      * @param criteria enumeration of criteria that have triggered this wakeup
      */
 
+    @Override
     public void processStimulus(Enumeration criteria) {
 
 	int child;
diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java b/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java
index c4fea01..98f7fb5 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java
+++ b/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java
@@ -658,6 +658,7 @@ public class ObjectFile implements Loader {
      * BranchGroup to your scene graph.  For an example, see
      * j3d-examples/ObjLoad/ObjLoad.java.
      */
+    @Override
     public Scene load(String filename) throws FileNotFoundException,
 					      IncorrectFormatException,
 					      ParsingErrorException {
@@ -693,6 +694,7 @@ public class ObjectFile implements Loader {
      * BranchGroup to your scene graph.  For an example, see
      * j3d-examples/ObjLoad/ObjLoad.java.
      */
+    @Override
     public Scene load(URL url) throws FileNotFoundException,
 				      IncorrectFormatException,
 				      ParsingErrorException {
@@ -1211,6 +1213,7 @@ public class ObjectFile implements Loader {
      * BranchGroup to your scene graph.  For an example, see
      * j3d-examples/ObjLoad/ObjLoad.java.
      */
+    @Override
     public Scene load(Reader reader) throws FileNotFoundException,
 				            IncorrectFormatException,
                                             ParsingErrorException {
@@ -1257,6 +1260,7 @@ public class ObjectFile implements Loader {
      * Only needs to be called to set it to a different URL
      * from that containing the .obj file.
      */
+    @Override
     public void setBaseUrl(URL url) {
 	baseUrl = url;
     } // End of setBaseUrl
@@ -1266,6 +1270,7 @@ public class ObjectFile implements Loader {
      * Return the URL where files associated with this .obj file (like
      * material properties files) will be found.
      */
+    @Override
     public URL getBaseUrl() {
 	return baseUrl;
     } // End of getBaseUrl
@@ -1277,6 +1282,7 @@ public class ObjectFile implements Loader {
      * Only needs to be called to set it to a different directory
      * from that containing the .obj file.
      */
+    @Override
     public void setBasePath(String pathName) {
 	basePath = pathName;
 	if (basePath == null || basePath == "")
@@ -1292,6 +1298,7 @@ public class ObjectFile implements Loader {
      * Return the path where files associated with this .obj file (like material
      * files) are located.
      */
+    @Override
     public String getBasePath() {
 	return basePath;
     } // End of getBasePath
@@ -1304,6 +1311,7 @@ public class ObjectFile implements Loader {
      * behaviors, views, or sounds.  However, several flags are defined
      * specifically for use with the ObjectFile Loader (see above).
      */
+    @Override
     public void setFlags(int flags) {
 	this.flags = flags;
 	if ((DEBUG & 4) != 0) System.out.println("Flags = " + flags);
@@ -1317,6 +1325,7 @@ public class ObjectFile implements Loader {
      * behaviors, views, or sounds.  However, several flags are defined
      * specifically for use with the ObjectFile Loader (see above).
      */
+    @Override
     public int getFlags() {
 	return flags;
     } // End of getFlags
diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileMaterials.java b/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileMaterials.java
index bc13a06..d294795 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileMaterials.java
+++ b/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileMaterials.java
@@ -407,6 +407,7 @@ class ObjectFileMaterials implements ImageObserver {
      * Implement the ImageObserver interface.  Needed to load jpeg and gif
      * files using the Toolkit.
      */
+    @Override
     public boolean imageUpdate(Image img, int flags,
 			       int x, int y, int w, int h) {