aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <[email protected]>2013-07-31 10:57:33 -0700
committerHarvey Harrison <[email protected]>2013-07-31 10:57:33 -0700
commitecf7b5a95099f9f59b6baa4e026252bbf3d70379 (patch)
tree0ec4a773e8547adc2db51e3969985b3fc2313c38
parentc7e52041871533dead6ff92239628fc875f13be7 (diff)
j3dcore: add all the missing @Override annotations
Signed-off-by: Harvey Harrison <[email protected]>
-rw-r--r--src/classes/share/javax/media/j3d/AlternateAppearance.java4
-rw-r--r--src/classes/share/javax/media/j3d/AlternateAppearanceRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/AmbientLight.java2
-rw-r--r--src/classes/share/javax/media/j3d/AmbientLightRetained.java2
-rw-r--r--src/classes/share/javax/media/j3d/Appearance.java5
-rw-r--r--src/classes/share/javax/media/j3d/AppearanceRetained.java13
-rw-r--r--src/classes/share/javax/media/j3d/AttributeBin.java1
-rw-r--r--src/classes/share/javax/media/j3d/AudioDeviceEnumerator.java2
-rw-r--r--src/classes/share/javax/media/j3d/AuralAttributes.java3
-rw-r--r--src/classes/share/javax/media/j3d/BHInternalNode.java3
-rw-r--r--src/classes/share/javax/media/j3d/BHLeafNode.java3
-rw-r--r--src/classes/share/javax/media/j3d/Background.java5
-rw-r--r--src/classes/share/javax/media/j3d/BackgroundRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/BackgroundSound.java3
-rw-r--r--src/classes/share/javax/media/j3d/Behavior.java3
-rw-r--r--src/classes/share/javax/media/j3d/BehaviorRetained.java3
-rw-r--r--src/classes/share/javax/media/j3d/BehaviorScheduler.java2
-rw-r--r--src/classes/share/javax/media/j3d/BehaviorStructure.java3
-rw-r--r--src/classes/share/javax/media/j3d/Billboard.java5
-rw-r--r--src/classes/share/javax/media/j3d/BoundingBox.java25
-rw-r--r--src/classes/share/javax/media/j3d/BoundingLeaf.java3
-rw-r--r--src/classes/share/javax/media/j3d/BoundingLeafRetained.java3
-rw-r--r--src/classes/share/javax/media/j3d/BoundingPolytope.java25
-rw-r--r--src/classes/share/javax/media/j3d/BoundingSphere.java25
-rw-r--r--src/classes/share/javax/media/j3d/Bounds.java3
-rw-r--r--src/classes/share/javax/media/j3d/BranchGroup.java2
-rw-r--r--src/classes/share/javax/media/j3d/BranchGroupRetained.java6
-rw-r--r--src/classes/share/javax/media/j3d/CachedFrustum.java1
-rw-r--r--src/classes/share/javax/media/j3d/Canvas3D.java4
-rw-r--r--src/classes/share/javax/media/j3d/CanvasViewEventCatcher.java2
-rw-r--r--src/classes/share/javax/media/j3d/Clip.java4
-rw-r--r--src/classes/share/javax/media/j3d/ClipRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/ColorInterpolator.java4
-rw-r--r--src/classes/share/javax/media/j3d/ColoringAttributes.java4
-rw-r--r--src/classes/share/javax/media/j3d/ColoringAttributesRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/CompressedGeometry.java2
-rw-r--r--src/classes/share/javax/media/j3d/CompressedGeometryHeader.java1
-rw-r--r--src/classes/share/javax/media/j3d/CompressedGeometryRenderMethod.java1
-rw-r--r--src/classes/share/javax/media/j3d/CompressedGeometryRetained.java9
-rw-r--r--src/classes/share/javax/media/j3d/ConeSound.java4
-rw-r--r--src/classes/share/javax/media/j3d/ConeSoundRetained.java3
-rw-r--r--src/classes/share/javax/media/j3d/DecalGroup.java2
-rw-r--r--src/classes/share/javax/media/j3d/DefaultRenderMethod.java1
-rw-r--r--src/classes/share/javax/media/j3d/DepthComponentFloat.java3
-rw-r--r--src/classes/share/javax/media/j3d/DepthComponentInt.java3
-rw-r--r--src/classes/share/javax/media/j3d/DepthComponentNative.java3
-rw-r--r--src/classes/share/javax/media/j3d/DirectionalLight.java3
-rw-r--r--src/classes/share/javax/media/j3d/DirectionalLightRetained.java6
-rw-r--r--src/classes/share/javax/media/j3d/DisplayListRenderMethod.java1
-rw-r--r--src/classes/share/javax/media/j3d/DistanceLOD.java4
-rw-r--r--src/classes/share/javax/media/j3d/EnvironmentSet.java1
-rw-r--r--src/classes/share/javax/media/j3d/EventCatcher.java24
-rw-r--r--src/classes/share/javax/media/j3d/ExponentialFog.java3
-rw-r--r--src/classes/share/javax/media/j3d/ExponentialFogRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/Fog.java2
-rw-r--r--src/classes/share/javax/media/j3d/FogRetained.java8
-rw-r--r--src/classes/share/javax/media/j3d/GLSLShaderProgram.java7
-rw-r--r--src/classes/share/javax/media/j3d/GLSLShaderProgramRetained.java33
-rw-r--r--src/classes/share/javax/media/j3d/GeneralizedStrip.java1
-rw-r--r--src/classes/share/javax/media/j3d/GeneralizedVertexList.java2
-rw-r--r--src/classes/share/javax/media/j3d/GeometryArray.java1
-rw-r--r--src/classes/share/javax/media/j3d/GeometryArrayRetained.java10
-rw-r--r--src/classes/share/javax/media/j3d/GeometryAtom.java6
-rw-r--r--src/classes/share/javax/media/j3d/GeometryDecompressor.java1
-rw-r--r--src/classes/share/javax/media/j3d/GeometryDecompressorRetained.java4
-rw-r--r--src/classes/share/javax/media/j3d/GeometryDecompressorShape3D.java4
-rw-r--r--src/classes/share/javax/media/j3d/GeometryRetained.java2
-rw-r--r--src/classes/share/javax/media/j3d/GeometryStripArray.java1
-rw-r--r--src/classes/share/javax/media/j3d/GeometryStripArrayRetained.java1
-rw-r--r--src/classes/share/javax/media/j3d/GeometryStructure.java3
-rw-r--r--src/classes/share/javax/media/j3d/GraphicsConfigTemplate3D.java3
-rw-r--r--src/classes/share/javax/media/j3d/Group.java4
-rw-r--r--src/classes/share/javax/media/j3d/GroupRetained.java24
-rw-r--r--src/classes/share/javax/media/j3d/HashKey.java3
-rw-r--r--src/classes/share/javax/media/j3d/HiResCoord.java1
-rw-r--r--src/classes/share/javax/media/j3d/ImageComponent2D.java3
-rw-r--r--src/classes/share/javax/media/j3d/ImageComponent2DRetained.java1
-rw-r--r--src/classes/share/javax/media/j3d/ImageComponent3D.java3
-rw-r--r--src/classes/share/javax/media/j3d/ImageComponentRetained.java3
-rw-r--r--src/classes/share/javax/media/j3d/IndexedGeometryArray.java8
-rw-r--r--src/classes/share/javax/media/j3d/IndexedGeometryArrayRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/IndexedGeometryStripArray.java1
-rw-r--r--src/classes/share/javax/media/j3d/IndexedGeometryStripArrayRetained.java1
-rw-r--r--src/classes/share/javax/media/j3d/IndexedLineArray.java2
-rw-r--r--src/classes/share/javax/media/j3d/IndexedLineArrayRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/IndexedLineStripArray.java2
-rw-r--r--src/classes/share/javax/media/j3d/IndexedLineStripArrayRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/IndexedPointArray.java2
-rw-r--r--src/classes/share/javax/media/j3d/IndexedPointArrayRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/IndexedQuadArray.java2
-rw-r--r--src/classes/share/javax/media/j3d/IndexedQuadArrayRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/IndexedTriangleArray.java2
-rw-r--r--src/classes/share/javax/media/j3d/IndexedTriangleArrayRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/IndexedTriangleFanArray.java2
-rw-r--r--src/classes/share/javax/media/j3d/IndexedTriangleFanArrayRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/IndexedTriangleStripArray.java2
-rw-r--r--src/classes/share/javax/media/j3d/IndexedTriangleStripArrayRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/IndexedUnorderSet.java1
-rw-r--r--src/classes/share/javax/media/j3d/InputDeviceBlockingThread.java1
-rw-r--r--src/classes/share/javax/media/j3d/InputDeviceScheduler.java3
-rw-r--r--src/classes/share/javax/media/j3d/IntegerFreeList.java2
-rw-r--r--src/classes/share/javax/media/j3d/Interpolator.java2
-rw-r--r--src/classes/share/javax/media/j3d/J3DGraphics2D.java5
-rw-r--r--src/classes/share/javax/media/j3d/J3DGraphics2DImpl.java80
-rw-r--r--src/classes/share/javax/media/j3d/J3dQueryProps.java9
-rw-r--r--src/classes/share/javax/media/j3d/J3dThread.java1
-rw-r--r--src/classes/share/javax/media/j3d/JoglDrawingSurfaceObject.java4
-rw-r--r--src/classes/share/javax/media/j3d/JoglGraphicsConfiguration.java12
-rw-r--r--src/classes/share/javax/media/j3d/JoglPipeline.java168
-rw-r--r--src/classes/share/javax/media/j3d/LOD.java2
-rw-r--r--src/classes/share/javax/media/j3d/Light.java2
-rw-r--r--src/classes/share/javax/media/j3d/LightBin.java1
-rw-r--r--src/classes/share/javax/media/j3d/LightRetained.java8
-rw-r--r--src/classes/share/javax/media/j3d/LineArray.java2
-rw-r--r--src/classes/share/javax/media/j3d/LineArrayRetained.java6
-rw-r--r--src/classes/share/javax/media/j3d/LineAttributes.java3
-rw-r--r--src/classes/share/javax/media/j3d/LineAttributesRetained.java4
-rw-r--r--src/classes/share/javax/media/j3d/LineStripArray.java2
-rw-r--r--src/classes/share/javax/media/j3d/LineStripArrayRetained.java6
-rw-r--r--src/classes/share/javax/media/j3d/LinearFog.java3
-rw-r--r--src/classes/share/javax/media/j3d/LinearFogRetained.java4
-rw-r--r--src/classes/share/javax/media/j3d/Link.java3
-rw-r--r--src/classes/share/javax/media/j3d/LinkRetained.java13
-rw-r--r--src/classes/share/javax/media/j3d/MasterControl.java16
-rw-r--r--src/classes/share/javax/media/j3d/MasterControlThread.java1
-rw-r--r--src/classes/share/javax/media/j3d/Material.java4
-rw-r--r--src/classes/share/javax/media/j3d/MaterialRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/MediaContainer.java3
-rw-r--r--src/classes/share/javax/media/j3d/ModelClip.java4
-rw-r--r--src/classes/share/javax/media/j3d/ModelClipRetained.java7
-rw-r--r--src/classes/share/javax/media/j3d/Morph.java4
-rw-r--r--src/classes/share/javax/media/j3d/MorphRetained.java15
-rw-r--r--src/classes/share/javax/media/j3d/NodeComponent.java1
-rw-r--r--src/classes/share/javax/media/j3d/NodeComponentRetained.java1
-rw-r--r--src/classes/share/javax/media/j3d/NodeRetained.java8
-rw-r--r--src/classes/share/javax/media/j3d/NoopDrawingSurfaceObject.java4
-rw-r--r--src/classes/share/javax/media/j3d/NoopPipeline.java163
-rw-r--r--src/classes/share/javax/media/j3d/NotificationThread.java1
-rw-r--r--src/classes/share/javax/media/j3d/OrderedCollection.java1
-rw-r--r--src/classes/share/javax/media/j3d/OrderedGroup.java8
-rw-r--r--src/classes/share/javax/media/j3d/OrderedGroupRetained.java14
-rw-r--r--src/classes/share/javax/media/j3d/OrientedShape3D.java4
-rw-r--r--src/classes/share/javax/media/j3d/OrientedShape3DRenderMethod.java1
-rw-r--r--src/classes/share/javax/media/j3d/OrientedShape3DRetained.java3
-rw-r--r--src/classes/share/javax/media/j3d/PathInterpolator.java1
-rw-r--r--src/classes/share/javax/media/j3d/PhysicalBody.java1
-rw-r--r--src/classes/share/javax/media/j3d/PickBounds.java4
-rw-r--r--src/classes/share/javax/media/j3d/PickCone.java3
-rw-r--r--src/classes/share/javax/media/j3d/PickConeRay.java2
-rw-r--r--src/classes/share/javax/media/j3d/PickConeSegment.java2
-rw-r--r--src/classes/share/javax/media/j3d/PickCylinder.java3
-rw-r--r--src/classes/share/javax/media/j3d/PickCylinderRay.java2
-rw-r--r--src/classes/share/javax/media/j3d/PickCylinderSegment.java2
-rw-r--r--src/classes/share/javax/media/j3d/PickPoint.java4
-rw-r--r--src/classes/share/javax/media/j3d/PickRay.java4
-rw-r--r--src/classes/share/javax/media/j3d/PickSegment.java4
-rw-r--r--src/classes/share/javax/media/j3d/Pipeline.java1
-rw-r--r--src/classes/share/javax/media/j3d/PointArray.java2
-rw-r--r--src/classes/share/javax/media/j3d/PointArrayRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/PointAttributes.java3
-rw-r--r--src/classes/share/javax/media/j3d/PointAttributesRetained.java4
-rw-r--r--src/classes/share/javax/media/j3d/PointLight.java3
-rw-r--r--src/classes/share/javax/media/j3d/PointLightRetained.java9
-rw-r--r--src/classes/share/javax/media/j3d/PointSound.java4
-rw-r--r--src/classes/share/javax/media/j3d/PointSoundRetained.java3
-rw-r--r--src/classes/share/javax/media/j3d/PolygonAttributes.java3
-rw-r--r--src/classes/share/javax/media/j3d/PolygonAttributesRetained.java4
-rw-r--r--src/classes/share/javax/media/j3d/PositionInterpolator.java3
-rw-r--r--src/classes/share/javax/media/j3d/PositionPathInterpolator.java3
-rw-r--r--src/classes/share/javax/media/j3d/QuadArray.java2
-rw-r--r--src/classes/share/javax/media/j3d/QuadArrayRetained.java6
-rw-r--r--src/classes/share/javax/media/j3d/Raster.java5
-rw-r--r--src/classes/share/javax/media/j3d/RasterRetained.java13
-rw-r--r--src/classes/share/javax/media/j3d/RenderAtom.java1
-rw-r--r--src/classes/share/javax/media/j3d/RenderBin.java4
-rw-r--r--src/classes/share/javax/media/j3d/RenderMolecule.java3
-rw-r--r--src/classes/share/javax/media/j3d/Renderer.java5
-rw-r--r--src/classes/share/javax/media/j3d/RendererStructure.java3
-rw-r--r--src/classes/share/javax/media/j3d/RenderingAttributes.java3
-rw-r--r--src/classes/share/javax/media/j3d/RenderingAttributesRetained.java4
-rw-r--r--src/classes/share/javax/media/j3d/RenderingAttributesStructure.java4
-rw-r--r--src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java4
-rw-r--r--src/classes/share/javax/media/j3d/RenderingError.java1
-rw-r--r--src/classes/share/javax/media/j3d/RotPosPathInterpolator.java3
-rw-r--r--src/classes/share/javax/media/j3d/RotPosScalePathInterpolator.java3
-rw-r--r--src/classes/share/javax/media/j3d/RotationInterpolator.java3
-rw-r--r--src/classes/share/javax/media/j3d/RotationPathInterpolator.java3
-rw-r--r--src/classes/share/javax/media/j3d/ScaleInterpolator.java3
-rw-r--r--src/classes/share/javax/media/j3d/SceneGraphObject.java1
-rw-r--r--src/classes/share/javax/media/j3d/SceneGraphObjectRetained.java2
-rw-r--r--src/classes/share/javax/media/j3d/SceneGraphPath.java3
-rw-r--r--src/classes/share/javax/media/j3d/Screen3D.java1
-rw-r--r--src/classes/share/javax/media/j3d/ShaderAppearance.java5
-rw-r--r--src/classes/share/javax/media/j3d/ShaderAppearanceRetained.java12
-rw-r--r--src/classes/share/javax/media/j3d/ShaderAttributeArray.java3
-rw-r--r--src/classes/share/javax/media/j3d/ShaderAttributeArrayRetained.java44
-rw-r--r--src/classes/share/javax/media/j3d/ShaderAttributeBinding.java1
-rw-r--r--src/classes/share/javax/media/j3d/ShaderAttributeObjectRetained.java4
-rw-r--r--src/classes/share/javax/media/j3d/ShaderAttributeRetained.java1
-rw-r--r--src/classes/share/javax/media/j3d/ShaderAttributeSet.java1
-rw-r--r--src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java11
-rw-r--r--src/classes/share/javax/media/j3d/ShaderAttributeValue.java3
-rw-r--r--src/classes/share/javax/media/j3d/ShaderAttributeValueRetained.java34
-rw-r--r--src/classes/share/javax/media/j3d/ShaderBin.java1
-rw-r--r--src/classes/share/javax/media/j3d/ShaderError.java1
-rw-r--r--src/classes/share/javax/media/j3d/ShaderProgram.java1
-rw-r--r--src/classes/share/javax/media/j3d/ShaderProgramRetained.java4
-rw-r--r--src/classes/share/javax/media/j3d/ShaderRetained.java4
-rw-r--r--src/classes/share/javax/media/j3d/Shape3D.java5
-rw-r--r--src/classes/share/javax/media/j3d/Shape3DCompileRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/Shape3DRetained.java18
-rw-r--r--src/classes/share/javax/media/j3d/SharedGroup.java2
-rw-r--r--src/classes/share/javax/media/j3d/SharedGroupRetained.java20
-rw-r--r--src/classes/share/javax/media/j3d/Sound.java2
-rw-r--r--src/classes/share/javax/media/j3d/SoundRetained.java6
-rw-r--r--src/classes/share/javax/media/j3d/SoundScheduler.java3
-rw-r--r--src/classes/share/javax/media/j3d/SoundStructure.java3
-rw-r--r--src/classes/share/javax/media/j3d/Soundscape.java5
-rw-r--r--src/classes/share/javax/media/j3d/SoundscapeRetained.java6
-rw-r--r--src/classes/share/javax/media/j3d/SourceCodeShader.java3
-rw-r--r--src/classes/share/javax/media/j3d/SourceCodeShaderRetained.java3
-rw-r--r--src/classes/share/javax/media/j3d/SpotLight.java3
-rw-r--r--src/classes/share/javax/media/j3d/SpotLightRetained.java7
-rw-r--r--src/classes/share/javax/media/j3d/StructureUpdateThread.java1
-rw-r--r--src/classes/share/javax/media/j3d/Switch.java3
-rw-r--r--src/classes/share/javax/media/j3d/SwitchRetained.java22
-rw-r--r--src/classes/share/javax/media/j3d/SwitchValueInterpolator.java4
-rw-r--r--src/classes/share/javax/media/j3d/TexCoordGeneration.java3
-rw-r--r--src/classes/share/javax/media/j3d/TexCoordGenerationRetained.java5
-rw-r--r--src/classes/share/javax/media/j3d/Text3D.java3
-rw-r--r--src/classes/share/javax/media/j3d/Text3DRenderMethod.java1
-rw-r--r--src/classes/share/javax/media/j3d/Text3DRetained.java9
-rw-r--r--src/classes/share/javax/media/j3d/Texture.java2
-rw-r--r--src/classes/share/javax/media/j3d/Texture2D.java5
-rw-r--r--src/classes/share/javax/media/j3d/Texture3D.java4
-rw-r--r--src/classes/share/javax/media/j3d/Texture3DRetained.java11
-rw-r--r--src/classes/share/javax/media/j3d/TextureAttributes.java3
-rw-r--r--src/classes/share/javax/media/j3d/TextureAttributesRetained.java4
-rw-r--r--src/classes/share/javax/media/j3d/TextureBin.java1
-rw-r--r--src/classes/share/javax/media/j3d/TextureCubeMap.java6
-rw-r--r--src/classes/share/javax/media/j3d/TextureCubeMapRetained.java12
-rw-r--r--src/classes/share/javax/media/j3d/TextureRetained.java6
-rw-r--r--src/classes/share/javax/media/j3d/TextureUnitState.java5
-rw-r--r--src/classes/share/javax/media/j3d/TextureUnitStateRetained.java15
-rw-r--r--src/classes/share/javax/media/j3d/TimerThread.java1
-rw-r--r--src/classes/share/javax/media/j3d/Transform3D.java3
-rw-r--r--src/classes/share/javax/media/j3d/TransformGroup.java3
-rw-r--r--src/classes/share/javax/media/j3d/TransformGroupRetained.java23
-rw-r--r--src/classes/share/javax/media/j3d/TransformInterpolator.java3
-rw-r--r--src/classes/share/javax/media/j3d/TransformStructure.java4
-rw-r--r--src/classes/share/javax/media/j3d/TransparencyAttributes.java3
-rw-r--r--src/classes/share/javax/media/j3d/TransparencyAttributesRetained.java4
-rw-r--r--src/classes/share/javax/media/j3d/TransparencyInterpolator.java4
-rw-r--r--src/classes/share/javax/media/j3d/TransparentRenderingInfo.java4
-rw-r--r--src/classes/share/javax/media/j3d/TriangleArray.java2
-rw-r--r--src/classes/share/javax/media/j3d/TriangleArrayRetained.java6
-rw-r--r--src/classes/share/javax/media/j3d/TriangleFanArray.java2
-rw-r--r--src/classes/share/javax/media/j3d/TriangleFanArrayRetained.java6
-rw-r--r--src/classes/share/javax/media/j3d/TriangleStripArray.java2
-rw-r--r--src/classes/share/javax/media/j3d/TriangleStripArrayRetained.java6
-rw-r--r--src/classes/share/javax/media/j3d/UnorderList.java2
-rw-r--r--src/classes/share/javax/media/j3d/VertexArrayRenderMethod.java1
-rw-r--r--src/classes/share/javax/media/j3d/ViewPlatform.java3
-rw-r--r--src/classes/share/javax/media/j3d/ViewPlatformRetained.java3
-rw-r--r--src/classes/share/javax/media/j3d/ViewSpecificGroup.java3
-rw-r--r--src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java7
-rw-r--r--src/classes/share/javax/media/j3d/WakeupAnd.java5
-rw-r--r--src/classes/share/javax/media/j3d/WakeupAndOfOrs.java5
-rw-r--r--src/classes/share/javax/media/j3d/WakeupCriteriaEnumerator.java2
-rw-r--r--src/classes/share/javax/media/j3d/WakeupCriterion.java3
-rw-r--r--src/classes/share/javax/media/j3d/WakeupIndexedList.java2
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOnAWTEvent.java3
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOnActivation.java3
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOnBehaviorPost.java3
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOnCollisionEntry.java4
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOnCollisionExit.java4
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOnCollisionMovement.java4
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOnDeactivation.java4
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOnElapsedFrames.java3
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOnElapsedTime.java4
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOnElapsedTimeHeap.java2
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOnSensorEntry.java3
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOnSensorExit.java3
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOnTransformChange.java3
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOnViewPlatformEntry.java3
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOnViewPlatformExit.java3
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOr.java5
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOrOfAnds.java5
288 files changed, 1758 insertions, 0 deletions
diff --git a/src/classes/share/javax/media/j3d/AlternateAppearance.java b/src/classes/share/javax/media/j3d/AlternateAppearance.java
index 568d248..48b9066 100644
--- a/src/classes/share/javax/media/j3d/AlternateAppearance.java
+++ b/src/classes/share/javax/media/j3d/AlternateAppearance.java
@@ -146,6 +146,7 @@ public class AlternateAppearance extends Leaf {
* Creates the retained mode AlternateAppearanceRetained object that this
* Alternate Appearance component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new AlternateAppearanceRetained();
this.retained.setSource(this);
@@ -522,6 +523,7 @@ public Enumeration<Group> getAllScopes() {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
@@ -572,6 +574,7 @@ public Enumeration<Group> getAllScopes() {
* @see Node#cloneTree
* @see DanglingReferenceException
*/
+ @Override
public void updateNodeReferences(NodeReferenceTable referenceTable) {
AlternateAppearanceRetained rt = (AlternateAppearanceRetained)
@@ -606,6 +609,7 @@ public Enumeration<Group> getAllScopes() {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
AlternateAppearance app = new AlternateAppearance();
app.duplicateNode(this, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/AlternateAppearanceRetained.java b/src/classes/share/javax/media/j3d/AlternateAppearanceRetained.java
index afbf12a..636bc13 100644
--- a/src/classes/share/javax/media/j3d/AlternateAppearanceRetained.java
+++ b/src/classes/share/javax/media/j3d/AlternateAppearanceRetained.java
@@ -501,6 +501,7 @@ Enumeration<Group> getAllScopes() {
* cached region and transformed region
*/
+ @Override
void updateBoundingLeaf() {
if (boundingLeaf != null && boundingLeaf.switchState.currentSwitchOn) {
region = boundingLeaf.transformedRegion;
@@ -514,6 +515,7 @@ Enumeration<Group> getAllScopes() {
}
}
+ @Override
void setLive(SetLiveState s) {
if (inImmCtx) {
@@ -684,6 +686,7 @@ Enumeration<Group> getAllScopes() {
* This clearLive routine first calls the superclass's method, then
* it removes itself to the list of alt app
*/
+ @Override
void clearLive(SetLiveState s) {
int i, j;
GroupRetained group;
@@ -739,6 +742,7 @@ Enumeration<Group> getAllScopes() {
+ @Override
void updateTransformChange() {
}
@@ -769,6 +773,7 @@ Enumeration<Group> getAllScopes() {
}
+ @Override
void getMirrorObjects(ArrayList leafList, HashKey key) {
leafList.add(mirrorAltApp);
}
diff --git a/src/classes/share/javax/media/j3d/AmbientLight.java b/src/classes/share/javax/media/j3d/AmbientLight.java
index beb07b0..588ea51 100644
--- a/src/classes/share/javax/media/j3d/AmbientLight.java
+++ b/src/classes/share/javax/media/j3d/AmbientLight.java
@@ -76,6 +76,7 @@ public class AmbientLight extends Light {
* Creates the retained mode AmbientLightRetained object that this
* AmbientLight component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new AmbientLightRetained();
this.retained.setSource(this);
@@ -95,6 +96,7 @@ public class AmbientLight extends Light {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
AmbientLight a = new AmbientLight();
a.duplicateNode(this, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/AmbientLightRetained.java b/src/classes/share/javax/media/j3d/AmbientLightRetained.java
index 175ef23..dcc7c22 100644
--- a/src/classes/share/javax/media/j3d/AmbientLightRetained.java
+++ b/src/classes/share/javax/media/j3d/AmbientLightRetained.java
@@ -39,12 +39,14 @@ class AmbientLightRetained extends LightRetained {
localBounds = new BoundingBox((Bounds)null);
}
+ @Override
void setLive(SetLiveState s) {
super.setLive(s);
J3dMessage createMessage = super.initMessage(7);
VirtualUniverse.mc.processMessage(createMessage);
}
+ @Override
void update(Context ctx, int lightSlot, double scale) {
}
}
diff --git a/src/classes/share/javax/media/j3d/Appearance.java b/src/classes/share/javax/media/j3d/Appearance.java
index 3f3f66e..a26eb84 100644
--- a/src/classes/share/javax/media/j3d/Appearance.java
+++ b/src/classes/share/javax/media/j3d/Appearance.java
@@ -329,6 +329,7 @@ public class Appearance extends NodeComponent {
* Creates the retained mode AppearanceRetained object that this
* Appearance component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new AppearanceRetained();
this.retained.setSource(this);
@@ -855,6 +856,7 @@ public class Appearance extends NodeComponent {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
Appearance a = new Appearance();
a.duplicateNodeComponent(this);
@@ -868,6 +870,7 @@ public class Appearance extends NodeComponent {
* @deprecated replaced with duplicateNodeComponent(
* NodeComponent originalNodeComponent, boolean forceDuplicate)
*/
+ @Override
public void duplicateNodeComponent(NodeComponent originalNodeComponent) {
checkDuplicateNodeComponent(originalNodeComponent);
}
@@ -892,6 +895,7 @@ public class Appearance extends NodeComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent, forceDuplicate);
@@ -975,6 +979,7 @@ public class Appearance extends NodeComponent {
* duplicate also even though current duplicateOnCloneTree flag is false.
* This should be overwrite by NodeComponent which contains sub-NodeComponent.
*/
+ @Override
boolean duplicateChild() {
if (getDuplicateOnCloneTree())
return true;
diff --git a/src/classes/share/javax/media/j3d/AppearanceRetained.java b/src/classes/share/javax/media/j3d/AppearanceRetained.java
index 3edb659..987e911 100644
--- a/src/classes/share/javax/media/j3d/AppearanceRetained.java
+++ b/src/classes/share/javax/media/j3d/AppearanceRetained.java
@@ -709,6 +709,7 @@ class AppearanceRetained extends NodeComponentRetained {
}
+ @Override
synchronized void createMirrorObject() {
if (mirror == null) {
// we can't check isStatic() since it sub-NodeComponent
@@ -725,6 +726,7 @@ class AppearanceRetained extends NodeComponentRetained {
* It also calls the update method for each node component if it
* is not null.
*/
+ @Override
synchronized void initMirrorObject() {
AppearanceRetained mirrorApp = (AppearanceRetained)mirror;
@@ -820,6 +822,7 @@ class AppearanceRetained extends NodeComponentRetained {
* Update the "component" field of the mirror object with the
* given "value"
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
AppearanceRetained mirrorApp = (AppearanceRetained)mirror;
if ((component & MATERIAL) != 0) {
@@ -885,6 +888,7 @@ class AppearanceRetained extends NodeComponentRetained {
}
+ @Override
void setLive(boolean backgroundGroup, int refCount) {
// System.err.println("AppearceRetained.setLive()");
doSetLive(backgroundGroup, refCount);
@@ -895,6 +899,7 @@ class AppearanceRetained extends NodeComponentRetained {
* This method calls the setLive method of all appearance bundle
* objects.
*/
+ @Override
void doSetLive(boolean backgroundGroup, int refCount) {
// System.err.println("AppearceRetained.doSetLive()");
@@ -960,6 +965,7 @@ class AppearanceRetained extends NodeComponentRetained {
* This method calls the clearLive method of all appearance bundle
* objects.
*/
+ @Override
void clearLive(int refCount) {
super.clearLive(refCount);
@@ -1012,6 +1018,7 @@ class AppearanceRetained extends NodeComponentRetained {
}
+ @Override
boolean isStatic() {
boolean flag;
@@ -1053,6 +1060,7 @@ class AppearanceRetained extends NodeComponentRetained {
// Issue 209 - enable this method (was previously commented out)
// Simply pass along to the NodeComponents
+ @Override
void compile(CompileState compState) {
setCompiled();
@@ -1115,10 +1123,12 @@ class AppearanceRetained extends NodeComponentRetained {
* Since hashCode is only used by AppearanceMap (at present) we may be
* able to improve efficency by calcing a hashCode from the values.
*/
+ @Override
public int hashCode() {
return getClass().hashCode();
}
+ @Override
public boolean equals(Object obj) {
return ((obj instanceof AppearanceRetained) &&
equals((AppearanceRetained) obj));
@@ -1184,6 +1194,7 @@ class AppearanceRetained extends NodeComponentRetained {
+ @Override
synchronized void addAMirrorUser(Shape3DRetained shape) {
super.addAMirrorUser(shape);
@@ -1218,6 +1229,7 @@ class AppearanceRetained extends NodeComponentRetained {
pointAttributes.addAMirrorUser(shape);
}
+ @Override
synchronized void removeAMirrorUser(Shape3DRetained shape) {
super.removeAMirrorUser(shape);
if (material != null)
@@ -1367,6 +1379,7 @@ class AppearanceRetained extends NodeComponentRetained {
return(true);
}
+ @Override
void handleFrequencyChange(int bit) {
int mask = 0;
if (bit == Appearance.ALLOW_COLORING_ATTRIBUTES_WRITE)
diff --git a/src/classes/share/javax/media/j3d/AttributeBin.java b/src/classes/share/javax/media/j3d/AttributeBin.java
index 8c5dd00..95ce52a 100644
--- a/src/classes/share/javax/media/j3d/AttributeBin.java
+++ b/src/classes/share/javax/media/j3d/AttributeBin.java
@@ -207,6 +207,7 @@ ArrayList<ShaderBin> addShaderBins = new ArrayList<ShaderBin>();
return (true);
}
+ @Override
public void updateObject() {
ShaderBin sb;
int i, size;
diff --git a/src/classes/share/javax/media/j3d/AudioDeviceEnumerator.java b/src/classes/share/javax/media/j3d/AudioDeviceEnumerator.java
index c89af75..dbab9b3 100644
--- a/src/classes/share/javax/media/j3d/AudioDeviceEnumerator.java
+++ b/src/classes/share/javax/media/j3d/AudioDeviceEnumerator.java
@@ -59,6 +59,7 @@ class AudioDeviceEnumerator implements Enumeration {
* Query that tells whether the enumerator has more elements
* @return true if the enumerator has more elements, false otherwise
*/
+ @Override
public boolean hasMoreElements() {
if(endOfList == false)
return true;
@@ -70,6 +71,7 @@ class AudioDeviceEnumerator implements Enumeration {
* Return the next element in the enumerators
* @return the next element in this enumerator
*/
+ @Override
public Object nextElement() {
if (this.hasMoreElements()) {
endOfList = true;
diff --git a/src/classes/share/javax/media/j3d/AuralAttributes.java b/src/classes/share/javax/media/j3d/AuralAttributes.java
index 1f35e0a..563bc3a 100644
--- a/src/classes/share/javax/media/j3d/AuralAttributes.java
+++ b/src/classes/share/javax/media/j3d/AuralAttributes.java
@@ -675,6 +675,7 @@ public class AuralAttributes extends NodeComponent {
* Creates the retained mode AuralAttributesRetained object that this
* component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new AuralAttributesRetained();
this.retained.setSource(this);
@@ -1255,6 +1256,7 @@ public class AuralAttributes extends NodeComponent {
* @deprecated As of Java 3D version 1.2, replaced by
* <code>cloneNodeComponent(boolean forceDuplicate)</code>
*/
+ @Override
public NodeComponent cloneNodeComponent() {
AuralAttributes a = new AuralAttributes();
a.duplicateNodeComponent(this, this.forceDuplicate);
@@ -1279,6 +1281,7 @@ public class AuralAttributes extends NodeComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent,
diff --git a/src/classes/share/javax/media/j3d/BHInternalNode.java b/src/classes/share/javax/media/j3d/BHInternalNode.java
index 4d090c5..1272e58 100644
--- a/src/classes/share/javax/media/j3d/BHInternalNode.java
+++ b/src/classes/share/javax/media/j3d/BHInternalNode.java
@@ -90,6 +90,7 @@ class BHInternalNode extends BHNode {
bHull.set(this.bHull);
}
+ @Override
void computeBoundingHull() {
BoundingBox rChildBound = null;
BoundingBox lChildBound = null;
@@ -127,6 +128,7 @@ class BHInternalNode extends BHNode {
}
+ @Override
void updateMarkedBoundingHull() {
if(mark == false)
@@ -191,6 +193,7 @@ class BHInternalNode extends BHNode {
}
}
+ @Override
void destroyTree(BHNode[] bhArr, int[] index) {
if(rChild != null)
diff --git a/src/classes/share/javax/media/j3d/BHLeafNode.java b/src/classes/share/javax/media/j3d/BHLeafNode.java
index 1a08745..2fcedbb 100644
--- a/src/classes/share/javax/media/j3d/BHLeafNode.java
+++ b/src/classes/share/javax/media/j3d/BHLeafNode.java
@@ -65,10 +65,12 @@ class BHLeafNode extends BHNode {
nodeType = BH_TYPE_LEAF;
}
+ @Override
void computeBoundingHull() {
bHull = leafIF.computeBoundingHull();
}
+ @Override
void updateMarkedBoundingHull() {
if(mark == false)
@@ -90,6 +92,7 @@ class BHLeafNode extends BHNode {
return leafIF.getLocale2();
}
+ @Override
void destroyTree(BHNode[] bhArr, int[] index) {
if(bhArr.length <= index[0]) {
// System.err.println("BHLeafNode : Problem bhArr overflow!!!");
diff --git a/src/classes/share/javax/media/j3d/Background.java b/src/classes/share/javax/media/j3d/Background.java
index fa2f4cf..e7cf50b 100644
--- a/src/classes/share/javax/media/j3d/Background.java
+++ b/src/classes/share/javax/media/j3d/Background.java
@@ -631,6 +631,7 @@ public class Background extends Leaf {
* Creates the retained mode BackgroundRetained object that this
* Background component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new BackgroundRetained();
this.retained.setSource(this);
@@ -654,6 +655,7 @@ public class Background extends Leaf {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
Background b = new Background();
b.duplicateNode(this, forceDuplicate);
@@ -693,6 +695,7 @@ public class Background extends Leaf {
* @see Node#cloneNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public void duplicateNode(Node originalNode, boolean
forceDuplicate) {
checkDuplicateNode(originalNode, forceDuplicate);
@@ -720,6 +723,7 @@ public class Background extends Leaf {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
@@ -770,6 +774,7 @@ public class Background extends Leaf {
* @see Node#cloneTree
* @see DanglingReferenceException
*/
+ @Override
public void updateNodeReferences(NodeReferenceTable referenceTable) {
super.updateNodeReferences(referenceTable);
diff --git a/src/classes/share/javax/media/j3d/BackgroundRetained.java b/src/classes/share/javax/media/j3d/BackgroundRetained.java
index 7337a99..847d8de 100644
--- a/src/classes/share/javax/media/j3d/BackgroundRetained.java
+++ b/src/classes/share/javax/media/j3d/BackgroundRetained.java
@@ -515,6 +515,7 @@ GeometryAtom[] bgGeometryAtoms = null;
* This setLive routine first calls the superclass's method, then
* it adds itself to the list of lights
*/
+ @Override
void setLive(SetLiveState s) {
super.doSetLive(s);
@@ -615,6 +616,7 @@ GeometryAtom[] bgGeometryAtoms = null;
* This clearLive routine first calls the superclass's method, then
* it removes itself to the list of lights
*/
+ @Override
void clearLive(SetLiveState s) {
super.clearLive(s);
if ((s.viewScopedNodeList != null) && (s.viewLists != null)) {
@@ -694,6 +696,7 @@ GeometryAtom[] bgGeometryAtoms = null;
* to update the object's
* transformed region
*/
+ @Override
void updateBoundingLeaf() {
if (boundingLeaf != null &&
boundingLeaf.mirrorBoundingLeaf.switchState.currentSwitchOn) {
@@ -757,6 +760,7 @@ GeometryAtom[] getBackgroundGeometryAtoms() {
return bgGeometryAtoms;
}
+ @Override
void mergeTransform(TransformGroupRetained xform) {
super.mergeTransform(xform);
if (applicationRegion != null) {
@@ -771,6 +775,7 @@ GeometryAtom[] getBackgroundGeometryAtoms() {
void notifyImageComponentImageChanged(ImageComponentRetained image,
ImageComponentUpdateInfo value) {
}
+ @Override
void getMirrorObjects(ArrayList leafList, HashKey key) {
leafList.add(this); // No Mirror in this case
}
diff --git a/src/classes/share/javax/media/j3d/BackgroundSound.java b/src/classes/share/javax/media/j3d/BackgroundSound.java
index 17e822b..8ca0de0 100644
--- a/src/classes/share/javax/media/j3d/BackgroundSound.java
+++ b/src/classes/share/javax/media/j3d/BackgroundSound.java
@@ -86,6 +86,7 @@ public class BackgroundSound extends Sound {
* Creates the retained mode BackgroundSoundRetained object that this
* BackgroundSound component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new BackgroundSoundRetained();
this.retained.setSource(this);
@@ -106,6 +107,7 @@ public class BackgroundSound extends Sound {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
BackgroundSound b = new BackgroundSound();
b.duplicateNode(this, forceDuplicate);
@@ -144,6 +146,7 @@ public class BackgroundSound extends Sound {
* @see Node#cloneNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public void duplicateNode(Node originalNode, boolean forceDuplicate) {
checkDuplicateNode(originalNode, forceDuplicate);
}
diff --git a/src/classes/share/javax/media/j3d/Behavior.java b/src/classes/share/javax/media/j3d/Behavior.java
index 18964ae..f0e5501 100644
--- a/src/classes/share/javax/media/j3d/Behavior.java
+++ b/src/classes/share/javax/media/j3d/Behavior.java
@@ -284,6 +284,7 @@ public abstract class Behavior extends Leaf {
* Creates the retained mode BehaviorRetained object that this
* Behavior object will point to.
*/
+ @Override
void createRetained() {
this.retained = new BehaviorRetained();
this.retained.setSource(this);
@@ -463,6 +464,7 @@ public abstract class Behavior extends Leaf {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
@@ -505,6 +507,7 @@ public abstract class Behavior extends Leaf {
* @see Node#cloneTree
* @see DanglingReferenceException
*/
+ @Override
public void updateNodeReferences(NodeReferenceTable referenceTable) {
super.updateNodeReferences(referenceTable);
diff --git a/src/classes/share/javax/media/j3d/BehaviorRetained.java b/src/classes/share/javax/media/j3d/BehaviorRetained.java
index e245408..b82b09d 100644
--- a/src/classes/share/javax/media/j3d/BehaviorRetained.java
+++ b/src/classes/share/javax/media/j3d/BehaviorRetained.java
@@ -286,6 +286,7 @@ class BehaviorRetained extends LeafRetained {
* it activates all canvases that are associated with the attached
* view.
*/
+ @Override
synchronized void setLive(SetLiveState s) {
super.doSetLive(s);
@@ -323,6 +324,7 @@ class BehaviorRetained extends LeafRetained {
* it deactivates all canvases that are associated with the attached
* view.
*/
+ @Override
synchronized void clearLive(SetLiveState s) {
super.clearLive(s);
s.nodeList.add(this);
@@ -510,6 +512,7 @@ class BehaviorRetained extends LeafRetained {
sendMessage(mtype, null);
}
+ @Override
void mergeTransform(TransformGroupRetained xform) {
super.mergeTransform(xform);
if (schedulingRegion != null) {
diff --git a/src/classes/share/javax/media/j3d/BehaviorScheduler.java b/src/classes/share/javax/media/j3d/BehaviorScheduler.java
index 5cccf86..1a43a34 100644
--- a/src/classes/share/javax/media/j3d/BehaviorScheduler.java
+++ b/src/classes/share/javax/media/j3d/BehaviorScheduler.java
@@ -66,6 +66,7 @@ class BehaviorScheduler extends J3dThread {
return (++numInstances);
}
+ @Override
int getInstanceNum() {
if (instanceNum == -1)
instanceNum = newInstanceNum();
@@ -120,6 +121,7 @@ class BehaviorScheduler extends J3dThread {
* clean (emptying out satisfied conditions) and processStimulus
* (adding conditions again if wakeupOn called) calls.
*/
+ @Override
void doWork(long referenceTime) {
BehaviorRetained arr[];
UnorderList list;
diff --git a/src/classes/share/javax/media/j3d/BehaviorStructure.java b/src/classes/share/javax/media/j3d/BehaviorStructure.java
index 0884618..dc10a13 100644
--- a/src/classes/share/javax/media/j3d/BehaviorStructure.java
+++ b/src/classes/share/javax/media/j3d/BehaviorStructure.java
@@ -197,6 +197,7 @@ class BehaviorStructure extends J3dStructure {
}
+ @Override
void processMessages(long referenceTime) {
J3dMessage[] messages = getMessages(referenceTime);
@@ -418,6 +419,7 @@ class BehaviorStructure extends J3dStructure {
}
+ @Override
void removeNodes(J3dMessage m) {
Object[] nodes = (Object[]) m.args[0];
boolean behavRemove = false;
@@ -1651,6 +1653,7 @@ Sensor sensorIntersect(Bounds behregion) {
}
+ @Override
void cleanup() {
behaviors.clear();
viewPlatforms.clear();
diff --git a/src/classes/share/javax/media/j3d/Billboard.java b/src/classes/share/javax/media/j3d/Billboard.java
index d17e3d6..0372062 100644
--- a/src/classes/share/javax/media/j3d/Billboard.java
+++ b/src/classes/share/javax/media/j3d/Billboard.java
@@ -297,6 +297,7 @@ public class Billboard extends Behavior {
/**
* Initialize method that sets up initial wakeup criteria.
*/
+ @Override
public void initialize() {
// Insert wakeup condition into queue
wakeupOn(wakeupFrame);
@@ -308,6 +309,7 @@ public class Billboard extends Behavior {
* @param criteria an enumeration of the criteria that caused the
* stimulus
*/
+ @Override
public void processStimulus(Enumeration criteria) {
double angle = 0.0;
double sign;
@@ -583,6 +585,7 @@ private boolean projectToPlane(Vector3d projVec, Vector3d planeVec) {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
Billboard b = new Billboard();
b.duplicateNode(this, forceDuplicate);
@@ -611,6 +614,7 @@ private boolean projectToPlane(Vector3d projVec, Vector3d planeVec) {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
@@ -657,6 +661,7 @@ private boolean projectToPlane(Vector3d projVec, Vector3d planeVec) {
* @see Node#cloneTree
* @see DanglingReferenceException
*/
+ @Override
public void updateNodeReferences(NodeReferenceTable referenceTable) {
super.updateNodeReferences(referenceTable);
diff --git a/src/classes/share/javax/media/j3d/BoundingBox.java b/src/classes/share/javax/media/j3d/BoundingBox.java
index 4595ced..304e43b 100644
--- a/src/classes/share/javax/media/j3d/BoundingBox.java
+++ b/src/classes/share/javax/media/j3d/BoundingBox.java
@@ -291,6 +291,7 @@ public void setUpper(Point3d p1) {
* Sets the the value of this BoundingBox
* @param boundsObject another bounds object
*/
+ @Override
public void set(Bounds boundsObject) {
int i;
@@ -350,6 +351,7 @@ public void setUpper(Point3d p1) {
* Creates a copy of this bounding box.
* @return a new bounding box
*/
+ @Override
public Object clone() {
return new BoundingBox(this.lower, this.upper);
}
@@ -368,6 +370,7 @@ public void setUpper(Point3d p1) {
*
* @since Java 3D 1.2
*/
+ @Override
public boolean equals(Object bounds) {
try {
BoundingBox box = (BoundingBox)bounds;
@@ -395,6 +398,7 @@ public void setUpper(Point3d p1) {
*
* @since Java 3D 1.2
*/
+ @Override
public int hashCode() {
long bits = 1L;
bits = J3dHash.mixDoubleBits(bits, lower.x);
@@ -413,6 +417,7 @@ public void setUpper(Point3d p1) {
* specified bounds object.
* @param boundsObject another bounds object
*/
+ @Override
public void combine(Bounds boundsObject) {
if((boundsObject == null) || (boundsObject.boundsIsEmpty)
@@ -475,6 +480,7 @@ public void setUpper(Point3d p1) {
* box and the array of bounding objects.
* @param bounds an array of bounds objects
*/
+ @Override
public void combine(Bounds[] bounds) {
int i=0;
@@ -551,6 +557,7 @@ public void setUpper(Point3d p1) {
* bounding box encloses the original bounding box and the point.
* @param point a 3d point in space
*/
+ @Override
public void combine(Point3d point) {
if( boundsIsInfinite) {
@@ -580,6 +587,7 @@ public void setUpper(Point3d p1) {
* array of points.
* @param points an array of 3d points in space
*/
+ @Override
public void combine(Point3d[] points) {
int i;
@@ -612,6 +620,7 @@ public void setUpper(Point3d p1) {
* @param boundsObject the bounding object to be transformed
* @param matrix a transformation matrix
*/
+ @Override
public void transform( Bounds boundsObject, Transform3D matrix) {
if (boundsObject == null || boundsObject.boundsIsEmpty) {
@@ -647,6 +656,7 @@ public void setUpper(Point3d p1) {
* Transforms this bounding box by the given matrix.
* @param matrix a transformation matrix
*/
+ @Override
public void transform(Transform3D matrix) {
if (boundsIsInfinite)
@@ -739,6 +749,7 @@ public void setUpper(Point3d p1) {
* @param position3 a point defining the location of the pick w= distance to pick
* @return true or false indicating if an intersection occured
*/
+ @Override
boolean intersect(Point3d origin, Vector3d direction, Point4d position ) {
double t1,t2,tmp,tnear,tfar,invDir,invMag;
double dirx, diry, dirz;
@@ -888,6 +899,7 @@ public void setUpper(Point3d p1) {
* @param position a point defining the location of the pick w= distance to pick
* @return true or false indicating if an intersection occured
*/
+ @Override
boolean intersect(Point3d point, Point4d position ) {
if( boundsIsEmpty ) {
@@ -922,6 +934,7 @@ public void setUpper(Point3d p1) {
* @param position a point defining the location of the pick w= distance to pick
* @return true or false indicating if an intersection occured
*/
+ @Override
boolean intersect( Point3d start, Point3d end, Point4d position ) {
double t1,t2,tmp,tnear,tfar,invDir,invMag;
double dirx, diry, dirz;
@@ -1087,6 +1100,7 @@ public void setUpper(Point3d p1) {
* @param direction the direction of the ray
* @return true or false indicating if an intersection occured
*/
+ @Override
public boolean intersect(Point3d origin, Vector3d direction ) {
if( boundsIsEmpty ) {
@@ -1152,6 +1166,7 @@ public void setUpper(Point3d p1) {
* @param point a point defining a position in 3-space
* @return true or false indicating if an intersection occured
*/
+ @Override
public boolean intersect(Point3d point ) {
if( boundsIsEmpty ) {
@@ -1175,6 +1190,7 @@ public void setUpper(Point3d p1) {
* with a volume of zero is <i>not</i> empty.
* @return true if the bounding box is empty; otherwise, it returns false
*/
+ @Override
public boolean isEmpty() {
return boundsIsEmpty;
@@ -1185,6 +1201,7 @@ public void setUpper(Point3d p1) {
* @param boundsObject another bounds object
* @return true or false indicating if an intersection occured
*/
+ @Override
boolean intersect(Bounds boundsObject, Point4d position) {
return intersect(boundsObject);
}
@@ -1194,6 +1211,7 @@ public void setUpper(Point3d p1) {
* @param boundsObject another bounds object
* @return true or false indicating if an intersection occured
*/
+ @Override
public boolean intersect(Bounds boundsObject) {
if( boundsObject == null ) {
@@ -1258,6 +1276,7 @@ public void setUpper(Point3d p1) {
* @param boundsObjects an array of bounding objects
* @return true or false indicating if an intersection occured
*/
+ @Override
public boolean intersect(Bounds[] boundsObjects) {
int i;
@@ -1544,6 +1563,7 @@ public void setUpper(Point3d p1) {
* @param boundsObjects an array of bounds objects
* @return closest bounding object
*/
+ @Override
public Bounds closestIntersection( Bounds[] boundsObjects) {
if( boundsObjects == null || boundsObjects.length <= 0 ) {
@@ -1762,6 +1782,7 @@ public void setUpper(Point3d p1) {
/**
* Returns a string representation of this class.
*/
+ @Override
public String toString() {
return new String( "Bounding box: Lower="+lower.x+" "+
lower.y+" "+lower.z+" Upper="+upper.x+" "+
@@ -1817,6 +1838,7 @@ private void setInfiniteBounds() {
}
// For a infinite bounds. What is the centroid ?
+@Override
Point3d getCenter() {
Point3d cent = new Point3d();
cent.add(upper, lower);
@@ -1824,6 +1846,7 @@ Point3d getCenter() {
return cent;
}
+@Override
public void getCenter(Point3d center) {
center.add(lower, upper);
center.scale(0.5d);
@@ -1854,6 +1877,7 @@ public void getCenter(Point3d center) {
* then do a copy, otherwise clone the Bounds and
* return
*/
+ @Override
Bounds copy(Bounds r) {
if (r != null && this.boundId == r.boundId) {
BoundingBox region = (BoundingBox) r;
@@ -1872,6 +1896,7 @@ public void getCenter(Point3d center) {
}
}
+ @Override
int getPickType() {
return PickShape.PICKBOUNDINGBOX;
}
diff --git a/src/classes/share/javax/media/j3d/BoundingLeaf.java b/src/classes/share/javax/media/j3d/BoundingLeaf.java
index 5fe2faa..3037abe 100644
--- a/src/classes/share/javax/media/j3d/BoundingLeaf.java
+++ b/src/classes/share/javax/media/j3d/BoundingLeaf.java
@@ -125,6 +125,7 @@ public class BoundingLeaf extends Leaf {
* Creates the BoundingLeafRetained object that this
* BoundingLeaf object will point to.
*/
+ @Override
void createRetained() {
this.retained = new BoundingLeafRetained();
this.retained.setSource(this);
@@ -144,6 +145,7 @@ public class BoundingLeaf extends Leaf {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
BoundingLeaf bl = new BoundingLeaf();
bl.duplicateNode(this, forceDuplicate);
@@ -173,6 +175,7 @@ public class BoundingLeaf extends Leaf {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/BoundingLeafRetained.java b/src/classes/share/javax/media/j3d/BoundingLeafRetained.java
index 4e8b85e..309922f 100644
--- a/src/classes/share/javax/media/j3d/BoundingLeafRetained.java
+++ b/src/classes/share/javax/media/j3d/BoundingLeafRetained.java
@@ -123,6 +123,7 @@ class BoundingLeafRetained extends LeafRetained {
}
+ @Override
void setLive(SetLiveState s) {
super.doSetLive(s);
@@ -260,6 +261,7 @@ class BoundingLeafRetained extends LeafRetained {
}
}
+ @Override
void clearLive(SetLiveState s) {
super.clearLive();
if (s.switchTargets != null &&
@@ -274,6 +276,7 @@ class BoundingLeafRetained extends LeafRetained {
}
}
+ @Override
void mergeTransform(TransformGroupRetained xform) {
super.mergeTransform(xform);
region.transform(xform.transform);
diff --git a/src/classes/share/javax/media/j3d/BoundingPolytope.java b/src/classes/share/javax/media/j3d/BoundingPolytope.java
index 4dc6844..37d47c0 100644
--- a/src/classes/share/javax/media/j3d/BoundingPolytope.java
+++ b/src/classes/share/javax/media/j3d/BoundingPolytope.java
@@ -380,6 +380,7 @@ public class BoundingPolytope extends Bounds {
* to enclose the given bounds object.
* @param boundsObject another bounds object
*/
+ @Override
public void set(Bounds boundsObject) {
int i,k;
@@ -475,6 +476,7 @@ public class BoundingPolytope extends Bounds {
* Creates a copy of a polytope.
* @return a new BoundingPolytope
*/
+ @Override
public Object clone() {
return new BoundingPolytope(planes);
}
@@ -493,6 +495,7 @@ public class BoundingPolytope extends Bounds {
*
* @since Java 3D 1.2
*/
+ @Override
public boolean equals(Object bounds) {
try {
BoundingPolytope polytope = (BoundingPolytope)bounds;
@@ -525,6 +528,7 @@ public class BoundingPolytope extends Bounds {
*
* @since Java 3D 1.2
*/
+ @Override
public int hashCode() {
long bits = 1L;
@@ -545,6 +549,7 @@ public class BoundingPolytope extends Bounds {
* given bounds object.
* @param boundsObject another bounds object
*/
+ @Override
public void combine(Bounds boundsObject) {
BoundingSphere sphere;
@@ -606,6 +611,7 @@ public class BoundingPolytope extends Bounds {
* given array of bounds object.
* @param boundsObjects an array of bounds objects
*/
+ @Override
public void combine(Bounds[] boundsObjects) {
int i=0;
double dis;
@@ -678,6 +684,7 @@ public class BoundingPolytope extends Bounds {
* Combines this bounding polytope with a point.
* @param point a 3d point in space
*/
+ @Override
public void combine(Point3d point) {
int i;
double dis;
@@ -731,6 +738,7 @@ public class BoundingPolytope extends Bounds {
* Combines this bounding polytope with an array of points.
* @param points an array of 3d points in space
*/
+ @Override
public void combine(Point3d[] points) {
int i,j;
double dis;
@@ -788,6 +796,7 @@ public class BoundingPolytope extends Bounds {
* @param boundsObject the bounding object to be transformed
* @param matrix a transformation matrix
*/
+ @Override
public void transform( Bounds boundsObject, Transform3D matrix) {
if( boundsObject == null || boundsObject.boundsIsEmpty) {
@@ -823,6 +832,7 @@ public class BoundingPolytope extends Bounds {
* Transforms this bounding polytope by the given transformation matrix.
* @param matrix a transformation matrix
*/
+ @Override
public void transform( Transform3D matrix) {
if(boundsIsInfinite)
@@ -924,6 +934,7 @@ public class BoundingPolytope extends Bounds {
* @param position is a point defining the location of the pick w= distance to pick
* @return true or false indicating if an intersection occured
*/
+ @Override
boolean intersect(Point3d origin, Vector3d direction, Point4d position ) {
double t,v0,vd,x,y,z,invMag;
double dx, dy, dz;
@@ -983,6 +994,7 @@ public class BoundingPolytope extends Bounds {
* @param position is a point defining the location of the pick w= distance to pick
* @return true or false indicating if an intersection occured
*/
+ @Override
boolean intersect(Point3d point, Point4d position ) {
int i;
@@ -1016,6 +1028,7 @@ public class BoundingPolytope extends Bounds {
* @param position is a point defining the location of the pick w= distance to pick
* @return true or false indicating if an intersection occured
*/
+ @Override
boolean intersect( Point3d start, Point3d end, Point4d position ) {
double t,v0,vd,x,y,z;
int i;
@@ -1084,6 +1097,7 @@ public class BoundingPolytope extends Bounds {
* @param direction the direction of the ray
* @return true or false indicating if an intersection occured
*/
+ @Override
public boolean intersect(Point3d origin, Vector3d direction ) {
// compute intersection point of ray and each plane then test if point is in polytope
@@ -1134,6 +1148,7 @@ public class BoundingPolytope extends Bounds {
* @return true if the bounding polytope is empty;
* otherwise, it returns false
*/
+ @Override
public boolean isEmpty() {
// if nVerts > 0 after computeAllVerts(), that means
// there is some intersection between 3 planes.
@@ -1145,6 +1160,7 @@ public class BoundingPolytope extends Bounds {
* @param point a Point defining a position in 3-space
* @return true or false indicating if an intersection occured
*/
+ @Override
public boolean intersect(Point3d point ) {
int i;
@@ -1171,6 +1187,7 @@ public class BoundingPolytope extends Bounds {
* @param boundsObject another bounds object
* @return true or false indicating if an intersection occured
*/
+ @Override
boolean intersect(Bounds boundsObject, Point4d position) {
return intersect(boundsObject);
}
@@ -1180,6 +1197,7 @@ public class BoundingPolytope extends Bounds {
* @param boundsObject another bounds object
* @return true or false indicating if an intersection occured
*/
+ @Override
public boolean intersect(Bounds boundsObject) {
if( boundsObject == null ) {
@@ -1210,6 +1228,7 @@ public class BoundingPolytope extends Bounds {
* @param boundsObjects an array of bounding objects
* @return true or false indicating if an intersection occured
*/
+ @Override
public boolean intersect(Bounds[] boundsObjects) {
double distsq, radsq;
@@ -1425,6 +1444,7 @@ public class BoundingPolytope extends Bounds {
* @param boundsObjects is an array of bounds objects
* @return closest bounding object
*/
+ @Override
public Bounds closestIntersection( Bounds[] boundsObjects) {
if( boundsObjects == null || boundsObjects.length <= 0 ) {
@@ -1557,6 +1577,7 @@ public class BoundingPolytope extends Bounds {
/**
* Returns a string representation of this class
*/
+ @Override
public String toString() {
int i;
@@ -1702,10 +1723,12 @@ public class BoundingPolytope extends Bounds {
checkBoundsIsEmpty();
}
+ @Override
Point3d getCenter() {
return centroid;
}
+@Override
public void getCenter(Point3d center) {
center.set(centroid);
}
@@ -1715,6 +1738,7 @@ public void getCenter(Point3d center) {
* then do a copy, otherwise clone the Bounds and
* return
*/
+ @Override
Bounds copy(Bounds r) {
int i, k;
@@ -1752,6 +1776,7 @@ public void getCenter(Point3d center) {
}
}
+ @Override
int getPickType() {
return PickShape.PICKBOUNDINGPOLYTOPE;
}
diff --git a/src/classes/share/javax/media/j3d/BoundingSphere.java b/src/classes/share/javax/media/j3d/BoundingSphere.java
index ff9bf66..f3e01f5 100644
--- a/src/classes/share/javax/media/j3d/BoundingSphere.java
+++ b/src/classes/share/javax/media/j3d/BoundingSphere.java
@@ -269,6 +269,7 @@ public BoundingSphere(Bounds[] boundsObjects) {
* Returns the position of this bounding sphere as a point.
* @param center a Point to receive the center of the bounding sphere
*/
+@Override
public void getCenter(Point3d center) {
center.set(this.center);
}
@@ -286,6 +287,7 @@ public void setCenter(Point3d center) {
* Sets the value of this BoundingSphere.
* @param boundsObject another bounds object
*/
+ @Override
public void set(Bounds boundsObject){
int i;
@@ -361,6 +363,7 @@ public void setCenter(Point3d center) {
* Creates a copy of the bounding sphere.
* @return a BoundingSphere
*/
+ @Override
public Object clone() {
return new BoundingSphere(this.center, this.radius);
}
@@ -379,6 +382,7 @@ public void setCenter(Point3d center) {
*
* @since Java 3D 1.2
*/
+ @Override
public boolean equals(Object bounds) {
try {
BoundingSphere sphere = (BoundingSphere)bounds;
@@ -406,6 +410,7 @@ public void setCenter(Point3d center) {
*
* @since Java 3D 1.2
*/
+ @Override
public int hashCode() {
long bits = 1L;
bits = J3dHash.mixDoubleBits(bits, radius);
@@ -422,6 +427,7 @@ public void setCenter(Point3d center) {
* given bounds object.
* @param boundsObject another bounds object
*/
+ @Override
public void combine(Bounds boundsObject) {
double t,dis,d1,u,l,x,y,z,oldc_to_new_c;
BoundingSphere sphere;
@@ -543,6 +549,7 @@ public void setCenter(Point3d center) {
* given array of bounds object.
* @param boundsObjects an array of bounds objects
*/
+ @Override
public void combine(Bounds[] boundsObjects) {
BoundingSphere sphere;
BoundingBox b;
@@ -666,6 +673,7 @@ public void setCenter(Point3d center) {
* Combines this bounding sphere with a point.
* @param point a 3D point in space
*/
+ @Override
public void combine(Point3d point) {
double dis,oldc_to_new_c;
@@ -699,6 +707,7 @@ public void setCenter(Point3d center) {
* Combines this bounding sphere with an array of points.
* @param points an array of 3D points in space
*/
+ @Override
public void combine(Point3d[] points) {
int i;
double dis,dis_sq,rad_sq,oldc_to_new_c;
@@ -742,6 +751,7 @@ public void setCenter(Point3d center) {
* @param boundsObject the bounding object to be transformed
* @param matrix a transformation matrix
*/
+ @Override
public void transform( Bounds boundsObject, Transform3D matrix) {
if (boundsObject == null || boundsObject.boundsIsEmpty) {
setEmptyBounds();
@@ -774,6 +784,7 @@ public void setCenter(Point3d center) {
/**
* Transforms this bounding sphere by the given matrix.
*/
+ @Override
public void transform( Transform3D trans) {
double scale;
@@ -796,6 +807,7 @@ public void setCenter(Point3d center) {
* @param position3 a point defining the location of the pick w= distance to pick
* @return true or false indicating if an intersection occured
*/
+ @Override
boolean intersect(Point3d origin, Vector3d direction, Point4d position ) {
if( boundsIsEmpty ) {
@@ -862,6 +874,7 @@ public void setCenter(Point3d center) {
* @param position a point defining the location of the pick w= distance to pick
* @return true or false indicating if an intersection occured
*/
+ @Override
boolean intersect(Point3d point, Point4d position ) {
double x,y,z,dist;
@@ -901,6 +914,7 @@ public void setCenter(Point3d center) {
* @param position a point defining the location of the pick w= distance to pick
* @return true or false indicating if an intersection occured
*/
+ @Override
boolean intersect( Point3d start, Point3d end, Point4d position ) {
if( boundsIsEmpty ) {
@@ -973,6 +987,7 @@ public void setCenter(Point3d center) {
* @param direction the direction of the ray
* @return true or false indicating if an intersection occured
*/
+ @Override
public boolean intersect(Point3d origin, Vector3d direction ) {
if( boundsIsEmpty ) {
@@ -1092,6 +1107,7 @@ public void setCenter(Point3d center) {
* @param point a point defining a position in 3-space
* @return true or false indicating if an intersection occured
*/
+ @Override
public boolean intersect(Point3d point ) {
double x,y,z,dist;
@@ -1122,6 +1138,7 @@ public void setCenter(Point3d center) {
* @return true if the bounding sphere is empty;
* otherwise, it returns false
*/
+ @Override
public boolean isEmpty() {
return boundsIsEmpty;
}
@@ -1131,6 +1148,7 @@ public void setCenter(Point3d center) {
* @param boundsObject another bounds object
* @return true or false indicating if an intersection occured
*/
+ @Override
boolean intersect(Bounds boundsObject, Point4d position) {
return intersect(boundsObject);
}
@@ -1140,6 +1158,7 @@ public void setCenter(Point3d center) {
* @param boundsObject another bounds object
* @return true or false indicating if an intersection occured
*/
+ @Override
public boolean intersect(Bounds boundsObject) {
double distsq, radsq;
BoundingSphere sphere;
@@ -1200,6 +1219,7 @@ public void setCenter(Point3d center) {
* @param boundsObjects an array of bounding objects
* @return true or false indicating if an intersection occured
*/
+ @Override
public boolean intersect(Bounds[] boundsObjects) {
double distsq, radsq;
BoundingSphere sphere;
@@ -1445,6 +1465,7 @@ public void setCenter(Point3d center) {
* @param boundsObjects an array of bounds objects
* @return closest bounding object
*/
+ @Override
public Bounds closestIntersection( Bounds[] boundsObjects) {
if( boundsObjects == null || boundsObjects.length <= 0 ) {
@@ -1637,6 +1658,7 @@ public void setCenter(Point3d center) {
/**
* Returns a string representation of this class.
*/
+ @Override
public String toString() {
return new String( "Center="+center+" Radius="+radius);
}
@@ -1677,6 +1699,7 @@ private void setInfiniteBounds() {
}
}
+ @Override
Point3d getCenter() {
return center;
}
@@ -1686,6 +1709,7 @@ private void setInfiniteBounds() {
* then do a copy, otherwise clone the Bounds and
* return
*/
+ @Override
Bounds copy(Bounds r) {
if (r != null && this.boundId == r.boundId) {
BoundingSphere region = (BoundingSphere)r;
@@ -1702,6 +1726,7 @@ private void setInfiniteBounds() {
}
}
+ @Override
int getPickType() {
return PickShape.PICKBOUNDINGSPHERE;
}
diff --git a/src/classes/share/javax/media/j3d/Bounds.java b/src/classes/share/javax/media/j3d/Bounds.java
index e091c96..9672859 100644
--- a/src/classes/share/javax/media/j3d/Bounds.java
+++ b/src/classes/share/javax/media/j3d/Bounds.java
@@ -60,6 +60,7 @@ public abstract class Bounds extends Object implements Cloneable {
/**
* Makes a copy of a bounds object.
*/
+ @Override
public abstract Object clone();
@@ -76,6 +77,7 @@ public abstract class Bounds extends Object implements Cloneable {
*
* @since Java 3D 1.2
*/
+ @Override
public abstract boolean equals(Object bounds);
@@ -90,6 +92,7 @@ public abstract class Bounds extends Object implements Cloneable {
*
* @since Java 3D 1.2
*/
+ @Override
public abstract int hashCode();
diff --git a/src/classes/share/javax/media/j3d/BranchGroup.java b/src/classes/share/javax/media/j3d/BranchGroup.java
index c4638b5..41fc93a 100644
--- a/src/classes/share/javax/media/j3d/BranchGroup.java
+++ b/src/classes/share/javax/media/j3d/BranchGroup.java
@@ -67,6 +67,7 @@ public class BranchGroup extends Group {
* Creates the retained mode BranchGroupRetained object that this
* BranchGroup component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new BranchGroupRetained();
this.retained.setSource(this);
@@ -567,6 +568,7 @@ public class BranchGroup extends Group {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
BranchGroup bg = new BranchGroup();
diff --git a/src/classes/share/javax/media/j3d/BranchGroupRetained.java b/src/classes/share/javax/media/j3d/BranchGroupRetained.java
index 6d30999..47372d0 100644
--- a/src/classes/share/javax/media/j3d/BranchGroupRetained.java
+++ b/src/classes/share/javax/media/j3d/BranchGroupRetained.java
@@ -61,6 +61,7 @@ class BranchGroupRetained extends GroupRetained {
/**
* This gets the current locale
*/
+ @Override
Locale getLocale() {
return locale;
}
@@ -109,6 +110,7 @@ class BranchGroupRetained extends GroupRetained {
}
}
+ @Override
void setNodeData(SetLiveState s) {
// super.setNodeData will set branchGroupPaths
// based on s.parentBranchGroupPaths, we need to
@@ -138,6 +140,7 @@ class BranchGroupRetained extends GroupRetained {
}
+ @Override
void setAuxData(SetLiveState s, int index, int hkIndex) {
super.setAuxData(s, index, hkIndex);
@@ -153,6 +156,7 @@ class BranchGroupRetained extends GroupRetained {
/**
* remove the localToVworld transform for this node.
*/
+ @Override
void removeNodeData(SetLiveState s) {
if((!inSharedGroup) || (s.keys.length == localToVworld.length)) {
@@ -175,6 +179,7 @@ class BranchGroupRetained extends GroupRetained {
super.removeNodeData(s);
}
+ @Override
void setLive(SetLiveState s) {
// recursively call child
super.doSetLive(s);
@@ -211,6 +216,7 @@ class BranchGroupRetained extends GroupRetained {
}
}
+ @Override
void compile(CompileState compState) {
// if this branch group is previously compiled, don't
// go any further. Mark the keepTG flag for now. Static
diff --git a/src/classes/share/javax/media/j3d/CachedFrustum.java b/src/classes/share/javax/media/j3d/CachedFrustum.java
index be04e98..c3d6e90 100644
--- a/src/classes/share/javax/media/j3d/CachedFrustum.java
+++ b/src/classes/share/javax/media/j3d/CachedFrustum.java
@@ -104,6 +104,7 @@ class CachedFrustum {
/**
* Returns a string containing the values of the CachedFrustum.
*/
+ @Override
public String toString() {
return( clipPlanes[0].toString()+"\n"+
clipPlanes[1].toString()+"\n"+
diff --git a/src/classes/share/javax/media/j3d/Canvas3D.java b/src/classes/share/javax/media/j3d/Canvas3D.java
index cd0a640..bdd9f2d 100644
--- a/src/classes/share/javax/media/j3d/Canvas3D.java
+++ b/src/classes/share/javax/media/j3d/Canvas3D.java
@@ -1226,6 +1226,7 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine
* to function properly.
* @param g the graphics context
*/
+ @Override
public void paint(Graphics g) {
if (!firstPaintCalled && added && validCanvas &&
@@ -1258,6 +1259,7 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine
* method need to call super.addNotify() in their addNotify() method for Java 3D
* to function properly.
*/
+ @Override
public void addNotify() {
// Return immediately if addNotify called twice with no removeNotify
if (addNotifyCalled) {
@@ -1367,6 +1369,7 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine
* method need to call super.removeNotify() in their removeNotify()
* method for Java 3D to function properly.
*/
+ @Override
public void removeNotify() {
// Return immediately if addNotify not called first
if (!addNotifyCalled) {
@@ -3947,6 +3950,7 @@ void resetImmediateRendering() {
ctxTimeStamp = VirtualUniverse.mc.getContextTimeStamp();
}
+@Override
public Point getLocationOnScreen() {
try {
return super.getLocationOnScreen();
diff --git a/src/classes/share/javax/media/j3d/CanvasViewEventCatcher.java b/src/classes/share/javax/media/j3d/CanvasViewEventCatcher.java
index bf556da..aadbf5f 100644
--- a/src/classes/share/javax/media/j3d/CanvasViewEventCatcher.java
+++ b/src/classes/share/javax/media/j3d/CanvasViewEventCatcher.java
@@ -45,6 +45,7 @@ class CanvasViewEventCatcher extends ComponentAdapter {
canvas = c;
}
+ @Override
public void componentResized(ComponentEvent e) {
if (DEBUG) {
System.err.println("Component resized " + e);
@@ -71,6 +72,7 @@ class CanvasViewEventCatcher extends ComponentAdapter {
}
}
+ @Override
public void componentMoved(ComponentEvent e) {
if (DEBUG) {
System.err.println("Component moved " + e);
diff --git a/src/classes/share/javax/media/j3d/Clip.java b/src/classes/share/javax/media/j3d/Clip.java
index 0301d37..427fb13 100644
--- a/src/classes/share/javax/media/j3d/Clip.java
+++ b/src/classes/share/javax/media/j3d/Clip.java
@@ -210,6 +210,7 @@ public class Clip extends Leaf {
* Creates the retained mode ClipRetained object that this
* Clip component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new ClipRetained();
this.retained.setSource(this);
@@ -229,6 +230,7 @@ public class Clip extends Leaf {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
Clip c = new Clip();
c.duplicateNode(this, forceDuplicate);
@@ -261,6 +263,7 @@ public class Clip extends Leaf {
* @see Node#cloneTree
* @see DanglingReferenceException
*/
+ @Override
public void updateNodeReferences(NodeReferenceTable referenceTable) {
ClipRetained rt = (ClipRetained) retained;
BoundingLeaf bl = rt.getApplicationBoundingLeaf();
@@ -294,6 +297,7 @@ public class Clip extends Leaf {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/ClipRetained.java b/src/classes/share/javax/media/j3d/ClipRetained.java
index fbd39fc..78c4ae6 100644
--- a/src/classes/share/javax/media/j3d/ClipRetained.java
+++ b/src/classes/share/javax/media/j3d/ClipRetained.java
@@ -207,6 +207,7 @@ class ClipRetained extends LeafRetained {
* This setLive routine first calls the superclass's method, then
* it adds itself to the list of lights
*/
+ @Override
void setLive(SetLiveState s) {
if (inImmCtx) {
throw new IllegalSharingException(J3dI18N.getString("ClipRetained0"));
@@ -255,6 +256,7 @@ class ClipRetained extends LeafRetained {
* This clearLive routine first calls the superclass's method, then
* it removes itself to the list of lights
*/
+ @Override
void clearLive(SetLiveState s) {
super.clearLive(s);
if ((s.viewScopedNodeList != null) && (s.viewLists != null)) {
@@ -344,6 +346,7 @@ class ClipRetained extends LeafRetained {
* cached region and transformed region
*/
+ @Override
void updateBoundingLeaf() {
if (boundingLeaf != null &&
boundingLeaf.mirrorBoundingLeaf.switchState.currentSwitchOn) {
@@ -383,12 +386,14 @@ class ClipRetained extends LeafRetained {
VirtualUniverse.mc.processMessage(createMessage);
}
+ @Override
void mergeTransform(TransformGroupRetained xform) {
super.mergeTransform(xform);
if (applicationRegion != null) {
applicationRegion.transform(xform.transform);
}
}
+ @Override
void getMirrorObjects(ArrayList leafList, HashKey key) {
leafList.add(this);
}
diff --git a/src/classes/share/javax/media/j3d/ColorInterpolator.java b/src/classes/share/javax/media/j3d/ColorInterpolator.java
index 6ceb236..1377d7c 100644
--- a/src/classes/share/javax/media/j3d/ColorInterpolator.java
+++ b/src/classes/share/javax/media/j3d/ColorInterpolator.java
@@ -171,6 +171,7 @@ public class ColorInterpolator extends Interpolator {
* @param criteria an enumeration of the criteria that caused the
* stimulus
*/
+ @Override
public void processStimulus(Enumeration criteria) {
// Handle stimulus
@@ -231,6 +232,7 @@ public class ColorInterpolator extends Interpolator {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
ColorInterpolator ci = new ColorInterpolator();
ci.duplicateNode(this, forceDuplicate);
@@ -259,6 +261,7 @@ public class ColorInterpolator extends Interpolator {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
@@ -297,6 +300,7 @@ public class ColorInterpolator extends Interpolator {
* @see Node#cloneTree
* @see DanglingReferenceException
*/
+ @Override
public void updateNodeReferences(NodeReferenceTable referenceTable) {
super.updateNodeReferences(referenceTable);
diff --git a/src/classes/share/javax/media/j3d/ColoringAttributes.java b/src/classes/share/javax/media/j3d/ColoringAttributes.java
index a3fb0d8..5596154 100644
--- a/src/classes/share/javax/media/j3d/ColoringAttributes.java
+++ b/src/classes/share/javax/media/j3d/ColoringAttributes.java
@@ -286,6 +286,7 @@ public class ColoringAttributes extends NodeComponent {
* Creates a retained mode ColoringAttributesRetained object that this
* ColoringAttributes component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new ColoringAttributesRetained();
this.retained.setSource(this);
@@ -296,6 +297,7 @@ public class ColoringAttributes extends NodeComponent {
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
ColoringAttributes ca = new ColoringAttributes();
ca.duplicateNodeComponent(this);
@@ -320,6 +322,7 @@ public class ColoringAttributes extends NodeComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
@@ -342,6 +345,7 @@ public class ColoringAttributes extends NodeComponent {
* If the scene graph is live only those values with their
* Capability read bit set will be displayed.
*/
+ @Override
public String toString() {
StringBuffer str = new StringBuffer(getNamePrefix());
str.append("javax.media.j3d.ColoringAttributes: ");
diff --git a/src/classes/share/javax/media/j3d/ColoringAttributesRetained.java b/src/classes/share/javax/media/j3d/ColoringAttributesRetained.java
index a964539..f419b1e 100644
--- a/src/classes/share/javax/media/j3d/ColoringAttributesRetained.java
+++ b/src/classes/share/javax/media/j3d/ColoringAttributesRetained.java
@@ -139,6 +139,7 @@ class ColoringAttributesRetained extends NodeComponentRetained {
* Creates and initializes a mirror object, point the mirror object
* to the retained object if the object is not editable
*/
+ @Override
synchronized void createMirrorObject() {
if (mirror == null) {
// Check the capability bits and let the mirror object
@@ -170,6 +171,7 @@ class ColoringAttributesRetained extends NodeComponentRetained {
* Creates a mirror object, point the mirror object to the retained
* object if the object is not editable
*/
+ @Override
synchronized void initMirrorObject() {
((ColoringAttributesRetained)mirror).set(this);
}
@@ -177,6 +179,7 @@ class ColoringAttributesRetained extends NodeComponentRetained {
/** Update the "component" field of the mirror object with the
* given "value"
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
ColoringAttributesRetained mirrorCa =
@@ -199,6 +202,7 @@ class ColoringAttributesRetained extends NodeComponentRetained {
// This functions clones the retained side only and is used
// internally
+ @Override
protected Object clone() {
ColoringAttributesRetained cr =
(ColoringAttributesRetained)super.clone();
@@ -250,6 +254,7 @@ class ColoringAttributesRetained extends NodeComponentRetained {
VirtualUniverse.mc.processMessage(createMessage);
}
}
+ @Override
void handleFrequencyChange(int bit) {
if (bit == ColoringAttributes.ALLOW_COLOR_WRITE ||
bit == ColoringAttributes.ALLOW_SHADE_MODEL_WRITE) {
diff --git a/src/classes/share/javax/media/j3d/CompressedGeometry.java b/src/classes/share/javax/media/j3d/CompressedGeometry.java
index d77397d..a595f1c 100644
--- a/src/classes/share/javax/media/j3d/CompressedGeometry.java
+++ b/src/classes/share/javax/media/j3d/CompressedGeometry.java
@@ -400,6 +400,7 @@ public class CompressedGeometry extends Geometry {
* Creates the retained mode CompressedGeometryRetained object that this
* CompressedGeometry object will point to.
*/
+ @Override
void createRetained() {
this.retained = new CompressedGeometryRetained() ;
this.retained.setSource(this) ;
@@ -408,6 +409,7 @@ public class CompressedGeometry extends Geometry {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
CompressedGeometry cg = new CompressedGeometry() ;
diff --git a/src/classes/share/javax/media/j3d/CompressedGeometryHeader.java b/src/classes/share/javax/media/j3d/CompressedGeometryHeader.java
index 0d80038..33b1742 100644
--- a/src/classes/share/javax/media/j3d/CompressedGeometryHeader.java
+++ b/src/classes/share/javax/media/j3d/CompressedGeometryHeader.java
@@ -217,6 +217,7 @@ public class CompressedGeometryHeader extends Object {
*
* @return a String describing contents of the compressed geometry header
*/
+ @Override
public String toString() {
String type = "UNKNOWN" ;
switch (bufferType) {
diff --git a/src/classes/share/javax/media/j3d/CompressedGeometryRenderMethod.java b/src/classes/share/javax/media/j3d/CompressedGeometryRenderMethod.java
index 54650e1..6633b57 100644
--- a/src/classes/share/javax/media/j3d/CompressedGeometryRenderMethod.java
+++ b/src/classes/share/javax/media/j3d/CompressedGeometryRenderMethod.java
@@ -36,6 +36,7 @@ class CompressedGeometryRenderMethod implements RenderMethod {
/**
* The actual rendering code for this RenderMethod.
*/
+ @Override
public boolean render(RenderMolecule rm, Canvas3D cv,
RenderAtomListInfo ra, int dirtyBits) {
if (rm.doInfinite) {
diff --git a/src/classes/share/javax/media/j3d/CompressedGeometryRetained.java b/src/classes/share/javax/media/j3d/CompressedGeometryRetained.java
index 4a2f5af..aba0277 100644
--- a/src/classes/share/javax/media/j3d/CompressedGeometryRetained.java
+++ b/src/classes/share/javax/media/j3d/CompressedGeometryRetained.java
@@ -124,6 +124,7 @@ class CompressedGeometryRetained extends GeometryRetained {
/**
* Method for calling native execute() method on behalf of the J3D renderer.
*/
+ @Override
void execute(Canvas3D cv, RenderAtom ra, boolean isNonUniformScale,
boolean updateAlpha, float alpha,
int screen, boolean ignoreVertexColors) {
@@ -148,6 +149,7 @@ class CompressedGeometryRetained extends GeometryRetained {
/**
* Compressed geometry is immutable so this method does nothing.
*/
+ @Override
void computeBoundingBox() {
}
@@ -155,6 +157,7 @@ class CompressedGeometryRetained extends GeometryRetained {
* Update this object. Compressed geometry is immutable so there's
* nothing to do.
*/
+ @Override
void update() {
isDirty = 0 ;
}
@@ -334,6 +337,7 @@ class CompressedGeometryRetained extends GeometryRetained {
// The following intersect() methods are used to implement geometry-based
// picking and collision.
//
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
GeometryRetained geomR = getPickGeometry() ;
@@ -341,17 +345,20 @@ class CompressedGeometryRetained extends GeometryRetained {
geomR.intersect(pickShape, pickInfo, flags, iPnt, geom, geomIndex) : false);
}
+ @Override
boolean intersect(Bounds targetBound) {
GeometryRetained geom = getPickGeometry() ;
return (geom != null ? geom.intersect(targetBound) : false);
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld, GeometryRetained g) {
GeometryRetained geom = getPickGeometry() ;
return (geom != null ?
geom.intersect(thisToOtherVworld, g) : false);
}
+ @Override
boolean intersect(Point3d[] pnts) {
GeometryRetained geom = getPickGeometry() ;
return (geom != null ? geom.intersect(pnts) : false);
@@ -361,6 +368,7 @@ class CompressedGeometryRetained extends GeometryRetained {
* Return a vertex format mask that's compatible with GeometryArray
* objects.
*/
+ @Override
int getVertexFormat() {
int vertexFormat = GeometryArray.COORDINATES ;
@@ -455,6 +463,7 @@ class CompressedGeometryRetained extends GeometryRetained {
}
}
+ @Override
int getClassType() {
return COMPRESS_TYPE;
}
diff --git a/src/classes/share/javax/media/j3d/ConeSound.java b/src/classes/share/javax/media/j3d/ConeSound.java
index bd4f129..b2f2629 100644
--- a/src/classes/share/javax/media/j3d/ConeSound.java
+++ b/src/classes/share/javax/media/j3d/ConeSound.java
@@ -561,6 +561,7 @@ public class ConeSound extends PointSound {
* Creates the retained mode ConeSoundRetained object that this
* ConeSound object will point to.
*/
+ @Override
void createRetained() {
this.retained = new ConeSoundRetained();
this.retained.setSource(this);
@@ -859,6 +860,7 @@ public class ConeSound extends PointSound {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
ConeSound c = new ConeSound();
c.duplicateNode(this, forceDuplicate);
@@ -897,6 +899,7 @@ public class ConeSound extends PointSound {
* @see Node#cloneNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public void duplicateNode(Node originalNode, boolean forceDuplicate) {
checkDuplicateNode(originalNode, forceDuplicate);
}
@@ -923,6 +926,7 @@ public class ConeSound extends PointSound {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/ConeSoundRetained.java b/src/classes/share/javax/media/j3d/ConeSoundRetained.java
index c6dc046..514f172 100644
--- a/src/classes/share/javax/media/j3d/ConeSoundRetained.java
+++ b/src/classes/share/javax/media/j3d/ConeSoundRetained.java
@@ -602,6 +602,7 @@ class ConeSoundRetained extends PointSoundRetained {
* Neither Angular gain Attenuation and Filtering fields, nor
* back distance gain not maintained in mirror object
*/
+ @Override
void updateMirrorObject(Object[] objs) {
if (debugFlag)
debugPrint("PointSoundRetained:updateMirrorObj()");
@@ -633,6 +634,7 @@ class ConeSoundRetained extends PointSoundRetained {
}
// Called on the mirror object
+ @Override
void updateTransformChange() {
Transform3D lastLocalToVworld = getLastLocalToVworld();
@@ -646,6 +648,7 @@ class ConeSoundRetained extends PointSoundRetained {
+ xformDirection.y + ", "+ xformDirection.z + ")");
}
+ @Override
void mergeTransform(TransformGroupRetained xform) {
super.mergeTransform(xform);
xform.transform.transform(direction);
diff --git a/src/classes/share/javax/media/j3d/DecalGroup.java b/src/classes/share/javax/media/j3d/DecalGroup.java
index 3dd1e21..a153903 100644
--- a/src/classes/share/javax/media/j3d/DecalGroup.java
+++ b/src/classes/share/javax/media/j3d/DecalGroup.java
@@ -63,6 +63,7 @@ public class DecalGroup extends OrderedGroup {
* Creates the retained mode DecalGroupRetained object that this
* DecalGroup component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new DecalGroupRetained();
this.retained.setSource(this);
@@ -83,6 +84,7 @@ public class DecalGroup extends OrderedGroup {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
DecalGroup dg = new DecalGroup();
dg.duplicateNode(this, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/DefaultRenderMethod.java b/src/classes/share/javax/media/j3d/DefaultRenderMethod.java
index 86be632..61a4ed0 100644
--- a/src/classes/share/javax/media/j3d/DefaultRenderMethod.java
+++ b/src/classes/share/javax/media/j3d/DefaultRenderMethod.java
@@ -35,6 +35,7 @@ class DefaultRenderMethod implements RenderMethod {
/**
* The actual rendering code for this RenderMethod
*/
+ @Override
public boolean render(RenderMolecule rm, Canvas3D cv,
RenderAtomListInfo ra, int dirtyBits) {
diff --git a/src/classes/share/javax/media/j3d/DepthComponentFloat.java b/src/classes/share/javax/media/j3d/DepthComponentFloat.java
index d729acb..3a304c5 100644
--- a/src/classes/share/javax/media/j3d/DepthComponentFloat.java
+++ b/src/classes/share/javax/media/j3d/DepthComponentFloat.java
@@ -80,6 +80,7 @@ public class DepthComponentFloat extends DepthComponent {
* Creates a retained mode DepthComponentFloatRetained object that this
* DepthComponentFloat component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new DepthComponentFloatRetained();
this.retained.setSource(this);
@@ -89,6 +90,7 @@ public class DepthComponentFloat extends DepthComponent {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
DepthComponentFloatRetained rt = (DepthComponentFloatRetained) retained;
DepthComponentFloat d = new DepthComponentFloat(rt.width,
@@ -115,6 +117,7 @@ public class DepthComponentFloat extends DepthComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent,
diff --git a/src/classes/share/javax/media/j3d/DepthComponentInt.java b/src/classes/share/javax/media/j3d/DepthComponentInt.java
index b3e2c43..34963ea 100644
--- a/src/classes/share/javax/media/j3d/DepthComponentInt.java
+++ b/src/classes/share/javax/media/j3d/DepthComponentInt.java
@@ -79,6 +79,7 @@ public class DepthComponentInt extends DepthComponent {
* Creates a retained mode DepthComponentIntRetained object that this
* DepthComponentInt component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new DepthComponentIntRetained();
this.retained.setSource(this);
@@ -88,6 +89,7 @@ public class DepthComponentInt extends DepthComponent {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
DepthComponentIntRetained rt = (DepthComponentIntRetained) retained;
DepthComponentInt d = new DepthComponentInt(rt.width,
@@ -114,6 +116,7 @@ public class DepthComponentInt extends DepthComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/DepthComponentNative.java b/src/classes/share/javax/media/j3d/DepthComponentNative.java
index 9157bb3..070d00c 100644
--- a/src/classes/share/javax/media/j3d/DepthComponentNative.java
+++ b/src/classes/share/javax/media/j3d/DepthComponentNative.java
@@ -62,6 +62,7 @@ public class DepthComponentNative extends DepthComponent {
* Creates a retained mode DepthComponentIntRetained object that this
* DepthComponentInt component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new DepthComponentNativeRetained();
this.retained.setSource(this);
@@ -77,6 +78,7 @@ public class DepthComponentNative extends DepthComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public NodeComponent cloneNodeComponent() {
DepthComponentNativeRetained rt = (DepthComponentNativeRetained) retained;
DepthComponentNative d = new DepthComponentNative(rt.width,
@@ -104,6 +106,7 @@ public class DepthComponentNative extends DepthComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/DirectionalLight.java b/src/classes/share/javax/media/j3d/DirectionalLight.java
index 0b6d9c5..69b4a46 100644
--- a/src/classes/share/javax/media/j3d/DirectionalLight.java
+++ b/src/classes/share/javax/media/j3d/DirectionalLight.java
@@ -107,6 +107,7 @@ public class DirectionalLight extends Light {
* Creates the retained mode DirectionalLightRetained object that this
* DirectionalLight component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new DirectionalLightRetained();
this.retained.setSource(this);
@@ -179,6 +180,7 @@ public class DirectionalLight extends Light {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
DirectionalLight d = new DirectionalLight();
d.duplicateNode(this, forceDuplicate);
@@ -207,6 +209,7 @@ public class DirectionalLight extends Light {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/DirectionalLightRetained.java b/src/classes/share/javax/media/j3d/DirectionalLightRetained.java
index 89817f6..325762b 100644
--- a/src/classes/share/javax/media/j3d/DirectionalLightRetained.java
+++ b/src/classes/share/javax/media/j3d/DirectionalLightRetained.java
@@ -127,6 +127,7 @@ class DirectionalLightRetained extends LightRetained
+ @Override
void setLive(SetLiveState s) {
super.setLive(s);
J3dMessage createMessage = super.initMessage(8);
@@ -141,6 +142,7 @@ class DirectionalLightRetained extends LightRetained
* updates a directional light. This includes its
* color and its transformed direction.
*/
+ @Override
// Note : if you add any more fields here , you need to update
// updateLight() in RenderingEnvironmentStructure
void updateMirrorObject(Object[] objs) {
@@ -179,6 +181,7 @@ class DirectionalLightRetained extends LightRetained
}
+ @Override
void update(Context ctx, int lightSlot, double scale) {
Pipeline.getPipeline().updateDirectionalLight(ctx,
lightSlot, color.x, color.y, color.z,
@@ -187,6 +190,7 @@ class DirectionalLightRetained extends LightRetained
}
// Clones only the retained side, internal use only
+ @Override
protected Object clone() {
DirectionalLightRetained dr =
(DirectionalLightRetained)super.clone();
@@ -197,6 +201,7 @@ class DirectionalLightRetained extends LightRetained
// Called on the mirror object
+ @Override
void updateTransformChange() {
super.updateTransformChange();
@@ -205,6 +210,7 @@ class DirectionalLightRetained extends LightRetained
}
+ @Override
void mergeTransform(TransformGroupRetained xform) {
super.mergeTransform(xform);
xform.transform.transform(direction, direction);
diff --git a/src/classes/share/javax/media/j3d/DisplayListRenderMethod.java b/src/classes/share/javax/media/j3d/DisplayListRenderMethod.java
index 4f09eca..a5c3233 100644
--- a/src/classes/share/javax/media/j3d/DisplayListRenderMethod.java
+++ b/src/classes/share/javax/media/j3d/DisplayListRenderMethod.java
@@ -46,6 +46,7 @@ class DisplayListRenderMethod implements RenderMethod {
/**
* The actual rendering code for this RenderMethod
*/
+ @Override
public boolean render(RenderMolecule rm, Canvas3D cv,
RenderAtomListInfo ra,
int dirtyBits) {
diff --git a/src/classes/share/javax/media/j3d/DistanceLOD.java b/src/classes/share/javax/media/j3d/DistanceLOD.java
index 32bcbdd..244c06a 100644
--- a/src/classes/share/javax/media/j3d/DistanceLOD.java
+++ b/src/classes/share/javax/media/j3d/DistanceLOD.java
@@ -163,6 +163,7 @@ public class DistanceLOD extends LOD {
/**
* Initialize method that sets up initial wakeup criteria.
*/
+ @Override
public void initialize() {
// Insert wakeup condition into queue
wakeupOn(wakeupFrame);
@@ -173,6 +174,7 @@ public class DistanceLOD extends LOD {
* @param criteria an enumeration of the criteria that caused the
* stimulus
*/
+ @Override
public void processStimulus(Enumeration criteria) {
@@ -254,6 +256,7 @@ public class DistanceLOD extends LOD {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
DistanceLOD d = new DistanceLOD();
d.duplicateNode(this, forceDuplicate);
@@ -282,6 +285,7 @@ public class DistanceLOD extends LOD {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/EnvironmentSet.java b/src/classes/share/javax/media/j3d/EnvironmentSet.java
index 83b9c2a..ab22747 100644
--- a/src/classes/share/javax/media/j3d/EnvironmentSet.java
+++ b/src/classes/share/javax/media/j3d/EnvironmentSet.java
@@ -295,6 +295,7 @@ ArrayList<AttributeBin> addAttributeBins = new ArrayList<AttributeBin>();
}
+ @Override
public void updateObject() {
int i;
AttributeBin a;
diff --git a/src/classes/share/javax/media/j3d/EventCatcher.java b/src/classes/share/javax/media/j3d/EventCatcher.java
index 71b83b8..d0e561f 100644
--- a/src/classes/share/javax/media/j3d/EventCatcher.java
+++ b/src/classes/share/javax/media/j3d/EventCatcher.java
@@ -163,6 +163,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
}
+ @Override
public void componentResized(ComponentEvent e) {
if (e.getSource() == canvas) {
if (DEBUG) {
@@ -174,6 +175,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
}
}
+ @Override
public void componentMoved(ComponentEvent e) {
if (e.getSource() == canvas) {
if (DEBUG) {
@@ -189,6 +191,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
}
}
+ @Override
public void componentHidden(ComponentEvent e) {
if (DEBUG) {
System.err.println(e);
@@ -199,6 +202,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
canvas.evaluateVisiblilty();
}
+ @Override
public void componentShown(ComponentEvent e) {
if (DEBUG) {
System.err.println(e);
@@ -209,6 +213,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
canvas.evaluateVisiblilty();
}
+ @Override
public void focusGained(FocusEvent e) {
canvas.sendEventToBehaviorScheduler(e);
if (DEBUG) {
@@ -216,6 +221,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
}
}
+ @Override
public void focusLost(FocusEvent e) {
canvas.sendEventToBehaviorScheduler(e);
if (DEBUG) {
@@ -223,6 +229,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
}
}
+ @Override
public void keyTyped(KeyEvent e) {
canvas.sendEventToBehaviorScheduler(e);
if (DEBUG) {
@@ -230,6 +237,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
}
}
+ @Override
public void keyPressed(KeyEvent e) {
canvas.sendEventToBehaviorScheduler(e);
@@ -238,6 +246,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
}
}
+ @Override
public void keyReleased(KeyEvent e) {
canvas.sendEventToBehaviorScheduler(e);
if (stopped) {
@@ -250,6 +259,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
}
}
+ @Override
public void mouseClicked(MouseEvent e) {
// if (keyEvents &&
// (VirtualUniverse.mc.getRenderingAPI() !=
@@ -266,6 +276,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
}
}
+ @Override
public void mouseEntered(MouseEvent e) {
// if (keyEvents &&
// (VirtualUniverse.mc.getRenderingAPI() ==
@@ -281,6 +292,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
}
}
+ @Override
public void mouseExited(MouseEvent e) {
if (mouseEvents)
canvas.sendEventToBehaviorScheduler(e);
@@ -289,6 +301,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
}
}
+ @Override
public void mousePressed(MouseEvent e) {
if (mouseEvents)
canvas.sendEventToBehaviorScheduler(e);
@@ -297,6 +310,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
}
}
+ @Override
public void mouseReleased(MouseEvent e) {
if (mouseEvents)
canvas.sendEventToBehaviorScheduler(e);
@@ -305,6 +319,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
}
}
+ @Override
public void mouseDragged(MouseEvent e) {
// Note : We don't have to test for mouseMotionEvent here because
// this routine will never be called unless mouseMotionEvent is enabled.
@@ -314,6 +329,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
}
}
+ @Override
public void mouseMoved(MouseEvent e) {
// Note : We don't have to test for mouseMotionEvent here because
// this routine will never be called unless mouseMotionEvent is enabled.
@@ -323,6 +339,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
}
}
+ @Override
public void mouseWheelMoved(MouseWheelEvent e) {
// Note : We don't have to test for mouseWheelEvent here because
// this routine will never be called unless mouseWheelEvent is enabled.
@@ -335,6 +352,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
/*
* WindowListener methods
*/
+ @Override
public void windowClosed(WindowEvent e) {
if (DEBUG) {
System.err.println(e);
@@ -343,6 +361,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
// Issue 458 - Don't set canvas visible to false
}
+ @Override
public void windowClosing(WindowEvent e) {
if (DEBUG) {
System.err.println(e);
@@ -351,6 +370,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
// Issue 458 - Don't set canvas.visible to false
}
+ @Override
public void windowActivated(WindowEvent e) {
if (DEBUG) {
System.err.println(e);
@@ -358,6 +378,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
canvas.sendEventToBehaviorScheduler(e);
}
+ @Override
public void windowDeactivated(WindowEvent e) {
if (DEBUG) {
System.err.println(e);
@@ -365,6 +386,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
canvas.sendEventToBehaviorScheduler(e);
}
+ @Override
public void windowDeiconified(WindowEvent e) {
if (DEBUG) {
System.err.println(e);
@@ -376,6 +398,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
canvas.evaluateVisiblilty();
}
+ @Override
public void windowIconified(WindowEvent e) {
if (DEBUG) {
System.err.println(e);
@@ -387,6 +410,7 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
canvas.evaluateVisiblilty();
}
+ @Override
public void windowOpened(WindowEvent e) {
if (DEBUG) {
System.err.println(e);
diff --git a/src/classes/share/javax/media/j3d/ExponentialFog.java b/src/classes/share/javax/media/j3d/ExponentialFog.java
index f097a90..bc24ee3 100644
--- a/src/classes/share/javax/media/j3d/ExponentialFog.java
+++ b/src/classes/share/javax/media/j3d/ExponentialFog.java
@@ -169,6 +169,7 @@ public class ExponentialFog extends Fog {
* Creates the retained mode ExponentialFogRetained object that this
* ExponentialFog node will point to.
*/
+ @Override
void createRetained() {
this.retained = new ExponentialFogRetained();
this.retained.setSource(this);
@@ -188,6 +189,7 @@ public class ExponentialFog extends Fog {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
ExponentialFog ef = new ExponentialFog();
ef.duplicateNode(this, forceDuplicate);
@@ -216,6 +218,7 @@ public class ExponentialFog extends Fog {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/ExponentialFogRetained.java b/src/classes/share/javax/media/j3d/ExponentialFogRetained.java
index 0379c32..e4c0945 100644
--- a/src/classes/share/javax/media/j3d/ExponentialFogRetained.java
+++ b/src/classes/share/javax/media/j3d/ExponentialFogRetained.java
@@ -79,6 +79,7 @@ class ExponentialFogRetained extends FogRetained {
}
+ @Override
void setLive(SetLiveState s) {
super.setLive(s);
@@ -122,6 +123,7 @@ class ExponentialFogRetained extends FogRetained {
* This method and its native counterpart update the native context
* fog values.
*/
+ @Override
void update(Context ctx, double scale) {
// Issue 144: recompute the density in EC, and send it to native code
validateDistancesInEc(scale);
@@ -133,6 +135,7 @@ class ExponentialFogRetained extends FogRetained {
// The update Object function.
// Note : if you add any more fields here , you need to update
// updateFog() in RenderingEnvironmentStructure
+ @Override
void updateMirrorObject(Object[] objs) {
int component = ((Integer)objs[1]).intValue();
@@ -153,6 +156,7 @@ class ExponentialFogRetained extends FogRetained {
// Clone the retained side only, internal use only
+ @Override
protected Object clone() {
ExponentialFogRetained efr =
(ExponentialFogRetained)super.clone();
@@ -167,6 +171,7 @@ class ExponentialFogRetained extends FogRetained {
/**
* Scale distances from local to eye coordinate.
*/
+ @Override
protected void validateDistancesInEc(double vworldToCoexistenceScale) {
// vworldToCoexistenceScale can be used here since
// CoexistenceToEc has a unit scale
diff --git a/src/classes/share/javax/media/j3d/Fog.java b/src/classes/share/javax/media/j3d/Fog.java
index 9f587fc..58557a9 100644
--- a/src/classes/share/javax/media/j3d/Fog.java
+++ b/src/classes/share/javax/media/j3d/Fog.java
@@ -499,6 +499,7 @@ public Enumeration<Group> getAllScopes() {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
@@ -545,6 +546,7 @@ public Enumeration<Group> getAllScopes() {
* @see Node#cloneTree
* @see DanglingReferenceException
*/
+ @Override
public void updateNodeReferences(NodeReferenceTable referenceTable) {
FogRetained rt = (FogRetained) retained;
diff --git a/src/classes/share/javax/media/j3d/FogRetained.java b/src/classes/share/javax/media/j3d/FogRetained.java
index 31da43b..32cfae5 100644
--- a/src/classes/share/javax/media/j3d/FogRetained.java
+++ b/src/classes/share/javax/media/j3d/FogRetained.java
@@ -531,6 +531,7 @@ Enumeration<Group> getAllScopes() {
/**
* The update Object function.
*/
+ @Override
void updateMirrorObject(Object[] objs) {
int component = ((Integer)objs[1]).intValue();
@@ -548,6 +549,7 @@ Enumeration<Group> getAllScopes() {
* the mirror object - will update the object's
* cached region and transformed region
*/
+ @Override
void updateBoundingLeaf() {
if (boundingLeaf != null && boundingLeaf.switchState.currentSwitchOn) {
region = boundingLeaf.transformedRegion;
@@ -567,6 +569,7 @@ Enumeration<Group> getAllScopes() {
* checking for use by an immediate context). It is up to the
* subclasses of fog to add themselves to the list of fogs
*/
+ @Override
void setLive(SetLiveState s) {
if (inImmCtx) {
throw new IllegalSharingException(J3dI18N.getString("FogRetained0"));
@@ -684,6 +687,7 @@ Enumeration<Group> getAllScopes() {
* This clearLive routine first calls the superclass's method, then
* it removes itself to the list of fogs
*/
+ @Override
void clearLive(SetLiveState s) {
int i;
GroupRetained group;
@@ -732,6 +736,7 @@ Enumeration<Group> getAllScopes() {
}
// Clone the retained side only, internal use only
+ @Override
protected Object clone() {
FogRetained fr = (FogRetained)super.clone();
@@ -751,6 +756,7 @@ Enumeration<Group> getAllScopes() {
return fr;
}
+ @Override
void updateTransformChange() {
super.updateTransformChange();
setLocalToVworldScale(sgFog.getLastLocalToVworld().getDistanceScale());
@@ -780,12 +786,14 @@ Enumeration<Group> getAllScopes() {
VirtualUniverse.mc.processMessage(createMessage);
}
+ @Override
void mergeTransform(TransformGroupRetained xform) {
super.mergeTransform(xform);
if (regionOfInfluence != null) {
regionOfInfluence.transform(xform.transform);
}
}
+ @Override
void getMirrorObjects(ArrayList leafList, HashKey key) {
leafList.add(mirrorFog);
}
diff --git a/src/classes/share/javax/media/j3d/GLSLShaderProgram.java b/src/classes/share/javax/media/j3d/GLSLShaderProgram.java
index 33e3b77..6e5ef02 100644
--- a/src/classes/share/javax/media/j3d/GLSLShaderProgram.java
+++ b/src/classes/share/javax/media/j3d/GLSLShaderProgram.java
@@ -47,6 +47,7 @@ public class GLSLShaderProgram extends ShaderProgram {
}
// Implement abstract setVertexAttrNames method (inherit javadoc from parent class)
+ @Override
public void setVertexAttrNames(String[] vertexAttrNames) {
checkForLiveOrCompiled();
@@ -62,6 +63,7 @@ public class GLSLShaderProgram extends ShaderProgram {
}
// Implement abstract getVertexAttrNames method (inherit javadoc from parent class)
+ @Override
public String[] getVertexAttrNames() {
if (isLiveOrCompiled()) {
@@ -75,6 +77,7 @@ public class GLSLShaderProgram extends ShaderProgram {
}
// Implement abstract setShaderAttrNames method (inherit javadoc from parent class)
+ @Override
public void setShaderAttrNames(String[] shaderAttrNames) {
checkForLiveOrCompiled();
@@ -90,6 +93,7 @@ public class GLSLShaderProgram extends ShaderProgram {
}
// Implement abstract getShaderAttrNames method (inherit javadoc from parent class)
+ @Override
public String[] getShaderAttrNames() {
if (isLiveOrCompiled()) {
@@ -127,6 +131,7 @@ public class GLSLShaderProgram extends ShaderProgram {
* @exception NullPointerException if any element in the
* shaders array is null.
*/
+ @Override
public void setShaders(Shader[] shaders) {
checkForLiveOrCompiled();
@@ -148,6 +153,7 @@ public class GLSLShaderProgram extends ShaderProgram {
}
// Implement abstract getShaders method (inherit javadoc from parent class)
+ @Override
public Shader[] getShaders() {
if (isLiveOrCompiled()) {
@@ -163,6 +169,7 @@ public class GLSLShaderProgram extends ShaderProgram {
* Creates a retained mode GLSLShaderProgramRetained object that this
* GLSLShaderProgram component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new GLSLShaderProgramRetained();
this.retained.setSource(this);
diff --git a/src/classes/share/javax/media/j3d/GLSLShaderProgramRetained.java b/src/classes/share/javax/media/j3d/GLSLShaderProgramRetained.java
index 4d8e4a9..d1c7614 100644
--- a/src/classes/share/javax/media/j3d/GLSLShaderProgramRetained.java
+++ b/src/classes/share/javax/media/j3d/GLSLShaderProgramRetained.java
@@ -39,6 +39,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
GLSLShaderProgramRetained() {
}
+ @Override
synchronized void createMirrorObject() {
// System.err.println("GLSLShaderProgramRetained : createMirrorObject");
// This method should only call by setLive().
@@ -52,6 +53,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
// ShaderAttributeValue methods
+ @Override
ShaderError setUniform1i(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -63,6 +65,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniform1f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -74,6 +77,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniform2i(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -85,6 +89,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniform2f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -96,6 +101,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniform3i(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -107,6 +113,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniform3f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -118,6 +125,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniform4i(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -129,6 +137,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniform4f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -140,6 +149,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniformMatrix3f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -151,6 +161,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniformMatrix4f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -164,6 +175,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
// ShaderAttributeArray methods
+ @Override
ShaderError setUniform1iArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -177,6 +189,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniform1fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -190,6 +203,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniform2iArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -203,6 +217,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniform2fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -216,6 +231,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniform3iArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -229,6 +245,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniform3fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -242,6 +259,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniform4iArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -255,6 +273,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniform4fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -268,6 +287,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniformMatrix3fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -281,6 +301,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
value);
}
+ @Override
ShaderError setUniformMatrix4fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -298,6 +319,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
* Method to return a flag indicating whether this
* ShaderProgram is supported on the specified Canvas.
*/
+ @Override
boolean isSupported(Canvas3D cv) {
return cv.shadingLanguageGLSL;
}
@@ -305,6 +327,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
/**
* Method to create the native shader.
*/
+ @Override
ShaderError createShader(Context ctx, ShaderRetained shader, ShaderId[] shaderIdArr) {
return Pipeline.getPipeline().createGLSLShader(ctx, shader.shaderType, shaderIdArr);
}
@@ -312,6 +335,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
/**
* Method to destroy the native shader.
*/
+ @Override
ShaderError destroyShader(Context ctx, ShaderId shaderId) {
return Pipeline.getPipeline().destroyGLSLShader(ctx, shaderId);
}
@@ -319,6 +343,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
/**
* Method to compile the native shader.
*/
+ @Override
ShaderError compileShader(Context ctx, ShaderId shaderId, String source) {
return Pipeline.getPipeline().compileGLSLShader(ctx, shaderId, source );
}
@@ -326,6 +351,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
/**
* Method to create the native shader program.
*/
+ @Override
ShaderError createShaderProgram(Context ctx, ShaderProgramId[] shaderProgramIdArr) {
return Pipeline.getPipeline().createGLSLShaderProgram(ctx, shaderProgramIdArr);
}
@@ -333,6 +359,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
/**
* Method to destroy the native shader program.
*/
+ @Override
ShaderError destroyShaderProgram(Context ctx, ShaderProgramId shaderProgramId) {
return Pipeline.getPipeline().destroyGLSLShaderProgram(ctx, shaderProgramId);
}
@@ -340,18 +367,22 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
/**
* Method to link the native shader program.
*/
+ @Override
ShaderError linkShaderProgram(Context ctx, ShaderProgramId shaderProgramId, ShaderId[] shaderIds) {
return Pipeline.getPipeline().linkGLSLShaderProgram(ctx, shaderProgramId, shaderIds);
}
+ @Override
ShaderError bindVertexAttrName(Context ctx, ShaderProgramId shaderProgramId, String attrName, int attrIndex) {
return Pipeline.getPipeline().bindGLSLVertexAttrName(ctx, shaderProgramId, attrName, attrIndex);
}
+ @Override
void lookupVertexAttrNames(Context ctx, ShaderProgramId shaderProgramId, String[] attrNames, boolean[] errArr) {
// This method is a no-op for GLSL
}
+ @Override
void lookupShaderAttrNames(Context ctx, ShaderProgramId shaderProgramId,
String[] attrNames, AttrNameInfo[] attrNameInfoArr) {
@@ -381,6 +412,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
/**
* Method to enable the native shader program.
*/
+ @Override
ShaderError enableShaderProgram(Context ctx, ShaderProgramId shaderProgramId) {
return Pipeline.getPipeline().useGLSLShaderProgram(ctx, shaderProgramId);
}
@@ -388,6 +420,7 @@ class GLSLShaderProgramRetained extends ShaderProgramRetained {
/**
* Method to disable the native shader program.
*/
+ @Override
ShaderError disableShaderProgram(Context ctx) {
return Pipeline.getPipeline().useGLSLShaderProgram(ctx, null);
}
diff --git a/src/classes/share/javax/media/j3d/GeneralizedStrip.java b/src/classes/share/javax/media/j3d/GeneralizedStrip.java
index 1018855..baddedf 100644
--- a/src/classes/share/javax/media/j3d/GeneralizedStrip.java
+++ b/src/classes/share/javax/media/j3d/GeneralizedStrip.java
@@ -129,6 +129,7 @@ class GeneralizedStrip {
count = ints.length ;
}
+ @Override
public String toString() {
String s = new String("[") ;
for (int i = 0 ; i < count-1 ; i++)
diff --git a/src/classes/share/javax/media/j3d/GeneralizedVertexList.java b/src/classes/share/javax/media/j3d/GeneralizedVertexList.java
index 5b8ba7e..26a225b 100644
--- a/src/classes/share/javax/media/j3d/GeneralizedVertexList.java
+++ b/src/classes/share/javax/media/j3d/GeneralizedVertexList.java
@@ -171,11 +171,13 @@ private ArrayList<Vertex> vertices;
}
// GeneralizedStripFlags interface implementation
+ @Override
public int getFlagCount() {
return vertices.size() ;
}
// GeneralizedStripFlags interface implementation
+ @Override
public int getFlag(int index) {
return vertices.get(index).flag;
}
diff --git a/src/classes/share/javax/media/j3d/GeometryArray.java b/src/classes/share/javax/media/j3d/GeometryArray.java
index b76900e..f830acc 100644
--- a/src/classes/share/javax/media/j3d/GeometryArray.java
+++ b/src/classes/share/javax/media/j3d/GeometryArray.java
@@ -1122,6 +1122,7 @@ public abstract class GeometryArray extends Geometry {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
diff --git a/src/classes/share/javax/media/j3d/GeometryArrayRetained.java b/src/classes/share/javax/media/j3d/GeometryArrayRetained.java
index f4d20fa..9e16872 100644
--- a/src/classes/share/javax/media/j3d/GeometryArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/GeometryArrayRetained.java
@@ -366,6 +366,7 @@ ArrayList<ArrayList<MorphRetained>> morphUserLists = null;
}
+ @Override
void setLive(boolean inBackgroundGroup, int refCount) {
dirtyFlag = VERTEX_CHANGED|INDEX_CHANGED;
isEditable = !isWriteStatic();
@@ -404,6 +405,7 @@ ArrayList<ArrayList<MorphRetained>> morphUserLists = null;
}
+ @Override
void clearLive(int refCount) {
super.clearLive(refCount);
@@ -412,6 +414,7 @@ ArrayList<ArrayList<MorphRetained>> morphUserLists = null;
}
}
+ @Override
void computeBoundingBox() {
// System.err.println("computeBoundingBox ....");
@@ -878,6 +881,7 @@ ArrayList<ArrayList<MorphRetained>> morphUserLists = null;
}
+ @Override
synchronized void update() {
}
@@ -2220,6 +2224,7 @@ ArrayList<ArrayList<MorphRetained>> morphUserLists = null;
// data in one pass
// pass >= 0 implies one pass for one texture unit state
+ @Override
void execute(Canvas3D cv, RenderAtom ra, boolean isNonUniformScale,
boolean updateAlpha, float alpha,
int screen,
@@ -3436,6 +3441,7 @@ ArrayList<ArrayList<MorphRetained>> morphUserLists = null;
* Returns vertexFormat in the GeometryArray
* @return vertexFormat format of vertices in the GeometryArray
*/
+ @Override
int getVertexFormat(){
return vertexFormat;
}
@@ -10640,6 +10646,7 @@ int numDlistUsers(RenderBin renderBin) {
return true;
}
+ @Override
void compile(CompileState compState) {
super.compile(compState);
@@ -10648,6 +10655,7 @@ int numDlistUsers(RenderBin renderBin) {
}
}
+ @Override
void mergeTransform(TransformGroupRetained xform) {
if (geoBounds != null) {
geoBounds.transform(xform.transform);
@@ -10800,6 +10808,7 @@ int numDlistUsers(RenderBin renderBin) {
}
+ @Override
boolean intersect(Transform3D thisLocalToVworld,
Transform3D otherLocalToVworld, GeometryRetained geom) {
@@ -11201,6 +11210,7 @@ int numDlistUsers(RenderBin renderBin) {
dist[0] = Math.sqrt(dist[0]);
}
+ @Override
void handleFrequencyChange(int bit) {
int mask = 0;
if ((vertexFormat & GeometryArray.BY_REFERENCE) == 0) {
diff --git a/src/classes/share/javax/media/j3d/GeometryAtom.java b/src/classes/share/javax/media/j3d/GeometryAtom.java
index 9c98702..a4351ef 100644
--- a/src/classes/share/javax/media/j3d/GeometryAtom.java
+++ b/src/classes/share/javax/media/j3d/GeometryAtom.java
@@ -92,10 +92,12 @@ class GeometryAtom extends Object implements BHLeafInterface, NnuId {
nnuId = NnuIdManager.getId();
}
+ @Override
public int getId() {
return nnuId;
}
+ @Override
public int equal(NnuId obj) {
int keyId = obj.getId();
if(nnuId < keyId) {
@@ -109,6 +111,7 @@ class GeometryAtom extends Object implements BHLeafInterface, NnuId {
}
}
+ @Override
public BoundingBox computeBoundingHull() {
/*
System.err.println("Bounds is " + source.vwcBounds);
@@ -122,6 +125,7 @@ class GeometryAtom extends Object implements BHLeafInterface, NnuId {
}
// This method is use by picking and collision queries.
+ @Override
public boolean isEnable() {
return ((source.vwcBounds != null) &&
(source.vwcBounds.isEmpty() == false) &&
@@ -129,6 +133,7 @@ class GeometryAtom extends Object implements BHLeafInterface, NnuId {
}
// This method is use by visibility query.
+ @Override
public boolean isEnable(int vis) {
if((source.vwcBounds != null) && (source.vwcBounds.isEmpty() == false) &&
(source.switchState.currentSwitchOn)) {
@@ -144,6 +149,7 @@ class GeometryAtom extends Object implements BHLeafInterface, NnuId {
return false;
}
+ @Override
public Locale getLocale2() {
return locale;
}
diff --git a/src/classes/share/javax/media/j3d/GeometryDecompressor.java b/src/classes/share/javax/media/j3d/GeometryDecompressor.java
index 1275429..7a5bfd8 100644
--- a/src/classes/share/javax/media/j3d/GeometryDecompressor.java
+++ b/src/classes/share/javax/media/j3d/GeometryDecompressor.java
@@ -119,6 +119,7 @@ abstract class GeometryDecompressor {
int tagLength, dataLength ;
int rightShift, absolute ;
+ @Override
public String toString() {
return
" tag length: " + tagLength +
diff --git a/src/classes/share/javax/media/j3d/GeometryDecompressorRetained.java b/src/classes/share/javax/media/j3d/GeometryDecompressorRetained.java
index 5bcaeb9..41ae770 100644
--- a/src/classes/share/javax/media/j3d/GeometryDecompressorRetained.java
+++ b/src/classes/share/javax/media/j3d/GeometryDecompressorRetained.java
@@ -192,6 +192,7 @@ class GeometryDecompressorRetained extends GeometryDecompressor {
* Initialize the vertex output list based on the vertex format provided
* by the SetState decompression command.
*/
+ @Override
void outputVertexFormat(boolean bundlingNorm, boolean bundlingColor,
boolean doingAlpha) {
@@ -216,6 +217,7 @@ class GeometryDecompressorRetained extends GeometryDecompressor {
/**
* Process a decompressed vertex.
*/
+ @Override
void outputVertex(Point3f position, Vector3f normal,
Color4f color, int vertexReplaceCode) {
@@ -253,6 +255,7 @@ class GeometryDecompressorRetained extends GeometryDecompressor {
* succeeding vertex. The outputColor() method is never called if
* colors are bundled with each vertex in the compressed buffer.
*/
+ @Override
void outputColor(Color4f color) {
if (boundsOnly || positionsOnly) return ;
if (debug) System.err.println("outputColor: " + color.toString()) ;
@@ -276,6 +279,7 @@ class GeometryDecompressorRetained extends GeometryDecompressor {
* called if normals are bundled with each vertex in the compressed
* buffer.
*/
+ @Override
void outputNormal(Vector3f normal) {
if (boundsOnly || positionsOnly) return ;
if (debug) System.err.println("outputNormal: " + normal.toString()) ;
diff --git a/src/classes/share/javax/media/j3d/GeometryDecompressorShape3D.java b/src/classes/share/javax/media/j3d/GeometryDecompressorShape3D.java
index af85ba8..4854b8c 100644
--- a/src/classes/share/javax/media/j3d/GeometryDecompressorShape3D.java
+++ b/src/classes/share/javax/media/j3d/GeometryDecompressorShape3D.java
@@ -187,6 +187,7 @@ class GeometryDecompressorShape3D extends GeometryDecompressor {
* Initialize the vertex output list based on the vertex format provided
* by the SetState decompression command.
*/
+ @Override
void outputVertexFormat(boolean bundlingNorm, boolean bundlingColor,
boolean doingAlpha) {
@@ -206,6 +207,7 @@ class GeometryDecompressorShape3D extends GeometryDecompressor {
/**
* Add a new decompressed vertex to the current list.
*/
+ @Override
void outputVertex(Point3f position, Vector3f normal,
Color4f color, int vertexReplaceCode) {
@@ -228,6 +230,7 @@ class GeometryDecompressorShape3D extends GeometryDecompressor {
* color. The outputColor() method is never called if colors are bundled
* with each vertex in the compressed buffer.
*/
+ @Override
void outputColor(Color4f color) {
if (debug) System.err.println(" outputColor: " + color.toString()) ;
@@ -250,6 +253,7 @@ class GeometryDecompressorShape3D extends GeometryDecompressor {
* never called if normals are bundled with each vertex in the compressed
* buffer.
*/
+ @Override
void outputNormal(Vector3f normal) {
if (debug) System.err.println(" outputNormal: " + normal.toString()) ;
diff --git a/src/classes/share/javax/media/j3d/GeometryRetained.java b/src/classes/share/javax/media/j3d/GeometryRetained.java
index 5a68225..47c816c 100644
--- a/src/classes/share/javax/media/j3d/GeometryRetained.java
+++ b/src/classes/share/javax/media/j3d/GeometryRetained.java
@@ -204,6 +204,7 @@ abstract class GeometryRetained extends NodeComponentRetained {
abstract void computeBoundingBox();
+ @Override
void setLive(boolean inBackgroundGroup, int refCount) {
doSetLive(inBackgroundGroup,refCount);
super.markAsLive();
@@ -213,6 +214,7 @@ abstract class GeometryRetained extends NodeComponentRetained {
* This setLive routine calls the superclass's method when reference
* count is 1
*/
+ @Override
void doSetLive(boolean inBackgroundGroup, int refCount) {
super.doSetLive(inBackgroundGroup, refCount);
this.update();
diff --git a/src/classes/share/javax/media/j3d/GeometryStripArray.java b/src/classes/share/javax/media/j3d/GeometryStripArray.java
index 136ec53..02db947 100644
--- a/src/classes/share/javax/media/j3d/GeometryStripArray.java
+++ b/src/classes/share/javax/media/j3d/GeometryStripArray.java
@@ -260,6 +260,7 @@ public abstract class GeometryStripArray extends GeometryArray {
*
* @since Java 3D 1.3
*/
+ @Override
public void setValidVertexCount(int validVertexCount) {
throw new UnsupportedOperationException();
}
diff --git a/src/classes/share/javax/media/j3d/GeometryStripArrayRetained.java b/src/classes/share/javax/media/j3d/GeometryStripArrayRetained.java
index a6113a6..f08c9e9 100644
--- a/src/classes/share/javax/media/j3d/GeometryStripArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/GeometryStripArrayRetained.java
@@ -775,6 +775,7 @@ abstract class GeometryStripArrayRetained extends GeometryArrayRetained {
}
// Called only for "by-copy" geometry
+ @Override
void mergeGeometryArrays(ArrayList list) {
int numMerge = list.size();
int numStrips = 0;
diff --git a/src/classes/share/javax/media/j3d/GeometryStructure.java b/src/classes/share/javax/media/j3d/GeometryStructure.java
index 48f2138..2fd5578 100644
--- a/src/classes/share/javax/media/j3d/GeometryStructure.java
+++ b/src/classes/share/javax/media/j3d/GeometryStructure.java
@@ -130,6 +130,7 @@ class GeometryStructure extends J3dStructure {
WakeupOnCollisionMovement.COND_IN_GS_LIST, u);
}
+ @Override
void processMessages(long referenceTime) {
J3dMessage m;
J3dMessage[] messages = getMessages(referenceTime);
@@ -364,6 +365,7 @@ class GeometryStructure extends J3dStructure {
// currTree.gatherTreeStatistics();
}
+ @Override
void removeNodes(J3dMessage m) {
Object[] nodes = (Object[]) m.args[0];
Object node;
@@ -1176,6 +1178,7 @@ class GeometryStructure extends J3dStructure {
*/
}
+ @Override
void cleanup() {
collideEntryList.clear();
collideExitList.clear();
diff --git a/src/classes/share/javax/media/j3d/GraphicsConfigTemplate3D.java b/src/classes/share/javax/media/j3d/GraphicsConfigTemplate3D.java
index da4bf19..757f5a6 100644
--- a/src/classes/share/javax/media/j3d/GraphicsConfigTemplate3D.java
+++ b/src/classes/share/javax/media/j3d/GraphicsConfigTemplate3D.java
@@ -290,6 +290,7 @@ public class GraphicsConfigTemplate3D extends GraphicsConfigTemplate {
*
* @see GraphicsDevice
*/
+ @Override
public GraphicsConfiguration
getBestConfiguration(GraphicsConfiguration[] gc) {
if ((gc == null) || (gc.length == 0) || (gc[0] == null)) {
@@ -332,6 +333,7 @@ public class GraphicsConfigTemplate3D extends GraphicsConfigTemplate {
* <code>false</code> if the GraphicsConfiguration can not be used
* to create a drawing surface usable by this API.
*/
+ @Override
public boolean isGraphicsConfigSupported(GraphicsConfiguration gc) {
if (gc == null) {
return false;
@@ -430,6 +432,7 @@ public class GraphicsConfigTemplate3D extends GraphicsConfigTemplate {
* Returns a string representation of this object.
* @return a string representation of this object.
*/
+ @Override
public String toString() {
return
"redSize : " + redSize + ", " +
diff --git a/src/classes/share/javax/media/j3d/Group.java b/src/classes/share/javax/media/j3d/Group.java
index b0e7ae6..11dee57 100644
--- a/src/classes/share/javax/media/j3d/Group.java
+++ b/src/classes/share/javax/media/j3d/Group.java
@@ -83,6 +83,7 @@ public class Group extends Node {
* Creates the retained mode GroupRetained object that this
* Group component object will point to.
*/
+ @Override
void createRetained() {
retained = new GroupRetained();
retained.setSource(this);
@@ -460,6 +461,7 @@ public class Group extends Node {
*
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
Node cloneTree(boolean forceDuplicate, Hashtable nodeHashtable) {
Group g = (Group) super.cloneTree(forceDuplicate, nodeHashtable);
GroupRetained rt = (GroupRetained) retained;
@@ -499,6 +501,7 @@ public class Group extends Node {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
@@ -529,6 +532,7 @@ public class Group extends Node {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
Group g = new Group();
g.duplicateNode(this, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/GroupRetained.java b/src/classes/share/javax/media/j3d/GroupRetained.java
index 5cb6ed6..d20dc68 100644
--- a/src/classes/share/javax/media/j3d/GroupRetained.java
+++ b/src/classes/share/javax/media/j3d/GroupRetained.java
@@ -1326,6 +1326,7 @@ synchronized void setAltAppScope() {
}
+ @Override
void updatePickable(HashKey keys[], boolean pick[]) {
int numChildLessOne = children.size() - 1;
super.updatePickable(keys, pick);
@@ -1351,6 +1352,7 @@ synchronized void setAltAppScope() {
}
+ @Override
void updateCollidable(HashKey keys[], boolean collide[]) {
int numChildLessOne = children.size() - 1;
super.updateCollidable(keys, collide);
@@ -2129,6 +2131,7 @@ synchronized void setAltAppScope() {
}
+ @Override
synchronized void updateLocalToVworld() {
// For each children call .....
for (int i=children.size()-1; i>=0; i--) {
@@ -2138,11 +2141,13 @@ synchronized void setAltAppScope() {
}
}
+ @Override
void setNodeData(SetLiveState s) {
super.setNodeData(s);
orderedPaths = s.orderedPaths;
}
+ @Override
void removeNodeData(SetLiveState s) {
if((!inSharedGroup) || (s.keys.length == localToVworld.length)) {
@@ -2158,6 +2163,7 @@ synchronized void setAltAppScope() {
+ @Override
void setLive(SetLiveState s) {
doSetLive(s);
super.markAsLive();
@@ -2180,6 +2186,7 @@ synchronized void setAltAppScope() {
/**
* This version of setLive calls setLive on all of its chidren.
*/
+ @Override
void doSetLive(SetLiveState s) {
int i, nchildren;
super.doSetLive(s);
@@ -2431,6 +2438,7 @@ synchronized void setAltAppScope() {
}
}
+ @Override
void computeCombineBounds(Bounds bounds) {
if (!VirtualUniverse.mc.cacheAutoComputedBounds) {
if (boundsAutoCompute) {
@@ -2481,6 +2489,7 @@ synchronized void setAltAppScope() {
* Gets the bounding object of a node.
* @return the node's bounding object
*/
+ @Override
Bounds getBounds() {
if ( boundsAutoCompute) {
@@ -2511,6 +2520,7 @@ synchronized void setAltAppScope() {
* Gets the bounding object of a node.
* @return the node's bounding object
*/
+ @Override
Bounds getEffectiveBounds() {
if ( boundsAutoCompute) {
return getBounds();
@@ -2537,6 +2547,7 @@ synchronized void setAltAppScope() {
}
+ @Override
boolean isStatic() {
return (super.isStatic() && isStaticChildren());
}
@@ -2544,6 +2555,7 @@ synchronized void setAltAppScope() {
/**
* This compiles() a group
*/
+ @Override
void setCompiled() {
super.setCompiled();
for (int i=children.size()-1; i>=0; i--) {
@@ -2553,6 +2565,7 @@ synchronized void setAltAppScope() {
}
}
+ @Override
void traverse(boolean sameLevel, int level) {
if (!sameLevel) {
super.traverse(true, level);
@@ -2575,6 +2588,7 @@ synchronized void setAltAppScope() {
}
}
+ @Override
void compile(CompileState compState) {
super.compile(compState);
@@ -2604,6 +2618,7 @@ synchronized void setAltAppScope() {
}
}
+ @Override
void merge(CompileState compState) {
GroupRetained saveParentGroup = null;
@@ -2652,6 +2667,7 @@ synchronized void setAltAppScope() {
/**
* This version of clearLive calls clearLive on all of its chidren.
*/
+ @Override
void clearLive(SetLiveState s) {
int i, k, hkIndex, nchildren;
int parentScopedLtSize = 0;
@@ -2867,22 +2883,26 @@ synchronized void setAltAppScope() {
}
// This is only used by alternateCollisionTarget
+ @Override
public BoundingBox computeBoundingHull() {
return collisionVwcBounds;
}
// If isSwitchOn cached here, we don't need to traverse up the tree
+ @Override
public boolean isEnable() {
return isNodeSwitchOn(this.sourceNode, key);
}
// If isSwitchOn cached here, we don't need to traverse up the tree
// This method does nothing with vis.
+ @Override
public boolean isEnable(int vis) {
return isNodeSwitchOn(this.sourceNode, key);
}
// Can't use getLocale, it is used by BranchGroupRetained
+ @Override
public Locale getLocale2() {
return locale;
}
@@ -3009,6 +3029,7 @@ synchronized void setAltAppScope() {
}
}
+ @Override
void setBoundsAutoCompute(boolean autoCompute) {
if (autoCompute != boundsAutoCompute) {
super.setBoundsAutoCompute(autoCompute);
@@ -3029,6 +3050,7 @@ synchronized void setAltAppScope() {
}
}
+ @Override
void setBounds(Bounds bounds) {
super.setBounds(bounds);
if (source.isLive() && !boundsAutoCompute &&
@@ -3045,6 +3067,7 @@ synchronized void setAltAppScope() {
}
+ @Override
int[] processViewSpecificInfo(int mode, HashKey k, View v, ArrayList vsgList, int[] keyList,
ArrayList leafList) {
int nchildren = children.size();
@@ -3176,6 +3199,7 @@ synchronized void setAltAppScope() {
}
// recursively found all geometryAtoms under this Group
+ @Override
void searchGeometryAtoms(UnorderList list) {
for (int i = children.size()-1; i >=0; i--) {
NodeRetained child = children.get(i);
diff --git a/src/classes/share/javax/media/j3d/HashKey.java b/src/classes/share/javax/media/j3d/HashKey.java
index 3b9c7a5..cfbf7fe 100644
--- a/src/classes/share/javax/media/j3d/HashKey.java
+++ b/src/classes/share/javax/media/j3d/HashKey.java
@@ -100,6 +100,7 @@ class HashKey extends Object {
return this;
}
+ @Override
public int hashCode() {
int h = 0;
int off = 0;
@@ -120,6 +121,7 @@ class HashKey extends Object {
return h;
}
+ @Override
public boolean equals(Object anObject) {
if ((anObject != null) && (anObject instanceof HashKey)) {
HashKey anotherHashKey = (HashKey)anObject;
@@ -225,6 +227,7 @@ class HashKey extends Object {
return false;
}
+ @Override
public String toString() {
return new String(value, 0, count);
}
diff --git a/src/classes/share/javax/media/j3d/HiResCoord.java b/src/classes/share/javax/media/j3d/HiResCoord.java
index 325b7a5..cfefa4a 100644
--- a/src/classes/share/javax/media/j3d/HiResCoord.java
+++ b/src/classes/share/javax/media/j3d/HiResCoord.java
@@ -429,6 +429,7 @@ private double scales[] = {
* @param o1 the second HiResCoord
* @return true if equal, false if not equal
*/
+ @Override
public boolean equals(Object o1) {
try {
HiResCoord h1 = (HiResCoord)o1;
diff --git a/src/classes/share/javax/media/j3d/ImageComponent2D.java b/src/classes/share/javax/media/j3d/ImageComponent2D.java
index aaed356..d8e0d2f 100644
--- a/src/classes/share/javax/media/j3d/ImageComponent2D.java
+++ b/src/classes/share/javax/media/j3d/ImageComponent2D.java
@@ -641,6 +641,7 @@ public class ImageComponent2D extends ImageComponent {
* Creates a retained mode ImageComponent2DRetained object that this
* ImageComponent2D component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new ImageComponent2DRetained();
this.retained.setSource(this);
@@ -649,6 +650,7 @@ public class ImageComponent2D extends ImageComponent {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
ImageComponent2DRetained rt = (ImageComponent2DRetained) retained;
@@ -679,6 +681,7 @@ public class ImageComponent2D extends ImageComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/ImageComponent2DRetained.java b/src/classes/share/javax/media/j3d/ImageComponent2DRetained.java
index 4f8849c..395b159 100644
--- a/src/classes/share/javax/media/j3d/ImageComponent2DRetained.java
+++ b/src/classes/share/javax/media/j3d/ImageComponent2DRetained.java
@@ -329,6 +329,7 @@ class ImageComponent2DRetained extends ImageComponentRetained {
}
}
+ @Override
void clearLive(int refCount) {
super.clearLive(refCount);
}
diff --git a/src/classes/share/javax/media/j3d/ImageComponent3D.java b/src/classes/share/javax/media/j3d/ImageComponent3D.java
index b2f4841..34be8b9 100644
--- a/src/classes/share/javax/media/j3d/ImageComponent3D.java
+++ b/src/classes/share/javax/media/j3d/ImageComponent3D.java
@@ -869,6 +869,7 @@ public class ImageComponent3D extends ImageComponent {
* Creates a retained mode ImageComponent3DRetained object that this
* ImageComponent3D component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new ImageComponent3DRetained();
this.retained.setSource(this);
@@ -879,6 +880,7 @@ public class ImageComponent3D extends ImageComponent {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
ImageComponent3DRetained rt = (ImageComponent3DRetained) retained;
@@ -918,6 +920,7 @@ public class ImageComponent3D extends ImageComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/ImageComponentRetained.java b/src/classes/share/javax/media/j3d/ImageComponentRetained.java
index c38863f..8fb9697 100644
--- a/src/classes/share/javax/media/j3d/ImageComponentRetained.java
+++ b/src/classes/share/javax/media/j3d/ImageComponentRetained.java
@@ -2147,6 +2147,7 @@ private ArrayList<NodeComponentRetained> userList = new ArrayList<NodeComponentR
* @exception IllegalSharingException if this image is
* being used by a Canvas3D as an off-screen buffer.
*/
+ @Override
void setLive(boolean inBackgroundGroup, int refCount) {
// Do illegalSharing check.
if(getUsedByOffScreen()) {
@@ -2160,6 +2161,7 @@ private ArrayList<NodeComponentRetained> userList = new ArrayList<NodeComponentR
* But it's using the updateMirrorObject interface to propagate
* the changes to the users
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
// System.err.println("ImageComponent.updateMirrorObject");
if ((component & IMAGE_CHANGED) == 0 &&
@@ -2194,6 +2196,7 @@ private ArrayList<NodeComponentRetained> userList = new ArrayList<NodeComponentR
VirtualUniverse.mc.processMessage(createMessage);
}
+ @Override
void handleFrequencyChange(int bit) {
if (bit == ImageComponent.ALLOW_IMAGE_WRITE) {
setFrequencyChangeMask(ImageComponent.ALLOW_IMAGE_WRITE, 0x1);
diff --git a/src/classes/share/javax/media/j3d/IndexedGeometryArray.java b/src/classes/share/javax/media/j3d/IndexedGeometryArray.java
index 61ca4cc..113bd4f 100644
--- a/src/classes/share/javax/media/j3d/IndexedGeometryArray.java
+++ b/src/classes/share/javax/media/j3d/IndexedGeometryArray.java
@@ -404,6 +404,7 @@ public abstract class IndexedGeometryArray extends GeometryArray {
*
* @since Java 3D 1.3
*/
+ @Override
public void setInitialVertexIndex(int initialVertexIndex) {
throw new UnsupportedOperationException();
}
@@ -417,6 +418,7 @@ public abstract class IndexedGeometryArray extends GeometryArray {
*
* @since Java 3D 1.3
*/
+ @Override
public void setInitialCoordIndex(int initialCoordIndex) {
throw new UnsupportedOperationException();
}
@@ -430,6 +432,7 @@ public abstract class IndexedGeometryArray extends GeometryArray {
*
* @since Java 3D 1.3
*/
+ @Override
public void setInitialColorIndex(int initialColorIndex) {
throw new UnsupportedOperationException();
}
@@ -443,6 +446,7 @@ public abstract class IndexedGeometryArray extends GeometryArray {
*
* @since Java 3D 1.3
*/
+ @Override
public void setInitialNormalIndex(int initialNormalIndex) {
throw new UnsupportedOperationException();
}
@@ -456,6 +460,7 @@ public abstract class IndexedGeometryArray extends GeometryArray {
*
* @since Java 3D 1.3
*/
+ @Override
public void setInitialTexCoordIndex(int texCoordSet,
int initialTexCoordIndex) {
throw new UnsupportedOperationException();
@@ -470,6 +475,7 @@ public abstract class IndexedGeometryArray extends GeometryArray {
*
* @since Java 3D 1.4
*/
+ @Override
public void setInitialVertexAttrIndex(int vertexAttrNum,
int initialVertexAttrIndex) {
throw new UnsupportedOperationException();
@@ -486,6 +492,7 @@ public abstract class IndexedGeometryArray extends GeometryArray {
*
* @since Java 3D 1.3
*/
+ @Override
public void setValidVertexCount(int validVertexCount) {
throw new UnsupportedOperationException();
}
@@ -1219,6 +1226,7 @@ public abstract class IndexedGeometryArray extends GeometryArray {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/IndexedGeometryArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedGeometryArrayRetained.java
index 811f364..528c46f 100644
--- a/src/classes/share/javax/media/j3d/IndexedGeometryArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/IndexedGeometryArrayRetained.java
@@ -1154,6 +1154,7 @@ abstract class IndexedGeometryArrayRetained extends GeometryArrayRetained {
}
+ @Override
void execute(Canvas3D cv, RenderAtom ra, boolean isNonUniformScale,
boolean updateAlpha, float alpha,
int screen, boolean ignoreVertexColors) {
@@ -1536,6 +1537,7 @@ abstract class IndexedGeometryArrayRetained extends GeometryArrayRetained {
} // end of nio buffer
}
+ @Override
void buildGA(Canvas3D cv, RenderAtom ra, boolean isNonUniformScale,
boolean updateAlpha, float alpha, boolean ignoreVertexColors,
Transform3D xform, Transform3D nxform) {
@@ -1603,6 +1605,7 @@ abstract class IndexedGeometryArrayRetained extends GeometryArrayRetained {
}
}
+ @Override
void mergeGeometryArrays(ArrayList list) {
int numMerge = list.size();
int[] texCoord = null;
@@ -1660,6 +1663,7 @@ abstract class IndexedGeometryArrayRetained extends GeometryArrayRetained {
}
+ @Override
boolean isWriteStatic() {
if (!super.isWriteStatic() ||
@@ -1903,6 +1907,7 @@ abstract class IndexedGeometryArrayRetained extends GeometryArrayRetained {
return validIndexCount;
}
+ @Override
void handleFrequencyChange(int bit) {
if ((bit == IndexedGeometryArray.ALLOW_COORDINATE_INDEX_WRITE) ||
(((vertexFormat & GeometryArray.USE_COORD_INDEX_ONLY) == 0) &&
diff --git a/src/classes/share/javax/media/j3d/IndexedGeometryStripArray.java b/src/classes/share/javax/media/j3d/IndexedGeometryStripArray.java
index b96a0b8..7253aac 100644
--- a/src/classes/share/javax/media/j3d/IndexedGeometryStripArray.java
+++ b/src/classes/share/javax/media/j3d/IndexedGeometryStripArray.java
@@ -253,6 +253,7 @@ public abstract class IndexedGeometryStripArray extends IndexedGeometryArray {
*
* @since Java 3D 1.3
*/
+ @Override
public void setValidIndexCount(int validIndexCount) {
throw new UnsupportedOperationException();
}
diff --git a/src/classes/share/javax/media/j3d/IndexedGeometryStripArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedGeometryStripArrayRetained.java
index 3a60161..d3e874f 100644
--- a/src/classes/share/javax/media/j3d/IndexedGeometryStripArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/IndexedGeometryStripArrayRetained.java
@@ -202,6 +202,7 @@ abstract class IndexedGeometryStripArrayRetained extends IndexedGeometryArrayRet
}
}
+ @Override
void mergeGeometryArrays(ArrayList list) {
int numMerge = list.size();
int numCount = 0;
diff --git a/src/classes/share/javax/media/j3d/IndexedLineArray.java b/src/classes/share/javax/media/j3d/IndexedLineArray.java
index b9d0746..f010506 100644
--- a/src/classes/share/javax/media/j3d/IndexedLineArray.java
+++ b/src/classes/share/javax/media/j3d/IndexedLineArray.java
@@ -182,6 +182,7 @@ public class IndexedLineArray extends IndexedGeometryArray {
* Creates the retained mode IndexedLineArrayRetained object that this
* IndexedLineArray object will point to.
*/
+ @Override
void createRetained() {
this.retained = new IndexedLineArrayRetained();
this.retained.setSource(this);
@@ -190,6 +191,7 @@ public class IndexedLineArray extends IndexedGeometryArray {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
IndexedLineArrayRetained rt = (IndexedLineArrayRetained) retained;
int texSetCount = rt.getTexCoordSetCount();
diff --git a/src/classes/share/javax/media/j3d/IndexedLineArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedLineArrayRetained.java
index 11c8cd3..b28b830 100644
--- a/src/classes/share/javax/media/j3d/IndexedLineArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/IndexedLineArrayRetained.java
@@ -40,6 +40,7 @@ class IndexedLineArrayRetained extends IndexedGeometryArrayRetained {
this.geoType = GEO_TYPE_INDEXED_LINE_SET;
}
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
Point3d pnts[] = new Point3d[2];
@@ -289,6 +290,7 @@ class IndexedLineArrayRetained extends IndexedGeometryArrayRetained {
}
+ @Override
boolean intersect(Point3d[] pnts) {
Point3d[] points = new Point3d[2];
Vector3d dir;
@@ -346,6 +348,7 @@ class IndexedLineArrayRetained extends IndexedGeometryArrayRetained {
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld,
GeometryRetained geom) {
@@ -370,6 +373,7 @@ class IndexedLineArrayRetained extends IndexedGeometryArrayRetained {
}
// the bounds argument is already transformed
+ @Override
boolean intersect(Bounds targetBound) {
Point3d[] pnts = new Point3d[2];
//NVaidya
@@ -420,6 +424,7 @@ class IndexedLineArrayRetained extends IndexedGeometryArrayRetained {
return false;
}
+ @Override
int getClassType() {
return LINE_TYPE;
}
diff --git a/src/classes/share/javax/media/j3d/IndexedLineStripArray.java b/src/classes/share/javax/media/j3d/IndexedLineStripArray.java
index 1e90a83..e956d23 100644
--- a/src/classes/share/javax/media/j3d/IndexedLineStripArray.java
+++ b/src/classes/share/javax/media/j3d/IndexedLineStripArray.java
@@ -205,6 +205,7 @@ public class IndexedLineStripArray extends IndexedGeometryStripArray {
* Creates the retained mode IndexedLineStripArrayRetained object that this
* IndexedLineStripArray object will point to.
*/
+ @Override
void createRetained() {
this.retained = new IndexedLineStripArrayRetained();
this.retained.setSource(this);
@@ -214,6 +215,7 @@ public class IndexedLineStripArray extends IndexedGeometryStripArray {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
IndexedLineStripArrayRetained rt =
(IndexedLineStripArrayRetained) retained;
diff --git a/src/classes/share/javax/media/j3d/IndexedLineStripArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedLineStripArrayRetained.java
index 76e41f8..21b5205 100644
--- a/src/classes/share/javax/media/j3d/IndexedLineStripArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/IndexedLineStripArrayRetained.java
@@ -43,6 +43,7 @@ class IndexedLineStripArrayRetained extends IndexedGeometryStripArrayRetained {
geoType = GEO_TYPE_INDEXED_LINE_STRIP_SET;
}
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
Point3d pnts[] = new Point3d[2];
@@ -324,6 +325,7 @@ class IndexedLineStripArrayRetained extends IndexedGeometryStripArrayRetained {
}
// intersect pnts[] with every triangle in this object
+ @Override
boolean intersect(Point3d[] pnts) {
int i = 0;
int j, count=0;
@@ -394,6 +396,7 @@ class IndexedLineStripArrayRetained extends IndexedGeometryStripArrayRetained {
return false;
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld,
GeometryRetained geom) {
int i = 0;
@@ -421,6 +424,7 @@ class IndexedLineStripArrayRetained extends IndexedGeometryStripArrayRetained {
}
// the bounds argument is already transformed
+ @Override
boolean intersect(Bounds targetBound) {
int i = 0;
int j, count=0;
@@ -483,6 +487,7 @@ class IndexedLineStripArrayRetained extends IndexedGeometryStripArrayRetained {
return false;
}
+ @Override
int getClassType() {
return LINE_TYPE;
}
diff --git a/src/classes/share/javax/media/j3d/IndexedPointArray.java b/src/classes/share/javax/media/j3d/IndexedPointArray.java
index 12527c4..4373fb3 100644
--- a/src/classes/share/javax/media/j3d/IndexedPointArray.java
+++ b/src/classes/share/javax/media/j3d/IndexedPointArray.java
@@ -180,6 +180,7 @@ public class IndexedPointArray extends IndexedGeometryArray {
* Creates the retained mode IndexedPointArrayRetained object that this
* IndexedPointArray object will point to.
*/
+ @Override
void createRetained() {
this.retained = new IndexedPointArrayRetained();
this.retained.setSource(this);
@@ -189,6 +190,7 @@ public class IndexedPointArray extends IndexedGeometryArray {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
IndexedPointArrayRetained rt = (IndexedPointArrayRetained) retained;
int texSetCount = rt.getTexCoordSetCount();
diff --git a/src/classes/share/javax/media/j3d/IndexedPointArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedPointArrayRetained.java
index 4f0a6d4..4d7970f 100644
--- a/src/classes/share/javax/media/j3d/IndexedPointArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/IndexedPointArrayRetained.java
@@ -39,6 +39,7 @@ class IndexedPointArrayRetained extends IndexedGeometryArrayRetained {
this.geoType = GEO_TYPE_INDEXED_POINT_SET;
}
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
double sdist[] = new double[1];
@@ -212,6 +213,7 @@ class IndexedPointArrayRetained extends IndexedGeometryArrayRetained {
return false;
}
+ @Override
boolean intersect(Point3d[] pnts) {
Point3d point = new Point3d();
int i = ((vertexFormat & GeometryArray.BY_REFERENCE) == 0 ?
@@ -264,6 +266,7 @@ class IndexedPointArrayRetained extends IndexedGeometryArrayRetained {
return false;
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld,
GeometryRetained geom) {
Point3d[] pnt = new Point3d[1];
@@ -283,6 +286,7 @@ class IndexedPointArrayRetained extends IndexedGeometryArrayRetained {
}
// the bounds argument is already transformed
+ @Override
boolean intersect(Bounds targetBound) {
int i = ((vertexFormat & GeometryArray.BY_REFERENCE) == 0 ?
initialVertexIndex : initialCoordIndex);
@@ -297,6 +301,7 @@ class IndexedPointArrayRetained extends IndexedGeometryArrayRetained {
return false;
}
+ @Override
int getClassType() {
return POINT_TYPE;
}
diff --git a/src/classes/share/javax/media/j3d/IndexedQuadArray.java b/src/classes/share/javax/media/j3d/IndexedQuadArray.java
index ab927a4..0ed40d1 100644
--- a/src/classes/share/javax/media/j3d/IndexedQuadArray.java
+++ b/src/classes/share/javax/media/j3d/IndexedQuadArray.java
@@ -184,6 +184,7 @@ public class IndexedQuadArray extends IndexedGeometryArray {
* Creates the retained mode IndexedQuadArrayRetained object that this
* IndexedQuadArray object will point to.
*/
+ @Override
void createRetained() {
this.retained = new IndexedQuadArrayRetained();
this.retained.setSource(this);
@@ -193,6 +194,7 @@ public class IndexedQuadArray extends IndexedGeometryArray {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
IndexedQuadArrayRetained rt = (IndexedQuadArrayRetained) retained;
int texSetCount = rt.getTexCoordSetCount();
diff --git a/src/classes/share/javax/media/j3d/IndexedQuadArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedQuadArrayRetained.java
index 360bef9..b32ac13 100644
--- a/src/classes/share/javax/media/j3d/IndexedQuadArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/IndexedQuadArrayRetained.java
@@ -40,6 +40,7 @@ class IndexedQuadArrayRetained extends IndexedGeometryArrayRetained {
this.geoType = GEO_TYPE_INDEXED_QUAD_SET;
}
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
Point3d pnts[] = new Point3d[4];
@@ -280,6 +281,7 @@ class IndexedQuadArrayRetained extends IndexedGeometryArrayRetained {
}
// intersect pnts[] with every quad in this object
+ @Override
boolean intersect(Point3d[] pnts) {
Point3d[] points = new Point3d[4];
double dist[] = new double[1];
@@ -357,6 +359,7 @@ class IndexedQuadArrayRetained extends IndexedGeometryArrayRetained {
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld,
GeometryRetained geom) {
@@ -388,6 +391,7 @@ class IndexedQuadArrayRetained extends IndexedGeometryArrayRetained {
}
// the bounds argument is already transformed
+ @Override
boolean intersect(Bounds targetBound) {
Point3d[] points = new Point3d[4];
//NVaidya
@@ -448,6 +452,7 @@ class IndexedQuadArrayRetained extends IndexedGeometryArrayRetained {
}
+ @Override
int getClassType() {
return QUAD_TYPE;
}
diff --git a/src/classes/share/javax/media/j3d/IndexedTriangleArray.java b/src/classes/share/javax/media/j3d/IndexedTriangleArray.java
index 87ecc3a..35969f0 100644
--- a/src/classes/share/javax/media/j3d/IndexedTriangleArray.java
+++ b/src/classes/share/javax/media/j3d/IndexedTriangleArray.java
@@ -184,6 +184,7 @@ public class IndexedTriangleArray extends IndexedGeometryArray {
* Creates the retained mode IndexedTriangleArrayRetained object that this
* IndexedTriangleArray object will point to.
*/
+ @Override
void createRetained() {
this.retained = new IndexedTriangleArrayRetained();
this.retained.setSource(this);
@@ -193,6 +194,7 @@ public class IndexedTriangleArray extends IndexedGeometryArray {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
IndexedTriangleArrayRetained rt = (IndexedTriangleArrayRetained) retained;
int texSetCount = rt.getTexCoordSetCount();
diff --git a/src/classes/share/javax/media/j3d/IndexedTriangleArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedTriangleArrayRetained.java
index 25509b8..22b4839 100644
--- a/src/classes/share/javax/media/j3d/IndexedTriangleArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/IndexedTriangleArrayRetained.java
@@ -40,6 +40,7 @@ class IndexedTriangleArrayRetained extends IndexedGeometryArrayRetained {
this.geoType = GEO_TYPE_INDEXED_TRI_SET;
}
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
Point3d pnts[] = new Point3d[3];
@@ -283,6 +284,7 @@ class IndexedTriangleArrayRetained extends IndexedGeometryArrayRetained {
}
// intersect pnts[] with every triangle in this object
+ @Override
boolean intersect(Point3d[] pnts) {
Point3d[] points = new Point3d[3];
double dist[] = new double[1];
@@ -347,6 +349,7 @@ class IndexedTriangleArrayRetained extends IndexedGeometryArrayRetained {
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld, GeometryRetained geom) {
Point3d[] pnts = new Point3d[3];
//NVaidya
@@ -372,6 +375,7 @@ class IndexedTriangleArrayRetained extends IndexedGeometryArrayRetained {
}
// the bounds argument is already transformed
+ @Override
boolean intersect(Bounds targetBound) {
Point3d[] pnts = new Point3d[3];
//NVaidya
@@ -428,6 +432,7 @@ class IndexedTriangleArrayRetained extends IndexedGeometryArrayRetained {
return false;
}
+ @Override
int getClassType() {
return TRIANGLE_TYPE;
}
diff --git a/src/classes/share/javax/media/j3d/IndexedTriangleFanArray.java b/src/classes/share/javax/media/j3d/IndexedTriangleFanArray.java
index 4875d85..38a321b 100644
--- a/src/classes/share/javax/media/j3d/IndexedTriangleFanArray.java
+++ b/src/classes/share/javax/media/j3d/IndexedTriangleFanArray.java
@@ -204,6 +204,7 @@ public class IndexedTriangleFanArray extends IndexedGeometryStripArray {
* Creates the retained mode IndexedTriangleFanArrayRetained object that this
* IndexedTriangleFanArray object will point to.
*/
+ @Override
void createRetained() {
this.retained = new IndexedTriangleFanArrayRetained();
this.retained.setSource(this);
@@ -213,6 +214,7 @@ public class IndexedTriangleFanArray extends IndexedGeometryStripArray {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
IndexedTriangleFanArrayRetained rt =
(IndexedTriangleFanArrayRetained) retained;
diff --git a/src/classes/share/javax/media/j3d/IndexedTriangleFanArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedTriangleFanArrayRetained.java
index fec3a4d..f4f0c98 100644
--- a/src/classes/share/javax/media/j3d/IndexedTriangleFanArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/IndexedTriangleFanArrayRetained.java
@@ -45,6 +45,7 @@ class IndexedTriangleFanArrayRetained extends IndexedGeometryStripArrayRetained
geoType = GEO_TYPE_INDEXED_TRI_FAN_SET;
}
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
Point3d pnts[] = new Point3d[3];
@@ -334,6 +335,7 @@ class IndexedTriangleFanArrayRetained extends IndexedGeometryStripArrayRetained
}
// intersect pnts[] with every triangle in this object
+ @Override
boolean intersect(Point3d[] pnts) {
int j;
Point3d[] points = new Point3d[3];
@@ -411,6 +413,7 @@ class IndexedTriangleFanArrayRetained extends IndexedGeometryStripArrayRetained
return false;
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld, GeometryRetained geom) {
int i = 0, j, scount, count = 0;
Point3d[] pnts = new Point3d[3];
@@ -437,6 +440,7 @@ class IndexedTriangleFanArrayRetained extends IndexedGeometryStripArrayRetained
}
// the bounds argument is already transformed
+ @Override
boolean intersect(Bounds targetBound) {
int i = 0;
int j, scount, count = 0;
@@ -501,6 +505,7 @@ class IndexedTriangleFanArrayRetained extends IndexedGeometryStripArrayRetained
return false;
}
+ @Override
int getClassType() {
return TRIANGLE_TYPE;
}
diff --git a/src/classes/share/javax/media/j3d/IndexedTriangleStripArray.java b/src/classes/share/javax/media/j3d/IndexedTriangleStripArray.java
index 3fb03d3..71f4659 100644
--- a/src/classes/share/javax/media/j3d/IndexedTriangleStripArray.java
+++ b/src/classes/share/javax/media/j3d/IndexedTriangleStripArray.java
@@ -206,6 +206,7 @@ public class IndexedTriangleStripArray extends IndexedGeometryStripArray {
* Creates the retained mode IndexedTriangleStripArrayRetained object that this
* IndexedTriangleStripArray object will point to.
*/
+ @Override
void createRetained() {
this.retained = new IndexedTriangleStripArrayRetained();
this.retained.setSource(this);
@@ -215,6 +216,7 @@ public class IndexedTriangleStripArray extends IndexedGeometryStripArray {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
IndexedTriangleStripArrayRetained rt =
(IndexedTriangleStripArrayRetained) retained;
diff --git a/src/classes/share/javax/media/j3d/IndexedTriangleStripArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedTriangleStripArrayRetained.java
index e7fd70f..3b393d3 100644
--- a/src/classes/share/javax/media/j3d/IndexedTriangleStripArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/IndexedTriangleStripArrayRetained.java
@@ -44,6 +44,7 @@ class IndexedTriangleStripArrayRetained extends IndexedGeometryStripArrayRetaine
geoType = GEO_TYPE_INDEXED_TRI_STRIP_SET;
}
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
Point3d pnts[] = new Point3d[3];
@@ -347,6 +348,7 @@ class IndexedTriangleStripArrayRetained extends IndexedGeometryStripArrayRetaine
}
// intersect pnts[] with every triangle in this object
+ @Override
boolean intersect(Point3d[] pnts) {
int j;
Point3d[] points = new Point3d[3];
@@ -428,6 +430,7 @@ class IndexedTriangleStripArrayRetained extends IndexedGeometryStripArrayRetaine
return false;
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld, GeometryRetained geom) {
int i = 0, j, scount, count = 0;
Point3d[] pnts = new Point3d[3];
@@ -455,6 +458,7 @@ class IndexedTriangleStripArrayRetained extends IndexedGeometryStripArrayRetaine
}
// the bounds argument is already transformed
+ @Override
boolean intersect(Bounds targetBound) {
int i = 0;
int j, scount, count = 0;
@@ -522,6 +526,7 @@ class IndexedTriangleStripArrayRetained extends IndexedGeometryStripArrayRetaine
return false;
}
+ @Override
int getClassType() {
return TRIANGLE_TYPE;
}
diff --git a/src/classes/share/javax/media/j3d/IndexedUnorderSet.java b/src/classes/share/javax/media/j3d/IndexedUnorderSet.java
index 8b54cca..d498bac 100644
--- a/src/classes/share/javax/media/j3d/IndexedUnorderSet.java
+++ b/src/classes/share/javax/media/j3d/IndexedUnorderSet.java
@@ -242,6 +242,7 @@ class IndexedUnorderSet implements Cloneable, java.io.Serializable {
*
* @return a clone of this <tt>ArrayList</tt> instance.
*/
+ @Override
synchronized protected final Object clone() {
try {
IndexedUnorderSet v = (IndexedUnorderSet)super.clone();
diff --git a/src/classes/share/javax/media/j3d/InputDeviceBlockingThread.java b/src/classes/share/javax/media/j3d/InputDeviceBlockingThread.java
index ec48af8..f65a65b 100644
--- a/src/classes/share/javax/media/j3d/InputDeviceBlockingThread.java
+++ b/src/classes/share/javax/media/j3d/InputDeviceBlockingThread.java
@@ -59,6 +59,7 @@ class InputDeviceBlockingThread extends Thread {
}
+ @Override
public void run() {
// Since this thread is blocking, this thread should not be
// taking an inordinate amount of CPU time. Note that the
diff --git a/src/classes/share/javax/media/j3d/InputDeviceScheduler.java b/src/classes/share/javax/media/j3d/InputDeviceScheduler.java
index d8d4150..1c24094 100644
--- a/src/classes/share/javax/media/j3d/InputDeviceScheduler.java
+++ b/src/classes/share/javax/media/j3d/InputDeviceScheduler.java
@@ -64,6 +64,7 @@ class InputDeviceScheduler extends J3dThread {
return (++numInstances);
}
+ @Override
int getInstanceNum() {
if (instanceNum == -1)
instanceNum = newInstanceNum();
@@ -189,6 +190,7 @@ class InputDeviceScheduler extends J3dThread {
return threadData;
}
+ @Override
void doWork(long referenceTime) {
synchronized (nonBlockingDevices) {
for (int i = nonBlockingDevices.size()-1; i >=0; i--) {
@@ -197,6 +199,7 @@ class InputDeviceScheduler extends J3dThread {
}
}
+ @Override
void shutdown() {
// stop all spawn threads
for (int i=threads.size()-1; i >=0; i--) {
diff --git a/src/classes/share/javax/media/j3d/IntegerFreeList.java b/src/classes/share/javax/media/j3d/IntegerFreeList.java
index f4a34e8..db96457 100644
--- a/src/classes/share/javax/media/j3d/IntegerFreeList.java
+++ b/src/classes/share/javax/media/j3d/IntegerFreeList.java
@@ -41,11 +41,13 @@ class IntegerFreeList extends MemoryFreeList {
count = initialCount;
}
+ @Override
synchronized Object getObject() {
if (size > 0) return super.removeLastElement();
else return new Integer(++count);
}
+ @Override
public synchronized void clear() {
super.clear();
count = 0;
diff --git a/src/classes/share/javax/media/j3d/Interpolator.java b/src/classes/share/javax/media/j3d/Interpolator.java
index bb00eff..e035927 100644
--- a/src/classes/share/javax/media/j3d/Interpolator.java
+++ b/src/classes/share/javax/media/j3d/Interpolator.java
@@ -95,6 +95,7 @@ public abstract class Interpolator extends Behavior {
* This is the default Interpolator behavior initialization routine.
* It schedules the behavior to awaken at the next frame.
*/
+ @Override
public void initialize() {
// Reset alpha
//alpha.setStartTime(J3dClock.currentTimeMillis());
@@ -125,6 +126,7 @@ public abstract class Interpolator extends Behavior {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/J3DGraphics2D.java b/src/classes/share/javax/media/j3d/J3DGraphics2D.java
index 4eae407..1fc48cf 100644
--- a/src/classes/share/javax/media/j3d/J3DGraphics2D.java
+++ b/src/classes/share/javax/media/j3d/J3DGraphics2D.java
@@ -95,6 +95,7 @@ public abstract class J3DGraphics2D extends Graphics2D {
*
* @see Canvas3D#getGraphics2D
*/
+ @Override
public final Graphics create() {
throw new UnsupportedOperationException();
}
@@ -107,6 +108,7 @@ public abstract class J3DGraphics2D extends Graphics2D {
*
* @see Canvas3D#getGraphics2D
*/
+ @Override
public final Graphics create(int x, int y, int width, int height) {
throw new UnsupportedOperationException();
}
@@ -122,6 +124,7 @@ public abstract class J3DGraphics2D extends Graphics2D {
* @see GraphicsContext3D#setBackground
* @see GraphicsContext3D#clear
*/
+ @Override
public final void setBackground(Color color) {
throw new UnsupportedOperationException();
}
@@ -137,6 +140,7 @@ public abstract class J3DGraphics2D extends Graphics2D {
* @see GraphicsContext3D#getBackground
* @see GraphicsContext3D#clear
*/
+ @Override
public final Color getBackground() {
throw new UnsupportedOperationException();
}
@@ -152,6 +156,7 @@ public abstract class J3DGraphics2D extends Graphics2D {
* @see GraphicsContext3D#setBackground
* @see GraphicsContext3D#clear
*/
+ @Override
public final void clearRect(int x, int y, int width, int height) {
throw new UnsupportedOperationException();
}
diff --git a/src/classes/share/javax/media/j3d/J3DGraphics2DImpl.java b/src/classes/share/javax/media/j3d/J3DGraphics2DImpl.java
index bd4a9b4..0d55383 100644
--- a/src/classes/share/javax/media/j3d/J3DGraphics2DImpl.java
+++ b/src/classes/share/javax/media/j3d/J3DGraphics2DImpl.java
@@ -153,6 +153,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
* @param wait flag indicating whether or not to wait for the
* rendering to be complete before returning from this call.
*/
+ @Override
public void flush(boolean waiting) {
if (hasBeenDisposed) {
@@ -452,79 +453,98 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
}
// Implementation of Graphics2D methods
+ @Override
public final void clip(Shape s) {
offScreenGraphics2D.clip(s);
}
+ @Override
public FontMetrics getFontMetrics() {
return offScreenGraphics2D.getFontMetrics();
}
+ @Override
public Rectangle getClipBounds(Rectangle r) {
return offScreenGraphics2D.getClipBounds(r);
}
+ @Override
public Rectangle getClipRect() {
return offScreenGraphics2D.getClipRect();
}
+ @Override
public String toString() {
return offScreenGraphics2D.toString();
}
+ @Override
public final AffineTransform getTransform() {
return offScreenGraphics2D.getTransform();
}
+ @Override
public final Color getColor() {
return offScreenGraphics2D.getColor();
}
+ @Override
public final Composite getComposite() {
return offScreenGraphics2D.getComposite();
}
+ @Override
public final Font getFont() {
return offScreenGraphics2D.getFont();
}
+ @Override
public final FontMetrics getFontMetrics(Font f) {
return offScreenGraphics2D.getFontMetrics(f);
}
+ @Override
public final FontRenderContext getFontRenderContext() {
return offScreenGraphics2D.getFontRenderContext();
}
+ @Override
public final GraphicsConfiguration getDeviceConfiguration() {
return offScreenGraphics2D.getDeviceConfiguration();
}
+ @Override
public final Object getRenderingHint(Key hintKey) {
return offScreenGraphics2D.getRenderingHint(hintKey);
}
+ @Override
public final Paint getPaint() {
return offScreenGraphics2D.getPaint();
}
+ @Override
public final Rectangle getClipBounds() {
return offScreenGraphics2D.getClipBounds();
}
+ @Override
public final RenderingHints getRenderingHints() {
return offScreenGraphics2D.getRenderingHints();
}
+ @Override
public final Shape getClip() {
return offScreenGraphics2D.getClip();
}
+ @Override
public final Stroke getStroke() {
return offScreenGraphics2D.getStroke();
}
+ @Override
public final boolean drawImage(Image img, AffineTransform xform,
ImageObserver obs) {
@@ -532,6 +552,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
return offScreenGraphics2D.drawImage(img, xform, obs);
}
+ @Override
public final void drawImage(BufferedImage img, BufferedImageOp op,
int x, int y) {
if (op != null) {
@@ -541,6 +562,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
offScreenGraphics2D.drawImage(img, null, x, y);
}
+ @Override
public final boolean drawImage(Image img,
int x, int y,
ImageObserver observer) {
@@ -551,6 +573,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
return offScreenGraphics2D.drawImage(img, x, y, observer);
}
+ @Override
public final boolean drawImage(Image img, int x, int y,
int width, int height,
ImageObserver observer) {
@@ -559,6 +582,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
observer);
}
+ @Override
public final boolean drawImage(Image img, int x, int y,
int width, int height,
Color bgcolor,
@@ -577,6 +601,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
sx2, sy2, observer);
}
+ @Override
public final boolean drawImage(Image img,
int dx1, int dy1, int dx2, int dy2,
int sx1, int sy1, int sx2, int sy2,
@@ -586,6 +611,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
sx2, sy2, observer);
}
+ @Override
public final boolean drawImage(Image img,
int dx1, int dy1, int dx2, int dy2,
int sx1, int sy1, int sx2, int sy2,
@@ -596,6 +622,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
sx2, sy2, bgcolor, observer);
}
+ @Override
public final boolean drawImage(Image img, int x, int y,
Color bgcolor,
ImageObserver observer) {
@@ -603,24 +630,29 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
return offScreenGraphics2D.drawImage(img, x, y, bgcolor, observer);
}
+ @Override
public final boolean hit(Rectangle rect, Shape s, boolean onStroke) {
return offScreenGraphics2D.hit(rect, s, onStroke);
}
+ @Override
public final void addRenderingHints(Map hints) {
offScreenGraphics2D.addRenderingHints(hints);
}
+ @Override
public final void clipRect(int x, int y, int width, int height) {
offScreenGraphics2D.clipRect(x, y, width, height);
}
+ @Override
public final void copyArea(int x, int y, int width, int height,
int dx, int dy) {
validate(x+dx, y+dy, x+dx+width, y+dy+height);
offScreenGraphics2D.copyArea(x, y, width, height, dx, dy);
}
+ @Override
public final void draw(Shape s) {
Rectangle rect = s.getBounds();
validate(rect.x, rect.y,
@@ -629,6 +661,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
offScreenGraphics2D.draw(s);
}
+ @Override
public final void drawArc(int x, int y, int width, int height,
int startAngle, int arcAngle) {
// XXXX: call validate with bounding box of primitive
@@ -636,12 +669,14 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
offScreenGraphics2D.drawArc(x, y, width, height, startAngle, arcAngle);
}
+ @Override
public final void drawGlyphVector(GlyphVector g, float x, float y) {
// XXXX: call validate with bounding box of primitive
validate();
offScreenGraphics2D.drawGlyphVector(g, x, y);
}
+ @Override
public final void drawLine(int x1, int y1, int x2, int y2) {
int minx, miny, maxx, maxy;
if (!strokeSet) {
@@ -668,12 +703,14 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
offScreenGraphics2D.drawLine(x1, y1, x2, y2);
}
+ @Override
public final void drawOval(int x, int y, int width, int height) {
// XXXX: call validate with bounding box of primitive
validate();
offScreenGraphics2D.drawOval(x, y, width, height);
}
+ @Override
public final void drawPolygon(int xPoints[], int yPoints[],
int nPoints) {
// XXXX: call validate with bounding box of primitive
@@ -681,6 +718,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
offScreenGraphics2D.drawPolygon(xPoints, yPoints, nPoints);
}
+ @Override
public final void drawPolyline(int xPoints[], int yPoints[],
int nPoints) {
// XXXX: call validate with bounding box of primitive
@@ -688,6 +726,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
offScreenGraphics2D.drawPolyline(xPoints, yPoints, nPoints);
}
+ @Override
public final void drawRenderableImage(RenderableImage img,
AffineTransform xform) {
@@ -695,12 +734,14 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
offScreenGraphics2D.drawRenderableImage(img, xform);
}
+ @Override
public final void drawRenderedImage(RenderedImage img,
AffineTransform xform) {
validate(0, 0, img.getWidth(), img.getHeight(), xform);
offScreenGraphics2D.drawRenderedImage(img, xform);
}
+ @Override
public final void drawRoundRect(int x, int y, int width, int height,
int arcWidth, int arcHeight) {
// XXXX: call validate with bounding box of primitive
@@ -709,6 +750,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
arcHeight);
}
+ @Override
public final void drawString(AttributedCharacterIterator iterator,
int x, int y) {
// XXXX: call validate with bounding box of primitive
@@ -716,6 +758,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
offScreenGraphics2D.drawString(iterator, x, y);
}
+ @Override
public final void drawString(AttributedCharacterIterator iterator,
float x, float y) {
// XXXX: call validate with bounding box of primitive
@@ -723,6 +766,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
offScreenGraphics2D.drawString(iterator, x, y);
}
+ @Override
public final void drawString(String s, float x, float y) {
TextLayout layout = new TextLayout(s, getFont(),
getFontRenderContext());
@@ -736,16 +780,19 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
}
+ @Override
public final void drawString(String s, int x, int y) {
drawString(s, (float) x, (float) y);
}
+ @Override
public final void fill(Shape s) {
Rectangle rect = s.getBounds();
validate(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
offScreenGraphics2D.fill(s);
}
+ @Override
public final void fillArc(int x, int y, int width, int height,
int startAngle, int arcAngle) {
// XXXX: call validate with bounding box of primitive
@@ -753,12 +800,14 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
offScreenGraphics2D.fillArc(x, y, width, height, startAngle, arcAngle);
}
+ @Override
public final void fillOval(int x, int y, int width, int height) {
// XXXX: call validate with bounding box of primitive
validate();
offScreenGraphics2D.fillOval(x, y, width, height);
}
+ @Override
public final void fillRoundRect(int x, int y, int width, int height,
int arcWidth, int arcHeight) {
// XXXX: call validate with bounding box of primitive
@@ -767,89 +816,110 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
arcHeight);
}
+ @Override
public final void rotate(double theta) {
offScreenGraphics2D.rotate(theta);
}
+ @Override
public final void rotate(double theta, double x, double y) {
offScreenGraphics2D.rotate(theta, x, y);
}
+ @Override
public final void scale(double sx, double sy) {
offScreenGraphics2D.scale(sx, sy);
}
+ @Override
public final void setClip(Shape clip) {
offScreenGraphics2D.setClip(clip);
}
+ @Override
public final void setClip(int x, int y, int width, int height) {
offScreenGraphics2D.setClip(x, y, width, height);
}
+ @Override
public final void setColor(Color c) {
offScreenGraphics2D.setColor(c);
}
+ @Override
public final void setComposite(Composite comp) {
offScreenGraphics2D.setComposite(comp);
}
+ @Override
public final void setFont(Font font) {
offScreenGraphics2D.setFont(font);
}
+ @Override
public final void setPaint( Paint paint ) {
offScreenGraphics2D.setPaint(paint);
}
+ @Override
public final void setPaintMode() {
xOrModeColor = null;
offScreenGraphics2D.setPaintMode();
}
+ @Override
public final void setRenderingHint(Key hintKey, Object hintValue) {
offScreenGraphics2D.setRenderingHint(hintKey, hintValue);
}
+ @Override
public final void setRenderingHints(Map hints) {
offScreenGraphics2D.setRenderingHints(hints);
}
+ @Override
public final void setStroke(Stroke s) {
strokeSet = (s != null);
offScreenGraphics2D.setStroke(s);
}
+ @Override
public final void setTransform(AffineTransform Tx) {
offScreenGraphics2D.setTransform(Tx);
}
+ @Override
public final void setXORMode(Color c1) {
xOrModeColor = c1;
offScreenGraphics2D.setXORMode(c1);
}
+ @Override
public final void shear(double shx, double shy) {
offScreenGraphics2D.shear(shx, shy);
}
+ @Override
public final void transform(AffineTransform Tx) {
offScreenGraphics2D.transform(Tx);
}
+ @Override
public final void translate(double tx, double ty) {
offScreenGraphics2D.translate(tx, ty);
}
+ @Override
public final void translate(int x, int y) {
offScreenGraphics2D.translate(x, y);
}
+ @Override
public boolean hitClip(int x, int y, int width, int height) {
return offScreenGraphics2D.hitClip(x, y, width, height);
}
+ @Override
public void draw3DRect(int x, int y, int width, int height,
boolean raised) {
// XXXX: call validate with bounding box of primitive
@@ -857,24 +927,28 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
offScreenGraphics2D.draw3DRect(x, y, width, height, raised);
}
+ @Override
public void drawBytes(byte data[], int offset, int length, int x, int y) {
// XXXX: call validate with bounding box of primitive
validate();
offScreenGraphics2D.drawBytes(data, offset, length, x, y);
}
+ @Override
public void drawChars(char data[], int offset, int length, int x, int y) {
// XXXX: call validate with bounding box of primitive
validate();
offScreenGraphics2D.drawChars(data, offset, length, x, y);
}
+ @Override
public void drawPolygon(Polygon p) {
// XXXX: call validate with bounding box of primitive
validate();
offScreenGraphics2D.drawPolygon(p);
}
+ @Override
public void drawRect(int x, int y, int width, int height) {
// XXXX: call validate with bounding box of primitive
// XXXX: need to consider Stroke width
@@ -882,6 +956,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
offScreenGraphics2D.drawRect(x, y, width, height);
}
+ @Override
public void fill3DRect(int x, int y, int width, int height,
boolean raised) {
// XXXX: call validate with bounding box of primitive
@@ -890,12 +965,14 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
offScreenGraphics2D.fill3DRect(x, y, width, height, raised);
}
+ @Override
public void fillPolygon(Polygon p) {
// XXXX: call validate with bounding box of primitive
validate();
offScreenGraphics2D.fillPolygon(p);
}
+ @Override
public final void fillPolygon(int xPoints[], int yPoints[],
int nPoints) {
// XXXX: call validate with bounding box of primitive
@@ -903,6 +980,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
offScreenGraphics2D.fillPolygon(xPoints, yPoints, nPoints);
}
+ @Override
public final void fillRect(int x, int y, int width, int height) {
// XXXX: call validate with bounding box of primitive
validate();
@@ -910,6 +988,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
}
// Issue 121 - release all resources, mark as disposed
+ @Override
public void dispose() {
// Issue 583 - do nothing if graphics has already been disposed
@@ -953,6 +1032,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
canvas3d.graphics2D = null;
}
+ @Override
public void drawAndFlushImage(BufferedImage img, int x, int y,
ImageObserver observer) {
diff --git a/src/classes/share/javax/media/j3d/J3dQueryProps.java b/src/classes/share/javax/media/j3d/J3dQueryProps.java
index 95f9560..ef639f1 100644
--- a/src/classes/share/javax/media/j3d/J3dQueryProps.java
+++ b/src/classes/share/javax/media/j3d/J3dQueryProps.java
@@ -58,6 +58,7 @@ class J3dQueryProps extends AbstractMap {
/**
* Gets value corresponding to specified key
*/
+ @Override
public Object get(Object key) {
return table.get(key);
}
@@ -65,6 +66,7 @@ class J3dQueryProps extends AbstractMap {
/**
* Returns true if the specified key is contained in this Map
*/
+ @Override
public boolean containsKey(Object key) {
return table.containsKey(key);
}
@@ -72,6 +74,7 @@ class J3dQueryProps extends AbstractMap {
/**
* Returns true if the specified value is contained in this Map
*/
+ @Override
public boolean containsValue(Object value) {
return table.containsValue(value);
}
@@ -79,6 +82,7 @@ class J3dQueryProps extends AbstractMap {
/**
* Returns a new Set object for the entries of this map
*/
+ @Override
public Set entrySet() {
if (entrySet == null)
entrySet = new EntrySet();
@@ -94,10 +98,12 @@ class J3dQueryProps extends AbstractMap {
private EntrySet() {
}
+ @Override
public int size() {
return table.size();
}
+ @Override
public Iterator iterator() {
return new MapIterator();
}
@@ -114,14 +120,17 @@ class J3dQueryProps extends AbstractMap {
i = table.entrySet().iterator();
}
+ @Override
public boolean hasNext() {
return i.hasNext();
}
+ @Override
public Object next() {
return i.next();
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
diff --git a/src/classes/share/javax/media/j3d/J3dThread.java b/src/classes/share/javax/media/j3d/J3dThread.java
index 71105ee..1d5b3a8 100644
--- a/src/classes/share/javax/media/j3d/J3dThread.java
+++ b/src/classes/share/javax/media/j3d/J3dThread.java
@@ -264,6 +264,7 @@ abstract class J3dThread extends Thread {
* This thread controls the syncing of all the canvases attached to
* this view.
*/
+ @Override
public void run() {
runMonitor(WAIT, 0, null);
while (running) {
diff --git a/src/classes/share/javax/media/j3d/JoglDrawingSurfaceObject.java b/src/classes/share/javax/media/j3d/JoglDrawingSurfaceObject.java
index 77c98ad..960e27a 100644
--- a/src/classes/share/javax/media/j3d/JoglDrawingSurfaceObject.java
+++ b/src/classes/share/javax/media/j3d/JoglDrawingSurfaceObject.java
@@ -37,17 +37,20 @@ class JoglDrawingSurfaceObject extends DrawingSurfaceObject {
// System.err.println("JoglDrawingSurfaceObject constructed");
}
+ @Override
synchronized boolean renderLock() {
// System.err.println("JoglDrawingSurfaceObject.renderLock()");
gotDsiLock = true;
return true;
}
+ @Override
synchronized void unLock() {
// System.err.println("JoglDrawingSurfaceObject.unLock()");
gotDsiLock = false;
}
+ @Override
synchronized void getDrawingSurfaceObjectInfo() {
// FIXME: we don't have all of the information we need here to
// create a GLDrawable for the Canvas3D, so for now, do nothing
@@ -68,6 +71,7 @@ class JoglDrawingSurfaceObject extends DrawingSurfaceObject {
*/
}
+ @Override
synchronized void invalidate() {
System.err.println("JoglDrawingSurfaceObject.invalidate()");
}
diff --git a/src/classes/share/javax/media/j3d/JoglGraphicsConfiguration.java b/src/classes/share/javax/media/j3d/JoglGraphicsConfiguration.java
index 868f3cc..d7dc3f1 100644
--- a/src/classes/share/javax/media/j3d/JoglGraphicsConfiguration.java
+++ b/src/classes/share/javax/media/j3d/JoglGraphicsConfiguration.java
@@ -76,49 +76,60 @@ class JoglGraphicsConfiguration extends GraphicsConfiguration {
return chosenIndex;
}
+ @Override
public BufferedImage createCompatibleImage(int width, int height) {
throw new RuntimeException("Unimplemented");
}
+ @Override
public BufferedImage createCompatibleImage(int width, int height,
int transparency) {
throw new RuntimeException("Unimplemented");
}
+ @Override
public VolatileImage createCompatibleVolatileImage(int width, int height) {
throw new RuntimeException("Unimplemented");
}
+ @Override
public VolatileImage createCompatibleVolatileImage(int width, int height, int transparency) {
throw new RuntimeException("Unimplemented");
}
+ @Override
public VolatileImage createCompatibleVolatileImage(int width, int height,
ImageCapabilities caps) throws AWTException {
throw new RuntimeException("Unimplemented");
}
+ @Override
public VolatileImage createCompatibleVolatileImage(int width, int height,
ImageCapabilities caps, int transparency) throws AWTException {
throw new RuntimeException("Unimplemented");
}
+ @Override
public Rectangle getBounds() {
return new Rectangle(0, 0, width, height);
}
+ @Override
public ColorModel getColorModel() {
throw new RuntimeException("Unimplemented");
}
+ @Override
public ColorModel getColorModel(int transparency) {
throw new RuntimeException("Unimplemented");
}
+ @Override
public AffineTransform getDefaultTransform() {
throw new RuntimeException("Unimplemented");
}
+ @Override
public GraphicsDevice getDevice() {
return device;
}
@@ -127,6 +138,7 @@ class JoglGraphicsConfiguration extends GraphicsConfiguration {
return awtGraphicsDevice;
}
+ @Override
public AffineTransform getNormalizingTransform() {
throw new RuntimeException("Unimplemented");
}
diff --git a/src/classes/share/javax/media/j3d/JoglPipeline.java b/src/classes/share/javax/media/j3d/JoglPipeline.java
index 86d7cb8..93703ed 100644
--- a/src/classes/share/javax/media/j3d/JoglPipeline.java
+++ b/src/classes/share/javax/media/j3d/JoglPipeline.java
@@ -108,6 +108,7 @@ class JoglPipeline extends Pipeline {
/**
* Initialize the pipeline
*/
+ @Override
void initialize(Pipeline.Type pipelineType) {
super.initialize(pipelineType);
@@ -127,6 +128,7 @@ class JoglPipeline extends Pipeline {
//
// used for GeometryArrays by Copy or interleaved
+ @Override
void execute(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale,
@@ -150,6 +152,7 @@ class JoglPipeline extends Pipeline {
}
// used by GeometryArray by Reference with java arrays
+ @Override
void executeVA(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale,
@@ -240,6 +243,7 @@ class JoglPipeline extends Pipeline {
}
// used by GeometryArray by Reference with NIO buffer
+ @Override
void executeVABuffer(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale,
@@ -345,6 +349,7 @@ class JoglPipeline extends Pipeline {
}
// used by GeometryArray by Reference in interleaved format with NIO buffer
+ @Override
void executeInterleavedBuffer(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale,
@@ -366,6 +371,7 @@ class JoglPipeline extends Pipeline {
null, varray, cdata, cdirty);
}
+ @Override
void setVertexFormat(Context ctx, GeometryArrayRetained geo,
int vformat, boolean useAlpha, boolean ignoreVertexColors) {
if (VERBOSE) System.err.println("JoglPipeline.setVertexFormat()");
@@ -400,6 +406,7 @@ class JoglPipeline extends Pipeline {
}
}
+ @Override
void disableGlobalAlpha(Context ctx, GeometryArrayRetained geo, int vformat,
boolean useAlpha, boolean ignoreVertexColors) {
if (VERBOSE) System.err.println("JoglPipeline.disableGlobalAlpha()");
@@ -416,6 +423,7 @@ class JoglPipeline extends Pipeline {
}
// used for GeometryArrays
+ @Override
void buildGA(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale, boolean updateAlpha,
@@ -863,6 +871,7 @@ class JoglPipeline extends Pipeline {
}
// used to Build Dlist GeometryArray by Reference with java arrays
+ @Override
void buildGAForByRef(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale, boolean updateAlpha,
@@ -1670,6 +1679,7 @@ class JoglPipeline extends Pipeline {
//
// by-copy or interleaved, by reference, Java arrays
+ @Override
void executeIndexedGeometry(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale,
@@ -1701,6 +1711,7 @@ class JoglPipeline extends Pipeline {
}
// interleaved, by reference, nio buffer
+ @Override
void executeIndexedGeometryBuffer(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale,
@@ -1729,6 +1740,7 @@ class JoglPipeline extends Pipeline {
}
// non interleaved, by reference, Java arrays
+ @Override
void executeIndexedGeometryVA(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale,
@@ -1821,6 +1833,7 @@ class JoglPipeline extends Pipeline {
}
// non interleaved, by reference, nio buffer
+ @Override
void executeIndexedGeometryVABuffer(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale,
@@ -1927,6 +1940,7 @@ class JoglPipeline extends Pipeline {
}
// by-copy geometry
+ @Override
void buildIndexedGeometry(Context absCtx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale, boolean updateAlpha,
@@ -2686,6 +2700,7 @@ class JoglPipeline extends Pipeline {
//
// Native method for readRaster
+ @Override
void readRaster(Context ctx,
int type, int xSrcOffset, int ySrcOffset,
int width, int height, int hCanvas,
@@ -2816,6 +2831,7 @@ class JoglPipeline extends Pipeline {
// ShaderAttributeValue methods
+ @Override
ShaderError setGLSLUniform1i(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -2826,6 +2842,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform1f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -2837,6 +2854,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform2i(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -2848,6 +2866,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform2f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -2859,6 +2878,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform3i(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -2870,6 +2890,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform3f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -2881,6 +2902,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform4i(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -2892,6 +2914,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform4f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -2903,6 +2926,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniformMatrix3f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -2916,6 +2940,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniformMatrix4f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -2931,6 +2956,7 @@ class JoglPipeline extends Pipeline {
// ShaderAttributeArray methods
+ @Override
ShaderError setGLSLUniform1iArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -2943,6 +2969,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform1fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -2955,6 +2982,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform2iArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -2967,6 +2995,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform2fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -2979,6 +3008,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform3iArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -2991,6 +3021,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform3fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -3003,6 +3034,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform4iArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -3015,6 +3047,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform4fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -3027,6 +3060,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniformMatrix3fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -3041,6 +3075,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniformMatrix4fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -3056,6 +3091,7 @@ class JoglPipeline extends Pipeline {
}
// interfaces for shader compilation, etc.
+ @Override
ShaderError createGLSLShader(Context ctx, int shaderType, ShaderId[] shaderId) {
if (VERBOSE) System.err.println("JoglPipeline.createGLSLShader()");
@@ -3076,6 +3112,7 @@ class JoglPipeline extends Pipeline {
shaderId[0] = new JoglShaderObject(shaderHandle);
return null;
}
+ @Override
ShaderError destroyGLSLShader(Context ctx, ShaderId shaderId) {
if (VERBOSE) System.err.println("JoglPipeline.destroyGLSLShader()");
@@ -3083,6 +3120,7 @@ class JoglPipeline extends Pipeline {
gl.glDeleteObjectARB(unbox(shaderId));
return null;
}
+ @Override
ShaderError compileGLSLShader(Context ctx, ShaderId shaderId, String program) {
if (VERBOSE) System.err.println("JoglPipeline.compileGLSLShader()");
@@ -3110,6 +3148,7 @@ class JoglPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError createGLSLShaderProgram(Context ctx, ShaderProgramId[] shaderProgramId) {
if (VERBOSE) System.err.println("JoglPipeline.createGLSLShaderProgram()");
@@ -3123,12 +3162,14 @@ class JoglPipeline extends Pipeline {
shaderProgramId[0] = new JoglShaderObject(shaderProgramHandle);
return null;
}
+ @Override
ShaderError destroyGLSLShaderProgram(Context ctx, ShaderProgramId shaderProgramId) {
if (VERBOSE) System.err.println("JoglPipeline.destroyGLSLShaderProgram()");
GL2 gl = context(ctx).getGL().getGL2();
gl.glDeleteObjectARB(unbox(shaderProgramId));
return null;
}
+ @Override
ShaderError linkGLSLShaderProgram(Context ctx, ShaderProgramId shaderProgramId,
ShaderId[] shaderIds) {
if (VERBOSE) System.err.println("JoglPipeline.linkGLSLShaderProgram()");
@@ -3150,6 +3191,7 @@ class JoglPipeline extends Pipeline {
}
return null;
}
+ @Override
ShaderError bindGLSLVertexAttrName(Context ctx, ShaderProgramId shaderProgramId,
String attrName, int attrIndex) {
if (VERBOSE) System.err.println("JoglPipeline.bindGLSLVertexAttrName()");
@@ -3160,6 +3202,7 @@ class JoglPipeline extends Pipeline {
attrName);
return null;
}
+ @Override
void lookupGLSLShaderAttrNames(Context ctx, ShaderProgramId shaderProgramId,
int numAttrNames, String[] attrNames, ShaderAttrLoc[] locArr,
int[] typeArr, int[] sizeArr, boolean[] isArrayArr) {
@@ -3241,6 +3284,7 @@ class JoglPipeline extends Pipeline {
}
}
+ @Override
ShaderError useGLSLShaderProgram(Context ctx, ShaderProgramId shaderProgramId) {
if (VERBOSE) System.err.println("JoglPipeline.useGLSLShaderProgram()");
@@ -3347,6 +3391,7 @@ class JoglPipeline extends Pipeline {
// ColoringAttributesRetained methods
//
+ @Override
void updateColoringAttributes(Context ctx,
float dRed, float dGreen, float dBlue,
float red, float green, float blue,
@@ -3380,6 +3425,7 @@ class JoglPipeline extends Pipeline {
//
private static final float[] black = new float[4];
+ @Override
void updateDirectionalLight(Context ctx,
int lightSlot, float red, float green,
float blue, float dirx, float diry, float dirz) {
@@ -3416,6 +3462,7 @@ class JoglPipeline extends Pipeline {
// PointLightRetained methods
//
+ @Override
void updatePointLight(Context ctx,
int lightSlot, float red, float green,
float blue, float attenx, float atteny, float attenz,
@@ -3452,6 +3499,7 @@ class JoglPipeline extends Pipeline {
// SpotLightRetained methods
//
+ @Override
void updateSpotLight(Context ctx,
int lightSlot, float red, float green,
float blue, float attenx, float atteny, float attenz,
@@ -3494,6 +3542,7 @@ class JoglPipeline extends Pipeline {
// ExponentialFogRetained methods
//
+ @Override
void updateExponentialFog(Context ctx,
float red, float green, float blue,
float density) {
@@ -3518,6 +3567,7 @@ class JoglPipeline extends Pipeline {
// LinearFogRetained methods
//
+ @Override
void updateLinearFog(Context ctx,
float red, float green, float blue,
double fdist, double bdist) {
@@ -3543,6 +3593,7 @@ class JoglPipeline extends Pipeline {
// LineAttributesRetained methods
//
+ @Override
void updateLineAttributes(Context ctx,
float lineWidth, int linePattern,
int linePatternMask,
@@ -3583,6 +3634,7 @@ class JoglPipeline extends Pipeline {
// MaterialRetained methods
//
+ @Override
void updateMaterial(Context ctx,
float red, float green, float blue, float alpha,
float aRed, float aGreen, float aBlue,
@@ -3647,6 +3699,7 @@ class JoglPipeline extends Pipeline {
// ModelClipRetained methods
//
+ @Override
void updateModelClip(Context ctx, int planeNum, boolean enableFlag,
double A, double B, double C, double D) {
if (VERBOSE) System.err.println("JoglPipeline.updateModelClip()");
@@ -3676,6 +3729,7 @@ class JoglPipeline extends Pipeline {
// PointAttributesRetained methods
//
+ @Override
void updatePointAttributes(Context ctx, float pointSize, boolean pointAntialiasing) {
if (VERBOSE) System.err.println("JoglPipeline.updatePointAttributes()");
@@ -3697,6 +3751,7 @@ class JoglPipeline extends Pipeline {
// PolygonAttributesRetained methods
//
+ @Override
void updatePolygonAttributes(Context ctx,
int polygonMode, int cullFace,
boolean backFaceNormalFlip,
@@ -3765,6 +3820,7 @@ class JoglPipeline extends Pipeline {
// RenderingAttributesRetained methods
//
+ @Override
void updateRenderingAttributes(Context ctx,
boolean depthBufferWriteEnableOverride,
boolean depthBufferEnableOverride,
@@ -3955,6 +4011,7 @@ class JoglPipeline extends Pipeline {
* trans contains eyeTovworld transform in d3d
* trans contains vworldToEye transform in ogl
*/
+ @Override
void updateTexCoordGeneration(Context ctx,
boolean enable, int genMode, int format,
float planeSx, float planeSy, float planeSz, float planeSw,
@@ -4312,6 +4369,7 @@ class JoglPipeline extends Pipeline {
blendFunctionTable[TransparencyAttributes.BLEND_CONSTANT_COLOR] = GL2.GL_CONSTANT_COLOR;
}
+ @Override
void updateTransparencyAttributes(Context ctx,
float alpha, int geometryType,
int polygonMode,
@@ -4352,6 +4410,7 @@ class JoglPipeline extends Pipeline {
// TextureAttributesRetained methods
//
+ @Override
void updateTextureAttributes(Context ctx,
double[] transform, boolean isIdentity, int textureMode,
int perspCorrectionMode,
@@ -4415,6 +4474,7 @@ class JoglPipeline extends Pipeline {
// }
}
+ @Override
void updateRegisterCombiners(Context absCtx,
double[] transform, boolean isIdentity, int textureMode,
int perspCorrectionMode,
@@ -4628,6 +4688,7 @@ class JoglPipeline extends Pipeline {
// GL_SGI_texture_color_table
}
+ @Override
void updateTextureColorTable(Context ctx, int numComponents,
int colorTableSize,
int[] textureColorTable) {
@@ -4647,6 +4708,7 @@ class JoglPipeline extends Pipeline {
// }
}
+ @Override
void updateCombiner(Context ctx,
int combineRgbMode, int combineAlphaMode,
int[] combineRgbSrc, int[] combineAlphaSrc,
@@ -4832,6 +4894,7 @@ class JoglPipeline extends Pipeline {
// TextureUnitStateRetained methods
//
+ @Override
void updateTextureUnitState(Context ctx, int index, boolean enable) {
if (VERBOSE) System.err.println("JoglPipeline.updateTextureUnitState()");
@@ -4868,6 +4931,7 @@ class JoglPipeline extends Pipeline {
// Texture2DRetained methods
//
+ @Override
void bindTexture2D(Context ctx, int objectId, boolean enable) {
if (VERBOSE) System.err.println("JoglPipeline.bindTexture2D(objectId=" + objectId + ",enable=" + enable + ")");
@@ -4883,6 +4947,7 @@ class JoglPipeline extends Pipeline {
}
}
+ @Override
void updateTexture2DImage(Context ctx,
int numLevels, int level,
int textureFormat, int imageFormat,
@@ -4896,6 +4961,7 @@ class JoglPipeline extends Pipeline {
width, height, boundaryWidth, dataType, data, useAutoMipMap);
}
+ @Override
void updateTexture2DSubImage(Context ctx,
int level, int xoffset, int yoffset,
int textureFormat, int imageFormat,
@@ -4914,6 +4980,7 @@ class JoglPipeline extends Pipeline {
dataType, data);
}
+ @Override
void updateTexture2DLodRange(Context ctx,
int baseLevel, int maximumLevel,
float minimumLOD, float maximumLOD) {
@@ -4924,6 +4991,7 @@ class JoglPipeline extends Pipeline {
minimumLOD, maximumLOD);
}
+ @Override
void updateTexture2DLodOffset(Context ctx,
float lodOffsetS, float lodOffsetT,
float lodOffsetR) {
@@ -4933,6 +5001,7 @@ class JoglPipeline extends Pipeline {
lodOffsetS, lodOffsetT, lodOffsetR);
}
+ @Override
void updateTexture2DBoundary(Context ctx,
int boundaryModeS, int boundaryModeT,
float boundaryRed, float boundaryGreen,
@@ -4945,6 +5014,7 @@ class JoglPipeline extends Pipeline {
boundaryBlue, boundaryAlpha);
}
+ @Override
void updateTexture2DFilterModes(Context ctx,
int minFilter, int magFilter) {
if (VERBOSE) System.err.println("JoglPipeline.updateTexture2DFilterModes()");
@@ -4952,6 +5022,7 @@ class JoglPipeline extends Pipeline {
updateTextureFilterModes(ctx, GL.GL_TEXTURE_2D, minFilter, magFilter);
}
+ @Override
void updateTexture2DSharpenFunc(Context ctx,
int numSharpenTextureFuncPts,
float[] sharpenTextureFuncPts) {
@@ -4961,6 +5032,7 @@ class JoglPipeline extends Pipeline {
numSharpenTextureFuncPts, sharpenTextureFuncPts);
}
+ @Override
void updateTexture2DFilter4Func(Context ctx,
int numFilter4FuncPts,
float[] filter4FuncPts) {
@@ -4970,6 +5042,7 @@ class JoglPipeline extends Pipeline {
numFilter4FuncPts, filter4FuncPts);
}
+ @Override
void updateTexture2DAnisotropicFilter(Context ctx, float degree) {
if (VERBOSE) System.err.println("JoglPipeline.updateTexture2DAnisotropicFilter()");
@@ -5017,6 +5090,7 @@ class JoglPipeline extends Pipeline {
// Texture3DRetained methods
//
+ @Override
void bindTexture3D(Context ctx, int objectId, boolean enable) {
if (VERBOSE) System.err.println("JoglPipeline.bindTexture3D()");
@@ -5032,6 +5106,7 @@ class JoglPipeline extends Pipeline {
}
}
+ @Override
void updateTexture3DImage(Context ctx,
int numLevels, int level,
int textureFormat, int imageFormat,
@@ -5193,6 +5268,7 @@ class JoglPipeline extends Pipeline {
}
}
+ @Override
void updateTexture3DSubImage(Context ctx,
int level,
int xoffset, int yoffset, int zoffset,
@@ -5379,6 +5455,7 @@ class JoglPipeline extends Pipeline {
}
+ @Override
void updateTexture3DLodRange(Context ctx,
int baseLevel, int maximumLevel,
float minimumLod, float maximumLod) {
@@ -5389,6 +5466,7 @@ class JoglPipeline extends Pipeline {
minimumLod, maximumLod);
}
+ @Override
void updateTexture3DLodOffset(Context ctx,
float lodOffsetS, float lodOffsetT,
float lodOffsetR) {
@@ -5398,6 +5476,7 @@ class JoglPipeline extends Pipeline {
lodOffsetS, lodOffsetT, lodOffsetR);
}
+ @Override
void updateTexture3DBoundary(Context ctx,
int boundaryModeS, int boundaryModeT,
int boundaryModeR, float boundaryRed,
@@ -5411,6 +5490,7 @@ class JoglPipeline extends Pipeline {
boundaryBlue, boundaryAlpha);
}
+ @Override
void updateTexture3DFilterModes(Context ctx,
int minFilter, int magFilter) {
if (VERBOSE) System.err.println("JoglPipeline.updateTexture3DFilterModes()");
@@ -5419,6 +5499,7 @@ class JoglPipeline extends Pipeline {
minFilter, magFilter);
}
+ @Override
void updateTexture3DSharpenFunc(Context ctx,
int numSharpenTextureFuncPts,
float[] sharpenTextureFuncPts) {
@@ -5428,6 +5509,7 @@ class JoglPipeline extends Pipeline {
numSharpenTextureFuncPts, sharpenTextureFuncPts);
}
+ @Override
void updateTexture3DFilter4Func(Context ctx,
int numFilter4FuncPts,
float[] filter4FuncPts) {
@@ -5437,6 +5519,7 @@ class JoglPipeline extends Pipeline {
numFilter4FuncPts, filter4FuncPts);
}
+ @Override
void updateTexture3DAnisotropicFilter(Context ctx, float degree) {
if (VERBOSE) System.err.println("JoglPipeline.updateTexture3DAnisotropicFilter()");
@@ -5450,6 +5533,7 @@ class JoglPipeline extends Pipeline {
// TextureCubeMapRetained methods
//
+ @Override
void bindTextureCubeMap(Context ctx, int objectId, boolean enable) {
if (VERBOSE) System.err.println("JoglPipeline.bindTextureCubeMap()");
@@ -5464,6 +5548,7 @@ class JoglPipeline extends Pipeline {
}
}
+ @Override
void updateTextureCubeMapImage(Context ctx,
int face, int numLevels, int level,
int textureFormat, int imageFormat,
@@ -5477,6 +5562,7 @@ class JoglPipeline extends Pipeline {
width, height, boundaryWidth, dataType, data, useAutoMipMap);
}
+ @Override
void updateTextureCubeMapSubImage(Context ctx,
int face, int level, int xoffset, int yoffset,
int textureFormat,int imageFormat,
@@ -5494,6 +5580,7 @@ class JoglPipeline extends Pipeline {
width, height, dataType, data);
}
+ @Override
void updateTextureCubeMapLodRange(Context ctx,
int baseLevel, int maximumLevel,
float minimumLod, float maximumLod) {
@@ -5505,6 +5592,7 @@ class JoglPipeline extends Pipeline {
minimumLod, maximumLod);
}
+ @Override
void updateTextureCubeMapLodOffset(Context ctx,
float lodOffsetS, float lodOffsetT,
float lodOffsetR) {
@@ -5515,6 +5603,7 @@ class JoglPipeline extends Pipeline {
lodOffsetS, lodOffsetT, lodOffsetR);
}
+ @Override
void updateTextureCubeMapBoundary(Context ctx,
int boundaryModeS, int boundaryModeT,
float boundaryRed, float boundaryGreen,
@@ -5528,6 +5617,7 @@ class JoglPipeline extends Pipeline {
boundaryBlue, boundaryAlpha);
}
+ @Override
void updateTextureCubeMapFilterModes(Context ctx,
int minFilter, int magFilter) {
if (VERBOSE) System.err.println("JoglPipeline.updateTextureCubeMapFilterModes()");
@@ -5537,6 +5627,7 @@ class JoglPipeline extends Pipeline {
minFilter, magFilter);
}
+ @Override
void updateTextureCubeMapSharpenFunc(Context ctx,
int numSharpenTextureFuncPts,
float[] sharpenTextureFuncPts) {
@@ -5547,6 +5638,7 @@ class JoglPipeline extends Pipeline {
numSharpenTextureFuncPts, sharpenTextureFuncPts);
}
+ @Override
void updateTextureCubeMapFilter4Func(Context ctx,
int numFilter4FuncPts,
float[] filter4FuncPts) {
@@ -5557,6 +5649,7 @@ class JoglPipeline extends Pipeline {
numFilter4FuncPts, filter4FuncPts);
}
+ @Override
void updateTextureCubeMapAnisotropicFilter(Context ctx, float degree) {
if (VERBOSE) System.err.println("JoglPipeline.updateTextureCubeMapAnisotropicFilter()");
@@ -6142,6 +6235,7 @@ class JoglPipeline extends Pipeline {
//
// Maximum lights supported by the native API
+ @Override
int getMaximumLights() {
if (VERBOSE) System.err.println("JoglPipeline.getMaximumLights()");
@@ -6159,6 +6253,7 @@ class JoglPipeline extends Pipeline {
// Mac/JRE 7; called from Renderer when resizing is dedected
// Implementation follows the approach in jogamp.opengl.GLDrawableHelper.resizeOffscreenDrawable(..)
+ @Override
void resizeOffscreenLayer(Canvas3D cv, int cvWidth, int cvHeight) {
if (!isOffscreenLayerSurfaceEnabled(cv))
return;
@@ -6257,6 +6352,7 @@ class JoglPipeline extends Pipeline {
}
// This is the native method for creating the underlying graphics context.
+ @Override
Context createNewContext(Canvas3D cv, Drawable drawable,
Context shareCtx, boolean isSharedCtx,
boolean offScreen) {
@@ -6399,6 +6495,7 @@ class JoglPipeline extends Pipeline {
return ctx;
}
+ @Override
void createQueryContext(Canvas3D cv, Drawable drawable,
boolean offScreen, int width, int height) {
if (VERBOSE) System.err.println("JoglPipeline.createQueryContext()");
@@ -6469,6 +6566,7 @@ class JoglPipeline extends Pipeline {
}
// This is the native for creating an offscreen buffer
+ @Override
Drawable createOffScreenBuffer(Canvas3D cv, Context ctx, int width, int height) {
if (VERBOSE) System.err.println("JoglPipeline.createOffScreenBuffer()");
@@ -6526,6 +6624,7 @@ class JoglPipeline extends Pipeline {
}
// 'destroyContext' is called first if context exists
+ @Override
void destroyOffScreenBuffer(Canvas3D cv, Context ctx, Drawable drawable) {
if (VERBOSE) System.err.println("JoglPipeline.destroyOffScreenBuffer()");
@@ -6533,6 +6632,7 @@ class JoglPipeline extends Pipeline {
}
// This is the native for reading the image from the offscreen buffer
+ @Override
void readOffScreenBuffer(Canvas3D cv, Context ctx, int format, int dataType, Object data, int width, int height) {
if (VERBOSE) System.err.println("JoglPipeline.readOffScreenBuffer()");
@@ -6664,6 +6764,7 @@ class JoglPipeline extends Pipeline {
}
// The native method for swapBuffers - onscreen only
+@Override
void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
if (VERBOSE) System.err.println("JoglPipeline.swapBuffers()");
GLDrawable draw = drawable(drawable);
@@ -6671,6 +6772,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for setting Material when no material is present
+ @Override
void updateMaterialColor(Context ctx, float r, float g, float b, float a) {
if (VERBOSE) System.err.println("JoglPipeline.updateMaterialColor()");
@@ -6679,6 +6781,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
gl.glDisable(GL2.GL_LIGHTING);
}
+ @Override
void destroyContext(Drawable drawable, Context ctx) {
if (VERBOSE) System.err.println("JoglPipeline.destroyContext()");
@@ -6697,6 +6800,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// This is the native method for doing accumulation.
+ @Override
void accum(Context ctx, float value) {
if (VERBOSE) System.err.println("JoglPipeline.accum()");
@@ -6707,6 +6811,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// This is the native method for doing accumulation return.
+ @Override
void accumReturn(Context ctx) {
if (VERBOSE) System.err.println("JoglPipeline.accumReturn()");
@@ -6715,6 +6820,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// This is the native method for clearing the accumulation buffer.
+ @Override
void clearAccum(Context ctx) {
if (VERBOSE) System.err.println("JoglPipeline.clearAccum()");
@@ -6724,6 +6830,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
// This is the native method for getting the number of lights the underlying
// native library can support.
+ @Override
int getNumCtxLights(Context ctx) {
if (VERBOSE) System.err.println("JoglPipeline.getNumCtxLights()");
@@ -6734,6 +6841,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// Native method for decal 1st child setup
+ @Override
boolean decal1stChildSetup(Context ctx) {
if (VERBOSE) System.err.println("JoglPipeline.decal1stChildSetup()");
@@ -6750,6 +6858,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// Native method for decal nth child setup
+ @Override
void decalNthChildSetup(Context ctx) {
if (VERBOSE) System.err.println("JoglPipeline.decalNthChildSetup()");
@@ -6760,6 +6869,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// Native method for decal reset
+ @Override
void decalReset(Context ctx, boolean depthBufferEnable) {
if (VERBOSE) System.err.println("JoglPipeline.decalReset()");
@@ -6770,6 +6880,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// Native method for eye lighting
+ @Override
void ctxUpdateEyeLightingEnable(Context ctx, boolean localEyeLightingEnable) {
if (VERBOSE) System.err.println("JoglPipeline.ctxUpdateEyeLightingEnable()");
@@ -6785,6 +6896,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
// The following three methods are used in multi-pass case
// native method for setting blend color
+ @Override
void setBlendColor(Context ctx, float red, float green,
float blue, float alpha) {
if (VERBOSE) System.err.println("JoglPipeline.setBlendColor()");
@@ -6796,6 +6908,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for setting blend func
+ @Override
void setBlendFunc(Context ctx, int srcBlendFunction, int dstBlendFunction) {
if (VERBOSE) System.err.println("JoglPipeline.setBlendFunc()");
@@ -6806,6 +6919,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for setting fog enable flag
+ @Override
void setFogEnableFlag(Context ctx, boolean enable) {
if (VERBOSE) System.err.println("JoglPipeline.setFogEnableFlag()");
@@ -6818,6 +6932,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// Setup the full scene antialising in D3D and ogl when GL_ARB_multisamle supported
+ @Override
void setFullSceneAntialiasing(Context absCtx, boolean enable) {
if (VERBOSE) System.err.println("JoglPipeline.setFullSceneAntialiasing()");
@@ -6832,6 +6947,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
}
+ @Override
void setGlobalAlpha(Context ctx, float alpha) {
if (VERBOSE) System.err.println("JoglPipeline.setGlobalAlpha()");
// FIXME: SUN_global_alpha
@@ -6843,6 +6959,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// Native method to update separate specular color control
+ @Override
void updateSeparateSpecularColorEnable(Context ctx, boolean enable) {
if (VERBOSE) System.err.println("JoglPipeline.updateSeparateSpecularColorEnable()");
@@ -6857,6 +6974,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
// True under Solaris,
// False under windows when display mode <= 8 bit
+ @Override
boolean validGraphicsMode() {
if (VERBOSE) System.err.println("JoglPipeline.validGraphicsMode()");
@@ -6876,6 +6994,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for setting light enables
+ @Override
void setLightEnables(Context ctx, long enableMask, int maxLights) {
if (VERBOSE) System.err.println("JoglPipeline.setLightEnables()");
@@ -6891,6 +7010,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for setting scene ambient
+ @Override
void setSceneAmbient(Context ctx, float red, float green, float blue) {
if (VERBOSE) System.err.println("JoglPipeline.setSceneAmbient()");
@@ -6905,6 +7025,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for disabling fog
+ @Override
void disableFog(Context ctx) {
if (VERBOSE) System.err.println("JoglPipeline.disableFog()");
@@ -6913,6 +7034,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for disabling modelClip
+ @Override
void disableModelClip(Context ctx) {
if (VERBOSE) System.err.println("JoglPipeline.disableModelClip()");
@@ -6927,6 +7049,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for setting default RenderingAttributes
+ @Override
void resetRenderingAttributes(Context ctx,
boolean depthBufferWriteEnableOverride,
boolean depthBufferEnableOverride) {
@@ -6947,6 +7070,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for setting default texture
+ @Override
void resetTextureNative(Context ctx, int texUnitIndex) {
if (VERBOSE) System.err.println("JoglPipeline.resetTextureNative()");
@@ -6964,6 +7088,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for activating a particular texture unit
+ @Override
void activeTextureUnit(Context ctx, int texUnitIndex) {
if (VERBOSE) System.err.println("JoglPipeline.activeTextureUnit()");
@@ -6975,6 +7100,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for setting default TexCoordGeneration
+ @Override
void resetTexCoordGeneration(Context ctx) {
if (VERBOSE) System.err.println("JoglPipeline.resetTexCoordGeneration()");
@@ -6986,6 +7112,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for setting default TextureAttributes
+ @Override
void resetTextureAttributes(Context ctx) {
if (VERBOSE) System.err.println("JoglPipeline.resetTextureAttributes()");
@@ -7013,6 +7140,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for setting default PolygonAttributes
+ @Override
void resetPolygonAttributes(Context ctx) {
if (VERBOSE) System.err.println("JoglPipeline.resetPolygonAttributes()");
@@ -7032,6 +7160,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for setting default LineAttributes
+ @Override
void resetLineAttributes(Context ctx) {
if (VERBOSE) System.err.println("JoglPipeline.resetLineAttributes()");
@@ -7044,6 +7173,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for setting default PointAttributes
+ @Override
void resetPointAttributes(Context ctx) {
if (VERBOSE) System.err.println("JoglPipeline.resetPointAttributes()");
@@ -7055,6 +7185,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for setting default TransparencyAttributes
+ @Override
void resetTransparency(Context ctx, int geometryType,
int polygonMode, boolean lineAA,
boolean pointAA) {
@@ -7077,6 +7208,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// native method for setting default ColoringAttributes
+ @Override
void resetColoringAttributes(Context ctx,
float r, float g,
float b, float a,
@@ -7095,6 +7227,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
* This native method makes sure that the rendering for this canvas
* gets done now.
*/
+ @Override
void syncRender(Context ctx, boolean wait) {
if (VERBOSE) System.err.println("JoglPipeline.syncRender()");
@@ -7107,6 +7240,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// The native method that sets this ctx to be the current one
+ @Override
boolean useCtx(Context ctx, Drawable drawable) {
if (VERBOSE) System.err.println("JoglPipeline.useCtx()");
GLContext context = context(ctx);
@@ -7115,6 +7249,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// Optionally release the context. Returns true if the context was released.
+ @Override
boolean releaseCtx(Context ctx) {
if (VERBOSE) System.err.println("JoglPipeline.releaseCtx()");
GLContext context = context(ctx);
@@ -7122,6 +7257,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
return true;
}
+ @Override
void clear(Context ctx, float r, float g, float b, boolean clearStencil) {
if (VERBOSE) System.err.println("JoglPipeline.clear()");
@@ -7171,6 +7307,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
+ @Override
void textureFillBackground(Context ctx, float texMinU, float texMaxU, float texMinV, float texMaxV,
float mapMinX, float mapMaxX, float mapMinY, float mapMaxY, boolean useBilinearFilter) {
if (VERBOSE) System.err.println("JoglPipeline.textureFillBackground()");
@@ -7223,6 +7360,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
+ @Override
void textureFillRaster(Context ctx, float texMinU, float texMaxU, float texMinV, float texMaxV,
float mapMinX, float mapMaxX, float mapMinY, float mapMaxY, float mapZ, float alpha,
boolean useBilinearFilter) {
@@ -7278,6 +7416,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
+ @Override
void executeRasterDepth(Context ctx, float posX, float posY, float posZ,
int srcOffsetX, int srcOffsetY, int rasterWidth, int rasterHeight,
int depthWidth, int depthHeight, int depthFormat, Object depthData) {
@@ -7341,6 +7480,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// The native method for setting the ModelView matrix.
+ @Override
void setModelViewMatrix(Context ctx, double[] viewMatrix, double[] modelMatrix) {
if (VERBOSE) System.err.println("JoglPipeline.setModelViewMatrix()");
GLContext context = context(ctx);
@@ -7362,6 +7502,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
}
// The native method for setting the Projection matrix.
+ @Override
void setProjectionMatrix(Context ctx, double[] projMatrix) {
if (VERBOSE) System.err.println("JoglPipeline.setProjectionMatrix()");
GLContext context = context(ctx);
@@ -7421,6 +7562,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
// The native method for setting the Viewport.
+ @Override
void setViewport(Context ctx, int x, int y, int width, int height) {
if (VERBOSE) System.err.println("JoglPipeline.setViewport()");
GL gl = context(ctx).getGL();
@@ -7428,6 +7570,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
}
// used for display Lists
+ @Override
void newDisplayList(Context ctx, int displayListId) {
if (VERBOSE) System.err.println("JoglPipeline.newDisplayList()");
if (displayListId <= 0) {
@@ -7438,6 +7581,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
gl.glNewList(displayListId, GL2.GL_COMPILE);
}
+ @Override
void endDisplayList(Context ctx) {
if (VERBOSE) System.err.println("JoglPipeline.endDisplayList()");
GL2 gl = context(ctx).getGL().getGL2();
@@ -7445,6 +7589,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
}
int numInvalidLists = 0;
+ @Override
void callDisplayList(Context ctx, int id, boolean isNonUniformScale) {
if (VERBOSE) System.err.println("JoglPipeline.callDisplayList()");
if (id <= 0) {
@@ -7472,6 +7617,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
}
}
+ @Override
void freeDisplayList(Context ctx, int id) {
if (VERBOSE) System.err.println("JoglPipeline.freeDisplayList()");
if (id <= 0) {
@@ -7482,6 +7628,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
gl.glDeleteLists(id, 1);
}
+ @Override
void freeTexture(Context ctx, int id) {
if (VERBOSE) System.err.println("JoglPipeline.freeTexture()");
@@ -7496,6 +7643,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
}
}
+ @Override
int generateTexID(Context ctx) {
if (VERBOSE) System.err.println("JoglPipeline.generateTexID()");
@@ -7509,6 +7657,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
return tmp[0];
}
+ @Override
void texturemapping(Context ctx,
int px, int py,
int minX, int minY, int maxX, int maxY,
@@ -7603,6 +7752,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
gl.glPopAttrib();
}
+ @Override
boolean initTexturemapping(Context ctx, int texWidth,
int texHeight, int objectId) {
if (VERBOSE) System.err.println("JoglPipeline.initTexturemapping()");
@@ -7637,6 +7787,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
// stereo is available before setting the mode to FIELD_LEFT or
// FIELD_RIGHT. The boolean isTRUE for double buffered mode, FALSE
// foe single buffering.
+ @Override
void setRenderMode(Context ctx, int mode, boolean doubleBuffer) {
if (VERBOSE) System.err.println("JoglPipeline.setRenderMode()");
@@ -7674,6 +7825,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
}
// Set glDepthMask.
+ @Override
void setDepthBufferWriteEnable(Context ctx, boolean mode) {
if (VERBOSE) System.err.println("JoglPipeline.setDepthBufferWriteEnable()");
@@ -8136,6 +8288,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
// GraphicsConfigTemplate3D.
// This method must return a valid GraphicsConfig, or else it must throw
// an exception if one cannot be returned.
+ @Override
GraphicsConfiguration getGraphicsConfig(GraphicsConfiguration gconfig) {
if (VERBOSE) System.err.println("JoglPipeline.getGraphicsConfig()");
@@ -8146,6 +8299,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
}
// Get best graphics config from pipeline
+ @Override
GraphicsConfiguration getBestConfiguration(GraphicsConfigTemplate3D gct,
GraphicsConfiguration[] gc) {
if (VERBOSE) System.err.println("JoglPipeline.getBestConfiguration()");
@@ -8296,6 +8450,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
}
// Determine whether specified graphics config is supported by pipeline
+ @Override
boolean isGraphicsConfigSupported(GraphicsConfigTemplate3D gct,
GraphicsConfiguration gc) {
if (VERBOSE) System.err.println("JoglPipeline.isGraphicsConfigSupported()");
@@ -8320,24 +8475,28 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
}
// Methods to get actual capabilities from Canvas3D
+ @Override
boolean hasDoubleBuffer(Canvas3D cv) {
if (VERBOSE) System.err.println("JoglPipeline.hasDoubleBuffer()");
if (VERBOSE) System.err.println(" Returning " + caps(cv).getDoubleBuffered());
return caps(cv).getDoubleBuffered();
}
+ @Override
boolean hasStereo(Canvas3D cv) {
if (VERBOSE) System.err.println("JoglPipeline.hasStereo()");
if (VERBOSE) System.err.println(" Returning " + caps(cv).getStereo());
return caps(cv).getStereo();
}
+ @Override
int getStencilSize(Canvas3D cv) {
if (VERBOSE) System.err.println("JoglPipeline.getStencilSize()");
if (VERBOSE) System.err.println(" Returning " + caps(cv).getStencilBits());
return caps(cv).getStencilBits();
}
+ @Override
boolean hasSceneAntialiasingMultisample(Canvas3D cv) {
if (VERBOSE) System.err.println("JoglPipeline.hasSceneAntialiasingMultisample()");
if (VERBOSE) System.err.println(" Returning " + caps(cv).getSampleBuffers());
@@ -8345,6 +8504,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
return caps(cv).getSampleBuffers();
}
+ @Override
boolean hasSceneAntialiasingAccum(Canvas3D cv) {
if (VERBOSE) System.err.println("JoglPipeline.hasSceneAntialiasingAccum()");
GLCapabilities caps = caps(cv);
@@ -8358,6 +8518,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
private boolean checkedForGetScreenMethod = false;
private Method getScreenMethod = null;
+ @Override
int getScreen(final GraphicsDevice graphicsDevice) {
if (VERBOSE) System.err.println("JoglPipeline.getScreen()");
@@ -8366,6 +8527,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
// int getScreen();
// which we want to call reflectively if it's available.
AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ @Override
public Object run() {
try {
getScreenMethod = graphicsDevice.getClass().getDeclaredMethod("getScreen", new Class[] {});
@@ -8429,6 +8591,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
this.chooser = chooser;
}
+ @Override
public void addNotify() {
super.addNotify();
@@ -8482,6 +8645,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
return done;
}
+ @Override
public void init(GLContext context) {
// This is basically a temporary
JoglContext jctx = new JoglContext(context);
@@ -8503,6 +8667,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
private void disposeOnEDT(final Frame f) {
Runnable r = new Runnable() {
+ @Override
public void run() {
f.setVisible(false);
f.dispose();
@@ -8523,18 +8688,21 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
//
// Method to construct a new DrawingSurfaceObject
+ @Override
DrawingSurfaceObject createDrawingSurfaceObject(Canvas3D cv) {
if (VERBOSE) System.err.println("JoglPipeline.createDrawingSurfaceObject()");
return new JoglDrawingSurfaceObject(cv);
}
// Method to free the drawing surface object
+ @Override
void freeDrawingSurface(Canvas3D cv, DrawingSurfaceObject drawingSurfaceObject) {
if (VERBOSE) System.err.println("JoglPipeline.freeDrawingSurface()");
// This method is a no-op
}
// Method to free the native drawing surface object
+ @Override
void freeDrawingSurfaceNative(Object o) {
if (VERBOSE) System.err.println("JoglPipeline.freeDrawingSurfaceNative()");
// This method is a no-op
diff --git a/src/classes/share/javax/media/j3d/LOD.java b/src/classes/share/javax/media/j3d/LOD.java
index c0c00d4..22b7cca 100644
--- a/src/classes/share/javax/media/j3d/LOD.java
+++ b/src/classes/share/javax/media/j3d/LOD.java
@@ -184,6 +184,7 @@ public Switch getSwitch(int index) {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
@@ -220,6 +221,7 @@ public Switch getSwitch(int index) {
* @see Node#cloneTree
* @see DanglingReferenceException
*/
+ @Override
public void updateNodeReferences(NodeReferenceTable referenceTable) {
int numSwitch = numSwitches();
diff --git a/src/classes/share/javax/media/j3d/Light.java b/src/classes/share/javax/media/j3d/Light.java
index affaf9b..7e99843 100644
--- a/src/classes/share/javax/media/j3d/Light.java
+++ b/src/classes/share/javax/media/j3d/Light.java
@@ -657,6 +657,7 @@ return ((LightRetained)this.retained).getAllScopes();
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
@@ -706,6 +707,7 @@ return ((LightRetained)this.retained).getAllScopes();
* @see Node#cloneTree
* @see DanglingReferenceException
*/
+ @Override
public void updateNodeReferences(NodeReferenceTable referenceTable) {
diff --git a/src/classes/share/javax/media/j3d/LightBin.java b/src/classes/share/javax/media/j3d/LightBin.java
index 55ba51d..420d942 100644
--- a/src/classes/share/javax/media/j3d/LightBin.java
+++ b/src/classes/share/javax/media/j3d/LightBin.java
@@ -248,6 +248,7 @@ ArrayList<PointLightRetained> pointLts = new ArrayList<PointLightRetained>();
}
+ @Override
public void updateObject() {
int i;
EnvironmentSet e ;
diff --git a/src/classes/share/javax/media/j3d/LightRetained.java b/src/classes/share/javax/media/j3d/LightRetained.java
index 7ab15e5..7780713 100644
--- a/src/classes/share/javax/media/j3d/LightRetained.java
+++ b/src/classes/share/javax/media/j3d/LightRetained.java
@@ -661,6 +661,7 @@ Enumeration<Group> getAllScopes() {
// The update Object function called during RenderingEnv objUpdate
// Note : if you add any more fields here , you need to update
// updateLight() in RenderingEnvironmentStructure
+ @Override
void updateMirrorObject(Object[] objs) {
int component = ((Integer)objs[1]).intValue();
@@ -686,6 +687,7 @@ Enumeration<Group> getAllScopes() {
* cached region and transformed region
*/
+ @Override
void updateBoundingLeaf() {
// This is necessary, if for example, the region
// changes from sphere to box.
@@ -700,6 +702,7 @@ Enumeration<Group> getAllScopes() {
}
}
}
+ @Override
void getMirrorObjects(ArrayList leafList, HashKey key) {
if (!inSharedGroup) {
leafList.add(mirrorLights[0]);
@@ -765,6 +768,7 @@ Enumeration<Group> getAllScopes() {
}
}
+ @Override
void setLive(SetLiveState s) {
LightRetained ml;
int i, j;
@@ -893,6 +897,7 @@ Enumeration<Group> getAllScopes() {
}
// The default set of clearLive actions
+ @Override
void clearLive(SetLiveState s) {
LightRetained ml;
newlyAddedMirrorLights.clear();
@@ -1002,6 +1007,7 @@ Enumeration<Group> getAllScopes() {
/**
* Clones only the retained side, internal use only
*/
+ @Override
protected Object clone() {
LightRetained lr = (LightRetained)super.clone();
lr.color = new Color3f(color);
@@ -1023,6 +1029,7 @@ Enumeration<Group> getAllScopes() {
// Called during RenderingEnv object update
+ @Override
void updateTransformChange() {
}
@@ -1056,6 +1063,7 @@ Enumeration<Group> getAllScopes() {
VirtualUniverse.mc.processMessage(createMessage);
}
+ @Override
void mergeTransform(TransformGroupRetained xform) {
super.mergeTransform(xform);
if (regionOfInfluence != null) {
diff --git a/src/classes/share/javax/media/j3d/LineArray.java b/src/classes/share/javax/media/j3d/LineArray.java
index e466537..469f51a 100644
--- a/src/classes/share/javax/media/j3d/LineArray.java
+++ b/src/classes/share/javax/media/j3d/LineArray.java
@@ -156,6 +156,7 @@ public class LineArray extends GeometryArray {
* Creates the retained mode LineArrayRetained object that this
* LineArray object will point to.
*/
+ @Override
void createRetained() {
this.retained = new LineArrayRetained();
this.retained.setSource(this);
@@ -165,6 +166,7 @@ public class LineArray extends GeometryArray {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
LineArrayRetained rt = (LineArrayRetained) retained;
int texSetCount = rt.getTexCoordSetCount();
diff --git a/src/classes/share/javax/media/j3d/LineArrayRetained.java b/src/classes/share/javax/media/j3d/LineArrayRetained.java
index 0cca7e6..a970d96 100644
--- a/src/classes/share/javax/media/j3d/LineArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/LineArrayRetained.java
@@ -40,6 +40,7 @@ class LineArrayRetained extends GeometryArrayRetained implements Cloneable {
this.geoType = GEO_TYPE_LINE_SET;
}
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
Point3d pnts[] = new Point3d[2];
@@ -286,6 +287,7 @@ class LineArrayRetained extends GeometryArrayRetained implements Cloneable {
}
+ @Override
boolean intersect(Point3d[] pnts) {
Point3d[] points = new Point3d[2];
double dist[] = new double[1];
@@ -341,6 +343,7 @@ class LineArrayRetained extends GeometryArrayRetained implements Cloneable {
return false;
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld,
GeometryRetained geom) {
Point3d[] pnts = new Point3d[2];
@@ -362,6 +365,7 @@ class LineArrayRetained extends GeometryArrayRetained implements Cloneable {
}
// the bounds argument is already transformed
+ @Override
boolean intersect(Bounds targetBound) {
Point3d[] pnts = new Point3d[2];
int i = ((vertexFormat & GeometryArray.BY_REFERENCE) == 0 ?
@@ -414,6 +418,7 @@ class LineArrayRetained extends GeometryArrayRetained implements Cloneable {
return false;
}
// From Graphics Gems IV (pg5) and Graphics Gems II, Pg170
+ @Override
void computeCentroid() {
Point3d pnt0 = new Point3d();
Point3d pnt1 = new Point3d();
@@ -444,6 +449,7 @@ class LineArrayRetained extends GeometryArrayRetained implements Cloneable {
}
}
+ @Override
int getClassType() {
return LINE_TYPE;
}
diff --git a/src/classes/share/javax/media/j3d/LineAttributes.java b/src/classes/share/javax/media/j3d/LineAttributes.java
index ea8a93c..d27938a 100644
--- a/src/classes/share/javax/media/j3d/LineAttributes.java
+++ b/src/classes/share/javax/media/j3d/LineAttributes.java
@@ -443,6 +443,7 @@ public class LineAttributes extends NodeComponent {
* Creates a retained mode LineAttributesRetained object that this
* LineAttributes component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new LineAttributesRetained();
this.retained.setSource(this);
@@ -453,6 +454,7 @@ public class LineAttributes extends NodeComponent {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
LineAttributes la = new LineAttributes();
la.duplicateNodeComponent(this);
@@ -478,6 +480,7 @@ public class LineAttributes extends NodeComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent,
diff --git a/src/classes/share/javax/media/j3d/LineAttributesRetained.java b/src/classes/share/javax/media/j3d/LineAttributesRetained.java
index 0f904fb..616a2ab 100644
--- a/src/classes/share/javax/media/j3d/LineAttributesRetained.java
+++ b/src/classes/share/javax/media/j3d/LineAttributesRetained.java
@@ -210,6 +210,7 @@ class LineAttributesRetained extends NodeComponentRetained {
* Creates and initializes a mirror object, point the mirror object
* to the retained object if the object is not editable
*/
+ @Override
synchronized void createMirrorObject() {
if (mirror == null) {
// Check the capability bits and let the mirror object
@@ -242,6 +243,7 @@ class LineAttributesRetained extends NodeComponentRetained {
* Initializes a mirror object, point the mirror object to the retained
* object if the object is not editable
*/
+ @Override
synchronized void initMirrorObject() {
((LineAttributesRetained)mirror).set(this);
}
@@ -249,6 +251,7 @@ class LineAttributesRetained extends NodeComponentRetained {
/** Update the "component" field of the mirror object with the
* given "value"
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
LineAttributesRetained mirrorLa = (LineAttributesRetained) mirror;
@@ -329,6 +332,7 @@ class LineAttributesRetained extends NodeComponentRetained {
}
+ @Override
void handleFrequencyChange(int bit) {
if (bit == LineAttributes.ALLOW_WIDTH_WRITE ||
bit == LineAttributes.ALLOW_PATTERN_WRITE||
diff --git a/src/classes/share/javax/media/j3d/LineStripArray.java b/src/classes/share/javax/media/j3d/LineStripArray.java
index 6a642b1..f97574e 100644
--- a/src/classes/share/javax/media/j3d/LineStripArray.java
+++ b/src/classes/share/javax/media/j3d/LineStripArray.java
@@ -178,6 +178,7 @@ public class LineStripArray extends GeometryStripArray {
* Creates the retained mode LineStripArrayRetained object that this
* LineStripArray object will point to.
*/
+ @Override
void createRetained() {
this.retained = new LineStripArrayRetained();
this.retained.setSource(this);
@@ -186,6 +187,7 @@ public class LineStripArray extends GeometryStripArray {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
LineStripArrayRetained rt = (LineStripArrayRetained) retained;
int stripcounts[] = new int[rt.getNumStrips()];
diff --git a/src/classes/share/javax/media/j3d/LineStripArrayRetained.java b/src/classes/share/javax/media/j3d/LineStripArrayRetained.java
index d7033a8..861c306 100644
--- a/src/classes/share/javax/media/j3d/LineStripArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/LineStripArrayRetained.java
@@ -44,6 +44,7 @@ class LineStripArrayRetained extends GeometryStripArrayRetained {
this.geoType = GEO_TYPE_LINE_STRIP_SET;
}
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
Point3d pnts[] = new Point3d[2];
@@ -331,6 +332,7 @@ class LineStripArrayRetained extends GeometryStripArrayRetained {
return false;
}
+ @Override
boolean intersect(Point3d[] pnts) {
int j, end;
Point3d[] points = new Point3d[2];
@@ -404,6 +406,7 @@ class LineStripArrayRetained extends GeometryStripArrayRetained {
return false;
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld,
GeometryRetained geom) {
int i = 0;
@@ -431,6 +434,7 @@ class LineStripArrayRetained extends GeometryStripArrayRetained {
}
// the bounds argument is already transformed
+ @Override
boolean intersect(Bounds targetBound) {
int i = 0;
int j, offset, end;
@@ -499,6 +503,7 @@ class LineStripArrayRetained extends GeometryStripArrayRetained {
}
// From Graphics Gems IV (pg5) and Graphics Gems II, Pg170
+ @Override
void computeCentroid() {
int i = 0;
int j;
@@ -543,6 +548,7 @@ class LineStripArrayRetained extends GeometryStripArrayRetained {
}
}
+ @Override
int getClassType() {
return LINE_TYPE;
}
diff --git a/src/classes/share/javax/media/j3d/LinearFog.java b/src/classes/share/javax/media/j3d/LinearFog.java
index 22e3269..a3f6b0a 100644
--- a/src/classes/share/javax/media/j3d/LinearFog.java
+++ b/src/classes/share/javax/media/j3d/LinearFog.java
@@ -210,6 +210,7 @@ public class LinearFog extends Fog {
* Creates the retained mode LinearFogRetained object that this
* LinearFog node will point to.
*/
+ @Override
void createRetained() {
this.retained = new LinearFogRetained();
this.retained.setSource(this);
@@ -229,6 +230,7 @@ public class LinearFog extends Fog {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
LinearFog lf = new LinearFog();
lf.duplicateNode(this, forceDuplicate);
@@ -257,6 +259,7 @@ public class LinearFog extends Fog {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/LinearFogRetained.java b/src/classes/share/javax/media/j3d/LinearFogRetained.java
index deb19b3..293c592 100644
--- a/src/classes/share/javax/media/j3d/LinearFogRetained.java
+++ b/src/classes/share/javax/media/j3d/LinearFogRetained.java
@@ -112,6 +112,7 @@ class LinearFogRetained extends FogRetained {
* This method and its native counterpart update the native context
* fog values.
*/
+ @Override
void update(Context ctx, double scale) {
validateDistancesInEc(scale);
Pipeline.getPipeline().updateLinearFog(ctx,
@@ -120,6 +121,7 @@ class LinearFogRetained extends FogRetained {
+ @Override
void setLive(SetLiveState s) {
super.setLive(s);
@@ -163,6 +165,7 @@ class LinearFogRetained extends FogRetained {
// The update Object function.
// Note : if you add any more fields here , you need to update
// updateFog() in RenderingEnvironmentStructure
+ @Override
synchronized void updateMirrorObject(Object[] objs) {
int component = ((Integer)objs[1]).intValue();
@@ -184,6 +187,7 @@ class LinearFogRetained extends FogRetained {
/**
* Scale distances from local to eye coordinate
*/
+ @Override
protected void validateDistancesInEc(double vworldToCoexistenceScale) {
// vworldToCoexistenceScale can be used here since
// CoexistenceToEc has a unit scale
diff --git a/src/classes/share/javax/media/j3d/Link.java b/src/classes/share/javax/media/j3d/Link.java
index 5e4fa67..e8c0237 100644
--- a/src/classes/share/javax/media/j3d/Link.java
+++ b/src/classes/share/javax/media/j3d/Link.java
@@ -78,6 +78,7 @@ public class Link extends Leaf {
* Creates the retained mode LinkRetained object that this
* Link object will point to.
*/
+ @Override
void createRetained() {
this.retained = new LinkRetained();
this.retained.setSource(this);
@@ -129,6 +130,7 @@ public class Link extends Leaf {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
Link l = new Link();
l.duplicateNode(this, forceDuplicate);
@@ -156,6 +158,7 @@ public class Link extends Leaf {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
((LinkRetained) retained).setSharedGroup(
diff --git a/src/classes/share/javax/media/j3d/LinkRetained.java b/src/classes/share/javax/media/j3d/LinkRetained.java
index e3d977c..aa554ed 100644
--- a/src/classes/share/javax/media/j3d/LinkRetained.java
+++ b/src/classes/share/javax/media/j3d/LinkRetained.java
@@ -117,6 +117,7 @@ class LinkRetained extends LeafRetained {
(SharedGroup)this.sharedGroup.source : null);
}
+ @Override
void computeCombineBounds(Bounds bounds) {
if (boundsAutoCompute) {
@@ -134,6 +135,7 @@ class LinkRetained extends LeafRetained {
* Gets the bounding object of a node.
* @return the node's bounding object
*/
+ @Override
Bounds getBounds() {
return (boundsAutoCompute ?
(Bounds)sharedGroup.getBounds().clone() :
@@ -144,6 +146,7 @@ class LinkRetained extends LeafRetained {
/**
* assign a name to this node when it is made live.
*/
+ @Override
void setLive(SetLiveState s) {
super.doSetLive(s);
@@ -184,6 +187,7 @@ class LinkRetained extends LeafRetained {
super.markAsLive();
}
+ @Override
void setNodeData(SetLiveState s) {
super.setNodeData(s);
@@ -209,6 +213,7 @@ class LinkRetained extends LeafRetained {
}
+ @Override
void recombineAbove() {
localBounds.setWithLock(sharedGroup.localBounds);
parent.recombineAbove();
@@ -217,6 +222,7 @@ class LinkRetained extends LeafRetained {
/**
* assign a name to this node when it is made live.
*/
+ @Override
void clearLive(SetLiveState s) {
if (sharedGroup != null) {
@@ -234,6 +240,7 @@ class LinkRetained extends LeafRetained {
}
}
+ @Override
void removeNodeData(SetLiveState s) {
if(refCount <= 0) {
// either not in sharedGroup or last instance in sharedGroup
@@ -269,6 +276,7 @@ class LinkRetained extends LeafRetained {
}
+ @Override
void updatePickable(HashKey keys[], boolean pick[]) {
super.updatePickable(keys, pick);
@@ -278,6 +286,7 @@ class LinkRetained extends LeafRetained {
}
}
+ @Override
void updateCollidable(HashKey keys[], boolean collide[]) {
super.updateCollidable(keys, collide);
@@ -287,6 +296,7 @@ class LinkRetained extends LeafRetained {
}
}
+ @Override
void setBoundsAutoCompute(boolean autoCompute) {
super.setBoundsAutoCompute(autoCompute);
if (!autoCompute) {
@@ -294,6 +304,7 @@ class LinkRetained extends LeafRetained {
}
}
+ @Override
void setCompiled() {
super.setCompiled();
if (sharedGroup != null) {
@@ -301,6 +312,7 @@ class LinkRetained extends LeafRetained {
}
}
+ @Override
void compile(CompileState compState) {
super.compile(compState);
@@ -334,6 +346,7 @@ class LinkRetained extends LeafRetained {
return newKeys;
}
+ @Override
void searchGeometryAtoms(UnorderList list) {
if (sharedGroup != null) {
sharedGroup.searchGeometryAtoms(list);
diff --git a/src/classes/share/javax/media/j3d/MasterControl.java b/src/classes/share/javax/media/j3d/MasterControl.java
index 30855b8..0d7af66 100644
--- a/src/classes/share/javax/media/j3d/MasterControl.java
+++ b/src/classes/share/javax/media/j3d/MasterControl.java
@@ -586,6 +586,7 @@ class MasterControl {
final int defaultThreadLimit = getNumberOfProcessors() + 1;
Integer threadLimit = java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Integer>() {
+ @Override
public Integer run() {
return Integer.getInteger("j3d.threadLimit", defaultThreadLimit);
}
@@ -602,6 +603,7 @@ class MasterControl {
// Get the input device scheduler sampling time
Integer samplingTime = java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Integer>() {
+ @Override
public Integer run() {
return Integer.getInteger("j3d.deviceSampleTime", 0);
}
@@ -618,6 +620,7 @@ class MasterControl {
final int defaultGLSLVertexAttrOffset = glslVertexAttrOffset;
Integer vattrOffset = java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Integer>() {
+ @Override
public Integer run() {
return Integer.getInteger("j3d.glslVertexAttrOffset",
defaultGLSLVertexAttrOffset);
@@ -705,6 +708,7 @@ class MasterControl {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Object>() {
+ @Override
public Object run() {
coreLoggerEnabled = initLogger(coreLogger, null);
devLoggerEnabled = initLogger(devLogger, Level.OFF);
@@ -768,6 +772,7 @@ class MasterControl {
private static String getProperty(final String prop) {
return java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<String>() {
+ @Override
public String run() {
return System.getProperty(prop);
}
@@ -844,6 +849,7 @@ private static String getProperty(final String prop) {
return java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<InputDeviceBlockingThread>() {
+ @Override
public InputDeviceBlockingThread run() {
synchronized (rootThreadGroup) {
InputDeviceBlockingThread thread = new InputDeviceBlockingThread(
@@ -863,6 +869,7 @@ private static String getProperty(final String prop) {
threadPriority = pri;
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Object>() {
+ @Override
public Object run() {
Thread list[] = new
Thread[rootThreadGroup.activeCount()];
@@ -970,6 +977,7 @@ private static String getProperty(final String prop) {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Object>() {
+ @Override
public Object run() {
Renderer r;
synchronized (rootThreadGroup) {
@@ -1137,6 +1145,7 @@ private static String getProperty(final String prop) {
state = RUNNING;
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Object>() {
+ @Override
public Object run() {
synchronized (rootThreadGroup) {
mcThread = new
@@ -1634,6 +1643,7 @@ private static String getProperty(final String prop) {
if (s.updateThread == null) {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Object>() {
+ @Override
public Object run() {
synchronized (rootThreadGroup) {
s.updateThread = new StructureUpdateThread(
@@ -1759,6 +1769,7 @@ private static String getProperty(final String prop) {
if (univ.behaviorScheduler == null) {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Object>() {
+ @Override
public Object run() {
synchronized (rootThreadGroup) {
univ.behaviorScheduler = new BehaviorScheduler(
@@ -1957,6 +1968,7 @@ private static String getProperty(final String prop) {
// Create timer thread
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Object>() {
+ @Override
public Object run() {
synchronized (rootThreadGroup) {
timerThread = new TimerThread(rootThreadGroup);
@@ -1970,6 +1982,7 @@ private static String getProperty(final String prop) {
// Create notification thread
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Object>() {
+ @Override
public Object run() {
synchronized (rootThreadGroup) {
notificationThread = new NotificationThread(rootThreadGroup);
@@ -2115,6 +2128,7 @@ private static String getProperty(final String prop) {
if (rdr == null) {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Object>() {
+ @Override
public Object run() {
synchronized (rootThreadGroup) {
@@ -2194,6 +2208,7 @@ private static String getProperty(final String prop) {
if (env.inputsched == null) {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Object>() {
+ @Override
public Object run() {
synchronized (rootThreadGroup) {
env.inputsched = new InputDeviceScheduler(
@@ -3465,6 +3480,7 @@ private static String getProperty(final String prop) {
// create ThreadGroup
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Object>() {
+ @Override
public Object run() {
ThreadGroup parent;
Thread thread = Thread.currentThread();
diff --git a/src/classes/share/javax/media/j3d/MasterControlThread.java b/src/classes/share/javax/media/j3d/MasterControlThread.java
index 7f33c3d..f1c67b0 100644
--- a/src/classes/share/javax/media/j3d/MasterControlThread.java
+++ b/src/classes/share/javax/media/j3d/MasterControlThread.java
@@ -55,6 +55,7 @@ class MasterControlThread extends Thread {
this.start();
}
+ @Override
public void run() {
do {
diff --git a/src/classes/share/javax/media/j3d/Material.java b/src/classes/share/javax/media/j3d/Material.java
index 241d802..528aa0e 100644
--- a/src/classes/share/javax/media/j3d/Material.java
+++ b/src/classes/share/javax/media/j3d/Material.java
@@ -171,6 +171,7 @@ public class Material extends NodeComponent {
* Creates a retained mode MaterialRetained object that this
* Material component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new MaterialRetained();
this.retained.setSource(this);
@@ -624,6 +625,7 @@ public class Material extends NodeComponent {
* If the scene graph is live only those values with their
* Capability read bit set will be displayed.
*/
+ @Override
public String toString() {
StringBuffer str = new StringBuffer(getNamePrefix());
str.append("javax.media.j3d.Material: ");
@@ -662,6 +664,7 @@ public class Material extends NodeComponent {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
Material m = new Material();
m.duplicateNodeComponent(this);
@@ -686,6 +689,7 @@ public class Material extends NodeComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent,
diff --git a/src/classes/share/javax/media/j3d/MaterialRetained.java b/src/classes/share/javax/media/j3d/MaterialRetained.java
index b1e924e..f900eee 100644
--- a/src/classes/share/javax/media/j3d/MaterialRetained.java
+++ b/src/classes/share/javax/media/j3d/MaterialRetained.java
@@ -403,6 +403,7 @@ class MaterialRetained extends NodeComponentRetained {
return colorTarget;
}
+ @Override
synchronized void createMirrorObject() {
if (mirror == null) {
// Check the capability bits and let the mirror object
@@ -440,6 +441,7 @@ class MaterialRetained extends NodeComponentRetained {
* Creates a mirror object, point the mirror object to the retained
* object if the object is not editable
*/
+ @Override
synchronized void initMirrorObject() {
MaterialRetained mirrorMaterial = (MaterialRetained)mirror;
mirrorMaterial.set(this);
@@ -449,6 +451,7 @@ class MaterialRetained extends NodeComponentRetained {
* Update the "component" field of the mirror object with the
* given "value"
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
MaterialRetained mirrorMaterial = (MaterialRetained)mirror;
if ((component & AMBIENT_COLOR_CHANGED) != 0) {
@@ -490,6 +493,7 @@ class MaterialRetained extends NodeComponentRetained {
// This functions clones the retained side only and is used
// internally
+ @Override
protected Object clone() {
MaterialRetained mr = (MaterialRetained)super.clone();
// color can't share the same reference
@@ -550,6 +554,7 @@ class MaterialRetained extends NodeComponentRetained {
}
+ @Override
void handleFrequencyChange(int bit) {
if (bit == Material.ALLOW_COMPONENT_WRITE) {
setFrequencyChangeMask(Material.ALLOW_COMPONENT_WRITE, 0x1);
diff --git a/src/classes/share/javax/media/j3d/MediaContainer.java b/src/classes/share/javax/media/j3d/MediaContainer.java
index f13b427..3a76b07 100644
--- a/src/classes/share/javax/media/j3d/MediaContainer.java
+++ b/src/classes/share/javax/media/j3d/MediaContainer.java
@@ -140,6 +140,7 @@ public class MediaContainer extends NodeComponent {
* Creates the retained mode MediaContainerRetained object that this
* component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new MediaContainerRetained();
this.retained.setSource(this);
@@ -307,6 +308,7 @@ public class MediaContainer extends NodeComponent {
* @deprecated As of Java 3D version 1.2, replaced with
* <code>cloneNodeComponent(boolean forceDuplicate)</code>
*/
+ @Override
public NodeComponent cloneNodeComponent() {
MediaContainer mc = new MediaContainer();
mc.duplicateNodeComponent(this);
@@ -335,6 +337,7 @@ public class MediaContainer extends NodeComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
diff --git a/src/classes/share/javax/media/j3d/ModelClip.java b/src/classes/share/javax/media/j3d/ModelClip.java
index 601a623..e03c8a0 100644
--- a/src/classes/share/javax/media/j3d/ModelClip.java
+++ b/src/classes/share/javax/media/j3d/ModelClip.java
@@ -613,6 +613,7 @@ public Enumeration<Group> getAllScopes() {
* Creates the retained mode ModelClipRetained object that
* this ModelClip node will point to.
*/
+ @Override
void createRetained() {
this.retained = new ModelClipRetained();
this.retained.setSource(this);
@@ -634,6 +635,7 @@ public Enumeration<Group> getAllScopes() {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
ModelClip c = new ModelClip();
c.duplicateNode(this, forceDuplicate);
@@ -666,6 +668,7 @@ public Enumeration<Group> getAllScopes() {
* @see Node#cloneTree
* @see DanglingReferenceException
*/
+ @Override
public void updateNodeReferences(NodeReferenceTable referenceTable) {
ModelClipRetained rt = (ModelClipRetained) retained;
BoundingLeaf bl = rt.getInfluencingBoundingLeaf();
@@ -705,6 +708,7 @@ public Enumeration<Group> getAllScopes() {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/ModelClipRetained.java b/src/classes/share/javax/media/j3d/ModelClipRetained.java
index 6593f68..04b248d 100644
--- a/src/classes/share/javax/media/j3d/ModelClipRetained.java
+++ b/src/classes/share/javax/media/j3d/ModelClipRetained.java
@@ -656,6 +656,7 @@ void update(Context ctx, int enableMask, Transform3D trans) {
+ @Override
void updateMirrorObject(Object[] objs) {
int component = ((Integer)objs[1]).intValue();
if ((component & PLANES_CHANGED) != 0) {
@@ -771,6 +772,7 @@ void update(Context ctx, int enableMask, Transform3D trans) {
* the mirror object - will update the object's
* cached region and transformed region
*/
+ @Override
void updateBoundingLeaf() {
if (boundingLeaf != null && boundingLeaf.switchState.currentSwitchOn) {
region = boundingLeaf.transformedRegion;
@@ -785,6 +787,7 @@ void update(Context ctx, int enableMask, Transform3D trans) {
}
+ @Override
void setLive(SetLiveState s) {
GroupRetained group;
@@ -870,6 +873,7 @@ void update(Context ctx, int enableMask, Transform3D trans) {
* This clearLive routine first calls the superclass's method, then
* it removes itself to the list of model clip
*/
+ @Override
void clearLive(SetLiveState s) {
super.clearLive(s);
@@ -929,6 +933,7 @@ void update(Context ctx, int enableMask, Transform3D trans) {
// Clone the retained side only, internal use only
+ @Override
protected Object clone() {
ModelClipRetained mc = (ModelClipRetained)super.clone();
@@ -1018,6 +1023,7 @@ void update(Context ctx, int enableMask, Transform3D trans) {
VirtualUniverse.mc.processMessage(createMessage);
}
+ @Override
void mergeTransform(TransformGroupRetained staticTransform) {
super.mergeTransform(staticTransform);
@@ -1030,6 +1036,7 @@ void update(Context ctx, int enableMask, Transform3D trans) {
xform.transform(planes[i], xformPlanes[i]);
}
}
+ @Override
void getMirrorObjects(ArrayList leafList, HashKey key) {
leafList.add(mirrorModelClip);
}
diff --git a/src/classes/share/javax/media/j3d/Morph.java b/src/classes/share/javax/media/j3d/Morph.java
index b04d183..9fc7d9e 100644
--- a/src/classes/share/javax/media/j3d/Morph.java
+++ b/src/classes/share/javax/media/j3d/Morph.java
@@ -268,6 +268,7 @@ public class Morph extends Leaf {
* Creates the retained mode MorphRetained object that this
* Morph object will point to.
*/
+ @Override
void createRetained() {
retained = new MorphRetained();
retained.setSource(this);
@@ -593,6 +594,7 @@ public class Morph extends Leaf {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
Morph m = new Morph();
m.duplicateNode(this, forceDuplicate);
@@ -630,6 +632,7 @@ public class Morph extends Leaf {
* @see Node#cloneNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public void duplicateNode(Node originalNode, boolean forceDuplicate) {
checkDuplicateNode(originalNode, forceDuplicate);
}
@@ -655,6 +658,7 @@ public class Morph extends Leaf {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/MorphRetained.java b/src/classes/share/javax/media/j3d/MorphRetained.java
index 329cc62..9ba5d71 100644
--- a/src/classes/share/javax/media/j3d/MorphRetained.java
+++ b/src/classes/share/javax/media/j3d/MorphRetained.java
@@ -171,6 +171,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater {
* Sets the geometric bounds of a node.
* @param bounds the bounding object for the node
*/
+ @Override
void setBounds(Bounds bounds) {
super.setBounds(bounds);
if (source.isLive() && !boundsAutoCompute) {
@@ -616,6 +617,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater {
* Gets the bounding object of a node.
* @return the node's bounding object
*/
+ @Override
Bounds getBounds() {
if(boundsAutoCompute) {
GeometryArrayRetained mga =
@@ -632,6 +634,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater {
}
}
+ @Override
Bounds getEffectiveBounds() {
if(boundsAutoCompute) {
return getBounds();
@@ -645,6 +648,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater {
* ONLY needed for SHAPE, MORPH, and LINK node type.
* Compute the combine bounds of bounds and its localBounds.
*/
+ @Override
void computeCombineBounds(Bounds bounds) {
if(boundsAutoCompute) {
@@ -699,6 +703,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater {
* Update GeometryArray computed by morphing input GeometryArrays
* with weights
*/
+ @Override
public void updateData(Geometry mga) {
int i,j,k, vFormat, geoType, stripVCount[];
@@ -1236,6 +1241,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater {
/**
* assign a name to this node when it is made live.
*/
+ @Override
void setLive(SetLiveState s) {
int i, j;
Shape3DRetained shape;
@@ -1483,6 +1489,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater {
/**
* assign a name to this node when it is made live.
*/
+ @Override
void clearLive(SetLiveState s) {
int i, j;
Shape3DRetained shape;
@@ -1576,6 +1583,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater {
}
+ @Override
void updatePickable(HashKey keys[], boolean pick[]) {
super.updatePickable(keys, pick);
@@ -1600,6 +1608,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater {
}
+ @Override
void updateCollidable(HashKey keys[], boolean collide[]) {
super.updateCollidable(keys, collide);
Shape3DRetained shape;
@@ -1641,6 +1650,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater {
throw new RuntimeException("Shape3DRetained: MirrorShape Not found!");
}
+ @Override
void getMirrorObjects(ArrayList leafList, HashKey key) {
Shape3DRetained ms;
if (inSharedGroup) {
@@ -1654,6 +1664,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater {
}
+ @Override
void setBoundsAutoCompute(boolean autoCompute) {
if (autoCompute != boundsAutoCompute) {
if (autoCompute) {
@@ -1683,6 +1694,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater {
}
}
+ @Override
void updateBounds() {
localBounds = getEffectiveBounds();
if (source.isLive()) {
@@ -1857,6 +1869,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater {
}
+ @Override
void compile(CompileState compState) {
super.compile(compState);
@@ -1928,6 +1941,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater {
}
}
+ @Override
void handleFrequencyChange(int bit) {
int mask = 0;
if (bit == Morph.ALLOW_GEOMETRY_ARRAY_WRITE) {
@@ -1948,6 +1962,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater {
}
}
+ @Override
void searchGeometryAtoms(UnorderList list) {
list.add(Shape3DRetained.getGeomAtom(
(Shape3DRetained) mirrorShape3D.get(0)));
diff --git a/src/classes/share/javax/media/j3d/NodeComponent.java b/src/classes/share/javax/media/j3d/NodeComponent.java
index 79b3f8b..fb0d0b5 100644
--- a/src/classes/share/javax/media/j3d/NodeComponent.java
+++ b/src/classes/share/javax/media/j3d/NodeComponent.java
@@ -264,6 +264,7 @@ public abstract class NodeComponent extends SceneGraphObject {
* Creates the retained mode NodeComponentRetained object that this
* NodeComponent object will point to.
*/
+ @Override
void createRetained() {
this.retained = new NodeComponentRetained();
this.retained.setSource(this);
diff --git a/src/classes/share/javax/media/j3d/NodeComponentRetained.java b/src/classes/share/javax/media/j3d/NodeComponentRetained.java
index 6279e62..c424257 100644
--- a/src/classes/share/javax/media/j3d/NodeComponentRetained.java
+++ b/src/classes/share/javax/media/j3d/NodeComponentRetained.java
@@ -235,6 +235,7 @@ class NodeComponentRetained extends SceneGraphObjectRetained {
}
}
+ @Override
protected Object clone() {
NodeComponentRetained ncr = (NodeComponentRetained)super.clone();
ncr.changedFrequent = changedFrequent;
diff --git a/src/classes/share/javax/media/j3d/NodeRetained.java b/src/classes/share/javax/media/j3d/NodeRetained.java
index b64b3a1..83739da 100644
--- a/src/classes/share/javax/media/j3d/NodeRetained.java
+++ b/src/classes/share/javax/media/j3d/NodeRetained.java
@@ -193,10 +193,12 @@ ArrayList<BranchGroupRetained[]> branchGroupPaths = new ArrayList<BranchGroupRet
}
+ @Override
public int getId() {
return nnuId;
}
+ @Override
public int equal(NnuId obj) {
int keyId = obj.getId();
if(nnuId < keyId) {
@@ -625,6 +627,7 @@ NodeRetained getParent() {
synchronized void updateLocalToVworld() {}
+ @Override
void setLive(SetLiveState s) {
int oldrefCount = refCount;
@@ -634,6 +637,7 @@ NodeRetained getParent() {
}
// The default set of setLive actions.
+ @Override
void doSetLive(SetLiveState s) {
int i;
int oldrefCount = refCount;
@@ -910,6 +914,7 @@ NodeRetained getParent() {
}
+ @Override
boolean isStatic() {
if (source.getCapability(Node.ALLOW_LOCAL_TO_VWORLD_READ) ||
source.getCapability(Node.ALLOW_PARENT_READ) ||
@@ -928,6 +933,7 @@ NodeRetained getParent() {
return true;
}
+ @Override
void merge(CompileState compState) {
staticTransform = compState.staticTransform;
if (compState.parentGroup != null) {
@@ -939,6 +945,7 @@ NodeRetained getParent() {
}
}
+ @Override
void mergeTransform(TransformGroupRetained xform) {
if (localBounds != null) {
localBounds.transform(xform.transform);
@@ -950,6 +957,7 @@ NodeRetained getParent() {
}
+ @Override
VirtualUniverse getVirtualUniverse() {
return universe;
}
diff --git a/src/classes/share/javax/media/j3d/NoopDrawingSurfaceObject.java b/src/classes/share/javax/media/j3d/NoopDrawingSurfaceObject.java
index d920501..0c41322 100644
--- a/src/classes/share/javax/media/j3d/NoopDrawingSurfaceObject.java
+++ b/src/classes/share/javax/media/j3d/NoopDrawingSurfaceObject.java
@@ -37,17 +37,20 @@ class NoopDrawingSurfaceObject extends DrawingSurfaceObject {
System.err.println("NoopDrawingSurfaceObject constructed");
}
+ @Override
synchronized boolean renderLock() {
// System.err.println("NoopDrawingSurfaceObject.renderLock()");
gotDsiLock = true;
return true;
}
+ @Override
synchronized void unLock() {
// System.err.println("NoopDrawingSurfaceObject.unLock()");
gotDsiLock = false;
}
+ @Override
synchronized void getDrawingSurfaceObjectInfo() {
if (canvas.drawable == null) {
System.err.println(
@@ -58,6 +61,7 @@ class NoopDrawingSurfaceObject extends DrawingSurfaceObject {
}
}
+ @Override
synchronized void invalidate() {
System.err.println("NoopDrawingSurfaceObject.invalidate()");
}
diff --git a/src/classes/share/javax/media/j3d/NoopPipeline.java b/src/classes/share/javax/media/j3d/NoopPipeline.java
index 66726f4..055cb69 100644
--- a/src/classes/share/javax/media/j3d/NoopPipeline.java
+++ b/src/classes/share/javax/media/j3d/NoopPipeline.java
@@ -46,6 +46,7 @@ class NoopPipeline extends Pipeline {
/**
* Initialize the pipeline
*/
+ @Override
void initialize(Pipeline.Type pipelineType) {
super.initialize(pipelineType);
@@ -59,6 +60,7 @@ class NoopPipeline extends Pipeline {
//
// used for GeometryArrays by Copy or interleaved
+ @Override
void execute(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale,
@@ -74,6 +76,7 @@ class NoopPipeline extends Pipeline {
}
// used by GeometryArray by Reference with java arrays
+ @Override
void executeVA(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale,
@@ -94,6 +97,7 @@ class NoopPipeline extends Pipeline {
}
// used by GeometryArray by Reference with NIO buffer
+ @Override
void executeVABuffer(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale,
@@ -117,6 +121,7 @@ class NoopPipeline extends Pipeline {
}
// used by GeometryArray by Reference in interleaved format with NIO buffer
+ @Override
void executeInterleavedBuffer(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale,
@@ -130,15 +135,18 @@ class NoopPipeline extends Pipeline {
FloatBuffer varray, float[] cdata, int cdirty) {
}
+ @Override
void setVertexFormat(Context ctx, GeometryArrayRetained geo,
int vformat, boolean useAlpha, boolean ignoreVertexColors) {
}
+ @Override
void disableGlobalAlpha(Context ctx, GeometryArrayRetained geo, int vformat,
boolean useAlpha, boolean ignoreVertexColors) {
}
// used for GeometryArrays
+ @Override
void buildGA(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale, boolean updateAlpha,
@@ -154,6 +162,7 @@ class NoopPipeline extends Pipeline {
}
// used to Build Dlist GeometryArray by Reference with java arrays
+ @Override
void buildGAForByRef(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale, boolean updateAlpha,
@@ -181,6 +190,7 @@ class NoopPipeline extends Pipeline {
//
// by-copy or interleaved, by reference, Java arrays
+ @Override
void executeIndexedGeometry(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale,
@@ -200,6 +210,7 @@ class NoopPipeline extends Pipeline {
}
// interleaved, by reference, nio buffer
+ @Override
void executeIndexedGeometryBuffer(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale,
@@ -218,6 +229,7 @@ class NoopPipeline extends Pipeline {
}
// non interleaved, by reference, Java arrays
+ @Override
void executeIndexedGeometryVA(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale,
@@ -241,6 +253,7 @@ class NoopPipeline extends Pipeline {
}
// non interleaved, by reference, nio buffer
+ @Override
void executeIndexedGeometryVABuffer(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale,
@@ -265,6 +278,7 @@ class NoopPipeline extends Pipeline {
}
// by-copy geometry
+ @Override
void buildIndexedGeometry(Context ctx,
GeometryArrayRetained geo, int geo_type,
boolean isNonUniformScale, boolean updateAlpha,
@@ -289,6 +303,7 @@ class NoopPipeline extends Pipeline {
// GraphicsContext3D methods
//
+ @Override
void readRaster(Context ctx,
int type, int xSrcOffset, int ySrcOffset,
int width, int height, int hCanvas,
@@ -307,6 +322,7 @@ class NoopPipeline extends Pipeline {
// ShaderAttributeValue methods
+ @Override
ShaderError setGLSLUniform1i(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -314,6 +330,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform1f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -321,6 +338,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform2i(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -328,6 +346,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform2f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -335,6 +354,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform3i(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -342,6 +362,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform3f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -349,6 +370,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform4i(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -356,6 +378,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform4f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -363,6 +386,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniformMatrix3f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -370,6 +394,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniformMatrix4f(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -379,6 +404,7 @@ class NoopPipeline extends Pipeline {
// ShaderAttributeArray methods
+ @Override
ShaderError setGLSLUniform1iArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -387,6 +413,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform1fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -395,6 +422,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform2iArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -403,6 +431,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform2fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -411,6 +440,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform3iArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -419,6 +449,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform3fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -427,6 +458,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform4iArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -435,6 +467,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniform4fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -443,6 +476,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniformMatrix3fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -451,6 +485,7 @@ class NoopPipeline extends Pipeline {
return null;
}
+ @Override
ShaderError setGLSLUniformMatrix4fArray(Context ctx,
ShaderProgramId shaderProgramId,
ShaderAttrLoc uniformLocation,
@@ -460,35 +495,44 @@ class NoopPipeline extends Pipeline {
}
// interfaces for shader compilation, etc.
+ @Override
ShaderError createGLSLShader(Context ctx, int shaderType, ShaderId[] shaderId) {
return null;
}
+ @Override
ShaderError destroyGLSLShader(Context ctx, ShaderId shaderId) {
return null;
}
+ @Override
ShaderError compileGLSLShader(Context ctx, ShaderId shaderId, String program) {
return null;
}
+ @Override
ShaderError createGLSLShaderProgram(Context ctx, ShaderProgramId[] shaderProgramId) {
return null;
}
+ @Override
ShaderError destroyGLSLShaderProgram(Context ctx, ShaderProgramId shaderProgramId) {
return null;
}
+ @Override
ShaderError linkGLSLShaderProgram(Context ctx, ShaderProgramId shaderProgramId,
ShaderId[] shaderIds) {
return null;
}
+ @Override
ShaderError bindGLSLVertexAttrName(Context ctx, ShaderProgramId shaderProgramId,
String attrName, int attrIndex) {
return null;
}
+ @Override
void lookupGLSLShaderAttrNames(Context ctx, ShaderProgramId shaderProgramId,
int numAttrNames, String[] attrNames, ShaderAttrLoc[] locArr,
int[] typeArr, int[] sizeArr, boolean[] isArrayArr) {
}
+ @Override
ShaderError useGLSLShaderProgram(Context ctx, ShaderProgramId shaderProgramId) {
return null;
}
@@ -500,6 +544,7 @@ class NoopPipeline extends Pipeline {
// ColoringAttributesRetained methods
//
+ @Override
void updateColoringAttributes(Context ctx,
float dRed, float dGreen, float dBlue,
float red, float green, float blue,
@@ -515,6 +560,7 @@ class NoopPipeline extends Pipeline {
// DirectionalLightRetained methods
//
+ @Override
void updateDirectionalLight(Context ctx,
int lightSlot, float red, float green,
float blue, float x, float y, float z) {
@@ -527,6 +573,7 @@ class NoopPipeline extends Pipeline {
// PointLightRetained methods
//
+ @Override
void updatePointLight(Context ctx,
int lightSlot, float red, float green,
float blue, float ax, float ay, float az,
@@ -540,6 +587,7 @@ class NoopPipeline extends Pipeline {
// SpotLightRetained methods
//
+ @Override
void updateSpotLight(Context ctx,
int lightSlot, float red, float green,
float blue, float ax, float ay, float az,
@@ -555,6 +603,7 @@ class NoopPipeline extends Pipeline {
// ExponentialFogRetained methods
//
+ @Override
void updateExponentialFog(Context ctx,
float red, float green, float blue,
float density) {
@@ -567,6 +616,7 @@ class NoopPipeline extends Pipeline {
// LinearFogRetained methods
//
+ @Override
void updateLinearFog(Context ctx,
float red, float green, float blue,
double fdist, double bdist) {
@@ -579,6 +629,7 @@ class NoopPipeline extends Pipeline {
// LineAttributesRetained methods
//
+ @Override
void updateLineAttributes(Context ctx,
float lineWidth, int linePattern,
int linePatternMask,
@@ -593,6 +644,7 @@ class NoopPipeline extends Pipeline {
// MaterialRetained methods
//
+ @Override
void updateMaterial(Context ctx,
float red, float green, float blue, float alpha,
float ared, float agreen, float ablue,
@@ -609,6 +661,7 @@ class NoopPipeline extends Pipeline {
// ModelClipRetained methods
//
+ @Override
void updateModelClip(Context ctx, int planeNum, boolean enableFlag,
double A, double B, double C, double D) {
}
@@ -620,6 +673,7 @@ class NoopPipeline extends Pipeline {
// PointAttributesRetained methods
//
+ @Override
void updatePointAttributes(Context ctx, float pointSize, boolean pointAntialiasing) {
}
@@ -630,6 +684,7 @@ class NoopPipeline extends Pipeline {
// PolygonAttributesRetained methods
//
+ @Override
void updatePolygonAttributes(Context ctx,
int polygonMode, int cullFace,
boolean backFaceNormalFlip,
@@ -644,6 +699,7 @@ class NoopPipeline extends Pipeline {
// RenderingAttributesRetained methods
//
+ @Override
void updateRenderingAttributes(Context ctx,
boolean depthBufferWriteEnableOverride,
boolean depthBufferEnableOverride,
@@ -671,6 +727,7 @@ class NoopPipeline extends Pipeline {
* trans contains eyeTovworld transform in d3d
* trans contains vworldToEye transform in ogl
*/
+ @Override
void updateTexCoordGeneration(Context ctx,
boolean enable, int genMode, int format,
float planeSx, float planeSy, float planeSz, float planeSw,
@@ -687,6 +744,7 @@ class NoopPipeline extends Pipeline {
// TransparencyAttributesRetained methods
//
+ @Override
void updateTransparencyAttributes(Context ctx,
float alpha, int geometryType,
int polygonMode,
@@ -703,6 +761,7 @@ class NoopPipeline extends Pipeline {
// TextureAttributesRetained methods
//
+ @Override
void updateTextureAttributes(Context ctx,
double[] transform, boolean isIdentity, int textureMode,
int perspCorrectionMode, float red,
@@ -710,6 +769,7 @@ class NoopPipeline extends Pipeline {
int textureFormat) {
}
+ @Override
void updateRegisterCombiners(Context ctx,
double[] transform, boolean isIdentity, int textureMode,
int perspCorrectionMode, float red,
@@ -721,11 +781,13 @@ class NoopPipeline extends Pipeline {
int combineRgbScale, int combineAlphaScale) {
}
+ @Override
void updateTextureColorTable(Context ctx, int numComponents,
int colorTableSize,
int[] colorTable) {
}
+ @Override
void updateCombiner(Context ctx,
int combineRgbMode, int combineAlphaMode,
int[] combineRgbSrc, int[] combineAlphaSrc,
@@ -740,6 +802,7 @@ class NoopPipeline extends Pipeline {
// TextureUnitStateRetained methods
//
+ @Override
void updateTextureUnitState(Context ctx, int unitIndex, boolean enableFlag) {
}
@@ -751,9 +814,11 @@ class NoopPipeline extends Pipeline {
// Texture2DRetained methods
//
+ @Override
void bindTexture2D(Context ctx, int objectId, boolean enable) {
}
+ @Override
void updateTexture2DImage(Context ctx,
int numLevels, int level,
int textureFormat, int imageFormat,
@@ -762,6 +827,7 @@ class NoopPipeline extends Pipeline {
int imageDataType, Object data, boolean useAutoMipMap) {
}
+ @Override
void updateTexture2DSubImage(Context ctx,
int level, int xoffset, int yoffset,
int textureFormat, int imageFormat,
@@ -770,36 +836,43 @@ class NoopPipeline extends Pipeline {
int imageDataType, Object data, boolean useAutoMipMap) {
}
+ @Override
void updateTexture2DLodRange(Context ctx,
int baseLevel, int maximumLevel,
float minimumLod, float maximumLod) {
}
+ @Override
void updateTexture2DLodOffset(Context ctx,
float lodOffsetX, float lodOffsetY,
float lodOffsetZ) {
}
+ @Override
void updateTexture2DBoundary(Context ctx,
int boundaryModeS, int boundaryModeT,
float boundaryRed, float boundaryGreen,
float boundaryBlue, float boundaryAlpha) {
}
+ @Override
void updateTexture2DFilterModes(Context ctx,
int minFilter, int magFilter) {
}
+ @Override
void updateTexture2DSharpenFunc(Context ctx,
int numSharpenTextureFuncPts,
float[] sharpenTextureFuncPts) {
}
+ @Override
void updateTexture2DFilter4Func(Context ctx,
int numFilter4FuncPts,
float[] filter4FuncPts) {
}
+ @Override
void updateTexture2DAnisotropicFilter(Context ctx, float degree) {
}
@@ -810,9 +883,11 @@ class NoopPipeline extends Pipeline {
// Texture3DRetained methods
//
+ @Override
void bindTexture3D(Context ctx, int objectId, boolean enable) {
}
+ @Override
void updateTexture3DImage(Context ctx,
int numLevels, int level,
int textureFormat, int imageFormat,
@@ -821,6 +896,7 @@ class NoopPipeline extends Pipeline {
int imageDataType, Object imageData, boolean useAutoMipMap) {
}
+ @Override
void updateTexture3DSubImage(Context ctx,
int level,
int xoffset, int yoffset, int zoffset,
@@ -831,16 +907,19 @@ class NoopPipeline extends Pipeline {
int imageTypeData, Object imageData, boolean useAutoMipMap) {
}
+ @Override
void updateTexture3DLodRange(Context ctx,
int baseLevel, int maximumLevel,
float minimumLod, float maximumLod) {
}
+ @Override
void updateTexture3DLodOffset(Context ctx,
float lodOffsetX, float lodOffsetY,
float lodOffsetZ) {
}
+ @Override
void updateTexture3DBoundary(Context ctx,
int boundaryModeS, int boundaryModeT,
int boundaryModeR, float boundaryRed,
@@ -848,20 +927,24 @@ class NoopPipeline extends Pipeline {
float boundaryAlpha) {
}
+ @Override
void updateTexture3DFilterModes(Context ctx,
int minFilter, int magFilter) {
}
+ @Override
void updateTexture3DSharpenFunc(Context ctx,
int numSharpenTextureFuncPts,
float[] sharpenTextureFuncPts) {
}
+ @Override
void updateTexture3DFilter4Func(Context ctx,
int numFilter4FuncPts,
float[] filter4FuncPts) {
}
+ @Override
void updateTexture3DAnisotropicFilter(Context ctx, float degree) {
}
@@ -872,9 +955,11 @@ class NoopPipeline extends Pipeline {
// TextureCubeMapRetained methods
//
+ @Override
void bindTextureCubeMap(Context ctx, int objectId, boolean enable) {
}
+ @Override
void updateTextureCubeMapImage(Context ctx,
int face, int numLevels, int level,
int textureFormat, int imageFormat,
@@ -883,6 +968,7 @@ class NoopPipeline extends Pipeline {
int imageDataType, Object imageData, boolean useAutoMipMap) {
}
+ @Override
void updateTextureCubeMapSubImage(Context ctx,
int face, int level, int xoffset, int yoffset,
int textureFormat, int imageFormat,
@@ -891,36 +977,43 @@ class NoopPipeline extends Pipeline {
int imageDataType, Object imageData, boolean useAutoMipMap) {
}
+ @Override
void updateTextureCubeMapLodRange(Context ctx,
int baseLevel, int maximumLevel,
float minimumLod, float maximumLod) {
}
+ @Override
void updateTextureCubeMapLodOffset(Context ctx,
float lodOffsetX, float lodOffsetY,
float lodOffsetZ) {
}
+ @Override
void updateTextureCubeMapBoundary(Context ctx,
int boundaryModeS, int boundaryModeT,
float boundaryRed, float boundaryGreen,
float boundaryBlue, float boundaryAlpha) {
}
+ @Override
void updateTextureCubeMapFilterModes(Context ctx,
int minFilter, int magFilter) {
}
+ @Override
void updateTextureCubeMapSharpenFunc(Context ctx,
int numSharpenTextureFuncPts,
float[] sharpenTextureFuncPts) {
}
+ @Override
void updateTextureCubeMapFilter4Func(Context ctx,
int numFilter4FuncPts,
float[] filter4FuncPts) {
}
+ @Override
void updateTextureCubeMapAnisotropicFilter(Context ctx, float degree) {
}
@@ -931,6 +1024,7 @@ class NoopPipeline extends Pipeline {
//
// Maximum lights supported by the native API
+ @Override
int getMaximumLights() {
return 8;
}
@@ -943,162 +1037,199 @@ class NoopPipeline extends Pipeline {
//
// This is the native method for creating the underlying graphics context.
+ @Override
Context createNewContext(Canvas3D cv, Drawable drawable,
Context shareCtx, boolean isSharedCtx,
boolean offScreen) {
return new NoopContext();
}
+ @Override
void createQueryContext(Canvas3D cv, Drawable drawable,
boolean offScreen, int width, int height) {
}
// This is the native for creating offscreen buffer
+ @Override
Drawable createOffScreenBuffer(Canvas3D cv, Context ctx, int width, int height) {
return null;
}
+ @Override
void destroyOffScreenBuffer(Canvas3D cv, Context ctx, Drawable drawable) {
}
// This is the native for reading the image from the offscreen buffer
+ @Override
void readOffScreenBuffer(Canvas3D cv, Context ctx, int format, int type, Object data, int width, int height) {
}
// The native method for swapBuffers
+@Override
void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {}
// native method for setting Material when no material is present
+ @Override
void updateMaterialColor(Context ctx, float r, float g, float b, float a) {
}
+ @Override
void destroyContext(Drawable drawable, Context ctx) {
}
// This is the native method for doing accumulation.
+ @Override
void accum(Context ctx, float value) {
}
// This is the native method for doing accumulation return.
+ @Override
void accumReturn(Context ctx) {
}
// This is the native method for clearing the accumulation buffer.
+ @Override
void clearAccum(Context ctx) {
}
// This is the native method for getting the number of lights the underlying
// native library can support.
+ @Override
int getNumCtxLights(Context ctx) {
return 0;
}
// Native method for decal 1st child setup
+ @Override
boolean decal1stChildSetup(Context ctx) {
return false;
}
// Native method for decal nth child setup
+ @Override
void decalNthChildSetup(Context ctx) {
}
// Native method for decal reset
+ @Override
void decalReset(Context ctx, boolean depthBufferEnable) {
}
// Native method for decal reset
+ @Override
void ctxUpdateEyeLightingEnable(Context ctx, boolean localEyeLightingEnable) {
}
// The following three methods are used in multi-pass case
// native method for setting blend color
+ @Override
void setBlendColor(Context ctx, float red, float green,
float blue, float alpha) {
}
// native method for setting blend func
+ @Override
void setBlendFunc(Context ctx, int src, int dst) {
}
// native method for setting fog enable flag
+ @Override
void setFogEnableFlag(Context ctx, boolean enableFlag) {
}
// Setup the full scene antialising in D3D and ogl when GL_ARB_multisamle supported
+ @Override
void setFullSceneAntialiasing(Context ctx, boolean enable) {
}
+ @Override
void setGlobalAlpha(Context ctx, float alpha) {
}
// Native method to update separate specular color control
+ @Override
void updateSeparateSpecularColorEnable(Context ctx, boolean control) {
}
// True under Solaris,
// False under windows when display mode <= 8 bit
+ @Override
boolean validGraphicsMode() {
return true;
}
// native method for setting light enables
+ @Override
void setLightEnables(Context ctx, long enableMask, int maxLights) {
}
// native method for setting scene ambient
+ @Override
void setSceneAmbient(Context ctx, float red, float green, float blue) {
}
// native method for disabling fog
+ @Override
void disableFog(Context ctx) {
}
// native method for disabling modelClip
+ @Override
void disableModelClip(Context ctx) {
}
// native method for setting default RenderingAttributes
+ @Override
void resetRenderingAttributes(Context ctx,
boolean depthBufferWriteEnableOverride,
boolean depthBufferEnableOverride) {
}
// native method for setting default texture
+ @Override
void resetTextureNative(Context ctx, int texUnitIndex) {
}
// native method for activating a particular texture unit
+ @Override
void activeTextureUnit(Context ctx, int texUnitIndex) {
}
// native method for setting default TexCoordGeneration
+ @Override
void resetTexCoordGeneration(Context ctx) {
}
// native method for setting default TextureAttributes
+ @Override
void resetTextureAttributes(Context ctx) {
}
// native method for setting default PolygonAttributes
+ @Override
void resetPolygonAttributes(Context ctx) {
}
// native method for setting default LineAttributes
+ @Override
void resetLineAttributes(Context ctx) {
}
// native method for setting default PointAttributes
+ @Override
void resetPointAttributes(Context ctx) {
}
// native method for setting default TransparencyAttributes
+ @Override
void resetTransparency(Context ctx, int geometryType,
int polygonMode, boolean lineAA,
boolean pointAA) {
}
// native method for setting default ColoringAttributes
+ @Override
void resetColoringAttributes(Context ctx,
float r, float g,
float b, float a,
@@ -1109,29 +1240,35 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {}
* This native method makes sure that the rendering for this canvas
* gets done now.
*/
+ @Override
void syncRender(Context ctx, boolean wait) {
}
// The native method that sets this ctx to be the current one
+ @Override
boolean useCtx(Context ctx, Drawable drawable) {
return true;
}
+ @Override
void clear(Context ctx, float r, float g, float b, boolean clearStencil) {
}
+ @Override
void textureFillBackground(Context ctx, float texMinU, float texMaxU, float texMinV, float texMaxV,
float mapMinX, float mapMaxX, float mapMinY, float mapMaxY, boolean useBiliearFilter) {
}
+ @Override
void textureFillRaster(Context ctx, float texMinU, float texMaxU, float texMinV, float texMaxV,
float mapMinX, float mapMaxX, float mapMinY, float mapMaxY, float mapZ, float alpha,
boolean useBiliearFilter) {
}
+ @Override
void executeRasterDepth(Context ctx, float posX, float posY, float posZ,
int srcOffsetX, int srcOffsetY, int rasterWidth, int rasterHeight,
int depthWidth, int depthHeight, int depthType, Object depthData) {
@@ -1139,36 +1276,47 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {}
}
// The native method for setting the ModelView matrix.
+ @Override
void setModelViewMatrix(Context ctx, double[] viewMatrix, double[] modelMatrix) {
}
// The native method for setting the Projection matrix.
+ @Override
void setProjectionMatrix(Context ctx, double[] projMatrix) {
}
+ @Override
void resizeOffscreenLayer(Canvas3D cv, int width, int height) {}
// The native method for setting the Viewport.
+ @Override
void setViewport(Context ctx, int x, int y, int width, int height) {
}
// used for display Lists
+ @Override
void newDisplayList(Context ctx, int displayListId) {
}
+ @Override
void endDisplayList(Context ctx) {
}
+ @Override
void callDisplayList(Context ctx, int id, boolean isNonUniformScale) {
}
+ @Override
void freeDisplayList(Context ctx, int id) {
}
+ @Override
void freeTexture(Context ctx, int id) {
}
+ @Override
int generateTexID(Context ctx) {
return 0;
}
+ @Override
void texturemapping(Context ctx,
int px, int py,
int xmin, int ymin, int xmax, int ymax,
@@ -1179,6 +1327,7 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {}
int winWidth, int winHeight) {
}
+ @Override
boolean initTexturemapping(Context ctx, int texWidth,
int texHeight, int objectId) {
return true;
@@ -1190,10 +1339,12 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {}
// stereo is available before setting the mode to FIELD_LEFT or
// FIELD_RIGHT. The boolean isTRUE for double buffered mode, FALSE
// foe single buffering.
+ @Override
void setRenderMode(Context ctx, int mode, boolean doubleBuffer) {
}
// Set glDepthMask.
+ @Override
void setDepthBufferWriteEnable(Context ctx, boolean mode) {
}
@@ -1210,12 +1361,14 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {}
// GraphicsConfigTemplate3D.
// This method must return a valid GraphicsConfig, or else it must throw
// an exception if one cannot be returned.
+ @Override
GraphicsConfiguration getGraphicsConfig(GraphicsConfiguration gconfig) {
System.err.println("NoopPipeline.getGraphicsConfig()");
return gconfig;
}
// Get best graphics config from pipeline
+ @Override
GraphicsConfiguration getBestConfiguration(GraphicsConfigTemplate3D gct,
GraphicsConfiguration[] gc) {
@@ -1233,32 +1386,39 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {}
}
// Determine whether specified graphics config is supported by pipeline
+ @Override
boolean isGraphicsConfigSupported(GraphicsConfigTemplate3D gct,
GraphicsConfiguration gc) {
return true;
}
// Methods to get actual capabilities from Canvas3D
+ @Override
boolean hasDoubleBuffer(Canvas3D cv) {
return true;
}
+ @Override
boolean hasStereo(Canvas3D cv) {
return false;
}
+ @Override
int getStencilSize(Canvas3D cv) {
return 0;
}
+ @Override
boolean hasSceneAntialiasingMultisample(Canvas3D cv) {
return false;
}
+ @Override
boolean hasSceneAntialiasingAccum(Canvas3D cv) {
return false;
}
+ @Override
int getScreen(GraphicsDevice graphicsDevice) {
return 0;
}
@@ -1271,16 +1431,19 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {}
//
// Method to construct a new DrawingSurfaceObject
+ @Override
DrawingSurfaceObject createDrawingSurfaceObject(Canvas3D cv) {
return new NoopDrawingSurfaceObject(cv);
}
// Method to free the drawing surface object
+ @Override
void freeDrawingSurface(Canvas3D cv, DrawingSurfaceObject drawingSurfaceObject) {
// This method is a no-op
}
// Method to free the native drawing surface object
+ @Override
void freeDrawingSurfaceNative(Object o) {
// This method is a no-op
}
diff --git a/src/classes/share/javax/media/j3d/NotificationThread.java b/src/classes/share/javax/media/j3d/NotificationThread.java
index 630f37c..c76c26d 100644
--- a/src/classes/share/javax/media/j3d/NotificationThread.java
+++ b/src/classes/share/javax/media/j3d/NotificationThread.java
@@ -96,6 +96,7 @@ class NotificationThread extends Thread {
runMonitor(STOP);
}
+ @Override
public void run() {
while (running) {
runMonitor(WAIT);
diff --git a/src/classes/share/javax/media/j3d/OrderedCollection.java b/src/classes/share/javax/media/j3d/OrderedCollection.java
index ba96463..0b28118 100644
--- a/src/classes/share/javax/media/j3d/OrderedCollection.java
+++ b/src/classes/share/javax/media/j3d/OrderedCollection.java
@@ -48,6 +48,7 @@ ArrayList<OrderedBin> childOrderedBins = new ArrayList<OrderedBin>();
boolean onUpdateList = false;
+ @Override
public void updateObject() {
int i;
LightBin lb;
diff --git a/src/classes/share/javax/media/j3d/OrderedGroup.java b/src/classes/share/javax/media/j3d/OrderedGroup.java
index 69e2505..4b50077 100644
--- a/src/classes/share/javax/media/j3d/OrderedGroup.java
+++ b/src/classes/share/javax/media/j3d/OrderedGroup.java
@@ -242,6 +242,7 @@ public class OrderedGroup extends Group {
*
* @since Java 3D 1.3
*/
+ @Override
public void addChild(Node child) {
// Just call super -- the extra work is done by the retained class
super.addChild(child);
@@ -272,6 +273,7 @@ public class OrderedGroup extends Group {
*
* @since Java 3D 1.3
*/
+ @Override
public void insertChild(Node child, int index) {
if (((OrderedGroupRetained)retained).userChildIndexOrder != null) {
throw new IllegalStateException(J3dI18N.getString("OrderedGroup6"));
@@ -308,6 +310,7 @@ public class OrderedGroup extends Group {
*
* @since Java 3D 1.3
*/
+ @Override
public void removeChild(int index) {
// Just call super -- the extra work is done by the retained class
super.removeChild(index);
@@ -331,6 +334,7 @@ public class OrderedGroup extends Group {
*
* @since Java 3D 1.3
*/
+ @Override
public void moveTo(BranchGroup branchGroup) {
// Just call super -- the extra work is done by the retained class
super.moveTo(branchGroup);
@@ -361,6 +365,7 @@ public class OrderedGroup extends Group {
*
* @since Java 3D 1.3
*/
+ @Override
public void removeChild(Node child) {
// Just call super -- the extra work is done by the retained class
super.removeChild(child);
@@ -384,6 +389,7 @@ public class OrderedGroup extends Group {
*
* @since Java 3D 1.3
*/
+ @Override
public void removeAllChildren() {
// Just call super -- the extra work is done by the retained class
super.removeAllChildren();
@@ -394,6 +400,7 @@ public class OrderedGroup extends Group {
* Creates the retained mode OrderedGroupRetained object that this
* OrderedGroup component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new OrderedGroupRetained();
this.retained.setSource(this);
@@ -470,6 +477,7 @@ public class OrderedGroup extends Group {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
OrderedGroup og = new OrderedGroup();
og.duplicateNode(this, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/OrderedGroupRetained.java b/src/classes/share/javax/media/j3d/OrderedGroupRetained.java
index 2b2535d..bcf4e36 100644
--- a/src/classes/share/javax/media/j3d/OrderedGroupRetained.java
+++ b/src/classes/share/javax/media/j3d/OrderedGroupRetained.java
@@ -136,6 +136,7 @@ ArrayList<ArrayList<OrderedPath>> childrenOrderedPaths = new ArrayList<ArrayList
return count;
}
+ @Override
void addChild(Node child) {
if(userChildIndexOrder != null) {
doAddChildIndexEntry();
@@ -164,6 +165,7 @@ ArrayList<ArrayList<OrderedPath>> childrenOrderedPaths = new ArrayList<ArrayList
}
+ @Override
void moveTo(BranchGroup bg) {
if(userChildIndexOrder != null) {
doAddChildIndexEntry();
@@ -209,6 +211,7 @@ ArrayList<ArrayList<OrderedPath>> childrenOrderedPaths = new ArrayList<ArrayList
* Compiles the children of the OrderedGroup, preventing shape merging at
* this level or above
*/
+ @Override
void compile(CompileState compState) {
super.compile(compState);
@@ -307,6 +310,7 @@ OrderedBin getOrderedBin(int index) {
}
+ @Override
void setAuxData(SetLiveState s, int index, int hkIndex) {
OrderedPath setLiveStateOrderedPath = s.orderedPaths.get(hkIndex);
for (int i=0; i<children.size(); i++) {
@@ -324,6 +328,7 @@ OrderedBin getOrderedBin(int index) {
}
+ @Override
void setLive(SetLiveState s) {
super.setLive(s);
s.orderedPaths = orderedPaths;
@@ -337,6 +342,7 @@ OrderedBin getOrderedBin(int index) {
}
}
+ @Override
void clearLive(SetLiveState s) {
super.clearLive(s);
// This is used to clear the childIdTable and set the orderedBin
@@ -353,6 +359,7 @@ OrderedBin getOrderedBin(int index) {
s.orderedPaths = orderedPaths;
}
+ @Override
void setNodeData(SetLiveState s) {
super.setNodeData(s);
if (!inSharedGroup) {
@@ -377,6 +384,7 @@ OrderedBin getOrderedBin(int index) {
// for each of its children
}
+ @Override
void removeNodeData(SetLiveState s) {
if((inSharedGroup) && (s.keys.length != localToVworld.length)) {
@@ -443,14 +451,17 @@ OrderedBin getOrderedBin(int index) {
System.err.println("");
}
+ @Override
void insertChildrenData(int index) {
childrenOrderedPaths.add(index, new ArrayList<OrderedPath>(1));
}
+ @Override
void appendChildrenData() {
childrenOrderedPaths.add(new ArrayList<OrderedPath>(1));
}
+ @Override
void doRemoveChild(int index, J3dMessage messages[], int messageIndex) {
if(userChildIndexOrder != null) {
@@ -461,10 +472,12 @@ OrderedBin getOrderedBin(int index) {
}
+ @Override
void removeChildrenData(int index) {
childrenOrderedPaths.remove(index);
}
+ @Override
void childDoSetLive(NodeRetained child, int childIndex, SetLiveState s) {
if (refCount == s.refCount) {
s.ogList.add(this);
@@ -476,6 +489,7 @@ OrderedBin getOrderedBin(int index) {
child.setLive(s);
}
+ @Override
void childCheckSetLive(NodeRetained child, int childIndex,
SetLiveState s, NodeRetained linkNode) {
ArrayList<OrderedPath> childOrderedPaths;
diff --git a/src/classes/share/javax/media/j3d/OrientedShape3D.java b/src/classes/share/javax/media/j3d/OrientedShape3D.java
index 74f3f1c..0dd1418 100644
--- a/src/classes/share/javax/media/j3d/OrientedShape3D.java
+++ b/src/classes/share/javax/media/j3d/OrientedShape3D.java
@@ -327,6 +327,7 @@ public class OrientedShape3D extends Shape3D {
* Creates the retained mode OrientedShape3DRetained object that this
* OrientedShape3D object will point to.
*/
+ @Override
void createRetained() {
retained = new OrientedShape3DRetained();
retained.setSource(this);
@@ -606,6 +607,7 @@ public class OrientedShape3D extends Shape3D {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
OrientedShape3D s = new OrientedShape3D();
s.duplicateNode(this, forceDuplicate);
@@ -643,6 +645,7 @@ public class OrientedShape3D extends Shape3D {
* @see Node#cloneNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public void duplicateNode(Node originalNode, boolean forceDuplicate) {
checkDuplicateNode(originalNode, forceDuplicate);
}
@@ -670,6 +673,7 @@ public class OrientedShape3D extends Shape3D {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/OrientedShape3DRenderMethod.java b/src/classes/share/javax/media/j3d/OrientedShape3DRenderMethod.java
index 9fb08d3..ae85f8c 100644
--- a/src/classes/share/javax/media/j3d/OrientedShape3DRenderMethod.java
+++ b/src/classes/share/javax/media/j3d/OrientedShape3DRenderMethod.java
@@ -35,6 +35,7 @@ package javax.media.j3d;
class OrientedShape3DRenderMethod implements RenderMethod {
+ @Override
public boolean render(RenderMolecule rm, Canvas3D cv,
RenderAtomListInfo ra, int dirtyBits) {
boolean useAlpha;
diff --git a/src/classes/share/javax/media/j3d/OrientedShape3DRetained.java b/src/classes/share/javax/media/j3d/OrientedShape3DRetained.java
index 643bb2b..5bdf87c 100644
--- a/src/classes/share/javax/media/j3d/OrientedShape3DRetained.java
+++ b/src/classes/share/javax/media/j3d/OrientedShape3DRetained.java
@@ -261,6 +261,7 @@ class OrientedShape3DRetained extends Shape3DRetained {
VirtualUniverse.mc.processMessage(changeMessage);
}
+ @Override
void updateImmediateMirrorObject(Object[] args) {
int component = ((Integer)args[1]).intValue();
if ((component & (ALIGNMENT_CHANGED |
@@ -591,6 +592,7 @@ class OrientedShape3DRetained extends Shape3DRetained {
return true;
}
+ @Override
void compile(CompileState compState) {
super.compile(compState);
@@ -604,6 +606,7 @@ class OrientedShape3DRetained extends Shape3DRetained {
compState.keepTG = true;
}
+ @Override
void searchGeometryAtoms(UnorderList list) {
list.add(getGeomAtom(getMirrorShape(key)));
}
diff --git a/src/classes/share/javax/media/j3d/PathInterpolator.java b/src/classes/share/javax/media/j3d/PathInterpolator.java
index 451241e..0d67bbe 100644
--- a/src/classes/share/javax/media/j3d/PathInterpolator.java
+++ b/src/classes/share/javax/media/j3d/PathInterpolator.java
@@ -275,6 +275,7 @@ public abstract class PathInterpolator extends TransformInterpolator {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/PhysicalBody.java b/src/classes/share/javax/media/j3d/PhysicalBody.java
index b263551..7b1153c 100644
--- a/src/classes/share/javax/media/j3d/PhysicalBody.java
+++ b/src/classes/share/javax/media/j3d/PhysicalBody.java
@@ -185,6 +185,7 @@ synchronized void addUser(View view) {
* Returns a string representation of this PhysicalBody's values.
*/
+ @Override
public String toString() {
return "eyePosition = (" + this.leftEyePosition + ", " +
this.rightEyePosition + ")\n" +
diff --git a/src/classes/share/javax/media/j3d/PickBounds.java b/src/classes/share/javax/media/j3d/PickBounds.java
index 3cca06c..60d1ec1 100644
--- a/src/classes/share/javax/media/j3d/PickBounds.java
+++ b/src/classes/share/javax/media/j3d/PickBounds.java
@@ -76,12 +76,14 @@ public final class PickBounds extends PickShape {
* Return true if shape intersect with bounds.
* The point of intersection is stored in pickPos.
*/
+ @Override
final boolean intersect(Bounds bounds, Point4d pickPos) {
return bounds.intersect(this.bounds, pickPos);
}
// Only use within J3D.
// Return a new PickBounds that is the transformed (t3d) of this pickBounds.
+ @Override
PickShape transform(Transform3D t3d) {
// If the bounds is a BoundingBox, then the transformed bounds will
// get bigger. So this is a potential bug, and we'll have to deal with
@@ -93,10 +95,12 @@ public final class PickBounds extends PickShape {
return newPB;
}
+ @Override
Point3d getStartPoint() {
return bounds.getCenter();
}
+ @Override
int getPickType() {
return (bounds != null ? bounds.getPickType() :
PickShape.PICKUNKNOWN);
diff --git a/src/classes/share/javax/media/j3d/PickCone.java b/src/classes/share/javax/media/j3d/PickCone.java
index 5a32c6d..6dd3893 100644
--- a/src/classes/share/javax/media/j3d/PickCone.java
+++ b/src/classes/share/javax/media/j3d/PickCone.java
@@ -93,12 +93,15 @@ public abstract class PickCone extends PickShape {
* Return true if shape intersect with bounds.
* The point of intersection is stored in pickPos.
*/
+ @Override
abstract boolean intersect(Bounds bounds, Point4d pickPos);
+ @Override
Point3d getStartPoint() {
return origin;
}
+ @Override
int getPickType() {
return PICKCONE;
}
diff --git a/src/classes/share/javax/media/j3d/PickConeRay.java b/src/classes/share/javax/media/j3d/PickConeRay.java
index d3f5465..d853508 100644
--- a/src/classes/share/javax/media/j3d/PickConeRay.java
+++ b/src/classes/share/javax/media/j3d/PickConeRay.java
@@ -82,6 +82,7 @@ public final class PickConeRay extends PickCone {
* @param pickPos the location of the point of intersection (not used for
* method. Provided for compatibility).
*/
+ @Override
final boolean intersect(Bounds bounds, Point4d pickPos) {
Point4d iPnt = new Point4d();
@@ -250,6 +251,7 @@ public final class PickConeRay extends PickCone {
// Only use within J3D.
// Return a new PickConeRay that is the transformed (t3d) of this pickConeRay.
+ @Override
PickShape transform(Transform3D t3d) {
Point3d end = new Point3d();
diff --git a/src/classes/share/javax/media/j3d/PickConeSegment.java b/src/classes/share/javax/media/j3d/PickConeSegment.java
index e62b024..b7b7f62 100644
--- a/src/classes/share/javax/media/j3d/PickConeSegment.java
+++ b/src/classes/share/javax/media/j3d/PickConeSegment.java
@@ -106,6 +106,7 @@ public final class PickConeSegment extends PickCone {
* @param pickPos the location of the point of intersection (not used for
* method. Provided for compatibility).
*/
+ @Override
final boolean intersect(Bounds bounds, Point4d pickPos) {
Point4d iPnt = new Point4d();
Vector3d vector = new Vector3d();
@@ -279,6 +280,7 @@ public final class PickConeSegment extends PickCone {
// Only use within J3D.
// Return a new PickConeSegment that is the transformed (t3d) of this pickConeSegment.
+ @Override
PickShape transform(Transform3D t3d) {
PickConeSegment newPCS = new PickConeSegment();
diff --git a/src/classes/share/javax/media/j3d/PickCylinder.java b/src/classes/share/javax/media/j3d/PickCylinder.java
index 3411298..ff590a1 100644
--- a/src/classes/share/javax/media/j3d/PickCylinder.java
+++ b/src/classes/share/javax/media/j3d/PickCylinder.java
@@ -84,6 +84,7 @@ public abstract class PickCylinder extends PickShape {
* Return true if shape intersect with bounds.
* The point of intersection is stored in pickPos.
*/
+ @Override
abstract boolean intersect(Bounds bounds, Point4d pickPos);
// This is a duplicate of the same method, declared private inside of
@@ -104,10 +105,12 @@ public abstract class PickCylinder extends PickShape {
return true;
}
+ @Override
Point3d getStartPoint() {
return origin;
}
+ @Override
int getPickType() {
return PICKCYLINDER;
}
diff --git a/src/classes/share/javax/media/j3d/PickCylinderRay.java b/src/classes/share/javax/media/j3d/PickCylinderRay.java
index 0d3c4c2..62195dd 100644
--- a/src/classes/share/javax/media/j3d/PickCylinderRay.java
+++ b/src/classes/share/javax/media/j3d/PickCylinderRay.java
@@ -84,6 +84,7 @@ public final class PickCylinderRay extends PickCylinder {
* @param pickPos the location of the point of intersection (not used for
* method. Provided for compatibility).
*/
+ @Override
final boolean intersect(Bounds bounds, Point4d pickPos) {
Point4d iPnt = new Point4d();
@@ -228,6 +229,7 @@ public final class PickCylinderRay extends PickCylinder {
// Only use within J3D.
// Return a new PickCylinderRay that is the transformed (t3d) of this pickCylinderRay.
+ @Override
PickShape transform(Transform3D t3d) {
PickCylinderRay newPCR = new PickCylinderRay();
diff --git a/src/classes/share/javax/media/j3d/PickCylinderSegment.java b/src/classes/share/javax/media/j3d/PickCylinderSegment.java
index 2626d07..9d33626 100644
--- a/src/classes/share/javax/media/j3d/PickCylinderSegment.java
+++ b/src/classes/share/javax/media/j3d/PickCylinderSegment.java
@@ -105,6 +105,7 @@ public final class PickCylinderSegment extends PickCylinder {
* @param pickPos the location of the point of intersection (not used for
* method. Provided for compatibility).
*/
+ @Override
final boolean intersect(Bounds bounds, Point4d pickPos) {
Point4d iPnt = new Point4d();
@@ -247,6 +248,7 @@ public final class PickCylinderSegment extends PickCylinder {
// Only use within J3D.
// Return a new PickCylinderSegment that is the transformed (t3d) of this
// pickCylinderSegment.
+ @Override
PickShape transform(Transform3D t3d) {
PickCylinderSegment newPCS = new PickCylinderSegment();
diff --git a/src/classes/share/javax/media/j3d/PickPoint.java b/src/classes/share/javax/media/j3d/PickPoint.java
index 1f7e2dd..a794d22 100644
--- a/src/classes/share/javax/media/j3d/PickPoint.java
+++ b/src/classes/share/javax/media/j3d/PickPoint.java
@@ -84,12 +84,14 @@ public final class PickPoint extends PickShape {
* Return true if shape intersect with bounds.
* The point of intersection is stored in pickPos.
*/
+ @Override
final boolean intersect(Bounds bounds, Point4d pickPos) {
return bounds.intersect(location, pickPos);
}
// Only use within J3D.
// Return a new PickPoint that is the transformed (t3d) of this pickPoint.
+ @Override
PickShape transform(Transform3D t3d) {
PickPoint newPPt = new PickPoint();
@@ -103,10 +105,12 @@ public final class PickPoint extends PickShape {
return newPPt;
}
+ @Override
Point3d getStartPoint() {
return location;
}
+ @Override
int getPickType() {
return PICKPOINT;
}
diff --git a/src/classes/share/javax/media/j3d/PickRay.java b/src/classes/share/javax/media/j3d/PickRay.java
index 02a418d..ed88da2 100644
--- a/src/classes/share/javax/media/j3d/PickRay.java
+++ b/src/classes/share/javax/media/j3d/PickRay.java
@@ -96,6 +96,7 @@ public final class PickRay extends PickShape {
* Return true if shape intersect with bounds.
* The point of intersection is stored in pickPos.
*/
+ @Override
final boolean intersect(Bounds bounds, Point4d pickPos) {
return bounds.intersect(origin, direction, pickPos);
}
@@ -103,6 +104,7 @@ public final class PickRay extends PickShape {
// Only use within J3D.
// Return a new PickRay that is the transformed (t3d) of this pickRay.
+ @Override
PickShape transform(Transform3D t3d) {
Point3d end = new Point3d();
@@ -125,10 +127,12 @@ public final class PickRay extends PickShape {
}
+ @Override
Point3d getStartPoint() {
return origin;
}
+ @Override
int getPickType() {
return PICKRAY;
}
diff --git a/src/classes/share/javax/media/j3d/PickSegment.java b/src/classes/share/javax/media/j3d/PickSegment.java
index 9b9a4d7..2f86358 100644
--- a/src/classes/share/javax/media/j3d/PickSegment.java
+++ b/src/classes/share/javax/media/j3d/PickSegment.java
@@ -96,6 +96,7 @@ public final class PickSegment extends PickShape {
* Return true if shape intersect with bounds.
* The point of intersection is stored in pickPos.
*/
+ @Override
final boolean intersect(Bounds bounds, Point4d pickPos) {
return bounds.intersect(start, end, pickPos);
}
@@ -104,6 +105,7 @@ public final class PickSegment extends PickShape {
// Only use within J3D.
// Return a new PickSegment that is the transformed (t3d) of this pickSegment.
+ @Override
PickShape transform(Transform3D t3d) {
PickSegment newPS = new PickSegment(start, end);
t3d.transform(newPS.start);
@@ -111,10 +113,12 @@ public final class PickSegment extends PickShape {
return newPS;
}
+ @Override
Point3d getStartPoint() {
return start;
}
+ @Override
int getPickType() {
return PICKSEGMENT;
}
diff --git a/src/classes/share/javax/media/j3d/Pipeline.java b/src/classes/share/javax/media/j3d/Pipeline.java
index b42cf13..45596e5 100644
--- a/src/classes/share/javax/media/j3d/Pipeline.java
+++ b/src/classes/share/javax/media/j3d/Pipeline.java
@@ -66,6 +66,7 @@ PipelineCreator(Type type) {
pipeType = type;
}
+@Override
public Pipeline run() {
try {
switch (pipeType) {
diff --git a/src/classes/share/javax/media/j3d/PointArray.java b/src/classes/share/javax/media/j3d/PointArray.java
index bfe705c..bfe6fae 100644
--- a/src/classes/share/javax/media/j3d/PointArray.java
+++ b/src/classes/share/javax/media/j3d/PointArray.java
@@ -149,6 +149,7 @@ public class PointArray extends GeometryArray {
* Creates the retained mode PointArrayRetained object that this
* PointArray object will point to.
*/
+ @Override
void createRetained() {
this.retained = new PointArrayRetained();
this.retained.setSource(this);
@@ -158,6 +159,7 @@ public class PointArray extends GeometryArray {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
PointArrayRetained rt = (PointArrayRetained) retained;
int texSetCount = rt.getTexCoordSetCount();
diff --git a/src/classes/share/javax/media/j3d/PointArrayRetained.java b/src/classes/share/javax/media/j3d/PointArrayRetained.java
index 26c9551..77e2433 100644
--- a/src/classes/share/javax/media/j3d/PointArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/PointArrayRetained.java
@@ -39,6 +39,7 @@ class PointArrayRetained extends GeometryArrayRetained {
this.geoType = GEO_TYPE_POINT_SET;
}
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
double sdist[] = new double[1];
@@ -211,6 +212,7 @@ class PointArrayRetained extends GeometryArrayRetained {
return false;
}
+ @Override
boolean intersect(Point3d[] pnts) {
Point3d point = new Point3d();
int i = ((vertexFormat & GeometryArray.BY_REFERENCE) == 0 ?
@@ -264,6 +266,7 @@ class PointArrayRetained extends GeometryArrayRetained {
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld,
GeometryRetained geom) {
@@ -283,6 +286,7 @@ class PointArrayRetained extends GeometryArrayRetained {
}
// the bounds argument is already transformed
+ @Override
boolean intersect(Bounds targetBound) {
int i = ((vertexFormat & GeometryArray.BY_REFERENCE) == 0 ?
initialVertexIndex : initialCoordIndex);
@@ -297,6 +301,7 @@ class PointArrayRetained extends GeometryArrayRetained {
return false;
}
+ @Override
int getClassType() {
return POINT_TYPE;
}
diff --git a/src/classes/share/javax/media/j3d/PointAttributes.java b/src/classes/share/javax/media/j3d/PointAttributes.java
index 3fb3031..2c5135a 100644
--- a/src/classes/share/javax/media/j3d/PointAttributes.java
+++ b/src/classes/share/javax/media/j3d/PointAttributes.java
@@ -186,6 +186,7 @@ public class PointAttributes extends NodeComponent {
* Creates a retained mode PointAttributesRetained object that this
* PointAttributes component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new PointAttributesRetained();
this.retained.setSource(this);
@@ -194,6 +195,7 @@ public class PointAttributes extends NodeComponent {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
PointAttributes pa = new PointAttributes();
pa.duplicateNodeComponent(this);
@@ -218,6 +220,7 @@ public class PointAttributes extends NodeComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/PointAttributesRetained.java b/src/classes/share/javax/media/j3d/PointAttributesRetained.java
index cf0787a..3025fa9 100644
--- a/src/classes/share/javax/media/j3d/PointAttributesRetained.java
+++ b/src/classes/share/javax/media/j3d/PointAttributesRetained.java
@@ -105,6 +105,7 @@ class PointAttributesRetained extends NodeComponentRetained {
* Creates and initializes a mirror object, point the mirror object
* to the retained object if the object is not editable
*/
+ @Override
synchronized void createMirrorObject() {
if (mirror == null) {
// Check the capability bits and let the mirror object
@@ -135,6 +136,7 @@ class PointAttributesRetained extends NodeComponentRetained {
* Initializes a mirror object, point the mirror object to the retained
* object if the object is not editable
*/
+ @Override
synchronized void initMirrorObject() {
((PointAttributesRetained)mirror).set(this);
}
@@ -144,6 +146,7 @@ class PointAttributesRetained extends NodeComponentRetained {
* Update the "component" field of the mirror object with the
* given "value"
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
PointAttributesRetained mirrorPa = (PointAttributesRetained) mirror;
@@ -207,6 +210,7 @@ class PointAttributesRetained extends NodeComponentRetained {
}
}
+ @Override
void handleFrequencyChange(int bit) {
if (bit == PointAttributes.ALLOW_SIZE_WRITE ||
bit == PointAttributes.ALLOW_ANTIALIASING_WRITE) {
diff --git a/src/classes/share/javax/media/j3d/PointLight.java b/src/classes/share/javax/media/j3d/PointLight.java
index fcae2a7..67ee2a9 100644
--- a/src/classes/share/javax/media/j3d/PointLight.java
+++ b/src/classes/share/javax/media/j3d/PointLight.java
@@ -155,6 +155,7 @@ public class PointLight extends Light {
* Creates the retained mode PointLightRetained object that this
* PointLight component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new PointLightRetained();
this.retained.setSource(this);
@@ -278,6 +279,7 @@ public class PointLight extends Light {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
PointLight p = new PointLight();
p.duplicateNode(this, forceDuplicate);
@@ -306,6 +308,7 @@ public class PointLight extends Light {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/PointLightRetained.java b/src/classes/share/javax/media/j3d/PointLightRetained.java
index efb06e4..4ea69d7 100644
--- a/src/classes/share/javax/media/j3d/PointLightRetained.java
+++ b/src/classes/share/javax/media/j3d/PointLightRetained.java
@@ -185,6 +185,7 @@ class PointLightRetained extends LightRetained {
* updates a point light. This includes its color, attenuation,
* and its transformed position.
*/
+ @Override
void update(Context ctx, int lightSlot, double scale) {
validateAttenuationInEc(scale);
Pipeline.getPipeline().updatePointLight(ctx,
@@ -195,6 +196,7 @@ class PointLightRetained extends LightRetained {
xformPosition.z);
}
+ @Override
void setLive(SetLiveState s) {
super.setLive(s);
J3dMessage createMessage = super.initMessage(9);
@@ -208,10 +210,12 @@ class PointLightRetained extends LightRetained {
// This is called only from SpotLightRetained, so as
// to not create a message for initialization. for spotlight
// the initialization of the message is done by SpotLightRetained
+ @Override
void doSetLive(SetLiveState s) {
super.setLive(s);
}
+ @Override
J3dMessage initMessage(int num) {
J3dMessage createMessage = super.initMessage(num);
Object[] objs = (Object[])createMessage.args[4];
@@ -223,6 +227,7 @@ class PointLightRetained extends LightRetained {
// Note : if you add any more fields here , you need to update
// updateLight() in RenderingEnvironmentStructure
+ @Override
void updateMirrorObject(Object[] objs) {
int component = ((Integer)objs[1]).intValue();
@@ -283,6 +288,7 @@ class PointLightRetained extends LightRetained {
// Clones only the retained side, internal use only
+ @Override
protected Object clone() {
PointLightRetained pr =
(PointLightRetained)super.clone();
@@ -295,6 +301,7 @@ class PointLightRetained extends LightRetained {
// Called on the mirror object
+ @Override
void updateTransformChange() {
super.updateTransformChange();
@@ -306,6 +313,7 @@ class PointLightRetained extends LightRetained {
validateAttenuationInEc(0.0861328125);
}
+ @Override
void sendMessage(int attrMask, Object attr) {
J3dMessage createMessage = new J3dMessage();
@@ -323,6 +331,7 @@ class PointLightRetained extends LightRetained {
VirtualUniverse.mc.processMessage(createMessage);
}
+ @Override
void mergeTransform(TransformGroupRetained xform) {
super.mergeTransform(xform);
xform.transform.transform(position, position);
diff --git a/src/classes/share/javax/media/j3d/PointSound.java b/src/classes/share/javax/media/j3d/PointSound.java
index 4f7a396..907bf5c 100644
--- a/src/classes/share/javax/media/j3d/PointSound.java
+++ b/src/classes/share/javax/media/j3d/PointSound.java
@@ -343,6 +343,7 @@ public class PointSound extends Sound {
* Creates the retained mode PointSoundRetained object that this
* PointSound object will point to.
*/
+ @Override
void createRetained() {
this.retained = new PointSoundRetained();
this.retained.setSource(this);
@@ -493,6 +494,7 @@ public class PointSound extends Sound {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
PointSound p = new PointSound();
p.duplicateNode(this, forceDuplicate);
@@ -530,6 +532,7 @@ public class PointSound extends Sound {
* @see Node#cloneNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public void duplicateNode(Node originalNode, boolean forceDuplicate) {
checkDuplicateNode(originalNode, forceDuplicate);
}
@@ -556,6 +559,7 @@ public class PointSound extends Sound {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/PointSoundRetained.java b/src/classes/share/javax/media/j3d/PointSoundRetained.java
index 1c8c9e1..14117a9 100644
--- a/src/classes/share/javax/media/j3d/PointSoundRetained.java
+++ b/src/classes/share/javax/media/j3d/PointSoundRetained.java
@@ -252,6 +252,7 @@ class PointSoundRetained extends SoundRetained {
*
* Distance gain attenuation field not maintained in mirror object.
*/
+ @Override
void updateMirrorObject(Object[] objs) {
if (debugFlag)
debugPrint("PointSoundRetained:updateMirrorObj()");
@@ -286,6 +287,7 @@ class PointSoundRetained extends SoundRetained {
}
// Called on the mirror object
+ @Override
void updateTransformChange() {
super.updateTransformChange();
getLastLocalToVworld().transform(position, xformPosition);
@@ -296,6 +298,7 @@ class PointSoundRetained extends SoundRetained {
", " + xformPosition.y + ", "+ xformPosition.z + ")");
}
+ @Override
void mergeTransform(TransformGroupRetained xform) {
super.mergeTransform(xform);
xform.transform.transform(position, position);
diff --git a/src/classes/share/javax/media/j3d/PolygonAttributes.java b/src/classes/share/javax/media/j3d/PolygonAttributes.java
index 758b024..4713806 100644
--- a/src/classes/share/javax/media/j3d/PolygonAttributes.java
+++ b/src/classes/share/javax/media/j3d/PolygonAttributes.java
@@ -439,6 +439,7 @@ public class PolygonAttributes extends NodeComponent {
* Creates a retained mode PolygonAttributesRetained object that this
* PolygonAttributes component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new PolygonAttributesRetained();
this.retained.setSource(this);
@@ -447,6 +448,7 @@ public class PolygonAttributes extends NodeComponent {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
PolygonAttributes pga = new PolygonAttributes();
pga.duplicateNodeComponent(this);
@@ -472,6 +474,7 @@ public class PolygonAttributes extends NodeComponent {
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
diff --git a/src/classes/share/javax/media/j3d/PolygonAttributesRetained.java b/src/classes/share/javax/media/j3d/PolygonAttributesRetained.java
index 7c1ae36..53f25e1 100644
--- a/src/classes/share/javax/media/j3d/PolygonAttributesRetained.java
+++ b/src/classes/share/javax/media/j3d/PolygonAttributesRetained.java
@@ -228,6 +228,7 @@ class PolygonAttributesRetained extends NodeComponentRetained {
* Creates and initializes a mirror object, point the mirror object
* to the retained object if the object is not editable
*/
+ @Override
synchronized void createMirrorObject() {
if (mirror == null) {
// Check the capability bits and let the mirror object
@@ -259,6 +260,7 @@ class PolygonAttributesRetained extends NodeComponentRetained {
* Initializes a mirror object, point the mirror object to the retained
* object if the object is not editable
*/
+ @Override
synchronized void initMirrorObject() {
((PolygonAttributesRetained) mirror).set(this);
}
@@ -267,6 +269,7 @@ class PolygonAttributesRetained extends NodeComponentRetained {
* Update the "component" field of the mirror object with the
* given "value"
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
PolygonAttributesRetained mirrorPa = (PolygonAttributesRetained) mirror;
@@ -344,6 +347,7 @@ class PolygonAttributesRetained extends NodeComponentRetained {
}
+ @Override
void handleFrequencyChange(int bit) {
if (bit == PolygonAttributes.ALLOW_CULL_FACE_WRITE ||
bit == PolygonAttributes.ALLOW_NORMAL_FLIP_WRITE||
diff --git a/src/classes/share/javax/media/j3d/PositionInterpolator.java b/src/classes/share/javax/media/j3d/PositionInterpolator.java
index c0cf8d2..83ad045 100644
--- a/src/classes/share/javax/media/j3d/PositionInterpolator.java
+++ b/src/classes/share/javax/media/j3d/PositionInterpolator.java
@@ -153,6 +153,7 @@ public class PositionInterpolator extends TransformInterpolator {
*
* @since Java 3D 1.3
*/
+ @Override
public void computeTransform(float alphaValue, Transform3D transform) {
double val = (1.0-alphaValue)*startPosition + alphaValue*endPosition;
@@ -179,6 +180,7 @@ public class PositionInterpolator extends TransformInterpolator {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
PositionInterpolator pi = new PositionInterpolator();
pi.duplicateNode(this, forceDuplicate);
@@ -206,6 +208,7 @@ public class PositionInterpolator extends TransformInterpolator {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/PositionPathInterpolator.java b/src/classes/share/javax/media/j3d/PositionPathInterpolator.java
index e1e85df..f303b10 100644
--- a/src/classes/share/javax/media/j3d/PositionPathInterpolator.java
+++ b/src/classes/share/javax/media/j3d/PositionPathInterpolator.java
@@ -185,6 +185,7 @@ public class PositionPathInterpolator extends PathInterpolator {
*
* @since Java 3D 1.3
*/
+ @Override
public void computeTransform(float alphaValue, Transform3D transform) {
computePathInterpolation(alphaValue);
@@ -227,6 +228,7 @@ public class PositionPathInterpolator extends PathInterpolator {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
PositionPathInterpolator ppi = new PositionPathInterpolator();
ppi.duplicateNode(this, forceDuplicate);
@@ -255,6 +257,7 @@ public class PositionPathInterpolator extends PathInterpolator {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/QuadArray.java b/src/classes/share/javax/media/j3d/QuadArray.java
index 383b619..8f5ce57 100644
--- a/src/classes/share/javax/media/j3d/QuadArray.java
+++ b/src/classes/share/javax/media/j3d/QuadArray.java
@@ -154,6 +154,7 @@ public class QuadArray extends GeometryArray {
* Creates the retained mode QuadArrayRetained object that this
* QuadArray object will point to.
*/
+ @Override
void createRetained() {
this.retained = new QuadArrayRetained();
this.retained.setSource(this);
@@ -163,6 +164,7 @@ public class QuadArray extends GeometryArray {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
QuadArrayRetained rt = (QuadArrayRetained) retained;
int texSetCount = rt.getTexCoordSetCount();
diff --git a/src/classes/share/javax/media/j3d/QuadArrayRetained.java b/src/classes/share/javax/media/j3d/QuadArrayRetained.java
index d2bc7fd..b4d728d 100644
--- a/src/classes/share/javax/media/j3d/QuadArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/QuadArrayRetained.java
@@ -41,6 +41,7 @@ class QuadArrayRetained extends GeometryArrayRetained {
this.geoType = GEO_TYPE_QUAD_SET;
}
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
@@ -283,6 +284,7 @@ class QuadArrayRetained extends GeometryArrayRetained {
}
// intersect pnts[] with every quad in this object
+ @Override
boolean intersect(Point3d[] pnts) {
Point3d[] points = new Point3d[4];
double dist[] = new double[1];
@@ -359,6 +361,7 @@ class QuadArrayRetained extends GeometryArrayRetained {
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld, GeometryRetained geom) {
Point3d[] points = new Point3d[4];
@@ -387,6 +390,7 @@ class QuadArrayRetained extends GeometryArrayRetained {
}
// the bounds argument is already transformed
+ @Override
boolean intersect(Bounds targetBound) {
Point3d[] points = new Point3d[4];
int i = ((vertexFormat & GeometryArray.BY_REFERENCE) == 0 ?
@@ -448,6 +452,7 @@ class QuadArrayRetained extends GeometryArrayRetained {
// From Graphics Gems IV (pg5) and Graphics Gems II, Pg170
// The centroid is the area-weighted sum of the centroids of
// disjoint triangles that make up the polygon.
+ @Override
void computeCentroid() {
int i = ((vertexFormat & GeometryArray.BY_REFERENCE) == 0 ?
initialVertexIndex : initialCoordIndex);
@@ -513,6 +518,7 @@ class QuadArrayRetained extends GeometryArrayRetained {
}
}
+ @Override
int getClassType() {
return QUAD_TYPE;
}
diff --git a/src/classes/share/javax/media/j3d/Raster.java b/src/classes/share/javax/media/j3d/Raster.java
index 9990e4e..9b2cb3c 100644
--- a/src/classes/share/javax/media/j3d/Raster.java
+++ b/src/classes/share/javax/media/j3d/Raster.java
@@ -350,6 +350,7 @@ public class Raster extends Geometry {
* Creates the retained mode Raster object that this
* Raster object will point to.
*/
+ @Override
void createRetained() {
retained = new RasterRetained();
retained.setSource(this);
@@ -723,6 +724,7 @@ public class Raster extends Geometry {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
Raster r = new Raster();
r.duplicateNodeComponent(this);
@@ -737,6 +739,7 @@ public class Raster extends Geometry {
* @deprecated replaced with duplicateNodeComponent(
* NodeComponent originalNodeComponent, boolean forceDuplicate)
*/
+ @Override
public void duplicateNodeComponent(NodeComponent originalNodeComponent) {
checkDuplicateNodeComponent(originalNodeComponent);
}
@@ -760,6 +763,7 @@ public class Raster extends Geometry {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent, forceDuplicate);
@@ -798,6 +802,7 @@ public class Raster extends Geometry {
* duplicate also even though current duplicateOnCloneTree flag is false.
* This should be overwrite by NodeComponent which contains sub-NodeComponent.
*/
+ @Override
boolean duplicateChild() {
if (getDuplicateOnCloneTree())
return true;
diff --git a/src/classes/share/javax/media/j3d/RasterRetained.java b/src/classes/share/javax/media/j3d/RasterRetained.java
index 60ad500..0216040 100644
--- a/src/classes/share/javax/media/j3d/RasterRetained.java
+++ b/src/classes/share/javax/media/j3d/RasterRetained.java
@@ -338,6 +338,7 @@ class RasterRetained extends GeometryRetained {
(DepthComponent)depthComponent.source);
}
+ @Override
void setLive(boolean inBackgroundGroup, int refCount) {
super.doSetLive(inBackgroundGroup, refCount);
if (texture != null) {
@@ -358,6 +359,7 @@ class RasterRetained extends GeometryRetained {
super.markAsLive();
}
+ @Override
void clearLive(int refCount) {
super.clearLive(refCount);
if (texture != null)
@@ -378,6 +380,7 @@ class RasterRetained extends GeometryRetained {
}
*/
+ @Override
void computeBoundingBox() {
if(clipMode == Raster.CLIP_IMAGE) {
// Disable view frustum culling by setting the raster's bounds to
@@ -400,6 +403,7 @@ class RasterRetained extends GeometryRetained {
}
}
+ @Override
void update() {
computeBoundingBox();
}
@@ -431,6 +435,7 @@ class RasterRetained extends GeometryRetained {
}
+ @Override
void execute(Canvas3D cv, RenderAtom ra, boolean isNonUniformScale,
boolean updateAlpha, float alpha,
int screen, boolean ignoreVertexColors) {
@@ -632,6 +637,7 @@ class RasterRetained extends GeometryRetained {
return clipCoord3;
}
+ @Override
int getClassType() {
return RASTER_TYPE;
}
@@ -644,31 +650,38 @@ class RasterRetained extends GeometryRetained {
ImageComponentUpdateInfo value) {
}
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
return false;
}
+ @Override
boolean intersect(Bounds targetBound) {
return false;
}
+ @Override
boolean intersect(Point3d[] pnts) {
return false;
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld, GeometryRetained
geom) {
return false;
}
+ @Override
boolean intersect(Transform3D thisLocalToVworld,
Transform3D otherLocalToVworld,
GeometryRetained geom) {
return false;
}
+ @Override
boolean intersect(Transform3D thisLocalToVworld, Bounds targetBound) {
return false;
}
+ @Override
void handleFrequencyChange(int bit) {
if (bit == Raster.ALLOW_IMAGE_WRITE)
setFrequencyChangeMask(bit, 0x1);
diff --git a/src/classes/share/javax/media/j3d/RenderAtom.java b/src/classes/share/javax/media/j3d/RenderAtom.java
index 9a75be0..1d1bb8d 100644
--- a/src/classes/share/javax/media/j3d/RenderAtom.java
+++ b/src/classes/share/javax/media/j3d/RenderAtom.java
@@ -268,6 +268,7 @@ class RenderAtom extends Object implements ObjectUpdate {
return ((dirtyMask & IN_DIRTY_ORIENTED_RAs) != 0);
}
+ @Override
public void updateObject() {
if (inRenderBin()) {
int lastLVWIndex =
diff --git a/src/classes/share/javax/media/j3d/RenderBin.java b/src/classes/share/javax/media/j3d/RenderBin.java
index 29cb7bf..f0a7b75 100644
--- a/src/classes/share/javax/media/j3d/RenderBin.java
+++ b/src/classes/share/javax/media/j3d/RenderBin.java
@@ -400,6 +400,7 @@ private LinkedHashSet<RenderAtom> dirtyDepthSortRenderAtom = new LinkedHashSet<R
/**
* updateObject
*/
+ @Override
public void updateObject() {
int i, j, k;
RenderAtomListInfo ra;
@@ -1342,6 +1343,7 @@ private LinkedHashSet<RenderAtom> dirtyDepthSortRenderAtom = new LinkedHashSet<R
}
+ @Override
void processMessages(long referenceTime) {
int i;
J3dMessage messages[], m;
@@ -6754,6 +6756,7 @@ void insertNodes(J3dMessage m) {
}
}
+@Override
void removeNodes(J3dMessage m) {
ArrayList<NodeRetained> viewScopedNodes = (ArrayList<NodeRetained>)m.args[3];
ArrayList<ArrayList<View>> scopedNodesViewList = (ArrayList<ArrayList<View>>)m.args[4];
@@ -6838,6 +6841,7 @@ void removeNodes(J3dMessage m) {
}
}
+ @Override
void cleanup() {
releaseAllDisplayListID();
removeAllRenderAtoms();
diff --git a/src/classes/share/javax/media/j3d/RenderMolecule.java b/src/classes/share/javax/media/j3d/RenderMolecule.java
index 070b97a..269c1a0 100644
--- a/src/classes/share/javax/media/j3d/RenderMolecule.java
+++ b/src/classes/share/javax/media/j3d/RenderMolecule.java
@@ -1182,6 +1182,7 @@ class RenderMolecule extends IndexedObject implements ObjectUpdate, NodeComponen
numEditingRenderAtoms = numRenderAtoms;
}
+ @Override
public void updateObject() {
int i;
RenderAtom renderAtom;
@@ -2908,6 +2909,7 @@ class RenderMolecule extends IndexedObject implements ObjectUpdate, NodeComponen
return false;
}
+ @Override
VirtualUniverse getVirtualUniverse() {
return null;
}
@@ -2963,6 +2965,7 @@ class RenderMolecule extends IndexedObject implements ObjectUpdate, NodeComponen
* come when there is no active renderAtom associated with the
* TextureBin. See bug# 4503926 for details.
*/
+ @Override
public void updateNodeComponentCheck() {
// If the renderMolecule has been removed, do nothing ..
diff --git a/src/classes/share/javax/media/j3d/Renderer.java b/src/classes/share/javax/media/j3d/Renderer.java
index ed393e3..6362672 100644
--- a/src/classes/share/javax/media/j3d/Renderer.java
+++ b/src/classes/share/javax/media/j3d/Renderer.java
@@ -176,6 +176,7 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine
return (++numInstances);
}
+ @Override
int getInstanceNum() {
if (instanceNum == -1)
instanceNum = newInstanceNum();
@@ -199,6 +200,7 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine
/**
* The main loop for the renderer.
*/
+ @Override
void doWork(long referenceTime) {
RenderBin renderBin = null;
Canvas3D cv, canvas=null;
@@ -1467,10 +1469,12 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine
}
// resource clean up
+@Override
void shutdown() {
removeAllCtxs();
}
+ @Override
void cleanup() {
super.cleanup();
renderMessage = new J3dMessage[1];
@@ -1735,6 +1739,7 @@ final void addTextureResource(int id, TextureRetained obj) {
}
static class DefaultErrorListener implements RenderingErrorListener {
+ @Override
public void errorOccurred(RenderingError error) {
System.err.println();
System.err.println("DefaultRenderingErrorListener.errorOccurred:");
diff --git a/src/classes/share/javax/media/j3d/RendererStructure.java b/src/classes/share/javax/media/j3d/RendererStructure.java
index 4f1a44f..b8dbc6c 100644
--- a/src/classes/share/javax/media/j3d/RendererStructure.java
+++ b/src/classes/share/javax/media/j3d/RendererStructure.java
@@ -60,9 +60,12 @@ class RendererStructure extends J3dStructure{
}
+ @Override
void processMessages(long referenceTime) {}
+ @Override
void removeNodes(J3dMessage m) {}
+ @Override
void cleanup() {}
}
diff --git a/src/classes/share/javax/media/j3d/RenderingAttributes.java b/src/classes/share/javax/media/j3d/RenderingAttributes.java
index 201aebe..0b545c7 100644
--- a/src/classes/share/javax/media/j3d/RenderingAttributes.java
+++ b/src/classes/share/javax/media/j3d/RenderingAttributes.java
@@ -1086,6 +1086,7 @@ public class RenderingAttributes extends NodeComponent {
* Creates a retained mode RenderingAttributesRetained object that this
* RenderingAttributes component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new RenderingAttributesRetained();
this.retained.setSource(this);
@@ -1095,6 +1096,7 @@ public class RenderingAttributes extends NodeComponent {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
RenderingAttributes ra = new RenderingAttributes();
ra.duplicateNodeComponent(this);
@@ -1119,6 +1121,7 @@ public class RenderingAttributes extends NodeComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
diff --git a/src/classes/share/javax/media/j3d/RenderingAttributesRetained.java b/src/classes/share/javax/media/j3d/RenderingAttributesRetained.java
index 11cced2..5f67c54 100644
--- a/src/classes/share/javax/media/j3d/RenderingAttributesRetained.java
+++ b/src/classes/share/javax/media/j3d/RenderingAttributesRetained.java
@@ -525,6 +525,7 @@ class RenderingAttributesRetained extends NodeComponentRetained {
* Creates and initializes a mirror object, point the mirror object
* to the retained object if the object is not editable
*/
+ @Override
synchronized void createMirrorObject() {
if (mirror == null) {
// Check the capability bits and let the mirror object
@@ -548,6 +549,7 @@ class RenderingAttributesRetained extends NodeComponentRetained {
* Initializes a mirror object, point the mirror object to the retained
* object if the object is not editable
*/
+ @Override
synchronized void initMirrorObject() {
((RenderingAttributesRetained)mirror).set(this);
}
@@ -556,6 +558,7 @@ class RenderingAttributesRetained extends NodeComponentRetained {
* Update the "component" field of the mirror object with the
* given "value"
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
RenderingAttributesRetained mirrorRa = (RenderingAttributesRetained)mirror;
@@ -692,6 +695,7 @@ class RenderingAttributesRetained extends NodeComponentRetained {
}
// TODO : Need to handle stencil operation -- Chien
+ @Override
void handleFrequencyChange(int bit) {
int mask = 0;
diff --git a/src/classes/share/javax/media/j3d/RenderingAttributesStructure.java b/src/classes/share/javax/media/j3d/RenderingAttributesStructure.java
index 30d556c..67ba1ef 100644
--- a/src/classes/share/javax/media/j3d/RenderingAttributesStructure.java
+++ b/src/classes/share/javax/media/j3d/RenderingAttributesStructure.java
@@ -42,6 +42,7 @@ class RenderingAttributesStructure extends J3dStructure implements ObjectUpdate
super(null, J3dThread.UPDATE_RENDERING_ATTRIBUTES);
}
+ @Override
void processMessages(long referenceTime) {
J3dMessage m;
boolean addMirrorObj = false;
@@ -179,6 +180,7 @@ class RenderingAttributesStructure extends J3dStructure implements ObjectUpdate
Arrays.fill(messages, 0, nMsg, null);
}
+ @Override
public void updateObject() {
int size = objList.size();
@@ -234,8 +236,10 @@ class RenderingAttributesStructure extends J3dStructure implements ObjectUpdate
n.updateMirrorObject(((Integer)args[1]).intValue(), args[2], args[3]);
}
+ @Override
void removeNodes(J3dMessage m) {}
+ @Override
void cleanup() {}
diff --git a/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java b/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java
index 703df5a..a7e55f2 100644
--- a/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java
+++ b/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java
@@ -156,6 +156,7 @@ void addObjArrayToFreeList(Object[] objs) {
objFreeList.add(objs);
}
+@Override
public void updateObject() {
int size;
@@ -175,6 +176,7 @@ public void updateObject() {
xformChangeList.clear();
}
+ @Override
void processMessages(long referenceTime) {
J3dMessage[] messages = getMessages(referenceTime);;
J3dMessage m;
@@ -512,6 +514,7 @@ public void updateObject() {
intersectedModelClips = new ModelClipRetained[numberOfModelClips];
}
+ @Override
void removeNodes(J3dMessage m) {
Object[] nodes = (Object[])m.args[0];
ArrayList<NodeRetained> viewScopedNodes = (ArrayList<NodeRetained>)m.args[3];
@@ -1738,5 +1741,6 @@ boolean isMclipScopedToThisView(Object obj, View view) {
return true;
}
+@Override
void cleanup() {}
}
diff --git a/src/classes/share/javax/media/j3d/RenderingError.java b/src/classes/share/javax/media/j3d/RenderingError.java
index 2c4b3f5..da68dd9 100644
--- a/src/classes/share/javax/media/j3d/RenderingError.java
+++ b/src/classes/share/javax/media/j3d/RenderingError.java
@@ -234,6 +234,7 @@ public class RenderingError extends Object {
*
* @return a string representation of this rendering error.
*/
+ @Override
public String toString() {
// Concatenate string representation of error code with error message
String errorCodeStr;
diff --git a/src/classes/share/javax/media/j3d/RotPosPathInterpolator.java b/src/classes/share/javax/media/j3d/RotPosPathInterpolator.java
index 68caac5..4e91d69 100644
--- a/src/classes/share/javax/media/j3d/RotPosPathInterpolator.java
+++ b/src/classes/share/javax/media/j3d/RotPosPathInterpolator.java
@@ -244,6 +244,7 @@ public class RotPosPathInterpolator extends PathInterpolator {
*
* @since Java 3D 1.3
*/
+ @Override
public void computeTransform(float alphaValue, Transform3D transform) {
double quatDot;
@@ -334,6 +335,7 @@ public class RotPosPathInterpolator extends PathInterpolator {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
RotPosPathInterpolator rppi = new RotPosPathInterpolator();
rppi.duplicateNode(this, forceDuplicate);
@@ -363,6 +365,7 @@ public class RotPosPathInterpolator extends PathInterpolator {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/RotPosScalePathInterpolator.java b/src/classes/share/javax/media/j3d/RotPosScalePathInterpolator.java
index 74238e3..3114f66 100644
--- a/src/classes/share/javax/media/j3d/RotPosScalePathInterpolator.java
+++ b/src/classes/share/javax/media/j3d/RotPosScalePathInterpolator.java
@@ -304,6 +304,7 @@ public class RotPosScalePathInterpolator extends PathInterpolator {
*
* @since Java 3D 1.3
*/
+ @Override
public void computeTransform(float alphaValue, Transform3D transform) {
float scale;
@@ -401,6 +402,7 @@ public class RotPosScalePathInterpolator extends PathInterpolator {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
RotPosScalePathInterpolator ri = new RotPosScalePathInterpolator();
ri.duplicateNode(this, forceDuplicate);
@@ -429,6 +431,7 @@ public class RotPosScalePathInterpolator extends PathInterpolator {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/RotationInterpolator.java b/src/classes/share/javax/media/j3d/RotationInterpolator.java
index beee025..f536685 100644
--- a/src/classes/share/javax/media/j3d/RotationInterpolator.java
+++ b/src/classes/share/javax/media/j3d/RotationInterpolator.java
@@ -150,6 +150,7 @@ public class RotationInterpolator extends TransformInterpolator {
*
* @since Java 3D 1.3
*/
+ @Override
public void computeTransform(float alphaValue, Transform3D transform) {
double val = (1.0-alphaValue)*minimumAngle + alphaValue*maximumAngle;
@@ -173,6 +174,7 @@ public class RotationInterpolator extends TransformInterpolator {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
RotationInterpolator ri = new RotationInterpolator();
ri.duplicateNode(this, forceDuplicate);
@@ -201,6 +203,7 @@ public class RotationInterpolator extends TransformInterpolator {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/RotationPathInterpolator.java b/src/classes/share/javax/media/j3d/RotationPathInterpolator.java
index fa8a154..6f49627 100644
--- a/src/classes/share/javax/media/j3d/RotationPathInterpolator.java
+++ b/src/classes/share/javax/media/j3d/RotationPathInterpolator.java
@@ -187,6 +187,7 @@ public class RotationPathInterpolator extends PathInterpolator {
*
* @since Java 3D 1.3
*/
+ @Override
public void computeTransform(float alphaValue, Transform3D transform) {
float tt;
double quatDot;
@@ -259,6 +260,7 @@ public class RotationPathInterpolator extends PathInterpolator {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
RotationPathInterpolator rpi = new RotationPathInterpolator();
rpi.duplicateNode(this, forceDuplicate);
@@ -287,6 +289,7 @@ public class RotationPathInterpolator extends PathInterpolator {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/ScaleInterpolator.java b/src/classes/share/javax/media/j3d/ScaleInterpolator.java
index ab85e9c..858967c 100644
--- a/src/classes/share/javax/media/j3d/ScaleInterpolator.java
+++ b/src/classes/share/javax/media/j3d/ScaleInterpolator.java
@@ -153,6 +153,7 @@ public class ScaleInterpolator extends TransformInterpolator {
*
* @since Java 3D 1.3
*/
+ @Override
public void computeTransform(float alphaValue, Transform3D transform) {
double val = (1.0-alphaValue)*minimumScale + alphaValue*maximumScale;
@@ -177,6 +178,7 @@ public class ScaleInterpolator extends TransformInterpolator {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
ScaleInterpolator si = new ScaleInterpolator();
si.duplicateNode(this, forceDuplicate);
@@ -205,6 +207,7 @@ public class ScaleInterpolator extends TransformInterpolator {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/SceneGraphObject.java b/src/classes/share/javax/media/j3d/SceneGraphObject.java
index 8370652..db0eb53 100644
--- a/src/classes/share/javax/media/j3d/SceneGraphObject.java
+++ b/src/classes/share/javax/media/j3d/SceneGraphObject.java
@@ -505,6 +505,7 @@ public abstract class SceneGraphObject extends Object {
* If its name is non-null, then it is concatenated with
* super.toString().
*/
+ @Override
public String toString() {
return getNamePrefix() + super.toString();
}
diff --git a/src/classes/share/javax/media/j3d/SceneGraphObjectRetained.java b/src/classes/share/javax/media/j3d/SceneGraphObjectRetained.java
index d9234fb..09000a7 100644
--- a/src/classes/share/javax/media/j3d/SceneGraphObjectRetained.java
+++ b/src/classes/share/javax/media/j3d/SceneGraphObjectRetained.java
@@ -164,6 +164,7 @@ abstract class SceneGraphObjectRetained extends IndexedObject
return source.capabilityBitsEmpty();
}
+ @Override
protected Object clone() {
try {
return super.clone();
@@ -175,6 +176,7 @@ abstract class SceneGraphObjectRetained extends IndexedObject
void handleFrequencyChange(int bit) {
}
+ @Override
VirtualUniverse getVirtualUniverse() {
return null;
}
diff --git a/src/classes/share/javax/media/j3d/SceneGraphPath.java b/src/classes/share/javax/media/j3d/SceneGraphPath.java
index 20b6f71..aac2f9d 100644
--- a/src/classes/share/javax/media/j3d/SceneGraphPath.java
+++ b/src/classes/share/javax/media/j3d/SceneGraphPath.java
@@ -303,6 +303,7 @@ public class SceneGraphPath {
* @param o1 the object we will compare this SceneGraphPath's path against.
* @return true or false
*/
+ @Override
public boolean equals(Object o1) {
boolean result = true;
@@ -348,6 +349,7 @@ public class SceneGraphPath {
* may return the same hash value, although this is not likely.
* @return the integer hash value
*/
+ @Override
public int hashCode() {
HashKey key = new HashKey(250);
// NOTE: Needed to add interior != null because this method is called
@@ -414,6 +416,7 @@ public class SceneGraphPath {
* if it is not null.
* @return String representation of this object
*/
+ @Override
public String toString() {
StringBuffer str = new StringBuffer();
diff --git a/src/classes/share/javax/media/j3d/Screen3D.java b/src/classes/share/javax/media/j3d/Screen3D.java
index fa412da..988dc97 100644
--- a/src/classes/share/javax/media/j3d/Screen3D.java
+++ b/src/classes/share/javax/media/j3d/Screen3D.java
@@ -320,6 +320,7 @@ synchronized void notifyUsers() {
return physicalScreenHeight;
}
+ @Override
public String toString() {
return "Screen3D: size = " +
"(" + getSize().width + " x " + getSize().height + ")" +
diff --git a/src/classes/share/javax/media/j3d/ShaderAppearance.java b/src/classes/share/javax/media/j3d/ShaderAppearance.java
index 33b5ac6..62da973 100644
--- a/src/classes/share/javax/media/j3d/ShaderAppearance.java
+++ b/src/classes/share/javax/media/j3d/ShaderAppearance.java
@@ -139,6 +139,7 @@ public class ShaderAppearance extends Appearance {
* Creates the retained mode ShaderAppearanceRetained object that this
* ShaderAppearance component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new ShaderAppearanceRetained();
this.retained.setSource(this);
@@ -218,6 +219,7 @@ public class ShaderAppearance extends Appearance {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
ShaderAppearance a = new ShaderAppearance();
a.duplicateNodeComponent(this);
@@ -231,6 +233,7 @@ public class ShaderAppearance extends Appearance {
* @deprecated replaced with duplicateNodeComponent(
* NodeComponent originalNodeComponent, boolean forceDuplicate)
*/
+ @Override
public void duplicateNodeComponent(NodeComponent originalNodeComponent) {
checkDuplicateNodeComponent(originalNodeComponent);
}
@@ -255,6 +258,7 @@ public class ShaderAppearance extends Appearance {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent, forceDuplicate);
@@ -278,6 +282,7 @@ public class ShaderAppearance extends Appearance {
* duplicate also even though current duplicateOnCloneTree flag is false.
* This should be overwrite by NodeComponent which contains sub-NodeComponent.
*/
+ @Override
boolean duplicateChild() {
if (super.duplicateChild())
return true;
diff --git a/src/classes/share/javax/media/j3d/ShaderAppearanceRetained.java b/src/classes/share/javax/media/j3d/ShaderAppearanceRetained.java
index 3b58124..da41886 100644
--- a/src/classes/share/javax/media/j3d/ShaderAppearanceRetained.java
+++ b/src/classes/share/javax/media/j3d/ShaderAppearanceRetained.java
@@ -140,6 +140,7 @@ class ShaderAppearanceRetained extends AppearanceRetained {
}
+ @Override
public boolean equals(Object obj) {
return ((obj instanceof ShaderAppearanceRetained) &&
equals((ShaderAppearanceRetained) obj));
@@ -168,6 +169,7 @@ class ShaderAppearanceRetained extends AppearanceRetained {
+ @Override
synchronized void createMirrorObject() {
// System.err.println("ShaderAppearanceRetained : createMirrorObject()");
@@ -187,6 +189,7 @@ class ShaderAppearanceRetained extends AppearanceRetained {
* It also calls the update method for each node component if it
* is not null.
*/
+ @Override
synchronized void initMirrorObject() {
// System.err.println("ShaderAppearanceRetained : initMirrorObject()");
@@ -216,6 +219,7 @@ class ShaderAppearanceRetained extends AppearanceRetained {
* Update the "component" field of the mirror object with the
* given "value"
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
// System.err.println("ShaderAppearanceRetained : updateMirrorObject(): " +
@@ -235,6 +239,7 @@ class ShaderAppearanceRetained extends AppearanceRetained {
* This method calls the setLive method of all appearance bundle
* objects.
*/
+ @Override
void doSetLive(boolean backgroundGroup, int refCount) {
// System.err.println("ShaderAppearceRetained.doSetLive()");
@@ -258,6 +263,7 @@ class ShaderAppearanceRetained extends AppearanceRetained {
* This clearLive routine first calls the superclass's method, then
* it removes itself to the list of lights
*/
+ @Override
void clearLive(int refCount) {
super.clearLive(refCount);
@@ -270,6 +276,7 @@ class ShaderAppearanceRetained extends AppearanceRetained {
}
}
+ @Override
synchronized void addAMirrorUser(Shape3DRetained shape) {
super.addAMirrorUser(shape);
@@ -279,6 +286,7 @@ class ShaderAppearanceRetained extends AppearanceRetained {
shaderAttributeSet.addAMirrorUser(shape);
}
+ @Override
synchronized void removeAMirrorUser(Shape3DRetained shape) {
super.removeAMirrorUser(shape);
@@ -326,6 +334,7 @@ class ShaderAppearanceRetained extends AppearanceRetained {
}
+ @Override
boolean isStatic() {
if (!super.isStatic()) {
return false;
@@ -343,6 +352,7 @@ class ShaderAppearanceRetained extends AppearanceRetained {
// Issue 209 - implement the compile method
// Simply pass along to the NodeComponents
+ @Override
void compile(CompileState compState) {
super.compile(compState);
@@ -355,6 +365,7 @@ class ShaderAppearanceRetained extends AppearanceRetained {
}
}
+ @Override
boolean isOpaque(int geoType) {
if (!super.isOpaque(geoType)) {
@@ -366,6 +377,7 @@ class ShaderAppearanceRetained extends AppearanceRetained {
return true;
}
+ @Override
void handleFrequencyChange(int bit) {
// System.err.println("ShaderAppearanceRetained : handleFrequencyChange()");
super.handleFrequencyChange(bit);
diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeArray.java b/src/classes/share/javax/media/j3d/ShaderAttributeArray.java
index f4ed5d0..13be68a 100644
--- a/src/classes/share/javax/media/j3d/ShaderAttributeArray.java
+++ b/src/classes/share/javax/media/j3d/ShaderAttributeArray.java
@@ -75,6 +75,7 @@ public class ShaderAttributeArray extends ShaderAttributeObject {
}
// Implement abstract getValue method
+ @Override
public Object getValue() {
if (isLiveOrCompiled())
if (!this.getCapability(ALLOW_VALUE_READ))
@@ -84,6 +85,7 @@ public class ShaderAttributeArray extends ShaderAttributeObject {
}
// Implement abstract setValue method
+ @Override
public void setValue(Object value) {
if (value == null) {
throw new NullPointerException();
@@ -153,6 +155,7 @@ public class ShaderAttributeArray extends ShaderAttributeObject {
* Creates a retained mode ShaderAttributeArrayRetained object that this
* ShaderAttributeArray component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new ShaderAttributeArrayRetained();
this.retained.setSource(this);
diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeArrayRetained.java b/src/classes/share/javax/media/j3d/ShaderAttributeArrayRetained.java
index f255b1b..48111bf 100644
--- a/src/classes/share/javax/media/j3d/ShaderAttributeArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/ShaderAttributeArrayRetained.java
@@ -105,6 +105,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
// Helper methods ...
+ @Override
synchronized void createMirrorObject() {
// System.err.println("ShaderAttributeArrayRetained : createMirrorObject");
// This method should only call by setLive().
@@ -124,6 +125,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
* ClassCastException is thrown if the object is not an array of
* one of the allowed classes.
*/
+ @Override
int computeClassType(Object value) {
Class objClass = value.getClass();
if (!objClass.isArray()) {
@@ -141,6 +143,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
/**
* Returns the base class represented by the specified class type.
*/
+ @Override
Class getBaseClass(int classType) {
return classTableArr[classType];
}
@@ -149,6 +152,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
* Creates an attribute wrapper object of the specified class
* type, and stores the specified array of objects.
*/
+ @Override
AttrWrapper createAttrWrapper(Object value, int classType) {
ArrayWrapper attrWrapper = null;
switch (classType) {
@@ -239,6 +243,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
static class IntegerArrayWrapper extends ArrayWrapper {
private int[] value = new int[0];
+ @Override
void set(Object value) {
Integer[] arr = (Integer[])value;
if (this.length != arr.length) {
@@ -250,10 +255,12 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
}
}
+ @Override
void set(int index, Object value) {
this.value[index] = ((Integer)value).intValue();
}
+ @Override
Object get() {
Integer[] arr = new Integer[this.length];
for (int i = 0; i < this.length; i++) {
@@ -262,6 +269,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
return arr;
}
+ @Override
Object getRef() {
return this.value;
}
@@ -271,6 +279,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
static class FloatArrayWrapper extends ArrayWrapper {
private float[] value = new float[0];
+ @Override
void set(Object value) {
Float[] arr = (Float[])value;
if (this.length != arr.length) {
@@ -282,10 +291,12 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
}
}
+ @Override
void set(int index, Object value) {
this.value[index] = ((Float)value).floatValue();
}
+ @Override
Object get() {
Float[] arr = new Float[this.length];
for (int i = 0; i < this.length; i++) {
@@ -294,6 +305,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
return arr;
}
+ @Override
Object getRef() {
return this.value;
}
@@ -337,6 +349,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
static class Tuple2iArrayWrapper extends ArrayWrapper {
private int[] value = new int[0];
+ @Override
void set(Object value) {
Tuple2i[] arr = (Tuple2i[])value;
if (this.length != arr.length) {
@@ -350,12 +363,14 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
}
}
+ @Override
void set(int index, Object value) {
int j = index * 2;
this.value[j+0] = ((Tuple2i)value).x;
this.value[j+1] = ((Tuple2i)value).y;
}
+ @Override
Object get() {
Tuple2i[] arr = new Tuple2i[this.length];
for (int i = 0; i < this.length; i++) {
@@ -367,6 +382,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
return arr;
}
+ @Override
Object getRef() {
return this.value;
}
@@ -376,6 +392,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
static class Tuple2fArrayWrapper extends ArrayWrapper {
private float[] value = new float[0];
+ @Override
void set(Object value) {
Tuple2f[] arr = (Tuple2f[])value;
if (this.length != arr.length) {
@@ -389,12 +406,14 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
}
}
+ @Override
void set(int index, Object value) {
int j = index * 2;
this.value[j+0] = ((Tuple2f)value).x;
this.value[j+1] = ((Tuple2f)value).y;
}
+ @Override
Object get() {
Tuple2f[] arr = new Tuple2f[this.length];
for (int i = 0; i < this.length; i++) {
@@ -406,6 +425,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
return arr;
}
+ @Override
Object getRef() {
return this.value;
}
@@ -456,6 +476,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
static class Tuple3iArrayWrapper extends ArrayWrapper {
private int[] value = new int[0];
+ @Override
void set(Object value) {
Tuple3i[] arr = (Tuple3i[])value;
if (this.length != arr.length) {
@@ -470,6 +491,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
}
}
+ @Override
void set(int index, Object value) {
int j = index * 3;
this.value[j+0] = ((Tuple3i)value).x;
@@ -477,6 +499,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
this.value[j+2] = ((Tuple3i)value).z;
}
+ @Override
Object get() {
Tuple3i[] arr = new Tuple3i[this.length];
for (int i = 0; i < this.length; i++) {
@@ -489,6 +512,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
return arr;
}
+ @Override
Object getRef() {
return this.value;
}
@@ -498,6 +522,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
static class Tuple3fArrayWrapper extends ArrayWrapper {
private float[] value = new float[0];
+ @Override
void set(Object value) {
Tuple3f[] arr = (Tuple3f[])value;
if (this.length != arr.length) {
@@ -512,6 +537,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
}
}
+ @Override
void set(int index, Object value) {
int j = index * 3;
this.value[j+0] = ((Tuple3f)value).x;
@@ -519,6 +545,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
this.value[j+2] = ((Tuple3f)value).z;
}
+ @Override
Object get() {
Tuple3f[] arr = new Tuple3f[this.length];
for (int i = 0; i < this.length; i++) {
@@ -531,6 +558,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
return arr;
}
+ @Override
Object getRef() {
return this.value;
}
@@ -584,6 +612,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
static class Tuple4iArrayWrapper extends ArrayWrapper {
private int[] value = new int[0];
+ @Override
void set(Object value) {
Tuple4i[] arr = (Tuple4i[])value;
if (this.length != arr.length) {
@@ -599,6 +628,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
}
}
+ @Override
void set(int index, Object value) {
int j = index * 4;
this.value[j+0] = ((Tuple4i)value).x;
@@ -607,6 +637,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
this.value[j+3] = ((Tuple4i)value).w;
}
+ @Override
Object get() {
Tuple4i[] arr = new Tuple4i[this.length];
for (int i = 0; i < this.length; i++) {
@@ -620,6 +651,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
return arr;
}
+ @Override
Object getRef() {
return this.value;
}
@@ -629,6 +661,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
static class Tuple4fArrayWrapper extends ArrayWrapper {
private float[] value = new float[0];
+ @Override
void set(Object value) {
Tuple4f[] arr = (Tuple4f[])value;
if (this.length != arr.length) {
@@ -644,6 +677,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
}
}
+ @Override
void set(int index, Object value) {
int j = index * 4;
this.value[j+0] = ((Tuple4f)value).x;
@@ -652,6 +686,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
this.value[j+3] = ((Tuple4f)value).w;
}
+ @Override
Object get() {
Tuple4f[] arr = new Tuple4f[this.length];
for (int i = 0; i < this.length; i++) {
@@ -665,6 +700,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
return arr;
}
+ @Override
Object getRef() {
return this.value;
}
@@ -721,6 +757,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
static class Matrix3fArrayWrapper extends ArrayWrapper {
private float[] value = new float[0];
+ @Override
void set(Object value) {
Matrix3f[] arr = (Matrix3f[])value;
if (this.length != arr.length) {
@@ -741,6 +778,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
}
}
+ @Override
void set(int index, Object value) {
int j = index * 9;
Matrix3f m = (Matrix3f)value;
@@ -756,6 +794,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
this.value[j+8] = m.m22;
}
+ @Override
Object get() {
Matrix3f[] arr = new Matrix3f[this.length];
for (int i = 0; i < this.length; i++) {
@@ -774,6 +813,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
return arr;
}
+ @Override
Object getRef() {
return this.value;
}
@@ -847,6 +887,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
static class Matrix4fArrayWrapper extends ArrayWrapper {
private float[] value = new float[0];
+ @Override
void set(Object value) {
Matrix4f[] arr = (Matrix4f[])value;
if (this.length != arr.length) {
@@ -874,6 +915,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
}
}
+ @Override
void set(int index, Object value) {
int j = index * 16;
Matrix4f m = (Matrix4f)value;
@@ -896,6 +938,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
this.value[j+15] = m.m33;
}
+ @Override
Object get() {
Matrix4f[] arr = new Matrix4f[this.length];
for (int i = 0; i < this.length; i++) {
@@ -921,6 +964,7 @@ class ShaderAttributeArrayRetained extends ShaderAttributeObjectRetained {
return arr;
}
+ @Override
Object getRef() {
return this.value;
}
diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeBinding.java b/src/classes/share/javax/media/j3d/ShaderAttributeBinding.java
index 9a122b9..f0359af 100644
--- a/src/classes/share/javax/media/j3d/ShaderAttributeBinding.java
+++ b/src/classes/share/javax/media/j3d/ShaderAttributeBinding.java
@@ -133,6 +133,7 @@ public class ShaderAttributeBinding extends ShaderAttribute {
* Creates a retained mode ShaderAttributeBindingRetained object that this
* ShaderAttributeBinding component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new ShaderAttributeBindingRetained();
this.retained.setSource(this);
diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeObjectRetained.java b/src/classes/share/javax/media/j3d/ShaderAttributeObjectRetained.java
index ec9b8b3..eb5d8f7 100644
--- a/src/classes/share/javax/media/j3d/ShaderAttributeObjectRetained.java
+++ b/src/classes/share/javax/media/j3d/ShaderAttributeObjectRetained.java
@@ -122,6 +122,7 @@ abstract class ShaderAttributeObjectRetained extends ShaderAttributeRetained {
/**
* Initializes a mirror object.
*/
+ @Override
synchronized void initMirrorObject() {
super.initMirrorObject();
((ShaderAttributeObjectRetained)mirror).initValue(getValue());
@@ -130,6 +131,7 @@ abstract class ShaderAttributeObjectRetained extends ShaderAttributeRetained {
/**
* Update the "component" field of the mirror object with the given "value"
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
//System.err.println("ShaderAttributeObjectRetained : updateMirrorObject");
@@ -310,6 +312,7 @@ abstract class ShaderAttributeObjectRetained extends ShaderAttributeRetained {
// to be set whenever the capability is writable, regardless of whether
// it is frequently writable. We must do this because the ShaderBin doesn't
// support updating shader attributes when changedFrequent is 0.
+ @Override
void setFrequencyChangeMask(int bit, int mask) {
if (source.getCapability(bit)) {
changedFrequent |= mask;
@@ -319,6 +322,7 @@ abstract class ShaderAttributeObjectRetained extends ShaderAttributeRetained {
}
}
+ @Override
void handleFrequencyChange(int bit) {
if (bit == ShaderAttributeObject.ALLOW_VALUE_WRITE) {
setFrequencyChangeMask(bit, 0x1);
diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeRetained.java b/src/classes/share/javax/media/j3d/ShaderAttributeRetained.java
index 872bb5d..3e65fec 100644
--- a/src/classes/share/javax/media/j3d/ShaderAttributeRetained.java
+++ b/src/classes/share/javax/media/j3d/ShaderAttributeRetained.java
@@ -58,6 +58,7 @@ abstract class ShaderAttributeRetained extends NodeComponentRetained {
return attrName;
}
+ @Override
void initMirrorObject() {
((ShaderAttributeObjectRetained)mirror).initializeAttrName(this.attrName);
}
diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeSet.java b/src/classes/share/javax/media/j3d/ShaderAttributeSet.java
index 2bf4124..2503626 100644
--- a/src/classes/share/javax/media/j3d/ShaderAttributeSet.java
+++ b/src/classes/share/javax/media/j3d/ShaderAttributeSet.java
@@ -265,6 +265,7 @@ public class ShaderAttributeSet extends NodeComponent {
* Creates a retained mode ShaderAttributeSetRetained object that this
* ShaderAttributeSet component object will point to.
*/
+ @Override
void createRetained() {
// System.err.println("ShaderAttributeSet : createRetained() ...");
this.retained = new ShaderAttributeSetRetained();
diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java b/src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java
index 8bd4a38..2ad4432 100644
--- a/src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java
+++ b/src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java
@@ -199,6 +199,7 @@ Map<String, ShaderAttributeRetained> getAttrs() {
return attrs;
}
+ @Override
void setLive(boolean backgroundGroup, int refCount) {
// System.err.println("ShaderAttributeSetRetained.setLive()");
@@ -212,6 +213,7 @@ Map<String, ShaderAttributeRetained> getAttrs() {
super.markAsLive();
}
+ @Override
synchronized void addAMirrorUser(Shape3DRetained shape) {
super.addAMirrorUser(shape);
@@ -223,6 +225,7 @@ Map<String, ShaderAttributeRetained> getAttrs() {
}
}
+ @Override
synchronized void removeAMirrorUser(Shape3DRetained shape) {
super.removeAMirrorUser(shape);
@@ -234,6 +237,7 @@ Map<String, ShaderAttributeRetained> getAttrs() {
}
+ @Override
synchronized void removeMirrorUsers(NodeComponentRetained node) {
super.removeMirrorUsers(node);
@@ -244,6 +248,7 @@ Map<String, ShaderAttributeRetained> getAttrs() {
}
}
+ @Override
synchronized void copyMirrorUsers(NodeComponentRetained node) {
super.copyMirrorUsers(node);
@@ -254,6 +259,7 @@ Map<String, ShaderAttributeRetained> getAttrs() {
}
}
+ @Override
void clearLive(int refCount) {
// System.err.println("ShaderAttributeSetRetained.clearLive()");
@@ -266,6 +272,7 @@ Map<String, ShaderAttributeRetained> getAttrs() {
}
}
+ @Override
synchronized void createMirrorObject() {
// System.err.println("ShaderAttributeSetRetained : createMirrorObject");
// This method should only call by setLive().
@@ -278,6 +285,7 @@ Map<String, ShaderAttributeRetained> getAttrs() {
initMirrorObject();
}
+ @Override
void initMirrorObject() {
ShaderAttributeRetained[] sAttrs = new ShaderAttributeRetained[attrs.size()];
@@ -293,6 +301,7 @@ Map<String, ShaderAttributeRetained> getAttrs() {
/**
* Update the "component" field of the mirror object with the given "value"
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
// System.err.println("ShaderAttributeSetRetained : updateMirrorObject");
@@ -362,6 +371,7 @@ Map<String, ShaderAttributeRetained> getAttrs() {
// to be set whenever the capability is writable, regardless of whether
// it is frequently writable. We must do this because the ShaderBin doesn't
// support updating shader attributes when changedFrequent is 0.
+ @Override
void setFrequencyChangeMask(int bit, int mask) {
if (source.getCapability(bit)) {
changedFrequent |= mask;
@@ -371,6 +381,7 @@ Map<String, ShaderAttributeRetained> getAttrs() {
}
}
+ @Override
void handleFrequencyChange(int bit) {
if (bit == ShaderAttributeSet.ALLOW_ATTRIBUTES_WRITE) {
setFrequencyChangeMask(bit, 0x1);
diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeValue.java b/src/classes/share/javax/media/j3d/ShaderAttributeValue.java
index a6520f0..2d2e085 100644
--- a/src/classes/share/javax/media/j3d/ShaderAttributeValue.java
+++ b/src/classes/share/javax/media/j3d/ShaderAttributeValue.java
@@ -74,6 +74,7 @@ public class ShaderAttributeValue extends ShaderAttributeObject {
}
// Implement abstract getValue method
+ @Override
public Object getValue() {
if (isLiveOrCompiled())
@@ -84,6 +85,7 @@ public class ShaderAttributeValue extends ShaderAttributeObject {
}
// Implement abstract setValue method
+ @Override
public void setValue(Object value) {
if (value == null) {
@@ -105,6 +107,7 @@ public class ShaderAttributeValue extends ShaderAttributeObject {
* Creates a retained mode ShaderAttributeValueRetained object that this
* ShaderAttributeValue component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new ShaderAttributeValueRetained();
this.retained.setSource(this);
diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeValueRetained.java b/src/classes/share/javax/media/j3d/ShaderAttributeValueRetained.java
index a509b1b..9555355 100644
--- a/src/classes/share/javax/media/j3d/ShaderAttributeValueRetained.java
+++ b/src/classes/share/javax/media/j3d/ShaderAttributeValueRetained.java
@@ -51,6 +51,7 @@ class ShaderAttributeValueRetained extends ShaderAttributeObjectRetained {
ShaderAttributeValueRetained() {
}
+ @Override
synchronized void createMirrorObject() {
// System.err.println("ShaderAttributeValueRetained : createMirrorObject");
// This method should only call by setLive().
@@ -69,6 +70,7 @@ class ShaderAttributeValueRetained extends ShaderAttributeObjectRetained {
* ClassCastException is thrown if the object is not an instance
* of one of the allowed classes.
*/
+ @Override
int computeClassType(Object value) {
Class objClass = value.getClass();
if (objClass.isArray()) {
@@ -86,6 +88,7 @@ class ShaderAttributeValueRetained extends ShaderAttributeObjectRetained {
/**
* Returns the base class represented by the specified class type.
*/
+ @Override
Class getBaseClass(int classType) {
return classTable[classType];
}
@@ -94,6 +97,7 @@ class ShaderAttributeValueRetained extends ShaderAttributeObjectRetained {
* Creates an attribute wrapper object of the specified class
* type, and stores the specified object.
*/
+ @Override
AttrWrapper createAttrWrapper(Object value, int classType) {
ValueWrapper attrWrapper = null;
switch (classType) {
@@ -170,14 +174,17 @@ class ShaderAttributeValueRetained extends ShaderAttributeObjectRetained {
static class IntegerWrapper extends ValueWrapper {
private int[] value = new int[1];
+ @Override
void set(Object value) {
this.value[0] = ((Integer)value).intValue();
}
+ @Override
Object get() {
return new Integer(this.value[0]);
}
+ @Override
Object getRef() {
return this.value;
}
@@ -187,14 +194,17 @@ class ShaderAttributeValueRetained extends ShaderAttributeObjectRetained {
static class FloatWrapper extends ValueWrapper {
private float[] value = new float[1];
+ @Override
void set(Object value) {
this.value[0] = ((Float)value).floatValue();
}
+ @Override
Object get() {
return new Float(this.value[0]);
}
+ @Override
Object getRef() {
return this.value;
}
@@ -223,14 +233,17 @@ class ShaderAttributeValueRetained extends ShaderAttributeObjectRetained {
static class Tuple2iWrapper extends ValueWrapper {
private int[] value = new int[2];
+ @Override
void set(Object value) {
((Tuple2i)value).get(this.value);
}
+ @Override
Object get() {
return new Point2i(value);
}
+ @Override
Object getRef() {
return value;
}
@@ -240,14 +253,17 @@ class ShaderAttributeValueRetained extends ShaderAttributeObjectRetained {
static class Tuple2fWrapper extends ValueWrapper {
private float[] value = new float[2];
+ @Override
void set(Object value) {
((Tuple2f)value).get(this.value);
}
+ @Override
Object get() {
return new Point2f(value);
}
+ @Override
Object getRef() {
return value;
}
@@ -276,14 +292,17 @@ class ShaderAttributeValueRetained extends ShaderAttributeObjectRetained {
static class Tuple3iWrapper extends ValueWrapper {
private int[] value = new int[3];
+ @Override
void set(Object value) {
((Tuple3i)value).get(this.value);
}
+ @Override
Object get() {
return new Point3i(value);
}
+ @Override
Object getRef() {
return value;
}
@@ -293,14 +312,17 @@ class ShaderAttributeValueRetained extends ShaderAttributeObjectRetained {
static class Tuple3fWrapper extends ValueWrapper {
private float[] value = new float[3];
+ @Override
void set(Object value) {
((Tuple3f)value).get(this.value);
}
+ @Override
Object get() {
return new Point3f(value);
}
+ @Override
Object getRef() {
return value;
}
@@ -329,14 +351,17 @@ class ShaderAttributeValueRetained extends ShaderAttributeObjectRetained {
static class Tuple4iWrapper extends ValueWrapper {
private int[] value = new int[4];
+ @Override
void set(Object value) {
((Tuple4i)value).get(this.value);
}
+ @Override
Object get() {
return new Point4i(value);
}
+ @Override
Object getRef() {
return value;
}
@@ -346,14 +371,17 @@ class ShaderAttributeValueRetained extends ShaderAttributeObjectRetained {
static class Tuple4fWrapper extends ValueWrapper {
private float[] value = new float[4];
+ @Override
void set(Object value) {
((Tuple4f)value).get(this.value);
}
+ @Override
Object get() {
return new Point4f(value);
}
+ @Override
Object getRef() {
return value;
}
@@ -382,6 +410,7 @@ class ShaderAttributeValueRetained extends ShaderAttributeObjectRetained {
static class Matrix3fWrapper extends ValueWrapper {
private float[] value = new float[9];
+ @Override
void set(Object value) {
Matrix3f m = (Matrix3f)value;
this.value[0] = m.m00;
@@ -395,10 +424,12 @@ class ShaderAttributeValueRetained extends ShaderAttributeObjectRetained {
this.value[8] = m.m22;
}
+ @Override
Object get() {
return new Matrix3f(value);
}
+ @Override
Object getRef() {
return value;
}
@@ -436,6 +467,7 @@ class ShaderAttributeValueRetained extends ShaderAttributeObjectRetained {
static class Matrix4fWrapper extends ValueWrapper {
private float[] value = new float[16];
+ @Override
void set(Object value) {
Matrix4f m = (Matrix4f)value;
this.value[0] = m.m00;
@@ -456,10 +488,12 @@ class ShaderAttributeValueRetained extends ShaderAttributeObjectRetained {
this.value[15] = m.m33;
}
+ @Override
Object get() {
return new Matrix4f(value);
}
+ @Override
Object getRef() {
return value;
}
diff --git a/src/classes/share/javax/media/j3d/ShaderBin.java b/src/classes/share/javax/media/j3d/ShaderBin.java
index 9a8abfe..520e64c 100644
--- a/src/classes/share/javax/media/j3d/ShaderBin.java
+++ b/src/classes/share/javax/media/j3d/ShaderBin.java
@@ -131,6 +131,7 @@ ArrayList<TextureBin> addTextureBins = new ArrayList<TextureBin>();
}
+ @Override
public void updateObject() {
TextureBin t;
int i;
diff --git a/src/classes/share/javax/media/j3d/ShaderError.java b/src/classes/share/javax/media/j3d/ShaderError.java
index 3293481..705aacc 100644
--- a/src/classes/share/javax/media/j3d/ShaderError.java
+++ b/src/classes/share/javax/media/j3d/ShaderError.java
@@ -383,6 +383,7 @@ public class ShaderError extends Object {
*
* @return a string representation of this shader error.
*/
+ @Override
public String toString() {
// Concatenate string representation of error code with error message
String errorCodeStr;
diff --git a/src/classes/share/javax/media/j3d/ShaderProgram.java b/src/classes/share/javax/media/j3d/ShaderProgram.java
index e2dc762..46499a1 100644
--- a/src/classes/share/javax/media/j3d/ShaderProgram.java
+++ b/src/classes/share/javax/media/j3d/ShaderProgram.java
@@ -199,6 +199,7 @@ public abstract class ShaderProgram extends NodeComponent {
}
static class DefaultErrorListener implements ShaderErrorListener {
+ @Override
public void errorOccurred(ShaderError error) {
System.err.println();
System.err.println("DefaultShaderErrorListener.errorOccurred:");
diff --git a/src/classes/share/javax/media/j3d/ShaderProgramRetained.java b/src/classes/share/javax/media/j3d/ShaderProgramRetained.java
index 3d199ce..ec63b3a 100644
--- a/src/classes/share/javax/media/j3d/ShaderProgramRetained.java
+++ b/src/classes/share/javax/media/j3d/ShaderProgramRetained.java
@@ -395,6 +395,7 @@ private HashSet<ShaderAttribute> shaderAttrErrorSet = null;
abstract boolean isSupported(Canvas3D cv);
+ @Override
void setLive(boolean backgroundGroup, int refCount) {
// System.err.println("ShaderProgramRetained.setLive()");
@@ -410,6 +411,7 @@ private HashSet<ShaderAttribute> shaderAttrErrorSet = null;
}
+ @Override
void clearLive(int refCount) {
// System.err.println("ShaderProgramRetained.clearLive()");
@@ -445,6 +447,7 @@ private HashSet<ShaderAttribute> shaderAttrErrorSet = null;
/**
* Initializes a mirror object.
*/
+ @Override
synchronized void initMirrorObject() {
// Create mirror copy of shaders
@@ -484,6 +487,7 @@ private HashSet<ShaderAttribute> shaderAttrErrorSet = null;
/**
* Update the "component" field of the mirror object with the given "value"
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
// ShaderProgram can't be modified once it is live.
diff --git a/src/classes/share/javax/media/j3d/ShaderRetained.java b/src/classes/share/javax/media/j3d/ShaderRetained.java
index d53321e..e946939 100644
--- a/src/classes/share/javax/media/j3d/ShaderRetained.java
+++ b/src/classes/share/javax/media/j3d/ShaderRetained.java
@@ -65,11 +65,13 @@ abstract class ShaderRetained extends NodeComponentRetained {
return shaderType;
}
+ @Override
void setLive(boolean inBackgroundGroup, int refCount) {
// System.err.println("SourceCodeShaderRetained.setLive()");
super.setLive(inBackgroundGroup, refCount);
}
+ @Override
void clearLive(int refCount) {
// System.err.println("SourceCodeShaderRetained.clearLive()");
super.clearLive(refCount);
@@ -80,10 +82,12 @@ abstract class ShaderRetained extends NodeComponentRetained {
* But it's using the updateMirrorObject interface to propagate
* the changes to the users
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
System.err.println("Shader.updateMirrorObject not implemented yet!");
}
+ @Override
void handleFrequencyChange(int bit) {
System.err.println("Shader.handleFrequencyChange not implemented yet!");
}
diff --git a/src/classes/share/javax/media/j3d/Shape3D.java b/src/classes/share/javax/media/j3d/Shape3D.java
index 3416578..9d9cd7e 100644
--- a/src/classes/share/javax/media/j3d/Shape3D.java
+++ b/src/classes/share/javax/media/j3d/Shape3D.java
@@ -193,6 +193,7 @@ public class Shape3D extends Leaf {
* Creates the retained mode Shape3DRetained object that this
* Shape3D object will point to.
*/
+ @Override
void createRetained() {
retained = new Shape3DRetained();
retained.setSource(this);
@@ -676,6 +677,7 @@ public class Shape3D extends Leaf {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
Shape3D s = new Shape3D();
s.duplicateNode(this, forceDuplicate);
@@ -713,6 +715,7 @@ public class Shape3D extends Leaf {
* @see Node#cloneNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public void duplicateNode(Node originalNode, boolean forceDuplicate) {
checkDuplicateNode(originalNode, forceDuplicate);
}
@@ -740,6 +743,7 @@ public class Shape3D extends Leaf {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
@@ -771,6 +775,7 @@ public class Shape3D extends Leaf {
/**
* See parent class for the documentation on getBounds().
*/
+ @Override
public Bounds getBounds() {
if (isLiveOrCompiled()) {
if(!this.getCapability(ALLOW_BOUNDS_READ)) {
diff --git a/src/classes/share/javax/media/j3d/Shape3DCompileRetained.java b/src/classes/share/javax/media/j3d/Shape3DCompileRetained.java
index 7b5f863..599632a 100644
--- a/src/classes/share/javax/media/j3d/Shape3DCompileRetained.java
+++ b/src/classes/share/javax/media/j3d/Shape3DCompileRetained.java
@@ -221,19 +221,23 @@ private void addSeparateList(ArrayList<GeometryArrayRetained> glist) {
geometryList.add(glist.get(k));
}
}
+ @Override
Bounds getCollisionBounds(int childIndex) {
return collisionBound;
}
+@Override
int numGeometries(int childIndex) {
return geometryInfo.get(childIndex).size();
}
+@Override
Geometry getGeometry(int i, int childIndex) {
return geometryInfo.get(childIndex).get(i);
}
+@Override
Enumeration<Geometry> getAllGeometries(int childIndex) {
ArrayList<Geometry> geoInfo = geometryInfo.get(childIndex);
Vector<Geometry> geomList = new Vector<Geometry>();
@@ -282,6 +286,7 @@ Bounds getBounds(int childIndex) {
* @exception IllegalArgumentException if <code>path</code> is
* invalid.
*/
+ @Override
boolean intersect(SceneGraphPath path,
PickShape pickShape, double[] dist) {
diff --git a/src/classes/share/javax/media/j3d/Shape3DRetained.java b/src/classes/share/javax/media/j3d/Shape3DRetained.java
index 6238911..f1c44f3 100644
--- a/src/classes/share/javax/media/j3d/Shape3DRetained.java
+++ b/src/classes/share/javax/media/j3d/Shape3DRetained.java
@@ -217,6 +217,7 @@ ArrayList<GeometryRetained> geometryList = null;
}
}
+ @Override
Bounds getLocalBounds(Bounds bounds) {
if(localBounds != null) {
localBounds.set(bounds);
@@ -232,6 +233,7 @@ ArrayList<GeometryRetained> geometryList = null;
* Sets the geometric bounds of a node.
* @param bounds the bounding object for the node
*/
+ @Override
void setBounds(Bounds bounds) {
super.setBounds(bounds);
@@ -845,6 +847,7 @@ Enumeration getAllGeometries(int id) {
* @return the node's bounding object
*/
+ @Override
Bounds getBounds() {
if(boundsAutoCompute) {
@@ -878,6 +881,7 @@ Enumeration getAllGeometries(int id) {
}
}
+ @Override
Bounds getEffectiveBounds() {
if(boundsAutoCompute) {
return getBounds();
@@ -892,6 +896,7 @@ Enumeration getAllGeometries(int id) {
* ONLY needed for SHAPE, MORPH, and LINK node type.
* Compute the combine bounds of bounds and its localBounds.
*/
+ @Override
void computeCombineBounds(Bounds bounds) {
if(boundsAutoCompute) {
@@ -961,11 +966,13 @@ Enumeration getAllGeometries(int id) {
* assign a name to this node when it is made live.
*/
+ @Override
void setLive(SetLiveState s) {
doSetLive(s);
markAsLive();
}
+ @Override
void doSetLive(SetLiveState s) {
// System.err.println("S3DRetained : setLive " + s);
Shape3DRetained shape;
@@ -1254,6 +1261,7 @@ Enumeration getAllGeometries(int id) {
/**
* assign a name to this node when it is made live.
*/
+ @Override
void clearLive(SetLiveState s) {
//System.err.println("S3DRetained : clearLive " + s);
@@ -1376,6 +1384,7 @@ Enumeration getAllGeometries(int id) {
}
}
+ @Override
boolean isStatic() {
if (source.getCapability(Shape3D.ALLOW_APPEARANCE_WRITE) ||
source.getCapability(Shape3D.ALLOW_GEOMETRY_WRITE) ||
@@ -1441,6 +1450,7 @@ Enumeration getAllGeometries(int id) {
}
+ @Override
void compile(CompileState compState) {
AppearanceRetained newApp;
@@ -1482,6 +1492,7 @@ Enumeration getAllGeometries(int id) {
}
+ @Override
void merge(CompileState compState) {
@@ -1570,6 +1581,7 @@ Enumeration getAllGeometries(int id) {
}
+ @Override
void getMirrorObjects( ArrayList list, HashKey k) {
Shape3DRetained ms;
if (inSharedGroup) {
@@ -1743,6 +1755,7 @@ Enumeration getAllGeometries(int id) {
+ @Override
void updatePickable(HashKey keys[], boolean pick[]) {
super.updatePickable(keys, pick);
Shape3DRetained shape;
@@ -1766,6 +1779,7 @@ Enumeration getAllGeometries(int id) {
}
+ @Override
void updateCollidable(HashKey keys[], boolean collide[]) {
super.updateCollidable(keys, collide);
Shape3DRetained shape;
@@ -2009,6 +2023,7 @@ Enumeration getAllGeometries(int id) {
throw new RuntimeException("Shape3DRetained: MirrorShape Not found!");
}
+ @Override
void setBoundsAutoCompute(boolean autoCompute) {
GeometryRetained geometry;
if (autoCompute != boundsAutoCompute) {
@@ -2053,6 +2068,7 @@ Enumeration getAllGeometries(int id) {
// This method is called when coordinates of a geometry in the geometrylist
// changed and autoBoundsCompute is true
+ @Override
void updateBounds() {
localBounds = new BoundingBox((BoundingBox) null);
getCombineBounds((BoundingBox)localBounds);
@@ -2746,6 +2762,7 @@ final static ArrayList<ArrayList<GeometryAtom>> getGeomAtomsList(ArrayList userL
}
+ @Override
void handleFrequencyChange(int bit) {
int mask = 0;
if (bit == Shape3D.ALLOW_GEOMETRY_WRITE) {
@@ -2821,6 +2838,7 @@ final static ArrayList<ArrayList<GeometryAtom>> getGeomAtomsList(ArrayList userL
return 0;
}
+ @Override
void searchGeometryAtoms(UnorderList list) {
list.add(getGeomAtom(getMirrorShape(key)));
}
diff --git a/src/classes/share/javax/media/j3d/SharedGroup.java b/src/classes/share/javax/media/j3d/SharedGroup.java
index fad7433..8d0fd7c 100644
--- a/src/classes/share/javax/media/j3d/SharedGroup.java
+++ b/src/classes/share/javax/media/j3d/SharedGroup.java
@@ -115,6 +115,7 @@ public class SharedGroup extends Group {
* Creates the retained mode SharedGroupRetained object that this
* SharedGroup component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new SharedGroupRetained();
this.retained.setSource(this);
@@ -158,6 +159,7 @@ public class SharedGroup extends Group {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
SharedGroup sg = new SharedGroup();
sg.duplicateNode(this, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/SharedGroupRetained.java b/src/classes/share/javax/media/j3d/SharedGroupRetained.java
index 81b6d08..75f29a4 100644
--- a/src/classes/share/javax/media/j3d/SharedGroupRetained.java
+++ b/src/classes/share/javax/media/j3d/SharedGroupRetained.java
@@ -83,6 +83,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
}
// SharedGroup specific data at SetLive.
+ @Override
void setAuxData(SetLiveState s, int index, int hkIndex) {
int i, size;
@@ -157,6 +158,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
}
+ @Override
void setNodeData(SetLiveState s) {
// For inSharedGroup case.
@@ -262,6 +264,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
s.modelClips = modelClips;
}
+ @Override
void setLive(SetLiveState s) {
int i,j;
@@ -356,6 +359,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
/**
* remove the localToVworld transform for a node.
*/
+ @Override
void removeNodeData(SetLiveState s) {
ArrayList switchTargets;
@@ -463,6 +467,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
s.altAppearances = altAppearances;
}
+ @Override
void clearLive(SetLiveState s) {
int i,j,k, index;
@@ -694,6 +699,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
return links;
}
+ @Override
void insertChildrenData(int index) {
if (childrenSwitchLinks == null) {
childrenSwitchLinks = new ArrayList(1);
@@ -701,6 +707,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
childrenSwitchLinks.add(index, new ArrayList(1));
}
+ @Override
void appendChildrenData() {
if (childrenSwitchLinks == null) {
childrenSwitchLinks = new ArrayList(1);
@@ -708,6 +715,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
childrenSwitchLinks.add(new ArrayList(1));
}
+ @Override
void removeChildrenData(int index) {
ArrayList oldSwitchLinks = (ArrayList)childrenSwitchLinks.get(index);
oldSwitchLinks.clear();
@@ -719,6 +727,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
// TargetsInterface methods
// ***************************
+ @Override
public int getTargetThreads(int type) {
if (type == TargetsInterface.TRANSFORM_TARGETS) {
return targetThreads;
@@ -728,12 +737,14 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
}
}
+ @Override
TargetsInterface getClosestTargetsInterface(int type) {
return this;
}
// re-evalute localTargetThreads using newCachedTargets and
// re-evaluate targetThreads
+ @Override
public void computeTargetThreads(int type,
CachedTargets[] newCachedTargets) {
@@ -771,6 +782,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
// re-compute localTargetThread, targetThreads and
// propagate changes to ancestors
+ @Override
public void updateTargetThreads(int type, CachedTargets[] newCachedTargets) {
// type is ignored here, only need for SharedGroup
if (type == TargetsInterface.TRANSFORM_TARGETS) {
@@ -787,6 +799,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
// re-evaluate targetThreads using childTargetThreads and
// propagate changes to ancestors
+ @Override
public void propagateTargetThreads(int type, int childTargetThreads) {
if (type == TargetsInterface.TRANSFORM_TARGETS) {
LinkRetained ln;
@@ -806,6 +819,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
}
}
+ @Override
public void updateCachedTargets(int type, CachedTargets[] newCt) {
if (type == TargetsInterface.TRANSFORM_TARGETS) {
j3dCTs = newCt;
@@ -814,6 +828,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
}
}
+ @Override
public void copyCachedTargets(int type, CachedTargets[] newCt) {
if (type == TargetsInterface.TRANSFORM_TARGETS) {
int size = cachedTargets.length;
@@ -825,6 +840,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
}
}
+ @Override
public CachedTargets getCachedTargets(int type, int index, int child) {
if (type == TargetsInterface.SWITCH_TARGETS) {
// child info is not used, SG does not have per child states
@@ -840,6 +856,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
}
}
+ @Override
public void resetCachedTargets(int type,
CachedTargets[] newCtArr,int child) {
if (type == TargetsInterface.SWITCH_TARGETS) {
@@ -861,6 +878,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
}
}
+@Override
public ArrayList<SwitchState> getTargetsData(int type, int index) {
// index is ignores for SharedGroup
if (type == TargetsInterface.SWITCH_TARGETS) {
@@ -872,6 +890,7 @@ public ArrayList<SwitchState> getTargetsData(int type, int index) {
}
}
+ @Override
void childDoSetLive(NodeRetained child, int childIndex, SetLiveState s) {
int i;
@@ -891,6 +910,7 @@ public ArrayList<SwitchState> getTargetsData(int type, int index) {
/**
* Make the boundsCache of this node and all its parents dirty
*/
+ @Override
void dirtyBoundsCache() {
// Possible optimisation is to not traverse up the tree
// if the cachedBounds==null. However this is not the case
diff --git a/src/classes/share/javax/media/j3d/Sound.java b/src/classes/share/javax/media/j3d/Sound.java
index 819c338..612206c 100644
--- a/src/classes/share/javax/media/j3d/Sound.java
+++ b/src/classes/share/javax/media/j3d/Sound.java
@@ -1128,6 +1128,7 @@ public abstract class Sound extends Leaf {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
@@ -1177,6 +1178,7 @@ public abstract class Sound extends Leaf {
* @see Node#cloneTree
* @see DanglingReferenceException
*/
+ @Override
public void updateNodeReferences(NodeReferenceTable referenceTable) {
super.updateNodeReferences(referenceTable);
diff --git a/src/classes/share/javax/media/j3d/SoundRetained.java b/src/classes/share/javax/media/j3d/SoundRetained.java
index 7c595cd..246e9dc 100644
--- a/src/classes/share/javax/media/j3d/SoundRetained.java
+++ b/src/classes/share/javax/media/j3d/SoundRetained.java
@@ -534,6 +534,7 @@ abstract class SoundRetained extends LeafRetained
}
// The update Object function.
+ @Override
synchronized void updateMirrorObject(Object[] objs) {
Transform3D trans = null;
int component = ((Integer)objs[1]).intValue();
@@ -1053,6 +1054,7 @@ abstract class SoundRetained extends LeafRetained
}
}
+ @Override
void setLive(SetLiveState s) {
SoundRetained ms;
int i, j;
@@ -1144,6 +1146,7 @@ abstract class SoundRetained extends LeafRetained
s.notifyThreads |= targetThreads;
}
+ @Override
void clearLive(SetLiveState s) {
SoundRetained ms;
@@ -1198,6 +1201,7 @@ abstract class SoundRetained extends LeafRetained
}
}
+ @Override
void mergeTransform(TransformGroupRetained xform) {
super.mergeTransform(xform);
if (schedulingRegion != null) {
@@ -1264,6 +1268,7 @@ abstract class SoundRetained extends LeafRetained
// Called on mirror object
// QUESTION: doesn't transformed region need to be saved???
+ @Override
void updateTransformChange() {
// If bounding leaf is null, tranform the bounds object
if (debugFlag)
@@ -1292,6 +1297,7 @@ abstract class SoundRetained extends LeafRetained
System.err.println(message);
}
}
+ @Override
void getMirrorObjects(ArrayList leafList, HashKey key) {
if (key == null) {
leafList.add(mirrorSounds[0]);
diff --git a/src/classes/share/javax/media/j3d/SoundScheduler.java b/src/classes/share/javax/media/j3d/SoundScheduler.java
index 8820cf8..9e71a0c 100644
--- a/src/classes/share/javax/media/j3d/SoundScheduler.java
+++ b/src/classes/share/javax/media/j3d/SoundScheduler.java
@@ -194,6 +194,7 @@ class SoundScheduler extends J3dStructure {
// NOTE: processMessage only called with updatethread.active true
+ @Override
void processMessages(long referenceTime) {
J3dMessage[] messages = getMessages(referenceTime);
int nMsg = getNumMessage();
@@ -392,6 +393,7 @@ class SoundScheduler extends J3dStructure {
/**
* Node removed from tree
*/
+ @Override
void removeNodes(J3dMessage m) {
Object[] nodes = (Object[])m.args[0];
ArrayList<NodeRetained> viewScopedNodes = (ArrayList<NodeRetained>)m.args[3];
@@ -3227,6 +3229,7 @@ class SoundScheduler extends J3dStructure {
}
}
+ @Override
void cleanup() {
// clean up any messages that are queued up, since they are
// irrelevant
diff --git a/src/classes/share/javax/media/j3d/SoundStructure.java b/src/classes/share/javax/media/j3d/SoundStructure.java
index 77ac722..05df38f 100644
--- a/src/classes/share/javax/media/j3d/SoundStructure.java
+++ b/src/classes/share/javax/media/j3d/SoundStructure.java
@@ -86,6 +86,7 @@ class SoundStructure extends J3dStructure {
debugPrint("SoundStructure constructed");
}
+ @Override
void processMessages(long referenceTime) {
J3dMessage messages[] = getMessages(referenceTime);
int nMsg = getNumMessage();
@@ -251,6 +252,7 @@ class SoundStructure extends J3dStructure {
}
+ @Override
void removeNodes(J3dMessage m) {
Object[] nodes = (Object[])m.args[0];
ArrayList<NodeRetained> viewScopedNodes = (ArrayList<NodeRetained>)m.args[3];
@@ -733,6 +735,7 @@ class SoundStructure extends J3dStructure {
}
+ @Override
void cleanup() {}
}
diff --git a/src/classes/share/javax/media/j3d/Soundscape.java b/src/classes/share/javax/media/j3d/Soundscape.java
index d67257b..8470636 100644
--- a/src/classes/share/javax/media/j3d/Soundscape.java
+++ b/src/classes/share/javax/media/j3d/Soundscape.java
@@ -122,6 +122,7 @@ public class Soundscape extends Leaf {
* Creates the retained mode SoundscapeRetained object that this
* component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new SoundscapeRetained();
this.retained.setSource(this);
@@ -236,6 +237,7 @@ public class Soundscape extends Leaf {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
Soundscape s = new Soundscape();
s.duplicateNode(this, forceDuplicate);
@@ -273,6 +275,7 @@ public class Soundscape extends Leaf {
* @see Node#cloneNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public void duplicateNode(Node originalNode, boolean forceDuplicate) {
checkDuplicateNode(originalNode, forceDuplicate);
}
@@ -298,6 +301,7 @@ public class Soundscape extends Leaf {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
@@ -341,6 +345,7 @@ public class Soundscape extends Leaf {
* @see Node#cloneTree
* @see DanglingReferenceException
*/
+ @Override
public void updateNodeReferences(NodeReferenceTable referenceTable) {
SoundscapeRetained rt = (SoundscapeRetained) retained;
diff --git a/src/classes/share/javax/media/j3d/SoundscapeRetained.java b/src/classes/share/javax/media/j3d/SoundscapeRetained.java
index f55fd9e..dc74bf0 100644
--- a/src/classes/share/javax/media/j3d/SoundscapeRetained.java
+++ b/src/classes/share/javax/media/j3d/SoundscapeRetained.java
@@ -230,6 +230,7 @@ class SoundscapeRetained extends LeafRetained
*/
// The update Object function.
+ @Override
synchronized void updateMirrorObject(Object[] objs) {
// NOTE: There doesn't seem to be a use for mirror objects since
// Soundscapes can't be shared.
@@ -266,6 +267,7 @@ class SoundscapeRetained extends LeafRetained
}
// The update tranform fields
+ @Override
synchronized void updateTransformChange() {
if (boundingLeaf != null) {
transformedRegion = boundingLeaf.transformedRegion;
@@ -352,6 +354,7 @@ class SoundscapeRetained extends LeafRetained
* This setLive routine first calls the superclass's method, then
* it adds itself to the list of soundscapes
*/
+ @Override
void setLive(SetLiveState s) {
super.doSetLive(s);
@@ -397,6 +400,7 @@ class SoundscapeRetained extends LeafRetained
* This clearLive routine first calls the superclass's method, then
* it removes itself to the list of lights
*/
+ @Override
void clearLive(SetLiveState s) {
super.clearLive(s);
if (s.switchTargets != null &&
@@ -439,6 +443,7 @@ class SoundscapeRetained extends LeafRetained
attributes = ss.attributes;
}
+ @Override
void mergeTransform(TransformGroupRetained xform) {
super.mergeTransform(xform);
if (applicationRegion != null) {
@@ -446,6 +451,7 @@ class SoundscapeRetained extends LeafRetained
}
}
+ @Override
void getMirrorObjects(ArrayList leafList, HashKey key) {
leafList.add(this);
}
diff --git a/src/classes/share/javax/media/j3d/SourceCodeShader.java b/src/classes/share/javax/media/j3d/SourceCodeShader.java
index 7c75fc4..afc243b 100644
--- a/src/classes/share/javax/media/j3d/SourceCodeShader.java
+++ b/src/classes/share/javax/media/j3d/SourceCodeShader.java
@@ -84,6 +84,7 @@ public class SourceCodeShader extends Shader {
* Creates a retained mode SourceCodeShaderRetained object that this
* SourceCodeShader component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new SourceCodeShaderRetained();
this.retained.setSource(this);
@@ -93,6 +94,7 @@ public class SourceCodeShader extends Shader {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
SourceCodeShaderRetained scsRetained = (SourceCodeShaderRetained) retained;
@@ -121,6 +123,7 @@ public class SourceCodeShader extends Shader {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/SourceCodeShaderRetained.java b/src/classes/share/javax/media/j3d/SourceCodeShaderRetained.java
index b74ea56..2e20b8e 100644
--- a/src/classes/share/javax/media/j3d/SourceCodeShaderRetained.java
+++ b/src/classes/share/javax/media/j3d/SourceCodeShaderRetained.java
@@ -71,6 +71,7 @@ class SourceCodeShaderRetained extends ShaderRetained {
this.shaderSource = shaderSource;
}
+ @Override
synchronized void createMirrorObject() {
// System.err.println("SourceCodeShaderRetained : createMirrorObject");
@@ -85,6 +86,7 @@ class SourceCodeShaderRetained extends ShaderRetained {
/**
* Initializes a mirror object.
*/
+ @Override
synchronized void initMirrorObject() {
mirror.source = source;
@@ -92,6 +94,7 @@ class SourceCodeShaderRetained extends ShaderRetained {
((SourceCodeShaderRetained) mirror).shaderData = null;
}
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
System.err.println("SourceCodeShader.updateMirrorObject not implemented yet!");
}
diff --git a/src/classes/share/javax/media/j3d/SpotLight.java b/src/classes/share/javax/media/j3d/SpotLight.java
index 08ba7cb..f9e65e9 100644
--- a/src/classes/share/javax/media/j3d/SpotLight.java
+++ b/src/classes/share/javax/media/j3d/SpotLight.java
@@ -188,6 +188,7 @@ public class SpotLight extends PointLight {
* Creates the retained mode SpotLightRetained object that this
* SpotLight component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new SpotLightRetained();
this.retained.setSource(this);
@@ -326,6 +327,7 @@ public class SpotLight extends PointLight {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
SpotLight s = new SpotLight();
s.duplicateNode(this, forceDuplicate);
@@ -354,6 +356,7 @@ public class SpotLight extends PointLight {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean
forceDuplicate) {
diff --git a/src/classes/share/javax/media/j3d/SpotLightRetained.java b/src/classes/share/javax/media/j3d/SpotLightRetained.java
index d7cd012..f7fef46 100644
--- a/src/classes/share/javax/media/j3d/SpotLightRetained.java
+++ b/src/classes/share/javax/media/j3d/SpotLightRetained.java
@@ -78,6 +78,7 @@ class SpotLightRetained extends PointLightRetained {
}
+ @Override
void setLive(SetLiveState s) {
super.doSetLive(s);
J3dMessage createMessage = super.initMessage(12);
@@ -197,6 +198,7 @@ class SpotLightRetained extends PointLightRetained {
* transformed position, spread angle, concentration,
* and its transformed position.
*/
+ @Override
void update(Context ctx, int lightSlot, double scale) {
validateAttenuationInEc(scale);
Pipeline.getPipeline().updateSpotLight(ctx,
@@ -215,6 +217,7 @@ class SpotLightRetained extends PointLightRetained {
* updates a directional light. This includes its
* color and its transformed direction.
*/
+ @Override
// Note : if you add any more fields here , you need to update
// updateLight() in RenderingEnvironmentStructure
void updateMirrorObject(Object[] objs) {
@@ -273,6 +276,7 @@ class SpotLightRetained extends PointLightRetained {
// Clones only the retained side, internal use only
+ @Override
protected Object clone() {
SpotLightRetained sr = (SpotLightRetained)super.clone();
sr.direction = new Vector3f(direction);
@@ -283,6 +287,7 @@ class SpotLightRetained extends PointLightRetained {
// Called on the mirror object
+ @Override
void updateTransformChange() {
super.updateTransformChange();
@@ -291,6 +296,7 @@ class SpotLightRetained extends PointLightRetained {
}
+ @Override
final void sendMessage(int attrMask, Object attr) {
J3dMessage createMessage = new J3dMessage();
createMessage.threads = targetThreads;
@@ -308,6 +314,7 @@ class SpotLightRetained extends PointLightRetained {
}
+ @Override
void mergeTransform(TransformGroupRetained xform) {
super.mergeTransform(xform);
xform.transform.transform(direction, direction);
diff --git a/src/classes/share/javax/media/j3d/StructureUpdateThread.java b/src/classes/share/javax/media/j3d/StructureUpdateThread.java
index 42cb1e9..8dbf431 100644
--- a/src/classes/share/javax/media/j3d/StructureUpdateThread.java
+++ b/src/classes/share/javax/media/j3d/StructureUpdateThread.java
@@ -93,6 +93,7 @@ class StructureUpdateThread extends J3dThread {
}
+ @Override
void doWork(long referenceTime) {
structure.processMessages(referenceTime);
}
diff --git a/src/classes/share/javax/media/j3d/Switch.java b/src/classes/share/javax/media/j3d/Switch.java
index 5353cff..6a3f760 100644
--- a/src/classes/share/javax/media/j3d/Switch.java
+++ b/src/classes/share/javax/media/j3d/Switch.java
@@ -126,6 +126,7 @@ public class Switch extends Group {
* Creates the retained mode SwitchRetained object that this
* Switch object will point to.
*/
+ @Override
void createRetained() {
this.retained = new SwitchRetained();
this.retained.setSource(this);
@@ -234,6 +235,7 @@ public class Switch extends Group {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
Switch s = new Switch();
s.duplicateNode(this, forceDuplicate);
@@ -262,6 +264,7 @@ public class Switch extends Group {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/SwitchRetained.java b/src/classes/share/javax/media/j3d/SwitchRetained.java
index 1a79136..76aba21 100644
--- a/src/classes/share/javax/media/j3d/SwitchRetained.java
+++ b/src/classes/share/javax/media/j3d/SwitchRetained.java
@@ -293,6 +293,7 @@ void updateSwitchChild(int child, boolean switchOn, ArrayList<SwitchState> updat
}
// Switch specific data at SetLive.
+ @Override
void setAuxData(SetLiveState s, int index, int hkIndex) {
int size;
ArrayList<SwitchState> switchStates;
@@ -307,6 +308,7 @@ void updateSwitchChild(int child, boolean switchOn, ArrayList<SwitchState> updat
}
}
+ @Override
void setNodeData(SetLiveState s) {
super.setNodeData(s);
// add this node to parent's childSwitchLink
@@ -340,6 +342,7 @@ void updateSwitchChild(int child, boolean switchOn, ArrayList<SwitchState> updat
}
}
+ @Override
void setLive(SetLiveState s) {
int i,j,k;
boolean switchOn;
@@ -412,6 +415,7 @@ void updateSwitchChild(int child, boolean switchOn, ArrayList<SwitchState> updat
}
+ @Override
void removeNodeData(SetLiveState s) {
int numChildren = children.size();
@@ -461,6 +465,7 @@ void updateSwitchChild(int child, boolean switchOn, ArrayList<SwitchState> updat
// synchronized with setWhichChild and setChildMask
+ @Override
synchronized void clearLive(SetLiveState s) {
Targets[] savedSwitchTargets = s.switchTargets;
s.switchTargets = null;
@@ -625,6 +630,7 @@ void updateSwitchChild(int child, boolean switchOn, ArrayList<SwitchState> updat
}
+ @Override
void computeCombineBounds(Bounds bounds) {
if (boundsAutoCompute) {
if (!VirtualUniverse.mc.cacheAutoComputedBounds) {
@@ -703,6 +709,7 @@ void updateSwitchChild(int child, boolean switchOn, ArrayList<SwitchState> updat
* Gets the bounding object of a node.
* @return the node's bounding object
*/
+ @Override
Bounds getBounds() {
if (boundsAutoCompute) {
// Issue 514 : NPE in Wonderland : triggered in cached bounds computation
@@ -764,6 +771,7 @@ void updateSwitchChild(int child, boolean switchOn, ArrayList<SwitchState> updat
* Compiles the children of the switch, preventing shape merging at
* this level or above
*/
+ @Override
void compile(CompileState compState) {
@@ -777,6 +785,7 @@ void updateSwitchChild(int child, boolean switchOn, ArrayList<SwitchState> updat
}
}
+ @Override
void insertChildrenData(int index) {
if (childrenSwitchStates == null) {
childrenSwitchStates = new ArrayList<ArrayList<SwitchState>>(1);
@@ -794,6 +803,7 @@ void updateSwitchChild(int child, boolean switchOn, ArrayList<SwitchState> updat
}
}
+ @Override
void appendChildrenData() {
if (childrenSwitchStates == null) {
childrenSwitchStates = new ArrayList<ArrayList<SwitchState>>(1);
@@ -810,6 +820,7 @@ void updateSwitchChild(int child, boolean switchOn, ArrayList<SwitchState> updat
}
}
+ @Override
void removeChildrenData(int index) {
ArrayList<SwitchState> oldSwitchStates = childrenSwitchStates.get(index);
oldSwitchStates.clear();
@@ -820,6 +831,7 @@ void updateSwitchChild(int child, boolean switchOn, ArrayList<SwitchState> updat
childrenSwitchLinks.remove(index);
}
+ @Override
void childDoSetLive(NodeRetained child, int childIndex, SetLiveState s) {
int numPaths = (inSharedGroup)? s.keys.length : 1;
@@ -861,12 +873,14 @@ void updateSwitchChild(int child, boolean switchOn, ArrayList<SwitchState> updat
// TargetsInterface methods
// ***************************
+ @Override
TargetsInterface getClosestTargetsInterface(int type) {
return (type == TargetsInterface.SWITCH_TARGETS)?
(TargetsInterface)this:
(TargetsInterface)parentTransformLink;
}
+ @Override
public CachedTargets getCachedTargets(int type, int index, int child) {
if (type == TargetsInterface.SWITCH_TARGETS) {
ArrayList<SwitchState> switchStates = childrenSwitchStates.get(child);
@@ -882,6 +896,7 @@ void updateSwitchChild(int child, boolean switchOn, ArrayList<SwitchState> updat
}
}
+ @Override
public void resetCachedTargets(int type,
CachedTargets[] newCtArr, int child) {
if (type == TargetsInterface.SWITCH_TARGETS) {
@@ -901,6 +916,7 @@ void updateSwitchChild(int child, boolean switchOn, ArrayList<SwitchState> updat
}
}
+@Override
public ArrayList<SwitchState> getTargetsData(int type, int child) {
if (type == TargetsInterface.SWITCH_TARGETS) {
return childrenSwitchStates.get(child);
@@ -911,27 +927,33 @@ public ArrayList<SwitchState> getTargetsData(int type, int child) {
}
}
+ @Override
public int getTargetThreads(int type) {
System.err.println("getTargetsThreads: wrong arguments");
return -1;
}
+ @Override
public void updateCachedTargets(int type, CachedTargets[] newCt) {
System.err.println("updateCachedTarget: wrong arguments");
}
+ @Override
public void computeTargetThreads(int type, CachedTargets[] newCt) {
System.err.println("computeTargetThreads: wrong arguments");
}
+ @Override
public void updateTargetThreads(int type, CachedTargets[] newCt) {
System.err.println("updateTargetThreads: wrong arguments");
}
+ @Override
public void propagateTargetThreads(int type, int newTargetThreads) {
System.err.println("propagateTargetThreads: wrong arguments");
}
+ @Override
public void copyCachedTargets(int type, CachedTargets[] newCt) {
System.err.println("copyCachedTarget: wrong arguments");
}
diff --git a/src/classes/share/javax/media/j3d/SwitchValueInterpolator.java b/src/classes/share/javax/media/j3d/SwitchValueInterpolator.java
index 9b6a2c9..b85e648 100644
--- a/src/classes/share/javax/media/j3d/SwitchValueInterpolator.java
+++ b/src/classes/share/javax/media/j3d/SwitchValueInterpolator.java
@@ -158,6 +158,7 @@ public class SwitchValueInterpolator extends Interpolator {
* @param criteria an enumeration of the criteria that triggered
* this stimulus
*/
+ @Override
public void processStimulus(Enumeration criteria) {
// Handle stimulus
WakeupCriterion criterion = passiveWakeupCriterion;
@@ -211,6 +212,7 @@ public class SwitchValueInterpolator extends Interpolator {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
SwitchValueInterpolator svi = new SwitchValueInterpolator();
svi.duplicateNode(this, forceDuplicate);
@@ -239,6 +241,7 @@ public class SwitchValueInterpolator extends Interpolator {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
@@ -276,6 +279,7 @@ public class SwitchValueInterpolator extends Interpolator {
* @see Node#cloneTree
* @see DanglingReferenceException
*/
+ @Override
public void updateNodeReferences(NodeReferenceTable referenceTable) {
super.updateNodeReferences(referenceTable);
diff --git a/src/classes/share/javax/media/j3d/TexCoordGeneration.java b/src/classes/share/javax/media/j3d/TexCoordGeneration.java
index c440b11..fe9679a 100644
--- a/src/classes/share/javax/media/j3d/TexCoordGeneration.java
+++ b/src/classes/share/javax/media/j3d/TexCoordGeneration.java
@@ -624,6 +624,7 @@ public class TexCoordGeneration extends NodeComponent {
* Creates a retained mode TexCoordGenerationRetained object that this
* TexCoordGeneration component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new TexCoordGenerationRetained();
this.retained.setSource(this);
@@ -632,6 +633,7 @@ public class TexCoordGeneration extends NodeComponent {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
TexCoordGeneration tga = new TexCoordGeneration();
tga.duplicateNodeComponent(this);
@@ -657,6 +659,7 @@ public class TexCoordGeneration extends NodeComponent {
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
diff --git a/src/classes/share/javax/media/j3d/TexCoordGenerationRetained.java b/src/classes/share/javax/media/j3d/TexCoordGenerationRetained.java
index 85aee97..aa704f5 100644
--- a/src/classes/share/javax/media/j3d/TexCoordGenerationRetained.java
+++ b/src/classes/share/javax/media/j3d/TexCoordGenerationRetained.java
@@ -253,6 +253,7 @@ class TexCoordGenerationRetained extends NodeComponentRetained {
* Creates a mirror object, point the mirror object to the retained
* object if the object is not editable
*/
+ @Override
synchronized void createMirrorObject() {
if (mirror == null) {
// Check the capability bits and let the mirror object
@@ -292,6 +293,7 @@ class TexCoordGenerationRetained extends NodeComponentRetained {
* Initializes a mirror object, point the mirror object to the retained
* object if the object is not editable
*/
+ @Override
synchronized void initMirrorObject() {
((TexCoordGenerationRetained)mirror).set(this);
}
@@ -299,6 +301,7 @@ class TexCoordGenerationRetained extends NodeComponentRetained {
/** Update the "component" field of the mirror object with the
* given "value"
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
TexCoordGenerationRetained mirrorTc = (TexCoordGenerationRetained) mirror;
@@ -340,6 +343,7 @@ class TexCoordGenerationRetained extends NodeComponentRetained {
tr.planeR.equals(planeR));
}
+ @Override
protected Object clone() {
TexCoordGenerationRetained tr = (TexCoordGenerationRetained)super.clone();
tr.planeS = new Vector4f(planeS);
@@ -398,6 +402,7 @@ class TexCoordGenerationRetained extends NodeComponentRetained {
}
}
+ @Override
void handleFrequencyChange(int bit) {
switch (bit) {
case TexCoordGeneration.ALLOW_ENABLE_WRITE:
diff --git a/src/classes/share/javax/media/j3d/Text3D.java b/src/classes/share/javax/media/j3d/Text3D.java
index 7ba3eaf..3791753 100644
--- a/src/classes/share/javax/media/j3d/Text3D.java
+++ b/src/classes/share/javax/media/j3d/Text3D.java
@@ -318,6 +318,7 @@ public class Text3D extends Geometry {
* Creates the retained mode Text3DRetained object that this
* Text3D component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new Text3DRetained();
this.retained.setSource(this);
@@ -606,6 +607,7 @@ public class Text3D extends Geometry {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
Text3D t = new Text3D();
t.duplicateNodeComponent(this);
@@ -630,6 +632,7 @@ public class Text3D extends Geometry {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/Text3DRenderMethod.java b/src/classes/share/javax/media/j3d/Text3DRenderMethod.java
index 10992c3..99f6e5c 100644
--- a/src/classes/share/javax/media/j3d/Text3DRenderMethod.java
+++ b/src/classes/share/javax/media/j3d/Text3DRenderMethod.java
@@ -36,6 +36,7 @@ class Text3DRenderMethod implements RenderMethod {
/**
* The actual rendering code for this RenderMethod
*/
+ @Override
public boolean render(RenderMolecule rm, Canvas3D cv,
RenderAtomListInfo ra, int dirtyBits) {
diff --git a/src/classes/share/javax/media/j3d/Text3DRetained.java b/src/classes/share/javax/media/j3d/Text3DRetained.java
index 03416bc..9e9771a 100644
--- a/src/classes/share/javax/media/j3d/Text3DRetained.java
+++ b/src/classes/share/javax/media/j3d/Text3DRetained.java
@@ -87,6 +87,7 @@ class Text3DRetained extends GeometryRetained {
}
+ @Override
synchronized void computeBoundingBox() {
Point3d l = new Point3d();
Point3d u = new Point3d();
@@ -187,6 +188,7 @@ class Text3DRetained extends GeometryRetained {
}
}
+ @Override
void update() {}
@@ -843,6 +845,7 @@ class Text3DRetained extends GeometryRetained {
* used by this.string are tesselated in this method, to avoid wait during
* traversal and rendering.
*/
+ @Override
void setLive(boolean inBackgroundGroup, int refCount) {
// Tesselate all character data and update character transforms
updateCharacterData();
@@ -851,6 +854,7 @@ class Text3DRetained extends GeometryRetained {
}
// TODO -- Need to rethink. Might have to consider charTransform[] in returns pickInfo.
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
Transform3D tempT3D = new Transform3D();
@@ -891,6 +895,7 @@ class Text3DRetained extends GeometryRetained {
return false;
}
+ @Override
boolean intersect(Point3d[] pnts) {
Transform3D tempT3D = new Transform3D();
GeometryArrayRetained ga;
@@ -917,6 +922,7 @@ class Text3DRetained extends GeometryRetained {
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld, GeometryRetained geom) {
GeometryArrayRetained ga;
@@ -930,6 +936,7 @@ class Text3DRetained extends GeometryRetained {
return false;
}
+ @Override
boolean intersect(Bounds targetBound) {
GeometryArrayRetained ga;
@@ -950,6 +957,7 @@ class Text3DRetained extends GeometryRetained {
}
+ @Override
void execute(Canvas3D cv, RenderAtom ra, boolean isNonUniformScale,
boolean updateAlpha, float alpha,
int screen,
@@ -966,6 +974,7 @@ class Text3DRetained extends GeometryRetained {
}
}
+ @Override
int getClassType() {
return TEXT3D_TYPE;
}
diff --git a/src/classes/share/javax/media/j3d/Texture.java b/src/classes/share/javax/media/j3d/Texture.java
index 693ad44..7655ad3 100644
--- a/src/classes/share/javax/media/j3d/Texture.java
+++ b/src/classes/share/javax/media/j3d/Texture.java
@@ -1802,6 +1802,7 @@ public abstract class Texture extends NodeComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
@@ -1857,6 +1858,7 @@ public abstract class Texture extends NodeComponent {
* duplicate also even though current duplicateOnCloneTree flag is false.
* This should be overwrite by NodeComponent which contains sub-NodeComponent.
*/
+ @Override
boolean duplicateChild() {
if (getDuplicateOnCloneTree())
return true;
diff --git a/src/classes/share/javax/media/j3d/Texture2D.java b/src/classes/share/javax/media/j3d/Texture2D.java
index d21aa9b..6f32db6 100644
--- a/src/classes/share/javax/media/j3d/Texture2D.java
+++ b/src/classes/share/javax/media/j3d/Texture2D.java
@@ -238,6 +238,7 @@ public class Texture2D extends Texture {
*
* @since Java 3D 1.3
*/
+ @Override
public void setMagFilter(int magFilter) {
checkForLiveOrCompiled();
@@ -501,6 +502,7 @@ public class Texture2D extends Texture {
* Creates a retained mode Texture2DRetained object that this
* Texture2D component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new Texture2DRetained();
this.retained.setSource(this);
@@ -511,6 +513,7 @@ public class Texture2D extends Texture {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
Texture2DRetained t2d = (Texture2DRetained) retained;
@@ -527,6 +530,7 @@ public class Texture2D extends Texture {
* @deprecated replaced with duplicateNodeComponent(
* NodeComponent originalNodeComponent, boolean forceDuplicate)
*/
+ @Override
public void duplicateNodeComponent(NodeComponent originalNodeComponent) {
checkDuplicateNodeComponent(originalNodeComponent);
}
@@ -548,6 +552,7 @@ public class Texture2D extends Texture {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/Texture3D.java b/src/classes/share/javax/media/j3d/Texture3D.java
index d5c41d8..6b2f955 100644
--- a/src/classes/share/javax/media/j3d/Texture3D.java
+++ b/src/classes/share/javax/media/j3d/Texture3D.java
@@ -204,6 +204,7 @@ public class Texture3D extends Texture {
* Creates a retained mode Texture3DRetained object that this
* Texture3D component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new Texture3DRetained();
this.retained.setSource(this);
@@ -212,6 +213,7 @@ public class Texture3D extends Texture {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
Texture3DRetained t3d = (Texture3DRetained) retained;
Texture3D t = new Texture3D(t3d.getMipMapMode(), t3d.format,
@@ -228,6 +230,7 @@ public class Texture3D extends Texture {
* @deprecated replaced with duplicateNodeComponent(
* NodeComponent originalNodeComponent, boolean forceDuplicate)
*/
+ @Override
public void duplicateNodeComponent(NodeComponent originalNodeComponent) {
checkDuplicateNodeComponent(originalNodeComponent);
}
@@ -250,6 +253,7 @@ public class Texture3D extends Texture {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/Texture3DRetained.java b/src/classes/share/javax/media/j3d/Texture3DRetained.java
index 616ff9e..c216c08 100644
--- a/src/classes/share/javax/media/j3d/Texture3DRetained.java
+++ b/src/classes/share/javax/media/j3d/Texture3DRetained.java
@@ -69,6 +69,7 @@ class Texture3DRetained extends TextureRetained {
/**
* This method updates the native context.
*/
+ @Override
void bindTexture(Context ctx, int objectId, boolean enable) {
Pipeline.getPipeline().bindTexture3D(ctx, objectId, enable);
}
@@ -85,6 +86,7 @@ class Texture3DRetained extends TextureRetained {
boundaryBlue, boundaryAlpha);
}
+ @Override
void updateTextureFilterModes(Context ctx,
int minFilter, int magFilter) {
@@ -92,6 +94,7 @@ class Texture3DRetained extends TextureRetained {
minFilter, magFilter);
}
+ @Override
void updateTextureSharpenFunc(Context ctx,
int numSharpenTextureFuncPts,
float[] sharpenTextureFuncPts) {
@@ -100,6 +103,7 @@ class Texture3DRetained extends TextureRetained {
numSharpenTextureFuncPts, sharpenTextureFuncPts);
}
+ @Override
void updateTextureFilter4Func(Context ctx,
int numFilter4FuncPts,
float[] filter4FuncPts) {
@@ -108,6 +112,7 @@ class Texture3DRetained extends TextureRetained {
numFilter4FuncPts, filter4FuncPts);
}
+ @Override
void updateTextureAnisotropicFilter(Context ctx, float degree) {
Pipeline.getPipeline().updateTexture3DAnisotropicFilter(ctx, degree);
}
@@ -149,6 +154,7 @@ class Texture3DRetained extends TextureRetained {
// load level 0 image with null data pointer, just to enable
// mipmapping when level 0 is not the base level
+ @Override
void updateTextureDimensions(Canvas3D cv) {
if(images[0][0] != null) {
updateTextureImage(cv, maxLevels, 0, 0,
@@ -159,6 +165,7 @@ class Texture3DRetained extends TextureRetained {
}
+ @Override
void updateTextureBoundary(Canvas3D cv) {
updateTextureBoundary(cv.ctx,
boundaryModeS, boundaryModeT, boundaryModeR,
@@ -166,6 +173,7 @@ class Texture3DRetained extends TextureRetained {
boundaryColor.z, boundaryColor.w);
}
+ @Override
void updateTextureLodRange(Context ctx,
int baseLevel, int maximumLevel,
float minimumLod, float maximumLod) {
@@ -174,6 +182,7 @@ class Texture3DRetained extends TextureRetained {
minimumLod, maximumLod);
}
+ @Override
void updateTextureLodOffset(Context ctx,
float lodOffsetX, float lodOffsetY,
float lodOffsetZ) {
@@ -182,6 +191,7 @@ class Texture3DRetained extends TextureRetained {
lodOffsetX, lodOffsetY, lodOffsetZ);
}
+ @Override
void reloadTextureImage(Canvas3D cv, int face, int level,
ImageComponentRetained image, int numLevels) {
@@ -203,6 +213,7 @@ class Texture3DRetained extends TextureRetained {
imageData.get());
}
+ @Override
void reloadTextureSubImage(Canvas3D cv, int level, int face,
ImageComponentUpdateInfo info,
ImageComponentRetained image) {
diff --git a/src/classes/share/javax/media/j3d/TextureAttributes.java b/src/classes/share/javax/media/j3d/TextureAttributes.java
index 55ed989..28e1bfc 100644
--- a/src/classes/share/javax/media/j3d/TextureAttributes.java
+++ b/src/classes/share/javax/media/j3d/TextureAttributes.java
@@ -1368,6 +1368,7 @@ public class TextureAttributes extends NodeComponent {
* Creates a retained mode TextureAttributesRetained object that this
* TextureAttributes component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new TextureAttributesRetained();
this.retained.setSource(this);
@@ -1377,6 +1378,7 @@ public class TextureAttributes extends NodeComponent {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
TextureAttributes ta = new TextureAttributes();
ta.duplicateNodeComponent(this);
@@ -1401,6 +1403,7 @@ public class TextureAttributes extends NodeComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
diff --git a/src/classes/share/javax/media/j3d/TextureAttributesRetained.java b/src/classes/share/javax/media/j3d/TextureAttributesRetained.java
index d9fc874..c51e830 100644
--- a/src/classes/share/javax/media/j3d/TextureAttributesRetained.java
+++ b/src/classes/share/javax/media/j3d/TextureAttributesRetained.java
@@ -675,6 +675,7 @@ class TextureAttributesRetained extends NodeComponentRetained {
* Creates and initializes a mirror object, point the mirror object
* to the retained object if the object is not editable
*/
+ @Override
synchronized void createMirrorObject() {
if (mirror == null) {
@@ -696,6 +697,7 @@ class TextureAttributesRetained extends NodeComponentRetained {
/**
* Initializes a mirror object
*/
+ @Override
synchronized void initMirrorObject() {
((TextureAttributesRetained)mirror).set(this);
}
@@ -865,6 +867,7 @@ class TextureAttributesRetained extends NodeComponentRetained {
}
+ @Override
protected Object clone() {
TextureAttributesRetained tr = (TextureAttributesRetained)super.clone();
tr.transform = new Transform3D(transform);
@@ -984,6 +987,7 @@ class TextureAttributesRetained extends NodeComponentRetained {
}
}
+ @Override
void handleFrequencyChange(int bit) {
switch (bit) {
case TextureAttributes.ALLOW_MODE_WRITE:
diff --git a/src/classes/share/javax/media/j3d/TextureBin.java b/src/classes/share/javax/media/j3d/TextureBin.java
index 3a7c64f..9af0cc1 100644
--- a/src/classes/share/javax/media/j3d/TextureBin.java
+++ b/src/classes/share/javax/media/j3d/TextureBin.java
@@ -766,6 +766,7 @@ HashMap<Transform3D[], RenderMolecule> transparentRenderMoleculeMap = new HashMa
soleUserCompDirty = 0;
}
+ @Override
public void updateObject() {
if (!addOpaqueRMs.isEmpty()) {
opaqueRMList = addAll(opaqueRenderMoleculeMap, addOpaqueRMs,
diff --git a/src/classes/share/javax/media/j3d/TextureCubeMap.java b/src/classes/share/javax/media/j3d/TextureCubeMap.java
index bbfa2d5..10fbdd8 100644
--- a/src/classes/share/javax/media/j3d/TextureCubeMap.java
+++ b/src/classes/share/javax/media/j3d/TextureCubeMap.java
@@ -328,6 +328,7 @@ public class TextureCubeMap extends Texture {
*
* @since Java 3D 1.3
*/
+ @Override
public void setImage(int level, ImageComponent image) {
throw new UnsupportedOperationException();
}
@@ -342,6 +343,7 @@ public class TextureCubeMap extends Texture {
*
* @since Java 3D 1.3
*/
+ @Override
public void setImages(ImageComponent[] images) {
throw new UnsupportedOperationException();
}
@@ -355,6 +357,7 @@ public class TextureCubeMap extends Texture {
*
* @since Java 3D 1.3
*/
+ @Override
public ImageComponent getImage(int level) {
throw new UnsupportedOperationException();
}
@@ -369,6 +372,7 @@ public class TextureCubeMap extends Texture {
*
* @since Java 3D 1.3
*/
+ @Override
public ImageComponent[] getImages() {
throw new UnsupportedOperationException();
}
@@ -378,6 +382,7 @@ public class TextureCubeMap extends Texture {
* Creates a retained mode TextureCubeMapRetained object that this
* TextureCubeMap component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new TextureCubeMapRetained();
this.retained.setSource(this);
@@ -390,6 +395,7 @@ public class TextureCubeMap extends Texture {
* @deprecated replaced with duplicateNodeComponent(
* NodeComponent originalNodeComponent, boolean forceDuplicate)
*/
+ @Override
public void duplicateNodeComponent(NodeComponent originalNodeComponent) {
checkDuplicateNodeComponent(originalNodeComponent);
}
diff --git a/src/classes/share/javax/media/j3d/TextureCubeMapRetained.java b/src/classes/share/javax/media/j3d/TextureCubeMapRetained.java
index d3990b7..97fa9ff 100644
--- a/src/classes/share/javax/media/j3d/TextureCubeMapRetained.java
+++ b/src/classes/share/javax/media/j3d/TextureCubeMapRetained.java
@@ -36,6 +36,7 @@ class TextureCubeMapRetained extends TextureRetained {
static final int NUMFACES = 6;
+ @Override
void initialize(int format, int width, int widPower,
int height, int heiPower, int mipmapMode,
int boundaryWidth) {
@@ -229,10 +230,12 @@ class TextureCubeMapRetained extends TextureRetained {
}
+ @Override
void bindTexture(Context ctx, int objectId, boolean enable) {
Pipeline.getPipeline().bindTextureCubeMap(ctx, objectId, enable);
}
+ @Override
void updateTextureBoundary(Context ctx,
int boundaryModeS, int boundaryModeT,
float boundaryRed, float boundaryGreen,
@@ -244,6 +247,7 @@ class TextureCubeMapRetained extends TextureRetained {
boundaryBlue, boundaryAlpha);
}
+ @Override
void updateTextureFilterModes(Context ctx,
int minFilter, int magFilter) {
@@ -251,6 +255,7 @@ class TextureCubeMapRetained extends TextureRetained {
minFilter, magFilter);
}
+ @Override
void updateTextureSharpenFunc(Context ctx,
int numSharpenTextureFuncPts,
float[] sharpenTextureFuncPts) {
@@ -259,6 +264,7 @@ class TextureCubeMapRetained extends TextureRetained {
numSharpenTextureFuncPts, sharpenTextureFuncPts);
}
+ @Override
void updateTextureFilter4Func(Context ctx,
int numFilter4FuncPts,
float[] filter4FuncPts) {
@@ -267,11 +273,13 @@ class TextureCubeMapRetained extends TextureRetained {
numFilter4FuncPts, filter4FuncPts);
}
+ @Override
void updateTextureAnisotropicFilter(Context ctx, float degree) {
Pipeline.getPipeline().updateTextureCubeMapAnisotropicFilter(ctx, degree);
}
+ @Override
void updateTextureLodRange(Context ctx,
int baseLevel, int maximumLevel,
float minimumLod, float maximumLod) {
@@ -280,6 +288,7 @@ class TextureCubeMapRetained extends TextureRetained {
minimumLod, maximumLod);
}
+ @Override
void updateTextureLodOffset(Context ctx,
float lodOffsetX, float lodOffsetY,
float lodOffsetZ) {
@@ -293,6 +302,7 @@ class TextureCubeMapRetained extends TextureRetained {
* Load level 0 explicitly with null data pointer to allow
* mipmapping when level 0 is not the base level
*/
+ @Override
void updateTextureDimensions(Canvas3D cv) {
if(images[0][0] != null) {
// All faces should have the same image format and type.
@@ -309,6 +319,7 @@ class TextureCubeMapRetained extends TextureRetained {
}
// This is just a wrapper of the native method.
+ @Override
void updateTextureImage(Canvas3D cv,
int face, int numLevels, int level,
int textureFormat, int imageFormat,
@@ -324,6 +335,7 @@ class TextureCubeMapRetained extends TextureRetained {
}
// This is just a wrapper of the native method.
+ @Override
void updateTextureSubImage(Canvas3D cv,
int face, int level,
int xoffset, int yoffset,
diff --git a/src/classes/share/javax/media/j3d/TextureRetained.java b/src/classes/share/javax/media/j3d/TextureRetained.java
index 688a2ca..fdb16ee 100644
--- a/src/classes/share/javax/media/j3d/TextureRetained.java
+++ b/src/classes/share/javax/media/j3d/TextureRetained.java
@@ -954,6 +954,7 @@ abstract class TextureRetained extends NodeComponentRetained {
+ @Override
void setLive(boolean backgroundGroup, int refCount) {
// This line should be assigned before calling doSetLive, so that
@@ -1025,6 +1026,7 @@ abstract class TextureRetained extends NodeComponentRetained {
super.markAsLive();
}
+ @Override
void clearLive(int refCount) {
super.clearLive(refCount);
@@ -1864,6 +1866,7 @@ abstract class TextureRetained extends NodeComponentRetained {
}
}
+ @Override
synchronized void createMirrorObject() {
if (mirror == null) {
if (this instanceof Texture3DRetained) {
@@ -1901,6 +1904,7 @@ abstract class TextureRetained extends NodeComponentRetained {
* Initializes a mirror object, point the mirror object to the retained
* object if the object is not editable
*/
+ @Override
synchronized void initMirrorObject() {
mirror.source = source;
if (this instanceof Texture3DRetained) {
@@ -2112,6 +2116,7 @@ abstract class TextureRetained extends NodeComponentRetained {
* Update the "component" field of the mirror object with the
* given "value"
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
TextureRetained mirrorTexture = (TextureRetained)mirror;
@@ -2468,6 +2473,7 @@ abstract class TextureRetained extends NodeComponentRetained {
}
+ @Override
void handleFrequencyChange(int bit) {
switch (bit) {
case Texture.ALLOW_ENABLE_WRITE:
diff --git a/src/classes/share/javax/media/j3d/TextureUnitState.java b/src/classes/share/javax/media/j3d/TextureUnitState.java
index 7b6c93c..93c3b41 100644
--- a/src/classes/share/javax/media/j3d/TextureUnitState.java
+++ b/src/classes/share/javax/media/j3d/TextureUnitState.java
@@ -124,6 +124,7 @@ public class TextureUnitState extends NodeComponent {
* Creates the retained mode TextureUnitStateRetained object that this
* TextureUnitState component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new TextureUnitStateRetained();
this.retained.setSource(this);
@@ -292,6 +293,7 @@ public class TextureUnitState extends NodeComponent {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
TextureUnitState ts = new TextureUnitState();
ts.duplicateNodeComponent(this);
@@ -305,6 +307,7 @@ public class TextureUnitState extends NodeComponent {
* @deprecated replaced with duplicateNodeComponent(
* NodeComponent originalNodeComponent, boolean forceDuplicate)
*/
+ @Override
public void duplicateNodeComponent(NodeComponent originalNodeComponent) {
checkDuplicateNodeComponent(originalNodeComponent);
}
@@ -329,6 +332,7 @@ public class TextureUnitState extends NodeComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent, forceDuplicate);
@@ -361,6 +365,7 @@ public class TextureUnitState extends NodeComponent {
* duplicate also even though current duplicateOnCloneTree flag is false.
* This should be overwrite by NodeComponent which contains sub-NodeComponent.
*/
+ @Override
boolean duplicateChild() {
if (getDuplicateOnCloneTree())
return true;
diff --git a/src/classes/share/javax/media/j3d/TextureUnitStateRetained.java b/src/classes/share/javax/media/j3d/TextureUnitStateRetained.java
index a1cf24f..c3b40c6 100644
--- a/src/classes/share/javax/media/j3d/TextureUnitStateRetained.java
+++ b/src/classes/share/javax/media/j3d/TextureUnitStateRetained.java
@@ -269,6 +269,7 @@ class TextureUnitStateRetained extends NodeComponentRetained {
* Creates and initializes a mirror object, point the mirror object
* to the retained object if the object is not editable
*/
+ @Override
synchronized void createMirrorObject() {
if (mirror == null) {
@@ -281,6 +282,7 @@ class TextureUnitStateRetained extends NodeComponentRetained {
}
+ @Override
synchronized void initMirrorObject() {
TextureUnitStateRetained mirrorTus =
@@ -307,6 +309,7 @@ class TextureUnitStateRetained extends NodeComponentRetained {
/** Update the "component" field of the mirror object with the
* given "value"
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
TextureUnitStateRetained mirrorTus = (TextureUnitStateRetained)mirror;
@@ -357,6 +360,7 @@ class TextureUnitStateRetained extends NodeComponentRetained {
return true;
}
+ @Override
protected Object clone() {
TextureUnitStateRetained tr = (TextureUnitStateRetained)super.clone();
@@ -412,6 +416,7 @@ class TextureUnitStateRetained extends NodeComponentRetained {
this.texGen = texGen;
}
+ @Override
synchronized void addAMirrorUser(Shape3DRetained shape) {
super.addAMirrorUser(shape);
@@ -424,6 +429,7 @@ class TextureUnitStateRetained extends NodeComponentRetained {
texGen.addAMirrorUser(shape);
}
+ @Override
synchronized void removeAMirrorUser(Shape3DRetained shape) {
super.removeAMirrorUser(shape);
@@ -435,6 +441,7 @@ class TextureUnitStateRetained extends NodeComponentRetained {
texGen.removeAMirrorUser(shape);
}
+ @Override
synchronized void removeMirrorUsers(NodeComponentRetained node) {
super.removeMirrorUsers(node);
@@ -446,6 +453,7 @@ class TextureUnitStateRetained extends NodeComponentRetained {
texGen.removeMirrorUsers(node);
}
+ @Override
synchronized void copyMirrorUsers(NodeComponentRetained node) {
super.copyMirrorUsers(node);
@@ -458,6 +466,7 @@ class TextureUnitStateRetained extends NodeComponentRetained {
}
+ @Override
void setLive(boolean backgroundGroup, int refCount) {
if (texture != null)
texture.setLive(backgroundGroup, refCount);
@@ -476,6 +485,7 @@ class TextureUnitStateRetained extends NodeComponentRetained {
}
+ @Override
void clearLive(int refCount) {
super.clearLive(refCount);
@@ -487,6 +497,7 @@ class TextureUnitStateRetained extends NodeComponentRetained {
texGen.clearLive(refCount);
}
+ @Override
boolean isStatic() {
return (source.capabilityBitsEmpty() &&
@@ -497,6 +508,7 @@ class TextureUnitStateRetained extends NodeComponentRetained {
// Issue 209 - enable this method (was previously commented out)
// Simply pass along to the NodeComponent
+ @Override
void compile (CompileState compState) {
setCompiled();
@@ -520,6 +532,7 @@ class TextureUnitStateRetained extends NodeComponentRetained {
}
+ @Override
void setInImmCtx(boolean flag) {
super.setInImmCtx(flag);
if (texture != null)
@@ -530,6 +543,7 @@ class TextureUnitStateRetained extends NodeComponentRetained {
texGen.setInImmCtx(flag);
}
+ @Override
boolean getInImmCtx() {
return (super.getInImmCtx() ||
((texture != null) && (texture.getInImmCtx())) ||
@@ -587,6 +601,7 @@ class TextureUnitStateRetained extends NodeComponentRetained {
return (texture != null && texture.enable);
}
+ @Override
void handleFrequencyChange(int bit) {
switch (bit) {
case TextureUnitState.ALLOW_STATE_WRITE: {
diff --git a/src/classes/share/javax/media/j3d/TimerThread.java b/src/classes/share/javax/media/j3d/TimerThread.java
index 3d0b6ab..daabac0 100644
--- a/src/classes/share/javax/media/j3d/TimerThread.java
+++ b/src/classes/share/javax/media/j3d/TimerThread.java
@@ -95,6 +95,7 @@ class TimerThread extends Thread {
}
}
+ @Override
public void run() {
long waitTime = -1;
long time;
diff --git a/src/classes/share/javax/media/j3d/Transform3D.java b/src/classes/share/javax/media/j3d/Transform3D.java
index 99296f3..ac584d0 100644
--- a/src/classes/share/javax/media/j3d/Transform3D.java
+++ b/src/classes/share/javax/media/j3d/Transform3D.java
@@ -767,6 +767,7 @@ public class Transform3D {
* Returns the matrix elements of this transform as a string.
* @return the matrix elements of this transform
*/
+ @Override
public String toString() {
// also, print classification?
return
@@ -4047,6 +4048,7 @@ public class Transform3D {
* @param o1 the object with which the comparison is made.
* @return true or false
*/
+ @Override
public boolean equals(Object o1) {
return (o1 instanceof Transform3D) && equals((Transform3D) o1);
}
@@ -4083,6 +4085,7 @@ public class Transform3D {
* likely.
* @return the integer hash code value
*/
+ @Override
public int hashCode() {
long bits = 1L;
diff --git a/src/classes/share/javax/media/j3d/TransformGroup.java b/src/classes/share/javax/media/j3d/TransformGroup.java
index 15545f1..fd9d733 100644
--- a/src/classes/share/javax/media/j3d/TransformGroup.java
+++ b/src/classes/share/javax/media/j3d/TransformGroup.java
@@ -110,6 +110,7 @@ public class TransformGroup extends Group {
* Creates the retained mode TransformGroupRetained object that this
* TransformGroup object will point to.
*/
+ @Override
void createRetained() {
this.retained = new TransformGroupRetained();
this.retained.setSource(this);
@@ -165,6 +166,7 @@ public class TransformGroup extends Group {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
TransformGroup tg = new TransformGroup();
tg.duplicateNode(this, forceDuplicate);
@@ -193,6 +195,7 @@ public class TransformGroup extends Group {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/TransformGroupRetained.java b/src/classes/share/javax/media/j3d/TransformGroupRetained.java
index 7709cac..b397b7a 100644
--- a/src/classes/share/javax/media/j3d/TransformGroupRetained.java
+++ b/src/classes/share/javax/media/j3d/TransformGroupRetained.java
@@ -207,6 +207,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
}
// synchronized with TransformStructure
+ @Override
synchronized void setNodeData(SetLiveState s) {
int i;
@@ -358,6 +359,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
s.parentTransformLink = this;
}
+ @Override
void setAuxData(SetLiveState s, int index, int hkIndex) {
super.setAuxData(s, index, hkIndex);
perPathData[hkIndex] = new TransformGroupData();
@@ -389,6 +391,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
}
}
+ @Override
boolean isStatic() {
if (!super.isStatic() ||
source.getCapability(TransformGroup.ALLOW_TRANSFORM_READ) ||
@@ -399,11 +402,13 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
}
}
+ @Override
void mergeTransform(TransformGroupRetained xform) {
super.mergeTransform(xform);
transform.mul(xform.transform, transform);
}
+ @Override
void traverse(boolean sameLevel, int level) {
System.err.println();
@@ -422,6 +427,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
super.traverse(true, level);
}
+ @Override
void compile(CompileState compState) {
// save and reset the keepTG and needNormalsTransform flags
@@ -466,6 +472,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
compState.needNormalsTransform = saveNeedNormalsTransform;
}
+ @Override
void merge(CompileState compState) {
TransformGroupRetained saveStaticTransform;
@@ -516,6 +523,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
* This setlive simply concatinates it's transform onto all the ones
* passed in.
*/
+ @Override
void setLive(SetLiveState s) {
int i,j;
Transform3D trans = null;
@@ -627,6 +635,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
/**
* remove the localToVworld transform for a transformGroup
*/
+ @Override
void removeNodeData(SetLiveState s) {
synchronized (this) { // synchronized with TransformStructure
@@ -732,6 +741,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
}
}
+ @Override
void clearLive(SetLiveState s) {
Targets[] savedTransformTargets = null;
@@ -781,6 +791,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
}
+ @Override
void computeCombineBounds(Bounds bounds) {
// Issue 514 : NPE in Wonderland : triggered in cached bounds computation
if (validCachedBounds && boundsAutoCompute) {
@@ -1027,6 +1038,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
* TransformGroup, it has to use currentChildLocalToVworld
* instead of currentLocalToVworld
*/
+ @Override
void transformBounds(SceneGraphPath path, Bounds bound) {
if (!((NodeRetained) path.item.retained).inSharedGroup) {
bound.transform(getCurrentChildLocalToVworld());
@@ -1098,6 +1110,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
// TargetsInterface methods
// ****************************
+ @Override
public int getTargetThreads(int type) {
// type is ignored here, only need for SharedGroup
if (type == TargetsInterface.TRANSFORM_TARGETS) {
@@ -1108,6 +1121,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
}
}
+ @Override
public CachedTargets getCachedTargets(int type, int index, int child) {
// type is ignored here, only need for SharedGroup
// child is ignored here
@@ -1119,6 +1133,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
}
}
+ @Override
TargetsInterface getClosestTargetsInterface(int type) {
return (type == TargetsInterface.TRANSFORM_TARGETS)?
(TargetsInterface)this:
@@ -1127,6 +1142,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
// re-evalute localTargetThreads using newCachedTargets and
// re-evaluate targetThreads
+ @Override
public void computeTargetThreads(int type,
CachedTargets[] newCachedTargets) {
@@ -1166,6 +1182,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
// re-compute localTargetThread, targetThreads and
// propagate changes to ancestors
+ @Override
public void updateTargetThreads(int type,
CachedTargets[] newCachedTargets) {
// type is ignored here, only need for SharedGroup
@@ -1183,6 +1200,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
// re-evaluate targetThreads using childTargetThreads and
// propagate changes to ancestors
+ @Override
public void propagateTargetThreads(int type, int childTargetThreads) {
// type is ignored here, only need for SharedGroup
@@ -1200,6 +1218,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
}
}
+ @Override
public void updateCachedTargets(int type, CachedTargets[] newCt) {
// type is ignored here, only need for SharedGroup
if (type == TargetsInterface.TRANSFORM_TARGETS) {
@@ -1209,6 +1228,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
}
}
+ @Override
public void copyCachedTargets(int type, CachedTargets[] newCt) {
// type is ignored here, only need for SharedGroup
if (type == TargetsInterface.TRANSFORM_TARGETS) {
@@ -1221,6 +1241,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
}
}
+ @Override
public void resetCachedTargets(int type,
CachedTargets[] newCtArr, int child) {
// type is ignored here, only need for SharedGroup
@@ -1232,11 +1253,13 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
}
}
+@Override
public ArrayList<SwitchState> getTargetsData(int type, int index) {
// not used
return null;
}
+ @Override
void childCheckSetLive(NodeRetained child, int childIndex,
SetLiveState s, NodeRetained linkNode) {
s.currentTransforms = childLocalToVworld;
diff --git a/src/classes/share/javax/media/j3d/TransformInterpolator.java b/src/classes/share/javax/media/j3d/TransformInterpolator.java
index 9afc9e4..09b4b95 100644
--- a/src/classes/share/javax/media/j3d/TransformInterpolator.java
+++ b/src/classes/share/javax/media/j3d/TransformInterpolator.java
@@ -158,6 +158,7 @@ public abstract class TransformInterpolator extends Interpolator {
* @param criteria an enumeration of the criteria that caused the
* stimulus
*/
+ @Override
public void processStimulus(Enumeration criteria) {
// Handle stimulus
WakeupCriterion criterion = passiveWakeupCriterion;
@@ -197,6 +198,7 @@ public abstract class TransformInterpolator extends Interpolator {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
@@ -234,6 +236,7 @@ public abstract class TransformInterpolator extends Interpolator {
* @see Node#cloneTree
* @see DanglingReferenceException
*/
+ @Override
public void updateNodeReferences(NodeReferenceTable referenceTable) {
super.updateNodeReferences(referenceTable);
diff --git a/src/classes/share/javax/media/j3d/TransformStructure.java b/src/classes/share/javax/media/j3d/TransformStructure.java
index 8df7fa9..1251540 100644
--- a/src/classes/share/javax/media/j3d/TransformStructure.java
+++ b/src/classes/share/javax/media/j3d/TransformStructure.java
@@ -87,6 +87,7 @@ private ArrayList<TransformGroupRetained> dirtyTransformGroups = new ArrayList<T
super(u, J3dThread.UPDATE_TRANSFORM);
}
+ @Override
void processMessages(long referenceTime) {
J3dMessage[] messages = getMessages(referenceTime);
int nMsg = getNumMessage();
@@ -350,6 +351,7 @@ private ArrayList<TransformGroupRetained> dirtyTransformGroups = new ArrayList<T
}
+ @Override
public void updateObject() {
processLastLocalToVworld();
processLastSwitchOn();
@@ -703,6 +705,7 @@ private ArrayList<TransformGroupRetained> dirtyTransformGroups = new ArrayList<T
return lazyUpdate;
}
+ @Override
void removeNodes(J3dMessage m) {
if (m.args[1] != null) {
TargetsInterface ti = (TargetsInterface)m.args[1];
@@ -712,6 +715,7 @@ private ArrayList<TransformGroupRetained> dirtyTransformGroups = new ArrayList<T
}
}
+ @Override
void cleanup() {}
// Wrapper for a (TransformGroupRetained, Transform3D) pair
diff --git a/src/classes/share/javax/media/j3d/TransparencyAttributes.java b/src/classes/share/javax/media/j3d/TransparencyAttributes.java
index a0c1854..2779f38 100644
--- a/src/classes/share/javax/media/j3d/TransparencyAttributes.java
+++ b/src/classes/share/javax/media/j3d/TransparencyAttributes.java
@@ -588,6 +588,7 @@ public class TransparencyAttributes extends NodeComponent {
* Creates a retained mode TransparencyAttributesRetained object that this
* TransparencyAttributes component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new TransparencyAttributesRetained();
this.retained.setSource(this);
@@ -597,6 +598,7 @@ public class TransparencyAttributes extends NodeComponent {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
TransparencyAttributes transa = new TransparencyAttributes();
transa.duplicateNodeComponent(this);
@@ -622,6 +624,7 @@ public class TransparencyAttributes extends NodeComponent {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(NodeComponent originalNodeComponent,
boolean forceDuplicate) {
super.duplicateAttributes(originalNodeComponent, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/TransparencyAttributesRetained.java b/src/classes/share/javax/media/j3d/TransparencyAttributesRetained.java
index 4b25e60..5d531a8 100644
--- a/src/classes/share/javax/media/j3d/TransparencyAttributesRetained.java
+++ b/src/classes/share/javax/media/j3d/TransparencyAttributesRetained.java
@@ -210,6 +210,7 @@ class TransparencyAttributesRetained extends NodeComponentRetained {
* Creates and initializes a mirror object, point the mirror object
* to the retained object if the object is not editable
*/
+ @Override
synchronized void createMirrorObject() {
if (mirror == null) {
// Check the capability bits and let the mirror object
@@ -251,6 +252,7 @@ static boolean useAlpha(TransparencyAttributesRetained ta) {
* Initializes a mirror object, point the mirror object to the retained
* object if the object is not editable
*/
+ @Override
synchronized void initMirrorObject() {
((TransparencyAttributesRetained)mirror).set(this);
}
@@ -259,6 +261,7 @@ static boolean useAlpha(TransparencyAttributesRetained ta) {
* Update the "component" field of the mirror object with the
* given "value"
*/
+ @Override
synchronized void updateMirrorObject(int component, Object value) {
TransparencyAttributesRetained mirrorTa =
@@ -336,6 +339,7 @@ static boolean useAlpha(TransparencyAttributesRetained ta) {
}
+ @Override
void handleFrequencyChange(int bit) {
if (bit == TransparencyAttributes.ALLOW_MODE_WRITE ||
bit == TransparencyAttributes.ALLOW_VALUE_WRITE||
diff --git a/src/classes/share/javax/media/j3d/TransparencyInterpolator.java b/src/classes/share/javax/media/j3d/TransparencyInterpolator.java
index 6b5714b..633bb97 100644
--- a/src/classes/share/javax/media/j3d/TransparencyInterpolator.java
+++ b/src/classes/share/javax/media/j3d/TransparencyInterpolator.java
@@ -168,6 +168,7 @@ public class TransparencyInterpolator extends Interpolator {
* @param criteria an enumeration of the criteria that caused the
* stimulus
*/
+ @Override
public void processStimulus(Enumeration criteria) {
// Handle stimulus
WakeupCriterion criterion = passiveWakeupCriterion;
@@ -203,6 +204,7 @@ public class TransparencyInterpolator extends Interpolator {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
TransparencyInterpolator ti = new TransparencyInterpolator();
ti.duplicateNode(this, forceDuplicate);
@@ -231,6 +233,7 @@ public class TransparencyInterpolator extends Interpolator {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
@@ -269,6 +272,7 @@ public class TransparencyInterpolator extends Interpolator {
* @see Node#cloneTree
* @see DanglingReferenceException
*/
+ @Override
public void updateNodeReferences(NodeReferenceTable referenceTable) {
super.updateNodeReferences(referenceTable);
diff --git a/src/classes/share/javax/media/j3d/TransparentRenderingInfo.java b/src/classes/share/javax/media/j3d/TransparentRenderingInfo.java
index 6c336d2..0bddbb7 100644
--- a/src/classes/share/javax/media/j3d/TransparentRenderingInfo.java
+++ b/src/classes/share/javax/media/j3d/TransparentRenderingInfo.java
@@ -136,10 +136,12 @@ class TransparentRenderingInfo extends Object implements com.sun.j3d.utils.scene
}
}
+ @Override
public double getDistanceSquared() {
return zVal;
}
+ @Override
public Geometry getGeometry() {
// XXXX: verify 0 is always the correct index. Assumption is that for
// Shape3D with multiple geometry each geometry is put in it's
@@ -149,10 +151,12 @@ class TransparentRenderingInfo extends Object implements com.sun.j3d.utils.scene
return (Geometry)geometryAtom.geometryArray[0].source;
}
+ @Override
public void getLocalToVWorld(Transform3D localToVW) {
localToVW.set(rm.localToVworld[NodeRetained.LAST_LOCAL_TO_VWORLD]);
}
+ @Override
public Shape3D getShape3D() {
return (Shape3D)geometryAtom.source.source;
}
diff --git a/src/classes/share/javax/media/j3d/TriangleArray.java b/src/classes/share/javax/media/j3d/TriangleArray.java
index c015d5d..f1cfb9f 100644
--- a/src/classes/share/javax/media/j3d/TriangleArray.java
+++ b/src/classes/share/javax/media/j3d/TriangleArray.java
@@ -154,6 +154,7 @@ public class TriangleArray extends GeometryArray {
* Creates the retained mode TriangleArrayRetained object that this
* TriangleArray object will point to.
*/
+ @Override
void createRetained() {
this.retained = new TriangleArrayRetained();
this.retained.setSource(this);
@@ -163,6 +164,7 @@ public class TriangleArray extends GeometryArray {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
TriangleArrayRetained rt = (TriangleArrayRetained) retained;
int texSetCount = rt.getTexCoordSetCount();
diff --git a/src/classes/share/javax/media/j3d/TriangleArrayRetained.java b/src/classes/share/javax/media/j3d/TriangleArrayRetained.java
index e3f0236..810ea7d 100644
--- a/src/classes/share/javax/media/j3d/TriangleArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/TriangleArrayRetained.java
@@ -41,6 +41,7 @@ class TriangleArrayRetained extends GeometryArrayRetained {
this.geoType = GEO_TYPE_TRI_SET;
}
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
Point3d pnts[] = new Point3d[3];
@@ -282,6 +283,7 @@ class TriangleArrayRetained extends GeometryArrayRetained {
}
+ @Override
boolean intersect(Point3d[] pnts) {
Point3d[] points = new Point3d[3];
double dist[] = new double[1];
@@ -343,6 +345,7 @@ class TriangleArrayRetained extends GeometryArrayRetained {
return false;
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld,
GeometryRetained geom) {
@@ -368,6 +371,7 @@ class TriangleArrayRetained extends GeometryArrayRetained {
}
// the bounds argument is already transformed
+ @Override
boolean intersect(Bounds targetBound) {
Point3d[] pnts = new Point3d[3];
int i = ((vertexFormat & GeometryArray.BY_REFERENCE) == 0 ?
@@ -424,6 +428,7 @@ class TriangleArrayRetained extends GeometryArrayRetained {
}
// From Graphics Gems IV (pg5) and Graphics Gems II, Pg170
+ @Override
void computeCentroid() {
int i = ((vertexFormat & GeometryArray.BY_REFERENCE) == 0 ?
initialVertexIndex : initialCoordIndex);
@@ -479,6 +484,7 @@ class TriangleArrayRetained extends GeometryArrayRetained {
}
}
+ @Override
int getClassType() {
return TRIANGLE_TYPE;
}
diff --git a/src/classes/share/javax/media/j3d/TriangleFanArray.java b/src/classes/share/javax/media/j3d/TriangleFanArray.java
index d75bcc6..51c9469 100644
--- a/src/classes/share/javax/media/j3d/TriangleFanArray.java
+++ b/src/classes/share/javax/media/j3d/TriangleFanArray.java
@@ -178,6 +178,7 @@ public class TriangleFanArray extends GeometryStripArray {
* Creates the retained mode TriangleFanArrayRetained object that this
* TriangleFanArray object will point to.
*/
+ @Override
void createRetained() {
this.retained = new TriangleFanArrayRetained();
this.retained.setSource(this);
@@ -187,6 +188,7 @@ public class TriangleFanArray extends GeometryStripArray {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
TriangleFanArrayRetained rt = (TriangleFanArrayRetained) retained;
int stripcounts[] = new int[rt.getNumStrips()];
diff --git a/src/classes/share/javax/media/j3d/TriangleFanArrayRetained.java b/src/classes/share/javax/media/j3d/TriangleFanArrayRetained.java
index 166f4c9..373a62b 100644
--- a/src/classes/share/javax/media/j3d/TriangleFanArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/TriangleFanArrayRetained.java
@@ -46,6 +46,7 @@ class TriangleFanArrayRetained extends GeometryStripArrayRetained {
this.geoType = GEO_TYPE_TRI_FAN_SET;
}
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
Point3d pnts[] = new Point3d[3];
@@ -342,6 +343,7 @@ class TriangleFanArrayRetained extends GeometryStripArrayRetained {
}
// intersect pnts[] with every triangle in this object
+ @Override
boolean intersect(Point3d[] pnts) {
int j, end;
Point3d[] points = new Point3d[3];
@@ -425,6 +427,7 @@ class TriangleFanArrayRetained extends GeometryStripArrayRetained {
return false;
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld, GeometryRetained geom) {
int i = 0, j, end;
Point3d[] pnts = new Point3d[3];
@@ -452,6 +455,7 @@ class TriangleFanArrayRetained extends GeometryStripArrayRetained {
}
// the bounds argument is already transformed
+ @Override
boolean intersect(Bounds targetBound) {
int i = 0;
int j, end;
@@ -522,6 +526,7 @@ class TriangleFanArrayRetained extends GeometryStripArrayRetained {
}
// From Graphics Gems IV (pg5) and Graphics Gems II, Pg170
+ @Override
void computeCentroid() {
Vector3d vec = new Vector3d();
Vector3d normal = new Vector3d();
@@ -585,6 +590,7 @@ class TriangleFanArrayRetained extends GeometryStripArrayRetained {
}
}
+ @Override
int getClassType() {
return TRIANGLE_TYPE;
}
diff --git a/src/classes/share/javax/media/j3d/TriangleStripArray.java b/src/classes/share/javax/media/j3d/TriangleStripArray.java
index 3e3114b..ebe9755 100644
--- a/src/classes/share/javax/media/j3d/TriangleStripArray.java
+++ b/src/classes/share/javax/media/j3d/TriangleStripArray.java
@@ -177,6 +177,7 @@ public class TriangleStripArray extends GeometryStripArray {
* Creates the retained mode TriangleStripArrayRetained object that this
* TriangleStripArray object will point to.
*/
+ @Override
void createRetained() {
this.retained = new TriangleStripArrayRetained();
this.retained.setSource(this);
@@ -186,6 +187,7 @@ public class TriangleStripArray extends GeometryStripArray {
/**
* @deprecated replaced with cloneNodeComponent(boolean forceDuplicate)
*/
+ @Override
public NodeComponent cloneNodeComponent() {
TriangleStripArrayRetained rt = (TriangleStripArrayRetained) retained;
int stripcounts[] = new int[rt.getNumStrips()];
diff --git a/src/classes/share/javax/media/j3d/TriangleStripArrayRetained.java b/src/classes/share/javax/media/j3d/TriangleStripArrayRetained.java
index 2c5b11d..c1da285 100644
--- a/src/classes/share/javax/media/j3d/TriangleStripArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/TriangleStripArrayRetained.java
@@ -45,6 +45,7 @@ class TriangleStripArrayRetained extends GeometryStripArrayRetained {
this.geoType = GEO_TYPE_TRI_STRIP_SET;
}
+ @Override
boolean intersect(PickShape pickShape, PickInfo pickInfo, int flags, Point3d iPnt,
GeometryRetained geom, int geomIndex) {
Point3d pnts[] = new Point3d[3];
@@ -355,6 +356,7 @@ class TriangleStripArrayRetained extends GeometryStripArrayRetained {
}
// intersect pnts[] with every triangle in this object
+ @Override
boolean intersect(Point3d[] pnts) {
int j, end;
Point3d[] points = new Point3d[3];
@@ -440,6 +442,7 @@ class TriangleStripArrayRetained extends GeometryStripArrayRetained {
return false;
}
+ @Override
boolean intersect(Transform3D thisToOtherVworld, GeometryRetained geom) {
int i = 0, j, end;
Point3d[] pnts = new Point3d[3];
@@ -468,6 +471,7 @@ class TriangleStripArrayRetained extends GeometryStripArrayRetained {
}
// the bounds argument is already transformed
+ @Override
boolean intersect(Bounds targetBound) {
int i = 0;
int j, end;
@@ -540,6 +544,7 @@ class TriangleStripArrayRetained extends GeometryStripArrayRetained {
}
// From Graphics Gems IV (pg5) and Graphics Gems II, Pg170
+ @Override
void computeCentroid() {
Point3d pnt0 = new Point3d();
Point3d pnt1 = new Point3d();
@@ -611,6 +616,7 @@ class TriangleStripArrayRetained extends GeometryStripArrayRetained {
}
+ @Override
int getClassType() {
return TRIANGLE_TYPE;
}
diff --git a/src/classes/share/javax/media/j3d/UnorderList.java b/src/classes/share/javax/media/j3d/UnorderList.java
index b328496..3d8cdd8 100644
--- a/src/classes/share/javax/media/j3d/UnorderList.java
+++ b/src/classes/share/javax/media/j3d/UnorderList.java
@@ -227,6 +227,7 @@ class UnorderList implements Cloneable, java.io.Serializable {
*
* @return a clone of this <tt>ArrayList</tt> instance.
*/
+ @Override
synchronized protected final Object clone() {
try {
UnorderList v = (UnorderList)super.clone();
@@ -525,6 +526,7 @@ class UnorderList implements Cloneable, java.io.Serializable {
return componentType;
}
+ @Override
synchronized public String toString() {
StringBuffer sb = new StringBuffer("Size = " + size + "\n[");
int len = size-1;
diff --git a/src/classes/share/javax/media/j3d/VertexArrayRenderMethod.java b/src/classes/share/javax/media/j3d/VertexArrayRenderMethod.java
index 3afe61d..ff99bb7 100644
--- a/src/classes/share/javax/media/j3d/VertexArrayRenderMethod.java
+++ b/src/classes/share/javax/media/j3d/VertexArrayRenderMethod.java
@@ -34,6 +34,7 @@ package javax.media.j3d;
class VertexArrayRenderMethod implements RenderMethod {
+ @Override
public boolean render(RenderMolecule rm, Canvas3D cv,
RenderAtomListInfo ra, int dirtyBits) {
diff --git a/src/classes/share/javax/media/j3d/ViewPlatform.java b/src/classes/share/javax/media/j3d/ViewPlatform.java
index 628bcb1..d99447b 100644
--- a/src/classes/share/javax/media/j3d/ViewPlatform.java
+++ b/src/classes/share/javax/media/j3d/ViewPlatform.java
@@ -144,6 +144,7 @@ public class ViewPlatform extends Leaf {
* Creates the retained mode ViewPlatformRetained object that this
* ViewPlatform component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new ViewPlatformRetained();
this.retained.setSource(this);
@@ -237,6 +238,7 @@ public class ViewPlatform extends Leaf {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
ViewPlatform v = new ViewPlatform();
v.duplicateNode(this, forceDuplicate);
@@ -272,6 +274,7 @@ public class ViewPlatform extends Leaf {
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
super.duplicateAttributes(originalNode, forceDuplicate);
diff --git a/src/classes/share/javax/media/j3d/ViewPlatformRetained.java b/src/classes/share/javax/media/j3d/ViewPlatformRetained.java
index 188df93..4d9f069 100644
--- a/src/classes/share/javax/media/j3d/ViewPlatformRetained.java
+++ b/src/classes/share/javax/media/j3d/ViewPlatformRetained.java
@@ -275,6 +275,7 @@ void removeView(View v) {
* it evaluates the view platform transform, and then it activates
* all canvases that are associated with the attached view.
*/
+ @Override
void setLive(SetLiveState s) {
View views[] = getViewList();
@@ -336,6 +337,7 @@ void removeView(View v) {
* it deactivates all canvases that are associated with the attached
* view.
*/
+ @Override
void clearLive(SetLiveState s) {
super.clearLive(s);
if (s.switchTargets != null &&
@@ -404,6 +406,7 @@ boolean isActiveViewPlatform() {
}
+ @Override
void compile(CompileState compState) {
super.compile(compState);
diff --git a/src/classes/share/javax/media/j3d/ViewSpecificGroup.java b/src/classes/share/javax/media/j3d/ViewSpecificGroup.java
index 35b327f..b8913a9 100644
--- a/src/classes/share/javax/media/j3d/ViewSpecificGroup.java
+++ b/src/classes/share/javax/media/j3d/ViewSpecificGroup.java
@@ -103,6 +103,7 @@ public class ViewSpecificGroup extends Group {
* Creates the retained mode ViewSpecificGroupRetained object that this
* ViewSpecificGroup component object will point to.
*/
+ @Override
void createRetained() {
this.retained = new ViewSpecificGroupRetained();
this.retained.setSource(this);
@@ -312,6 +313,7 @@ public Enumeration<View> getAllViews() {
* @see Node#duplicateNode
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
public Node cloneNode(boolean forceDuplicate) {
ViewSpecificGroup vsg = new ViewSpecificGroup();
vsg.duplicateNode(this, forceDuplicate);
@@ -341,6 +343,7 @@ public Enumeration<View> getAllViews() {
* @see Node#cloneTree
* @see NodeComponent#setDuplicateOnCloneTree
*/
+ @Override
void duplicateAttributes(Node originalNode, boolean forceDuplicate) {
// XXXX: implement this?
diff --git a/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java b/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java
index d1a3115..69fde27 100644
--- a/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java
+++ b/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java
@@ -259,6 +259,7 @@ void setView(View view, int index) {
}
+ @Override
int[] processViewSpecificInfo(int mode, HashKey key, View v, ArrayList vsgList, int[] keyList, ArrayList leaflist) {
int hkIndex = 0;
Integer hashInt = null;
@@ -520,6 +521,7 @@ Enumeration<View> getAllViews() {
}
}
+ @Override
void compile(CompileState compState) {
super.compile(compState);
@@ -529,6 +531,7 @@ Enumeration<View> getAllViews() {
// XXXX: complete this
}
+ @Override
void setLive(SetLiveState s) {
if (inBackgroundGroup) {
throw new
@@ -549,6 +552,7 @@ Enumeration<View> getAllViews() {
}
+ @Override
void clearLive(SetLiveState s) {
ArrayList<ArrayList<View>> savedViewList = s.viewLists;
if (s.changedViewGroup == null) {
@@ -588,6 +592,7 @@ Enumeration<View> getAllViews() {
}
+ @Override
void removeNodeData(SetLiveState s) {
if((!inSharedGroup) || (s.keys.length == localToVworld.length)) {
s.changedViewGroup.add(this);
@@ -650,6 +655,7 @@ void updateCachedInformation(int component, View view, int index) {
}
+ @Override
void setNodeData(SetLiveState s) {
super.setNodeData(s);
if (!inSharedGroup) {
@@ -690,6 +696,7 @@ void updateCachedInformation(int component, View view, int index) {
}
+ @Override
void setAuxData(SetLiveState s, int index, int hkIndex) {
ArrayList<View> vl = new ArrayList<View>();
ArrayList<View> parentList = null;
diff --git a/src/classes/share/javax/media/j3d/WakeupAnd.java b/src/classes/share/javax/media/j3d/WakeupAnd.java
index 3e2241d..a00c2fe 100644
--- a/src/classes/share/javax/media/j3d/WakeupAnd.java
+++ b/src/classes/share/javax/media/j3d/WakeupAnd.java
@@ -61,6 +61,7 @@ public final class WakeupAnd extends WakeupCondition {
/**
* This sets the bit for the given child, then checks if the full condition is met
*/
+ @Override
void setConditionMet(int id, Boolean checkSchedulingRegion) {
conditionsMet[id] = true;
@@ -80,6 +81,7 @@ public final class WakeupAnd extends WakeupCondition {
/**
* This gets called when this condition is added to the AndOr tree.
*/
+ @Override
void buildTree(WakeupCondition parent, int id, BehaviorRetained b) {
super.buildTree(parent, id, b);
@@ -94,6 +96,7 @@ public final class WakeupAnd extends WakeupCondition {
* This goes through the AndOr tree to remove the various criterion from the
* BehaviorStructure lists
*/
+ @Override
void cleanTree(BehaviorStructure bs) {
for (int i=0; i<conditions.length; i++) {
conditions[i].cleanTree(bs);
@@ -102,6 +105,7 @@ public final class WakeupAnd extends WakeupCondition {
}
+ @Override
void reInsertElapseTimeCond() {
super.reInsertElapseTimeCond();
for(int i = 0; i < conditions.length; i++) {
@@ -116,6 +120,7 @@ public final class WakeupAnd extends WakeupCondition {
* This goes through the AndOr tree to remove the various criterion from the
* BehaviorStructure.
*/
+ @Override
void resetTree() {
super.resetTree();
for(int i = 0; i < conditions.length; i++) {
diff --git a/src/classes/share/javax/media/j3d/WakeupAndOfOrs.java b/src/classes/share/javax/media/j3d/WakeupAndOfOrs.java
index 44d43d2..54243d3 100644
--- a/src/classes/share/javax/media/j3d/WakeupAndOfOrs.java
+++ b/src/classes/share/javax/media/j3d/WakeupAndOfOrs.java
@@ -62,6 +62,7 @@ public final class WakeupAndOfOrs extends WakeupCondition {
/**
* This sets the bit for the given child, then checks if the full condition is met
*/
+ @Override
void setConditionMet(int id, Boolean checkSchedulingRegion) {
conditionsMet[id] = true;
@@ -81,6 +82,7 @@ public final class WakeupAndOfOrs extends WakeupCondition {
/**
* This gets called when this condition is added to the AndOr tree.
*/
+ @Override
void buildTree(WakeupCondition parent, int id, BehaviorRetained b) {
super.buildTree(parent, id, b);
@@ -96,6 +98,7 @@ public final class WakeupAndOfOrs extends WakeupCondition {
* This goes through the AndOr tree to remove the various criterion from the
* BehaviorStructure lists
*/
+ @Override
void cleanTree(BehaviorStructure bs) {
for (int i=0; i<conditions.length; i++) {
conditions[i].cleanTree(bs);
@@ -104,6 +107,7 @@ public final class WakeupAndOfOrs extends WakeupCondition {
}
+ @Override
void reInsertElapseTimeCond() {
super.reInsertElapseTimeCond();
for(int i = 0; i < conditions.length; i++) {
@@ -117,6 +121,7 @@ public final class WakeupAndOfOrs extends WakeupCondition {
* This goes through the AndOr tree to remove the various criterion from the
* BehaviorStructure.
*/
+ @Override
void resetTree() {
super.resetTree();
for(int i = 0; i < conditions.length; i++) {
diff --git a/src/classes/share/javax/media/j3d/WakeupCriteriaEnumerator.java b/src/classes/share/javax/media/j3d/WakeupCriteriaEnumerator.java
index 23be947..c3b00e8 100644
--- a/src/classes/share/javax/media/j3d/WakeupCriteriaEnumerator.java
+++ b/src/classes/share/javax/media/j3d/WakeupCriteriaEnumerator.java
@@ -130,6 +130,7 @@ class WakeupCriteriaEnumerator implements Enumeration {
}
}
+ @Override
public boolean hasMoreElements() {
if (currentIndex == length) {
return false;
@@ -137,6 +138,7 @@ class WakeupCriteriaEnumerator implements Enumeration {
return true;
}
+ @Override
public Object nextElement() {
if (currentIndex < length) {
return criterion[currentIndex++];
diff --git a/src/classes/share/javax/media/j3d/WakeupCriterion.java b/src/classes/share/javax/media/j3d/WakeupCriterion.java
index 2fb358e..784bde9 100644
--- a/src/classes/share/javax/media/j3d/WakeupCriterion.java
+++ b/src/classes/share/javax/media/j3d/WakeupCriterion.java
@@ -73,6 +73,7 @@ public abstract class WakeupCriterion extends WakeupCondition {
* Initialize And/Or tree and add criterion to the BehaviourStructure.
*
*/
+ @Override
void buildTree(WakeupCondition parent, int id, BehaviorRetained b) {
super.buildTree(parent, id, b);
triggered = false;
@@ -87,6 +88,7 @@ public abstract class WakeupCriterion extends WakeupCondition {
* may reassign to another universe at this time.
*
*/
+ @Override
void cleanTree(BehaviorStructure bs){
conditionMet = false;
removeBehaviorCondition(bs);
@@ -96,6 +98,7 @@ public abstract class WakeupCriterion extends WakeupCondition {
/**
* This goes through the AndOr tree to reset various criterion.
*/
+ @Override
void resetTree() {
conditionMet = false;
triggered = false;
diff --git a/src/classes/share/javax/media/j3d/WakeupIndexedList.java b/src/classes/share/javax/media/j3d/WakeupIndexedList.java
index 29176f8..5eb7de1 100644
--- a/src/classes/share/javax/media/j3d/WakeupIndexedList.java
+++ b/src/classes/share/javax/media/j3d/WakeupIndexedList.java
@@ -228,6 +228,7 @@ class WakeupIndexedList implements Cloneable, java.io.Serializable {
*
* @return a clone of this <tt>ArrayList</tt> instance.
*/
+ @Override
synchronized protected final Object clone() {
try {
WakeupIndexedList v = (WakeupIndexedList)super.clone();
@@ -535,6 +536,7 @@ class WakeupIndexedList implements Cloneable, java.io.Serializable {
return componentType;
}
+ @Override
synchronized public String toString() {
StringBuffer sb = new StringBuffer(hashCode() + " Size = " + size + "[");
int len = size-1;
diff --git a/src/classes/share/javax/media/j3d/WakeupOnAWTEvent.java b/src/classes/share/javax/media/j3d/WakeupOnAWTEvent.java
index d61317c..effa7c2 100644
--- a/src/classes/share/javax/media/j3d/WakeupOnAWTEvent.java
+++ b/src/classes/share/javax/media/j3d/WakeupOnAWTEvent.java
@@ -101,6 +101,7 @@ void addAWTEvent(AWTEvent event) {
* This is a callback from BehaviorStructure. It is
* used to add wakeupCondition to behavior structure.
*/
+ @Override
void addBehaviorCondition(BehaviorStructure bs) {
resetBehaviorCondition(bs);
bs.wakeupOnAWTEvent.add(this);
@@ -111,6 +112,7 @@ void addAWTEvent(AWTEvent event) {
* This is a callback from BehaviorStructure. It is
* used to remove wakeupCondition from behavior structure.
*/
+ @Override
void removeBehaviorCondition(BehaviorStructure bs) {
bs.wakeupOnAWTEvent.remove(this);
}
@@ -119,6 +121,7 @@ void addAWTEvent(AWTEvent event) {
* Perform task in addBehaviorCondition() that has to be
* set every time the condition met.
*/
+ @Override
void resetBehaviorCondition(BehaviorStructure bs) {
if (enableAWTEventTS != bs.awtEventTimestamp) {
if ((AwtId >= FocusEvent.FOCUS_FIRST && AwtId <= FocusEvent.FOCUS_LAST) ||
diff --git a/src/classes/share/javax/media/j3d/WakeupOnActivation.java b/src/classes/share/javax/media/j3d/WakeupOnActivation.java
index caefcd6..6b438c3 100644
--- a/src/classes/share/javax/media/j3d/WakeupOnActivation.java
+++ b/src/classes/share/javax/media/j3d/WakeupOnActivation.java
@@ -52,6 +52,7 @@ public final class WakeupOnActivation extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to add wakeupCondition to behavior structure.
*/
+ @Override
void addBehaviorCondition(BehaviorStructure bs) {
behav.wakeupArray[BehaviorRetained.WAKEUP_ACTIVATE_INDEX]++;
behav.wakeupMask |= BehaviorRetained.WAKEUP_ACTIVATE;
@@ -63,6 +64,7 @@ public final class WakeupOnActivation extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to remove wakeupCondition from behavior structure.
*/
+ @Override
void removeBehaviorCondition(BehaviorStructure bs) {
behav.wakeupArray[BehaviorRetained.WAKEUP_ACTIVATE_INDEX]--;
if (behav.wakeupArray[BehaviorRetained.WAKEUP_ACTIVATE_INDEX] == 0) {
@@ -75,5 +77,6 @@ public final class WakeupOnActivation extends WakeupCriterion {
* Perform task in addBehaviorCondition() that has to be
* set every time the condition met.
*/
+ @Override
void resetBehaviorCondition(BehaviorStructure bs) {}
}
diff --git a/src/classes/share/javax/media/j3d/WakeupOnBehaviorPost.java b/src/classes/share/javax/media/j3d/WakeupOnBehaviorPost.java
index c6fd0ad..4e2d9c5 100644
--- a/src/classes/share/javax/media/j3d/WakeupOnBehaviorPost.java
+++ b/src/classes/share/javax/media/j3d/WakeupOnBehaviorPost.java
@@ -106,6 +106,7 @@ public final class WakeupOnBehaviorPost extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to add wakeupCondition to behavior structure.
*/
+ @Override
void addBehaviorCondition(BehaviorStructure bs) {
bs.wakeupOnBehaviorPost.add(this);
}
@@ -115,6 +116,7 @@ public final class WakeupOnBehaviorPost extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to remove wakeupCondition from behavior structure.
*/
+ @Override
void removeBehaviorCondition(BehaviorStructure bs) {
bs.wakeupOnBehaviorPost.remove(this);
}
@@ -123,5 +125,6 @@ public final class WakeupOnBehaviorPost extends WakeupCriterion {
* Perform task in addBehaviorCondition() that has to be
* set every time the condition met.
*/
+ @Override
void resetBehaviorCondition(BehaviorStructure bs) {}
}
diff --git a/src/classes/share/javax/media/j3d/WakeupOnCollisionEntry.java b/src/classes/share/javax/media/j3d/WakeupOnCollisionEntry.java
index 5a5012c..27fcd63 100644
--- a/src/classes/share/javax/media/j3d/WakeupOnCollisionEntry.java
+++ b/src/classes/share/javax/media/j3d/WakeupOnCollisionEntry.java
@@ -314,6 +314,7 @@ public final class WakeupOnCollisionEntry extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to add wakeupCondition to behavior structure.
*/
+ @Override
void addBehaviorCondition(BehaviorStructure bs) {
switch (nodeType) {
@@ -369,6 +370,7 @@ public final class WakeupOnCollisionEntry extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to remove wakeupCondition from behavior structure.
*/
+ @Override
void removeBehaviorCondition(BehaviorStructure bs) {
vwcBounds = null;
if (geometryAtoms != null) {
@@ -572,6 +574,7 @@ public final class WakeupOnCollisionEntry extends WakeupCriterion {
}
+ @Override
void setTriggered(){
// if path not set, probably the branch is just detach.
if (collidingPath != null) {
@@ -584,6 +587,7 @@ public final class WakeupOnCollisionEntry extends WakeupCriterion {
* Perform task in addBehaviorCondition() that has to be
* set every time the condition met.
*/
+ @Override
void resetBehaviorCondition(BehaviorStructure bs) {
// The reference geometryAtom will not change once
// Shape3D create so there is no need to set this.
diff --git a/src/classes/share/javax/media/j3d/WakeupOnCollisionExit.java b/src/classes/share/javax/media/j3d/WakeupOnCollisionExit.java
index 831ad8a..775096f 100644
--- a/src/classes/share/javax/media/j3d/WakeupOnCollisionExit.java
+++ b/src/classes/share/javax/media/j3d/WakeupOnCollisionExit.java
@@ -246,6 +246,7 @@ public final class WakeupOnCollisionExit extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to add wakeupCondition to behavior structure.
*/
+ @Override
void addBehaviorCondition(BehaviorStructure bs) {
switch (nodeType) {
@@ -302,6 +303,7 @@ public final class WakeupOnCollisionExit extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to remove wakeupCondition from behavior structure.
*/
+ @Override
void removeBehaviorCondition(BehaviorStructure bs) {
vwcBounds = null;
if (geometryAtoms != null) {
@@ -371,6 +373,7 @@ public final class WakeupOnCollisionExit extends WakeupCriterion {
}
}
+ @Override
void setTriggered(){
// if path not set, probably the branch is just detach.
if (collidingPath != null) {
@@ -383,6 +386,7 @@ public final class WakeupOnCollisionExit extends WakeupCriterion {
* Perform task in addBehaviorCondition() that has to be
* set every time the condition met.
*/
+ @Override
void resetBehaviorCondition(BehaviorStructure bs) {
// The reference geometryAtom will not change once
// Shape3D create so there is no need to set this.
diff --git a/src/classes/share/javax/media/j3d/WakeupOnCollisionMovement.java b/src/classes/share/javax/media/j3d/WakeupOnCollisionMovement.java
index 764284a..a4942e3 100644
--- a/src/classes/share/javax/media/j3d/WakeupOnCollisionMovement.java
+++ b/src/classes/share/javax/media/j3d/WakeupOnCollisionMovement.java
@@ -255,6 +255,7 @@ public final class WakeupOnCollisionMovement extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to add wakeupCondition to behavior structure.
*/
+ @Override
void addBehaviorCondition(BehaviorStructure bs) {
switch (nodeType) {
@@ -311,6 +312,7 @@ public final class WakeupOnCollisionMovement extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to remove wakeupCondition from behavior structure.
*/
+ @Override
void removeBehaviorCondition(BehaviorStructure bs) {
vwcBounds = null;
if (geometryAtoms != null) {
@@ -378,6 +380,7 @@ public final class WakeupOnCollisionMovement extends WakeupCriterion {
}
}
+ @Override
void setTriggered(){
// if path not set, probably the branch is just detach.
if (collidingPath != null) {
@@ -390,6 +393,7 @@ public final class WakeupOnCollisionMovement extends WakeupCriterion {
* Perform task in addBehaviorCondition() that has to be
* set every time the condition met.
*/
+ @Override
void resetBehaviorCondition(BehaviorStructure bs) {
// The reference geometryAtom will not change once
// Shape3D create so there is no need to set this.
diff --git a/src/classes/share/javax/media/j3d/WakeupOnDeactivation.java b/src/classes/share/javax/media/j3d/WakeupOnDeactivation.java
index 629a3d1..91acb03 100644
--- a/src/classes/share/javax/media/j3d/WakeupOnDeactivation.java
+++ b/src/classes/share/javax/media/j3d/WakeupOnDeactivation.java
@@ -52,6 +52,7 @@ public final class WakeupOnDeactivation extends WakeupCriterion {
* Set the Criterion's trigger flag to true.
* No need to check for scheduling region in this case
*/
+ @Override
void setTriggered(){
this.triggered = true;
if (this.parent == null) {
@@ -65,6 +66,7 @@ public final class WakeupOnDeactivation extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to add wakeupCondition to behavior structure.
*/
+ @Override
void addBehaviorCondition(BehaviorStructure bs) {
behav.wakeupArray[BehaviorRetained.WAKEUP_DEACTIVATE_INDEX]++;
behav.wakeupMask |= BehaviorRetained.WAKEUP_DEACTIVATE;
@@ -76,6 +78,7 @@ public final class WakeupOnDeactivation extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to remove wakeupCondition from behavior structure.
*/
+ @Override
void removeBehaviorCondition(BehaviorStructure bs) {
behav.wakeupArray[BehaviorRetained.WAKEUP_DEACTIVATE_INDEX]--;
if (behav.wakeupArray[BehaviorRetained.WAKEUP_DEACTIVATE_INDEX] == 0) {
@@ -88,5 +91,6 @@ public final class WakeupOnDeactivation extends WakeupCriterion {
* Perform task in addBehaviorCondition() that has to be
* set every time the condition met.
*/
+ @Override
void resetBehaviorCondition(BehaviorStructure bs) {}
}
diff --git a/src/classes/share/javax/media/j3d/WakeupOnElapsedFrames.java b/src/classes/share/javax/media/j3d/WakeupOnElapsedFrames.java
index bebc6bf..cb596a4 100644
--- a/src/classes/share/javax/media/j3d/WakeupOnElapsedFrames.java
+++ b/src/classes/share/javax/media/j3d/WakeupOnElapsedFrames.java
@@ -141,6 +141,7 @@ public final class WakeupOnElapsedFrames extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to add wakeupCondition to behavior structure.
*/
+ @Override
void addBehaviorCondition(BehaviorStructure bs) {
this.countdown = this.frameCount;
bs.wakeupOnElapsedFrames.add(this);
@@ -159,6 +160,7 @@ public final class WakeupOnElapsedFrames extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to remove wakeupCondition from behavior structure.
*/
+ @Override
void removeBehaviorCondition(BehaviorStructure bs) {
bs.wakeupOnElapsedFrames.remove(this);
if (!passive && (behav != null) && behav.enable) {
@@ -171,6 +173,7 @@ public final class WakeupOnElapsedFrames extends WakeupCriterion {
* Perform task in addBehaviorCondition() that has to be
* set every time the condition met.
*/
+ @Override
void resetBehaviorCondition(BehaviorStructure bs) {
this.countdown = this.frameCount;
}
diff --git a/src/classes/share/javax/media/j3d/WakeupOnElapsedTime.java b/src/classes/share/javax/media/j3d/WakeupOnElapsedTime.java
index e821d5c..1f93bd3 100644
--- a/src/classes/share/javax/media/j3d/WakeupOnElapsedTime.java
+++ b/src/classes/share/javax/media/j3d/WakeupOnElapsedTime.java
@@ -64,6 +64,7 @@ public final class WakeupOnElapsedTime extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to add wakeupCondition to behavior structure.
*/
+ @Override
void addBehaviorCondition(BehaviorStructure bs) {
this.triggeredTime = wait + J3dClock.currentTimeMillis();
behav.wakeupArray[BehaviorRetained.WAKEUP_TIME_INDEX]++;
@@ -76,6 +77,7 @@ public final class WakeupOnElapsedTime extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to remove wakeupCondition from behavior structure.
*/
+ @Override
void removeBehaviorCondition(BehaviorStructure bs) {
behav.wakeupArray[BehaviorRetained.WAKEUP_TIME_INDEX]--;
if (behav.wakeupArray[BehaviorRetained.WAKEUP_TIME_INDEX] == 0) {
@@ -90,6 +92,7 @@ public final class WakeupOnElapsedTime extends WakeupCriterion {
* reinsert the wakeupOnElapseTime condition back to the
* TimerThread wakeup heap
*/
+ @Override
void reInsertElapseTimeCond() {
super.reInsertElapseTimeCond();
this.triggeredTime = wait + J3dClock.currentTimeMillis();
@@ -101,6 +104,7 @@ public final class WakeupOnElapsedTime extends WakeupCriterion {
* Perform task in addBehaviorCondition() that has to be
* set every time the condition met.
*/
+ @Override
void resetBehaviorCondition(BehaviorStructure bs) {
this.triggeredTime = wait + J3dClock.currentTimeMillis();
VirtualUniverse.mc.timerThread.add(this);
diff --git a/src/classes/share/javax/media/j3d/WakeupOnElapsedTimeHeap.java b/src/classes/share/javax/media/j3d/WakeupOnElapsedTimeHeap.java
index 7043a95..d14a148 100644
--- a/src/classes/share/javax/media/j3d/WakeupOnElapsedTimeHeap.java
+++ b/src/classes/share/javax/media/j3d/WakeupOnElapsedTimeHeap.java
@@ -191,6 +191,7 @@ class WakeupOnElapsedTimeHeap implements Cloneable {
/**
* Clone this heap
*/
+ @Override
protected final Object clone() {
try {
WakeupOnElapsedTimeHeap heap = (WakeupOnElapsedTimeHeap)super.clone();
@@ -205,6 +206,7 @@ class WakeupOnElapsedTimeHeap implements Cloneable {
}
+ @Override
public String toString() {
StringBuffer sb = new StringBuffer("[ ");
diff --git a/src/classes/share/javax/media/j3d/WakeupOnSensorEntry.java b/src/classes/share/javax/media/j3d/WakeupOnSensorEntry.java
index 13c5cff..4da94dc 100644
--- a/src/classes/share/javax/media/j3d/WakeupOnSensorEntry.java
+++ b/src/classes/share/javax/media/j3d/WakeupOnSensorEntry.java
@@ -83,6 +83,7 @@ public final class WakeupOnSensorEntry extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to add wakeupCondition to behavior structure.
*/
+ @Override
void addBehaviorCondition(BehaviorStructure bs) {
bs.addSensorEntryCondition(this);
if ((behav != null) && behav.enable) {
@@ -95,6 +96,7 @@ public final class WakeupOnSensorEntry extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to remove wakeupCondition from behavior structure.
*/
+ @Override
void removeBehaviorCondition(BehaviorStructure bs) {
bs.removeSensorEntryCondition(this);
if ((behav != null) && behav.enable) {
@@ -139,5 +141,6 @@ public final class WakeupOnSensorEntry extends WakeupCriterion {
* Perform task in addBehaviorCondition() that has to be
* set every time the condition met.
*/
+ @Override
void resetBehaviorCondition(BehaviorStructure bs) {}
}
diff --git a/src/classes/share/javax/media/j3d/WakeupOnSensorExit.java b/src/classes/share/javax/media/j3d/WakeupOnSensorExit.java
index c409a95..a7d314b 100644
--- a/src/classes/share/javax/media/j3d/WakeupOnSensorExit.java
+++ b/src/classes/share/javax/media/j3d/WakeupOnSensorExit.java
@@ -81,6 +81,7 @@ public final class WakeupOnSensorExit extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to add wakeupCondition to behavior structure.
*/
+ @Override
void addBehaviorCondition(BehaviorStructure bs) {
bs.addSensorExitCondition(this);
if ((behav != null) && behav.enable) {
@@ -93,6 +94,7 @@ public final class WakeupOnSensorExit extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to remove wakeupCondition from behavior structure.
*/
+ @Override
void removeBehaviorCondition(BehaviorStructure bs) {
bs.removeSensorExitCondition(this);
if ((behav != null) && behav.enable) {
@@ -138,5 +140,6 @@ public final class WakeupOnSensorExit extends WakeupCriterion {
* Perform task in addBehaviorCondition() that has to be
* set every time the condition met.
*/
+ @Override
void resetBehaviorCondition(BehaviorStructure bs) {}
}
diff --git a/src/classes/share/javax/media/j3d/WakeupOnTransformChange.java b/src/classes/share/javax/media/j3d/WakeupOnTransformChange.java
index 564f32c..2ef17c9 100644
--- a/src/classes/share/javax/media/j3d/WakeupOnTransformChange.java
+++ b/src/classes/share/javax/media/j3d/WakeupOnTransformChange.java
@@ -71,6 +71,7 @@ public final class WakeupOnTransformChange extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to add wakeupCondition to behavior structure.
*/
+ @Override
void addBehaviorCondition(BehaviorStructure bs) {
transform.addCondition(this);
}
@@ -80,6 +81,7 @@ public final class WakeupOnTransformChange extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to remove wakeupCondition from behavior structure.
*/
+ @Override
void removeBehaviorCondition(BehaviorStructure bs) {
transform.removeCondition(this);
}
@@ -89,5 +91,6 @@ public final class WakeupOnTransformChange extends WakeupCriterion {
* Perform task in addBehaviorCondition() that has to be
* set every time the condition met.
*/
+ @Override
void resetBehaviorCondition(BehaviorStructure bs) {}
}
diff --git a/src/classes/share/javax/media/j3d/WakeupOnViewPlatformEntry.java b/src/classes/share/javax/media/j3d/WakeupOnViewPlatformEntry.java
index 5231472..33f3d65 100644
--- a/src/classes/share/javax/media/j3d/WakeupOnViewPlatformEntry.java
+++ b/src/classes/share/javax/media/j3d/WakeupOnViewPlatformEntry.java
@@ -113,6 +113,7 @@ public final class WakeupOnViewPlatformEntry extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to add wakeupCondition to behavior structure.
*/
+ @Override
void addBehaviorCondition(BehaviorStructure bs) {
updateTransformRegion(behav);
behav.wakeupArray[BehaviorRetained.WAKEUP_VP_ENTRY_INDEX]++;
@@ -125,6 +126,7 @@ public final class WakeupOnViewPlatformEntry extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to remove wakeupCondition from behavior structure.
*/
+ @Override
void removeBehaviorCondition(BehaviorStructure bs) {
behav.wakeupArray[BehaviorRetained.WAKEUP_VP_ENTRY_INDEX]--;
if (behav.wakeupArray[BehaviorRetained.WAKEUP_VP_ENTRY_INDEX] == 0) {
@@ -139,6 +141,7 @@ public final class WakeupOnViewPlatformEntry extends WakeupCriterion {
* Perform task in addBehaviorCondition() that has to be
* set every time the condition met.
*/
+ @Override
void resetBehaviorCondition(BehaviorStructure bs) {
// updateTransformRegion() is invoked in BehaviorStructure
// whenever Behavior transform change so there is
diff --git a/src/classes/share/javax/media/j3d/WakeupOnViewPlatformExit.java b/src/classes/share/javax/media/j3d/WakeupOnViewPlatformExit.java
index 3ebe98e..4778ea7 100644
--- a/src/classes/share/javax/media/j3d/WakeupOnViewPlatformExit.java
+++ b/src/classes/share/javax/media/j3d/WakeupOnViewPlatformExit.java
@@ -116,6 +116,7 @@ public final class WakeupOnViewPlatformExit extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to add wakeupCondition to behavior structure.
*/
+ @Override
void addBehaviorCondition(BehaviorStructure bs) {
updateTransformRegion(behav);
behav.wakeupArray[BehaviorRetained.WAKEUP_VP_EXIT_INDEX]++;
@@ -128,6 +129,7 @@ public final class WakeupOnViewPlatformExit extends WakeupCriterion {
* This is a callback from BehaviorStructure. It is
* used to remove wakeupCondition from behavior structure.
*/
+ @Override
void removeBehaviorCondition(BehaviorStructure bs) {
bs.removeVPExitCondition(this);
behav.wakeupArray[BehaviorRetained.WAKEUP_VP_EXIT_INDEX]--;
@@ -141,6 +143,7 @@ public final class WakeupOnViewPlatformExit extends WakeupCriterion {
* Perform task in addBehaviorCondition() that has to be
* set every time the condition met.
*/
+ @Override
void resetBehaviorCondition(BehaviorStructure bs) {
// updateTransformRegion() is invoked in BehaviorStructure
// whenever Behavior transform change so there is
diff --git a/src/classes/share/javax/media/j3d/WakeupOr.java b/src/classes/share/javax/media/j3d/WakeupOr.java
index 5016c5a..1d4b934 100644
--- a/src/classes/share/javax/media/j3d/WakeupOr.java
+++ b/src/classes/share/javax/media/j3d/WakeupOr.java
@@ -56,6 +56,7 @@ public final class WakeupOr extends WakeupCondition {
/**
* This sets the bit for the given child, then checks if the full condition is met
*/
+ @Override
void setConditionMet(int id, Boolean checkSchedulingRegion) {
if (parent == null) {
super.setConditionMet(this.id, checkSchedulingRegion);
@@ -68,6 +69,7 @@ public final class WakeupOr extends WakeupCondition {
/**
* This gets called when this condition is added to the AndOr tree.
*/
+ @Override
void buildTree(WakeupCondition parent, int id, BehaviorRetained b) {
super.buildTree(parent, id, b);
@@ -82,12 +84,14 @@ public final class WakeupOr extends WakeupCondition {
* This goes through the AndOr tree to remove the various criterion from the
* BehaviorStructure lists
*/
+ @Override
void cleanTree(BehaviorStructure bs) {
for (int i=0; i<conditions.length; i++) {
conditions[i].cleanTree(bs);
}
}
+ @Override
void reInsertElapseTimeCond() {
super.reInsertElapseTimeCond();
for(int i = 0; i < conditions.length; i++) {
@@ -101,6 +105,7 @@ public final class WakeupOr extends WakeupCondition {
* This goes through the AndOr tree to remove the various criterion from the
* BehaviorStructure.
*/
+ @Override
void resetTree() {
super.resetTree();
for(int i = 0; i < conditions.length; i++) {
diff --git a/src/classes/share/javax/media/j3d/WakeupOrOfAnds.java b/src/classes/share/javax/media/j3d/WakeupOrOfAnds.java
index 5f98237..1038f23 100644
--- a/src/classes/share/javax/media/j3d/WakeupOrOfAnds.java
+++ b/src/classes/share/javax/media/j3d/WakeupOrOfAnds.java
@@ -57,6 +57,7 @@ public final class WakeupOrOfAnds extends WakeupCondition {
/**
* This sets the bit for the given child, then checks if the full condition is met
*/
+ @Override
void setConditionMet(int id, Boolean checkSchedulingRegion) {
if (parent == null) {
super.setConditionMet(this.id, checkSchedulingRegion);
@@ -68,6 +69,7 @@ public final class WakeupOrOfAnds extends WakeupCondition {
/**
* This gets called when this condition is added to the AndOr tree.
*/
+ @Override
void buildTree(WakeupCondition parent, int id, BehaviorRetained b) {
super.buildTree(parent, id, b);
@@ -82,12 +84,14 @@ public final class WakeupOrOfAnds extends WakeupCondition {
* This goes through the AndOr tree to remove the various criterion from the
* BehaviorStructure lists
*/
+ @Override
void cleanTree(BehaviorStructure bs) {
for (int i=0; i<conditions.length; i++) {
conditions[i].cleanTree(bs);
}
}
+ @Override
void reInsertElapseTimeCond() {
super.reInsertElapseTimeCond();
for(int i = 0; i < conditions.length; i++) {
@@ -101,6 +105,7 @@ public final class WakeupOrOfAnds extends WakeupCondition {
* This goes through the AndOr tree to remove the various criterion from the
* BehaviorStructure.
*/
+ @Override
void resetTree() {
super.resetTree();
for(int i = 0; i < conditions.length; i++) {