foray-commit Mailing List for FOray (Page 23)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 13326
          http://sourceforge.net/p/foray/code/13326
Author:   victormote
Date:     2024-05-03 16:55:28 +0000 (Fri, 03 May 2024)
Log Message:
-----------
Move dictionaryMap and related methods to superclass, so that the variant class can use.

Modified Paths:
--------------
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/OrthographyServer4a.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/OrthographyServer4aStandard.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/OrthographyServer4aVariant.java

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/OrthographyServer4a.java
===================================================================

--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/OrthographyServer4a.java	2024-05-03 16:41:27 UTC (rev 13325)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/OrthographyServer4a.java	2024-05-03 16:55:28 UTC (rev 13326)
@@ -30,7 +30,9 @@
 import org.axsl.fotree.text.FoOrthographyServer;
 import org.axsl.i18n.WritingSystem;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Pattern;
 
 /**
@@ -38,6 +40,9 @@
  */
 public abstract class OrthographyServer4a implements FoOrthographyServer {
 
+    /** Map whose key is a dictionary ID, and whose value is the matching dictionary resource. */
+    private Map<String, DictionaryResource> dictionaryMap = new HashMap<String, DictionaryResource>();
+
     @Override
     public abstract Orthography4a getOrthography(WritingSystem writingSystem);
 
@@ -58,4 +63,25 @@
      */
     public abstract List<DerivativePattern> getDerivativePatterns(String id);
 
+    /**
+     * Registers a dictionary.
+     * @param id The id of the dictionary to be registered.
+     * @param resource The dictionary resource being registered.
+     */
+    public void registerDictionary(final String id, final DictionaryResource resource) {
+        if (this.dictionaryMap.get(id) != null) {
+            throw new IllegalArgumentException("DictionaryResource already exist for id: " + id);
+        }
+        this.dictionaryMap.put(id, resource);
+    }
+
+    /**
+     * Returns the dictionary resource for a given Id.
+     * @param id The id of the dictionary to be returned.
+     * @return The dictionary resource for {@code id}.
+     */
+    public DictionaryResource getDictionaryResource(final String id) {
+        return this.dictionaryMap.get(id);
+    }
+
 }

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/OrthographyServer4aStandard.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/OrthographyServer4aStandard.java	2024-05-03 16:41:27 UTC (rev 13325)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/OrthographyServer4aStandard.java	2024-05-03 16:55:28 UTC (rev 13326)
@@ -62,9 +62,6 @@
     private Map<WritingSystem, Orthography4aStandard> orthographyMap =
             new HashMap<WritingSystem, Orthography4aStandard>();
 
-    /** Map whose key is a dictionary ID, and whose value is the matching dictionary resource. */
-    private Map<String, DictionaryResource> dictionaryMap = new HashMap<String, DictionaryResource>();
-
     /** The map of match rule lists, keyed by id. */
     private Map<String, List<Pattern>> matchRuleLists = new HashMap<String, List<Pattern>>();
 
@@ -118,7 +115,7 @@
 //        }
         /* Not every orthography has a dictionary resource. */
         if (resource != null) {
-            this.dictionaryMap.put(resource.getId(), resource);
+            registerDictionary(resource.getId(), resource);
         }
     }
 
@@ -161,30 +158,9 @@
         return this.derivativeRuleLists.get(id);
     }
 
