Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilterDialog.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java39
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsView.java5
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSOutputConsole.java5
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/OpenChangeSetAction.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/PasteConnectionStringAction.java7
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java3
14 files changed, 56 insertions, 39 deletions
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) {

Back to the top