ICU-4707 Fix some Eclipse warnings

X-SVN-Rev: 19907
This commit is contained in:
George Rhoten 2006-07-27 23:42:41 +00:00
parent 2db165b24a
commit cf440d910b
17 changed files with 24 additions and 46 deletions

View File

@ -112,7 +112,6 @@ public class BagFormatter {
* @param set1 first set * @param set1 first set
* @param name2 name of second set to be compared * @param name2 name of second set to be compared
* @param set2 second set * @param set2 second set
* @return formatted string
*/ */
public void showSetDifferences( public void showSetDifferences(
PrintWriter pw, PrintWriter pw,
@ -318,7 +317,7 @@ public class BagFormatter {
} }
public String getName(String separator, int start, int end) { public String getName(String separator, int start, int end) {
if (getNameSource() == null || getNameSource() == UnicodeProperty.NULL) return ""; if (getNameSource() == null || getNameSource() == UnicodeLabel.NULL) return "";
String result = getName(start, false); String result = getName(start, false);
if (start == end) return separator + result; if (start == end) return separator + result;
String endString = getName(end, false); String endString = getName(end, false);
@ -496,8 +495,8 @@ public class BagFormatter {
//myTabber.add(7,Tabber.LEFT); //myTabber.add(7,Tabber.LEFT);
commentSeparator = (showCount || showLiteral != null commentSeparator = (showCount || showLiteral != null
|| getLabelSource(true) != UnicodeProperty.NULL || getLabelSource(true) != UnicodeLabel.NULL
|| getNameSource() != UnicodeProperty.NULL) || getNameSource() != UnicodeLabel.NULL)
? "\t #" : ""; ? "\t #" : "";
if (DEBUG) System.out.println("Tabber: " + myTabber.toString()); if (DEBUG) System.out.println("Tabber: " + myTabber.toString());

View File

@ -13,12 +13,12 @@ import java.io.IOException;
import java.io.ObjectInput; import java.io.ObjectInput;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; //import java.util.HashMap;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; //import java.util.Map;
import com.ibm.icu.impl.Utility; //import com.ibm.icu.impl.Utility;
import com.ibm.icu.text.UTF16; import com.ibm.icu.text.UTF16;
/** /**

View File

@ -14,12 +14,12 @@ import java.io.ObjectOutput;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashMap; //import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.SortedSet; import java.util.SortedSet;
import java.util.TreeSet; //import java.util.TreeSet;
import com.ibm.icu.impl.Utility; //import com.ibm.icu.impl.Utility;
import com.ibm.icu.text.UTF16; import com.ibm.icu.text.UTF16;
/** /**

View File

@ -1,13 +1,11 @@
/* /*
******************************************************************************* *******************************************************************************
* Copyright (C) 1996-2004, International Business Machines Corporation and * * Copyright (C) 1996-2006, International Business Machines Corporation and *
* others. All Rights Reserved. * * others. All Rights Reserved. *
******************************************************************************* *******************************************************************************
*/ */
package com.ibm.icu.dev.test.util; package com.ibm.icu.dev.test.util;
import java.io.BufferedReader;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
@ -20,7 +18,7 @@ import java.util.TreeSet;
import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.test.TestFmwk;
import com.ibm.icu.impl.ICUResourceBundle; import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.text.SimpleDateFormat; //import com.ibm.icu.text.SimpleDateFormat;
import com.ibm.icu.util.Currency; import com.ibm.icu.util.Currency;
import com.ibm.icu.util.TimeZone; import com.ibm.icu.util.TimeZone;
import com.ibm.icu.util.ULocale; import com.ibm.icu.util.ULocale;

View File

@ -13,7 +13,6 @@ import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.Locale; import java.util.Locale;
import java.util.regex.Pattern;
public class FileUtilities { public class FileUtilities {
public static void appendFile(String filename, String encoding, PrintWriter output) throws IOException { public static void appendFile(String filename, String encoding, PrintWriter output) throws IOException {

View File

@ -6,12 +6,9 @@
*/ */
package com.ibm.icu.dev.test.util; package com.ibm.icu.dev.test.util;
import java.util.MissingResourceException;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.test.TestFmwk;
import com.ibm.icu.impl.ICUListResourceBundle;
import com.ibm.icu.impl.ICULocaleData;
import com.ibm.icu.impl.Utility; import com.ibm.icu.impl.Utility;

View File

@ -32,7 +32,6 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* Copyright (C) 2001-2004, International Business Machines Corporation and * * Copyright (C) 2001-2006, International Business Machines Corporation and *
* others. All Rights Reserved. * * others. All Rights Reserved. *
******************************************************************************* *******************************************************************************
*/ */
@ -8,13 +8,11 @@ package com.ibm.icu.dev.test.util;
import com.ibm.icu.impl.ICULocaleService; import com.ibm.icu.impl.ICULocaleService;
import com.ibm.icu.impl.ICUService; import com.ibm.icu.impl.ICUService;
import com.ibm.icu.impl.LocaleUtility;
import com.ibm.icu.text.Collator; import com.ibm.icu.text.Collator;
import com.ibm.icu.util.ULocale; import com.ibm.icu.util.ULocale;
import java.util.EventListener; import java.util.EventListener;
import java.util.Iterator; import java.util.Iterator;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* Copyright (C) 2001-2005, International Business Machines Corporation and * * Copyright (C) 2001-2006, International Business Machines Corporation and *
* others. All Rights Reserved. * * others. All Rights Reserved. *
******************************************************************************* *******************************************************************************
*/ */
@ -11,7 +11,6 @@ import com.ibm.icu.dev.test.TestLog;
import com.ibm.icu.impl.ICUService; import com.ibm.icu.impl.ICUService;
import com.ibm.icu.impl.ICUService.Factory; import com.ibm.icu.impl.ICUService.Factory;
import com.ibm.icu.impl.ICUService.SimpleFactory; import com.ibm.icu.impl.ICUService.SimpleFactory;
import com.ibm.icu.impl.LocaleUtility;
import com.ibm.icu.impl.ICULocaleService; import com.ibm.icu.impl.ICULocaleService;
import com.ibm.icu.text.Collator; import com.ibm.icu.text.Collator;
import com.ibm.icu.util.ULocale; import com.ibm.icu.util.ULocale;

View File

@ -1,6 +1,6 @@
/* /*
******************************************************************************* *******************************************************************************
* Copyright (C) 2005, International Business Machines Corporation and * * Copyright (C) 2005-2006, International Business Machines Corporation and *
* others. All Rights Reserved. * * others. All Rights Reserved. *
******************************************************************************* *******************************************************************************
*/ */
@ -12,7 +12,6 @@
package com.ibm.icu.dev.test.util; package com.ibm.icu.dev.test.util;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import com.ibm.icu.impl.ICUResourceBundle; import com.ibm.icu.impl.ICUResourceBundle;

View File

@ -1,6 +1,6 @@
/* /*
******************************************************************************* *******************************************************************************
* Copyright (C) 2003-2005, International Business Machines Corporation and * * Copyright (C) 2003-2006, International Business Machines Corporation and *
* others. All Rights Reserved. * * others. All Rights Reserved. *
******************************************************************************* *******************************************************************************
*/ */
@ -13,7 +13,6 @@ import com.ibm.icu.text.UnicodeSet;
import com.ibm.icu.text.UnicodeSetIterator; import com.ibm.icu.text.UnicodeSetIterator;
import com.ibm.icu.util.LocaleData; import com.ibm.icu.util.LocaleData;
import com.ibm.icu.util.ULocale; import com.ibm.icu.util.ULocale;
import com.ibm.icu.util.UResourceBundle;
/** /**
* @author ram * @author ram

View File

@ -1,6 +1,6 @@
/* /*
********************************************************************** **********************************************************************
* Copyright (c) 2002-2004, International Business Machines * Copyright (c) 2002-2006, International Business Machines
* Corporation and others. All Rights Reserved. * Corporation and others. All Rights Reserved.
********************************************************************** **********************************************************************
* Author: Mark Davis * Author: Mark Davis
@ -8,17 +8,12 @@
*/ */
package com.ibm.icu.dev.test.util; package com.ibm.icu.dev.test.util;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set; import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet; import java.util.TreeSet;
/** /**

View File

@ -1,20 +1,17 @@
/* /*
********************************************************************** **********************************************************************
* Copyright (c) 2002-2004, International Business Machines * Copyright (c) 2002-2006, International Business Machines
* Corporation and others. All Rights Reserved. * Corporation and others. All Rights Reserved.
********************************************************************** **********************************************************************
* Author: Mark Davis * Author: Mark Davis
********************************************************************** **********************************************************************
*/package com.ibm.icu.dev.test.util; */package com.ibm.icu.dev.test.util;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set; import java.util.Set;
import java.util.TreeMap; import java.util.TreeMap;

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* Copyright (C) 1996-2005, International Business Machines Corporation and * * Copyright (C) 1996-2006, International Business Machines Corporation and *
* others. All Rights Reserved. * * others. All Rights Reserved. *
******************************************************************************* *******************************************************************************
*/ */
@ -64,7 +64,7 @@ public final class TrieTest extends TestFmwk
int start, limit; int start, limit;
int value; int value;
boolean overwrite; boolean overwrite;
}; }
/** /**
* Values for testing: * Values for testing:
@ -81,13 +81,13 @@ public final class TrieTest extends TestFmwk
int limit; int limit;
int value; int value;
}; }
private static final class storageHolder private static final class storageHolder
{ {
double bogus; // needed for aligining the storage double bogus; // needed for aligining the storage
byte storage[] = new byte[10000000]; byte storage[] = new byte[10000000];
}; }
private static final class _testFoldedValue private static final class _testFoldedValue

View File

@ -146,7 +146,7 @@ public class ULocaleTest extends TestFmwk {
return (NumberFormat) (locale.equals(loc) ? return (NumberFormat) (locale.equals(loc) ?
proto.clone() : null); proto.clone() : null);
} }
}; }
checkService("fr_FR_NICE", new ServiceFacade() { checkService("fr_FR_NICE", new ServiceFacade() {
public Object create(ULocale req) { public Object create(ULocale req) {

View File

@ -745,7 +745,7 @@ Name: Unicode_1_Name
if (DEBUG) System.out.println("\tGotID <" + text.substring(start,i) + ">"); if (DEBUG) System.out.println("\tGotID <" + text.substring(start,i) + ">");
return i; return i;
} }
}; }
} }

View File

@ -1,6 +1,6 @@
/* /*
******************************************************************************* *******************************************************************************
* Copyright (C) 1996-2005, International Business Machines Corporation and * * Copyright (C) 1996-2006, International Business Machines Corporation and *
* others. All Rights Reserved. * * others. All Rights Reserved. *
******************************************************************************* *******************************************************************************
*/ */
@ -8,7 +8,6 @@ package com.ibm.icu.dev.test.util;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;