diff options
83 files changed, 210 insertions, 87 deletions
diff --git a/org.eclipse.help.base/META-INF/MANIFEST.MF b/org.eclipse.help.base/META-INF/MANIFEST.MF index c9cef4f10..7605053dc 100644 --- a/org.eclipse.help.base/META-INF/MANIFEST.MF +++ b/org.eclipse.help.base/META-INF/MANIFEST.MF @@ -23,3 +23,4 @@ Require-Bundle: org.apache.lucene;bundle-version="[1.4.3,2.0.0)", org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)", org.eclipse.ant.core;bundle-version="[3.1.0,4.0.0)";resolution:=optional Eclipse-LazyStart: true +Import-Package: com.ibm.icu.text diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java index e42560b05..173474485 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java @@ -12,7 +12,7 @@ package org.eclipse.help.internal.base; import java.net.MalformedURLException; import java.net.URL; -import java.util.*; +import java.util.Locale; import org.eclipse.core.runtime.*; import org.eclipse.help.HelpSystem; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java index 89cb64d45..ddea2ba50 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java @@ -10,7 +10,9 @@ *******************************************************************************/ package org.eclipse.help.internal.base; -import java.util.*; +import java.util.ArrayList; +import java.util.Observable; +import java.util.StringTokenizer; import org.eclipse.core.runtime.Preferences; import org.eclipse.core.runtime.Preferences.PropertyChangeEvent; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java index fce77aeb1..54d20315f 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java @@ -11,7 +11,8 @@ package org.eclipse.help.internal.base; import java.io.*; import java.nio.channels.*; -import java.util.*; +import java.util.Map; +import java.util.Properties; import org.eclipse.core.runtime.*; import org.eclipse.help.internal.appserver.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java index d70b2740a..84053571c 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.help.internal.base; -import java.util.*; +import java.util.Locale; import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.preferences.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/IndexToolApplication.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/IndexToolApplication.java index f8071f29e..b2cb1cb4e 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/IndexToolApplication.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/IndexToolApplication.java @@ -11,7 +11,7 @@ package org.eclipse.help.internal.base; import java.io.*; -import java.util.*; +import java.util.Locale; import java.util.zip.*; import org.eclipse.core.runtime.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/HelpProperties.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/HelpProperties.java index f4545152a..d158d72ec 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/HelpProperties.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/HelpProperties.java @@ -11,7 +11,7 @@ package org.eclipse.help.internal.base.util; import java.io.*; -import java.util.*; +import java.util.Properties; import org.eclipse.core.runtime.*; import org.eclipse.help.internal.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserLog.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserLog.java index 99f277b75..0934eff98 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserLog.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserLog.java @@ -11,8 +11,9 @@ package org.eclipse.help.internal.browser; import java.io.*; -import java.text.*; -import java.util.*; +import com.ibm.icu.text.DateFormat; +import com.ibm.icu.text.SimpleDateFormat; +import java.util.Date; import org.eclipse.help.internal.base.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java index 3f5409e68..7e0270074 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java @@ -10,7 +10,9 @@ *******************************************************************************/ package org.eclipse.help.internal.browser; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; import org.eclipse.core.runtime.*; import org.eclipse.help.browser.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java index 612f348e6..997602bde 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java @@ -10,7 +10,8 @@ *******************************************************************************/ package org.eclipse.help.internal.browser; -import java.util.*; +import java.util.ArrayList; +import java.util.StringTokenizer; import org.eclipse.core.runtime.*; import org.eclipse.help.browser.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java index 498120e69..0822686e4 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java @@ -9,8 +9,10 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.help.internal.browser; + import java.io.*; -import java.util.*; +import java.util.Hashtable; +import java.util.Locale; import org.eclipse.core.runtime.*; import org.eclipse.help.browser.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java index 22a29d14d..a6260fe89 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java @@ -11,8 +11,9 @@ package org.eclipse.help.internal.search; import java.io.*; -import java.text.*; -import java.util.*; +import com.ibm.icu.text.BreakIterator; +import java.util.Locale; +import java.util.StringTokenizer; import org.apache.lucene.analysis.*; import org.eclipse.core.runtime.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLDocParser.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLDocParser.java index c342db5cd..d5f5d8ee7 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLDocParser.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLDocParser.java @@ -13,7 +13,8 @@ package org.eclipse.help.internal.search; import java.io.*; import java.net.*; -import java.util.*; +import java.util.Locale; +import java.util.StringTokenizer; import org.apache.lucene.demo.html.*; import org.eclipse.help.internal.base.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/ISearchQuery.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/ISearchQuery.java index 71ffae52b..8643fa94b 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/ISearchQuery.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/ISearchQuery.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.help.internal.search; -import java.util.*; +import java.util.Collection; public interface ISearchQuery { /** diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java index 12aad4fb8..16684b6f6 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java @@ -12,7 +12,7 @@ package org.eclipse.help.internal.search; import java.io.*; import java.net.*; -import java.util.*; +import java.util.Hashtable; import javax.xml.parsers.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginVersionInfo.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginVersionInfo.java index 47ee82418..a46e14a97 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginVersionInfo.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginVersionInfo.java @@ -11,7 +11,13 @@ package org.eclipse.help.internal.search; import java.io.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.StringTokenizer; import org.eclipse.core.runtime.*; import org.eclipse.help.internal.base.util.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/ProgressDistributor.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/ProgressDistributor.java index f0ed4bce7..cc031faaa 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/ProgressDistributor.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/ProgressDistributor.java @@ -10,7 +10,9 @@ *******************************************************************************/ package org.eclipse.help.internal.search; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; import org.eclipse.core.runtime.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java index c67789b47..edb7381d3 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java @@ -10,7 +10,12 @@ *******************************************************************************/ package org.eclipse.help.internal.search; import java.io.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.StringTokenizer; import org.apache.lucene.analysis.*; import org.apache.lucene.index.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsExactPhrase.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsExactPhrase.java index 50f127a98..b65a456b7 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsExactPhrase.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsExactPhrase.java @@ -9,7 +9,9 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.help.internal.search; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import org.apache.lucene.index.*; import org.apache.lucene.search.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsPhrase.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsPhrase.java index c5e2ae4f4..a6aa8bbba 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsPhrase.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsPhrase.java @@ -9,7 +9,9 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.help.internal.search; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import org.apache.lucene.index.*; import org.apache.lucene.search.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchQuery.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchQuery.java index 1eee2b270..624dcd27d 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchQuery.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchQuery.java @@ -10,7 +10,8 @@ *******************************************************************************/ package org.eclipse.help.internal.search; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; import org.eclipse.core.runtime.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java index ed8193078..4a4e24bf9 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java @@ -11,8 +11,9 @@ package org.eclipse.help.internal.search; import java.io.*; -import java.text.*; -import java.util.*; +import com.ibm.icu.text.BreakIterator; +import java.util.ArrayList; +import java.util.Locale; import org.apache.lucene.analysis.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Eclipse.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Eclipse.java index 6324a0dd4..21051c2c8 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Eclipse.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Eclipse.java @@ -11,7 +11,7 @@ package org.eclipse.help.internal.standalone; import java.io.*; -import java.util.*; +import java.util.List; /** * Eclipse launcher. Spawns eclipse executable or diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseConnection.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseConnection.java index 6e9bcfe5a..04e2d451c 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseConnection.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseConnection.java @@ -12,7 +12,7 @@ package org.eclipse.help.internal.standalone; import java.io.*; import java.net.*; -import java.util.*; +import java.util.Properties; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java index 25d52c799..fa62fc9b1 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java @@ -11,7 +11,8 @@ package org.eclipse.help.internal.standalone; import java.io.*; -import java.util.*; +import java.util.ArrayList; +import java.util.List; /** * Options for starting stand alone help and infocenter. diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java index d51ccf3b3..95acc02ed 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.help.internal.standalone; -import java.util.*; +import java.util.List; import org.eclipse.help.internal.base.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneInfocenter.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneInfocenter.java index 8bb2e9a88..f2706db89 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneInfocenter.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneInfocenter.java @@ -13,7 +13,7 @@ package org.eclipse.help.internal.standalone; import java.net.Authenticator; import java.net.HttpURLConnection; import java.net.PasswordAuthentication; -import java.util.*; +import java.util.List; import org.eclipse.help.internal.base.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTocsArray.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTocsArray.java index 0edc04e66..a79984213 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTocsArray.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTocsArray.java @@ -10,7 +10,8 @@ *******************************************************************************/ package org.eclipse.help.internal.workingset; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; import org.eclipse.core.runtime.*; import org.eclipse.help.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTopic.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTopic.java index 784e5c05a..b076dc28d 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTopic.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTopic.java @@ -10,7 +10,8 @@ *******************************************************************************/ package org.eclipse.help.internal.workingset; -import java.util.*; +import java.util.HashMap; +import java.util.Map; import org.eclipse.help.*; import org.eclipse.help.internal.util.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java index ada88c270..446f42d0d 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java @@ -10,7 +10,9 @@ *******************************************************************************/ package org.eclipse.help.internal.workingset; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import org.w3c.dom.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetComparator.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetComparator.java index 7faf1b093..1287471e3 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetComparator.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetComparator.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.help.internal.workingset; -import java.text.*; -import java.util.*; +import com.ibm.icu.text.Collator; +import java.util.Comparator; /** * Compares two working sets by name. diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java index 4d9088355..62371b9ca 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java @@ -11,7 +11,11 @@ package org.eclipse.help.internal.workingset; import java.io.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; import javax.xml.parsers.*; import javax.xml.transform.*; diff --git a/org.eclipse.help.base/src/org/eclipse/help/standalone/Help.java b/org.eclipse.help.base/src/org/eclipse/help/standalone/Help.java index 266044d90..89008c5d4 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/standalone/Help.java +++ b/org.eclipse.help.base/src/org/eclipse/help/standalone/Help.java @@ -11,7 +11,7 @@ package org.eclipse.help.standalone; import java.io.*; -import java.util.*; +import java.util.ArrayList; import org.eclipse.help.internal.standalone.*; diff --git a/org.eclipse.help.ui/META-INF/MANIFEST.MF b/org.eclipse.help.ui/META-INF/MANIFEST.MF index e51da28f7..ac5daed6a 100644 --- a/org.eclipse.help.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.help.ui/META-INF/MANIFEST.MF @@ -20,3 +20,4 @@ Require-Bundle: org.eclipse.help.base;bundle-version="[3.1.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)", org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)" Eclipse-LazyStart: true +Import-Package: com.ibm.icu.text diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpActivitySupport.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpActivitySupport.java index 3fc98f8ec..f7d21a556 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpActivitySupport.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpActivitySupport.java @@ -11,7 +11,11 @@ package org.eclipse.help.ui.internal; -import java.util.*; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; import org.eclipse.core.runtime.*; import org.eclipse.help.internal.*; diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkHandler.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkHandler.java index 1d60a61fe..8a75d7ea0 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkHandler.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkHandler.java @@ -9,7 +9,8 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.help.ui.internal; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; import org.eclipse.swt.*; import org.eclipse.swt.events.*; diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/StyledLineWrapper.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/StyledLineWrapper.java index c4f4f380d..b7c96c752 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/StyledLineWrapper.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/StyledLineWrapper.java @@ -10,8 +10,9 @@ *******************************************************************************/ package org.eclipse.help.ui.internal; -import java.text.*; -import java.util.*; +import com.ibm.icu.text.BreakIterator; +import java.util.ArrayList; +import java.util.Iterator; import org.eclipse.help.internal.context.*; import org.eclipse.swt.*; diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java index 9db57b10f..4800e2053 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java @@ -10,7 +10,9 @@ *******************************************************************************/ package org.eclipse.help.ui.internal.browser.embedded; import java.net.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.Vector; import org.eclipse.core.runtime.*; import org.eclipse.help.internal.base.*; import org.eclipse.help.ui.internal.*; diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/InfoCenterPage.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/InfoCenterPage.java index c28026a1a..c3f103888 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/InfoCenterPage.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/InfoCenterPage.java @@ -13,7 +13,8 @@ package org.eclipse.help.ui.internal.search; import java.io.*; import java.net.*; -import java.util.*; +import java.util.ArrayList; +import java.util.StringTokenizer; import javax.xml.parsers.*; diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/InfoCenterSearchScopeFactory.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/InfoCenterSearchScopeFactory.java index 259ddd8f1..b7349bf69 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/InfoCenterSearchScopeFactory.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/InfoCenterSearchScopeFactory.java @@ -10,7 +10,9 @@ *******************************************************************************/ package org.eclipse.help.ui.internal.search; -import java.util.*; +import java.util.ArrayList; +import java.util.Dictionary; +import java.util.StringTokenizer; import org.eclipse.help.internal.search.InfoCenter; import org.eclipse.help.search.*; diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BookmarksPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BookmarksPart.java index 4b08d0715..f3cf156d3 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BookmarksPart.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BookmarksPart.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.help.ui.internal.views; -import java.util.*; +import java.util.Observable; import java.util.Observer; import org.eclipse.help.IHelpResource; diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineDescriptor.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineDescriptor.java index 0f8ed7f82..7a80175b2 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineDescriptor.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineDescriptor.java @@ -10,7 +10,8 @@ *******************************************************************************/ package org.eclipse.help.ui.internal.views; -import java.util.*; +import java.util.Dictionary; +import java.util.Hashtable; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.help.search.*; diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineDescriptorManager.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineDescriptorManager.java index d95a71de6..b4c989800 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineDescriptorManager.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineDescriptorManager.java @@ -11,7 +11,9 @@ package org.eclipse.help.ui.internal.views; import java.io.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.Observable; import javax.xml.parsers.*; diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java index ea9de1fdd..143ed214f 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java @@ -14,7 +14,7 @@ import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.net.URLDecoder; -import java.text.Collator; +import java.text.Collator; // can't use ICU, public instance import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; diff --git a/org.eclipse.help.webapp/META-INF/MANIFEST.MF b/org.eclipse.help.webapp/META-INF/MANIFEST.MF index b49b3bec6..96908a226 100644 --- a/org.eclipse.help.webapp/META-INF/MANIFEST.MF +++ b/org.eclipse.help.webapp/META-INF/MANIFEST.MF @@ -11,3 +11,4 @@ Require-Bundle: org.eclipse.help.base;bundle-version="[3.1.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)" Eclipse-LazyStart: true Export-Package: org.eclipse.help.internal.webapp;x-friends:="org.eclipse.ua.tests" +Import-Package: com.ibm.icu.text diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.java index 96d2fc8b0..b1c64fe72 100644 --- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.java +++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.java @@ -10,8 +10,12 @@ *******************************************************************************/ package org.eclipse.help.internal.webapp; -import java.text.*; -import java.util.*; +import com.ibm.icu.text.MessageFormat; +import java.util.HashMap; +import java.util.Locale; +import java.util.MissingResourceException; +import java.util.ResourceBundle; +import java.util.StringTokenizer; import org.eclipse.core.runtime.*; diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java index a895b5a91..a4db7b09c 100644 --- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java +++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.help.internal.webapp.data; -import java.util.*; +import java.util.Locale; import javax.servlet.http.*; diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ToolbarData.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ToolbarData.java index c2690ff52..b4e4127cc 100644 --- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ToolbarData.java +++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ToolbarData.java @@ -10,7 +10,8 @@ *******************************************************************************/ package org.eclipse.help.internal.webapp.data; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import javax.servlet.*; import javax.servlet.http.*; diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java index 46001a6a9..7cb520643 100644 --- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java +++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java @@ -11,7 +11,14 @@ package org.eclipse.help.internal.webapp.data; import java.io.*; import java.net.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.StringTokenizer; import java.util.regex.*; import javax.servlet.http.*; diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java index e989fce42..f2951b42e 100644 --- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java +++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java @@ -11,7 +11,7 @@ package org.eclipse.help.internal.webapp.data; import java.io.*; -import java.util.*; +import java.util.ArrayList; import javax.servlet.*; import javax.servlet.http.*; diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java index 5df86c3d9..7d4d214f1 100644 --- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java +++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java @@ -12,7 +12,8 @@ package org.eclipse.help.internal.webapp.servlet; import java.io.*; import java.net.*; -import java.util.*; +import java.util.Enumeration; +import java.util.Locale; import javax.servlet.*; import javax.servlet.http.*; diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/HighlightFilter.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/HighlightFilter.java index ae41c5a76..8e6499bb2 100644 --- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/HighlightFilter.java +++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/HighlightFilter.java @@ -12,7 +12,10 @@ package org.eclipse.help.internal.webapp.servlet; import java.io.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.StringTokenizer; import javax.servlet.http.*; diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java index 81b1f8c38..93427520c 100644 --- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java +++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java @@ -11,7 +11,9 @@ package org.eclipse.help.internal.webapp.servlet; import java.io.*; -import java.util.*; +import java.util.Iterator; +import java.util.SortedSet; +import java.util.TreeSet; import javax.servlet.http.*; diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/SearchServlet.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/SearchServlet.java index bf2d03e2b..74640a453 100644 --- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/SearchServlet.java +++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/SearchServlet.java @@ -11,7 +11,7 @@ package org.eclipse.help.internal.webapp.servlet; import java.io.*; -import java.util.*; +import java.util.ArrayList; import javax.servlet.*; import javax.servlet.http.*; diff --git a/org.eclipse.help/META-INF/MANIFEST.MF b/org.eclipse.help/META-INF/MANIFEST.MF index b6b6b378e..55a9d0227 100644 --- a/org.eclipse.help/META-INF/MANIFEST.MF +++ b/org.eclipse.help/META-INF/MANIFEST.MF @@ -17,3 +17,4 @@ Export-Package: org.eclipse.help, org.eclipse.help.internal.xhtml;x-friends:="org.eclipse.help.ui,org.eclipse.ui.intro,org.eclipse.ua.tests,org.eclipse.help.base" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)" Eclipse-LazyStart: true +Import-Package: com.ibm.icu.text diff --git a/org.eclipse.help/src/org/eclipse/help/IHelpContentProducer.java b/org.eclipse.help/src/org/eclipse/help/IHelpContentProducer.java index 511d9e017..8788ad180 100644 --- a/org.eclipse.help/src/org/eclipse/help/IHelpContentProducer.java +++ b/org.eclipse.help/src/org/eclipse/help/IHelpContentProducer.java @@ -11,7 +11,7 @@ package org.eclipse.help; import java.io.*; -import java.util.*; +import java.util.Locale; /** * Producer capable of generating or otherwise obtaining contents for help diff --git a/org.eclipse.help/src/org/eclipse/help/internal/context/Context.java b/org.eclipse.help/src/org/eclipse/help/internal/context/Context.java index e523f2914..2951f0123 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/context/Context.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/context/Context.java @@ -10,7 +10,7 @@ * Phil Loats (IBM Corp.) - fix to use only foundation APIs *******************************************************************************/ package org.eclipse.help.internal.context; -import java.util.*; +import java.util.List; import org.eclipse.help.*; import org.xml.sax.*; diff --git a/org.eclipse.help/src/org/eclipse/help/internal/context/ContextManager.java b/org.eclipse.help/src/org/eclipse/help/internal/context/ContextManager.java index 37a12ebf1..590011185 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/context/ContextManager.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/context/ContextManager.java @@ -9,7 +9,14 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.help.internal.context; -import java.util.*; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.eclipse.core.runtime.*; import org.eclipse.help.*; diff --git a/org.eclipse.help/src/org/eclipse/help/internal/context/ContextsBuilder.java b/org.eclipse.help/src/org/eclipse/help/internal/context/ContextsBuilder.java index 5f3c38697..ab165726a 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/context/ContextsBuilder.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/context/ContextsBuilder.java @@ -9,7 +9,9 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.help.internal.context; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import org.eclipse.help.*; public class ContextsBuilder { diff --git a/org.eclipse.help/src/org/eclipse/help/internal/context/ContextsFileParser.java b/org.eclipse.help/src/org/eclipse/help/internal/context/ContextsFileParser.java index 593589b9c..ac46e69e1 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/context/ContextsFileParser.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/context/ContextsFileParser.java @@ -11,7 +11,7 @@ package org.eclipse.help.internal.context; import java.io.*; -import java.text.*; +import com.ibm.icu.text.MessageFormat; import javax.xml.parsers.*; diff --git a/org.eclipse.help/src/org/eclipse/help/internal/context/ContextsNode.java b/org.eclipse.help/src/org/eclipse/help/internal/context/ContextsNode.java index 1667fd9ca..a8eef8fea 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/context/ContextsNode.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/context/ContextsNode.java @@ -9,7 +9,8 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.help.internal.context; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.eclipse.help.internal.FilterableUAElement; import org.xml.sax.*; diff --git a/org.eclipse.help/src/org/eclipse/help/internal/context/PluginContexts.java b/org.eclipse.help/src/org/eclipse/help/internal/context/PluginContexts.java index 108959061..79062b760 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/context/PluginContexts.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/context/PluginContexts.java @@ -9,7 +9,8 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.help.internal.context; -import java.util.*; +import java.util.HashMap; +import java.util.Map; import org.eclipse.help.*; /** diff --git a/org.eclipse.help/src/org/eclipse/help/internal/context/PluginsContexts.java b/org.eclipse.help/src/org/eclipse/help/internal/context/PluginsContexts.java index e17f620a8..dfe1c3947 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/context/PluginsContexts.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/context/PluginsContexts.java @@ -9,7 +9,8 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.help.internal.context; -import java.util.*; +import java.util.HashMap; +import java.util.Map; /** * Holds mapping of short plugin Id to PluginContext */ diff --git a/org.eclipse.help/src/org/eclipse/help/internal/index/IndexManager.java b/org.eclipse.help/src/org/eclipse/help/internal/index/IndexManager.java index 652b032ff..cc6066fc9 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/index/IndexManager.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/index/IndexManager.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.help.internal.index; -import java.text.Collator; +import com.ibm.icu.text.Collator; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/org.eclipse.help/src/org/eclipse/help/internal/model/INavigationElement.java b/org.eclipse.help/src/org/eclipse/help/internal/model/INavigationElement.java index ab12f66ec..72b048494 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/model/INavigationElement.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/model/INavigationElement.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.help.internal.model; -import java.util.*; +import java.util.List; /** * Part of help navigation model corresponding to any of: TOC, TOPIC, ANCHOR, or diff --git a/org.eclipse.help/src/org/eclipse/help/internal/model/ITocElement.java b/org.eclipse.help/src/org/eclipse/help/internal/model/ITocElement.java index 05bcf0d3c..a22ab68d0 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/model/ITocElement.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/model/ITocElement.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.help.internal.model; -import java.util.*; +import java.util.List; import org.eclipse.help.*; diff --git a/org.eclipse.help/src/org/eclipse/help/internal/protocols/HelpURLConnection.java b/org.eclipse.help/src/org/eclipse/help/internal/protocols/HelpURLConnection.java index f8b260cb1..680b41f01 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/protocols/HelpURLConnection.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/protocols/HelpURLConnection.java @@ -10,7 +10,11 @@ package org.eclipse.help.internal.protocols; import java.io.*; import java.net.*; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; import org.eclipse.core.runtime.*; import org.eclipse.help.internal.*; diff --git a/org.eclipse.help/src/org/eclipse/help/internal/toc/Anchor.java b/org.eclipse.help/src/org/eclipse/help/internal/toc/Anchor.java index 4387b17cc..b37b5579a 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/toc/Anchor.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/toc/Anchor.java @@ -9,7 +9,8 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.help.internal.toc; -import java.util.*; + +import java.util.List; import org.eclipse.help.internal.model.*; import org.xml.sax.*; diff --git a/org.eclipse.help/src/org/eclipse/help/internal/toc/DirectoryToc.java b/org.eclipse.help/src/org/eclipse/help/internal/toc/DirectoryToc.java index f99f61706..a99063722 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/toc/DirectoryToc.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/toc/DirectoryToc.java @@ -12,7 +12,11 @@ package org.eclipse.help.internal.toc; import java.io.*; import java.net.*; -import java.util.*; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; import java.util.zip.*; import org.eclipse.core.runtime.*; diff --git a/org.eclipse.help/src/org/eclipse/help/internal/toc/TocFile.java b/org.eclipse.help/src/org/eclipse/help/internal/toc/TocFile.java index 82a1a19ec..d09871d22 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/toc/TocFile.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/toc/TocFile.java @@ -10,7 +10,8 @@ *******************************************************************************/ package org.eclipse.help.internal.toc; import java.io.*; -import java.util.*; +import java.util.HashMap; +import java.util.Map; import org.eclipse.help.internal.util.*; diff --git a/org.eclipse.help/src/org/eclipse/help/internal/toc/TocFileParser.java b/org.eclipse.help/src/org/eclipse/help/internal/toc/TocFileParser.java index 9c301a26c..db7d0ca1d 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/toc/TocFileParser.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/toc/TocFileParser.java @@ -11,8 +11,8 @@ package org.eclipse.help.internal.toc; import java.io.*; -import java.text.*; -import java.util.*; +import com.ibm.icu.text.MessageFormat; +import java.util.ArrayList; import javax.xml.parsers.*; diff --git a/org.eclipse.help/src/org/eclipse/help/internal/toc/TocManager.java b/org.eclipse.help/src/org/eclipse/help/internal/toc/TocManager.java index 61d505c92..8821492d3 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/toc/TocManager.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/toc/TocManager.java @@ -10,7 +10,16 @@ *******************************************************************************/ package org.eclipse.help.internal.toc; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.StringTokenizer; import org.eclipse.core.runtime.*; import org.eclipse.help.*; diff --git a/org.eclipse.help/src/org/eclipse/help/internal/util/FastStack.java b/org.eclipse.help/src/org/eclipse/help/internal/util/FastStack.java index 20a63f7a0..53edb7910 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/util/FastStack.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/util/FastStack.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.help.internal.util; -import java.util.*; +import java.util.ArrayList; /** * Fast Stack is similar to java.uiti.Stack, but simplified for speed. It uses diff --git a/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF b/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF index baa06b604..850b846cb 100644 --- a/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF +++ b/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF @@ -25,3 +25,4 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", org.eclipse.help.base;bundle-version="[3.2.0,4.0.0)";resolution:=optional, org.eclipse.help.ui;bundle-version="[3.2.0,4.0.0)";resolution:=optional Eclipse-LazyStart: true +Import-Package: com.ibm.icu.text diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetMenu.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetMenu.java index cb570c6cd..20e607952 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetMenu.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetMenu.java @@ -10,8 +10,10 @@ *******************************************************************************/ package org.eclipse.ui.internal.cheatsheets.actions; -import java.text.Collator; -import java.util.*; +import com.ibm.icu.text.Collator; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import org.eclipse.jface.action.ContributionItem; diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheet.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheet.java index 98625fdeb..1235d3d23 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheet.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheet.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.ui.internal.cheatsheets.data; -import java.util.*; import java.util.ArrayList; +import java.util.Collection; /** * diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetParser.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetParser.java index 029681c8c..c1b9ad1c8 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetParser.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetParser.java @@ -12,7 +12,7 @@ package org.eclipse.ui.internal.cheatsheets.data; import java.io.*; import java.net.URL; -import java.util.*; +import java.util.ArrayList; import javax.xml.parsers.*; diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/ConditionalSubItem.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/ConditionalSubItem.java index bbf6880ed..e7bec1d33 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/ConditionalSubItem.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/ConditionalSubItem.java @@ -10,7 +10,8 @@ *******************************************************************************/ package org.eclipse.ui.internal.cheatsheets.data; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; import org.eclipse.ui.internal.cheatsheets.views.CheatSheetManager; diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/Item.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/Item.java index 0cfb0217b..7543a35e7 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/Item.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/Item.java @@ -10,7 +10,8 @@ *******************************************************************************/ package org.eclipse.ui.internal.cheatsheets.data; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; public class Item extends Intro implements IExecutableItem, IPerformWhenItem, ISubItemItem { private String title; diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/PerformWhen.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/PerformWhen.java index 9b3895336..1cc4bdd4f 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/PerformWhen.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/PerformWhen.java @@ -10,7 +10,8 @@ *******************************************************************************/ package org.eclipse.ui.internal.cheatsheets.data; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; import org.eclipse.ui.internal.cheatsheets.views.CheatSheetManager; public class PerformWhen implements IExecutableItem { diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetCollectionSorter.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetCollectionSorter.java index d117e1c79..5ade19f9c 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetCollectionSorter.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetCollectionSorter.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.ui.internal.cheatsheets.registry; -import java.text.Collator; +import com.ibm.icu.text.Collator; import org.eclipse.jface.viewers.*; import org.eclipse.ui.model.WorkbenchAdapter; diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetRegistryReader.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetRegistryReader.java index f7a461f38..afaf08d45 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetRegistryReader.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetRegistryReader.java @@ -10,8 +10,13 @@ *******************************************************************************/ package org.eclipse.ui.internal.cheatsheets.registry; -import java.text.Collator; -import java.util.*; +import com.ibm.icu.text.Collator; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.StringTokenizer; import org.eclipse.core.runtime.*; import org.eclipse.ui.internal.cheatsheets.*; diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetManager.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetManager.java index edae5773e..194512384 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetManager.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetManager.java @@ -10,7 +10,13 @@ *******************************************************************************/ package org.eclipse.ui.internal.cheatsheets.views; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.eclipse.ui.cheatsheets.*; import org.eclipse.ui.internal.cheatsheets.registry.CheatSheetElement; |