[FOray-commit] SF.net SVN: foray:[13824] trunk/foray

[<vic...@us...>]

Revision: 13824
          http://sourceforge.net/p/foray/code/13824
Author:   victormote
Date:     2025-06-06 12:42:07 +0000 (Fri, 06 Jun 2025)
Log Message:
-----------
Convert String to PsName for dictionary keys. This gets Type1 font parsing working again, so reactivate related test.

Modified Paths:
--------------
    trunk/foray/foray-font/src/test/java/org/foray/font/type1/Type1FontParserPfaTests.java
    trunk/foray/foray-ps/src/main/java/org/foray/ps/PsDictionary.java

Modified: trunk/foray/foray-font/src/test/java/org/foray/font/type1/Type1FontParserPfaTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/type1/Type1FontParserPfaTests.java	2025-06-06 11:59:19 UTC (rev 13823)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/type1/Type1FontParserPfaTests.java	2025-06-06 12:42:07 UTC (rev 13824)
@@ -41,7 +41,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -59,7 +58,6 @@
      * @throws IOException For errors reading the test file.
      */
     @Test
-    @Disabled
     public void testParse() throws FontException, IOException {
         final String path = "/source-utah.edu/utopia-1.0/putr.pfa";
         final InputStream inputStream = getClass().getResourceAsStream(path);

Modified: trunk/foray/foray-ps/src/main/java/org/foray/ps/PsDictionary.java
===================================================================
--- trunk/foray/foray-ps/src/main/java/org/foray/ps/PsDictionary.java	2025-06-06 11:59:19 UTC (rev 13823)
+++ trunk/foray/foray-ps/src/main/java/org/foray/ps/PsDictionary.java	2025-06-06 12:42:07 UTC (rev 13824)
@@ -153,10 +153,11 @@
 
     /**
      * Return the value for a given key.
-     * @param key The key whose value should be retrieved.
+     * @param stringKey The key whose value should be retrieved.
      * @return The value.
      */
-    public PsObject getItem(final String key) {
+    public PsObject getItem(final String stringKey) {
+        final PsName key = new PsName(stringKey, false, false);
         for (PsObject currentKey : this.dictionary.keySet()) {
             if (currentKey.equals(key)) {
                 return this.dictionary.get(currentKey);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.