Changeset 6127 in josm for trunk/src/com/drew/metadata/exif/DataFormat.java

Timestamp:

2013-08-09T18:05:11+02:00 (12 years ago)

Author:

bastiK

Message:

applied #8895 - Upgrade metadata-extractor to v. 2.6.4 (patch by ebourg)

File:

• trunk/src/com/drew/metadata/exif/DataFormat.java (modified) (2 diffs)

trunk/src/com/drew/metadata/exif/DataFormat.java

@@ -1 +1 @@
 /*
- * This is public domain software - that is, you can do whatever you want
- * with it, and include it software that is licensed under the GNU or the
- * BSD license, or whatever other licence you choose, including proprietary
- * closed source licenses.  I do ask that you leave this header in tact.
+ * Copyright 2002-2012 Drew Noakes
  *
- * If you make modifications to this code that you think would benefit the
- * wider community, please send me a copy and I'll post it on my site.
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
  *
- * If you make use of this code, I'd appreciate hearing about it.
- *   drew@drewnoakes.com
- * Latest version of this software kept at
- *   http://drewnoakes.com/
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ *
+ * More information about this project is available at:
+ *
+ *    http://drewnoakes.com/code/exif/
+ *    http://code.google.com/p/metadata-extractor/
  */
 package com.drew.metadata.exif;
 
+import com.drew.lang.annotations.NotNull;
 import com.drew.metadata.MetadataException;
 
 /**
  * An enumeration of data formats used in the TIFF IFDs.
+ *
+ * @author Drew Noakes http://drewnoakes.com
  */
 public class DataFormat
 {
-    public static final DataFormat BYTE = new DataFormat("BYTE", 1);
-    public static final DataFormat STRING = new DataFormat("STRING", 2);
-    public static final DataFormat USHORT = new DataFormat("USHORT", 3);
-    public static final DataFormat ULONG = new DataFormat("ULONG", 4);
-    public static final DataFormat URATIONAL = new DataFormat("URATIONAL", 5);
-    public static final DataFormat SBYTE = new DataFormat("SBYTE", 6);
-    public static final DataFormat UNDEFINED = new DataFormat("UNDEFINED", 7);
-    public static final DataFormat SSHORT = new DataFormat("SSHORT", 8);
-    public static final DataFormat SLONG = new DataFormat("SLONG", 9);
-    public static final DataFormat SRATIONAL = new DataFormat("SRATIONAL", 10);
-    public static final DataFormat SINGLE = new DataFormat("SINGLE", 11);
-    public static final DataFormat DOUBLE = new DataFormat("DOUBLE", 12);
+    @NotNull public static final DataFormat BYTE = new DataFormat("BYTE", 1);
+    @NotNull public static final DataFormat STRING = new DataFormat("STRING", 2);
+    @NotNull public static final DataFormat USHORT = new DataFormat("USHORT", 3);
+    @NotNull public static final DataFormat ULONG = new DataFormat("ULONG", 4);
+    @NotNull public static final DataFormat URATIONAL = new DataFormat("URATIONAL", 5);
+    @NotNull public static final DataFormat SBYTE = new DataFormat("SBYTE", 6);
+    @NotNull public static final DataFormat UNDEFINED = new DataFormat("UNDEFINED", 7);
+    @NotNull public static final DataFormat SSHORT = new DataFormat("SSHORT", 8);
+    @NotNull public static final DataFormat SLONG = new DataFormat("SLONG", 9);
+    @NotNull public static final DataFormat SRATIONAL = new DataFormat("SRATIONAL", 10);
+    @NotNull public static final DataFormat SINGLE = new DataFormat("SINGLE", 11);
+    @NotNull public static final DataFormat DOUBLE = new DataFormat("DOUBLE", 12);
 
-    private final String myName;
-    private final int value;
+    @NotNull private final String _name;
+    private final int _value;
 
+    @NotNull
     public static DataFormat fromValue(int value) throws MetadataException
     {
@@ -59 +69 @@
     }
 
-    private DataFormat(String name, int value)
+    private DataFormat(@NotNull String name, int value)
     {
-        myName = name;
-        this.value = value;
+        _name = name;
+        _value = value;
     }
 
     public int getValue()
     {
-        return value;
+        return _value;
     }
 
+    @NotNull
     public String toString()
     {
-        return myName;
+        return _name;
     }
 }