diff options
author | Alexander Kurtakov | 2020-04-12 19:16:52 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2020-04-12 20:17:07 +0000 |
commit | ee3c6bf7e9c7d83177d4ff9d8939a786d84405ba (patch) | |
tree | 6316011d6bba1bc6816dd4633a9f268a59c967d5 /bundles | |
parent | 03bea06ad2fa3925234acc7d353875cd1b2f4e10 (diff) | |
download | eclipse.platform.team-ee3c6bf7e9c7d83177d4ff9d8939a786d84405ba.tar.gz eclipse.platform.team-ee3c6bf7e9c7d83177d4ff9d8939a786d84405ba.tar.xz eclipse.platform.team-ee3c6bf7e9c7d83177d4ff9d8939a786d84405ba.zip |
Bug 562048 - Remove dependency on icu from platform.teamI20200413-1800I20200412-1800
Direct replacements only.
Change-Id: If8287ead3f0715155294bd9632aa12a310818e8c
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'bundles')
44 files changed, 93 insertions, 113 deletions
diff --git a/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF index 3c448c4cf..d12165d5d 100644 --- a/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF @@ -12,6 +12,5 @@ Export-Package: org.eclipse.compare.internal.core;x-friends:="org.eclipse.compar org.eclipse.compare.internal.core.patch;x-friends:="org.eclipse.compare,org.eclipse.team.ui", org.eclipse.compare.patch;core=split;mandatory:=core, org.eclipse.compare.rangedifferencer -Import-Package: com.ibm.icu.text;version="3.6.1" Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.compare.core diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java index 4ebb67735..8c259e333 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java @@ -15,16 +15,13 @@ package org.eclipse.compare.internal.core.patch; import java.io.BufferedReader; import java.io.IOException; -import java.text.ParseException; +import java.text.*; import java.util.*; import java.util.regex.Pattern; import org.eclipse.compare.patch.IFilePatch2; import org.eclipse.core.runtime.*; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.SimpleDateFormat; - public class PatchReader { private static final boolean DEBUG= false; diff --git a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF index 2844d9088..a66984c85 100644 --- a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF @@ -26,7 +26,5 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", org.eclipse.compare.core;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)";resolution:=optional Bundle-ActivationPolicy: lazy -Import-Package: com.ibm.icu.util, - com.ibm.icu.text Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Automatic-Module-Name: org.eclipse.compare diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java index db2e4fa38..eeaf8fafd 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.compare; +import java.text.MessageFormat; + import org.eclipse.compare.contentmergeviewer.IFlushable; import org.eclipse.compare.internal.CompareMessages; import org.eclipse.compare.internal.IFlushable2; @@ -28,8 +30,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; -import com.ibm.icu.text.MessageFormat; - /** * A custom <code>CompareViewerPane</code> that supports dynamic viewer switching. * diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java index 0e6ae5aa2..7a1d7c04a 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java @@ -13,8 +13,11 @@ *******************************************************************************/ package org.eclipse.compare; +import java.text.DateFormat; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Calendar; import java.util.Collections; import java.util.Date; import java.util.HashMap; @@ -57,11 +60,6 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.swt.widgets.Widget; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.MessageFormat; -import com.ibm.icu.util.Calendar; - - /** * A dialog where one input element can be compared against * a list of historic variants (editions) of the same input element. diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index 62a15039a..5191a77a7 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -26,6 +26,7 @@ package org.eclipse.compare.contentmergeviewer; import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -207,8 +208,6 @@ import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; import org.eclipse.ui.texteditor.SourceViewerDecorationSupport; -import com.ibm.icu.text.MessageFormat; - /** * A text merge viewer uses the <code>RangeDifferencer</code> to perform a * textual, line-by-line comparison of two (or three) input documents. It is diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java index 7265a051f..15fa7680b 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java @@ -15,7 +15,10 @@ package org.eclipse.compare.internal; import java.io.BufferedInputStream; import java.io.InputStream; +import java.text.DateFormat; +import java.text.MessageFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.Iterator; import java.util.ResourceBundle; @@ -53,11 +56,6 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.swt.widgets.Widget; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.MessageFormat; -import com.ibm.icu.util.Calendar; - - public class AddFromHistoryDialog extends ResizableDialog { static class HistoryInput implements ITypedElement, IEncodedStreamContentAccessor, IModificationDate { diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java index 1643acfeb..8c933a2b7 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java @@ -15,6 +15,7 @@ package org.eclipse.compare.internal; import java.io.IOException; import java.io.InputStream; +import java.text.MessageFormat; import java.util.ResourceBundle; import org.eclipse.compare.CompareConfiguration; @@ -31,8 +32,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.PlatformUI; -import com.ibm.icu.text.MessageFormat; - /** * A simple compare viewer for binary files. * Shows the position of the first non-matching byte. diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java index cbf343679..34d8c221b 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.compare.internal; +import java.text.MessageFormat; import java.util.StringTokenizer; import org.eclipse.core.resources.IResource; @@ -20,9 +21,6 @@ import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IStatus; -import com.ibm.icu.text.MessageFormat; - - public class CompareResourceFilter { private static final char[][] NO_CHAR_CHAR= new char[0][]; diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java index 94450efdf..8f4604d39 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java @@ -16,6 +16,7 @@ package org.eclipse.compare.internal; import java.lang.reflect.InvocationTargetException; +import java.text.MessageFormat; import java.util.HashSet; import java.util.Set; @@ -56,9 +57,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; -import com.ibm.icu.text.MessageFormat; - - /** * A two-way or three-way compare for arbitrary IResources. */ diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java index 7a8f91c20..a85efadd9 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java @@ -24,6 +24,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.URL; import java.net.URLConnection; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -97,8 +98,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.progress.IWorkbenchSiteProgressService; import org.eclipse.ui.texteditor.IDocumentProvider; -import com.ibm.icu.text.MessageFormat; - /** * Convenience and utility methods. */ diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java index 9d95f6896..4cc096c14 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java @@ -25,6 +25,7 @@ import java.io.StringReader; import java.lang.reflect.InvocationTargetException; import java.net.MalformedURLException; import java.net.URL; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; @@ -72,8 +73,6 @@ import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; import org.eclipse.ui.views.navigator.ResourceComparator; -import com.ibm.icu.text.MessageFormat; - public class InputPatchPage extends WizardPage { // constants diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java index 7bd7b4dce..b5d7c73b7 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.compare.internal.patch; +import java.text.MessageFormat; + import org.eclipse.compare.internal.ICompareContextIds; import org.eclipse.compare.internal.Utilities; import org.eclipse.core.resources.IFile; @@ -39,8 +41,6 @@ import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; import org.eclipse.ui.views.navigator.ResourceComparator; -import com.ibm.icu.text.MessageFormat; - /*** * This page only shows up if the user is trying to apply * a non-workspace rooted patch. diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java index 1c91d01e2..6bfe69dd6 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java @@ -13,14 +13,14 @@ *******************************************************************************/ package org.eclipse.compare.structuremergeviewer; +import java.text.MessageFormat; + import org.eclipse.compare.IEditableContent; import org.eclipse.compare.ITypedElement; import org.eclipse.compare.internal.Utilities; import org.eclipse.core.runtime.ListenerList; import org.eclipse.swt.graphics.Image; -import com.ibm.icu.text.MessageFormat; - /** * Diff node are used as the compare result of the differencing engine. * Since it implements the {@link ITypedElement} and {@link ICompareInput} diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java index 02898cf5b..04fb6b5da 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java @@ -15,6 +15,7 @@ package org.eclipse.compare.structuremergeviewer; import java.io.IOException; import java.io.InputStream; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -31,8 +32,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; -import com.ibm.icu.text.MessageFormat; - /** * A generic two-way or three-way differencing engine. * <p> diff --git a/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF index 87c846e79..41a997296 100644 --- a/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF @@ -25,7 +25,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.net;bundle-version="[1.0.0,2.0.0)", org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)" Bundle-ActivationPolicy: lazy -Import-Package: com.ibm.icu.text, - com.ibm.icu.util +Import-Package: com.ibm.icu.text Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Automatic-Module-Name: org.eclipse.team.cvs.core diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java index 1c14839e8..c147b8556 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui; +import java.text.DateFormat; import java.util.Date; import org.eclipse.core.resources.IFile; @@ -31,8 +32,6 @@ import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; import org.eclipse.team.internal.ccvs.ui.actions.CVSAction; import org.eclipse.ui.PlatformUI; -import com.ibm.icu.text.DateFormat; - public class CVSFilePropertiesPage extends CVSPropertiesPage { IFile file; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilterDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilterDialog.java index 5c27d55a8..cd2a3a396 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilterDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilterDialog.java @@ -13,18 +13,18 @@ *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui; +import java.util.Calendar; import java.util.Date; -import org.eclipse.jface.dialogs.*; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.TrayDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.*; import org.eclipse.ui.PlatformUI; -import com.ibm.icu.util.Calendar; - public class CVSHistoryFilterDialog extends TrayDialog { private CVSHistoryFilter historyFilter; @@ -43,12 +43,14 @@ public class CVSHistoryFilterDialog extends TrayDialog { setHelpAvailable(false); // Disable help controls - F1 will still work } + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText(CVSUIMessages.HistoryFilterDialog_title); PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IHelpContextIds.HISTORY_FILTER_DIALOG); } + @Override protected Control createDialogArea(Composite parent) { Composite topLevel = new Composite(parent, SWT.NONE); GridLayout layout = new GridLayout(); @@ -143,6 +145,7 @@ public class CVSHistoryFilterDialog extends TrayDialog { /** * A button has been pressed. Process the dialog contents. */ + @Override protected void buttonPressed(int buttonId) { if (IDialogConstants.CANCEL_ID == buttonId) { super.buttonPressed(buttonId); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java index 919de9269..4c83d51f0 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java @@ -18,6 +18,8 @@ package org.eclipse.team.internal.ccvs.ui; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.*; import org.eclipse.compare.*; @@ -77,10 +79,6 @@ import org.eclipse.ui.part.IPageSite; import org.eclipse.ui.progress.IProgressConstants; import org.eclipse.ui.texteditor.ITextEditorActionConstants; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.SimpleDateFormat; -import com.ibm.icu.util.Calendar; - public class CVSHistoryPage extends HistoryPage implements IAdaptable, IHistoryCompareAdapter { /* private */ ICVSFile file; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java index ecbaae729..ea2757538 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java @@ -17,6 +17,7 @@ *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui; +import java.text.DateFormat; import java.util.Date; import org.eclipse.core.resources.IFile; @@ -47,8 +48,6 @@ import org.eclipse.team.internal.ui.history.DateHistoryCategory; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.themes.ITheme; -import com.ibm.icu.text.DateFormat; - public class CVSHistoryTableProvider { public static final String CATEGORIES_COLOR = "org.eclipse.team.cvs.ui.fontsandcolors.cvshistorypagecategories"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java index 1660dcf45..84a071880 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java @@ -14,6 +14,7 @@ package org.eclipse.team.internal.ccvs.ui; +import java.text.SimpleDateFormat; import java.util.*; import org.eclipse.core.resources.*; @@ -42,8 +43,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.themes.ITheme; import org.osgi.framework.Bundle; -import com.ibm.icu.text.SimpleDateFormat; - public class CVSLightweightDecorator extends LabelProvider implements ILightweightLabelDecorator, IResourceStateChangeListener, IPropertyChangeListener { // Decorator id as defined in the decorator extension point diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java index db1f92bb2..d29dc81af 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java @@ -17,16 +17,13 @@ package org.eclipse.team.internal.ccvs.ui; -import com.ibm.icu.text.Collator; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.Iterator; +import java.text.Collator; +import java.util.*; import java.util.List; -import org.eclipse.jface.dialogs.*; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.dialogs.MessageDialogWithToggle; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jface.util.PropertyChangeEvent; @@ -56,6 +53,7 @@ import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPreferencePage { public static class PerspectiveDescriptorComparator implements Comparator { + @Override public int compare(Object o1, Object o2) { if (o1 instanceof IPerspectiveDescriptor && o2 instanceof IPerspectiveDescriptor) { String id1= ((IPerspectiveDescriptor)o1).getLabel(); @@ -89,10 +87,12 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref PlatformUI.getWorkbench().getHelpSystem().setHelp(fCheckbox, helpID); } + @Override public void initializeValue(IPreferenceStore store) { fCheckbox.setSelection(store.getBoolean(fKey)); } + @Override public void performOk(IPreferenceStore store) { store.setValue(fKey, fCheckbox.getSelection()); } @@ -124,6 +124,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref return fCombo; } + @Override public void initializeValue(IPreferenceStore store) { final Object value= getValue(store, fKey); final int index= fValues.indexOf(value); @@ -133,6 +134,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref fCombo.select(0); } + @Override public void performOk(IPreferenceStore store) { saveValue(store, fKey, fValues.get(fCombo.getSelectionIndex())); } @@ -146,10 +148,12 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref super(composite, key, label, helpID, labels, values); } + @Override protected void saveValue(IPreferenceStore store, String key, Object object) { store.setValue(key, ((Integer)object).intValue()); } + @Override protected Object getValue(IPreferenceStore store, String key) { return Integer.valueOf(store.getInt(key)); } @@ -161,10 +165,12 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref super(composite, key, label, helpID, labels, values); } + @Override protected Object getValue(IPreferenceStore store, String key) { return store.getString(key); } + @Override protected void saveValue(IPreferenceStore store, String key, Object object) { store.setValue(key, (String)object); } @@ -194,6 +200,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref PlatformUI.getWorkbench().getHelpSystem().setHelp(fGroup, helpID); } + @Override public void initializeValue(IPreferenceStore store) { final Object value= loadValue(store, fKey); final int index= fValues.indexOf(value); @@ -203,6 +210,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref } } + @Override public void performOk(IPreferenceStore store) { for (int i = 0; i < fButtons.length; ++i) { if (fButtons[i].getSelection()) { @@ -223,10 +231,12 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref super(composite, key, label, helpID, labels, values); } + @Override protected Object loadValue(IPreferenceStore store, String key) { return Integer.valueOf(store.getInt(key)); } + @Override protected void saveValue(IPreferenceStore store, String key, Object value) { store.setValue(key, ((Integer)value).intValue()); } @@ -238,10 +248,12 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref super(composite, key, label, helpID, labels, values); } + @Override protected Object loadValue(IPreferenceStore store, String key) { return store.getString(key); } + @Override protected void saveValue(IPreferenceStore store, String key, Object value) { store.setValue(key, (String)value); } @@ -264,15 +276,18 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref PlatformUI.getWorkbench().getHelpSystem().setHelp(fText, helpID); } + @Override public void initializeValue(IPreferenceStore store) { final String value= store.getString(fKey); fText.setText(value); } + @Override public void performOk(IPreferenceStore store) { store.setValue(fKey, fText.getText()); } + @Override public void modifyText(ModifyEvent e) { modifyText(fText); } @@ -347,6 +362,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref YES_NO_PROMPT= new String [] { CVSUIMessages.CVSPreferencesPage_11, CVSUIMessages.CVSPreferencesPage_12, CVSUIMessages.CVSPreferencesPage_13 }; // } + @Override protected Control createContents(Composite parent) { // create a tab folder for the page @@ -384,6 +400,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref ICVSUIConstants.PREF_COMMIT_FILES_DISPLAY_THRESHOLD, CVSUIMessages.CVSPreferencesPage_20, null) { + @Override protected void modifyText(Text text) { // Parse the timeout value try { @@ -406,6 +423,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref ICVSUIConstants.PREF_COMMIT_COMMENTS_MAX_HISTORY, CVSUIMessages.CVSPreferencesPage_47, null) { + @Override protected void modifyText(Text text) { try { final int x = Integer.parseInt(text.getText()); @@ -438,6 +456,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref ICVSUIConstants.PREF_TIMEOUT, CVSUIMessages.CVSPreferencesPage_23, IHelpContextIds.PREF_COMMS_TIMEOUT) { + @Override protected void modifyText(Text text) { // Parse the timeout value try { @@ -465,11 +484,13 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref new Integer [] { Integer.valueOf(0), Integer.valueOf(1), Integer.valueOf(2)}); quietnessCombo.getCombo().addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { if (getQuietnessOptionFor(quietnessCombo.getCombo().getSelectionIndex()).equals(Command.SILENT)) { MessageDialog.openWarning(getShell(), CVSUIMessages.CVSPreferencesPage_30, CVSUIMessages.CVSPreferencesPage_31); // } } + @Override public void widgetDefaultSelected(SelectionEvent e) { widgetSelected(e); } @@ -574,9 +595,11 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref } } + @Override public void init(IWorkbench workbench) { } + @Override public boolean performOk() { final IPreferenceStore store = getPreferenceStore(); @@ -608,6 +631,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref return true; } + @Override protected void performDefaults() { super.performDefaults(); final IPreferenceStore store = getPreferenceStore(); @@ -623,6 +647,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref * * @return the preference store for this plugin */ + @Override protected IPreferenceStore doGetPreferenceStore() { return CVSUIPlugin.getPlugin().getPreferenceStore(); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsView.java index dbdb7443e..47471eb3b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsView.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsView.java @@ -15,7 +15,7 @@ *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui; -import java.text.ParseException; +import java.text.*; import java.util.Locale; import org.eclipse.jface.viewers.*; @@ -28,9 +28,6 @@ import org.eclipse.team.internal.ccvs.core.EditorsInfo; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.SimpleDateFormat; - /** * * The <code>EditorsView</code> shows the result of cvs editors command diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java index e0ae44760..8ae3bbae6 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui; +import java.text.DateFormat; import java.util.Date; import org.eclipse.core.runtime.IAdaptable; @@ -28,8 +29,6 @@ import org.eclipse.swt.widgets.*; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; -import com.ibm.icu.text.DateFormat; - /** * This class provides the table and it's required components for a file's revision * history diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSOutputConsole.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSOutputConsole.java index bbfa27c6f..fe8f07ad6 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSOutputConsole.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSOutputConsole.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui.console; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Date; import org.eclipse.core.runtime.*; @@ -33,9 +35,6 @@ import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.console.*; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.SimpleDateFormat; - /** * Console that shows the output of CVS commands. It is shown as a page in the generic * console view. It supports coloring for message, command, and error lines in addition diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/OpenChangeSetAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/OpenChangeSetAction.java index 54ae477c1..ff0bc80ab 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/OpenChangeSetAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/OpenChangeSetAction.java @@ -14,6 +14,7 @@ package org.eclipse.team.internal.ccvs.ui.mappings; import java.lang.reflect.InvocationTargetException; +import java.text.DateFormat; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.mapping.ResourceTraversal; @@ -41,8 +42,6 @@ import org.eclipse.team.internal.ui.mapping.ResourceModelParticipantAction; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; import org.eclipse.ui.PlatformUI; -import com.ibm.icu.text.DateFormat; - class OpenChangeSetAction extends ResourceModelParticipantAction { protected OpenChangeSetAction(ISynchronizePageConfiguration configuration) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java index febd585a8..9c4bef7d7 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java @@ -16,6 +16,7 @@ package org.eclipse.team.internal.ccvs.ui.operations; import java.io.IOException; import java.io.InputStream; +import java.text.DateFormat; import java.util.*; import org.eclipse.core.resources.IFile; @@ -50,8 +51,6 @@ import org.eclipse.ui.*; import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor; -import com.ibm.icu.text.DateFormat; - /** * An operation to fetch the annotations for a file from the repository and * display them in the annotations view. diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/PasteConnectionStringAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/PasteConnectionStringAction.java index cfc4fb050..70665dc2e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/PasteConnectionStringAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/PasteConnectionStringAction.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui.repo; +import java.util.StringTokenizer; + import org.eclipse.jface.action.IAction; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.dnd.TextTransfer; @@ -22,8 +24,6 @@ import org.eclipse.ui.*; import org.eclipse.ui.actions.ActionDelegate; import org.eclipse.ui.actions.ActionFactory; -import com.ibm.icu.util.StringTokenizer; - /** * Try to paste a CVS connection string from clipboard as a repository location */ @@ -32,6 +32,7 @@ public class PasteConnectionStringAction extends ActionDelegate implements private IAction action; + @Override public void run(IAction action) { Clipboard clipboard = new Clipboard(PlatformUI.getWorkbench() .getDisplay()); @@ -57,11 +58,13 @@ public class PasteConnectionStringAction extends ActionDelegate implements } } + @Override public void init(IAction action) { super.init(action); this.action = action; } + @Override public void init(IViewPart view) { IActionBars actionBars = view.getViewSite().getActionBars(); actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(), action); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java index 0a39c6ec8..6c8fd8136 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui.subscriber; +import java.text.DateFormat; import java.util.Date; import org.eclipse.core.resources.IResource; @@ -39,8 +40,6 @@ import org.eclipse.team.internal.ui.synchronize.SyncInfoSetChangeSetCollector; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; import org.eclipse.team.ui.synchronize.SynchronizePageActionGroup; -import com.ibm.icu.text.DateFormat; - /** * Collector that fetches the log for incoming CVS change sets */ diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java index b418330f3..f6ab31ca6 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java @@ -14,6 +14,7 @@ package org.eclipse.team.internal.ccvs.ui.subscriber; import java.lang.reflect.InvocationTargetException; +import java.text.DateFormat; import org.eclipse.compare.structuremergeviewer.IDiffElement; import org.eclipse.core.resources.IResource; @@ -33,8 +34,6 @@ import org.eclipse.team.internal.core.subscribers.CheckedInChangeSet; import org.eclipse.team.internal.ui.synchronize.ChangeSetDiffNode; import org.eclipse.team.ui.synchronize.*; -import com.ibm.icu.text.DateFormat; - class OpenChangeSetAction extends SynchronizeModelAction { protected OpenChangeSetAction(ISynchronizePageConfiguration configuration) { diff --git a/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF index 05b2edbf2..02c6d3c7d 100644 --- a/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF @@ -33,7 +33,5 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)";resolution:=op org.eclipse.ui.editors;bundle-version="[3.3.0,4.0.0)", org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)" Bundle-ActivationPolicy: lazy -Import-Package: com.ibm.icu.text, - com.ibm.icu.util Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Automatic-Module-Name: org.eclipse.team.ui diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/SWTUtils.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/SWTUtils.java index 348f34989..68f7a244b 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/SWTUtils.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/SWTUtils.java @@ -14,6 +14,7 @@ package org.eclipse.team.internal.ui; +import java.text.MessageFormat; import java.util.Iterator; import org.eclipse.core.runtime.Assert; @@ -41,9 +42,6 @@ import org.eclipse.ui.dialogs.PreferenceLinkArea; import org.eclipse.ui.dialogs.PreferencesUtil; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import com.ibm.icu.text.MessageFormat; - - public class SWTUtils { public static final int MARGINS_DEFAULT= -1; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/OpenWithMenu.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/OpenWithMenu.java index 8e0a1efa2..77773c264 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/OpenWithMenu.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/OpenWithMenu.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.team.internal.ui.actions; +import java.text.Collator; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -53,8 +54,6 @@ import org.eclipse.ui.statushandlers.IStatusAdapterConstants; import org.eclipse.ui.statushandlers.StatusAdapter; import org.eclipse.ui.statushandlers.StatusManager; -import com.ibm.icu.text.Collator; - /** * A menu for opening file revisions in the workbench. * <p> diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/DateHistoryCategory.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/DateHistoryCategory.java index e855d0647..05ff480cc 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/DateHistoryCategory.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/DateHistoryCategory.java @@ -14,11 +14,10 @@ package org.eclipse.team.internal.ui.history; import java.util.ArrayList; +import java.util.Calendar; import org.eclipse.team.core.history.IFileRevision; -import com.ibm.icu.util.Calendar; - public class DateHistoryCategory extends AbstractHistoryCategory { private String name; private Calendar fromDate; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionEditorInput.java index f44a392f5..0530d865e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionEditorInput.java @@ -15,6 +15,7 @@ package org.eclipse.team.internal.ui.history; import java.io.InputStream; import java.net.URI; +import java.text.DateFormat; import java.util.Date; import org.eclipse.core.resources.IEncodedStorage; @@ -34,8 +35,6 @@ import org.eclipse.ui.IPersistableElement; import org.eclipse.ui.IStorageEditorInput; import org.eclipse.ui.model.IWorkbenchAdapter; -import com.ibm.icu.text.DateFormat; - public class FileRevisionEditorInput extends PlatformObject implements IWorkbenchAdapter, IStorageEditorInput { private final Object fileRevision; private final IStorage storage; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionTypedElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionTypedElement.java index df6a3db50..82a29407e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionTypedElement.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionTypedElement.java @@ -14,6 +14,7 @@ package org.eclipse.team.internal.ui.history; import java.net.URI; +import java.text.DateFormat; import java.util.Date; import org.eclipse.compare.ITypedElement; @@ -25,8 +26,6 @@ import org.eclipse.team.core.history.IFileRevision; import org.eclipse.team.internal.ui.StorageTypedElement; import org.eclipse.ui.IEditorInput; -import com.ibm.icu.text.DateFormat; - /** * An {@link ITypedElement} wrapper for {@link IFileRevision} for use with the * Compare framework. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java index 0401a7802..6fc6302c0 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java @@ -14,6 +14,7 @@ package org.eclipse.team.internal.ui.history; +import java.text.DateFormat; import java.util.Date; import org.eclipse.core.resources.IFile; @@ -46,8 +47,6 @@ import org.eclipse.team.core.history.IFileHistory; import org.eclipse.team.core.history.IFileRevision; import org.eclipse.team.internal.ui.TeamUIMessages; -import com.ibm.icu.text.DateFormat; - public class GenericHistoryTableProvider { private IFileHistory currentFileHistory; private IFile currentFile; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java index 8cc694e54..886b0e47c 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.team.internal.ui.history; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -74,9 +75,6 @@ import org.eclipse.ui.part.PluginTransfer; import org.eclipse.ui.part.ResourceTransfer; import org.eclipse.ui.part.ShowInContext; -import com.ibm.icu.text.SimpleDateFormat; - - public class GenericHistoryView extends PageBookView implements IHistoryView, IPropertyChangeListener, IShowInTarget { private static final String HISTORY_VIEW_GROUP = "org.eclipse.team.ui.historyView"; //$NON-NLS-1$ private static final String NAVIGATION_GROUP = "org.eclipse.team.ui.navigation"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java index 072339c1b..a70657a5a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java @@ -15,7 +15,9 @@ package org.eclipse.team.internal.ui.history; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.HashSet; @@ -93,9 +95,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.IPageSite; import org.eclipse.ui.progress.IProgressConstants; -import com.ibm.icu.text.SimpleDateFormat; -import com.ibm.icu.util.Calendar; - public class LocalHistoryPage extends HistoryPage implements IHistoryCompareAdapter { public static final int ON = 1; public static final int OFF = 2; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java index 1ce8a992d..713f85d71 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.team.internal.ui.history; +import java.text.DateFormat; import java.util.Date; import org.eclipse.compare.IModificationDate; @@ -50,8 +51,6 @@ import org.eclipse.team.internal.ui.TeamUIPlugin; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.themes.ITheme; -import com.ibm.icu.text.DateFormat; - public class LocalHistoryTableProvider { /* private */ static final int COL_DATE = 0; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/SyncViewerPreferencePage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/SyncViewerPreferencePage.java index 71d3d5ac7..3613a47c6 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/SyncViewerPreferencePage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/SyncViewerPreferencePage.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.team.internal.ui.preferences; +import java.text.Collator; import java.util.Arrays; import java.util.Comparator; @@ -40,8 +41,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; -import com.ibm.icu.text.Collator; - /** * This preference page allows to configure various aspects of the Synchronize View. */ diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java index 8ae43d9cd..60eda0385 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java @@ -15,6 +15,7 @@ *******************************************************************************/ package org.eclipse.team.internal.ui.synchronize; +import java.util.Calendar; import java.util.Date; import org.eclipse.jface.dialogs.Dialog; @@ -39,8 +40,6 @@ import org.eclipse.team.internal.ui.TeamUIMessages; import org.eclipse.team.internal.ui.Utils; import org.eclipse.team.ui.synchronize.ISynchronizeParticipant; -import com.ibm.icu.util.Calendar; - /** * A composite that allows editing a subscriber refresh schedule. A validator can be used to allow * containers to show page completion. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberRefreshSchedule.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberRefreshSchedule.java index 18e0cd275..24810031a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberRefreshSchedule.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberRefreshSchedule.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.team.internal.ui.synchronize; +import java.text.DateFormat; +import java.util.Calendar; import java.util.Date; import org.eclipse.core.runtime.Adapters; @@ -25,9 +27,6 @@ import org.eclipse.team.ui.synchronize.ISynchronizeParticipant; import org.eclipse.ui.IMemento; import org.eclipse.ui.actions.ActionFactory; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.util.Calendar; - /** * Schedule to refresh a subscriber at a specified interval. The schedule can be disabled or enabled * and will create the refresh job. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java index 5f3323172..bc8dbafcb 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.team.internal.ui.synchronize; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Collections; import java.util.Date; import java.util.HashMap; @@ -49,9 +51,6 @@ import org.eclipse.team.internal.ui.TeamUIPlugin; import org.eclipse.team.internal.ui.Utils; import org.eclipse.team.ui.synchronize.ISynchronizeModelElement; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.SimpleDateFormat; - /** * Handler that serializes the updating of a synchronize model provider. * All modifications to the synchronize model are performed in this |