AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-5445 Fix some Eclipse warnings

Browse Source 
X-SVN-Rev: 21195
This commit is contained in:
George Rhoten 2007-03-08 23:28:27 +00:00
parent a5f41db15b
commit 4d2d2d4897
9 changed files with 47 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
icu4j/src/com/ibm/icu/dev/test/calendar/AstroTest.java
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1996-2005, International Business Machines Corporation and *
* Copyright (C) 1996-2007, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -67,14 +67,12 @@ public class AstroTest extends TestFmwk {
}
public void TestCoordinates() {
GregorianCalendar gc = new GregorianCalendar(new SimpleTimeZone(0, "UTC"));
CalendarAstronomer astro = new CalendarAstronomer();
Equatorial result = astro.eclipticToEquatorial(139.686111 * PI/ 180.0, 4.875278* PI / 180.0);
logln("result is " + result + "; " + result.toHmsString());
}
public void TestCoverage() {
GregorianCalendar gc = new GregorianCalendar(new SimpleTimeZone(0, "UTC"));
GregorianCalendar cal = new GregorianCalendar(1958, Calendar.AUGUST, 15);
Date then = cal.getTime();
CalendarAstronomer myastro = new CalendarAstronomer(then);
@ -263,7 +261,6 @@ public class AstroTest extends TestFmwk {
public void TestBasics() {
// Check that our JD computation is the same as the book's (p. 88)
GregorianCalendar gc = new GregorianCalendar(new SimpleTimeZone(0, "UTC"));
CalendarAstronomer astro = new CalendarAstronomer();
GregorianCalendar cal3 = new GregorianCalendar(TimeZone.getTimeZone("GMT"), Locale.US);
DateFormat d3 = DateFormat.getDateTimeInstance(cal3, DateFormat.MEDIUM,DateFormat.MEDIUM,Locale.US);

64
icu4j/src/com/ibm/icu/dev/test/charset/TestCharset.java
View File

@ -1,6 +1,6 @@
/**
*******************************************************************************
* Copyright (C) 2006, International Business Machines Corporation and *
* Copyright (C) 2006-2007, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*
@ -29,10 +29,10 @@ import com.ibm.icu.dev.test.TestFmwk;
import com.ibm.icu.text.UTF16;
public class TestCharset extends TestFmwk {
private String encoding = "UTF-16";
CharsetDecoder decoder = null;
CharsetEncoder encoder = null;
Charset charset =null;
private String m_encoding = "UTF-16";
CharsetDecoder m_decoder = null;
CharsetEncoder m_encoder = null;
Charset m_charset =null;
static final String unistr = "abcd\ud800\udc00\u1234\u00a5\u3000\r\n";
static final byte[] byteStr ={
(byte) 0x00,(byte) 'a',
@ -64,9 +64,9 @@ public class TestCharset extends TestFmwk {
try{
CharsetProviderICU provider = new CharsetProviderICU();
//Charset charset = CharsetICU.forName(encoding);
charset = provider.charsetForName(encoding);
decoder = (CharsetDecoder) charset.newDecoder();
encoder = (CharsetEncoder) charset.newEncoder();
m_charset = provider.charsetForName(m_encoding);
m_decoder = (CharsetDecoder) m_charset.newDecoder();
m_encoder = (CharsetEncoder) m_charset.newEncoder();
}catch(MissingResourceException ex){
warnln("Could not load charset data");
}
@ -295,15 +295,15 @@ public class TestCharset extends TestFmwk {
ByteBuffer expected = ByteBuffer.wrap(expectedByteStr);
rc = 0;
if(decoder==null){
if(m_decoder==null){
warnln("Could not load decoder.");
return;
}
decoder.reset();
m_decoder.reset();
/* Convert the whole buffer to Unicode */
try {
CharBuffer chars = CharBuffer.allocate(unistr.length());
CoderResult result = decoder.decode(byes, chars, false);
CoderResult result = m_decoder.decode(byes, chars, false);
if (result.isError()) {
errln("ToChars encountered Error");
@ -330,11 +330,11 @@ public class TestCharset extends TestFmwk {
try {
CharBuffer chars = CharBuffer.allocate(unistr.length());
ByteBuffer b = ByteBuffer.wrap(byteStr);
decoder.reset();
m_decoder.reset();
CoderResult result=null;
for (int i = 1; i <= byteStr.length; i++) {
b.limit(i);
result = decoder.decode(b, chars, false);
result = m_decoder.decode(b, chars, false);
if(result.isOverflow()){
errln("ToChars single threw an overflow exception");
}
@ -360,11 +360,11 @@ public class TestCharset extends TestFmwk {
/* Convert the buffer one at a time to Unicode */
try {
CharBuffer chars = CharBuffer.allocate(unistr.length());
decoder.reset();
m_decoder.reset();
byes.rewind();
for (int i = 1; i <= byteStr.length; i++) {
byes.limit(i);
CoderResult result = decoder.decode(byes, chars, false);
CoderResult result = m_decoder.decode(byes, chars, false);
if (result.isError()) {
errln("Error while decoding: "+result.toString());
}
@ -396,8 +396,8 @@ public class TestCharset extends TestFmwk {
/* Convert the whole buffer from unicode */
try {
ByteBuffer bytes = ByteBuffer.allocate(expectedByteStr.length);
encoder.reset();
CoderResult result = encoder.encode(uniVal, bytes, false);
m_encoder.reset();
CoderResult result = m_encoder.encode(uniVal, bytes, false);
if (result.isError()) {
errln("FromChars reported error: " + result.toString());
rc = 1;
@ -421,11 +421,11 @@ public class TestCharset extends TestFmwk {
try {
ByteBuffer bytes = ByteBuffer.allocate(expectedByteStr.length);
CharBuffer c = CharBuffer.wrap(unistr);
encoder.reset();
m_encoder.reset();
CoderResult result= null;
for (int i = 1; i <= unistr.length(); i++) {
c.limit(i);
result = encoder.encode(c, bytes, false);
result = m_encoder.encode(c, bytes, false);
if(result.isOverflow()){
errln("FromChars single threw an overflow exception");
}
@ -454,12 +454,12 @@ public class TestCharset extends TestFmwk {
/* Convert one char at a time to unicode */
try {
ByteBuffer bytes = ByteBuffer.allocate(expectedByteStr.length);
encoder.reset();
m_encoder.reset();
char[] temp = unistr.toCharArray();
CoderResult result=null;
for (int i = 0; i <= temp.length; i++) {
uniVal.limit(i);
result = encoder.encode(uniVal, bytes, false);
result = m_encoder.encode(uniVal, bytes, false);
if(result.isOverflow()){
errln("FromChars simple threw an overflow exception");
}
@ -482,7 +482,7 @@ public class TestCharset extends TestFmwk {
rc = 9;
}
if (rc != 0) {
errln("Test Simple FromChars " + encoding + " --FAILED");
errln("Test Simple FromChars " + m_encoding + " --FAILED");
}
}
@ -655,13 +655,13 @@ public class TestCharset extends TestFmwk {
'\u22B5','\u22B6','\u22B7','\u22B8','\u22B9',
'\u22BA','\u22BB','\u22BC','\u22BD','\u22BE'
};
if(encoder==null){
if(m_encoder==null){
warnln("Could not load encoder.");
return;
}
encoder.reset();
if (!encoder.canEncode(new String(mySource))) {
errln("Test canConvert() " + encoding + " failed. "+encoder);
m_encoder.reset();
if (!m_encoder.canEncode(new String(mySource))) {
errln("Test canConvert() " + m_encoding + " failed. "+m_encoder);
}
}
@ -1103,13 +1103,13 @@ public class TestCharset extends TestFmwk {
public void convertAllTest(ByteBuffer bSource, CharBuffer uSource) throws Exception {
{
try {
decoder.reset();
m_decoder.reset();
ByteBuffer mySource = bSource.duplicate();
CharBuffer myTarget = decoder.decode(mySource);
CharBuffer myTarget = m_decoder.decode(mySource);
if (!equals(myTarget, uSource)) {
errln(
"--Test convertAll() "
+ encoding
+ m_encoding
+ " to Unicode --FAILED");
}
} catch (Exception e) {
@ -1119,13 +1119,13 @@ public class TestCharset extends TestFmwk {
}
{
try {
encoder.reset();
m_encoder.reset();
CharBuffer mySource = CharBuffer.wrap(uSource);
ByteBuffer myTarget = encoder.encode(mySource);
ByteBuffer myTarget = m_encoder.encode(mySource);
if (!equals(myTarget, bSource)) {
errln(
"--Test convertAll() "
+ encoding
+ m_encoding
+ " to Unicode --FAILED");
}
} catch (Exception e) {

7
icu4j/src/com/ibm/icu/dev/test/collator/CollationRegressionTest.java
View File

@ -1042,7 +1042,7 @@ public class CollationRegressionTest extends TestFmwk {
// CollationElementIterator.previous broken for expanding char sequences
//
public void Test4179686() throws Exception {
RuleBasedCollator en_us = (RuleBasedCollator) Collator.getInstance(Locale.US);
// Create a collator with a few expanding character sequences in it....
RuleBasedCollator coll = new RuleBasedCollator(en_us.getRules()
+ " & ae ; \u00e4 & AE ; \u00c4"
@ -1074,12 +1074,9 @@ public class CollationRegressionTest extends TestFmwk {
}
}
private static RuleBasedCollator en_us ;
protected void init()throws Exception{
if(en_us ==null){
en_us = (RuleBasedCollator)Collator.getInstance(Locale.US);
}
}
public void Test4244884() throws Exception {
RuleBasedCollator coll = (RuleBasedCollator)Collator.getInstance(Locale.US);
coll = new RuleBasedCollator(coll.getRules()

4
icu4j/src/com/ibm/icu/dev/test/format/GlobalizationPreferencesTest.java
View File

@ -1,7 +1,7 @@
//##header
/*
*******************************************************************************
* Copyright (C) 2004-2006, International Business Machines Corporation and *
* Copyright (C) 2004-2007, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -1554,7 +1554,7 @@ public class GlobalizationPreferencesTest extends TestFmwk {
Calendar cal = gp.getCalendar();
// Calendar instance returned from GP should be initialized
// by the current time
long timeDiff = System.currentTimeMillis() - gp.getCalendar().getTimeInMillis();
long timeDiff = System.currentTimeMillis() - cal.getTimeInMillis();
if (Math.abs(timeDiff) > 1000) {
// if difference is more than 1 second..
errln("FAIL: The Calendar was not initialized by current time - difference:" + timeDiff);

4
icu4j/src/com/ibm/icu/dev/test/normalizer/BasicTest.java
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1996-2006, International Business Machines Corporation and *
* Copyright (C) 1996-2007, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -2918,7 +2918,7 @@ public class BasicTest extends TestFmwk {
};
String output;
int i, length;
int i;
for(i=0; i<cases.length; ++i) {
output=Normalizer.normalize(cases[i].input, cases[i].mode, cases[i].options);

7
icu4j/src/com/ibm/icu/dev/test/serializable/CoverageTest.java
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2005-2006, International Business Machines Corporation and *
* Copyright (C) 2005-2007, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*
@ -14,7 +14,6 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.net.URL;
@ -111,7 +110,7 @@ public class CoverageTest extends CompatibilityTest implements URLHandler.URLVis
} else {
Class c = Class.forName(name);
try {
Field uid = c.getDeclaredField("serialVersionUID");
/*Field uid = */c.getDeclaredField("serialVersionUID");
} catch (Exception e) {
errln("No serialVersionUID");
}
@ -150,8 +149,6 @@ public class CoverageTest extends CompatibilityTest implements URLHandler.URLVis
if (handler != null) {
Object objectsOut[] = handler.getTestObjects();
Object objectsIn[];
boolean passed = true;
ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream(byteOut);

4
icu4j/src/com/ibm/icu/text/LowercaseTransliterator.java
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1996-2005, International Business Machines Corporation and *
* Copyright (C) 1996-2007, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -61,7 +61,7 @@ class LowercaseTransliterator extends Transliterator{
}
iter=new ReplaceableContextIterator();
result = new StringBuffer();
int[] locCache = new int[1];
locCache = new int[1];
locCache[0]=0;
}

4
icu4j/src/com/ibm/icu/text/TitlecaseTransliterator.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2005, International Business Machines Corporation and
* Copyright (C) 1996-2007, International Business Machines Corporation and
* others. All Rights Reserved.
*
*/
@ -59,7 +59,7 @@ class TitlecaseTransliterator extends Transliterator {
}
iter=new ReplaceableContextIterator();
result = new StringBuffer();
int[] locCache = new int[1];
locCache = new int[1];
locCache[0]=0;
}

4
icu4j/src/com/ibm/icu/text/UppercaseTransliterator.java
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1996-2005, International Business Machines Corporation and *
* Copyright (C) 1996-2007, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -57,7 +57,7 @@ class UppercaseTransliterator extends Transliterator {
}
iter=new ReplaceableContextIterator();
result = new StringBuffer();
int[] locCache = new int[1];
locCache = new int[1];
locCache[0]=0;
}