A few edits

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_ComplexScripts@1148489 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/fonts/DefaultScriptProcessor.java b/src/java/org/apache/fop/fonts/DefaultScriptProcessor.java
index 61df47f98891b41dbe60c5a7ff945e3829bf9c5d..fdd528a0fdc3f30053221f3bc3d8cbd5071b74a7 100644 (file)
--- a/src/java/org/apache/fop/fonts/DefaultScriptProcessor.java
+++ b/src/java/org/apache/fop/fonts/DefaultScriptProcessor.java
@@ -19,8 +19,6 @@
 
 package org.apache.fop.fonts;
 
-import java.util.Map;
-
 // CSOFF: LineLengthCheck
 
 /**

diff --git a/src/java/org/apache/fop/fonts/DevanagariScriptProcessor.java b/src/java/org/apache/fop/fonts/DevanagariScriptProcessor.java
index 544b04d53711d7597f370a2c38daf8e59f9c1a6d..e2bb3e2192f100ad86b904817fca2fad614834cc 100644 (file)
--- a/src/java/org/apache/fop/fonts/DevanagariScriptProcessor.java
+++ b/src/java/org/apache/fop/fonts/DevanagariScriptProcessor.java
@@ -44,7 +44,7 @@ public class DevanagariScriptProcessor extends IndicScriptProcessor {
     }
 
     @Override
-    protected Class getSyllabizerClass() {
+    protected Class<? extends DevanagariSyllabizer> getSyllabizerClass() {
         return DevanagariSyllabizer.class;
     }
 

diff --git a/src/java/org/apache/fop/fonts/IndicScriptProcessor.java b/src/java/org/apache/fop/fonts/IndicScriptProcessor.java
index c4b31e283856b1fb9e3ce39ce4e4050a0d935d33..168a0c200f89029e3cd4260e30d0d6cff313a8eb 100644 (file)
--- a/src/java/org/apache/fop/fonts/IndicScriptProcessor.java
+++ b/src/java/org/apache/fop/fonts/IndicScriptProcessor.java
@@ -207,7 +207,7 @@ public class IndicScriptProcessor extends DefaultScriptProcessor {
      * Get script specific syllabizer class.
      * @return a syllabizer class object or null
      */
-    protected Class getSyllabizerClass() {
+    protected Class<? extends Syllabizer> getSyllabizerClass() {
         return null;
     }
 
@@ -391,9 +391,7 @@ public class IndicScriptProcessor extends DefaultScriptProcessor {
             if ( o instanceof Syllabizer ) {
                 Syllabizer s = (Syllabizer) o;
                 if ( ( d = script.compareTo ( s.script ) ) == 0 ) {
-                    if ( ( d = language.compareTo ( s.language ) ) == 0 ) {
-                        d = 0;
-                    }
+                    d = language.compareTo ( s.language );
                 }
             } else {
                 d = -1;
@@ -401,7 +399,7 @@ public class IndicScriptProcessor extends DefaultScriptProcessor {
             return d;
         }
         private static Map<String,Syllabizer> syllabizers = new HashMap<String,Syllabizer>();
-        static Syllabizer getSyllabizer ( String script, String language, Class syllabizerClass ) {
+        static Syllabizer getSyllabizer ( String script, String language, Class<? extends Syllabizer> syllabizerClass ) {
             String sid = makeSyllabizerId ( script, language );
             Syllabizer s = syllabizers.get ( sid );
             if ( s == null ) {
@@ -415,10 +413,10 @@ public class IndicScriptProcessor extends DefaultScriptProcessor {
         static String makeSyllabizerId ( String script, String language ) {
             return script + ":" + language;
         }
-        static Syllabizer makeSyllabizer ( String script, String language, Class syllabizerClass ) {
+        static Syllabizer makeSyllabizer ( String script, String language, Class<? extends Syllabizer> syllabizerClass ) {
             Syllabizer s;
             try {
-                Constructor cf = syllabizerClass.getDeclaredConstructor ( new Class[] { String.class, String.class } );
+                Constructor<? extends Syllabizer> cf = syllabizerClass.getDeclaredConstructor ( new Class[] { String.class, String.class } );
                 s = (Syllabizer) cf.newInstance ( script, language );
             } catch ( NoSuchMethodException e ) {
                 s = null;

diff --git a/src/java/org/apache/fop/fonts/ScriptProcessor.java b/src/java/org/apache/fop/fonts/ScriptProcessor.java
index 601a27053ba20730a588a06c552bb0f7e6239f99..8fabe60286600840ca2e444eed30d7b5b5b53336 100644 (file)
--- a/src/java/org/apache/fop/fonts/ScriptProcessor.java
+++ b/src/java/org/apache/fop/fonts/ScriptProcessor.java
@@ -19,9 +19,7 @@
 
 package org.apache.fop.fonts;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.apache.fop.util.CharUtilities;
@@ -39,7 +37,7 @@ public abstract class ScriptProcessor {
 
     private final String script;
 
-    private static Map processors = new HashMap();
+    private static Map<String, ScriptProcessor> processors = new HashMap<String, ScriptProcessor>();
 
     /**
      * Instantiate a script processor.
@@ -207,7 +205,7 @@ public abstract class ScriptProcessor {
     public static synchronized ScriptProcessor getInstance ( String script ) {
         ScriptProcessor sp = null;
         assert processors != null;
-        if ( ( sp = (ScriptProcessor) processors.get ( script ) ) == null ) {
+        if ( ( sp = processors.get ( script ) ) == null ) {
             processors.put ( script, sp = createProcessor ( script ) );
         }
         return sp;