Deprecation/Lint fixes

Author: markpet49

src/gov/nasa/worldwind/WorldWind.java

@@ -211,8 +211,8 @@ public static Object createComponent(String className) throws WWRuntimeException
 
         try
         {
-            Class c = Class.forName(className.trim());
-            return c.newInstance();
+            Class<?> c = Class.forName(className.trim());
+            return c.getConstructor().newInstance();
         }
         catch (Exception e)
         {

src/gov/nasa/worldwind/awt/KeyEventState.java

@@ -5,239 +5,229 @@
  */
 package gov.nasa.worldwind.awt;
 
+import gov.nasa.worldwind.util.Logging;
 import java.awt.event.*;
 import java.util.*;
 
 /**
  * @author dcollins
  * @version $Id: KeyEventState.java 2193 2014-08-01 23:33:16Z dcollins $
  */
-public class KeyEventState implements KeyListener, MouseListener
-{
-    protected static class InputState
-    {
+public class KeyEventState implements KeyListener, MouseListener {
+
+    protected static class InputState {
 
         protected int eventType;
         protected int keyOrButtonCode;
         protected long timestamp;
 
-        public InputState(int eventType, int keyOrButtonCode, long timestamp)
-        {
+        public InputState(int eventType, int keyOrButtonCode, long timestamp) {
             this.eventType = eventType;
             this.keyOrButtonCode = keyOrButtonCode;
             this.timestamp = timestamp;
         }
 
-        public int getEventType()
-        {
+        public int getEventType() {
             return this.eventType;
         }
 
-        public int getKeyOrButtonCode()
-        {
+        public int getKeyOrButtonCode() {
             return this.keyOrButtonCode;
         }
 
-        public long getTimestamp()
-        {
+        public long getTimestamp() {
             return this.timestamp;
         }
     }
 
-    protected Map<Object, InputState> keyStateMap = new HashMap<Object, InputState>();
-    protected int modifiers;
+    protected Map<Object, InputState> keyStateMap = new HashMap<>();
     protected int modifiersEx;
-    protected int mouseModifiers;
     protected int mouseModifiersEx;
 
-    public KeyEventState()
-    {
+    public KeyEventState() {
     }
 
-    public boolean isKeyDown(int keyCode)
-    {
+    public boolean isKeyDown(int keyCode) {
         InputState state = this.getKeyState(keyCode);
         return state != null && state.getEventType() == KeyEvent.KEY_PRESSED;
     }
 
-    public int keyState(int keyCode)
-    {
+    public int keyState(int keyCode) {
         InputState state = this.getKeyState(keyCode);
         return state != null && state.getEventType() == KeyEvent.KEY_PRESSED ? 1 : 0;
     }
 
-    public int getNumKeysDown()
-    {
-        if (keyStateMap.isEmpty())
-        {
-            return(0);
+    public int getNumKeysDown() {
+        if (keyStateMap.isEmpty()) {
+            return (0);
         }
         int numKeys = 0;
-        for (Object o : this.keyStateMap.keySet())
-        {
+        for (Object o : this.keyStateMap.keySet()) {
             //Integer key = (KeyEvent) o;
             InputState is = this.keyStateMap.get(o);
-            if (is.getEventType() == KeyEvent.KEY_PRESSED)
-            {
+            if (is.getEventType() == KeyEvent.KEY_PRESSED) {
                 numKeys++;
             }
 
         }
-        return(numKeys);
+        return (numKeys);
     }
 
-    public int getNumButtonsDown()
-    {
-        if (keyStateMap.isEmpty())
-        {
-            return(0);
+    public int getNumButtonsDown() {
+        if (keyStateMap.isEmpty()) {
+            return (0);
         }
         int numKeys = 0;
-        for (Object o : this.keyStateMap.keySet())
-        {
-            //Integer key = (KeyEvent) o;
+        for (Object o : this.keyStateMap.keySet()) {
             InputState is = this.keyStateMap.get(o);
-            if (is.getEventType() == MouseEvent.MOUSE_PRESSED)
-            {
+            if (is.getEventType() == MouseEvent.MOUSE_PRESSED) {
                 numKeys++;
             }
 
         }
-        return(numKeys);
+        return (numKeys);
     }
 
-    public int getModifiers()
-    {
-        return this.modifiers;
+    /**
+     * @return The same value as {@link #getModifiersEx()}.
+     * @deprecated Use {@link #getModifiersEx()} instead
+     */
+    @Deprecated
+    public int getModifiers() {
+        String msg = Logging.getMessage("generic.OperationDeprecatedAndChanged", "getModifiers", "getModifiersEx");
+        Logging.logger().severe(msg);
+        return this.modifiersEx;
     }
 
-    public int getModifiersEx()
-    {
+    /**
+     * @return The extended event modifiers.
+     */
+    public int getModifiersEx() {
         return this.modifiersEx;
     }
 
-    public int getMouseModifiers()
-    {
-        return this.mouseModifiers;
+    /**
+     * @return The same value as {@link #getMouseModifiersEx()}.
+     * @deprecated Use {@link #getMouseModifiersEx()} instead
+     */
+    @Deprecated
+    public int getMouseModifiers() {
+        String msg = Logging.getMessage("generic.OperationDeprecatedAndChanged", "getMouseModifiers", "getMouseModifiersEx");
+        Logging.logger().severe(msg);
+        return this.mouseModifiersEx;
     }
 
-    public int getMouseModifiersEx()
-    {
+    /**
+     * @return The extended mouse event modifiers.
+     */
+    public int getMouseModifiersEx() {
         return this.mouseModifiersEx;
     }
 
-    public void clearKeyState()
-    {
+    public void clearKeyState() {
         this.keyStateMap.clear();
-        this.modifiers = 0;
         this.modifiersEx = 0;
-        this.mouseModifiers = 0;
         this.mouseModifiersEx = 0;
     }
 
     @Override
-    public void keyTyped(KeyEvent e)
-    {
+    public void keyTyped(KeyEvent e) {
     }
 
     @Override
-    public void keyPressed(KeyEvent e)
-    {
+    public void keyPressed(KeyEvent e) {
         this.onKeyEvent(e, KeyEvent.KEY_PRESSED);
     }
 
     @Override
-    public void keyReleased(KeyEvent e)
-    {
+    public void keyReleased(KeyEvent e) {
         this.removeKeyState(e);
     }
 
-    protected void onKeyEvent(KeyEvent e, int eventType)
-    {
-        if (e == null)
+    protected void onKeyEvent(KeyEvent e, int eventType) {
+        if (e == null) {
             return;
+        }
 
         long timestamp = this.getTimeStamp(e, eventType, this.keyStateMap.get(e.getKeyCode()));
         this.setKeyState(e.getKeyCode(), new InputState(eventType, e.getKeyCode(), timestamp));
-        this.setModifiers(e.getModifiers());
         this.setModifiersEx(e.getModifiersEx());
     }
 
     @Override
-    public void mouseClicked(java.awt.event.MouseEvent mouseEvent)
-    {
+    public void mouseClicked(java.awt.event.MouseEvent mouseEvent) {
     }
 
     @Override
-    public void mousePressed(java.awt.event.MouseEvent e)
-    {
+    public void mousePressed(java.awt.event.MouseEvent e) {
         long timestamp = this.getTimeStamp(e, MouseEvent.MOUSE_PRESSED, this.keyStateMap.get(e.getModifiersEx()));
         this.setKeyState(e.getButton(), new InputState(MouseEvent.MOUSE_PRESSED, e.getButton(), timestamp));
-        this.setMouseModifiers(e.getModifiers());
         this.setMouseModifiersEx(e.getModifiersEx());
     }
 
-    public void mouseReleased(java.awt.event.MouseEvent e)
-    {
+    @Override
+    public void mouseReleased(java.awt.event.MouseEvent e) {
         this.keyStateMap.remove(e.getButton());
-        this.setMouseModifiers(0);
         this.setMouseModifiersEx(0);
     }
 
-    public void mouseEntered(java.awt.event.MouseEvent mouseEvent)
-    {
+    @Override
+    public void mouseEntered(java.awt.event.MouseEvent mouseEvent) {
 
     }
 
-    public void mouseExited(java.awt.event.MouseEvent mouseEvent)
-    {
-        
+    @Override
+    public void mouseExited(java.awt.event.MouseEvent mouseEvent) {
+
     }
 
-    protected InputState getKeyState(int keyCode)
-    {
+    protected InputState getKeyState(int keyCode) {
         return this.keyStateMap.get(keyCode);
     }
 
-    protected void setKeyState(int keyCode, InputState state)
-    {
+    protected void setKeyState(int keyCode, InputState state) {
         this.keyStateMap.put(keyCode, state);
     }
 
-    protected void setModifiers(int modifiers)
-    {
-        this.modifiers = modifiers;
+    /**
+     * @param modifiers Unused.
+     * @deprecated Use {@link #setModifiersEx(int)} instead
+     */
+    @Deprecated
+    protected void setModifiers(int modifiers) {
+        String msg = Logging.getMessage("generic.OperationDeprecatedAndChanged", "setModifiers", "setModifiersEx");
+        Logging.logger().severe(msg);
     }
 
-    protected void setModifiersEx(int modifiersEx)
-    {
+    protected void setModifiersEx(int modifiersEx) {
         this.modifiersEx = modifiersEx;
     }
 
-    protected void setMouseModifiersEx(int modifiersEx)
-    {
+    protected void setMouseModifiersEx(int modifiersEx) {
         this.mouseModifiersEx = modifiersEx;
     }
 
-    protected void setMouseModifiers(int modifiers)
-    {
-        this.mouseModifiers = modifiers;
+    /**
+     * @param modifiers Unused.
+     * @deprecated Use {@link #setMouseModifiersEx(int)} instead
+     */
+    @Deprecated
+    protected void setMouseModifiers(int modifiers) {
+        String msg = Logging.getMessage("generic.OperationDeprecatedAndChanged", "setMouseModifiers", "setMouseModifiersEx");
+        Logging.logger().severe(msg);
     }
 
-
-
     protected void removeKeyState(KeyEvent e) {
         this.keyStateMap.remove(e.getKeyCode());
-        this.setModifiers(e.getModifiers());
         this.setModifiersEx(e.getModifiersEx());
     }
 
-    protected long getTimeStamp(InputEvent e, int eventType, InputState currentState)
-    {
+    protected long getTimeStamp(InputEvent e, int eventType, InputState currentState) {
         // If the current state for this input event type exists and is not null, then keep the current timestamp.
-        if (currentState != null && currentState.getEventType() == eventType)
+        if (currentState != null && currentState.getEventType() == eventType) {
             return currentState.getTimestamp();
+        }
         // Otherwise return the InputEvent's timestamp.
         return e.getWhen();
     }
-}
+}

src/gov/nasa/worldwind/cache/BasicMemoryCache.java

@@ -408,20 +408,4 @@ public String toString()
         return "MemoryCache " + this.name + " max size = " + this.getCapacity() + " current size = "
             + this.currentUsedCapacity.get() + " number of items: " + this.getNumObjects();
     }
-
-    @Override
-    protected void finalize() throws Throwable
-    {
-        try
-        {
-            // clear doesn't throw any checked exceptions
-            // but this is in case of an unchecked exception
-            // basically, we don't want to exit without calling super.finalize
-            this.clear();
-        }
-        finally
-        {
-            super.finalize();
-        }
-    }
 }

src/gov/nasa/worldwind/formats/shapefile/ShapefileRecordMultiPoint.java

@@ -30,7 +30,17 @@ public class ShapefileRecordMultiPoint extends ShapefileRecord
     protected double[] mRange; // will be null if no measures
     protected double[] mValues; // will be null if no measures
 
-    /** {@inheritDoc} */
+    /**
+     * Constructs a record instance from the given {@link java.nio.ByteBuffer}. The buffer's current position must be
+     * the start of the record, and will be the start of the next record when the constructor returns.
+     *
+     * @param shapeFile the parent {@link Shapefile}.
+     * @param buffer    the shapefile record {@link java.nio.ByteBuffer} to read from.
+     *
+     * @throws IllegalArgumentException if any argument is null or otherwise invalid.
+     * @throws gov.nasa.worldwind.exception.WWRuntimeException
+     *                                  if the record's shape type does not match that of the shapefile.
+     */
     public ShapefileRecordMultiPoint(Shapefile shapeFile, ByteBuffer buffer)
     {
         super(shapeFile, buffer);