Fix some Java warnings detected by IntelliJ.

Author: andreasrosdalw

openpdf-html/src/main/java/org/openpdf/css/style/derived/LengthValue.java

@@ -183,7 +183,6 @@ public static float calcFloatProportionalValue(CalculatedStyle style,
                         "'" + ValueConstants.stringForSACPrimitiveType(primitiveType) + "' "
                         + primitiveType + "(" + stringValue + ")");
         }
-        //assert (new Float(absVal).intValue() >= 0);
 
         if (XRLog.isLoggingEnabled()) {
             if (cssName == CSSName.FONT_SIZE) {

openpdf-renderer/src/main/java/org/openpdf/renderer/PDFObject.java

@@ -123,7 +123,7 @@ public class PDFObject {
      * for dereferencing.  This may be null.
      * @param type the type of object
      * @param value the value.  For DICTIONARY, this is a HashMap.
-     * for ARRAY it's an ArrayList.  For NUMBER, it's a Double.
+     * for ARRAY, it's an ArrayList.  For NUMBER, it's a Double.
      * for BOOLEAN, it's Boolean.TRUE or Boolean.FALSE.  For
      * everything else, it's a String.
      */
@@ -173,12 +173,11 @@ public PDFObject(Object obj) throws PDFParseException {
             this.type = DICTIONARY;
         } else if (obj instanceof Boolean) {
             this.type = BOOLEAN;
-        } else if (obj instanceof PDFParser.Tok) {
-            PDFParser.Tok tok = (PDFParser.Tok) obj;
-            if (tok!=null && tok.name!=null && tok.name.equals("true")) {
+        } else if (obj instanceof PDFParser.Tok tok) {
+            if (tok.name != null && tok.name.equals("true")) {
                 this.value = Boolean.TRUE;
                 this.type = BOOLEAN;
-            } else if (tok!=null && tok.name!=null && tok.name.equals("false")) {
+            } else if (tok.name != null && tok.name.equals("false")) {
                 this.value = Boolean.FALSE;
                 this.type = BOOLEAN;
             } else {
@@ -341,7 +340,6 @@ public Object getCache() throws IOException {
     public void setCache(Object obj) throws IOException {
         if (type == INDIRECT) {
             dereference().setCache(obj);
-            return;
         } else {
             cache = new SoftReference<Object>(obj);
         }
@@ -352,12 +350,11 @@ public byte[] getStream(Set<String> filterLimits) throws IOException
         if (type == INDIRECT) {
             return dereference().getStream(filterLimits);
         } else if (type == STREAM && stream != null) {
-            byte[] data = null;
+            byte[] data;
 
             synchronized (stream) {
                 // decode
                 ByteBuffer streamBuf = decodeStream(filterLimits);
-                // ByteBuffer streamBuf = stream;
 
                 // First try to use the array with no copying.  This can only
                 // be done if the buffer has a backing array, and is not a slice
@@ -443,8 +440,8 @@ private ByteBuffer decodeStream(Set<String> filterLimits) throws IOException {
         if (outStream == null) {
             stream.rewind();
             outStream = PDFDecoder.decodeStream(this, stream, filterLimits);
-            decodedStreamFilterLimits = new HashSet<String>(filterLimits);
-            decodedStream = new SoftReference(outStream);
+            decodedStreamFilterLimits = new HashSet<>(filterLimits);
+            decodedStream = new SoftReference<>(outStream);
         }
 
         return outStream;
@@ -520,7 +517,7 @@ public String getStringValue() throws IOException {
 
     /**
      * Get the value as a text string; i.e., a string encoded in UTF-16BE
-     * or PDFDocEncoding. Simple latin alpha-numeric characters are preserved in
+     * or PDFDocEncoding. Simple latin alphanumeric characters are preserved in
      * both these encodings.
      * @return the text string value
      * @throws IOException
@@ -538,8 +535,7 @@ public PDFObject[] getArray() throws IOException {
         if (type == INDIRECT) {
             return dereference().getArray();
         } else if (type == ARRAY) {
-            PDFObject[] ary = (PDFObject[]) value;
-            return ary;
+            return (PDFObject[]) value;
         } else {
             PDFObject[] ary = new PDFObject[1];
             ary[0] = this;
@@ -592,7 +588,7 @@ public Iterator getDictKeys() throws IOException {
         }
 
         // wrong type
-        return new ArrayList().iterator();
+        return Collections.emptyIterator();
     }
 
     /**
@@ -607,7 +603,7 @@ public HashMap<String,PDFObject> getDictionary() throws IOException {
         }
 
         // wrong type
-        return new HashMap<String,PDFObject>();
+        return new HashMap<>();
     }
 
     /**
@@ -621,8 +617,7 @@ public PDFObject getDictRef(String key) throws IOException {
         } else if (type == DICTIONARY || type == STREAM) {
             key = key.intern();
             HashMap h = (HashMap) value;
-            PDFObject obj = (PDFObject) h.get(key.intern());
-            return obj;
+            return (PDFObject) h.get(key.intern());
         }
 
         // wrong type
@@ -711,7 +706,7 @@ public String toString() {
                 try {
                     str.append("\n" + dereference().toString());
                 } catch (Throwable t) {
-                    str.append(t.toString());
+                    str.append(t);
                 }
                 return str.toString();
             } else if (type == BOOLEAN) {
@@ -753,21 +748,11 @@ public String toString() {
                 if (st == null) {
                     return "Broken stream";
                 }
-                return "Stream: [[" + new String(st, 0, st.length > 30 ? 30 : st.length) + "]]";
+                return "Stream: [[" + new String(st, 0, Math.min(st.length, 30)) + "]]";
             } else if (type == NULL) {
                 return "Null";
             } else if (type == KEYWORD) {
                 return "Keyword: " + getStringValue();
-            /*	    } else if (type==IMAGE) {
-            StringBuffer sb= new StringBuffer();
-            java.awt.Image im= (java.awt.Image)stream;
-            sb.append("Image ("+im.getWidth(null)+"x"+im.getHeight(null)+", with keys:");
-            HashMap hm= (HashMap)value;
-            Iterator it= hm.keySet().iterator();
-            while(it.hasNext()) {
-            sb.append(" "+(String)it.next());
-            }
-            return sb.toString();*/
             } else {
                 return "Whoops!  big error!  Unknown type";
             }
@@ -796,7 +781,7 @@ public PDFObject dereference() throws IOException {
 
                 obj = owner.dereference((PDFXref)value, getDecrypter());
 
-                cache = new SoftReference<PDFObject>(obj);
+                cache = new SoftReference<>(obj);
             }
 
             return obj;
@@ -824,9 +809,8 @@ public boolean equals(Object o) {
         if (super.equals(o)) {
             // they are the same object
             return true;
-        } else if (type == INDIRECT && o instanceof PDFObject) {
+        } else if (type == INDIRECT && o instanceof PDFObject obj) {
             // they are both PDFObjects.  Check type and xref.
-            PDFObject obj = (PDFObject) o;
 
             if (obj.type == INDIRECT) {
                 PDFXref lXref = (PDFXref) value;
@@ -842,7 +826,6 @@ public boolean equals(Object o) {
 
 	    /**
      * Returns the root of this object.
-     * @return
      */
     public PDFObject getRoot() {
     	return owner.getRoot();

openpdf-renderer/src/main/java/org/openpdf/renderer/font/CIDFontType2.java

@@ -125,7 +125,7 @@ private void parseWidths(PDFObject fontObj)
 
                             // value is width / default width
                             float value = entries[c].getIntValue();
-                            this.widths.put(key, new Float(value));
+                            this.widths.put(key, value);
                         }
                         // all done
                         entryIdx = -1;
@@ -138,7 +138,7 @@ private void parseWidths(PDFObject fontObj)
 
                     // set the range
                     for (int c = first; c <= last; c++) {
-                        this.widths.put(Character.valueOf((char) c), new Float(value));
+                        this.widths.put(Character.valueOf((char) c), Float.valueOf(value));
                     }
 
                     // all done
@@ -188,7 +188,7 @@ private void parseWidths(PDFObject fontObj)
 
                             // value is width / default width
                             float value = entries[c].getIntValue();
-                            this.widthsVertical.put(key, new Float(value));
+                            this.widthsVertical.put(key, value);
                         }
                         // all done
                         entryIdx = -1;
@@ -201,7 +201,7 @@ private void parseWidths(PDFObject fontObj)
 
                     // set the range
                     for (int c = first; c <= last; c++) {
-                        this.widthsVertical.put(Character.valueOf((char) c), new Float(value));
+                        this.widthsVertical.put(Character.valueOf((char) c), Float.valueOf(value));
                     }
 
                     // all done

openpdf-renderer/src/main/java/org/openpdf/renderer/function/FunctionType4.java

@@ -101,9 +101,9 @@ private void prepareResult(float[] outputs, int outputOffset) {
 	 ************************************************************************/
 
 	private void prepareInitialStack(float[] inputs, int inputOffset) {
-		this.stack = new Stack<Object>();
+		this.stack = new Stack<>();
     	for (int i = inputOffset; i < inputs.length; i++) {
-    		this.stack.push(new Double(inputs[i]));
+    		this.stack.push(inputs[i]);
 		}
 	}