From: Simon Pepping <spepping@apache.org>
Date: Wed, 6 Oct 2010 07:37:52 +0000 (+0000)
Subject: More cleanup of unused methods in Hyphenator
X-Git-Tag: fop-1_1rc1old~429
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=18b6055d598d093daa5789cf290c779bf82a0a6b;p=xmlgraphics-fop.git

More cleanup of unused methods in Hyphenator

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

diff --git a/src/java/org/apache/fop/hyphenation/Hyphenator.java b/src/java/org/apache/fop/hyphenation/Hyphenator.java
index 7f37b5e28..76e8b6327 100644
--- a/src/java/org/apache/fop/hyphenation/Hyphenator.java
+++ b/src/java/org/apache/fop/hyphenation/Hyphenator.java
@@ -63,18 +63,6 @@ public final class Hyphenator {
         return hTreeCache;
     }
 
-    /**
-     * Returns a hyphenation tree for a given language and country. The hyphenation trees are
-     * cached.
-     * @param lang the language
-     * @param country the country (may be null or "none")
-     * @return the hyphenation tree
-     */
-    public static HyphenationTree getHyphenationTree(String lang,
-            String country) {
-        return getHyphenationTree(lang, country, null, null);
-    }
-
     /**
      * Returns a hyphenation tree for a given language and country,
      * with fallback from (lang,country) to (lang).
@@ -378,62 +366,4 @@ public final class Hyphenator {
         return hTree.hyphenate(word, leftMin, rightMin);
     }
 
-    /**
-     * Hyphenates a word.
-     * @param lang the language
-     * @param country the optional country code (may be null or "none")
-     * @param word the word to hyphenate
-     * @param leftMin the minimum number of characters before the hyphenation point
-     * @param rightMin the minimum number of characters after the hyphenation point
-     * @return the hyphenation result
-     */
-    public static Hyphenation hyphenate(String lang, String country,
-                                        String word,
-                                        int leftMin, int rightMin) {
-        return hyphenate(lang, country, null, null, word, leftMin, rightMin);
-    }
-
-    /**
-     * Hyphenates a word.
-     * @param lang the language
-     * @param country the optional country code (may be null or "none")
-     * @param resolver resolver to find the hyphenation files
-     * @param hyphPatNames the map with user-configured hyphenation pattern file names
-     * @param word the word to hyphenate
-     * @param offset the offset of the first character in the "word" character array
-     * @param len the length of the word
-     * @param leftMin the minimum number of characters before the hyphenation point
-     * @param rightMin the minimum number of characters after the hyphenation point
-     * @return the hyphenation result
-     */
-    public static Hyphenation hyphenate(String lang,            // CSOK: ParameterNumber
-                                        String country,    
-                                        HyphenationTreeResolver resolver,
-                                        Map hyphPatNames,
-                                        char[] word, int offset, int len,
-                                        int leftMin, int rightMin) {
-        HyphenationTree hTree = getHyphenationTree(lang, country, resolver, hyphPatNames);
-        if (hTree == null) {
-            return null;
-        }
-        return hTree.hyphenate(word, offset, len, leftMin, rightMin);
-    }
-
-    /**
-     * Hyphenates a word.
-     * @param lang the language
-     * @param country the optional country code (may be null or "none")
-     * @param word the word to hyphenate
-     * @param offset the offset of the first character in the "word" character array
-     * @param len the length of the word
-     * @param leftMin the minimum number of characters before the hyphenation point
-     * @param rightMin the minimum number of characters after the hyphenation point
-     * @return the hyphenation result
-     */
-    public static Hyphenation hyphenate(String lang, String country,
-                                        char[] word, int offset, int len,
-                                        int leftMin, int rightMin) {
-        return hyphenate(lang, country, null, null, word, offset, len, leftMin, rightMin);
-    }
-
 }