diff --git a/src/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java b/src/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java index 624e52d9..6f0d65f2 100644 --- a/src/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java +++ b/src/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java @@ -31,7 +31,7 @@ import java.io.OutputStream; */ public class DirectoryMetadataBundlerTask extends MetadataBundlerTask { - @Override // documentation inherited. + @Override protected OutputStream createOutputStream (File target) throws IOException { @@ -39,7 +39,7 @@ public class DirectoryMetadataBundlerTask extends MetadataBundlerTask return null; } - @Override // documentation inherited + @Override protected OutputStream nextEntry (OutputStream lastEntry, String path) throws IOException { diff --git a/src/java/com/threerings/jme/model/BillboardController.java b/src/java/com/threerings/jme/model/BillboardController.java index 52581472..259ecb1a 100644 --- a/src/java/com/threerings/jme/model/BillboardController.java +++ b/src/java/com/threerings/jme/model/BillboardController.java @@ -80,7 +80,7 @@ public class BillboardController extends ModelController protected boolean _axial, _eyeRelativeX, _eyeRelativeZ; }; - @Override // documentation inherited + @Override public void configure (Properties props, Spatial target) { super.configure(props, target); @@ -130,7 +130,7 @@ public class BillboardController extends ModelController _rot.mult(lrot, lrot); } - @Override // documentation inherited + @Override public Controller putClone ( Controller store, Model.CloneCreator properties) { @@ -145,7 +145,7 @@ public class BillboardController extends ModelController return bstore; } - @Override // documentation inherited + @Override public void read (JMEImporter im) throws IOException { @@ -155,7 +155,7 @@ public class BillboardController extends ModelController capsule.readString("alignment", "DIR_X_POS_Z")); } - @Override // documentation inherited + @Override public void write (JMEExporter ex) throws IOException { diff --git a/src/java/com/threerings/jme/model/EmissionController.java b/src/java/com/threerings/jme/model/EmissionController.java index 9ed94444..faab31a1 100644 --- a/src/java/com/threerings/jme/model/EmissionController.java +++ b/src/java/com/threerings/jme/model/EmissionController.java @@ -37,7 +37,7 @@ import com.jme.util.export.OutputCapsule; */ public abstract class EmissionController extends ModelController { - @Override // documentation inherited + @Override public void configure (Properties props, Spatial target) { super.configure(props, target); @@ -45,7 +45,7 @@ public abstract class EmissionController extends ModelController props.getProperty("hide_target", "true")); } - @Override // documentation inherited + @Override public void init (Model model) { super.init(model); @@ -59,7 +59,7 @@ public abstract class EmissionController extends ModelController } } - @Override // documentation inherited + @Override public Controller putClone ( Controller store, Model.CloneCreator properties) { @@ -72,7 +72,7 @@ public abstract class EmissionController extends ModelController return estore; } - @Override // documentation inherited + @Override public void read (JMEImporter im) throws IOException { @@ -81,7 +81,7 @@ public abstract class EmissionController extends ModelController _hideTarget = capsule.readBoolean("hideTarget", true); } - @Override // documentation inherited + @Override public void write (JMEExporter ex) throws IOException { diff --git a/src/java/com/threerings/jme/model/Model.java b/src/java/com/threerings/jme/model/Model.java index 5e49a9bc..0c098561 100644 --- a/src/java/com/threerings/jme/model/Model.java +++ b/src/java/com/threerings/jme/model/Model.java @@ -712,7 +712,7 @@ public class Model extends ModelNode fos.close(); } - @Override // documentation inherited + @Override public void read (JMEImporter im) throws IOException { @@ -743,7 +743,7 @@ public class Model extends ModelNode } } - @Override // documentation inherited + @Override public void write (JMEExporter ex) throws IOException { @@ -770,7 +770,7 @@ public class Model extends ModelNode capsule.writeSavableArrayList(getControllers(), "controllers", null); } - @Override // documentation inherited + @Override public void resolveTextures (TextureProvider tprov) { super.resolveTextures(tprov); @@ -852,7 +852,7 @@ public class Model extends ModelNode lockInstance(targets); } - @Override // documentation inherited + @Override public Spatial putClone (Spatial store, CloneCreator properties) { Model mstore = (Model)properties.originalToCopy.get(this); @@ -880,7 +880,7 @@ public class Model extends ModelNode return mstore; } - @Override // documentation inherited + @Override public void updateGeometricState (float time, boolean initiator) { // if we were not visible the last time we were rendered, don't do a @@ -915,7 +915,7 @@ public class Model extends ModelNode } } - @Override // documentation inherited + @Override public void onDraw (Renderer r) { // if we switch from invisible to visible, we have to do a last-minute diff --git a/src/java/com/threerings/jme/model/ModelController.java b/src/java/com/threerings/jme/model/ModelController.java index 03f2bbf1..acec7847 100644 --- a/src/java/com/threerings/jme/model/ModelController.java +++ b/src/java/com/threerings/jme/model/ModelController.java @@ -114,7 +114,7 @@ public abstract class ModelController extends Controller return mstore; } - @Override // documentation inherited + @Override public void read (JMEImporter im) throws IOException { @@ -129,7 +129,7 @@ public abstract class ModelController extends Controller } } - @Override // documentation inherited + @Override public void write (JMEExporter ex) throws IOException { diff --git a/src/java/com/threerings/jme/model/ModelMesh.java b/src/java/com/threerings/jme/model/ModelMesh.java index a6fa7fec..0a6c7a9d 100644 --- a/src/java/com/threerings/jme/model/ModelMesh.java +++ b/src/java/com/threerings/jme/model/ModelMesh.java @@ -85,7 +85,7 @@ public class ModelMesh extends TriMesh super(name); } - @Override // documentation inherited + @Override public int hashCode () { // hash on the name rather than the identity for consistent ordering @@ -180,7 +180,7 @@ public class ModelMesh extends TriMesh } } - @Override // documentation inherited + @Override public void reconstruct ( FloatBuffer vertices, FloatBuffer normals, FloatBuffer colors, FloatBuffer textures, IntBuffer indices) @@ -290,7 +290,7 @@ public class ModelMesh extends TriMesh return mstore; } - @Override // documentation inherited + @Override public void updateWorldVectors () { if (!_transformLocked) { @@ -298,7 +298,7 @@ public class ModelMesh extends TriMesh } } - @Override // documentation inherited + @Override public void read (JMEImporter im) throws IOException { @@ -334,7 +334,7 @@ public class ModelMesh extends TriMesh capsule.readIntBuffer("indexBuffer", null)); } - @Override // documentation inherited + @Override public void write (JMEExporter ex) throws IOException { @@ -459,7 +459,7 @@ public class ModelMesh extends TriMesh // no-op } - @Override // documentation inherited + @Override protected void setupBatchList () { batchList = Lists.newArrayListWithCapacity(1); @@ -664,7 +664,7 @@ public class ModelMesh extends TriMesh * the base layer. */ protected class ModelBatch extends TriangleBatch { - @Override // documentation inherited + @Override public void draw (Renderer r) { boolean drawing = (isEnabled() && r.isProcessingQueue()); diff --git a/src/java/com/threerings/jme/model/ModelNode.java b/src/java/com/threerings/jme/model/ModelNode.java index 5c48cfa7..2a00a950 100644 --- a/src/java/com/threerings/jme/model/ModelNode.java +++ b/src/java/com/threerings/jme/model/ModelNode.java @@ -63,7 +63,7 @@ public class ModelNode extends Node super(name); } - @Override // documentation inherited + @Override public int hashCode () { // hash on the name rather than the identity for consistent ordering @@ -98,7 +98,7 @@ public class ModelNode extends Node return _modelTransform; } - @Override // documentation inherited + @Override public void updateWorldData (float time) { // we use locked bounds as an indication that we can skip the update @@ -108,7 +108,7 @@ public class ModelNode extends Node } } - @Override // documentation inherited + @Override public void updateWorldBound () { // don't bother updating if we know there are no visible descendants @@ -117,7 +117,7 @@ public class ModelNode extends Node } } - @Override // documentation inherited + @Override public void updateWorldVectors () { super.updateWorldVectors(); @@ -178,7 +178,7 @@ public class ModelNode extends Node return mstore; } - @Override // documentation inherited + @Override public void read (JMEImporter im) throws IOException { @@ -198,7 +198,7 @@ public class ModelNode extends Node } } - @Override // documentation inherited + @Override public void write (JMEExporter ex) throws IOException { diff --git a/src/java/com/threerings/jme/model/Rotator.java b/src/java/com/threerings/jme/model/Rotator.java index 7063a442..68b7f18e 100644 --- a/src/java/com/threerings/jme/model/Rotator.java +++ b/src/java/com/threerings/jme/model/Rotator.java @@ -42,7 +42,7 @@ import com.threerings.jme.util.JmeUtil; */ public class Rotator extends ModelController { - @Override // documentation inherited + @Override public void configure (Properties props, Spatial target) { super.configure(props, target); @@ -60,7 +60,7 @@ public class Rotator extends ModelController _target.getLocalRotation().multLocal(_rot); } - @Override // documentation inherited + @Override public Controller putClone ( Controller store, Model.CloneCreator properties) { @@ -76,7 +76,7 @@ public class Rotator extends ModelController return rstore; } - @Override // documentation inherited + @Override public void read (JMEImporter im) throws IOException { @@ -86,7 +86,7 @@ public class Rotator extends ModelController _velocity = capsule.readFloat("velocity", 0f); } - @Override // documentation inherited + @Override public void write (JMEExporter ex) throws IOException { diff --git a/src/java/com/threerings/jme/model/SkinMesh.java b/src/java/com/threerings/jme/model/SkinMesh.java index dda52fd3..c5861013 100644 --- a/src/java/com/threerings/jme/model/SkinMesh.java +++ b/src/java/com/threerings/jme/model/SkinMesh.java @@ -233,7 +233,7 @@ public class SkinMesh extends ModelMesh _bones = bones.toArray(new Bone[bones.size()]); } - @Override // documentation inherited + @Override public void addOverlay (RenderState[] overlay) { // add a cloned state config (with same uniforms) for the overlay @@ -249,7 +249,7 @@ public class SkinMesh extends ModelMesh _osconfigs.add(osconfig); } - @Override // documentation inherited + @Override public void removeOverlay (RenderState[] overlay) { // remove the corresponding state config @@ -263,7 +263,7 @@ public class SkinMesh extends ModelMesh } } - @Override // documentation inherited + @Override public void reconstruct ( FloatBuffer vertices, FloatBuffer normals, FloatBuffer colors, FloatBuffer textures, IntBuffer indices) @@ -274,7 +274,7 @@ public class SkinMesh extends ModelMesh _frames = new HashIntMap(); } - @Override // documentation inherited + @Override public Spatial putClone (Spatial store, Model.CloneCreator properties) { SkinMesh mstore = (SkinMesh)properties.originalToCopy.get(this); @@ -323,7 +323,7 @@ public class SkinMesh extends ModelMesh return mstore; } - @Override // documentation inherited + @Override public void read (JMEImporter im) throws IOException { @@ -333,7 +333,7 @@ public class SkinMesh extends ModelMesh "weightGroups", null), new WeightGroup[0])); } - @Override // documentation inherited + @Override public void write (JMEExporter ex) throws IOException { @@ -342,7 +342,7 @@ public class SkinMesh extends ModelMesh capsule.write(_weightGroups, "weightGroups", null); } - @Override // documentation inherited + @Override public void expandModelBounds () { BoundingVolume obound = getBatch(0).getModelBound().clone(null); @@ -350,7 +350,7 @@ public class SkinMesh extends ModelMesh getBatch(0).getModelBound().mergeLocal(obound); } - @Override // documentation inherited + @Override public void setReferenceTransforms () { _invRefTransform = new Matrix4f(); @@ -368,7 +368,7 @@ public class SkinMesh extends ModelMesh } } - @Override // documentation inherited + @Override public void lockStaticMeshes ( Renderer renderer, boolean useVBOs, boolean useDisplayLists) { @@ -394,7 +394,7 @@ public class SkinMesh extends ModelMesh _useDisplayLists = useDisplayLists && !_translucent; } - @Override // documentation inherited + @Override public void configureShaders (ShaderCache scache) { if (_disableShaders || !GLContext.getCapabilities().GL_ARB_vertex_shader || @@ -418,14 +418,14 @@ public class SkinMesh extends ModelMesh } } - @Override // documentation inherited + @Override public void storeMeshFrame (int frameId, boolean blend) { _storeFrameId = frameId; _storeBlend = blend; } - @Override // documentation inherited + @Override public void setMeshFrame (int frameId) { TriangleBatch batch = getBatch(0), @@ -439,7 +439,7 @@ public class SkinMesh extends ModelMesh } } - @Override // documentation inherited + @Override public void blendMeshFrames (int frameId1, int frameId2, float alpha) { BlendFrame frame1 = (BlendFrame)_frames.get(frameId1), @@ -452,7 +452,7 @@ public class SkinMesh extends ModelMesh nbuf.put(_nbuf); } - @Override // documentation inherited + @Override public void updateWorldData (float time) { super.updateWorldData(time); @@ -568,7 +568,7 @@ public class SkinMesh extends ModelMesh } } - @Override // documentation inherited + @Override protected ModelBatch createModelBatch () { // update the shader configs immediately before drawing @@ -598,7 +598,7 @@ public class SkinMesh extends ModelMesh }; } - @Override // documentation inherited + @Override protected void storeOriginalBuffers () { super.storeOriginalBuffers(); @@ -659,19 +659,19 @@ public class SkinMesh extends ModelMesh } } - @Override // documentation inherited + @Override protected String getVertexShader () { return "media/jme/skin.vert"; } - @Override // documentation inherited + @Override protected String getFragmentShader () { return "media/jme/skin.frag"; } - @Override // documentation inherited + @Override protected void getDefinitions (ArrayList defs) { super.getDefinitions(defs); @@ -680,7 +680,7 @@ public class SkinMesh extends ModelMesh } } - @Override // documentation inherited + @Override protected void getDerivedDefinitions (ArrayList ddefs) { super.getDerivedDefinitions(ddefs); diff --git a/src/java/com/threerings/jme/model/TextureAnimator.java b/src/java/com/threerings/jme/model/TextureAnimator.java index daf50655..3042d224 100644 --- a/src/java/com/threerings/jme/model/TextureAnimator.java +++ b/src/java/com/threerings/jme/model/TextureAnimator.java @@ -42,7 +42,7 @@ import com.threerings.jme.util.JmeUtil.FrameState; */ public class TextureAnimator extends TextureController { - @Override // documentation inherited + @Override public void configure (Properties props, Spatial target) { super.configure(props, target); @@ -68,7 +68,7 @@ public class TextureAnimator extends TextureController 0f); } - @Override // documentation inherited + @Override public Controller putClone ( Controller store, Model.CloneCreator properties) { @@ -87,7 +87,7 @@ public class TextureAnimator extends TextureController return tstore; } - @Override // documentation inherited + @Override public void read (JMEImporter im) throws IOException { @@ -100,7 +100,7 @@ public class TextureAnimator extends TextureController _repeatType = capsule.readInt("repeatType", Controller.RT_WRAP); } - @Override // documentation inherited + @Override public void write (JMEExporter ex) throws IOException { @@ -113,7 +113,7 @@ public class TextureAnimator extends TextureController capsule.write(_repeatType, "repeatType", Controller.RT_WRAP); } - @Override // documentation inherited + @Override protected void initTextures () { super.initTextures(); diff --git a/src/java/com/threerings/jme/model/TextureController.java b/src/java/com/threerings/jme/model/TextureController.java index a9226315..5c34eab4 100644 --- a/src/java/com/threerings/jme/model/TextureController.java +++ b/src/java/com/threerings/jme/model/TextureController.java @@ -37,7 +37,7 @@ import com.threerings.jme.util.SpatialVisitor; */ public abstract class TextureController extends ModelController { - @Override // documentation inherited + @Override public void resolveTextures (TextureProvider tprov) { // reinitialize the cloned textures if we re-resolve diff --git a/src/java/com/threerings/jme/model/TextureTranslator.java b/src/java/com/threerings/jme/model/TextureTranslator.java index 2caa04b9..f4ea1947 100644 --- a/src/java/com/threerings/jme/model/TextureTranslator.java +++ b/src/java/com/threerings/jme/model/TextureTranslator.java @@ -44,7 +44,7 @@ import static com.threerings.jme.Log.log; */ public class TextureTranslator extends TextureController { - @Override // documentation inherited + @Override public void configure (Properties props, Spatial target) { super.configure(props, target); @@ -67,7 +67,7 @@ public class TextureTranslator extends TextureController _translation.addLocal(_velocity.x * time, _velocity.y * time, 0f); } - @Override // documentation inherited + @Override public Controller putClone ( Controller store, Model.CloneCreator properties) { @@ -82,7 +82,7 @@ public class TextureTranslator extends TextureController return tstore; } - @Override // documentation inherited + @Override public void read (JMEImporter im) throws IOException { @@ -91,7 +91,7 @@ public class TextureTranslator extends TextureController _velocity = (Vector2f)capsule.readSavable("velocity", null); } - @Override // documentation inherited + @Override public void write (JMEExporter ex) throws IOException { @@ -100,7 +100,7 @@ public class TextureTranslator extends TextureController capsule.write(_velocity, "velocity", null); } - @Override // documentation inherited + @Override protected void initTextures () { super.initTextures(); diff --git a/src/java/com/threerings/jme/model/Translator.java b/src/java/com/threerings/jme/model/Translator.java index 6947828e..8740fb9b 100644 --- a/src/java/com/threerings/jme/model/Translator.java +++ b/src/java/com/threerings/jme/model/Translator.java @@ -41,7 +41,7 @@ import com.threerings.jme.util.JmeUtil; */ public class Translator extends ModelController { - @Override // documentation inherited + @Override public void configure (Properties props, Spatial target) { super.configure(props, target); @@ -72,7 +72,7 @@ public class Translator extends ModelController _target.getLocalTranslation().interpolate(_from, _to, alpha); } - @Override // documentation inherited + @Override public Controller putClone ( Controller store, Model.CloneCreator properties) { @@ -90,7 +90,7 @@ public class Translator extends ModelController return tstore; } - @Override // documentation inherited + @Override public void read (JMEImporter im) throws IOException { @@ -102,7 +102,7 @@ public class Translator extends ModelController _repeatType = capsule.readInt("repeatType", Controller.RT_WRAP); } - @Override // documentation inherited + @Override public void write (JMEExporter ex) throws IOException { diff --git a/src/java/com/threerings/jme/tools/ModelDef.java b/src/java/com/threerings/jme/tools/ModelDef.java index b1a8a793..d0d7157d 100644 --- a/src/java/com/threerings/jme/tools/ModelDef.java +++ b/src/java/com/threerings/jme/tools/ModelDef.java @@ -390,7 +390,7 @@ public class ModelDef /** A triangle mesh that deforms according to bone positions. */ public static class SkinMeshDef extends TriMeshDef { - @Override // documentation inherited + @Override public void getBoneNames (HashSet bones) { for (Vertex vertex : vertices) { @@ -398,13 +398,13 @@ public class ModelDef } } - @Override // documentation inherited + @Override protected ModelMesh createMesh () { return new SkinMesh("mesh"); } - @Override // documentation inherited + @Override public void resolveReferences ( HashMap nodes, HashSet referenced) { @@ -442,7 +442,7 @@ public class ModelDef ((SkinMesh)_mesh).setWeightGroups(wgroups); } - @Override // documentation inherited + @Override protected void configureMesh (Properties props) { // divide the vertices up by weight groups @@ -579,13 +579,13 @@ public class ModelDef return StringUtil.toString(location); } - @Override // documentation inherited + @Override public int hashCode () { return Arrays.hashCode(location) ^ Arrays.hashCode(normal) ^ Arrays.hashCode(tcoords); } - @Override // documentation inherited + @Override public boolean equals (Object obj) { Vertex overt = (Vertex)obj; @@ -706,7 +706,7 @@ public class ModelDef getLocalTranslation(), getLocalRotation(), getLocalScale(), localTransform); } - @Override // documentation inherited + @Override public void updateWorldVectors () { super.updateWorldVectors(); @@ -973,21 +973,21 @@ public class ModelDef * are unique and non-null). */ protected static class HashArrayList extends ArrayList { - @Override // documentation inherited + @Override public boolean add (E element) { add(size(), element); return true; } - @Override // documentation inherited + @Override public void add (int idx, E element) { super.add(idx, element); remapFrom(idx); } - @Override // documentation inherited + @Override public E remove (int idx) { E element = super.remove(idx); @@ -996,27 +996,27 @@ public class ModelDef return element; } - @Override // documentation inherited + @Override public void clear () { super.clear(); _indices.clear(); } - @Override // documentation inherited + @Override public int indexOf (Object obj) { Integer idx = _indices.get(obj); return (idx == null ? -1 : idx); } - @Override // documentation inherited + @Override public boolean contains (Object obj) { return _indices.containsKey(obj); } - @Override // documentation inherited + @Override public boolean remove (Object obj) { Integer idx = _indices.remove(obj); diff --git a/src/java/com/threerings/jme/tools/ModelViewer.java b/src/java/com/threerings/jme/tools/ModelViewer.java index 35d546f7..4ce35f74 100644 --- a/src/java/com/threerings/jme/tools/ModelViewer.java +++ b/src/java/com/threerings/jme/tools/ModelViewer.java @@ -376,7 +376,7 @@ public class ModelViewer extends JmeCanvasApp run(); } - @Override // documentation inherited + @Override public boolean init () { if (!super.init()) { @@ -388,7 +388,7 @@ public class ModelViewer extends JmeCanvasApp return true; } - @Override // documentation inherited + @Override protected void initDisplay () throws JmeException { @@ -397,7 +397,7 @@ public class ModelViewer extends JmeCanvasApp _ctx.getRenderer().getQueue().setTwoPassTransparency(false); } - @Override // documentation inherited + @Override protected void initInput () { super.initInput(); @@ -430,13 +430,13 @@ public class ModelViewer extends JmeCanvasApp CAMPOS_FORMAT.format(pitch)); } - @Override // documentation inherited + @Override protected CameraHandler createCameraHandler (Camera camera) { return new OrbitCameraHandler(camera); } - @Override // documentation inherited + @Override protected void initRoot () { super.initRoot(); @@ -528,7 +528,7 @@ public class ModelViewer extends JmeCanvasApp } } - @Override // documentation inherited + @Override protected void initLighting () { _dlight = new DirectionalLight(); @@ -962,7 +962,7 @@ public class ModelViewer extends JmeCanvasApp _spatial.setLocalScale(_scale.getValue() * 0.0001f); } - @Override // documentation inherited + @Override public void setVisible (boolean visible) { super.setVisible(visible); @@ -1032,7 +1032,7 @@ public class ModelViewer extends JmeCanvasApp protected class MouseOrbiter extends MouseAdapter implements MouseMotionListener, MouseWheelListener { - @Override // documentation inherited + @Override public void mousePressed (MouseEvent e) { _mloc.setLocation(e.getX(), e.getY()); @@ -1081,7 +1081,7 @@ public class ModelViewer extends JmeCanvasApp _gpoint = super.getGroundPoint(); } - @Override // documentation inherited + @Override public void panCamera (float x, float y) { Vector3f offset = _camera.getLeft().mult(-x).addLocal( _camera.getUp().mult(y)); @@ -1090,7 +1090,7 @@ public class ModelViewer extends JmeCanvasApp _camera.onFrameChange(); } - @Override // documentation inherited + @Override public Vector3f getGroundPoint () { return _gpoint; diff --git a/src/java/com/threerings/jme/util/ShaderCache.java b/src/java/com/threerings/jme/util/ShaderCache.java index 49660721..267d365f 100644 --- a/src/java/com/threerings/jme/util/ShaderCache.java +++ b/src/java/com/threerings/jme/util/ShaderCache.java @@ -230,14 +230,14 @@ public class ShaderCache Collections.addAll(this.defs, defs); } - @Override // documentation inherited + @Override public int hashCode () { return (vert == null ? 0 : vert.hashCode()) + (frag == null ? 0 : frag.hashCode()) + defs.hashCode(); } - @Override // documentation inherited + @Override public boolean equals (Object obj) { ShaderKey okey = (ShaderKey)obj; @@ -245,7 +245,7 @@ public class ShaderCache defs.equals(okey.defs); } - @Override // documentation inherited + @Override public String toString () { return "[vert=" + vert + ", frag=" + frag + ", defs=" + defs + "]"; diff --git a/src/java/com/threerings/jme/util/ShaderConfig.java b/src/java/com/threerings/jme/util/ShaderConfig.java index 9bea9a85..6dcec802 100644 --- a/src/java/com/threerings/jme/util/ShaderConfig.java +++ b/src/java/com/threerings/jme/util/ShaderConfig.java @@ -87,7 +87,7 @@ public abstract class ShaderConfig return _scache.configureState(_state, vert, frag, darray, ddarray); } - @Override // documentation inherited + @Override public ShaderConfig clone () { try { @@ -308,7 +308,7 @@ public abstract class ShaderConfig return (otype != type); } - @Override // documentation inherited + @Override public LightConfig clone () { try { @@ -318,7 +318,7 @@ public abstract class ShaderConfig } } - @Override // documentation inherited + @Override public String toString () { return Integer.toString(type); @@ -339,7 +339,7 @@ public abstract class ShaderConfig return (omode != envMapMode); } - @Override // documentation inherited + @Override public TextureConfig clone () { try { @@ -349,7 +349,7 @@ public abstract class ShaderConfig } } - @Override // documentation inherited + @Override public String toString () { return Integer.toString(envMapMode); diff --git a/src/java/com/threerings/media/animation/GleamAnimation.java b/src/java/com/threerings/media/animation/GleamAnimation.java index 1afa474c..676d4de3 100644 --- a/src/java/com/threerings/media/animation/GleamAnimation.java +++ b/src/java/com/threerings/media/animation/GleamAnimation.java @@ -74,7 +74,7 @@ public class GleamAnimation extends Animation _fadeIn = fadeIn; } - @Override // documentation inherited + @Override public void tick (long timestamp) { if (timestamp - _lastUpdate < _millisBetweenUpdates) { diff --git a/src/java/com/threerings/openal/Buffer.java b/src/java/com/threerings/openal/Buffer.java index df67addd..046d84bf 100644 --- a/src/java/com/threerings/openal/Buffer.java +++ b/src/java/com/threerings/openal/Buffer.java @@ -95,7 +95,7 @@ public class Buffer _id = 0; } - @Override // documentation inherited + @Override protected void finalize () throws Throwable { diff --git a/src/java/com/threerings/openal/Source.java b/src/java/com/threerings/openal/Source.java index d45152b4..3c7b3ee2 100644 --- a/src/java/com/threerings/openal/Source.java +++ b/src/java/com/threerings/openal/Source.java @@ -360,7 +360,7 @@ public class Source _queue.clear(); } - @Override // documentation inherited + @Override protected void finalize () throws Throwable { diff --git a/src/java/com/threerings/resource/NetworkResourceBundle.java b/src/java/com/threerings/resource/NetworkResourceBundle.java index 3d2b9466..f43acebe 100644 --- a/src/java/com/threerings/resource/NetworkResourceBundle.java +++ b/src/java/com/threerings/resource/NetworkResourceBundle.java @@ -53,13 +53,13 @@ public class NetworkResourceBundle extends KnownAvailabilityResourceBundle _ident = path; } - @Override // documentation inherited + @Override public String getIdent () { return _ident; } - @Override // documentation inherited + @Override public InputStream getResource (String path) throws IOException { @@ -94,7 +94,7 @@ public class NetworkResourceBundle extends KnownAvailabilityResourceBundle } } - @Override // documentation inherited + @Override public BufferedImage getImageResource (String path, boolean useFastIO) throws IOException {