You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ga...@apache.org on 2012/02/29 23:19:52 UTC
svn commit: r1295320 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/complexscripts/util/NumberConverter.java
test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
Author: gadams
Date: Wed Feb 29 22:19:52 2012
New Revision: 1295320
URL: http://svn.apache.org/viewvc?rev=1295320&view=rev
Log:
fix @Override usage to be compatible with Java 1.5
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/NumberConverter.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/NumberConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/NumberConverter.java?rev=1295320&r1=1295319&r2=1295320&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/NumberConverter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/NumberConverter.java Wed Feb 29 22:19:52 2012
@@ -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 );
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java?rev=1295320&r1=1295319&r2=1295320&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java Wed Feb 29 22:19:52 2012
@@ -444,12 +444,10 @@ public class GPOSTestCase implements Scr
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;
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java?rev=1295320&r1=1295319&r2=1295320&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java Wed Feb 29 22:19:52 2012
@@ -2242,12 +2242,10 @@ public class GSUBTestCase implements Scr
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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org