Changeset 13061 in josm for trunk/src/com/drew/metadata/exif/makernotes/OlympusEquipmentMakernoteDescriptor.java

Timestamp:

2017-10-30T22:46:09+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #15505 - update to metadata-extractor 2.10.1

File:

• trunk/src/com/drew/metadata/exif/makernotes/OlympusEquipmentMakernoteDescriptor.java (modified) (14 diffs)

trunk/src/com/drew/metadata/exif/makernotes/OlympusEquipmentMakernoteDescriptor.java

@@ -40 +40 @@
  * @author Drew Noakes https://drewnoakes.com
  */
+@SuppressWarnings("WeakerAccess")
 public class OlympusEquipmentMakernoteDescriptor extends TagDescriptor<OlympusEquipmentMakernoteDirectory>
 {
@@ -53 +54 @@
         switch (tagType) {
             case TAG_EQUIPMENT_VERSION:
-                return GetEquipmentVersionDescription();
+                return getEquipmentVersionDescription();
+            case TAG_CAMERA_TYPE_2:
+                return getCameraType2Description();
             case TAG_FOCAL_PLANE_DIAGONAL:
-                return GetFocalPlaneDiagonalDescription();
+                return getFocalPlaneDiagonalDescription();
             case TAG_BODY_FIRMWARE_VERSION:
-                return GetBodyFirmwareVersionDescription();
+                return getBodyFirmwareVersionDescription();
             case TAG_LENS_TYPE:
-                return GetLensTypeDescription();
+                return getLensTypeDescription();
             case TAG_LENS_FIRMWARE_VERSION:
-                return GetLensFirmwareVersionDescription();
+                return getLensFirmwareVersionDescription();
             case TAG_MAX_APERTURE_AT_MIN_FOCAL:
-                return GetMaxApertureAtMinFocalDescription();
+                return getMaxApertureAtMinFocalDescription();
             case TAG_MAX_APERTURE_AT_MAX_FOCAL:
-                return GetMaxApertureAtMaxFocalDescription();
+                return getMaxApertureAtMaxFocalDescription();
             case TAG_MAX_APERTURE:
-                return GetMaxApertureDescription();
+                return getMaxApertureDescription();
             case TAG_LENS_PROPERTIES:
-                return GetLensPropertiesDescription();
+                return getLensPropertiesDescription();
             case TAG_EXTENDER:
-                return GetExtenderDescription();
+                return getExtenderDescription();
             case TAG_FLASH_TYPE:
-                return GetFlashTypeDescription();
+                return getFlashTypeDescription();
             case TAG_FLASH_MODEL:
-                return GetFlashModelDescription();
+                return getFlashModelDescription();
             default:
                 return super.getDescription(tagType);
@@ -82 +85 @@
 
     @Nullable
-    public String GetEquipmentVersionDescription()
+    public String getEquipmentVersionDescription()
     {
         return getVersionBytesDescription(TAG_EQUIPMENT_VERSION, 4);
@@ -88 +91 @@
 
     @Nullable
-    public String GetFocalPlaneDiagonalDescription()
+    public String getCameraType2Description()
+    {
+        String cameratype = _directory.getString(TAG_CAMERA_TYPE_2);
+        if(cameratype == null)
+            return null;
+
+        if(OlympusMakernoteDirectory.OlympusCameraTypes.containsKey(cameratype))
+            return OlympusMakernoteDirectory.OlympusCameraTypes.get(cameratype);
+
+        return cameratype;
+    }
+
+    @Nullable
+    public String getFocalPlaneDiagonalDescription()
     {
         return _directory.getString(TAG_FOCAL_PLANE_DIAGONAL) + " mm";
@@ -94 +110 @@
 
     @Nullable
-    public String GetBodyFirmwareVersionDescription()
+    public String getBodyFirmwareVersionDescription()
     {
         Integer value = _directory.getInteger(TAG_BODY_FIRMWARE_VERSION);
@@ -107 +123 @@
 
     @Nullable
-    public String GetLensTypeDescription()
+    public String getLensTypeDescription()
     {
         String str = _directory.getString(TAG_LENS_TYPE);
@@ -140 +156 @@
 
     @Nullable
-    public String GetLensFirmwareVersionDescription()
+    public String getLensFirmwareVersionDescription()
     {
         Integer value = _directory.getInteger(TAG_LENS_FIRMWARE_VERSION);
@@ -153 +169 @@
 
     @Nullable
-    public String GetMaxApertureAtMinFocalDescription()
+    public String getMaxApertureAtMinFocalDescription()
     {
         Integer value = _directory.getInteger(TAG_MAX_APERTURE_AT_MIN_FOCAL);
@@ -164 +180 @@
 
     @Nullable
-    public String GetMaxApertureAtMaxFocalDescription()
+    public String getMaxApertureAtMaxFocalDescription()
     {
         Integer value = _directory.getInteger(TAG_MAX_APERTURE_AT_MAX_FOCAL);
@@ -175 +191 @@
 
     @Nullable
-    public String GetMaxApertureDescription()
+    public String getMaxApertureDescription()
     {
         Integer value = _directory.getInteger(TAG_MAX_APERTURE);
@@ -191 +207 @@
 
     @Nullable
-    public String GetLensPropertiesDescription()
+    public String getLensPropertiesDescription()
     {
         Integer value = _directory.getInteger(TAG_LENS_PROPERTIES);
@@ -201 +217 @@
 
     @Nullable
-    public String GetExtenderDescription()
+    public String getExtenderDescription()
     {
         String str = _directory.getString(TAG_EXTENDER);
@@ -234 +250 @@
 
     @Nullable
-    public String GetFlashTypeDescription()
+    public String getFlashTypeDescription()
     {
         return getIndexedDescription(TAG_FLASH_TYPE,
@@ -241 +257 @@
 
     @Nullable
-    public String GetFlashModelDescription()
+    public String getFlashModelDescription()
     {
         return getIndexedDescription(TAG_FLASH_MODEL,