svn commit: r1925399 - in /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font: PDTrueTypeFont.java encoding/GlyphList.java

[lehmi]

Author: lehmi
Date: Sun May  4 15:30:14 2025
New Revision: 1925399

URL: http://svn.apache.org/viewvc?rev=1925399&view=rev
Log:
PDFBOX-5998: revert some of the changes as putIfAbsent isn't available in java 6

Modified:
    
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
    
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/GlyphList.java

Modified: 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java?rev=1925399&r1=1925398&r2=1925399&view=diff
==============================================================================
--- 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
 (original)
+++ 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
 Sun May  4 15:30:14 2025
@@ -69,7 +69,10 @@ public class PDTrueTypeFont extends PDSi
         Map<Integer, String> codeToName = 
MacOSRomanEncoding.INSTANCE.getCodeToNameMap();
         for (Map.Entry<Integer, String> entry : codeToName.entrySet())
         {
-            INVERTED_MACOS_ROMAN.putIfAbsent(entry.getValue(), entry.getKey());
+            if (!INVERTED_MACOS_ROMAN.containsKey(entry.getValue()))
+            {
+                INVERTED_MACOS_ROMAN.put(entry.getValue(), entry.getKey());
+            }
         }
     }
 
@@ -448,7 +451,10 @@ public class PDTrueTypeFont extends PDSi
         for (int code = 0; code <= 255; code++)
         {
             int gid = codeToGID(code);
-            gidToCode.putIfAbsent(gid, code);
+            if (!gidToCode.containsKey(gid))
+            {
+                gidToCode.put(gid, code);
+            }
         }
         return gidToCode;
     }

Modified: 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/GlyphList.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/GlyphList.java?rev=1925399&r1=1925398&r2=1925399&view=diff
==============================================================================
--- 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/GlyphList.java
 (original)
+++ 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/GlyphList.java
 Sun May  4 15:30:14 2025
@@ -180,14 +180,10 @@ public final class GlyphList
                           MacExpertEncoding.INSTANCE.contains(name) ||
                           SymbolEncoding.INSTANCE.contains(name) ||
                           ZapfDingbatsEncoding.INSTANCE.contains(name);
-                    if (forceOverride)
+                    if (forceOverride || !unicodeToName.containsKey(string))
                     {
                         unicodeToName.put(string, name);
                     }
-                    else
-                    {
-                        unicodeToName.putIfAbsent(string, name);
-                    }
                 }
             }
         }