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

Timestamp:

2013-08-09T18:05:11+02:00 (11 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/CasioType1MakernoteDirectory.java (modified) (5 diffs)

trunk/src/com/drew/metadata/exif/CasioType1MakernoteDirectory.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
  *
- * Created by dnoakes on 27-Nov-2002 10:10:47 using IntelliJ IDEA.
+ *    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.Directory;
 
@@ -22 +27 @@
 
 /**
+ * Describes tags specific to Casio (type 1) cameras.
+ *
  * A standard TIFF IFD directory but always uses Motorola (Big-Endian) Byte Alignment.
  * Makernote data begins immediately (no header).
+ *
+ * @author Drew Noakes http://drewnoakes.com
  */
 public class CasioType1MakernoteDirectory extends Directory
@@ -48 +57 @@
     public static final int TAG_CASIO_CCD_SENSITIVITY = 0x0014;
 
-    protected static final HashMap<Integer, String> tagNameMap = new HashMap<Integer, String>();
+    @NotNull
+    protected static final HashMap<Integer, String> _tagNameMap = new HashMap<Integer, String>();
 
     static
     {
-        tagNameMap.put(new Integer(TAG_CASIO_CCD_SENSITIVITY), "CCD Sensitivity");
-        tagNameMap.put(new Integer(TAG_CASIO_CONTRAST), "Contrast");
-        tagNameMap.put(new Integer(TAG_CASIO_DIGITAL_ZOOM), "Digital Zoom");
-        tagNameMap.put(new Integer(TAG_CASIO_FLASH_INTENSITY), "Flash Intensity");
-        tagNameMap.put(new Integer(TAG_CASIO_FLASH_MODE), "Flash Mode");
-        tagNameMap.put(new Integer(TAG_CASIO_FOCUSING_MODE), "Focussing Mode");
-        tagNameMap.put(new Integer(TAG_CASIO_OBJECT_DISTANCE), "Object Distance");
-        tagNameMap.put(new Integer(TAG_CASIO_QUALITY), "Quality");
-        tagNameMap.put(new Integer(TAG_CASIO_RECORDING_MODE), "Recording Mode");
-        tagNameMap.put(new Integer(TAG_CASIO_SATURATION), "Saturation");
-        tagNameMap.put(new Integer(TAG_CASIO_SHARPNESS), "Sharpness");
-        tagNameMap.put(new Integer(TAG_CASIO_UNKNOWN_1), "Makernote Unknown 1");
-        tagNameMap.put(new Integer(TAG_CASIO_UNKNOWN_2), "Makernote Unknown 2");
-        tagNameMap.put(new Integer(TAG_CASIO_UNKNOWN_3), "Makernote Unknown 3");
-        tagNameMap.put(new Integer(TAG_CASIO_UNKNOWN_4), "Makernote Unknown 4");
-        tagNameMap.put(new Integer(TAG_CASIO_UNKNOWN_5), "Makernote Unknown 5");
-        tagNameMap.put(new Integer(TAG_CASIO_UNKNOWN_6), "Makernote Unknown 6");
-        tagNameMap.put(new Integer(TAG_CASIO_UNKNOWN_7), "Makernote Unknown 7");
-        tagNameMap.put(new Integer(TAG_CASIO_UNKNOWN_8), "Makernote Unknown 8");
-        tagNameMap.put(new Integer(TAG_CASIO_WHITE_BALANCE), "White Balance");
+        _tagNameMap.put(TAG_CASIO_CCD_SENSITIVITY, "CCD Sensitivity");
+        _tagNameMap.put(TAG_CASIO_CONTRAST, "Contrast");
+        _tagNameMap.put(TAG_CASIO_DIGITAL_ZOOM, "Digital Zoom");
+        _tagNameMap.put(TAG_CASIO_FLASH_INTENSITY, "Flash Intensity");
+        _tagNameMap.put(TAG_CASIO_FLASH_MODE, "Flash Mode");
+        _tagNameMap.put(TAG_CASIO_FOCUSING_MODE, "Focusing Mode");
+        _tagNameMap.put(TAG_CASIO_OBJECT_DISTANCE, "Object Distance");
+        _tagNameMap.put(TAG_CASIO_QUALITY, "Quality");
+        _tagNameMap.put(TAG_CASIO_RECORDING_MODE, "Recording Mode");
+        _tagNameMap.put(TAG_CASIO_SATURATION, "Saturation");
+        _tagNameMap.put(TAG_CASIO_SHARPNESS, "Sharpness");
+        _tagNameMap.put(TAG_CASIO_UNKNOWN_1, "Makernote Unknown 1");
+        _tagNameMap.put(TAG_CASIO_UNKNOWN_2, "Makernote Unknown 2");
+        _tagNameMap.put(TAG_CASIO_UNKNOWN_3, "Makernote Unknown 3");
+        _tagNameMap.put(TAG_CASIO_UNKNOWN_4, "Makernote Unknown 4");
+        _tagNameMap.put(TAG_CASIO_UNKNOWN_5, "Makernote Unknown 5");
+        _tagNameMap.put(TAG_CASIO_UNKNOWN_6, "Makernote Unknown 6");
+        _tagNameMap.put(TAG_CASIO_UNKNOWN_7, "Makernote Unknown 7");
+        _tagNameMap.put(TAG_CASIO_UNKNOWN_8, "Makernote Unknown 8");
+        _tagNameMap.put(TAG_CASIO_WHITE_BALANCE, "White Balance");
     }
 
@@ -79 +89 @@
     }
 
+    @NotNull
     public String getName()
     {
@@ -84 +95 @@
     }
 
-    protected HashMap getTagNameMap()
+    @NotNull
+    protected HashMap<Integer, String> getTagNameMap()
     {
-        return tagNameMap;
+        return _tagNameMap;
     }
 }