Author: spepping
Date: Tue Jul 19 19:13:01 2011
New Revision: 1148489
URL: http://svn.apache.org/viewvc?rev=1148489&view=rev
Log:
A few edits
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/DefaultScriptProcessor.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/DevanagariScriptProcessor.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/IndicScriptProcessor.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/ScriptProcessor.java
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/DefaultScriptProcessor.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/DefaultScriptProcessor.java?rev=1148489&r1=1148488&r2=1148489&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/DefaultScriptProcessor.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/DefaultScriptProcessor.java
Tue Jul 19 19:13:01 2011
@@ -19,8 +19,6 @@
package org.apache.fop.fonts;
-import java.util.Map;
-
// CSOFF: LineLengthCheck
/**
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/DevanagariScriptProcessor.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/DevanagariScriptProcessor.java?rev=1148489&r1=1148488&r2=1148489&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/DevanagariScriptProcessor.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/DevanagariScriptProcessor.java
Tue Jul 19 19:13:01 2011
@@ -44,7 +44,7 @@ public class DevanagariScriptProcessor e
}
@Override
- protected Class getSyllabizerClass() {
+ protected Class<? extends DevanagariSyllabizer> getSyllabizerClass() {
return DevanagariSyllabizer.class;
}
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/IndicScriptProcessor.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/IndicScriptProcessor.java?rev=1148489&r1=1148488&r2=1148489&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/IndicScriptProcessor.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/IndicScriptProcessor.java
Tue Jul 19 19:13:01 2011
@@ -207,7 +207,7 @@ public class IndicScriptProcessor extend
* 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 extend
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 extend
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 extend
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;
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/ScriptProcessor.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/ScriptProcessor.java?rev=1148489&r1=1148488&r2=1148489&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/ScriptProcessor.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/ScriptProcessor.java
Tue Jul 19 19:13:01 2011
@@ -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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
