fix @Override usage to be compatible with Java 1.5

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

diff --git a/src/java/org/apache/fop/complexscripts/util/NumberConverter.java b/src/java/org/apache/fop/complexscripts/util/NumberConverter.java
index 6d98312496ecacbf0e347c558487c9a52fa21be6..b80014b1991173009341cc34effdf885cbf2a57f 100644 (file)
--- a/src/java/org/apache/fop/complexscripts/util/NumberConverter.java
+++ b/src/java/org/apache/fop/complexscripts/util/NumberConverter.java
@@ -707,7 +707,6 @@ public class NumberConverter {
         EnglishNumberAsWordFormatter ( int caseType ) {
             this.caseType = caseType;
         }
-        @Override
         public Integer[] format ( long number, int one, int letterValue, String features, String language, String country ) {
             List<String> wl = new ArrayList<String>();
             if ( number >= 1000000000000L ) {
@@ -817,7 +816,6 @@ public class NumberConverter {
         FrenchNumberAsWordFormatter ( int caseType ) {
             this.caseType = caseType;
         }
-        @Override
         public Integer[] format ( long number, int one, int letterValue, String features, String language, String country ) {
             List<String> wl = new ArrayList<String>();
             if ( number >= 1000000000000L ) {
@@ -952,7 +950,6 @@ public class NumberConverter {
         SpanishNumberAsWordFormatter ( int caseType ) {
             this.caseType = caseType;
         }
-        @Override
         public Integer[] format ( long number, int one, int letterValue, String features, String language, String country ) {
             List<String> wl = new ArrayList<String>();
             if ( number >= 1000000000000L ) {
@@ -1153,7 +1150,6 @@ public class NumberConverter {
         "\u2160"
     };
     private static class RomanNumeralsFormatter implements SpecialNumberFormatter {
-        @Override
         public Integer[] format ( long number, int one, int letterValue, String features, String language, String country ) {
             List<Integer> sl = new ArrayList<Integer>();
             if ( number == 0 ) {
@@ -1200,7 +1196,6 @@ public class NumberConverter {
      * Isopsephry (Greek) Numerals
      */
     private static class IsopsephryNumeralsFormatter implements SpecialNumberFormatter {
-        @Override
         public Integer[] format ( long number, int one, int letterValue, String features, String language, String country ) {
             return null;
         }
@@ -1242,7 +1237,6 @@ public class NumberConverter {
         0x05E5, // FINAL TSADHI
     };
     private class GematriaNumeralsFormatter implements SpecialNumberFormatter {
-        @Override
         public Integer[] format ( long number, int one, int letterValue, String features, String language, String country ) {
             if ( one == 0x05D0 ) {
                 if ( letterValue == LETTER_VALUE_ALPHABETIC ) {
@@ -1381,7 +1375,6 @@ public class NumberConverter {
         0x0649, // ALEF MAQSURA
     };
     private class ArabicNumeralsFormatter implements SpecialNumberFormatter {
-        @Override
         public Integer[] format ( long number, int one, int letterValue, String features, String language, String country ) {
             if ( one == 0x0627 ) {
                 int[] map;
@@ -1539,7 +1532,6 @@ public class NumberConverter {
         0x30F3, // N
     };
     private class KanaNumeralsFormatter implements SpecialNumberFormatter {
-        @Override
         public Integer[] format ( long number, int one, int letterValue, String features, String language, String country ) {
             if ( ( one == 0x3042 ) && ( letterValue == LETTER_VALUE_ALPHABETIC ) ) {
                 return formatNumberAsSequence ( number, one, hiraganaGojuonAlphabeticMap.length, hiraganaGojuonAlphabeticMap );
@@ -1603,7 +1595,6 @@ public class NumberConverter {
         0x0E2E,
     };
     private class ThaiNumeralsFormatter implements SpecialNumberFormatter {
-        @Override
         public Integer[] format ( long number, int one, int letterValue, String features, String language, String country ) {
             if ( ( one == 0x0E01 ) && ( letterValue == LETTER_VALUE_ALPHABETIC ) ) {
                 return formatNumberAsSequence ( number, one, thaiAlphabeticMap.length, thaiAlphabeticMap );

diff --git a/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java b/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
index 28e364c433bc70fe19b9ac7197cb177bbc0dff35..881587b8eb0091da1097379476ee42ad627626ba 100644 (file)
--- a/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
+++ b/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
@@ -444,12 +444,10 @@ public class GPOSTestCase implements ScriptContextTester, GlyphContextTester {
         return this;
     }
 
-    @Override
     public GlyphContextTester getTester ( String feature ) {
         return this;
     }
 
-    @Override
     public boolean test ( String script, String language, String feature, GlyphSequence gs, int index, int flags ) {
         return true;
     }

diff --git a/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java b/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
index d969222dfc218fb56f106cb2521a5a4d2700ffde..e3f122b15613907354758c8d33006bbbebd34ada 100644 (file)
--- a/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
+++ b/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
@@ -2242,12 +2242,10 @@ public class GSUBTestCase implements ScriptContextTester, GlyphContextTester {
         return this;
     }
 
-    @Override
     public GlyphContextTester getTester ( String feature ) {
         return this;
     }
 
-    @Override
     public boolean test ( String script, String language, String feature, GlyphSequence gs, int index, int flags ) {
         return true;
     }