-    /**
-     * Registers a dictionary.
-     * @param id The id of the dictionary to be registered.
-     * @param resource The dictionary resource being registered.
-     */
-    public void registerDictionary(final String id, final DictionaryResource resource) {
-        if (this.dictionaryMap.get(id) != null) {
-            throw new IllegalArgumentException("DictionaryResource already exist for id: " + id);
-        }
-        this.dictionaryMap.put(id, resource);
-    }
-
-    /**
-     * Returns the dictionary resource for a given Id.
-     * @param id The id of the dictionary to be returned.
-     * @return The dictionary resource for {@code id}.
-     */
-    public DictionaryResource getDictionaryResource(final String id) {
-        return this.dictionaryMap.get(id);
-    }
-
     @Override
     public SegmentDictionary getDictionary(final String dictionaryId) {
-        final DictionaryResource resource = this.dictionaryMap.get(dictionaryId);
+        final DictionaryResource resource = this.getDictionaryResource(dictionaryId);
         if (resource == null) {
             this.logger.warn("Dictionary not found: {}", dictionaryId);
             return null;

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/OrthographyServer4aVariant.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/OrthographyServer4aVariant.java	2024-05-03 16:41:27 UTC (rev 13325)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/OrthographyServer4aVariant.java	2024-05-03 16:55:28 UTC (rev 13326)
@@ -29,7 +29,6 @@
 package org.foray.orthography;
 
 import org.axsl.i18n.WritingSystem;
-import org.axsl.orthography.Dictionary;
 
 import java.util.HashMap;
 import java.util.List;
@@ -67,8 +66,13 @@
     }
 
     @Override
-    public Dictionary getDictionary(final String dictionaryId) {
-        return this.wrapped.getDictionary(dictionaryId);
+    public SegmentDictionary getDictionary(final String dictionaryId) {
+        final DictionaryResource resource = getDictionaryResource(dictionaryId);
+        if (resource == null) {
+            return this.wrapped.getDictionary(dictionaryId);
+        } else {
+            return resource.getResource();
+        }
     }
 
     @Override

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





2006	Jan	Feb	Mar (139)	Apr (98)	May (250)	Jun (394)	Jul (84)	Aug (13)	Sep (420)	Oct (186)	Nov (1)	Dec (3)
2007	Jan (108)	Feb (202)	Mar (291)	Apr (247)	May (374)	Jun (227)	Jul (231)	Aug (60)	Sep (31)	Oct (45)	Nov (18)	Dec
2008	Jan (38)	Feb (71)	Mar (142)	Apr	May (59)	Jun (6)	Jul (10)	Aug	Sep	Oct	Nov	Dec
2009	Jan (12)	Feb (4)	Mar (88)	Apr (121)	May (17)	Jun (30)	Jul	Aug (5)	Sep	Oct (1)	Nov	Dec
2010	Jan (11)	Feb (76)	Mar (11)	Apr	May (11)	Jun	Jul	Aug (44)	Sep (14)	Oct (7)	Nov	Dec
2011	Jan	Feb	Mar	Apr	May (9)	Jun	Jul	Aug	Sep	Oct (10)	Nov	Dec
2012	Jan	Feb	Mar	Apr	May	Jun (3)	Jul (4)	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (168)
2017	Jan (77)	Feb (11)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2018	Jan	Feb	Mar (1)	Apr (6)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb (88)	Mar (118)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2020	Jan	Feb	Mar	Apr	May (6)	Jun	Jul	Aug	Sep	Oct	Nov	Dec (141)
2021	Jan (170)	Feb (20)	Mar	Apr	May	Jun	Jul (1)	Aug	Sep	Oct (62)	Nov (189)	Dec (162)
2022	Jan (201)	Feb (118)	Mar (8)	Apr	May (2)	Jun (47)	Jul (19)	Aug (14)	Sep (3)	Oct	Nov (28)	Dec (235)
2023	Jan (112)	Feb (23)	Mar (2)	Apr (2)	May	Jun (1)	Jul	Aug (70)	Sep (92)	Oct (20)	Nov (1)	Dec (1)
2024	Jan	Feb	Mar (1)	Apr (1)	May (14)	Jun (11)	Jul (1)	Aug	Sep	Oct	Nov	Dec
2025	Jan (10)	Feb (29)	Mar	Apr (162)	May (245)	Jun (83)	Jul	Aug (1)	Sep	Oct	Nov	Dec

foray-commit Mailing List for FOray (Page 23)

Modular XSL-FO Implementation for Java.

foray-commit — FOray repository commit log messages