diff options
| author | Michael Valenta | 2005-04-05 20:52:46 +0000 |
|---|---|---|
| committer | Michael Valenta | 2005-04-05 20:52:46 +0000 |
| commit | faef8a53e63ccf13ecd34a88f7e8c8939531f1b1 (patch) | |
| tree | a82ab462ac43e9cc905d1cc8d56cc72c63702f4a | |
| parent | 4380468cac65f229ff907e487fb2367f1edabf1b (diff) | |
| download | eclipse.platform.team-faef8a53e63ccf13ecd34a88f7e8c8939531f1b1.tar.gz eclipse.platform.team-faef8a53e63ccf13ecd34a88f7e8c8939531f1b1.tar.xz eclipse.platform.team-faef8a53e63ccf13ecd34a88f7e8c8939531f1b1.zip | |
Converted to using Runtime NLS support
168 files changed, 3888 insertions, 2411 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java index ba14c9c6f..d05c6996a 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java @@ -18,6 +18,7 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -51,7 +52,7 @@ public class AddToVersionControlDialog extends DetailsDialog { * @param parentShell */ public AddToVersionControlDialog(Shell parentShell, IResource[] unaddedResources) { - super(parentShell, Policy.bind("AddToVersionControlDialog.title")); //$NON-NLS-1$ + super(parentShell, CVSUIMessages.AddToVersionControlDialog_title); //$NON-NLS-1$ this.unaddedResources = unaddedResources; } @@ -68,9 +69,9 @@ public class AddToVersionControlDialog extends DetailsDialog { // add a description label if (unaddedResources.length==1) { - createWrappingLabel(composite, Policy.bind("AddToVersionControlDialog.thereIsAnUnaddedResource", new Integer(unaddedResources.length).toString())); //$NON-NLS-1$ + createWrappingLabel(composite, NLS.bind(CVSUIMessages.AddToVersionControlDialog_thereIsAnUnaddedResource, new String[] { new Integer(unaddedResources.length).toString() })); //$NON-NLS-1$ } else { - createWrappingLabel(composite, Policy.bind("AddToVersionControlDialog.thereAreUnaddedResources", new Integer(unaddedResources.length).toString())); //$NON-NLS-1$ + createWrappingLabel(composite, NLS.bind(CVSUIMessages.AddToVersionControlDialog_thereAreUnaddedResources, new String[] { new Integer(unaddedResources.length).toString() })); //$NON-NLS-1$ } } @@ -99,7 +100,7 @@ public class AddToVersionControlDialog extends DetailsDialog { private void addUnaddedResourcesArea(Composite composite) { // add a description label - createWrappingLabel(composite, Policy.bind("ReleaseCommentDialog.unaddedResources")); //$NON-NLS-1$ + createWrappingLabel(composite, CVSUIMessages.ReleaseCommentDialog_unaddedResources); //$NON-NLS-1$ // add the selectable checkbox list listViewer = CheckboxTableViewer.newCheckList(composite, SWT.BORDER); @@ -148,7 +149,7 @@ public class AddToVersionControlDialog extends DetailsDialog { data.grabExcessHorizontalSpace = true; composite.setData(data); - Button selectButton = createButton(buttonComposite, IDialogConstants.SELECT_ALL_ID, Policy.bind("ReleaseCommentDialog.selectAll"), false); //$NON-NLS-1$ + Button selectButton = createButton(buttonComposite, IDialogConstants.SELECT_ALL_ID, CVSUIMessages.ReleaseCommentDialog_selectAll, false); //$NON-NLS-1$ SelectionListener listener = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { listViewer.setAllChecked(true); @@ -157,7 +158,7 @@ public class AddToVersionControlDialog extends DetailsDialog { }; selectButton.addSelectionListener(listener); - Button deselectButton = createButton(buttonComposite, IDialogConstants.DESELECT_ALL_ID, Policy.bind("ReleaseCommentDialog.deselectAll"), false); //$NON-NLS-1$ + Button deselectButton = createButton(buttonComposite, IDialogConstants.DESELECT_ALL_ID, CVSUIMessages.ReleaseCommentDialog_deselectAll, false); //$NON-NLS-1$ listener = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { listViewer.setAllChecked(false); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AlternateUserValidationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AlternateUserValidationDialog.java index 021e54aea..7eeb0a6ab 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AlternateUserValidationDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AlternateUserValidationDialog.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.events.VerifyListener; @@ -51,7 +52,7 @@ public class AlternateUserValidationDialog extends Dialog { protected void configureShell(Shell newShell) { super.configureShell(newShell); - newShell.setText(Policy.bind("AlternateUserValidationDialog.Enter_Password_2")); //$NON-NLS-1$ + newShell.setText(CVSUIMessages.AlternateUserValidationDialog_Enter_Password_2); //$NON-NLS-1$ } protected Control createContents(Composite parent) { @@ -77,7 +78,7 @@ public class AlternateUserValidationDialog extends Dialog { middleComposite.setLayoutData(new GridData()); Label l = new Label(middleComposite, SWT.NULL); - l.setText(Policy.bind("AlternateUserValidationDialog.message", user)); //$NON-NLS-1$ + l.setText(NLS.bind(CVSUIMessages.AlternateUserValidationDialog_message, new String[] { user })); //$NON-NLS-1$ l.setLayoutData(new GridData()); l = new Label(middleComposite, SWT.NULL); l.setText(""); //$NON-NLS-1$ @@ -136,7 +137,7 @@ public class AlternateUserValidationDialog extends Dialog { buttonComposite.setLayout(new GridLayout()); buttonComposite.setLayoutData(new GridData()); Button b = new Button(buttonComposite, SWT.PUSH); - b.setText(Policy.bind("AlternateUserValidationDialog.OK_6")); //$NON-NLS-1$ + b.setText(CVSUIMessages.AlternateUserValidationDialog_OK_6); //$NON-NLS-1$ data = new GridData(); data.widthHint = 70; b.setLayoutData(data); @@ -147,7 +148,7 @@ public class AlternateUserValidationDialog extends Dialog { }); buttonComposite.getShell().setDefaultButton(b); b = new Button(buttonComposite, SWT.PUSH); - b.setText(Policy.bind("AlternateUserValidationDialog.Cancel_7")); //$NON-NLS-1$ + b.setText(CVSUIMessages.AlternateUserValidationDialog_Cancel_7); //$NON-NLS-1$ data = new GridData(); data.widthHint = 70; b.setLayoutData(data); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AnnotateView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AnnotateView.java index 16590a009..4d4e7963c 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AnnotateView.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AnnotateView.java @@ -29,6 +29,7 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.ListViewer; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -105,7 +106,7 @@ public class AnnotateView extends ViewPart implements ISelectionChangedListener // Create default contents Label label = new Label(top, SWT.WRAP); - label.setText(Policy.bind("CVSAnnotateView.viewInstructions")); //$NON-NLS-1$ + label.setText(CVSUIMessages.CVSAnnotateView_viewInstructions); //$NON-NLS-1$ label.setLayoutData(new GridData(GridData.FILL_BOTH)); top.layout(); } @@ -161,7 +162,7 @@ public class AnnotateView extends ViewPart implements ISelectionChangedListener IDocumentProvider provider = editor.getDocumentProvider(); document = provider.getDocument(editor.getEditorInput()); - setPartName(Policy.bind("CVSAnnotateView.showFileAnnotation", new Object[] {cvsResource.getName()})); //$NON-NLS-1$ + setPartName(NLS.bind(CVSUIMessages.CVSAnnotateView_showFileAnnotation, (new Object[] {cvsResource.getName()}))); //$NON-NLS-1$ try { IResource localResource = cvsResource.getIResource(); if (localResource != null) { @@ -361,7 +362,7 @@ public class AnnotateView extends ViewPart implements ISelectionChangedListener return (ITextEditor)part; } else { // There is something really wrong so just bail - throw new PartInitException(Policy.bind("AnnotateView.0")); //$NON-NLS-1$ + throw new PartInitException(CVSUIMessages.AnnotateView_0); //$NON-NLS-1$ } } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AvoidableMessageDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AvoidableMessageDialog.java index 8984cd1e9..76782c4ec 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AvoidableMessageDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AvoidableMessageDialog.java @@ -42,7 +42,7 @@ public class AvoidableMessageDialog extends MessageDialog { GridData data = new GridData(); data.horizontalIndent = 50; dontShowAgain.setLayoutData(data); - dontShowAgain.setText(Policy.bind("AvoidableMessageDialog.dontShowAgain")); //$NON-NLS-1$ + dontShowAgain.setText(CVSUIMessages.AvoidableMessageDialog_dontShowAgain); //$NON-NLS-1$ dontShowAgain.setSelection(dontShow); dontShowAgain.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java index d055936de..9710e1b34 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java @@ -32,6 +32,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.team.core.TeamException; @@ -104,7 +105,7 @@ public class CVSCompareEditorInput extends CompareEditorInput { ICVSResource resource = edition; if (edition instanceof ICVSRemoteFile) { try { - return Policy.bind("nameAndRevision", resource.getName(), ((ICVSRemoteFile)edition).getRevision()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.nameAndRevision, new String[] { resource.getName(), ((ICVSRemoteFile)edition).getRevision() }); //$NON-NLS-1$ } catch (TeamException e) { // fall through } @@ -113,14 +114,14 @@ public class CVSCompareEditorInput extends CompareEditorInput { if (edition.isContainer()) { CVSTag tag = ((ICVSRemoteFolder)edition).getTag(); if (tag == null) { - return Policy.bind("CVSCompareEditorInput.inHead", edition.getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CVSCompareEditorInput_inHead, new String[] { edition.getName() }); //$NON-NLS-1$ } else if (tag.getType() == CVSTag.BRANCH) { - return Policy.bind("CVSCompareEditorInput.inBranch", new Object[] {edition.getName(), tag.getName()}); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CVSCompareEditorInput_inBranch, (new Object[] {edition.getName(), tag.getName()})); //$NON-NLS-1$ } else { - return Policy.bind("CVSCompareEditorInput.repository", new Object[] {edition.getName(), tag.getName()}); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CVSCompareEditorInput_repository, (new Object[] {edition.getName(), tag.getName()})); //$NON-NLS-1$ } } else { - return Policy.bind("CVSCompareEditorInput.repository", new Object[] {edition.getName(), resource.getSyncInfo().getRevision()}); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CVSCompareEditorInput_repository, (new Object[] {edition.getName(), resource.getSyncInfo().getRevision()})); //$NON-NLS-1$ } } catch (TeamException e) { handle(e); @@ -141,9 +142,9 @@ public class CVSCompareEditorInput extends CompareEditorInput { if (edition.isContainer()) { CVSTag tag = ((ICVSRemoteFolder)resource).getTag(); if (tag == null) { - return Policy.bind("CVSCompareEditorInput.headLabel"); //$NON-NLS-1$ + return CVSUIMessages.CVSCompareEditorInput_headLabel; //$NON-NLS-1$ } else if (tag.getType() == CVSTag.BRANCH) { - return Policy.bind("CVSCompareEditorInput.branchLabel", tag.getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CVSCompareEditorInput_branchLabel, new String[] { tag.getName() }); //$NON-NLS-1$ } else { return tag.getName(); } @@ -209,7 +210,7 @@ public class CVSCompareEditorInput extends CompareEditorInput { } else if (t instanceof TeamException) { error = ((TeamException)t).getStatus(); } else { - error = new Status(IStatus.ERROR, CVSUIPlugin.ID, 1, Policy.bind("internal"), t); //$NON-NLS-1$ + error = new Status(IStatus.ERROR, CVSUIPlugin.ID, 1, CVSUIMessages.internal, t); //$NON-NLS-1$ } setMessage(error.getMessage()); if (!(t instanceof TeamException)) { @@ -226,18 +227,18 @@ public class CVSCompareEditorInput extends CompareEditorInput { if (title == null) { if (ancestor != null) { - title = Policy.bind("CVSCompareEditorInput.titleAncestor", new Object[] {guessResourceName(), getVersionLabel(ancestor), getVersionLabel(left), getVersionLabel(right)} ); //$NON-NLS-1$ - toolTipText = Policy.bind("CVSCompareEditorInput.titleAncestor", new Object[] {guessResourcePath(), getVersionLabel(ancestor), getVersionLabel(left), getVersionLabel(right)} ); //$NON-NLS-1$ + title = NLS.bind(CVSUIMessages.CVSCompareEditorInput_titleAncestor, (new Object[] {guessResourceName(), getVersionLabel(ancestor), getVersionLabel(left), getVersionLabel(right)})); //$NON-NLS-1$ + toolTipText = NLS.bind(CVSUIMessages.CVSCompareEditorInput_titleAncestor, (new Object[] {guessResourcePath(), getVersionLabel(ancestor), getVersionLabel(left), getVersionLabel(right)})); //$NON-NLS-1$ } else { String leftName = null; if (left != null) leftName = left.getName(); String rightName = null; if (right != null) rightName = right.getName(); if (leftName != null && !leftName.equals(rightName)) { - title = Policy.bind("CVSCompareEditorInput.titleNoAncestorDifferent", new Object[] {leftName, getVersionLabel(left), rightName, getVersionLabel(right)} ); //$NON-NLS-1$ + title = NLS.bind(CVSUIMessages.CVSCompareEditorInput_titleNoAncestorDifferent, (new Object[] {leftName, getVersionLabel(left), rightName, getVersionLabel(right)})); //$NON-NLS-1$ } else { - title = Policy.bind("CVSCompareEditorInput.titleNoAncestor", new Object[] {guessResourceName(), getVersionLabel(left), getVersionLabel(right)} ); //$NON-NLS-1$ - title = Policy.bind("CVSCompareEditorInput.titleNoAncestor", new Object[] {guessResourcePath(), getVersionLabel(left), getVersionLabel(right)} ); //$NON-NLS-1$ + title = NLS.bind(CVSUIMessages.CVSCompareEditorInput_titleNoAncestor, (new Object[] {guessResourceName(), getVersionLabel(left), getVersionLabel(right)})); //$NON-NLS-1$ + title = NLS.bind(CVSUIMessages.CVSCompareEditorInput_titleNoAncestor, (new Object[] {guessResourcePath(), getVersionLabel(left), getVersionLabel(right)})); //$NON-NLS-1$ } } } @@ -278,7 +279,7 @@ public class CVSCompareEditorInput extends CompareEditorInput { protected Object prepareInput(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { final boolean threeWay = ancestor != null; if (right == null || left == null) { - setMessage(Policy.bind("CVSCompareEditorInput.different")); //$NON-NLS-1$ + setMessage(CVSUIMessages.CVSCompareEditorInput_different); //$NON-NLS-1$ return null; } @@ -299,7 +300,7 @@ public class CVSCompareEditorInput extends CompareEditorInput { protected void updateProgress(IProgressMonitor progressMonitor, Object node) { if (node instanceof ITypedElement) { ITypedElement element = (ITypedElement)node; - progressMonitor.subTask(Policy.bind("CompareEditorInput.fileProgress", new String[] {element.getName()})); //$NON-NLS-1$ + progressMonitor.subTask(NLS.bind(CVSUIMessages.CompareEditorInput_fileProgress, (new String[] {element.getName()}))); //$NON-NLS-1$ progressMonitor.worked(1); } } @@ -319,9 +320,9 @@ public class CVSCompareEditorInput extends CompareEditorInput { try { // do the diff Object result = null; - monitor.beginTask(Policy.bind("CVSCompareEditorInput.comparing"), 30); //$NON-NLS-1$ + monitor.beginTask(CVSUIMessages.CVSCompareEditorInput_comparing, 30); //$NON-NLS-1$ IProgressMonitor sub = new SubProgressMonitor(monitor, 30); - sub.beginTask(Policy.bind("CVSCompareEditorInput.comparing"), 100); //$NON-NLS-1$ + sub.beginTask(CVSUIMessages.CVSCompareEditorInput_comparing, 100); //$NON-NLS-1$ try { result = d.findDifferences(threeWay, sub, null, ancestor, left, right); } finally { @@ -428,7 +429,7 @@ public class CVSCompareEditorInput extends CompareEditorInput { CompareConfiguration cc = getCompareConfiguration(); ITypedElement l = node.getLeft(); if (l == null) { - cc.setLeftLabel(Policy.bind("CVSCompareEditorInput.0")); //$NON-NLS-1$ + cc.setLeftLabel(CVSUIMessages.CVSCompareEditorInput_0); //$NON-NLS-1$ cc.setLeftImage(null); } else { cc.setLeftLabel(getLabel(l)); @@ -436,7 +437,7 @@ public class CVSCompareEditorInput extends CompareEditorInput { } ITypedElement r = node.getRight(); if (r == null) { - cc.setRightLabel(Policy.bind("CVSCompareEditorInput.1")); //$NON-NLS-1$ + cc.setRightLabel(CVSUIMessages.CVSCompareEditorInput_1); //$NON-NLS-1$ cc.setRightImage(null); } else { cc.setRightLabel(getLabel(r)); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareRevisionsInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareRevisionsInput.java index d6bfe1d03..2cdb76fe3 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareRevisionsInput.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareRevisionsInput.java @@ -41,6 +41,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -110,7 +111,7 @@ public class CVSCompareRevisionsInput extends CompareEditorInput implements ISav try { new ProgressMonitorDialog(shell).run(false, false, runnable); } catch (InvocationTargetException e) { - CVSUIPlugin.openError(CVSUIPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow().getShell(), Policy.bind("TeamFile.saveChanges", resource.getName()), null, e); //$NON-NLS-1$ + CVSUIPlugin.openError(null, null, null, e); } catch (InterruptedException e) { // Ignore } @@ -143,7 +144,7 @@ public class CVSCompareRevisionsInput extends CompareEditorInput implements ISav try { ICVSRemoteFile currentEdition = (ICVSRemoteFile) CVSWorkspaceRoot.getRemoteResourceFor(resource); if (currentEdition != null && currentEdition.getRevision().equals(revisionName)) { - Policy.bind("currentRevision", revisionName); //$NON-NLS-1$ + NLS.bind(CVSUIMessages.currentRevision, new String[] { revisionName }); //$NON-NLS-1$ } else { return revisionName; } @@ -251,13 +252,13 @@ public class CVSCompareRevisionsInput extends CompareEditorInput implements ISav cc.setLeftEditable(true); cc.setRightEditable(false); String resourceName = resource.getName(); - String leftLabel = Policy.bind("CVSCompareRevisionsInput.workspace", new Object[] {resourceName}); //$NON-NLS-1$ + String leftLabel = NLS.bind(CVSUIMessages.CVSCompareRevisionsInput_workspace, (new Object[] {resourceName})); //$NON-NLS-1$ cc.setLeftLabel(leftLabel); - String rightLabel = Policy.bind("CVSCompareRevisionsInput.repository", new Object[] {resourceName}); //$NON-NLS-1$ + String rightLabel = NLS.bind(CVSUIMessages.CVSCompareRevisionsInput_repository, (new Object[] {resourceName})); //$NON-NLS-1$ cc.setRightLabel(rightLabel); } private void initializeActions() { - getRevisionAction = new Action(Policy.bind("HistoryView.getRevisionAction")) { //$NON-NLS-1$ + getRevisionAction = new Action(CVSUIMessages.HistoryView_getRevisionAction) { //$NON-NLS-1$ public void run() { try { new ProgressMonitorDialog(shell).run(false, true, new WorkspaceModifyOperation(null) { @@ -301,7 +302,7 @@ public class CVSCompareRevisionsInput extends CompareEditorInput implements ISav viewer.refresh(); } }; - getContentsAction = new Action(Policy.bind("HistoryView.getContentsAction")) { //$NON-NLS-1$ + getContentsAction = new Action(CVSUIMessages.HistoryView_getContentsAction) { //$NON-NLS-1$ public void run() { try { replaceLocalWithCurrentlySelectedRevision(); @@ -368,7 +369,7 @@ public class CVSCompareRevisionsInput extends CompareEditorInput implements ISav * @see org.eclipse.compare.CompareEditorInput#getTitle() */ public String getTitle() { - return Policy.bind("CVSCompareRevisionsInput.compareResourceAndVersions", new Object[] {resource.getFullPath().toString()}); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CVSCompareRevisionsInput_compareResourceAndVersions, (new Object[] {resource.getFullPath().toString()})); //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java index b479d71b2..9cccf9f5f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java @@ -126,8 +126,8 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork fBindings.entrySet(), contentsProvider, labelProvider, - Policy.bind("CVSDecoratorPreferencesPage.0")); //$NON-NLS-1$ - dialog.setTitle(Policy.bind("CVSDecoratorPreferencesPage.1")); //$NON-NLS-1$ + CVSUIMessages.CVSDecoratorPreferencesPage_0); //$NON-NLS-1$ + dialog.setTitle(CVSUIMessages.CVSDecoratorPreferencesPage_1); //$NON-NLS-1$ if (dialog.open() != Window.OK) return; @@ -169,20 +169,20 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork final Composite composite= SWTUtils.createHFillComposite(parent, SWTUtils.MARGINS_DEFAULT); - fDirty= SWTUtils.createCheckBox(composite, Policy.bind("CVSDecoratorPreferencesPage.2")); //$NON-NLS-1$ + fDirty= SWTUtils.createCheckBox(composite, CVSUIMessages.CVSDecoratorPreferencesPage_2); //$NON-NLS-1$ fDirty.addSelectionListener(this); - fHasRemote= SWTUtils.createCheckBox(composite, Policy.bind("CVSDecoratorPreferencesPage.3")); //$NON-NLS-1$ + fHasRemote= SWTUtils.createCheckBox(composite, CVSUIMessages.CVSDecoratorPreferencesPage_3); //$NON-NLS-1$ fHasRemote.addSelectionListener(this); - fAdded= SWTUtils.createCheckBox(composite, Policy.bind("CVSDecoratorPreferencesPage.4")); //$NON-NLS-1$ + fAdded= SWTUtils.createCheckBox(composite, CVSUIMessages.CVSDecoratorPreferencesPage_4); //$NON-NLS-1$ fAdded.addSelectionListener(this); - fNewResource= SWTUtils.createCheckBox(composite, Policy.bind("CVSDecoratorPreferencesPage.5")); //$NON-NLS-1$ + fNewResource= SWTUtils.createCheckBox(composite, CVSUIMessages.CVSDecoratorPreferencesPage_5); //$NON-NLS-1$ fNewResource.addSelectionListener(this); final TabItem item= new TabItem(parent, SWT.NONE); - item.setText(Policy.bind("CVSDecoratorPreferencesPage.6")); //$NON-NLS-1$ + item.setText(CVSUIMessages.CVSDecoratorPreferencesPage_6); //$NON-NLS-1$ item.setControl(composite); } @@ -237,16 +237,16 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork final Composite composite= SWTUtils.createHFillComposite(parent, SWTUtils.MARGINS_DEFAULT, 3); Dialog.applyDialogFont(composite); - fFileDecoration= new FormatEditor(composite, Policy.bind("CVSDecoratorPreferencesPage.7"), Policy.bind("CVSDecoratorPreferencesPage.8"), BINDINGS, ICVSUIConstants.PREF_FILETEXT_DECORATION); //$NON-NLS-1$ //$NON-NLS-2$ - fFolderDecoration= new FormatEditor(composite, Policy.bind("CVSDecoratorPreferencesPage.9"), Policy.bind("CVSDecoratorPreferencesPage.10"), FOLDER_BINDINGS, ICVSUIConstants.PREF_FOLDERTEXT_DECORATION); //$NON-NLS-1$ //$NON-NLS-2$ - fProjectDecoration= new FormatEditor(composite, Policy.bind("CVSDecoratorPreferencesPage.11"), Policy.bind("CVSDecoratorPreferencesPage.12"), FOLDER_BINDINGS, ICVSUIConstants.PREF_PROJECTTEXT_DECORATION); //$NON-NLS-1$ //$NON-NLS-2$ + fFileDecoration= new FormatEditor(composite, CVSUIMessages.CVSDecoratorPreferencesPage_7, CVSUIMessages.CVSDecoratorPreferencesPage_8, BINDINGS, ICVSUIConstants.PREF_FILETEXT_DECORATION); //$NON-NLS-1$ //$NON-NLS-2$ + fFolderDecoration= new FormatEditor(composite, CVSUIMessages.CVSDecoratorPreferencesPage_9, CVSUIMessages.CVSDecoratorPreferencesPage_10, FOLDER_BINDINGS, ICVSUIConstants.PREF_FOLDERTEXT_DECORATION); //$NON-NLS-1$ //$NON-NLS-2$ + fProjectDecoration= new FormatEditor(composite, CVSUIMessages.CVSDecoratorPreferencesPage_11, CVSUIMessages.CVSDecoratorPreferencesPage_12, FOLDER_BINDINGS, ICVSUIConstants.PREF_PROJECTTEXT_DECORATION); //$NON-NLS-1$ //$NON-NLS-2$ fFileDecoration.addModifyListener(this); fFolderDecoration.addModifyListener(this); fProjectDecoration.addModifyListener(this); SWTUtils.createPlaceholder(composite, 1, 3); - final Label dirtyLabel= SWTUtils.createLabel(composite, Policy.bind("CVSDecoratorPreferencesPage.13"), 1); //$NON-NLS-1$ + final Label dirtyLabel= SWTUtils.createLabel(composite, CVSUIMessages.CVSDecoratorPreferencesPage_13, 1); //$NON-NLS-1$ dirtyLabel.setLayoutData(new GridData()); dirtyFlag = new Text(composite, SWT.BORDER); @@ -255,7 +255,7 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork SWTUtils.createPlaceholder(composite, 1, 1); - final Label addedLabel= SWTUtils.createLabel(composite, Policy.bind("CVSDecoratorPreferencesPage.14"), 1); //$NON-NLS-1$ + final Label addedLabel= SWTUtils.createLabel(composite, CVSUIMessages.CVSDecoratorPreferencesPage_14, 1); //$NON-NLS-1$ addedLabel.setLayoutData(new GridData()); addedFlag = new Text(composite, SWT.BORDER); @@ -266,7 +266,7 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork SWTUtils.createPlaceholder(composite, 1, 3); final TabItem item= new TabItem(parent, SWT.NONE); - item.setText(Policy.bind("CVSDecoratorPreferencesPage.15")); //$NON-NLS-1$ + item.setText(CVSUIMessages.CVSDecoratorPreferencesPage_15); //$NON-NLS-1$ item.setControl(composite); } @@ -327,18 +327,18 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork final Composite composite= SWTUtils.createHFillComposite(parent, SWTUtils.MARGINS_DEFAULT); Dialog.applyDialogFont(composite); - fShowDirty= SWTUtils.createCheckBox(composite, Policy.bind("CVSDecoratorPreferencesPage.16")); //$NON-NLS-1$ - SWTUtils.createLabel(composite, Policy.bind("CVSDecoratorPreferencesPage.17")); //$NON-NLS-1$ + fShowDirty= SWTUtils.createCheckBox(composite, CVSUIMessages.CVSDecoratorPreferencesPage_16); //$NON-NLS-1$ + SWTUtils.createLabel(composite, CVSUIMessages.CVSDecoratorPreferencesPage_17); //$NON-NLS-1$ - fUseFontDecorations= SWTUtils.createCheckBox(composite, Policy.bind("CVSDecoratorPreferencesPage.18")); //$NON-NLS-1$ + fUseFontDecorations= SWTUtils.createCheckBox(composite, CVSUIMessages.CVSDecoratorPreferencesPage_18); //$NON-NLS-1$ - SWTUtils.createPreferenceLink((IWorkbenchPreferenceContainer) getContainer(), composite, Policy.bind("CVSDecoratorPreferencesPage.19"), Policy.bind("CVSDecoratorPreferencesPage.20")); //$NON-NLS-1$ //$NON-NLS-2$ + SWTUtils.createPreferenceLink((IWorkbenchPreferenceContainer) getContainer(), composite, CVSUIMessages.CVSDecoratorPreferencesPage_19, CVSUIMessages.CVSDecoratorPreferencesPage_20); //$NON-NLS-1$ //$NON-NLS-2$ fShowDirty.addSelectionListener(this); fUseFontDecorations.addSelectionListener(this); final TabItem item= new TabItem(parent, SWT.NONE); - item.setText(Policy.bind("CVSDecoratorPreferencesPage.21")); //$NON-NLS-1$ + item.setText(CVSUIMessages.CVSDecoratorPreferencesPage_21); //$NON-NLS-1$ item.setControl(composite); } @@ -490,22 +490,22 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork static { BINDINGS= new HashMap(); - BINDINGS.put(CVSDecoratorConfiguration.RESOURCE_NAME, Policy.bind("CVSDecoratorPreferencesPage.22")); //$NON-NLS-1$ - BINDINGS.put(CVSDecoratorConfiguration.RESOURCE_TAG, Policy.bind("CVSDecoratorPreferencesPage.23")); //$NON-NLS-1$ - BINDINGS.put(CVSDecoratorConfiguration.FILE_KEYWORD, Policy.bind("CVSDecoratorPreferencesPage.24")); //$NON-NLS-1$ - BINDINGS.put(CVSDecoratorConfiguration.FILE_REVISION, Policy.bind("CVSDecoratorPreferencesPage.25")); //$NON-NLS-1$ - BINDINGS.put(CVSDecoratorConfiguration.DIRTY_FLAG, Policy.bind("CVSDecoratorPreferencesPage.26")); //$NON-NLS-1$ - BINDINGS.put(CVSDecoratorConfiguration.ADDED_FLAG, Policy.bind("CVSDecoratorPreferencesPage.27")); //$NON-NLS-1$ + BINDINGS.put(CVSDecoratorConfiguration.RESOURCE_NAME, CVSUIMessages.CVSDecoratorPreferencesPage_22); //$NON-NLS-1$ + BINDINGS.put(CVSDecoratorConfiguration.RESOURCE_TAG, CVSUIMessages.CVSDecoratorPreferencesPage_23); //$NON-NLS-1$ + BINDINGS.put(CVSDecoratorConfiguration.FILE_KEYWORD, CVSUIMessages.CVSDecoratorPreferencesPage_24); //$NON-NLS-1$ + BINDINGS.put(CVSDecoratorConfiguration.FILE_REVISION, CVSUIMessages.CVSDecoratorPreferencesPage_25); //$NON-NLS-1$ + BINDINGS.put(CVSDecoratorConfiguration.DIRTY_FLAG, CVSUIMessages.CVSDecoratorPreferencesPage_26); //$NON-NLS-1$ + BINDINGS.put(CVSDecoratorConfiguration.ADDED_FLAG, CVSUIMessages.CVSDecoratorPreferencesPage_27); //$NON-NLS-1$ FOLDER_BINDINGS= new HashMap(); - FOLDER_BINDINGS.put(CVSDecoratorConfiguration.RESOURCE_NAME, Policy.bind("CVSDecoratorPreferencesPage.28")); //$NON-NLS-1$ - FOLDER_BINDINGS.put(CVSDecoratorConfiguration.RESOURCE_TAG, Policy.bind("CVSDecoratorPreferencesPage.29")); //$NON-NLS-1$ - FOLDER_BINDINGS.put(CVSDecoratorConfiguration.REMOTELOCATION_HOST, Policy.bind("CVSDecoratorPreferencesPage.30")); //$NON-NLS-1$ - FOLDER_BINDINGS.put(CVSDecoratorConfiguration.REMOTELOCATION_METHOD, Policy.bind("CVSDecoratorPreferencesPage.31")); //$NON-NLS-1$ - FOLDER_BINDINGS.put(CVSDecoratorConfiguration.REMOTELOCATION_USER, Policy.bind("CVSDecoratorPreferencesPage.32")); //$NON-NLS-1$ - FOLDER_BINDINGS.put(CVSDecoratorConfiguration.REMOTELOCATION_ROOT, Policy.bind("CVSDecoratorPreferencesPage.33")); //$NON-NLS-1$ - FOLDER_BINDINGS.put(CVSDecoratorConfiguration.REMOTELOCATION_REPOSITORY, Policy.bind("CVSDecoratorPreferencesPage.34")); //$NON-NLS-1$ - FOLDER_BINDINGS.put(CVSDecoratorConfiguration.DIRTY_FLAG, Policy.bind("CVSDecoratorPreferencesPage.35")); //$NON-NLS-1$ + FOLDER_BINDINGS.put(CVSDecoratorConfiguration.RESOURCE_NAME, CVSUIMessages.CVSDecoratorPreferencesPage_28); //$NON-NLS-1$ + FOLDER_BINDINGS.put(CVSDecoratorConfiguration.RESOURCE_TAG, CVSUIMessages.CVSDecoratorPreferencesPage_29); //$NON-NLS-1$ + FOLDER_BINDINGS.put(CVSDecoratorConfiguration.REMOTELOCATION_HOST, CVSUIMessages.CVSDecoratorPreferencesPage_30); //$NON-NLS-1$ + FOLDER_BINDINGS.put(CVSDecoratorConfiguration.REMOTELOCATION_METHOD, CVSUIMessages.CVSDecoratorPreferencesPage_31); //$NON-NLS-1$ + FOLDER_BINDINGS.put(CVSDecoratorConfiguration.REMOTELOCATION_USER, CVSUIMessages.CVSDecoratorPreferencesPage_32); //$NON-NLS-1$ + FOLDER_BINDINGS.put(CVSDecoratorConfiguration.REMOTELOCATION_ROOT, CVSUIMessages.CVSDecoratorPreferencesPage_33); //$NON-NLS-1$ + FOLDER_BINDINGS.put(CVSDecoratorConfiguration.REMOTELOCATION_REPOSITORY, CVSUIMessages.CVSDecoratorPreferencesPage_34); //$NON-NLS-1$ + FOLDER_BINDINGS.put(CVSDecoratorConfiguration.DIRTY_FLAG, CVSUIMessages.CVSDecoratorPreferencesPage_35); //$NON-NLS-1$ final PreviewFile project= new PreviewFile("Project", IResource.PROJECT, false, false, false, false, true, null, "v1_0"); //$NON-NLS-1$ //$NON-NLS-2$ final ArrayList children= new ArrayList(); 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 7c0aae2c5..462bacc9d 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 @@ -50,9 +50,9 @@ public class CVSFilePropertiesPage extends CVSPropertiesPage { ICVSFile cvsResource = CVSWorkspaceRoot.getCVSFileFor(file); if (!cvsResource.isManaged()) { if (cvsResource.isIgnored()) { - createLabel(composite, Policy.bind("CVSFilePropertiesPage.ignored")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSFilePropertiesPage_ignored); //$NON-NLS-1$ } else { - createLabel(composite, Policy.bind("CVSFilePropertiesPage.notManaged")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSFilePropertiesPage_notManaged); //$NON-NLS-1$ } createLabel(composite, ""); //$NON-NLS-1$ return composite; @@ -62,33 +62,33 @@ public class CVSFilePropertiesPage extends CVSPropertiesPage { if (syncInfo.isAdded()) { - createLabel(composite, Policy.bind("CVSFilePropertiesPage.isAdded"), 2); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSFilePropertiesPage_isAdded, 2); //$NON-NLS-1$ } else { // Base - createLabel(composite, Policy.bind("CVSFilePropertiesPage.baseRevision")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSFilePropertiesPage_baseRevision); //$NON-NLS-1$ createLabel(composite, syncInfo.getRevision()); Date baseTime = syncInfo.getTimeStamp(); if (baseTime != null) { - createLabel(composite, Policy.bind("CVSFilePropertiesPage.baseTimestamp")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSFilePropertiesPage_baseTimestamp); //$NON-NLS-1$ createLabel(composite, DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).format(syncInfo.getTimeStamp())); } // Modified - createLabel(composite, Policy.bind("CVSFilePropertiesPage.modified")); //$NON-NLS-1$ - createLabel(composite, cvsResource.isModified(null) ? Policy.bind("yes") : Policy.bind("no")); //$NON-NLS-1$ //$NON-NLS-2$ + createLabel(composite, CVSUIMessages.CVSFilePropertiesPage_modified); //$NON-NLS-1$ + createLabel(composite, cvsResource.isModified(null) ? CVSUIMessages.yes : CVSUIMessages.no); //$NON-NLS-1$ //$NON-NLS-2$ } // Keyword Mode - createLabel(composite, Policy.bind("CVSFilePropertiesPage.keywordMode")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSFilePropertiesPage_keywordMode); //$NON-NLS-1$ createLabel(composite, syncInfo.getKeywordMode().getLongDisplayText()); // Tag - createLabel(composite, Policy.bind("CVSFilePropertiesPage.tag")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSFilePropertiesPage_tag); //$NON-NLS-1$ CVSTag tag = Util.getAccurateFileTag(cvsResource); createLabel(composite, getTagLabel(tag)); } catch (TeamException e) { // Display error text - createLabel(composite, Policy.bind("CVSFilePropertiesPage.error")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSFilePropertiesPage_error); //$NON-NLS-1$ createLabel(composite, ""); //$NON-NLS-1$ } WorkbenchHelp.setHelp(getControl(), IHelpContextIds.FILE_PROPERTY_PAGE); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java index aafb34efa..68904c852 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java @@ -52,23 +52,23 @@ public class CVSFolderPropertiesPage extends CVSPropertiesPage { ICVSFolder cvsResource = CVSWorkspaceRoot.getCVSFolderFor(folder); if (!cvsResource.isManaged()) { if (cvsResource.isIgnored()) { - createLabel(composite, Policy.bind("CVSFolderPropertiesPage.ignored"), 2); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSFolderPropertiesPage_ignored, 2); //$NON-NLS-1$ } else { - createLabel(composite, Policy.bind("CVSFolderPropertiesPage.notManaged"), 2); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSFolderPropertiesPage_notManaged, 2); //$NON-NLS-1$ } } else if (!cvsResource.isCVSFolder()) { // We have a managed folder which is not a cvs folder. // This is really an invalid state but it does happen once in a while - createLabel(composite, Policy.bind("CVSFolderPropertiesPage.notCVSFolder"), 2); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSFolderPropertiesPage_notCVSFolder, 2); //$NON-NLS-1$ } else { FolderSyncInfo syncInfo = cvsResource.getFolderSyncInfo(); - createLabel(composite, Policy.bind("CVSFolderPropertiesPage.root")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSFolderPropertiesPage_root); //$NON-NLS-1$ root = createLabel(composite, syncInfo.getRoot()); - createLabel(composite, Policy.bind("CVSFolderPropertiesPage.repository")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSFolderPropertiesPage_repository); //$NON-NLS-1$ repository = createLabel(composite, syncInfo.getRepository()); // Tag - createLabel(composite, Policy.bind("CVSFilePropertiesPage.tag")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSFilePropertiesPage_tag); //$NON-NLS-1$ CVSTag tag = syncInfo.getTag(); if (tag != null && tag.getType() == CVSTag.BRANCH) { @@ -79,15 +79,15 @@ public class CVSFolderPropertiesPage extends CVSPropertiesPage { // Static-ness if (syncInfo.getIsStatic()) { - createLabel(composite, Policy.bind("CVSFolderPropertiesPage.static")); //$NON-NLS-1$ - createLabel(composite, syncInfo.getIsStatic() ? Policy.bind("yes") : Policy.bind("no")); //$NON-NLS-1$ //$NON-NLS-2$ + createLabel(composite, CVSUIMessages.CVSFolderPropertiesPage_static); //$NON-NLS-1$ + createLabel(composite, syncInfo.getIsStatic() ? CVSUIMessages.yes : CVSUIMessages.no); //$NON-NLS-1$ //$NON-NLS-2$ } createLabel(composite, "", 2); // spacer //$NON-NLS-1$ // Allow the folder to be disconnected from CVS control final Button disconnect = new Button(composite, SWT.NONE); - disconnect.setText(Policy.bind("CVSFolderPropertiesPage.disconnect")); //$NON-NLS-1$ + disconnect.setText(CVSUIMessages.CVSFolderPropertiesPage_disconnect); //$NON-NLS-1$ GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END); data.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT); int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); @@ -97,8 +97,8 @@ public class CVSFolderPropertiesPage extends CVSPropertiesPage { public void handleEvent (Event event) { // perform a disconnect if (disconnectFolder()) { - root.setText(Policy.bind("CVSFilePropertiesPage.none")); //$NON-NLS-1$ - repository.setText(Policy.bind("CVSFilePropertiesPage.none")); //$NON-NLS-1$ + root.setText(CVSUIMessages.CVSFilePropertiesPage_none); //$NON-NLS-1$ + repository.setText(CVSUIMessages.CVSFilePropertiesPage_none); //$NON-NLS-1$ disconnect.setEnabled(false); } } @@ -106,7 +106,7 @@ public class CVSFolderPropertiesPage extends CVSPropertiesPage { } } catch (TeamException e) { // Display error text - createLabel(composite, Policy.bind("CVSFilePropertiesPage.error"), 2); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSFilePropertiesPage_error, 2); //$NON-NLS-1$ } WorkbenchHelp.setHelp(getControl(), IHelpContextIds.FOLDER_PROPERTY_PAGE); Dialog.applyDialogFont(parent); @@ -152,7 +152,7 @@ public class CVSFolderPropertiesPage extends CVSPropertiesPage { } private boolean disconnectFolder() { - if (MessageDialog.openQuestion(getShell(), Policy.bind("CVSFolderPropertiesPage.disconnectTitle"), Policy.bind("CVSFolderPropertiesPage.disconnectQuestion"))) { //$NON-NLS-1$ //$NON-NLS-2$ + if (MessageDialog.openQuestion(getShell(), CVSUIMessages.CVSFolderPropertiesPage_disconnectTitle, CVSUIMessages.CVSFolderPropertiesPage_disconnectQuestion)) { //$NON-NLS-1$ //$NON-NLS-2$ final ICVSFolder cvsFolder = CVSWorkspaceRoot.getCVSFolderFor(folder); try { PlatformUI.getWorkbench().getProgressService().run(true, false, new IRunnableWithProgress() { 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 066c56fb9..a5fc5bf62 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 @@ -40,7 +40,7 @@ public class CVSLightweightDecorator extends LabelProvider implements ILightweig // Decorator id as defined in the decorator extension point public final static String ID = "org.eclipse.team.cvs.ui.decorator"; //$NON-NLS-1$ - private static ExceptionCollector exceptions = new ExceptionCollector(Policy.bind("CVSDecorator.exceptionMessage"), CVSUIPlugin.ID, IStatus.ERROR, CVSUIPlugin.getPlugin().getLog()); //$NON-NLS-1$; + private static ExceptionCollector exceptions = new ExceptionCollector(CVSUIMessages.CVSDecorator_exceptionMessage, CVSUIPlugin.ID, IStatus.ERROR, CVSUIPlugin.getPlugin().getLog()); //$NON-NLS-1$; private static String DECORATOR_FORMAT = "yyyy/MM/dd HH:mm:ss"; //$NON-NLS-1$ private static SimpleDateFormat decorateFormatter = new SimpleDateFormat(DECORATOR_FORMAT, Locale.getDefault()); 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 bf390a3c8..48b34f2eb 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 @@ -335,7 +335,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref ++index; } - COMPRESSION_LABELS= new String [] { Policy.bind("CVSPreferencesPage.0"), Policy.bind("CVSPreferencesPage.1"), Policy.bind("CVSPreferencesPage.2"), Policy.bind("CVSPreferencesPage.3"), Policy.bind("CVSPreferencesPage.4"), Policy.bind("CVSPreferencesPage.5"), Policy.bind("CVSPreferencesPage.6"), Policy.bind("CVSPreferencesPage.7"), Policy.bind("CVSPreferencesPage.8"), Policy.bind("CVSPreferencesPage.9") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ + COMPRESSION_LABELS= new String [] { CVSUIMessages.CVSPreferencesPage_0, CVSUIMessages.CVSPreferencesPage_1, CVSUIMessages.CVSPreferencesPage_2, CVSUIMessages.CVSPreferencesPage_3, CVSUIMessages.CVSPreferencesPage_4, CVSUIMessages.CVSPreferencesPage_5, CVSUIMessages.CVSPreferencesPage_6, CVSUIMessages.CVSPreferencesPage_7, CVSUIMessages.CVSPreferencesPage_8, CVSUIMessages.CVSPreferencesPage_9 }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ COMPRESSION_VALUES= new Integer [COMPRESSION_LABELS.length]; for (int i = 0; i < COMPRESSION_VALUES.length; i++) { COMPRESSION_VALUES[i]= new Integer(i); @@ -346,13 +346,13 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref PERSPECTIVE_LABELS= new String [perspectives.length + 1]; Arrays.sort(perspectives, new PerspectiveDescriptorComparator()); PERSPECTIVE_VALUES[0]= ICVSUIConstants.OPTION_NO_PERSPECTIVE; - PERSPECTIVE_LABELS[0]= Policy.bind("CVSPreferencesPage.10"); //$NON-NLS-1$ + PERSPECTIVE_LABELS[0]= CVSUIMessages.CVSPreferencesPage_10; //$NON-NLS-1$ for (int i = 0; i < perspectives.length; i++) { PERSPECTIVE_VALUES[i + 1]= perspectives[i].getId(); PERSPECTIVE_LABELS[i + 1]= perspectives[i].getLabel(); } - YES_NO_PROMPT= new String [] { Policy.bind("CVSPreferencesPage.11"), Policy.bind("CVSPreferencesPage.12"), Policy.bind("CVSPreferencesPage.13") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + YES_NO_PROMPT= new String [] { CVSUIMessages.CVSPreferencesPage_11, CVSUIMessages.CVSPreferencesPage_12, CVSUIMessages.CVSPreferencesPage_13 }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ /** * Handle deleted perspectives */ @@ -384,18 +384,18 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref private Composite createGeneralTab(final TabFolder tabFolder) { final Composite composite = SWTUtils.createHFillComposite(tabFolder, SWTUtils.MARGINS_DEFAULT); final TabItem tab= new TabItem(tabFolder, SWT.NONE); - tab.setText(Policy.bind("CVSPreferencesPage.14")); //$NON-NLS-1$ + tab.setText(CVSUIMessages.CVSPreferencesPage_14); //$NON-NLS-1$ tab.setControl(composite); - new Checkbox(composite, ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION, Policy.bind("CVSPreferencesPage.15"), IHelpContextIds.PREF_DETERMINE_SERVER_VERSION); //$NON-NLS-1$ - new Checkbox(composite, ICVSUIConstants.PREF_CONFIRM_MOVE_TAG, Policy.bind("CVSPreferencesPage.16"), IHelpContextIds.PREF_CONFIRM_MOVE_TAG); //$NON-NLS-1$ - new Checkbox(composite, ICVSUIConstants.PREF_DEBUG_PROTOCOL, Policy.bind("CVSPreferencesPage.17"), IHelpContextIds.PREF_DEBUG_PROTOCOL); //$NON-NLS-1$ - new Checkbox(composite, ICVSUIConstants.PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG, Policy.bind("CVSPreferencesPage.18"), IHelpContextIds.PREF_AUTOREFRESH_TAG); //$NON-NLS-1$ + new Checkbox(composite, ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION, CVSUIMessages.CVSPreferencesPage_15, IHelpContextIds.PREF_DETERMINE_SERVER_VERSION); //$NON-NLS-1$ + new Checkbox(composite, ICVSUIConstants.PREF_CONFIRM_MOVE_TAG, CVSUIMessages.CVSPreferencesPage_16, IHelpContextIds.PREF_CONFIRM_MOVE_TAG); //$NON-NLS-1$ + new Checkbox(composite, ICVSUIConstants.PREF_DEBUG_PROTOCOL, CVSUIMessages.CVSPreferencesPage_17, IHelpContextIds.PREF_DEBUG_PROTOCOL); //$NON-NLS-1$ + new Checkbox(composite, ICVSUIConstants.PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG, CVSUIMessages.CVSPreferencesPage_18, IHelpContextIds.PREF_AUTOREFRESH_TAG); //$NON-NLS-1$ final Composite textComposite= SWTUtils.createHFillComposite(composite, SWTUtils.MARGINS_NONE, 2); new TextField( textComposite, ICVSUIConstants.PREF_COMMIT_FILES_DISPLAY_THRESHOLD, - Policy.bind("CVSPreferencesPage.20"), //$NON-NLS-1$ + CVSUIMessages.CVSPreferencesPage_20, //$NON-NLS-1$ null) { protected void modifyText(Text text) { // Parse the timeout value @@ -405,11 +405,11 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref setErrorMessage(null); setValid(true); } else { - setErrorMessage(Policy.bind("CVSPreferencesPage.21")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.CVSPreferencesPage_21); //$NON-NLS-1$ setValid(false); } } catch (NumberFormatException ex) { - setErrorMessage(Policy.bind("CVSPreferencesPage.22")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.CVSPreferencesPage_22); //$NON-NLS-1$ setValid(false); } } @@ -421,14 +421,14 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref private Composite createConnectionTab(final TabFolder tabFolder) { final Composite composite = SWTUtils.createHFillComposite(tabFolder, SWTUtils.MARGINS_DEFAULT); final TabItem tab= new TabItem(tabFolder, SWT.NONE); - tab.setText(Policy.bind("CVSPreferencesPage.19")); //$NON-NLS-1$ + tab.setText(CVSUIMessages.CVSPreferencesPage_19); //$NON-NLS-1$ tab.setControl(composite); final Composite textComposite= SWTUtils.createHFillComposite(composite, SWTUtils.MARGINS_NONE, 2); new TextField( textComposite, ICVSUIConstants.PREF_TIMEOUT, - Policy.bind("CVSPreferencesPage.23"), //$NON-NLS-1$ + CVSUIMessages.CVSPreferencesPage_23, //$NON-NLS-1$ IHelpContextIds.PREF_COMMS_TIMEOUT) { protected void modifyText(Text text) { // Parse the timeout value @@ -438,11 +438,11 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref setErrorMessage(null); setValid(true); } else { - setErrorMessage(Policy.bind("CVSPreferencesPage.24")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.CVSPreferencesPage_24); //$NON-NLS-1$ setValid(false); } } catch (NumberFormatException ex) { - setErrorMessage(Policy.bind("CVSPreferencesPage.25")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.CVSPreferencesPage_25); //$NON-NLS-1$ setValid(false); } } @@ -451,15 +451,15 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref final ComboBox quietnessCombo = new IntegerComboBox( textComposite, ICVSUIConstants.PREF_QUIETNESS, - Policy.bind("CVSPreferencesPage.26"), //$NON-NLS-1$ + CVSUIMessages.CVSPreferencesPage_26, //$NON-NLS-1$ IHelpContextIds.PREF_QUIET, - new String [] { Policy.bind("CVSPreferencesPage.27"), Policy.bind("CVSPreferencesPage.28"), Policy.bind("CVSPreferencesPage.29") }, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + new String [] { CVSUIMessages.CVSPreferencesPage_27, CVSUIMessages.CVSPreferencesPage_28, CVSUIMessages.CVSPreferencesPage_29 }, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ new Integer [] { new Integer(0), new Integer(1), new Integer(2)}); quietnessCombo.getCombo().addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { if (getQuietnessOptionFor(quietnessCombo.getCombo().getSelectionIndex()).equals(Command.SILENT)) { - MessageDialog.openWarning(getShell(), Policy.bind("CVSPreferencesPage.30"), Policy.bind("CVSPreferencesPage.31")); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openWarning(getShell(), CVSUIMessages.CVSPreferencesPage_30, CVSUIMessages.CVSPreferencesPage_31); //$NON-NLS-1$ //$NON-NLS-2$ } } public void widgetDefaultSelected(SelectionEvent e) { @@ -470,7 +470,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref new IntegerComboBox( textComposite, ICVSUIConstants.PREF_COMPRESSION_LEVEL, - Policy.bind("CVSPreferencesPage.32"), //$NON-NLS-1$ + CVSUIMessages.CVSPreferencesPage_32, //$NON-NLS-1$ IHelpContextIds.PREF_COMPRESSION, COMPRESSION_LABELS, COMPRESSION_VALUES); @@ -481,18 +481,18 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref private Composite createFilesFoldersTab(final TabFolder tabFolder) { final Composite composite = SWTUtils.createHFillComposite(tabFolder, SWTUtils.MARGINS_DEFAULT); final TabItem tab= new TabItem(tabFolder, SWT.NONE); - tab.setText(Policy.bind("CVSPreferencesPage.33")); //$NON-NLS-1$ + tab.setText(CVSUIMessages.CVSPreferencesPage_33); //$NON-NLS-1$ tab.setControl(composite); - new Checkbox(composite, ICVSUIConstants.PREF_REPOSITORIES_ARE_BINARY, Policy.bind("CVSPreferencesPage.34"), IHelpContextIds.PREF_TREAT_NEW_FILE_AS_BINARY); //$NON-NLS-1$ - new Checkbox(composite, ICVSUIConstants.PREF_USE_PLATFORM_LINEEND, Policy.bind("CVSPreferencesPage.35"), IHelpContextIds.PREF_LINEEND); //$NON-NLS-1$ - new Checkbox(composite, ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES, Policy.bind("CVSPreferencesPage.36"), IHelpContextIds.PREF_PRUNE); //$NON-NLS-1$ - new Checkbox(composite, ICVSUIConstants.PREF_REPLACE_UNMANAGED, Policy.bind("CVSPreferencesPage.37"), IHelpContextIds.PREF_REPLACE_DELETE_UNMANAGED); //$NON-NLS-1$ + new Checkbox(composite, ICVSUIConstants.PREF_REPOSITORIES_ARE_BINARY, CVSUIMessages.CVSPreferencesPage_34, IHelpContextIds.PREF_TREAT_NEW_FILE_AS_BINARY); //$NON-NLS-1$ + new Checkbox(composite, ICVSUIConstants.PREF_USE_PLATFORM_LINEEND, CVSUIMessages.CVSPreferencesPage_35, IHelpContextIds.PREF_LINEEND); //$NON-NLS-1$ + new Checkbox(composite, ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES, CVSUIMessages.CVSPreferencesPage_36, IHelpContextIds.PREF_PRUNE); //$NON-NLS-1$ + new Checkbox(composite, ICVSUIConstants.PREF_REPLACE_UNMANAGED, CVSUIMessages.CVSPreferencesPage_37, IHelpContextIds.PREF_REPLACE_DELETE_UNMANAGED); //$NON-NLS-1$ SWTUtils.createPlaceholder(composite, 1); final Composite bottom= SWTUtils.createHFillComposite(composite, SWTUtils.MARGINS_NONE, 2); new StringComboBox( bottom, ICVSUIConstants.PREF_TEXT_KSUBST, - Policy.bind("CVSPreferencesPage.38"), //$NON-NLS-1$ + CVSUIMessages.CVSPreferencesPage_38, //$NON-NLS-1$ IHelpContextIds.PREF_KEYWORDMODE, KSUBST_LABELS, KSUBST_VALUES); @@ -503,20 +503,20 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref final Composite composite = SWTUtils.createHFillComposite(tabFolder, SWTUtils.MARGINS_DEFAULT, 1); final TabItem tab= new TabItem(tabFolder, SWT.NONE); - tab.setText(Policy.bind("CVSPreferencesPage.39")); //$NON-NLS-1$ + tab.setText(CVSUIMessages.CVSPreferencesPage_39); //$NON-NLS-1$ tab.setControl(composite); new StringRadioButtons( composite, ICVSUIConstants.PREF_ALLOW_EMPTY_COMMIT_COMMENTS, - Policy.bind("CVSPreferencesPage.40"), //$NON-NLS-1$ + CVSUIMessages.CVSPreferencesPage_40, //$NON-NLS-1$ IHelpContextIds.PREF_ALLOW_EMPTY_COMMIT_COMMENTS, YES_NO_PROMPT, new String [] { MessageDialogWithToggle.ALWAYS, MessageDialogWithToggle.NEVER, MessageDialogWithToggle.PROMPT }); new IntegerRadioButtons(composite, ICVSUIConstants.PREF_SAVE_DIRTY_EDITORS, - Policy.bind("CVSPreferencesPage.41"), //$NON-NLS-1$ + CVSUIMessages.CVSPreferencesPage_41, //$NON-NLS-1$ IHelpContextIds.PREF_SAVE_DIRTY_EDITORS, YES_NO_PROMPT, new Integer [] { new Integer(ICVSUIConstants.OPTION_AUTOMATIC), new Integer(ICVSUIConstants.OPTION_NEVER), new Integer(ICVSUIConstants.OPTION_PROMPT)}); @@ -524,7 +524,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref new StringRadioButtons( composite, ICVSUIConstants.PREF_CHANGE_PERSPECTIVE_ON_SHOW_ANNOTATIONS, - Policy.bind("CVSPreferencesPage.42"), //$NON-NLS-1$ + CVSUIMessages.CVSPreferencesPage_42, //$NON-NLS-1$ IHelpContextIds.PREF_CHANGE_PERSPECTIVE_ON_SHOW_ANNOTATIONS, YES_NO_PROMPT, new String [] { MessageDialogWithToggle.ALWAYS, MessageDialogWithToggle.NEVER, MessageDialogWithToggle.PROMPT } @@ -534,7 +534,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref new StringComboBox( composite, ICVSUIConstants.PREF_DEFAULT_PERSPECTIVE_FOR_SHOW_ANNOTATIONS, - Policy.bind("CVSPreferencesPage.43"), //$NON-NLS-1$ + CVSUIMessages.CVSPreferencesPage_43, //$NON-NLS-1$ IHelpContextIds.PREF_DEFAULT_PERSPECTIVE_FOR_SHOW_ANNOTATIONS, PERSPECTIVE_LABELS, PERSPECTIVE_VALUES); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java index 65784e7af..47d0f8ce4 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java @@ -29,6 +29,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -122,10 +123,10 @@ public class CVSProjectPropertiesPage extends CVSPropertiesPage { createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); } protected Control createDialogArea(Composite parent) { - parent.getShell().setText(Policy.bind("CVSProjectPropertiesPage.Select_a_Repository_1")); //$NON-NLS-1$ + parent.getShell().setText(CVSUIMessages.CVSProjectPropertiesPage_Select_a_Repository_1); //$NON-NLS-1$ Composite composite = (Composite) super.createDialogArea(parent); - createLabel(composite, Policy.bind("CVSProjectPropertiesPage.Select_a_CVS_repository_location_to_share_the_project_with__2"), 1); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSProjectPropertiesPage_Select_a_CVS_repository_location_to_share_the_project_with__2, 1); //$NON-NLS-1$ Table table = new Table(composite, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL); GridData data = new GridData(GridData.FILL_HORIZONTAL); data.heightHint = TABLE_HEIGHT_HINT; @@ -160,7 +161,7 @@ public class CVSProjectPropertiesPage extends CVSPropertiesPage { }); viewer.setInput(compatibleLocatons); - final Button compatibleButton = createCheckBox(composite, Policy.bind("CVSProjectPropertiesPage.31")); //$NON-NLS-1$ + final Button compatibleButton = createCheckBox(composite, CVSUIMessages.CVSProjectPropertiesPage_31); //$NON-NLS-1$ compatibleButton.setSelection(showCompatible); compatibleButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -194,31 +195,31 @@ public class CVSProjectPropertiesPage extends CVSPropertiesPage { layout.numColumns = 2; composite.setLayout(layout); - Label label = createLabel(composite, Policy.bind("CVSProjectPropertiesPage.connectionType"), 1); //$NON-NLS-1$ + Label label = createLabel(composite, CVSUIMessages.CVSProjectPropertiesPage_connectionType, 1); //$NON-NLS-1$ methodText = createReadOnlyText(composite, "", 1); //$NON-NLS-1$ - label = createLabel(composite, Policy.bind("CVSProjectPropertiesPage.user"), 1); //$NON-NLS-1$ + label = createLabel(composite, CVSUIMessages.CVSProjectPropertiesPage_user, 1); //$NON-NLS-1$ userText = createReadOnlyText(composite, "", 1); //$NON-NLS-1$ - label = createLabel(composite, Policy.bind("CVSPropertiesPage.host"), 1); //$NON-NLS-1$ + label = createLabel(composite, CVSUIMessages.CVSPropertiesPage_host, 1); //$NON-NLS-1$ hostText = createReadOnlyText(composite, "", 1); //$NON-NLS-1$ - label = createLabel(composite, Policy.bind("CVSPropertiesPage.port"), 1); //$NON-NLS-1$ + label = createLabel(composite, CVSUIMessages.CVSPropertiesPage_port, 1); //$NON-NLS-1$ portText = createReadOnlyText(composite, "", 1); //$NON-NLS-1$ - label = createLabel(composite, Policy.bind("CVSPropertiesPage.path"), 1); //$NON-NLS-1$ + label = createLabel(composite, CVSUIMessages.CVSPropertiesPage_path, 1); //$NON-NLS-1$ pathText = createReadOnlyText(composite, "", 1); //$NON-NLS-1$ - label = createLabel(composite, Policy.bind("CVSPropertiesPage.module"), 1); //$NON-NLS-1$ + label = createLabel(composite, CVSUIMessages.CVSPropertiesPage_module, 1); //$NON-NLS-1$ moduleText = createReadOnlyText(composite, "", 1); //$NON-NLS-1$ - label = createLabel(composite, Policy.bind("CVSPropertiesPage.tag"), 1); //$NON-NLS-1$ + label = createLabel(composite, CVSUIMessages.CVSPropertiesPage_tag, 1); //$NON-NLS-1$ tagText = createReadOnlyText(composite, "", 1); //$NON-NLS-1$ createLabel(composite, "", 1); //$NON-NLS-1$ // Should absent directories be fetched on update - fetchButton = createCheckBox(composite, Policy.bind("CVSProjectPropertiesPage.fetchAbsentDirectoriesOnUpdate")); //$NON-NLS-1$ + fetchButton = createCheckBox(composite, CVSUIMessages.CVSProjectPropertiesPage_fetchAbsentDirectoriesOnUpdate); //$NON-NLS-1$ fetchButton.addListener(SWT.Selection, new Listener() { public void handleEvent(Event event) { fetch = fetchButton.getSelection(); @@ -226,7 +227,7 @@ public class CVSProjectPropertiesPage extends CVSPropertiesPage { }); // Should the project be configured for watch/edit - watchEditButton = createCheckBox(composite, Policy.bind("CVSProjectPropertiesPage.configureForWatchEdit")); //$NON-NLS-1$ + watchEditButton = createCheckBox(composite, CVSUIMessages.CVSProjectPropertiesPage_configureForWatchEdit); //$NON-NLS-1$ watchEditButton.addListener(SWT.Selection, new Listener() { public void handleEvent(Event event) { watchEdit = watchEditButton.getSelection(); @@ -239,14 +240,14 @@ public class CVSProjectPropertiesPage extends CVSPropertiesPage { createLabel(composite, "", 1); //$NON-NLS-1$ label = new Label(composite, SWT.WRAP); - label.setText(Policy.bind("CVSProjectPropertiesPage.You_can_change_the_sharing_of_this_project_to_another_repository_location._However,_this_is_only_possible_if_the_new_location_is___compatible___(on_the_same_host_with_the_same_repository_path)._1")); //$NON-NLS-1$ + label.setText(CVSUIMessages.CVSProjectPropertiesPage_You_can_change_the_sharing_of_this_project_to_another_repository_location__However__this_is_only_possible_if_the_new_location_is___compatible____on_the_same_host_with_the_same_repository_path___1); //$NON-NLS-1$ GridData data = new GridData(GridData.FILL_HORIZONTAL); data.widthHint = 200; data.horizontalSpan = 2; label.setLayoutData(data); Button changeButton = new Button(composite, SWT.PUSH); - changeButton.setText(Policy.bind("CVSProjectPropertiesPage.Change_Sharing_5")); //$NON-NLS-1$ + changeButton.setText(CVSUIMessages.CVSProjectPropertiesPage_Change_Sharing_5); //$NON-NLS-1$ changeButton.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { RepositorySelectionDialog dialog = new RepositorySelectionDialog(getShell(), oldLocation); @@ -355,7 +356,7 @@ public class CVSProjectPropertiesPage extends CVSPropertiesPage { hostText.setText(location.getHost()); int port = location.getPort(); if (port == ICVSRepositoryLocation.USE_DEFAULT_PORT) { - portText.setText(Policy.bind("CVSPropertiesPage.defaultPort")); //$NON-NLS-1$ + portText.setText(CVSUIMessages.CVSPropertiesPage_defaultPort); //$NON-NLS-1$ } else { portText.setText("" + port); //$NON-NLS-1$ } @@ -364,7 +365,7 @@ public class CVSProjectPropertiesPage extends CVSPropertiesPage { if (syncInfo == null) return; String label = syncInfo.getRepository(); if (label.equals(FolderSyncInfo.VIRTUAL_DIRECTORY)) { - label = Policy.bind("CVSPropertiesPage.virtualModule", label); //$NON-NLS-1$ + label = NLS.bind(CVSUIMessages.CVSPropertiesPage_virtualModule, new String[] { label }); //$NON-NLS-1$ } moduleText.setText(label); fetchButton.setSelection(fetch); @@ -409,14 +410,14 @@ public class CVSProjectPropertiesPage extends CVSPropertiesPage { } try { if (newLocation != null && !isCompatible(newLocation, oldLocation)) { - if (!MessageDialog.openQuestion(getShell(), Policy.bind("CVSProjectPropertiesPage.32"), Policy.bind("CVSProjectPropertiesPage.33"))) { //$NON-NLS-1$ //$NON-NLS-2$ + if (!MessageDialog.openQuestion(getShell(), CVSUIMessages.CVSProjectPropertiesPage_32, CVSUIMessages.CVSProjectPropertiesPage_33)) { //$NON-NLS-1$ //$NON-NLS-2$ return false; } } new ProgressMonitorDialog(getShell()).run(true, true, new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { - monitor.beginTask(Policy.bind("CVSProjectPropertiesPage.progressTaskName"), //$NON-NLS-1$ + monitor.beginTask(CVSUIMessages.CVSProjectPropertiesPage_progressTaskName, //$NON-NLS-1$ ((newLocation == null)?0:100) + (changeReadOnly[0]?100:0)); if (newLocation != null) provider.setRemoteRoot(newLocation, Policy.subMonitorFor(monitor, 100)); @@ -445,8 +446,8 @@ public class CVSProjectPropertiesPage extends CVSPropertiesPage { protected void setReadOnly(final boolean watchEdit, final IProgressMonitor monitor) throws CVSException { monitor.beginTask(null, 512); String taskName = watchEdit? - Policy.bind("CVSProjectPropertiesPage.setReadOnly"): //$NON-NLS-1$ - Policy.bind("CVSProjectPropertiesPage.clearReadOnly"); //$NON-NLS-1$ + CVSUIMessages.CVSProjectPropertiesPage_setReadOnly: //$NON-NLS-1$ + CVSUIMessages.CVSProjectPropertiesPage_clearReadOnly; //$NON-NLS-1$ monitor.subTask(taskName); ICVSFolder root = CVSWorkspaceRoot.getCVSFolderFor(project); root.accept(new ICVSResourceVisitor() { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java index da5081fc1..5d7584e7d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.IProjectSetSerializer; import org.eclipse.team.core.RepositoryProvider; @@ -201,7 +202,7 @@ public class CVSProjectSetSerializer implements IProjectSetSerializer { if (yesToAll) return 2; if (!project.exists()) return 0; final MessageDialog dialog = - new MessageDialog(shell, Policy.bind("CVSProjectSetSerializer.Confirm_Overwrite_Project_8"), null, Policy.bind("CVSProjectSetSerializer.The_project_{0}_already_exists._Do_you_wish_to_overwrite_it__9", project.getName()), MessageDialog.QUESTION, //$NON-NLS-1$ //$NON-NLS-2$ + new MessageDialog(shell, CVSUIMessages.CVSProjectSetSerializer_Confirm_Overwrite_Project_8, null, NLS.bind(CVSUIMessages.CVSProjectSetSerializer_The_project__0__already_exists__Do_you_wish_to_overwrite_it__9, new String[] { project.getName() }), MessageDialog.QUESTION, //$NON-NLS-1$ //$NON-NLS-2$ new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPropertiesPage.java index 2d356d520..76d3ce038 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPropertiesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPropertiesPage.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.internal.ccvs.core.CVSTag; import org.eclipse.ui.dialogs.PropertyPage; @@ -25,18 +26,18 @@ public abstract class CVSPropertiesPage extends PropertyPage { public static String getTagLabel(CVSTag tag) { if (tag == null) { - return Policy.bind("CVSFilePropertiesPage.none"); //$NON-NLS-1$ + return CVSUIMessages.CVSFilePropertiesPage_none; //$NON-NLS-1$ } switch (tag.getType()) { case CVSTag.HEAD: return tag.getName(); case CVSTag.VERSION: - return Policy.bind("CVSFilePropertiesPage.version", tag.getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CVSFilePropertiesPage_version, new String[] { tag.getName() }); //$NON-NLS-1$ case CVSTag.BRANCH: - return Policy.bind("CVSFilePropertiesPage.branch", tag.getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CVSFilePropertiesPage_branch, new String[] { tag.getName() }); //$NON-NLS-1$ case CVSTag.DATE: - return Policy.bind("CVSFilePropertiesPage.date", tag.getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CVSFilePropertiesPage_date, new String[] { tag.getName() }); //$NON-NLS-1$ default : return tag.getName(); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java new file mode 100644 index 000000000..6080556b2 --- /dev/null +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java @@ -0,0 +1,1387 @@ +/********************************************************************** + * Copyright (c) 2005 IBM Corporation and others. All rights reserved. This + * program and the accompanying materials are made available under the terms of + * the Eclipse Public License v1.0 which accompanies this distribution, and is + * available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM - Initial API and implementation + **********************************************************************/ +package org.eclipse.team.internal.ccvs.ui; + +import org.eclipse.osgi.util.NLS; + +public class CVSUIMessages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.team.internal.ccvs.ui.messages";//$NON-NLS-1$ + // + // Copyright (c) 2000, 2005 IBM Corporation and others. + // All rights reserved. This program and the accompanying materials + // are made available under the terms of the Eclipse Public License v1.0 + // which accompanies this distribution, and is available at + // http://www.eclipse.org/legal/epl-v10.html + // + // Contributors: + // IBM Corporation - initial API and implementation + // + public static String PasswordManagementPreferencePage_2; + public static String PasswordManagementPreferencePage_3; + public static String PasswordManagementPreferencePage_4; + public static String PasswordManagementPreferencePage_5; + public static String PasswordManagementPreferencePage_6; + public static String UserValidationDialog_5; + public static String UserValidationDialog_6; + public static String UserValidationDialog_7; + public static String details; + public static String simpleInternal; + public static String internal; + public static String yes; + public static String no; + public static String information; + public static String exception; + public static String confirmOverwriteTitle; + public static String confirmOverwrite; + public static String question; + public static String localChanges; + public static String error; + public static String cvs; + public static String notAvailable; + public static String buildError; + public static String ok; + public static String separator; + + public static String nameAndRevision; + public static String currentRevision; + + public static String AddAction_addFailed; + public static String AddAction_adding; + public static String AddAction_addIgnoredTitle; + public static String AddAction_addIgnoredQuestion; + + public static String AddToVersionControlDialog_title; + public static String AddToVersionControlDialog_thereIsAnUnaddedResource; + public static String AddToVersionControlDialog_thereAreUnaddedResources; + + public static String CheckoutAction_overlappingModuleExpansions; + + public static String AutoDefineTagsAction_defineTags; + + public static String AvoidableMessageDialog_dontShowAgain; + + public static String BranchWizard_title; + public static String BranchWizard_errorBranching; + public static String BranchWizardPage_pageDescription; + public static String BranchWizardPage_pageDescriptionVersion; + public static String BranchWizardPage_specifyVersion; + public static String BranchWizardPage_branchName; + public static String BranchWizardPage_versionName; + public static String BranchWizardPage_startWorking; + public static String BranchWizardPage_versionPrefix; + public static String BranchWizard_versionNameWarning; + public static String BranchWizard_branchNameWarning; + public static String BranchWizard_branchAndVersionMustBeDifferent; + public static String BranchWizard_branchNameAlreadyExists; + public static String BranchWizard_versionNameAlreadyExists; + public static String BranchWizardPage_existingVersionsAndBranches; + + public static String ConsolePreferencePage_consoleColorSettings; + public static String ConsolePreferencePage_commandColor; + public static String ConsolePreferencePage_messageColor; + public static String ConsolePreferencePage_errorColor; + public static String ConsolePreferencePage_font; + + public static String CVSAction_errorTitle; + public static String CVSAction_warningTitle; + public static String CVSAction_multipleProblemsMessage; + public static String CVSAction_mixingTagsTitle; + public static String CVSAction_mixingTags; + public static String CVSAction_handlerNotEnabledTitle; + public static String CVSAction_handlerNotEnabledMessage; + + public static String CVSAnnotateView_showFileAnnotation; + public static String CVSAnnotateView_viewInstructions; + + public static String ShowAnnotationAction_noSyncInfo; + public static String ShowAnnotationOperation_taskName; + public static String ShowAnnotationOperation_0; + public static String ShowAnnotationOperation_1; + public static String ShowAnnotationOperation_2; + public static String ShowAnnotationOperation_4; + + public static String CVSCatchupReleaseViewer_commit; + public static String CVSCatchupReleaseViewer_update; + public static String CVSCatchupReleaseViewer_forceCommit; + public static String CVSCatchupReleaseViewer_forceUpdate; + public static String CVSCatchupReleaseViewer_ignore; + public static String CVSCatchupReleaseViewer_mergeUpdate; + public static String CVSCatchupReleaseViewer_commonFile; + public static String CVSCatchupReleaseViewer_commonFileRevision; + public static String CVSCatchupReleaseViewer_noCommonFile; + public static String CVSCatchupReleaseViewer_noRepositoryFile; + public static String CVSCatchupReleaseViewer_repositoryFile; + public static String CVSCatchupReleaseViewer_repositoryFileRevision; + public static String CVSCatchupReleaseViewer_workspaceFile; + public static String CVSCatchupReleaseViewer_showInHistory; + public static String CVSCatchupReleaseViewer_fileDecoration; + public static String CVSCatchupReleaseViewer_folderDecoration; + public static String CVSCatchupReleaseViewer_confirmMerge; + public static String CVSCatchupReleaseViewer_addAction; + public static String CVSCatchupReleaseViewer_labelWithSyncKind; + + public static String CVSCompareEditorInput_branchLabel; + public static String CVSCompareEditorInput_headLabel; + public static String CVSCompareEditorInput_comparing; + public static String CVSCompareEditorInput_different; + public static String CVSCompareEditorInput_inBranch; + public static String CVSCompareEditorInput_inHead; + public static String CVSCompareEditorInput_0; + public static String CVSCompareEditorInput_1; + public static String CVSCompareEditorInput_repository; + public static String CVSCompareEditorInput_titleAncestor; + public static String CVSCompareEditorInput_titleNoAncestor; + public static String CVSCompareEditorInput_titleNoAncestorDifferent; + public static String CVSCompareEditorInput_workspace; + public static String CVSCompareEditorInput_workspaceLabel; + public static String CVSCompareEditorInput_noWorkspaceFile; + public static String CVSCompareEditorInput_noRepositoryFile; + + public static String CVSCompareRevisionsInput_addToWorkspace; + public static String CVSCompareRevisionsInput_compareResourceAndVersions; + public static String CVSCompareRevisionsInput_errorReplacingTitle; + public static String CVSCompareRevisionsInput_errorReplacingMessage; + public static String CVSCompareRevisionsInput_repository; + public static String CVSCompareRevisionsInput_structureCompare; + public static String CVSCompareRevisionsInput_workspace; + public static String CVSCompareRevisionsInput_truncate; + + public static String CVSDecorator_projectDecoration; + + public static String CVSDecoratorPreferencesPage_0; + public static String CVSDecoratorPreferencesPage_1; + public static String CVSDecoratorPreferencesPage_2; + public static String CVSDecoratorPreferencesPage_3; + public static String CVSDecoratorPreferencesPage_4; + public static String CVSDecoratorPreferencesPage_5; + public static String CVSDecoratorPreferencesPage_6; + public static String CVSDecoratorPreferencesPage_7; + public static String CVSDecoratorPreferencesPage_8; + public static String CVSDecoratorPreferencesPage_9; + public static String CVSDecoratorPreferencesPage_10; + public static String CVSDecoratorPreferencesPage_11; + public static String CVSDecoratorPreferencesPage_12; + public static String CVSDecoratorPreferencesPage_13; + public static String CVSDecoratorPreferencesPage_14; + public static String CVSDecoratorPreferencesPage_15; + public static String CVSDecoratorPreferencesPage_16; + public static String CVSDecoratorPreferencesPage_17; + public static String CVSDecoratorPreferencesPage_18; + public static String CVSDecoratorPreferencesPage_19; + public static String CVSDecoratorPreferencesPage_20; + public static String CVSDecoratorPreferencesPage_21; + public static String CVSDecoratorPreferencesPage_22; + public static String CVSDecoratorPreferencesPage_23; + public static String CVSDecoratorPreferencesPage_24; + public static String CVSDecoratorPreferencesPage_25; + public static String CVSDecoratorPreferencesPage_26; + public static String CVSDecoratorPreferencesPage_27; + public static String CVSDecoratorPreferencesPage_28; + public static String CVSDecoratorPreferencesPage_29; + public static String CVSDecoratorPreferencesPage_30; + public static String CVSDecoratorPreferencesPage_31; + public static String CVSDecoratorPreferencesPage_32; + public static String CVSDecoratorPreferencesPage_33; + public static String CVSDecoratorPreferencesPage_34; + public static String CVSDecoratorPreferencesPage_35; + + public static String CVSDecorator_projectDecorationWithTag; + public static String CVSDecorator_fileDecorationWithTag; + public static String CVSDecorator_fileDecorationNoTag; + public static String CVSDecorator_folderDecoration; + + public static String CVSFilePropertiesPage_ignored; + public static String CVSFilePropertiesPage_notManaged; + public static String CVSFilePropertiesPage_isAdded; + public static String CVSFilePropertiesPage_baseRevision; + public static String CVSFilePropertiesPage_baseTimestamp; + public static String CVSFilePropertiesPage_dirty; + public static String CVSFilePropertiesPage_modified; + public static String CVSFilePropertiesPage_keywordMode; + public static String CVSFilePropertiesPage_tag; + public static String CVSFilePropertiesPage_none; + public static String CVSFilePropertiesPage_version; + public static String CVSFilePropertiesPage_branch; + public static String CVSFilePropertiesPage_date; + public static String CVSFilePropertiesPage_error; + public static String CVSFilePropertiesPage_permissions; + public static String CVSFilePropertiesPage_notAvailable; + + public static String CVSFolderPropertiesPage_ignored; + public static String CVSFolderPropertiesPage_notManaged; + public static String CVSFolderPropertiesPage_notCVSFolder; + public static String CVSFolderPropertiesPage_root; + public static String CVSFolderPropertiesPage_repository; + public static String CVSFolderPropertiesPage_static; + public static String CVSFolderPropertiesPage_disconnect; + public static String CVSFolderPropertiesPage_disconnectTitle; + public static String CVSFolderPropertiesPage_disconnectQuestion; + + public static String CVSLocalCompareEditorInput_title; + + public static String CVSOperationCancelledException_operationCancelled; + + public static String CVSPropertiesPage_connectionType; + public static String CVSPropertiesPage_user; + public static String CVSPropertiesPage_password; + public static String CVSPropertiesPage_host; + public static String CVSPropertiesPage_port; + public static String CVSPropertiesPage_path; + public static String CVSPropertiesPage_module; + public static String CVSPropertiesPage_defaultPort; + public static String CVSPropertiesPage_tag; + public static String CVSPreferencesPage_0; + public static String CVSPreferencesPage_1; + public static String CVSPreferencesPage_2; + public static String CVSPreferencesPage_3; + public static String CVSPreferencesPage_4; + public static String CVSPreferencesPage_5; + public static String CVSPreferencesPage_6; + public static String CVSPreferencesPage_7; + public static String CVSPreferencesPage_8; + public static String CVSPreferencesPage_9; + public static String CVSPreferencesPage_10; + public static String CVSPreferencesPage_11; + public static String CVSPreferencesPage_12; + public static String CVSPreferencesPage_13; + public static String CVSPreferencesPage_14; + public static String CVSPreferencesPage_15; + public static String CVSPreferencesPage_16; + public static String CVSPreferencesPage_17; + public static String CVSPreferencesPage_18; + public static String CVSPreferencesPage_19; + public static String CVSPreferencesPage_23; + public static String CVSPreferencesPage_24; + public static String CVSPreferencesPage_25; + public static String CVSPreferencesPage_26; + public static String CVSPreferencesPage_27; + public static String CVSPreferencesPage_28; + public static String CVSPreferencesPage_29; + public static String CVSPreferencesPage_20; + public static String CVSPreferencesPage_21; + public static String CVSPreferencesPage_22; + public static String CVSPreferencesPage_30; + public static String CVSPreferencesPage_31; + public static String CVSPreferencesPage_32; + public static String CVSPreferencesPage_33; + public static String CVSPreferencesPage_34; + public static String CVSPreferencesPage_35; + public static String CVSPreferencesPage_36; + public static String CVSPreferencesPage_37; + public static String CVSPreferencesPage_38; + public static String CVSPreferencesPage_39; + public static String CVSPreferencesPage_40; + public static String CVSPreferencesPage_41; + public static String CVSPreferencesPage_42; + public static String CVSPreferencesPage_43; + public static String CVSPropertiesPage_update; + public static String CVSPropertiesPage_virtualModule; + + + public static String CVSRemoteFilePropertySource_name; + public static String CVSRemoteFilePropertySource_revision; + public static String CVSRemoteFilePropertySource_date; + public static String CVSRemoteFilePropertySource_author; + public static String CVSRemoteFilePropertySource_comment; + public static String CVSRemoteFilePropertySource_tag; + + public static String CVSRemoteFolderPropertySource_name; + public static String CVSRemoteFolderPropertySource_tag; + public static String CVSRemoteFolderPropertySource_none; + + public static String CVSRepositoryLocationPropertySource_default; + public static String CVSRepositoryLocationPropertySource_host; + public static String CVSRepositoryLocationPropertySource_user; + public static String CVSRepositoryLocationPropertySource_port; + public static String CVSRepositoryLocationPropertySource_root; + public static String CVSRepositoryLocationPropertySource_method; + + public static String CVSSyncCompareInput_confirmMergeMessageTitle; + public static String CVSSyncCompareInput_confirmMergeMessage; + public static String CVSSyncCompareInput_projectDeleted; + public static String CVSSyncCompareInput_filteringOutgoingChanges; + + public static String CVSSyncSet_conflicts; + public static String CVSSyncSet_incomings; + public static String CVSSyncSet_noConflicts; + public static String CVSSyncSet_noIncomings; + public static String CVSSyncSet_noOutgoings; + public static String CVSSyncSet_outgoings; + public static String CVSSyncSet_noNew; + public static String CVSParticipant_0; + public static String CVSParticipant_1; + public static String CVSParticipant_2; + public static String CVSSyncSet_new; + + public static String CVSUIPlugin_refreshTitle; + public static String CVSUIPlugin_refreshQuestion; + public static String CVSUIPlugin_refreshMultipleQuestion; + + public static String CVSAction_disabledTitle; + public static String CVSAction_disabledMessage; + public static String CVSAction_refreshTitle; + public static String CVSAction_refreshQuestion; + public static String CVSAction_refreshMultipleQuestion; + + public static String CommitAction_commitFailed; + public static String CommitWizardCommitPage_0; + public static String CommitWizardCommitPage_2; + public static String CommitWizardCommitPage_3; + public static String CommitWizardCommitPage_4; + public static String CommitWizardCommitPage_1; + public static String CommitWizardCommitPage_5; + public static String CommitWizardFileTypePage_0; + public static String CommitWizardFileTypePage_2; + public static String CommitWizardFileTypePage_3; + + public static String CommitSyncAction_questionRelease; + public static String CommitSyncAction_titleRelease; + public static String CommitSyncAction_releaseAll; + public static String CommitSyncAction_releasePart; + public static String CommitSyncAction_cancelRelease; + public static String CommitSyncAction_errorCommitting; + + public static String CompareWithRemoteAction_compare; + public static String CompareWithRemoteAction_noRemote; + public static String CompareWithRemoteAction_noRemoteLong; + public static String CompareWithRemoteAction_fetching; + + public static String CompareWithRevisionAction_compare; + public static String CompareWithRevisionAction_noRevisions; + public static String CompareWithRevisionAction_noRevisionsLong; + public static String CompareWithRevisionAction_fetching; + + public static String CompareWithTagAction_message; + public static String CompareWithTagAction_replace; + public static String CompareWithTagAction_noRemote; + public static String CompareWithTagAction_noRemoteLong; + public static String CompareWithTagAction_fetching; + + public static String CompareEditorInput_fileProgress; + + public static String ConfigurationWizardAutoconnectPage_description; + public static String ConfigurationWizardAutoconnectPage_user; + public static String ConfigurationWizardAutoconnectPage_host; + public static String ConfigurationWizardAutoconnectPage_port; + public static String ConfigurationWizardAutoconnectPage_default; + public static String ConfigurationWizardAutoconnectPage_connectionType; + public static String ConfigurationWizardAutoconnectPage_repositoryPath; + public static String ConfigurationWizardAutoconnectPage_module; + public static String ConfigurationWizardAutoconnectPage_validate; + public static String ConfigurationWizardAutoconnectPage_noSyncInfo; + public static String ConfigurationWizardAutoconnectPage_noCVSDirectory; + + public static String RepositorySelectionPage_description; + public static String RepositorySelectionPage_useExisting; + public static String RepositorySelectionPage_useNew; + + public static String ConfigurationWizardMainPage_connection; + public static String ConfigurationWizardMainPage_userName; + public static String ConfigurationWizardMainPage_password; + public static String ConfigurationWizardMainPage_host; + public static String ConfigurationWizardMainPage_0; + public static String ConfigurationWizardMainPage_5; + public static String ConfigurationWizardMainPage_1; + public static String ConfigurationWizardMainPage_2; + public static String ConfigurationWizardMainPage_3; + public static String ConfigurationWizardMainPage_4; + public static String ConfigurationWizardMainPage_useDefaultPort; + public static String ConfigurationWizardMainPage_usePort; + public static String ConfigurationWizardMainPage_repositoryPath; + public static String ConfigurationWizardMainPage_invalidUserName; + public static String ConfigurationWizardMainPage_invalidHostName; + public static String ConfigurationWizardMainPage_invalidPort; + public static String ConfigurationWizardMainPage_invalidPathWithSpaces; + public static String ConfigurationWizardMainPage_invalidPathWithSlashes; + public static String ConfigurationWizardMainPage_useNTFormat; + + public static String Console_copy; + public static String Console_selectAll; + public static String Console_clearOutput; + public static String Console_resultServerError; + public static String Console_resultWarnings; + public static String Console_resultException; + public static String Console_resultAborted; + public static String Console_resultOk; + public static String Console_resultTimeFormat; + public static String Console_couldNotFormatTime; + public static String Console_preExecutionDelimiter; + public static String Console_postExecutionDelimiter; + public static String Console_info; + public static String Console_warning; + public static String Console_error; + + public static String AddToBranchAction_enterTag; + public static String AddToBranchAction_enterTagLong; + + public static String DiffAction_diff; + + public static String FixTypeAction_fix; + + public static String GenerateCVSDiff_title; + public static String GenerateCVSDiff_pageTitle; + public static String GenerateCVSDiff_pageDescription; + public static String GenerateCVSDiff_overwriteTitle; + public static String GenerateCVSDiff_overwriteMsg; + public static String GenerateCVSDiff_error; + public static String GenerateCVSDiff_working; + public static String GenerateCVSDiff_noDiffsFoundMsg; + public static String GenerateCVSDiff_noDiffsFoundTitle; + public static String GenerateCVSDiff_1; + public static String GenerateCVSDiff_2; + public static String GenerateCVSDiff_3; + public static String GenerateCVSDiff_4; + + public static String GetSyncAction_questionCatchup; + public static String GetSyncAction_titleCatchup; + public static String GetSyncAction_catchupAll; + public static String GetSyncAction_catchupPart; + public static String GetSyncAction_cancelCatchup; + public static String UpdateSyncAction_errorUpdating; + + public static String HistoryFilterDialog_title; + public static String HistoryFilterDialog_showMatching; + public static String HistoryFilterDialog_matchingAny; + public static String HistoryFilterDialog_matchingAll; + public static String HistoryFilterDialog_author; + public static String HistoryFilterDialog_comment; + public static String HistoryFilterDialog_fromDate; + public static String HistoryFilterDialog_toDate; + + public static String HistoryView_getAnnotateAction; + public static String HistoryView_getContentsAction; + public static String HistoryView_getRevisionAction; + public static String HistoryView_tagWithExistingAction; + public static String HistoryView_copy; + public static String HistoryView_revision; + public static String HistoryView_tags; + public static String HistoryView_date; + public static String HistoryView_author; + public static String HistoryView_comment; + public static String HistoryView_refreshLabel; + public static String HistoryView_refresh; + public static String HistoryView_linkWithLabel; + public static String HistoryView_selectAll; + public static String HistoryView_showComment; + public static String HistoryView_showTags; + public static String HistoryView_title; + public static String HistoryView_titleWithArgument; + public static String HistoryView_overwriteTitle; + public static String HistoryView_overwriteMsg; + public static String HistoryView_fetchHistoryJob; + public static String HistoryView_fetchHistoryJobFile; + public static String HistoryView_errorFetchingEntries; + + public static String IgnoreAction_ignore; + + public static String MergeAction_saveChangesTitle; + public static String MergeAction_saveChanges; + + public static String MergeEditorInput_title; + + public static String MergeWizard_title; + public static String MergeWizard_0; + public static String MergeWizard_1; + public static String MergeWizardPage_0; + public static String MergeWizardPage_1; + public static String MergeWizardPage_2; + public static String MergeWizardPage_3; + public static String MergeWizardPage_4; + public static String MergeWizardPage_5; + public static String MergeWizardPage_6; + public static String MergeWizardPage_7; + public static String MergeWizardPage_8; + public static String MergeWizardPage_9; + public static String MergeWizardPage_10; + public static String MergeWizardPage_11; + public static String MergeWizardPage_12; + public static String MergeWizardPage_13; + public static String MergeWizard_preparing; + public static String MergeWizard_preparingStart; + public static String MergeWizard_preparingEnd; + public static String MergeWizardEndPage_branches; + + public static String ModuleSelectionPage_moduleIsProject; + public static String ModuleSelectionPage_specifyModule; + + public static String MoveTagAction_errorMessage; + public static String ModeWizardSelectionPage_10; + public static String ModeWizardSelectionPage_11; + public static String ModeWizardSelectionPage_12; + public static String ModeWizardSelectionPage_13; + public static String ModeWizardSelectionPage_14; + public static String ModeWizardSelectionPage_15; + public static String ModeWizardSelectionPage_17; + public static String ModeWizardSelectionPage_18; + public static String ModeWizardSelectionPage_19; + public static String ModeWizardSelectionPage_20; + public static String ModeWizardSelectionPage_21; + public static String ModeWizardSelectionPage_22; + public static String ModeWizardSelectionPage_23; + public static String ModeWizardSelectionPage_24; + public static String ModeWizardSelectionPage_25; + + public static String MoveTagAction_title; + public static String MoveTagAction_message; + + public static String NewLocationWizard_title; + public static String NewLocationWizard_heading; + public static String NewLocationWizard_description; + public static String NewLocationWizard_validationFailedText; + public static String NewLocationWizard_validationFailedTitle; + public static String NewLocationWizard_exception; + + public static String OpenLogEntryAction_deletedTitle; + public static String OpenLogEntryAction_deleted; + + public static String ReleaseCommentDialog_title; + public static String ReleaseCommentDialog_choosePrevious; + public static String ReleaseCommentDialog_enterComment; + public static String ReleaseCommentDialog_unaddedResources; + public static String ReleaseCommentDialog_selectAll; + public static String ReleaseCommentDialog_deselectAll; + public static String ReleaseCommentDialog_clearTextArea; + + public static String RemoteFolderElement_nameAndTag; + public static String RemoteFolderElement_fetchingRemoteChildren; + + public static String RemoveRootAction_removeRoot; + + public static String ReplaceWithTagAction_message; + public static String ReplaceWithTagAction_replace; + public static String ReplaceWithTagAction_replacing; + public static String ReplaceWithTagAction_mixingTags; + + public static String ReplaceWithRemoteAction_replacing; + public static String ReplaceWithRemoteAction_problemMessage; + + public static String ReplaceWithAction_confirmOverwrite; + public static String ReplaceWithAction_localChanges; + public static String ReplaceWithAction_calculatingDirtyResources; + + public static String ReplaceWithLatestAction_multipleTags; + public static String ReplaceWithLatestAction_multipleVersions; + public static String ReplaceWithLatestAction_multipleBranches; + public static String ReplaceWithLatestAction_singleVersion; + public static String ReplaceWithLatestAction_singleBranch; + public static String ReplaceWithLatestAction_singleHEAD; + + public static String RepositoryDialog_getRepository; + public static String RepositoryDialog_description; + + public static String RepositoryManager_getting; + public static String RepositoryManager_committing; + public static String RepositoryManager_updating; + public static String RepositoryManager_deleting; + public static String RepositoryManager_adding; + public static String RepositoryManager_rename; + public static String RepositoryManager_save; + public static String RepositoryManager_ioException; + public static String RepositoryManager_parsingProblem; + public static String RepositoryManager_fetchingRemoteFolders; + + public static String RepositoriesView_refresh; + public static String RepositoriesView_refreshTooltip; + public static String RepositoriesView_new; + public static String RepositoriesView_newSubmenu; + public static String RepositoriesView_newAnonCVS; + public static String RepositoriesView_newWorkingSet; + public static String RepositoriesView_deselectWorkingSet; + public static String RepositoriesView_editWorkingSet; + public static String RepositoriesView_workingSetMenuItem; + public static String RepositoriesView_collapseAll; + public static String RepositoriesView_collapseAllTooltip; + public static String RepositoriesView_NItemsSelected; + public static String RepositoriesView_OneItemSelected; + public static String RepositoriesView_ResourceInRepository; + public static String RepositoriesView_CannotGetRevision; + public static String RemoteViewPart_workingSetToolTip; + + public static String ResourcePropertiesPage_status; + public static String ResourcePropertiesPage_notManaged; + public static String ResourcePropertiesPage_versioned; + public static String ResourcePropertiesPage_notVersioned; + public static String ResourcePropertiesPage_state; + public static String ResourcePropertiesPage_checkedOut; + public static String ResourcePropertiesPage_checkedIn; + //ResourcePropertiesPage.baseRevision=Base Revision + //ResourcePropertiesPage.none=none + public static String ResourcePropertiesPage_error; + + public static String KSubstWizard_title; + public static String KSubstWizard_working; + public static String KSubstWizard_problemsMessage; + public static String KSubstWizard_errorTitle; + public static String KSubstWizard_warningTitle; + + public static String KSubstWizardSharedFilesPage_pageTitle; + public static String KSubstWizardSharedFilesPage_pageDescription; + public static String KSubstWizardSharedFilesPage_contents; + public static String KSubstWizardSharedFilesPage_includeSharedFiles; + public static String KSubstWizardSharedFilesPage_sharedFilesViewer_title; + + public static String KSubstWizardDirtyFilesPage_pageTitle; + public static String KSubstWizardDirtyFilesPage_pageDescription; + public static String KSubstWizardDirtyFilesPage_contents; + public static String KSubstWizardDirtyFilesPage_includeDirtyFiles; + public static String KSubstWizardDirtyFilesPage_dirtyFilesViewer_title; + + public static String KSubstWizardSelectionPage_pageTitle; + public static String KSubstWizardSelectionPage_pageDescription; + public static String KSubstWizardSelectionPage_automaticButton; + public static String KSubstWizardSelectionPage_automaticLabel; + public static String KSubstWizardSelectionPage_binaryButton; + public static String KSubstWizardSelectionPage_binaryLabel; + public static String KSubstWizardSelectionPage_textButton; + public static String KSubstWizardSelectionPage_textLabel; + public static String KSubstWizardSelectionPage_textWithSubstitutionsButton; + public static String KSubstWizardSelectionPage_textWithSubstitutionsLabel; + + public static String KSubstWizardCommitCommentPage_pageTitle; + public static String KSubstWizardCommitCommentPage_pageDescription; + + public static String KSubstWizardSummaryPage_pageTitle; + public static String KSubstWizardSummaryPage_pageDescription; + public static String KSubstWizardSummaryPage_contents; + public static String KSubstWizardSummaryPage_showUnaffectedFiles; + public static String KSubstWizardSummaryPage_summaryViewer_title; + public static String KSubstWizardSummaryPage_summaryViewer_fileHeader; + public static String KSubstWizardSummaryPage_summaryViewer_ksubstHeader; + + public static String SetKeywordSubstitutionAction_label; + public static String SetKeywordSubstitutionAction_tooltip; + + public static String SharingWizard_autoConnectTitle; + public static String SharingWizard_autoConnectOneOTitle; + public static String SharingWizard_autoConnectTitleDescription; + public static String SharingWizard_couldNotImport; + public static String SharingWizard_couldNotImportLong; + public static String SharingWizard_selectTagTitle; + public static String SharingWizard_selectTag; + public static String SharingWizard_description; + public static String SharingWizard_importTitle; + public static String SharingWizard_importTitleDescription; + public static String SharingWizard_title; + public static String SharingWizard_heading; + public static String SharingWizard_enterInformation; + public static String SharingWizard_enterInformationDescription; + public static String SharingWizard_enterModuleName; + public static String SharingWizard_enterModuleNameDescription; + public static String SharingWizard_validationFailedText; + public static String SharingWizard_validationFailedTitle; + + public static String SharingWizardFinishPage_message; + + public static String ShowHistoryAction_showHistory; + public static String ShowHistoryAction_noHistory; + public static String ShowHistoryAction_noHistoryLong; + + public static String SyncAction_sync; + public static String SyncAction_workingSetName; + public static String SyncAction_noChangesTitle; + public static String SyncAction_noChangesMessage; + + public static String TagAction_tagErrorTitle; + public static String TagAction_tagWarningTitle; + public static String TagAction_tagProblemsMessage; + public static String TagAction_tagProblemsMessageMultiple; + public static String TagAction_tagResources; + public static String TagRefreshButtonArea_0; + public static String TagRefreshButtonArea_1; + public static String TagRefreshButtonArea_2; + public static String TagRefreshButtonArea_3; + public static String TagRefreshButtonArea_4; + public static String TagRefreshButtonArea_5; + public static String TagRefreshButtonArea_6; + public static String TagRefreshButtonArea_7; + public static String TagRefreshButtonArea_8; + public static String TagAction_enterTag; + public static String TagAction_moveTag; + public static String TagRootElement_0; + public static String TagLocalAction_0; + public static String TagLocalAction_1; + public static String TagLocalAction_2; + public static String TagLocalAction_4; + public static String TagAction_moveTagConfirmTitle; + public static String TagAction_moveTagConfirmMessage; + public static String TagAction_uncommittedChangesTitle; + public static String TagAction_uncommittedChanges; + public static String TagAction_tagAlreadyExists; + public static String TagAction_existingVersions; + + public static String TagInRepositoryAction_tagProblemsMessage; + public static String TagInRepositoryAction_tagProblemsMessageMultiple; + + public static String UpdateAction_update; + public static String UpdateAction_updating; + public static String UpdateAction_promptForUpdateSeveral; + public static String UpdateAction_promptForUpdateOne; + public static String UpdateAction_promptForUpdateTitle; + + public static String UpdateWizard_title; + public static String UpdateWizard_0; + public static String UpdateWizard_1; + public static String UpdateWizard_updatePage; + public static String UpdateWizardPage_description; + + public static String UserValidationDialog_required; + public static String UserValidationDialog_labelUser; + public static String UserValidationDialog_labelPassword; + public static String UserValidationDialog_password; + public static String UserValidationDialog_user; + + public static String KeyboradInteractiveDialog_message; + public static String KeyboardInteractiveDialog_labelRepository; + + public static String VersionsElement_versions; + + public static String WorkbenchUserAuthenticator_cancelled; + public static String WorkbenchUserAuthenticator_0; + public static String WorkbenchUserAuthenticator_1; + public static String WorkbenchUserAuthenticator_2; + public static String WorkbenchUserAuthenticator_errorFlushing; + public static String WorkbenchUserAuthenticator_errorSaving; + + public static String Unmanage_unmanaging; + public static String Unmanage_unmanage; + public static String Unmanage_title; + public static String Unmanage_titleN; + public static String Unmanage_option1; + public static String Unmanage_option2; + public static String Unmanage_unmanagingError; + + public static String Unmanage_message; + public static String Unmanage_messageN; + + public static String Save_To_Clipboard_2; + public static String Save_In_File_System_3; + public static String Browse____4; + public static String Save_Patch_As_5; + public static String patch_txt_6; + public static String Save_In_Workspace_7; + public static String Select_a_folder_then_type_in_the_file_name__8; + public static String Fi_le_name__9; + public static String Do_not_recurse_into_sub_folders_10; + public static String Do_not_include_new_files_in_patch_11; + public static String Diff_output_format_12; + public static String Unified__format_required_by_Compare_With_Patch_feature__13; + public static String Context_14; + public static String Standard_15; + public static String Advanced_options_19; + public static String Configure_the_options_used_for_the_CVS_diff_command_20; + + public static String After_configuring_the_project__1; + public static String Open_the_Synchronize_view_on_the_project_2; + public static String Automatically_import_the_local_resources_into_the_repository_3; + public static String Run_update_4; + public static String Do_nothing_5; + public static String Validate_Connection_on_Finish_7; + + public static String TagSelectionDialog_Select_a_Tag_1; + public static String TagSelectionDialog_recurseOption; + public static String TagSelectionDialog_0; + public static String TagSelectionDialog_1; + public static String TagSelectionDialog_2; + public static String TagSelectionDialog_3; + public static String TagSelectionDialog_4; + public static String TagSelectionDialog_5; + public static String TagSelectionDialog_6; + public static String TagSelectionDialog_7; + public static String TagSelectionDialog_8; + + public static String TagSelectionArea_0; + public static String TagSelectionArea_1; + public static String TagSelectionArea_2; + public static String TagSelectionArea_3; + public static String TagSelectionWizardPage_0; + public static String TagSelectionWizardPage_1; + + public static String UpdateSyncAction_Conflicting_changes_found_1; + public static String UpdateSyncAction_You_have_local_changes_you_are_about_to_overwrite_2; + public static String UpdateSyncAction_Only_update_resources_that_can_be_automatically_merged_3; + public static String UpdateSyncAction_Update_all_resources__overwriting_local_changes_with_remote_contents_4; + public static String UpdateSyncAction_Overwrite_local_changes__5; + public static String UpdateSyncAction_You_have_local_changes_you_are_about_to_overwrite__Do_you_wish_to_continue__6; + + public static String ExtMethodPreferencePage_message; + public static String ExtMethodPreferencePage_CVS_RSH; + public static String ExtMethodPreferencePage_Browse; + public static String ExtMethodPreferencePage_0; + public static String ExtMethodPreferencePage_2; + public static String ExtMethodPreferencePage_1; + public static String ExtMethodPreferencePage_Details; + public static String ExtMethodPreferencePage_CVS_RSH_Parameters; + public static String ExtMethodPreferencePage_Add_Variable; + public static String ExtMethodPreferencePage_CVS_SERVER__7; + public static String UpdateMergeActionProblems_merging_remote_resources_into_workspace_1; + public static String UpdateMergeActionProblems_merging_remote_resources_into_workspace_2; + + public static String TagConfigurationDialog_1; + public static String TagConfigurationDialog_4; + public static String TagConfigurationDialog_5; + public static String TagConfigurationDialog_6; + public static String TagConfigurationDialog_7; + public static String TagConfigurationDialog_8; + public static String TagConfigurationDialog_9; + public static String TagConfigurationDialog_0; + public static String TagConfigurationDialog_10; + public static String TagConfigurationDialog_11; + public static String TagConfigurationDialog_12; + public static String TagConfigurationDialog_13; + public static String TagConfigurationDialog_14; + public static String TagConfigurationDialog_20; + public static String TagConfigurationDialog_21; + public static String TagConfigurationDialog_22; + + public static String ChangeListener_Deleting_CVS_folders_1; + public static String ChangeListener_Folders_cannot_be_deleted_from_a_CVS_server_from_the_client__To_delete_the_folder_2; + public static String ChangeListener_Do_not_ask_me_about_this_again_3; + public static String ConfigureTagsFromRepoViewConfigure_Tag_Error_1; + public static String RemoteRootAction_label; + public static String RemoteLogOperation_0; + public static String RemoteLogOperation_1; + public static String RemoveDateTagAction_0; + public static String RemoteRootAction_Unable_to_Discard_Location_1; + public static String RemoteRootAction_Projects_in_the_local_workspace_are_shared_with__2; + public static String RemoveRootAction_removeRoot_3; + public static String RemoteRootAction_The_projects_that_are_shared_with_the_above_repository_are__4; + + public static String BranchCategory_Branches_1; + public static String GroupedByVersionCategory_Versions_1; + public static String VersionCategory_Versions_1; + public static String ModulesCategory_label; + public static String HistoryView_______4; + + public static String CVSProjectPropertiesPage_connectionType; + public static String CVSProjectPropertiesPage_user; + public static String CVSProjectPropertiesPage_Select_a_Repository_1; + public static String CVSProjectPropertiesPage_Select_a_CVS_repository_location_to_share_the_project_with__2; + public static String CVSProjectPropertiesPage_Change_Sharing_5; + public static String CVSProjectPropertiesPage_fetchAbsentDirectoriesOnUpdate; + public static String CVSProjectPropertiesPage_configureForWatchEdit; + public static String CVSProjectPropertiesPage_progressTaskName; + public static String CVSProjectPropertiesPage_setReadOnly; + public static String CVSProjectPropertiesPage_clearReadOnly; + public static String CVSRepositoryPropertiesPage_Confirm_Project_Sharing_Changes_1; + public static String CVSPreferencePage_Save_dirty_editors_before_CVS_operations_1; + public static String CVSRepositoryPropertiesPage_There_are_projects_in_the_workspace_shared_with_this_repository_2; + public static String CVSRepositoryPropertiesPage_sharedProject; + public static String CVSRepositoryPropertiesPage_useDefaultProgramName; + public static String CVSRepositoryPropertiesPage_useProgramName; + public static String CVSRepositoryPropertiesPage_useLocationAsLabel; + public static String CVSRepositoryPropertiesPage_useCustomLabel; + + public static String CVSProjectSetSerializer_Confirm_Overwrite_Project_8; + public static String CVSProjectSetSerializer_The_project__0__already_exists__Do_you_wish_to_overwrite_it__9; + + public static String IgnoreResourcesDialog_titleSingle; + public static String IgnoreResourcesDialog_titleMany; + public static String IgnoreResourcesDialog_prompt; + public static String IgnoreResourcesDialog_addNameEntryButton; + public static String IgnoreResourcesDialog_addNameEntryExample; + public static String IgnoreResourcesDialog_addExtensionEntryButton; + public static String IgnoreResourcesDialog_addExtensionEntryExample; + public static String IgnoreResourcesDialog_addCustomEntryButton; + public static String IgnoreResourcesDialog_addCustomEntryExample; + public static String IgnoreResourcesDialog_patternMustNotBeEmpty; + public static String IgnoreResourcesDialog_patternDoesNotMatchFile; + + public static String ContentAction_Confirm_Long_Operation_1; + public static String ContentAction_Changing_this_setting_will_involve_contacting_the_server_and_may_be_long_running_2; + + public static String CVSProjectPropertiesPage_You_can_change_the_sharing_of_this_project_to_another_repository_location__However__this_is_only_possible_if_the_new_location_is___compatible____on_the_same_host_with_the_same_repository_path___1; + + public static String ConfigurationWizardMainPage_Location_1; + public static String ConfigurationWizardMainPage_Authentication_2; + public static String ConfigurationWizardMainPage_Connection_3; + public static String AlternateUserValidationDialog_Enter_Password_2; + public static String AlternateUserValidationDialog_OK_6; + public static String AlternateUserValidationDialog_Cancel_7; + public static String AlternateUserValidationDialog_message; + public static String WorkbenchUserAuthenticator_The_operation_was_canceled_by_the_user_1; + public static String CVSCatchupReleaseViewer_No_workspace_file_1; + public static String CVSCatchupReleaseViewer_Select__Outgoing_Additions_1; + public static String ForceCommitSyncAction_Outgoing_Changes_Not_Added_1; + public static String ForceCommitSyncAction_You_have_chosen_to_commit_new_resources_which_have_not_been_added_to_version_control__Do_you_wish_to_add_them_to_version_control_now__2; + + public static String WorkingSetSelectionArea_workingSetOther; + public static String ListSelectionArea_selectAll; + public static String ListSelectionArea_deselectAll; + + public static String RestoreFromRepositoryWizard_fileSelectionPageTitle; + public static String RestoreFromRepositoryWizard_fileSelectionPageDescription; + public static String RestoreFromRepositoryFileSelectionPage_fileSelectionPaneTitle; + public static String RestoreFromRepositoryFileSelectionPage_revisionSelectionPaneTitle; + public static String RestoreFromRepositoryFileSelectionPage_fileToRestore; + public static String RestoreFromRepositoryFileSelectionPage_fileContentPaneTitle; + public static String RestoreFromRepositoryFileSelectionPage_emptyRevisionPane; + public static String RestoreFromRepositoryFileSelectionPage_fileExists; + public static String RestoreFromRepositoryFileSelectionPage_revisionIsDeletion; + public static String RestoreFromRepositoryAction_noFilesTitle; + public static String RestoreFromRepositoryAction_noFilesMessage; + + public static String RepositoryRoot_folderInfoMissing; + + public static String RepositoriesViewContentHandler_unmatchedTag; + public static String RepositoriesViewContentHandler_missingAttribute; + public static String RepositoriesViewContentHandler_errorCreatingRoot; + + public static String CVSWorkingSetFolderSelectionPage_projectSelectionPageTitle; + public static String CVSWorkingSetFolderSelectionPage_projectSelectionPageDescription; + public static String CVSWorkingSetFolderSelectionPage_name; + public static String CVSWorkingSetFolderSelectionPage_treeLabel; + public static String CVSWorkingSetFolderSelectionPage_refresh; + public static String CVSWorkingSetFolderSelectionPage_invalidWorkingSetName; + public static String CVSWorkingSetFolderSelectionPage_duplicateWorkingSetName; + public static String CVSWorkingSetFolderSelectionPage_mustSelectFolder; + + public static String WorkingSetSelectionDialog_title; + public static String WorkingSetSelectionDialog_title_multiSelect; + public static String WorkingSetSelectionDialog_message; + public static String WorkingSetSelectionDialog_message_multiSelect; + public static String WorkingSetSelectionDialog_detailsButton_label; + public static String WorkingSetSelectionDialog_newButton_label; + public static String WorkingSetSelectionDialog_removeButton_label; + + public static String RefreshTagsAction_title; + public static String RefreshTagsAction_message; + + public static String WatchEditPreferencePage_description; + public static String WatchEditPreferencePage_checkoutReadOnly; + public static String WatchEditPreferencePage_validateEditSaveAction; + public static String WatchEditPreferencePage_edit; + public static String WatchEditPreferencePage_highjack; + public static String WatchEditPreferencePage_editPrompt; + public static String WatchEditPreferencePage_neverPrompt; + public static String WatchEditPreferencePage_alwaysPrompt; + public static String WatchEditPreferencePage_onlyPrompt; + + public static String Uneditaction_confirmMessage; + public static String Uneditaction_confirmTitle; + + public static String FileModificationValidator_promptTitle; + public static String FileModificationValidator_promptMessage; + public static String FileModificationValidator_vetoMessage; + + public static String RefreshRemoteProjectWizard_title; + public static String RefreshRemoteProjectWizard_0; + public static String RefreshRemoteProjectWizard_1; + public static String RefreshRemoteProjectWizard_2; + public static String RefreshRemoteProjectWizard_3; + public static String RefreshRemoteProjectWizard_4; + public static String RefreshRemoteProjectSelectionPage_pageTitle; + public static String RefreshRemoteProjectSelectionPage_pageDescription; + public static String RefreshRemoteProjectSelectionPage_selectRemoteProjects; + public static String RefreshRemoteProjectSelectionPage_noWorkingSet; + public static String RefreshRemoteProjectSelectionPage_workingSet; + + public static String EditorsView_file; + public static String EditorsView_user; + public static String EditorsView_date; + public static String EditorsView_computer; + + public static String EditorsDialog_title; + public static String EditorsDialog_question; + public static String EditorsAction_classNotInitialized; + + public static String SynchronizeProjectsDialog_title; + public static String SynchronizeProjectsDialog_selectProjects; + public static String SynchronizeProjectsDialog_syncOutgoingChanges; + public static String SynchronizeProjectsDialog_allSharedProjects; + public static String SynchronizeProjectsDialog_sharedWorkingSetProjects; + + public static String RemoteFileEditorInput_fullPathAndRevision; + + public static String CheckoutOperation_thisResourceExists; + public static String CheckoutOperation_thisExternalFileExists; + public static String CheckoutOperation_confirmOverwrite; + public static String CheckoutOperation_scrubbingProject; + public static String CheckoutOperation_refreshingProject; + + public static String CheckoutSingleProjectOperation_taskname; + public static String CheckoutMultipleProjectsOperation_taskName; + + public static String CheckoutIntoOperation_taskname; + public static String CheckoutIntoOperation_targetIsFile; + public static String CheckoutIntoOperation_targetIsFolder; + public static String CheckoutIntoOperation_targetIsPrunedFolder; + public static String CheckoutIntoOperation_mappingAlreadyExists; + public static String CheckoutIntoOperation_cancelled; + public static String CheckoutIntoOperation_overwriteMessage; + + public static String AddToWorkspace_taskName1; + public static String AddToWorkspace_taskNameN; + + public static String CheckoutAsAction_checkoutFailed; + + public static String CheckoutAsAction_enterProjectTitle; + public static String CheckoutAsAction_enterLocationTitle; + public static String CheckoutAsAction_taskname; + public static String CheckoutAsAction_multiCheckout; + + public static String CheckoutAsWizard_title; + public static String CheckoutAsWizard_error; + public static String CheckoutAsMainPage_title; + public static String CheckoutAsMainPage_description; + public static String CheckoutAsMainPage_singleFolder; + public static String CheckoutAsMainPage_asConfiguredProject; + public static String CheckoutAsMainPage_asSimpleProject; + public static String CheckoutAsMainPage_projectNameLabel; + public static String CheckoutAsMainPage_multipleFolders; + public static String CheckoutAsMainPage_asProjects; + public static String CheckoutAsMainPage_intoProject; + + public static String CheckoutAsLocationSelectionPage_title; + public static String CheckoutAsLocationSelectionPage_description; + public static String CheckoutAsLocationSelectionPage_useDefaultLabel; + public static String CheckoutAsLocationSelectionPage_locationLabel; + public static String CheckoutAsLocationSelectionPage_parentDirectoryLabel; + public static String CheckoutAsLocationSelectionPage_browseLabel; + public static String CheckoutAsLocationSelectionPage_locationEmpty; + public static String CheckoutAsLocationSelectionPage_invalidLocation; + public static String CheckoutAsLocationSelectionPage_messageForSingle; + public static String CheckoutAsLocationSelectionPage_messageForMulti; + + public static String CheckoutAsProjectSelectionPage_title; + public static String CheckoutAsProjectSelectionPage_description; + public static String CheckoutAsProjectSelectionPage_name; + public static String CheckoutAsProjectSelectionPage_treeLabel; + public static String CheckoutAsProjectSelectionPage_showLabel; + public static String CheckoutAsProjectSelectionPage_recurse; + public static String CheckoutAsProjectSelectionPage_showAll; + public static String CheckoutAsProjectSelectionPage_showUnshared; + public static String CheckoutAsProjectSelectionPage_showSameRepo; + public static String CheckoutAsProjectSelectionPage_invalidFolderName; + + public static String TargetLocationSelectionDialog_projectNameLabel; + public static String TargetLocationSelectionDialog_useDefaultLabel; + public static String TargetLocationSelectionDialog_locationLabel; + public static String TargetLocationSelectionDialog_parentDirectoryLabel; + public static String TargetLocationSelectionDialog_browseLabel; + public static String TargetLocationSelectionDialog_messageForSingle; + public static String TargetLocationSelectionDialog_messageForMulti; + public static String TagetLocationSelectionDialog_locationEmpty; + public static String TagetLocationSelectionDialog_invalidLocation; + public static String TagetLocationSelectionDialog_alreadyExists; + public static String CheckoutIntoWizard_title; + public static String CheckoutIntoWizard_projectSelectionPageTitle; + public static String CheckoutIntoWizard_projectSelectionPageDescription; + public static String CheckoutIntoWizard_error; + + public static String WorkspaceChangeSetCapability_1; + public static String OpenCommitSetAction_20; + public static String OpenCommitSetAction_21; + public static String WorkspaceChangeSetCapability_2; + public static String WorkspaceChangeSetCapability_3; + public static String CVSChangeSetCollector_4; + public static String CVSChangeSetCollector_0; + public static String WorkspaceChangeSetCapability_7; + public static String WorkspaceChangeSetCapability_8; + + public static String CheckoutIntoWizard_thisResourceExists; + public static String CheckoutIntoWizard_confirmOverwrite; + public static String CheckoutIntoWizard_mappingAlreadyExists; + public static String CheckoutIntoProjectSelectionPage_description; + public static String CheckoutIntoProjectSelectionPage_name; + public static String CheckoutIntoProjectSelectionPage_treeLabel; + public static String CheckoutIntoProjectSelectionPage_showLabel; + public static String CheckoutIntoProjectSelectionPage_showAll; + public static String CheckoutIntoProjectSelectionPage_showUnshared; + public static String CheckoutIntoProjectSelectionPage_showSameRepo; + public static String CheckoutIntoProjectSelectionPage_recurse; + public static String CheckoutIntoProjectSelectionPage_invalidFolderName; + + public static String HasProjectMetaFile_taskName; + public static String TagFromWorkspace_taskName; + public static String TagFromRepository_taskName; + public static String UpdateOnlyMergeable_taskName; + public static String UpdateDialog_overwriteTitle; + public static String UpdateDialog_overwriteMessage; + public static String ReplaceOperation_taskName; + public static String UpdateOperation_taskName; + + public static String SafeUpdateAction_warnFilesWithConflictsTitle; + public static String SafeUpdateAction_warnFilesWithConflictsDescription; + + public static String Error_unableToShowSyncView; + public static String ShowAnnotationAction_1; + public static String ShowAnnotationAction_2; + public static String ShowAnnotationAction_3; + + public static String UpdateAction_jobName; + public static String MergeUpdateAction_jobName; + public static String MergeUpdateAction_invalidSubscriber; + public static String CommitAction_jobName; + + public static String CommitCommentArea_0; + public static String CommitCommentArea_1; + public static String CommitCommentArea_2; + public static String CommitCommentArea_3; + public static String CommitCommentArea_4; + + public static String OverrideAndUpdateAction_jobName; + public static String WorkInProgressPreferencePage_6; + + + + public static String CheckoutProjectOperation_8; + public static String CheckoutProjectOperation_9; + public static String CheckoutProjectOperation_0; + public static String CVSOperation_0; + public static String CVSOperation_1; + public static String CVSOperation_2; + public static String CVSModelElement_0; + public static String CVSModelElement_1; + public static String CVSDecorator_exceptionMessage; + public static String FetchMembersOperation_0; + + public static String RemoteRevisionQuickDiffProvider_readingFile; + public static String RemoteRevisionQuickDiffProvider_closingFile; + public static String RemoteRevisionQuickDiffProvider_fetchingFile; + public static String RemoteCompareOperation_0; + + public static String WorkspaceToolbarCommitAction_label; + public static String WorkspaceToolbarCommitAction_tooltip; + public static String WorkspaceToolbarCommitAction_description; + public static String WorkspaceToolbarCommitAction_image; + + public static String WorkspaceToolbarUpdateAction_label; + public static String WorkspaceToolbarUpdateAction_tooltip; + public static String WorkspaceToolbarUpdateAction_description; + public static String WorkspaceToolbarUpdateAction_image; + + public static String SharingWizardIgnore_label; + public static String SharingWizardIgnore_tooltip; + public static String SharingWizardIgnore_description; + public static String SharingWizardIgnore_image; + + public static String ConsoleRemoveAction_label; + public static String ConsoleRemoveAction_tooltip; + public static String ConsoleRemoveAction_image; + + public static String WorkspaceUpdateAction_label; + public static String WorkspaceUpdateAction_tooltip; + public static String WorkspaceUpdateAction_helpContextId; + + public static String OverrideAndUpdateAction_label; + public static String OverrideAndUpdateAction_tooltip; + public static String OverrideAndUpdateAction_helpContextId; + + public static String RefreshDirtyStateAction_label; + public static String RefreshDirtyStateOperation_0; + public static String RefreshDirtyStateOperation_1; + public static String RefreshDirtyStateAction_tooltip; + public static String RefreshDirtyStateAction_helpContextId; + + public static String WorkspaceCommitAction_label; + public static String WorkspaceCommitAction_tooltip; + public static String WorkspaceCommitAction_helpContextId; + + public static String OverrideAndCommitAction_label; + public static String OverrideAndCommitAction_tooltip; + public static String OverrideAndCommitAction_helpContextId; + + public static String ConfirmMergedAction_label; + public static String ConfirmMergedAction_tooltip; + public static String ConfirmMergedAction_helpContextId; + + public static String BranchAction_label; + public static String BranchAction_tooltip; + + public static String IgnoreAction_label; + public static String IgnoreAction_0; + public static String IgnoreAction_1; + public static String IgnoreAction_tooltip; + + public static String ShowResourceInHistoryAction_label; + public static String ShowResourceInHistoryAction_tooltip; + + public static String ShowAnnotationAction_label; + public static String ShowAnnotationAction_tooltip; + + public static String GenerateDiffFileAction_label; + public static String GenerateDiffFileOperation_0; + public static String GenerateDiffFileOperation_1; + public static String GenerateDiffFileOperation_2; + public static String GenerateDiffFileWizard_0; + public static String GenerateDiffFileWizard_2; + public static String GenerateDiffFileWizard_3; + public static String GenerateDiffFileWizard_4; + public static String GenerateDiffFileWizard_5; + public static String GenerateDiffFileAction_tooltip; + + public static String MergeUpdateAction_label; + public static String MergeUpdateAction_tooltip; + public static String MergeUpdateAction_helpContextId; + + public static String CompareRevertAction_label; + public static String CompareRevertAction_tooltip; + public static String CompareRevertAction_helpContextId; + + public static String SharingCommitAction_label; + public static String SharingCommitAction_tooltip; + public static String SharingCommitAction_description; + public static String SharingCommitAction_image; + + public static String MergeSynchronizeParticipant_8; + public static String MergeSynchronizeParticipant_9; + public static String MergeSynchronizeParticipant_10; + public static String MergeSynchronizeParticipant_11; + public static String MergeSynchronizeParticipant_12; + public static String DisconnectOperation_0; + public static String DisconnectOperation_1; + public static String SubscriberConfirmMergedAction_0; + public static String SubscriberConfirmMergedAction_jobName; + public static String CVSSubscriberAction_0; + public static String ReleaseCommentDialog_6; + public static String ReconcileProjectOperation_0; + public static String CheckoutToRemoteFolderOperation_0; + public static String CVSRepositoryPropertiesPage_21; + public static String CVSRepositoryPropertiesPage_22; + public static String CVSRepositoryPropertiesPage_23; + public static String CVSRepositoryPropertiesPage_24; + public static String CVSRepositoryPropertiesPage_0; + public static String CVSRepositoryPropertiesPage_1; + public static String CompareRevertAction_0; + public static String CompareParticipant_0; + + public static String ComparePreferencePage_0; + public static String ComparePreferencePage_1; + public static String ComparePreferencePage_2; + public static String ComparePreferencePage_3; + public static String ComparePreferencePage_4; + public static String ComparePreferencePage_6; + + public static String FileModificationValidator_3; + public static String FileModificationValidator_4; + public static String CVSSynchronizeViewPage_0; + public static String CVSSynchronizeWizard_0; + public static String Participant_comparing; + public static String Participant_merging; + public static String Participant_synchronizing; + + public static String Participant_comparingDetail; + public static String Participant_mergingDetail; + public static String Participant_synchronizingDetail; + + public static String CompareWithRevisionAction_4; + public static String ReplaceWithRevisionAction_0; + public static String ReplaceWithRevisionAction_1; + + public static String ConsolePreferencesPage_4; + public static String ConsolePreferencesPage_5; + public static String ConsolePreferencesPage_6; + public static String ConsolePreferencesPage_7; + public static String ConsolePreferencesPage_8; + public static String ConsolePreferencesPage_9; + + public static String SharingWizard_23; + public static String SharingWizard_24; + public static String SharingWizard_25; + public static String SharingWizardSyncPage_0; + public static String ReconcileProjectOperation_1; + public static String ReconcileProjectOperation_2; + public static String ShareProjectOperation_0; + public static String SharingWizard_26; + public static String SharingWizard_27; + public static String SharingWizardSyncPage_3; + public static String SharingWizardSyncPage_4; + public static String SharingWizardSyncPage_5; + public static String SharingWizardSyncPage_8; + public static String SharingWizardSyncPage_9; + public static String SharingWizardSyncPage_10; + public static String SharingWizardSyncPage_11; + public static String SharingWizardSyncPage_12; + public static String ShareProjectOperation_1; + public static String CVSProjectPropertiesPage_31; + public static String CVSProjectPropertiesPage_32; + public static String CVSProjectPropertiesPage_33; + public static String RepositoryEncodingPropertyPage_2; + public static String RepositoryEncodingPropertyPage_3; + public static String RepositoryEncodingPropertyPage_0; + public static String RepositoryEncodingPropertyPage_1; + public static String RepositoryEncodingPropertyPage_4; + public static String CheckoutWizard_7; + public static String CheckoutWizard_8; + public static String CheckoutWizard_0; + public static String CheckoutWizard_10; + public static String CheckoutWizard_11; + public static String ModuleSelectionPage_2; + public static String CheckoutAsWizard_3; + public static String CheckoutAsWizard_4; + public static String CheckoutAsMainPage_10; + public static String CVSTeamProvider_updatingFile; + public static String CVSTeamProvider_makeBranch; + public static String CVSTeamProvider_folderInfo; + public static String CVSTeamProvider_updatingFolder; + public static String AddOperation_0; + public static String BranchOperation_0; + public static String BranchOperation_1; + public static String CommitOperation_0; + public static String CommitSetDialog_0; + public static String CommitSetDialog_2; + public static String CommitSetDialog_3; + public static String CommitWizard_0; + public static String CommitWizard_1; + public static String CommitWizard_2; + public static String CommitWizard_3; + public static String CommitWizard_4; + public static String CommitWizard_6; + public static String CommitWizard_7; + public static String UpdateOperation_0; + public static String ReplaceOperation_0; + public static String ReplaceOperation_1; + public static String TagOperation_0; + public static String RemoteAnnotationStorage_1; + public static String DateTagCategory_0; + public static String DateTagDialog_0; + public static String DateTagDialog_1; + public static String DateTagDialog_2; + public static String DateTagDialog_3; + public static String DateTagDialog_4; + public static String DateTagDialog_5; + public static String WorkbenchPreference_defaultEncoding; + public static String WorkbenchPreference_otherEncoding; + public static String WorkbenchPreference_unsupportedEncoding; + + public static String LogEntryCacheUpdateHandler_0; + public static String LogEntryCacheUpdateHandler_1; + public static String LogEntryCacheUpdateHandler_2; + public static String MultiFolderTagSource_0; + public static String LocalProjectTagSource_0; + public static String AnnotateView_0; + public static String ModeWizard_0; + public static String ModeWizard_1; + public static String ModeWizard_2; + public static String ModeWizard_3; + public static String ModeWizard_4; + public static String ModeWizard_5; + public static String ModeWizard_6; + + public static String ModeWizardSelectionPage_2; + public static String ModeWizardSelectionPage_3; + public static String ModeWizardSelectionPage_4; + public static String ModeWizardSelectionPage_8; + public static String ModeWizardSelectionPage_9; + + public static String ReplaceWithTagAction_0; + public static String ReplaceWithTagAction_1; + public static String ReplaceWithTagAction_2; + public static String ReplaceWithTagAction_4; + public static String UncommittedChangesDialog_2; + public static String UncommittedChangesDialog_3; + public static String UncommittedChangesDialog_4; + public static String AddWizard_0; + + static { + // load message values from bundle file + NLS.initializeMessages(BUNDLE_NAME, CVSUIMessages.class); + } +}
\ No newline at end of file diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java index 018dcf977..ca56c2f6d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java @@ -26,6 +26,7 @@ import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; @@ -209,11 +210,11 @@ public class CVSUIPlugin extends AbstractUIPlugin { } String question; if (resources.length == 1) { - question = Policy.bind("CVSUIPlugin.refreshQuestion", status.getMessage(), resources[0].getFullPath().toString()); //$NON-NLS-1$ + question = NLS.bind(CVSUIMessages.CVSUIPlugin_refreshQuestion, new String[] { status.getMessage(), resources[0].getFullPath().toString() }); //$NON-NLS-1$ } else { - question = Policy.bind("CVSUIPlugin.refreshMultipleQuestion", status.getMessage()); //$NON-NLS-1$ + question = NLS.bind(CVSUIMessages.CVSUIPlugin_refreshMultipleQuestion, new String[] { status.getMessage() }); //$NON-NLS-1$ } - result[0] = MessageDialog.openQuestion(shellToUse, Policy.bind("CVSUIPlugin.refreshTitle"), question); //$NON-NLS-1$ + result[0] = MessageDialog.openQuestion(shellToUse, CVSUIMessages.CVSUIPlugin_refreshTitle, question); //$NON-NLS-1$ } }; Display.getDefault().syncExec(runnable); @@ -333,7 +334,7 @@ public class CVSUIPlugin extends AbstractUIPlugin { } public static void log(CoreException e) { - log(e.getStatus().getSeverity(), Policy.bind("simpleInternal"), e); //$NON-NLS-1$ + log(e.getStatus().getSeverity(), CVSUIMessages.simpleInternal, e); //$NON-NLS-1$ } /** @@ -393,16 +394,16 @@ public class CVSUIPlugin extends AbstractUIPlugin { status = ((TeamException)exception).getStatus(); log = ((flags & LOG_TEAM_EXCEPTIONS) > 0); } else if (exception instanceof InterruptedException) { - return new CVSStatus(IStatus.OK, Policy.bind("ok")); //$NON-NLS-1$ + return new CVSStatus(IStatus.OK, CVSUIMessages.ok); //$NON-NLS-1$ } else if (exception != null) { - status = new CVSStatus(IStatus.ERROR, Policy.bind("internal"), exception); //$NON-NLS-1$ + status = new CVSStatus(IStatus.ERROR, CVSUIMessages.internal, exception); //$NON-NLS-1$ log = ((flags & LOG_OTHER_EXCEPTIONS) > 0); - if (title == null) title = Policy.bind("SimpleInternal"); //$NON-NLS-1$ + if (title == null) title = CVSUIMessages.internal; //$NON-NLS-1$ } // Check for a build error and report it differently if (status.getCode() == IResourceStatus.BUILD_FAILED) { - message = Policy.bind("buildError"); //$NON-NLS-1$ + message = CVSUIMessages.buildError; //$NON-NLS-1$ log = true; } @@ -422,7 +423,7 @@ public class CVSUIPlugin extends AbstractUIPlugin { final IOpenableInShell openable = new IOpenableInShell() { public void open(Shell shell) { if (displayStatus.getSeverity() == IStatus.INFO && !displayStatus.isMultiStatus()) { - MessageDialog.openInformation(shell, Policy.bind("information"), displayStatus.getMessage()); //$NON-NLS-1$ + MessageDialog.openInformation(shell, CVSUIMessages.information, displayStatus.getMessage()); //$NON-NLS-1$ } else { ErrorDialog.openError(shell, displayTitle, displayMessage, displayStatus); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java index 29a159c2b..7ada77d79 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java @@ -180,8 +180,8 @@ public class CommitCommentArea extends DialogArea { } } - private static final String EMPTY_MESSAGE= Policy.bind("CommitCommentArea.0"); //$NON-NLS-1$ - private static final String COMBO_MESSAGE= Policy.bind("CommitCommentArea.1"); //$NON-NLS-1$ + private static final String EMPTY_MESSAGE= CVSUIMessages.CommitCommentArea_0; //$NON-NLS-1$ + private static final String COMBO_MESSAGE= CVSUIMessages.CommitCommentArea_1; //$NON-NLS-1$ public static final String OK_REQUESTED = "OkRequested";//$NON-NLS-1$ public static final String COMMENT_MODIFIED = "CommentModified";//$NON-NLS-1$ @@ -234,9 +234,9 @@ public class CommitCommentArea extends DialogArea { if (MessageDialogWithToggle.PROMPT.equals(value)) { - final String title= Policy.bind("CommitCommentArea.2"); //$NON-NLS-1$ - final String message= Policy.bind("CommitCommentArea.3"); //$NON-NLS-1$ - final String toggleMessage= Policy.bind("CommitCommentArea.4"); //$NON-NLS-1$ + final String title= CVSUIMessages.CommitCommentArea_2; //$NON-NLS-1$ + final String message= CVSUIMessages.CommitCommentArea_3; //$NON-NLS-1$ + final String toggleMessage= CVSUIMessages.CommitCommentArea_4; //$NON-NLS-1$ final MessageDialogWithToggle dialog= MessageDialogWithToggle.openYesNoQuestion(shell, title, message, toggleMessage, false, store, ICVSUIConstants.PREF_ALLOW_EMPTY_COMMIT_COMMENTS); if (dialog.getReturnCode() != IDialogConstants.YES_ID) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ComparePreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ComparePreferencePage.java index 3586a04bc..58c2474f7 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ComparePreferencePage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ComparePreferencePage.java @@ -35,7 +35,7 @@ public class ComparePreferencePage extends CVSFieldEditorPreferencePage { * @see org.eclipse.team.internal.ccvs.ui.CVSFieldEditorPreferencePage#getPageDescription() */ protected String getPageDescription() { - return Policy.bind("ComparePreferencePage.0"); //$NON-NLS-1$ + return CVSUIMessages.ComparePreferencePage_0; //$NON-NLS-1$ } /* (non-Javadoc) @@ -44,7 +44,7 @@ public class ComparePreferencePage extends CVSFieldEditorPreferencePage { protected void createFieldEditors() { addField(new BooleanFieldEditor( ICVSUIConstants.PREF_CONSIDER_CONTENTS, - Policy.bind("ComparePreferencePage.4"), //$NON-NLS-1$ + CVSUIMessages.ComparePreferencePage_4, //$NON-NLS-1$ BooleanFieldEditor.DEFAULT, getFieldEditorParent()) { protected Button getChangeControl(Composite parent) { @@ -55,17 +55,17 @@ public class ComparePreferencePage extends CVSFieldEditorPreferencePage { }); addField(new BooleanFieldEditor( ICVSUIConstants.PREF_SHOW_COMPARE_REVISION_IN_DIALOG, - Policy.bind("ComparePreferencePage.3"), //$NON-NLS-1$ + CVSUIMessages.ComparePreferencePage_3, //$NON-NLS-1$ BooleanFieldEditor.DEFAULT, getFieldEditorParent())); addField(new BooleanFieldEditor( ICVSUIConstants.PREF_SHOW_AUTHOR_IN_EDITOR, - Policy.bind("ComparePreferencePage.1"), //$NON-NLS-1$ + CVSUIMessages.ComparePreferencePage_1, //$NON-NLS-1$ BooleanFieldEditor.DEFAULT, getFieldEditorParent())); addField(new BooleanFieldEditor( ICVSUIConstants.PREF_COMMIT_SET_DEFAULT_ENABLEMENT, - Policy.bind("ComparePreferencePage.2"), //$NON-NLS-1$ + CVSUIMessages.ComparePreferencePage_2, //$NON-NLS-1$ BooleanFieldEditor.DEFAULT, getFieldEditorParent())); @@ -73,7 +73,7 @@ public class ComparePreferencePage extends CVSFieldEditorPreferencePage { if (container instanceof IWorkbenchPreferenceContainer) { IWorkbenchPreferenceContainer workbenchContainer = (IWorkbenchPreferenceContainer) container; SWTUtils.createPreferenceLink(workbenchContainer, getFieldEditorParent(), - CompareUI.PREFERENCE_PAGE_ID, Policy.bind("ComparePreferencePage.6")); //$NON-NLS-1$ //$NON-NLS-2$ + CompareUI.PREFERENCE_PAGE_ID, CVSUIMessages.ComparePreferencePage_6); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/DateTagDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/DateTagDialog.java index f9ef5cc98..48a7a5135 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/DateTagDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/DateTagDialog.java @@ -41,7 +41,7 @@ public class DateTagDialog extends Dialog { public void createArea(Composite parent) { Composite composite = createComposite(parent, 4, false); initializeDialogUnits(composite); - createLabel(composite, Policy.bind("DateTagDialog.0"), 1); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.DateTagDialog_0, 1); //$NON-NLS-1$ fromMonthCombo = new Combo(composite, SWT.READ_ONLY); fromDayCombo = new Combo(composite, SWT.READ_ONLY); fromDayCombo.setTextLimit(2); @@ -112,8 +112,8 @@ public class DateTagDialog extends Dialog { public void createArea(Composite parent) { Composite composite = createComposite(parent, 2, false); initializeDialogUnits(composite); - includeTime = createCheckbox(composite, Policy.bind("DateTagDialog.1"), 2); //$NON-NLS-1$ - createLabel(composite, Policy.bind("DateTagDialog.2"), 1); //$NON-NLS-1$ + includeTime = createCheckbox(composite, CVSUIMessages.DateTagDialog_1, 2); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.DateTagDialog_2, 1); //$NON-NLS-1$ Composite dateComposite = new Composite(composite, SWT.NONE); GridLayout dateLayout = new GridLayout(); dateLayout.numColumns = 3; @@ -124,8 +124,8 @@ public class DateTagDialog extends Dialog { minuteCombo.setTextLimit(2); secondCombo = new Combo(dateComposite, SWT.READ_ONLY); secondCombo.setTextLimit(2); - localTime = createRadioButton(composite, Policy.bind("DateTagDialog.3"), 2); //$NON-NLS-1$ - utcTime = createRadioButton(composite, Policy.bind("DateTagDialog.4"), 2); //$NON-NLS-1$ + localTime = createRadioButton(composite, CVSUIMessages.DateTagDialog_3, 2); //$NON-NLS-1$ + utcTime = createRadioButton(composite, CVSUIMessages.DateTagDialog_4, 2); //$NON-NLS-1$ String sixty[] = new String[60]; for (int i = 0; i < 60; i++) { @@ -188,7 +188,7 @@ public class DateTagDialog extends Dialog { */ protected void configureShell(Shell newShell) { super.configureShell(newShell); - newShell.setText(Policy.bind("DateTagDialog.5")); //$NON-NLS-1$ + newShell.setText(CVSUIMessages.DateTagDialog_5); //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsDialog.java index 476cff63b..c2cdbdf95 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsDialog.java @@ -43,7 +43,7 @@ public class EditorsDialog extends Dialog { Composite parent = (Composite) super.createDialogArea(container); - getShell().setText(Policy.bind("EditorsDialog.title")); //$NON-NLS-1$ + getShell().setText(CVSUIMessages.EditorsDialog_title); //$NON-NLS-1$ createMessageArea(parent); editorsView = new EditorsView(); editorsView.createPartControl(container); @@ -62,7 +62,7 @@ public class EditorsDialog extends Dialog { */ private void createMessageArea(Composite parent) { Label label = new Label(parent, SWT.NONE); - label.setText(Policy.bind("EditorsDialog.question")); //$NON-NLS-1$ + label.setText(CVSUIMessages.EditorsDialog_question); //$NON-NLS-1$ } } 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 714337685..ef7ec4e2c 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 @@ -170,25 +170,25 @@ public class EditorsView extends ViewPart { // file name col = new TableColumn(table, SWT.NONE); col.setResizable(true); - col.setText(Policy.bind("EditorsView.file")); //$NON-NLS-1$ + col.setText(CVSUIMessages.EditorsView_file); //$NON-NLS-1$ layout.addColumnData(new ColumnWeightData(30, true)); // user name col = new TableColumn(table, SWT.NONE); col.setResizable(true); - col.setText(Policy.bind("EditorsView.user")); //$NON-NLS-1$ + col.setText(CVSUIMessages.EditorsView_user); //$NON-NLS-1$ layout.addColumnData(new ColumnWeightData(20, true)); // creation date col = new TableColumn(table, SWT.NONE); col.setResizable(true); - col.setText(Policy.bind("EditorsView.date")); //$NON-NLS-1$ + col.setText(CVSUIMessages.EditorsView_date); //$NON-NLS-1$ layout.addColumnData(new ColumnWeightData(30, true)); // computer name col = new TableColumn(table, SWT.NONE); col.setResizable(true); - col.setText(Policy.bind("EditorsView.computer")); //$NON-NLS-1$ + col.setText(CVSUIMessages.EditorsView_computer); //$NON-NLS-1$ layout.addColumnData(new ColumnWeightData(20, true)); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java index 067480fc7..f8516444f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java @@ -64,11 +64,11 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc } }; - useExternal = createRadioButton(composite, Policy.bind("ExtMethodPreferencePage.0"), 1); //$NON-NLS-1$ + useExternal = createRadioButton(composite, CVSUIMessages.ExtMethodPreferencePage_0, 1); //$NON-NLS-1$ useExternal.addSelectionListener(selectionListener); external = createExternalArea(composite); - useInternal = createRadioButton(composite, Policy.bind("ExtMethodPreferencePage.1"), 1); //$NON-NLS-1$ + useInternal = createRadioButton(composite, CVSUIMessages.ExtMethodPreferencePage_1, 1); //$NON-NLS-1$ useInternal.addSelectionListener(selectionListener); internal = createInternalArea(composite); @@ -97,14 +97,14 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); Label intro = new Label(composite, SWT.LEFT | SWT.WRAP); - intro.setText(Policy.bind("ExtMethodPreferencePage.2")); //$NON-NLS-1$ + intro.setText(CVSUIMessages.ExtMethodPreferencePage_2); //$NON-NLS-1$ GridData data = new GridData(); data.horizontalSpan = 2; data.horizontalAlignment = GridData.FILL; data.widthHint = 300; intro.setLayoutData(data); - createLabel(composite, Policy.bind("CVSPropertiesPage.connectionType"), 1); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSPropertiesPage_connectionType, 1); //$NON-NLS-1$ methodType = createCombo(composite); return composite; } @@ -118,19 +118,19 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); Label intro = new Label(composite, SWT.LEFT | SWT.WRAP); - intro.setText(Policy.bind("ExtMethodPreferencePage_message")); //$NON-NLS-1$ + intro.setText(CVSUIMessages.ExtMethodPreferencePage_message); //$NON-NLS-1$ GridData data = new GridData(); data.horizontalSpan = 3; data.horizontalAlignment = GridData.FILL; data.widthHint = 300; intro.setLayoutData(data); - new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_RSH")); //$NON-NLS-1$ + new Label(composite, SWT.LEFT).setText(CVSUIMessages.ExtMethodPreferencePage_CVS_RSH); //$NON-NLS-1$ cvsRsh = new Text(composite, SWT.BORDER); cvsRsh.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); final Button b = new Button(composite, SWT.NONE); - b.setText(Policy.bind("ExtMethodPreferencePage_Browse")); //$NON-NLS-1$ + b.setText(CVSUIMessages.ExtMethodPreferencePage_Browse); //$NON-NLS-1$ data = new GridData(); data.horizontalAlignment = GridData.FILL; data.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT); @@ -140,7 +140,7 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc b.addListener(SWT.MouseDown, new Listener() { public void handleEvent (Event event) { FileDialog d = new FileDialog(getShell()); - d.setText(Policy.bind("ExtMethodPreferencePage_Details")); //$NON-NLS-1$ + d.setText(CVSUIMessages.ExtMethodPreferencePage_Details); //$NON-NLS-1$ String file = d.open(); if(file!=null) { setCvsRshText(file); @@ -148,14 +148,14 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc } }); - new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_RSH_Parameters")); //$NON-NLS-1$ + new Label(composite, SWT.LEFT).setText(CVSUIMessages.ExtMethodPreferencePage_CVS_RSH_Parameters); //$NON-NLS-1$ cvsRshParameters = new Text(composite, SWT.BORDER); data = new GridData(); data.horizontalSpan = 2; data.horizontalAlignment = GridData.FILL; cvsRshParameters.setLayoutData(data); - new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_SERVER__7")); //$NON-NLS-1$ + new Label(composite, SWT.LEFT).setText(CVSUIMessages.ExtMethodPreferencePage_CVS_SERVER__7); //$NON-NLS-1$ cvsServer = new Text(composite, SWT.BORDER); data = new GridData(); data.horizontalSpan = 2; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java index 6f04a33b6..4992e5f12 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java @@ -51,7 +51,7 @@ public class FileModificationValidator extends CVSCoreFileModificationValidator } else if (target instanceof CoreException) { return ((CoreException) target).getStatus(); } - return new Status(IStatus.ERROR, CVSUIPlugin.ID, 0, Policy.bind("internal"), target); //$NON-NLS-1$ + return new Status(IStatus.ERROR, CVSUIPlugin.ID, 0, CVSUIMessages.internal, target); //$NON-NLS-1$ } private IStatus edit(final IFile[] files, final Shell shell) { @@ -88,7 +88,7 @@ public class FileModificationValidator extends CVSCoreFileModificationValidator return getStatus(e); } catch (InterruptedException e) { // Must return an error to indicate that it is not OK to edit the files - return new Status(IStatus.CANCEL, CVSUIPlugin.ID, 0, Policy.bind("FileModificationValidator.vetoMessage"), null); //$NON-NLS-1$; + return new Status(IStatus.CANCEL, CVSUIPlugin.ID, 0, CVSUIMessages.FileModificationValidator_vetoMessage, null); //$NON-NLS-1$; } } else { // Allow the files to be edited without notifying the server @@ -128,7 +128,7 @@ public class FileModificationValidator extends CVSCoreFileModificationValidator int flags = isRunningInUIThread() ? 0 : CVSUIPlugin.PERFORM_SYNC_EXEC; CVSUIPlugin.openDialog(shell, new CVSUIPlugin.IOpenableInShell() { public void open(Shell shell) { - result[0] = MessageDialog.openQuestion(shell,Policy.bind("FileModificationValidator.3"),Policy.bind("FileModificationValidator.4")); //$NON-NLS-1$ //$NON-NLS-2$ + result[0] = MessageDialog.openQuestion(shell,CVSUIMessages.FileModificationValidator_3,CVSUIMessages.FileModificationValidator_4); //$NON-NLS-1$ //$NON-NLS-2$ } }, flags); return result[0]; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterDialog.java index 54d276ae4..a59158704 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterDialog.java @@ -53,7 +53,7 @@ public class HistoryFilterDialog extends Dialog { protected void configureShell(Shell newShell) { super.configureShell(newShell); - newShell.setText(Policy.bind("HistoryFilterDialog.title")); //$NON-NLS-1$ + newShell.setText(CVSUIMessages.HistoryFilterDialog_title); //$NON-NLS-1$ } protected Control createDialogArea(Composite parent) { @@ -69,36 +69,36 @@ public class HistoryFilterDialog extends Dialog { GridData data = new GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan = 2; label.setLayoutData(data); - label.setText(Policy.bind("HistoryFilterDialog.showMatching")); //$NON-NLS-1$ + label.setText(CVSUIMessages.HistoryFilterDialog_showMatching); //$NON-NLS-1$ andRadio = new Button(topLevel, SWT.RADIO); - andRadio.setText(Policy.bind("HistoryFilterDialog.matchingAll")); //$NON-NLS-1$ + andRadio.setText(CVSUIMessages.HistoryFilterDialog_matchingAll); //$NON-NLS-1$ data = new GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan = 2; andRadio.setLayoutData(data); andRadio.setSelection(true); orRadio = new Button(topLevel, SWT.RADIO); - orRadio.setText(Policy.bind("HistoryFilterDialog.matchingAny")); //$NON-NLS-1$ + orRadio.setText(CVSUIMessages.HistoryFilterDialog_matchingAny); //$NON-NLS-1$ data = new GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan = 2; orRadio.setLayoutData(data); //author label = new Label(topLevel, SWT.NONE); - label.setText(Policy.bind("HistoryFilterDialog.author")); //$NON-NLS-1$ + label.setText(CVSUIMessages.HistoryFilterDialog_author); //$NON-NLS-1$ author = new Text(topLevel, SWT.BORDER); author.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); //comment label = new Label(topLevel, SWT.NONE); - label.setText(Policy.bind("HistoryFilterDialog.comment")); //$NON-NLS-1$ + label.setText(CVSUIMessages.HistoryFilterDialog_comment); //$NON-NLS-1$ comment = new Text(topLevel, SWT.BORDER); comment.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); //"from" date label = new Label(topLevel, SWT.NONE); - label.setText(Policy.bind("HistoryFilterDialog.fromDate")); //$NON-NLS-1$ + label.setText(CVSUIMessages.HistoryFilterDialog_fromDate); //$NON-NLS-1$ Composite fdComposite = new Composite(topLevel, SWT.NONE); GridLayout fdLayout = new GridLayout(); fdLayout.numColumns = 3; @@ -110,7 +110,7 @@ public class HistoryFilterDialog extends Dialog { //"to" date label = new Label(topLevel, SWT.NONE); - label.setText(Policy.bind("HistoryFilterDialog.toDate")); //$NON-NLS-1$ + label.setText(CVSUIMessages.HistoryFilterDialog_toDate); //$NON-NLS-1$ Composite tdComposite = new Composite(topLevel, SWT.NONE); GridLayout tdLayout = new GridLayout(); tdLayout.numColumns = 3; 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 023debe63..3da7ee792 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 @@ -16,6 +16,7 @@ import java.util.Date; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.*; import org.eclipse.swt.graphics.*; @@ -64,7 +65,7 @@ public class HistoryTableProvider { String revision = entry.getRevision(); String currentRevision = getCurrentRevision(); if (currentRevision != null && currentRevision.equals(revision)) { - revision = Policy.bind("currentRevision", revision); //$NON-NLS-1$ + revision = NLS.bind(CVSUIMessages.currentRevision, new String[] { revision }); //$NON-NLS-1$ } return revision; case COL_TAGS: @@ -79,7 +80,7 @@ public class HistoryTableProvider { return result.toString(); case COL_DATE: Date date = entry.getDate(); - if (date == null) return Policy.bind("notAvailable"); //$NON-NLS-1$ + if (date == null) return CVSUIMessages.notAvailable; //$NON-NLS-1$ return DateFormat.getInstance().format(date); case COL_AUTHOR: return entry.getAuthor(); @@ -90,9 +91,9 @@ public class HistoryTableProvider { case -1: return comment; case 0: - return Policy.bind("HistoryView.[...]_4"); //$NON-NLS-1$ + return CVSUIMessages.HistoryView_______4; //$NON-NLS-1$ default: - return Policy.bind("CVSCompareRevisionsInput.truncate", comment.substring(0, index)); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CVSCompareRevisionsInput_truncate, new String[] { comment.substring(0, index) }); //$NON-NLS-1$ } } return ""; //$NON-NLS-1$ @@ -334,35 +335,35 @@ public class HistoryTableProvider { // revision TableColumn col = new TableColumn(table, SWT.NONE); col.setResizable(true); - col.setText(Policy.bind("HistoryView.revision")); //$NON-NLS-1$ + col.setText(CVSUIMessages.HistoryView_revision); //$NON-NLS-1$ col.addSelectionListener(headerListener); layout.addColumnData(new ColumnWeightData(20, true)); // tags col = new TableColumn(table, SWT.NONE); col.setResizable(true); - col.setText(Policy.bind("HistoryView.tags")); //$NON-NLS-1$ + col.setText(CVSUIMessages.HistoryView_tags); //$NON-NLS-1$ col.addSelectionListener(headerListener); layout.addColumnData(new ColumnWeightData(20, true)); // creation date col = new TableColumn(table, SWT.NONE); col.setResizable(true); - col.setText(Policy.bind("HistoryView.date")); //$NON-NLS-1$ + col.setText(CVSUIMessages.HistoryView_date); //$NON-NLS-1$ col.addSelectionListener(headerListener); layout.addColumnData(new ColumnWeightData(20, true)); // author col = new TableColumn(table, SWT.NONE); col.setResizable(true); - col.setText(Policy.bind("HistoryView.author")); //$NON-NLS-1$ + col.setText(CVSUIMessages.HistoryView_author); //$NON-NLS-1$ col.addSelectionListener(headerListener); layout.addColumnData(new ColumnWeightData(20, true)); //comment col = new TableColumn(table, SWT.NONE); col.setResizable(true); - col.setText(Policy.bind("HistoryView.comment")); //$NON-NLS-1$ + col.setText(CVSUIMessages.HistoryView_comment); //$NON-NLS-1$ col.addSelectionListener(headerListener); layout.addColumnData(new ColumnWeightData(50, true)); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryView.java index b5fa5a70c..5890f96c8 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryView.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryView.java @@ -26,6 +26,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.*; import org.eclipse.jface.viewers.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.*; import org.eclipse.swt.dnd.DND; @@ -137,7 +138,7 @@ public class HistoryView extends ViewPart { private class FetchLogEntriesJob extends Job { public ICVSRemoteFile remoteFile; public FetchLogEntriesJob() { - super(Policy.bind("HistoryView.fetchHistoryJob")); //$NON-NLS-1$; + super(CVSUIMessages.HistoryView_fetchHistoryJob); //$NON-NLS-1$; } public void setRemoteFile(ICVSRemoteFile file) { this.remoteFile = file; @@ -172,22 +173,22 @@ public class HistoryView extends ViewPart { protected void contributeActions() { // Refresh (toolbar) CVSUIPlugin plugin = CVSUIPlugin.getPlugin(); - refreshAction = new Action(Policy.bind("HistoryView.refreshLabel"), plugin.getImageDescriptor(ICVSUIConstants.IMG_REFRESH_ENABLED)) { //$NON-NLS-1$ + refreshAction = new Action(CVSUIMessages.HistoryView_refreshLabel, plugin.getImageDescriptor(ICVSUIConstants.IMG_REFRESH_ENABLED)) { //$NON-NLS-1$ public void run() { refresh(); } }; - refreshAction.setToolTipText(Policy.bind("HistoryView.refresh")); //$NON-NLS-1$ + refreshAction.setToolTipText(CVSUIMessages.HistoryView_refresh); //$NON-NLS-1$ refreshAction.setDisabledImageDescriptor(plugin.getImageDescriptor(ICVSUIConstants.IMG_REFRESH_DISABLED)); refreshAction.setHoverImageDescriptor(plugin.getImageDescriptor(ICVSUIConstants.IMG_REFRESH)); // Link with Editor (toolbar) - linkWithEditorAction = new Action(Policy.bind("HistoryView.linkWithLabel"), plugin.getImageDescriptor(ICVSUIConstants.IMG_LINK_WITH_EDITOR_ENABLED)) { //$NON-NLS-1$ + linkWithEditorAction = new Action(CVSUIMessages.HistoryView_linkWithLabel, plugin.getImageDescriptor(ICVSUIConstants.IMG_LINK_WITH_EDITOR_ENABLED)) { //$NON-NLS-1$ public void run() { setLinkingEnabled(isChecked()); } }; - linkWithEditorAction.setToolTipText(Policy.bind("HistoryView.linkWithLabel")); //$NON-NLS-1$ + linkWithEditorAction.setToolTipText(CVSUIMessages.HistoryView_linkWithLabel); //$NON-NLS-1$ linkWithEditorAction.setHoverImageDescriptor(plugin.getImageDescriptor(ICVSUIConstants.IMG_LINK_WITH_EDITOR)); linkWithEditorAction.setChecked(isLinkingEnabled()); @@ -200,7 +201,7 @@ public class HistoryView extends ViewPart { } }); - getContentsAction = getContextMenuAction(Policy.bind("HistoryView.getContentsAction"), true /* needs progress */, new IWorkspaceRunnable() { //$NON-NLS-1$ + getContentsAction = getContextMenuAction(CVSUIMessages.HistoryView_getContentsAction, true /* needs progress */, new IWorkspaceRunnable() { //$NON-NLS-1$ public void run(IProgressMonitor monitor) throws CoreException { ICVSRemoteFile remoteFile = currentSelection.getRemoteFile(); monitor.beginTask(null, 100); @@ -218,7 +219,7 @@ public class HistoryView extends ViewPart { }); WorkbenchHelp.setHelp(getContentsAction, IHelpContextIds.GET_FILE_CONTENTS_ACTION); - getRevisionAction = getContextMenuAction(Policy.bind("HistoryView.getRevisionAction"), true /* needs progress */, new IWorkspaceRunnable() { //$NON-NLS-1$ + getRevisionAction = getContextMenuAction(CVSUIMessages.HistoryView_getRevisionAction, true /* needs progress */, new IWorkspaceRunnable() { //$NON-NLS-1$ public void run(IProgressMonitor monitor) throws CoreException { ICVSRemoteFile remoteFile = currentSelection.getRemoteFile(); try { @@ -281,7 +282,7 @@ public class HistoryView extends ViewPart { return resources; } }; - tagWithExistingAction = getContextMenuAction(Policy.bind("HistoryView.tagWithExistingAction"), false /* no progress */, new IWorkspaceRunnable() { //$NON-NLS-1$ + tagWithExistingAction = getContextMenuAction(CVSUIMessages.HistoryView_tagWithExistingAction, false /* no progress */, new IWorkspaceRunnable() { //$NON-NLS-1$ public void run(IProgressMonitor monitor) throws CoreException { tagActionDelegate.selectionChanged(tagWithExistingAction, tableViewer.getSelection()); tagActionDelegate.run(tagWithExistingAction); @@ -298,7 +299,7 @@ public class HistoryView extends ViewPart { // Toggle text visible action final IPreferenceStore store = CVSUIPlugin.getPlugin().getPreferenceStore(); - toggleTextAction = new Action(Policy.bind("HistoryView.showComment")) { //$NON-NLS-1$ + toggleTextAction = new Action(CVSUIMessages.HistoryView_showComment) { //$NON-NLS-1$ public void run() { setViewerVisibility(); store.setValue(ICVSUIConstants.PREF_SHOW_COMMENTS, toggleTextAction.isChecked()); @@ -307,7 +308,7 @@ public class HistoryView extends ViewPart { toggleTextAction.setChecked(store.getBoolean(ICVSUIConstants.PREF_SHOW_COMMENTS)); WorkbenchHelp.setHelp(toggleTextAction, IHelpContextIds.SHOW_COMMENT_IN_HISTORY_ACTION); // Toggle list visible action - toggleListAction = new Action(Policy.bind("HistoryView.showTags")) { //$NON-NLS-1$ + toggleListAction = new Action(CVSUIMessages.HistoryView_showTags) { //$NON-NLS-1$ public void run() { setViewerVisibility(); store.setValue(ICVSUIConstants.PREF_SHOW_TAGS, toggleListAction.isChecked()); @@ -342,11 +343,11 @@ public class HistoryView extends ViewPart { // Create actions for the text editor copyAction = new TextViewerAction(textViewer, ITextOperationTarget.COPY); - copyAction.setText(Policy.bind("HistoryView.copy")); //$NON-NLS-1$ + copyAction.setText(CVSUIMessages.HistoryView_copy); //$NON-NLS-1$ actionBars.setGlobalActionHandler(ITextEditorActionConstants.COPY, copyAction); selectAllAction = new TextViewerAction(textViewer, ITextOperationTarget.SELECT_ALL); - selectAllAction.setText(Policy.bind("HistoryView.selectAll")); //$NON-NLS-1$ + selectAllAction.setText(CVSUIMessages.HistoryView_selectAll); //$NON-NLS-1$ actionBars.setGlobalActionHandler(ITextEditorActionConstants.SELECT_ALL, selectAllAction); actionBars.updateActionBars(); @@ -446,7 +447,7 @@ public class HistoryView extends ViewPart { try { fetchLogEntriesJob.join(); } catch (InterruptedException e) { - CVSUIPlugin.log(new CVSException(Policy.bind("HistoryView.errorFetchingEntries", remoteFile.getName()), e)); //$NON-NLS-1$ + CVSUIPlugin.log(new CVSException(NLS.bind(CVSUIMessages.HistoryView_errorFetchingEntries, new String[] { remoteFile.getName() }), e)); //$NON-NLS-1$ } } fetchLogEntriesJob.setRemoteFile(remoteFile); @@ -556,7 +557,7 @@ public class HistoryView extends ViewPart { try { fetchLogEntriesJob.join(); } catch (InterruptedException e) { - CVSUIPlugin.log(new CVSException(Policy.bind("HistoryView.errorFetchingEntries", ""), e)); //$NON-NLS-1$ //$NON-NLS-2$ + CVSUIPlugin.log(new CVSException(NLS.bind(CVSUIMessages.HistoryView_errorFetchingEntries, new String[] { "" }), e)); //$NON-NLS-1$ //$NON-NLS-2$ } } } @@ -781,8 +782,8 @@ public class HistoryView extends ViewPart { ICVSFile cvsFile = CVSWorkspaceRoot.getCVSFileFor(file); try { if(cvsFile.isModified(null)) { - String title = Policy.bind("HistoryView.overwriteTitle"); //$NON-NLS-1$ - String msg = Policy.bind("HistoryView.overwriteMsg"); //$NON-NLS-1$ + String title = CVSUIMessages.HistoryView_overwriteTitle; //$NON-NLS-1$ + String msg = CVSUIMessages.HistoryView_overwriteMsg; //$NON-NLS-1$ final MessageDialog dialog = new MessageDialog(getViewSite().getShell(), title, null, msg, MessageDialog.QUESTION, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.CANCEL_LABEL }, 0); final int[] result = new int[1]; getViewSite().getShell().getDisplay().syncExec(new Runnable() { @@ -881,7 +882,7 @@ public class HistoryView extends ViewPart { char c = string.charAt(i); if (c == '\r' || c == '\n') { if (!skipAdjacentLineSeparator) - buffer.append(Policy.bind("separator")); //$NON-NLS-1$ + buffer.append(CVSUIMessages.separator); //$NON-NLS-1$ skipAdjacentLineSeparator = true; } else { buffer.append(c); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java index 991d515b8..130c21fcb 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java @@ -15,6 +15,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.resource.JFaceColors; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -111,9 +112,9 @@ public class IgnoreResourcesDialog extends Dialog { protected void configureShell(Shell newShell) { super.configureShell(newShell); if (resources.length == 1) { - newShell.setText(Policy.bind("IgnoreResourcesDialog.titleSingle", resources[0].getName())); //$NON-NLS-1$ + newShell.setText(NLS.bind(CVSUIMessages.IgnoreResourcesDialog_titleSingle, new String[] { resources[0].getName() })); //$NON-NLS-1$ } else { - newShell.setText(Policy.bind("IgnoreResourcesDialog.titleMany", Integer.toString(resources.length))); //$NON-NLS-1$ + newShell.setText(NLS.bind(CVSUIMessages.IgnoreResourcesDialog_titleMany, new String[] { Integer.toString(resources.length) })); //$NON-NLS-1$ } } @@ -135,7 +136,7 @@ public class IgnoreResourcesDialog extends Dialog { WorkbenchHelp.setHelp(top, IHelpContextIds.ADD_TO_CVSIGNORE); - createIndentedLabel(top, Policy.bind("IgnoreResourcesDialog.prompt"), 0); //$NON-NLS-1$ + createIndentedLabel(top, CVSUIMessages.IgnoreResourcesDialog_prompt, 0); //$NON-NLS-1$ Listener selectionListener = new Listener() { public void handleEvent(Event event) { @@ -148,20 +149,20 @@ public class IgnoreResourcesDialog extends Dialog { } }; - addNameEntryButton = createRadioButton(top, Policy.bind("IgnoreResourcesDialog.addNameEntryButton")); //$NON-NLS-1$ + addNameEntryButton = createRadioButton(top, CVSUIMessages.IgnoreResourcesDialog_addNameEntryButton); //$NON-NLS-1$ addNameEntryButton.addListener(SWT.Selection, selectionListener); addNameEntryButton.setSelection(selectedAction == ADD_NAME_ENTRY); - createIndentedLabel(top, Policy.bind("IgnoreResourcesDialog.addNameEntryExample"), LABEL_INDENT_WIDTH); //$NON-NLS-1$ + createIndentedLabel(top, CVSUIMessages.IgnoreResourcesDialog_addNameEntryExample, LABEL_INDENT_WIDTH); //$NON-NLS-1$ - addExtensionEntryButton = createRadioButton(top, Policy.bind("IgnoreResourcesDialog.addExtensionEntryButton")); //$NON-NLS-1$ + addExtensionEntryButton = createRadioButton(top, CVSUIMessages.IgnoreResourcesDialog_addExtensionEntryButton); //$NON-NLS-1$ addExtensionEntryButton.addListener(SWT.Selection, selectionListener); addExtensionEntryButton.setSelection(selectedAction == ADD_EXTENSION_ENTRY); - createIndentedLabel(top, Policy.bind("IgnoreResourcesDialog.addExtensionEntryExample"), LABEL_INDENT_WIDTH); //$NON-NLS-1$ + createIndentedLabel(top, CVSUIMessages.IgnoreResourcesDialog_addExtensionEntryExample, LABEL_INDENT_WIDTH); //$NON-NLS-1$ - addCustomEntryButton = createRadioButton(top, Policy.bind("IgnoreResourcesDialog.addCustomEntryButton")); //$NON-NLS-1$ + addCustomEntryButton = createRadioButton(top, CVSUIMessages.IgnoreResourcesDialog_addCustomEntryButton); //$NON-NLS-1$ addCustomEntryButton.addListener(SWT.Selection, selectionListener); addCustomEntryButton.setSelection(selectedAction == ADD_CUSTOM_ENTRY); - createIndentedLabel(top, Policy.bind("IgnoreResourcesDialog.addCustomEntryExample"), LABEL_INDENT_WIDTH); //$NON-NLS-1$ + createIndentedLabel(top, CVSUIMessages.IgnoreResourcesDialog_addCustomEntryExample, LABEL_INDENT_WIDTH); //$NON-NLS-1$ customEntryText = createIndentedText(top, resources[0].getName(), LABEL_INDENT_WIDTH); customEntryText.addListener(SWT.Modify, modifyListener); @@ -220,14 +221,14 @@ public class IgnoreResourcesDialog extends Dialog { if (selectedAction == ADD_CUSTOM_ENTRY) { customPattern = customEntryText.getText(); if (customPattern.length() == 0) { - setError(Policy.bind("IgnoreResourcesDialog.patternMustNotBeEmpty")); //$NON-NLS-1$ + setError(CVSUIMessages.IgnoreResourcesDialog_patternMustNotBeEmpty); //$NON-NLS-1$ return; } FileNameMatcher matcher = new FileNameMatcher(new String[] { customPattern }); for (int i = 0; i < resources.length; i++) { String name = resources[i].getName(); if (! matcher.match(name)) { - setError(Policy.bind("IgnoreResourcesDialog.patternDoesNotMatchFile", name)); //$NON-NLS-1$ + setError(NLS.bind(CVSUIMessages.IgnoreResourcesDialog_patternDoesNotMatchFile, new String[] { name })); //$NON-NLS-1$ return; } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/KeyboardInteractiveDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/KeyboardInteractiveDialog.java index d1813fdb7..ade6706db 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/KeyboardInteractiveDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/KeyboardInteractiveDialog.java @@ -13,6 +13,7 @@ package org.eclipse.team.internal.ccvs.ui; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -60,7 +61,7 @@ public class KeyboardInteractiveDialog extends Dialog { this.instruction=instruction; this.prompt=prompt; this.echo=echo; - this.message=Policy.bind("KeyboradInteractiveDialog.message", destination+(name!=null && name.length()>0 ? ": "+name : "")); //NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.message=NLS.bind(CVSUIMessages.KeyboradInteractiveDialog_message, new String[] { destination+(name!=null && name.length()>0 ? ": "+name : "") }); //NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** * @see Window#configureShell @@ -100,7 +101,7 @@ public class KeyboardInteractiveDialog extends Dialog { } if(domain!=null){ Label label = new Label(main, SWT.WRAP); - label.setText(Policy.bind("KeyboardInteractiveDialog.labelRepository", domain)); //$NON-NLS-1$ + label.setText(NLS.bind(CVSUIMessages.KeyboardInteractiveDialog_labelRepository, new String[] { domain })); //$NON-NLS-1$ GridData data=new GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan=3; label.setLayoutData(data); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java index 7b606a77b..6f8b74c0e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java @@ -132,7 +132,7 @@ public class ListSelectionArea extends DialogArea { buttonComposite.setLayout(new GridLayout(2, false)); buttonComposite.setData(new GridData(SWT.END, SWT.BEGINNING, true, false)); - Button selectButton = createButton(buttonComposite, Policy.bind("ListSelectionArea.selectAll"), GridData.HORIZONTAL_ALIGN_FILL); //$NON-NLS-1$ + Button selectButton = createButton(buttonComposite, CVSUIMessages.ListSelectionArea_selectAll, GridData.HORIZONTAL_ALIGN_FILL); //$NON-NLS-1$ SelectionListener listener = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -142,7 +142,7 @@ public class ListSelectionArea extends DialogArea { selectButton.addSelectionListener(listener); - Button deselectButton = createButton(buttonComposite, Policy.bind("ListSelectionArea.deselectAll"), GridData.HORIZONTAL_ALIGN_FILL); //$NON-NLS-1$ + Button deselectButton = createButton(buttonComposite, CVSUIMessages.ListSelectionArea_deselectAll, GridData.HORIZONTAL_ALIGN_FILL); //$NON-NLS-1$ listener = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/PasswordManagementPreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/PasswordManagementPreferencePage.java index e6c3dd6de..5aa52dc35 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/PasswordManagementPreferencePage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/PasswordManagementPreferencePage.java @@ -51,7 +51,7 @@ public class PasswordManagementPreferencePage extends PreferencePage implements }; public void init(IWorkbench workbench) { - setDescription(Policy.bind("PasswordManagementPreferencePage.2")); //$NON-NLS-1$ + setDescription(CVSUIMessages.PasswordManagementPreferencePage_2); //$NON-NLS-1$ } /** @@ -88,8 +88,8 @@ public class PasswordManagementPreferencePage extends PreferencePage implements new TableColumn(table, SWT.NULL); new TableColumn(table, SWT.NULL); TableColumn[] columns = table.getColumns(); - columns[0].setText(Policy.bind("PasswordManagementPreferencePage.3")); //$NON-NLS-1$ - columns[1].setText(Policy.bind("PasswordManagementPreferencePage.4")); //$NON-NLS-1$ + columns[0].setText(CVSUIMessages.PasswordManagementPreferencePage_3); //$NON-NLS-1$ + columns[1].setText(CVSUIMessages.PasswordManagementPreferencePage_4); //$NON-NLS-1$ viewer.setColumnProperties(new String[] {"location", "username"}); //$NON-NLS-1$ //$NON-NLS-2$ viewer.setLabelProvider(new TableLabelProvider()); viewer.setContentProvider(new IStructuredContentProvider() { @@ -122,7 +122,7 @@ public class PasswordManagementPreferencePage extends PreferencePage implements buttons.setLayout(layout); removeButton = new Button(buttons, SWT.PUSH); - removeButton.setText(Policy.bind("PasswordManagementPreferencePage.5")); //$NON-NLS-1$ + removeButton.setText(CVSUIMessages.PasswordManagementPreferencePage_5); //$NON-NLS-1$ data = new GridData(); data.horizontalAlignment = GridData.FILL; data.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT); @@ -136,7 +136,7 @@ public class PasswordManagementPreferencePage extends PreferencePage implements } }); removeAllButton = new Button(buttons, SWT.PUSH); - removeAllButton.setText(Policy.bind("PasswordManagementPreferencePage.6")); //$NON-NLS-1$ + removeAllButton.setText(CVSUIMessages.PasswordManagementPreferencePage_6); //$NON-NLS-1$ data = new GridData(); data.horizontalAlignment = GridData.FILL; data.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Policy.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Policy.java index 5b70321d7..be810b75f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Policy.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Policy.java @@ -11,8 +11,6 @@ package org.eclipse.team.internal.ccvs.ui; -import java.text.MessageFormat; -import java.util.MissingResourceException; import java.util.ResourceBundle; import org.eclipse.core.runtime.IProgressMonitor; @@ -23,6 +21,10 @@ import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.team.internal.core.InfiniteSubProgressMonitor; public class Policy { + + private static String ACTION_BUNDLE = "org.eclipse.team.internal.ccvs.ui.actions.actions"; //$NON-NLS-1$ + private static ResourceBundle actionBundle = null; + public static boolean DEBUG_CONSOLE_BUFFERING = false; static { @@ -32,66 +34,6 @@ public class Policy { } } - private static String bundleName = "org.eclipse.team.internal.ccvs.ui.messages"; //$NON-NLS-1$ - private static ResourceBundle bundle = null; - - /* - * Returns a resource bundle, creating one if it none is available. - */ - private static ResourceBundle getResourceBundle() { - // thread safety - ResourceBundle tmpBundle = bundle; - if (tmpBundle != null) - return tmpBundle; - // always create a new classloader to be passed in - // in order to prevent ResourceBundle caching - return bundle = ResourceBundle.getBundle(bundleName); - } - - /** - * Lookup the message with the given ID in this catalog and bind its - * substitution locations with the given string. - */ - public static String bind(String id, String binding) { - return bind(id, new String[] { binding }); - } - - /** - * Lookup the message with the given ID in this catalog and bind its - * substitution locations with the given strings. - */ - public static String bind(String id, String binding1, String binding2) { - return bind(id, new String[] { binding1, binding2 }); - } - - /** - * Gets a string from the resource bundle. We don't want to crash because of a missing String. - * Returns the key if not found. - */ - public static String bind(String key) { - try { - return getResourceBundle().getString(key); - } catch (MissingResourceException e) { - return key; - } catch (NullPointerException e) { - return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$ - } - } - - /** - * Gets a string from the resource bundle and binds it with the given arguments. If the key is - * not found, return the key. - */ - public static String bind(String key, Object[] args) { - try { - return MessageFormat.format(bind(key), args); - } catch (MissingResourceException e) { - return key; - } catch (NullPointerException e) { - return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$ - } - } - /** * Progress monitor helpers */ @@ -123,7 +65,10 @@ public class Policy { return new InfiniteSubProgressMonitor(monitor, ticks); } - public static ResourceBundle getBundle() { - return getResourceBundle(); + public static ResourceBundle getActionBundle() { + ResourceBundle tmpBundle = actionBundle; + if (tmpBundle != null) + return tmpBundle; + return actionBundle = ResourceBundle.getBundle(ACTION_BUNDLE); } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java index 3f1a64e3d..46b75d8e8 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java @@ -45,7 +45,7 @@ public class ReleaseCommentDialog extends DetailsDialog { * @param proposedComment */ public ReleaseCommentDialog(Shell parentShell, IResource[] resourcesToCommit, String proposedComment, int depth) { - super(parentShell, Policy.bind("ReleaseCommentDialog.title")); //$NON-NLS-1$ + super(parentShell, CVSUIMessages.ReleaseCommentDialog_title); //$NON-NLS-1$ int shellStyle = getShellStyle(); setShellStyle(shellStyle | SWT.RESIZE | SWT.MAX); commitCommentArea = new CommitCommentArea(); @@ -79,7 +79,7 @@ public class ReleaseCommentDialog extends DetailsDialog { * @see Dialog#createDialogArea(Composite) */ protected void createMainDialogArea(Composite parent) { - getShell().setText(Policy.bind("ReleaseCommentDialog.title")); //$NON-NLS-1$ + getShell().setText(CVSUIMessages.ReleaseCommentDialog_title); //$NON-NLS-1$ Composite composite = new Composite(parent, SWT.NULL); composite.setLayout(new GridLayout()); composite.setLayoutData(new GridData(GridData.FILL_BOTH)); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteAnnotationStorage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteAnnotationStorage.java index 1698ce320..7d79be8a5 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteAnnotationStorage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteAnnotationStorage.java @@ -16,6 +16,7 @@ import java.io.InputStream; import org.eclipse.core.resources.IEncodedStorage; import org.eclipse.core.resources.IResourceStatus; import org.eclipse.core.runtime.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.core.TeamPlugin; @@ -45,7 +46,7 @@ public class RemoteAnnotationStorage extends PlatformObject implements IEncodedS String charSet = TeamPlugin.getCharset(getName(), contents); return charSet; } catch (IOException e) { - throw new CVSException(new Status(IStatus.ERROR, CVSUIPlugin.ID, IResourceStatus.FAILED_DESCRIBING_CONTENTS, Policy.bind("RemoteAnnotationStorage.1", new String[] { getFullPath().toString() }), e)); //$NON-NLS-1$ + throw new CVSException(new Status(IStatus.ERROR, CVSUIPlugin.ID, IResourceStatus.FAILED_DESCRIBING_CONTENTS, NLS.bind(CVSUIMessages.RemoteAnnotationStorage_1, (new String[] { getFullPath().toString() })), e)); //$NON-NLS-1$ } finally { try { contents.close(); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteFileEditorInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteFileEditorInput.java index 413050c50..ca604197a 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteFileEditorInput.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteFileEditorInput.java @@ -18,6 +18,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.variants.IResourceVariant; import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; @@ -125,7 +126,7 @@ public class RemoteFileEditorInput implements IWorkbenchAdapter, IStorageEditorI String fullPath; try { String revision = file.getRevision(); - fullPath = Policy.bind("RemoteFileEditorInput.fullPathAndRevision", path.toString(), revision); //$NON-NLS-1$ + fullPath = NLS.bind(CVSUIMessages.RemoteFileEditorInput_fullPathAndRevision, new String[] { path.toString(), revision }); //$NON-NLS-1$ } catch (TeamException e) { CVSUIPlugin.log(e); fullPath = path.toString(); @@ -162,7 +163,7 @@ public class RemoteFileEditorInput implements IWorkbenchAdapter, IStorageEditorI public String getName() { String name = file.getName(); try { - return Policy.bind("nameAndRevision", name, file.getRevision()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.nameAndRevision, new String[] { name, file.getRevision() }); //$NON-NLS-1$ } catch (TeamException e) { return name; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java index cc1bb77fb..b61b6c37d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java @@ -289,13 +289,13 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi document.set(caw.toString()); //System.out.println("+ CVSQuickDiff: updating document : " + caw.toString()); } catch (IOException x) { - throw new CVSException(Policy.bind("RemoteRevisionQuickDiffProvider.readingFile"), x); //$NON-NLS-1$ + throw new CVSException(CVSUIMessages.RemoteRevisionQuickDiffProvider_readingFile, x); //$NON-NLS-1$ } finally { if (in != null) { try { in.close(); } catch (IOException x) { - throw new CVSException(Policy.bind("RemoteRevisionQuickDiffProvider.closingFile"), x); //$NON-NLS-1$ + throw new CVSException(CVSUIMessages.RemoteRevisionQuickDiffProvider_closingFile, x); //$NON-NLS-1$ } } } @@ -336,7 +336,7 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi if(fUpdateJob != null && fUpdateJob.getState() != Job.NONE) { fUpdateJob.cancel(); } - fUpdateJob = new Job(Policy.bind("RemoteRevisionQuickDiffProvider.fetchingFile")) { //$NON-NLS-1$ + fUpdateJob = new Job(CVSUIMessages.RemoteRevisionQuickDiffProvider_fetchingFile) { //$NON-NLS-1$ protected IStatus run(IProgressMonitor monitor) { try { readDocument(monitor); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java index dd67b7712..20ee45a74 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java @@ -51,7 +51,7 @@ public class ResourcePropertiesPage extends PropertyPage { if (resource != null) { ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); if (!cvsResource.isManaged()) { - createPair(composite, Policy.bind("ResourcePropertiesPage.status"), Policy.bind("ResourcePropertiesPage.notManaged")); //$NON-NLS-1$ //$NON-NLS-2$ + createPair(composite, CVSUIMessages.ResourcePropertiesPage_status, CVSUIMessages.ResourcePropertiesPage_notManaged); //$NON-NLS-1$ //$NON-NLS-2$ } else { boolean hasRemote = false; if(cvsResource.isFolder()) { @@ -62,11 +62,11 @@ public class ResourcePropertiesPage extends PropertyPage { hasRemote = true; } } - createPair(composite, Policy.bind("ResourcePropertiesPage.status"), hasRemote ? Policy.bind("ResourcePropertiesPage.versioned") : Policy.bind("ResourcePropertiesPage.notVersioned")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + createPair(composite, CVSUIMessages.ResourcePropertiesPage_status, hasRemote ? CVSUIMessages.ResourcePropertiesPage_versioned : CVSUIMessages.ResourcePropertiesPage_notVersioned); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } } catch (TeamException e) { - createPair(composite, Policy.bind("ResourcePropertiesPage.error"), e.getMessage()); //$NON-NLS-1$ + createPair(composite, CVSUIMessages.ResourcePropertiesPage_error, e.getMessage()); //$NON-NLS-1$ } Dialog.applyDialogFont(parent); return composite; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java index 1ff580ff5..84838abcb 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java @@ -13,6 +13,7 @@ package org.eclipse.team.internal.ccvs.ui; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -63,7 +64,7 @@ public class UserValidationDialog extends Dialog { */ protected void configureShell(Shell newShell) { super.configureShell(newShell); - newShell.setText(Policy.bind("UserValidationDialog.required")); //$NON-NLS-1$ + newShell.setText(CVSUIMessages.UserValidationDialog_required); //$NON-NLS-1$ // set F1 help WorkbenchHelp.setHelp(newShell, IHelpContextIds.USER_VALIDATION_DIALOG); } @@ -123,14 +124,14 @@ public class UserValidationDialog extends Dialog { } if (domain != null) { Label d = new Label(main, SWT.WRAP); - d.setText(Policy.bind("UserValidationDialog.5")); //$NON-NLS-1$ + d.setText(CVSUIMessages.UserValidationDialog_5); //$NON-NLS-1$ data = new GridData(); d.setLayoutData(data); Label label = new Label(main, SWT.WRAP); if (isUsernameMutable) { - label.setText(Policy.bind("UserValidationDialog.labelUser", domain)); //$NON-NLS-1$ + label.setText(NLS.bind(CVSUIMessages.UserValidationDialog_labelUser, new String[] { domain })); //$NON-NLS-1$ } else { - label.setText(Policy.bind("UserValidationDialog.labelPassword", new Object[]{defaultUsername, domain})); //$NON-NLS-1$ + label.setText(NLS.bind(CVSUIMessages.UserValidationDialog_labelPassword, (new Object[]{defaultUsername, domain}))); //$NON-NLS-1$ } data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL); data.horizontalSpan = 2; @@ -142,7 +143,7 @@ public class UserValidationDialog extends Dialog { if(domain != null) { allowCachingButton = new Button(main, SWT.CHECK); - allowCachingButton.setText(Policy.bind("UserValidationDialog.6")); //$NON-NLS-1$ + allowCachingButton.setText(CVSUIMessages.UserValidationDialog_6); //$NON-NLS-1$ data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL); data.horizontalSpan = 3; allowCachingButton.setLayoutData(data); @@ -164,7 +165,7 @@ public class UserValidationDialog extends Dialog { warningLabel.setImage(getImage(DLG_IMG_MESSAGE_WARNING)); warningLabel.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_BEGINNING)); Label warningText = new Label(warningComposite, SWT.WRAP); - warningText.setText(Policy.bind("UserValidationDialog.7")); //$NON-NLS-1$ + warningText.setText(CVSUIMessages.UserValidationDialog_7); //$NON-NLS-1$ data = new GridData(GridData.FILL_HORIZONTAL); data.widthHint = 300; warningText.setLayoutData(data); @@ -181,7 +182,7 @@ public class UserValidationDialog extends Dialog { * @param parent the parent of the widgets */ protected void createPasswordFields(Composite parent) { - new Label(parent, SWT.NONE).setText(Policy.bind("UserValidationDialog.password")); //$NON-NLS-1$ + new Label(parent, SWT.NONE).setText(CVSUIMessages.UserValidationDialog_password); //$NON-NLS-1$ passwordField = new Text(parent, SWT.BORDER | SWT.PASSWORD); GridData data = new GridData(GridData.FILL_HORIZONTAL); @@ -195,7 +196,7 @@ public class UserValidationDialog extends Dialog { * @param parent the parent of the widgets */ protected void createUsernameFields(Composite parent) { - new Label(parent, SWT.NONE).setText(Policy.bind("UserValidationDialog.user")); //$NON-NLS-1$ + new Label(parent, SWT.NONE).setText(CVSUIMessages.UserValidationDialog_user); //$NON-NLS-1$ usernameField = new Text(parent, SWT.BORDER); GridData data = new GridData(GridData.FILL_HORIZONTAL); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WatchEditPreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WatchEditPreferencePage.java index 0f2b3359d..e9aa756ea 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WatchEditPreferencePage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WatchEditPreferencePage.java @@ -35,7 +35,7 @@ public class WatchEditPreferencePage extends CVSFieldEditorPreferencePage { * @see org.eclipse.team.internal.ccvs.ui.CVSFieldEditorPreferencePage#getPageDescription() */ protected String getPageDescription() { - return Policy.bind("WatchEditPreferencePage.description"); //$NON-NLS-1$; + return CVSUIMessages.WatchEditPreferencePage_description; //$NON-NLS-1$; } /* (non-Javadoc) @@ -44,16 +44,16 @@ public class WatchEditPreferencePage extends CVSFieldEditorPreferencePage { protected void createFieldEditors() { addField(new BooleanFieldEditor( ICVSUIConstants.PREF_CHECKOUT_READ_ONLY, - Policy.bind("WatchEditPreferencePage.checkoutReadOnly"), //$NON-NLS-1$ + CVSUIMessages.WatchEditPreferencePage_checkoutReadOnly, //$NON-NLS-1$ BooleanFieldEditor.DEFAULT, getFieldEditorParent())); actionEditor = new RadioGroupFieldEditor( ICVSUIConstants.PREF_EDIT_ACTION, - Policy.bind("WatchEditPreferencePage.validateEditSaveAction"), //$NON-NLS-1$ + CVSUIMessages.WatchEditPreferencePage_validateEditSaveAction, //$NON-NLS-1$ 1, - new String[][] {{Policy.bind("WatchEditPreferencePage.edit"), ICVSUIConstants.PREF_EDIT_PROMPT_EDIT}, //$NON-NLS-1$ - {Policy.bind("WatchEditPreferencePage.highjack"), ICVSUIConstants.PREF_EDIT_PROMPT_HIGHJACK}, //$NON-NLS-1$ + new String[][] {{CVSUIMessages.WatchEditPreferencePage_edit, ICVSUIConstants.PREF_EDIT_PROMPT_EDIT}, //$NON-NLS-1$ + {CVSUIMessages.WatchEditPreferencePage_highjack, ICVSUIConstants.PREF_EDIT_PROMPT_HIGHJACK}, //$NON-NLS-1$ }, //$NON-NLS-1$ //$NON-NLS-2$ getFieldEditorParent(), true); addField(actionEditor); @@ -61,11 +61,11 @@ public class WatchEditPreferencePage extends CVSFieldEditorPreferencePage { promptEditor = new RadioGroupFieldEditor( ICVSUIConstants.PREF_EDIT_PROMPT, - Policy.bind("WatchEditPreferencePage.editPrompt"), //$NON-NLS-1$ + CVSUIMessages.WatchEditPreferencePage_editPrompt, //$NON-NLS-1$ 1, - new String[][] {{Policy.bind("WatchEditPreferencePage.alwaysPrompt"), ICVSUIConstants.PREF_EDIT_PROMPT_ALWAYS}, //$NON-NLS-1$ - {Policy.bind("WatchEditPreferencePage.onlyPrompt"), ICVSUIConstants.PREF_EDIT_PROMPT_IF_EDITORS}, //$NON-NLS-1$ - {Policy.bind("WatchEditPreferencePage.neverPrompt"), ICVSUIConstants.PREF_EDIT_PROMPT_NEVER}, //$NON-NLS-1$ + new String[][] {{CVSUIMessages.WatchEditPreferencePage_alwaysPrompt, ICVSUIConstants.PREF_EDIT_PROMPT_ALWAYS}, //$NON-NLS-1$ + {CVSUIMessages.WatchEditPreferencePage_onlyPrompt, ICVSUIConstants.PREF_EDIT_PROMPT_IF_EDITORS}, //$NON-NLS-1$ + {CVSUIMessages.WatchEditPreferencePage_neverPrompt, ICVSUIConstants.PREF_EDIT_PROMPT_NEVER}, //$NON-NLS-1$ }, //$NON-NLS-1$ //$NON-NLS-2$ getFieldEditorParent(), true); store = getCVSPreferenceStore(); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java index ec40c0efe..6f970e897 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java @@ -13,6 +13,7 @@ package org.eclipse.team.internal.ccvs.ui; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.jface.dialogs.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.*; @@ -80,7 +81,7 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator { } if (result[0] == null) { - throw new OperationCanceledException(Policy.bind("WorkbenchUserAuthenticator.cancelled")); //$NON-NLS-1$ + throw new OperationCanceledException(CVSUIMessages.WorkbenchUserAuthenticator_cancelled); //$NON-NLS-1$ } if (userinfo.isUsernameMutable()) { @@ -203,7 +204,7 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator { } if (result[0] == null) { - throw new OperationCanceledException(Policy.bind("WorkbenchUserAuthenticator.The_operation_was_canceled_by_the_user_1")); //$NON-NLS-1$ + throw new OperationCanceledException(CVSUIMessages.WorkbenchUserAuthenticator_The_operation_was_canceled_by_the_user_1); //$NON-NLS-1$ } userinfo.setPassword(result[0]); @@ -248,7 +249,7 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator { final Display display = CVSUIPlugin.getStandardDisplay(); display.syncExec(new Runnable() { public void run() { - openConfirm[0] = MessageDialog.openConfirm(null, Policy.bind("WorkbenchUserAuthenticator.1"), Policy.bind("WorkbenchUserAuthenticator.2", location.getHost())); //$NON-NLS-1$ //$NON-NLS-2$ + openConfirm[0] = MessageDialog.openConfirm(null, CVSUIMessages.WorkbenchUserAuthenticator_1, NLS.bind(CVSUIMessages.WorkbenchUserAuthenticator_2, new String[] { location.getHost() })); //$NON-NLS-1$ //$NON-NLS-2$ } }); if (!openConfirm[0]) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java index a3fafe10e..d554424ac 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java @@ -124,7 +124,7 @@ public class WorkingSetSelectionArea extends DialogArea { data.horizontalIndent= 15; mruList.setLayoutData(data); - selectButton = createButton(composite, Policy.bind("WorkingSetSelectionArea.workingSetOther"), GridData.HORIZONTAL_ALIGN_FILL); //$NON-NLS-1$ + selectButton = createButton(composite, CVSUIMessages.WorkingSetSelectionArea_workingSetOther, GridData.HORIZONTAL_ALIGN_FILL); //$NON-NLS-1$ selectButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { handleWorkingSetSelection(); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java index d197d779c..6885bac2e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java @@ -18,8 +18,8 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.team.internal.ccvs.core.CVSException; import org.eclipse.team.internal.ccvs.core.ICVSResource; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.operations.AddOperation; import org.eclipse.team.internal.ccvs.ui.wizards.AddWizard; @@ -58,7 +58,7 @@ public class AddAction extends WorkspaceTraversalAction { } } if (prompt) { - return MessageDialog.openQuestion(getShell(), Policy.bind("AddAction.addIgnoredTitle"), Policy.bind("AddAction.addIgnoredQuestion")); //$NON-NLS-1$ //$NON-NLS-2$ + return MessageDialog.openQuestion(getShell(), CVSUIMessages.AddAction_addIgnoredTitle, CVSUIMessages.AddAction_addIgnoredQuestion); //$NON-NLS-1$ //$NON-NLS-2$ } return true; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java index df59b0c2b..7f870004d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java @@ -24,6 +24,7 @@ import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; @@ -31,7 +32,6 @@ import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.ui.*; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; import org.eclipse.team.internal.ui.Utils; import org.eclipse.team.internal.ui.actions.TeamAction; @@ -240,7 +240,7 @@ abstract public class CVSAction extends TeamAction implements IEditorActionDeleg * Sunclasses should override to present a custon message. */ protected String getErrorTitle() { - return Policy.bind("CVSAction.errorTitle"); //$NON-NLS-1$ + return CVSUIMessages.CVSAction_errorTitle; //$NON-NLS-1$ } /** @@ -248,7 +248,7 @@ abstract public class CVSAction extends TeamAction implements IEditorActionDeleg * Sunclasses should override to present a custon message. */ protected String getWarningTitle() { - return Policy.bind("CVSAction.warningTitle"); //$NON-NLS-1$ + return CVSUIMessages.CVSAction_warningTitle; //$NON-NLS-1$ } /** @@ -257,7 +257,7 @@ abstract public class CVSAction extends TeamAction implements IEditorActionDeleg * Sunclasses should override to present a custon message. */ protected String getMultiStatusMessage() { - return Policy.bind("CVSAction.multipleProblemsMessage"); //$NON-NLS-1$ + return CVSUIMessages.CVSAction_multipleProblemsMessage; //$NON-NLS-1$ } /** @@ -490,7 +490,7 @@ abstract public class CVSAction extends TeamAction implements IEditorActionDeleg return resources.contains(resource); } public String promptMessage(IResource resource) { - return Policy.bind("ReplaceWithAction.localChanges", resource.getName());//$NON-NLS-1$ + return NLS.bind(CVSUIMessages.ReplaceWithAction_localChanges, new String[] { resource.getName() });//$NON-NLS-1$ } }; } @@ -520,9 +520,9 @@ abstract public class CVSAction extends TeamAction implements IEditorActionDeleg public void run() { AvoidableMessageDialog dialog = new AvoidableMessageDialog( shell, - Policy.bind("CVSAction.mixingTagsTitle"), //$NON-NLS-1$ + CVSUIMessages.CVSAction_mixingTagsTitle, //$NON-NLS-1$ null, // accept the default window icon - Policy.bind("CVSAction.mixingTags", tag.getName()), //$NON-NLS-1$ + NLS.bind(CVSUIMessages.CVSAction_mixingTags, new String[] { tag.getName() }), //$NON-NLS-1$ MessageDialog.QUESTION, new String[] {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, 0); @@ -627,17 +627,17 @@ abstract public class CVSAction extends TeamAction implements IEditorActionDeleg execute((IAction)null); } else { MessageDialog.openInformation(activeWorkbenchWindow.getShell(), - Policy.bind("CVSAction.handlerNotEnabledTitle"), //$NON-NLS-1$ - Policy.bind("CVSAction.handlerNotEnabledMessage")); //$NON-NLS-1$ + CVSUIMessages.CVSAction_handlerNotEnabledTitle, //$NON-NLS-1$ + CVSUIMessages.CVSAction_handlerNotEnabledMessage); //$NON-NLS-1$ } } } } catch (InvocationTargetException e) { - throw new ExecutionException(Policy.bind("CVSAction.errorTitle"), e); //$NON-NLS-1$ + throw new ExecutionException(CVSUIMessages.CVSAction_errorTitle, e); //$NON-NLS-1$ } catch (InterruptedException e) { // Operation was cancelled. Ignore } catch (TeamException e) { - throw new ExecutionException(Policy.bind("CVSAction.errorTitle"), e); //$NON-NLS-1$ + throw new ExecutionException(CVSUIMessages.CVSAction_errorTitle, e); //$NON-NLS-1$ } return null; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java index ccd6e2006..03f69d518 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java @@ -23,8 +23,8 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.team.core.subscribers.SubscriberResourceMappingContext; import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.wizards.CommitWizard; import org.eclipse.ui.PlatformUI; @@ -106,7 +106,7 @@ public class CommitAction extends WorkspaceTraversalAction { * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() */ protected String getErrorTitle() { - return Policy.bind("CommitAction.commitFailed"); //$NON-NLS-1$ + return CVSUIMessages.CommitAction_commitFailed; //$NON-NLS-1$ } /** diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java index e429e34b1..ef1230700 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java @@ -14,11 +14,11 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.compare.CompareUI; import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ccvs.core.*; -import org.eclipse.team.internal.ccvs.ui.*; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.core.CVSException; +import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; +import org.eclipse.team.internal.ccvs.ui.CVSCompareEditorInput; +import org.eclipse.team.internal.ccvs.ui.ResourceEditionNode; import org.eclipse.team.internal.ccvs.ui.operations.RemoteCompareOperation; /** @@ -30,7 +30,6 @@ public class CompareRemoteResourcesAction extends CVSAction { public void execute(IAction action) throws InvocationTargetException, InterruptedException { ICVSRemoteResource[] editions = getSelectedRemoteResources(); if (editions == null || editions.length != 2) { - MessageDialog.openError(getShell(), Policy.bind("CompareRemoteResourcesAction.unableToCompare"), Policy.bind("CompareRemoteResourcesAction.selectTwoResources")); //$NON-NLS-1$ //$NON-NLS-2$ return; } try { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java index 28a1feca1..4b64f8d1d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java @@ -69,7 +69,7 @@ public class CompareWithRevisionAction extends WorkspaceAction { if (file[0] == null) { // No revisions for selected file - MessageDialog.openWarning(getShell(), Policy.bind("CompareWithRevisionAction.noRevisions"), Policy.bind("CompareWithRevisionAction.noRevisionsLong")); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openWarning(getShell(), CVSUIMessages.CompareWithRevisionAction_noRevisions, CVSUIMessages.CompareWithRevisionAction_noRevisionsLong); //$NON-NLS-1$ //$NON-NLS-2$ return; } @@ -77,7 +77,7 @@ public class CompareWithRevisionAction extends WorkspaceAction { run(new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InvocationTargetException { try { - monitor.beginTask(Policy.bind("CompareWithRevisionAction.fetching"), 100); //$NON-NLS-1$ + monitor.beginTask(CVSUIMessages.CompareWithRevisionAction_fetching, 100); //$NON-NLS-1$ entries[0] = file[0].getLogEntries(Policy.subMonitorFor(monitor, 100)); monitor.done(); } catch (TeamException e) { @@ -116,14 +116,14 @@ public class CompareWithRevisionAction extends WorkspaceAction { * Return the text describing this action */ protected String getActionTitle() { - return Policy.bind("CompareWithRevisionAction.4"); //$NON-NLS-1$ + return CVSUIMessages.CompareWithRevisionAction_4; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() */ protected String getErrorTitle() { - return Policy.bind("CompareWithRevisionAction.compare"); //$NON-NLS-1$ + return CVSUIMessages.CompareWithRevisionAction_compare; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java index 104befa09..7f49c0717 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java @@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.ICVSFolder; import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.model.RemoteModule; import org.eclipse.team.internal.ccvs.ui.tags.TagConfigurationDialog; import org.eclipse.team.internal.ccvs.ui.tags.TagSource; @@ -96,7 +96,7 @@ public class ConfigureTagsFromRepoViewOnFolder extends CVSAction { * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() */ protected String getErrorTitle() { - return Policy.bind("ConfigureTagsFromRepoViewConfigure_Tag_Error_1"); //$NON-NLS-1$ + return CVSUIMessages.ConfigureTagsFromRepoViewConfigure_Tag_Error_1; //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditorsAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditorsAction.java index 311b94a6c..9831a15ff 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditorsAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditorsAction.java @@ -17,11 +17,11 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.Team; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.ui.*; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction.IProviderAction; /** @@ -75,7 +75,7 @@ public class EditorsAction implements IProviderAction, IRunnableWithProgress { */ public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { if (f_provider == null || f_resources == null) { - throw new InvocationTargetException(new RuntimeException(Policy.bind("EditorsAction.classNotInitialized", this.getClass().getName()))); //$NON-NLS-1$ + throw new InvocationTargetException(new RuntimeException(NLS.bind(CVSUIMessages.EditorsAction_classNotInitialized, new String[] { this.getClass().getName() }))); //$NON-NLS-1$ } try { execute(f_provider,f_resources,monitor); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/GenerateDiffFileAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/GenerateDiffFileAction.java index 1412d19d4..a8fda619d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/GenerateDiffFileAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/GenerateDiffFileAction.java @@ -13,8 +13,8 @@ package org.eclipse.team.internal.ccvs.ui.actions; import org.eclipse.core.resources.IResource; import org.eclipse.jface.action.IAction; import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.wizards.GenerateDiffFileWizard; /** @@ -33,7 +33,7 @@ public class GenerateDiffFileAction extends WorkspaceAction { * Method declared on IActionDelegate. */ public void execute(IAction action) { - final String title = Policy.bind("GenerateCVSDiff.title"); //$NON-NLS-1$ + final String title = CVSUIMessages.GenerateCVSDiff_title; //$NON-NLS-1$ final IResource[] resources = getSelectedResources(); final GenerateDiffFileWizard wizard = new GenerateDiffFileWizard(resources[0]); wizard.setWindowTitle(title); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java index 2e0639554..ebea13f0e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java @@ -17,13 +17,13 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.jface.action.IAction; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.synchronize.SyncInfo; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.IgnoreResourcesDialog; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation; import org.eclipse.ui.IWorkbenchPart; @@ -47,7 +47,7 @@ public class IgnoreAction extends WorkspaceTraversalAction { * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider) */ protected String getTaskName(CVSTeamProvider provider) { - return Policy.bind("IgnoreAction.0", provider.getProject().getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.IgnoreAction_0, new String[] { provider.getProject().getName() }); //$NON-NLS-1$ } /* (non-Javadoc) @@ -76,7 +76,7 @@ public class IgnoreAction extends WorkspaceTraversalAction { * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName() */ protected String getTaskName() { - return Policy.bind("IgnoreAction.1"); //$NON-NLS-1$ + return CVSUIMessages.IgnoreAction_1; //$NON-NLS-1$ } } @@ -97,7 +97,7 @@ public class IgnoreAction extends WorkspaceTraversalAction { * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() */ protected String getErrorTitle() { - return Policy.bind("IgnoreAction.ignore"); //$NON-NLS-1$ + return CVSUIMessages.IgnoreAction_ignore; //$NON-NLS-1$ } /** diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MoveRemoteTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MoveRemoteTagAction.java index a6b1c55bc..0c10719cc 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MoveRemoteTagAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MoveRemoteTagAction.java @@ -13,8 +13,8 @@ package org.eclipse.team.internal.ccvs.ui.actions; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.CVSTag; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation; import org.eclipse.team.internal.ccvs.ui.tags.TagSelectionDialog; @@ -27,8 +27,8 @@ public class MoveRemoteTagAction extends TagInRepositoryAction { // Allow the user to select a tag ITagOperation operation = createTagOperation(); TagSelectionDialog dialog = new TagSelectionDialog(getShell(), operation.getTagSource(), - Policy.bind("MoveTagAction.title"), //$NON-NLS-1$ - Policy.bind("MoveTagAction.message"), //$NON-NLS-1$ + CVSUIMessages.MoveTagAction_title, //$NON-NLS-1$ + CVSUIMessages.MoveTagAction_message, //$NON-NLS-1$ TagSelectionDialog.INCLUDE_BRANCHES | TagSelectionDialog.INCLUDE_VERSIONS, isFolderSelected(), /* show recurse */ IHelpContextIds.TAG_REMOTE_WITH_EXISTING_DIALOG); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenLogEntryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenLogEntryAction.java index 69664d47d..14746e68b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenLogEntryAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenLogEntryAction.java @@ -69,7 +69,7 @@ public class OpenLogEntryAction extends CVSAction { final ILogEntry[] entries = getSelectedLogEntries(); for (int i = 0; i < entries.length; i++) { if (entries[i].isDeletion()) { - MessageDialog.openError(getShell(), Policy.bind("OpenLogEntryAction.deletedTitle"), Policy.bind("OpenLogEntryAction.deleted")); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openError(getShell(), CVSUIMessages.OpenLogEntryAction_deletedTitle, CVSUIMessages.OpenLogEntryAction_deleted); //$NON-NLS-1$ //$NON-NLS-2$ } else { ICVSRemoteFile file = entries[i].getRemoteFile(); String filename = file.getName(); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java index ed1a74620..b55c6356d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java @@ -19,6 +19,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.team.internal.ccvs.core.CVSException; import org.eclipse.team.internal.ccvs.core.ICVSResource; import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.operations.ReplaceOperation; import org.eclipse.team.internal.core.InfiniteSubProgressMonitor; @@ -52,7 +53,7 @@ public class ReplaceWithRemoteAction extends WorkspaceTraversalAction { * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() */ protected String getErrorTitle() { - return Policy.bind("ReplaceWithRemoteAction.problemMessage"); //$NON-NLS-1$ + return CVSUIMessages.ReplaceWithRemoteAction_problemMessage; //$NON-NLS-1$ } /** diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRevisionAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRevisionAction.java index 43d414787..accd9f218 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRevisionAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRevisionAction.java @@ -15,7 +15,7 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.viewers.*; import org.eclipse.swt.widgets.*; import org.eclipse.team.internal.ccvs.ui.CVSCompareRevisionsInput; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ui.Utils; import org.eclipse.team.ui.SaveablePartDialog; @@ -45,7 +45,7 @@ public class ReplaceWithRevisionAction extends CompareWithRevisionAction { * Add the replace button to the dialog. */ protected void createButtonsForButtonBar(Composite parent) { - replaceButton = createButton(parent, REPLACE_ID, Policy.bind("ReplaceWithRevisionAction.0"), true); //$NON-NLS-1$ + replaceButton = createButton(parent, REPLACE_ID, CVSUIMessages.ReplaceWithRevisionAction_0, true); //$NON-NLS-1$ replaceButton.setEnabled(false); input.getViewer().addSelectionChangedListener( new ISelectionChangedListener() { @@ -87,6 +87,6 @@ public class ReplaceWithRevisionAction extends CompareWithRevisionAction { * @see org.eclipse.team.internal.ccvs.ui.actions.CompareWithRevisionAction#getActionTitle() */ protected String getActionTitle() { - return Policy.bind("ReplaceWithRevisionAction.1"); //$NON-NLS-1$ + return CVSUIMessages.ReplaceWithRevisionAction_1; //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java index 08a9dfb03..97acadf4e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.internal.ccvs.core.CVSTag; import org.eclipse.team.internal.ccvs.ui.*; @@ -39,17 +40,17 @@ public class ReplaceWithTagAction extends WorkspaceTraversalAction { try { PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - dialog[0] = new UncommittedChangesDialog(shell, Policy.bind("ReplaceWithTagAction.4"), mappings, monitor) { //$NON-NLS-1$ + dialog[0] = new UncommittedChangesDialog(shell, CVSUIMessages.ReplaceWithTagAction_4, mappings, monitor) { //$NON-NLS-1$ protected String getSingleMappingMessage(ResourceMapping mapping) { String label = ResourceMappingResourceDisplayArea.getLabel(mapping); if (getAllMappings().length == 1) { - return Policy.bind("ReplaceWithTagAction.2", label); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.ReplaceWithTagAction_2, new String[] { label }); //$NON-NLS-1$ } - return Policy.bind("ReplaceWithTagAction.0", label); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.ReplaceWithTagAction_0, new String[] { label }); //$NON-NLS-1$ } protected String getMultipleMappingsMessage() { - return Policy.bind("ReplaceWithTagAction.1"); //$NON-NLS-1$ + return CVSUIMessages.ReplaceWithTagAction_1; //$NON-NLS-1$ } }; } @@ -95,8 +96,8 @@ public class ReplaceWithTagAction extends WorkspaceTraversalAction { return; } TagSelectionDialog dialog = new TagSelectionDialog(getShell(), TagSource.create(resourceMappings[0]), - Policy.bind("ReplaceWithTagAction.message"), //$NON-NLS-1$ - Policy.bind("TagSelectionDialog.Select_a_Tag_1"), //$NON-NLS-1$ + CVSUIMessages.ReplaceWithTagAction_message, //$NON-NLS-1$ + CVSUIMessages.TagSelectionDialog_Select_a_Tag_1, //$NON-NLS-1$ TagSelectionDialog.INCLUDE_ALL_TAGS, false, /*show recurse*/ IHelpContextIds.REPLACE_TAG_SELECTION_DIALOG); //$NON-NLS-1$ @@ -129,7 +130,7 @@ public class ReplaceWithTagAction extends WorkspaceTraversalAction { * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() */ protected String getErrorTitle() { - return Policy.bind("ReplaceWithTagAction.replace"); //$NON-NLS-1$ + return CVSUIMessages.ReplaceWithTagAction_replace; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RestoreFromRepositoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RestoreFromRepositoryAction.java index 0978126c3..eb4a6ccc0 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RestoreFromRepositoryAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RestoreFromRepositoryAction.java @@ -22,6 +22,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.client.*; @@ -32,6 +33,7 @@ import org.eclipse.team.internal.ccvs.core.connection.CVSServerException; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; import org.eclipse.team.internal.ccvs.core.util.KnownRepositories; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.ResizableWizardDialog; import org.eclipse.team.internal.ccvs.ui.wizards.RestoreFromRepositoryWizard; @@ -122,7 +124,7 @@ public class RestoreFromRepositoryAction extends WorkspaceTraversalAction { ICVSFile[] files = fetchDeletedFiles(resource); if (files == null) return; if (files.length == 0) { - MessageDialog.openInformation(getShell(), Policy.bind("RestoreFromRepositoryAction.noFilesTitle"), Policy.bind("RestoreFromRepositoryAction.noFilesMessage", resource.getName())); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openInformation(getShell(), CVSUIMessages.RestoreFromRepositoryAction_noFilesTitle, NLS.bind(CVSUIMessages.RestoreFromRepositoryAction_noFilesMessage, new String[] { resource.getName() })); //$NON-NLS-1$ //$NON-NLS-2$ return; } RestoreFromRepositoryWizard wizard = new RestoreFromRepositoryWizard(resource, files); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java index e3564bbca..a65467283 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java @@ -15,13 +15,14 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.core.resources.IResource; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.client.listeners.LogEntry; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.operations.ShowAnnotationOperation; public class ShowAnnotationAction extends WorkspaceAction { @@ -51,7 +52,7 @@ public class ShowAnnotationAction extends WorkspaceAction { return; boolean binary = isBinary(cvsResource); if (binary) { - if (!MessageDialog.openQuestion(getShell(), Policy.bind("ShowAnnotationAction.2"), Policy.bind("ShowAnnotationAction.3", cvsResource.getName()))) { //$NON-NLS-1$ //$NON-NLS-2$ + if (!MessageDialog.openQuestion(getShell(), CVSUIMessages.ShowAnnotationAction_2, NLS.bind(CVSUIMessages.ShowAnnotationAction_3, new String[] { cvsResource.getName() }))) { //$NON-NLS-1$ //$NON-NLS-2$ return; } } @@ -122,7 +123,7 @@ public class ShowAnnotationAction extends WorkspaceAction { try { info= cvsResource.getSyncInfo(); if (info == null) - throw new CVSException(Policy.bind("ShowAnnotationAction.noSyncInfo", cvsResource.getName())); //$NON-NLS-1$ + throw new CVSException(NLS.bind(CVSUIMessages.ShowAnnotationAction_noSyncInfo, new String[] { cvsResource.getName() })); //$NON-NLS-1$ } catch (CVSException e) { throw new InvocationTargetException(e); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowHistoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowHistoryAction.java index 6974fa3a2..b1d11fa35 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowHistoryAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowHistoryAction.java @@ -20,8 +20,8 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.HistoryView; -import org.eclipse.team.internal.ccvs.ui.Policy; public class ShowHistoryAction extends CVSAction { /** @@ -80,7 +80,7 @@ public class ShowHistoryAction extends CVSAction { * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() */ protected String getErrorTitle() { - return Policy.bind("ShowHistoryAction.showHistory"); //$NON-NLS-1$ + return CVSUIMessages.ShowHistoryAction_showHistory; //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java index 70b340146..0c13b8171 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java @@ -20,7 +20,6 @@ import org.eclipse.team.internal.ccvs.core.CVSException; import org.eclipse.team.internal.ccvs.core.ICVSResource; import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.HistoryView; -import org.eclipse.team.internal.ccvs.ui.Policy; public class ShowResourceInHistoryAction extends WorkspaceAction { /* @@ -43,7 +42,7 @@ public class ShowResourceInHistoryAction extends WorkspaceAction { * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() */ protected String getErrorTitle() { - return Policy.bind("ShowHistoryAction.showHistory"); //$NON-NLS-1$ + return CVSUIMessages.ShowHistoryAction_showHistory; //$NON-NLS-1$ } /** diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java index b710b09d4..8aca56b2c 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java @@ -26,8 +26,8 @@ import org.eclipse.team.core.TeamException; import org.eclipse.team.core.subscribers.Subscriber; import org.eclipse.team.core.synchronize.SyncInfo; import org.eclipse.team.internal.ccvs.core.*; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.subscriber.WorkspaceSynchronizeParticipant; import org.eclipse.team.internal.ui.Utils; import org.eclipse.team.ui.TeamUI; @@ -131,7 +131,7 @@ public class SyncAction extends WorkspaceTraversalAction { shell.getDisplay().syncExec(new Runnable() { public void run() { if (info.getKind() == SyncInfo.IN_SYNC) { - MessageDialog.openInformation(shell, Policy.bind("SyncAction.noChangesTitle"), Policy.bind("SyncAction.noChangesMessage")); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openInformation(shell, CVSUIMessages.SyncAction_noChangesTitle, CVSUIMessages.SyncAction_noChangesMessage); //$NON-NLS-1$ //$NON-NLS-2$ } else { SyncInfoCompareInput input = new SyncInfoCompareInput(subscriber.getName(), info); CompareUI.openCompareEditor(input); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java index ec8a32022..f0c0d6e93 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java @@ -20,13 +20,14 @@ import org.eclipse.jface.dialogs.MessageDialogWithToggle; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.window.Window; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.internal.ccvs.core.CVSException; import org.eclipse.team.internal.ccvs.core.CVSTag; import org.eclipse.team.internal.ccvs.core.ICVSFolder; import org.eclipse.team.internal.ccvs.core.ICVSResource; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation; import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; import org.eclipse.team.internal.ccvs.ui.tags.TagAsVersionDialog; @@ -83,15 +84,15 @@ public abstract class TagAction extends WorkspaceTraversalAction { return null; } TagAsVersionDialog dialog = new TagAsVersionDialog(getShell(), - Policy.bind("TagAction.tagResources"), //$NON-NLS-1$ + CVSUIMessages.TagAction_tagResources, //$NON-NLS-1$ operation); if (dialog.open() != Window.OK) return null; // The user has indicated they want to force a move. Make sure they really do. if (dialog.shouldMoveTag() && store.getBoolean(ICVSUIConstants.PREF_CONFIRM_MOVE_TAG)) { MessageDialogWithToggle confirmDialog = MessageDialogWithToggle.openYesNoQuestion(getShell(), - Policy.bind("TagAction.moveTagConfirmTitle"), //$NON-NLS-1$ - Policy.bind("TagAction.moveTagConfirmMessage", dialog.getTagName()), //$NON-NLS-1$ + CVSUIMessages.TagAction_moveTagConfirmTitle, //$NON-NLS-1$ + NLS.bind(CVSUIMessages.TagAction_moveTagConfirmMessage, new String[] { dialog.getTagName() }), //$NON-NLS-1$ null, false, null, @@ -111,11 +112,11 @@ public abstract class TagAction extends WorkspaceTraversalAction { protected abstract ITagOperation createTagOperation(); protected String getErrorTitle() { - return Policy.bind("TagAction.tagErrorTitle"); //$NON-NLS-1$ + return CVSUIMessages.TagAction_tagErrorTitle; //$NON-NLS-1$ } protected String getWarningTitle() { - return Policy.bind("TagAction.tagWarningTitle"); //$NON-NLS-1$ + return CVSUIMessages.TagAction_tagWarningTitle; //$NON-NLS-1$ } /** diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagLocalAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagLocalAction.java index fc78a8af9..a403a431e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagLocalAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagLocalAction.java @@ -15,8 +15,9 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.core.resources.mapping.ResourceMapping; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.osgi.util.NLS; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation; import org.eclipse.team.internal.ccvs.ui.operations.TagOperation; import org.eclipse.team.internal.ui.dialogs.ResourceMappingResourceDisplayArea; @@ -34,17 +35,17 @@ public class TagLocalAction extends TagAction { try { PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - dialog[0] = new UncommittedChangesDialog(getShell(), Policy.bind("TagLocalAction.4"), mappings, monitor) { //$NON-NLS-1$ + dialog[0] = new UncommittedChangesDialog(getShell(), CVSUIMessages.TagLocalAction_4, mappings, monitor) { //$NON-NLS-1$ protected String getSingleMappingMessage(ResourceMapping mapping) { String label = ResourceMappingResourceDisplayArea.getLabel(mapping); if (getAllMappings().length == 1) { - return Policy.bind("TagLocalAction.2", label); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.TagLocalAction_2, new String[] { label }); //$NON-NLS-1$ } - return Policy.bind("TagLocalAction.0", label); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.TagLocalAction_0, new String[] { label }); //$NON-NLS-1$ } protected String getMultipleMappingsMessage() { - return Policy.bind("TagLocalAction.1"); //$NON-NLS-1$ + return CVSUIMessages.TagLocalAction_1; //$NON-NLS-1$ } }; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UncommittedChangesDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UncommittedChangesDialog.java index 1021ab130..2e5b33e3f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UncommittedChangesDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UncommittedChangesDialog.java @@ -19,14 +19,15 @@ import org.eclipse.core.resources.mapping.ResourceTraversal; import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Status; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.subscribers.Subscriber; import org.eclipse.team.core.synchronize.FastSyncInfoFilter; import org.eclipse.team.core.synchronize.SyncInfo; import org.eclipse.team.core.synchronize.FastSyncInfoFilter.SyncInfoDirectionFilter; import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ui.dialogs.*; public abstract class UncommittedChangesDialog extends MappingSelectionDialog { @@ -56,13 +57,13 @@ public abstract class UncommittedChangesDialog extends MappingSelectionDialog { protected String getResourceListMessage(ResourceMapping mapping) { if (mapping == null) { - return Policy.bind("UncommittedChangesDialog.2"); //$NON-NLS-1$ + return CVSUIMessages.UncommittedChangesDialog_2; //$NON-NLS-1$ } else { String label = ResourceMappingResourceDisplayArea.getLabel(mapping); if (mapping.getModelObject() instanceof IFile) { - return Policy.bind("UncommittedChangesDialog.4", label); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.UncommittedChangesDialog_4, new String[] { label }); //$NON-NLS-1$ } - return Policy.bind("UncommittedChangesDialog.3", label); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.UncommittedChangesDialog_3, new String[] { label }); //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UneditAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UneditAction.java index e3ad2c8ab..f7dc33763 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UneditAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UneditAction.java @@ -22,7 +22,7 @@ import org.eclipse.team.internal.ccvs.core.CVSException; import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; import org.eclipse.team.internal.ccvs.core.ICVSFile; import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.ui.actions.WorkspaceModifyOperation; public class UneditAction extends WorkspaceAction { @@ -32,7 +32,7 @@ public class UneditAction extends WorkspaceAction { */ protected void execute(IAction action) throws InvocationTargetException, InterruptedException { - if(! MessageDialog.openConfirm(getShell(), Policy.bind("Uneditaction.confirmTitle"), Policy.bind("Uneditaction.confirmMessage"))) { //$NON-NLS-1$ //$NON-NLS-2$ + if(! MessageDialog.openConfirm(getShell(), CVSUIMessages.Uneditaction_confirmTitle, CVSUIMessages.Uneditaction_confirmMessage)) { //$NON-NLS-1$ //$NON-NLS-2$ return; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UnmanageAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UnmanageAction.java index a03e3693d..df3874638 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UnmanageAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UnmanageAction.java @@ -17,14 +17,15 @@ import org.eclipse.core.resources.IResource; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.*; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.*; import org.eclipse.team.internal.ccvs.core.CVSException; import org.eclipse.team.internal.ccvs.core.ICVSResource; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.operations.DisconnectOperation; import org.eclipse.ui.help.WorkbenchHelp; @@ -53,18 +54,18 @@ public class UnmanageAction extends WorkspaceAction { static String getTitle(IProject[] projects) { if (projects.length == 1) - return Policy.bind("Unmanage.title"); //$NON-NLS-1$ + return CVSUIMessages.Unmanage_title; //$NON-NLS-1$ else - return Policy.bind("Unmanage.titleN"); //$NON-NLS-1$ + return CVSUIMessages.Unmanage_titleN; //$NON-NLS-1$ } static String getMessage(IProject[] projects) { if (projects.length == 1) { IProject project = projects[0]; - return Policy.bind("Unmanage.message", project.getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.Unmanage_message, new String[] { project.getName() }); //$NON-NLS-1$ } else { - return Policy.bind("Unmanage.messageN", new Integer(projects.length).toString()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.Unmanage_messageN, new String[] { new Integer(projects.length).toString() }); //$NON-NLS-1$ } } @@ -74,12 +75,12 @@ public class UnmanageAction extends WorkspaceAction { radio1 = new Button(composite, SWT.RADIO); radio1.addSelectionListener(selectionListener); - radio1.setText(Policy.bind("Unmanage.option2")); //$NON-NLS-1$ + radio1.setText(CVSUIMessages.Unmanage_option2); //$NON-NLS-1$ radio2 = new Button(composite, SWT.RADIO); radio2.addSelectionListener(selectionListener); - radio2.setText(Policy.bind("Unmanage.option1")); //$NON-NLS-1$ + radio2.setText(CVSUIMessages.Unmanage_option1); //$NON-NLS-1$ // set initial state radio1.setSelection(deleteContent); @@ -133,7 +134,7 @@ public class UnmanageAction extends WorkspaceAction { * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle() */ protected String getErrorTitle() { - return Policy.bind("Unmanage.unmanagingError");//$NON-NLS-1$ + return CVSUIMessages.Unmanage_unmanagingError;//$NON-NLS-1$ } /** diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java index e7349bae7..d9b34ffa2 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java @@ -18,6 +18,7 @@ import org.eclipse.core.runtime.*; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.RepositoryProvider; @@ -28,6 +29,7 @@ import org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer; import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; import org.eclipse.team.internal.ccvs.core.util.Util; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ui.dialogs.IPromptCondition; import org.eclipse.team.internal.ui.dialogs.PromptingDialog; @@ -54,7 +56,7 @@ public abstract class WorkspaceAction extends CVSAction { handleOrphanedSubtrees(); // Check enablement just in case the sync info wasn't loaded if (!isEnabled()) { - MessageDialog.openInformation(getShell(), Policy.bind("CVSAction.disabledTitle"), Policy.bind("CVSAction.disabledMessage")); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openInformation(getShell(), CVSUIMessages.CVSAction_disabledTitle, CVSUIMessages.CVSAction_disabledMessage); //$NON-NLS-1$ //$NON-NLS-2$ return false; } } @@ -241,11 +243,11 @@ public abstract class WorkspaceAction extends CVSAction { } String question; if (resources.length == 1) { - question = Policy.bind("CVSAction.refreshQuestion", status.getMessage(), resources[0].getFullPath().toString()); //$NON-NLS-1$ + question = NLS.bind(CVSUIMessages.CVSAction_refreshQuestion, new String[] { status.getMessage(), resources[0].getFullPath().toString() }); //$NON-NLS-1$ } else { - question = Policy.bind("CVSAction.refreshMultipleQuestion", status.getMessage()); //$NON-NLS-1$ + question = NLS.bind(CVSUIMessages.CVSAction_refreshMultipleQuestion, new String[] { status.getMessage() }); //$NON-NLS-1$ } - result[0] = MessageDialog.openQuestion(shellToUse, Policy.bind("CVSAction.refreshTitle"), question); //$NON-NLS-1$ + result[0] = MessageDialog.openQuestion(shellToUse, CVSUIMessages.CVSAction_refreshTitle, question); //$NON-NLS-1$ } }; Display.getDefault().syncExec(runnable); @@ -543,25 +545,25 @@ public abstract class WorkspaceAction extends CVSAction { } // set text to default - String actionText = Policy.bind("ReplaceWithLatestAction.multipleTags"); //$NON-NLS-1$ + String actionText = CVSUIMessages.ReplaceWithLatestAction_multipleTags; //$NON-NLS-1$ if(commonTag != null) { int tagType = commonTag.getType(); String tagName = commonTag.getName(); // multiple tag names but of the same type if(sameTagType && !multipleSameNames) { if(tagType == CVSTag.BRANCH) { - actionText = Policy.bind("ReplaceWithLatestAction.multipleBranches"); //$NON-NLS-1$ + actionText = CVSUIMessages.ReplaceWithLatestAction_multipleBranches; //$NON-NLS-1$ } else { - actionText = Policy.bind("ReplaceWithLatestAction.multipleVersions"); //$NON-NLS-1$ + actionText = CVSUIMessages.ReplaceWithLatestAction_multipleVersions; //$NON-NLS-1$ } // same tag names and types } else if(sameTagType && multipleSameNames) { if(tagType == CVSTag.BRANCH) { - actionText = Policy.bind("ReplaceWithLatestAction.singleBranch", tagName); //$NON-NLS-1$ + actionText = NLS.bind(CVSUIMessages.ReplaceWithLatestAction_singleBranch, new String[] { tagName }); //$NON-NLS-1$ } else if(tagType == CVSTag.VERSION){ - actionText = Policy.bind("ReplaceWithLatestAction.singleVersion", tagName); //$NON-NLS-1$ + actionText = NLS.bind(CVSUIMessages.ReplaceWithLatestAction_singleVersion, new String[] { tagName }); //$NON-NLS-1$ } else if(tagType == CVSTag.HEAD) { - actionText = Policy.bind("ReplaceWithLatestAction.singleHEAD", tagName); //$NON-NLS-1$ + actionText = NLS.bind(CVSUIMessages.ReplaceWithLatestAction_singleHEAD, new String[] { tagName }); //$NON-NLS-1$ } } } @@ -569,7 +571,7 @@ public abstract class WorkspaceAction extends CVSAction { return actionText; } catch (CVSException e) { // silently ignore - return Policy.bind("ReplaceWithLatestAction.multipleTags"); //$NON-NLS-1$ + return CVSUIMessages.ReplaceWithLatestAction_multipleTags; //$NON-NLS-1$ } } @@ -580,7 +582,7 @@ public abstract class WorkspaceAction extends CVSAction { try { monitor = Policy.monitorFor(monitor); monitor.beginTask(null, selectedResources.length * 100); - monitor.setTaskName(Policy.bind("ReplaceWithAction.calculatingDirtyResources")); //$NON-NLS-1$ + monitor.setTaskName(CVSUIMessages.ReplaceWithAction_calculatingDirtyResources); //$NON-NLS-1$ for (int i = 0; i < selectedResources.length; i++) { IResource resource = selectedResources[i]; ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); @@ -593,7 +595,7 @@ public abstract class WorkspaceAction extends CVSAction { } PromptingDialog dialog = new PromptingDialog(getShell(), selectedResources, - getPromptCondition((IResource[]) dirtyResources.toArray(new IResource[dirtyResources.size()])), Policy.bind("ReplaceWithAction.confirmOverwrite"));//$NON-NLS-1$ + getPromptCondition((IResource[]) dirtyResources.toArray(new IResource[dirtyResources.size()])), CVSUIMessages.ReplaceWithAction_confirmOverwrite);//$NON-NLS-1$ return dialog.promptForMultiple(); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/actions.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/actions.properties new file mode 100644 index 000000000..8bf71c9ad --- /dev/null +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/actions.properties @@ -0,0 +1,91 @@ +############################################################################### +# Copyright (c) 2000, 2005 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### + +SetKeywordSubstitutionAction.label=Cha&nge ASCII/Binary Property... +SetKeywordSubstitutionAction.tooltip=Change whether the selected resources should be treated as ASCII or binary on the CVS Server + +RemoteRootAction.label=Discard location +ModulesCategory.label=Modules + +WorkingSetSelectionDialog.detailsButton.label= &Edit... +WorkingSetSelectionDialog.newButton.label= &New... +WorkingSetSelectionDialog.removeButton.label= &Remove + +WorkspaceToolbarCommitAction.label=Commit +WorkspaceToolbarCommitAction.tooltip=Commit All Outgoing Changes... +WorkspaceToolbarCommitAction.description=Commit All Outgoing Changes... +WorkspaceToolbarCommitAction.image=checkin_action.gif + +WorkspaceToolbarUpdateAction.label=Update +WorkspaceToolbarUpdateAction.tooltip=Update All Incoming Changes... +WorkspaceToolbarUpdateAction.description=Update All Incoming Changes... +WorkspaceToolbarUpdateAction.image=checkout_action.gif + +SharingWizardIgnore.label=Ignore +SharingWizardIgnore.tooltip=Ignore Selected Resources... +SharingWizardIgnore.description=Ignore Selected Resources... +SharingWizardIgnore.image=ignorefiles.gif + +ConsoleRemoveAction.label=Close CVS Console +ConsoleRemoveAction.tooltip=Close CVS console +ConsoleRemoveAction.image=participant_rem.gif + +WorkspaceUpdateAction.label=&Update +WorkspaceUpdateAction.tooltip=Perform an update on the selected resources +WorkspaceUpdateAction.helpContextId=org.eclipse.team.cvs.ui.workspace_update_action + +OverrideAndUpdateAction.label=O&verride and Update +OverrideAndUpdateAction.tooltip=Perform an override and update on the selected resources. This will make the local contents equal to the remote ignoring any local changes. +OverrideAndUpdateAction.helpContextId=org.eclipse.team.cvs.ui.workspace_overupdate_action + +RefreshDirtyStateAction.label=C&lean Timestamps +RefreshDirtyStateAction.tooltip=Reset the dirty state of out-of-sync files whose contents match the server contents +RefreshDirtyStateAction.helpContextId=org.eclipse.team.cvs.ui.workspace_refresh_dirty_state_action_context + +WorkspaceCommitAction.label=&Commit... +WorkspaceCommitAction.tooltip=Perform a commit on the selected resources +WorkspaceCommitAction.helpContextId="org.eclipse.team.cvs.ui.workspace_commit_action + +OverrideAndCommitAction.label=Override and Comm&it... +OverrideAndCommitAction.tooltip=Perform an override and commit on the selected resources. This will make the remote contents equal to the local ignoring any remote changes. +OverrideAndCommitAction.helpContextId=org.eclipse.team.cvs.ui.workspace_overcommit_action + +ConfirmMergedAction.label=&Mark as Merged +ConfirmMergedAction.tooltip=Mark the conflict as merged by upgrading the base to match the remote +ConfirmMergedAction.helpContextId=org.eclipse.team.cvs.ui.workspace_confirm_merged_action + +BranchAction.label=&Branch... +BranchAction.tooltip=Branch + +IgnoreAction.label=A&dd to .cvsignore... +IgnoreAction.tooltip=Ignore the Selected Resources when Synchronizing + +ShowResourceInHistoryAction.label=Show in Resource &History +ShowResourceInHistoryAction.tooltip=Show in Resource History + +ShowAnnotationAction.label=Show &Annotation +ShowAnnotationAction.tooltip=Show Annotation + +GenerateDiffFileAction.label=Create &Patch... +GenerateDiffFileAction.tooltip=Compare your workspace contents with the server and generate a diff file that can be used as a patch file. + +MergeUpdateAction.label=&Update +MergeUpdateAction.tooltip=Perform an update merge on the selected resources +MergeUpdateAction.helpContextId=org.eclipse.team.cvs.ui.merge_update_action + +CompareRevertAction.label=&Override and Update +CompareRevertAction.tooltip=Revert the local file contents to match that of their corresponding remotes +CompareRevertAction.helpContextId=org.eclipse.team.cvs.ui.compare_revert_action + +SharingCommitAction.label=Commit +SharingCommitAction.tooltip=Commit All Changes... +SharingCommitAction.description=Commit All Changes... +SharingCommitAction.image=checkin_action.gif
\ No newline at end of file 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 279274dc7..5a7ebad41 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 @@ -23,6 +23,7 @@ import org.eclipse.jface.resource.FontRegistry; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.*; import org.eclipse.swt.widgets.Display; import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; @@ -67,7 +68,7 @@ public class CVSOutputConsole extends MessageConsole implements IConsoleListener static { DateFormat format; try { - format = new SimpleDateFormat(Policy.bind("Console.resultTimeFormat")); //$NON-NLS-1$ + format = new SimpleDateFormat(CVSUIMessages.Console_resultTimeFormat); //$NON-NLS-1$ } catch (RuntimeException e) { // This can happen if the bundle contains an invalid format format = new SimpleDateFormat("'(took 'm:ss.SSS')')"); //$NON-NLS-1$ @@ -260,7 +261,7 @@ public class CVSOutputConsole extends MessageConsole implements IConsoleListener public void commandInvoked(Session session, String line) { if (!session.isOutputToConsole()) return; commandStarted = System.currentTimeMillis(); - appendLine(ConsoleDocument.COMMAND, Policy.bind("Console.preExecutionDelimiter")); //$NON-NLS-1$ + appendLine(ConsoleDocument.COMMAND, CVSUIMessages.Console_preExecutionDelimiter); //$NON-NLS-1$ appendLine(ConsoleDocument.COMMAND, line); } @@ -292,34 +293,34 @@ public class CVSOutputConsole extends MessageConsole implements IConsoleListener try { time = TIME_FORMAT.format(new Date(commandRuntime)); } catch (RuntimeException e) { - CVSUIPlugin.log(IStatus.ERROR, Policy.bind("Console.couldNotFormatTime"), e); //$NON-NLS-1$ + CVSUIPlugin.log(IStatus.ERROR, CVSUIMessages.Console_couldNotFormatTime, e); //$NON-NLS-1$ time = ""; //$NON-NLS-1$ } String statusText; if (status != null) { boolean includeRoot = true; if (status.getCode() == CVSStatus.SERVER_ERROR) { - statusText = Policy.bind("Console.resultServerError", status.getMessage(), time); //$NON-NLS-1$ + statusText = NLS.bind(CVSUIMessages.Console_resultServerError, new String[] { status.getMessage(), time }); //$NON-NLS-1$ includeRoot = false; } else { - statusText = Policy.bind("Console.resultOk", time); //$NON-NLS-1$ + statusText = NLS.bind(CVSUIMessages.Console_resultOk, new String[] { time }); //$NON-NLS-1$ } appendLine(ConsoleDocument.COMMAND, statusText); outputStatus(status, includeRoot, includeRoot ? 0 : 1); } else if (exception != null) { if (exception instanceof OperationCanceledException) { - statusText = Policy.bind("Console.resultAborted", time); //$NON-NLS-1$ + statusText = NLS.bind(CVSUIMessages.Console_resultAborted, new String[] { time }); //$NON-NLS-1$ } else { - statusText = Policy.bind("Console.resultException", time); //$NON-NLS-1$ + statusText = NLS.bind(CVSUIMessages.Console_resultException, new String[] { time }); //$NON-NLS-1$ } appendLine(ConsoleDocument.COMMAND, statusText); if (exception instanceof CoreException) { outputStatus(((CoreException)exception).getStatus(), true, 1); } } else { - statusText = Policy.bind("Console.resultOk", time); //$NON-NLS-1$ + statusText = NLS.bind(CVSUIMessages.Console_resultOk, new String[] { time }); //$NON-NLS-1$ } - appendLine(ConsoleDocument.COMMAND, Policy.bind("Console.postExecutionDelimiter")); //$NON-NLS-1$ + appendLine(ConsoleDocument.COMMAND, CVSUIMessages.Console_postExecutionDelimiter); //$NON-NLS-1$ appendLine(ConsoleDocument.COMMAND, ""); //$NON-NLS-1$ } @@ -401,11 +402,11 @@ public class CVSOutputConsole extends MessageConsole implements IConsoleListener */ private String messageLineForStatus(IStatus status) { if (status.getSeverity() == IStatus.ERROR) { - return Policy.bind("Console.error", status.getMessage()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.Console_error, new String[] { status.getMessage() }); //$NON-NLS-1$ } else if (status.getSeverity() == IStatus.WARNING) { - return Policy.bind("Console.warning", status.getMessage()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.Console_warning, new String[] { status.getMessage() }); //$NON-NLS-1$ } else if (status.getSeverity() == IStatus.INFO) { - return Policy.bind("Console.info", status.getMessage()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.Console_info, new String[] { status.getMessage() }); //$NON-NLS-1$ } return status.getMessage(); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/ConsolePreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/ConsolePreferencesPage.java index 3a0334beb..6f6742e62 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/ConsolePreferencesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/ConsolePreferencesPage.java @@ -39,44 +39,44 @@ public class ConsolePreferencesPage extends FieldEditorPreferencePage implements protected void createFieldEditors() { final Composite composite = getFieldEditorParent(); - createLabel(composite, Policy.bind("ConsolePreferencesPage.9")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.ConsolePreferencesPage_9); //$NON-NLS-1$ IPreferenceStore store = getPreferenceStore(); // ** WRAP - wrap = new BooleanFieldEditor(ICVSUIConstants.PREF_CONSOLE_WRAP, Policy.bind("ConsolePreferencesPage.6"), composite); //$NON-NLS-1$ + wrap = new BooleanFieldEditor(ICVSUIConstants.PREF_CONSOLE_WRAP, CVSUIMessages.ConsolePreferencesPage_6, composite); //$NON-NLS-1$ addField(wrap); - width = new IntegerFieldEditor(ICVSUIConstants.PREF_CONSOLE_WIDTH, Policy.bind("ConsolePreferencesPage.7"), composite); //$NON-NLS-1$) + width = new IntegerFieldEditor(ICVSUIConstants.PREF_CONSOLE_WIDTH, CVSUIMessages.ConsolePreferencesPage_7, composite); //$NON-NLS-1$) width.setValidRange(80, Integer.MAX_VALUE - 1); addField(width); width.setEnabled(store.getBoolean(ICVSUIConstants.PREF_CONSOLE_WRAP), composite); // ** RESTRICT OUTPUT - restrictOutput = new BooleanFieldEditor(ICVSUIConstants.PREF_CONSOLE_LIMIT_OUTPUT, Policy.bind("ConsolePreferencesPage.5"), composite); //$NON-NLS-1$ + restrictOutput = new BooleanFieldEditor(ICVSUIConstants.PREF_CONSOLE_LIMIT_OUTPUT, CVSUIMessages.ConsolePreferencesPage_5, composite); //$NON-NLS-1$ addField(restrictOutput); - highWaterMark = new IntegerFieldEditor(ICVSUIConstants.PREF_CONSOLE_HIGH_WATER_MARK, Policy.bind("ConsolePreferencesPage.8"), composite); //$NON-NLS-1$) + highWaterMark = new IntegerFieldEditor(ICVSUIConstants.PREF_CONSOLE_HIGH_WATER_MARK, CVSUIMessages.ConsolePreferencesPage_8, composite); //$NON-NLS-1$) highWaterMark.setValidRange(1000, Integer.MAX_VALUE - 1); addField(highWaterMark); highWaterMark.setEnabled(store.getBoolean(ICVSUIConstants.PREF_CONSOLE_LIMIT_OUTPUT), composite); // ** SHOW AUTOMATICALLY - showOnMessage = new BooleanFieldEditor(ICVSUIConstants.PREF_CONSOLE_SHOW_ON_MESSAGE, Policy.bind("ConsolePreferencesPage.4"), composite); //$NON-NLS-1$ + showOnMessage = new BooleanFieldEditor(ICVSUIConstants.PREF_CONSOLE_SHOW_ON_MESSAGE, CVSUIMessages.ConsolePreferencesPage_4, composite); //$NON-NLS-1$ addField(showOnMessage); - createLabel(composite, Policy.bind("ConsolePreferencePage.consoleColorSettings")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.ConsolePreferencePage_consoleColorSettings); //$NON-NLS-1$ // ** COLORS AND FONTS commandColorEditor = createColorFieldEditor(ICVSUIConstants.PREF_CONSOLE_COMMAND_COLOR, - Policy.bind("ConsolePreferencePage.commandColor"), composite); //$NON-NLS-1$ + CVSUIMessages.ConsolePreferencePage_commandColor, composite); //$NON-NLS-1$ addField(commandColorEditor); messageColorEditor = createColorFieldEditor(ICVSUIConstants.PREF_CONSOLE_MESSAGE_COLOR, - Policy.bind("ConsolePreferencePage.messageColor"), composite); //$NON-NLS-1$ + CVSUIMessages.ConsolePreferencePage_messageColor, composite); //$NON-NLS-1$ addField(messageColorEditor); errorColorEditor = createColorFieldEditor(ICVSUIConstants.PREF_CONSOLE_ERROR_COLOR, - Policy.bind("ConsolePreferencePage.errorColor"), composite); //$NON-NLS-1$ + CVSUIMessages.ConsolePreferencePage_errorColor, composite); //$NON-NLS-1$ addField(errorColorEditor); Dialog.applyDialogFont(composite); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/ConsoleRemoveAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/ConsoleRemoveAction.java index 6b0beec08..e51109e2f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/ConsoleRemoveAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/ConsoleRemoveAction.java @@ -23,7 +23,7 @@ import org.eclipse.team.internal.ui.Utils; public class ConsoleRemoveAction extends Action { ConsoleRemoveAction() { - Utils.initAction(this, "ConsoleRemoveAction.", Policy.getBundle()); //$NON-NLS-1$ + Utils.initAction(this, "ConsoleRemoveAction.", Policy.getActionBundle()); //$NON-NLS-1$ } public void run() { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties index c5dcbac53..3edd92393 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties @@ -4,18 +4,18 @@ # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -# +# # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -PasswordManagementPreferencePage.2=When you create a CVS repository location you have the option of saving the password to disk. This page allows you to manage the stored passwords. The following CVS repository locations have saved passwords: -PasswordManagementPreferencePage.3=Location -PasswordManagementPreferencePage.4=Username -PasswordManagementPreferencePage.5=&Remove -PasswordManagementPreferencePage.6=Remove &All -UserValidationDialog.5=CVS Repository: -UserValidationDialog.6=&Save Password -UserValidationDialog.7=Saved passwords are stored on your computer in a file that's difficult, but not impossible, for an intruder to read. +PasswordManagementPreferencePage_2=When you create a CVS repository location you have the option of saving the password to disk. This page allows you to manage the stored passwords. The following CVS repository locations have saved passwords: +PasswordManagementPreferencePage_3=Location +PasswordManagementPreferencePage_4=Username +PasswordManagementPreferencePage_5=&Remove +PasswordManagementPreferencePage_6=Remove &All +UserValidationDialog_5=CVS Repository: +UserValidationDialog_6=&Save Password +UserValidationDialog_7=Saved passwords are stored on your computer in a file that's difficult, but not impossible, for an intruder to read. details=Press the details button for more information. simpleInternal=Internal error internal=An internal error has occurred, consult the error log for details. @@ -37,760 +37,758 @@ separator=/ nameAndRevision={0} {1} currentRevision=*{0} -AddAction.addFailed=Error occurred during Add -AddAction.adding=Adding... -AddAction.addIgnoredTitle=Add Ignored Resource? -AddAction.addIgnoredQuestion=You have explicitly asked to version control one or more resources that otherwise would have been ignored. Continue? - -AddToVersionControlDialog.title=Add to CVS Version Control -AddToVersionControlDialog.thereIsAnUnaddedResource=There is {0} resource that is not under CVS version control. Do you want to add it? -AddToVersionControlDialog.thereAreUnaddedResources=There are {0} resources that are not under CVS version control. Do you want to add them? - -CheckoutAction.overlappingModuleExpansions=You have attempted to check out multiple remote modules that expand to the same local resource ''{0}''. - -AutoDefineTagsAction.defineTags = Auto-discover tags - -AvoidableMessageDialog.dontShowAgain=Don't show this again - -BranchWizard.title=Create a new CVS Branch -BranchWizard.errorBranching=Error Branching Resources -BranchWizardPage.pageDescription=Creates a new branch and a starting point version. -BranchWizardPage.pageDescriptionVersion=Creates a new branch based on the version in the workspace. -BranchWizardPage.specifyVersion=The version will provide a starting point for merging the branch back to the source branch. -BranchWizardPage.branchName=&Branch Name: -BranchWizardPage.versionName=&Version Name: -BranchWizardPage.startWorking=Start &working in the branch -BranchWizardPage.versionPrefix=Root_ -BranchWizard.versionNameWarning=Version name: {0} -BranchWizard.branchNameWarning=Branch name: {0} -BranchWizard.branchAndVersionMustBeDifferent=The branch name and version name must be different. -BranchWizard.branchNameAlreadyExists=Branch name already exists. -BranchWizard.versionNameAlreadyExists=Version name already exists. -BranchWizardPage.existingVersionsAndBranches=E&xisting Versions and Branches - -ConsolePreferencePage.consoleColorSettings=Console text color settings: -ConsolePreferencePage.commandColor=Command &Line: -ConsolePreferencePage.messageColor=&Message: -ConsolePreferencePage.errorColor=E&rror: -ConsolePreferencePage.font=Console font setting: - -CVSAction.errorTitle=Errors occurred -CVSAction.warningTitle=Warnings occurred -CVSAction.multipleProblemsMessage=Multiple problems occurred: -CVSAction.mixingTagsTitle=Confirm Mixing Tags -CVSAction.mixingTags=You are mixing tags within a project. Beware that synchronization uses the tag information associated with each resource to determine the remote resource with which the local resource is compared. \n\nThis means that the part(s) of your project that you are replacing with another tag will be synchronized with the tag ''{0}'' while other resources in the project will be synchronized with another tag. \n\nDo you wish to continue? -CVSAction.handlerNotEnabledTitle=Warning -CVSAction.handlerNotEnabledMessage=The action doesn't apply to the current selection. - -CVSAnnotateView.showFileAnnotation=CVS Annotate - {0} -CVSAnnotateView.viewInstructions=This view shows annotations for a file in CVS. Select a file and then choose \"Team->Show Annotation\" from the context menu. - -ShowAnnotationAction.noSyncInfo=Cannot display annotation for {0} because it doesn''t have a remote revision. -ShowAnnotationOperation.taskName=Fetching annotations from repository -ShowAnnotationOperation.0=Error opening perspective -ShowAnnotationOperation.1=Confirm Perspective Switch -ShowAnnotationOperation.2=The CVS Annotate View is associated with the {0} perspective. Do you want to switch to that perspective now? -ShowAnnotationOperation.4=&Remember my decision - -CVSCatchupReleaseViewer.commit=&Commit... -CVSCatchupReleaseViewer.update=&Update from Repository -CVSCatchupReleaseViewer.forceCommit=Override and Co&mmit... -CVSCatchupReleaseViewer.forceUpdate=Override and U&pdate -CVSCatchupReleaseViewer.ignore=A&dd to .cvsignore -CVSCatchupReleaseViewer.mergeUpdate=&Merge Changes into Local Copy -CVSCatchupReleaseViewer.commonFile=Common file: {0} -CVSCatchupReleaseViewer.commonFileRevision=Common file: {0} {1} -CVSCatchupReleaseViewer.noCommonFile=No common file -CVSCatchupReleaseViewer.noRepositoryFile=No repository file -CVSCatchupReleaseViewer.repositoryFile=Repository file: {0} -CVSCatchupReleaseViewer.repositoryFileRevision=Repository file: {0} {1} [{2}] -CVSCatchupReleaseViewer.workspaceFile=Workspace file: {0} -CVSCatchupReleaseViewer.showInHistory=Show in &Resource History -CVSCatchupReleaseViewer.fileDecoration={0} ({1}) -CVSCatchupReleaseViewer.folderDecoration={0} {1} -CVSCatchupReleaseViewer.confirmMerge=Mark as Mer&ged -CVSCatchupReleaseViewer.addAction=&Add to Version Control -CVSCatchupReleaseViewer.labelWithSyncKind={0} {1} - -CVSCompareEditorInput.branchLabel=<branch-{0}> -CVSCompareEditorInput.headLabel=<HEAD> -CVSCompareEditorInput.comparing=Comparing... -CVSCompareEditorInput.different=Cannot compare resources of different kind. -CVSCompareEditorInput.inBranch={0} in {1} -CVSCompareEditorInput.inHead={0} in HEAD -CVSCompareEditorInput.0=File is new -CVSCompareEditorInput.1=File has been deleted -CVSCompareEditorInput.repository=Repository: {0} {1} -CVSCompareEditorInput.titleAncestor=Compare {0} {1}-{2} and {3} -CVSCompareEditorInput.titleNoAncestor=Compare {0} {1} and {2} -CVSCompareEditorInput.titleNoAncestorDifferent=Compare {0} {1} and {2} {3} -CVSCompareEditorInput.workspace=Workspace: {0} -CVSCompareEditorInput.workspaceLabel=<workspace> -CVSCompareEditorInput.noWorkspaceFile=No workspace file -CVSCompareEditorInput.noRepositoryFile=No repository file - -CVSCompareRevisionsInput.addToWorkspace=Get -CVSCompareRevisionsInput.compareResourceAndVersions=Revisions of ''{0}'' -CVSCompareRevisionsInput.errorReplacingTitle=Unable to Replace -CVSCompareRevisionsInput.errorReplacingMessage=Resource(s) could not be loaded. A communication error may have occurred, or \ - the resource(s) may not exist on the server, or you may \ - not have permission to access them. -CVSCompareRevisionsInput.repository=Repository file: {0} -CVSCompareRevisionsInput.structureCompare=Structure Compare -CVSCompareRevisionsInput.workspace=Workspace file: {0} -CVSCompareRevisionsInput.truncate={0}[...] - -CVSDecorator.projectDecoration={0} [{1}] - -CVSDecoratorPreferencesPage.0=Select the &variables to add to the decoration format: -CVSDecoratorPreferencesPage.1=Add Variables -CVSDecoratorPreferencesPage.2=O&utgoing changes -CVSDecoratorPreferencesPage.3=Re&mote resources -CVSDecoratorPreferencesPage.4=Added &resources -CVSDecoratorPreferencesPage.5=&New resources -CVSDecoratorPreferencesPage.6=I&con Decorations -CVSDecoratorPreferencesPage.7=File &Decoration: -CVSDecoratorPreferencesPage.8=Add &Variables... -CVSDecoratorPreferencesPage.9=F&older Decoration: -CVSDecoratorPreferencesPage.10=Add Varia&bles... -CVSDecoratorPreferencesPage.11=&Project Decoration: -CVSDecoratorPreferencesPage.12=Add Variable&s... -CVSDecoratorPreferencesPage.13=Di&rty flag: -CVSDecoratorPreferencesPage.14=Added f&lag: -CVSDecoratorPreferencesPage.15=Te&xt Decorations -CVSDecoratorPreferencesPage.16=C&ompute deep outgoing state for folders -CVSDecoratorPreferencesPage.17=Disabling this will improve decorator performance. -CVSDecoratorPreferencesPage.18=Enable &font and color decorations -CVSDecoratorPreferencesPage.19=org.eclipse.ui.preferencePages.ColorsAndFonts -CVSDecoratorPreferencesPage.20=See <a>''{0}''</a> to configure the font and color decorations. -CVSDecoratorPreferencesPage.21=&General -CVSDecoratorPreferencesPage.22=name of the resource being decorated -CVSDecoratorPreferencesPage.23=the tag applied to the resource -CVSDecoratorPreferencesPage.24=keyword subsitution rule for the resource -CVSDecoratorPreferencesPage.25=last revision loaded into workspace -CVSDecoratorPreferencesPage.26=flag indicating that the file has outgoing changes -CVSDecoratorPreferencesPage.27=flag indicating that the file has been added to the server -CVSDecoratorPreferencesPage.28=name of the resource being decorated -CVSDecoratorPreferencesPage.29=the tag applied to the resource (version, branch, or date) -CVSDecoratorPreferencesPage.30=the repository location's hostname -CVSDecoratorPreferencesPage.31=the connection method (e.g. pserver, ssh) -CVSDecoratorPreferencesPage.32=user name for the connection -CVSDecoratorPreferencesPage.33=repository home directory on server -CVSDecoratorPreferencesPage.34=root relative directory -CVSDecoratorPreferencesPage.35=flag indicating that the folder has a child resource with outgoing changes - -CVSDecorator.projectDecorationWithTag={0} [{1} {2}] -CVSDecorator.fileDecorationWithTag={0} [{1}:{2}] -CVSDecorator.fileDecorationNoTag={0} [{1}] -CVSDecorator.folderDecoration={0} [{1}] - -CVSFilePropertiesPage.ignored=The file is ignored by CVS. -CVSFilePropertiesPage.notManaged=The file is not managed by CVS. -CVSFilePropertiesPage.isAdded=This file has been added to CVS control but has not been committed -CVSFilePropertiesPage.baseRevision=Base revision: -CVSFilePropertiesPage.baseTimestamp=Base timestamp: -CVSFilePropertiesPage.dirty=Dirty: -CVSFilePropertiesPage.modified=Modified: -CVSFilePropertiesPage.keywordMode=Keyword mode: -CVSFilePropertiesPage.tag=Tag: -CVSFilePropertiesPage.none=HEAD -CVSFilePropertiesPage.version={0} (Version) -CVSFilePropertiesPage.branch={0} (Branch) -CVSFilePropertiesPage.date={0} (Date) -CVSFilePropertiesPage.error=An error occurred while creating this page. -CVSFilePropertiesPage.permissions=Permissions: -CVSFilePropertiesPage.notAvailable=Not Available - -CVSFolderPropertiesPage.ignored=The folder is ignored by CVS. -CVSFolderPropertiesPage.notManaged=The folder is not managed by CVS. -CVSFolderPropertiesPage.notCVSFolder=This folder has lost its CVS sharing information. -CVSFolderPropertiesPage.root=Repository root: -CVSFolderPropertiesPage.repository=Repository path: -CVSFolderPropertiesPage.static=Static: -CVSFolderPropertiesPage.disconnect=&Disconnect... -CVSFolderPropertiesPage.disconnectTitle=Disconnect folder? -CVSFolderPropertiesPage.disconnectQuestion=Disconnecting the folder from CVS control will delete the CVS synchronization information for the folder. Are you sure you want to disconnect? - -CVSLocalCompareEditorInput.title=CVS Compare [{0}] - -CVSOperationCancelledException.operationCancelled=Operation Cancelled - -CVSPropertiesPage.connectionType=&Connection type: -CVSPropertiesPage.user=&User: -CVSPropertiesPage.password=&Password: -CVSPropertiesPage.host=&Host: -CVSPropertiesPage.port=Port: -CVSPropertiesPage.path=Repository p&ath: -CVSPropertiesPage.module=Module: -CVSPropertiesPage.defaultPort=Default -CVSPropertiesPage.tag=Tag: -CVSPreferencesPage.0=0 (disabled) -CVSPreferencesPage.1=1 -CVSPreferencesPage.2=2 -CVSPreferencesPage.3=3 -CVSPreferencesPage.4=4 -CVSPreferencesPage.5=5 -CVSPreferencesPage.6=6 -CVSPreferencesPage.7=7 -CVSPreferencesPage.8=8 -CVSPreferencesPage.9=9 (highest compression) -CVSPreferencesPage.10=None -CVSPreferencesPage.11=Yes -CVSPreferencesPage.12=No -CVSPreferencesPage.13=Prompt -CVSPreferencesPage.14=&General -CVSPreferencesPage.15=&Validate server version compatibility on first connection -CVSPreferencesPage.16=Confirm &move tag on tag operation -CVSPreferencesPage.17=&Display detailed protocol output to stdout (for debugging purposes) -CVSPreferencesPage.18=R&efresh tags when comparing or replacing tags -CVSPreferencesPage.19=&Connection -CVSPreferencesPage.23=C&onnection timeout: -CVSPreferencesPage.24=Timeout must be positive -CVSPreferencesPage.25=The timeout must be a number -CVSPreferencesPage.26=&Quietness level: -CVSPreferencesPage.27=Verbose -CVSPreferencesPage.28=Somewhat quiet -CVSPreferencesPage.29=Very quiet -CVSPreferencesPage.20=Maximum &number of files displayed when committing: -CVSPreferencesPage.21=Maximum files displayed must be positive -CVSPreferencesPage.22=Maximum files displayed must be a number -CVSPreferencesPage.30='Very Quiet' mode is dangerous -CVSPreferencesPage.31=In 'Very Quiet' mode, some cvs servers may not communicate important information about errors that have occurred. You may want to consider using 'Somewhat quiet' mode instead. -CVSPreferencesPage.32=Compre&ssion: -CVSPreferencesPage.33=&Files and Folders -CVSPreferencesPage.34=&Treat all new files as binary -CVSPreferencesPage.35=Con&vert text files to use platform line ending -CVSPreferencesPage.36=P&rune empty directories -CVSPreferencesPage.37=&Delete unmanaged resources on replace -CVSPreferencesPage.38=Default te&xt mode: -CVSPreferencesPage.39=&Prompting -CVSPreferencesPage.40=A&llow empty commit comments -CVSPreferencesPage.41=A&utomatically save dirty editors before CVS operations -CVSPreferencesPage.42=S&witch perspective after a 'Show Annotations' operation -CVSPreferencesPage.43=D&efault perspective for 'Show Annotations': -CVSPropertiesPage.update=Change &Tag... -CVSPropertiesPage.virtualModule=<no corresponding remote folder> - - -CVSRemoteFilePropertySource.name=Name -CVSRemoteFilePropertySource.revision=Revision -CVSRemoteFilePropertySource.date=Date -CVSRemoteFilePropertySource.author=Author -CVSRemoteFilePropertySource.comment=Comment -CVSRemoteFilePropertySource.tag=Tag - -CVSRemoteFolderPropertySource.name=Name -CVSRemoteFolderPropertySource.tag=Tag -CVSRemoteFolderPropertySource.none=(none) - -CVSRepositoryLocationPropertySource.default=Default -CVSRepositoryLocationPropertySource.host=Host -CVSRepositoryLocationPropertySource.user=User -CVSRepositoryLocationPropertySource.port=Port -CVSRepositoryLocationPropertySource.root=Root -CVSRepositoryLocationPropertySource.method=Connection Method - -CVSSyncCompareInput.confirmMergeMessageTitle=Information -CVSSyncCompareInput.confirmMergeMessage=Your changes have been saved. When you are finished, \ - select 'Mark as Merged' to make this file an outgoing change. -CVSSyncCompareInput.projectDeleted=Project ''{0}'' has been deleted locally and cannot be synchronized. -CVSSyncCompareInput.filteringOutgoingChanges=Accumulating resources with outgoing changes - -CVSSyncSet.conflicts={0} conflicts, -CVSSyncSet.incomings={0} incoming change(s), -CVSSyncSet.noConflicts=No conflicts, -CVSSyncSet.noIncomings=no incoming changes, -CVSSyncSet.noOutgoings=no outgoing changes, -CVSSyncSet.outgoings={0} outgoing change(s), -CVSSyncSet.noNew=no new resources. -CVSParticipant.0=Remote File ({0} - {1}) -CVSParticipant.1=Common Ancestor ({0} - {1}) -CVSParticipant.2=C&VS -CVSSyncSet.new={0} new resource(s). - -CVSUIPlugin.refreshTitle=Refresh Resource? -CVSUIPlugin.refreshQuestion={0} Would you like to refresh resource ''{1}''? -CVSUIPlugin.refreshMultipleQuestion={0} Would you like to refresh the selected resources? - -CVSAction.disabledTitle=Information -CVSAction.disabledMessage=The chosen operation is not enabled. -CVSAction.refreshTitle=Refresh Project? -CVSAction.refreshQuestion={0} Would you like to refresh project ''{1}''? -CVSAction.refreshMultipleQuestion={0} Would you like to refresh the projects of the selected resources? - -CommitAction.commitFailed=Problems encountered performing commit -CommitWizardCommitPage.0=Commit -CommitWizardCommitPage.2=Enter a comment for the commit operation. -CommitWizardCommitPage.3=Please enter a commit comment. -CommitWizardCommitPage.4=Conflicting changes cannot be commited. Either exclude them from the commit or use the synchronize view to resolve the conflicts. -CommitWizardCommitPage.1=There are {0} changes to be committed which exceeds the display threshold of {1}. -CommitWizardCommitPage.5=Show &Changes -CommitWizardFileTypePage.0=Add Resources -CommitWizardFileTypePage.2=Unknown new files detected. -CommitWizardFileTypePage.3=New files with the following unknown names or extensions have been detected in the workspace. Please specify whether these files should be stored as text or binary and whether this decision should be remembered. - -CommitSyncAction.questionRelease=You have changes that conflict with the server. Release those changes? -CommitSyncAction.titleRelease=Confirm Overwrite -CommitSyncAction.releaseAll=Release all changes, overriding any conflicting changes on the server. -CommitSyncAction.releasePart=Only release the changes that don't conflict with changes on the server. -CommitSyncAction.cancelRelease=Cancel the release operation. -CommitSyncAction.errorCommitting=An error occurred while committing changes. - -CompareWithRemoteAction.compare=Error Comparing with Latest -CompareWithRemoteAction.noRemote=No Remote Resource -CompareWithRemoteAction.noRemoteLong=The selected resource has no remote resource to compare with. -CompareWithRemoteAction.fetching=Comparing with latest from repository... - -CompareWithRevisionAction.compare=Error Comparing with Revision -CompareWithRevisionAction.noRevisions=No Revisions -CompareWithRevisionAction.noRevisionsLong=The selected resource has no revisions to compare with. -CompareWithRevisionAction.fetching=Fetching revisions from repository... - -CompareWithTagAction.message=Compare With Branch or Version -CompareWithTagAction.replace=Error Comparing With Branch or Version -CompareWithTagAction.noRemote=No Remote Resource -CompareWithTagAction.noRemoteLong=The selected tag has no remote resource to compare with. -CompareWithTagAction.fetching=Fetching resources with tag {0}... - -CompareEditorInput.fileProgress=Comparing CVS file: {0} - -ConfigurationWizardAutoconnectPage.description=Your project already has CVS/ directories. It was probably previously shared, or checked out using another tool. It will be automatically shared using the following information. -ConfigurationWizardAutoconnectPage.user=User: -ConfigurationWizardAutoconnectPage.host=Host: -ConfigurationWizardAutoconnectPage.port=Port: -ConfigurationWizardAutoconnectPage.default=Default -ConfigurationWizardAutoconnectPage.connectionType=Connection type: -ConfigurationWizardAutoconnectPage.repositoryPath=Repository path: -ConfigurationWizardAutoconnectPage.module=Module: -ConfigurationWizardAutoconnectPage.validate=&Validate Connection on Finish -ConfigurationWizardAutoconnectPage.noSyncInfo=Could not get folder information -ConfigurationWizardAutoconnectPage.noCVSDirectory=Could not find CVS/ directory - -RepositorySelectionPage.description=This wizard will help you to share your files with the CVS repository for the first time. Your project will automatically be imported into the CVS repository, and the Synchronize view will open to allow you to commit your resources. -RepositorySelectionPage.useExisting=&Use existing repository location: -RepositorySelectionPage.useNew=&Create a new repository location - -ConfigurationWizardMainPage.connection=&Connection type: -ConfigurationWizardMainPage.userName=&User: -ConfigurationWizardMainPage.password=&Password: -ConfigurationWizardMainPage.host=&Host: -ConfigurationWizardMainPage.0=Location already exists. -ConfigurationWizardMainPage.5=The host name must not start or end with a space -ConfigurationWizardMainPage.1=User Name Required -ConfigurationWizardMainPage.2=Host Required -ConfigurationWizardMainPage.3=Port Required -ConfigurationWizardMainPage.4=Repository Path Required -ConfigurationWizardMainPage.useDefaultPort=Use Default P&ort -ConfigurationWizardMainPage.usePort=Use Por&t: -ConfigurationWizardMainPage.repositoryPath=&Repository path: -ConfigurationWizardMainPage.invalidUserName=Invalid User Name -ConfigurationWizardMainPage.invalidHostName=Invalid Host Name -ConfigurationWizardMainPage.invalidPort=Invalid Port -ConfigurationWizardMainPage.invalidPathWithSpaces=The repository path cannot have segments with leading or trailing spaces -ConfigurationWizardMainPage.invalidPathWithSlashes=The repository path cannot contain a double slash (//) -ConfigurationWizardMainPage.useNTFormat=Use NT path names for specifying CVSNT repository paths (e.g. C:\\cvs\\root) - -Console.copy=Copy -Console.selectAll=Select All -Console.clearOutput=Clear Output -Console.resultServerError={0} {1} -Console.resultWarnings={0} {1} -Console.resultException=failed due to an internal error {0} -Console.resultAborted=operation canceled {0} -Console.resultOk=ok {0} -Console.resultTimeFormat='(took 'm:ss.SSS')' -Console.couldNotFormatTime=An error occurred formatting the output time for the CVS console. -Console.preExecutionDelimiter=*** -Console.postExecutionDelimiter=*** -Console.info=Info: {0} -Console.warning=Warning: {0} -Console.error=Error: {0} - -AddToBranchAction.enterTag=Enter Branch Tag -AddToBranchAction.enterTagLong=Enter the name of the branch: - -DiffAction.diff=Diff - -FixTypeAction.fix=Fix Types - -GenerateCVSDiff.title=Create Patch -GenerateCVSDiff.pageTitle=Run and save CVS diff results in a file -GenerateCVSDiff.pageDescription=The results of the CVS diff command can be used as an input file for the Apply Patch wizard. -GenerateCVSDiff.overwriteTitle=Confirm Overwrite -GenerateCVSDiff.overwriteMsg=A file with that name already exists. Overwrite? -GenerateCVSDiff.error=Error running the CVS diff command -GenerateCVSDiff.working=Running CVS diff... -GenerateCVSDiff.noDiffsFoundMsg=No differences found. -GenerateCVSDiff.noDiffsFoundTitle=CVS diff -GenerateCVSDiff.1=Read-only file -GenerateCVSDiff.2=The specified file is read-only and cannot be overwritten. -GenerateCVSDiff.3=Can't write directory -GenerateCVSDiff.4=You don't have permission to create a file in this directory. - -GetSyncAction.questionCatchup=You have local changes which you are about to overwrite. Should the conflicting changes be added? -GetSyncAction.titleCatchup=Catch up Over Conflicts? -GetSyncAction.catchupAll=Catch up to all incoming changes, overriding any conflicting local changes. -GetSyncAction.catchupPart=Only catch up to the changes that don't conflict with local changes. -GetSyncAction.cancelCatchup=Cancel the catch up operation. -UpdateSyncAction.errorUpdating=An error occurred while updating changes. - -HistoryFilterDialog.title = Filter Resource History -HistoryFilterDialog.showMatching = Show entries matching: -HistoryFilterDialog.matchingAny = a&ny of the provided criteria -HistoryFilterDialog.matchingAll = a&ll of the provided criteria -HistoryFilterDialog.author = &Author: -HistoryFilterDialog.comment = &Comment containing: -HistoryFilterDialog.fromDate = &From date (M/D/Y) : -HistoryFilterDialog.toDate = &To date (M/D/Y) : - -HistoryView.getAnnotateAction=Show &Annotation -HistoryView.getContentsAction=&Get Contents -HistoryView.getRevisionAction=Get Sticky &Revision -HistoryView.tagWithExistingAction=&Tag with Existing... -HistoryView.copy=&Copy -HistoryView.revision=Revision -HistoryView.tags=Tags -HistoryView.date=Date -HistoryView.author=Author -HistoryView.comment=Comment -HistoryView.refreshLabel=&Refresh View -HistoryView.refresh=Refresh View -HistoryView.linkWithLabel=Link with Editor -HistoryView.selectAll=Select &All -HistoryView.showComment=Show Comment Viewer -HistoryView.showTags=Show Tag Viewer -HistoryView.title=CVS Resource History -HistoryView.titleWithArgument=CVS Resource History ({0}) -HistoryView.overwriteTitle=Overwrite local changes? -HistoryView.overwriteMsg=You have local changes. Do you want to overwrite them? -HistoryView.fetchHistoryJob=Fetching CVS revision history -HistoryView.fetchHistoryJobFile=Fetching CVS revision history for: {0} -HistoryView.errorFetchingEntries=Error fetching entries for {0} - -IgnoreAction.ignore=Error Ignoring Resource - -MergeAction.saveChangesTitle=Save Changes -MergeAction.saveChanges=You have unsaved changes that will be saved before the action is performed. - -MergeEditorInput.title=Merge {0} with {1} - -MergeWizard.title=Merge -MergeWizard.0=Select the merge points -MergeWizard.1=Specify the branch or version to be merged and the common base version. -MergeWizardPage.0=Preview the merge in the &synchronize view -MergeWizardPage.1=Perform the merge into the &local workspace -MergeWizardPage.2=&Branch or version to be merged (end tag): -MergeWizardPage.3=Br&owse... -MergeWizardPage.4=Choose End Tag -MergeWizardPage.5=&Select end tag -MergeWizardPage.6=Common base &version (start tag): -MergeWizardPage.7=Bro&wse... -MergeWizardPage.8=Choose Start Tag -MergeWizardPage.9=&Select start tag -MergeWizardPage.10=The specified end tag is not known to exist. Either enter a different tag or refresh the known tags. -MergeWizardPage.11=The specified start tag is not known to exist. Either enter a different tag or refresh the known tags. -MergeWizardPage.12=The start and end tags cannot be the same. -MergeWizardPage.13=A start tag is required for previewing a merge in the synchronize view. -MergeWizard.preparing=Preparing merge wizard -MergeWizard.preparingStart=Fetching tags for start page -MergeWizard.preparingEnd=Fetching tags for end page -MergeWizardEndPage.branches=Branches - -ModuleSelectionPage.moduleIsProject=Use &project name as module name -ModuleSelectionPage.specifyModule=Use &specified module name: - -MoveTagAction.errorMessage=Error Tagging -ModeWizardSelectionPage.10=Propo&se -ModeWizardSelectionPage.11=Automatically propose a new mode for the file based\non its name and extension. This can be configured on the\nTeam > File Content preference page. -ModeWizardSelectionPage.12=S&elect All -ModeWizardSelectionPage.13=Select &None -ModeWizardSelectionPage.14=Only sho&w those files -ModeWizardSelectionPage.15=C&lear -ModeWizardSelectionPage.17={0} files will be changed -ModeWizardSelectionPage.18=SelectionPage -ModeWizardSelectionPage.19=ASCII/Binary Property -ModeWizardSelectionPage.20=Configure the way CVS transfers your files. -ModeWizardSelectionPage.21=Fil&ter files by name (? = any character, * = any string) -ModeWizardSelectionPage.22=C&hange the ASCII/Binary property for the selected files -ModeWizardSelectionPage.23=For information about the different CVS ASCII/Binary modes refer to your CVS documentation. -ModeWizardSelectionPage.24=Enter a c&ommit comment -ModeWizardSelectionPage.25={0} files selected - -MoveTagAction.title=Tag with Existing Tag -MoveTagAction.message=&Select the tag to be moved - -NewLocationWizard.title=Add CVS Repository -NewLocationWizard.heading=Add a new CVS Repository -NewLocationWizard.description=Add a new CVS Repository to the CVS Repositories view -NewLocationWizard.validationFailedText=Error validating location: "{0}"\n\nKeep location anyway? -NewLocationWizard.validationFailedTitle=Unable to Validate -NewLocationWizard.exception=Unable to create repository location - -OpenLogEntryAction.deletedTitle=Resource is Deleted -OpenLogEntryAction.deleted=The selected revision represents a deletion. It cannot be opened. - -ReleaseCommentDialog.title=Commit -ReleaseCommentDialog.choosePrevious=Choose a &previously entered comment: -ReleaseCommentDialog.enterComment=Edit the commit &comment: -ReleaseCommentDialog.unaddedResources=Checked resources will be &added to CVS version control. -ReleaseCommentDialog.selectAll=&Select All -ReleaseCommentDialog.deselectAll=D&eselect All -ReleaseCommentDialog.clearTextArea=&Reset Comment - -RemoteFolderElement.nameAndTag={0} {1} -RemoteFolderElement.fetchingRemoteChildren=Fetching remote CVS children for ''{0}''... - -RemoveRootAction.removeRoot=Error Discarding Location - -ReplaceWithTagAction.message=Replace with Branch or Version -ReplaceWithTagAction.replace=Error Replacing With Tag -ReplaceWithTagAction.replacing=Replacing with tag {0} -ReplaceWithTagAction.mixingTags=You are mixing tags within a project. This may cause confusion \ - when synchronizing with the repository. Synchronize uses the tag information associated with \ - each resource to determine the remote resource with which the local resource is compared. \ - For example, with version tags, the state of the tagged resources never change so you will \ - not see changes made to the resources in HEAD (or other branches). Do you wish to continue? - -ReplaceWithRemoteAction.replacing=Replacing -ReplaceWithRemoteAction.problemMessage=Error Replacing With Latest From Repository - -ReplaceWithAction.confirmOverwrite=Confirm Overwrite -ReplaceWithAction.localChanges={0} has local changes which you are about to overwrite. Do you wish to overwrite? -ReplaceWithAction.calculatingDirtyResources=Finding outgoing changes... - -ReplaceWithLatestAction.multipleTags=La&test from Repository -ReplaceWithLatestAction.multipleVersions=&Versions from Repository -ReplaceWithLatestAction.multipleBranches=La&test from Branches -ReplaceWithLatestAction.singleVersion=&Version {0} -ReplaceWithLatestAction.singleBranch=La&test from Branch {0} -ReplaceWithLatestAction.singleHEAD=La&test from {0} - -RepositoryDialog.getRepository=Select a repository -RepositoryDialog.description=Select a repository to connect your project to - -RepositoryManager.getting=Getting -RepositoryManager.committing=Committing -RepositoryManager.updating=Updating -RepositoryManager.deleting=Deleting -RepositoryManager.adding=Adding -RepositoryManager.rename=An IO Exception occurred while renaming the state file -RepositoryManager.save=An IO Exception occurred while saving the state file -RepositoryManager.ioException=An IO Exception occurred while reading the state file -RepositoryManager.parsingProblem=An error occurred parsing file ''{0}''. -RepositoryManager.fetchingRemoteFolders=Fetching remote CVS folders for ''{0}''... - -RepositoriesView.refresh=&Refresh View -RepositoriesView.refreshTooltip=Refresh View -RepositoriesView.new=&Repository Location... -RepositoriesView.newSubmenu=&New -RepositoriesView.newAnonCVS=&Anonymous Repository Location to dev.eclipse.org... -RepositoriesView.newWorkingSet=Select Working Set... -RepositoriesView.deselectWorkingSet=Deselect Working Set -RepositoriesView.editWorkingSet=Edit Active Working Set... -RepositoriesView.workingSetMenuItem={0} {1} -RepositoriesView.collapseAll=Collapse All -RepositoriesView.collapseAllTooltip=Collapse All -RepositoriesView.NItemsSelected={0} items selected -RepositoriesView.OneItemSelected=1 item selected -RepositoriesView.ResourceInRepository={0} in {1} -RepositoriesView.CannotGetRevision=Cannot get revision -RemoteViewPart.workingSetToolTip=Working Set: {0} - -ResourcePropertiesPage.status=Status -ResourcePropertiesPage.notManaged=Not managed by CVS -ResourcePropertiesPage.versioned=versioned -ResourcePropertiesPage.notVersioned=not versioned -ResourcePropertiesPage.state=State -ResourcePropertiesPage.checkedOut=Checked Out -ResourcePropertiesPage.checkedIn=Checked In +AddAction_addFailed=Error occurred during Add +AddAction_adding=Adding... +AddAction_addIgnoredTitle=Add Ignored Resource? +AddAction_addIgnoredQuestion=You have explicitly asked to version control one or more resources that otherwise would have been ignored. Continue? + +AddToVersionControlDialog_title=Add to CVS Version Control +AddToVersionControlDialog_thereIsAnUnaddedResource=There is {0} resource that is not under CVS version control. Do you want to add it? +AddToVersionControlDialog_thereAreUnaddedResources=There are {0} resources that are not under CVS version control. Do you want to add them? + +CheckoutAction_overlappingModuleExpansions=You have attempted to check out multiple remote modules that expand to the same local resource ''{0}''. + +AutoDefineTagsAction_defineTags = Auto-discover tags + +AvoidableMessageDialog_dontShowAgain=Don't show this again + +BranchWizard_title=Create a new CVS Branch +BranchWizard_errorBranching=Error Branching Resources +BranchWizardPage_pageDescription=Creates a new branch and a starting point version. +BranchWizardPage_pageDescriptionVersion=Creates a new branch based on the version in the workspace. +BranchWizardPage_specifyVersion=The version will provide a starting point for merging the branch back to the source branch. +BranchWizardPage_branchName=&Branch Name: +BranchWizardPage_versionName=&Version Name: +BranchWizardPage_startWorking=Start &working in the branch +BranchWizardPage_versionPrefix=Root_ +BranchWizard_versionNameWarning=Version name: {0} +BranchWizard_branchNameWarning=Branch name: {0} +BranchWizard_branchAndVersionMustBeDifferent=The branch name and version name must be different. +BranchWizard_branchNameAlreadyExists=Branch name already exists. +BranchWizard_versionNameAlreadyExists=Version name already exists. +BranchWizardPage_existingVersionsAndBranches=E&xisting Versions and Branches + +ConsolePreferencePage_consoleColorSettings=Console text color settings: +ConsolePreferencePage_commandColor=Command &Line: +ConsolePreferencePage_messageColor=&Message: +ConsolePreferencePage_errorColor=E&rror: +ConsolePreferencePage_font=Console font setting: + +CVSAction_errorTitle=Errors occurred +CVSAction_warningTitle=Warnings occurred +CVSAction_multipleProblemsMessage=Multiple problems occurred: +CVSAction_mixingTagsTitle=Confirm Mixing Tags +CVSAction_mixingTags=You are mixing tags within a project. Beware that synchronization uses the tag information associated with each resource to determine the remote resource with which the local resource is compared. \n\nThis means that the part(s) of your project that you are replacing with another tag will be synchronized with the tag ''{0}'' while other resources in the project will be synchronized with another tag. \n\nDo you wish to continue? +CVSAction_handlerNotEnabledTitle=Warning +CVSAction_handlerNotEnabledMessage=The action doesn't apply to the current selection. + +CVSAnnotateView_showFileAnnotation=CVS Annotate - {0} +CVSAnnotateView_viewInstructions=This view shows annotations for a file in CVS. Select a file and then choose \"Team->Show Annotation\" from the context menu. + +ShowAnnotationAction_noSyncInfo=Cannot display annotation for {0} because it doesn''t have a remote revision. +ShowAnnotationOperation_taskName=Fetching annotations from repository +ShowAnnotationOperation_0=Error opening perspective +ShowAnnotationOperation_1=Confirm Perspective Switch +ShowAnnotationOperation_2=The CVS Annotate View is associated with the {0} perspective. Do you want to switch to that perspective now? +ShowAnnotationOperation_4=&Remember my decision + +CVSCatchupReleaseViewer_commit=&Commit... +CVSCatchupReleaseViewer_update=&Update from Repository +CVSCatchupReleaseViewer_forceCommit=Override and Co&mmit... +CVSCatchupReleaseViewer_forceUpdate=Override and U&pdate +CVSCatchupReleaseViewer_ignore=A&dd to .cvsignore +CVSCatchupReleaseViewer_mergeUpdate=&Merge Changes into Local Copy +CVSCatchupReleaseViewer_commonFile=Common file: {0} +CVSCatchupReleaseViewer_commonFileRevision=Common file: {0} {1} +CVSCatchupReleaseViewer_noCommonFile=No common file +CVSCatchupReleaseViewer_noRepositoryFile=No repository file +CVSCatchupReleaseViewer_repositoryFile=Repository file: {0} +CVSCatchupReleaseViewer_repositoryFileRevision=Repository file: {0} {1} [{2}] +CVSCatchupReleaseViewer_workspaceFile=Workspace file: {0} +CVSCatchupReleaseViewer_showInHistory=Show in &Resource History +CVSCatchupReleaseViewer_fileDecoration={0} ({1}) +CVSCatchupReleaseViewer_folderDecoration={0} {1} +CVSCatchupReleaseViewer_confirmMerge=Mark as Mer&ged +CVSCatchupReleaseViewer_addAction=&Add to Version Control +CVSCatchupReleaseViewer_labelWithSyncKind={0} {1} + +CVSCompareEditorInput_branchLabel=<branch-{0}> +CVSCompareEditorInput_headLabel=<HEAD> +CVSCompareEditorInput_comparing=Comparing... +CVSCompareEditorInput_different=Cannot compare resources of different kind. +CVSCompareEditorInput_inBranch={0} in {1} +CVSCompareEditorInput_inHead={0} in HEAD +CVSCompareEditorInput_0=File is new +CVSCompareEditorInput_1=File has been deleted +CVSCompareEditorInput_repository=Repository: {0} {1} +CVSCompareEditorInput_titleAncestor=Compare {0} {1}-{2} and {3} +CVSCompareEditorInput_titleNoAncestor=Compare {0} {1} and {2} +CVSCompareEditorInput_titleNoAncestorDifferent=Compare {0} {1} and {2} {3} +CVSCompareEditorInput_workspace=Workspace: {0} +CVSCompareEditorInput_workspaceLabel=<workspace> +CVSCompareEditorInput_noWorkspaceFile=No workspace file +CVSCompareEditorInput_noRepositoryFile=No repository file + +CVSCompareRevisionsInput_addToWorkspace=Get +CVSCompareRevisionsInput_compareResourceAndVersions=Revisions of ''{0}'' +CVSCompareRevisionsInput_errorReplacingTitle=Unable to Replace +CVSCompareRevisionsInput_errorReplacingMessage=Resource(s) could not be loaded. A communication error may have occurred, or \ +the resource(s) may not exist on the server, or you may \ +not have permission to access them. +CVSCompareRevisionsInput_repository=Repository file: {0} +CVSCompareRevisionsInput_structureCompare=Structure Compare +CVSCompareRevisionsInput_workspace=Workspace file: {0} +CVSCompareRevisionsInput_truncate={0}[...] + +CVSDecorator_projectDecoration={0} [{1}] + +CVSDecoratorPreferencesPage_0=Select the &variables to add to the decoration format: +CVSDecoratorPreferencesPage_1=Add Variables +CVSDecoratorPreferencesPage_2=O&utgoing changes +CVSDecoratorPreferencesPage_3=Re&mote resources +CVSDecoratorPreferencesPage_4=Added &resources +CVSDecoratorPreferencesPage_5=&New resources +CVSDecoratorPreferencesPage_6=I&con Decorations +CVSDecoratorPreferencesPage_7=File &Decoration: +CVSDecoratorPreferencesPage_8=Add &Variables... +CVSDecoratorPreferencesPage_9=F&older Decoration: +CVSDecoratorPreferencesPage_10=Add Varia&bles... +CVSDecoratorPreferencesPage_11=&Project Decoration: +CVSDecoratorPreferencesPage_12=Add Variable&s... +CVSDecoratorPreferencesPage_13=Di&rty flag: +CVSDecoratorPreferencesPage_14=Added f&lag: +CVSDecoratorPreferencesPage_15=Te&xt Decorations +CVSDecoratorPreferencesPage_16=C&ompute deep outgoing state for folders +CVSDecoratorPreferencesPage_17=Disabling this will improve decorator performance. +CVSDecoratorPreferencesPage_18=Enable &font and color decorations +CVSDecoratorPreferencesPage_19=org.eclipse.ui.preferencePages.ColorsAndFonts +CVSDecoratorPreferencesPage_20=See <a>''{0}''</a> to configure the font and color decorations. +CVSDecoratorPreferencesPage_21=&General +CVSDecoratorPreferencesPage_22=name of the resource being decorated +CVSDecoratorPreferencesPage_23=the tag applied to the resource +CVSDecoratorPreferencesPage_24=keyword subsitution rule for the resource +CVSDecoratorPreferencesPage_25=last revision loaded into workspace +CVSDecoratorPreferencesPage_26=flag indicating that the file has outgoing changes +CVSDecoratorPreferencesPage_27=flag indicating that the file has been added to the server +CVSDecoratorPreferencesPage_28=name of the resource being decorated +CVSDecoratorPreferencesPage_29=the tag applied to the resource (version, branch, or date) +CVSDecoratorPreferencesPage_30=the repository location's hostname +CVSDecoratorPreferencesPage_31=the connection method (e.g. pserver, ssh) +CVSDecoratorPreferencesPage_32=user name for the connection +CVSDecoratorPreferencesPage_33=repository home directory on server +CVSDecoratorPreferencesPage_34=root relative directory +CVSDecoratorPreferencesPage_35=flag indicating that the folder has a child resource with outgoing changes + +CVSDecorator_projectDecorationWithTag={0} [{1} {2}] +CVSDecorator_fileDecorationWithTag={0} [{1}:{2}] +CVSDecorator_fileDecorationNoTag={0} [{1}] +CVSDecorator_folderDecoration={0} [{1}] + +CVSFilePropertiesPage_ignored=The file is ignored by CVS. +CVSFilePropertiesPage_notManaged=The file is not managed by CVS. +CVSFilePropertiesPage_isAdded=This file has been added to CVS control but has not been committed +CVSFilePropertiesPage_baseRevision=Base revision: +CVSFilePropertiesPage_baseTimestamp=Base timestamp: +CVSFilePropertiesPage_dirty=Dirty: +CVSFilePropertiesPage_modified=Modified: +CVSFilePropertiesPage_keywordMode=Keyword mode: +CVSFilePropertiesPage_tag=Tag: +CVSFilePropertiesPage_none=HEAD +CVSFilePropertiesPage_version={0} (Version) +CVSFilePropertiesPage_branch={0} (Branch) +CVSFilePropertiesPage_date={0} (Date) +CVSFilePropertiesPage_error=An error occurred while creating this page. +CVSFilePropertiesPage_permissions=Permissions: +CVSFilePropertiesPage_notAvailable=Not Available + +CVSFolderPropertiesPage_ignored=The folder is ignored by CVS. +CVSFolderPropertiesPage_notManaged=The folder is not managed by CVS. +CVSFolderPropertiesPage_notCVSFolder=This folder has lost its CVS sharing information. +CVSFolderPropertiesPage_root=Repository root: +CVSFolderPropertiesPage_repository=Repository path: +CVSFolderPropertiesPage_static=Static: +CVSFolderPropertiesPage_disconnect=&Disconnect... +CVSFolderPropertiesPage_disconnectTitle=Disconnect folder? +CVSFolderPropertiesPage_disconnectQuestion=Disconnecting the folder from CVS control will delete the CVS synchronization information for the folder. Are you sure you want to disconnect? + +CVSLocalCompareEditorInput_title=CVS Compare [{0}] + +CVSOperationCancelledException_operationCancelled=Operation Cancelled + +CVSPropertiesPage_connectionType=&Connection type: +CVSPropertiesPage_user=&User: +CVSPropertiesPage_password=&Password: +CVSPropertiesPage_host=&Host: +CVSPropertiesPage_port=Port: +CVSPropertiesPage_path=Repository p&ath: +CVSPropertiesPage_module=Module: +CVSPropertiesPage_defaultPort=Default +CVSPropertiesPage_tag=Tag: +CVSPreferencesPage_0=0 (disabled) +CVSPreferencesPage_1=1 +CVSPreferencesPage_2=2 +CVSPreferencesPage_3=3 +CVSPreferencesPage_4=4 +CVSPreferencesPage_5=5 +CVSPreferencesPage_6=6 +CVSPreferencesPage_7=7 +CVSPreferencesPage_8=8 +CVSPreferencesPage_9=9 (highest compression) +CVSPreferencesPage_10=None +CVSPreferencesPage_11=Yes +CVSPreferencesPage_12=No +CVSPreferencesPage_13=Prompt +CVSPreferencesPage_14=&General +CVSPreferencesPage_15=&Validate server version compatibility on first connection +CVSPreferencesPage_16=Confirm &move tag on tag operation +CVSPreferencesPage_17=&Display detailed protocol output to stdout (for debugging purposes) +CVSPreferencesPage_18=R&efresh tags when comparing or replacing tags +CVSPreferencesPage_19=&Connection +CVSPreferencesPage_23=C&onnection timeout: +CVSPreferencesPage_24=Timeout must be positive +CVSPreferencesPage_25=The timeout must be a number +CVSPreferencesPage_26=&Quietness level: +CVSPreferencesPage_27=Verbose +CVSPreferencesPage_28=Somewhat quiet +CVSPreferencesPage_29=Very quiet +CVSPreferencesPage_20=Maximum &number of files displayed when committing: +CVSPreferencesPage_21=Maximum files displayed must be positive +CVSPreferencesPage_22=Maximum files displayed must be a number +CVSPreferencesPage_30='Very Quiet' mode is dangerous +CVSPreferencesPage_31=In 'Very Quiet' mode, some cvs servers may not communicate important information about errors that have occurred. You may want to consider using 'Somewhat quiet' mode instead. +CVSPreferencesPage_32=Compre&ssion: +CVSPreferencesPage_33=&Files and Folders +CVSPreferencesPage_34=&Treat all new files as binary +CVSPreferencesPage_35=Con&vert text files to use platform line ending +CVSPreferencesPage_36=P&rune empty directories +CVSPreferencesPage_37=&Delete unmanaged resources on replace +CVSPreferencesPage_38=Default te&xt mode: +CVSPreferencesPage_39=&Prompting +CVSPreferencesPage_40=A&llow empty commit comments +CVSPreferencesPage_41=A&utomatically save dirty editors before CVS operations +CVSPreferencesPage_42=S&witch perspective after a 'Show Annotations' operation +CVSPreferencesPage_43=D&efault perspective for 'Show Annotations': +CVSPropertiesPage_update=Change &Tag... +CVSPropertiesPage_virtualModule=<no corresponding remote folder> + + +CVSRemoteFilePropertySource_name=Name +CVSRemoteFilePropertySource_revision=Revision +CVSRemoteFilePropertySource_date=Date +CVSRemoteFilePropertySource_author=Author +CVSRemoteFilePropertySource_comment=Comment +CVSRemoteFilePropertySource_tag=Tag + +CVSRemoteFolderPropertySource_name=Name +CVSRemoteFolderPropertySource_tag=Tag +CVSRemoteFolderPropertySource_none=(none) + +CVSRepositoryLocationPropertySource_default=Default +CVSRepositoryLocationPropertySource_host=Host +CVSRepositoryLocationPropertySource_user=User +CVSRepositoryLocationPropertySource_port=Port +CVSRepositoryLocationPropertySource_root=Root +CVSRepositoryLocationPropertySource_method=Connection Method + +CVSSyncCompareInput_confirmMergeMessageTitle=Information +CVSSyncCompareInput_confirmMergeMessage=Your changes have been saved. When you are finished, \ +select 'Mark as Merged' to make this file an outgoing change. +CVSSyncCompareInput_projectDeleted=Project ''{0}'' has been deleted locally and cannot be synchronized. +CVSSyncCompareInput_filteringOutgoingChanges=Accumulating resources with outgoing changes + +CVSSyncSet_conflicts={0} conflicts, +CVSSyncSet_incomings={0} incoming change(s), +CVSSyncSet_noConflicts=No conflicts, +CVSSyncSet_noIncomings=no incoming changes, +CVSSyncSet_noOutgoings=no outgoing changes, +CVSSyncSet_outgoings={0} outgoing change(s), +CVSSyncSet_noNew=no new resources. +CVSParticipant_0=Remote File ({0} - {1}) +CVSParticipant_1=Common Ancestor ({0} - {1}) +CVSParticipant_2=C&VS +CVSSyncSet_new={0} new resource(s). + +CVSUIPlugin_refreshTitle=Refresh Resource? +CVSUIPlugin_refreshQuestion={0} Would you like to refresh resource ''{1}''? +CVSUIPlugin_refreshMultipleQuestion={0} Would you like to refresh the selected resources? + +CVSAction_disabledTitle=Information +CVSAction_disabledMessage=The chosen operation is not enabled. +CVSAction_refreshTitle=Refresh Project? +CVSAction_refreshQuestion={0} Would you like to refresh project ''{1}''? +CVSAction_refreshMultipleQuestion={0} Would you like to refresh the projects of the selected resources? + +CommitAction_commitFailed=Problems encountered performing commit +CommitWizardCommitPage_0=Commit +CommitWizardCommitPage_2=Enter a comment for the commit operation. +CommitWizardCommitPage_3=Please enter a commit comment. +CommitWizardCommitPage_4=Conflicting changes cannot be commited. Either exclude them from the commit or use the synchronize view to resolve the conflicts. +CommitWizardCommitPage_1=There are {0} changes to be committed which exceeds the display threshold of {1}. +CommitWizardCommitPage_5=Show &Changes +CommitWizardFileTypePage_0=Add Resources +CommitWizardFileTypePage_2=Unknown new files detected. +CommitWizardFileTypePage_3=New files with the following unknown names or extensions have been detected in the workspace. Please specify whether these files should be stored as text or binary and whether this decision should be remembered. + +CommitSyncAction_questionRelease=You have changes that conflict with the server. Release those changes? +CommitSyncAction_titleRelease=Confirm Overwrite +CommitSyncAction_releaseAll=Release all changes, overriding any conflicting changes on the server. +CommitSyncAction_releasePart=Only release the changes that don't conflict with changes on the server. +CommitSyncAction_cancelRelease=Cancel the release operation. +CommitSyncAction_errorCommitting=An error occurred while committing changes. + +CompareWithRemoteAction_compare=Error Comparing with Latest +CompareWithRemoteAction_noRemote=No Remote Resource +CompareWithRemoteAction_noRemoteLong=The selected resource has no remote resource to compare with. +CompareWithRemoteAction_fetching=Comparing with latest from repository... + +CompareWithRevisionAction_compare=Error Comparing with Revision +CompareWithRevisionAction_noRevisions=No Revisions +CompareWithRevisionAction_noRevisionsLong=The selected resource has no revisions to compare with. +CompareWithRevisionAction_fetching=Fetching revisions from repository... + +CompareWithTagAction_message=Compare With Branch or Version +CompareWithTagAction_replace=Error Comparing With Branch or Version +CompareWithTagAction_noRemote=No Remote Resource +CompareWithTagAction_noRemoteLong=The selected tag has no remote resource to compare with. +CompareWithTagAction_fetching=Fetching resources with tag {0}... + +CompareEditorInput_fileProgress=Comparing CVS file: {0} + +ConfigurationWizardAutoconnectPage_description=Your project already has CVS/ directories. It was probably previously shared, or checked out using another tool. It will be automatically shared using the following information. +ConfigurationWizardAutoconnectPage_user=User: +ConfigurationWizardAutoconnectPage_host=Host: +ConfigurationWizardAutoconnectPage_port=Port: +ConfigurationWizardAutoconnectPage_default=Default +ConfigurationWizardAutoconnectPage_connectionType=Connection type: +ConfigurationWizardAutoconnectPage_repositoryPath=Repository path: +ConfigurationWizardAutoconnectPage_module=Module: +ConfigurationWizardAutoconnectPage_validate=&Validate Connection on Finish +ConfigurationWizardAutoconnectPage_noSyncInfo=Could not get folder information +ConfigurationWizardAutoconnectPage_noCVSDirectory=Could not find CVS/ directory + +RepositorySelectionPage_description=This wizard will help you to share your files with the CVS repository for the first time. Your project will automatically be imported into the CVS repository, and the Synchronize view will open to allow you to commit your resources. +RepositorySelectionPage_useExisting=&Use existing repository location: +RepositorySelectionPage_useNew=&Create a new repository location + +ConfigurationWizardMainPage_connection=&Connection type: +ConfigurationWizardMainPage_userName=&User: +ConfigurationWizardMainPage_password=&Password: +ConfigurationWizardMainPage_host=&Host: +ConfigurationWizardMainPage_0=Location already exists. +ConfigurationWizardMainPage_5=The host name must not start or end with a space +ConfigurationWizardMainPage_1=User Name Required +ConfigurationWizardMainPage_2=Host Required +ConfigurationWizardMainPage_3=Port Required +ConfigurationWizardMainPage_4=Repository Path Required +ConfigurationWizardMainPage_useDefaultPort=Use Default P&ort +ConfigurationWizardMainPage_usePort=Use Por&t: +ConfigurationWizardMainPage_repositoryPath=&Repository path: +ConfigurationWizardMainPage_invalidUserName=Invalid User Name +ConfigurationWizardMainPage_invalidHostName=Invalid Host Name +ConfigurationWizardMainPage_invalidPort=Invalid Port +ConfigurationWizardMainPage_invalidPathWithSpaces=The repository path cannot have segments with leading or trailing spaces +ConfigurationWizardMainPage_invalidPathWithSlashes=The repository path cannot contain a double slash (//) +ConfigurationWizardMainPage_useNTFormat=Use NT path names for specifying CVSNT repository paths (e.g. C:\\cvs\\root) + +Console_copy=Copy +Console_selectAll=Select All +Console_clearOutput=Clear Output +Console_resultServerError={0} {1} +Console_resultWarnings={0} {1} +Console_resultException=failed due to an internal error {0} +Console_resultAborted=operation canceled {0} +Console_resultOk=ok {0} +Console_resultTimeFormat='(took 'm:ss.SSS')' +Console_couldNotFormatTime=An error occurred formatting the output time for the CVS console. +Console_preExecutionDelimiter=*** +Console_postExecutionDelimiter=*** +Console_info=Info: {0} +Console_warning=Warning: {0} +Console_error=Error: {0} + +AddToBranchAction_enterTag=Enter Branch Tag +AddToBranchAction_enterTagLong=Enter the name of the branch: + +DiffAction_diff=Diff + +FixTypeAction_fix=Fix Types + +GenerateCVSDiff_title=Create Patch +GenerateCVSDiff_pageTitle=Run and save CVS diff results in a file +GenerateCVSDiff_pageDescription=The results of the CVS diff command can be used as an input file for the Apply Patch wizard. +GenerateCVSDiff_overwriteTitle=Confirm Overwrite +GenerateCVSDiff_overwriteMsg=A file with that name already exists. Overwrite? +GenerateCVSDiff_error=Error running the CVS diff command +GenerateCVSDiff_working=Running CVS diff... +GenerateCVSDiff_noDiffsFoundMsg=No differences found. +GenerateCVSDiff_noDiffsFoundTitle=CVS diff +GenerateCVSDiff_1=Read-only file +GenerateCVSDiff_2=The specified file is read-only and cannot be overwritten. +GenerateCVSDiff_3=Can't write directory +GenerateCVSDiff_4=You don't have permission to create a file in this directory. + +GetSyncAction_questionCatchup=You have local changes which you are about to overwrite. Should the conflicting changes be added? +GetSyncAction_titleCatchup=Catch up Over Conflicts? +GetSyncAction_catchupAll=Catch up to all incoming changes, overriding any conflicting local changes. +GetSyncAction_catchupPart=Only catch up to the changes that don't conflict with local changes. +GetSyncAction_cancelCatchup=Cancel the catch up operation. +UpdateSyncAction_errorUpdating=An error occurred while updating changes. + +HistoryFilterDialog_title = Filter Resource History +HistoryFilterDialog_showMatching = Show entries matching: +HistoryFilterDialog_matchingAny = a&ny of the provided criteria +HistoryFilterDialog_matchingAll = a&ll of the provided criteria +HistoryFilterDialog_author = &Author: +HistoryFilterDialog_comment = &Comment containing: +HistoryFilterDialog_fromDate = &From date (M/D/Y) : +HistoryFilterDialog_toDate = &To date (M/D/Y) : + +HistoryView_getAnnotateAction=Show &Annotation +HistoryView_getContentsAction=&Get Contents +HistoryView_getRevisionAction=Get Sticky &Revision +HistoryView_tagWithExistingAction=&Tag with Existing... +HistoryView_copy=&Copy +HistoryView_revision=Revision +HistoryView_tags=Tags +HistoryView_date=Date +HistoryView_author=Author +HistoryView_comment=Comment +HistoryView_refreshLabel=&Refresh View +HistoryView_refresh=Refresh View +HistoryView_linkWithLabel=Link with Editor +HistoryView_selectAll=Select &All +HistoryView_showComment=Show Comment Viewer +HistoryView_showTags=Show Tag Viewer +HistoryView_title=CVS Resource History +HistoryView_titleWithArgument=CVS Resource History ({0}) +HistoryView_overwriteTitle=Overwrite local changes? +HistoryView_overwriteMsg=You have local changes. Do you want to overwrite them? +HistoryView_fetchHistoryJob=Fetching CVS revision history +HistoryView_fetchHistoryJobFile=Fetching CVS revision history for: {0} +HistoryView_errorFetchingEntries=Error fetching entries for {0} + +IgnoreAction_ignore=Error Ignoring Resource + +MergeAction_saveChangesTitle=Save Changes +MergeAction_saveChanges=You have unsaved changes that will be saved before the action is performed. + +MergeEditorInput_title=Merge {0} with {1} + +MergeWizard_title=Merge +MergeWizard_0=Select the merge points +MergeWizard_1=Specify the branch or version to be merged and the common base version. +MergeWizardPage_0=Preview the merge in the &synchronize view +MergeWizardPage_1=Perform the merge into the &local workspace +MergeWizardPage_2=&Branch or version to be merged (end tag): +MergeWizardPage_3=Br&owse... +MergeWizardPage_4=Choose End Tag +MergeWizardPage_5=&Select end tag +MergeWizardPage_6=Common base &version (start tag): +MergeWizardPage_7=Bro&wse... +MergeWizardPage_8=Choose Start Tag +MergeWizardPage_9=&Select start tag +MergeWizardPage_10=The specified end tag is not known to exist. Either enter a different tag or refresh the known tags. +MergeWizardPage_11=The specified start tag is not known to exist. Either enter a different tag or refresh the known tags. +MergeWizardPage_12=The start and end tags cannot be the same. +MergeWizardPage_13=A start tag is required for previewing a merge in the synchronize view. +MergeWizard_preparing=Preparing merge wizard +MergeWizard_preparingStart=Fetching tags for start page +MergeWizard_preparingEnd=Fetching tags for end page +MergeWizardEndPage_branches=Branches + +ModuleSelectionPage_moduleIsProject=Use &project name as module name +ModuleSelectionPage_specifyModule=Use &specified module name: + +MoveTagAction_errorMessage=Error Tagging +ModeWizardSelectionPage_10=Propo&se +ModeWizardSelectionPage_11=Automatically propose a new mode for the file based\non its name and extension. This can be configured on the\nTeam > File Content preference page. +ModeWizardSelectionPage_12=S&elect All +ModeWizardSelectionPage_13=Select &None +ModeWizardSelectionPage_14=Only sho&w those files +ModeWizardSelectionPage_15=C&lear +ModeWizardSelectionPage_17={0} files will be changed +ModeWizardSelectionPage_18=SelectionPage +ModeWizardSelectionPage_19=ASCII/Binary Property +ModeWizardSelectionPage_20=Configure the way CVS transfers your files. +ModeWizardSelectionPage_21=Fil&ter files by name (? = any character, * = any string) +ModeWizardSelectionPage_22=C&hange the ASCII/Binary property for the selected files +ModeWizardSelectionPage_23=For information about the different CVS ASCII/Binary modes refer to your CVS documentation. +ModeWizardSelectionPage_24=Enter a c&ommit comment +ModeWizardSelectionPage_25={0} files selected + +MoveTagAction_title=Tag with Existing Tag +MoveTagAction_message=&Select the tag to be moved + +NewLocationWizard_title=Add CVS Repository +NewLocationWizard_heading=Add a new CVS Repository +NewLocationWizard_description=Add a new CVS Repository to the CVS Repositories view +NewLocationWizard_validationFailedText=Error validating location: "{0}"\n\nKeep location anyway? +NewLocationWizard_validationFailedTitle=Unable to Validate +NewLocationWizard_exception=Unable to create repository location + +OpenLogEntryAction_deletedTitle=Resource is Deleted +OpenLogEntryAction_deleted=The selected revision represents a deletion. It cannot be opened. + +ReleaseCommentDialog_title=Commit +ReleaseCommentDialog_choosePrevious=Choose a &previously entered comment: +ReleaseCommentDialog_enterComment=Edit the commit &comment: +ReleaseCommentDialog_unaddedResources=Checked resources will be &added to CVS version control. +ReleaseCommentDialog_selectAll=&Select All +ReleaseCommentDialog_deselectAll=D&eselect All +ReleaseCommentDialog_clearTextArea=&Reset Comment + +RemoteFolderElement_nameAndTag={0} {1} +RemoteFolderElement_fetchingRemoteChildren=Fetching remote CVS children for ''{0}''... + +RemoveRootAction_removeRoot=Error Discarding Location + +ReplaceWithTagAction_message=Replace with Branch or Version +ReplaceWithTagAction_replace=Error Replacing With Tag +ReplaceWithTagAction_replacing=Replacing with tag {0} +ReplaceWithTagAction_mixingTags=You are mixing tags within a project. This may cause confusion \ +when synchronizing with the repository. Synchronize uses the tag information associated with \ +each resource to determine the remote resource with which the local resource is compared. \ +For example, with version tags, the state of the tagged resources never change so you will \ +not see changes made to the resources in HEAD (or other branches). Do you wish to continue? + +ReplaceWithRemoteAction_replacing=Replacing +ReplaceWithRemoteAction_problemMessage=Error Replacing With Latest From Repository + +ReplaceWithAction_confirmOverwrite=Confirm Overwrite +ReplaceWithAction_localChanges={0} has local changes which you are about to overwrite. Do you wish to overwrite? +ReplaceWithAction_calculatingDirtyResources=Finding outgoing changes... + +ReplaceWithLatestAction_multipleTags=La&test from Repository +ReplaceWithLatestAction_multipleVersions=&Versions from Repository +ReplaceWithLatestAction_multipleBranches=La&test from Branches +ReplaceWithLatestAction_singleVersion=&Version {0} +ReplaceWithLatestAction_singleBranch=La&test from Branch {0} +ReplaceWithLatestAction_singleHEAD=La&test from {0} + +RepositoryDialog_getRepository=Select a repository +RepositoryDialog_description=Select a repository to connect your project to + +RepositoryManager_getting=Getting +RepositoryManager_committing=Committing +RepositoryManager_updating=Updating +RepositoryManager_deleting=Deleting +RepositoryManager_adding=Adding +RepositoryManager_rename=An IO Exception occurred while renaming the state file +RepositoryManager_save=An IO Exception occurred while saving the state file +RepositoryManager_ioException=An IO Exception occurred while reading the state file +RepositoryManager_parsingProblem=An error occurred parsing file ''{0}''. +RepositoryManager_fetchingRemoteFolders=Fetching remote CVS folders for ''{0}''... + +RepositoriesView_refresh=&Refresh View +RepositoriesView_refreshTooltip=Refresh View +RepositoriesView_new=&Repository Location... +RepositoriesView_newSubmenu=&New +RepositoriesView_newAnonCVS=&Anonymous Repository Location to dev.eclipse.org... +RepositoriesView_newWorkingSet=Select Working Set... +RepositoriesView_deselectWorkingSet=Deselect Working Set +RepositoriesView_editWorkingSet=Edit Active Working Set... +RepositoriesView_workingSetMenuItem={0} {1} +RepositoriesView_collapseAll=Collapse All +RepositoriesView_collapseAllTooltip=Collapse All +RepositoriesView_NItemsSelected={0} items selected +RepositoriesView_OneItemSelected=1 item selected +RepositoriesView_ResourceInRepository={0} in {1} +RepositoriesView_CannotGetRevision=Cannot get revision +RemoteViewPart_workingSetToolTip=Working Set: {0} + +ResourcePropertiesPage_status=Status +ResourcePropertiesPage_notManaged=Not managed by CVS +ResourcePropertiesPage_versioned=versioned +ResourcePropertiesPage_notVersioned=not versioned +ResourcePropertiesPage_state=State +ResourcePropertiesPage_checkedOut=Checked Out +ResourcePropertiesPage_checkedIn=Checked In #ResourcePropertiesPage.baseRevision=Base Revision #ResourcePropertiesPage.none=none -ResourcePropertiesPage.error=Error - -KSubstWizard.title=Set Keyword Substitution -KSubstWizard.working=Setting keyword substitution mode... -KSubstWizard.problemsMessage=Problems encountered setting keyword substitution -KSubstWizard.errorTitle=Errors Occurred -KSubstWizard.warningTitle=Warnings occurred - -KSubstWizardSharedFilesPage.pageTitle=Include versioned files -KSubstWizardSharedFilesPage.pageDescription=\ - Choose to include or exclude files that are already in the repository -KSubstWizardSharedFilesPage.contents=\ - Since the keyword substitution mode attribute is not version controlled, the \ - change will be reflected immediately on all branches and in all revisions of \ - any affected files that are already shared in the repository. You should inform \ - all developers that they must delete and check out fresh copies of project containing the affected \ - files before committing new changes to the repository. You may also experience \ - side-effects working with earlier revisions of these files. -KSubstWizardSharedFilesPage.includeSharedFiles=&Include files that are already shared in the repository. -KSubstWizardSharedFilesPage.sharedFilesViewer.title=&The following files were selected and are already shared in the repository: - -KSubstWizardDirtyFilesPage.pageTitle=Include files with outgoing changes -KSubstWizardDirtyFilesPage.pageDescription=\ - Choose to include or exclude files with outgoing changes -KSubstWizardDirtyFilesPage.contents=\ - This operation may commit changes to files without first providing a chance to resolve \ - conflicts. -KSubstWizardDirtyFilesPage.includeDirtyFiles=&Include files that have outgoing changes. -KSubstWizardDirtyFilesPage.dirtyFilesViewer.title=&The following files were selected and have outgoing changes. - -KSubstWizardSelectionPage.pageTitle=Select Keyword Substitution Mode -KSubstWizardSelectionPage.pageDescription=\ - Choose the desired keyword substitution mode for the selected files. -KSubstWizardSelectionPage.automaticButton=&Automatic -KSubstWizardSelectionPage.automaticLabel=\ - Automatically chooses ''{0}'' or ''{1}'' \ - for each file according to the Team file extension preferences. -KSubstWizardSelectionPage.binaryButton=&Binary (-kb) -KSubstWizardSelectionPage.binaryLabel=\ - Binary files are stored in the repository without alteration.\n\ - CVS does not directly support conflict resolution for binary files. -KSubstWizardSelectionPage.textButton=A&SCII without keyword substitution (-ko) -KSubstWizardSelectionPage.textLabel=\ - End of lines are replaced with the appropriate convention for the client system.\n\ - CVS supports conflict resolution and differencing of ASCII files with single line granularity. -KSubstWizardSelectionPage.textWithSubstitutionsButton=ASCII with &keyword substitution -KSubstWizardSelectionPage.textWithSubstitutionsLabel=\ - End of lines are replaced with the appropriate convention for the client system.\n\ - ASCII files may contain keywords that are expanded by the CVS server during file transfers.\n\ - Please consult the CVS documentation for a description of the various supported keywords and modes. - -KSubstWizardCommitCommentPage.pageTitle=Enter Commit Comment -KSubstWizardCommitCommentPage.pageDescription=\ - Enter the commit comment to be used for the selected files when they are committed. - -KSubstWizardSummaryPage.pageTitle=Summary -KSubstWizardSummaryPage.pageDescription=\ - Summary of keyword substitution changes to be performed. -KSubstWizardSummaryPage.contents=\ - Click on \'Finish\' to change the keyword substitution mode of the checked files indicated below.\n\ - You can change the mode on a per file basis by clicking in the corresponding cell.\n\ - Note: Files that are not checked, or that already have the indicated mode will not be affected in any way. -KSubstWizardSummaryPage.showUnaffectedFiles=&Show files that already have the requested keyword substitution mode. -KSubstWizardSummaryPage.summaryViewer.title=&The following checked files will have their keyword substitution mode changed to the indicated value. -KSubstWizardSummaryPage.summaryViewer.fileHeader=File Location -KSubstWizardSummaryPage.summaryViewer.ksubstHeader=Keyword Substitution Mode - -SetKeywordSubstitutionAction.label=Cha&nge ASCII/Binary Property... -SetKeywordSubstitutionAction.tooltip=Change whether the selected resources should be treated as ASCII or binary on the CVS Server - -SharingWizard.autoConnectTitle=Connect Project to Repository -SharingWizard.autoConnectOneOTitle=Connect Project from Eclipse 1.0 to Repository -SharingWizard.autoConnectTitleDescription=Project is already configured with CVS repository information. -SharingWizard.couldNotImport=Remote Project Exists -SharingWizard.couldNotImportLong=Module ''{0}'' already exists remotely. Would you like to synchronize your local project with the existing remote module? -SharingWizard.selectTagTitle=Select Tag -SharingWizard.selectTag=&Select the tag to synchronize with: -SharingWizard.description=Configure a Project to Use CVS -SharingWizard.importTitle=Share Project with CVS Repository -SharingWizard.importTitleDescription=Select an existing repository location or create a new location. -SharingWizard.title=Share Project -SharingWizard.heading=Configure a Project to Use CVS -SharingWizard.enterInformation=Enter Repository Location Information -SharingWizard.enterInformationDescription=Define the location and protocol required to connect with an existing CVS repository. -SharingWizard.enterModuleName=Enter Module Name -SharingWizard.enterModuleNameDescription=Select the name of the module in the CVS repository. -SharingWizard.validationFailedText={0}. Set project sharing anyway? -SharingWizard.validationFailedTitle=Unable to Validate - -SharingWizardFinishPage.message=The wizard has all the information necessary to share your project with the CVS repository. When you click \"Finish\", the wizard will import your project into the repository and open the Synchronize view to allow you to commit your resources. - -ShowHistoryAction.showHistory=Error occurred performing Show History -ShowHistoryAction.noHistory=No History Available -ShowHistoryAction.noHistoryLong=No resource history available for selected resources. - -SyncAction.sync=Synchronize -SyncAction.workingSetName=Latest CVS Synchronize -SyncAction.noChangesTitle=No Changes -SyncAction.noChangesMessage=There are no changes between the workspace resource and the remote. - -TagAction.tagErrorTitle=Tagging Error -TagAction.tagWarningTitle=Tagging Warning -TagAction.tagProblemsMessage=Problems reported tagging the resource. -TagAction.tagProblemsMessageMultiple=Problems tagging the resources. {0} project(s) successfully tagged and {1} project(s) with errors. -TagAction.tagResources=Tag Resources -TagRefreshButtonArea.0=No Tags Found -TagRefreshButtonArea.1=Perform &Deep Search -TagRefreshButtonArea.2=Confi&gure Manually -TagRefreshButtonArea.3=&Cancel -TagRefreshButtonArea.4=Tags were not found for {0} using the auto-refresh files and a shallow cvs log operation. You can choose to search using a deep cvs log operation, to manually configure the tags or to cancel. -TagRefreshButtonArea.5=Refreshing tags -TagRefreshButtonArea.6=Refreshing tags... -TagRefreshButtonArea.7=No tags could be found. -TagRefreshButtonArea.8= -TagAction.enterTag=&Please enter a version tag: -TagAction.moveTag=&Move tag if it already exists -TagRootElement.0=Dates -TagLocalAction.0=There are uncommitted changes in ''{0}'' that will not be tagged. Should ''{0}'' be tagged? -TagLocalAction.1=The following contain &uncommitted changes that will not be versioned. Check those that should be included in the tag operation. -TagLocalAction.2=There are uncommitted changes in ''{0}'' that will not be tagged. Should the tag operation proceed? -TagLocalAction.4=Tag with Uncommitted Changes -TagAction.moveTagConfirmTitle=Confirm Move Existing Tag -TagAction.moveTagConfirmMessage=If the tag {0} is already used in this project, it will be moved to the selected revisions. Are you sure you want to perform the tag operation? -TagAction.uncommittedChangesTitle=Confirm Uncommitted Changes -TagAction.uncommittedChanges=You are tagging ''{0}'' that has uncommitted changes. These changes are not in the repository and will not be included in the version you are creating. Do you still want to tag this resource? -TagAction.tagAlreadyExists=Version tag already exists. -TagAction.existingVersions=Existing Versions - -TagInRepositoryAction.tagProblemsMessage=Problems reported tagging the resource. -TagInRepositoryAction.tagProblemsMessageMultiple=Problems tagging the resources. {0} resource(s) successfully tagged and {1} resource(s) with errors. - -UpdateAction.update=Problems encountered performing update -UpdateAction.updating=Updating... -UpdateAction.promptForUpdateSeveral=Are you sure you want to update {0} resources? -UpdateAction.promptForUpdateOne=Are you sure you want to update {0} resource? -UpdateAction.promptForUpdateTitle=Confirm Update - -UpdateWizard.title=Update -UpdateWizard.0=Select Tag -UpdateWizard.1=Select the tag for the update -UpdateWizard.updatePage=Update Options -UpdateWizardPage.description=Select other options for the update - -UserValidationDialog.required=Password Required -UserValidationDialog.labelUser={0} -UserValidationDialog.labelPassword={1} -UserValidationDialog.password=&Password: -UserValidationDialog.user=&User name: - -KeyboradInteractiveDialog.message=Keyboard Interactive authentication for {0} -KeyboardInteractiveDialog.labelRepository=Enter values for the following repository: {0} - -VersionsElement.versions=Versions - -WorkbenchUserAuthenticator.cancelled=Operation cancelled because login cancelled -WorkbenchUserAuthenticator.0=An attempt to prompt for user authentication information has failed. -WorkbenchUserAuthenticator.1=Host Key Change -WorkbenchUserAuthenticator.2=The host key for {0} has changed. It is possible that this was intentional but there is also a chance that you are the target of an attack of some kind. If you know that the host key has changed, click OK and existing host key will be purged. Otherwise, click Cancel and consult with your system administrator -WorkbenchUserAuthenticator.errorFlushing=Error occurred while flushing password for {0} -WorkbenchUserAuthenticator.errorSaving=Error occurred while saving password for {0} - -Unmanage.unmanaging=Disconnecting from CVS... -Unmanage.unmanage=Disconnect from CVS -Unmanage.title=Confirm Disconnect from CVS -Unmanage.titleN=Confirm Multiple Project Disconnect from CVS -Unmanage.message=Are you sure you want to disconnect CVS from ''{0}''? -Unmanage.messageN=Are you sure you want to disconnect CVS from these {0} projects? -Unmanage.option1=Do not delete the CVS meta information (e.g. CVS sub-directories). -Unmanage.option2=Also delete the CVS meta information from the file system. -Unmanage.unmanagingError=Errors occurred while disconnecting - -Unmanage.message=Are you sure you want to disconnect CVS from ''{0}''? -Unmanage.messageN=Are you sure you want to disconnect CVS from these {0} projects? +ResourcePropertiesPage_error=Error + +KSubstWizard_title=Set Keyword Substitution +KSubstWizard_working=Setting keyword substitution mode... +KSubstWizard_problemsMessage=Problems encountered setting keyword substitution +KSubstWizard_errorTitle=Errors Occurred +KSubstWizard_warningTitle=Warnings occurred + +KSubstWizardSharedFilesPage_pageTitle=Include versioned files +KSubstWizardSharedFilesPage_pageDescription=\ +Choose to include or exclude files that are already in the repository +KSubstWizardSharedFilesPage_contents=\ +Since the keyword substitution mode attribute is not version controlled, the \ +change will be reflected immediately on all branches and in all revisions of \ +any affected files that are already shared in the repository. You should inform \ +all developers that they must delete and check out fresh copies of project containing the affected \ +files before committing new changes to the repository. You may also experience \ +side-effects working with earlier revisions of these files. +KSubstWizardSharedFilesPage_includeSharedFiles=&Include files that are already shared in the repository. +KSubstWizardSharedFilesPage_sharedFilesViewer_title=&The following files were selected and are already shared in the repository: + +KSubstWizardDirtyFilesPage_pageTitle=Include files with outgoing changes +KSubstWizardDirtyFilesPage_pageDescription=\ +Choose to include or exclude files with outgoing changes +KSubstWizardDirtyFilesPage_contents=\ +This operation may commit changes to files without first providing a chance to resolve \ +conflicts. +KSubstWizardDirtyFilesPage_includeDirtyFiles=&Include files that have outgoing changes. +KSubstWizardDirtyFilesPage_dirtyFilesViewer_title=&The following files were selected and have outgoing changes. + +KSubstWizardSelectionPage_pageTitle=Select Keyword Substitution Mode +KSubstWizardSelectionPage_pageDescription=\ +Choose the desired keyword substitution mode for the selected files. +KSubstWizardSelectionPage_automaticButton=&Automatic +KSubstWizardSelectionPage_automaticLabel=\ +Automatically chooses ''{0}'' or ''{1}'' \ +for each file according to the Team file extension preferences. +KSubstWizardSelectionPage_binaryButton=&Binary (-kb) +KSubstWizardSelectionPage_binaryLabel=\ +Binary files are stored in the repository without alteration.\n\ +CVS does not directly support conflict resolution for binary files. +KSubstWizardSelectionPage_textButton=A&SCII without keyword substitution (-ko) +KSubstWizardSelectionPage_textLabel=\ +End of lines are replaced with the appropriate convention for the client system.\n\ +CVS supports conflict resolution and differencing of ASCII files with single line granularity. +KSubstWizardSelectionPage_textWithSubstitutionsButton=ASCII with &keyword substitution +KSubstWizardSelectionPage_textWithSubstitutionsLabel=\ +End of lines are replaced with the appropriate convention for the client system.\n\ +ASCII files may contain keywords that are expanded by the CVS server during file transfers.\n\ +Please consult the CVS documentation for a description of the various supported keywords and modes. + +KSubstWizardCommitCommentPage_pageTitle=Enter Commit Comment +KSubstWizardCommitCommentPage_pageDescription=\ +Enter the commit comment to be used for the selected files when they are committed. + +KSubstWizardSummaryPage_pageTitle=Summary +KSubstWizardSummaryPage_pageDescription=\ +Summary of keyword substitution changes to be performed. +KSubstWizardSummaryPage_contents=\ +Click on \'Finish\' to change the keyword substitution mode of the checked files indicated below.\n\ +You can change the mode on a per file basis by clicking in the corresponding cell.\n\ +Note: Files that are not checked, or that already have the indicated mode will not be affected in any way. +KSubstWizardSummaryPage_showUnaffectedFiles=&Show files that already have the requested keyword substitution mode. +KSubstWizardSummaryPage_summaryViewer_title=&The following checked files will have their keyword substitution mode changed to the indicated value. +KSubstWizardSummaryPage_summaryViewer_fileHeader=File Location +KSubstWizardSummaryPage_summaryViewer_ksubstHeader=Keyword Substitution Mode + +SetKeywordSubstitutionAction_label=Cha&nge ASCII/Binary Property... +SetKeywordSubstitutionAction_tooltip=Change whether the selected resources should be treated as ASCII or binary on the CVS Server + +SharingWizard_autoConnectTitle=Connect Project to Repository +SharingWizard_autoConnectOneOTitle=Connect Project from Eclipse 1.0 to Repository +SharingWizard_autoConnectTitleDescription=Project is already configured with CVS repository information. +SharingWizard_couldNotImport=Remote Project Exists +SharingWizard_couldNotImportLong=Module ''{0}'' already exists remotely. Would you like to synchronize your local project with the existing remote module? +SharingWizard_selectTagTitle=Select Tag +SharingWizard_selectTag=&Select the tag to synchronize with: +SharingWizard_description=Configure a Project to Use CVS +SharingWizard_importTitle=Share Project with CVS Repository +SharingWizard_importTitleDescription=Select an existing repository location or create a new location. +SharingWizard_title=Share Project +SharingWizard_heading=Configure a Project to Use CVS +SharingWizard_enterInformation=Enter Repository Location Information +SharingWizard_enterInformationDescription=Define the location and protocol required to connect with an existing CVS repository. +SharingWizard_enterModuleName=Enter Module Name +SharingWizard_enterModuleNameDescription=Select the name of the module in the CVS repository. +SharingWizard_validationFailedText={0}. Set project sharing anyway? +SharingWizard_validationFailedTitle=Unable to Validate + +SharingWizardFinishPage_message=The wizard has all the information necessary to share your project with the CVS repository. When you click \"Finish\", the wizard will import your project into the repository and open the Synchronize view to allow you to commit your resources. + +ShowHistoryAction_showHistory=Error occurred performing Show History +ShowHistoryAction_noHistory=No History Available +ShowHistoryAction_noHistoryLong=No resource history available for selected resources. + +SyncAction_sync=Synchronize +SyncAction_workingSetName=Latest CVS Synchronize +SyncAction_noChangesTitle=No Changes +SyncAction_noChangesMessage=There are no changes between the workspace resource and the remote. + +TagAction_tagErrorTitle=Tagging Error +TagAction_tagWarningTitle=Tagging Warning +TagAction_tagProblemsMessage=Problems reported tagging the resource. +TagAction_tagProblemsMessageMultiple=Problems tagging the resources. {0} project(s) successfully tagged and {1} project(s) with errors. +TagAction_tagResources=Tag Resources +TagRefreshButtonArea_0=No Tags Found +TagRefreshButtonArea_1=Perform &Deep Search +TagRefreshButtonArea_2=Confi&gure Manually +TagRefreshButtonArea_3=&Cancel +TagRefreshButtonArea_4=Tags were not found for {0} using the auto-refresh files and a shallow cvs log operation. You can choose to search using a deep cvs log operation, to manually configure the tags or to cancel. +TagRefreshButtonArea_5=Refreshing tags +TagRefreshButtonArea_6=Refreshing tags... +TagRefreshButtonArea_7=No tags could be found. +TagRefreshButtonArea_8= +TagAction_enterTag=&Please enter a version tag: +TagAction_moveTag=&Move tag if it already exists +TagRootElement_0=Dates +TagLocalAction_0=There are uncommitted changes in ''{0}'' that will not be tagged. Should ''{0}'' be tagged? +TagLocalAction_1=The following contain &uncommitted changes that will not be versioned. Check those that should be included in the tag operation. +TagLocalAction_2=There are uncommitted changes in ''{0}'' that will not be tagged. Should the tag operation proceed? +TagLocalAction_4=Tag with Uncommitted Changes +TagAction_moveTagConfirmTitle=Confirm Move Existing Tag +TagAction_moveTagConfirmMessage=If the tag {0} is already used in this project, it will be moved to the selected revisions. Are you sure you want to perform the tag operation? +TagAction_uncommittedChangesTitle=Confirm Uncommitted Changes +TagAction_uncommittedChanges=You are tagging ''{0}'' that has uncommitted changes. These changes are not in the repository and will not be included in the version you are creating. Do you still want to tag this resource? +TagAction_tagAlreadyExists=Version tag already exists. +TagAction_existingVersions=Existing Versions + +TagInRepositoryAction_tagProblemsMessage=Problems reported tagging the resource. +TagInRepositoryAction_tagProblemsMessageMultiple=Problems tagging the resources. {0} resource(s) successfully tagged and {1} resource(s) with errors. + +UpdateAction_update=Problems encountered performing update +UpdateAction_updating=Updating... +UpdateAction_promptForUpdateSeveral=Are you sure you want to update {0} resources? +UpdateAction_promptForUpdateOne=Are you sure you want to update {0} resource? +UpdateAction_promptForUpdateTitle=Confirm Update + +UpdateWizard_title=Update +UpdateWizard_0=Select Tag +UpdateWizard_1=Select the tag for the update +UpdateWizard_updatePage=Update Options +UpdateWizardPage_description=Select other options for the update + +UserValidationDialog_required=Password Required +UserValidationDialog_labelUser={0} +UserValidationDialog_labelPassword={1} +UserValidationDialog_password=&Password: +UserValidationDialog_user=&User name: + +KeyboradInteractiveDialog_message=Keyboard Interactive authentication for {0} +KeyboardInteractiveDialog_labelRepository=Enter values for the following repository: {0} + +VersionsElement_versions=Versions + +WorkbenchUserAuthenticator_cancelled=Operation cancelled because login cancelled +WorkbenchUserAuthenticator_0=An attempt to prompt for user authentication information has failed. +WorkbenchUserAuthenticator_1=Host Key Change +WorkbenchUserAuthenticator_2=The host key for {0} has changed. It is possible that this was intentional but there is also a chance that you are the target of an attack of some kind. If you know that the host key has changed, click OK and existing host key will be purged. Otherwise, click Cancel and consult with your system administrator +WorkbenchUserAuthenticator_errorFlushing=Error occurred while flushing password for {0} +WorkbenchUserAuthenticator_errorSaving=Error occurred while saving password for {0} + +Unmanage_unmanaging=Disconnecting from CVS... +Unmanage_unmanage=Disconnect from CVS +Unmanage_title=Confirm Disconnect from CVS +Unmanage_titleN=Confirm Multiple Project Disconnect from CVS +Unmanage_option1=Do not delete the CVS meta information (e.g. CVS sub-directories). +Unmanage_option2=Also delete the CVS meta information from the file system. +Unmanage_unmanagingError=Errors occurred while disconnecting + +Unmanage_message=Are you sure you want to disconnect CVS from ''{0}''? +Unmanage_messageN=Are you sure you want to disconnect CVS from these {0} projects? Save_To_Clipboard_2=&Save to clipboard Save_In_File_System_3=Sa&ve in file system -Browse..._4=Br&owse... +Browse____4=Br&owse... Save_Patch_As_5=Save Patch As -patch.txt_6=patch.txt +patch_txt_6=patch.txt Save_In_Workspace_7=Save in &workspace Select_a_folder_then_type_in_the_file_name__8=Select a fol&der then type in the file name: -Fi&le_name__9=Fi&le name: -Do_not_recurse_into_sub-folders_10=&Recurse into sub-folders +Fi_le_name__9=Fi&le name: +Do_not_recurse_into_sub_folders_10=&Recurse into sub-folders Do_not_include_new_files_in_patch_11=&Include new files in patch Diff_output_format_12=Diff output format -Unified_(format_required_by_Compare_With_Patch_feature)_13=&Unified (format required by the Apply Patch wizard) +Unified__format_required_by_Compare_With_Patch_feature__13=&Unified (format required by the Apply Patch wizard) Context_14=&Context Standard_15=&Standard Advanced_options_19=Advanced options @@ -803,38 +801,38 @@ Run_update_4=Run update Do_nothing_5=Do nothing Validate_Connection_on_Finish_7=Validate Location on Finish -TagSelectionDialog.Select_a_Tag_1=&Select a branch or version -TagSelectionDialog.recurseOption=Recurse into sub-&folders -TagSelectionDialog.0=&Add Date... -TagSelectionDialog.1=&Remove -TagSelectionDialog.2=No Tags Found -TagSelectionDialog.3=Perform Deep Search -TagSelectionDialog.4=Configure Manually -TagSelectionDialog.5=Cancel -TagSelectionDialog.6=Tags were not found for {0} using the auto-refresh files and a shallow cvs log operation. You can choose to search using a deep cvs log operation, to manually configure the tags or to cancel. -TagSelectionDialog.7=Refreshing tags -TagSelectionDialog.8=Error refreshing tags - -TagSelectionArea.0=&Matching tags: -TagSelectionArea.1={0}: -TagSelectionArea.2={0} (? = any character, * = any String): -TagSelectionArea.3=Select a &tag -TagSelectionWizardPage.0=&Use the tag currently associated with the workspace resources -TagSelectionWizardPage.1=&Select the tag from the following list - -UpdateSyncAction.Conflicting_changes_found_1=Conflicting changes found -UpdateSyncAction.You_have_local_changes_you_are_about_to_overwrite_2=You have local changes you are about to overwrite -UpdateSyncAction.Only_update_resources_that_can_be_automatically_merged_3=Only update resources that can be automatically merged -UpdateSyncAction.Update_all_resources,_overwriting_local_changes_with_remote_contents_4=Update all resources, overwriting local changes with remote contents -UpdateSyncAction.Overwrite_local_changes__5=Overwrite local changes? -UpdateSyncAction.You_have_local_changes_you_are_about_to_overwrite._Do_you_wish_to_continue__6=You have local changes you are about to overwrite. Do you wish to continue? +TagSelectionDialog_Select_a_Tag_1=&Select a branch or version +TagSelectionDialog_recurseOption=Recurse into sub-&folders +TagSelectionDialog_0=&Add Date... +TagSelectionDialog_1=&Remove +TagSelectionDialog_2=No Tags Found +TagSelectionDialog_3=Perform Deep Search +TagSelectionDialog_4=Configure Manually +TagSelectionDialog_5=Cancel +TagSelectionDialog_6=Tags were not found for {0} using the auto-refresh files and a shallow cvs log operation. You can choose to search using a deep cvs log operation, to manually configure the tags or to cancel. +TagSelectionDialog_7=Refreshing tags +TagSelectionDialog_8=Error refreshing tags + +TagSelectionArea_0=&Matching tags: +TagSelectionArea_1={0}: +TagSelectionArea_2={0} (? = any character, * = any String): +TagSelectionArea_3=Select a &tag +TagSelectionWizardPage_0=&Use the tag currently associated with the workspace resources +TagSelectionWizardPage_1=&Select the tag from the following list + +UpdateSyncAction_Conflicting_changes_found_1=Conflicting changes found +UpdateSyncAction_You_have_local_changes_you_are_about_to_overwrite_2=You have local changes you are about to overwrite +UpdateSyncAction_Only_update_resources_that_can_be_automatically_merged_3=Only update resources that can be automatically merged +UpdateSyncAction_Update_all_resources__overwriting_local_changes_with_remote_contents_4=Update all resources, overwriting local changes with remote contents +UpdateSyncAction_Overwrite_local_changes__5=Overwrite local changes? +UpdateSyncAction_You_have_local_changes_you_are_about_to_overwrite__Do_you_wish_to_continue__6=You have local changes you are about to overwrite. Do you wish to continue? ExtMethodPreferencePage_message=These variables define the external connection program to use with the \'ext\' connection method. These values should be the same as the \'ext\' CVS command-line environment variable settings. ExtMethodPreferencePage_CVS_RSH=CVS_&RSH: ExtMethodPreferencePage_Browse=&Browse... -ExtMethodPreferencePage.0=Use an &external program to connect -ExtMethodPreferencePage.2=Choosing to use another connection method allows the meta information in CVS projects to be compatible with external CVS tools while using a custom connection method. -ExtMethodPreferencePage.1=Use another &connection method type to connect +ExtMethodPreferencePage_0=Use an &external program to connect +ExtMethodPreferencePage_2=Choosing to use another connection method allows the meta information in CVS projects to be compatible with external CVS tools while using a custom connection method. +ExtMethodPreferencePage_1=Use another &connection method type to connect ExtMethodPreferencePage_Details=Select a program or script ExtMethodPreferencePage_CVS_RSH_Parameters=&Parameters: ExtMethodPreferencePage_Add_Variable=&Add Variable... @@ -842,573 +840,559 @@ ExtMethodPreferencePage_CVS_SERVER__7=CVS_&SERVER: UpdateMergeActionProblems_merging_remote_resources_into_workspace_1=Problems merging remote resources into workspace UpdateMergeActionProblems_merging_remote_resources_into_workspace_2=Problems merging remote resources into workspace -TagConfigurationDialog.1=Configure Branches and Versions for {0} -TagConfigurationDialog.4=Configure tags you will see in the workbench. -TagConfigurationDialog.5=&Browse files for tags: -TagConfigurationDialog.6=&New tags found in the selected files: -TagConfigurationDialog.7=Remembered &tags for these projects: -TagConfigurationDialog.8=&Add Checked Tags -TagConfigurationDialog.9=&Remove -TagConfigurationDialog.0=Add &Date... -TagConfigurationDialog.10=Re&move All -TagConfigurationDialog.11=&List of files to be automatically examined when refreshing tags: -TagConfigurationDialog.12=A&dd Selected Files -TagConfigurationDialog.13=Rem&ove -TagConfigurationDialog.14=Error fetching tags from remote CVS files -TagConfigurationDialog.20=&Refresh Tags -TagConfigurationDialog.21=&Configure Tags... -TagConfigurationDialog.22=Updating Tags - -ChangeListener.Deleting_CVS_folders_1=Deleting CVS folders -ChangeListener.Folders_cannot_be_deleted_from_a_CVS_server_from_the_client._To_delete_the_folder_2=Folders cannot be deleted from a CVS server from the client. To delete the folder -ChangeListener.Do_not_ask_me_about_this_again_3=Do not ask me about this again +TagConfigurationDialog_1=Configure Branches and Versions for {0} +TagConfigurationDialog_4=Configure tags you will see in the workbench. +TagConfigurationDialog_5=&Browse files for tags: +TagConfigurationDialog_6=&New tags found in the selected files: +TagConfigurationDialog_7=Remembered &tags for these projects: +TagConfigurationDialog_8=&Add Checked Tags +TagConfigurationDialog_9=&Remove +TagConfigurationDialog_0=Add &Date... +TagConfigurationDialog_10=Re&move All +TagConfigurationDialog_11=&List of files to be automatically examined when refreshing tags: +TagConfigurationDialog_12=A&dd Selected Files +TagConfigurationDialog_13=Rem&ove +TagConfigurationDialog_14=Error fetching tags from remote CVS files +TagConfigurationDialog_20=&Refresh Tags +TagConfigurationDialog_21=&Configure Tags... +TagConfigurationDialog_22=Updating Tags + +ChangeListener_Deleting_CVS_folders_1=Deleting CVS folders +ChangeListener_Folders_cannot_be_deleted_from_a_CVS_server_from_the_client__To_delete_the_folder_2=Folders cannot be deleted from a CVS server from the client. To delete the folder +ChangeListener_Do_not_ask_me_about_this_again_3=Do not ask me about this again ConfigureTagsFromRepoViewConfigure_Tag_Error_1=Configure Tag Error -RemoteRootAction.label=Discard location -RemoteLogOperation.0=Fetching log information from {0} -RemoteLogOperation.1=Fetching log information -RemoveDateTagAction.0=&Remove -RemoteRootAction.Unable_to_Discard_Location_1=Unable to Discard Location -RemoteRootAction.Projects_in_the_local_workspace_are_shared_with__2=Projects in the local workspace are shared with {0}. This location cannot be discarded until all local projects are disconnected from it. -RemoveRootAction.removeRoot_3=RemoveRootAction.removeRoot -RemoteRootAction.The_projects_that_are_shared_with_the_above_repository_are__4=The projects that are shared with the above repository are: - -BranchCategory.Branches_1=Branches -GroupedByVersionCategory.Versions_1=Versions -VersionCategory.Versions_1=Versions -ModulesCategory.label=Modules -HistoryView.[...]_4=[...] - -CVSProjectPropertiesPage.connectionType=Connection type: -CVSProjectPropertiesPage.user=User: -CVSProjectPropertiesPage.Select_a_Repository_1=Select a Repository -CVSProjectPropertiesPage.Select_a_CVS_repository_location_to_share_the_project_with__2=Select a compatible CVS repository location to share the project with: -CVSProjectPropertiesPage.Change_Sharing_5=&Change Sharing... -CVSProjectPropertiesPage.fetchAbsentDirectoriesOnUpdate=&Fetch absent or new directories when updating -CVSProjectPropertiesPage.configureForWatchEdit=Enable watch/edit for this project -CVSProjectPropertiesPage.progressTaskName=Updating project's CVS properties -CVSProjectPropertiesPage.setReadOnly=Setting all files read-only -CVSProjectPropertiesPage.clearReadOnly=Setting all files writable -CVSRepositoryPropertiesPage.Confirm_Project_Sharing_Changes_1=Confirm Project Sharing Changes -CVSPreferencePage.Save_dirty_editors_before_CVS_operations_1= -CVSRepositoryPropertiesPage.There_are_projects_in_the_workspace_shared_with_this_repository_2=There are projects in the workspace shared with this repository. The projects will be updated with the new information that you have entered -CVSRepositoryPropertiesPage.sharedProject=The projects that are shared with {0} are: -CVSRepositoryPropertiesPage.useDefaultProgramName=Expect the &default program name "cvs" in text message prefixes from this server -CVSRepositoryPropertiesPage.useProgramName=Expect a custom &program name: -CVSRepositoryPropertiesPage.useLocationAsLabel=Use the &repository identification string as the label -CVSRepositoryPropertiesPage.useCustomLabel=Use a custom &label: - -CVSProjectSetSerializer.Confirm_Overwrite_Project_8=Confirm Overwrite Project -CVSProjectSetSerializer.The_project_{0}_already_exists._Do_you_wish_to_overwrite_it__9=The project {0} already exists. Do you wish to overwrite it? - -IgnoreResourcesDialog.titleSingle=Add {0} to .cvsignore -IgnoreResourcesDialog.titleMany=Add {0} resources to .cvsignore -IgnoreResourcesDialog.prompt=Select what to add to the .cvsignore file(s): -IgnoreResourcesDialog.addNameEntryButton=Resource(s) by name -IgnoreResourcesDialog.addNameEntryExample=Examples: file1.so, file2.so, .rcfile, bin -IgnoreResourcesDialog.addExtensionEntryButton=Wildcard extension -IgnoreResourcesDialog.addExtensionEntryExample=Examples: *.so, *.rcfile, bin -IgnoreResourcesDialog.addCustomEntryButton=Custom pattern -IgnoreResourcesDialog.addCustomEntryExample=The wildcard characters '*' and '?' are permitted. -IgnoreResourcesDialog.patternMustNotBeEmpty=Pattern must not be empty. -IgnoreResourcesDialog.patternDoesNotMatchFile=Pattern does not match all selected resources: e.g. {0} - -ContentAction.Confirm_Long_Operation_1=Confirm Long Operation -ContentAction.Changing_this_setting_will_involve_contacting_the_server_and_may_be_long-running_2=Changing this setting will involve contacting the server and may be long-running - -CVSProjectPropertiesPage.You_can_change_the_sharing_of_this_project_to_another_repository_location._However,_this_is_only_possible_if_the_new_location_is___compatible___(on_the_same_host_with_the_same_repository_path)._1=You can change the sharing of this project to another repository location. However, this is only possible if the new location is \"compatible\" (on the same host with the same repository path). - -ConfigurationWizardMainPage.Location_1=Location -ConfigurationWizardMainPage.Authentication_2=Authentication -ConfigurationWizardMainPage.Connection_3=Connection -AlternateUserValidationDialog.Enter_Password_2=Enter Password -AlternateUserValidationDialog.OK_6=OK -AlternateUserValidationDialog.Cancel_7=Cancel -AlternateUserValidationDialog.message=Enter the password for {0}: -WorkbenchUserAuthenticator.The_operation_was_canceled_by_the_user_1=The operation was canceled by the user -CVSCatchupReleaseViewer.No_workspace_file_1=No workspace file -CVSCatchupReleaseViewer.Select_&Outgoing_Additions_1=Select New Reso&urces -ForceCommitSyncAction.Outgoing_Changes_Not_Added_1=Outgoing Changes Not Added -ForceCommitSyncAction.You_have_chosen_to_commit_new_resources_which_have_not_been_added_to_version_control._Do_you_wish_to_add_them_to_version_control_now__2=You have chosen to commit new resources which have not been added to version control. Do you wish to add them to version control now? - -WorkingSetSelectionArea.workingSetOther=&Other... -ListSelectionArea.selectAll=&Select All -ListSelectionArea.deselectAll=&Deselect All - -RestoreFromRepositoryWizard.fileSelectionPageTitle=Restore from Repository -RestoreFromRepositoryWizard.fileSelectionPageDescription=Select the revision of each file that should be restored. -RestoreFromRepositoryFileSelectionPage.fileSelectionPaneTitle={0} - Select file to be restored: -RestoreFromRepositoryFileSelectionPage.revisionSelectionPaneTitle={0} - Check revision to be restored: -RestoreFromRepositoryFileSelectionPage.fileToRestore={0} ({1} to be restored) -RestoreFromRepositoryFileSelectionPage.fileContentPaneTitle={0} {1} in ''{2}'' -RestoreFromRepositoryFileSelectionPage.emptyRevisionPane=Remote revisions of selected file: -RestoreFromRepositoryFileSelectionPage.fileExists=File ''{0}'' already exists locally. -RestoreFromRepositoryFileSelectionPage.revisionIsDeletion=Revision {0} of {1} is the deletion and can not be restored. Select another revision of this file. -RestoreFromRepositoryAction.noFilesTitle=No Deleted Files Found -RestoreFromRepositoryAction.noFilesMessage=There were no deleted files found on the repository in folder ''{0}''. - -RepositoryRoot.folderInfoMissing=Local folder ''{0}'' is not properly mapped to a remote folder. - -RepositoriesViewContentHandler.unmatchedTag=No matching end tag found for tag ''{0}'' while reading repositories View configuration file. -RepositoriesViewContentHandler.missingAttribute=Required attribute ''{1}'' missing from tag ''{0}'' while reading repositories View configuration file. -RepositoriesViewContentHandler.errorCreatingRoot=An error occurred trying to create repository ''{0}''. - -CVSWorkingSetFolderSelectionPage.projectSelectionPageTitle=CVS Working Set -CVSWorkingSetFolderSelectionPage.projectSelectionPageDescription=Enter a working set name and select the working set folders. -CVSWorkingSetFolderSelectionPage.name=&Working set name: -CVSWorkingSetFolderSelectionPage.treeLabel=Working &set contents: -CVSWorkingSetFolderSelectionPage.refresh=&Refresh Contents -CVSWorkingSetFolderSelectionPage.invalidWorkingSetName=The name must contain only letters and digits. -CVSWorkingSetFolderSelectionPage.duplicateWorkingSetName=A working set of the specific name already exists. -CVSWorkingSetFolderSelectionPage.mustSelectFolder=At least one folder must be checked. - -WorkingSetSelectionDialog.title= Select CVS Working Set -WorkingSetSelectionDialog.title.multiSelect= Select CVS Working Sets -WorkingSetSelectionDialog.message= &Select a CVS working set: -WorkingSetSelectionDialog.message.multiSelect= &Select CVS working sets: -WorkingSetSelectionDialog.detailsButton.label= &Edit... -WorkingSetSelectionDialog.newButton.label= &New... -WorkingSetSelectionDialog.removeButton.label= &Remove - -RefreshTagsAction.title=Refresh Branch and Version Tags? -RefreshTagsAction.message=Repository ''{0}'' has {1} projects to refresh. Continue? - -WatchEditPreferencePage.description=Settings for CVS Watch/Edit. -WatchEditPreferencePage.checkoutReadOnly=&Configure projects to use Watch/Edit on checkout -WatchEditPreferencePage.validateEditSaveAction=When read-only files are modified in an editor -WatchEditPreferencePage.edit=Send a CVS &edit notification to the server -WatchEditPreferencePage.highjack=Edit the file &without informing the server -WatchEditPreferencePage.editPrompt=Before a CVS edit notification is sent to the server -WatchEditPreferencePage.neverPrompt=&Never prompt -WatchEditPreferencePage.alwaysPrompt=Always &prompt -WatchEditPreferencePage.onlyPrompt=&Only prompt if there are other editors - -Uneditaction.confirmMessage=Overwrite local changes to edited files? -Uneditaction.confirmTitle=Confirm Unedit - -FileModificationValidator.promptTitle=CVS Edit Files? -FileModificationValidator.promptMessage=There are read-only files being modified. Should a 'cvs edit' be performed? -FileModificationValidator.vetoMessage=User vetoed file modification - -RefreshRemoteProjectWizard.title=Refresh Branches -RefreshRemoteProjectWizard.0=Tags not found for some modules -RefreshRemoteProjectWizard.1=Search Deeply -RefreshRemoteProjectWizard.2=Skip -RefreshRemoteProjectWizard.3=Tags were not found on module {0} using the auto-refresh files and a shallow cvs log operation. You can choose to search this module using a deep cvs log operation or skip it. -RefreshRemoteProjectWizard.4=Tags were not found on {0} modules using the auto-refresh files and a shallow cvs log operation. You can choose to search these module using a deep cvs log operation or skip them. -RefreshRemoteProjectSelectionPage.pageTitle=Select Projects -RefreshRemoteProjectSelectionPage.pageDescription=Select the remote projects whose tags should be refreshed. -RefreshRemoteProjectSelectionPage.selectRemoteProjects=This wizard helps discover the tags associated with one or more remote projects. &Check the projects whose tags you wish to refresh. -RefreshRemoteProjectSelectionPage.noWorkingSet=Do not &use a working set -RefreshRemoteProjectSelectionPage.workingSet=Select a &working set (matching projects will be checked): - -EditorsView.file=File name -EditorsView.user=User name -EditorsView.date=Date -EditorsView.computer=Computer name - -EditorsDialog.title=Editors -EditorsDialog.question=The resource already has editors. Do you still want to edit the resource and send a CVS edit notification to server? -EditorsAction.classNotInitialized={0} not initialized - -TargetLocationSelectionDialog.projectNameLabel=&Project Name: -TargetLocationSelectionDialog.useDefaultLabel=Use default &workspace location -TargetLocationSelectionDialog.locationLabel=&Location: -TargetLocationSelectionDialog.parentDirectoryLabel=&Directory: -TargetLocationSelectionDialog.browseLabel=&Browse... -TargetLocationSelectionDialog.messageForSingle=Select the parent directory for project {0}. -TargetLocationSelectionDialog.messageForMulti=Select the parent directory for the {0} projects. -TagetLocationSelectionDialog.locationEmpty=Project contents directory must be specified. -TagetLocationSelectionDialog.invalidLocation=Invalid location path. -TagetLocationSelectionDialog.alreadyExists=Project {0} already exists. - -SynchronizeProjectsDialog.title=Synchronize CVS Projects -SynchronizeProjectsDialog.selectProjects=Projects to be synchronized -SynchronizeProjectsDialog.syncOutgoingChanges=Only synchronize projects with outgoing &changes -SynchronizeProjectsDialog.allSharedProjects=Include &all projects shared with CVS -SynchronizeProjectsDialog.sharedWorkingSetProjects=Include &working set resources shared with CVS: - -RemoteFileEditorInput.fullPathAndRevision={0} {1} - -CheckoutOperation.thisResourceExists=The resource ''{0}'' already exists in the workspace and will be deleted. Proceed with the check out of ''{1}''? -CheckoutOperation.thisExternalFileExists=The folder ''{0}'' exists in the local file system and will be deleted. Proceed with the check out of ''{1}''? -CheckoutOperation.confirmOverwrite=Confirm Overwrite -CheckoutOperation.scrubbingProject=Scrubbing project ''{0}''. -CheckoutOperation.refreshingProject=Configuring project ''{0}''. - -CheckoutSingleProjectOperation.taskname=Checking out ''{0}'' from CVS -CheckoutMultipleProjectsOperation.taskName=Checking out {0} folders from CVS - -CheckoutIntoOperation.taskname=Checking out {0} folders from CVS into ''{1}'' -CheckoutIntoOperation.targetIsFile=Folder ''{0}'' cannot be checked out because file ''{1}'' is in the way. -CheckoutIntoOperation.targetIsFolder=Folder ''{0}'' cannot be checked out because folder ''{1}'' is in the way. -CheckoutIntoOperation.targetIsPrunedFolder=Folder ''{0}'' cannot be checked out because it conflicts with the pruned folder ''{1}''. -CheckoutIntoOperation.mappingAlreadyExists=Cannot checkout remote folder ''{0}'' into ''{1}'' because local folder ''{2}'' is already mapped to remote folder ''{0}''. -CheckoutIntoOperation.cancelled=Checkout of ''{1}'' cancelled by user. -CheckoutIntoOperation.overwriteMessage=Folder ''{0}'' already exists and will be deleted. Continue? - -AddToWorkspace.taskName1=Checking out ''{0}'' from CVS -AddToWorkspace.taskNameN=Checking out {0} folders from CVS - -CheckoutAsAction.checkoutFailed=Problems encountered performing checkout - -CheckoutAsAction.enterProjectTitle=Check Out {0} As... -CheckoutAsAction.enterLocationTitle=Check Out {0} Projects As... -CheckoutAsAction.taskname=Checking out "{0}" from CVS as "{1}" -CheckoutAsAction.multiCheckout=Checking out {0} projects from CVS - -CheckoutAsWizard.title=Check Out As -CheckoutAsWizard.error=Problems encountered performing checkout -CheckoutAsMainPage.title=Check Out As -CheckoutAsMainPage.description=Select the method of check out -CheckoutAsMainPage.singleFolder=Choose how to check out folder ''{0}'' -CheckoutAsMainPage.asConfiguredProject=Check out as a project &configured using the New Project Wizard -CheckoutAsMainPage.asSimpleProject=Check out as a &project in the workspace -CheckoutAsMainPage.projectNameLabel=&Project Name: -CheckoutAsMainPage.multipleFolders=Choose how to check out the {0} folders -CheckoutAsMainPage.asProjects=Check out into the &workspace as projects -CheckoutAsMainPage.intoProject=Check out &into an existing project - -CheckoutAsLocationSelectionPage.title=Check Out As -CheckoutAsLocationSelectionPage.description=Select the project location -CheckoutAsLocationSelectionPage.useDefaultLabel=Use default &workspace location -CheckoutAsLocationSelectionPage.locationLabel=&Location: -CheckoutAsLocationSelectionPage.parentDirectoryLabel=&Directory: -CheckoutAsLocationSelectionPage.browseLabel=&Browse... -CheckoutAsLocationSelectionPage.locationEmpty=Project contents directory must be specified. -CheckoutAsLocationSelectionPage.invalidLocation=Invalid location path. -CheckoutAsLocationSelectionPage.messageForSingle=Select the parent directory for project {0}. -CheckoutAsLocationSelectionPage.messageForMulti=Select the parent directory for the {0} projects. - -CheckoutAsProjectSelectionPage.title=Check Out Into -CheckoutAsProjectSelectionPage.description=Select the local folder that is the target of the checkout operation. -CheckoutAsProjectSelectionPage.name=Target folder &name: -CheckoutAsProjectSelectionPage.treeLabel=&Parent of target folder: -CheckoutAsProjectSelectionPage.showLabel=&Filter project list: -CheckoutAsProjectSelectionPage.recurse=&Checkout subfolders -CheckoutAsProjectSelectionPage.showAll=Show all valid target projects -CheckoutAsProjectSelectionPage.showUnshared=Show unshared projects -CheckoutAsProjectSelectionPage.showSameRepo=Show projects shared with the same repository -CheckoutAsProjectSelectionPage.invalidFolderName=''{0}'' is not a valid folder name - -TargetLocationSelectionDialog.projectNameLabel=&Project Name: -TargetLocationSelectionDialog.useDefaultLabel=Use default &workspace location -TargetLocationSelectionDialog.locationLabel=&Location: -TargetLocationSelectionDialog.parentDirectoryLabel=&Directory: -TargetLocationSelectionDialog.browseLabel=&Browse... -TargetLocationSelectionDialog.messageForSingle=Select the parent directory for project {0}. -TargetLocationSelectionDialog.messageForMulti=Select the parent directory for the {0} projects. -TagetLocationSelectionDialog.locationEmpty=Project contents directory must be specified. -TagetLocationSelectionDialog.invalidLocation=Invalid location path. -TagetLocationSelectionDialog.alreadyExists=Project {0} already exists. -CheckoutIntoWizard.title=Checkout Into -CheckoutIntoWizard.projectSelectionPageTitle=Select local folder -CheckoutIntoWizard.projectSelectionPageDescription=Select the local folder that is the target of the checkout operation. -CheckoutIntoWizard.error=Checkout Error - -WorkspaceChangeSetCapability.1=New Set -OpenCommitSetAction.20=Open Change in Compare Editor -OpenCommitSetAction.21=Could not determine the repository location of the selected resources -WorkspaceChangeSetCapability.2=New Change Set -WorkspaceChangeSetCapability.3=Enter the name and comment for the new change set -CVSChangeSetCollector.4=Retrieving revision histories -CVSChangeSetCollector.0=Unassigned Remote Changes -WorkspaceChangeSetCapability.7=Edit Change Set Comment -WorkspaceChangeSetCapability.8=Edit the name and comment for the change set - -CheckoutIntoWizard.thisResourceExists=The resource ''{0}'' already exists in the workspace. Overwrite? -CheckoutIntoWizard.confirmOverwrite=Confirm Overwrite -CheckoutIntoWizard.mappingAlreadyExists=Cannot add remote folder ''{0}'' to project ''{1}'' as ''{2}'' because local folder ''{3}'' is already mapped to that folder. -CheckoutIntoProjectSelectionPage.description=Choose the name and parent folder where ''{0}'' should be checked out to. -CheckoutIntoProjectSelectionPage.name=Target folder &name: -CheckoutIntoProjectSelectionPage.treeLabel=&Parent of target folder: -CheckoutIntoProjectSelectionPage.showLabel=&Filter project list: -CheckoutIntoProjectSelectionPage.showAll=Show all valid target projects -CheckoutIntoProjectSelectionPage.showUnshared=Show unshared projects -CheckoutIntoProjectSelectionPage.showSameRepo=Show projects shared with the same repository -CheckoutIntoProjectSelectionPage.recurse=&Checkout subfolders -CheckoutIntoProjectSelectionPage.invalidFolderName=''{0}'' is not a valid folder name - -HasProjectMetaFile.taskName=Looking for a remote meta file -TagFromWorkspace.taskName=Tagging from workspace -TagFromRepository.taskName=Tagging from repository -UpdateOnlyMergeable.taskName=Updating mergeable changes -UpdateDialog.overwriteTitle=Overwrite Local Changes? -UpdateDialog.overwriteMessage=Do you want to overwrite local changes? -ReplaceOperation.taskName=CVS Replace -UpdateOperation.taskName=CVS Update - -SafeUpdateAction.warnFilesWithConflictsTitle=Non-mergeable files -SafeUpdateAction.warnFilesWithConflictsDescription=Some conflicting files cannot be merged automatically with the update action. They contain conflicting changes that will have to be merged manually. Use the Synchronize View to find the conflicts then merge the changes in a compare editor. - -SafeUpdateAction.warnFilesWithConflictsTitle=Non-mergeable files -SafeUpdateAction.warnFilesWithConflictsDescription=Some conflicting files cannot be merged automatically with the update action. They contain conflicting changes that will have to be merged manually. Use the Synchronize View to find the conflicts then merge the changes in a compare editor. - -Error.unableToShowSyncView=Error opening Synchronize View. Please ensure that the Team plugin is installed correctly. -ShowAnnotationAction.1=Unexpected response from CVS Server: {0} -ShowAnnotationAction.2=Annotate Binary File? -ShowAnnotationAction.3=File {0} is marked as a binary file. The CVS annotation operation only works properly for files that contain text. Do you wish to continue? - -UpdateAction.jobName=CVS Update -MergeUpdateAction.jobName=CVS Merge -MergeUpdateAction.invalidSubscriber=Invalid subscriber: {0} -CommitAction.jobName=CVS Commit - -CommitCommentArea.0=<Click here to enter a commit comment> -CommitCommentArea.1=<Choose a previously entered comment> -CommitCommentArea.2=Empty commit comment -CommitCommentArea.3=The commit comment is empty. Are you sure you would like to continue with an empty comment? -CommitCommentArea.4=Re&member decision? - -OverrideAndUpdateAction.jobName=Performing CVS Override and Update on {0} resources -WorkInProgressPreferencePage.6=None - - - -CheckoutProjectOperation.8=Checking out ''{0}'' into project ''{1}'' -CheckoutProjectOperation.9=Checking out ''{0}'' into {1} projects -CheckoutProjectOperation.0=Checkout of remote folder {0} cancelled by user -CVSOperation.0=Errors occured in {0} of {1} operations. -CVSOperation.1=Show CVS Console -CVSOperation.2=Show CVS Console -CVSModelElement.0=Error -CVSModelElement.1=Error fetching resource list from repository. -CVSDecorator.exceptionMessage=Errors occured while applying CVS decorations to resources. -FetchMembersOperation.0=Fetching members of {0} - -RemoteRevisionQuickDiffProvider.readingFile=Error reading remote file -RemoteRevisionQuickDiffProvider.closingFile=Error closing remote file -RemoteRevisionQuickDiffProvider.fetchingFile=CVS QuickDiff: fetching remote contents -RemoteCompareOperation.0=Comparing tags {0} and {1} of {2} - -WorkspaceToolbarCommitAction.label=Commit -WorkspaceToolbarCommitAction.tooltip=Commit All Outgoing Changes... -WorkspaceToolbarCommitAction.description=Commit All Outgoing Changes... -WorkspaceToolbarCommitAction.image=checkin_action.gif - -WorkspaceToolbarUpdateAction.label=Update -WorkspaceToolbarUpdateAction.tooltip=Update All Incoming Changes... -WorkspaceToolbarUpdateAction.description=Update All Incoming Changes... -WorkspaceToolbarUpdateAction.image=checkout_action.gif - -SharingWizardIgnore.label=Ignore -SharingWizardIgnore.tooltip=Ignore Selected Resources... -SharingWizardIgnore.description=Ignore Selected Resources... -SharingWizardIgnore.image=ignorefiles.gif - -ConsoleRemoveAction.label=Close CVS Console -ConsoleRemoveAction.tooltip=Close CVS console -ConsoleRemoveAction.image=participant_rem.gif - -WorkspaceUpdateAction.label=&Update -WorkspaceUpdateAction.tooltip=Perform an update on the selected resources -WorkspaceUpdateAction.helpContextId=org.eclipse.team.cvs.ui.workspace_update_action - -OverrideAndUpdateAction.label=O&verride and Update -OverrideAndUpdateAction.tooltip=Perform an override and update on the selected resources. This will make the local contents equal to the remote ignoring any local changes. -OverrideAndUpdateAction.helpContextId=org.eclipse.team.cvs.ui.workspace_overupdate_action - -RefreshDirtyStateAction.label=C&lean Timestamps -RefreshDirtyStateOperation.0=Problems encountered cleaning timestamps -RefreshDirtyStateOperation.1=CVS Clean Timestamps -RefreshDirtyStateAction.tooltip=Reset the dirty state of out-of-sync files whose contents match the server contents -RefreshDirtyStateAction.helpContextId=org.eclipse.team.cvs.ui.workspace_refresh_dirty_state_action_context - -WorkspaceCommitAction.label=&Commit... -WorkspaceCommitAction.tooltip=Perform a commit on the selected resources -WorkspaceCommitAction.helpContextId="org.eclipse.team.cvs.ui.workspace_commit_action - -OverrideAndCommitAction.label=Override and Comm&it... -OverrideAndCommitAction.tooltip=Perform an override and commit on the selected resources. This will make the remote contents equal to the local ignoring any remote changes. -OverrideAndCommitAction.helpContextId=org.eclipse.team.cvs.ui.workspace_overcommit_action - -ConfirmMergedAction.label=&Mark as Merged -ConfirmMergedAction.tooltip=Mark the conflict as merged by upgrading the base to match the remote -ConfirmMergedAction.helpContextId=org.eclipse.team.cvs.ui.workspace_confirm_merged_action - -BranchAction.label=&Branch... -BranchAction.tooltip=Branch - -IgnoreAction.label=A&dd to .cvsignore... -IgnoreAction.0=Ignoring selected resources for project {0} -IgnoreAction.1=Ignoring Resources -IgnoreAction.tooltip=Ignore the Selected Resources when Synchronizing - -ShowResourceInHistoryAction.label=Show in Resource &History -ShowResourceInHistoryAction.tooltip=Show in Resource History - -ShowAnnotationAction.label=Show &Annotation -ShowAnnotationAction.tooltip=Show Annotation - -GenerateDiffFileAction.label=Create &Patch... -GenerateDiffFileOperation.0=The file could not be written. Possible reasons are the directory is write-protected or not enough disk space is available. -GenerateDiffFileOperation.1=The file could not be written due to an I/O error. -GenerateDiffFileOperation.2=An I/O error occured. -GenerateDiffFileWizard.0=Please enter a valid location. -GenerateDiffFileWizard.2=Please enter a file name. -GenerateDiffFileWizard.3=The specified directory does not exist. -GenerateDiffFileWizard.4=Please select a location in the workspace. -GenerateDiffFileWizard.5=Please enter a valid filename. -GenerateDiffFileAction.tooltip=Compare your workspace contents with the server and generate a diff file that can be used as a patch file. - -MergeUpdateAction.label=&Update -MergeUpdateAction.tooltip=Perform an update merge on the selected resources -MergeUpdateAction.helpContextId=org.eclipse.team.cvs.ui.merge_update_action - -CompareRevertAction.label=&Override and Update -CompareRevertAction.tooltip=Revert the local file contents to match that of their corresponding remotes -CompareRevertAction.helpContextId=org.eclipse.team.cvs.ui.compare_revert_action - -SharingCommitAction.label=Commit -SharingCommitAction.tooltip=Commit All Changes... -SharingCommitAction.description=Commit All Changes... -SharingCommitAction.image=checkin_action.gif - -MergeSynchronizeParticipant.8=Missing id initializing cvs merge participant -MergeSynchronizeParticipant.9=Unable to initialize cvs merge subscriber -MergeSynchronizeParticipant.10=Could not restore CVS Merge in Synchronize view: {0} -MergeSynchronizeParticipant.11=Root resource in cvs merge subscriber is no longer in workspace, ignoring: {0} -MergeSynchronizeParticipant.12=Missing root resources for cvs merge subscriber: {0} -DisconnectOperation.0=Disconnecting -DisconnectOperation.1=Disconnecting {0} -SubscriberConfirmMergedAction.0=Synchronization information is missing for resource {0} -SubscriberConfirmMergedAction.jobName=Performing a CVS Mark as Merged operation on {0} resources. -CVSSubscriberAction.0=Invalid attemp to make unsupervised resource {0} in-sync. -ReleaseCommentDialog.6=Review resources that will be committed: -ReconcileProjectOperation.0=Reconciling project {0} with remote folder {1} -CheckoutToRemoteFolderOperation.0=Downloading folder {0} -CVSRepositoryPropertiesPage.21=Use this location's connection information for all connections -CVSRepositoryPropertiesPage.22=Use the following locations for read and write access -CVSRepositoryPropertiesPage.23=Read: -CVSRepositoryPropertiesPage.24=Write: -CVSRepositoryPropertiesPage.0=Confirm Host or Path Change -CVSRepositoryPropertiesPage.1=You have chosen to change the host name or repository root path for this location. You should ensure that this new information still identifies the same repository. -CompareRevertAction.0=Reverting {0} resources -CompareParticipant.0={0} ({1}) - -ComparePreferencePage.0=Options for CVS comparisons: -ComparePreferencePage.1=Show the &file author in compare editors -ComparePreferencePage.2=Automatically enable chan&ge set grouping in CVS synchronizations -ComparePreferencePage.3=Show revision &comparisons in a dialog -ComparePreferencePage.4=Con&sider file contents in comparisons -ComparePreferencePage.6=See <a>''{0}''</a> for compare editor preferences. - -FileModificationValidator.3=Perform Edit? -FileModificationValidator.4=A CVS edit notification is required to be sent to the server in order to allow editing of one or more selected files. Continue? -CVSSynchronizeViewPage.0=Show incoming grouped by comment -CVSSynchronizeWizard.0=Unknown -Participant.comparing=Comparing -Participant.merging=Merging -Participant.synchronizing=Synchronizing - -Participant.comparingDetail=Comparing {0} with {1} -Participant.mergingDetail=Merging {0} -Participant.synchronizingDetail=Synchronizing {0} - -CompareWithRevisionAction.4=Compare With Revision -ReplaceWithRevisionAction.0=&Replace -ReplaceWithRevisionAction.1=Replace With Revision - -ConsolePreferencesPage.4=&Show CVS console automatically when command is run -ConsolePreferencesPage.5=&Limit console output -ConsolePreferencesPage.6=&Fixed width console -ConsolePreferencesPage.7=Character &width: -ConsolePreferencesPage.8=&Console &buffer size (characters): -ConsolePreferencesPage.9=CVS Console Settings: - -SharingWizard.23=Share Project Resources -SharingWizard.24=Review and commit resources to the repository. Use the context menu to perform additional operations on the resources. -SharingWizard.25=Module ''{0}'' exists on the server. Select the tag to synchronize with. -SharingWizardSyncPage.0=Sharing -ReconcileProjectOperation.1=Local resource {0} is a file while the corresponding remote {1} is a folder -ReconcileProjectOperation.2=Local resource {0} is a folder while the corresponding remote {1} is a file -ShareProjectOperation.0=Sharing project {0} as {1} -SharingWizard.26=Keep Sharing? -SharingWizard.27=Project {0} has been mapped to a remote module. Should this mapping be kept? -SharingWizardSyncPage.3=The resources of project {0} are in-sync with the repository. -SharingWizardSyncPage.4=An error has occurred populating this view. -SharingWizardSyncPage.5=Show Errors -SharingWizardSyncPage.8=Errors Occurred -SharingWizardSyncPage.9=The following errors occurred. -SharingWizardSyncPage.10=Commit Changes? -SharingWizardSyncPage.11=There are still uncommitted changes that have not been shared. Should these changes be committed? -SharingWizardSyncPage.12=Launch the &Commit wizard -ShareProjectOperation.1=Calculating synchronization states -CVSProjectPropertiesPage.31=Show only compatible repository locations -CVSProjectPropertiesPage.32=Confirm -CVSProjectPropertiesPage.33=The selected repository location may not be compatible with the current location. Are you sure you want to change sharing to the new location? -RepositoryEncodingPropertyPage.2=Identify the file system encoding used by the server where the repository is located. Setting this will allow file names and commit comments to be properly translated between the client and server in cases where the server encoding differs from the client. -RepositoryEncodingPropertyPage.3=Server Encoding -RepositoryEncodingPropertyPage.0=Cannot Change Encoding -RepositoryEncodingPropertyPage.1=Location {0} no longer exists. -RepositoryEncodingPropertyPage.4=Note: this setting does not apply to file content encodings. File content encodings can be set on the Workbench/Editors preference page and on the Info property page of a project. -CheckoutWizard.7=Checkout Project from CVS Repository -CheckoutWizard.8=This wizard allows you to checkout projects from a CVS Repository. -CheckoutWizard.0=Checkout from CVS -CheckoutWizard.10=Select Module -CheckoutWizard.11=Select the module to be checked out from CVS -ModuleSelectionPage.2=Use an existing &module (this will allow you to browse the modules in the repository) -CheckoutAsWizard.3=Select Tag -CheckoutAsWizard.4=Choose the tag to check out from -CheckoutAsMainPage.10=(Only available when the .project file does not exist in the repository) -CVSTeamProvider.updatingFile=Updating {0} -CVSTeamProvider.makeBranch=Creating branch -CVSTeamProvider.folderInfo=Updating folder synchronization information for project {0} -CVSTeamProvider.updatingFolder=Updating {0} -AddOperation.0=Adding {0} -BranchOperation.0=Branching -BranchOperation.1=Branching {0} -CommitOperation.0=Committing {0} -CommitSetDialog.0=&Name: -CommitSetDialog.2=Use the &title as the commit comment -CommitSetDialog.3=Enter a commit &comment -CommitWizard.0=Committing resources -CommitWizard.1=Committing resources -CommitWizard.2=Commit files -CommitWizard.3=CommitWizard -CommitWizard.4=Collecting outgoing changes -CommitWizard.6=Nothing to Commit -CommitWizard.7=The selected resouces do not contain any changes. -UpdateOperation.0=Updating {0} -ReplaceOperation.0=Replacing {0} -ReplaceOperation.1=Scrubbing {0} -TagOperation.0=Tagging {0} -RemoteAnnotationStorage.1=As error occurred computing the content type of remote resource {0} -DateTagCategory.0=Dates -DateTagDialog.0=Date (M/D/Y): -DateTagDialog.1=Include time component in tag -DateTagDialog.2=Time (HH:MM:SS): -DateTagDialog.3=Time is local -DateTagDialog.4=Time is in universal time coordinates (UTC) -DateTagDialog.5=Create Date Tag -WorkbenchPreference.defaultEncoding = Defaul&t ({0}) -WorkbenchPreference.otherEncoding = &Other: -WorkbenchPreference.unsupportedEncoding = The selected encoding is not supported. - -LogEntryCacheUpdateHandler.0=Errors have occured while maintaining the log entry cache. -LogEntryCacheUpdateHandler.1=Updating revision histories -LogEntryCacheUpdateHandler.2=Could not fetch revision histories due to an internal timeout. -MultiFolderTagSource.0={0} folders -LocalProjectTagSource.0={0} Projects -AnnotateView.0=Could not find an appropriate editor -ModeWizard.0=ModeWizard -ModeWizard.1=Change the ASCII/Binary Property -ModeWizard.2=An error occurred -ModeWizard.3=Setting file transfer mode... -ModeWizard.4=Problems encountered while setting file transfer mode -ModeWizard.5=Errors occured -ModeWizard.6=Warnings occurred - -ModeWizardSelectionPage.2=File -ModeWizardSelectionPage.3=ASCII/Binary Property -ModeWizardSelectionPage.4=Path -ModeWizardSelectionPage.8=&Reset -ModeWizardSelectionPage.9=Reset the selected files to their current mode - -ReplaceWithTagAction.0=There are uncommitted changes in ''{0}'' that will be overwritten. Should ''{0}'' be replaced? -ReplaceWithTagAction.1=The following contain &uncommitted changes that will be overwritten. Check those that should be included in the replace operation. -ReplaceWithTagAction.2=There are uncommitted changes in ''{0}'' that will be overwritten. Should the replace proceed? -ReplaceWithTagAction.4=Replace with Uncommitted Changes -UncommittedChangesDialog.2=Select an item to see the dirty resources it contains. -UncommittedChangesDialog.3=&The dirty resources contained in ''{0}'' -UncommittedChangesDialog.4=&The full path of ''{0}'' -AddWizard.0=Add to Version Control +RemoteRootAction_label=Discard location +RemoteLogOperation_0=Fetching log information from {0} +RemoteLogOperation_1=Fetching log information +RemoveDateTagAction_0=&Remove +RemoteRootAction_Unable_to_Discard_Location_1=Unable to Discard Location +RemoteRootAction_Projects_in_the_local_workspace_are_shared_with__2=Projects in the local workspace are shared with {0}. This location cannot be discarded until all local projects are disconnected from it. +RemoveRootAction_removeRoot_3=RemoveRootAction.removeRoot +RemoteRootAction_The_projects_that_are_shared_with_the_above_repository_are__4=The projects that are shared with the above repository are: + +BranchCategory_Branches_1=Branches +GroupedByVersionCategory_Versions_1=Versions +VersionCategory_Versions_1=Versions +ModulesCategory_label=Modules +HistoryView_______4=[...] + +CVSProjectPropertiesPage_connectionType=Connection type: +CVSProjectPropertiesPage_user=User: +CVSProjectPropertiesPage_Select_a_Repository_1=Select a Repository +CVSProjectPropertiesPage_Select_a_CVS_repository_location_to_share_the_project_with__2=Select a compatible CVS repository location to share the project with: +CVSProjectPropertiesPage_Change_Sharing_5=&Change Sharing... +CVSProjectPropertiesPage_fetchAbsentDirectoriesOnUpdate=&Fetch absent or new directories when updating +CVSProjectPropertiesPage_configureForWatchEdit=Enable watch/edit for this project +CVSProjectPropertiesPage_progressTaskName=Updating project's CVS properties +CVSProjectPropertiesPage_setReadOnly=Setting all files read-only +CVSProjectPropertiesPage_clearReadOnly=Setting all files writable +CVSRepositoryPropertiesPage_Confirm_Project_Sharing_Changes_1=Confirm Project Sharing Changes +CVSPreferencePage_Save_dirty_editors_before_CVS_operations_1= +CVSRepositoryPropertiesPage_There_are_projects_in_the_workspace_shared_with_this_repository_2=There are projects in the workspace shared with this repository. The projects will be updated with the new information that you have entered +CVSRepositoryPropertiesPage_sharedProject=The projects that are shared with {0} are: +CVSRepositoryPropertiesPage_useDefaultProgramName=Expect the &default program name "cvs" in text message prefixes from this server +CVSRepositoryPropertiesPage_useProgramName=Expect a custom &program name: +CVSRepositoryPropertiesPage_useLocationAsLabel=Use the &repository identification string as the label +CVSRepositoryPropertiesPage_useCustomLabel=Use a custom &label: + +CVSProjectSetSerializer_Confirm_Overwrite_Project_8=Confirm Overwrite Project +CVSProjectSetSerializer_The_project__0__already_exists__Do_you_wish_to_overwrite_it__9=The project {0} already exists. Do you wish to overwrite it? + +IgnoreResourcesDialog_titleSingle=Add {0} to .cvsignore +IgnoreResourcesDialog_titleMany=Add {0} resources to .cvsignore +IgnoreResourcesDialog_prompt=Select what to add to the .cvsignore file(s): +IgnoreResourcesDialog_addNameEntryButton=Resource(s) by name +IgnoreResourcesDialog_addNameEntryExample=Examples: file1.so, file2.so, .rcfile, bin +IgnoreResourcesDialog_addExtensionEntryButton=Wildcard extension +IgnoreResourcesDialog_addExtensionEntryExample=Examples: *.so, *.rcfile, bin +IgnoreResourcesDialog_addCustomEntryButton=Custom pattern +IgnoreResourcesDialog_addCustomEntryExample=The wildcard characters '*' and '?' are permitted. +IgnoreResourcesDialog_patternMustNotBeEmpty=Pattern must not be empty. +IgnoreResourcesDialog_patternDoesNotMatchFile=Pattern does not match all selected resources: e.g. {0} + +ContentAction_Confirm_Long_Operation_1=Confirm Long Operation +ContentAction_Changing_this_setting_will_involve_contacting_the_server_and_may_be_long_running_2=Changing this setting will involve contacting the server and may be long-running + +CVSProjectPropertiesPage_You_can_change_the_sharing_of_this_project_to_another_repository_location__However__this_is_only_possible_if_the_new_location_is___compatible____on_the_same_host_with_the_same_repository_path___1=You can change the sharing of this project to another repository location. However, this is only possible if the new location is \"compatible\" (on the same host with the same repository path). + +ConfigurationWizardMainPage_Location_1=Location +ConfigurationWizardMainPage_Authentication_2=Authentication +ConfigurationWizardMainPage_Connection_3=Connection +AlternateUserValidationDialog_Enter_Password_2=Enter Password +AlternateUserValidationDialog_OK_6=OK +AlternateUserValidationDialog_Cancel_7=Cancel +AlternateUserValidationDialog_message=Enter the password for {0}: +WorkbenchUserAuthenticator_The_operation_was_canceled_by_the_user_1=The operation was canceled by the user +CVSCatchupReleaseViewer_No_workspace_file_1=No workspace file +CVSCatchupReleaseViewer_Select__Outgoing_Additions_1=Select New Reso&urces +ForceCommitSyncAction_Outgoing_Changes_Not_Added_1=Outgoing Changes Not Added +ForceCommitSyncAction_You_have_chosen_to_commit_new_resources_which_have_not_been_added_to_version_control__Do_you_wish_to_add_them_to_version_control_now__2=You have chosen to commit new resources which have not been added to version control. Do you wish to add them to version control now? + +WorkingSetSelectionArea_workingSetOther=&Other... +ListSelectionArea_selectAll=&Select All +ListSelectionArea_deselectAll=&Deselect All + +RestoreFromRepositoryWizard_fileSelectionPageTitle=Restore from Repository +RestoreFromRepositoryWizard_fileSelectionPageDescription=Select the revision of each file that should be restored. +RestoreFromRepositoryFileSelectionPage_fileSelectionPaneTitle={0} - Select file to be restored: +RestoreFromRepositoryFileSelectionPage_revisionSelectionPaneTitle={0} - Check revision to be restored: +RestoreFromRepositoryFileSelectionPage_fileToRestore={0} ({1} to be restored) +RestoreFromRepositoryFileSelectionPage_fileContentPaneTitle={0} {1} in ''{2}'' +RestoreFromRepositoryFileSelectionPage_emptyRevisionPane=Remote revisions of selected file: +RestoreFromRepositoryFileSelectionPage_fileExists=File ''{0}'' already exists locally. +RestoreFromRepositoryFileSelectionPage_revisionIsDeletion=Revision {0} of {1} is the deletion and can not be restored. Select another revision of this file. +RestoreFromRepositoryAction_noFilesTitle=No Deleted Files Found +RestoreFromRepositoryAction_noFilesMessage=There were no deleted files found on the repository in folder ''{0}''. + +RepositoryRoot_folderInfoMissing=Local folder ''{0}'' is not properly mapped to a remote folder. + +RepositoriesViewContentHandler_unmatchedTag=No matching end tag found for tag ''{0}'' while reading repositories View configuration file. +RepositoriesViewContentHandler_missingAttribute=Required attribute ''{1}'' missing from tag ''{0}'' while reading repositories View configuration file. +RepositoriesViewContentHandler_errorCreatingRoot=An error occurred trying to create repository ''{0}''. + +CVSWorkingSetFolderSelectionPage_projectSelectionPageTitle=CVS Working Set +CVSWorkingSetFolderSelectionPage_projectSelectionPageDescription=Enter a working set name and select the working set folders. +CVSWorkingSetFolderSelectionPage_name=&Working set name: +CVSWorkingSetFolderSelectionPage_treeLabel=Working &set contents: +CVSWorkingSetFolderSelectionPage_refresh=&Refresh Contents +CVSWorkingSetFolderSelectionPage_invalidWorkingSetName=The name must contain only letters and digits. +CVSWorkingSetFolderSelectionPage_duplicateWorkingSetName=A working set of the specific name already exists. +CVSWorkingSetFolderSelectionPage_mustSelectFolder=At least one folder must be checked. + +WorkingSetSelectionDialog_title= Select CVS Working Set +WorkingSetSelectionDialog_title_multiSelect= Select CVS Working Sets +WorkingSetSelectionDialog_message= &Select a CVS working set: +WorkingSetSelectionDialog_message_multiSelect= &Select CVS working sets: +WorkingSetSelectionDialog_detailsButton_label= &Edit... +WorkingSetSelectionDialog_newButton_label= &New... +WorkingSetSelectionDialog_removeButton_label= &Remove + +RefreshTagsAction_title=Refresh Branch and Version Tags? +RefreshTagsAction_message=Repository ''{0}'' has {1} projects to refresh. Continue? + +WatchEditPreferencePage_description=Settings for CVS Watch/Edit. +WatchEditPreferencePage_checkoutReadOnly=&Configure projects to use Watch/Edit on checkout +WatchEditPreferencePage_validateEditSaveAction=When read-only files are modified in an editor +WatchEditPreferencePage_edit=Send a CVS &edit notification to the server +WatchEditPreferencePage_highjack=Edit the file &without informing the server +WatchEditPreferencePage_editPrompt=Before a CVS edit notification is sent to the server +WatchEditPreferencePage_neverPrompt=&Never prompt +WatchEditPreferencePage_alwaysPrompt=Always &prompt +WatchEditPreferencePage_onlyPrompt=&Only prompt if there are other editors + +Uneditaction_confirmMessage=Overwrite local changes to edited files? +Uneditaction_confirmTitle=Confirm Unedit + +FileModificationValidator_promptTitle=CVS Edit Files? +FileModificationValidator_promptMessage=There are read-only files being modified. Should a 'cvs edit' be performed? +FileModificationValidator_vetoMessage=User vetoed file modification + +RefreshRemoteProjectWizard_title=Refresh Branches +RefreshRemoteProjectWizard_0=Tags not found for some modules +RefreshRemoteProjectWizard_1=Search Deeply +RefreshRemoteProjectWizard_2=Skip +RefreshRemoteProjectWizard_3=Tags were not found on module {0} using the auto-refresh files and a shallow cvs log operation. You can choose to search this module using a deep cvs log operation or skip it. +RefreshRemoteProjectWizard_4=Tags were not found on {0} modules using the auto-refresh files and a shallow cvs log operation. You can choose to search these module using a deep cvs log operation or skip them. +RefreshRemoteProjectSelectionPage_pageTitle=Select Projects +RefreshRemoteProjectSelectionPage_pageDescription=Select the remote projects whose tags should be refreshed. +RefreshRemoteProjectSelectionPage_selectRemoteProjects=This wizard helps discover the tags associated with one or more remote projects. &Check the projects whose tags you wish to refresh. +RefreshRemoteProjectSelectionPage_noWorkingSet=Do not &use a working set +RefreshRemoteProjectSelectionPage_workingSet=Select a &working set (matching projects will be checked): + +EditorsView_file=File name +EditorsView_user=User name +EditorsView_date=Date +EditorsView_computer=Computer name + +EditorsDialog_title=Editors +EditorsDialog_question=The resource already has editors. Do you still want to edit the resource and send a CVS edit notification to server? +EditorsAction_classNotInitialized={0} not initialized + +SynchronizeProjectsDialog_title=Synchronize CVS Projects +SynchronizeProjectsDialog_selectProjects=Projects to be synchronized +SynchronizeProjectsDialog_syncOutgoingChanges=Only synchronize projects with outgoing &changes +SynchronizeProjectsDialog_allSharedProjects=Include &all projects shared with CVS +SynchronizeProjectsDialog_sharedWorkingSetProjects=Include &working set resources shared with CVS: + +RemoteFileEditorInput_fullPathAndRevision={0} {1} + +CheckoutOperation_thisResourceExists=The resource ''{0}'' already exists in the workspace and will be deleted. Proceed with the check out of ''{1}''? +CheckoutOperation_thisExternalFileExists=The folder ''{0}'' exists in the local file system and will be deleted. Proceed with the check out of ''{1}''? +CheckoutOperation_confirmOverwrite=Confirm Overwrite +CheckoutOperation_scrubbingProject=Scrubbing project ''{0}''. +CheckoutOperation_refreshingProject=Configuring project ''{0}''. + +CheckoutSingleProjectOperation_taskname=Checking out ''{0}'' from CVS +CheckoutMultipleProjectsOperation_taskName=Checking out {0} folders from CVS + +CheckoutIntoOperation_taskname=Checking out {0} folders from CVS into ''{1}'' +CheckoutIntoOperation_targetIsFile=Folder ''{0}'' cannot be checked out because file ''{1}'' is in the way. +CheckoutIntoOperation_targetIsFolder=Folder ''{0}'' cannot be checked out because folder ''{1}'' is in the way. +CheckoutIntoOperation_targetIsPrunedFolder=Folder ''{0}'' cannot be checked out because it conflicts with the pruned folder ''{1}''. +CheckoutIntoOperation_mappingAlreadyExists=Cannot checkout remote folder ''{0}'' into ''{1}'' because local folder ''{2}'' is already mapped to remote folder ''{0}''. +CheckoutIntoOperation_cancelled=Checkout of ''{1}'' cancelled by user. +CheckoutIntoOperation_overwriteMessage=Folder ''{0}'' already exists and will be deleted. Continue? + +AddToWorkspace_taskName1=Checking out ''{0}'' from CVS +AddToWorkspace_taskNameN=Checking out {0} folders from CVS + +CheckoutAsAction_checkoutFailed=Problems encountered performing checkout + +CheckoutAsAction_enterProjectTitle=Check Out {0} As... +CheckoutAsAction_enterLocationTitle=Check Out {0} Projects As... +CheckoutAsAction_taskname=Checking out "{0}" from CVS as "{1}" +CheckoutAsAction_multiCheckout=Checking out {0} projects from CVS + +CheckoutAsWizard_title=Check Out As +CheckoutAsWizard_error=Problems encountered performing checkout +CheckoutAsMainPage_title=Check Out As +CheckoutAsMainPage_description=Select the method of check out +CheckoutAsMainPage_singleFolder=Choose how to check out folder ''{0}'' +CheckoutAsMainPage_asConfiguredProject=Check out as a project &configured using the New Project Wizard +CheckoutAsMainPage_asSimpleProject=Check out as a &project in the workspace +CheckoutAsMainPage_projectNameLabel=&Project Name: +CheckoutAsMainPage_multipleFolders=Choose how to check out the {0} folders +CheckoutAsMainPage_asProjects=Check out into the &workspace as projects +CheckoutAsMainPage_intoProject=Check out &into an existing project + +CheckoutAsLocationSelectionPage_title=Check Out As +CheckoutAsLocationSelectionPage_description=Select the project location +CheckoutAsLocationSelectionPage_useDefaultLabel=Use default &workspace location +CheckoutAsLocationSelectionPage_locationLabel=&Location: +CheckoutAsLocationSelectionPage_parentDirectoryLabel=&Directory: +CheckoutAsLocationSelectionPage_browseLabel=&Browse... +CheckoutAsLocationSelectionPage_locationEmpty=Project contents directory must be specified. +CheckoutAsLocationSelectionPage_invalidLocation=Invalid location path. +CheckoutAsLocationSelectionPage_messageForSingle=Select the parent directory for project {0}. +CheckoutAsLocationSelectionPage_messageForMulti=Select the parent directory for the {0} projects. + +CheckoutAsProjectSelectionPage_title=Check Out Into +CheckoutAsProjectSelectionPage_description=Select the local folder that is the target of the checkout operation. +CheckoutAsProjectSelectionPage_name=Target folder &name: +CheckoutAsProjectSelectionPage_treeLabel=&Parent of target folder: +CheckoutAsProjectSelectionPage_showLabel=&Filter project list: +CheckoutAsProjectSelectionPage_recurse=&Checkout subfolders +CheckoutAsProjectSelectionPage_showAll=Show all valid target projects +CheckoutAsProjectSelectionPage_showUnshared=Show unshared projects +CheckoutAsProjectSelectionPage_showSameRepo=Show projects shared with the same repository +CheckoutAsProjectSelectionPage_invalidFolderName=''{0}'' is not a valid folder name + +TargetLocationSelectionDialog_projectNameLabel=&Project Name: +TargetLocationSelectionDialog_useDefaultLabel=Use default &workspace location +TargetLocationSelectionDialog_locationLabel=&Location: +TargetLocationSelectionDialog_parentDirectoryLabel=&Directory: +TargetLocationSelectionDialog_browseLabel=&Browse... +TargetLocationSelectionDialog_messageForSingle=Select the parent directory for project {0}. +TargetLocationSelectionDialog_messageForMulti=Select the parent directory for the {0} projects. +TagetLocationSelectionDialog_locationEmpty=Project contents directory must be specified. +TagetLocationSelectionDialog_invalidLocation=Invalid location path. +TagetLocationSelectionDialog_alreadyExists=Project {0} already exists. +CheckoutIntoWizard_title=Checkout Into +CheckoutIntoWizard_projectSelectionPageTitle=Select local folder +CheckoutIntoWizard_projectSelectionPageDescription=Select the local folder that is the target of the checkout operation. +CheckoutIntoWizard_error=Checkout Error + +WorkspaceChangeSetCapability_1=New Set +OpenCommitSetAction_20=Open Change in Compare Editor +OpenCommitSetAction_21=Could not determine the repository location of the selected resources +WorkspaceChangeSetCapability_2=New Change Set +WorkspaceChangeSetCapability_3=Enter the name and comment for the new change set +CVSChangeSetCollector_4=Retrieving revision histories +CVSChangeSetCollector_0=Unassigned Remote Changes +WorkspaceChangeSetCapability_7=Edit Change Set Comment +WorkspaceChangeSetCapability_8=Edit the name and comment for the change set + +CheckoutIntoWizard_thisResourceExists=The resource ''{0}'' already exists in the workspace. Overwrite? +CheckoutIntoWizard_confirmOverwrite=Confirm Overwrite +CheckoutIntoWizard_mappingAlreadyExists=Cannot add remote folder ''{0}'' to project ''{1}'' as ''{2}'' because local folder ''{3}'' is already mapped to that folder. +CheckoutIntoProjectSelectionPage_description=Choose the name and parent folder where ''{0}'' should be checked out to. +CheckoutIntoProjectSelectionPage_name=Target folder &name: +CheckoutIntoProjectSelectionPage_treeLabel=&Parent of target folder: +CheckoutIntoProjectSelectionPage_showLabel=&Filter project list: +CheckoutIntoProjectSelectionPage_showAll=Show all valid target projects +CheckoutIntoProjectSelectionPage_showUnshared=Show unshared projects +CheckoutIntoProjectSelectionPage_showSameRepo=Show projects shared with the same repository +CheckoutIntoProjectSelectionPage_recurse=&Checkout subfolders +CheckoutIntoProjectSelectionPage_invalidFolderName=''{0}'' is not a valid folder name + +HasProjectMetaFile_taskName=Looking for a remote meta file +TagFromWorkspace_taskName=Tagging from workspace +TagFromRepository_taskName=Tagging from repository +UpdateOnlyMergeable_taskName=Updating mergeable changes +UpdateDialog_overwriteTitle=Overwrite Local Changes? +UpdateDialog_overwriteMessage=Do you want to overwrite local changes? +ReplaceOperation_taskName=CVS Replace +UpdateOperation_taskName=CVS Update + +SafeUpdateAction_warnFilesWithConflictsTitle=Non-mergeable files +SafeUpdateAction_warnFilesWithConflictsDescription=Some conflicting files cannot be merged automatically with the update action. They contain conflicting changes that will have to be merged manually. Use the Synchronize View to find the conflicts then merge the changes in a compare editor. + +Error_unableToShowSyncView=Error opening Synchronize View. Please ensure that the Team plugin is installed correctly. +ShowAnnotationAction_1=Unexpected response from CVS Server: {0} +ShowAnnotationAction_2=Annotate Binary File? +ShowAnnotationAction_3=File {0} is marked as a binary file. The CVS annotation operation only works properly for files that contain text. Do you wish to continue? + +UpdateAction_jobName=CVS Update +MergeUpdateAction_jobName=CVS Merge +MergeUpdateAction_invalidSubscriber=Invalid subscriber: {0} +CommitAction_jobName=CVS Commit + +CommitCommentArea_0=<Click here to enter a commit comment> +CommitCommentArea_1=<Choose a previously entered comment> +CommitCommentArea_2=Empty commit comment +CommitCommentArea_3=The commit comment is empty. Are you sure you would like to continue with an empty comment? +CommitCommentArea_4=Re&member decision? + +OverrideAndUpdateAction_jobName=Performing CVS Override and Update on {0} resources +WorkInProgressPreferencePage_6=None + + + +CheckoutProjectOperation_8=Checking out ''{0}'' into project ''{1}'' +CheckoutProjectOperation_9=Checking out ''{0}'' into {1} projects +CheckoutProjectOperation_0=Checkout of remote folder {0} cancelled by user +CVSOperation_0=Errors occured in {0} of {1} operations. +CVSOperation_1=Show CVS Console +CVSOperation_2=Show CVS Console +CVSModelElement_0=Error +CVSModelElement_1=Error fetching resource list from repository. +CVSDecorator_exceptionMessage=Errors occured while applying CVS decorations to resources. +FetchMembersOperation_0=Fetching members of {0} + +RemoteRevisionQuickDiffProvider_readingFile=Error reading remote file +RemoteRevisionQuickDiffProvider_closingFile=Error closing remote file +RemoteRevisionQuickDiffProvider_fetchingFile=CVS QuickDiff: fetching remote contents +RemoteCompareOperation_0=Comparing tags {0} and {1} of {2} + +WorkspaceToolbarCommitAction_label=Commit +WorkspaceToolbarCommitAction_tooltip=Commit All Outgoing Changes... +WorkspaceToolbarCommitAction_description=Commit All Outgoing Changes... +WorkspaceToolbarCommitAction_image=checkin_action.gif + +WorkspaceToolbarUpdateAction_label=Update +WorkspaceToolbarUpdateAction_tooltip=Update All Incoming Changes... +WorkspaceToolbarUpdateAction_description=Update All Incoming Changes... +WorkspaceToolbarUpdateAction_image=checkout_action.gif + +SharingWizardIgnore_label=Ignore +SharingWizardIgnore_tooltip=Ignore Selected Resources... +SharingWizardIgnore_description=Ignore Selected Resources... +SharingWizardIgnore_image=ignorefiles.gif + +ConsoleRemoveAction_label=Close CVS Console +ConsoleRemoveAction_tooltip=Close CVS console +ConsoleRemoveAction_image=participant_rem.gif + +WorkspaceUpdateAction_label=&Update +WorkspaceUpdateAction_tooltip=Perform an update on the selected resources +WorkspaceUpdateAction_helpContextId=org.eclipse.team.cvs.ui.workspace_update_action + +OverrideAndUpdateAction_label=O&verride and Update +OverrideAndUpdateAction_tooltip=Perform an override and update on the selected resources. This will make the local contents equal to the remote ignoring any local changes. +OverrideAndUpdateAction_helpContextId=org.eclipse.team.cvs.ui.workspace_overupdate_action + +RefreshDirtyStateAction_label=C&lean Timestamps +RefreshDirtyStateOperation_0=Problems encountered cleaning timestamps +RefreshDirtyStateOperation_1=CVS Clean Timestamps +RefreshDirtyStateAction_tooltip=Reset the dirty state of out-of-sync files whose contents match the server contents +RefreshDirtyStateAction_helpContextId=org.eclipse.team.cvs.ui.workspace_refresh_dirty_state_action_context + +WorkspaceCommitAction_label=&Commit... +WorkspaceCommitAction_tooltip=Perform a commit on the selected resources +WorkspaceCommitAction_helpContextId="org.eclipse.team.cvs.ui.workspace_commit_action + +OverrideAndCommitAction_label=Override and Comm&it... +OverrideAndCommitAction_tooltip=Perform an override and commit on the selected resources. This will make the remote contents equal to the local ignoring any remote changes. +OverrideAndCommitAction_helpContextId=org.eclipse.team.cvs.ui.workspace_overcommit_action + +ConfirmMergedAction_label=&Mark as Merged +ConfirmMergedAction_tooltip=Mark the conflict as merged by upgrading the base to match the remote +ConfirmMergedAction_helpContextId=org.eclipse.team.cvs.ui.workspace_confirm_merged_action + +BranchAction_label=&Branch... +BranchAction_tooltip=Branch + +IgnoreAction_label=A&dd to .cvsignore... +IgnoreAction_0=Ignoring selected resources for project {0} +IgnoreAction_1=Ignoring Resources +IgnoreAction_tooltip=Ignore the Selected Resources when Synchronizing + +ShowResourceInHistoryAction_label=Show in Resource &History +ShowResourceInHistoryAction_tooltip=Show in Resource History + +ShowAnnotationAction_label=Show &Annotation +ShowAnnotationAction_tooltip=Show Annotation + +GenerateDiffFileAction_label=Create &Patch... +GenerateDiffFileOperation_0=The file could not be written. Possible reasons are the directory is write-protected or not enough disk space is available. +GenerateDiffFileOperation_1=The file could not be written due to an I/O error. +GenerateDiffFileOperation_2=An I/O error occured. +GenerateDiffFileWizard_0=Please enter a valid location. +GenerateDiffFileWizard_2=Please enter a file name. +GenerateDiffFileWizard_3=The specified directory does not exist. +GenerateDiffFileWizard_4=Please select a location in the workspace. +GenerateDiffFileWizard_5=Please enter a valid filename. +GenerateDiffFileAction_tooltip=Compare your workspace contents with the server and generate a diff file that can be used as a patch file. + +MergeUpdateAction_label=&Update +MergeUpdateAction_tooltip=Perform an update merge on the selected resources +MergeUpdateAction_helpContextId=org.eclipse.team.cvs.ui.merge_update_action + +CompareRevertAction_label=&Override and Update +CompareRevertAction_tooltip=Revert the local file contents to match that of their corresponding remotes +CompareRevertAction_helpContextId=org.eclipse.team.cvs.ui.compare_revert_action + +SharingCommitAction_label=Commit +SharingCommitAction_tooltip=Commit All Changes... +SharingCommitAction_description=Commit All Changes... +SharingCommitAction_image=checkin_action.gif + +MergeSynchronizeParticipant_8=Missing id initializing cvs merge participant +MergeSynchronizeParticipant_9=Unable to initialize cvs merge subscriber +MergeSynchronizeParticipant_10=Could not restore CVS Merge in Synchronize view: {0} +MergeSynchronizeParticipant_11=Root resource in cvs merge subscriber is no longer in workspace, ignoring: {0} +MergeSynchronizeParticipant_12=Missing root resources for cvs merge subscriber: {0} +DisconnectOperation_0=Disconnecting +DisconnectOperation_1=Disconnecting {0} +SubscriberConfirmMergedAction_0=Synchronization information is missing for resource {0} +SubscriberConfirmMergedAction_jobName=Performing a CVS Mark as Merged operation on {0} resources. +CVSSubscriberAction_0=Invalid attemp to make unsupervised resource {0} in-sync. +ReleaseCommentDialog_6=Review resources that will be committed: +ReconcileProjectOperation_0=Reconciling project {0} with remote folder {1} +CheckoutToRemoteFolderOperation_0=Downloading folder {0} +CVSRepositoryPropertiesPage_21=Use this location's connection information for all connections +CVSRepositoryPropertiesPage_22=Use the following locations for read and write access +CVSRepositoryPropertiesPage_23=Read: +CVSRepositoryPropertiesPage_24=Write: +CVSRepositoryPropertiesPage_0=Confirm Host or Path Change +CVSRepositoryPropertiesPage_1=You have chosen to change the host name or repository root path for this location. You should ensure that this new information still identifies the same repository. +CompareRevertAction_0=Reverting {0} resources +CompareParticipant_0={0} ({1}) + +ComparePreferencePage_0=Options for CVS comparisons: +ComparePreferencePage_1=Show the &file author in compare editors +ComparePreferencePage_2=Automatically enable chan&ge set grouping in CVS synchronizations +ComparePreferencePage_3=Show revision &comparisons in a dialog +ComparePreferencePage_4=Con&sider file contents in comparisons +ComparePreferencePage_6=See <a>''{0}''</a> for compare editor preferences. + +FileModificationValidator_3=Perform Edit? +FileModificationValidator_4=A CVS edit notification is required to be sent to the server in order to allow editing of one or more selected files. Continue? +CVSSynchronizeViewPage_0=Show incoming grouped by comment +CVSSynchronizeWizard_0=Unknown +Participant_comparing=Comparing +Participant_merging=Merging +Participant_synchronizing=Synchronizing + +Participant_comparingDetail=Comparing {0} with {1} +Participant_mergingDetail=Merging {0} +Participant_synchronizingDetail=Synchronizing {0} + +CompareWithRevisionAction_4=Compare With Revision +ReplaceWithRevisionAction_0=&Replace +ReplaceWithRevisionAction_1=Replace With Revision + +ConsolePreferencesPage_4=&Show CVS console automatically when command is run +ConsolePreferencesPage_5=&Limit console output +ConsolePreferencesPage_6=&Fixed width console +ConsolePreferencesPage_7=Character &width: +ConsolePreferencesPage_8=&Console &buffer size (characters): +ConsolePreferencesPage_9=CVS Console Settings: + +SharingWizard_23=Share Project Resources +SharingWizard_24=Review and commit resources to the repository. Use the context menu to perform additional operations on the resources. +SharingWizard_25=Module ''{0}'' exists on the server. Select the tag to synchronize with. +SharingWizardSyncPage_0=Sharing +ReconcileProjectOperation_1=Local resource {0} is a file while the corresponding remote {1} is a folder +ReconcileProjectOperation_2=Local resource {0} is a folder while the corresponding remote {1} is a file +ShareProjectOperation_0=Sharing project {0} as {1} +SharingWizard_26=Keep Sharing? +SharingWizard_27=Project {0} has been mapped to a remote module. Should this mapping be kept? +SharingWizardSyncPage_3=The resources of project {0} are in-sync with the repository. +SharingWizardSyncPage_4=An error has occurred populating this view. +SharingWizardSyncPage_5=Show Errors +SharingWizardSyncPage_8=Errors Occurred +SharingWizardSyncPage_9=The following errors occurred. +SharingWizardSyncPage_10=Commit Changes? +SharingWizardSyncPage_11=There are still uncommitted changes that have not been shared. Should these changes be committed? +SharingWizardSyncPage_12=Launch the &Commit wizard +ShareProjectOperation_1=Calculating synchronization states +CVSProjectPropertiesPage_31=Show only compatible repository locations +CVSProjectPropertiesPage_32=Confirm +CVSProjectPropertiesPage_33=The selected repository location may not be compatible with the current location. Are you sure you want to change sharing to the new location? +RepositoryEncodingPropertyPage_2=Identify the file system encoding used by the server where the repository is located. Setting this will allow file names and commit comments to be properly translated between the client and server in cases where the server encoding differs from the client. +RepositoryEncodingPropertyPage_3=Server Encoding +RepositoryEncodingPropertyPage_0=Cannot Change Encoding +RepositoryEncodingPropertyPage_1=Location {0} no longer exists. +RepositoryEncodingPropertyPage_4=Note: this setting does not apply to file content encodings. File content encodings can be set on the Workbench/Editors preference page and on the Info property page of a project. +CheckoutWizard_7=Checkout Project from CVS Repository +CheckoutWizard_8=This wizard allows you to checkout projects from a CVS Repository. +CheckoutWizard_0=Checkout from CVS +CheckoutWizard_10=Select Module +CheckoutWizard_11=Select the module to be checked out from CVS +ModuleSelectionPage_2=Use an existing &module (this will allow you to browse the modules in the repository) +CheckoutAsWizard_3=Select Tag +CheckoutAsWizard_4=Choose the tag to check out from +CheckoutAsMainPage_10=(Only available when the .project file does not exist in the repository) +CVSTeamProvider_updatingFile=Updating {0} +CVSTeamProvider_makeBranch=Creating branch +CVSTeamProvider_folderInfo=Updating folder synchronization information for project {0} +CVSTeamProvider_updatingFolder=Updating {0} +AddOperation_0=Adding {0} +BranchOperation_0=Branching +BranchOperation_1=Branching {0} +CommitOperation_0=Committing {0} +CommitSetDialog_0=&Name: +CommitSetDialog_2=Use the &title as the commit comment +CommitSetDialog_3=Enter a commit &comment +CommitWizard_0=Committing resources +CommitWizard_1=Committing resources +CommitWizard_2=Commit files +CommitWizard_3=CommitWizard +CommitWizard_4=Collecting outgoing changes +CommitWizard_6=Nothing to Commit +CommitWizard_7=The selected resouces do not contain any changes. +UpdateOperation_0=Updating {0} +ReplaceOperation_0=Replacing {0} +ReplaceOperation_1=Scrubbing {0} +TagOperation_0=Tagging {0} +RemoteAnnotationStorage_1=As error occurred computing the content type of remote resource {0} +DateTagCategory_0=Dates +DateTagDialog_0=Date (M/D/Y): +DateTagDialog_1=Include time component in tag +DateTagDialog_2=Time (HH:MM:SS): +DateTagDialog_3=Time is local +DateTagDialog_4=Time is in universal time coordinates (UTC) +DateTagDialog_5=Create Date Tag +WorkbenchPreference_defaultEncoding = Defaul&t ({0}) +WorkbenchPreference_otherEncoding = &Other: +WorkbenchPreference_unsupportedEncoding = The selected encoding is not supported. + +LogEntryCacheUpdateHandler_0=Errors have occured while maintaining the log entry cache. +LogEntryCacheUpdateHandler_1=Updating revision histories +LogEntryCacheUpdateHandler_2=Could not fetch revision histories due to an internal timeout. +MultiFolderTagSource_0={0} folders +LocalProjectTagSource_0={0} Projects +AnnotateView_0=Could not find an appropriate editor +ModeWizard_0=ModeWizard +ModeWizard_1=Change the ASCII/Binary Property +ModeWizard_2=An error occurred +ModeWizard_3=Setting file transfer mode... +ModeWizard_4=Problems encountered while setting file transfer mode +ModeWizard_5=Errors occured +ModeWizard_6=Warnings occurred + +ModeWizardSelectionPage_2=File +ModeWizardSelectionPage_3=ASCII/Binary Property +ModeWizardSelectionPage_4=Path +ModeWizardSelectionPage_8=&Reset +ModeWizardSelectionPage_9=Reset the selected files to their current mode + +ReplaceWithTagAction_0=There are uncommitted changes in ''{0}'' that will be overwritten. Should ''{0}'' be replaced? +ReplaceWithTagAction_1=The following contain &uncommitted changes that will be overwritten. Check those that should be included in the replace operation. +ReplaceWithTagAction_2=There are uncommitted changes in ''{0}'' that will be overwritten. Should the replace proceed? +ReplaceWithTagAction_4=Replace with Uncommitted Changes +UncommittedChangesDialog_2=Select an item to see the dirty resources it contains. +UncommittedChangesDialog_3=&The dirty resources contained in ''{0}'' +UncommittedChangesDialog_4=&The full path of ''{0}'' +AddWizard_0=Add to Version Control diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/BranchCategory.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/BranchCategory.java index b060bc0e6..0c1ec1851 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/BranchCategory.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/BranchCategory.java @@ -16,9 +16,9 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.team.internal.ccvs.core.CVSException; import org.eclipse.team.internal.ccvs.core.CVSTag; import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; /** * BranchCategory is the model element for the branches category * for a particular repository in the repositories view. Its children @@ -54,6 +54,6 @@ public class BranchCategory extends TagCategory { * @param object The object to get a label for. */ public String getLabel(Object o) { - return Policy.bind("BranchCategory.Branches_1"); //$NON-NLS-1$ + return CVSUIMessages.BranchCategory_Branches_1; //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSModelElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSModelElement.java index 228897409..c0e45bec8 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSModelElement.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSModelElement.java @@ -17,8 +17,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.team.core.TeamException; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.model.IWorkbenchAdapter; @@ -117,7 +117,7 @@ public abstract class CVSModelElement implements IWorkbenchAdapter, IAdaptable { * @param t the exception that occurred. */ protected void handle(Throwable t) { - handle(Policy.bind("CVSModelElement.0"), Policy.bind("CVSModelElement.1"), t); //$NON-NLS-1$ //$NON-NLS-2$ + handle(CVSUIMessages.CVSModelElement_0, CVSUIMessages.CVSModelElement_1, t); //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFilePropertySource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFilePropertySource.java index 1f591a9b7..826cefb53 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFilePropertySource.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFilePropertySource.java @@ -18,9 +18,9 @@ import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; import org.eclipse.team.internal.ccvs.core.ILogEntry; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource; import org.eclipse.ui.views.properties.PropertyDescriptor; @@ -34,30 +34,30 @@ public class CVSRemoteFilePropertySource implements IPropertySource { static protected IPropertyDescriptor[] propertyDescriptors = new IPropertyDescriptor[5]; { PropertyDescriptor descriptor; - String category = Policy.bind("cvs"); //$NON-NLS-1$ + String category = CVSUIMessages.cvs; //$NON-NLS-1$ // resource name - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_NAME, Policy.bind("CVSRemoteFilePropertySource.name")); //$NON-NLS-1$ + descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_NAME, CVSUIMessages.CVSRemoteFilePropertySource_name); //$NON-NLS-1$ descriptor.setAlwaysIncompatible(true); descriptor.setCategory(category); propertyDescriptors[0] = descriptor; // revision - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_REVISION, Policy.bind("CVSRemoteFilePropertySource.revision")); //$NON-NLS-1$ + descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_REVISION, CVSUIMessages.CVSRemoteFilePropertySource_revision); //$NON-NLS-1$ descriptor.setAlwaysIncompatible(true); descriptor.setCategory(category); propertyDescriptors[1] = descriptor; // date - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_DATE, Policy.bind("CVSRemoteFilePropertySource.date")); //$NON-NLS-1$ + descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_DATE, CVSUIMessages.CVSRemoteFilePropertySource_date); //$NON-NLS-1$ descriptor.setAlwaysIncompatible(true); descriptor.setCategory(category); propertyDescriptors[2] = descriptor; // author - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_AUTHOR, Policy.bind("CVSRemoteFilePropertySource.author")); //$NON-NLS-1$ + descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_AUTHOR, CVSUIMessages.CVSRemoteFilePropertySource_author); //$NON-NLS-1$ descriptor.setAlwaysIncompatible(true); descriptor.setCategory(category); propertyDescriptors[3] = descriptor; // comment - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_COMMENT, Policy.bind("CVSRemoteFilePropertySource.comment")); //$NON-NLS-1$ + descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_COMMENT, CVSUIMessages.CVSRemoteFilePropertySource_comment); //$NON-NLS-1$ descriptor.setAlwaysIncompatible(true); descriptor.setCategory(category); propertyDescriptors[4] = descriptor; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFolderPropertySource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFolderPropertySource.java index f857f72e0..5dfa789c2 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFolderPropertySource.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFolderPropertySource.java @@ -13,8 +13,8 @@ package org.eclipse.team.internal.ccvs.ui.model; import org.eclipse.team.internal.ccvs.core.CVSTag; import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource; import org.eclipse.ui.views.properties.PropertyDescriptor; @@ -26,15 +26,15 @@ public class CVSRemoteFolderPropertySource implements IPropertySource { static protected IPropertyDescriptor[] propertyDescriptors = new IPropertyDescriptor[2]; { PropertyDescriptor descriptor; - String category = Policy.bind("cvs"); //$NON-NLS-1$ + String category = CVSUIMessages.cvs; //$NON-NLS-1$ // resource name - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_NAME, Policy.bind("CVSRemoteFolderPropertySource.name")); //$NON-NLS-1$ + descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_NAME, CVSUIMessages.CVSRemoteFolderPropertySource_name); //$NON-NLS-1$ descriptor.setAlwaysIncompatible(true); descriptor.setCategory(category); propertyDescriptors[0] = descriptor; // tag - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_TAG, Policy.bind("CVSRemoteFolderPropertySource.tag")); //$NON-NLS-1$ + descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_TAG, CVSUIMessages.CVSRemoteFolderPropertySource_tag); //$NON-NLS-1$ descriptor.setAlwaysIncompatible(true); descriptor.setCategory(category); propertyDescriptors[1] = descriptor; @@ -71,7 +71,7 @@ public class CVSRemoteFolderPropertySource implements IPropertySource { if (id.equals(ICVSUIConstants.PROP_TAG)) { CVSTag tag = folder.getTag(); if (tag == null) { - return Policy.bind("CVSRemoteFolderPropertySource.none"); //$NON-NLS-1$ + return CVSUIMessages.CVSRemoteFolderPropertySource_none; //$NON-NLS-1$ } return tag.getName(); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryLocationPropertySource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryLocationPropertySource.java index 0551e7e6c..1f342ee2e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryLocationPropertySource.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryLocationPropertySource.java @@ -12,8 +12,8 @@ package org.eclipse.team.internal.ccvs.ui.model; import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource; import org.eclipse.ui.views.properties.PropertyDescriptor; @@ -25,30 +25,30 @@ public class CVSRepositoryLocationPropertySource implements IPropertySource { static protected IPropertyDescriptor[] propertyDescriptors = new IPropertyDescriptor[5]; { PropertyDescriptor descriptor; - String category = Policy.bind("cvs"); //$NON-NLS-1$ + String category = CVSUIMessages.cvs; //$NON-NLS-1$ // host - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_HOST, Policy.bind("CVSRepositoryLocationPropertySource.host")); //$NON-NLS-1$ + descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_HOST, CVSUIMessages.CVSRepositoryLocationPropertySource_host); //$NON-NLS-1$ descriptor.setAlwaysIncompatible(true); descriptor.setCategory(category); propertyDescriptors[0] = descriptor; // user - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_USER, Policy.bind("CVSRepositoryLocationPropertySource.user")); //$NON-NLS-1$ + descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_USER, CVSUIMessages.CVSRepositoryLocationPropertySource_user); //$NON-NLS-1$ descriptor.setAlwaysIncompatible(true); descriptor.setCategory(category); propertyDescriptors[1] = descriptor; // port - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_PORT, Policy.bind("CVSRepositoryLocationPropertySource.port")); //$NON-NLS-1$ + descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_PORT, CVSUIMessages.CVSRepositoryLocationPropertySource_port); //$NON-NLS-1$ descriptor.setAlwaysIncompatible(true); descriptor.setCategory(category); propertyDescriptors[2] = descriptor; // root - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_ROOT, Policy.bind("CVSRepositoryLocationPropertySource.root")); //$NON-NLS-1$ + descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_ROOT, CVSUIMessages.CVSRepositoryLocationPropertySource_root); //$NON-NLS-1$ descriptor.setAlwaysIncompatible(true); descriptor.setCategory(category); propertyDescriptors[3] = descriptor; // method - descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_METHOD, Policy.bind("CVSRepositoryLocationPropertySource.method")); //$NON-NLS-1$ + descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_METHOD, CVSUIMessages.CVSRepositoryLocationPropertySource_method); //$NON-NLS-1$ descriptor.setAlwaysIncompatible(true); descriptor.setCategory(category); propertyDescriptors[4] = descriptor; @@ -94,7 +94,7 @@ public class CVSRepositoryLocationPropertySource implements IPropertySource { if (id.equals(ICVSUIConstants.PROP_PORT)) { int port = location.getPort(); if (port == ICVSRepositoryLocation.USE_DEFAULT_PORT) { - return Policy.bind("CVSRepositoryLocationPropertySource.default"); //$NON-NLS-1$ + return CVSUIMessages.CVSRepositoryLocationPropertySource_default; //$NON-NLS-1$ } return "" + port; //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSTagElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSTagElement.java index 078882bf2..1e0d9b8da 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSTagElement.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSTagElement.java @@ -17,6 +17,7 @@ import java.util.*; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.resources.RemoteFolder; @@ -123,7 +124,7 @@ public class CVSTagElement extends CVSModelElement implements IDeferredWorkbench try { monitor = Policy.monitorFor(monitor); RemoteFolder folder = new RemoteFolder(null, root, ICVSRemoteFolder.REPOSITORY_ROOT_FOLDER_NAME, tag); - monitor.beginTask(Policy.bind("RemoteFolderElement.fetchingRemoteChildren", root.toString()), 100); //$NON-NLS-1$ + monitor.beginTask(NLS.bind(CVSUIMessages.RemoteFolderElement_fetchingRemoteChildren, new String[] { root.toString() }), 100); //$NON-NLS-1$ FetchMembersOperation operation = new FetchMembersOperation(null, folder, collector); operation.setFilter(new RemoteFolderFilter() { public ICVSRemoteResource[] filter(ICVSRemoteResource[] folders) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/DateTagCategory.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/DateTagCategory.java index 005096462..7cc4eff96 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/DateTagCategory.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/DateTagCategory.java @@ -13,9 +13,9 @@ package org.eclipse.team.internal.ccvs.ui.model; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.team.internal.ccvs.core.*; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; /** * The DateTagCategory is the parent of all the date tags in the repositories view. @@ -44,7 +44,7 @@ public class DateTagCategory extends TagCategory { * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) */ public String getLabel(Object o) { - return Policy.bind("DateTagCategory.0"); //$NON-NLS-1$ + return CVSUIMessages.DateTagCategory_0; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteFileElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteFileElement.java index 951169864..94a57b358 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteFileElement.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteFileElement.java @@ -13,9 +13,10 @@ package org.eclipse.team.internal.ccvs.ui.model; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.ui.PlatformUI; public class RemoteFileElement extends RemoteResourceElement { @@ -39,7 +40,7 @@ public class RemoteFileElement extends RemoteResourceElement { if (!(o instanceof ICVSRemoteFile)) return null; ICVSRemoteFile file = (ICVSRemoteFile)o; try { - return Policy.bind("nameAndRevision", file.getName(), file.getRevision()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.nameAndRevision, new String[] { file.getName(), file.getRevision() }); //$NON-NLS-1$ } catch (TeamException e) { handle(null, null, e); return null; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteFolderElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteFolderElement.java index 9ade2297b..aae7aee9f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteFolderElement.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteFolderElement.java @@ -14,6 +14,7 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.ui.*; @@ -37,7 +38,7 @@ public class RemoteFolderElement extends RemoteResourceElement implements IDefer CVSTag tag = folder.getTag(); if (tag != null && tag.getType() != CVSTag.HEAD) { if (folder.getRemoteParent() == null) { - return Policy.bind("RemoteFolderElement.nameAndTag", folder.getName(), tag.getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.RemoteFolderElement_nameAndTag, new String[] { folder.getName(), tag.getName() }); //$NON-NLS-1$ } } return folder.getName(); @@ -66,7 +67,7 @@ public class RemoteFolderElement extends RemoteResourceElement implements IDefer } try { monitor = Policy.monitorFor(monitor); - monitor.beginTask(Policy.bind("RemoteFolderElement.fetchingRemoteChildren", getLabel(o)), 100); //$NON-NLS-1$ + monitor.beginTask(NLS.bind(CVSUIMessages.RemoteFolderElement_fetchingRemoteChildren, new String[] { getLabel(o) }), 100); //$NON-NLS-1$ FetchMembersOperation operation = new FetchMembersOperation(null, (ICVSRemoteFolder)o, collector); operation.run(Policy.subMonitorFor(monitor, 100)); } catch (InvocationTargetException e) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/VersionCategory.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/VersionCategory.java index c490eb398..6e6120600 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/VersionCategory.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/VersionCategory.java @@ -17,7 +17,6 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.ui.*; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.model.IWorkbenchAdapter; import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; import org.eclipse.ui.progress.IElementCollector; @@ -115,7 +114,7 @@ public class VersionCategory extends CVSModelElement implements IAdaptable, * @param object The object to get a label for. */ public String getLabel(Object o) { - return Policy.bind("VersionCategory.Versions_1"); //$NON-NLS-1$ + return CVSUIMessages.VersionCategory_Versions_1; //$NON-NLS-1$ } /** diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/AddOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/AddOperation.java index f5d42adab..55090f71f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/AddOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/AddOperation.java @@ -15,6 +15,7 @@ import java.util.*; import org.eclipse.core.resources.*; import org.eclipse.core.resources.mapping.ResourceMapping; import org.eclipse.core.runtime.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.Team; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; @@ -24,6 +25,7 @@ import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption; import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; import org.eclipse.team.internal.ccvs.core.connection.CVSServerException; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.IWorkbenchPart; @@ -61,14 +63,14 @@ public class AddOperation extends RepositoryProviderOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName() */ protected String getTaskName() { - return Policy.bind("AddAction.adding"); //$NON-NLS-1$ + return CVSUIMessages.AddAction_adding; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider) */ protected String getTaskName(CVSTeamProvider provider) { - return Policy.bind("AddOperation.0", provider.getProject().getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.AddOperation_0, new String[] { provider.getProject().getName() }); //$NON-NLS-1$ } /* @@ -152,7 +154,7 @@ public class AddOperation extends RepositoryProviderOperation { throw exception[0]; } } catch (CoreException e) { - throw new CVSException(new Status(IStatus.ERROR, CVSProviderPlugin.ID, TeamException.UNABLE, Policy.bind("CVSTeamProvider.visitError", new Object[] {resources[i].getFullPath()}), e)); //$NON-NLS-1$ + throw CVSException.wrapException(e); } } // If an exception occured during the visit, throw it here @@ -224,7 +226,7 @@ public class AddOperation extends RepositoryProviderOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getErrorMessage(org.eclipse.core.runtime.IStatus[], int) */ protected String getErrorMessage(IStatus[] failures, int totalOperations) { - return Policy.bind("AddAction.addFailed"); //$NON-NLS-1$ + return CVSUIMessages.AddAction_addFailed; //$NON-NLS-1$ } protected KSubstOption getKSubstOption(IFile file) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/BranchOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/BranchOperation.java index 8324392e0..56d80f9a8 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/BranchOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/BranchOperation.java @@ -14,6 +14,7 @@ import org.eclipse.core.resources.*; import org.eclipse.core.resources.mapping.ResourceMapping; import org.eclipse.core.runtime.*; import org.eclipse.jface.dialogs.InputDialog; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.client.Command; @@ -24,6 +25,7 @@ import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.syncinfo.*; import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.actions.CVSAction; @@ -59,7 +61,7 @@ public class BranchOperation extends RepositoryProviderOperation { boolean allSticky = areAllResourcesSticky(resources); String initialVersionName = calculateInitialVersionName(resources,allSticky); final BranchPromptDialog dialog = new BranchPromptDialog(getShell(), - Policy.bind("BranchWizard.title"), //$NON-NLS-1$ + CVSUIMessages.BranchWizard_title, //$NON-NLS-1$ resources, allSticky, initialVersionName); @@ -119,7 +121,7 @@ public class BranchOperation extends RepositoryProviderOperation { // Determine the total amount of work int totalWork = (versionTag!= null ? 60 : 40) + (moveToBranch ? 20 : 0); - monitor.beginTask(Policy.bind("CVSTeamProvider.makeBranch"), totalWork); //$NON-NLS-1$ + monitor.beginTask(CVSUIMessages.CVSTeamProvider_makeBranch, totalWork); //$NON-NLS-1$ try { // Build the arguments list ICVSResource[] arguments = getCVSArguments(resources); @@ -203,7 +205,7 @@ public class BranchOperation extends RepositoryProviderOperation { // 512 ticks gives us a maximum of 2048 which seems reasonable for folders and files in a project progress.beginTask(null, 100); final IProgressMonitor monitor = Policy.infiniteSubMonitorFor(progress, 100); - monitor.beginTask(Policy.bind("CVSTeamProvider.folderInfo", provider.getProject().getName()), 512); //$NON-NLS-1$ + monitor.beginTask(NLS.bind(CVSUIMessages.CVSTeamProvider_folderInfo, new String[] { provider.getProject().getName() }), 512); //$NON-NLS-1$ // Visit all the children folders in order to set the root in the folder sync info for (int i = 0; i < resources.length; i++) { @@ -213,7 +215,7 @@ public class BranchOperation extends RepositoryProviderOperation { //ResourceSyncInfo info = file.getSyncInfo(); byte[] syncBytes = file.getSyncBytes(); if (syncBytes != null) { - monitor.subTask(Policy.bind("CVSTeamProvider.updatingFile", file.getName())); //$NON-NLS-1$ + monitor.subTask(NLS.bind(CVSUIMessages.CVSTeamProvider_updatingFile, new String[] { file.getName() })); //$NON-NLS-1$ file.setSyncBytes(ResourceSyncInfo.setTag(syncBytes, tag), ICVSFile.UNKNOWN); } } @@ -221,7 +223,7 @@ public class BranchOperation extends RepositoryProviderOperation { monitor.worked(1); FolderSyncInfo info = folder.getFolderSyncInfo(); if (info != null) { - monitor.subTask(Policy.bind("CVSTeamProvider.updatingFolder", info.getRepository())); //$NON-NLS-1$ + monitor.subTask(NLS.bind(CVSUIMessages.CVSTeamProvider_updatingFolder, new String[] { info.getRepository() })); //$NON-NLS-1$ MutableFolderSyncInfo newInfo = info.cloneMutable(); newInfo.setTag(tag); folder.setFolderSyncInfo(newInfo); @@ -256,14 +258,14 @@ public class BranchOperation extends RepositoryProviderOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName() */ protected String getTaskName() { - return Policy.bind("BranchOperation.0"); //$NON-NLS-1$ + return CVSUIMessages.BranchOperation_0; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider) */ protected String getTaskName(CVSTeamProvider provider) { - return Policy.bind("BranchOperation.1", provider.getProject().getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.BranchOperation_1, new String[] { provider.getProject().getName() }); //$NON-NLS-1$ } /** diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java index 3096afb56..3c825ce5b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java @@ -20,6 +20,7 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.internal.ccvs.core.CVSException; import org.eclipse.team.internal.ccvs.core.CVSStatus; @@ -220,7 +221,7 @@ public abstract class CVSOperation extends TeamOperation { } protected String getErrorMessage(IStatus[] failures, int totalOperations) { - return Policy.bind("CVSOperation.0", String.valueOf(failures.length), String.valueOf(totalOperations)); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CVSOperation_0, new String[] { String.valueOf(failures.length), String.valueOf(totalOperations) }); //$NON-NLS-1$ } /** @@ -365,14 +366,14 @@ public abstract class CVSOperation extends TeamOperation { */ protected IAction getShowConsoleAction() { // Show the console as the goto action - return new Action(Policy.bind("CVSOperation.1")) { //$NON-NLS-1$ + return new Action(CVSUIMessages.CVSOperation_1) { //$NON-NLS-1$ public void run() { CVSOutputConsole console = CVSUIPlugin.getPlugin().getConsole(); if (console != null) console.show(true); } public String getToolTipText() { - return Policy.bind("CVSOperation.2"); //$NON-NLS-1$ + return CVSUIMessages.CVSOperation_2; //$NON-NLS-1$ } }; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java index 4fd3d37f2..1b2201211 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java @@ -15,6 +15,7 @@ import java.util.*; import org.eclipse.core.resources.*; import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.jobs.ISchedulingRule; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.RepositoryProvider; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; @@ -23,6 +24,7 @@ import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer; import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.IWorkbenchPart; @@ -68,7 +70,7 @@ public class CheckoutIntoOperation extends CheckoutOperation { } catch (CVSException e) { CVSUIPlugin.log(e); } - return Policy.bind("CheckoutIntoOperation.taskname", new Integer(remoteFolders.length).toString(), localFolderName); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CheckoutIntoOperation_taskname, new String[] { new Integer(remoteFolders.length).toString(), localFolderName }); //$NON-NLS-1$ } /** @@ -151,7 +153,7 @@ public class CheckoutIntoOperation extends CheckoutOperation { ICVSResource resource = parentFolder.getChild(childPath); if (resource != null && !resource.isFolder()) { // The target folder conflicts with an existing file - addError(new CVSStatus(IStatus.ERROR, Policy.bind("CheckoutIntoOperation.targetIsFile", remoteFolder.getName(), resource.getIResource().getFullPath().toString()))); //$NON-NLS-1$ + addError(new CVSStatus(IStatus.ERROR, NLS.bind(CVSUIMessages.CheckoutIntoOperation_targetIsFile, new String[] { remoteFolder.getName(), resource.getIResource().getFullPath().toString() }))); //$NON-NLS-1$ return null; } targetFolderSet.add(parentFolder.getFolder(childPath)); @@ -197,9 +199,9 @@ public class CheckoutIntoOperation extends CheckoutOperation { // then the remote cannot be loaded. String message; if (targetFolder.exists()) { - message = Policy.bind("CheckoutIntoOperation.targetIsFolder", remoteFolder.getName(), targetFolder.getIResource().getFullPath().toString()); //$NON-NLS-1$ + message = NLS.bind(CVSUIMessages.CheckoutIntoOperation_targetIsFolder, new String[] { remoteFolder.getName(), targetFolder.getIResource().getFullPath().toString() }); //$NON-NLS-1$ } else { - message = Policy.bind("CheckoutIntoOperation.targetIsPrunedFolder", remoteFolder.getName(), targetFolder.getFolderSyncInfo().getRepository()); //$NON-NLS-1$ + message = NLS.bind(CVSUIMessages.CheckoutIntoOperation_targetIsPrunedFolder, new String[] { remoteFolder.getName(), targetFolder.getFolderSyncInfo().getRepository() }); //$NON-NLS-1$ } return new CVSStatus(IStatus.ERROR, message); } @@ -258,12 +260,11 @@ public class CheckoutIntoOperation extends CheckoutOperation { if (resource == null) return; FolderSyncInfo info = folder.getFolderSyncInfo(); if (info.isSameMapping(remoteInfo)) { - throw new CVSException(Policy.bind("CheckoutIntoOperation.mappingAlreadyExists", //$NON-NLS-1$ - new Object[] { - remoteFolder.getName(), - targetFolder.getIResource().getFullPath().toString(), - resource.getFullPath().toString() - })); + throw new CVSException(NLS.bind(CVSUIMessages.CheckoutIntoOperation_mappingAlreadyExists, (new Object[] { + remoteFolder.getName(), + targetFolder.getIResource().getFullPath().toString(), + resource.getFullPath().toString() + }))); } folder.acceptChildren(this); } @@ -287,7 +288,7 @@ public class CheckoutIntoOperation extends CheckoutOperation { for (int i=0;i<targetFolders.length;i++) { ICVSFolder targetFolder = targetFolders[i]; if (needsPromptForOverwrite(targetFolder, Policy.subMonitorFor(monitor, 50)) && !promptToOverwrite(targetFolder)) { - return new CVSStatus(IStatus.INFO, Policy.bind("CheckoutIntoOperation.cancelled", remoteFolder.getName())); //$NON-NLS-1$ + return new CVSStatus(IStatus.INFO, NLS.bind(CVSUIMessages.CheckoutIntoOperation_cancelled, new String[] { remoteFolder.getName() })); //$NON-NLS-1$ } } @@ -305,8 +306,8 @@ public class CheckoutIntoOperation extends CheckoutOperation { private boolean promptToOverwrite(ICVSFolder folder) { return promptToOverwrite( - Policy.bind("CheckoutOperation.confirmOverwrite"), //$NON-NLS-1$ - Policy.bind("CheckoutIntoOperation.overwriteMessage", folder.getName())); //$NON-NLS-1$ + CVSUIMessages.CheckoutOperation_confirmOverwrite, //$NON-NLS-1$ + NLS.bind(CVSUIMessages.CheckoutIntoOperation_overwriteMessage, new String[] { folder.getName() })); //$NON-NLS-1$ } private IStatus scrubFolder(ICVSFolder folder, IProgressMonitor monitor) throws CVSException { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java index cd78b1598..da6f1e617 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java @@ -18,6 +18,7 @@ import org.eclipse.core.resources.*; import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.core.runtime.jobs.MultiRule; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.RepositoryProvider; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; @@ -26,6 +27,7 @@ import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer; import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.IWorkbenchPart; @@ -188,9 +190,9 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation { // changed when the checkout command is run. String taskName; if (targetProjects.length == 1) { - taskName = Policy.bind("CheckoutProjectOperation.8", resource.getName(), targetProjects[0].getName()); //$NON-NLS-1$ + taskName = NLS.bind(CVSUIMessages.CheckoutProjectOperation_8, new String[] { resource.getName(), targetProjects[0].getName() }); //$NON-NLS-1$ } else { - taskName = Policy.bind("CheckoutProjectOperation.9", resource.getName(), String.valueOf(targetProjects.length)); //$NON-NLS-1$ + taskName = NLS.bind(CVSUIMessages.CheckoutProjectOperation_9, new String[] { resource.getName(), String.valueOf(targetProjects.length) }); //$NON-NLS-1$ } pm.beginTask(taskName, 100); pm.setTaskName(taskName); @@ -327,7 +329,7 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation { Policy.checkCanceled(monitor); if (needsPromptForOverwrite(project) && !promptToOverwrite(remoteFolder, project)) { // User said no to this project but not no to all - return new CVSStatus(IStatus.INFO, CVSStatus.CANCEL, Policy.bind("CheckoutProjectOperation.0", remoteFolder.getRepositoryRelativePath())); //$NON-NLS-1$ + return new CVSStatus(IStatus.INFO, CVSStatus.CANCEL, NLS.bind(CVSUIMessages.CheckoutProjectOperation_0, new String[] { remoteFolder.getRepositoryRelativePath() })); //$NON-NLS-1$ } } // Create the projects and remove any previous content @@ -351,7 +353,7 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation { IResource[] children = project.members(IContainer.INCLUDE_TEAM_PRIVATE_MEMBERS); Policy.checkCanceled(monitor); monitor.beginTask(null, 100 + children.length * 100); - monitor.subTask(Policy.bind("CheckoutOperation.scrubbingProject", project.getName())); //$NON-NLS-1$ + monitor.subTask(NLS.bind(CVSUIMessages.CheckoutOperation_scrubbingProject, new String[] { project.getName() })); //$NON-NLS-1$ try { for (int j = 0; j < children.length; j++) { if ( ! children[j].getName().equals(".project")) {//$NON-NLS-1$ @@ -399,8 +401,8 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation { // First, if the project exists in the workspace, prompt if (project.exists()) { if (!promptToOverwrite( - Policy.bind("CheckoutOperation.confirmOverwrite"), //$NON-NLS-1$ - Policy.bind("CheckoutOperation.thisResourceExists", project.getName(), getRemoteModuleName(remoteFolder)))) { //$NON-NLS-1$ + CVSUIMessages.CheckoutOperation_confirmOverwrite, //$NON-NLS-1$ + NLS.bind(CVSUIMessages.CheckoutOperation_thisResourceExists, new String[] { project.getName(), getRemoteModuleName(remoteFolder) }))) { //$NON-NLS-1$ return false; } } @@ -424,8 +426,8 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation { if (localLocation != null && localLocation.exists()) { try { return (promptToOverwrite( - Policy.bind("CheckoutOperation.confirmOverwrite"), //$NON-NLS-1$ - Policy.bind("CheckoutOperation.thisExternalFileExists", localLocation.getCanonicalPath(), getRemoteModuleName(remoteFolder)))); //$NON-NLS-1$ + CVSUIMessages.CheckoutOperation_confirmOverwrite, //$NON-NLS-1$ + NLS.bind(CVSUIMessages.CheckoutOperation_thisExternalFileExists, new String[] { localLocation.getCanonicalPath(), getRemoteModuleName(remoteFolder) }))); //$NON-NLS-1$ } catch (IOException e) { CVSUIPlugin.log(CVSException.wrapException(e)); } @@ -443,7 +445,7 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation { IProject project = projects[i]; // Register the project with Team try { - monitor.subTask(Policy.bind("CheckoutOperation.refreshingProject", project.getName())); //$NON-NLS-1$ + monitor.subTask(NLS.bind(CVSUIMessages.CheckoutOperation_refreshingProject, new String[] { project.getName() })); //$NON-NLS-1$ ICVSFolder folder = CVSWorkspaceRoot.getCVSFolderFor(project); if (folder.isCVSFolder()) { RepositoryProvider.map(project, CVSProviderPlugin.getTypeId()); @@ -464,9 +466,9 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation { protected String getTaskName() { ICVSRemoteFolder[] remoteFolders = getRemoteFolders(); if (remoteFolders.length == 1) { - return Policy.bind("CheckoutSingleProjectOperation.taskname", remoteFolders[0].getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CheckoutSingleProjectOperation_taskname, new String[] { remoteFolders[0].getName() }); //$NON-NLS-1$ } else { - return Policy.bind("CheckoutMultipleProjectsOperation.taskName", new Integer(remoteFolders.length).toString()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CheckoutMultipleProjectsOperation_taskName, new String[] { new Integer(remoteFolders.length).toString() }); //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutToRemoteFolderOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutToRemoteFolderOperation.java index 73ba274f3..bd0fca44f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutToRemoteFolderOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutToRemoteFolderOperation.java @@ -14,12 +14,14 @@ import java.lang.reflect.InvocationTargetException; import java.util.*; import org.eclipse.core.runtime.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.client.*; import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; import org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener; import org.eclipse.team.internal.ccvs.core.resources.RemoteFile; import org.eclipse.team.internal.ccvs.core.resources.RemoteFolderSandbox; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.IWorkbenchPart; @@ -161,7 +163,7 @@ public class CheckoutToRemoteFolderOperation extends CheckoutOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName() */ protected String getTaskName() { - return Policy.bind("CheckoutToRemoteFolderOperation.0", getRemoteFolders()[0].getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CheckoutToRemoteFolderOperation_0, new String[] { getRemoteFolders()[0].getName() }); //$NON-NLS-1$ } protected IStatus checkout(final ICVSRemoteFolder resource, final ICVSFolder sandbox, IProgressMonitor pm) throws CVSException { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CommitOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CommitOperation.java index 84e3aa43a..eed59e8b3 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CommitOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CommitOperation.java @@ -14,11 +14,12 @@ import org.eclipse.core.resources.mapping.ResourceMapping; import org.eclipse.core.resources.mapping.ResourceMappingContext; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.subscribers.SubscriberResourceMappingContext; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.client.*; import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.ui.IWorkbenchPart; /** @@ -47,21 +48,21 @@ public class CommitOperation extends SingleCommandOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName() */ protected String getTaskName() { - return Policy.bind("RepositoryManager.committing"); //$NON-NLS-1$ + return CVSUIMessages.RepositoryManager_committing; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider) */ protected String getTaskName(CVSTeamProvider provider) { - return Policy.bind("CommitOperation.0", provider.getProject().getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CommitOperation_0, new String[] { provider.getProject().getName() }); //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getErrorMessage(org.eclipse.core.runtime.IStatus[], int) */ protected String getErrorMessage(IStatus[] failures, int totalOperations) { - return Policy.bind("CommitAction.commitFailed"); //$NON-NLS-1$ + return CVSUIMessages.CommitAction_commitFailed; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DisconnectOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DisconnectOperation.java index 3a29bf4a3..c1cf2f386 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DisconnectOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DisconnectOperation.java @@ -13,12 +13,13 @@ package org.eclipse.team.internal.ccvs.ui.operations; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.RepositoryProvider; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.ui.IWorkbenchPart; /** @@ -60,14 +61,14 @@ public class DisconnectOperation extends RepositoryProviderOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName() */ protected String getTaskName() { - return Policy.bind("DisconnectOperation.0"); //$NON-NLS-1$ + return CVSUIMessages.DisconnectOperation_0; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider) */ protected String getTaskName(CVSTeamProvider provider) { - return Policy.bind("DisconnectOperation.1", provider.getProject().getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.DisconnectOperation_1, new String[] { provider.getProject().getName() }); //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchMembersOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchMembersOperation.java index 768111b78..21abe7f5a 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchMembersOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchMembersOperation.java @@ -14,10 +14,12 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.resources.RemoteFolder; import org.eclipse.team.internal.ccvs.core.resources.RemoteFolderMemberFetcher; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.IWorkbenchPart; @@ -129,7 +131,7 @@ public class FetchMembersOperation extends RemoteOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName() */ protected String getTaskName() { - return Policy.bind("FetchMembersOperation.0", getRemoteFolder().getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.FetchMembersOperation_0, new String[] { getRemoteFolder().getName() }); //$NON-NLS-1$ } private ICVSRemoteFolder getRemoteFolder() { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/HasProjectMetaFileOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/HasProjectMetaFileOperation.java index 96eddf780..0ec52050f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/HasProjectMetaFileOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/HasProjectMetaFileOperation.java @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.CVSException; import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.ui.IWorkbenchPart; /** @@ -82,7 +82,7 @@ public class HasProjectMetaFileOperation extends CVSOperation { } protected String getTaskName() { - return Policy.bind("HasProjectMetaFile.taskName"); //$NON-NLS-1$ + return CVSUIMessages.HasProjectMetaFile_taskName; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java index 6750aa2d6..52166e2a5 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java @@ -15,6 +15,7 @@ import java.util.Date; import org.eclipse.core.resources.*; import org.eclipse.core.runtime.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.synchronize.SyncInfoFilter.ContentComparisonSyncInfoFilter; @@ -23,6 +24,7 @@ import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.syncinfo.MutableResourceSyncInfo; import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; @@ -44,7 +46,7 @@ public class ReconcileProjectOperation extends ShareProjectOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName() */ protected String getTaskName() { - return Policy.bind("ReconcileProjectOperation.0", getProject().getName(), folder.getRepositoryRelativePath()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.ReconcileProjectOperation_0, new String[] { getProject().getName(), folder.getRepositoryRelativePath() }); //$NON-NLS-1$ } /* (non-Javadoc) @@ -103,7 +105,7 @@ public class ReconcileProjectOperation extends ShareProjectOperation { try { if (resource.getType() == IResource.FILE) { if (remote.isContainer()) { - CVSUIPlugin.log(IStatus.ERROR, Policy.bind("ReconcileProjectOperation.1", resource.getFullPath().toString(), remote.getRepositoryRelativePath()), null); //$NON-NLS-1$ + CVSUIPlugin.log(IStatus.ERROR, NLS.bind(CVSUIMessages.ReconcileProjectOperation_1, new String[] { resource.getFullPath().toString(), remote.getRepositoryRelativePath() }), null); //$NON-NLS-1$ } else { IFile file = (IFile)resource; IResourceVariant variant = (IResourceVariant)remote; @@ -121,7 +123,7 @@ public class ReconcileProjectOperation extends ShareProjectOperation { } } else { if (!remote.isContainer()) { - CVSUIPlugin.log(IStatus.ERROR, Policy.bind("ReconcileProjectOperation.2", resource.getFullPath().toString(), remote.getRepositoryRelativePath()), null); //$NON-NLS-1$ + CVSUIPlugin.log(IStatus.ERROR, NLS.bind(CVSUIMessages.ReconcileProjectOperation_2, new String[] { resource.getFullPath().toString(), remote.getRepositoryRelativePath() }), null); //$NON-NLS-1$ } else { // Map the local folder to the remote folder. // (Note that this will make phantoms for non-exisiting local folders) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java index b8c1bda6b..b723c64e4 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java @@ -14,6 +14,7 @@ import java.util.*; import org.eclipse.compare.CompareUI; import org.eclipse.core.runtime.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Display; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; @@ -384,7 +385,7 @@ public class RemoteCompareOperation extends RemoteOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName() */ protected String getTaskName() { - return Policy.bind("RemoteCompareOperation.0", new Object[] {left.getName(), right.getName(), getRemoteResource().getRepositoryRelativePath()}); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.RemoteCompareOperation_0, (new Object[] {left.getName(), right.getName(), getRemoteResource().getRepositoryRelativePath()})); //$NON-NLS-1$ } protected IWorkbenchPage getTargetPage() { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java index d457218c0..d3132c3ef 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java @@ -15,12 +15,14 @@ import java.util.*; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.client.*; import org.eclipse.team.internal.ccvs.core.client.listeners.*; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.util.Util; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.IWorkbenchPart; @@ -235,7 +237,7 @@ public class RemoteLogOperation extends RepositoryLocationOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryLocationOperation#execute(org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation, org.eclipse.team.internal.ccvs.core.ICVSRemoteResource[], org.eclipse.core.runtime.IProgressMonitor) */ protected void execute(ICVSRepositoryLocation location, ICVSRemoteResource[] remoteResources, IProgressMonitor monitor) throws CVSException { - monitor.beginTask(Policy.bind("RemoteLogOperation.0", location.getHost()), 100); //$NON-NLS-1$ + monitor.beginTask(NLS.bind(CVSUIMessages.RemoteLogOperation_0, new String[] { location.getHost() }), 100); //$NON-NLS-1$ Session s = new Session(location, CVSWorkspaceRoot.getCVSFolderFor(ResourcesPlugin.getWorkspace().getRoot()), false /* do not output to console */); // Create a log listener that will update the cache as entries are received LogListener listener = new LogListener(entryCache); @@ -269,7 +271,7 @@ public class RemoteLogOperation extends RepositoryLocationOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName() */ protected String getTaskName() { - return Policy.bind("RemoteLogOperation.1"); //$NON-NLS-1$ + return CVSUIMessages.RemoteLogOperation_1; //$NON-NLS-1$ } protected Command.LocalOption[] getLocalOptions(CVSTag tag1, CVSTag tag2) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java index acdce2a91..3e435ad8f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java @@ -17,11 +17,13 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.mapping.ResourceMapping; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.client.*; import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; import org.eclipse.team.internal.ccvs.core.util.PrepareForReplaceVisitor; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.IWorkbenchPart; @@ -42,7 +44,7 @@ public class ReplaceOperation extends UpdateOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName() */ protected String getTaskName() { - return Policy.bind("ReplaceOperation.taskName"); //$NON-NLS-1$ + return CVSUIMessages.ReplaceOperation_taskName; //$NON-NLS-1$ } /* (non-Javadoc) @@ -62,7 +64,7 @@ public class ReplaceOperation extends UpdateOperation { new PrepareForReplaceVisitor().visitResources( provider.getProject(), resources, - Policy.bind("ReplaceOperation.1"), //$NON-NLS-1$ + CVSUIMessages.ReplaceOperation_1, //$NON-NLS-1$ recurse ? IResource.DEPTH_INFINITE : IResource.DEPTH_ONE, Policy.subMonitorFor(monitor, 30)); //$NON-NLS-1$ @@ -120,6 +122,6 @@ public class ReplaceOperation extends UpdateOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider) */ protected String getTaskName(CVSTeamProvider provider) { - return Policy.bind("ReplaceOperation.0", provider.getProject().getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.ReplaceOperation_0, new String[] { provider.getProject().getName() }); //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShareProjectOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShareProjectOperation.java index 5c23d263f..505c6a214 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShareProjectOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShareProjectOperation.java @@ -12,6 +12,7 @@ package org.eclipse.team.internal.ccvs.ui.operations; import org.eclipse.core.resources.*; import org.eclipse.core.runtime.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.RepositoryProvider; import org.eclipse.team.core.TeamException; @@ -21,6 +22,7 @@ import org.eclipse.team.internal.ccvs.core.client.Session; import org.eclipse.team.internal.ccvs.core.connection.CVSServerException; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.resources.RemoteFolderTree; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; @@ -165,7 +167,7 @@ public class ShareProjectOperation extends CVSOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName() */ protected String getTaskName() { - return Policy.bind("ShareProjectOperation.0", project.getName(), moduleName); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.ShareProjectOperation_0, new String[] { project.getName(), moduleName }); //$NON-NLS-1$ } /** 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 9b7f108e3..208cb9710 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 @@ -20,6 +20,7 @@ import org.eclipse.core.runtime.*; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialogWithToggle; import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Display; import org.eclipse.team.core.variants.IResourceVariant; import org.eclipse.team.internal.ccvs.core.*; @@ -85,7 +86,7 @@ public class ShowAnnotationOperation extends CVSOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName() */ protected String getTaskName() { - return Policy.bind("ShowAnnotationOperation.taskName"); //$NON-NLS-1$ + return CVSUIMessages.ShowAnnotationOperation_taskName; //$NON-NLS-1$ } protected boolean hasCharset(ICVSResource cvsResource, InputStream contents) { @@ -113,7 +114,7 @@ public class ShowAnnotationOperation extends CVSOperation { try { workbench.showPerspective(defaultPerspectiveID, window); } catch (WorkbenchException e) { - Utils.handleError(window.getShell(), e, Policy.bind("ShowAnnotationOperation.0"), e.getMessage()); //$NON-NLS-1$ + Utils.handleError(window.getShell(), e, CVSUIMessages.ShowAnnotationOperation_0, e.getMessage()); //$NON-NLS-1$ } } @@ -209,9 +210,9 @@ public class ShowAnnotationOperation extends CVSOperation { // Ask the user whether to switch final MessageDialogWithToggle m = MessageDialogWithToggle.openYesNoQuestion( Utils.getShell(null), - Policy.bind("ShowAnnotationOperation.1"), //$NON-NLS-1$ - Policy.bind("ShowAnnotationOperation.2", desired.getLabel()), //$NON-NLS-1$ - Policy.bind("ShowAnnotationOperation.4"), //$NON-NLS-1$ + CVSUIMessages.ShowAnnotationOperation_1, //$NON-NLS-1$ + NLS.bind(CVSUIMessages.ShowAnnotationOperation_2, new String[] { desired.getLabel() }), //$NON-NLS-1$ + CVSUIMessages.ShowAnnotationOperation_4, //$NON-NLS-1$ false /* toggle state */, store, ICVSUIConstants.PREF_CHANGE_PERSPECTIVE_ON_SHOW_ANNOTATIONS); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java index 1fdc61660..a604d8ce7 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java @@ -15,11 +15,12 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.core.runtime.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.client.Command; import org.eclipse.team.internal.ccvs.core.client.RTag; import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.actions.TagAction; import org.eclipse.team.internal.ccvs.ui.tags.TagSource; import org.eclipse.ui.IWorkbenchPart; @@ -57,10 +58,9 @@ public class TagInRepositoryOperation extends RemoteOperation implements ITagOpe */ protected String getErrorMessage(IStatus[] problems, int operationCount) { if(operationCount == 1) { - return Policy.bind("TagInRepositoryAction.tagProblemsMessage"); //$NON-NLS-1$ + return CVSUIMessages.TagInRepositoryAction_tagProblemsMessage; //$NON-NLS-1$ } else { - return Policy.bind("TagInRepositoryAction.tagProblemsMessageMultiple", //$NON-NLS-1$ - Integer.toString(operationCount - problems.length), Integer.toString(problems.length)); + return NLS.bind(CVSUIMessages.TagInRepositoryAction_tagProblemsMessageMultiple, new String[] { Integer.toString(operationCount - problems.length), Integer.toString(problems.length) }); } } @@ -108,7 +108,7 @@ public class TagInRepositoryOperation extends RemoteOperation implements ITagOpe } protected String getTaskName() { - return Policy.bind("TagFromRepository.taskName"); //$NON-NLS-1$ + return CVSUIMessages.TagFromRepository_taskName; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java index e00f4f514..9a779e94a 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java @@ -17,10 +17,12 @@ import java.util.Set; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.mapping.ResourceMapping; import org.eclipse.core.runtime.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.client.*; import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.actions.TagAction; @@ -58,10 +60,9 @@ public class TagOperation extends RepositoryProviderOperation implements ITagOpe protected String getErrorMessage(IStatus[] problems, int operationCount) { // We accumulated 1 status per resource above. if(operationCount == 1) { - return Policy.bind("TagAction.tagProblemsMessage"); //$NON-NLS-1$ + return CVSUIMessages.TagAction_tagProblemsMessage; //$NON-NLS-1$ } else { - return Policy.bind("TagAction.tagProblemsMessageMultiple", //$NON-NLS-1$ - Integer.toString(operationCount - problems.length), Integer.toString(problems.length)); + return NLS.bind(CVSUIMessages.TagAction_tagProblemsMessageMultiple, new String[] { Integer.toString(operationCount - problems.length), Integer.toString(problems.length) }); } } @@ -128,14 +129,14 @@ public class TagOperation extends RepositoryProviderOperation implements ITagOpe } protected String getTaskName() { - return Policy.bind("TagFromWorkspace.taskName"); //$NON-NLS-1$ + return CVSUIMessages.TagFromWorkspace_taskName; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider) */ protected String getTaskName(CVSTeamProvider provider) { - return Policy.bind("TagOperation.0", provider.getProject().getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.TagOperation_0, new String[] { provider.getProject().getName() }); //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java index 5c370438e..d5d1971f9 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java @@ -16,10 +16,11 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.client.*; import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.ui.IWorkbenchPart; /** @@ -57,14 +58,14 @@ public class UpdateOnlyMergableOperation extends SingleCommandOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName() */ protected String getTaskName() { - return Policy.bind("UpdateOnlyMergeable.taskName"); //$NON-NLS-1$ + return CVSUIMessages.UpdateOnlyMergeable_taskName; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider) */ protected String getTaskName(CVSTeamProvider provider) { - return Policy.bind("UpdateOperation.0", provider.getProject().getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.UpdateOperation_0, new String[] { provider.getProject().getName() }); //$NON-NLS-1$ } protected void addSkippedFiles(IFile[] files) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java index 168a0d764..e8b9fe7f8 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java @@ -19,6 +19,7 @@ import org.eclipse.core.resources.mapping.ResourceMapping; import org.eclipse.core.resources.mapping.ResourceMappingContext; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.subscribers.SubscriberResourceMappingContext; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.CVSException; @@ -31,6 +32,7 @@ import org.eclipse.team.internal.ccvs.core.client.Session; import org.eclipse.team.internal.ccvs.core.client.Update; import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; import org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.IWorkbenchPart; @@ -111,14 +113,14 @@ public class UpdateOperation extends SingleCommandOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName() */ protected String getTaskName() { - return Policy.bind("UpdateOperation.taskName"); //$NON-NLS-1$; + return CVSUIMessages.UpdateOperation_taskName; //$NON-NLS-1$; } /* (non-Javadoc) * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider) */ protected String getTaskName(CVSTeamProvider provider) { - return Policy.bind("UpdateOperation.0", provider.getProject().getName()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.UpdateOperation_0, new String[] { provider.getProject().getName() }); //$NON-NLS-1$ } /** @@ -141,7 +143,7 @@ public class UpdateOperation extends SingleCommandOperation { * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getErrorMessage(org.eclipse.core.runtime.IStatus[], int) */ protected String getErrorMessage(IStatus[] failures, int totalOperations) { - return Policy.bind("UpdateAction.update"); //$NON-NLS-1$ + return CVSUIMessages.UpdateAction_update; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java index ecf619683..d75267f3f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java @@ -24,8 +24,8 @@ import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.CVSException; import org.eclipse.team.internal.ccvs.core.CVSTag; import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.actions.CVSAction; /** @@ -53,7 +53,7 @@ public class AddToBranchAction extends CVSAction { final CVSException[] exception = new CVSException[] { null }; shell.getDisplay().syncExec(new Runnable() { public void run() { - InputDialog dialog = new InputDialog(getShell(), Policy.bind("AddToBranchAction.enterTag"), Policy.bind("AddToBranchAction.enterTagLong"), null, validator); //$NON-NLS-1$ //$NON-NLS-2$ + InputDialog dialog = new InputDialog(getShell(), CVSUIMessages.AddToBranchAction_enterTag, CVSUIMessages.AddToBranchAction_enterTagLong, null, validator); //$NON-NLS-1$ //$NON-NLS-2$ if (dialog.open() == InputDialog.OK) { CVSTag tag = new CVSTag(dialog.getValue(), CVSTag.BRANCH); try { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java index ae705c7b5..13ab05849 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java @@ -19,6 +19,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.*; import org.eclipse.jface.dialogs.*; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -95,8 +96,8 @@ public class CVSRepositoryPropertiesPage extends PropertyPage { updateWidgetEnablements(); } }; - useLocationAsLabel = createRadioButton(labelGroup, Policy.bind("CVSRepositoryPropertiesPage.useLocationAsLabel"), 3); //$NON-NLS-1$ - useCustomLabel = createRadioButton(labelGroup, Policy.bind("CVSRepositoryPropertiesPage.useCustomLabel"), 1); //$NON-NLS-1$ + useLocationAsLabel = createRadioButton(labelGroup, CVSUIMessages.CVSRepositoryPropertiesPage_useLocationAsLabel, 3); //$NON-NLS-1$ + useCustomLabel = createRadioButton(labelGroup, CVSUIMessages.CVSRepositoryPropertiesPage_useCustomLabel, 1); //$NON-NLS-1$ useCustomLabel.addListener(SWT.Selection, labelListener); labelText = createTextField(labelGroup); labelText.addListener(SWT.Modify, labelListener); @@ -104,19 +105,19 @@ public class CVSRepositoryPropertiesPage extends PropertyPage { // Add some extra space createLabel(composite, "", 3); //$NON-NLS-1$ - createLabel(composite, Policy.bind("CVSPropertiesPage.connectionType"), 1); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSPropertiesPage_connectionType, 1); //$NON-NLS-1$ methodType = createCombo(composite); - createLabel(composite, Policy.bind("CVSPropertiesPage.user"), 1); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSPropertiesPage_user, 1); //$NON-NLS-1$ userText = createTextField(composite); - createLabel(composite, Policy.bind("CVSPropertiesPage.password"), 1); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSPropertiesPage_password, 1); //$NON-NLS-1$ passwordText = createPasswordField(composite); - createLabel(composite, Policy.bind("CVSPropertiesPage.host"), 1); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSPropertiesPage_host, 1); //$NON-NLS-1$ hostText = createTextField(composite); - createLabel(composite, Policy.bind("CVSPropertiesPage.path"), 1); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CVSPropertiesPage_path, 1); //$NON-NLS-1$ pathText = createTextField(composite); // Port number @@ -130,15 +131,15 @@ public class CVSRepositoryPropertiesPage extends PropertyPage { layout.marginHeight = 0; layout.marginWidth = 0; portGroup.setLayout(layout); - useDefaultPort = createRadioButton(portGroup, Policy.bind("ConfigurationWizardMainPage.useDefaultPort"), 3); //$NON-NLS-1$ - useCustomPort = createRadioButton(portGroup, Policy.bind("ConfigurationWizardMainPage.usePort"), 1); //$NON-NLS-1$ + useDefaultPort = createRadioButton(portGroup, CVSUIMessages.ConfigurationWizardMainPage_useDefaultPort, 3); //$NON-NLS-1$ + useCustomPort = createRadioButton(portGroup, CVSUIMessages.ConfigurationWizardMainPage_usePort, 1); //$NON-NLS-1$ portText = createTextField(portGroup); // Add some extra space createLabel(composite, "", 3); //$NON-NLS-1$ allowCachingButton = new Button(composite, SWT.CHECK); - allowCachingButton.setText(Policy.bind("UserValidationDialog.6")); //$NON-NLS-1$ + allowCachingButton.setText(CVSUIMessages.UserValidationDialog_6); //$NON-NLS-1$ data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL); data.horizontalSpan = 3; allowCachingButton.setLayoutData(data); @@ -161,7 +162,7 @@ public class CVSRepositoryPropertiesPage extends PropertyPage { warningLabel.setImage(Dialog.getImage(Dialog.DLG_IMG_MESSAGE_WARNING)); warningLabel.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_BEGINNING)); Label warningText = new Label(warningComposite, SWT.WRAP); - warningText.setText(Policy.bind("UserValidationDialog.7")); //$NON-NLS-1$ + warningText.setText(CVSUIMessages.UserValidationDialog_7); //$NON-NLS-1$ data = new GridData(GridData.FILL_HORIZONTAL); data.widthHint = 300; warningText.setLayoutData(data); @@ -363,8 +364,8 @@ public class CVSRepositoryPropertiesPage extends PropertyPage { if (!(location.getHost().equals(hostText.getText()) && location.getRootDirectory().equals(pathText.getText()))) { // The host or path has changed if (!MessageDialog.openConfirm(getShell(), - Policy.bind("CVSRepositoryPropertiesPage.0"), //$NON-NLS-1$ - Policy.bind("CVSRepositoryPropertiesPage.1"))) { //$NON-NLS-1$ + CVSUIMessages.CVSRepositoryPropertiesPage_0, //$NON-NLS-1$ + CVSUIMessages.CVSRepositoryPropertiesPage_1)) { //$NON-NLS-1$ return false; } } @@ -393,9 +394,9 @@ public class CVSRepositoryPropertiesPage extends PropertyPage { // To do: warn the user DetailsDialogWithProjects dialog = new DetailsDialogWithProjects( progressMonitorDialog.getShell(), - Policy.bind("CVSRepositoryPropertiesPage.Confirm_Project_Sharing_Changes_1"), //$NON-NLS-1$ - Policy.bind("CVSRepositoryPropertiesPage.There_are_projects_in_the_workspace_shared_with_this_repository_2"), //$NON-NLS-1$ - Policy.bind("CVSRepositoryPropertiesPage.sharedProject", location.toString()), //$NON-NLS-1$ + CVSUIMessages.CVSRepositoryPropertiesPage_Confirm_Project_Sharing_Changes_1, //$NON-NLS-1$ + CVSUIMessages.CVSRepositoryPropertiesPage_There_are_projects_in_the_workspace_shared_with_this_repository_2, //$NON-NLS-1$ + NLS.bind(CVSUIMessages.CVSRepositoryPropertiesPage_sharedProject, new String[] { location.toString() }), //$NON-NLS-1$ (IProject[]) projects.toArray(new IProject[projects.size()]), true, DetailsDialogWithProjects.DLG_IMG_WARNING); @@ -526,7 +527,7 @@ public class CVSRepositoryPropertiesPage extends PropertyPage { try { CVSRepositoryLocation l = CVSRepositoryLocation.fromProperties(createProperties()); if (!l.equals(location) && KnownRepositories.getInstance().isKnownRepository(l.getLocation())) { - setErrorMessage(Policy.bind("ConfigurationWizardMainPage.0")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.ConfigurationWizardMainPage_0); //$NON-NLS-1$ setValid(false); return; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java index 40b096062..a47955c97 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java @@ -23,10 +23,10 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; import org.eclipse.team.internal.ccvs.ui.ListSelectionArea; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.WorkingSetSelectionArea; import org.eclipse.team.internal.ccvs.ui.model.RemoteContentProvider; import org.eclipse.team.internal.ccvs.ui.wizards.CVSWizardPage; @@ -106,7 +106,7 @@ public class RefreshRemoteProjectSelectionPage extends CVSWizardPage { new InputElement(), new RemoteContentProvider(), new WorkbenchLabelProvider(), - Policy.bind("RefreshRemoteProjectSelectionPage.selectRemoteProjects")); //$NON-NLS-1$ + CVSUIMessages.RefreshRemoteProjectSelectionPage_selectRemoteProjects); //$NON-NLS-1$ listArea.createArea(composite); listArea.addPropertyChangeListener(new IPropertyChangeListener() { @@ -116,7 +116,7 @@ public class RefreshRemoteProjectSelectionPage extends CVSWizardPage { }); listArea.getViewer().setSorter(new RepositorySorter()); - workingSetArea = new WorkingSetSelectionArea(getShell(), Policy.bind("RefreshRemoteProjectSelectionPage.noWorkingSet"), Policy.bind("RefreshRemoteProjectSelectionPage.workingSet"), settings); //$NON-NLS-1$ //$NON-NLS-2$ + workingSetArea = new WorkingSetSelectionArea(getShell(), CVSUIMessages.RefreshRemoteProjectSelectionPage_noWorkingSet, CVSUIMessages.RefreshRemoteProjectSelectionPage_workingSet, settings); //$NON-NLS-1$ //$NON-NLS-2$ setWorkingSet(workingSet); workingSetArea.addPropertyChangeListener(new IPropertyChangeListener() { public void propertyChange(PropertyChangeEvent event) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectWizard.java index 8e52a64b4..f811be6a0 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectWizard.java @@ -21,6 +21,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; @@ -78,7 +79,7 @@ public class RefreshRemoteProjectWizard extends Wizard { if (settings == null) { this.settings = workbenchSettings.addNewSection("RefreshRemoteProjectWizard");//$NON-NLS-1$ } - setWindowTitle(Policy.bind("RefreshRemoteProjectWizard.title")); //$NON-NLS-1$ + setWindowTitle(CVSUIMessages.RefreshRemoteProjectWizard_title); //$NON-NLS-1$ } /** @@ -89,9 +90,9 @@ public class RefreshRemoteProjectWizard extends Wizard { ImageDescriptor substImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_NEW_LOCATION); projectSelectionPage = new RefreshRemoteProjectSelectionPage( "ProjectSelectionPage", //$NON-NLS-1$ - Policy.bind("RefreshRemoteProjectSelectionPage.pageTitle"), //$NON-NLS-1$ + CVSUIMessages.RefreshRemoteProjectSelectionPage_pageTitle, //$NON-NLS-1$ substImage, - Policy.bind("RefreshRemoteProjectSelectionPage.pageDescription"), //$NON-NLS-1$ + CVSUIMessages.RefreshRemoteProjectSelectionPage_pageDescription, //$NON-NLS-1$ settings, root, rootFolders); addPage(projectSelectionPage); } @@ -156,12 +157,12 @@ public class RefreshRemoteProjectWizard extends Wizard { final boolean[] prompt = new boolean[] { false }; getShell().getDisplay().syncExec(new Runnable() { public void run() { - MessageDialog dialog = new MessageDialog(getShell(), Policy.bind("RefreshRemoteProjectWizard.0"), null, //$NON-NLS-1$ + MessageDialog dialog = new MessageDialog(getShell(), CVSUIMessages.RefreshRemoteProjectWizard_0, null, //$NON-NLS-1$ getNoTagsMessage(folders), MessageDialog.INFORMATION, new String[] { - Policy.bind("RefreshRemoteProjectWizard.1"), //$NON-NLS-1$ - Policy.bind("RefreshRemoteProjectWizard.2") //$NON-NLS-1$ + CVSUIMessages.RefreshRemoteProjectWizard_1, //$NON-NLS-1$ + CVSUIMessages.RefreshRemoteProjectWizard_2 }, 1); int code = dialog.open(); if (code == 0) { @@ -175,8 +176,8 @@ public class RefreshRemoteProjectWizard extends Wizard { private String getNoTagsMessage(ICVSRemoteResource[] folders) { if (folders.length == 1) { - return Policy.bind("RefreshRemoteProjectWizard.3", folders[0].getRepositoryRelativePath()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.RefreshRemoteProjectWizard_3, new String[] { folders[0].getRepositoryRelativePath() }); //$NON-NLS-1$ } - return Policy.bind("RefreshRemoteProjectWizard.4", Integer.toString(folders.length)); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.RefreshRemoteProjectWizard_4, new String[] { Integer.toString(folders.length) }); //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteViewPart.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteViewPart.java index ac4b213aa..714543173 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteViewPart.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteViewPart.java @@ -10,48 +10,28 @@ *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui.repo; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IMenuListener; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.action.MenuManager; -import org.eclipse.jface.action.Separator; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.jface.action.*; import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jface.viewers.DoubleClickEvent; -import org.eclipse.jface.viewers.IDoubleClickListener; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.*; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.events.KeyEvent; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Menu; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Tree; +import org.eclipse.swt.widgets.*; import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.actions.OpenRemoteFileAction; import org.eclipse.team.internal.ccvs.ui.model.RemoteContentProvider; -import org.eclipse.ui.IActionBars; -import org.eclipse.ui.ISelectionListener; -import org.eclipse.ui.IWorkbenchActionConstants; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.IWorkingSet; -import org.eclipse.ui.IWorkingSetManager; -import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.*; import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.dialogs.IWorkingSetEditWizard; import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog; import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.ui.part.DrillDownAdapter; -import org.eclipse.ui.part.ViewPart; +import org.eclipse.ui.part.*; /** * This class acts as a superclass to all remote CVS tree views. @@ -79,7 +59,7 @@ public abstract class RemoteViewPart extends ViewPart implements ISelectionListe private class ChangeWorkingSetAction extends Action { String name; public ChangeWorkingSetAction(String name, int index) { - super(Policy.bind("RepositoriesView.workingSetMenuItem", new Integer(index).toString(), name)); //$NON-NLS-1$ + super(NLS.bind(CVSUIMessages.RepositoriesView_workingSetMenuItem, new String[] { new Integer(index).toString(), name })); //$NON-NLS-1$ this.name = name; } public void run() { @@ -187,7 +167,7 @@ public abstract class RemoteViewPart extends ViewPart implements ISelectionListe if (workingSet == null) { toolTip = null; } else { - toolTip = Policy.bind("RemoteViewPart.workingSetToolTip", workingSet.getName()); //$NON-NLS-1$ + toolTip = NLS.bind(CVSUIMessages.RemoteViewPart_workingSetToolTip, new String[] { workingSet.getName() }); //$NON-NLS-1$ } setTitleToolTip(toolTip); if (refreshViewer) refreshViewer(); @@ -202,26 +182,26 @@ public abstract class RemoteViewPart extends ViewPart implements ISelectionListe // Refresh (toolbar) CVSUIPlugin plugin = CVSUIPlugin.getPlugin(); - refreshAction = new Action(Policy.bind("RepositoriesView.refresh"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_REFRESH_ENABLED)) { //$NON-NLS-1$ + refreshAction = new Action(CVSUIMessages.RepositoriesView_refresh, CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_REFRESH_ENABLED)) { //$NON-NLS-1$ public void run() { refreshAll(); } }; - refreshAction.setToolTipText(Policy.bind("RepositoriesView.refreshTooltip")); //$NON-NLS-1$ + refreshAction.setToolTipText(CVSUIMessages.RepositoriesView_refreshTooltip); //$NON-NLS-1$ refreshAction.setDisabledImageDescriptor(plugin.getImageDescriptor(ICVSUIConstants.IMG_REFRESH_DISABLED)); refreshAction.setHoverImageDescriptor(plugin.getImageDescriptor(ICVSUIConstants.IMG_REFRESH)); getViewSite().getActionBars().setGlobalActionHandler(ActionFactory.REFRESH.getId(), refreshAction); - collapseAllAction = new Action(Policy.bind("RepositoriesView.collapseAll"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_COLLAPSE_ALL_ENABLED)) { //$NON-NLS-1$ + collapseAllAction = new Action(CVSUIMessages.RepositoriesView_collapseAll, CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_COLLAPSE_ALL_ENABLED)) { //$NON-NLS-1$ public void run() { collapseAll(); } }; - collapseAllAction.setToolTipText(Policy.bind("RepositoriesView.collapseAllTooltip")); //$NON-NLS-1$ + collapseAllAction.setToolTipText(CVSUIMessages.RepositoriesView_collapseAllTooltip); //$NON-NLS-1$ collapseAllAction.setHoverImageDescriptor(plugin.getImageDescriptor(ICVSUIConstants.IMG_COLLAPSE_ALL)); // Select Working Set (popup) - selectWorkingSetAction = new Action(Policy.bind("RepositoriesView.newWorkingSet")) { //$NON-NLS-1$ + selectWorkingSetAction = new Action(CVSUIMessages.RepositoriesView_newWorkingSet) { //$NON-NLS-1$ public void run() { IWorkingSetManager manager = PlatformUI.getWorkbench().getWorkingSetManager(); IWorkingSetSelectionDialog dialog = manager.createWorkingSetSelectionDialog(shell, false); @@ -243,7 +223,7 @@ public abstract class RemoteViewPart extends ViewPart implements ISelectionListe WorkbenchHelp.setHelp(selectWorkingSetAction, IHelpContextIds.SELECT_WORKING_SET_ACTION); // Deselect Working Set (popup) - deselectWorkingSetAction = new Action(Policy.bind("RepositoriesView.deselectWorkingSet")) { //$NON-NLS-1$ + deselectWorkingSetAction = new Action(CVSUIMessages.RepositoriesView_deselectWorkingSet) { //$NON-NLS-1$ public void run() { setWorkingSet(null, true); } @@ -251,7 +231,7 @@ public abstract class RemoteViewPart extends ViewPart implements ISelectionListe WorkbenchHelp.setHelp(deselectWorkingSetAction, IHelpContextIds.DESELECT_WORKING_SET_ACTION); // Edit Working Set (popup) - editWorkingSetAction = new Action(Policy.bind("RepositoriesView.editWorkingSet")) { //$NON-NLS-1$ + editWorkingSetAction = new Action(CVSUIMessages.RepositoriesView_editWorkingSet) { //$NON-NLS-1$ public void run() { IWorkingSetManager manager = PlatformUI.getWorkbench().getWorkingSetManager(); IWorkingSet workingSet = getWorkingSet(); @@ -262,10 +242,8 @@ public abstract class RemoteViewPart extends ViewPart implements ISelectionListe IWorkingSetEditWizard wizard = manager.createWorkingSetEditWizard(workingSet); if (wizard == null) { // todo - String title = Policy.bind("EditWorkingSetAction.error.nowizard.title"); //$NON-NLS-1$ - String message = Policy.bind("EditWorkingSetAction.error.nowizard.message"); //$NON-NLS-1$ - CVSUIPlugin.openError(shell, title, message, null); - return; + CVSUIPlugin.log(IStatus.ERROR, NLS.bind("No wizard registered for working set {0}", new Object[] {workingSet.getName()}), null); //$NON-NLS-1$ + return; } WizardDialog dialog = new WizardDialog(shell, wizard); dialog.create(); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveDateTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveDateTagAction.java index 692159068..c65164c14 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveDateTagAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveDateTagAction.java @@ -15,8 +15,8 @@ import java.util.Iterator; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.team.internal.ccvs.core.CVSTag; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.actions.CVSAction; import org.eclipse.team.internal.ccvs.ui.model.CVSTagElement; import org.eclipse.ui.actions.SelectionListenerAction; @@ -26,7 +26,7 @@ public class RemoveDateTagAction extends SelectionListenerAction { private IStructuredSelection selection; public RemoveDateTagAction() { - super(Policy.bind("RemoveDateTagAction.0")); //$NON-NLS-1$ + super(CVSUIMessages.RemoveDateTagAction_0); //$NON-NLS-1$ } public void run() { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java index 14f8a7657..85b14be46 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java @@ -21,12 +21,13 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.RepositoryProvider; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.util.KnownRepositories; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.actions.CVSAction; import org.eclipse.team.internal.ccvs.ui.model.RepositoryLocationSchedulingRule; import org.eclipse.team.internal.ui.dialogs.DetailsDialogWithProjects; @@ -44,7 +45,7 @@ public class RemoveRootAction extends SelectionListenerAction { private RepositoriesView view; public RemoveRootAction(Shell shell, RepositoriesView view) { - super(Policy.bind("RemoteRootAction.label")); //$NON-NLS-1$ + super(CVSUIMessages.RemoteRootAction_label); //$NON-NLS-1$ this.view = view; this.shell = shell; } @@ -98,9 +99,9 @@ public class RemoveRootAction extends SelectionListenerAction { public void run() { DetailsDialogWithProjects dialog = new DetailsDialogWithProjects( shell, - Policy.bind("RemoteRootAction.Unable_to_Discard_Location_1"), //$NON-NLS-1$ - Policy.bind("RemoteRootAction.Projects_in_the_local_workspace_are_shared_with__2", location), //$NON-NLS-1$ - Policy.bind("RemoteRootAction.The_projects_that_are_shared_with_the_above_repository_are__4"), //$NON-NLS-1$ + CVSUIMessages.RemoteRootAction_Unable_to_Discard_Location_1, //$NON-NLS-1$ + NLS.bind(CVSUIMessages.RemoteRootAction_Projects_in_the_local_workspace_are_shared_with__2, new String[] { location }), //$NON-NLS-1$ + CVSUIMessages.RemoteRootAction_The_projects_that_are_shared_with_the_above_repository_are__4, //$NON-NLS-1$ (IProject[]) shared.toArray(new IProject[shared.size()]), false, DetailsDialogWithProjects.DLG_IMG_ERROR); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java index b5125434b..aae32f38d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java @@ -25,6 +25,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DragSourceEvent; @@ -41,12 +42,12 @@ import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; import org.eclipse.team.internal.ccvs.core.ICVSResource; import org.eclipse.team.internal.ccvs.core.util.KnownRepositories; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSResourceTransfer; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; import org.eclipse.team.internal.ccvs.ui.IRepositoryListener; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.WorkbenchUserAuthenticator; import org.eclipse.team.internal.ccvs.ui.actions.CVSAction; import org.eclipse.team.internal.ccvs.ui.model.AllRootsElement; @@ -157,7 +158,7 @@ public class RepositoriesView extends RemoteViewPart { // Create actions // New Repository (popup) - newAction = new Action(Policy.bind("RepositoriesView.new"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_NEWLOCATION)) { //$NON-NLS-1$ + newAction = new Action(CVSUIMessages.RepositoriesView_new, CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_NEWLOCATION)) { //$NON-NLS-1$ public void run() { NewLocationWizard wizard = new NewLocationWizard(); WizardDialog dialog = new WizardDialog(shell, wizard); @@ -167,7 +168,7 @@ public class RepositoriesView extends RemoteViewPart { WorkbenchHelp.setHelp(newAction, IHelpContextIds.NEW_REPOSITORY_LOCATION_ACTION); if (includeAnonConnection()) { - newAnonAction = new Action(Policy.bind("RepositoriesView.newAnonCVS"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_NEWLOCATION)) { //$NON-NLS-1$ + newAnonAction = new Action(CVSUIMessages.RepositoriesView_newAnonCVS, CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_NEWLOCATION)) { //$NON-NLS-1$ public void run() { Properties p = new Properties(); p.setProperty("connection", "pserver"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -232,7 +233,7 @@ public class RepositoriesView extends RemoteViewPart { */ protected void addWorkbenchActions(IMenuManager manager) { // New actions go next - MenuManager sub = new MenuManager(Policy.bind("RepositoriesView.newSubmenu"), IWorkbenchActionConstants.GROUP_ADD); //$NON-NLS-1$ + MenuManager sub = new MenuManager(CVSUIMessages.RepositoriesView_newSubmenu, IWorkbenchActionConstants.GROUP_ADD); //$NON-NLS-1$ manager.add(sub); super.addWorkbenchActions(manager); IStructuredSelection selection = (IStructuredSelection)getViewer().getSelection(); @@ -316,7 +317,8 @@ public class RepositoriesView extends RemoteViewPart { if (!(selection instanceof IStructuredSelection)) return ""; //$NON-NLS-1$ IStructuredSelection s = (IStructuredSelection)selection; - if (s.size() > 1) return Policy.bind("RepositoriesView.NItemsSelected", String.valueOf(s.size())); //$NON-NLS-1$ + if (s.size() > 1) + return NLS.bind(CVSUIMessages.RepositoriesView_NItemsSelected, new String[] { String.valueOf(s.size()) }); //$NON-NLS-1$ Object element = CVSAction.getAdapter(s.getFirstElement(), ICVSResource.class); if (element instanceof ICVSRemoteResource) { ICVSRemoteResource res = (ICVSRemoteResource)element; @@ -327,13 +329,13 @@ public class RepositoriesView extends RemoteViewPart { try { name = res.getRepositoryRelativePath() + " " + ((ICVSRemoteFile)res).getRevision(); //$NON-NLS-1$ } catch (TeamException e) { - TeamPlugin.log(IStatus.ERROR, Policy.bind("RepositoriesView.CannotGetRevision"), e); //$NON-NLS-1$ + TeamPlugin.log(IStatus.ERROR, CVSUIMessages.RepositoriesView_CannotGetRevision, e); //$NON-NLS-1$ name = res.getRepositoryRelativePath(); } } - return Policy.bind("RepositoriesView.ResourceInRepository", name, res.getRepository().getLocation(true)); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.RepositoriesView_ResourceInRepository, new String[] { name, res.getRepository().getLocation(true) }); //$NON-NLS-1$ } - return Policy.bind("RepositoriesView.OneItemSelected"); //$NON-NLS-1$ + return CVSUIMessages.RepositoriesView_OneItemSelected; //$NON-NLS-1$ } /** diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java index 74c7fbec2..2a006092e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java @@ -13,9 +13,10 @@ package org.eclipse.team.internal.ccvs.ui.repo; import java.util.*; import org.eclipse.core.runtime.Path; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.util.KnownRepositories; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.xml.sax.*; import org.xml.sax.helpers.DefaultHandler; @@ -75,7 +76,7 @@ public class RepositoriesViewContentHandler extends DefaultHandler { String elementName = getElementName(namespaceURI, localName, qName); if (!elementName.equals(tagStack.peek())) { - throw new SAXException(Policy.bind("RepositoriesViewContentHandler.unmatchedTag", elementName)); //$NON-NLS-1$ + throw new SAXException(NLS.bind(CVSUIMessages.RepositoriesViewContentHandler_unmatchedTag, new String[] { elementName })); //$NON-NLS-1$ } if (elementName.equals(REPOSITORIES_VIEW_TAG)) { @@ -128,7 +129,7 @@ public class RepositoriesViewContentHandler extends DefaultHandler { } else if (elementName.equals(REPOSITORY_TAG)) { String id = atts.getValue(ID_ATTRIBUTE); if (id == null) { - throw new SAXException(Policy.bind("RepositoriesViewContentHandler.missingAttribute", REPOSITORY_TAG, ID_ATTRIBUTE)); //$NON-NLS-1$ + throw new SAXException(NLS.bind(CVSUIMessages.RepositoriesViewContentHandler_missingAttribute, new String[] { REPOSITORY_TAG, ID_ATTRIBUTE })); //$NON-NLS-1$ } ICVSRepositoryLocation root; try { @@ -137,7 +138,7 @@ public class RepositoriesViewContentHandler extends DefaultHandler { KnownRepositories.getInstance().addRepository(root, false); } } catch (CVSException e) { - throw new SAXException(Policy.bind("RepositoriesViewContentHandler.errorCreatingRoot", id), e); //$NON-NLS-1$ + throw new SAXException(NLS.bind(CVSUIMessages.RepositoriesViewContentHandler_errorCreatingRoot, new String[] { id }), e); //$NON-NLS-1$ } currentRepositoryRoot = new RepositoryRoot(root); String name = atts.getValue(NAME_ATTRIBUTE); @@ -150,20 +151,20 @@ public class RepositoriesViewContentHandler extends DefaultHandler { } else if (elementName.equals(DATE_TAG_TAG)){ String name = atts.getValue(NAME_ATTRIBUTE); if (name == null) { - throw new SAXException(Policy.bind("RepositoriesViewContentHandler.missingAttribute", DATE_TAGS_TAG, NAME_ATTRIBUTE)); //$NON-NLS-1$ + throw new SAXException(NLS.bind(CVSUIMessages.RepositoriesViewContentHandler_missingAttribute, new String[] { DATE_TAGS_TAG, NAME_ATTRIBUTE })); //$NON-NLS-1$ } dateTags.add(new CVSTag(name, CVSTag.DATE)); }else if (elementName.equals(WORKING_SET_TAG)) { String name = atts.getValue(NAME_ATTRIBUTE); if (name == null) { - throw new SAXException(Policy.bind("RepositoriesViewContentHandler.missingAttribute", WORKING_SET_TAG, NAME_ATTRIBUTE)); //$NON-NLS-1$ + throw new SAXException(NLS.bind(CVSUIMessages.RepositoriesViewContentHandler_missingAttribute, new String[] { WORKING_SET_TAG, NAME_ATTRIBUTE })); //$NON-NLS-1$ } // Ignore any elements until the corresponding end tag is reached ignoreElements = true; } else if (elementName.equals(MODULE_TAG)) { String path = atts.getValue(PATH_ATTRIBUTE); if (path == null) { - throw new SAXException(Policy.bind("RepositoriesViewContentHandler.missingAttribute", MODULE_TAG, PATH_ATTRIBUTE)); //$NON-NLS-1$ + throw new SAXException(NLS.bind(CVSUIMessages.RepositoriesViewContentHandler_missingAttribute, new String[] { MODULE_TAG, PATH_ATTRIBUTE })); //$NON-NLS-1$ } String type = atts.getValue(TYPE_ATTRIBUTE); if (type != null && type.equals(DEFINED_MODULE_TYPE)) { @@ -187,7 +188,7 @@ public class RepositoriesViewContentHandler extends DefaultHandler { } String name = atts.getValue(NAME_ATTRIBUTE); if (name == null) { - throw new SAXException(Policy.bind("RepositoriesViewContentHandler.missingAttribute", TAG_TAG, NAME_ATTRIBUTE)); //$NON-NLS-1$ + throw new SAXException(NLS.bind(CVSUIMessages.RepositoriesViewContentHandler_missingAttribute, new String[] { TAG_TAG, NAME_ATTRIBUTE })); //$NON-NLS-1$ } tags.add(new CVSTag(name, getCVSTagType(type))); } else if (elementName.equals(AUTO_REFRESH_FILE_TAG)) { @@ -196,7 +197,7 @@ public class RepositoriesViewContentHandler extends DefaultHandler { // get the old path attribute format which was relative to the module path = atts.getValue(PATH_ATTRIBUTE); if (path == null) { - throw new SAXException(Policy.bind("RepositoriesViewContentHandler.missingAttribute", AUTO_REFRESH_FILE_TAG, FULL_PATH_ATTRIBUTE)); //$NON-NLS-1$ + throw new SAXException(NLS.bind(CVSUIMessages.RepositoriesViewContentHandler_missingAttribute, new String[] { AUTO_REFRESH_FILE_TAG, FULL_PATH_ATTRIBUTE })); //$NON-NLS-1$ } if (RepositoryRoot.isDefinedModuleName(currentRemotePath)) { path = null; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java index e31a17526..fa3cdccad 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java @@ -18,6 +18,7 @@ import org.eclipse.jface.preference.FieldEditor; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -94,7 +95,7 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro } return false; } catch (BackingStoreException e) { - CVSUIPlugin.log(new CVSStatus(IStatus.ERROR, Policy.bind("internal"), e)); //$NON-NLS-1$ + CVSUIPlugin.log(new CVSStatus(IStatus.ERROR, CVSUIMessages.internal, e)); //$NON-NLS-1$ return false; } } @@ -333,15 +334,15 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro GridLayout layout = new GridLayout(); composite.setLayout(layout); - createWrappingLabel(composite, Policy.bind("RepositoryEncodingPropertyPage.2"), 1); //$NON-NLS-1$ + createWrappingLabel(composite, CVSUIMessages.RepositoryEncodingPropertyPage_2, 1); //$NON-NLS-1$ - encoding = new EncodingFieldEditor(CVSRepositoryLocation.PREF_SERVER_ENCODING, Policy.bind("RepositoryEncodingPropertyPage.3"), composite); //$NON-NLS-1$ + encoding = new EncodingFieldEditor(CVSRepositoryLocation.PREF_SERVER_ENCODING, CVSUIMessages.RepositoryEncodingPropertyPage_3, composite); //$NON-NLS-1$ encoding.setPreferencePage(this); encoding.setPreferenceStore(getLocationPreferenceStore()); encoding.load(); encoding.setPropertyChangeListener(this); - createWrappingLabel(composite, Policy.bind("RepositoryEncodingPropertyPage.4"), 1); //$NON-NLS-1$ + createWrappingLabel(composite, CVSUIMessages.RepositoryEncodingPropertyPage_4, 1); //$NON-NLS-1$ WorkbenchHelp.setHelp(getControl(), IHelpContextIds.REPOSITORY_ENCODING_PROPERTY_PAGE); Dialog.applyDialogFont(parent); @@ -383,7 +384,7 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro public boolean performOk() { if (!KnownRepositories.getInstance().isKnownRepository(location.getLocation(false))) { // The location may have been replaced by the main properties page - MessageDialog.openInformation(getShell(), Policy.bind("RepositoryEncodingPropertyPage.0"), Policy.bind("RepositoryEncodingPropertyPage.1", location.getLocation(true))); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openInformation(getShell(), CVSUIMessages.RepositoryEncodingPropertyPage_0, NLS.bind(CVSUIMessages.RepositoryEncodingPropertyPage_1, new String[] { location.getLocation(true) })); //$NON-NLS-1$ //$NON-NLS-2$ return true; } encoding.store(); @@ -391,7 +392,7 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro ((CVSRepositoryLocation)location).getPreferences().flush(); } catch (BackingStoreException e) { // Log and ignore - CVSUIPlugin.log(new CVSStatus(IStatus.ERROR, Policy.bind("internal"), e)); //$NON-NLS-1$ + CVSUIPlugin.log(new CVSStatus(IStatus.ERROR, CVSUIMessages.internal, e)); //$NON-NLS-1$ } return true; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java index dd36bed30..45769d044 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java @@ -22,6 +22,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.*; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; @@ -179,7 +180,7 @@ public class RepositoryManager { public ICVSRemoteResource[] getFoldersForTag(ICVSRepositoryLocation location, CVSTag tag, IProgressMonitor monitor) throws CVSException { monitor = Policy.monitorFor(monitor); try { - monitor.beginTask(Policy.bind("RepositoryManager.fetchingRemoteFolders", tag.getName()), 100); //$NON-NLS-1$ + monitor.beginTask(NLS.bind(CVSUIMessages.RepositoryManager_fetchingRemoteFolders, new String[] { tag.getName() }), 100); //$NON-NLS-1$ if (tag.getType() == CVSTag.HEAD) { ICVSRemoteResource[] resources = location.members(tag, false, Policy.subMonitorFor(monitor, 60)); RepositoryRoot root = getRepositoryRootFor(location); @@ -329,7 +330,7 @@ public class RepositoryManager { is.close(); } } catch (IOException e) { - CVSUIPlugin.log(Status.ERROR, Policy.bind("RepositoryManager.ioException"), e); //$NON-NLS-1$ + CVSUIPlugin.log(Status.ERROR, CVSUIMessages.RepositoryManager_ioException, e); //$NON-NLS-1$ } catch (TeamException e) { CVSUIPlugin.log(e); } @@ -347,7 +348,7 @@ public class RepositoryManager { saveState(); file.delete(); } catch (IOException e) { - CVSUIPlugin.log(Status.ERROR, Policy.bind("RepositoryManager.ioException"), e); //$NON-NLS-1$ + CVSUIPlugin.log(Status.ERROR, CVSUIMessages.RepositoryManager_ioException, e); //$NON-NLS-1$ } catch (TeamException e) { CVSUIPlugin.log(e); } @@ -366,7 +367,7 @@ public class RepositoryManager { is.close(); } } catch (IOException e) { - CVSUIPlugin.log(Status.ERROR, Policy.bind("RepositoryManager.ioException"), e); //$NON-NLS-1$ + CVSUIPlugin.log(Status.ERROR, CVSUIMessages.RepositoryManager_ioException, e); //$NON-NLS-1$ } catch (TeamException e) { CVSUIPlugin.log(e); } @@ -388,10 +389,10 @@ public class RepositoryManager { } boolean renamed = tempFile.renameTo(stateFile); if (!renamed) { - throw new TeamException(new Status(Status.ERROR, CVSUIPlugin.ID, TeamException.UNABLE, Policy.bind("RepositoryManager.rename", tempFile.getAbsolutePath()), null)); //$NON-NLS-1$ + throw new TeamException(new Status(Status.ERROR, CVSUIPlugin.ID, TeamException.UNABLE, NLS.bind(CVSUIMessages.RepositoryManager_rename, new String[] { tempFile.getAbsolutePath() }), null)); //$NON-NLS-1$ } } catch (IOException e) { - throw new TeamException(new Status(Status.ERROR, CVSUIPlugin.ID, TeamException.UNABLE, Policy.bind("RepositoryManager.save",stateFile.getAbsolutePath()), e)); //$NON-NLS-1$ + throw new TeamException(new Status(Status.ERROR, CVSUIPlugin.ID, TeamException.UNABLE, NLS.bind(CVSUIMessages.RepositoryManager_save, new String[] { stateFile.getAbsolutePath() }), e)); //$NON-NLS-1$ } } private void writeState(XMLWriter writer) { @@ -413,9 +414,9 @@ public class RepositoryManager { SAXParser parser = factory.newSAXParser(); parser.parse(new InputSource(stream), new RepositoriesViewContentHandler(this)); } catch (SAXException ex) { - throw new CVSException(Policy.bind("RepositoryManager.parsingProblem", REPOSITORIES_VIEW_FILE), ex); //$NON-NLS-1$ + throw new CVSException(NLS.bind(CVSUIMessages.RepositoryManager_parsingProblem, new String[] { REPOSITORIES_VIEW_FILE }), ex); //$NON-NLS-1$ } catch (ParserConfigurationException ex) { - throw new CVSException(Policy.bind("RepositoryManager.parsingProblem", REPOSITORIES_VIEW_FILE), ex); //$NON-NLS-1$ + throw new CVSException(NLS.bind(CVSUIMessages.RepositoryManager_parsingProblem, new String[] { REPOSITORIES_VIEW_FILE }), ex); //$NON-NLS-1$ } } private void readCommentHistory(InputStream stream) throws IOException, TeamException { @@ -424,9 +425,9 @@ public class RepositoryManager { SAXParser parser = factory.newSAXParser(); parser.parse(new InputSource(stream), new CommentHistoryContentHandler()); } catch (SAXException ex) { - throw new CVSException(Policy.bind("RepositoryManager.parsingProblem", COMMENT_HIST_FILE), ex); //$NON-NLS-1$ + throw new CVSException(NLS.bind(CVSUIMessages.RepositoryManager_parsingProblem, new String[] { COMMENT_HIST_FILE }), ex); //$NON-NLS-1$ } catch (ParserConfigurationException ex) { - throw new CVSException(Policy.bind("RepositoryManager.parsingProblem", COMMENT_HIST_FILE), ex); //$NON-NLS-1$ + throw new CVSException(NLS.bind(CVSUIMessages.RepositoryManager_parsingProblem, new String[] { COMMENT_HIST_FILE }), ex); //$NON-NLS-1$ } } @@ -505,10 +506,10 @@ public class RepositoryManager { } boolean renamed = tempFile.renameTo(histFile); if (!renamed) { - throw new TeamException(new Status(Status.ERROR, CVSUIPlugin.ID, TeamException.UNABLE, Policy.bind("RepositoryManager.rename", tempFile.getAbsolutePath()), null)); //$NON-NLS-1$ + throw new TeamException(new Status(Status.ERROR, CVSUIPlugin.ID, TeamException.UNABLE, NLS.bind(CVSUIMessages.RepositoryManager_rename, new String[] { tempFile.getAbsolutePath() }), null)); //$NON-NLS-1$ } } catch (IOException e) { - throw new TeamException(new Status(Status.ERROR, CVSUIPlugin.ID, TeamException.UNABLE, Policy.bind("RepositoryManager.save",histFile.getAbsolutePath()), e)); //$NON-NLS-1$ + throw new TeamException(new Status(Status.ERROR, CVSUIPlugin.ID, TeamException.UNABLE, NLS.bind(CVSUIMessages.RepositoryManager_save, new String[] { histFile.getAbsolutePath() }), e)); //$NON-NLS-1$ } } private void writeCommentHistory(XMLWriter writer) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java index eaaabe8f6..fb2888a94 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java @@ -14,6 +14,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.*; import org.eclipse.core.runtime.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.client.Command; @@ -154,12 +155,12 @@ public class RepositoryRoot extends PlatformObject { } FolderSyncInfo info = ((ICVSFolder)resource).getFolderSyncInfo(); if (info == null) - throw new CVSException(Policy.bind("RepositoryRoot.folderInfoMissing", resource.getName())); //$NON-NLS-1$ + throw new CVSException(NLS.bind(CVSUIMessages.RepositoryRoot_folderInfoMissing, new String[] { resource.getName() })); //$NON-NLS-1$ return info.getRepository(); } else { FolderSyncInfo info = resource.getParent().getFolderSyncInfo(); if (info == null) - throw new CVSException(Policy.bind("RepositoryRoot.folderInfoMissing", resource.getParent().getName())); //$NON-NLS-1$ + throw new CVSException(NLS.bind(CVSUIMessages.RepositoryRoot_folderInfoMissing, new String[] { resource.getParent().getName() })); //$NON-NLS-1$ String path = new Path(null, info.getRepository()).append(resource.getName()).toString(); return path; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSActionDelegateWrapper.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSActionDelegateWrapper.java index 39d199239..bc8943d50 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSActionDelegateWrapper.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSActionDelegateWrapper.java @@ -24,7 +24,7 @@ public class CVSActionDelegateWrapper extends ActionDelegateWrapper { public CVSActionDelegateWrapper(CVSAction delegate, ISynchronizePageConfiguration configuration) { super(delegate, configuration, delegate.getId()); - Utils.initAction(this, getBundleKeyPrefix(), Policy.getBundle()); + Utils.initAction(this, getBundleKeyPrefix(), Policy.getActionBundle()); } /** 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 872c11f59..b80f0a405 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 @@ -52,7 +52,7 @@ public class CVSChangeSetCollector extends SyncInfoSetChangeSetCollector impleme */ private static final String LOG_ENTRY_HANDLER = CVSUIPlugin.ID + ".LogEntryHandler"; //$NON-NLS-1$ - private static final String DEFAULT_INCOMING_SET_NAME = Policy.bind("CVSChangeSetCollector.0"); //$NON-NLS-1$ + private static final String DEFAULT_INCOMING_SET_NAME = CVSUIMessages.CVSChangeSetCollector_0; //$NON-NLS-1$ boolean disposed = false; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipant.java index 2d3498040..5dd0e735b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipant.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipant.java @@ -15,6 +15,7 @@ import org.eclipse.core.resources.*; import org.eclipse.core.runtime.*; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jface.viewers.ILabelDecorator; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.synchronize.SyncInfo; import org.eclipse.team.core.variants.IResourceVariant; @@ -69,7 +70,7 @@ public class CVSParticipant extends SubscriberParticipant implements IChangeSetP try { ILogEntry entry = ((ICVSRemoteFile)remote).getLogEntry(monitor); remoteAuthor = entry.getAuthor(); - config.setRightLabel(Policy.bind("CVSParticipant.0", remote.getContentIdentifier(), remoteAuthor)); //$NON-NLS-1$ + config.setRightLabel(NLS.bind(CVSUIMessages.CVSParticipant_0, new String[] { remote.getContentIdentifier(), remoteAuthor })); //$NON-NLS-1$ } catch (TeamException e) { CVSUIPlugin.log(e); } @@ -83,7 +84,7 @@ public class CVSParticipant extends SubscriberParticipant implements IChangeSetP ILogEntry entry = ((ICVSRemoteFile)base).getLogEntry(monitor); baseAuthor = entry.getAuthor(); } - config.setAncestorLabel(Policy.bind("CVSParticipant.1", base.getContentIdentifier(), baseAuthor)); //$NON-NLS-1$ + config.setAncestorLabel(NLS.bind(CVSUIMessages.CVSParticipant_1, new String[] { base.getContentIdentifier(), baseAuthor })); //$NON-NLS-1$ } catch (TeamException e) { CVSUIPlugin.log(e); } @@ -148,7 +149,7 @@ public class CVSParticipant extends SubscriberParticipant implements IChangeSetP pages[i] = inheritedPages[i]; } pages[pages.length - 1] = new ComparePreferencePage(); - pages[pages.length - 1].setTitle(Policy.bind("CVSParticipant.2")); //$NON-NLS-1$ + pages[pages.length - 1].setTitle(CVSUIMessages.CVSParticipant_2); //$NON-NLS-1$ return pages; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipantAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipantAction.java index 317db1739..b64f3c010 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipantAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipantAction.java @@ -26,12 +26,12 @@ public abstract class CVSParticipantAction extends SynchronizeModelAction { protected CVSParticipantAction(ISynchronizePageConfiguration configuration) { super(null, configuration); - Utils.initAction(this, getBundleKeyPrefix(), Policy.getBundle()); + Utils.initAction(this, getBundleKeyPrefix(), Policy.getActionBundle()); } protected CVSParticipantAction(ISynchronizePageConfiguration configuration, ISelectionProvider provider, String bundleKey) { super(null, configuration, provider); - Utils.initAction(this, bundleKey, Policy.getBundle()); + Utils.initAction(this, bundleKey, Policy.getActionBundle()); } /** diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberOperation.java index b311e8b7e..0c99663f6 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberOperation.java @@ -27,6 +27,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.synchronize.SyncInfo; import org.eclipse.team.core.synchronize.SyncInfoSet; @@ -40,6 +41,7 @@ import org.eclipse.team.internal.ccvs.core.ICVSRunnable; import org.eclipse.team.internal.ccvs.core.client.PruneFolderVisitor; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ui.TeamUIPlugin; @@ -123,7 +125,7 @@ public abstract class CVSSubscriberOperation extends SynchronizeModelOperation { return true; } else { // No other ancestors should be null. Log the problem. - CVSUIPlugin.log(IStatus.WARNING, Policy.bind("CVSSubscriberAction.0", info.getLocal().getFullPath().toString()), null); //$NON-NLS-1$ + CVSUIPlugin.log(IStatus.WARNING, NLS.bind(CVSUIMessages.CVSSubscriberAction_0, new String[] { info.getLocal().getFullPath().toString() }), null); //$NON-NLS-1$ return false; } } else { @@ -281,7 +283,7 @@ public abstract class CVSSubscriberOperation extends SynchronizeModelOperation { } } } catch(CoreException e) { - throw new CVSException(Policy.bind("UpdateMergeActionProblems_merging_remote_resources_into_workspace_1"), e); //$NON-NLS-1$ + throw new CVSException(CVSUIMessages.UpdateMergeActionProblems_merging_remote_resources_into_workspace_1, e); //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeWizard.java index 54d2e5b48..76ec7119e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeWizard.java @@ -13,7 +13,7 @@ package org.eclipse.team.internal.ccvs.ui.subscriber; import org.eclipse.core.resources.IResource; import org.eclipse.jface.wizard.IWizard; import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.wizards.CheckoutWizard; import org.eclipse.team.internal.ui.synchronize.SubscriberParticipantWizard; import org.eclipse.team.ui.TeamUI; @@ -39,7 +39,7 @@ public class CVSSynchronizeWizard extends SubscriberParticipantWizard { if(desc != null) { return desc.getName(); } else { - return Policy.bind("CVSSynchronizeWizard.0"); //$NON-NLS-1$ + return CVSUIMessages.CVSSynchronizeWizard_0; //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CommitSetDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CommitSetDialog.java index f8f61fea5..bc6fba391 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CommitSetDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CommitSetDialog.java @@ -131,7 +131,7 @@ public class CommitSetDialog extends Dialog { composite.setFont(parent.getFont()); Label label = new Label(composite, SWT.NONE); - label.setText(Policy.bind("CommitSetDialog.0")); //$NON-NLS-1$ + label.setText(CVSUIMessages.CommitSetDialog_0); //$NON-NLS-1$ label.setLayoutData(new GridData(GridData.BEGINNING)); nameText = new Text(composite, SWT.BORDER); @@ -163,8 +163,8 @@ public class CommitSetDialog extends Dialog { radioAreaLayout.marginBottom = 0; radioArea.setLayout(radioAreaLayout); - useTitleButton = createRadioButton(radioArea, Policy.bind("CommitSetDialog.2")); //$NON-NLS-1$ - enterCommentButton = createRadioButton(radioArea, Policy.bind("CommitSetDialog.3")); //$NON-NLS-1$ + useTitleButton = createRadioButton(radioArea, CVSUIMessages.CommitSetDialog_2); //$NON-NLS-1$ + enterCommentButton = createRadioButton(radioArea, CVSUIMessages.CommitSetDialog_3); //$NON-NLS-1$ SelectionAdapter listener = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { updateEnablements(); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java index 8da9e5203..ec74c0e05 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Preferences.IPropertyChangeListener; import org.eclipse.core.runtime.Preferences.PropertyChangeEvent; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.subscribers.Subscriber; import org.eclipse.team.core.synchronize.*; @@ -96,7 +97,7 @@ public class CompareParticipant extends CVSParticipant implements IPropertyChang * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#getName() */ public String getName() { - return Policy.bind("CompareParticipant.0", getSubscriber().getName(), Utils.convertSelection(getSubscriber().roots())); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CompareParticipant_0, new String[] { getSubscriber().getName(), Utils.convertSelection(getSubscriber().roots()) }); //$NON-NLS-1$ } /* @@ -197,7 +198,7 @@ public class CompareParticipant extends CVSParticipant implements IPropertyChang * @see org.eclipse.team.ui.synchronize.SubscriberParticipant#getShortTaskName() */ protected String getShortTaskName() { - return Policy.bind("Participant.comparing"); //$NON-NLS-1$ + return CVSUIMessages.Participant_comparing; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertOperation.java index 3824e68bf..e2ef5d51a 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertOperation.java @@ -18,9 +18,11 @@ import java.util.Set; import org.eclipse.compare.structuremergeviewer.IDiffElement; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.synchronize.SyncInfo; import org.eclipse.team.core.synchronize.SyncInfoSet; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; @@ -35,7 +37,7 @@ public class CompareRevertOperation extends CVSSubscriberOperation { */ protected String getJobName() { SyncInfoSet syncSet = getSyncInfoSet(); - return Policy.bind("CompareRevertAction.0", new Integer(syncSet.size()).toString()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CompareRevertAction_0, new String[] { new Integer(syncSet.size()).toString() }); //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedOperation.java index b2f146a38..92a70d238 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedOperation.java @@ -13,6 +13,7 @@ package org.eclipse.team.internal.ccvs.ui.subscriber; import org.eclipse.compare.structuremergeviewer.IDiffElement; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.synchronize.SyncInfo; import org.eclipse.team.core.synchronize.SyncInfoSet; @@ -20,6 +21,7 @@ import org.eclipse.team.internal.ccvs.core.CVSException; import org.eclipse.team.internal.ccvs.core.CVSSyncInfo; import org.eclipse.team.internal.ccvs.core.ICVSFolder; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; @@ -39,7 +41,7 @@ public class ConfirmMergedOperation extends CVSSubscriberOperation { */ protected String getJobName() { SyncInfoSet syncSet = getSyncInfoSet(); - return Policy.bind("SubscriberConfirmMergedAction.jobName", new Integer(syncSet.size()).toString()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.SubscriberConfirmMergedAction_jobName, new String[] { new Integer(syncSet.size()).toString() }); //$NON-NLS-1$ } /* (non-Javadoc) @@ -67,7 +69,7 @@ public class ConfirmMergedOperation extends CVSSubscriberOperation { try { CVSSyncInfo cvsInfo = getCVSSyncInfo(info); if (cvsInfo == null) { - CVSUIPlugin.log(IStatus.ERROR, Policy.bind("SubscriberConfirmMergedAction.0", cvsInfo.getLocal().getFullPath().toString()), null); //$NON-NLS-1$ + CVSUIPlugin.log(IStatus.ERROR, NLS.bind(CVSUIMessages.SubscriberConfirmMergedAction_0, new String[] { cvsInfo.getLocal().getFullPath().toString() }), null); //$NON-NLS-1$ return false; } // Make sure the parent is managed diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/LogEntryCacheUpdateHandler.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/LogEntryCacheUpdateHandler.java index f871da515..425d51331 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/LogEntryCacheUpdateHandler.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/LogEntryCacheUpdateHandler.java @@ -25,6 +25,7 @@ import org.eclipse.team.internal.ccvs.core.resources.RemoteFile; import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; import org.eclipse.team.internal.ccvs.core.util.Util; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.operations.RemoteLogOperation; @@ -159,7 +160,7 @@ public class LogEntryCacheUpdateHandler extends BackgroundEventHandler { } public LogEntryCacheUpdateHandler(ISynchronizePageConfiguration configuration) { - super(Policy.bind("LogEntryCacheUpdateHandler.1"), Policy.bind("LogEntryCacheUpdateHandler.0")); //$NON-NLS-1$ //$NON-NLS-2$ + super(CVSUIMessages.LogEntryCacheUpdateHandler_1, CVSUIMessages.LogEntryCacheUpdateHandler_0); //$NON-NLS-1$ //$NON-NLS-2$ this.configuration = configuration; this.subscriber = getSubscriber(configuration); cacheReference = new SoftReference(new LogEntryCache()); @@ -388,7 +389,7 @@ public class LogEntryCacheUpdateHandler extends BackgroundEventHandler { } if (job.getState() != Job.NONE) { // The job never completed in the time aloted so throw an exception - throw new CVSException(Policy.bind("LogEntryCacheUpdateHandler.2")); //$NON-NLS-1$ + throw new CVSException(CVSUIMessages.LogEntryCacheUpdateHandler_2); //$NON-NLS-1$ } } // Queue the event even if the job didn't stop in the time aloted @@ -424,8 +425,8 @@ public class LogEntryCacheUpdateHandler extends BackgroundEventHandler { logEntriesCache = new LogEntryCache(); cacheReference = new SoftReference(logEntriesCache); } - monitor.beginTask(Policy.bind("CVSChangeSetCollector.4"), 100 * projectMapping.size()); //$NON-NLS-1$ - monitor.setTaskName(Policy.bind("CVSChangeSetCollector.4")); //$NON-NLS-1$ + monitor.beginTask(CVSUIMessages.CVSChangeSetCollector_4, 100 * projectMapping.size()); //$NON-NLS-1$ + monitor.setTaskName(CVSUIMessages.CVSChangeSetCollector_4); //$NON-NLS-1$ for (Iterator iter = projectMapping.values().iterator(); iter.hasNext();) { SyncInfoSet set = (SyncInfoSet) iter.next(); fetchLogEntries(logEntriesCache, set, Policy.subMonitorFor(monitor, 90)); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java index a5a6150a2..6adf35772 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java @@ -15,11 +15,12 @@ import java.util.*; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.subscribers.Subscriber; import org.eclipse.team.internal.ccvs.core.*; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.actions.ShowAnnotationAction; import org.eclipse.team.internal.ccvs.ui.actions.ShowResourceInHistoryAction; import org.eclipse.team.internal.ui.Utils; @@ -120,12 +121,12 @@ public class MergeSynchronizeParticipant extends CVSParticipant { String qualifier = descriptor.getId(); String localname = secondayId; if(qualifier == null || localname == null) { - throw new PartInitException(Policy.bind("MergeSynchronizeParticipant.8")); //$NON-NLS-1$ + throw new PartInitException(CVSUIMessages.MergeSynchronizeParticipant_8); //$NON-NLS-1$ } try { setSubscriber(read(new QualifiedName(qualifier, localname), memento)); } catch (CVSException e) { - throw new PartInitException(Policy.bind("MergeSynchronizeParticipant.9"), e); //$NON-NLS-1$ + throw new PartInitException(CVSUIMessages.MergeSynchronizeParticipant_9, e); //$NON-NLS-1$ } } } @@ -155,7 +156,7 @@ public class MergeSynchronizeParticipant extends CVSParticipant { * @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#getName() */ public String getName() { - return Policy.bind("CompareParticipant.0", ((CVSMergeSubscriber)getSubscriber()).getName(), Utils.convertSelection(getSubscriber().roots())); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CompareParticipant_0, new String[] { ((CVSMergeSubscriber)getSubscriber()).getName(), Utils.convertSelection(getSubscriber().roots()) }); //$NON-NLS-1$ } /* @@ -221,7 +222,7 @@ public class MergeSynchronizeParticipant extends CVSParticipant { IMemento[] rootNodes = memento.getChildren(CTX_ROOT); if(rootNodes == null || rootNodes.length == 0) { - throw new CVSException(Policy.bind("MergeSynchronizeParticipant.10", id.toString())); //$NON-NLS-1$ + throw new CVSException(NLS.bind(CVSUIMessages.MergeSynchronizeParticipant_10, new String[] { id.toString() })); //$NON-NLS-1$ } List resources = new ArrayList(); @@ -233,11 +234,11 @@ public class MergeSynchronizeParticipant extends CVSParticipant { resources.add(resource); } else { // log that a resource previously in the merge set is no longer in the workspace - CVSProviderPlugin.log(CVSStatus.INFO, Policy.bind("MergeSynchronizeParticipant.11", path.toString()), null); //$NON-NLS-1$ + CVSProviderPlugin.log(CVSStatus.INFO, NLS.bind(CVSUIMessages.MergeSynchronizeParticipant_11, new String[] { path.toString() }), null); //$NON-NLS-1$ } } if(resources.isEmpty()) { - throw new CVSException(Policy.bind("MergeSynchronizeParticipant.12", id.toString())); //$NON-NLS-1$ + throw new CVSException(NLS.bind(CVSUIMessages.MergeSynchronizeParticipant_12, new String[] { id.toString() })); //$NON-NLS-1$ } IResource[] roots = (IResource[]) resources.toArray(new IResource[resources.size()]); return new CVSMergeSubscriber(id, roots, start, end); @@ -275,6 +276,6 @@ public class MergeSynchronizeParticipant extends CVSParticipant { * @see org.eclipse.team.ui.synchronize.SubscriberParticipant#getShortTaskName() */ protected String getShortTaskName() { - return Policy.bind("Participant.merging"); //$NON-NLS-1$ + return CVSUIMessages.Participant_merging; //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateOperation.java index b3bbc8736..652560b7b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateOperation.java @@ -18,6 +18,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.subscribers.Subscriber; import org.eclipse.team.core.synchronize.SyncInfo; @@ -28,6 +29,7 @@ import org.eclipse.team.internal.ccvs.core.CVSSyncInfo; import org.eclipse.team.internal.ccvs.core.CVSTag; import org.eclipse.team.internal.ccvs.core.client.Command; import org.eclipse.team.internal.ccvs.core.client.Update; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; @@ -48,7 +50,7 @@ public class MergeUpdateOperation extends SafeUpdateOperation { */ protected String getJobName() { SyncInfoSet syncSet = getSyncInfoSet(); - return Policy.bind("MergeUpdateAction.jobName", new Integer(syncSet.size()).toString()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.MergeUpdateAction_jobName, new String[] { new Integer(syncSet.size()).toString() }); //$NON-NLS-1$ } /* (non-Javadoc) @@ -147,7 +149,7 @@ public class MergeUpdateOperation extends SafeUpdateOperation { // Assumption that all nodes are from the same subscriber. currentSubcriber = ((CVSSyncInfo)node).getSubscriber(); if (!(currentSubcriber instanceof CVSMergeSubscriber)) { - throw new CVSException(Policy.bind("MergeUpdateAction.invalidSubscriber", currentSubcriber.toString())); //$NON-NLS-1$ + throw new CVSException(NLS.bind(CVSUIMessages.MergeUpdateAction_invalidSubscriber, new String[] { currentSubcriber.toString() })); //$NON-NLS-1$ } } 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 6126e29c1..ab2361cc0 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 @@ -23,7 +23,7 @@ import org.eclipse.team.core.synchronize.*; import org.eclipse.team.core.synchronize.FastSyncInfoFilter.*; import org.eclipse.team.core.variants.IResourceVariant; import org.eclipse.team.internal.ccvs.core.*; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.operations.RemoteCompareOperation.CompareTreeBuilder; import org.eclipse.team.internal.core.subscribers.ChangeSet; import org.eclipse.team.internal.core.subscribers.CheckedInChangeSet; @@ -33,7 +33,7 @@ import org.eclipse.team.ui.synchronize.*; class OpenChangeSetAction extends SynchronizeModelAction { protected OpenChangeSetAction(ISynchronizePageConfiguration configuration) { - super(Policy.bind("OpenCommitSetAction.20"), configuration); //$NON-NLS-1$ + super(CVSUIMessages.OpenCommitSetAction_20, configuration); //$NON-NLS-1$ } /* (non-Javadoc) @@ -121,7 +121,7 @@ class OpenChangeSetAction extends SynchronizeModelAction { if (infos.length > 0) { ICVSRepositoryLocation location = getLocation(infos[0]); if (location == null) { - handle(new CVSException(Policy.bind("OpenCommitSetAction.21"))); //$NON-NLS-1$ + handle(new CVSException(CVSUIMessages.OpenCommitSetAction_21)); //$NON-NLS-1$ return; } CompareTreeBuilder builder = new CompareTreeBuilder(location, null, null); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateSubscriberOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateSubscriberOperation.java index fc13cb758..f2215c568 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateSubscriberOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateSubscriberOperation.java @@ -17,11 +17,13 @@ import java.util.List; import org.eclipse.compare.structuremergeviewer.IDiffElement; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.synchronize.FastSyncInfoFilter; import org.eclipse.team.core.synchronize.SyncInfo; import org.eclipse.team.core.synchronize.SyncInfoSet; import org.eclipse.team.internal.ccvs.core.CVSException; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.operations.OverrideAndUpdateOperation; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; @@ -68,6 +70,6 @@ public class OverrideAndUpdateSubscriberOperation extends CVSSubscriberOperation */ protected String getJobName() { SyncInfoSet syncSet = getSyncInfoSet(); - return Policy.bind("UpdateAction.jobName", new Integer(syncSet.size()).toString()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.UpdateAction_jobName, new String[] { new Integer(syncSet.size()).toString() }); //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateOperation.java index 5979e9ac4..d7260f79f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateOperation.java @@ -25,6 +25,7 @@ import org.eclipse.team.internal.ccvs.core.ICVSFile; import org.eclipse.team.internal.ccvs.core.ICVSFolder; import org.eclipse.team.internal.ccvs.core.ICVSRunnable; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; @@ -66,13 +67,13 @@ public class RefreshDirtyStateOperation extends CVSSubscriberOperation { } protected String getErrorTitle() { - return Policy.bind("RefreshDirtyStateOperation.0"); //$NON-NLS-1$ + return CVSUIMessages.RefreshDirtyStateOperation_0; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#getJobName(org.eclipse.team.ui.sync.SyncInfoSet) */ protected String getJobName() { - return Policy.bind("RefreshDirtyStateOperation.1"); //$NON-NLS-1$ + return CVSUIMessages.RefreshDirtyStateOperation_1; //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateOperation.java index 6a4b16473..489f03725 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateOperation.java @@ -21,6 +21,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.synchronize.FastSyncInfoFilter; import org.eclipse.team.core.synchronize.SyncInfo; @@ -35,6 +36,7 @@ import org.eclipse.team.internal.ccvs.core.ICVSFile; import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.operations.UpdateOnlyMergableOperation; @@ -338,8 +340,8 @@ public abstract class SafeUpdateOperation extends CVSSubscriberOperation { TeamUIPlugin.getStandardDisplay().syncExec(new Runnable() { public void run() { MessageDialog.openInformation(getShell(), - Policy.bind("SafeUpdateAction.warnFilesWithConflictsTitle"), //$NON-NLS-1$ - Policy.bind("SafeUpdateAction.warnFilesWithConflictsDescription")); //$NON-NLS-1$ + CVSUIMessages.SafeUpdateAction_warnFilesWithConflictsTitle, //$NON-NLS-1$ + CVSUIMessages.SafeUpdateAction_warnFilesWithConflictsDescription); //$NON-NLS-1$ } }); } @@ -390,7 +392,7 @@ public abstract class SafeUpdateOperation extends CVSSubscriberOperation { } protected String getErrorTitle() { - return Policy.bind("UpdateAction.update"); //$NON-NLS-1$ + return CVSUIMessages.UpdateAction_update; //$NON-NLS-1$ } /* (non-Javadoc) @@ -398,7 +400,7 @@ public abstract class SafeUpdateOperation extends CVSSubscriberOperation { */ protected String getJobName() { SyncInfoSet syncSet = getSyncInfoSet(); - return Policy.bind("UpdateAction.jobName", new Integer(syncSet.size()).toString()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.UpdateAction_jobName, new String[] { new Integer(syncSet.size()).toString() }); //$NON-NLS-1$ } /** @@ -416,8 +418,8 @@ public abstract class SafeUpdateOperation extends CVSSubscriberOperation { TeamUIPlugin.getStandardDisplay().syncExec(new Runnable() { public void run() { String sizeString = Integer.toString(set.size()); - String message = set.size() > 1 ? Policy.bind("UpdateAction.promptForUpdateSeveral", sizeString) : Policy.bind("UpdateAction.promptForUpdateOne", sizeString); //$NON-NLS-1$ //$NON-NLS-2$ - result[0] = MessageDialog.openQuestion(getShell(), Policy.bind("UpdateAction.promptForUpdateTitle", sizeString), message); //$NON-NLS-1$ + String message = set.size() > 1 ? NLS.bind(CVSUIMessages.UpdateAction_promptForUpdateSeveral, new String[] { sizeString }) : NLS.bind(CVSUIMessages.UpdateAction_promptForUpdateOne, new String[] { sizeString }); //$NON-NLS-1$ //$NON-NLS-2$ + result[0] = MessageDialog.openQuestion(getShell(), NLS.bind(CVSUIMessages.UpdateAction_promptForUpdateTitle, new String[] { sizeString }), message); //$NON-NLS-1$ } }); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SyncInfoSetDetailsDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SyncInfoSetDetailsDialog.java index 8053eb667..88df6af14 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SyncInfoSetDetailsDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SyncInfoSetDetailsDialog.java @@ -20,7 +20,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.*; import org.eclipse.team.core.synchronize.*; import org.eclipse.team.internal.ccvs.ui.AdaptableResourceList; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ui.dialogs.DetailsDialog; import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; @@ -39,14 +39,9 @@ public abstract class SyncInfoSetDetailsDialog extends DetailsDialog { private SyncInfoSet syncSet; private Object[] selectedResources; - /** - * @param parentShell - * @param dialogTitle - */ - public SyncInfoSetDetailsDialog(Shell parentShell, String dialogTitle, String detailsTitle, SyncInfoSet syncSet) { + public SyncInfoSetDetailsDialog(Shell parentShell, String dialogTitle, SyncInfoSet syncSet) { super(parentShell, dialogTitle); this.syncSet = syncSet; - //this.detailsTitle = detailsTitle; } /* (non-Javadoc) @@ -112,7 +107,7 @@ public abstract class SyncInfoSetDetailsDialog extends DetailsDialog { data.grabExcessHorizontalSpace = true; composite.setData(data); - Button selectButton = createButton(buttonComposite, IDialogConstants.SELECT_ALL_ID, Policy.bind("ReleaseCommentDialog.selectAll"), false); //$NON-NLS-1$ + Button selectButton = createButton(buttonComposite, IDialogConstants.SELECT_ALL_ID, CVSUIMessages.ReleaseCommentDialog_selectAll, false); //$NON-NLS-1$ SelectionListener listener = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { listViewer.setAllChecked(true); @@ -121,7 +116,7 @@ public abstract class SyncInfoSetDetailsDialog extends DetailsDialog { }; selectButton.addSelectionListener(listener); - Button deselectButton = createButton(buttonComposite, IDialogConstants.DESELECT_ALL_ID, Policy.bind("ReleaseCommentDialog.deselectAll"), false); //$NON-NLS-1$ + Button deselectButton = createButton(buttonComposite, IDialogConstants.DESELECT_ALL_ID, CVSUIMessages.ReleaseCommentDialog_deselectAll, false); //$NON-NLS-1$ listener = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { listViewer.setAllChecked(false); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/UpdateDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/UpdateDialog.java index 3ea8d91bc..2c6bdf4cb 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/UpdateDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/UpdateDialog.java @@ -16,7 +16,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.synchronize.SyncInfoSet; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; /** * This dialog prompts for the type of update which should take place @@ -28,7 +28,7 @@ public class UpdateDialog extends SyncInfoSetDetailsDialog { public static final int YES = IDialogConstants.YES_ID; public UpdateDialog(Shell parentShell, SyncInfoSet syncSet) { - super(parentShell, Policy.bind("UpdateDialog.overwriteTitle"), Policy.bind("UpdateDialog.overwriteDetailsTitle"), syncSet); //$NON-NLS-1$ //$NON-NLS-2$ + super(parentShell, CVSUIMessages.UpdateDialog_overwriteTitle, syncSet); //$NON-NLS-1$ //$NON-NLS-2$ } /* (non-Javadoc) @@ -41,7 +41,7 @@ public class UpdateDialog extends SyncInfoSetDetailsDialog { // TODO: set F1 help //WorkbenchHelp.setHelp(composite, IHelpContextIds.ADD_TO_VERSION_CONTROL_DIALOG); - createWrappingLabel(composite, Policy.bind("UpdateDialog.overwriteMessage")); //$NON-NLS-1$ + createWrappingLabel(composite, CVSUIMessages.UpdateDialog_overwriteMessage); //$NON-NLS-1$ } protected void createButtonsForButtonBar(Composite parent) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java index 9cb5873ac..b26710b12 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.synchronize.SyncInfo; @@ -26,6 +27,7 @@ import org.eclipse.team.core.synchronize.SyncInfoSet; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.client.Command; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.operations.*; @@ -52,7 +54,7 @@ public class WorkspaceCommitOperation extends CVSSubscriberOperation { * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberOperation#getErrorTitle() */ protected String getErrorTitle() { - return Policy.bind("CommitAction.commitFailed"); //$NON-NLS-1$ + return CVSUIMessages.CommitAction_commitFailed; //$NON-NLS-1$ } /* (non-Javadoc) @@ -60,7 +62,7 @@ public class WorkspaceCommitOperation extends CVSSubscriberOperation { */ protected String getJobName() { SyncInfoSet syncSet = getSyncInfoSet(); - return Policy.bind("CommitAction.jobName", new Integer(syncSet.size()).toString()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.CommitAction_jobName, new String[] { new Integer(syncSet.size()).toString() }); //$NON-NLS-1$ } /* (non-Javadoc) @@ -237,12 +239,12 @@ public class WorkspaceCommitOperation extends CVSSubscriberOperation { */ protected int promptForConflicts(SyncInfoSet syncSet) { String[] buttons = new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL}; - String question = Policy.bind("CommitSyncAction.questionRelease"); //$NON-NLS-1$ - String title = Policy.bind("CommitSyncAction.titleRelease"); //$NON-NLS-1$ + String question = CVSUIMessages.CommitSyncAction_questionRelease; //$NON-NLS-1$ + String title = CVSUIMessages.CommitSyncAction_titleRelease; //$NON-NLS-1$ String[] tips = new String[] { - Policy.bind("CommitSyncAction.releaseAll"), //$NON-NLS-1$ - Policy.bind("CommitSyncAction.releasePart"), //$NON-NLS-1$ - Policy.bind("CommitSyncAction.cancelRelease") //$NON-NLS-1$ + CVSUIMessages.CommitSyncAction_releaseAll, //$NON-NLS-1$ + CVSUIMessages.CommitSyncAction_releasePart, //$NON-NLS-1$ + CVSUIMessages.CommitSyncAction_cancelRelease }; Shell shell = getShell(); final ToolTipMessageDialog dialog = new ToolTipMessageDialog(shell, title, null, question, MessageDialog.QUESTION, buttons, tips, 0); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java index 72fc3d563..55a1795bf 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java @@ -20,6 +20,7 @@ import org.eclipse.jface.viewers.ILabelDecorator; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.synchronize.SyncInfo; import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.actions.*; @@ -136,9 +137,9 @@ public class WorkspaceSynchronizeParticipant extends ScopableSubscriberParticipa * @see org.eclipse.team.ui.synchronize.ChangeSetCapability#createChangeSet(org.eclipse.team.core.synchronize.SyncInfo[]) */ public ActiveChangeSet createChangeSet(ISynchronizePageConfiguration configuration, SyncInfo[] infos) { - ActiveChangeSet set = getActiveChangeSetManager().createSet(Policy.bind("WorkspaceChangeSetCapability.1"), new SyncInfo[0]); //$NON-NLS-1$ + ActiveChangeSet set = getActiveChangeSetManager().createSet(CVSUIMessages.WorkspaceChangeSetCapability_1, new SyncInfo[0]); //$NON-NLS-1$ CommitSetDialog dialog = new CommitSetDialog(configuration.getSite().getShell(), set, getResources(infos), - Policy.bind("WorkspaceChangeSetCapability.2"), Policy.bind("WorkspaceChangeSetCapability.3")); //$NON-NLS-1$ //$NON-NLS-2$ + CVSUIMessages.WorkspaceChangeSetCapability_2, CVSUIMessages.WorkspaceChangeSetCapability_3); //$NON-NLS-1$ //$NON-NLS-2$ dialog.open(); if (dialog.getReturnCode() != InputDialog.OK) return null; set.add(infos); @@ -158,7 +159,7 @@ public class WorkspaceSynchronizeParticipant extends ScopableSubscriberParticipa */ public void editChangeSet(ISynchronizePageConfiguration configuration, ActiveChangeSet set) { CommitSetDialog dialog = new CommitSetDialog(configuration.getSite().getShell(), set, set.getResources(), - Policy.bind("WorkspaceChangeSetCapability.7"), Policy.bind("WorkspaceChangeSetCapability.8")); //$NON-NLS-1$ //$NON-NLS-2$ + CVSUIMessages.WorkspaceChangeSetCapability_7, CVSUIMessages.WorkspaceChangeSetCapability_8); //$NON-NLS-1$ //$NON-NLS-2$ dialog.open(); if (dialog.getReturnCode() != InputDialog.OK) return; // Nothing to do here as the set was updated by the dialog diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java index 8e1ebeef4..cc28234ac 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button; @@ -24,8 +25,8 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.team.internal.ccvs.core.CVSTag; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.wizards.CVSWizardPage; import org.eclipse.team.internal.ui.PixelConverter; import org.eclipse.team.internal.ui.SWTUtils; @@ -69,10 +70,10 @@ public class BranchPromptDialog extends DetailsDialog { final int areaWidth= convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH); - final Label description= SWTUtils.createLabel(composite, allStickyResources ? Policy.bind("BranchWizardPage.pageDescriptionVersion") : Policy.bind("BranchWizardPage.pageDescription")); //$NON-NLS-1$//$NON-NLS-2$ + final Label description= SWTUtils.createLabel(composite, allStickyResources ? CVSUIMessages.BranchWizardPage_pageDescriptionVersion : CVSUIMessages.BranchWizardPage_pageDescription); //$NON-NLS-1$//$NON-NLS-2$ description.setLayoutData(SWTUtils.createGridData(areaWidth, SWT.DEFAULT, true, false)); - final Label name= SWTUtils.createLabel(composite, Policy.bind("BranchWizardPage.branchName")); //$NON-NLS-1$ + final Label name= SWTUtils.createLabel(composite, CVSUIMessages.BranchWizardPage_branchName); //$NON-NLS-1$ name.setLayoutData(SWTUtils.createGridData(areaWidth, SWT.DEFAULT, true, false)); branchText = CVSWizardPage.createTextField(composite); @@ -85,7 +86,7 @@ public class BranchPromptDialog extends DetailsDialog { }); addBranchContentAssist(); - final Button check = SWTUtils.createCheckBox(composite, Policy.bind("BranchWizardPage.startWorking")); //$NON-NLS-1$ + final Button check = SWTUtils.createCheckBox(composite, CVSUIMessages.BranchWizardPage_startWorking); //$NON-NLS-1$ check.addListener(SWT.Selection, new Listener() { public void handleEvent(Event event) { update = check.getSelection(); @@ -94,10 +95,10 @@ public class BranchPromptDialog extends DetailsDialog { check.setSelection(true); update = true; - final Label versionLabel1= SWTUtils.createLabel(composite, Policy.bind("BranchWizardPage.specifyVersion")); //$NON-NLS-1$ + final Label versionLabel1= SWTUtils.createLabel(composite, CVSUIMessages.BranchWizardPage_specifyVersion); //$NON-NLS-1$ versionLabel1.setLayoutData(SWTUtils.createGridData(areaWidth, SWT.DEFAULT, true, false)); - final Label versionLabel2= SWTUtils.createLabel(composite, Policy.bind("BranchWizardPage.versionName")); //$NON-NLS-1$ + final Label versionLabel2= SWTUtils.createLabel(composite, CVSUIMessages.BranchWizardPage_versionName); //$NON-NLS-1$ versionLabel2.setLayoutData(SWTUtils.createGridData(areaWidth, SWT.DEFAULT, true, false)); versionText = CVSWizardPage.createTextField(composite); @@ -134,7 +135,7 @@ public class BranchPromptDialog extends DetailsDialog { */ protected void updateVersionName(String branchName) { if(versionText!=null && !allStickyResources) { - versionText.setText(Policy.bind("BranchWizardPage.versionPrefix") + branchName); //$NON-NLS-1$ + versionText.setText(CVSUIMessages.BranchWizardPage_versionPrefix + branchName); //$NON-NLS-1$ } } @@ -153,7 +154,7 @@ public class BranchPromptDialog extends DetailsDialog { composite.setLayoutData(gridData); tagArea = new TagSelectionArea(getShell(), tagSource, TagSelectionArea.INCLUDE_VERSIONS | TagSelectionArea.INCLUDE_BRANCHES, null); - tagArea.setTagAreaLabel(Policy.bind("BranchWizardPage.existingVersionsAndBranches")); //$NON-NLS-1$ + tagArea.setTagAreaLabel(CVSUIMessages.BranchWizardPage_existingVersionsAndBranches); //$NON-NLS-1$ tagArea.setIncludeFilterInputArea(false); tagArea.createArea(composite); @@ -171,15 +172,15 @@ public class BranchPromptDialog extends DetailsDialog { } else { IStatus status = CVSTag.validateTagName(branchTag); if (!status.isOK()) { - message = Policy.bind("BranchWizard.branchNameWarning", status.getMessage()); //$NON-NLS-1$ + message = NLS.bind(CVSUIMessages.BranchWizard_branchNameWarning, new String[] { status.getMessage() }); //$NON-NLS-1$ } else { if(versionText!=null) { status = CVSTag.validateTagName(versionText.getText()); if (!status.isOK()) { - message = Policy.bind("BranchWizard.versionNameWarning", status.getMessage()); //$NON-NLS-1$ + message = NLS.bind(CVSUIMessages.BranchWizard_versionNameWarning, new String[] { status.getMessage() }); //$NON-NLS-1$ } else { if(versionTag.length() != 0 && versionTag.equals(branchTag)) { - message = Policy.bind("BranchWizard.branchAndVersionMustBeDifferent"); //$NON-NLS-1$ + message = CVSUIMessages.BranchWizard_branchAndVersionMustBeDifferent; //$NON-NLS-1$ } } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/LocalProjectTagSource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/LocalProjectTagSource.java index 0da8fbd26..ec514214d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/LocalProjectTagSource.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/LocalProjectTagSource.java @@ -17,12 +17,13 @@ import java.util.List; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.RepositoryProvider; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; /** * Tag source that gets its tags from the projects exist in the workspace @@ -95,7 +96,7 @@ public class LocalProjectTagSource extends TagSource { * @see org.eclipse.team.internal.ccvs.ui.tags.TagSource#getShortDescription() */ public String getShortDescription() { - return Policy.bind("LocalProjectTagSource.0", Integer.toString(remoteFolders.length)); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.LocalProjectTagSource_0, new String[] { Integer.toString(remoteFolders.length) }); //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java index 9f140463b..ceef326b2 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java @@ -10,9 +10,10 @@ *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui.tags; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.internal.ccvs.core.ICVSFolder; import org.eclipse.team.internal.ccvs.core.ICVSResource; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; /** * A tag source for multiple folders. @@ -33,7 +34,7 @@ public class MultiFolderTagSource extends SingleFolderTagSource { * @see org.eclipse.team.internal.ccvs.ui.merge.SingleFolderTagSource#getShortDescription() */ public String getShortDescription() { - return Policy.bind("MultiFolderTagSource.0", Integer.toString(folders.length)); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.MultiFolderTagSource_0, new String[] { Integer.toString(folders.length) }); //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagAsVersionDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagAsVersionDialog.java index 38be5bbaf..3daa2d76d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagAsVersionDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagAsVersionDialog.java @@ -19,8 +19,8 @@ import org.eclipse.swt.events.*; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.*; import org.eclipse.team.internal.ccvs.core.CVSTag; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation; import org.eclipse.team.internal.ui.PixelConverter; import org.eclipse.team.internal.ui.SWTUtils; @@ -56,7 +56,7 @@ public class TagAsVersionDialog extends DetailsDialog { final int width= convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);; - final Label label = SWTUtils.createLabel(parent, Policy.bind("TagAction.enterTag")); //$NON-NLS-1$ + final Label label = SWTUtils.createLabel(parent, CVSUIMessages.TagAction_enterTag); //$NON-NLS-1$ label.setLayoutData(SWTUtils.createGridData(width, SWT.DEFAULT, true, false)); tagText = new Text(parent, SWT.SINGLE | SWT.BORDER); @@ -70,7 +70,7 @@ public class TagAsVersionDialog extends DetailsDialog { } ); - moveTagButton= SWTUtils.createCheckBox(parent, Policy.bind("TagAction.moveTag")); //$NON-NLS-1$ + moveTagButton= SWTUtils.createCheckBox(parent, CVSUIMessages.TagAction_moveTag); //$NON-NLS-1$ moveTagButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { moveTag = moveTagButton.getSelection(); @@ -100,7 +100,7 @@ public class TagAsVersionDialog extends DetailsDialog { composite.setLayoutData(gridData); tagArea = new TagSelectionArea(getShell(), tagSource, TagSelectionArea.INCLUDE_VERSIONS, null); - tagArea.setTagAreaLabel(Policy.bind("TagAction.existingVersions")); //$NON-NLS-1$ + tagArea.setTagAreaLabel(CVSUIMessages.TagAction_existingVersions); //$NON-NLS-1$ tagArea.setIncludeFilterInputArea(false); tagArea.createArea(composite); tagArea.addPropertyChangeListener(new IPropertyChangeListener() { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagConfigurationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagConfigurationDialog.java index 0fec7fb46..f772054c0 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagConfigurationDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagConfigurationDialog.java @@ -20,6 +20,7 @@ import org.eclipse.jface.dialogs.*; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.*; import org.eclipse.swt.graphics.Point; @@ -224,7 +225,7 @@ public class TagConfigurationDialog extends Dialog { */ protected void configureShell(Shell newShell) { super.configureShell(newShell); - newShell.setText(Policy.bind("TagConfigurationDialog.1", tagSource.getShortDescription())); //$NON-NLS-1$ + newShell.setText(NLS.bind(CVSUIMessages.TagConfigurationDialog_1, new String[] { tagSource.getShortDescription() })); //$NON-NLS-1$ } /** @@ -250,7 +251,7 @@ public class TagConfigurationDialog extends Dialog { comp.setLayoutData(new GridData(GridData.FILL_BOTH)); Label cvsResourceTreeLabel = new Label(comp, SWT.NONE); - cvsResourceTreeLabel.setText(Policy.bind("TagConfigurationDialog.5")); //$NON-NLS-1$ + cvsResourceTreeLabel.setText(CVSUIMessages.TagConfigurationDialog_5); //$NON-NLS-1$ data = new GridData(); data.horizontalSpan = 1; cvsResourceTreeLabel.setLayoutData(data); @@ -281,7 +282,7 @@ public class TagConfigurationDialog extends Dialog { comp.setLayoutData(new GridData(GridData.FILL_BOTH)); Label cvsTagTreeLabel = new Label(comp, SWT.NONE); - cvsTagTreeLabel.setText(Policy.bind("TagConfigurationDialog.6")); //$NON-NLS-1$ + cvsTagTreeLabel.setText(CVSUIMessages.TagConfigurationDialog_6); //$NON-NLS-1$ data = new GridData(); data.horizontalSpan = 1; cvsTagTreeLabel.setLayoutData(data); @@ -307,7 +308,7 @@ public class TagConfigurationDialog extends Dialog { selectComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); Button selectAllButton = new Button(selectComp, SWT.PUSH); selectAllButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - selectAllButton.setText(Policy.bind("ReleaseCommentDialog.selectAll")); //$NON-NLS-1$ + selectAllButton.setText(CVSUIMessages.ReleaseCommentDialog_selectAll); //$NON-NLS-1$ selectAllButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { int nItems = table.getItemCount(); @@ -317,7 +318,7 @@ public class TagConfigurationDialog extends Dialog { }); Button deselectAllButton = new Button(selectComp, SWT.PUSH); deselectAllButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - deselectAllButton.setText(Policy.bind("ReleaseCommentDialog.deselectAll")); //$NON-NLS-1$ + deselectAllButton.setText(CVSUIMessages.ReleaseCommentDialog_deselectAll); //$NON-NLS-1$ deselectAllButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { int nItems = table.getItemCount(); @@ -352,7 +353,7 @@ public class TagConfigurationDialog extends Dialog { rememberedTags.setLayout (gridLayout); Label rememberedTagsLabel = new Label (rememberedTags, SWT.NONE); - rememberedTagsLabel.setText (Policy.bind("TagConfigurationDialog.7")); //$NON-NLS-1$ + rememberedTagsLabel.setText (CVSUIMessages.TagConfigurationDialog_7); //$NON-NLS-1$ data = new GridData (); data.horizontalSpan = 2; rememberedTagsLabel.setLayoutData (data); @@ -385,7 +386,7 @@ public class TagConfigurationDialog extends Dialog { buttonComposite.setLayout (gridLayout); addSelectedTagsButton = new Button (buttonComposite, SWT.PUSH); - addSelectedTagsButton.setText (Policy.bind("TagConfigurationDialog.8")); //$NON-NLS-1$ + addSelectedTagsButton.setText (CVSUIMessages.TagConfigurationDialog_8); //$NON-NLS-1$ data = getStandardButtonData(addSelectedTagsButton); data.horizontalAlignment = GridData.FILL; addSelectedTagsButton.setLayoutData(data); @@ -397,7 +398,7 @@ public class TagConfigurationDialog extends Dialog { } }); Button addDatesButton = new Button(buttonComposite, SWT.PUSH); - addDatesButton.setText(Policy.bind("TagConfigurationDialog.0")); //$NON-NLS-1$ + addDatesButton.setText(CVSUIMessages.TagConfigurationDialog_0); //$NON-NLS-1$ data = getStandardButtonData(addDatesButton); data.horizontalAlignment = GridData.FILL; addDatesButton.setLayoutData(data); @@ -410,7 +411,7 @@ public class TagConfigurationDialog extends Dialog { } }); removeTagButton = new Button (buttonComposite, SWT.PUSH); - removeTagButton.setText (Policy.bind("TagConfigurationDialog.9")); //$NON-NLS-1$ + removeTagButton.setText (CVSUIMessages.TagConfigurationDialog_9); //$NON-NLS-1$ data = getStandardButtonData(removeTagButton); data.horizontalAlignment = GridData.FILL; removeTagButton.setLayoutData(data); @@ -423,7 +424,7 @@ public class TagConfigurationDialog extends Dialog { }); Button removeAllTags = new Button (buttonComposite, SWT.PUSH); - removeAllTags.setText (Policy.bind("TagConfigurationDialog.10")); //$NON-NLS-1$ + removeAllTags.setText (CVSUIMessages.TagConfigurationDialog_10); //$NON-NLS-1$ data = getStandardButtonData(removeAllTags); data.horizontalAlignment = GridData.FILL; removeAllTags.setLayoutData(data); @@ -437,7 +438,7 @@ public class TagConfigurationDialog extends Dialog { if(allowSettingAutoRefreshFiles) { Label explanation = new Label(rememberedTags, SWT.WRAP); - explanation.setText(Policy.bind("TagConfigurationDialog.11")); //$NON-NLS-1$ + explanation.setText(CVSUIMessages.TagConfigurationDialog_11); //$NON-NLS-1$ data = new GridData (); data.horizontalSpan = 2; //data.widthHint = 300; @@ -474,7 +475,7 @@ public class TagConfigurationDialog extends Dialog { buttonComposite2.setLayout (gridLayout); addSelectedFilesButton = new Button (buttonComposite2, SWT.PUSH); - addSelectedFilesButton.setText (Policy.bind("TagConfigurationDialog.12")); //$NON-NLS-1$ + addSelectedFilesButton.setText (CVSUIMessages.TagConfigurationDialog_12); //$NON-NLS-1$ data = getStandardButtonData(addSelectedFilesButton); data.horizontalAlignment = GridData.FILL; addSelectedFilesButton.setLayoutData(data); @@ -485,7 +486,7 @@ public class TagConfigurationDialog extends Dialog { }); removeFileButton = new Button (buttonComposite2, SWT.PUSH); - removeFileButton.setText (Policy.bind("TagConfigurationDialog.13")); //$NON-NLS-1$ + removeFileButton.setText (CVSUIMessages.TagConfigurationDialog_13); //$NON-NLS-1$ data = getStandardButtonData(removeFileButton); data.horizontalAlignment = GridData.FILL; removeFileButton.setLayoutData(data); @@ -520,7 +521,7 @@ public class TagConfigurationDialog extends Dialog { try { CVSUIPlugin.runWithProgress(getShell(), true /*cancelable*/, new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - monitor.beginTask(Policy.bind("TagConfigurationDialog.22"), filesSelection.length); //$NON-NLS-1$ + monitor.beginTask(CVSUIMessages.TagConfigurationDialog_22, filesSelection.length); //$NON-NLS-1$ try { for (int i = 0; i < filesSelection.length; i++) { ICVSFile file = filesSelection[i].getCVSFile(); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagRefreshButtonArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagRefreshButtonArea.java index 6f38dd0dd..04d7a0ef7 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagRefreshButtonArea.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagRefreshButtonArea.java @@ -17,6 +17,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.*; import org.eclipse.team.core.TeamException; @@ -52,8 +53,8 @@ public class TagRefreshButtonArea extends DialogArea { */ public void createArea(Composite parent) { - final String addButtonLabel= Policy.bind("TagConfigurationDialog.21"); //$NON-NLS-1$ - final String refreshButtonLabel= Policy.bind("TagConfigurationDialog.20"); //$NON-NLS-1$ + final String addButtonLabel= CVSUIMessages.TagConfigurationDialog_21; //$NON-NLS-1$ + final String refreshButtonLabel= CVSUIMessages.TagConfigurationDialog_20; //$NON-NLS-1$ final PixelConverter converter= SWTUtils.createDialogPixelConverter(parent); @@ -101,14 +102,14 @@ public class TagRefreshButtonArea extends DialogArea { setBusy(true); Display.getDefault().asyncExec(new Runnable() { public void run() { - fMessageLabel.setText(Policy.bind("TagRefreshButtonArea.6")); //$NON-NLS-1$ + fMessageLabel.setText(CVSUIMessages.TagRefreshButtonArea_6); //$NON-NLS-1$ } }); - monitor.beginTask(Policy.bind("TagRefreshButtonArea.5"), 100); //$NON-NLS-1$ + monitor.beginTask(CVSUIMessages.TagRefreshButtonArea_5, 100); //$NON-NLS-1$ final CVSTag[] tags = tagSource.refresh(false, Policy.subMonitorFor(monitor, 70)); Display.getDefault().asyncExec(new Runnable() { public void run() { - fMessageLabel.setText(background && tags.length == 0 ? Policy.bind("TagRefreshButtonArea.7") : ""); //$NON-NLS-1$ //$NON-NLS-2$ + fMessageLabel.setText(background && tags.length == 0 ? CVSUIMessages.TagRefreshButtonArea_7 : ""); //$NON-NLS-1$ //$NON-NLS-2$ } }); if (!background && tags.length == 0 && promptForBestEffort()) { @@ -125,7 +126,7 @@ public class TagRefreshButtonArea extends DialogArea { } catch (InterruptedException e) { // operation cancelled } catch (InvocationTargetException e) { - CVSUIPlugin.openError(shell, Policy.bind("TagConfigurationDialog.14"), null, e); //$NON-NLS-1$ + CVSUIPlugin.openError(shell, CVSUIMessages.TagConfigurationDialog_14, null, e); //$NON-NLS-1$ } } @@ -142,13 +143,13 @@ public class TagRefreshButtonArea extends DialogArea { final boolean[] prompt = new boolean[] { false }; shell.getDisplay().syncExec(new Runnable() { public void run() { - MessageDialog dialog = new MessageDialog(shell, Policy.bind("TagRefreshButtonArea.0"), null, //$NON-NLS-1$ + MessageDialog dialog = new MessageDialog(shell, CVSUIMessages.TagRefreshButtonArea_0, null, //$NON-NLS-1$ getNoTagsFoundMessage(), MessageDialog.INFORMATION, new String[] { - Policy.bind("TagRefreshButtonArea.1"), //$NON-NLS-1$ - Policy.bind("TagRefreshButtonArea.2"), //$NON-NLS-1$ - Policy.bind("TagRefreshButtonArea.3") //$NON-NLS-1$ + CVSUIMessages.TagRefreshButtonArea_1, //$NON-NLS-1$ + CVSUIMessages.TagRefreshButtonArea_2, //$NON-NLS-1$ + CVSUIMessages.TagRefreshButtonArea_3 }, 1); int code = dialog.open(); if (code == 0) { @@ -164,7 +165,7 @@ public class TagRefreshButtonArea extends DialogArea { } private String getNoTagsFoundMessage() { - return Policy.bind("TagRefreshButtonArea.4", tagSource.getShortDescription()); //$NON-NLS-1$ + return NLS.bind(CVSUIMessages.TagRefreshButtonArea_4, new String[] { tagSource.getShortDescription() }); //$NON-NLS-1$ } public void setTagSource(TagSource tagSource) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagRootElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagRootElement.java index 5202e97e1..0f015f860 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagRootElement.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagRootElement.java @@ -54,11 +54,11 @@ public class TagRootElement implements IWorkbenchAdapter, IAdaptable { } public String getLabel(Object o) { if(typeOfTagRoot==CVSTag.BRANCH) { - return Policy.bind("MergeWizardEndPage.branches"); //$NON-NLS-1$ + return CVSUIMessages.MergeWizardEndPage_branches; //$NON-NLS-1$ } else if(typeOfTagRoot==CVSTag.DATE){ - return Policy.bind("TagRootElement.0"); //$NON-NLS-1$ + return CVSUIMessages.TagRootElement_0; //$NON-NLS-1$ }else { - return Policy.bind("VersionsElement.versions"); //$NON-NLS-1$ + return CVSUIMessages.VersionsElement_versions; //$NON-NLS-1$ } } public Object getParent(Object o) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java index 2e997025a..edf3c4e62 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java @@ -30,6 +30,7 @@ import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; @@ -51,8 +52,8 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Tree; import org.eclipse.team.internal.ccvs.core.CVSTag; import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.actions.CVSAction; import org.eclipse.team.internal.ccvs.ui.repo.NewDateTagAction; import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; @@ -169,9 +170,9 @@ public class TagSelectionArea extends DialogArea { Composite inner = createGrabbingComposite(parent, 1); if (isIncludeFilterInputArea()) { createFilterInput(inner); - tagAreaTextLabel = createWrappingLabel(inner, Policy.bind("TagSelectionArea.0"), 1); //$NON-NLS-1$ + tagAreaTextLabel = createWrappingLabel(inner, CVSUIMessages.TagSelectionArea_0, 1); //$NON-NLS-1$ } else { - tagAreaTextLabel = createWrappingLabel(inner, Policy.bind("TagSelectionArea.1", getTagAreaLabel()), 1); //$NON-NLS-1$ + tagAreaTextLabel = createWrappingLabel(inner, NLS.bind(CVSUIMessages.TagSelectionArea_1, new String[] { getTagAreaLabel() }), 1); //$NON-NLS-1$ } switcher = new PageBook(inner, SWT.NONE); GridData gridData = new GridData(GridData.FILL_BOTH); @@ -183,7 +184,7 @@ public class TagSelectionArea extends DialogArea { } private void createFilterInput(Composite inner) { - createWrappingLabel(inner, Policy.bind("TagSelectionArea.2", getTagAreaLabel()), 1); //$NON-NLS-1$ + createWrappingLabel(inner, NLS.bind(CVSUIMessages.TagSelectionArea_2, new String[] { getTagAreaLabel() }), 1); //$NON-NLS-1$ filterText = createText(inner, 1); filterText.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { @@ -211,7 +212,7 @@ public class TagSelectionArea extends DialogArea { */ public String getTagAreaLabel() { if (tagAreaLabel == null) - tagAreaLabel = Policy.bind("TagSelectionArea.3"); //$NON-NLS-1$ + tagAreaLabel = CVSUIMessages.TagSelectionArea_3; //$NON-NLS-1$ return tagAreaLabel; } @@ -461,14 +462,14 @@ public class TagSelectionArea extends DialogArea { handleSelectionChange(); } private void addMenuItemActions(IMenuManager manager) { - manager.add(new Action(Policy.bind("TagSelectionDialog.0")) { //$NON-NLS-1$ + manager.add(new Action(CVSUIMessages.TagSelectionDialog_0) { //$NON-NLS-1$ public void run() { CVSTag dateTag = NewDateTagAction.getDateTag(getShell(), getLocation()); addDateTag(dateTag); } }); if(getSelectedDateTagElement().length > 0){ - manager.add(new Action(Policy.bind("TagSelectionDialog.1")) { //$NON-NLS-1$ + manager.add(new Action(CVSUIMessages.TagSelectionDialog_1) { //$NON-NLS-1$ public void run() { deleteDateTag(); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionDialog.java index 422f9b66f..51cdb7849 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionDialog.java @@ -71,8 +71,8 @@ public class TagSelectionDialog extends Dialog implements IPropertyChangeListene public static CVSTag getTagToCompareWith(Shell shell, TagSource tagSource, int includeFlags) { TagSelectionDialog dialog = new TagSelectionDialog(shell, tagSource, - Policy.bind("CompareWithTagAction.message"), //$NON-NLS-1$ - Policy.bind("TagSelectionDialog.Select_a_Tag_1"), //$NON-NLS-1$ + CVSUIMessages.CompareWithTagAction_message, //$NON-NLS-1$ + CVSUIMessages.TagSelectionDialog_Select_a_Tag_1, //$NON-NLS-1$ includeFlags, false, /* show recurse*/ IHelpContextIds.COMPARE_TAG_SELECTION_DIALOG); @@ -170,7 +170,7 @@ public class TagSelectionDialog extends Dialog implements IPropertyChangeListene protected void createCustomArea(Composite parent) { if(showRecurse) { final Button recurseCheck = new Button(parent, SWT.CHECK); - recurseCheck.setText(Policy.bind("TagSelectionDialog.recurseOption")); //$NON-NLS-1$ + recurseCheck.setText(CVSUIMessages.TagSelectionDialog_recurseOption); //$NON-NLS-1$ recurseCheck.addListener(SWT.Selection, new Listener() { public void handleEvent(Event event) { recurse = recurseCheck.getSelection(); @@ -268,7 +268,7 @@ public class TagSelectionDialog extends Dialog implements IPropertyChangeListene private IRunnableContext getRunnableContext() { return new IRunnableContext() { public void run(boolean fork, boolean cancelable, final IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { - final Job refreshJob = new Job(Policy.bind("TagSelectionDialog.7")) { //$NON-NLS-1$ + final Job refreshJob = new Job(CVSUIMessages.TagSelectionDialog_7) { //$NON-NLS-1$ protected IStatus run(IProgressMonitor monitor) { if (monitor.isCanceled()) return Status.CANCEL_STATUS; @@ -276,9 +276,9 @@ public class TagSelectionDialog extends Dialog implements IPropertyChangeListene setBusy(true); runnable.run(monitor); } catch (InvocationTargetException e) { - return new CVSStatus(IStatus.ERROR, Policy.bind("TagSelectionDialog.8"), e); //$NON-NLS-1$ + return new CVSStatus(IStatus.ERROR, CVSUIMessages.TagSelectionDialog_8, e); //$NON-NLS-1$ } catch (InterruptedException e) { - return new CVSStatus(IStatus.ERROR, Policy.bind("TagSelectionDialog.8"), e); //$NON-NLS-1$ + return new CVSStatus(IStatus.ERROR, CVSUIMessages.TagSelectionDialog_8, e); //$NON-NLS-1$ } finally { setBusy(false); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionWizardPage.java index ebb43fac2..7cb489d47 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionWizardPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionWizardPage.java @@ -21,7 +21,7 @@ import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.team.internal.ccvs.core.CVSTag; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.wizards.CVSWizardPage; import org.eclipse.team.internal.ui.PixelConverter; import org.eclipse.team.internal.ui.SWTUtils; @@ -88,8 +88,8 @@ public class TagSelectionWizardPage extends CVSWizardPage { } }; useResourceTag = true; - useResourceTagButton = createRadioButton(composite, Policy.bind("TagSelectionWizardPage.0"), 1); //$NON-NLS-1$ - selectTagButton = createRadioButton(composite, Policy.bind("TagSelectionWizardPage.1"), 1); //$NON-NLS-1$ + useResourceTagButton = createRadioButton(composite, CVSUIMessages.TagSelectionWizardPage_0, 1); //$NON-NLS-1$ + selectTagButton = createRadioButton(composite, CVSUIMessages.TagSelectionWizardPage_1, 1); //$NON-NLS-1$ useResourceTagButton.setSelection(useResourceTag); selectTagButton.setSelection(!useResourceTag); useResourceTagButton.addSelectionListener(listener); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AddWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AddWizard.java index 5ee273d4e..c54522fda 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AddWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AddWizard.java @@ -96,7 +96,7 @@ public class AddWizard extends ResizableWizard { super("AddWizard", CVSUIPlugin.getPlugin().getDialogSettings()); //$NON-NLS-1$ this.op = op; this.unknowns = unknowns; - setWindowTitle(Policy.bind("AddWizard.0")); //$NON-NLS-1$ + setWindowTitle(CVSUIMessages.AddWizard_0); //$NON-NLS-1$ setDefaultPageImageDescriptor(CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_NEW_LOCATION)); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java index 44733e566..3c91cce91 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java @@ -17,13 +17,14 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.*; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.*; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.*; import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.help.WorkbenchHelp; /** @@ -54,7 +55,7 @@ public class CheckoutAsLocationSelectionPage extends CVSWizardPage { * @param description */ public CheckoutAsLocationSelectionPage(ImageDescriptor titleImage, ICVSRemoteFolder[] remoteFolders) { - super(NAME, Policy.bind("CheckoutAsLocationSelectionPage.title"), titleImage, Policy.bind("CheckoutAsLocationSelectionPage.description")); //$NON-NLS-1$ //$NON-NLS-2$ + super(NAME, CVSUIMessages.CheckoutAsLocationSelectionPage_title, titleImage, CVSUIMessages.CheckoutAsLocationSelectionPage_description); //$NON-NLS-1$ //$NON-NLS-2$ this.remoteFolders = remoteFolders; } @@ -101,7 +102,7 @@ public class CheckoutAsLocationSelectionPage extends CVSWizardPage { final Button useDefaultsButton = new Button(composite, SWT.CHECK | SWT.RIGHT); - useDefaultsButton.setText(Policy.bind("CheckoutAsLocationSelectionPage.useDefaultLabel")); //$NON-NLS-1$ + useDefaultsButton.setText(CVSUIMessages.CheckoutAsLocationSelectionPage_useDefaultLabel); //$NON-NLS-1$ useDefaultsButton.setSelection(this.useDefaults); createUserSpecifiedProjectLocationGroup(composite, !this.useDefaults); @@ -135,9 +136,9 @@ public class CheckoutAsLocationSelectionPage extends CVSWizardPage { // location label locationLabel = new Label(projectGroup, SWT.NONE); if (isSingleFolder()) { - locationLabel.setText(Policy.bind("CheckoutAsLocationSelectionPage.locationLabel")); //$NON-NLS-1$ + locationLabel.setText(CVSUIMessages.CheckoutAsLocationSelectionPage_locationLabel); //$NON-NLS-1$ } else { - locationLabel.setText(Policy.bind("CheckoutAsLocationSelectionPage.parentDirectoryLabel")); //$NON-NLS-1$ + locationLabel.setText(CVSUIMessages.CheckoutAsLocationSelectionPage_parentDirectoryLabel); //$NON-NLS-1$ } locationLabel.setEnabled(enabled); @@ -150,7 +151,7 @@ public class CheckoutAsLocationSelectionPage extends CVSWizardPage { // browse button this.browseButton = new Button(projectGroup, SWT.PUSH); - this.browseButton.setText(Policy.bind("CheckoutAsLocationSelectionPage.browseLabel")); //$NON-NLS-1$ + this.browseButton.setText(CVSUIMessages.CheckoutAsLocationSelectionPage_browseLabel); //$NON-NLS-1$ this.browseButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { handleLocationBrowseButtonPressed(); @@ -182,12 +183,12 @@ public class CheckoutAsLocationSelectionPage extends CVSWizardPage { } else { targetLocation = locationPathField.getText(); if (targetLocation.equals("")) {//$NON-NLS-1$ - return(Policy.bind("CheckoutAsLocationSelectionPage.locationEmpty")); //$NON-NLS-1$ + return(CVSUIMessages.CheckoutAsLocationSelectionPage_locationEmpty); //$NON-NLS-1$ } else{ IPath path = new Path("");//$NON-NLS-1$ if (!path.isValidPath(targetLocation)) { - return Policy.bind("CheckoutAsLocationSelectionPage.invalidLocation"); //$NON-NLS-1$ + return CVSUIMessages.CheckoutAsLocationSelectionPage_invalidLocation; //$NON-NLS-1$ } } @@ -269,9 +270,9 @@ public class CheckoutAsLocationSelectionPage extends CVSWizardPage { private void handleLocationBrowseButtonPressed() { DirectoryDialog dialog = new DirectoryDialog(locationPathField.getShell()); if (isSingleFolder()) { - dialog.setMessage(Policy.bind("CheckoutAsLocationSelectionPage.messageForSingle", getSingleProject().getName())); //$NON-NLS-1$ + dialog.setMessage(NLS.bind(CVSUIMessages.CheckoutAsLocationSelectionPage_messageForSingle, new String[] { getSingleProject().getName() })); //$NON-NLS-1$ } else { - dialog.setMessage(Policy.bind("CheckoutAsLocationSelectionPage.messageForMulti", new Integer(remoteFolders.length).toString())); //$NON-NLS-1$ + dialog.setMessage(NLS.bind(CVSUIMessages.CheckoutAsLocationSelectionPage_messageForMulti, new String[] { new Integer(remoteFolders.length).toString() })); //$NON-NLS-1$ } String dirName = locationPathField.getText(); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java index 3aa0897ca..17792ff13 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java @@ -15,14 +15,15 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.*; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.*; import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.help.WorkbenchHelp; /** @@ -50,7 +51,7 @@ public class CheckoutAsMainPage extends CVSWizardPage { * @param description */ public CheckoutAsMainPage(ImageDescriptor titleImage, ICVSRemoteFolder[] folders, boolean allowProjectConfiguration) { - super(NAME, Policy.bind("CheckoutAsMainPage.title"), titleImage, Policy.bind("CheckoutAsMainPage.description")); //$NON-NLS-1$ //$NON-NLS-2$ + super(NAME, CVSUIMessages.CheckoutAsMainPage_title, titleImage, CVSUIMessages.CheckoutAsMainPage_description); //$NON-NLS-1$ //$NON-NLS-2$ this.folders = folders; this.allowProjectConfiguration = allowProjectConfiguration; } @@ -97,11 +98,11 @@ public class CheckoutAsMainPage extends CVSWizardPage { * Create the page contents for a single folder checkout */ private void createSingleFolderArea(Composite composite) { - createLabel(composite, Policy.bind("CheckoutAsMainPage.singleFolder", getFolderName())); //$NON-NLS-1$ - configuredProjectButton = createRadioButton(composite, Policy.bind("CheckoutAsMainPage.asConfiguredProject"), 1); //$NON-NLS-1$ + createLabel(composite, NLS.bind(CVSUIMessages.CheckoutAsMainPage_singleFolder, new String[] { getFolderName() })); //$NON-NLS-1$ + configuredProjectButton = createRadioButton(composite, CVSUIMessages.CheckoutAsMainPage_asConfiguredProject, 1); //$NON-NLS-1$ if (!allowProjectConfiguration) { configuredProjectButton.setEnabled(false); - Label configuredLabel = createWrappingLabel(composite, Policy.bind("CheckoutAsMainPage.10"), 5); //$NON-NLS-1$ + Label configuredLabel = createWrappingLabel(composite, CVSUIMessages.CheckoutAsMainPage_10, 5); //$NON-NLS-1$ configuredLabel.setEnabled(false); } createCheckoutAsProjectRadioArea(composite); @@ -117,7 +118,7 @@ public class CheckoutAsMainPage extends CVSWizardPage { * Create the page contents for a multiple folder checkout */ private void createMultipleFoldersArea(Composite composite) { - createLabel(composite, Policy.bind("CheckoutAsMainPage.multipleFolders", new Integer(folders.length).toString())); //$NON-NLS-1$ + createLabel(composite, NLS.bind(CVSUIMessages.CheckoutAsMainPage_multipleFolders, new String[] { new Integer(folders.length).toString() })); //$NON-NLS-1$ createCheckoutAsProjectRadioArea(composite); createCheckoutIntoRadioArea(composite); simpleProjectButton.setSelection(true); @@ -128,10 +129,10 @@ public class CheckoutAsMainPage extends CVSWizardPage { */ private void createCheckoutAsProjectRadioArea(Composite composite) { if (isSingleFolder()) { - simpleProjectButton = createRadioButton(composite, Policy.bind("CheckoutAsMainPage.asSimpleProject"), 1); //$NON-NLS-1$ + simpleProjectButton = createRadioButton(composite, CVSUIMessages.CheckoutAsMainPage_asSimpleProject, 1); //$NON-NLS-1$ createProjectNameGroup(composite); } else { - simpleProjectButton = createRadioButton(composite, Policy.bind("CheckoutAsMainPage.asProjects"), 1); //$NON-NLS-1$ + simpleProjectButton = createRadioButton(composite, CVSUIMessages.CheckoutAsMainPage_asProjects, 1); //$NON-NLS-1$ } } @@ -139,7 +140,7 @@ public class CheckoutAsMainPage extends CVSWizardPage { * @param composite */ private void createCheckoutIntoRadioArea(Composite composite) { - intoProjectButton = createRadioButton(composite, Policy.bind("CheckoutAsMainPage.intoProject"), 1); //$NON-NLS-1$ + intoProjectButton = createRadioButton(composite, CVSUIMessages.CheckoutAsMainPage_intoProject, 1); //$NON-NLS-1$ } /** @@ -157,7 +158,7 @@ public class CheckoutAsMainPage extends CVSWizardPage { // new project label Label projectLabel = new Label(projectGroup,SWT.NONE); - projectLabel.setText(Policy.bind("CheckoutAsMainPage.projectNameLabel")); //$NON-NLS-1$ + projectLabel.setText(CVSUIMessages.CheckoutAsMainPage_projectNameLabel); //$NON-NLS-1$ // new project name entry field projectNameField = new Text(projectGroup, SWT.BORDER); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java index 9a2806fdc..89e2030a1 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -29,7 +30,6 @@ import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; import org.eclipse.team.internal.ccvs.ui.*; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.help.WorkbenchHelp; /** @@ -58,7 +58,7 @@ public class CheckoutAsProjectSelectionPage extends CVSWizardPage { * @param titleImage */ public CheckoutAsProjectSelectionPage(ImageDescriptor titleImage, ICVSRemoteFolder[] remoteFolders) { - super(NAME, Policy.bind("CheckoutAsProjectSelectionPage.title"), titleImage, Policy.bind("CheckoutAsProjectSelectionPage.description")); //$NON-NLS-1$ //$NON-NLS-2$ + super(NAME, CVSUIMessages.CheckoutAsProjectSelectionPage_title, titleImage, CVSUIMessages.CheckoutAsProjectSelectionPage_description); //$NON-NLS-1$ //$NON-NLS-2$ this.remoteFolders = remoteFolders; } @@ -90,7 +90,7 @@ public class CheckoutAsProjectSelectionPage extends CVSWizardPage { WorkbenchHelp.setHelp(composite, IHelpContextIds.CHECKOUT_PROJECT_SELECTION_PAGE); if (isSingleFolder()) { - createLabel(composite, Policy.bind("CheckoutAsProjectSelectionPage.name")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.CheckoutAsProjectSelectionPage_name); //$NON-NLS-1$ nameField = createTextField(composite); nameField.addListener(SWT.Modify, new Listener() { public void handleEvent(Event event) { @@ -100,7 +100,7 @@ public class CheckoutAsProjectSelectionPage extends CVSWizardPage { }); } - createWrappingLabel(composite, Policy.bind("CheckoutAsProjectSelectionPage.treeLabel"), 0, 2); //$NON-NLS-1$ + createWrappingLabel(composite, CVSUIMessages.CheckoutAsProjectSelectionPage_treeLabel, 0, 2); //$NON-NLS-1$ tree = createResourceSelectionTree(composite, IResource.PROJECT | IResource.FOLDER, 2 /* horizontal span */); tree.addSelectionChangedListener(new ISelectionChangedListener() { @@ -115,7 +115,7 @@ public class CheckoutAsProjectSelectionPage extends CVSWizardPage { data.horizontalAlignment = GridData.FILL; data.horizontalSpan = 2; filterComposite.setLayoutData(data); - createLabel(filterComposite, Policy.bind("CheckoutAsProjectSelectionPage.showLabel")); //$NON-NLS-1$ + createLabel(filterComposite, CVSUIMessages.CheckoutAsProjectSelectionPage_showLabel); //$NON-NLS-1$ filterList = createCombo(filterComposite); filterList.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -126,7 +126,7 @@ public class CheckoutAsProjectSelectionPage extends CVSWizardPage { createWrappingLabel(composite, "", 0, 2); //$NON-NLS-1$ // Should subfolders of the folder be checked out? - recurseCheck = createCheckBox(composite, Policy.bind("CheckoutAsProjectSelectionPage.recurse")); //$NON-NLS-1$ + recurseCheck = createCheckBox(composite, CVSUIMessages.CheckoutAsProjectSelectionPage_recurse); //$NON-NLS-1$ recurseCheck.addListener(SWT.Selection, new Listener() { public void handleEvent(Event event) { recurse = recurseCheck.getSelection(); @@ -152,9 +152,9 @@ public class CheckoutAsProjectSelectionPage extends CVSWizardPage { recurseCheck.setSelection(recurse); filter = 0; updateTreeContents(filter); - filterList.add(Policy.bind("CheckoutAsProjectSelectionPage.showAll")); //$NON-NLS-1$ - filterList.add(Policy.bind("CheckoutAsProjectSelectionPage.showUnshared")); //$NON-NLS-1$ - filterList.add(Policy.bind("CheckoutAsProjectSelectionPage.showSameRepo")); //$NON-NLS-1$ + filterList.add(CVSUIMessages.CheckoutAsProjectSelectionPage_showAll); //$NON-NLS-1$ + filterList.add(CVSUIMessages.CheckoutAsProjectSelectionPage_showUnshared); //$NON-NLS-1$ + filterList.add(CVSUIMessages.CheckoutAsProjectSelectionPage_showSameRepo); //$NON-NLS-1$ filterList.select(filter); } @@ -174,7 +174,7 @@ public class CheckoutAsProjectSelectionPage extends CVSWizardPage { private void updateWidgetEnablements() { if (isSingleFolder() && !Path.EMPTY.isValidSegment(folderName)) { setPageComplete(false); - setErrorMessage(Policy.bind("CheckoutAsProjectSelectionPage.invalidFolderName", folderName)); //$NON-NLS-1$ + setErrorMessage(NLS.bind(CVSUIMessages.CheckoutAsProjectSelectionPage_invalidFolderName, new String[] { folderName })); //$NON-NLS-1$ return; } boolean complete = selection != null && selection.getType() != IResource.FILE; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java index 25d22557c..bde71b33e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java @@ -18,7 +18,6 @@ import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.ui.*; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.operations.*; import org.eclipse.team.internal.ccvs.ui.tags.*; import org.eclipse.ui.IWorkbenchPart; @@ -70,7 +69,7 @@ public class CheckoutAsWizard extends Wizard { public CheckoutAsWizard(IWorkbenchPart part, ICVSRemoteFolder[] remoteFolders, boolean allowProjectConfiguration) { this.part = part; this.remoteFolders = remoteFolders; - setWindowTitle(Policy.bind("CheckoutAsWizard.title")); //$NON-NLS-1$ + setWindowTitle(CVSUIMessages.CheckoutAsWizard_title); //$NON-NLS-1$ this.allowProjectConfiguration = allowProjectConfiguration; } @@ -90,7 +89,7 @@ public class CheckoutAsWizard extends Wizard { locationSelectionPage = new CheckoutAsLocationSelectionPage(substImage, remoteFolders); addPage(locationSelectionPage); - tagSelectionPage = new TagSelectionWizardPage("tagPage", Policy.bind("CheckoutAsWizard.3"), substImage, Policy.bind("CheckoutAsWizard.4"), TagSource.create(remoteFolders), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + tagSelectionPage = new TagSelectionWizardPage("tagPage", CVSUIMessages.CheckoutAsWizard_3, substImage, CVSUIMessages.CheckoutAsWizard_4, TagSource.create(remoteFolders), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ TagSelectionArea.INCLUDE_HEAD_TAG | TagSelectionArea.INCLUDE_BRANCHES | TagSelectionArea.INCLUDE_VERSIONS | @@ -174,7 +173,7 @@ public class CheckoutAsWizard extends Wizard { } private void handle(Throwable e) { - CVSUIPlugin.openError(getShell(), Policy.bind("CheckoutAsWizard.error"), null, e); //$NON-NLS-1$ + CVSUIPlugin.openError(getShell(), CVSUIMessages.CheckoutAsWizard_error, null, e); //$NON-NLS-1$ } /* diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java index 54372ffb1..85cc8030f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java @@ -23,7 +23,6 @@ import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.util.KnownRepositories; import org.eclipse.team.internal.ccvs.ui.*; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.operations.CheckoutMultipleProjectsOperation; import org.eclipse.team.internal.ccvs.ui.operations.HasProjectMetaFileOperation; import org.eclipse.ui.*; @@ -42,7 +41,7 @@ public class CheckoutWizard extends Wizard implements ICVSWizard, INewWizard { private CVSWizardPage dummyPage; public CheckoutWizard() { - setWindowTitle(Policy.bind("CheckoutWizard.0")); //$NON-NLS-1$ + setWindowTitle(CVSUIMessages.CheckoutWizard_0); //$NON-NLS-1$ } /* (non-Javadoc) @@ -55,19 +54,19 @@ public class CheckoutWizard extends Wizard implements ICVSWizard, INewWizard { ICVSRepositoryLocation[] locations = CVSUIPlugin.getPlugin().getRepositoryManager().getKnownRepositoryLocations(); if (locations.length > 0) { - locationPage = new RepositorySelectionPage("locationSelection", Policy.bind("CheckoutWizard.7"), substImage); //$NON-NLS-1$ //$NON-NLS-2$ - locationPage.setDescription(Policy.bind("SharingWizard.importTitleDescription")); //$NON-NLS-1$ - locationPage.setExtendedDescription(Policy.bind("CheckoutWizard.8")); //$NON-NLS-1$ + locationPage = new RepositorySelectionPage("locationSelection", CVSUIMessages.CheckoutWizard_7, substImage); //$NON-NLS-1$ //$NON-NLS-2$ + locationPage.setDescription(CVSUIMessages.SharingWizard_importTitleDescription); //$NON-NLS-1$ + locationPage.setExtendedDescription(CVSUIMessages.CheckoutWizard_8); //$NON-NLS-1$ addPage(locationPage); } - createLocationPage = new ConfigurationWizardMainPage("createLocationPage", Policy.bind("SharingWizard.enterInformation"), substImage); //$NON-NLS-1$ //$NON-NLS-2$ - createLocationPage.setDescription(Policy.bind("SharingWizard.enterInformationDescription")); //$NON-NLS-1$ + createLocationPage = new ConfigurationWizardMainPage("createLocationPage", CVSUIMessages.SharingWizard_enterInformation, substImage); //$NON-NLS-1$ //$NON-NLS-2$ + createLocationPage.setDescription(CVSUIMessages.SharingWizard_enterInformationDescription); //$NON-NLS-1$ addPage(createLocationPage); createLocationPage.setDialogSettings(NewLocationWizard.getLocationDialogSettings()); - modulePage = new ModuleSelectionPage("moduleSelection", Policy.bind("CheckoutWizard.10"), substImage); //$NON-NLS-1$ //$NON-NLS-2$ - modulePage.setDescription(Policy.bind("CheckoutWizard.11")); //$NON-NLS-1$ + modulePage = new ModuleSelectionPage("moduleSelection", CVSUIMessages.CheckoutWizard_10, substImage); //$NON-NLS-1$ //$NON-NLS-2$ + modulePage.setDescription(CVSUIMessages.CheckoutWizard_11); //$NON-NLS-1$ modulePage.setHelpContxtId(IHelpContextIds.CHECKOUT_MODULE_SELECTION_PAGE); modulePage.setSupportsMultiSelection(true); addPage(modulePage); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java index 4109349ac..68fd30db6 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java @@ -30,7 +30,6 @@ import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.client.Command; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.ui.*; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.operations.*; import org.eclipse.team.internal.core.subscribers.SubscriberSyncInfoCollector; import org.eclipse.team.ui.synchronize.ResourceScope; @@ -91,11 +90,11 @@ public class CommitWizard extends ResizableWizard { } protected String getJobName() { - return Policy.bind("CommitWizard.0"); //$NON-NLS-1$ + return CVSUIMessages.CommitWizard_0; //$NON-NLS-1$ } protected String getTaskName() { - return Policy.bind("CommitWizard.1"); //$NON-NLS-1$ + return CVSUIMessages.CommitWizard_1; //$NON-NLS-1$ } /* @@ -142,9 +141,9 @@ public class CommitWizard extends ResizableWizard { public CommitWizard(final IResource [] resources) throws CVSException { - super(Policy.bind("CommitWizard.3"), CVSUIPlugin.getPlugin().getDialogSettings()); //$NON-NLS-1$ + super(CVSUIMessages.CommitWizard_3, CVSUIPlugin.getPlugin().getDialogSettings()); //$NON-NLS-1$ - setWindowTitle(Policy.bind("CommitWizard.2")); //$NON-NLS-1$ + setWindowTitle(CVSUIMessages.CommitWizard_2); //$NON-NLS-1$ setDefaultPageImageDescriptor(CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_NEW_LOCATION)); fResources= resources; @@ -165,7 +164,7 @@ public class CommitWizard extends ResizableWizard { try { PlatformUI.getWorkbench().getProgressService().run(true, true, new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - monitor.beginTask(Policy.bind("CommitWizard.4"), IProgressMonitor.UNKNOWN); //$NON-NLS-1$ + monitor.beginTask(CVSUIMessages.CommitWizard_4, IProgressMonitor.UNKNOWN); //$NON-NLS-1$ syncInfoCollector.waitForCollector(monitor); monitor.done(); } @@ -297,7 +296,7 @@ public class CommitWizard extends ResizableWizard { private static void run(Shell shell, CommitWizard wizard) { if (!wizard.hasOutgoingChanges()) { - MessageDialog.openInformation(shell, Policy.bind("CommitWizard.6"), Policy.bind("CommitWizard.7")); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openInformation(shell, CVSUIMessages.CommitWizard_6, CVSUIMessages.CommitWizard_7); //$NON-NLS-1$ //$NON-NLS-2$ } else { open(shell, wizard); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java index ed3d16209..db3deb884 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java @@ -21,6 +21,7 @@ import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.wizard.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.events.SelectionAdapter; @@ -30,7 +31,6 @@ import org.eclipse.swt.widgets.*; import org.eclipse.team.core.synchronize.SyncInfo; import org.eclipse.team.core.synchronize.SyncInfoSet; import org.eclipse.team.internal.ccvs.ui.*; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.core.subscribers.ChangeSet; import org.eclipse.team.internal.ui.*; import org.eclipse.team.internal.ui.synchronize.SyncInfoModelElement; @@ -96,9 +96,9 @@ public class CommitWizardCommitPage extends WizardPage implements IPropertyChang public CommitWizardCommitPage(IResource [] resources, CommitWizard wizard) { - super(Policy.bind("CommitWizardCommitPage.0")); //$NON-NLS-1$ - setTitle(Policy.bind("CommitWizardCommitPage.0")); //$NON-NLS-1$ - setDescription(Policy.bind("CommitWizardCommitPage.2")); //$NON-NLS-1$ + super(CVSUIMessages.CommitWizardCommitPage_0); //$NON-NLS-1$ + setTitle(CVSUIMessages.CommitWizardCommitPage_0); //$NON-NLS-1$ + setDescription(CVSUIMessages.CommitWizardCommitPage_2); //$NON-NLS-1$ fSettingsSaver= new SettingsSaver(); fWizard= wizard; @@ -168,9 +168,9 @@ public class CommitWizardCommitPage extends WizardPage implements IPropertyChang // Create composite for showing the reason for not showing the changes and a button to show them Composite changeDesc = new Composite(bottomChild, SWT.NONE); changeDesc.setLayout(SWTUtils.createGridLayout(2, converter, SWTUtils.MARGINS_NONE)); - SWTUtils.createLabel(changeDesc, Policy.bind("CommitWizardCommitPage.1", Integer.toString(size), Integer.toString(getFileDisplayThreshold()))); //$NON-NLS-1$ + SWTUtils.createLabel(changeDesc, NLS.bind(CVSUIMessages.CommitWizardCommitPage_1, new String[] { Integer.toString(size), Integer.toString(getFileDisplayThreshold()) })); //$NON-NLS-1$ Button showChanges = new Button(changeDesc, SWT.PUSH); - showChanges.setText(Policy.bind("CommitWizardCommitPage.5")); //$NON-NLS-1$ + showChanges.setText(CVSUIMessages.CommitWizardCommitPage_5); //$NON-NLS-1$ showChanges.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { showChangesPane(); @@ -263,7 +263,7 @@ public class CommitWizardCommitPage extends WizardPage implements IPropertyChang if (fConfiguration != null) { SyncInfoSet set = fConfiguration.getSyncInfoSet(); if (set.hasConflicts()) { - setErrorMessage(Policy.bind("CommitWizardCommitPage.4")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.CommitWizardCommitPage_4); //$NON-NLS-1$ setPageComplete(false); return; } @@ -285,7 +285,7 @@ public class CommitWizardCommitPage extends WizardPage implements IPropertyChang if (MessageDialogWithToggle.NEVER.equals(value)) { setPageComplete(false); if (setMessage) - setErrorMessage(Policy.bind("CommitWizardCommitPage.3")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.CommitWizardCommitPage_3); //$NON-NLS-1$ return false; } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardFileTypePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardFileTypePage.java index 353e86ad9..5f237dec8 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardFileTypePage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardFileTypePage.java @@ -31,7 +31,7 @@ import org.eclipse.team.internal.ccvs.core.client.Command; import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; -import org.eclipse.team.internal.ccvs.ui.Policy; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ui.SWTUtils; import org.eclipse.team.internal.ui.preferences.FileTypeTable; @@ -44,9 +44,9 @@ public class CommitWizardFileTypePage extends WizardPage { private final Collection fNames; public CommitWizardFileTypePage(Collection unknownExtensions, Collection unknownNames) { - super(Policy.bind("CommitWizardFileTypePage.0")); //$NON-NLS-1$ - setTitle(Policy.bind("CommitWizardFileTypePage.0")); //$NON-NLS-1$ - setDescription(Policy.bind("CommitWizardFileTypePage.2")); //$NON-NLS-1$ + super(CVSUIMessages.CommitWizardFileTypePage_0); //$NON-NLS-1$ + setTitle(CVSUIMessages.CommitWizardFileTypePage_0); //$NON-NLS-1$ + setDescription(CVSUIMessages.CommitWizardFileTypePage_2); //$NON-NLS-1$ fNames= new ArrayList(); for (final Iterator iter = unknownNames.iterator(); iter.hasNext();) { @@ -70,7 +70,7 @@ public class CommitWizardFileTypePage extends WizardPage { Dialog.applyDialogFont(composite); final Label label= new Label(composite, SWT.WRAP); - label.setText(Policy.bind("CommitWizardFileTypePage.3")); //$NON-NLS-1$ + label.setText(CVSUIMessages.CommitWizardFileTypePage_3); //$NON-NLS-1$ label.setLayoutData(SWTUtils.createHFillGridData()); final List items= new ArrayList(); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java index 9ba198a26..c2f108c4c 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java @@ -27,9 +27,9 @@ import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.help.WorkbenchHelp; /** @@ -62,7 +62,7 @@ public class ConfigurationWizardAutoconnectPage extends CVSWizardPage { data.horizontalSpan = 2; data.widthHint = 350; description.setLayoutData(data); - description.setText(Policy.bind("ConfigurationWizardAutoconnectPage.description")); //$NON-NLS-1$ + description.setText(CVSUIMessages.ConfigurationWizardAutoconnectPage_description); //$NON-NLS-1$ if (location == null) return; @@ -70,22 +70,22 @@ public class ConfigurationWizardAutoconnectPage extends CVSWizardPage { createLabel(composite, ""); //$NON-NLS-1$ createLabel(composite, ""); //$NON-NLS-1$ - createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.user")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.ConfigurationWizardAutoconnectPage_user); //$NON-NLS-1$ createLabel(composite, location.getUsername()); - createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.host")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.ConfigurationWizardAutoconnectPage_host); //$NON-NLS-1$ createLabel(composite, location.getHost()); - createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.port")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.ConfigurationWizardAutoconnectPage_port); //$NON-NLS-1$ int port = location.getPort(); if (port == ICVSRepositoryLocation.USE_DEFAULT_PORT) { - createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.default")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.ConfigurationWizardAutoconnectPage_default); //$NON-NLS-1$ } else { createLabel(composite, "" + port); //$NON-NLS-1$ } - createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.connectionType")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.ConfigurationWizardAutoconnectPage_connectionType); //$NON-NLS-1$ createLabel(composite, location.getMethod().getName()); - createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.repositoryPath")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.ConfigurationWizardAutoconnectPage_repositoryPath); //$NON-NLS-1$ createLabel(composite, location.getRootDirectory()); - createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.module")); //$NON-NLS-1$ + createLabel(composite, CVSUIMessages.ConfigurationWizardAutoconnectPage_module); //$NON-NLS-1$ createLabel(composite, info.getRepository()); // Spacer @@ -95,7 +95,7 @@ public class ConfigurationWizardAutoconnectPage extends CVSWizardPage { final Button check = new Button(composite, SWT.CHECK); data = new GridData(); data.horizontalSpan = 2; - check.setText(Policy.bind("ConfigurationWizardAutoconnectPage.validate")); //$NON-NLS-1$ + check.setText(CVSUIMessages.ConfigurationWizardAutoconnectPage_validate); //$NON-NLS-1$ check.addListener(SWT.Selection, new Listener() { public void handleEvent(Event event) { validate = check.getSelection(); @@ -117,7 +117,7 @@ public class ConfigurationWizardAutoconnectPage extends CVSWizardPage { info = folder.getFolderSyncInfo(); if (info == null) { // This should never happen - CVSUIPlugin.openError(null, Policy.bind("ConfigurationWizardAutoconnectPage.noSyncInfo"), Policy.bind("ConfigurationWizardAutoconnectPage.noCVSDirectory"), null); //$NON-NLS-1$ //$NON-NLS-2$ + CVSUIPlugin.openError(null, CVSUIMessages.ConfigurationWizardAutoconnectPage_noSyncInfo, CVSUIMessages.ConfigurationWizardAutoconnectPage_noCVSDirectory, null); //$NON-NLS-1$ //$NON-NLS-2$ return false; } location = CVSRepositoryLocation.fromString(info.getRoot()); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java index 5023e13ff..91353db31 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java @@ -45,9 +45,9 @@ import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; import org.eclipse.team.internal.ccvs.core.IConnectionMethod; import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation; import org.eclipse.team.internal.ccvs.core.util.KnownRepositories; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.help.WorkbenchHelp; /** @@ -199,37 +199,37 @@ public class ConfigurationWizardMainPage extends CVSWizardPage { } }; - Group g = createGroup(composite, Policy.bind("ConfigurationWizardMainPage.Location_1")); //$NON-NLS-1$ + Group g = createGroup(composite, CVSUIMessages.ConfigurationWizardMainPage_Location_1); //$NON-NLS-1$ // Host name - createLabel(g, Policy.bind("ConfigurationWizardMainPage.host")); //$NON-NLS-1$ + createLabel(g, CVSUIMessages.ConfigurationWizardMainPage_host); //$NON-NLS-1$ hostCombo = createEditableCombo(g); hostCombo.addListener(SWT.Selection, listener); hostCombo.addListener(SWT.Modify, listener); // Repository Path - createLabel(g, Policy.bind("ConfigurationWizardMainPage.repositoryPath")); //$NON-NLS-1$ + createLabel(g, CVSUIMessages.ConfigurationWizardMainPage_repositoryPath); //$NON-NLS-1$ repositoryPathCombo = createEditableCombo(g); repositoryPathCombo.addListener(SWT.Selection, listener); repositoryPathCombo.addListener(SWT.Modify, listener); - g = createGroup(composite, Policy.bind("ConfigurationWizardMainPage.Authentication_2")); //$NON-NLS-1$ + g = createGroup(composite, CVSUIMessages.ConfigurationWizardMainPage_Authentication_2); //$NON-NLS-1$ // User name - createLabel(g, Policy.bind("ConfigurationWizardMainPage.userName")); //$NON-NLS-1$ + createLabel(g, CVSUIMessages.ConfigurationWizardMainPage_userName); //$NON-NLS-1$ userCombo = createEditableCombo(g); userCombo.addListener(SWT.Selection, listener); userCombo.addListener(SWT.Modify, listener); // Password - createLabel(g, Policy.bind("ConfigurationWizardMainPage.password")); //$NON-NLS-1$ + createLabel(g, CVSUIMessages.ConfigurationWizardMainPage_password); //$NON-NLS-1$ passwordText = createPasswordField(g); passwordText.addListener(SWT.Modify, listener); - g = createGroup(composite, Policy.bind("ConfigurationWizardMainPage.Connection_3")); //$NON-NLS-1$ + g = createGroup(composite, CVSUIMessages.ConfigurationWizardMainPage_Connection_3); //$NON-NLS-1$ // Connection type - createLabel(g, Policy.bind("ConfigurationWizardMainPage.connection")); //$NON-NLS-1$ + createLabel(g, CVSUIMessages.ConfigurationWizardMainPage_connection); //$NON-NLS-1$ connectionMethodCombo = createCombo(g); connectionMethodCombo.addListener(SWT.Selection, listener); @@ -244,8 +244,8 @@ public class ConfigurationWizardMainPage extends CVSWizardPage { layout.marginHeight = 0; layout.marginWidth = 0; portGroup.setLayout(layout); - useDefaultPort = createRadioButton(portGroup, Policy.bind("ConfigurationWizardMainPage.useDefaultPort"), 2); //$NON-NLS-1$ - useCustomPort = createRadioButton(portGroup, Policy.bind("ConfigurationWizardMainPage.usePort"), 1); //$NON-NLS-1$ + useDefaultPort = createRadioButton(portGroup, CVSUIMessages.ConfigurationWizardMainPage_useDefaultPort, 2); //$NON-NLS-1$ + useCustomPort = createRadioButton(portGroup, CVSUIMessages.ConfigurationWizardMainPage_usePort, 1); //$NON-NLS-1$ useCustomPort.addListener(SWT.Selection, listener); portText = createTextField(portGroup); portText.addListener(SWT.Modify, listener); @@ -259,7 +259,7 @@ public class ConfigurationWizardMainPage extends CVSWizardPage { validateButtonTabGroup.setLayout(new FillLayout()); validateButton = new Button(validateButtonTabGroup, SWT.CHECK); - validateButton.setText(Policy.bind("ConfigurationWizardAutoconnectPage.validate")); //$NON-NLS-1$ + validateButton.setText(CVSUIMessages.ConfigurationWizardAutoconnectPage_validate); //$NON-NLS-1$ validateButton.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { validate = validateButton.getSelection(); @@ -268,7 +268,7 @@ public class ConfigurationWizardMainPage extends CVSWizardPage { } allowCachingButton = new Button(composite, SWT.CHECK); - allowCachingButton.setText(Policy.bind("UserValidationDialog.6")); //$NON-NLS-1$ + allowCachingButton.setText(CVSUIMessages.UserValidationDialog_6); //$NON-NLS-1$ data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL); data.horizontalSpan = 3; allowCachingButton.setLayoutData(data); @@ -291,7 +291,7 @@ public class ConfigurationWizardMainPage extends CVSWizardPage { warningLabel.setImage(Dialog.getImage(Dialog.DLG_IMG_MESSAGE_WARNING)); warningLabel.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_BEGINNING)); Label warningText = new Label(warningComposite, SWT.WRAP); - warningText.setText(Policy.bind("UserValidationDialog.7")); //$NON-NLS-1$ + warningText.setText(CVSUIMessages.UserValidationDialog_7); //$NON-NLS-1$ data = new GridData(GridData.FILL_HORIZONTAL); data.widthHint = 300; GC gc= new GC(composite); @@ -536,7 +536,7 @@ public class ConfigurationWizardMainPage extends CVSWizardPage { try { CVSRepositoryLocation l = CVSRepositoryLocation.fromProperties(createProperties()); if (!l.equals(oldLocation) && KnownRepositories.getInstance().isKnownRepository(l.getLocation())) { - setErrorMessage(Policy.bind("ConfigurationWizardMainPage.0")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.ConfigurationWizardMainPage_0); //$NON-NLS-1$ setPageComplete(false); return; } @@ -578,43 +578,43 @@ public class ConfigurationWizardMainPage extends CVSWizardPage { public static final int INVALID_FIELD_CONTENTS = 2; public static final IStatus validateUserName(String user) { if (user.length() == 0) { - return new Status(IStatus.ERROR, CVSUIPlugin.ID, REQUIRED_FIELD, Policy.bind("ConfigurationWizardMainPage.1"), null); //$NON-NLS-1$ + return new Status(IStatus.ERROR, CVSUIPlugin.ID, REQUIRED_FIELD, CVSUIMessages.ConfigurationWizardMainPage_1, null); //$NON-NLS-1$ } if ((user.indexOf('@') != -1) || (user.indexOf(':') != -1)) { return new Status(IStatus.ERROR, CVSUIPlugin.ID, INVALID_FIELD_CONTENTS, - Policy.bind("ConfigurationWizardMainPage.invalidUserName"), null); //$NON-NLS-1$ + CVSUIMessages.ConfigurationWizardMainPage_invalidUserName, null); //$NON-NLS-1$ } return Status.OK_STATUS; } public static final IStatus validateHost(String host) { if (host.length() == 0) { - return new Status(IStatus.ERROR, CVSUIPlugin.ID, REQUIRED_FIELD, Policy.bind("ConfigurationWizardMainPage.2"), null); //$NON-NLS-1$ + return new Status(IStatus.ERROR, CVSUIPlugin.ID, REQUIRED_FIELD, CVSUIMessages.ConfigurationWizardMainPage_2, null); //$NON-NLS-1$ } if (host.indexOf(':') != -1) { return new Status(IStatus.ERROR, CVSUIPlugin.ID, INVALID_FIELD_CONTENTS, - Policy.bind("ConfigurationWizardMainPage.invalidHostName"), null); //$NON-NLS-1$ + CVSUIMessages.ConfigurationWizardMainPage_invalidHostName, null); //$NON-NLS-1$ } if (host.startsWith(" ") || host.endsWith(" ")) { //$NON-NLS-1$ //$NON-NLS-2$ return new Status(IStatus.ERROR, CVSUIPlugin.ID, INVALID_FIELD_CONTENTS, - Policy.bind("ConfigurationWizardMainPage.5"), null); //$NON-NLS-1$ + CVSUIMessages.ConfigurationWizardMainPage_5, null); //$NON-NLS-1$ } return Status.OK_STATUS; } public static final IStatus validatePort(String port) { if (port.length() == 0) { - return new Status(IStatus.ERROR, CVSUIPlugin.ID, REQUIRED_FIELD, Policy.bind("ConfigurationWizardMainPage.3"), null); //$NON-NLS-1$ + return new Status(IStatus.ERROR, CVSUIPlugin.ID, REQUIRED_FIELD, CVSUIMessages.ConfigurationWizardMainPage_3, null); //$NON-NLS-1$ } try { Integer.parseInt(port); } catch (NumberFormatException e) { return new Status(IStatus.ERROR, CVSUIPlugin.ID, INVALID_FIELD_CONTENTS, - Policy.bind("ConfigurationWizardMainPage.invalidPort"), null); //$NON-NLS-1$ + CVSUIMessages.ConfigurationWizardMainPage_invalidPort, null); //$NON-NLS-1$ } return Status.OK_STATUS; } public static final IStatus validatePath(String pathString) { if (pathString.length() == 0) { - return new Status(IStatus.ERROR, CVSUIPlugin.ID, REQUIRED_FIELD, Policy.bind("ConfigurationWizardMainPage.4"), null); //$NON-NLS-1$ + return new Status(IStatus.ERROR, CVSUIPlugin.ID, REQUIRED_FIELD, CVSUIMessages.ConfigurationWizardMainPage_4, null); //$NON-NLS-1$ } IPath path = new Path(null, pathString); String[] segments = path.segments(); @@ -622,7 +622,7 @@ public class ConfigurationWizardMainPage extends CVSWizardPage { String string = segments[i]; if (string.charAt(0) == ' ' || string.charAt(string.length() -1) == ' ') { return new Status(IStatus.ERROR, CVSUIPlugin.ID, INVALID_FIELD_CONTENTS, - Policy.bind("ConfigurationWizardMainPage.invalidPathWithSpaces"), null); //$NON-NLS-1$ + CVSUIMessages.ConfigurationWizardMainPage_invalidPathWithSpaces, null); //$NON-NLS-1$ } } // look for // and inform the user that we support use of C:\cvs\root instead of /c//cvs/root @@ -630,10 +630,10 @@ public class ConfigurationWizardMainPage extends CVSWizardPage { if (pathString.indexOf("//") == 2) { //$NON-NLS-1$ // The user is probably trying to specify a CVSNT path return new Status(IStatus.ERROR, CVSUIPlugin.ID, INVALID_FIELD_CONTENTS, - Policy.bind("ConfigurationWizardMainPage.useNTFormat"), null); //$NON-NLS-1$ + CVSUIMessages.ConfigurationWizardMainPage_useNTFormat, null); //$NON-NLS-1$ } else { return new Status(IStatus.ERROR, CVSUIPlugin.ID, INVALID_FIELD_CONTENTS, - Policy.bind("ConfigurationWizardMainPage.invalidPathWithSlashes"), null); //$NON-NLS-1$ + CVSUIMessages.ConfigurationWizardMainPage_invalidPathWithSlashes, null); //$NON-NLS-1$ } } return Status.OK_STATUS; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileOperation.java index 16f50dd94..1a5177a7c 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileOperation.java @@ -33,8 +33,8 @@ import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; /** * An operation to run the CVS diff operation on a set of resources. The result @@ -62,7 +62,7 @@ public class GenerateDiffFileOperation implements IRunnableWithProgress { final CVSTeamProvider provider = (CVSTeamProvider)RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId()); monitor.beginTask("", 500); //$NON-NLS-1$ - monitor.setTaskName(Policy.bind("GenerateCVSDiff.working")); //$NON-NLS-1$ + monitor.setTaskName(CVSUIMessages.GenerateCVSDiff_working); //$NON-NLS-1$ try { if (outputFile != null) { generateDiffToFile(monitor, provider, outputFile); @@ -87,9 +87,9 @@ public class GenerateDiffFileOperation implements IRunnableWithProgress { os.close(); } } catch (FileNotFoundException e) { - throw new TeamException(Policy.bind("GenerateDiffFileOperation.0"), e); //$NON-NLS-1$ + throw new TeamException(CVSUIMessages.GenerateDiffFileOperation_0, e); //$NON-NLS-1$ } catch (IOException e) { - throw new TeamException(Policy.bind("GenerateDiffFileOperation.1"), e); //$NON-NLS-1$ + throw new TeamException(CVSUIMessages.GenerateDiffFileOperation_1, e); //$NON-NLS-1$ } if (file.length() == 0) { @@ -107,7 +107,7 @@ public class GenerateDiffFileOperation implements IRunnableWithProgress { os.close(); } } catch (IOException e) { - throw new TeamException(Policy.bind("GenerateDiffFileOperation.2"), e); //$NON-NLS-1$ + throw new TeamException(CVSUIMessages.GenerateDiffFileOperation_2, e); //$NON-NLS-1$ } if (os.size() == 0) { reportEmptyDiff(); @@ -134,8 +134,8 @@ public class GenerateDiffFileOperation implements IRunnableWithProgress { public void open(Shell shell) { MessageDialog.openInformation( shell, - Policy.bind("GenerateCVSDiff.noDiffsFoundTitle"), //$NON-NLS-1$ - Policy.bind("GenerateCVSDiff.noDiffsFoundMsg")); //$NON-NLS-1$ + CVSUIMessages.GenerateCVSDiff_noDiffsFoundTitle, //$NON-NLS-1$ + CVSUIMessages.GenerateCVSDiff_noDiffsFoundMsg); //$NON-NLS-1$ } }, CVSUIPlugin.PERFORM_SYNC_EXEC); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java index e1cb336ca..0589b88a2 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java @@ -56,10 +56,10 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.team.internal.ccvs.core.client.Command; import org.eclipse.team.internal.ccvs.core.client.Diff; import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.internal.ide.misc.ContainerContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; @@ -154,29 +154,29 @@ public class GenerateDiffFileWizard extends Wizard { private boolean validateFilesystemLocation() { final String pathString= fsPathText.getText().trim(); if (pathString.length() == 0 || !new Path("").isValidPath(pathString)) { //$NON-NLS-1$ - setErrorMessage(Policy.bind("GenerateDiffFileWizard.0")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.GenerateDiffFileWizard_0); //$NON-NLS-1$ return false; } final File file= new File(pathString); if (!file.isAbsolute()) { - setErrorMessage(Policy.bind("GenerateDiffFileWizard.0")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.GenerateDiffFileWizard_0); //$NON-NLS-1$ return false; } if (file.isDirectory()) { - setErrorMessage(Policy.bind("GenerateDiffFileWizard.2")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.GenerateDiffFileWizard_2); //$NON-NLS-1$ return false; } if (pathString.endsWith("/") || pathString.endsWith("\\")) { //$NON-NLS-1$//$NON-NLS-2$ - setErrorMessage(Policy.bind("GenerateDiffFileWizard.3")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.GenerateDiffFileWizard_3); //$NON-NLS-1$ return false; } final File parent= file.getParentFile(); if (!(parent.exists() && parent.isDirectory())) { - setErrorMessage(Policy.bind("GenerateDiffFileWizard.3")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.GenerateDiffFileWizard_3); //$NON-NLS-1$ return false; } return true; @@ -189,12 +189,12 @@ public class GenerateDiffFileWizard extends Wizard { */ private boolean validateWorkspaceLocation() { if (wsSelectedContainer == null) { - setErrorMessage(Policy.bind("GenerateDiffFileWizard.4")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.GenerateDiffFileWizard_4); //$NON-NLS-1$ return false; } final String filename= wsFilenameText.getText().trim(); if (!new Path("").isValidSegment(filename)) { //$NON-NLS-1$ - setErrorMessage(Policy.bind("GenerateDiffFileWizard.5")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.GenerateDiffFileWizard_5); //$NON-NLS-1$ return false; } return true; @@ -270,9 +270,9 @@ public class GenerateDiffFileWizard extends Wizard { */ private void setupWorkspaceControls(Composite composite) { wsRadio= new Button(composite, SWT.RADIO); - wsRadio.setText(Policy.bind("Save_In_Workspace_7")); //$NON-NLS-1$ + wsRadio.setText(CVSUIMessages.Save_In_Workspace_7); //$NON-NLS-1$ - new Label(composite, SWT.LEFT).setText(Policy.bind("Select_a_folder_then_type_in_the_file_name__8")); //$NON-NLS-1$ + new Label(composite, SWT.LEFT).setText(CVSUIMessages.Select_a_folder_then_type_in_the_file_name__8); //$NON-NLS-1$ wsTreeViewer = new TreeViewer(composite, SWT.BORDER); final GridData gd= new GridData(SWT.FILL, SWT.FILL, true, true); @@ -294,7 +294,7 @@ public class GenerateDiffFileWizard extends Wizard { final Label label = new Label(group, SWT.NONE); label.setLayoutData(new GridData()); - label.setText(Policy.bind("Fi&le_name__9")); //$NON-NLS-1$ + label.setText(CVSUIMessages.Fi_le_name__9); //$NON-NLS-1$ wsFilenameText = new Text(group,SWT.BORDER); wsFilenameText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); @@ -307,7 +307,7 @@ public class GenerateDiffFileWizard extends Wizard { GridLayout layout; fsRadio= new Button(composite, SWT.RADIO); - fsRadio.setText(Policy.bind("Save_In_File_System_3")); //$NON-NLS-1$ + fsRadio.setText(CVSUIMessages.Save_In_File_System_3); //$NON-NLS-1$ final Composite nameGroup = new Composite(composite,SWT.NONE); layout = new GridLayout(); @@ -322,7 +322,7 @@ public class GenerateDiffFileWizard extends Wizard { fsPathText.setLayoutData(gd); fsBrowseButton = new Button(nameGroup, SWT.NULL); - fsBrowseButton.setText(Policy.bind("Browse..._4")); //$NON-NLS-1$ + fsBrowseButton.setText(CVSUIMessages.Browse____4); //$NON-NLS-1$ } /** @@ -330,7 +330,7 @@ public class GenerateDiffFileWizard extends Wizard { */ private void setupClipboardControls(final Composite composite) { cpRadio= new Button(composite, SWT.RADIO); - cpRadio.setText(Policy.bind("Save_To_Clipboard_2")); //$NON-NLS-1$ + cpRadio.setText(CVSUIMessages.Save_To_Clipboard_2); //$NON-NLS-1$ } @@ -406,8 +406,8 @@ public class GenerateDiffFileWizard extends Wizard { final File file= new File(fsPathText.getText()); dialog.setFilterPath(file.getParent()); } - dialog.setText(Policy.bind("Save_Patch_As_5")); //$NON-NLS-1$ - dialog.setFileName(Policy.bind("patch.txt_6")); //$NON-NLS-1$ + dialog.setText(CVSUIMessages.Save_Patch_As_5); //$NON-NLS-1$ + dialog.setFileName(CVSUIMessages.patch_txt_6); //$NON-NLS-1$ final String path = dialog.open(); if (path != null) { fsPathText.setText(new Path(path).toOSString()); @@ -492,11 +492,11 @@ public class GenerateDiffFileWizard extends Wizard { WorkbenchHelp.setHelp(composite, IHelpContextIds.PATCH_OPTIONS_PAGE); recurseOption = new Button(composite, SWT.CHECK); - recurseOption.setText(Policy.bind("Do_not_recurse_into_sub-folders_10")); //$NON-NLS-1$ + recurseOption.setText(CVSUIMessages.Do_not_recurse_into_sub_folders_10); //$NON-NLS-1$ recurseOption.setSelection(true); includeNewFilesOptions = new Button(composite, SWT.CHECK); - includeNewFilesOptions.setText(Policy.bind("Do_not_include_new_files_in_patch_11")); //$NON-NLS-1$ + includeNewFilesOptions.setText(CVSUIMessages.Do_not_include_new_files_in_patch_11); //$NON-NLS-1$ includeNewFilesOptions.setSelection(true); Group diffTypeGroup = new Group(composite, SWT.NONE); @@ -505,15 +505,15 @@ public class GenerateDiffFileWizard extends Wizard { diffTypeGroup.setLayout(layout); GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL); diffTypeGroup.setLayoutData(data); - diffTypeGroup.setText(Policy.bind("Diff_output_format_12")); //$NON-NLS-1$ + diffTypeGroup.setText(CVSUIMessages.Diff_output_format_12); //$NON-NLS-1$ unifiedDiffOption = new Button(diffTypeGroup, SWT.RADIO); - unifiedDiffOption.setText(Policy.bind("Unified_(format_required_by_Compare_With_Patch_feature)_13")); //$NON-NLS-1$ + unifiedDiffOption.setText(CVSUIMessages.Unified__format_required_by_Compare_With_Patch_feature__13); //$NON-NLS-1$ unifiedDiffOption.setSelection(true); contextDiffOption = new Button(diffTypeGroup, SWT.RADIO); - contextDiffOption.setText(Policy.bind("Context_14")); //$NON-NLS-1$ + contextDiffOption.setText(CVSUIMessages.Context_14); //$NON-NLS-1$ regularDiffOption = new Button(diffTypeGroup, SWT.RADIO); - regularDiffOption.setText(Policy.bind("Standard_15")); //$NON-NLS-1$ + regularDiffOption.setText(CVSUIMessages.Standard_15); //$NON-NLS-1$ Dialog.applyDialogFont(parent); } @@ -627,20 +627,20 @@ public class GenerateDiffFileWizard extends Wizard { public GenerateDiffFileWizard(IResource resource) { super(); this.resource = resource; - setWindowTitle(Policy.bind("GenerateCVSDiff.title")); //$NON-NLS-1$ + setWindowTitle(CVSUIMessages.GenerateCVSDiff_title); //$NON-NLS-1$ initializeDefaultPageImageDescriptor(); defaultValuesStore= new DefaultValuesStore(); } public void addPages() { - String pageTitle = Policy.bind("GenerateCVSDiff.pageTitle"); //$NON-NLS-1$ - String pageDescription = Policy.bind("GenerateCVSDiff.pageDescription"); //$NON-NLS-1$ + String pageTitle = CVSUIMessages.GenerateCVSDiff_pageTitle; //$NON-NLS-1$ + String pageDescription = CVSUIMessages.GenerateCVSDiff_pageDescription; //$NON-NLS-1$ locationPage = new LocationPage(pageTitle, pageTitle, CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_DIFF), defaultValuesStore); locationPage.setDescription(pageDescription); addPage(locationPage); - pageTitle = Policy.bind("Advanced_options_19"); //$NON-NLS-1$ - pageDescription = Policy.bind("Configure_the_options_used_for_the_CVS_diff_command_20"); //$NON-NLS-1$ + pageTitle = CVSUIMessages.Advanced_options_19; //$NON-NLS-1$ + pageDescription = CVSUIMessages.Configure_the_options_used_for_the_CVS_diff_command_20; //$NON-NLS-1$ optionsPage = new OptionsPage(pageTitle, pageTitle, CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_DIFF)); optionsPage.setDescription(pageDescription); addPage(optionsPage); @@ -707,7 +707,7 @@ public class GenerateDiffFileWizard extends Wizard { try { workspaceResource.getParent().refreshLocal(IResource.DEPTH_ONE, null); } catch(CoreException e) { - CVSUIPlugin.openError(getShell(), Policy.bind("GenerateCVSDiff.error"), null, e); //$NON-NLS-1$ + CVSUIPlugin.openError(getShell(), CVSUIMessages.GenerateCVSDiff_error, null, e); //$NON-NLS-1$ return false; } break; @@ -742,15 +742,15 @@ public class GenerateDiffFileWizard extends Wizard { * The file exists. */ if (!file.canWrite()) { - final String title= Policy.bind("GenerateCVSDiff.1"); //$NON-NLS-1$ - final String msg= Policy.bind("GenerateCVSDiff.2"); //$NON-NLS-1$ + final String title= CVSUIMessages.GenerateCVSDiff_1; //$NON-NLS-1$ + final String msg= CVSUIMessages.GenerateCVSDiff_2; //$NON-NLS-1$ final MessageDialog dialog= new MessageDialog(getShell(), title, null, msg, MessageDialog.ERROR, new String[] { IDialogConstants.OK_LABEL }, 0); dialog.open(); return false; } - final String title = Policy.bind("GenerateCVSDiff.overwriteTitle"); //$NON-NLS-1$ - final String msg = Policy.bind("GenerateCVSDiff.overwriteMsg"); //$NON-NLS-1$ + final String title = CVSUIMessages.GenerateCVSDiff_overwriteTitle; //$NON-NLS-1$ + final String msg = CVSUIMessages.GenerateCVSDiff_overwriteMsg; //$NON-NLS-1$ final MessageDialog dialog = new MessageDialog(getShell(), title, null, msg, MessageDialog.QUESTION, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.CANCEL_LABEL }, 0); dialog.open(); if (dialog.getReturnCode() != 0) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java index e38b5005d..6e4cbecc5 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java @@ -48,9 +48,9 @@ public class MergeWizard extends Wizard { public void addPages() { setNeedsProgressMonitor(true); TagSource tagSource = TagSource.create(resources); - setWindowTitle(Policy.bind("MergeWizard.title")); //$NON-NLS-1$ + setWindowTitle(CVSUIMessages.MergeWizard_title); //$NON-NLS-1$ ImageDescriptor mergeImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_MERGE); - page = new MergeWizardPage("mergePage", Policy.bind("MergeWizard.0"), mergeImage, Policy.bind("MergeWizard.1"), tagSource); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + page = new MergeWizardPage("mergePage", CVSUIMessages.MergeWizard_0, mergeImage, CVSUIMessages.MergeWizard_1, tagSource); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addPage(page); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java index e83d8744c..720e4a2f7 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java @@ -22,8 +22,8 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; import org.eclipse.team.internal.ccvs.core.CVSTag; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.tags.TagContentAssistProcessor; import org.eclipse.team.internal.ccvs.ui.tags.TagRefreshButtonArea; import org.eclipse.team.internal.ccvs.ui.tags.TagSelectionArea; @@ -82,8 +82,8 @@ public class MergeWizardPage extends CVSWizardPage { composite.setLayoutData(SWTUtils.createHFillGridData()); composite.setLayout(SWTUtils.createGridLayout(1, converter, SWTUtils.MARGINS_NONE)); - previewButton = SWTUtils.createRadioButton(composite, Policy.bind("MergeWizardPage.0")); //$NON-NLS-1$ - noPreviewButton = SWTUtils.createRadioButton(composite, Policy.bind("MergeWizardPage.1")); //$NON-NLS-1$ + previewButton = SWTUtils.createRadioButton(composite, CVSUIMessages.MergeWizardPage_0); //$NON-NLS-1$ + noPreviewButton = SWTUtils.createRadioButton(composite, CVSUIMessages.MergeWizardPage_1); //$NON-NLS-1$ SelectionAdapter selectionAdapter = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { preview = previewButton.getSelection(); @@ -102,7 +102,7 @@ public class MergeWizardPage extends CVSWizardPage { } private void createEndTagArea(Composite parent) { - SWTUtils.createLabel(parent, Policy.bind("MergeWizardPage.2"), 2); //$NON-NLS-1$ + SWTUtils.createLabel(parent, CVSUIMessages.MergeWizardPage_2, 2); //$NON-NLS-1$ endTagField = SWTUtils.createText(parent); endTagField.addModifyListener(new ModifyListener() { @@ -112,13 +112,13 @@ public class MergeWizardPage extends CVSWizardPage { }); final int endTagIncludeFlags = TagSelectionArea.INCLUDE_VERSIONS | TagSelectionArea.INCLUDE_BRANCHES | TagSelectionArea.INCLUDE_HEAD_TAG; TagContentAssistProcessor.createContentAssistant(endTagField, tagSource, endTagIncludeFlags); - endTagBrowseButton = createPushButton(parent, Policy.bind("MergeWizardPage.3")); //$NON-NLS-1$ + endTagBrowseButton = createPushButton(parent, CVSUIMessages.MergeWizardPage_3); //$NON-NLS-1$ endTagBrowseButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { TagSelectionDialog dialog = new TagSelectionDialog(getShell(), getTagSource(), - Policy.bind("MergeWizardPage.4"), //$NON-NLS-1$ - Policy.bind("MergeWizardPage.5"), //$NON-NLS-1$ + CVSUIMessages.MergeWizardPage_4, //$NON-NLS-1$ + CVSUIMessages.MergeWizardPage_5, //$NON-NLS-1$ endTagIncludeFlags, false, IHelpContextIds.MERGE_END_PAGE); if (dialog.open() == Dialog.OK) { @@ -131,7 +131,7 @@ public class MergeWizardPage extends CVSWizardPage { private void createStartTagArea(Composite parent) { - SWTUtils.createLabel(parent, Policy.bind("MergeWizardPage.6"), 2); //$NON-NLS-1$ + SWTUtils.createLabel(parent, CVSUIMessages.MergeWizardPage_6, 2); //$NON-NLS-1$ startTagField = SWTUtils.createText(parent); startTagField.addModifyListener(new ModifyListener() { @@ -141,12 +141,12 @@ public class MergeWizardPage extends CVSWizardPage { }); TagContentAssistProcessor.createContentAssistant(startTagField, tagSource, TagSelectionArea.INCLUDE_VERSIONS); - startTagBrowseButton = createPushButton(parent, Policy.bind("MergeWizardPage.7")); //$NON-NLS-1$ + startTagBrowseButton = createPushButton(parent, CVSUIMessages.MergeWizardPage_7); //$NON-NLS-1$ startTagBrowseButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { TagSelectionDialog dialog = new TagSelectionDialog(getShell(), getTagSource(), - Policy.bind("MergeWizardPage.8"), //$NON-NLS-1$ - Policy.bind("MergeWizardPage.9"), //$NON-NLS-1$ + CVSUIMessages.MergeWizardPage_8, //$NON-NLS-1$ + CVSUIMessages.MergeWizardPage_9, //$NON-NLS-1$ TagSelectionDialog.INCLUDE_VERSIONS, false, IHelpContextIds.MERGE_START_PAGE); if (dialog.open() == Dialog.OK) { @@ -244,13 +244,13 @@ public class MergeWizardPage extends CVSWizardPage { private void updateEnablements() { if (endTag == null && endTagField.getText().length() > 0) { - setErrorMessage(Policy.bind("MergeWizardPage.10")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.MergeWizardPage_10); //$NON-NLS-1$ } else if (startTag == null && startTagField.getText().length() > 0) { - setErrorMessage(Policy.bind("MergeWizardPage.11")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.MergeWizardPage_11); //$NON-NLS-1$ } else if (endTag != null && startTag != null && startTag.equals(endTag)) { - setErrorMessage(Policy.bind("MergeWizardPage.12")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.MergeWizardPage_12); //$NON-NLS-1$ } else if (startTag == null && endTag != null && preview) { - setErrorMessage(Policy.bind("MergeWizardPage.13")); //$NON-NLS-1$ + setErrorMessage(CVSUIMessages.MergeWizardPage_13); //$NON-NLS-1$ } else { setErrorMessage(null); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizard.java index 338cb21c7..914509639 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizard.java @@ -41,6 +41,7 @@ import org.eclipse.team.internal.ccvs.core.ICVSFile; import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.Policy; @@ -121,8 +122,8 @@ public class ModeWizard extends ResizableWizard { */ protected ModeWizard(Shell shell, final IResource[] resources) { - super(Policy.bind("ModeWizard.0"), CVSUIPlugin.getPlugin().getDialogSettings(), 700, 480); //$NON-NLS-1$ - setWindowTitle(Policy.bind("ModeWizard.1")); //$NON-NLS-1$ + super(CVSUIMessages.ModeWizard_0, CVSUIPlugin.getPlugin().getDialogSettings(), 700, 480); //$NON-NLS-1$ + setWindowTitle(CVSUIMessages.ModeWizard_1); //$NON-NLS-1$ fChanges= getModeChanges(shell, resources); fPage= new ModeWizardSelectionPage(fChanges); @@ -172,7 +173,7 @@ public class ModeWizard extends ResizableWizard { } }, IResource.DEPTH_INFINITE, false); } catch (CoreException e) { - CVSUIPlugin.openError(shell, Policy.bind("ModeWizard.2"), null, e); //$NON-NLS-1$ + CVSUIPlugin.openError(shell, CVSUIMessages.ModeWizard_2, null, e); //$NON-NLS-1$ } } return changes; @@ -193,7 +194,7 @@ public class ModeWizard extends ResizableWizard { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { final int totalWork= 10000; - monitor.beginTask(Policy.bind("ModeWizard.3"), totalWork); //$NON-NLS-1$ + monitor.beginTask(CVSUIMessages.ModeWizard_3, totalWork); //$NON-NLS-1$ final Map changesPerProvider= getProviderMapping(changes); @@ -226,7 +227,7 @@ public class ModeWizard extends ResizableWizard { // Check for any status messages and display them if (!messages.isEmpty()) { boolean error = false; - final MultiStatus combinedStatus = new MultiStatus(CVSUIPlugin.ID, 0, Policy.bind("ModeWizard.4"), null); //$NON-NLS-1$ + final MultiStatus combinedStatus = new MultiStatus(CVSUIPlugin.ID, 0, CVSUIMessages.ModeWizard_4, null); //$NON-NLS-1$ for (int i = 0; i < messages.size(); i++) { final IStatus status = (IStatus)messages.get(i); if (status.getSeverity() == IStatus.ERROR || status.getCode() == CVSStatus.SERVER_ERROR) { @@ -242,14 +243,14 @@ public class ModeWizard extends ResizableWizard { } else { statusToDisplay = combinedStatus; } - final String title= error ? Policy.bind("ModeWizard.5") : Policy.bind("ModeWizard.6"); //$NON-NLS-1$ //$NON-NLS-2$ + final String title= error ? CVSUIMessages.ModeWizard_5 : CVSUIMessages.ModeWizard_6; //$NON-NLS-1$ //$NON-NLS-2$ CVSUIPlugin.openError(getShell(), title, message, new CVSException(statusToDisplay)); } return super.performFinish(); } catch (InterruptedException e) { return true; } catch (InvocationTargetException e) { - CVSUIPlugin.openError(getShell(), Policy.bind("ModeWizard.4"), null, e); //$NON-NLS-1$ + CVSUIPlugin.openError(getShell(), CVSUIMessages.ModeWizard_4, null, e); //$NON-NLS-1$ return false; } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizardSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizardSelectionPage.java index 7e3d538d2..af5b9f3f9 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizardSelectionPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizardSelectionPage.java @@ -39,6 +39,7 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.events.ModifyEvent; @@ -61,10 +62,10 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption; import org.eclipse.team.internal.ccvs.core.util.StringMatcher; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.CommitCommentArea; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.wizards.ModeWizard.ModeChange; import org.eclipse.team.internal.ui.PixelConverter; import org.eclipse.team.internal.ui.SWTUtils; @@ -260,21 +261,21 @@ public class ModeWizardSelectionPage extends WizardPage { */ final TableColumn fileColumn = new TableColumn(table, SWT.NONE, INDEX_FILE); fileColumn.setWidth(converter.convertWidthInCharsToPixels(LARGE_COLUMN)); - fileColumn.setText(Policy.bind("ModeWizardSelectionPage.2")); //$NON-NLS-1$ + fileColumn.setText(CVSUIMessages.ModeWizardSelectionPage_2); //$NON-NLS-1$ /** * The 'Mode' column */ final TableColumn newModeColumn = new TableColumn(table, SWT.NONE, INDEX_MODE); newModeColumn.setWidth(converter.convertWidthInCharsToPixels(COLUMN_MIN_WIDTH_IN_CHARS + 6)); - newModeColumn.setText(Policy.bind("ModeWizardSelectionPage.3")); //$NON-NLS-1$ + newModeColumn.setText(CVSUIMessages.ModeWizardSelectionPage_3); //$NON-NLS-1$ /** * The 'Path' column */ final TableColumn pathColumn= new TableColumn(table, SWT.NONE, INDEX_PATH); pathColumn.setWidth(converter.convertWidthInCharsToPixels(50)); - pathColumn.setText(Policy.bind("ModeWizardSelectionPage.4")); //$NON-NLS-1$ + pathColumn.setText(CVSUIMessages.ModeWizardSelectionPage_4); //$NON-NLS-1$ fViewer= new TableViewer(table); @@ -453,8 +454,8 @@ public class ModeWizardSelectionPage extends WizardPage { fTable= table; fButton= new Button(parent, SWT.NONE); fButton.setLayoutData(SWTUtils.createGridData(buttonWidth, SWT.DEFAULT, SWT.FILL, SWT.CENTER, false, false)); - fButton.setText(Policy.bind("ModeWizardSelectionPage.8")); //$NON-NLS-1$ - fButton.setToolTipText(Policy.bind("ModeWizardSelectionPage.9")); //$NON-NLS-1$ + fButton.setText(CVSUIMessages.ModeWizardSelectionPage_8); //$NON-NLS-1$ + fButton.setToolTipText(CVSUIMessages.ModeWizardSelectionPage_9); //$NON-NLS-1$ fButton.addSelectionListener(this); fTable.addObserver(this); } @@ -491,8 +492,8 @@ public class ModeWizardSelectionPage extends WizardPage { final int buttonWidth= converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); fButton= new Button(parent, SWT.NONE); fButton.setLayoutData(SWTUtils.createGridData(buttonWidth, SWT.DEFAULT, SWT.FILL, SWT.CENTER, false, false)); - fButton.setText(Policy.bind("ModeWizardSelectionPage.10")); //$NON-NLS-1$ - fButton.setToolTipText(Policy.bind("ModeWizardSelectionPage.11")); //$NON-NLS-1$ + fButton.setText(CVSUIMessages.ModeWizardSelectionPage_10); //$NON-NLS-1$ + fButton.setToolTipText(CVSUIMessages.ModeWizardSelectionPage_11); //$NON-NLS-1$ fButton.addSelectionListener(this); fTable.addObserver(this); @@ -522,7 +523,7 @@ public class ModeWizardSelectionPage extends WizardPage { final int buttonWidth= converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); fButton= new Button(parent, SWT.NONE); fButton.setLayoutData(SWTUtils.createGridData(buttonWidth, SWT.DEFAULT, SWT.FILL, SWT.CENTER, false, false)); - fButton.setText(Policy.bind("ModeWizardSelectionPage.12")); //$NON-NLS-1$ + fButton.setText(CVSUIMessages.ModeWizardSelectionPage_12); //$NON-NLS-1$ fButton.addSelectionListener(this); } @@ -541,7 +542,7 @@ public class ModeWizardSelectionPage extends WizardPage { final int buttonWidth= converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); fButton= new Button(parent, SWT.NONE); fButton.setLayoutData(SWTUtils.createGridData(buttonWidth, SWT.DEFAULT, SWT.FILL, SWT.CENTER, false, false)); - fButton.setText(Policy.bind("ModeWizardSelectionPage.13")); //$NON-NLS-1$ + fButton.setText(CVSUIMessages.ModeWizardSelectionPage_13); //$NON-NLS-1$ fButton.addSelectionListener(this); } @@ -558,7 +559,7 @@ public class ModeWizardSelectionPage extends WizardPage { public ShowChangesOnlyCheckbox(ModeWizardSelectionPage page, Composite parent) { fPage= page; fCheck= new Button(parent, SWT.CHECK); - fCheck.setText(Policy.bind("ModeWizardSelectionPage.14")); //$NON-NLS-1$ + fCheck.setText(CVSUIMessages.ModeWizardSelectionPage_14); //$NON-NLS-1$ fCheck.setLayoutData(SWTUtils.createHFillGridData()); fCheck.setSelection(false); fCheck.addSelectionListener(this); @@ -582,7 +583,7 @@ public class ModeWizardSelectionPage extends WizardPage { final int buttonWidth= converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); final Button button= new Button(parent, SWT.PUSH); - button.setText(Policy.bind("ModeWizardSelectionPage.15")); //$NON-NLS-1$ + button.setText(CVSUIMessages.ModeWizardSelectionPage_15); //$NON-NLS-1$ button.setLayoutData(SWTUtils.createGridData(buttonWidth, SWT.DEFAULT, SWT.FILL, SWT.CENTER, false, false)); button.addSelectionListener(this); @@ -625,7 +626,7 @@ public class ModeWizardSelectionPage extends WizardPage { * @param numberOfChanges */ private void updateText(int numberOfChanges) { - fLabel.setText(Policy.bind("ModeWizardSelectionPage.17", Integer.toString(numberOfChanges))); //$NON-NLS-1$ + fLabel.setText(NLS.bind(CVSUIMessages.ModeWizardSelectionPage_17, new String[] { Integer.toString(numberOfChanges) })); //$NON-NLS-1$ } } @@ -650,7 +651,7 @@ public class ModeWizardSelectionPage extends WizardPage { * @param numberOfChanges */ private void updateText(int selected) { - fLabel.setText(Policy.bind("ModeWizardSelectionPage.25", Integer.toString(selected))); //$NON-NLS-1$ + fLabel.setText(NLS.bind(CVSUIMessages.ModeWizardSelectionPage_25, new String[] { Integer.toString(selected) })); //$NON-NLS-1$ } } @@ -693,8 +694,8 @@ public class ModeWizardSelectionPage extends WizardPage { private CommitCommentArea fCommentArea; public ModeWizardSelectionPage(List modeChanges) { - super(Policy.bind("ModeWizardSelectionPage.18"), Policy.bind("ModeWizardSelectionPage.19"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_KEYWORD)); //$NON-NLS-1$ //$NON-NLS-2$ - setDescription(Policy.bind("ModeWizardSelectionPage.20")); //$NON-NLS-1$ + super(CVSUIMessages.ModeWizardSelectionPage_18, CVSUIMessages.ModeWizardSelectionPage_19, CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_KEYWORD)); //$NON-NLS-1$ //$NON-NLS-2$ + setDescription(CVSUIMessages.ModeWizardSelectionPage_20); //$NON-NLS-1$ fChanges= modeChanges; } @@ -718,7 +719,7 @@ public class ModeWizardSelectionPage extends WizardPage { final Composite topComposite= SWTUtils.createHVFillComposite(mainSash, SWTUtils.MARGINS_NONE); ((GridLayout)topComposite.getLayout()).marginBottom= verticalSpace; - final Composite topGroup= SWTUtils.createHVFillGroup(topComposite, Policy.bind("ModeWizardSelectionPage.21"), SWTUtils.MARGINS_DIALOG); //$NON-NLS-1$ + final Composite topGroup= SWTUtils.createHVFillGroup(topComposite, CVSUIMessages.ModeWizardSelectionPage_21, SWTUtils.MARGINS_DIALOG); //$NON-NLS-1$ final Composite filterComposite= SWTUtils.createHFillComposite(topGroup, SWTUtils.MARGINS_NONE, 2); final FilterTextBox filterBox= new FilterTextBox(ModeWizardSelectionPage.this, filterComposite, converter); @@ -750,13 +751,13 @@ public class ModeWizardSelectionPage extends WizardPage { ((GridLayout)leftComposite.getLayout()).marginRight= horizontalSpace; ((GridLayout)leftComposite.getLayout()).marginTop= verticalSpace; - final Group leftGroup= SWTUtils.createHVFillGroup(leftComposite, Policy.bind("ModeWizardSelectionPage.22"), SWTUtils.MARGINS_DIALOG, 3); //$NON-NLS-1$ + final Group leftGroup= SWTUtils.createHVFillGroup(leftComposite, CVSUIMessages.ModeWizardSelectionPage_22, SWTUtils.MARGINS_DIALOG, 3); //$NON-NLS-1$ new ModeCombo(fTable, leftGroup); new GuessButton(fTable, leftGroup, converter); new ResetButton(fTable, leftGroup, converter); SWTUtils.createPlaceholder(leftGroup, 1); - final Label infoLabel= SWTUtils.createLabel(leftGroup, Policy.bind("ModeWizardSelectionPage.23"), 3); //$NON-NLS-1$ + final Label infoLabel= SWTUtils.createLabel(leftGroup, CVSUIMessages.ModeWizardSelectionPage_23, 3); //$NON-NLS-1$ fTable.addObserver(new Observer() { public void update(Observable o, Object arg) { @@ -773,7 +774,7 @@ public class ModeWizardSelectionPage extends WizardPage { ((GridLayout)rightComposite.getLayout()).marginLeft= horizontalSpace; ((GridLayout)rightComposite.getLayout()).marginTop= verticalSpace; - final Group rightGroup= SWTUtils.createHVFillGroup(rightComposite, Policy.bind("ModeWizardSelectionPage.24"), SWTUtils.MARGINS_DIALOG); //$NON-NLS-1$ + final Group rightGroup= SWTUtils.createHVFillGroup(rightComposite, CVSUIMessages.ModeWizardSelectionPage_24, SWTUtils.MARGINS_DIALOG); //$NON-NLS-1$ (fCommentArea= new CommitCommentArea()).createArea(rightGroup); /** diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java index 183ba9b05..7b27dbb95 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java @@ -29,8 +29,8 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.*; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.model.RemoteContentProvider; import org.eclipse.team.internal.ccvs.ui.repo.RepositorySorter; import org.eclipse.ui.help.WorkbenchHelp; @@ -76,16 +76,16 @@ public class ModuleSelectionPage extends CVSWizardPage { }; if (project != null) { - useProjectNameButton = createRadioButton(composite, Policy.bind("ModuleSelectionPage.moduleIsProject"), 2); //$NON-NLS-1$ + useProjectNameButton = createRadioButton(composite, CVSUIMessages.ModuleSelectionPage_moduleIsProject, 2); //$NON-NLS-1$ useProjectNameButton.addListener(SWT.Selection, listener); } - useSpecifiedNameButton = createRadioButton(composite, Policy.bind("ModuleSelectionPage.specifyModule"), 1); //$NON-NLS-1$ + useSpecifiedNameButton = createRadioButton(composite, CVSUIMessages.ModuleSelectionPage_specifyModule, 1); //$NON-NLS-1$ useSpecifiedNameButton.addListener(SWT.Selection, listener); text = createTextField(composite); text.addListener(SWT.Modify, listener); - selectModuleButton = createRadioButton(composite, Policy.bind("ModuleSelectionPage.2"), 2); //$NON-NLS-1$ + selectModuleButton = createRadioButton(composite, CVSUIMessages.ModuleSelectionPage_2, 2); //$NON-NLS-1$ selectModuleButton.addListener(SWT.Selection, listener); moduleList = createModuleTree(composite, 2); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java index 782815296..d12e2b799 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.*; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.wizard.Wizard; +import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.CVSException; import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; @@ -45,7 +46,7 @@ public class NewLocationWizard extends Wizard { public NewLocationWizard() { IDialogSettings section = getLocationDialogSettings(); setDialogSettings(section); - setWindowTitle(Policy.bind("NewLocationWizard.title")); //$NON-NLS-1$ + setWindowTitle(CVSUIMessages.NewLocationWizard_title); //$NON-NLS-1$ } @@ -58,12 +59,12 @@ public class NewLocationWizard extends Wizard { * Creates the wizard pages */ public void addPages() { - mainPage = new ConfigurationWizardMainPage("repositoryPage1", Policy.bind("NewLocationWizard.heading"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_NEW_LOCATION)); //$NON-NLS-1$ //$NON-NLS-2$ + mainPage = new ConfigurationWizardMainPage("repositoryPage1", CVSUIMessages.NewLocationWizard_heading, CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_NEW_LOCATION)); //$NON-NLS-1$ //$NON-NLS-2$ if (properties != null) { mainPage.setProperties(properties); } mainPage.setShowValidate(true); - mainPage.setDescription(Policy.bind("NewLocationWizard.description")); //$NON-NLS-1$ + mainPage.setDescription(CVSUIMessages.NewLocationWizard_description); //$NON-NLS-1$ mainPage.setDialogSettings(getDialogSettings()); addPage(mainPage); } @@ -109,7 +110,7 @@ public class NewLocationWizard extends Wizard { } catch (TeamException e) { if (location[0] == null) { // Exception creating the root, we cannot continue - CVSUIPlugin.openError(getContainer().getShell(), Policy.bind("NewLocationWizard.exception"), null, e); //$NON-NLS-1$ + CVSUIPlugin.openError(getContainer().getShell(), CVSUIMessages.NewLocationWizard_exception, null, e); //$NON-NLS-1$ return false; } else { // Exception validating. We can continue if the user wishes. @@ -119,11 +120,11 @@ public class NewLocationWizard extends Wizard { } if (error.isMultiStatus()) { - CVSUIPlugin.openError(getContainer().getShell(), Policy.bind("NewLocationWizard.validationFailedTitle"), null, e); //$NON-NLS-1$ + CVSUIPlugin.openError(getContainer().getShell(), CVSUIMessages.NewLocationWizard_validationFailedTitle, null, e); //$NON-NLS-1$ } else { keepLocation = MessageDialog.openQuestion(getContainer().getShell(), - Policy.bind("NewLocationWizard.validationFailedTitle"), //$NON-NLS-1$ - Policy.bind("NewLocationWizard.validationFailedText", new Object[] {error.getMessage()})); //$NON-NLS-1$ + CVSUIMessages.NewLocationWizard_validationFailedTitle, //$NON-NLS-1$ + NLS.bind(CVSUIMessages.NewLocationWizard_validationFailedText, (new Object[] {error.getMessage()}))); //$NON-NLS-1$ } } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RepositorySelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RepositorySelectionPage.java index 1e0716dd6..1c9b5eb7e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RepositorySelectionPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RepositorySelectionPage.java @@ -70,13 +70,13 @@ public class RepositorySelectionPage extends CVSWizardPage { // set F1 help WorkbenchHelp.setHelp(composite, IHelpContextIds.SHARING_SELECT_REPOSITORY_PAGE); if (extendedDescription == null) { - extendedDescription = Policy.bind("RepositorySelectionPage.description"); //$NON-NLS-1$ + extendedDescription = CVSUIMessages.RepositorySelectionPage_description; //$NON-NLS-1$ } createWrappingLabel(composite, extendedDescription, 0 /* indent */, 1 /* columns */); - useNewRepo = createRadioButton(composite, Policy.bind("RepositorySelectionPage.useNew"), 1); //$NON-NLS-1$ + useNewRepo = createRadioButton(composite, CVSUIMessages.RepositorySelectionPage_useNew, 1); //$NON-NLS-1$ - useExistingRepo = createRadioButton(composite, Policy.bind("RepositorySelectionPage.useExisting"), 1); //$NON-NLS-1$ + useExistingRepo = createRadioButton(composite, CVSUIMessages.RepositorySelectionPage_useExisting, 1); //$NON-NLS-1$ table = createTable(composite, 1); table.setContentProvider(new WorkbenchContentProvider()); table.setLabelProvider(new WorkbenchLabelProvider()); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java index 5746c9adb..978026cb5 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java @@ -22,6 +22,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.*; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -143,7 +144,7 @@ public class RestoreFromRepositoryFileSelectionPage extends CVSWizardPage { revisionSelectionPane.setLayoutData(data); historyTableProvider = new HistoryTableProvider(); revisionsTable = createRevisionSelectionTable(revisionSelectionPane, historyTableProvider); - revisionSelectionPane.setText(Policy.bind("RestoreFromRepositoryFileSelectionPage.emptyRevisionPane")); //$NON-NLS-1$ + revisionSelectionPane.setText(CVSUIMessages.RestoreFromRepositoryFileSelectionPage_emptyRevisionPane); //$NON-NLS-1$ // Bottom: File content viewer fileContentPane = new CompareViewerSwitchingPane(vsplitter, SWT.BORDER | SWT.FLAT) { @@ -204,7 +205,7 @@ public class RestoreFromRepositoryFileSelectionPage extends CVSWizardPage { ILogEntry entry = (ILogEntry)filesToRestore.get(element); text = super.decorateText(input, element); if (entry != null) { - text = Policy.bind("RestoreFromRepositoryFileSelectionPage.fileToRestore", text, entry.getRevision()); //$NON-NLS-1$ + text = NLS.bind(CVSUIMessages.RestoreFromRepositoryFileSelectionPage_fileToRestore, new String[] { text, entry.getRevision() }); //$NON-NLS-1$ } } return text; @@ -240,14 +241,14 @@ public class RestoreFromRepositoryFileSelectionPage extends CVSWizardPage { IFile file = (IFile) iter.next(); if (file.exists()) { setPageComplete(false); - setErrorMessage(Policy.bind("RestoreFromRepositoryFileSelectionPage.fileExists", file.getName())); //$NON-NLS-1$ + setErrorMessage(NLS.bind(CVSUIMessages.RestoreFromRepositoryFileSelectionPage_fileExists, new String[] { file.getName() })); //$NON-NLS-1$ return; } ILogEntry entry = (ILogEntry) filesToRestore.get(file); if (entry.isDeletion()) { setPageComplete(false); - setErrorMessage(Policy.bind("RestoreFromRepositoryFileSelectionPage.revisionIsDeletion", entry.getRevision(), file.getName())); //$NON-NLS-1$ + setErrorMessage(NLS.bind(CVSUIMessages.RestoreFromRepositoryFileSelectionPage_revisionIsDeletion, new String[] { entry.getRevision(), file.getName() })); //$NON-NLS-1$ return; } } @@ -315,13 +316,13 @@ public class RestoreFromRepositoryFileSelectionPage extends CVSWizardPage { if (folder == null) return; if (fileSelectionPane != null && !fileSelectionPane.isDisposed()) { - fileSelectionPane.setText(Policy.bind("RestoreFromRepositoryFileSelectionPage.fileSelectionPaneTitle", folder.getProject().getName())); //$NON-NLS-1$ + fileSelectionPane.setText(NLS.bind(CVSUIMessages.RestoreFromRepositoryFileSelectionPage_fileSelectionPaneTitle, new String[] { folder.getProject().getName() })); //$NON-NLS-1$ fileSelectionPane.setImage(CompareUI.getImage(folder.getProject())); } if (revisionSelectionPane != null && !revisionSelectionPane.isDisposed()) { if (selectedFile == null) { - revisionSelectionPane.setText(Policy.bind("RestoreFromRepositoryFileSelectionPage.emptyRevisionPane")); //$NON-NLS-1$ + revisionSelectionPane.setText(CVSUIMessages.RestoreFromRepositoryFileSelectionPage_emptyRevisionPane); //$NON-NLS-1$ revisionSelectionPane.setImage(null); } } @@ -361,7 +362,7 @@ public class RestoreFromRepositoryFileSelectionPage extends CVSWizardPage { } } // Set the titlebar text for the revisions table - revisionSelectionPane.setText(Policy.bind("RestoreFromRepositoryFileSelectionPage.revisionSelectionPaneTitle", selectedFile.getName())); //$NON-NLS-1$ + revisionSelectionPane.setText(NLS.bind(CVSUIMessages.RestoreFromRepositoryFileSelectionPage_revisionSelectionPaneTitle, new String[] { selectedFile.getName() })); //$NON-NLS-1$ revisionSelectionPane.setImage(CompareUI.getImage(selectedFile)); // Clear the file content pane fileContentPane.setInput(null); @@ -502,8 +503,7 @@ public class RestoreFromRepositoryFileSelectionPage extends CVSWizardPage { * @return String */ private String getEditionLabel(IFile selectedFile, ILogEntry selected) { - return Policy.bind("RestoreFromRepositoryFileSelectionPage.fileContentPaneTitle", //$NON-NLS-1$ - new Object[] { selectedFile.getName(), selected.getRevision(), selectedFile.getFullPath().makeRelative().removeLastSegments(1).toString() }); + return NLS.bind(CVSUIMessages.RestoreFromRepositoryFileSelectionPage_fileContentPaneTitle, (new Object[] { selectedFile.getName(), selected.getRevision(), selectedFile.getFullPath().makeRelative().removeLastSegments(1).toString() })); } public boolean restoreSelectedFiles() { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryWizard.java index e9154389a..96dbb9ed8 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryWizard.java @@ -14,9 +14,9 @@ import org.eclipse.core.resources.IContainer; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.Wizard; import org.eclipse.team.internal.ccvs.core.ICVSFile; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; -import org.eclipse.team.internal.ccvs.ui.Policy; /** * This wizard allows the user to show deleted resources in the history view @@ -33,7 +33,7 @@ public class RestoreFromRepositoryWizard extends Wizard { public RestoreFromRepositoryWizard(IContainer parent, ICVSFile[] files) { this.parent = parent; this.files = files; - setWindowTitle(Policy.bind("RestoreFromRepositoryWizard.fileSelectionPageTitle")); //$NON-NLS-1$ + setWindowTitle(CVSUIMessages.RestoreFromRepositoryWizard_fileSelectionPageTitle); //$NON-NLS-1$ } /** @@ -50,7 +50,7 @@ public class RestoreFromRepositoryWizard extends Wizard { setNeedsProgressMonitor(true); ImageDescriptor substImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_CHECKOUT); - fileSelectionPage = new RestoreFromRepositoryFileSelectionPage("FileSelectionPage", Policy.bind("RestoreFromRepositoryWizard.fileSelectionPageTitle"), substImage, Policy.bind("RestoreFromRepositoryWizard.fileSelectionPageDescription")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + fileSelectionPage = new RestoreFromRepositoryFileSelectionPage("FileSelectionPage", CVSUIMessages.RestoreFromRepositoryWizard_fileSelectionPageTitle, substImage, CVSUIMessages.RestoreFromRepositoryWizard_fileSelectionPageDescription); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ fileSelectionPage.setInput(parent, files); addPage(fileSelectionPage); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java index dd1deeecd..82254a03d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java @@ -23,6 +23,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.RepositoryProvider; @@ -35,6 +36,7 @@ import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; import org.eclipse.team.internal.ccvs.core.util.KnownRepositories; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; @@ -90,16 +92,16 @@ public class SharingWizard extends Wizard implements IConfigurationWizard, ICVSW } setDialogSettings(section); setNeedsProgressMonitor(true); - setWindowTitle(Policy.bind("SharingWizard.title")); //$NON-NLS-1$ + setWindowTitle(CVSUIMessages.SharingWizard_title); //$NON-NLS-1$ } public void addPages() { ImageDescriptor sharingImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_SHARE); boolean autoconnect = false; if (doesCVSDirectoryExist()) { - autoconnectPage = new ConfigurationWizardAutoconnectPage("autoconnectPage", Policy.bind("SharingWizard.autoConnectTitle"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$ + autoconnectPage = new ConfigurationWizardAutoconnectPage("autoconnectPage", CVSUIMessages.SharingWizard_autoConnectTitle, sharingImage); //$NON-NLS-1$ //$NON-NLS-2$ if (autoconnectPage.setProject(project)) { - autoconnectPage.setDescription(Policy.bind("SharingWizard.autoConnectTitleDescription")); //$NON-NLS-1$ + autoconnectPage.setDescription(CVSUIMessages.SharingWizard_autoConnectTitleDescription); //$NON-NLS-1$ addPage(autoconnectPage); autoconnect = true; } @@ -107,17 +109,17 @@ public class SharingWizard extends Wizard implements IConfigurationWizard, ICVSW if (!autoconnect) { ICVSRepositoryLocation[] locations = CVSUIPlugin.getPlugin().getRepositoryManager().getKnownRepositoryLocations(); if (locations.length > 0) { - locationPage = new RepositorySelectionPage("importPage", Policy.bind("SharingWizard.importTitle"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$ - locationPage.setDescription(Policy.bind("SharingWizard.importTitleDescription")); //$NON-NLS-1$ + locationPage = new RepositorySelectionPage("importPage", CVSUIMessages.SharingWizard_importTitle, sharingImage); //$NON-NLS-1$ //$NON-NLS-2$ + locationPage.setDescription(CVSUIMessages.SharingWizard_importTitleDescription); //$NON-NLS-1$ addPage(locationPage); } - createLocationPage = new ConfigurationWizardMainPage("createLocationPage", Policy.bind("SharingWizard.enterInformation"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$ - createLocationPage.setDescription(Policy.bind("SharingWizard.enterInformationDescription")); //$NON-NLS-1$ + createLocationPage = new ConfigurationWizardMainPage("createLocationPage", CVSUIMessages.SharingWizard_enterInformation, sharingImage); //$NON-NLS-1$ //$NON-NLS-2$ + createLocationPage.setDescription(CVSUIMessages.SharingWizard_enterInformationDescription); //$NON-NLS-1$ createLocationPage.setCVSWizard(this); createLocationPage.setDialogSettings(NewLocationWizard.getLocationDialogSettings()); addPage(createLocationPage); - modulePage = new ModuleSelectionPage("modulePage", Policy.bind("SharingWizard.enterModuleName"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$ - modulePage.setDescription(Policy.bind("SharingWizard.enterModuleNameDescription")); //$NON-NLS-1$ + modulePage = new ModuleSelectionPage("modulePage", CVSUIMessages.SharingWizard_enterModuleName, sharingImage); //$NON-NLS-1$ //$NON-NLS-2$ + modulePage.setDescription(CVSUIMessages.SharingWizard_enterModuleNameDescription); //$NON-NLS-1$ modulePage.setCVSWizard(this); modulePage.setProject(project); modulePage.setHelpContxtId(IHelpContextIds.SHARING_MODULE_PAGE); @@ -130,9 +132,9 @@ public class SharingWizard extends Wizard implements IConfigurationWizard, ICVSW private void addTagPage(ImageDescriptor sharingImage) { tagPage = new TagSelectionWizardPage("tagPage", //$NON-NLS-1$ - Policy.bind("SharingWizard.selectTagTitle"), //$NON-NLS-1$ + CVSUIMessages.SharingWizard_selectTagTitle, //$NON-NLS-1$ sharingImage, - Policy.bind("SharingWizard.selectTag"), //$NON-NLS-1$ + CVSUIMessages.SharingWizard_selectTag, //$NON-NLS-1$ TagSource.EMPTY, // start with an empty tag source TagSourceWorkbenchAdapter.INCLUDE_HEAD_TAG | TagSourceWorkbenchAdapter.INCLUDE_BRANCHES); //$NON-NLS-1$ tagPage.setCVSWizard(this); @@ -142,9 +144,9 @@ public class SharingWizard extends Wizard implements IConfigurationWizard, ICVSW private void addSyncPage(ImageDescriptor sharingImage) { syncPage = new SharingWizardSyncPage("syncPagePage", //$NON-NLS-1$ - Policy.bind("SharingWizard.23"), //$NON-NLS-1$ + CVSUIMessages.SharingWizard_23, //$NON-NLS-1$ sharingImage, - Policy.bind("SharingWizard.24")); //$NON-NLS-1$ + CVSUIMessages.SharingWizard_24); //$NON-NLS-1$ syncPage.setProject(project); syncPage.setCVSWizard(this); addPage(syncPage); @@ -320,7 +322,7 @@ public class SharingWizard extends Wizard implements IConfigurationWizard, ICVSW } private boolean promptToKeepMapping() { - return (MessageDialog.openQuestion(getShell(), Policy.bind("SharingWizard.26"), Policy.bind("SharingWizard.27", project.getName()))); //$NON-NLS-1$ //$NON-NLS-2$ + return (MessageDialog.openQuestion(getShell(), CVSUIMessages.SharingWizard_26, NLS.bind(CVSUIMessages.SharingWizard_27, new String[] { project.getName() }))); //$NON-NLS-1$ //$NON-NLS-2$ } private void reconcileProject(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { @@ -449,8 +451,8 @@ public class SharingWizard extends Wizard implements IConfigurationWizard, ICVSW getShell().getDisplay().syncExec(new Runnable() { public void run() { keep[0] = MessageDialog.openQuestion(getContainer().getShell(), - Policy.bind("SharingWizard.validationFailedTitle"), //$NON-NLS-1$ - Policy.bind("SharingWizard.validationFailedText", new Object[] {e.getStatus().getMessage()})); //$NON-NLS-1$ + CVSUIMessages.SharingWizard_validationFailedTitle, //$NON-NLS-1$ + NLS.bind(CVSUIMessages.SharingWizard_validationFailedText, (new Object[] {e.getStatus().getMessage()}))); //$NON-NLS-1$ } }); if (!keep[0]) { @@ -534,7 +536,7 @@ public class SharingWizard extends Wizard implements IConfigurationWizard, ICVSW } else { shareProject(Policy.subMonitorFor(monitor, 50)); } - getParticipant().refreshNow(new IResource[] {project}, Policy.bind("ShareProjectOperation.1"), Policy.subMonitorFor(monitor, 50)); //$NON-NLS-1$ + getParticipant().refreshNow(new IResource[] {project}, CVSUIMessages.ShareProjectOperation_1, Policy.subMonitorFor(monitor, 50)); //$NON-NLS-1$ if (monitor.isCanceled()) { throw new InterruptedException(); } @@ -556,7 +558,7 @@ public class SharingWizard extends Wizard implements IConfigurationWizard, ICVSW private void prepareTagPage(ICVSRemoteFolder remote) { tagPage.setTagSource(TagSource.create(remote)); - tagPage.setDescription(Policy.bind("SharingWizard.25", remote.getRepositoryRelativePath())); //$NON-NLS-1$ + tagPage.setDescription(NLS.bind(CVSUIMessages.SharingWizard_25, new String[] { remote.getRepositoryRelativePath() })); //$NON-NLS-1$ } private WorkspaceSynchronizeParticipant getParticipant() { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardSyncPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardSyncPage.java index 2f256515b..6ded1e7c0 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardSyncPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardSyncPage.java @@ -24,6 +24,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -39,9 +40,9 @@ import org.eclipse.team.core.TeamStatus; import org.eclipse.team.core.synchronize.ISyncInfoSetChangeEvent; import org.eclipse.team.core.synchronize.ISyncInfoSetChangeListener; import org.eclipse.team.core.synchronize.SyncInfoSet; +import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; -import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.subscriber.WorkspaceSynchronizeParticipant; import org.eclipse.team.internal.ui.PixelConverter; import org.eclipse.team.internal.ui.SWTUtils; @@ -114,7 +115,7 @@ public class SharingWizardSyncPage extends CVSWizardPage implements ISyncInfoSet fCheckbox= new Button(composite, SWT.CHECK); fCheckbox.setLayoutData(SWTUtils.createHFillGridData()); - fCheckbox.setText(Policy.bind("SharingWizardSyncPage.12")); //$NON-NLS-1$ + fCheckbox.setText(CVSUIMessages.SharingWizardSyncPage_12); //$NON-NLS-1$ fCheckbox.setSelection(true); updatePage(); @@ -125,7 +126,7 @@ public class SharingWizardSyncPage extends CVSWizardPage implements ISyncInfoSet private Control createNoChangesPage(PageBook pageBook) { Composite composite = createComposite(pageBook, 1, false); - createWrappingLabel(composite, Policy.bind("SharingWizardSyncPage.3", project.getName()), 0); //$NON-NLS-1$ + createWrappingLabel(composite, NLS.bind(CVSUIMessages.SharingWizardSyncPage_3, new String[] { project.getName() }), 0); //$NON-NLS-1$ return composite; } @@ -134,10 +135,10 @@ public class SharingWizardSyncPage extends CVSWizardPage implements ISyncInfoSet GridLayout layout = new GridLayout(); composite.setLayout(layout); - createWrappingLabel(composite, Policy.bind("SharingWizardSyncPage.4"), 0); //$NON-NLS-1$ + createWrappingLabel(composite, CVSUIMessages.SharingWizardSyncPage_4, 0); //$NON-NLS-1$ Button showErrors = new Button(composite, SWT.PUSH); - showErrors.setText(Policy.bind("SharingWizardSyncPage.5")); //$NON-NLS-1$ + showErrors.setText(CVSUIMessages.SharingWizardSyncPage_5); //$NON-NLS-1$ GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END); showErrors.setLayoutData(data); showErrors.addSelectionListener(new SelectionAdapter() { @@ -151,7 +152,7 @@ public class SharingWizardSyncPage extends CVSWizardPage implements ISyncInfoSet /* private */ void showErrors() { ITeamStatus[] status = infos.getErrors(); - String title = Policy.bind("SharingWizardSyncPage.8"); //$NON-NLS-1$ + String title = CVSUIMessages.SharingWizardSyncPage_8; //$NON-NLS-1$ if (status.length == 1) { IStatus s = status[0]; if (s.getException() instanceof CoreException) { @@ -159,7 +160,7 @@ public class SharingWizardSyncPage extends CVSWizardPage implements ISyncInfoSet } ErrorDialog.openError(getShell(), title, null, s); } else { - MultiStatus multi = new MultiStatus(CVSUIPlugin.ID, 0, status, Policy.bind("SharingWizardSyncPage.9"), null); //$NON-NLS-1$ + MultiStatus multi = new MultiStatus(CVSUIPlugin.ID, 0, status, CVSUIMessages.SharingWizardSyncPage_9, null); //$NON-NLS-1$ ErrorDialog.openError(getShell(), title, null, multi); } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java index 78e873ba6..8859c968a 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java @@ -37,7 +37,7 @@ public class UpdateWizard extends ResizableWizard { super("UpdateWizard", CVSUIPlugin.getPlugin().getDialogSettings()); //$NON-NLS-1$ this.part = part; this.mappers = mappers; - setWindowTitle(Policy.bind("UpdateWizard.title")); //$NON-NLS-1$ + setWindowTitle(CVSUIMessages.UpdateWizard_title); //$NON-NLS-1$ } public static void run(IWorkbenchPart part, ResourceMapping[] mappers) { @@ -47,7 +47,7 @@ public class UpdateWizard extends ResizableWizard { public void addPages() { ImageDescriptor substImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_CHECKOUT); - tagSelectionPage = new TagSelectionWizardPage("tagPage", Policy.bind("UpdateWizard.0"), substImage, Policy.bind("UpdateWizard.1"), TagSource.create(mappers), TagSourceWorkbenchAdapter.INCLUDE_ALL_TAGS); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + tagSelectionPage = new TagSelectionWizardPage("tagPage", CVSUIMessages.UpdateWizard_0, substImage, CVSUIMessages.UpdateWizard_1, TagSource.create(mappers), TagSourceWorkbenchAdapter.INCLUDE_ALL_TAGS); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ tagSelectionPage.setAllowNoTag(true); tagSelectionPage.setHelpContxtId(IHelpContextIds.UPDATE_TAG_SELETION_PAGE); CVSTag tag = getInitialSelection(); |