Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2003-07-24 15:56:53 +0000
committerJean Michel-Lemieux2003-07-24 15:56:53 +0000
commit963ff55e18143cc010e0beb7ce481ae9503595d1 (patch)
tree922f5786f0a87ef4ad6f77d2cf97c06640c87dca
parent1d77e09dc1f44cf0e8c624b08bad3bfc2a0511bd (diff)
downloadeclipse.platform.team-963ff55e18143cc010e0beb7ce481ae9503595d1.tar.gz
eclipse.platform.team-963ff55e18143cc010e0beb7ce481ae9503595d1.tar.xz
eclipse.platform.team-963ff55e18143cc010e0beb7ce481ae9503595d1.zip
NLS changes
-rw-r--r--bundles/org.eclipse.team.ui/plugin.xml8
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java7
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobDoneElement.java27
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobStateCategory.java128
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobsContentProvider.java86
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobsLabelProvider.java63
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobsView.java110
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties10
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/SyncViewerPreferencePage.java20
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/SyncViewerSubscriberActions.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java18
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/sets/SyncSet.java2
12 files changed, 33 insertions, 448 deletions
diff --git a/bundles/org.eclipse.team.ui/plugin.xml b/bundles/org.eclipse.team.ui/plugin.xml
index a8c118b97..c0ff8f01c 100644
--- a/bundles/org.eclipse.team.ui/plugin.xml
+++ b/bundles/org.eclipse.team.ui/plugin.xml
@@ -212,14 +212,6 @@
class="org.eclipse.team.internal.ui.sync.views.SynchronizeView"
id="org.eclipse.team.sync.views.SynchronizeView">
</view>
-<!-- <view
- name="Jobs"
- fastViewWidthRatio="0.25"
- category="org.eclipse.team.ui"
- class="org.eclipse.team.internal.ui.jobs.JobsView"
- id="org.eclipse.team.sync.views.JobsView">
- </view>
- -->
</extension>
<!-- **************** Synchronizing Perspective ******************* -->
<extension
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java
index 24f7cb433..9ea7871ba 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java
@@ -16,7 +16,6 @@ import java.util.List;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.preference.IPersistentPreferenceStore;
import org.eclipse.jface.preference.IPreferencePageContainer;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -46,8 +45,8 @@ import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Layout;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.team.internal.ui.Policy;
import org.eclipse.team.internal.ui.TeamUIPlugin;
+import org.eclipse.team.internal.ui.Utils;
public class PreferencePageContainerDialog extends Dialog implements IPreferencePageContainer {
@@ -411,9 +410,7 @@ public class PreferencePageContainerDialog extends Dialog implements IPreference
try {
((IPersistentPreferenceStore) store).save();
} catch (IOException e) {
- MessageDialog.openError(
- getShell(), Policy.bind("saving"),
- Policy.bind("saving", page.getTitle(), e.getMessage()));
+ Utils.handle(e);
}
}
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobDoneElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobDoneElement.java
deleted file mode 100644
index dbabba99e..000000000
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobDoneElement.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.team.internal.ui.jobs;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.Job;
-
-/**
- * Done category in the job view
- */
-class JobDoneElement {
-
- public Job job;
- public IStatus status;
- JobDoneElement(Job job, IStatus status) {
- this.job = job;
- this.status = status;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobStateCategory.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobStateCategory.java
deleted file mode 100644
index 329ccccf4..000000000
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobStateCategory.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.team.internal.ui.jobs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobChangeListener;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Top level category in the job view
- */
-class JobStateCategory implements IJobChangeListener {
- AbstractTreeViewer tree;
- List children = new ArrayList();
- public String name;
- public int state;
- public Display display;
-
- public boolean equals(Object other) {
- if(this == other) return true;
- if(other instanceof JobStateCategory) {
- return ((JobStateCategory)other).name.equals(name);
- }
- return false;
- }
-
- JobStateCategory(AbstractTreeViewer tree, String name, int state) {
- this.tree = tree;
- this.name = name;
- this.state = state;
- this.display = tree.getControl().getShell().getDisplay();
- Platform.getJobManager().addJobChangeListener(this);
- }
-
- public void add(final Object child) {
- display.asyncExec(new Runnable() {
- public void run() {
- if(! children.contains(child)) {
- children.add(child);
- tree.add(JobStateCategory.this, child);
- tree.expandAll();
- }
- }
- });
- }
-
- public void remove(final Object child) {
- display.asyncExec(new Runnable() {
- public void run() {
- if(children.contains(child)) {
- children.remove(child);
- tree.remove(child);
- tree.expandAll();
- }
- }
- });
- }
-
- public Object[] getChildren() {
- return (Object[]) children.toArray(new Object[children.size()]);
- }
-
- public void dispose() {
- Platform.getJobManager().removeJobChangeListener(this);
- }
-
- public void aboutToRun(IJobChangeEvent event) {
- handleJobChange(event.getJob());
- }
-
- public void awake(IJobChangeEvent event) {
- handleJobChange(event.getJob());
- }
-
- public void done(IJobChangeEvent event) {
- handleJobChange(new JobDoneElement(event.getJob(), event.getResult()));
- }
-
- public void running(IJobChangeEvent event) {
- handleJobChange(event.getJob());
- }
-
- public void scheduled(IJobChangeEvent event) {
- handleJobChange(event.getJob());
- }
-
- public void sleeping(IJobChangeEvent event) {
- handleJobChange(event.getJob());
- }
-
- synchronized protected void handleJobChange(Object object) {
- int s = Job.NONE;
- boolean add = true;
- Job job = null;
- if(object instanceof Job) {
- s = ((Job)object).getState();
- job = ((Job)object);
- } else if(object instanceof JobDoneElement) {
- job = ((JobDoneElement)object).job;
- add = ! ((JobDoneElement)object).status.isOK();
- }
-
- if(s == state & add) {
- add(object);
- } else {
- remove(job);
- }
- }
-
- public void removeAll() {
- tree.remove(getChildren());
- children.clear();
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobsContentProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobsContentProvider.java
deleted file mode 100644
index 443a57545..000000000
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobsContentProvider.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.team.internal.ui.jobs;
-
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * Content provider for jobs
- */
-class JobsContentProvider implements ITreeContentProvider {
-
- private final JobsView view;
- private AbstractTreeViewer viewer;
-
- private JobStateCategory Sleeping;
- private JobStateCategory Running;
- private JobStateCategory Waiting;
- private JobStateCategory Done;
-
- JobsContentProvider(JobsView view) {
- this.view = view;
- }
-
- public Object[] getElements(Object inputElement) {
- if(inputElement instanceof IJobManager) {
- return new Object[] {Waiting, Sleeping, Running, Done};
- }
- if(inputElement instanceof JobStateCategory) {
- return ((JobStateCategory)inputElement).getChildren();
- }
- return new Object[0];
- }
-
- public void dispose() {
- Sleeping.dispose();
- Running.dispose();
- Waiting.dispose();
- Done.dispose();
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- this.viewer = (AbstractTreeViewer)viewer;
- IJobManager oldManager = null;
- IJobManager newManager = null;
- if (oldInput instanceof IJobManager) {
- oldManager = (IJobManager) oldInput;
- }
- if (newInput instanceof IJobManager) {
- newManager = (IJobManager) newInput;
- }
- if (oldManager != newManager) {
- if (oldManager != null) {
- }
- if (newManager != null) {
- Sleeping = new JobStateCategory((AbstractTreeViewer)viewer, "Sleeping", Job.SLEEPING);
- Running = new JobStateCategory((AbstractTreeViewer)viewer, "Running", Job.RUNNING);
- Waiting = new JobStateCategory((AbstractTreeViewer)viewer, "Waiting", Job.WAITING);
- Done = new JobStateCategory((AbstractTreeViewer)viewer, "Done", Job.NONE);
- }
- }
- }
-
- public Object[] getChildren(Object parentElement) {
- return getElements(parentElement);
- }
-
- public Object getParent(Object element) {
- return null;
- }
-
- public boolean hasChildren(Object element) {
- return getChildren(element).length > 0;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobsLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobsLabelProvider.java
deleted file mode 100644
index 9c9ec1e83..000000000
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobsLabelProvider.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.team.internal.ui.jobs;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-public class JobsLabelProvider extends LabelProvider implements IColorProvider {
-
- public Image getImage(Object element) {
- return super.getImage(element);
- }
-
- public String getText(Object element) {
- if(element instanceof Job) {
- return ((Job)element).getName();
- }
- if(element instanceof JobStateCategory) {
- return ((JobStateCategory)element).name;
- }
- if(element instanceof JobDoneElement) {
- JobDoneElement done = (JobDoneElement)element;
- return done.job.getName() + " (" + done.status.toString() + ")";
- }
- if(element instanceof String) {
- return (String)element;
- }
- return "unkown element";
- }
-
- public Color getForeground(Object element) {
- if(element instanceof JobDoneElement) {
- IStatus done = ((JobDoneElement)element).status;
- if(done.getSeverity() == IStatus.CANCEL) {
- return Display.getDefault().getSystemColor(SWT.COLOR_DARK_GREEN);
- }
- if(done.getSeverity() == IStatus.ERROR) {
- return Display.getDefault().getSystemColor(SWT.COLOR_DARK_RED);
- }
- }
- // use default color
- return null;
- }
-
- public Color getBackground(Object element) {
- // use default color
- return null;
- }
-}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobsView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobsView.java
deleted file mode 100644
index a906b1c88..000000000
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/JobsView.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.team.internal.ui.jobs;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.part.ViewPart;
-
-public class JobsView extends ViewPart {
-
- private AbstractTreeViewer tree;
- private Action clearDone;
- private Action cancelJob;
-
- public void createPartControl(Composite parent) {
- tree = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
- tree.setContentProvider(new JobsContentProvider(this));
- tree.setLabelProvider(new JobsLabelProvider());
- tree.setInput(Platform.getJobManager());
- initializeActions();
-
- MenuManager menuMgr = new MenuManager("#PopupMenu");
- menuMgr.setRemoveAllWhenShown(true);
- menuMgr.addMenuListener(new IMenuListener() {
- public void menuAboutToShow(IMenuManager manager) {
- fillContextMenu(manager);
- }
- });
- Menu menu = menuMgr.createContextMenu(tree.getControl());
- tree.getControl().setMenu(menu);
- getSite().registerContextMenu(menuMgr, tree);
- }
-
- private void initializeActions() {
- clearDone = new Action("Clear") {
- public boolean isEnabled() {
- IStructuredSelection s = (IStructuredSelection)tree.getSelection();
- Object element = s.getFirstElement();
- if(element instanceof JobStateCategory) {
- return ((JobStateCategory)element).name.equals("Done");
- }
- return false;
- }
- public void run() {
- IStructuredSelection s = (IStructuredSelection)tree.getSelection();
- Object element = s.getFirstElement();
- if(element instanceof JobStateCategory) {
- ((JobStateCategory)element).removeAll();
- }
- }
- };
- cancelJob = new Action("Cancel") {
- public boolean isEnabled() {
- IStructuredSelection s = (IStructuredSelection)tree.getSelection();
- Iterator it = s.iterator();
- while(it.hasNext()) {
- Object element = it.next();
- if(!(element instanceof Job)) {
- return false;
- }
- }
- return true;
- }
- public void run() {
- IStructuredSelection s = (IStructuredSelection)tree.getSelection();
- Iterator it = s.iterator();
- while(it.hasNext()) {
- Job job = (Job)it.next();
- job.cancel();
- }
- }
- };
- }
-
- protected void fillContextMenu(IMenuManager manager) {
- clearDone.setEnabled(clearDone.isEnabled());
- manager.add(clearDone);
- cancelJob.setEnabled(cancelJob.isEnabled());
- manager.add(cancelJob);
- manager.add(new Separator("Additions"));
- }
-
- public void setFocus() {
- }
-
- public AbstractTreeViewer getViewer() {
- return tree;
- }
-}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
index d76b21eb4..37565589a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
@@ -388,3 +388,13 @@ SynchronizeView.12=One item selected
SynchronizeView.13=\ items selected
SynchronizeView.14=Error opening perspective
SynchronizeView.16=Error opening view
+SyncViewerPreferencePage.6=Synchronize view preferences
+SyncViewerPreferencePage.7=Team Synchronize View settings:
+SyncViewerPreferencePage.8=Display
+SyncViewerPreferencePage.9=Compress in-sync folder paths when using the tree view
+SyncViewerPreferencePage.10=Use incoming/outgoing mode when synchronizing
+SyncViewerPreferencePage.11=Refreshing with Remote
+SyncViewerPreferencePage.12=Refresh with the remote resources in the background
+SyncViewerPreferencePage.13=Enable a background task to refresh with remote resources
+SyncViewerPreferencePage.14=How often should the background refresh run? (in minutes)
+SyncViewerPreferencePage.15=Perspective Switching
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 fd8325bc8..b016e3755 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
@@ -123,8 +123,8 @@ public class SyncViewerPreferencePage extends FieldEditorPreferencePage implemen
public SyncViewerPreferencePage() {
super(GRID);
- setTitle("Synchronize view preferences");
- setDescription("Team Synchronize View settings:");
+ setTitle(Policy.bind("SyncViewerPreferencePage.6")); //$NON-NLS-1$
+ setDescription(Policy.bind("SyncViewerPreferencePage.7")); //$NON-NLS-1$
setPreferenceStore(TeamUIPlugin.getPlugin().getPreferenceStore());
}
@@ -142,28 +142,28 @@ public class SyncViewerPreferencePage extends FieldEditorPreferencePage implemen
public void createFieldEditors() {
GridData data;
- Group displayGroup = createGroup(getFieldEditorParent(), "Display");
+ Group displayGroup = createGroup(getFieldEditorParent(), Policy.bind("SyncViewerPreferencePage.8")); //$NON-NLS-1$
- compressFolders = new BooleanFieldEditor(SYNCVIEW_COMPRESS_FOLDERS, "Compress in-sync folder paths when using the tree view", SWT.NONE, displayGroup);
+ compressFolders = new BooleanFieldEditor(SYNCVIEW_COMPRESS_FOLDERS, Policy.bind("SyncViewerPreferencePage.9"), SWT.NONE, displayGroup); //$NON-NLS-1$
addField(compressFolders);
- useBothMode = new BooleanFieldEditor(SYNCVIEW_USEBOTHMODE, "Use incoming/outgoing mode when synchronizing", SWT.NONE, displayGroup);
+ useBothMode = new BooleanFieldEditor(SYNCVIEW_USEBOTHMODE, Policy.bind("SyncViewerPreferencePage.10"), SWT.NONE, displayGroup); //$NON-NLS-1$
addField(useBothMode);
- refreshGroup = createGroup(getFieldEditorParent(), "Refreshing with Remote");
+ refreshGroup = createGroup(getFieldEditorParent(), Policy.bind("SyncViewerPreferencePage.11")); //$NON-NLS-1$
- bkgRefresh = new BooleanFieldEditor(SYNCVIEW_BACKGROUND_SYNC, "Refresh with the remote resources in the background", SWT.NONE, refreshGroup);
+ bkgRefresh = new BooleanFieldEditor(SYNCVIEW_BACKGROUND_SYNC, Policy.bind("SyncViewerPreferencePage.12"), SWT.NONE, refreshGroup); //$NON-NLS-1$
addField(bkgRefresh);
- bkgScheduledRefresh = new BooleanFieldEditor(SYNCVIEW_SCHEDULED_SYNC, "Enable a background task to refresh with remote resources", SWT.NONE, refreshGroup);
+ bkgScheduledRefresh = new BooleanFieldEditor(SYNCVIEW_SCHEDULED_SYNC, Policy.bind("SyncViewerPreferencePage.13"), SWT.NONE, refreshGroup); //$NON-NLS-1$
addField(bkgScheduledRefresh);
- scheduledDelay = new IntegerFieldEditor2(SYNCVIEW_DELAY, "How often should the background refresh run? (in minutes)", refreshGroup, 2);
+ scheduledDelay = new IntegerFieldEditor2(SYNCVIEW_DELAY, Policy.bind("SyncViewerPreferencePage.14"), refreshGroup, 2); //$NON-NLS-1$
addField(scheduledDelay);
updateLastRunTime(createLabel(refreshGroup, null, 0));
- Group perspectiveGroup = createGroup(getFieldEditorParent(), "Perspective Switching");
+ Group perspectiveGroup = createGroup(getFieldEditorParent(), Policy.bind("SyncViewerPreferencePage.15")); //$NON-NLS-1$
createLabel(perspectiveGroup, Policy.bind("SynchronizationViewPreference.defaultPerspectiveDescription"), 1); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/SyncViewerSubscriberActions.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/SyncViewerSubscriberActions.java
index 2be56c860..823412aaa 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/SyncViewerSubscriberActions.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/SyncViewerSubscriberActions.java
@@ -80,7 +80,7 @@ public class SyncViewerSubscriberActions extends SyncViewerActionGroup {
* @return
*/
private String getSubscriberClassName(IConfigurationElement element) {
- return (String)element.getAttribute("subscriberClass");
+ return (String)element.getAttribute("subscriberClass"); //$NON-NLS-1$
}
/* (non-Javadoc)
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java
index c47588c91..4f31f8098 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java
@@ -89,7 +89,7 @@ public class SyncInfoCompareInput extends CompareEditorInput {
* @see org.eclipse.compare.CompareEditorInput#getTitle()
*/
public String getTitle() {
- return Policy.bind("SyncInfoCompareInput.title", sync.getSubscriber().getName(), node.getName());
+ return Policy.bind("SyncInfoCompareInput.title", sync.getSubscriber().getName(), node.getName()); //$NON-NLS-1$
}
protected void updateLabels() {
@@ -97,26 +97,26 @@ public class SyncInfoCompareInput extends CompareEditorInput {
IRemoteResource remote = sync.getRemote();
IRemoteResource base = sync.getRemote();
- config.setLeftLabel(Policy.bind("SyncInfoCompareInput.localLabel"));
+ config.setLeftLabel(Policy.bind("SyncInfoCompareInput.localLabel")); //$NON-NLS-1$
if(remote != null) {
try {
- config.setRightLabel(Policy.bind("SyncInfoCompareInput.remoteLabelExists", remote.getContentIdentifier(), remote.getCreatorDisplayName(), flattenText(remote.getComment())));
+ config.setRightLabel(Policy.bind("SyncInfoCompareInput.remoteLabelExists", remote.getContentIdentifier(), remote.getCreatorDisplayName(), flattenText(remote.getComment()))); //$NON-NLS-1$
} catch (TeamException e) {
- config.setRightLabel(Policy.bind("SyncInfoCompareInput.remoteLabel"));
+ config.setRightLabel(Policy.bind("SyncInfoCompareInput.remoteLabel")); //$NON-NLS-1$
}
} else {
- config.setRightLabel(Policy.bind("SyncInfoCompareInput.remoteLabel"));
+ config.setRightLabel(Policy.bind("SyncInfoCompareInput.remoteLabel")); //$NON-NLS-1$
}
if(base != null) {
try {
- config.setAncestorLabel(Policy.bind("SyncInfoCompareInput.baseLabelExists", base.getContentIdentifier(), base.getCreatorDisplayName(), flattenText(base.getComment())));
+ config.setAncestorLabel(Policy.bind("SyncInfoCompareInput.baseLabelExists", base.getContentIdentifier(), base.getCreatorDisplayName(), flattenText(base.getComment()))); //$NON-NLS-1$
} catch (TeamException e) {
- config.setAncestorLabel(Policy.bind("SyncInfoCompareInput.baseLabel"));
+ config.setAncestorLabel(Policy.bind("SyncInfoCompareInput.baseLabel")); //$NON-NLS-1$
}
} else {
- config.setAncestorLabel(Policy.bind("SyncInfoCompareInput.baseLabel"));
+ config.setAncestorLabel(Policy.bind("SyncInfoCompareInput.baseLabel")); //$NON-NLS-1$
}
}
@@ -153,7 +153,7 @@ public class SyncInfoCompareInput extends CompareEditorInput {
* @see org.eclipse.ui.IEditorInput#getToolTipText()
*/
public String getToolTipText() {
- return Policy.bind("SyncInfoCompareInput.tooltip", sync.getSubscriber().getName(), node.getName());
+ return Policy.bind("SyncInfoCompareInput.tooltip", sync.getSubscriber().getName(), node.getName()); //$NON-NLS-1$
}
/* (non-Javadoc)
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/sets/SyncSet.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/sets/SyncSet.java
index 12743d485..9b5aea5e8 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/sets/SyncSet.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/sets/SyncSet.java
@@ -239,7 +239,7 @@ public class SyncSet {
if(info != null) {
infos.add(info);
} else {
- TeamUIPlugin.log(IStatus.INFO, "missing sync info: " + child.getFullPath(), null);
+ TeamUIPlugin.log(IStatus.INFO, "missing sync info: " + child.getFullPath(), null); //$NON-NLS-1$
}
}
return (SyncInfo[]) infos.toArray(new SyncInfo[infos.size()]);

Back to the top