Changeset 6127 in josm for trunk/src/com/drew/metadata/exif/PentaxMakernoteDirectory.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/PentaxMakernoteDirectory.java (modified) (5 diffs)

trunk/src/com/drew/metadata/exif/PentaxMakernoteDirectory.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 @@
 
 /**
- * Directory for metadata specific to Pentax and Asahi cameras.
+ * Describes tags specific to Pentax and Asahi cameras.
+ *
+ * @author Drew Noakes http://drewnoakes.com
  */
 public class PentaxMakernoteDirectory extends Directory
@@ -122 +129 @@
     public static final int TAG_PENTAX_DAYLIGHT_SAVINGS = 0x1001;
 
-    protected static final HashMap tagNameMap = new HashMap();
+    @NotNull
+    protected static final HashMap<Integer, String> _tagNameMap = new HashMap<Integer, String>();
 
     static
     {
-        tagNameMap.put(new Integer(TAG_PENTAX_CAPTURE_MODE), "Capture Mode");
-        tagNameMap.put(new Integer(TAG_PENTAX_QUALITY_LEVEL), "Quality Level");
-        tagNameMap.put(new Integer(TAG_PENTAX_FOCUS_MODE), "Focus Mode");
-        tagNameMap.put(new Integer(TAG_PENTAX_FLASH_MODE), "Flash Mode");
-        tagNameMap.put(new Integer(TAG_PENTAX_WHITE_BALANCE), "White Balance");
-        tagNameMap.put(new Integer(TAG_PENTAX_DIGITAL_ZOOM), "Digital Zoom");
-        tagNameMap.put(new Integer(TAG_PENTAX_SHARPNESS), "Sharpness");
-        tagNameMap.put(new Integer(TAG_PENTAX_CONTRAST), "Contrast");
-        tagNameMap.put(new Integer(TAG_PENTAX_SATURATION), "Saturation");
-        tagNameMap.put(new Integer(TAG_PENTAX_ISO_SPEED), "ISO Speed");
-        tagNameMap.put(new Integer(TAG_PENTAX_COLOUR), "Colour");
-        tagNameMap.put(new Integer(TAG_PENTAX_PRINT_IMAGE_MATCHING_INFO), "Print Image Matching (PIM) Info");
-        tagNameMap.put(new Integer(TAG_PENTAX_TIME_ZONE), "Time Zone");
-        tagNameMap.put(new Integer(TAG_PENTAX_DAYLIGHT_SAVINGS), "Daylight Savings");
+        _tagNameMap.put(TAG_PENTAX_CAPTURE_MODE, "Capture Mode");
+        _tagNameMap.put(TAG_PENTAX_QUALITY_LEVEL, "Quality Level");
+        _tagNameMap.put(TAG_PENTAX_FOCUS_MODE, "Focus Mode");
+        _tagNameMap.put(TAG_PENTAX_FLASH_MODE, "Flash Mode");
+        _tagNameMap.put(TAG_PENTAX_WHITE_BALANCE, "White Balance");
+        _tagNameMap.put(TAG_PENTAX_DIGITAL_ZOOM, "Digital Zoom");
+        _tagNameMap.put(TAG_PENTAX_SHARPNESS, "Sharpness");
+        _tagNameMap.put(TAG_PENTAX_CONTRAST, "Contrast");
+        _tagNameMap.put(TAG_PENTAX_SATURATION, "Saturation");
+        _tagNameMap.put(TAG_PENTAX_ISO_SPEED, "ISO Speed");
+        _tagNameMap.put(TAG_PENTAX_COLOUR, "Colour");
+        _tagNameMap.put(TAG_PENTAX_PRINT_IMAGE_MATCHING_INFO, "Print Image Matching (PIM) Info");
+        _tagNameMap.put(TAG_PENTAX_TIME_ZONE, "Time Zone");
+        _tagNameMap.put(TAG_PENTAX_DAYLIGHT_SAVINGS, "Daylight Savings");
     }
 
@@ -147 +155 @@
     }
 
+    @NotNull
     public String getName()
     {
@@ -152 +161 @@
     }
 
-    protected HashMap getTagNameMap()
+    @NotNull
+    protected HashMap<Integer, String> getTagNameMap()
     {
-        return tagNameMap;
+        return _tagNameMap;
     }
 }