Changeset 10862 in josm for trunk/src/com/drew/lang

Timestamp:

2016-08-20T20:58:03+02:00 (9 years ago)

Author:

Don-vip

Message:

update to metadata-extractor 2.9.1

Location:

trunk/src/com/drew/lang

Files:

• BufferBoundsException.java (modified) (1 diff)
• ByteArrayReader.java (modified) (4 diffs)
• CompoundException.java (modified) (1 diff)
• DateUtil.java (added)
• GeoLocation.java (modified) (2 diffs)
• NullOutputStream.java (deleted)
• RandomAccessReader.java (modified) (2 diffs)
• Rational.java (modified) (1 diff)
• SequentialByteArrayReader.java (modified) (2 diffs)
• SequentialReader.java (modified) (1 diff)
• StreamReader.java (modified) (2 diffs)
• StringUtil.java (modified) (1 diff)
• annotations/NotNull.java (modified) (1 diff)
• annotations/Nullable.java (modified) (1 diff)
• annotations/SuppressWarnings.java (deleted)
• annotations/package.html (modified) (1 diff)
• package.html (modified) (1 diff)

trunk/src/com/drew/lang/BufferBoundsException.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2015 Drew Noakes
+ * Copyright 2002-2016 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/lang/ByteArrayReader.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2015 Drew Noakes
+ * Copyright 2002-2016 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -22 +22 @@
 package com.drew.lang;
 
+import java.io.IOException;
+
 import com.drew.lang.annotations.NotNull;
-
-import java.io.IOException;
 
 /**
@@ -40 +40 @@
     private final byte[] _buffer;
 
-    @SuppressWarnings({ "ConstantConditions" })
-    @com.drew.lang.annotations.SuppressWarnings(value = "EI_EXPOSE_REP2", justification = "Design intent")
     public ByteArrayReader(@NotNull byte[] buffer)
     {
@@ -74 +72 @@
         return bytesRequested >= 0
             && index >= 0
-            && (long)index + (long)bytesRequested - 1L < (long)_buffer.length;
+            && (long)index + (long)bytesRequested - 1L < _buffer.length;
     }
 

trunk/src/com/drew/lang/CompoundException.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2015 Drew Noakes
+ * Copyright 2002-2016 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/lang/GeoLocation.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2015 Drew Noakes
+ * Copyright 2002-2016 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -84 +84 @@
         double[] dms = decimalToDegreesMinutesSeconds(decimal);
         DecimalFormat format = new DecimalFormat("0.##");
-        return String.format("%s° %s' %s\"", format.format(dms[0]), format.format(dms[1]), format.format(dms[2]));
+        return String.format("%s\u00B0 %s' %s\"", format.format(dms[0]), format.format(dms[1]), format.format(dms[2]));
     }
 

trunk/src/com/drew/lang/RandomAccessReader.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2015 Drew Noakes
+ * Copyright 2002-2016 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -53 +53 @@
      * @param index The index from which to read the byte
      * @return The read byte value
-     * @throws IllegalArgumentException <code>index</code> or <code>count</code> are negative
+     * @throws IllegalArgumentException <code>index</code> is negative
      * @throws BufferBoundsException if the requested byte is beyond the end of the underlying data source
      * @throws IOException if the byte is unable to be read

trunk/src/com/drew/lang/Rational.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2015 Drew Noakes
+ * Copyright 2002-2016 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/lang/SequentialByteArrayReader.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2015 Drew Noakes
+ * Copyright 2002-2016 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -42 +42 @@
     }
 
-    @SuppressWarnings("ConstantConditions")
     public SequentialByteArrayReader(@NotNull byte[] bytes, int baseIndex)
     {

trunk/src/com/drew/lang/SequentialReader.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2015 Drew Noakes
+ * Copyright 2002-2016 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/lang/StreamReader.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2015 Drew Noakes
+ * Copyright 2002-2016 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -37 +37 @@
     private final InputStream _stream;
 
-    @SuppressWarnings("ConstantConditions")
     public StreamReader(@NotNull InputStream stream)
     {

trunk/src/com/drew/lang/StringUtil.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2015 Drew Noakes
+ * Copyright 2002-2016 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/lang/annotations/NotNull.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2015 Drew Noakes
+ * Copyright 2002-2016 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/lang/annotations/Nullable.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2015 Drew Noakes
+ * Copyright 2002-2016 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/lang/annotations/package.html

@@ -1 +1 @@
 <!--
-  ~ Copyright 2002-2015 Drew Noakes
+  ~ Copyright 2002-2016 Drew Noakes
   ~
   ~    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/lang/package.html

@@ -1 +1 @@
 <!--
-  ~ Copyright 2002-2015 Drew Noakes
+  ~ Copyright 2002-2016 Drew Noakes
   ~
   ~    Licensed under the Apache License, Version 2.0 (the "License");