NLS fixes
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 ba3116b..ed7b11c 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
@@ -123,14 +123,14 @@
*/
private String getLabel(ITypedElement element) {
if (element instanceof ResourceNode) {
- return Policy.bind("CVSCompareEditorInput.workspace", element.getName());
+ return Policy.bind("CVSCompareEditorInput.workspace", element.getName()); //$NON-NLS-1$
}
if (element instanceof ResourceEditionNode) {
ICVSRemoteResource edition = ((ResourceEditionNode)element).getRemoteResource();
ICVSResource resource = (ICVSResource)edition;
if (edition instanceof ICVSRemoteFile) {
try {
- return resource.getName() + " " + ((ICVSRemoteFile)edition).getRevision();
+ return Policy.bind("nameAndRevision", resource.getName(), ((ICVSRemoteFile)edition).getRevision()); //$NON-NLS-1$
} catch (TeamException e) {
// fall through
}
@@ -139,14 +139,14 @@
if (edition.isContainer()) {
CVSTag tag = ((ICVSRemoteFolder)edition).getTag();
if (tag == null) {
- return Policy.bind("CVSCompareEditorInput.inHead", edition.getName());
+ return Policy.bind("CVSCompareEditorInput.inHead", edition.getName()); //$NON-NLS-1$
} else if (tag.getType() == CVSTag.BRANCH) {
- return Policy.bind("CVSCompareEditorInput.inBranch", new Object[] {edition.getName(), tag.getName()});
+ return Policy.bind("CVSCompareEditorInput.inBranch", new Object[] {edition.getName(), tag.getName()}); //$NON-NLS-1$
} else {
- return Policy.bind("CVSCompareEditorInput.repository", new Object[] {edition.getName(), tag.getName()});
+ return Policy.bind("CVSCompareEditorInput.repository", new Object[] {edition.getName(), tag.getName()}); //$NON-NLS-1$
}
} else {
- return Policy.bind("CVSCompareEditorInput.repository", new Object[] {edition.getName(), resource.getSyncInfo().getRevision()});
+ return Policy.bind("CVSCompareEditorInput.repository", new Object[] {edition.getName(), resource.getSyncInfo().getRevision()}); //$NON-NLS-1$
}
} catch (TeamException e) {
handle(e);
@@ -161,7 +161,7 @@
*/
private String getVersionLabel(ITypedElement element) {
if (element instanceof ResourceNode) {
- return Policy.bind("CVSCompareEditorInput.workspaceLabel");
+ return Policy.bind("CVSCompareEditorInput.workspaceLabel"); //$NON-NLS-1$
}
if (element instanceof ResourceEditionNode) {
ICVSRemoteResource edition = ((ResourceEditionNode)element).getRemoteResource();
@@ -170,9 +170,9 @@
if (edition.isContainer()) {
CVSTag tag = ((ICVSRemoteFolder)resource).getTag();
if (tag == null) {
- return Policy.bind("CVSCompareEditorInput.headLabel");
+ return Policy.bind("CVSCompareEditorInput.headLabel"); //$NON-NLS-1$
} else if (tag.getType() == CVSTag.BRANCH) {
- return Policy.bind("CVSCompareEditorInput.branchLabel", tag.getName());
+ return Policy.bind("CVSCompareEditorInput.branchLabel", tag.getName()); //$NON-NLS-1$
} else {
return tag.getName();
}
@@ -201,7 +201,7 @@
if (ancestor != null) {
return ancestor.getName();
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
@@ -221,7 +221,7 @@
} else if (t instanceof TeamException) {
error = ((TeamException)t).getStatus();
} else {
- error = new Status(IStatus.ERROR, CVSUIPlugin.ID, 1, Policy.bind("internal"), t);
+ error = new Status(IStatus.ERROR, CVSUIPlugin.ID, 1, Policy.bind("internal"), t); //$NON-NLS-1$
}
setMessage(error.getMessage());
if (!(t instanceof TeamException)) {
@@ -238,7 +238,7 @@
String title;
if (ancestor != null) {
- title = Policy.bind("CVSCompareEditorInput.titleAncestor", new Object[] {guessResourceName(), getVersionLabel(ancestor), getVersionLabel(left), getVersionLabel(right)} );
+ title = Policy.bind("CVSCompareEditorInput.titleAncestor", new Object[] {guessResourceName(), getVersionLabel(ancestor), getVersionLabel(left), getVersionLabel(right)} ); //$NON-NLS-1$
} else {
String leftName = null;
if (left != null) leftName = left.getName();
@@ -246,9 +246,9 @@
if (right != null) rightName = right.getName();
boolean differentNames = false;
if (leftName != null && !leftName.equals(rightName)) {
- title = Policy.bind("CVSCompareEditorInput.titleNoAncestorDifferent", new Object[] {leftName, getVersionLabel(left), rightName, getVersionLabel(right)} );
+ title = Policy.bind("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)} );
+ title = Policy.bind("CVSCompareEditorInput.titleNoAncestor", new Object[] {guessResourceName(), getVersionLabel(left), getVersionLabel(right)} ); //$NON-NLS-1$
}
}
setTitle(title);
@@ -267,11 +267,11 @@
right = node.getRight();
ancestor = node.getAncestor();
if (left == null) {
- cc.setLeftLabel(Policy.bind("CVSCompareEditorInput.noWorkspaceFile"));
+ cc.setLeftLabel(Policy.bind("CVSCompareEditorInput.noWorkspaceFile")); //$NON-NLS-1$
cc.setLeftImage(right.getImage());
}
if (right == null) {
- cc.setRightLabel(Policy.bind("CVSCompareEditorInput.noRepositoryFile"));
+ cc.setRightLabel(Policy.bind("CVSCompareEditorInput.noRepositoryFile")); //$NON-NLS-1$
cc.setRightImage(left.getImage());
}
if (ancestor == null) ancestor = this.ancestor;
@@ -307,7 +307,7 @@
protected Object prepareInput(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
boolean threeWay = ancestor != null;
if (right == null || left == null) {
- setMessage(Policy.bind("CVSCompareEditorInput.different"));
+ setMessage(Policy.bind("CVSCompareEditorInput.different")); //$NON-NLS-1$
return null;
}
@@ -328,7 +328,7 @@
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()}));
+ progressMonitor.subTask(Policy.bind("CompareEditorInput.fileProgress", new String[] {element.getName()})); //$NON-NLS-1$
progressMonitor.worked(1);
}
}
@@ -350,12 +350,12 @@
};
try {
- monitor.beginTask(Policy.bind("CVSCompareEditorInput.comparing"), 30);
+ monitor.beginTask(Policy.bind("CVSCompareEditorInput.comparing"), 30); //$NON-NLS-1$
// do the diff
IProgressMonitor sub = new SubProgressMonitor(monitor, 30);
try {
- sub.beginTask(Policy.bind("CVSCompareEditorInput.comparing"), 100);
+ sub.beginTask(Policy.bind("CVSCompareEditorInput.comparing"), 100); //$NON-NLS-1$
return d.findDifferences(threeWay, sub, null, ancestor, left, right);
} finally {
sub.done();
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 114a95a..9601b28 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
@@ -90,7 +90,7 @@
try {
ICVSRemoteFile currentEdition = (ICVSRemoteFile) CVSWorkspaceRoot.getRemoteResourceFor(resource);
if (currentEdition != null && currentEdition.getRevision().equals(revisionName)) {
- return "*" + revisionName;
+ Policy.bind("currentRevision", revisionName); //$NON-NLS-1$
} else {
return revisionName;
}
@@ -157,19 +157,18 @@
return null;
}
public String getColumnText(Object element, int columnIndex) {
- if (!(element instanceof DiffNode)) return "";
+ if (!(element instanceof DiffNode)) return ""; //$NON-NLS-1$
ITypedElement right = ((DiffNode)element).getRight();
- if (!(right instanceof ResourceRevisionNode)) return "";
+ if (!(right instanceof ResourceRevisionNode)) return ""; //$NON-NLS-1$
ILogEntry entry = ((ResourceRevisionNode)right).getLogEntry();
switch (columnIndex) {
case COL_REVISION:
try {
- StringBuffer revisionName = new StringBuffer();
if (currentEdition != null && currentEdition.getRevision().equals(entry.getRevision())) {
- revisionName.append("*");
+ return Policy.bind("currentRevision", entry.getRevision()); //$NON-NLS-1$
+ } else {
+ return entry.getRevision();
}
- revisionName.append(entry.getRevision());
- return revisionName.toString();
} catch (TeamException e) {
handle(e);
}
@@ -180,23 +179,23 @@
for (int i = 0; i < tags.length; i++) {
result.append(tags[i].getName());
if (i < tags.length - 1) {
- result.append(", ");
+ result.append(", "); //$NON-NLS-1$
}
}
return result.toString();
case COL_DATE:
Date date = entry.getDate();
- if (date == null) return Policy.bind("notAvailable");
+ if (date == null) return Policy.bind("notAvailable"); //$NON-NLS-1$
return DateFormat.getInstance().format(date);
case COL_AUTHOR:
return entry.getAuthor();
case COL_COMMENT:
String comment = entry.getComment();
- int index = comment.indexOf("\n");
+ int index = comment.indexOf("\n"); //$NON-NLS-1$
if (index == -1) return comment;
- return comment.substring(0, index) + "[...]";
+ return Policy.bind("CVSCompareRevisionsInput.truncate", comment.substring(0, index)); //$NON-NLS-1$
}
- return "";
+ return ""; //$NON-NLS-1$
}
}
@@ -216,35 +215,35 @@
// revision
TableColumn col = new TableColumn(table, SWT.NONE);
col.setResizable(true);
- col.setText(Policy.bind("HistoryView.revision"));
+ col.setText(Policy.bind("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"));
+ col.setText(Policy.bind("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"));
+ col.setText(Policy.bind("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"));
+ col.setText(Policy.bind("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"));
+ col.setText(Policy.bind("HistoryView.comment")); //$NON-NLS-1$
col.addSelectionListener(headerListener);
layout.addColumnData(new ColumnWeightData(50, true));
}
@@ -255,7 +254,7 @@
table.setLinesVisible(true);
GridData data = new GridData(GridData.FILL_BOTH);
table.setLayoutData(data);
- table.setData(CompareUI.COMPARE_VIEWER_TITLE, Policy.bind("CVSCompareRevisionsInput.structureCompare"));
+ table.setData(CompareUI.COMPARE_VIEWER_TITLE, Policy.bind("CVSCompareRevisionsInput.structureCompare")); //$NON-NLS-1$
TableLayout layout = new TableLayout();
table.setLayout(layout);
@@ -331,17 +330,17 @@
// } else {
// setTitle(Policy.bind("CompareResourceEditorInput.compareResourceAndVersions", new Object[] {resourceName}));
// }
- setTitle(Policy.bind("CVSCompareRevisionsInput.compareResourceAndVersions", new Object[] {resourceName}));
+ setTitle(Policy.bind("CVSCompareRevisionsInput.compareResourceAndVersions", new Object[] {resourceName})); //$NON-NLS-1$
cc.setLeftEditable(true);
cc.setRightEditable(false);
- String leftLabel = Policy.bind("CVSCompareRevisionsInput.workspace", new Object[] {resourceName});
+ String leftLabel = Policy.bind("CVSCompareRevisionsInput.workspace", new Object[] {resourceName}); //$NON-NLS-1$
cc.setLeftLabel(leftLabel);
- String rightLabel = Policy.bind("CVSCompareRevisionsInput.repository", new Object[] {resourceName});
+ String rightLabel = Policy.bind("CVSCompareRevisionsInput.repository", new Object[] {resourceName}); //$NON-NLS-1$
cc.setRightLabel(rightLabel);
}
private void initializeActions() {
- loadAction = new Action(Policy.bind("CVSCompareRevisionsInput.addToWorkspace"), null) {
+ loadAction = new Action(Policy.bind("CVSCompareRevisionsInput.addToWorkspace"), null) { //$NON-NLS-1$
public void run() {
try {
new ProgressMonitorDialog(shell).run(false, true, new WorkspaceModifyOperation() {
@@ -413,7 +412,7 @@
} else if (t instanceof TeamException) {
error = ((TeamException)t).getStatus();
} else {
- error = new Status(IStatus.ERROR, CVSUIPlugin.ID, 1, Policy.bind("internal"), t);
+ error = new Status(IStatus.ERROR, CVSUIPlugin.ID, 1, Policy.bind("internal"), t); //$NON-NLS-1$
}
setMessage(error.getMessage());
ErrorDialog.openError(shell, null, null, error);
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 542c128..b86e540 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
@@ -42,11 +42,11 @@
ICVSFile cvsResource = CVSWorkspaceRoot.getCVSFileFor(file);
if (!cvsResource.isManaged()) {
if (cvsResource.isIgnored()) {
- createLabel(composite, Policy.bind("CVSFilePropertiesPage.ignored"));
+ createLabel(composite, Policy.bind("CVSFilePropertiesPage.ignored")); //$NON-NLS-1$
} else {
- createLabel(composite, Policy.bind("CVSFilePropertiesPage.notManaged"));
+ createLabel(composite, Policy.bind("CVSFilePropertiesPage.notManaged")); //$NON-NLS-1$
}
- createLabel(composite, "");
+ createLabel(composite, ""); //$NON-NLS-1$
return composite;
}
ResourceSyncInfo syncInfo = cvsResource.getSyncInfo();
@@ -54,60 +54,60 @@
if (syncInfo.isAdded()) {
- createLabel(composite, Policy.bind("CVSFilePropertiesPage.isAdded"), 2);
+ createLabel(composite, Policy.bind("CVSFilePropertiesPage.isAdded"), 2); //$NON-NLS-1$
} else {
// Base
- createLabel(composite, Policy.bind("CVSFilePropertiesPage.baseRevision"));
+ createLabel(composite, Policy.bind("CVSFilePropertiesPage.baseRevision")); //$NON-NLS-1$
createLabel(composite, syncInfo.getRevision());
Date baseTime = syncInfo.getTimeStamp();
if (baseTime != null) {
- createLabel(composite, Policy.bind("CVSFilePropertiesPage.baseTimestamp"));
+ createLabel(composite, Policy.bind("CVSFilePropertiesPage.baseTimestamp")); //$NON-NLS-1$
createLabel(composite, CVSDateFormatter.dateToEntryLine(syncInfo.getTimeStamp()));
}
// Modified
- createLabel(composite, Policy.bind("CVSFilePropertiesPage.modified"));
- createLabel(composite, cvsResource.isModified() ? Policy.bind("yes") : Policy.bind("no"));
+ createLabel(composite, Policy.bind("CVSFilePropertiesPage.modified")); //$NON-NLS-1$
+ createLabel(composite, cvsResource.isModified() ? Policy.bind("yes") : Policy.bind("no")); //$NON-NLS-1$ //$NON-NLS-2$
}
// Keyword Mode
- createLabel(composite, Policy.bind("CVSFilePropertiesPage.keywordMode"));
+ createLabel(composite, Policy.bind("CVSFilePropertiesPage.keywordMode")); //$NON-NLS-1$
createLabel(composite, syncInfo.getKeywordMode().getLongDisplayText());
// Tag
- createLabel(composite, Policy.bind("CVSFilePropertiesPage.tag"));
+ createLabel(composite, Policy.bind("CVSFilePropertiesPage.tag")); //$NON-NLS-1$
CVSTag tag = syncInfo.getTag();
if (tag == null) {
- createLabel(composite, Policy.bind("CVSFilePropertiesPage.none"));
+ createLabel(composite, Policy.bind("CVSFilePropertiesPage.none")); //$NON-NLS-1$
} else {
switch (tag.getType()) {
case CVSTag.HEAD:
createLabel(composite, tag.getName());
break;
case CVSTag.VERSION:
- createLabel(composite, Policy.bind("CVSFilePropertiesPage.version", tag.getName()));
+ createLabel(composite, Policy.bind("CVSFilePropertiesPage.version", tag.getName())); //$NON-NLS-1$
break;
case CVSTag.BRANCH:
- createLabel(composite, Policy.bind("CVSFilePropertiesPage.branch", tag.getName()));
+ createLabel(composite, Policy.bind("CVSFilePropertiesPage.branch", tag.getName())); //$NON-NLS-1$
break;
case CVSTag.DATE:
- createLabel(composite, Policy.bind("CVSFilePropertiesPage.date", tag.getName()));
+ createLabel(composite, Policy.bind("CVSFilePropertiesPage.date", tag.getName())); //$NON-NLS-1$
break;
}
}
// Permissions
- createLabel(composite, Policy.bind("CVSFilePropertiesPage.permissions"));
+ createLabel(composite, Policy.bind("CVSFilePropertiesPage.permissions")); //$NON-NLS-1$
String permissions = syncInfo.getPermissions();
if (permissions == null) {
- createLabel(composite, Policy.bind("CVSFilePropertiesPage.notAvailable"));
+ createLabel(composite, Policy.bind("CVSFilePropertiesPage.notAvailable")); //$NON-NLS-1$
} else {
createLabel(composite, syncInfo.getPermissions());
}
} catch (TeamException e) {
// Display error text
- createLabel(composite, Policy.bind("CVSFilePropertiesPage.error"));
- createLabel(composite, "");
+ createLabel(composite, Policy.bind("CVSFilePropertiesPage.error")); //$NON-NLS-1$
+ createLabel(composite, ""); //$NON-NLS-1$
}
return composite;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPerspective.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPerspective.java
index 857df3a..a68898e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPerspective.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPerspective.java
@@ -22,9 +22,9 @@
*/
public void defineActions(IPageLayout layout) {
// Add "new wizards".
- layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.project");
- layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder");
- layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.file");
+ layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.project"); //$NON-NLS-1$
+ layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder"); //$NON-NLS-1$
+ layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.file"); //$NON-NLS-1$
// Add "show views".
layout.addShowViewShortcut(IPageLayout.ID_RES_NAV);
@@ -40,7 +40,7 @@
public void defineLayout(IPageLayout layout) {
String editorArea = layout.getEditorArea();
- IFolderLayout top = layout.createFolder("top", IPageLayout.TOP, 0.60f, editorArea);
+ IFolderLayout top = layout.createFolder("top", IPageLayout.TOP, 0.60f, editorArea); //$NON-NLS-1$
top.addView(RepositoriesView.VIEW_ID);
layout.addView(HistoryView.VIEW_ID, IPageLayout.BOTTOM, 1.0f, editorArea);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ChangeListener.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ChangeListener.java
index c2988a0..8faa3ce 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ChangeListener.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ChangeListener.java
@@ -41,11 +41,11 @@
}
static String getTitle() {
- return "Deleting CVS folders";
+ return Policy.bind("ChangeListener.Deleting_CVS_folders_1"); //$NON-NLS-1$
}
static String getMessage() {
- return "Folders cannot be deleted from a CVS server from the client. To delete the folder...";
+ return Policy.bind("ChangeListener.Folders_cannot_be_deleted_from_a_CVS_server_from_the_client._To_delete_the_folder_2"); //$NON-NLS-1$
}
protected Control createCustomArea(Composite parent) {
@@ -54,7 +54,7 @@
doNotShowOption = new Button(composite, SWT.CHECK);
doNotShowOption.addSelectionListener(selectionListener);
- doNotShowOption.setText("Do not ask me about this again");
+ doNotShowOption.setText(Policy.bind("ChangeListener.Do_not_ask_me_about_this_again_3")); //$NON-NLS-1$
// set initial state
doNotShowOption.setSelection(false);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilter.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilter.java
index 91d6e54..9966bb4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilter.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilter.java
@@ -53,10 +53,10 @@
&& (toDate.after(entry.getDate()));
}
protected boolean hasAuthor() {
- return !author.equals("");
+ return !author.equals(""); //$NON-NLS-1$
}
protected boolean hasComment() {
- return !comment.equals("");
+ return !comment.equals(""); //$NON-NLS-1$
}
protected boolean hasDate() {
return fromDate != null && toDate != null;
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 3c314c4..4c1ced1 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
@@ -43,7 +43,7 @@
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
- newShell.setText(Policy.bind("HistoryFilterDialog.title"));
+ newShell.setText(Policy.bind("HistoryFilterDialog.title")); //$NON-NLS-1$
}
protected Control createDialogArea(Composite parent) {
@@ -57,36 +57,36 @@
GridData data = new GridData(GridData.FILL_HORIZONTAL);
data.horizontalSpan = 2;
label.setLayoutData(data);
- label.setText(Policy.bind("HistoryFilterDialog.showMatching"));
+ label.setText(Policy.bind("HistoryFilterDialog.showMatching")); //$NON-NLS-1$
andRadio = new Button(topLevel, SWT.RADIO);
- andRadio.setText(Policy.bind("HistoryFilterDialog.matchingAll"));
+ andRadio.setText(Policy.bind("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"));
+ orRadio.setText(Policy.bind("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"));
+ label.setText(Policy.bind("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"));
+ label.setText(Policy.bind("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"));
+ label.setText(Policy.bind("HistoryFilterDialog.fromDate")); //$NON-NLS-1$
Composite fdComposite = new Composite(topLevel, SWT.NONE);
GridLayout fdLayout = new GridLayout();
fdLayout.numColumns = 3;
@@ -98,7 +98,7 @@
//"to" date
label = new Label(topLevel, SWT.NONE);
- label.setText(Policy.bind("HistoryFilterDialog.toDate"));
+ label.setText(Policy.bind("HistoryFilterDialog.toDate")); //$NON-NLS-1$
Composite tdComposite = new Composite(topLevel, SWT.NONE);
GridLayout tdLayout = new GridLayout();
tdLayout.numColumns = 3;
@@ -117,7 +117,7 @@
}
String months[] = new String[12];
- SimpleDateFormat format = new SimpleDateFormat("MMMM");
+ SimpleDateFormat format = new SimpleDateFormat("MMMM"); //$NON-NLS-1$
Calendar calendar = Calendar.getInstance();
for (int i = 0; i < 12; i++) {
calendar.set(Calendar.MONTH, i);
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 c357303..9fbe349 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
@@ -135,7 +135,7 @@
String revision = entry.getRevision();
if (file == null) return revision;
if (currentRevision != null && currentRevision.equals(revision)) {
- return "*" + revision;
+ Policy.bind("currentRevision", revision); //$NON-NLS-1$
}
return revision;
case COL_TAGS:
@@ -144,40 +144,40 @@
for (int i = 0; i < tags.length; i++) {
result.append(tags[i].getName());
if (i < tags.length - 1) {
- result.append(", ");
+ result.append(", "); //$NON-NLS-1$
}
}
return result.toString();
case COL_DATE:
Date date = entry.getDate();
- if (date == null) return Policy.bind("notAvailable");
+ if (date == null) return Policy.bind("notAvailable"); //$NON-NLS-1$
return DateFormat.getInstance().format(date);
case COL_AUTHOR:
return entry.getAuthor();
case COL_COMMENT:
String comment = entry.getComment();
- int index = comment.indexOf("\n");
+ int index = comment.indexOf("\n"); //$NON-NLS-1$
switch (index) {
case -1:
return comment;
case 0:
- return "[...]";
+ return Policy.bind("HistoryView.[...]_4"); //$NON-NLS-1$
default:
- return comment.substring(0, index) + "[...]";
+ return Policy.bind("CVSCompareRevisionsInput.truncate", comment.substring(0, index)); //$NON-NLS-1$
}
}
- return "";
+ return ""; //$NON-NLS-1$
}
}
- public static final String VIEW_ID = "org.eclipse.team.ccvs.ui.HistoryView";
+ public static final String VIEW_ID = "org.eclipse.team.ccvs.ui.HistoryView"; //$NON-NLS-1$
/**
* Adds the action contributions for this view.
*/
protected void contributeActions() {
// Refresh (toolbar)
- final Action refreshAction = new Action(Policy.bind("HistoryView.refresh"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_REFRESH)) {
+ final Action refreshAction = new Action(Policy.bind("HistoryView.refresh"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_REFRESH)) { //$NON-NLS-1$
public void run() {
BusyIndicator.showWhile(tableViewer.getTable().getDisplay(), new Runnable() {
public void run() {
@@ -186,7 +186,7 @@
});
}
};
- refreshAction.setToolTipText(Policy.bind("HistoryView.refresh"));
+ refreshAction.setToolTipText(Policy.bind("HistoryView.refresh")); //$NON-NLS-1$
// Double click open action
openAction = new OpenLogEntryAction();
@@ -197,7 +197,7 @@
}
});
- getContentsAction = getContextMenuAction(Policy.bind("HistoryView.getContentsAction"), new IWorkspaceRunnable() {
+ getContentsAction = getContextMenuAction(Policy.bind("HistoryView.getContentsAction"), new IWorkspaceRunnable() { //$NON-NLS-1$
public void run(IProgressMonitor monitor) throws CoreException {
ICVSRemoteFile remoteFile = currentSelection.getRemoteFile();
monitor.beginTask(null, 100);
@@ -238,7 +238,7 @@
// Toggle text visible action
final IPreferenceStore store = CVSUIPlugin.getPlugin().getPreferenceStore();
- toggleTextAction = new Action(Policy.bind("HistoryView.showComment")) {
+ toggleTextAction = new Action(Policy.bind("HistoryView.showComment")) { //$NON-NLS-1$
public void run() {
setViewerVisibility();
store.setValue(ICVSUIConstants.PREF_SHOW_COMMENTS, toggleTextAction.isChecked());
@@ -246,7 +246,7 @@
};
toggleTextAction.setChecked(store.getBoolean(ICVSUIConstants.PREF_SHOW_COMMENTS));
// Toggle list visible action
- toggleListAction = new Action(Policy.bind("HistoryView.showTags")) {
+ toggleListAction = new Action(Policy.bind("HistoryView.showTags")) { //$NON-NLS-1$
public void run() {
setViewerVisibility();
store.setValue(ICVSUIConstants.PREF_SHOW_TAGS, toggleListAction.isChecked());
@@ -279,11 +279,11 @@
// Create actions for the text editor
copyAction = new TextViewerAction(textViewer, ITextOperationTarget.COPY);
- copyAction.setText(Policy.bind("HistoryView.copy"));
+ copyAction.setText(Policy.bind("HistoryView.copy")); //$NON-NLS-1$
actionBars.setGlobalActionHandler(ITextEditorActionConstants.COPY, copyAction);
selectAllAction = new TextViewerAction(textViewer, ITextOperationTarget.SELECT_ALL);
- selectAllAction.setText(Policy.bind("HistoryView.selectAll"));
+ selectAllAction.setText(Policy.bind("HistoryView.selectAll")); //$NON-NLS-1$
actionBars.setGlobalActionHandler(ITextEditorActionConstants.SELECT_ALL, selectAllAction);
actionBars.updateActionBars();
@@ -323,35 +323,35 @@
// revision
TableColumn col = new TableColumn(table, SWT.NONE);
col.setResizable(true);
- col.setText(Policy.bind("HistoryView.revision"));
+ col.setText(Policy.bind("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"));
+ col.setText(Policy.bind("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"));
+ col.setText(Policy.bind("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"));
+ col.setText(Policy.bind("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"));
+ col.setText(Policy.bind("HistoryView.comment")); //$NON-NLS-1$
col.addSelectionListener(headerListener);
layout.addColumnData(new ColumnWeightData(50, true));
}
@@ -437,13 +437,13 @@
public void selectionChanged(SelectionChangedEvent event) {
ISelection selection = event.getSelection();
if (selection == null || !(selection instanceof IStructuredSelection)) {
- textViewer.setDocument(new Document(""));
+ textViewer.setDocument(new Document("")); //$NON-NLS-1$
tagViewer.setInput(null);
return;
}
IStructuredSelection ss = (IStructuredSelection)selection;
if (ss.size() != 1) {
- textViewer.setDocument(new Document(""));
+ textViewer.setDocument(new Document("")); //$NON-NLS-1$
tagViewer.setInput(null);
return;
}
@@ -589,8 +589,8 @@
}
}
}
- manager.add(new Separator("additions"));
- manager.add(new Separator("additions-end"));
+ manager.add(new Separator("additions")); //$NON-NLS-1$
+ manager.add(new Separator("additions-end")); //$NON-NLS-1$
}
private void fillTextMenu(IMenuManager manager) {
manager.add(copyAction);
@@ -653,7 +653,7 @@
ICVSRemoteFile remoteFile = (ICVSRemoteFile)CVSWorkspaceRoot.getRemoteResourceFor(file);
currentRevision = remoteFile.getRevision();
tableViewer.setInput(remoteFile);
- setTitle(Policy.bind("HistoryView.titleWithArgument", remoteFile.getName()));
+ setTitle(Policy.bind("HistoryView.titleWithArgument", remoteFile.getName())); //$NON-NLS-1$
} catch (TeamException e) {
ErrorDialog.openError(getViewSite().getShell(), null, null, e.getStatus());
}
@@ -662,7 +662,7 @@
}
this.file = null;
tableViewer.setInput(null);
- setTitle(Policy.bind("HistoryView.title"));
+ setTitle(Policy.bind("HistoryView.title")); //$NON-NLS-1$
}
/**
@@ -671,12 +671,12 @@
public void showHistory(ICVSRemoteFile file) {
if (file == null) {
tableViewer.setInput(null);
- setTitle(Policy.bind("HistoryView.title"));
+ setTitle(Policy.bind("HistoryView.title")); //$NON-NLS-1$
return;
}
this.file = null;
tableViewer.setInput(file);
- setTitle(Policy.bind("HistoryView.titleWithArgument", file.getName()));
+ setTitle(Policy.bind("HistoryView.titleWithArgument", file.getName())); //$NON-NLS-1$
}
private Action getContextMenuAction(String title, final IWorkspaceRunnable action) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
index 93a1019..2a30146 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
@@ -52,7 +52,7 @@
public final String PREF_PROMPT_ON_FOLDER_DELETE = "pref_prompt_on_folder_delete"; //$NON-NLS-1$
public final String PREF_SHOW_MARKERS = "pref_show_markers"; //$NON-NLS-1$
public final String PREF_REPLACE_UNMANAGED = "pref_replace_unmanaged"; //$NON-NLS-1$
- public final String PREF_COMPRESSION_LEVEL = "pref_compression_level";
+ public final String PREF_COMPRESSION_LEVEL = "pref_compression_level"; //$NON-NLS-1$
// console preferences
public final String PREF_CONSOLE_COMMAND_COLOR = "pref_console_command_color"; //$NON-NLS-1$
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 206c393..9ddcc25 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
@@ -51,7 +51,7 @@
} catch (MissingResourceException e) {
return key;
} catch (NullPointerException e) {
- return "!" + key + "!";
+ return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -65,7 +65,7 @@
} catch (MissingResourceException e) {
return key;
} catch (NullPointerException e) {
- return "!" + key + "!";
+ return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
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 7b971e9..1c2aaa2 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
@@ -24,7 +24,7 @@
private static final int WIDTH_HINT = 350;
private static final int HEIGHT_HINT = 50;
- private String comment = "";
+ private String comment = ""; //$NON-NLS-1$
private Text text;
@@ -40,14 +40,14 @@
* @see Dialog#createDialogArea(Composite)
*/
protected Control createDialogArea(Composite parent) {
- getShell().setText(Policy.bind("ReleaseCommentDialog.title"));
+ getShell().setText(Policy.bind("ReleaseCommentDialog.title")); //$NON-NLS-1$
Composite composite = new Composite(parent, SWT.NULL);
composite.setLayout(new GridLayout());
composite.setLayoutData(new GridData(GridData.FILL_BOTH));
Label label = new Label(composite, SWT.NULL);
label.setLayoutData(new GridData());
- label.setText(Policy.bind("ReleaseCommentDialog.enterComment"));
+ label.setText(Policy.bind("ReleaseCommentDialog.enterComment")); //$NON-NLS-1$
text = new Text(composite, SWT.BORDER | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
GridData data = new GridData(GridData.FILL_BOTH);
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 38a6d7d..b1dcb21 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
@@ -140,7 +140,7 @@
public String getName() {
String name = file.getName();
try {
- return name + " " + file.getRevision();
+ return Policy.bind("nameAndRevision", 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/RepositoriesView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RepositoriesView.java
index d7b3be8..ec458c4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RepositoriesView.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RepositoriesView.java
@@ -45,7 +45,7 @@
* the performing of CVS-specific operations on the repository contents.
*/
public class RepositoriesView extends ViewPart {
- public static final String VIEW_ID = "org.eclipse.team.ccvs.ui.RepositoriesView";
+ public static final String VIEW_ID = "org.eclipse.team.ccvs.ui.RepositoriesView"; //$NON-NLS-1$
// The tree viewer
private TreeViewer viewer;
@@ -103,15 +103,15 @@
// Create actions
// Refresh (toolbar)
- refreshAction = new Action(Policy.bind("RepositoriesView.refresh"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_REFRESH)) {
+ refreshAction = new Action(Policy.bind("RepositoriesView.refresh"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_REFRESH)) { //$NON-NLS-1$
public void run() {
viewer.refresh();
}
};
- refreshAction.setToolTipText(Policy.bind("RepositoriesView.refresh"));
+ refreshAction.setToolTipText(Policy.bind("RepositoriesView.refresh")); //$NON-NLS-1$
// New Repository (popup)
- final Action newAction = new Action(Policy.bind("RepositoriesView.new"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_NEWLOCATION)) {
+ final Action newAction = new Action(Policy.bind("RepositoriesView.new"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_NEWLOCATION)) { //$NON-NLS-1$
public void run() {
NewLocationWizard wizard = new NewLocationWizard();
WizardDialog dialog = new WizardDialog(viewer.getTree().getShell(), wizard);
@@ -129,7 +129,7 @@
manager.add(new Separator(IWorkbenchActionConstants.GROUP_FILE));
// New actions go next
- MenuManager sub = new MenuManager(Policy.bind("RepositoriesView.newSubmenu"), IWorkbenchActionConstants.GROUP_ADD);
+ MenuManager sub = new MenuManager(Policy.bind("RepositoriesView.newSubmenu"), IWorkbenchActionConstants.GROUP_ADD); //$NON-NLS-1$
sub.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
manager.add(sub);
@@ -161,14 +161,14 @@
// Add module toggling to the local pull-down menu
IMenuManager mgr = bars.getMenuManager();
- showFoldersAction = new Action("Show Folders") {
+ showFoldersAction = new Action(Policy.bind("RepositoriesView.Show_Folders_6")) { //$NON-NLS-1$
public void run() {
CVSUIPlugin.getPlugin().getPreferenceStore().setValue(ICVSUIConstants.PREF_SHOW_MODULES, false);
showModulesAction.setChecked(false);
viewer.refresh();
}
};
- showModulesAction = new Action("Show Modules") {
+ showModulesAction = new Action(Policy.bind("RepositoriesView.Show_Modules_7")) { //$NON-NLS-1$
public void run() {
CVSUIPlugin.getPlugin().getPreferenceStore().setValue(ICVSUIConstants.PREF_SHOW_MODULES, true);
showFoldersAction.setChecked(false);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RepositoryManager.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RepositoryManager.java
index 3b7b6ec..02436e6 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RepositoryManager.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RepositoryManager.java
@@ -55,7 +55,7 @@
* It also provides a number of useful methods for assisting in repository operations.
*/
public class RepositoryManager {
- private static final String STATE_FILE = ".repositoryManagerState";
+ private static final String STATE_FILE = ".repositoryManagerState"; //$NON-NLS-1$
private static final int STATE_FILE_VERSION_1 = -1;
// Map ICVSRepositoryLocation -> List of CVSTag
@@ -68,7 +68,7 @@
List listeners = new ArrayList();
// The previously remembered comment
- private static String previousComment = "";
+ private static String previousComment = ""; //$NON-NLS-1$
public static boolean notifyRepoView = true;
@@ -124,8 +124,8 @@
ICVSRepositoryLocation location = CVSProvider.getInstance().getRepository(project.getFolderSyncInfo().getRoot());
List tags = new ArrayList();
List filesToRefresh = new ArrayList(Arrays.asList(getAutoRefreshFiles(project)));
- filesToRefresh.add(".project");
- filesToRefresh.add(".vcm_meta");
+ filesToRefresh.add(".project"); //$NON-NLS-1$
+ filesToRefresh.add(".vcm_meta"); //$NON-NLS-1$
for (Iterator it = filesToRefresh.iterator(); it.hasNext();) {
String relativePath = (String)it.next();
ICVSFile file = null;
@@ -373,7 +373,7 @@
dis.close();
}
} catch (IOException e) {
- CVSUIPlugin.log(new Status(Status.ERROR, CVSUIPlugin.ID, TeamException.UNABLE, Policy.bind("RepositoryManager.ioException"), e));
+ CVSUIPlugin.log(new Status(Status.ERROR, CVSUIPlugin.ID, TeamException.UNABLE, Policy.bind("RepositoryManager.ioException"), e)); //$NON-NLS-1$
} catch (TeamException e) {
CVSUIPlugin.log(e.getStatus());
}
@@ -382,7 +382,7 @@
private void saveState() throws TeamException {
IPath pluginStateLocation = CVSUIPlugin.getPlugin().getStateLocation();
- File tempFile = pluginStateLocation.append(STATE_FILE + ".tmp").toFile();
+ File tempFile = pluginStateLocation.append(STATE_FILE + ".tmp").toFile(); //$NON-NLS-1$
File stateFile = pluginStateLocation.append(STATE_FILE).toFile();
try {
DataOutputStream dos = new DataOutputStream(new FileOutputStream(tempFile));
@@ -396,10 +396,10 @@
}
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));
+ throw new TeamException(new Status(Status.ERROR, CVSUIPlugin.ID, TeamException.UNABLE, Policy.bind("RepositoryManager.rename", 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));
+ throw new TeamException(new Status(Status.ERROR, CVSUIPlugin.ID, TeamException.UNABLE, Policy.bind("RepositoryManager.save",stateFile.getAbsolutePath()), e)); //$NON-NLS-1$
}
}
private void writeState(DataOutputStream dos) throws IOException {
@@ -541,8 +541,8 @@
public void add(IResource[] resources, IProgressMonitor monitor) throws TeamException {
Hashtable table = getProviderMapping(resources);
Set keySet = table.keySet();
- monitor.beginTask("", keySet.size() * 1000);
- monitor.setTaskName(Policy.bind("RepositoryManager.adding"));
+ monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$
+ monitor.setTaskName(Policy.bind("RepositoryManager.adding")); //$NON-NLS-1$
Iterator iterator = keySet.iterator();
while (iterator.hasNext()) {
IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000);
@@ -561,8 +561,8 @@
public void delete(IResource[] resources, IProgressMonitor monitor) throws TeamException {
Hashtable table = getProviderMapping(resources);
Set keySet = table.keySet();
- monitor.beginTask("", keySet.size() * 1000);
- monitor.setTaskName(Policy.bind("RepositoryManager.deleting"));
+ monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$
+ monitor.setTaskName(Policy.bind("RepositoryManager.deleting")); //$NON-NLS-1$
Iterator iterator = keySet.iterator();
while (iterator.hasNext()) {
IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000);
@@ -577,8 +577,8 @@
public void update(IResource[] resources, Command.LocalOption[] options, boolean createBackups, IProgressMonitor monitor) throws TeamException {
Hashtable table = getProviderMapping(resources);
Set keySet = table.keySet();
- monitor.beginTask("", keySet.size() * 1000);
- monitor.setTaskName(Policy.bind("RepositoryManager.updating"));
+ monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$
+ monitor.setTaskName(Policy.bind("RepositoryManager.updating")); //$NON-NLS-1$
Iterator iterator = keySet.iterator();
while (iterator.hasNext()) {
IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000);
@@ -633,8 +633,8 @@
public void commit(IResource[] resources, String comment, IProgressMonitor monitor) throws TeamException {
Hashtable table = getProviderMapping(resources);
Set keySet = table.keySet();
- monitor.beginTask("", keySet.size() * 1000);
- monitor.setTaskName(Policy.bind("RepositoryManager.committing"));
+ monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$
+ monitor.setTaskName(Policy.bind("RepositoryManager.committing")); //$NON-NLS-1$
Iterator iterator = keySet.iterator();
while (iterator.hasNext()) {
IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourceEditionNode.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourceEditionNode.java
index f36bce5..de6c384 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourceEditionNode.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourceEditionNode.java
@@ -128,7 +128,7 @@
* Returns the name of this node.
*/
public String getName() {
- return resource == null ? "" : resource.getName();
+ return resource == null ? "" : resource.getName(); //$NON-NLS-1$
}
public ICVSRemoteResource getRemoteResource() {
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 513fd44..cdfff20 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
@@ -44,7 +44,7 @@
if (resource != null) {
ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource);
if (!cvsResource.isManaged()) {
- createPair(composite, Policy.bind("ResourcePropertiesPage.status"), Policy.bind("ResourcePropertiesPage.notManaged"));
+ createPair(composite, Policy.bind("ResourcePropertiesPage.status"), Policy.bind("ResourcePropertiesPage.notManaged")); //$NON-NLS-1$ //$NON-NLS-2$
} else {
boolean hasRemote = false;
if(cvsResource.isFolder()) {
@@ -55,11 +55,11 @@
hasRemote = true;
}
}
- createPair(composite, Policy.bind("ResourcePropertiesPage.status"), hasRemote ? Policy.bind("ResourcePropertiesPage.versioned") : Policy.bind("ResourcePropertiesPage.notVersioned"));
+ createPair(composite, Policy.bind("ResourcePropertiesPage.status"), hasRemote ? Policy.bind("ResourcePropertiesPage.versioned") : Policy.bind("ResourcePropertiesPage.notVersioned")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
} catch (TeamException e) {
- createPair(composite, Policy.bind("ResourcePropertiesPage.error"), e.getMessage());
+ createPair(composite, Policy.bind("ResourcePropertiesPage.error"), e.getMessage()); //$NON-NLS-1$
}
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 d4e76ae..9802dfe 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
@@ -53,7 +53,7 @@
*/
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
- newShell.setText(Policy.bind("UserValidationDialog.required"));
+ newShell.setText(Policy.bind("UserValidationDialog.required")); //$NON-NLS-1$
// set F1 help
//WorkbenchHelp.setHelp(newShell, new Object[] {ICVSHelpContextIds.USER_VALIDATION_DIALOG});
}
@@ -95,9 +95,9 @@
Label label = new Label(main, SWT.WRAP);
if (isUsernameMutable) {
- label.setText(Policy.bind("UserValidationDialog.labelUser", domain));
+ label.setText(Policy.bind("UserValidationDialog.labelUser", domain)); //$NON-NLS-1$
} else {
- label.setText(Policy.bind("UserValidationDialog.labelPassword", new Object[] {defaultUsername, domain}));
+ label.setText(Policy.bind("UserValidationDialog.labelPassword", new Object[] {defaultUsername, domain})); //$NON-NLS-1$
}
GridData data = new GridData(GridData.FILL_HORIZONTAL);
data.horizontalSpan = 3;
@@ -114,7 +114,7 @@
* @param parent the parent of the widgets
*/
protected void createPasswordFields(Composite parent) {
- new Label(parent, SWT.NONE).setText(Policy.bind("UserValidationDialog.password"));
+ new Label(parent, SWT.NONE).setText(Policy.bind("UserValidationDialog.password")); //$NON-NLS-1$
passwordField = new Text(parent, SWT.BORDER);
GridData data = new GridData(GridData.FILL_HORIZONTAL);
@@ -131,7 +131,7 @@
* @param parent the parent of the widgets
*/
protected void createUsernameFields(Composite parent) {
- new Label(parent, SWT.NONE).setText(Policy.bind("UserValidationDialog.user"));
+ new Label(parent, SWT.NONE).setText(Policy.bind("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/actions/AddAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java
index 622fdef..a3a6c42 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
@@ -40,8 +40,8 @@
try {
Hashtable table = getProviderMapping();
Set keySet = table.keySet();
- monitor.beginTask("", keySet.size() * 1000);
- monitor.setTaskName(Policy.bind("AddAction.adding"));
+ monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$
+ monitor.setTaskName(Policy.bind("AddAction.adding")); //$NON-NLS-1$
Iterator iterator = keySet.iterator();
while (iterator.hasNext()) {
IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000);
@@ -56,7 +56,7 @@
monitor.done();
}
}
- }, Policy.bind("AddAction.add"), this.PROGRESS_DIALOG);
+ }, Policy.bind("AddAction.add"), this.PROGRESS_DIALOG); //$NON-NLS-1$
}
/*
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddToWorkspaceAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddToWorkspaceAction.java
index 1c47a1c..7489bef 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddToWorkspaceAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddToWorkspaceAction.java
@@ -122,7 +122,7 @@
throw new InvocationTargetException(e);
}
}
- }, Policy.bind("AddToWorkspaceAction.checkoutFailed"), this.PROGRESS_DIALOG);
+ }, Policy.bind("AddToWorkspaceAction.checkoutFailed"), this.PROGRESS_DIALOG); //$NON-NLS-1$
}
private static String getTaskName(ICVSRemoteFolder[] remoteFolders) {
@@ -139,7 +139,7 @@
if (yesToAll) return 2;
if ( ! project.exists()) return 0;
final MessageDialog dialog =
- new MessageDialog(shell, Policy.bind("AddToWorkspaceAction.confirmOverwrite"), null, Policy.bind("AddToWorkspaceAction.thisResourceExists", project.getName()), MessageDialog.QUESTION,
+ new MessageDialog(shell, Policy.bind("AddToWorkspaceAction.confirmOverwrite"), null, Policy.bind("AddToWorkspaceAction.thisResourceExists", project.getName()), MessageDialog.QUESTION, //$NON-NLS-1$ //$NON-NLS-2$
new String[] {
IDialogConstants.YES_LABEL,
IDialogConstants.NO_LABEL,
@@ -159,7 +159,7 @@
if (yesToAll) return 2;
if ( ! location.exists()) return 0;
final MessageDialog dialog =
- new MessageDialog(shell, Policy.bind("AddToWorkspaceAction.confirmOverwrite"), null, Policy.bind("AddToWorkspaceAction.thisExternalFileExists", location.getName()), MessageDialog.QUESTION,
+ new MessageDialog(shell, Policy.bind("AddToWorkspaceAction.confirmOverwrite"), null, Policy.bind("AddToWorkspaceAction.thisExternalFileExists", location.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/actions/CheckoutAsAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAsAction.java
index f614d82..eeb61a2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAsAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAsAction.java
@@ -81,7 +81,7 @@
String name = folders[0].getName();
// Prompt for name
final int[] result = new int[] { InputDialog.OK };
- final InputDialog dialog = new InputDialog(shell, Policy.bind("CheckoutAsAction.enterProjectTitle"), Policy.bind("CheckoutAsAction.enterProject"), name,
+ final InputDialog dialog = new InputDialog(shell, Policy.bind("CheckoutAsAction.enterProjectTitle"), Policy.bind("CheckoutAsAction.enterProject"), name, //$NON-NLS-1$ //$NON-NLS-2$
new IInputValidator() {
public String isValid(String newText) {
IStatus status = ResourcesPlugin.getWorkspace().validateName(newText, IResource.PROJECT);
@@ -107,19 +107,19 @@
final boolean[] confirm = new boolean[] { false };
shell.getDisplay().syncExec(new Runnable() {
public void run() {
- confirm[0] = MessageDialog.openConfirm(shell, Policy.bind("confirmOverwriteTitle"), Policy.bind("confirmOverwrite"));
+ confirm[0] = MessageDialog.openConfirm(shell, Policy.bind("confirmOverwriteTitle"), Policy.bind("confirmOverwrite")); //$NON-NLS-1$ //$NON-NLS-2$
}
});
if (!confirm[0]) return;
}
monitor.beginTask(null, 100);
- monitor.setTaskName(Policy.bind("CheckoutAsAction.taskname", name, project.getName()));
+ monitor.setTaskName(Policy.bind("CheckoutAsAction.taskname", name, project.getName())); //$NON-NLS-1$
CVSProviderPlugin.getProvider().checkout(folders, new IProject[] { project }, Policy.subMonitorFor(monitor, 100));
} catch (TeamException e) {
throw new InvocationTargetException(e);
}
}
- }, Policy.bind("CheckoutAsAction.checkoutFailed"), this.PROGRESS_DIALOG);
+ }, Policy.bind("CheckoutAsAction.checkoutFailed"), this.PROGRESS_DIALOG); //$NON-NLS-1$
}
/*
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 b7242ba..362c3df 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
@@ -42,7 +42,7 @@
throw new InvocationTargetException(e);
}
}
- }, Policy.bind("CommitAction.commitFailed"), PROGRESS_DIALOG);
+ }, Policy.bind("CommitAction.commitFailed"), PROGRESS_DIALOG); //$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 a7e85e0..55631f8 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
@@ -31,7 +31,7 @@
public void run(IAction action) {
ICVSRemoteResource[] editions = getSelectedRemoteResources();
if (editions == null || editions.length != 2) {
- MessageDialog.openError(getShell(), Policy.bind("CompareRemoteResourcesAction.unableToCompare"), Policy.bind("CompareRemoteResourcesAction.selectTwoResources"));
+ MessageDialog.openError(getShell(), Policy.bind("CompareRemoteResourcesAction.unableToCompare"), Policy.bind("CompareRemoteResourcesAction.selectTwoResources")); //$NON-NLS-1$ //$NON-NLS-2$
return;
}
ResourceEditionNode left = new ResourceEditionNode(editions[0]);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithBaseAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithBaseAction.java
index 35ee0e5..404f6b5 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithBaseAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithBaseAction.java
@@ -49,7 +49,7 @@
resource[0] = resources[0];
ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource[0]);
- monitor.beginTask(Policy.bind("CompareWithRemoteAction.fetching"), 100);
+ monitor.beginTask(Policy.bind("CompareWithRemoteAction.fetching"), 100); //$NON-NLS-1$
remoteResource[0] = CVSWorkspaceRoot.getRemoteTree(resource[0], CVSTag.BASE, Policy.subMonitorFor(monitor, 100));
monitor.done();
@@ -57,11 +57,11 @@
throw new InvocationTargetException(e);
}
}
- }, Policy.bind("CompareWithRemoteAction.compare"), PROGRESS_DIALOG);
+ }, Policy.bind("CompareWithRemoteAction.compare"), PROGRESS_DIALOG); //$NON-NLS-1$
// Just to be safe...
if (remoteResource[0] == null) {
- MessageDialog.openInformation(getShell(), Policy.bind("CompareWithRemoteAction.noRemote"), Policy.bind("CompareWithRemoteAction.noRemoteLong"));
+ MessageDialog.openInformation(getShell(), Policy.bind("CompareWithRemoteAction.noRemote"), Policy.bind("CompareWithRemoteAction.noRemoteLong")); //$NON-NLS-1$ //$NON-NLS-2$
return;
}
@@ -70,7 +70,7 @@
public void run(IProgressMonitor monitor) throws InvocationTargetException {
CompareUI.openCompareEditor(new CVSCompareEditorInput(new CVSResourceNode(resource[0]), new ResourceEditionNode(remoteResource[0])));
}
- }, Policy.bind("CompareWithRemoteAction.compare"), PROGRESS_BUSYCURSOR);
+ }, Policy.bind("CompareWithRemoteAction.compare"), PROGRESS_BUSYCURSOR); //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRemoteAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRemoteAction.java
index b631492..7429b76 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRemoteAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRemoteAction.java
@@ -72,7 +72,7 @@
}
}
- monitor.beginTask(Policy.bind("CompareWithRemoteAction.fetching"), 100);
+ monitor.beginTask(Policy.bind("CompareWithRemoteAction.fetching"), 100); //$NON-NLS-1$
remoteResource[0] = CVSWorkspaceRoot.getRemoteTree(resource[0], tag[0], Policy.subMonitorFor(monitor, 100));
monitor.done();
@@ -80,11 +80,11 @@
throw new InvocationTargetException(e);
}
}
- }, Policy.bind("CompareWithRemoteAction.compare"), PROGRESS_DIALOG);
+ }, Policy.bind("CompareWithRemoteAction.compare"), PROGRESS_DIALOG); //$NON-NLS-1$
// Just to be safe...
if (remoteResource[0] == null) {
- MessageDialog.openInformation(getShell(), Policy.bind("CompareWithRemoteAction.noRemote"), Policy.bind("CompareWithRemoteAction.noRemoteLong"));
+ MessageDialog.openInformation(getShell(), Policy.bind("CompareWithRemoteAction.noRemote"), Policy.bind("CompareWithRemoteAction.noRemoteLong")); //$NON-NLS-1$ //$NON-NLS-2$
return;
}
@@ -93,7 +93,7 @@
public void run(IProgressMonitor monitor) throws InvocationTargetException {
CompareUI.openCompareEditor(new CVSCompareEditorInput(new CVSResourceNode(resource[0]), new ResourceEditionNode(remoteResource[0])));
}
- }, Policy.bind("CompareWithRemoteAction.compare"), PROGRESS_BUSYCURSOR);
+ }, Policy.bind("CompareWithRemoteAction.compare"), PROGRESS_BUSYCURSOR); //$NON-NLS-1$
}
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 14c3848..227cfaa 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
@@ -53,11 +53,11 @@
public void run(IProgressMonitor monitor) throws InvocationTargetException {
file[0] = getSelectedRemoteFile();
}
- }, Policy.bind("CompareWithRevisionAction.compare"), this.PROGRESS_BUSYCURSOR);
+ }, Policy.bind("CompareWithRevisionAction.compare"), this.PROGRESS_BUSYCURSOR); //$NON-NLS-1$
if (file[0] == null) {
// No revisions for selected file
- MessageDialog.openWarning(getShell(), Policy.bind("CompareWithRevisionAction.noRevisions"), Policy.bind("CompareWithRevisionAction.noRevisionsLong"));
+ MessageDialog.openWarning(getShell(), Policy.bind("CompareWithRevisionAction.noRevisions"), Policy.bind("CompareWithRevisionAction.noRevisionsLong")); //$NON-NLS-1$ //$NON-NLS-2$
return;
}
@@ -65,14 +65,14 @@
run(new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException {
try {
- monitor.beginTask(Policy.bind("CompareWithRevisionAction.fetching"), 100);
+ monitor.beginTask(Policy.bind("CompareWithRevisionAction.fetching"), 100); //$NON-NLS-1$
entries[0] = file[0].getLogEntries(Policy.subMonitorFor(monitor, 100));
monitor.done();
} catch (TeamException e) {
throw new InvocationTargetException(e);
}
}
- }, Policy.bind("CompareWithRevisionAction.compare"), this.PROGRESS_DIALOG);
+ }, Policy.bind("CompareWithRevisionAction.compare"), this.PROGRESS_DIALOG); //$NON-NLS-1$
if (entries[0] == null) return;
@@ -81,7 +81,7 @@
public void run(IProgressMonitor monitor) throws InvocationTargetException {
CompareUI.openCompareEditor(new CVSCompareRevisionsInput((IFile)getSelectedResources()[0], entries[0]));
}
- }, Policy.bind("CompareWithRevisionAction.compare"), this.PROGRESS_BUSYCURSOR);
+ }, Policy.bind("CompareWithRevisionAction.compare"), this.PROGRESS_BUSYCURSOR); //$NON-NLS-1$
}
/*
* @see TeamAction#isEnabled()
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java
index e4b96cb..6d2a4fa 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java
@@ -58,7 +58,7 @@
}
tag[0] = dialog.getResult();
}
- }, Policy.bind("CompareWithTagAction.compare"), PROGRESS_BUSYCURSOR);
+ }, Policy.bind("CompareWithTagAction.compare"), PROGRESS_BUSYCURSOR); //$NON-NLS-1$
if (tag[0] == null) return;
@@ -69,18 +69,18 @@
run(new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException {
try {
- monitor.beginTask(Policy.bind("CompareWithTagAction.fetching", tag[0].getName()), 100);
+ monitor.beginTask(Policy.bind("CompareWithTagAction.fetching", tag[0].getName()), 100); //$NON-NLS-1$
remoteResource[0] = CVSWorkspaceRoot.getRemoteTree(resource, tag[0], Policy.subMonitorFor(monitor, 100));
monitor.done();
} catch (TeamException e) {
throw new InvocationTargetException(e);
}
}
- }, Policy.bind("CompareWithTagAction.compare"), PROGRESS_DIALOG);
+ }, Policy.bind("CompareWithTagAction.compare"), PROGRESS_DIALOG); //$NON-NLS-1$
// Just to be safe...
if (remoteResource[0] == null) {
- MessageDialog.openInformation(getShell(), Policy.bind("CompareWithTagAction.noRemote"), Policy.bind("CompareWithTagAction.noRemoteLong"));
+ MessageDialog.openInformation(getShell(), Policy.bind("CompareWithTagAction.noRemote"), Policy.bind("CompareWithTagAction.noRemoteLong")); //$NON-NLS-1$ //$NON-NLS-2$
return;
}
@@ -89,7 +89,7 @@
public void run(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException {
CompareUI.openCompareEditor(new CVSCompareEditorInput(new CVSResourceNode(resource), new ResourceEditionNode(remoteResource[0])));
}
- }, Policy.bind("CompareWithTagAction.compare"), PROGRESS_BUSYCURSOR);
+ }, Policy.bind("CompareWithTagAction.compare"), PROGRESS_BUSYCURSOR); //$NON-NLS-1$
}
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoView.java
index f62ee06..f3354fb 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoView.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoView.java
@@ -97,12 +97,12 @@
TagConfigurationDialog d = new TagConfigurationDialog(shell, cvsFolders);
d.open();
} catch(CVSException e) {
- ErrorDialog.openError(shell, "Configure Tag Error", "Error retreiving root folders from repository", e.getStatus());
+ ErrorDialog.openError(shell, Policy.bind("ConfigureTagsFromRepoViewConfigure_Tag_Error_1"), Policy.bind("ConfigureTagsFromRepoViewError_retreiving_root_folders_from_repository_2"), e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
}
}
});
}
- }, "Configuring branch tags", this.PROGRESS_BUSYCURSOR);
+ }, Policy.bind("ConfigureTagsFromRepoViewConfiguring_branch_tags_3"), this.PROGRESS_BUSYCURSOR); //$NON-NLS-1$
}
/*
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 439c91e..c8781db 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
@@ -9,21 +9,16 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.widgets.Shell;
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.ICVSFolder;
import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder;
-import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource;
-import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation;
+import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.internal.ccvs.ui.TagConfigurationDialog;
import org.eclipse.team.internal.ccvs.ui.model.RemoteModule;
import org.eclipse.team.ui.actions.TeamAction;
@@ -78,7 +73,7 @@
}
});
}
- }, "Configuring branch tags", this.PROGRESS_BUSYCURSOR);
+ }, Policy.bind("ConfigureTagsFromRepoViewOnFolderConfiguring_branch_tags_1"), this.PROGRESS_BUSYCURSOR); //$NON-NLS-1$
}
/*
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CopyRepositoryNameAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CopyRepositoryNameAction.java
index 8dc985e..de37f43 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CopyRepositoryNameAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CopyRepositoryNameAction.java
@@ -27,7 +27,7 @@
StringBuffer buffer = new StringBuffer();
for (int i = 0; i < locations.length; i++) {
buffer.append(locations[i].getLocation());
- if (i < locations.length - 1) buffer.append("\n");
+ if (i < locations.length - 1) buffer.append("\n"); //$NON-NLS-1$
}
copyToClipbard(Display.getDefault(), buffer.toString());
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/DefineBranchAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/DefineBranchAction.java
index ca68dcf..004702c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/DefineBranchAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/DefineBranchAction.java
@@ -85,7 +85,7 @@
Shell shell = getShell();
shell.getDisplay().syncExec(new Runnable() {
public void run() {
- InputDialog dialog = new InputDialog(getShell(), Policy.bind("DefineBranchAction.enterTag"), Policy.bind("DefineBranchAction.enterTagLong"), null, validator);
+ InputDialog dialog = new InputDialog(getShell(), Policy.bind("DefineBranchAction.enterTag"), Policy.bind("DefineBranchAction.enterTagLong"), null, validator); //$NON-NLS-1$ //$NON-NLS-2$
if (dialog.open() == InputDialog.OK) {
CVSTag tag = new CVSTag(dialog.getValue(), CVSTag.BRANCH);
CVSUIPlugin.getPlugin().getRepositoryManager().addBranchTags(roots[0], new CVSTag[] {tag});
@@ -93,7 +93,7 @@
}
});
}
- }, Policy.bind("DefineBranchAction.tag"), this.PROGRESS_BUSYCURSOR);
+ }, Policy.bind("DefineBranchAction.tag"), this.PROGRESS_BUSYCURSOR); //$NON-NLS-1$
}
/*
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/DefineVersionAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/DefineVersionAction.java
index ab3eee5..816d799 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/DefineVersionAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/DefineVersionAction.java
@@ -86,7 +86,7 @@
Shell shell = getShell();
shell.getDisplay().syncExec(new Runnable() {
public void run() {
- InputDialog dialog = new InputDialog(getShell(), Policy.bind("DefineVersionAction.enterTag"), Policy.bind("DefineVersionAction.enterTagLong"), null, validator);
+ InputDialog dialog = new InputDialog(getShell(), Policy.bind("DefineVersionAction.enterTag"), Policy.bind("DefineVersionAction.enterTagLong"), null, validator); //$NON-NLS-1$ //$NON-NLS-2$
if (dialog.open() == InputDialog.OK) {
ICVSRemoteResource resource = projects[0].getCVSResource();
CVSTag tag = new CVSTag(dialog.getValue(), CVSTag.VERSION);
@@ -95,7 +95,7 @@
}
});
}
- }, Policy.bind("DefineVersionAction.tag"), this.PROGRESS_DIALOG);
+ }, Policy.bind("DefineVersionAction.tag"), this.PROGRESS_DIALOG); //$NON-NLS-1$
}
/*
* @see TeamAction#isEnabled()
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 2e98240..dae52dc 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
@@ -43,7 +43,7 @@
* Method declared on IActionDelegate.
*/
public void run(IAction action) {
- final String title = Policy.bind("GenerateCVSDiff.title");
+ final String title = Policy.bind("GenerateCVSDiff.title"); //$NON-NLS-1$
try {
final IResource[] resources = getSelectedResources();
if (!checkSharing(resources)) {
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 14c6014..55e65b4 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
@@ -51,6 +51,6 @@
}
}
}
- }, Policy.bind("IgnoreAction.ignore"), PROGRESS_BUSYCURSOR);
+ }, Policy.bind("IgnoreAction.ignore"), PROGRESS_BUSYCURSOR); //$NON-NLS-1$
}
}
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 656fff2..418575f 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
@@ -70,16 +70,16 @@
for (int i = 0; i < entries.length; i++) {
try {
if (entries[i].isDeletion()) {
- MessageDialog.openError(getShell(), Policy.bind("OpenLogEntryAction.deletedTitle"), Policy.bind("OpenLogEntryAction.deleted"));
+ MessageDialog.openError(getShell(), Policy.bind("OpenLogEntryAction.deletedTitle"), Policy.bind("OpenLogEntryAction.deleted")); //$NON-NLS-1$ //$NON-NLS-2$
} else {
- page.openEditor(new RemoteFileEditorInput(entries[i].getRemoteFile()), "org.eclipse.ui.DefaultTextEditor");
+ page.openEditor(new RemoteFileEditorInput(entries[i].getRemoteFile()), "org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$
}
} catch (PartInitException e) {
throw new InvocationTargetException(e);
}
}
}
- }, Policy.bind("OpenLogEntryAction.open"), PROGRESS_BUSYCURSOR);
+ }, Policy.bind("OpenLogEntryAction.open"), PROGRESS_BUSYCURSOR); //$NON-NLS-1$
}
/*
* @see TeamAction#isEnabled()
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenRemoteFileAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenRemoteFileAction.java
index b264216..e259da7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenRemoteFileAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenRemoteFileAction.java
@@ -71,7 +71,7 @@
ICVSRemoteFile[] files = getSelectedRemoteFiles();
for (int i = 0; i < files.length; i++) {
try {
- page.openEditor(new RemoteFileEditorInput(files[i]), "org.eclipse.ui.DefaultTextEditor");
+ page.openEditor(new RemoteFileEditorInput(files[i]), "org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$
} catch (PartInitException e) {
throw new InvocationTargetException(e);
}
@@ -98,7 +98,7 @@
}
}*/
}
- }, Policy.bind("OpenRemoteFileAction.open"), this.PROGRESS_BUSYCURSOR);
+ }, Policy.bind("OpenRemoteFileAction.open"), this.PROGRESS_BUSYCURSOR); //$NON-NLS-1$
}
/*
* @see TeamAction#isEnabled()
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RemoveBranchTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RemoveBranchTagAction.java
index 2300216..1e42da9 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RemoveBranchTagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RemoveBranchTagAction.java
@@ -62,7 +62,7 @@
manager.removeBranchTag(tag.getRoot(), new CVSTag[] {tag.getTag()});
}
}
- }, Policy.bind("RemoveBranchTagAction.removeTag"), this.PROGRESS_BUSYCURSOR);
+ }, Policy.bind("RemoveBranchTagAction.removeTag"), this.PROGRESS_BUSYCURSOR); //$NON-NLS-1$
}
/*
@@ -72,7 +72,7 @@
BranchTag[] tags = getSelectedBranchTags();
if (tags.length == 0) return false;
for (int i = 0; i < tags.length; i++) {
- if (tags[i].getTag().getName().equals("HEAD")) return false;
+ if (tags[i].getTag().getName().equals("HEAD")) return false; //$NON-NLS-1$
}
return true;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RemoveRootAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RemoveRootAction.java
index 77bd320..11f1790 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RemoveRootAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RemoveRootAction.java
@@ -96,7 +96,7 @@
final String location = roots[i].getLocation();
shell.getDisplay().syncExec(new Runnable() {
public void run() {
- MessageDialog.openInformation(getShell(), "Unable to Discard Location", "Projects in the local workspace are shared with " + location);
+ MessageDialog.openInformation(getShell(), Policy.bind("RemoteRootAction.Unable_to_Discard_Location_1"), Policy.bind("RemoteRootAction.Projects_in_the_local_workspace_are_shared_with__2") + location); //$NON-NLS-1$ //$NON-NLS-2$
}
});
} else {
@@ -107,7 +107,7 @@
}
}
}
- }, Policy.bind("RemoveRootAction.removeRoot"), this.PROGRESS_DIALOG);
+ }, Policy.bind(Policy.bind("RemoteRootAction.RemoveRootAction.removeRoot_3")), this.PROGRESS_DIALOG); //$NON-NLS-1$
}
/*
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 cf78641..f59f7f3 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
@@ -34,7 +34,7 @@
for (int i = 0; i < candidateResources.length; i++) {
IResource resource = candidateResources[i];
if (isDirty(resource) && getConfirmOverwrite()) {
- if (confirmOverwrite(Policy.bind("ReplaceWithRemoteAction.localChanges", resource.getName()))) {
+ if (confirmOverwrite(Policy.bind("ReplaceWithRemoteAction.localChanges", resource.getName()))) { //$NON-NLS-1$
targetResources.add(resource);
}
} else {
@@ -44,8 +44,8 @@
// Do the replace
Hashtable table = getProviderMapping((IResource[])targetResources.toArray(new IResource[targetResources.size()]));
Set keySet = table.keySet();
- monitor.beginTask("", keySet.size() * 1000);
- monitor.setTaskName(Policy.bind("ReplaceWithRemoteAction.replacing"));
+ monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$
+ monitor.setTaskName(Policy.bind("ReplaceWithRemoteAction.replacing")); //$NON-NLS-1$
Iterator iterator = keySet.iterator();
while (iterator.hasNext()) {
IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000);
@@ -60,7 +60,7 @@
monitor.done();
}
}
- }, Policy.bind("ReplaceWithRemoteAction.problemMessage"), PROGRESS_DIALOG);
+ }, Policy.bind("ReplaceWithRemoteAction.problemMessage"), PROGRESS_DIALOG); //$NON-NLS-1$
}
protected boolean isEnabled() throws TeamException {
IResource[] resources = getSelectedResources();
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 a0f3293..0c99ddd 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
@@ -58,7 +58,7 @@
final boolean[] result = new boolean[] { false };
shell.getDisplay().syncExec(new Runnable() {
public void run() {
- result[0] = MessageDialog.openQuestion(getShell(), Policy.bind("question"), Policy.bind("localChanges"));
+ result[0] = MessageDialog.openQuestion(getShell(), Policy.bind("question"), Policy.bind("localChanges")); //$NON-NLS-1$ //$NON-NLS-2$
}
});
if (!result[0]) return;
@@ -76,7 +76,7 @@
}
tag[0] = dialog.getResult();
}
- }, Policy.bind("ReplaceWithTagAction.replace"), this.PROGRESS_BUSYCURSOR);
+ }, Policy.bind("ReplaceWithTagAction.replace"), this.PROGRESS_BUSYCURSOR); //$NON-NLS-1$
if (tag[0] == null) return;
@@ -86,8 +86,8 @@
try {
Hashtable table = getProviderMapping();
Set keySet = table.keySet();
- monitor.beginTask("", keySet.size() * 1000);
- monitor.setTaskName(Policy.bind("ReplaceWithTagAction.replacing", tag[0].getName()));
+ monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$
+ monitor.setTaskName(Policy.bind("ReplaceWithTagAction.replacing", tag[0].getName())); //$NON-NLS-1$
Iterator iterator = keySet.iterator();
while (iterator.hasNext()) {
IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000);
@@ -102,7 +102,7 @@
monitor.done();
}
}
- }, Policy.bind("ReplaceWithTagAction.replace"), this.PROGRESS_DIALOG);
+ }, Policy.bind("ReplaceWithTagAction.replace"), this.PROGRESS_DIALOG); //$NON-NLS-1$
}
protected boolean isEnabled() {
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 b67449c..be8f69b 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
@@ -69,7 +69,7 @@
view.showHistory(files[0]);
}
}
- }, Policy.bind("ShowHistoryAction.showHistory"), this.PROGRESS_BUSYCURSOR);
+ }, Policy.bind("ShowHistoryAction.showHistory"), this.PROGRESS_BUSYCURSOR); //$NON-NLS-1$
}
/*
* @see TeamAction#isEnabled()
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 0c1c635..cfa1314 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
@@ -35,7 +35,7 @@
view.showHistory(resources[0]);
}
}
- }, Policy.bind("ShowHistoryAction.showHistory"), this.PROGRESS_BUSYCURSOR);
+ }, Policy.bind("ShowHistoryAction.showHistory"), this.PROGRESS_BUSYCURSOR); //$NON-NLS-1$
}
/*
* @see TeamAction#isEnabled()
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 6ab423f..c1fe514 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
@@ -39,7 +39,7 @@
*/
public class TagAction extends TeamAction {
// The previously remembered tag
- private static String previousTag = "";
+ private static String previousTag = ""; //$NON-NLS-1$
/*
* @see IActionDelegate#run(IAction)
@@ -58,7 +58,7 @@
if (result[0] == null) return;
Hashtable table = getProviderMapping();
Set keySet = table.keySet();
- monitor.beginTask("", keySet.size() * 1000);
+ monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$
Iterator iterator = keySet.iterator();
while (iterator.hasNext()) {
@@ -82,12 +82,12 @@
throw new InvocationTargetException(e);
}
}
- }, Policy.bind("TagAction.tagProblemsMessage"), this.PROGRESS_DIALOG);
+ }, Policy.bind("TagAction.tagProblemsMessage"), this.PROGRESS_DIALOG); //$NON-NLS-1$
// Check for any status messages and display them
if ( ! messages.isEmpty()) {
boolean error = false;
- MultiStatus combinedStatus = new MultiStatus(CVSUIPlugin.ID, 0, Policy.bind("TagAction.tagProblemsMessage"), null);
+ MultiStatus combinedStatus = new MultiStatus(CVSUIPlugin.ID, 0, Policy.bind("TagAction.tagProblemsMessage"), null); //$NON-NLS-1$
for (int i = 0; i < messages.size(); i++) {
IStatus status = (IStatus)messages.get(i);
if (status.getSeverity() == IStatus.ERROR || status.getCode() == CVSStatus.SERVER_ERROR) {
@@ -105,9 +105,9 @@
}
String title;
if (error) {
- title = Policy.bind("TagAction.tagErrorTitle");
+ title = Policy.bind("TagAction.tagErrorTitle"); //$NON-NLS-1$
} else {
- title = Policy.bind("TagAction.tagWarningTitle");
+ title = Policy.bind("TagAction.tagWarningTitle"); //$NON-NLS-1$
}
ErrorDialog.openError(getShell(), title, message, statusToDisplay);
}
@@ -146,7 +146,7 @@
}
};
InputDialog dialog = new InputDialog(getShell(),
- Policy.bind("TagAction.tagResources"), Policy.bind("TagAction.enterTag"), previousTag, validator);
+ Policy.bind("TagAction.tagResources"), Policy.bind("TagAction.enterTag"), previousTag, validator); //$NON-NLS-1$ //$NON-NLS-2$
if (dialog.open() != InputDialog.OK) return null;
return dialog.getValue();
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java
index 48c8d44..95fbf2c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java
@@ -90,7 +90,7 @@
throw new InvocationTargetException(e);
}
}
- }, Policy.bind("TagAction.tagProblemsMessage"), this.PROGRESS_DIALOG);
+ }, Policy.bind("TagAction.tagProblemsMessage"), this.PROGRESS_DIALOG); //$NON-NLS-1$
}
/*
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 3a99471..9b11984 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
@@ -90,12 +90,12 @@
radio1 = new Button(composite, SWT.RADIO);
radio1.addSelectionListener(selectionListener);
- radio1.setText(Policy.bind("Unmanage.option2"));
+ radio1.setText(Policy.bind("Unmanage.option2")); //$NON-NLS-1$
radio2 = new Button(composite, SWT.RADIO);
radio2.addSelectionListener(selectionListener);
- radio2.setText(Policy.bind("Unmanage.option1"));
+ radio2.setText(Policy.bind("Unmanage.option1")); //$NON-NLS-1$
// set initial state
radio1.setSelection(deleteContent);
@@ -135,7 +135,7 @@
}
}
if (exceptions[0] != null) {
- handle(exceptions[0], null, Policy.bind("Unmanage.unmanagingError"));
+ handle(exceptions[0], null, Policy.bind("Unmanage.unmanagingError")); //$NON-NLS-1$
}
}
@@ -145,8 +145,8 @@
try {
Hashtable table = getProviderMapping();
Set keySet = table.keySet();
- monitor.beginTask("", keySet.size() * 1000);
- monitor.setTaskName(Policy.bind("Unmanage.unmanaging"));
+ monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$
+ monitor.setTaskName(Policy.bind("Unmanage.unmanaging")); //$NON-NLS-1$
Iterator iterator = keySet.iterator();
while (iterator.hasNext()) {
IProgressMonitor subMonitor = new InfiniteSubProgressMonitor(monitor, 1000);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UpdateAction.java
index a284a73..124e28d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UpdateAction.java
@@ -45,8 +45,8 @@
try {
Hashtable table = getProviderMapping();
Set keySet = table.keySet();
- monitor.beginTask("", keySet.size() * 1000);
- monitor.setTaskName(Policy.bind("UpdateAction.updating"));
+ monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$
+ monitor.setTaskName(Policy.bind("UpdateAction.updating")); //$NON-NLS-1$
Iterator iterator = keySet.iterator();
while (iterator.hasNext()) {
IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000);
@@ -61,7 +61,7 @@
monitor.done();
}
}
- }, Policy.bind("UpdateAction.update"), this.PROGRESS_DIALOG);
+ }, Policy.bind("UpdateAction.update"), this.PROGRESS_DIALOG); //$NON-NLS-1$
}
/*
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeEditorInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeEditorInput.java
index 3c24fd5..3a8d972 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeEditorInput.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeEditorInput.java
@@ -60,7 +60,7 @@
return end;
}
public String getTitle() {
- return Policy.bind("MergeEditorInput.title", start.getName(), end.getName());
+ return Policy.bind("MergeEditorInput.title", start.getName(), end.getName()); //$NON-NLS-1$
}
public boolean isSaveNeeded() {
return false;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java
index f3292d0..61542db 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java
@@ -28,12 +28,12 @@
public void addPages() {
// Provide a progress monitor to indicate what is going on
- setWindowTitle(Policy.bind("MergeWizard.title"));
+ setWindowTitle(Policy.bind("MergeWizard.title")); //$NON-NLS-1$
ImageDescriptor mergeImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_MERGE);
- startPage = new MergeWizardStartPage("startPage", Policy.bind("MergeWizard.start"), mergeImage);
+ startPage = new MergeWizardStartPage("startPage", Policy.bind("MergeWizard.start"), mergeImage); //$NON-NLS-1$ //$NON-NLS-2$
startPage.setProject(project);
addPage(startPage);
- endPage = new MergeWizardEndPage("endPage", Policy.bind("MergeWizard.end"), mergeImage, startPage);
+ endPage = new MergeWizardEndPage("endPage", Policy.bind("MergeWizard.end"), mergeImage, startPage); //$NON-NLS-1$ //$NON-NLS-2$
endPage.setProject(project);
addPage(endPage);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardEndPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardEndPage.java
index 54026f4..f8ebc7c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardEndPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardEndPage.java
@@ -43,7 +43,7 @@
*/
public MergeWizardEndPage(String pageName, String title, ImageDescriptor titleImage, MergeWizardStartPage startPage) {
super(pageName, title, titleImage);
- setDescription(Policy.bind("MergeWizardEndPage.description"));
+ setDescription(Policy.bind("MergeWizardEndPage.description")); //$NON-NLS-1$
this.startPage = startPage;
}
/*
@@ -75,7 +75,7 @@
setPageComplete(true);
setMessage(null);
} else {
- setMessage(Policy.bind("MergeWizardEndPage.duplicateTagSelected", result.getName()), WARNING_MESSAGE);
+ setMessage(Policy.bind("MergeWizardEndPage.duplicateTagSelected", result.getName()), WARNING_MESSAGE); //$NON-NLS-1$
setPageComplete(false);
}
} else {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardStartPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardStartPage.java
index 859bf61..fdade93 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardStartPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardStartPage.java
@@ -48,7 +48,7 @@
*/
public MergeWizardStartPage(String pageName, String title, ImageDescriptor titleImage) {
super(pageName, title, titleImage);
- setDescription(Policy.bind("MergeWizardStartPage.description"));
+ setDescription(Policy.bind("MergeWizardStartPage.description")); //$NON-NLS-1$
}
protected TableViewer createTable(Composite parent) {
Table table = new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/TagRootElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/TagRootElement.java
index 765c4db..18dd5e9 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/TagRootElement.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/TagRootElement.java
@@ -87,9 +87,9 @@
}
public String getLabel(Object o) {
if(typeOfTagRoot==CVSTag.BRANCH) {
- return Policy.bind("MergeWizardEndPage.branches");
+ return Policy.bind("MergeWizardEndPage.branches"); //$NON-NLS-1$
} else {
- return Policy.bind("VersionsElement.versions");
+ return Policy.bind("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/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index a632bb2..cf28c57 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
@@ -13,6 +13,9 @@
cvs=CVS
notAvailable=Not Available
+nameAndRevision={0} {1}
+currentRevision=*{0}
+
AddAction.add=Add
AddAction.adding=Adding...
@@ -55,6 +58,8 @@
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}
CVSCompareEditorInput.branchLabel=<branch-{0}>
CVSCompareEditorInput.headLabel=<HEAD>
@@ -80,6 +85,7 @@
CVSCompareRevisionsInput.repository=Repository file: {0}
CVSCompareRevisionsInput.structureCompare=Structure Compare
CVSCompareRevisionsInput.workspace=Workspace file: {0}
+CVSCompareRevisionsInput.truncate={0}[...]
CVSDecorator.projectDecoration={0} [{1}]
CVSDecorator.projectDecorationWithTag={0} [{1} {2}]
@@ -331,6 +337,8 @@
ReleaseCommentDialog.title=Commit Comment
ReleaseCommentDialog.enterComment=Please enter a comment.
+RemoteFolderElement.nameAndTag={0} {1}
+
RemoveRootAction.removeRoot=Error Discarding Location
RemoveBranchTagAction.removeTag=Discard Branch
@@ -358,6 +366,8 @@
RepositoriesView.refresh=&Refresh View
RepositoriesView.new=&CVS Repository Location...
RepositoriesView.newSubmenu=&New
+RepositoriesView.Show_Folders_6=Show Folders
+RepositoriewView.Show_Modules_7=Show Modules
ResourcePropertiesPage.status=Status
ResourcePropertiesPage.notManaged=Not managed by CVS
@@ -439,7 +449,7 @@
SharingWizard.heading=Configure a Project to Use CVS
SharingWizard.enterInformation=Enter Repository Location Information
SharingWizard.enterModuleName=Enter Module Name
-
+SharingWizard.readyToFinish=Ready to Share Project
SharingWizard.validationFailedText={0}. Set project sharing anyway?
SharingWizard.validationFailedTitle=Unable to Validate
@@ -625,4 +635,19 @@
TagConfigurationDialog.15=This will fetch tags from the repository that are defined on the following files:
TagConfigurationDialog.19=If expected tags do not appear try using the configure tags dialogs to customize the tags associated with this project
TagConfigurationDialog.20=&Refresh
-TagConfigurationDialog.21=&Configure Tags
\ No newline at end of file
+TagConfigurationDialog.21=&Configure 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
+ConfigureTagsFromRepoViewError_retreiving_root_folders_from_repository_2=Error retreiving root folders from repository
+ConfigureTagsFromRepoViewConfiguring_branch_tags_3=Configuring branch tags
+ConfigureTagsFromRepoViewOnFolderConfiguring_branch_tags_1=Configuring branch tags
+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
+RemoteRootAction.RemoveRootAction.removeRoot_3=RemoveRootAction.removeRoot
+BranchCategory.Branches_1=Branches
+GroupedByVersionCategory.Versions_1=Versions
+VersionCategory.Versions_1=Versions
+HistoryView.[...]_4=[...]
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 dc26574..dfa68ed 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
@@ -11,6 +11,7 @@
import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation;
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.model.IWorkbenchAdapter;
/**
* BranchCategory is the model element for the branches category
@@ -73,7 +74,7 @@
* @param object The object to get a label for.
*/
public String getLabel(Object o) {
- return "Branches";
+ return Policy.bind("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 e8b32ea..e665a85 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
@@ -28,15 +28,15 @@
} else if (t instanceof TeamException) {
error = ((TeamException)t).getStatus();
} else {
- error = new Status(IStatus.ERROR, CVSUIPlugin.ID, 1, Policy.bind("simpleInternal"), t);
+ error = new Status(IStatus.ERROR, CVSUIPlugin.ID, 1, Policy.bind("simpleInternal"), t); //$NON-NLS-1$
}
Shell shell = new Shell(Display.getDefault());
if (error.getSeverity() == IStatus.INFO) {
- MessageDialog.openInformation(shell, Policy.bind("information"), error.getMessage());
+ MessageDialog.openInformation(shell, Policy.bind("information"), error.getMessage()); //$NON-NLS-1$
} else {
- ErrorDialog.openError(shell, Policy.bind("exception"), null, error);
+ ErrorDialog.openError(shell, Policy.bind("exception"), null, error); //$NON-NLS-1$
}
shell.dispose();
// Let's log non-team exceptions
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 ea5ac8e..e40164c 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
@@ -28,30 +28,30 @@
static protected IPropertyDescriptor[] propertyDescriptors = new IPropertyDescriptor[5];
{
PropertyDescriptor descriptor;
- String category = Policy.bind("cvs");
+ String category = Policy.bind("cvs"); //$NON-NLS-1$
// resource name
- descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_NAME, Policy.bind("CVSRemoteFilePropertySource.name"));
+ descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_NAME, Policy.bind("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"));
+ descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_REVISION, Policy.bind("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"));
+ descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_DATE, Policy.bind("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"));
+ descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_AUTHOR, Policy.bind("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"));
+ descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_COMMENT, Policy.bind("CVSRemoteFilePropertySource.comment")); //$NON-NLS-1$
descriptor.setAlwaysIncompatible(true);
descriptor.setCategory(category);
propertyDescriptors[4] = descriptor;
@@ -101,7 +101,7 @@
if (id.equals(ICVSUIConstants.PROP_COMMENT)) {
return entry.getComment();
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
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 af50268..9f14d6f 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
@@ -20,15 +20,15 @@
static protected IPropertyDescriptor[] propertyDescriptors = new IPropertyDescriptor[2];
{
PropertyDescriptor descriptor;
- String category = Policy.bind("cvs");
+ String category = Policy.bind("cvs"); //$NON-NLS-1$
// resource name
- descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_NAME, Policy.bind("CVSRemoteFolderPropertySource.name"));
+ descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_NAME, Policy.bind("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"));
+ descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_TAG, Policy.bind("CVSRemoteFolderPropertySource.tag")); //$NON-NLS-1$
descriptor.setAlwaysIncompatible(true);
descriptor.setCategory(category);
propertyDescriptors[1] = descriptor;
@@ -65,11 +65,11 @@
if (id.equals(ICVSUIConstants.PROP_TAG)) {
CVSTag tag = folder.getTag();
if (tag == null) {
- return Policy.bind("CVSRemoteFolderPropertySource.none");
+ return Policy.bind("CVSRemoteFolderPropertySource.none"); //$NON-NLS-1$
}
return tag.getName();
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
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 ba3a3a5..a0fab60 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
@@ -21,30 +21,30 @@
static protected IPropertyDescriptor[] propertyDescriptors = new IPropertyDescriptor[5];
{
PropertyDescriptor descriptor;
- String category = Policy.bind("cvs");
+ String category = Policy.bind("cvs"); //$NON-NLS-1$
// host
- descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_HOST, Policy.bind("CVSRepositoryLocationPropertySource.host"));
+ descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_HOST, Policy.bind("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"));
+ descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_USER, Policy.bind("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"));
+ descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_PORT, Policy.bind("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"));
+ descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_ROOT, Policy.bind("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"));
+ descriptor = new PropertyDescriptor(ICVSUIConstants.PROP_METHOD, Policy.bind("CVSRepositoryLocationPropertySource.method")); //$NON-NLS-1$
descriptor.setAlwaysIncompatible(true);
descriptor.setCategory(category);
propertyDescriptors[4] = descriptor;
@@ -90,11 +90,11 @@
if (id.equals(ICVSUIConstants.PROP_PORT)) {
int port = location.getPort();
if (port == ICVSRepositoryLocation.USE_DEFAULT_PORT) {
- return Policy.bind("CVSRepositoryLocationPropertySource.default");
+ return Policy.bind("CVSRepositoryLocationPropertySource.default"); //$NON-NLS-1$
}
- return "" + port;
+ return "" + port; //$NON-NLS-1$
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/GroupedByVersionCategory.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/GroupedByVersionCategory.java
index 8693402..63ff74d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/GroupedByVersionCategory.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/GroupedByVersionCategory.java
@@ -18,6 +18,7 @@
import org.eclipse.team.internal.ccvs.core.resources.RemoteFolder;
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.model.IWorkbenchAdapter;
public class GroupedByVersionCategory extends CVSModelElement implements IAdaptable {
@@ -86,7 +87,7 @@
* @param object The object to get a label for.
*/
public String getLabel(Object o) {
- return "Versions";
+ return Policy.bind("GroupedByVersionCategory.Versions_1"); //$NON-NLS-1$
}
/**
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 f5d1c87..f6f3be1 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
@@ -5,11 +5,10 @@
* All Rights Reserved.
*/
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile;
-import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
+import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.ui.PlatformUI;
public class RemoteFileElement extends RemoteResourceElement {
@@ -33,7 +32,7 @@
if (!(o instanceof ICVSRemoteFile)) return null;
ICVSRemoteFile file = (ICVSRemoteFile)o;
try {
- return file.getName() + " " + file.getRevision();
+ return Policy.bind("nameAndRevision", file.getName(), file.getRevision()); //$NON-NLS-1$
} catch (TeamException e) {
handle(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 4cb9161..cca51ec 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
@@ -12,7 +12,7 @@
import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.ccvs.core.CVSTag;
import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder;
-import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
+import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
@@ -41,7 +41,7 @@
CVSTag tag = folder.getTag();
if (tag != null && tag.getType() == CVSTag.VERSION) {
if (folder.getRemoteParent() == null) {
- return folder.getName() + " " + tag.getName();
+ return Policy.bind("RemoteFolderElement.nameAndTag", folder.getName(), tag.getName()); //$NON-NLS-1$
}
}
return folder.getName();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteModule.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteModule.java
index dd3f280..783e324 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteModule.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteModule.java
@@ -113,7 +113,7 @@
* For debugging purposes only.
*/
public String toString() {
- return "RemoteModule(" + folder.getName() + ")";
+ return "RemoteModule(" + folder.getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
public ICVSRemoteResource getCVSResource() {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteVersionModule.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteVersionModule.java
index f2021fc..41bc0d1 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteVersionModule.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteVersionModule.java
@@ -92,6 +92,6 @@
* For debugging purposes only.
*/
public String toString() {
- return "RemoteVersionModule(" + tag.getName() + ")";
+ return "RemoteVersionModule(" + tag.getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
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 0bba2f6..114ce23 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
@@ -18,6 +18,7 @@
import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation;
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.model.IWorkbenchAdapter;
public class VersionCategory extends CVSModelElement implements IAdaptable {
@@ -86,7 +87,7 @@
* @param object The object to get a label for.
*/
public String getLabel(Object o) {
- return "Versions";
+ return Policy.bind("VersionCategory.Versions_1"); //$NON-NLS-1$
}
/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java
index 4f20b9f..ec779ba 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java
@@ -185,7 +185,6 @@
return image;
}
public String getText(Object element) {
- StringBuffer postfix = new StringBuffer();
if (element instanceof ITeamNode) {
ITeamNode node = (ITeamNode)element;
IResource resource = node.getResource();
@@ -197,24 +196,24 @@
KSubstOption option = info != null && info.getKeywordMode() != null ?
info.getKeywordMode() :
KSubstOption.fromFile((IFile)resource);
- postfix.append("(" + option.getShortDisplayText() + ")");
+ return Policy.bind("CVSCatchupReleaseViewer.fileDecoration", oldProvider.getText(element), option.getShortDisplayText()); //$NON-NLS-1$
} else if (resource instanceof IContainer) {
ICVSFolder cvsFolder = CVSWorkspaceRoot.getCVSFolderFor((IContainer)resource);
FolderSyncInfo info = cvsFolder.getFolderSyncInfo();
if (info != null) {
CVSTag tag = info.getTag();
if (tag != null) {
- postfix.append(" ");
- postfix.append(tag.getName());
+ return Policy.bind("CVSCatchupReleaseViewer.folderDecoration", oldProvider.getText(element), tag.getName()); //$NON-NLS-1$
}
}
}
+
} catch (CVSException e) {
ErrorDialog.openError(getControl().getShell(), null, null, e.getStatus());
}
}
}
- return oldProvider.getText(element) + " " + postfix.toString() ;
+ return oldProvider.getText(element);
}
});
}
@@ -267,17 +266,17 @@
*/
private void initializeActions(final CVSSyncCompareInput diffModel) {
Shell shell = getControl().getShell();
- commitAction = new CommitSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.commit"), shell);
- forceCommitAction = new ForceCommitSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.forceCommit"), shell);
- updateAction = new UpdateSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.update"), shell);
- forceUpdateAction = new ForceUpdateSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.forceUpdate"), shell);
- updateMergeAction = new UpdateMergeAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.update"), shell);
- ignoreAction = new IgnoreAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.ignore"), shell);
- updateWithJoinAction = new UpdateWithForcedJoinAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.mergeUpdate"), shell);
- forceUpdateMergeAction = new OverrideUpdateMergeAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.forceUpdate"), shell);
+ commitAction = new CommitSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.commit"), shell); //$NON-NLS-1$
+ forceCommitAction = new ForceCommitSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.forceCommit"), shell); //$NON-NLS-1$
+ updateAction = new UpdateSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.update"), shell); //$NON-NLS-1$
+ forceUpdateAction = new ForceUpdateSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.forceUpdate"), shell); //$NON-NLS-1$
+ updateMergeAction = new UpdateMergeAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.update"), shell); //$NON-NLS-1$
+ ignoreAction = new IgnoreAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.ignore"), shell); //$NON-NLS-1$
+ updateWithJoinAction = new UpdateWithForcedJoinAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.mergeUpdate"), shell); //$NON-NLS-1$
+ forceUpdateMergeAction = new OverrideUpdateMergeAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.forceUpdate"), shell); //$NON-NLS-1$
// Show in history view
- showInHistory = new HistoryAction(Policy.bind("CVSCatchupReleaseViewer.showInHistory"));
+ showInHistory = new HistoryAction(Policy.bind("CVSCatchupReleaseViewer.showInHistory")); //$NON-NLS-1$
addSelectionChangedListener(showInHistory);
}
@@ -287,7 +286,7 @@
protected void updateLabels(MergeResource resource) {
CompareConfiguration config = getCompareConfiguration();
String name = resource.getName();
- config.setLeftLabel(Policy.bind("CVSCatchupReleaseViewer.workspaceFile", name));
+ config.setLeftLabel(Policy.bind("CVSCatchupReleaseViewer.workspaceFile", name)); //$NON-NLS-1$
IRemoteSyncElement syncTree = resource.getSyncElement();
IRemoteResource remote = syncTree.getRemote();
@@ -298,26 +297,26 @@
// XXX Should have real progress
ILogEntry logEntry = remoteFile.getLogEntry(new NullProgressMonitor());
String author = logEntry.getAuthor();
- config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.repositoryFileRevision", new Object[] {name, revision, author}));
+ config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.repositoryFileRevision", new Object[] {name, revision, author})); //$NON-NLS-1$
} catch (TeamException e) {
ErrorDialog.openError(getControl().getShell(), null, null, e.getStatus());
- config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.repositoryFile", name));
+ config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.repositoryFile", name)); //$NON-NLS-1$
}
} else {
- config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.noRepositoryFile"));
+ config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.noRepositoryFile")); //$NON-NLS-1$
}
IRemoteResource base = syncTree.getBase();
if (base != null) {
try {
String revision = ((ICVSRemoteFile)base).getRevision();
- config.setAncestorLabel(Policy.bind("CVSCatchupReleaseViewer.commonFileRevision", new Object[] {name, revision} ));
+ config.setAncestorLabel(Policy.bind("CVSCatchupReleaseViewer.commonFileRevision", new Object[] {name, revision} )); //$NON-NLS-1$
} catch (TeamException e) {
ErrorDialog.openError(getControl().getShell(), null, null, e.getStatus());
- config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.commonFile", name));
+ config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.commonFile", name)); //$NON-NLS-1$
}
} else {
- config.setAncestorLabel(Policy.bind("CVSCatchupReleaseViewer.noCommonFile"));
+ config.setAncestorLabel(Policy.bind("CVSCatchupReleaseViewer.noCommonFile")); //$NON-NLS-1$
}
}
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java
index 06980b7..fb5b2b2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java
@@ -185,7 +185,7 @@
} catch (final CoreException e) {
getShell().getDisplay().syncExec(new Runnable() {
public void run() {
- ErrorDialog.openError(getShell(), Policy.bind("simpleInternal"), Policy.bind("internal"), e.getStatus());
+ ErrorDialog.openError(getShell(), Policy.bind("simpleInternal"), Policy.bind("internal"), e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
CVSUIPlugin.log(e.getStatus());
}
});
@@ -229,12 +229,12 @@
*/
protected int promptForConflicts(SyncSet syncSet) {
String[] buttons = new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL};
- String question = Policy.bind("CommitSyncAction.questionRelease");
- String title = Policy.bind("CommitSyncAction.titleRelease");
+ String question = Policy.bind("CommitSyncAction.questionRelease"); //$NON-NLS-1$
+ String title = Policy.bind("CommitSyncAction.titleRelease"); //$NON-NLS-1$
String[] tips = new String[] {
- Policy.bind("CommitSyncAction.releaseAll"),
- Policy.bind("CommitSyncAction.releasePart"),
- Policy.bind("CommitSyncAction.cancelRelease")
+ Policy.bind("CommitSyncAction.releaseAll"), //$NON-NLS-1$
+ Policy.bind("CommitSyncAction.releasePart"), //$NON-NLS-1$
+ Policy.bind("CommitSyncAction.cancelRelease") //$NON-NLS-1$
};
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/sync/ForceCommitSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java
index 476f113..b41f909 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java
@@ -233,12 +233,12 @@
*/
protected int promptForConflicts(SyncSet syncSet) {
String[] buttons = new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL};
- String question = Policy.bind("CommitSyncAction.questionRelease");
- String title = Policy.bind("CommitSyncAction.titleRelease");
+ String question = Policy.bind("CommitSyncAction.questionRelease"); //$NON-NLS-1$
+ String title = Policy.bind("CommitSyncAction.titleRelease"); //$NON-NLS-1$
String[] tips = new String[] {
- Policy.bind("CommitSyncAction.releaseAll"),
- Policy.bind("CommitSyncAction.releasePart"),
- Policy.bind("CommitSyncAction.cancelRelease")
+ Policy.bind("CommitSyncAction.releaseAll"), //$NON-NLS-1$
+ Policy.bind("CommitSyncAction.releasePart"), //$NON-NLS-1$
+ Policy.bind("CommitSyncAction.cancelRelease") //$NON-NLS-1$
};
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/sync/MergeAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/MergeAction.java
index a8dab6f..12d3aa2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/MergeAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/MergeAction.java
@@ -104,7 +104,7 @@
}
};
try {
- run(op, Policy.bind("MergeAction.problemsDuringSync"));
+ run(op, Policy.bind("MergeAction.problemsDuringSync")); //$NON-NLS-1$
} catch (InterruptedException e) {
}
if (result[0] != null) {
@@ -178,7 +178,7 @@
if (throwable instanceof CoreException) {
error = ((CoreException)throwable).getStatus();
} else {
- error = new Status(IStatus.ERROR, CVSUIPlugin.ID, 1, Policy.bind("simpleInternal") , throwable);
+ error = new Status(IStatus.ERROR, CVSUIPlugin.ID, 1, Policy.bind("simpleInternal") , throwable); //$NON-NLS-1$
}
ErrorDialog.openError(shell, problemMessage, error.getMessage(), error);
CVSUIPlugin.log(error);
@@ -197,7 +197,7 @@
getShell().getDisplay().syncExec(new Runnable() {
public void run() {
try {
- boolean r = MessageDialog.openConfirm(getShell(), Policy.bind("MergeAction.saveChangesTitle"), Policy.bind("MergeAction.saveChanges"));
+ boolean r = MessageDialog.openConfirm(getShell(), Policy.bind("MergeAction.saveChangesTitle"), Policy.bind("MergeAction.saveChanges")); //$NON-NLS-1$ //$NON-NLS-2$
if (!r) {
result[0] = false;
return;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizard.java
index 777c7f9..b4b7ff5 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizard.java
@@ -45,11 +45,11 @@
public BranchWizard() {
setNeedsProgressMonitor(true);
- setWindowTitle(Policy.bind("BranchWizard.title"));
+ setWindowTitle(Policy.bind("BranchWizard.title")); //$NON-NLS-1$
}
public void addPages() {
- mainPage = new BranchWizardPage("versionPage", Policy.bind("BranchWizard.createABranch"), areAllResourcesSticky(resources), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_BRANCH));
+ mainPage = new BranchWizardPage("versionPage", Policy.bind("BranchWizard.createABranch"), areAllResourcesSticky(resources), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_BRANCH)); //$NON-NLS-1$ //$NON-NLS-2$
addPage(mainPage);
}
public boolean performFinish() {
@@ -72,8 +72,8 @@
RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager();
Hashtable table = getProviderMapping(resources);
Set keySet = table.keySet();
- monitor.beginTask("", keySet.size() * 1000);
- MultiStatus status = new MultiStatus(CVSUIPlugin.ID, IStatus.INFO, Policy.bind("BranchWizard.errorTagging"), null);
+ monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$
+ MultiStatus status = new MultiStatus(CVSUIPlugin.ID, IStatus.INFO, Policy.bind("BranchWizard.errorTagging"), null); //$NON-NLS-1$
Iterator iterator = keySet.iterator();
while (iterator.hasNext()) {
IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizardPage.java
index 2adc03f..655a92e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizardPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizardPage.java
@@ -32,9 +32,9 @@
public BranchWizardPage(String pageName,String title, boolean allStickyResources, ImageDescriptor titleImage) {
super(pageName, title, titleImage);
if(allStickyResources) {
- setDescription(Policy.bind("BranchWizardPage.pageDescriptionVersion"));
+ setDescription(Policy.bind("BranchWizardPage.pageDescriptionVersion")); //$NON-NLS-1$
} else {
- setDescription(Policy.bind("BranchWizardPage.pageDescription"));
+ setDescription(Policy.bind("BranchWizardPage.pageDescription")); //$NON-NLS-1$
}
this.allStickyResources = allStickyResources;
}
@@ -47,7 +47,7 @@
Label label;
GridData data;
- createLabel(composite, Policy.bind("BranchWizardPage.branchName"));
+ createLabel(composite, Policy.bind("BranchWizardPage.branchName")); //$NON-NLS-1$
branchText = createTextField(composite);
branchText.addListener(SWT.Modify, new Listener() {
public void handleEvent(Event event) {
@@ -57,14 +57,14 @@
}
});
- createLabel(composite, "");
- createLabel(composite, "");
+ createLabel(composite, ""); //$NON-NLS-1$
+ createLabel(composite, ""); //$NON-NLS-1$
final Button check = new Button(composite, SWT.CHECK);
data = new GridData();
data.horizontalSpan = 2;
check.setLayoutData(data);
- check.setText(Policy.bind("BranchWizardPage.startWorking"));
+ check.setText(Policy.bind("BranchWizardPage.startWorking")); //$NON-NLS-1$
check.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event event) {
update = check.getSelection();
@@ -74,17 +74,17 @@
update = true;
if(!allStickyResources) {
- createLabel(composite, "");
- createLabel(composite, "");
+ createLabel(composite, ""); //$NON-NLS-1$
+ createLabel(composite, ""); //$NON-NLS-1$
label = new Label(composite, SWT.WRAP);
- label.setText(Policy.bind("BranchWizardPage.specifyVersion"));
+ label.setText(Policy.bind("BranchWizardPage.specifyVersion")); //$NON-NLS-1$
data = new GridData();
data.horizontalSpan = 2;
data.widthHint = 350;
label.setLayoutData(data);
- createLabel(composite, Policy.bind("BranchWizardPage.versionName"));
+ createLabel(composite, Policy.bind("BranchWizardPage.versionName")); //$NON-NLS-1$
versionText = createTextField(composite);
versionText.addListener(SWT.Modify, new Listener() {
public void handleEvent(Event event) {
@@ -113,7 +113,7 @@
private void updateVersionName(String branchName) {
if(versionText!=null) {
- versionText.setText(Policy.bind("BranchWizardPage.versionPrefix") + branchName);
+ versionText.setText(Policy.bind("BranchWizardPage.versionPrefix") + branchName); //$NON-NLS-1$
}
}
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 032705a..86489ac 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
@@ -52,40 +52,40 @@
data.horizontalSpan = 2;
data.widthHint = 350;
description.setLayoutData(data);
- description.setText(Policy.bind("ConfigurationWizardAutoconnectPage.description"));
+ description.setText(Policy.bind("ConfigurationWizardAutoconnectPage.description")); //$NON-NLS-1$
if (location == null) return;
// Spacer
- createLabel(composite, "");
- createLabel(composite, "");
+ createLabel(composite, ""); //$NON-NLS-1$
+ createLabel(composite, ""); //$NON-NLS-1$
- createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.user"));
+ createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.user")); //$NON-NLS-1$
createLabel(composite, location.getUsername());
- createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.host"));
+ createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.host")); //$NON-NLS-1$
createLabel(composite, location.getHost());
- createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.port"));
+ createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.port")); //$NON-NLS-1$
int port = location.getPort();
if (port == location.USE_DEFAULT_PORT) {
- createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.default"));
+ createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.default")); //$NON-NLS-1$
} else {
- createLabel(composite, "" + port);
+ createLabel(composite, "" + port); //$NON-NLS-1$
}
- createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.connectionType"));
+ createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.connectionType")); //$NON-NLS-1$
createLabel(composite, location.getMethod().getName());
- createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.repositoryPath"));
+ createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.repositoryPath")); //$NON-NLS-1$
createLabel(composite, location.getRootDirectory());
- createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.module"));
+ createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.module")); //$NON-NLS-1$
createLabel(composite, info.getRepository());
// Spacer
- createLabel(composite, "");
- createLabel(composite, "");
+ createLabel(composite, ""); //$NON-NLS-1$
+ createLabel(composite, ""); //$NON-NLS-1$
final Button check = new Button(composite, SWT.CHECK);
data = new GridData();
data.horizontalSpan = 2;
- check.setText(Policy.bind("ConfigurationWizardAutoconnectPage.validate"));
+ check.setText(Policy.bind("ConfigurationWizardAutoconnectPage.validate")); //$NON-NLS-1$
check.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event event) {
validate = check.getSelection();
@@ -106,7 +106,7 @@
info = folder.getFolderSyncInfo();
if (info == null) {
// This should never happen
- ErrorDialog.openError(getContainer().getShell(), Policy.bind("ConfigurationWizardAutoconnectPage.noSyncInfo"), Policy.bind("ConfigurationWizardAutoconnectPage.noCVSDirectory"), null);
+ ErrorDialog.openError(getContainer().getShell(), Policy.bind("ConfigurationWizardAutoconnectPage.noSyncInfo"), Policy.bind("ConfigurationWizardAutoconnectPage.noCVSDirectory"), null); //$NON-NLS-1$ //$NON-NLS-2$
return;
}
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 5c65810..6321da0 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
@@ -135,30 +135,30 @@
}
};
- createLabel(composite, Policy.bind("ConfigurationWizardMainPage.connection"));
+ createLabel(composite, Policy.bind("ConfigurationWizardMainPage.connection")); //$NON-NLS-1$
connectionMethodCombo = createCombo(composite);
- createLabel(composite, Policy.bind("ConfigurationWizardMainPage.userName"));
+ createLabel(composite, Policy.bind("ConfigurationWizardMainPage.userName")); //$NON-NLS-1$
userCombo = createEditableCombo(composite);
userCombo.addListener(SWT.Selection, listener);
userCombo.addListener(SWT.Modify, listener);
- createLabel(composite, Policy.bind("ConfigurationWizardMainPage.password"));
+ createLabel(composite, Policy.bind("ConfigurationWizardMainPage.password")); //$NON-NLS-1$
passwordText = createTextField(composite);
passwordText.setEchoChar('*');
- createLabel(composite, Policy.bind("ConfigurationWizardMainPage.host"));
+ createLabel(composite, Policy.bind("ConfigurationWizardMainPage.host")); //$NON-NLS-1$
hostCombo = createEditableCombo(composite);
hostCombo.addListener(SWT.Selection, listener);
hostCombo.addListener(SWT.Modify, listener);
- useDefaultPort = createRadioButton(composite, Policy.bind("ConfigurationWizardMainPage.useDefaultPort"), 2);
- useCustomPort = createRadioButton(composite, Policy.bind("ConfigurationWizardMainPage.usePort"), 1);
+ useDefaultPort = createRadioButton(composite, Policy.bind("ConfigurationWizardMainPage.useDefaultPort"), 2); //$NON-NLS-1$
+ useCustomPort = createRadioButton(composite, Policy.bind("ConfigurationWizardMainPage.usePort"), 1); //$NON-NLS-1$
useCustomPort.addListener(SWT.Selection, listener);
portText = createTextField(composite);
portText.addListener(SWT.Selection, listener);
- createLabel(composite, Policy.bind("ConfigurationWizardMainPage.repositoryPath"));
+ createLabel(composite, Policy.bind("ConfigurationWizardMainPage.repositoryPath")); //$NON-NLS-1$
repositoryPathCombo = createEditableCombo(composite);
repositoryPathCombo.addListener(SWT.Selection, listener);
repositoryPathCombo.addListener(SWT.Modify, listener);
@@ -168,7 +168,7 @@
GridData data = new GridData();
data.horizontalSpan = 2;
validateButton.setLayoutData(data);
- validateButton.setText(Policy.bind("ConfigurationWizardAutoconnectPage.validate"));
+ validateButton.setText(Policy.bind("ConfigurationWizardAutoconnectPage.validate")); //$NON-NLS-1$
validateButton.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event e) {
validate = validateButton.getSelection();
@@ -203,14 +203,14 @@
public boolean finish(IProgressMonitor monitor) {
// Set the result to be the current values
Properties result = new Properties();
- result.setProperty("connection", connectionMethodCombo.getText());
- result.setProperty("user", userCombo.getText());
- result.setProperty("password", passwordText.getText());
- result.setProperty("host", hostCombo.getText());
+ result.setProperty("connection", connectionMethodCombo.getText()); //$NON-NLS-1$
+ result.setProperty("user", userCombo.getText()); //$NON-NLS-1$
+ result.setProperty("password", passwordText.getText()); //$NON-NLS-1$
+ result.setProperty("host", hostCombo.getText()); //$NON-NLS-1$
if (useCustomPort.getSelection()) {
- result.setProperty("port", portText.getText());
+ result.setProperty("port", portText.getText()); //$NON-NLS-1$
}
- result.setProperty("root", repositoryPathCombo.getText());
+ result.setProperty("root", repositoryPathCombo.getText()); //$NON-NLS-1$
this.properties = result;
saveWidgetValues();
@@ -261,29 +261,29 @@
for (int i = 0; i < methods.length; i++) {
connectionMethodCombo.add(methods[i]);
}
- String method = (String)properties.getProperty("connection");
+ String method = (String)properties.getProperty("connection"); //$NON-NLS-1$
if (method == null) {
connectionMethodCombo.select(0);
} else {
connectionMethodCombo.select(connectionMethodCombo.indexOf(method));
}
- String user = (String)properties.getProperty("user");
+ String user = (String)properties.getProperty("user"); //$NON-NLS-1$
if (user != null) {
userCombo.setText(user);
}
- String password = (String)properties.getProperty("password");
+ String password = (String)properties.getProperty("password"); //$NON-NLS-1$
if (password != null) {
passwordText.setText(password);
}
- String host = (String)properties.getProperty("host");
+ String host = (String)properties.getProperty("host"); //$NON-NLS-1$
if (host != null) {
hostCombo.setText(host);
}
- String port = (String)properties.getProperty("port");
+ String port = (String)properties.getProperty("port"); //$NON-NLS-1$
if (port == null) {
useDefaultPort.setSelection(true);
} else {
@@ -291,7 +291,7 @@
portText.setText(port);
}
- String repositoryPath = (String)properties.getProperty("root");
+ String repositoryPath = (String)properties.getProperty("root"); //$NON-NLS-1$
if (repositoryPath != null) {
repositoryPathCombo.setText(repositoryPath);
}
@@ -360,7 +360,7 @@
return;
}
if ((user.indexOf('@') != -1) || (user.indexOf(':') != -1)) {
- setErrorMessage(Policy.bind("ConfigurationWizardMainPage.invalidUserName"));
+ setErrorMessage(Policy.bind("ConfigurationWizardMainPage.invalidUserName")); //$NON-NLS-1$
setPageComplete(false);
return;
}
@@ -372,7 +372,7 @@
return;
}
if (host.indexOf(':') != -1) {
- setErrorMessage(Policy.bind("ConfigurationWizardMainPage.invalidHostName"));
+ setErrorMessage(Policy.bind("ConfigurationWizardMainPage.invalidHostName")); //$NON-NLS-1$
setPageComplete(false);
return;
}
@@ -386,7 +386,7 @@
try {
Integer.parseInt(portText.getText());
} catch (NumberFormatException e) {
- setErrorMessage(Policy.bind("ConfigurationWizardMainPage.invalidPort"));
+ setErrorMessage(Policy.bind("ConfigurationWizardMainPage.invalidPort")); //$NON-NLS-1$
setPageComplete(false);
return;
}
@@ -402,7 +402,7 @@
for (int i = 0; i < segments.length; i++) {
String string = segments[i];
if (string.charAt(0) == ' ' || string.charAt(string.length() -1) == ' ') {
- setErrorMessage(Policy.bind("ConfigurationWizardMainPage.invalidPathWithSpaces"));
+ setErrorMessage(Policy.bind("ConfigurationWizardMainPage.invalidPathWithSpaces")); //$NON-NLS-1$
setPageComplete(false);
return;
}
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 e3a3f26..2e365df 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
@@ -55,9 +55,9 @@
*/
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
try {
- monitor.beginTask("", resources.length * 500);
+ monitor.beginTask("", resources.length * 500); //$NON-NLS-1$
monitor.setTaskName(
- Policy.bind("GenerateCVSDiff.working"));
+ Policy.bind("GenerateCVSDiff.working")); //$NON-NLS-1$
OutputStream os;
if(toClipboard) {
@@ -99,8 +99,8 @@
if (emptyDiff) {
MessageDialog.openInformation(
shell,
- Policy.bind("GenerateCVSDiff.noDiffsFoundTitle"),
- Policy.bind("GenerateCVSDiff.noDiffsFoundMsg"));
+ Policy.bind("GenerateCVSDiff.noDiffsFoundTitle"), //$NON-NLS-1$
+ Policy.bind("GenerateCVSDiff.noDiffsFoundMsg")); //$NON-NLS-1$
}
} catch (TeamException e) {
throw new InvocationTargetException(e);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizard.java
index faa5b22..aaf35a7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizard.java
@@ -115,7 +115,7 @@
this.defaultKSubst = defaultOption;
this.resources = resources;
this.depth = depth;
- setWindowTitle(Policy.bind("KSubstWizard.title"));
+ setWindowTitle(Policy.bind("KSubstWizard.title")); //$NON-NLS-1$
}
/**
@@ -210,8 +210,8 @@
getContainer().run(false /*fork*/, true /*cancelable*/, new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
try {
- monitor.beginTask("", 10000);
- monitor.setTaskName(Policy.bind("KSubstWizard.working"));
+ monitor.beginTask("", 10000); //$NON-NLS-1$
+ monitor.setTaskName(Policy.bind("KSubstWizard.working")); //$NON-NLS-1$
computeChangeList(mainPage.getKSubstOption());
Map table = getProviderMapping();
@@ -239,7 +239,7 @@
if ( ! messages.isEmpty()) {
boolean error = false;
MultiStatus combinedStatus = new MultiStatus(CVSUIPlugin.ID, 0,
- Policy.bind("KSubstWizard.problemsMessage"), null);
+ Policy.bind("KSubstWizard.problemsMessage"), null); //$NON-NLS-1$
for (int i = 0; i < messages.size(); i++) {
IStatus status = (IStatus)messages.get(i);
if (status.getSeverity() == IStatus.ERROR || status.getCode() == CVSStatus.SERVER_ERROR) {
@@ -257,9 +257,9 @@
}
String title;
if (error) {
- title = Policy.bind("KSubstWizard.errorTitle");
+ title = Policy.bind("KSubstWizard.errorTitle"); //$NON-NLS-1$
} else {
- title = Policy.bind("KSubstWizard.warningTitle");
+ title = Policy.bind("KSubstWizard.warningTitle"); //$NON-NLS-1$
}
ErrorDialog.openError(getShell(), title, message, statusToDisplay);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java
index 5a0c259..b0686d3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java
@@ -36,10 +36,10 @@
Composite top = new Composite(parent, SWT.NONE);
top.setLayout(new GridLayout());
setControl(top);
- createWrappingLabel(top, Policy.bind("KSubstWizardDirtyFilesPage.contents"), 0, LABEL_WIDTH_HINT);
+ createWrappingLabel(top, Policy.bind("KSubstWizardDirtyFilesPage.contents"), 0, LABEL_WIDTH_HINT); //$NON-NLS-1$
includeDirtyFilesButton = new Button(top, SWT.CHECK);
- includeDirtyFilesButton.setText(Policy.bind("KSubstWizardDirtyFilesPage.includeDirtyFiles"));
+ includeDirtyFilesButton.setText(Policy.bind("KSubstWizardDirtyFilesPage.includeDirtyFiles")); //$NON-NLS-1$
includeDirtyFilesButton.setSelection(includeDirtyFiles);
includeDirtyFilesButton.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event e) {
@@ -49,7 +49,7 @@
createSeparator(top, SPACER_HEIGHT);
listViewer = createFileListViewer(top,
- Policy.bind("KSubstWizardDirtyFilesPage.dirtyFilesViewer.title"), LIST_HEIGHT_HINT);
+ Policy.bind("KSubstWizardDirtyFilesPage.dirtyFilesViewer.title"), LIST_HEIGHT_HINT); //$NON-NLS-1$
}
public boolean includeDirtyFiles() {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java
index 1a6d68f..d5cd602 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java
@@ -69,28 +69,28 @@
};
// Automatic
- automaticRadioButton = createRadioButton(top, Policy.bind("KSubstWizardSelectionPage.automaticButton"), 1);
+ automaticRadioButton = createRadioButton(top, Policy.bind("KSubstWizardSelectionPage.automaticButton"), 1); //$NON-NLS-1$
automaticRadioButton.addListener(SWT.Selection, selectionListener);
automaticRadioButton.setSelection(ksubst == null);
- createWrappingLabel(top, Policy.bind("KSubstWizardSelectionPage.automaticLabel"), LABEL_INDENT_WIDTH, LABEL_WIDTH_HINT);
+ createWrappingLabel(top, Policy.bind("KSubstWizardSelectionPage.automaticLabel"), LABEL_INDENT_WIDTH, LABEL_WIDTH_HINT); //$NON-NLS-1$
// Binary
- binaryRadioButton = createRadioButton(top, Policy.bind("KSubstWizardSelectionPage.binaryButton"), 1);
+ binaryRadioButton = createRadioButton(top, Policy.bind("KSubstWizardSelectionPage.binaryButton"), 1); //$NON-NLS-1$
binaryRadioButton.addListener(SWT.Selection, selectionListener);
binaryRadioButton.setSelection(Command.KSUBST_BINARY.equals(ksubst));
- createIndentedLabel(top, Policy.bind("KSubstWizardSelectionPage.binaryLabel"), LABEL_INDENT_WIDTH);
+ createIndentedLabel(top, Policy.bind("KSubstWizardSelectionPage.binaryLabel"), LABEL_INDENT_WIDTH); //$NON-NLS-1$
// Text without keyword substitution
- textRadioButton = createRadioButton(top, Policy.bind("KSubstWizardSelectionPage.textButton"), 1);
+ textRadioButton = createRadioButton(top, Policy.bind("KSubstWizardSelectionPage.textButton"), 1); //$NON-NLS-1$
textRadioButton.addListener(SWT.Selection, selectionListener);
textRadioButton.setSelection(Command.KSUBST_TEXT.equals(ksubst));
- createIndentedLabel(top, Policy.bind("KSubstWizardSelectionPage.textLabel"), LABEL_INDENT_WIDTH);
+ createIndentedLabel(top, Policy.bind("KSubstWizardSelectionPage.textLabel"), LABEL_INDENT_WIDTH); //$NON-NLS-1$
// Text with keyword substitution
- ksubstRadioButton = createRadioButton(top, Policy.bind("KSubstWizardSelectionPage.textWithSubstitutionsButton"), 1);
+ ksubstRadioButton = createRadioButton(top, Policy.bind("KSubstWizardSelectionPage.textWithSubstitutionsButton"), 1); //$NON-NLS-1$
ksubstRadioButton.addListener(SWT.Selection, selectionListener);
ksubstRadioButton.setSelection(false);
- createIndentedLabel(top, Policy.bind("KSubstWizardSelectionPage.textWithSubstitutionsLabel"), LABEL_INDENT_WIDTH);
+ createIndentedLabel(top, Policy.bind("KSubstWizardSelectionPage.textWithSubstitutionsLabel"), LABEL_INDENT_WIDTH); //$NON-NLS-1$
ksubstOptionCombo = new Combo(top, SWT.READ_ONLY);
ksubstOptionCombo.addListener(SWT.Selection, selectionListener);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java
index d4d7298..a527b03 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java
@@ -37,10 +37,10 @@
Composite top = new Composite(parent, SWT.NONE);
top.setLayout(new GridLayout());
setControl(top);
- createWrappingLabel(top, Policy.bind("KSubstWizardSharedFilesPage.contents"), 0, LABEL_WIDTH_HINT);
+ createWrappingLabel(top, Policy.bind("KSubstWizardSharedFilesPage.contents"), 0, LABEL_WIDTH_HINT); //$NON-NLS-1$
includeSharedFilesButton = new Button(top, SWT.CHECK);
- includeSharedFilesButton.setText(Policy.bind("KSubstWizardSharedFilesPage.includeSharedFiles"));
+ includeSharedFilesButton.setText(Policy.bind("KSubstWizardSharedFilesPage.includeSharedFiles")); //$NON-NLS-1$
includeSharedFilesButton.setSelection(includeSharedFiles);
includeSharedFilesButton.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event e) {
@@ -50,7 +50,7 @@
createSeparator(top, SPACER_HEIGHT);
listViewer = createFileListViewer(top,
- Policy.bind("KSubstWizardSharedFilesPage.sharedFilesViewer.title"), LIST_HEIGHT_HINT);
+ Policy.bind("KSubstWizardSharedFilesPage.sharedFilesViewer.title"), LIST_HEIGHT_HINT); //$NON-NLS-1$
}
public boolean includeSharedFiles() {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java
index 5936ff7..020f599 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java
@@ -73,17 +73,17 @@
Composite top = new Composite(parent, SWT.NONE);
top.setLayout(new GridLayout());
setControl(top);
- createWrappingLabel(top, Policy.bind("KSubstWizardSummaryPage.contents"), 0, LABEL_WIDTH_HINT);
+ createWrappingLabel(top, Policy.bind("KSubstWizardSummaryPage.contents"), 0, LABEL_WIDTH_HINT); //$NON-NLS-1$
createSeparator(top, 0);
tableViewer = createFileTableViewer(top,
- Policy.bind("KSubstWizardSummaryPage.summaryViewer.title"),
- Policy.bind("KSubstWizardSummaryPage.summaryViewer.fileHeader"),
- Policy.bind("KSubstWizardSummaryPage.summaryViewer.ksubstHeader"),
+ Policy.bind("KSubstWizardSummaryPage.summaryViewer.title"), //$NON-NLS-1$
+ Policy.bind("KSubstWizardSummaryPage.summaryViewer.fileHeader"), //$NON-NLS-1$
+ Policy.bind("KSubstWizardSummaryPage.summaryViewer.ksubstHeader"), //$NON-NLS-1$
LIST_HEIGHT_HINT);
showUnaffectedFilesButton = new Button(top, SWT.CHECK);
- showUnaffectedFilesButton.setText(Policy.bind("KSubstWizardSummaryPage.showUnaffectedFiles"));
+ showUnaffectedFilesButton.setText(Policy.bind("KSubstWizardSummaryPage.showUnaffectedFiles")); //$NON-NLS-1$
showUnaffectedFilesButton.setSelection(showUnaffectedFiles);
showUnaffectedFilesButton.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event e) {
@@ -198,7 +198,7 @@
TableEditor tableEditor = new TableEditor(table);
CellEditor cellEditor = new ComboBoxCellEditor(table, ksubstOptionsDisplayText);
tableViewer.setCellEditors(new CellEditor[] { null, cellEditor });
- tableViewer.setColumnProperties(new String[] { "file", "mode" });
+ tableViewer.setColumnProperties(new String[] { "file", "mode" }); //$NON-NLS-1$ //$NON-NLS-2$
tableViewer.setCellModifier(new ICellModifier() {
public Object getValue(Object element, String property) {
KSubstChangeElement change = (KSubstChangeElement) element;
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 39a30c3..20b756f 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
@@ -32,8 +32,8 @@
// set F1 help
// WorkbenchHelp.setHelp(composite, new DialogPageContextComputer (this, ITeamHelpContextIds.REPO_CONNECTION_MAIN_PAGE));
- useProjectNameButton = createRadioButton(composite, Policy.bind("ModuleSelectionPage.moduleIsProject"), 2);
- useSpecifiedNameButton = createRadioButton(composite, Policy.bind("ModuleSelectionPage.specifyModule"), 1);
+ useProjectNameButton = createRadioButton(composite, Policy.bind("ModuleSelectionPage.moduleIsProject"), 2); //$NON-NLS-1$
+ useSpecifiedNameButton = createRadioButton(composite, Policy.bind("ModuleSelectionPage.specifyModule"), 1); //$NON-NLS-1$
useProjectNameButton.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event event) {
useProjectName = useProjectNameButton.getSelection();
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 a837287..b1679bb 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
@@ -37,19 +37,19 @@
section = workbenchSettings.addNewSection("NewLocationWizard");//$NON-NLS-1$
}
setDialogSettings(section);
- setWindowTitle(Policy.bind("NewLocationWizard.title"));
+ setWindowTitle(Policy.bind("NewLocationWizard.title")); //$NON-NLS-1$
}
/**
* Creates the wizard pages
*/
public void addPages() {
- mainPage = new ConfigurationWizardMainPage("repositoryPage1", Policy.bind("NewLocationWizard.heading"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_SHARE));
+ mainPage = new ConfigurationWizardMainPage("repositoryPage1", Policy.bind("NewLocationWizard.heading"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_SHARE)); //$NON-NLS-1$ //$NON-NLS-2$
if (properties != null) {
mainPage.setProperties(properties);
}
mainPage.setShowValidate(true);
- mainPage.setDescription(Policy.bind("NewLocationWizard.description"));
+ mainPage.setDescription(Policy.bind("NewLocationWizard.description")); //$NON-NLS-1$
mainPage.setDialogSettings(getDialogSettings());
addPage(mainPage);
}
@@ -88,13 +88,13 @@
IStatus error = e.getStatus();
if (root[0] == null) {
// Exception creating the root, we cannot continue
- ErrorDialog.openError(getContainer().getShell(), Policy.bind("NewLocationWizard.exception"), null, error);
+ ErrorDialog.openError(getContainer().getShell(), Policy.bind("NewLocationWizard.exception"), null, error); //$NON-NLS-1$
return false;
} else {
// Exception validating. We can continue if the user wishes.
boolean keep = MessageDialog.openQuestion(getContainer().getShell(),
- Policy.bind("NewLocationWizard.validationFailedTitle"),
- Policy.bind("NewLocationWizard.validationFailedText", new Object[] {e.getStatus().getMessage()}));
+ Policy.bind("NewLocationWizard.validationFailedTitle"), //$NON-NLS-1$
+ Policy.bind("NewLocationWizard.validationFailedText", new Object[] {e.getStatus().getMessage()})); //$NON-NLS-1$
try {
if (keep) {
provider.addRepository(root[0]);
@@ -102,7 +102,7 @@
provider.disposeRepository(root[0]);
}
} catch (TeamException e1) {
- ErrorDialog.openError(getContainer().getShell(), Policy.bind("exception"), null, e1.getStatus());
+ ErrorDialog.openError(getContainer().getShell(), Policy.bind("exception"), null, e1.getStatus()); //$NON-NLS-1$
return false;
}
return keep;
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 a0a6f34..ec2db35 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
@@ -79,9 +79,9 @@
data.horizontalSpan = 2;
data.widthHint = 350;
description.setLayoutData(data);
- description.setText(Policy.bind("RepositorySelectionPage.description"));
+ description.setText(Policy.bind("RepositorySelectionPage.description")); //$NON-NLS-1$
- useExistingRepo = createRadioButton(composite, Policy.bind("RepositorySelectionPage.useExisting"), 2);
+ useExistingRepo = createRadioButton(composite, Policy.bind("RepositorySelectionPage.useExisting"), 2); //$NON-NLS-1$
table = createTable(composite);
table.setContentProvider(new WorkbenchContentProvider());
table.setLabelProvider(new WorkbenchLabelProvider());
@@ -91,7 +91,7 @@
setPageComplete(true);
}
});
- useNewRepo = createRadioButton(composite, Policy.bind("RepositorySelectionPage.useNew"), 2);
+ useNewRepo = createRadioButton(composite, Policy.bind("RepositorySelectionPage.useNew"), 2); //$NON-NLS-1$
useExistingRepo.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event event) {
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 7c7acbe..ce742ed 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
@@ -69,27 +69,27 @@
}
setDialogSettings(section);
setNeedsProgressMonitor(true);
- setWindowTitle(Policy.bind("SharingWizard.title"));
+ setWindowTitle(Policy.bind("SharingWizard.title")); //$NON-NLS-1$
}
public void addPages() {
ImageDescriptor sharingImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_SHARE);
if (doesCVSDirectoryExist()) {
- autoconnectPage = new ConfigurationWizardAutoconnectPage("autoconnectPage", Policy.bind("SharingWizard.autoConnectTitle"), sharingImage);
+ autoconnectPage = new ConfigurationWizardAutoconnectPage("autoconnectPage", Policy.bind("SharingWizard.autoConnectTitle"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$
autoconnectPage.setProject(project);
addPage(autoconnectPage);
} else {
ICVSRepositoryLocation[] locations = CVSUIPlugin.getPlugin().getRepositoryManager().getKnownRoots();
if (locations.length > 0) {
- locationPage = new RepositorySelectionPage("importPage", Policy.bind("SharingWizard.importTitle"), sharingImage);
+ locationPage = new RepositorySelectionPage("importPage", Policy.bind("SharingWizard.importTitle"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$
addPage(locationPage);
}
- createLocationPage = new ConfigurationWizardMainPage("createLocationPage", Policy.bind("SharingWizard.enterInformation"), sharingImage);
+ createLocationPage = new ConfigurationWizardMainPage("createLocationPage", Policy.bind("SharingWizard.enterInformation"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$
addPage(createLocationPage);
createLocationPage.setDialogSettings(getDialogSettings());
- modulePage = new ModuleSelectionPage("modulePage", Policy.bind("SharingWizard.enterModuleName"), sharingImage);
+ modulePage = new ModuleSelectionPage("modulePage", Policy.bind("SharingWizard.enterModuleName"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$
addPage(modulePage);
- finishPage = new SharingWizardFinishPage("finishPage", Policy.bind("Ready to Share Project"), sharingImage);
+ finishPage = new SharingWizardFinishPage("finishPage", Policy.bind("SharingWizard.readyToFinish"), sharingImage); //$NON-NLS-1$
addPage(finishPage);
}
}
@@ -109,10 +109,10 @@
return super.canFinish();
}
protected String getMainPageDescription() {
- return Policy.bind("SharingWizard.description");
+ return Policy.bind("SharingWizard.description"); //$NON-NLS-1$
}
protected String getMainPageTitle() {
- return Policy.bind("SharingWizard.heading");
+ return Policy.bind("SharingWizard.heading"); //$NON-NLS-1$
}
public IWizardPage getNextPage(IWizardPage page) {
if (page == autoconnectPage) return null;
@@ -141,7 +141,7 @@
getContainer().run(false, false, new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException {
try {
- monitor.beginTask("", 100);
+ monitor.beginTask("", 100); //$NON-NLS-1$
if (autoconnectPage != null) {
// Autoconnect to the repository using CVS/ directories
@@ -164,8 +164,8 @@
} catch (TeamException e) {
// Exception validating. We can continue if the user wishes.
boolean keep = MessageDialog.openQuestion(getContainer().getShell(),
- Policy.bind("SharingWizard.validationFailedTitle"),
- Policy.bind("SharingWizard.validationFailedText", new Object[] {e.getStatus().getMessage()}));
+ Policy.bind("SharingWizard.validationFailedTitle"), //$NON-NLS-1$
+ Policy.bind("SharingWizard.validationFailedText", new Object[] {e.getStatus().getMessage()})); //$NON-NLS-1$
if (!keep) {
// Remove the root
try {
@@ -173,7 +173,7 @@
CVSProviderPlugin.getProvider().disposeRepository(location);
}
} catch (TeamException e1) {
- ErrorDialog.openError(getContainer().getShell(), Policy.bind("exception"), null, e1.getStatus());
+ ErrorDialog.openError(getContainer().getShell(), Policy.bind("exception"), null, e1.getStatus()); //$NON-NLS-1$
}
result[0] = false;
return;
@@ -198,7 +198,7 @@
String moduleName = getModuleName();
ICVSRemoteFolder folder = location.getRemoteFolder(moduleName, null);
if (folder.exists(new SubProgressMonitor(monitor, 50))) {
- MessageDialog.openInformation(getShell(), Policy.bind("SharingWizard.couldNotImport"), Policy.bind("SharingWizard.couldNotImportLong"));
+ MessageDialog.openInformation(getShell(), Policy.bind("SharingWizard.couldNotImport"), Policy.bind("SharingWizard.couldNotImportLong")); //$NON-NLS-1$ //$NON-NLS-2$
result[0] = false;
doSync[0] = false;
return;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java
index 07fdeb2..db68d29 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java
@@ -23,7 +23,7 @@
public void createControl(Composite parent) {
Composite composite = createComposite(parent, 1);
Label label = new Label(composite, SWT.LEFT | SWT.WRAP);
- label.setText(Policy.bind("SharingWizardFinishPage.message"));
+ label.setText(Policy.bind("SharingWizardFinishPage.message")); //$NON-NLS-1$
GridData data = new GridData();
data.widthHint = 350;
label.setLayoutData(data);
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 35e779d..d05a3f9 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
@@ -31,7 +31,7 @@
public UpdateWizard() {
setNeedsProgressMonitor(true);
- setWindowTitle(Policy.bind("UpdateWizard.title"));
+ setWindowTitle(Policy.bind("UpdateWizard.title")); //$NON-NLS-1$
}
public void addPages() {
@@ -40,14 +40,14 @@
new ProgressMonitorDialog(getShell()).run(false, false, new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
monitor.beginTask(null, 100);
- updatePage = new UpdateWizardPage("updatePage", Policy.bind("UpdateWizard.updatePage"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_SHARE));
+ updatePage = new UpdateWizardPage("updatePage", Policy.bind("UpdateWizard.updatePage"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_SHARE)); //$NON-NLS-1$ //$NON-NLS-2$
updatePage.setProject(project);
addPage(updatePage);
monitor.done();
}
});
} catch (InvocationTargetException e) {
- CVSUIPlugin.log(new Status(IStatus.ERROR, CVSUIPlugin.ID, 0, Policy.bind("internal"), e.getTargetException()));
+ CVSUIPlugin.log(new Status(IStatus.ERROR, CVSUIPlugin.ID, 0, Policy.bind("internal"), e.getTargetException())); //$NON-NLS-1$
} catch (InterruptedException e) {
// Ignore
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java
index 2fd54e1..526ac2d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java
@@ -61,7 +61,7 @@
data.horizontalSpan = 2;
data.widthHint = 350;
description.setLayoutData(data);
- description.setText(Policy.bind("UpdateWizardPage.description"));
+ description.setText(Policy.bind("UpdateWizardPage.description")); //$NON-NLS-1$
tree = createTree(composite);
tree.setContentProvider(new WorkbenchContentProvider());
@@ -88,15 +88,15 @@
}
});
- createLabel(composite, "");
- createLabel(composite, "");
+ createLabel(composite, ""); //$NON-NLS-1$
+ createLabel(composite, ""); //$NON-NLS-1$
doOverwrite = false;
final Button overwrite = new Button(composite, SWT.CHECK);
data = new GridData();
data.horizontalSpan = 2;
overwrite.setLayoutData(data);
- overwrite.setText(Policy.bind("UpdateWizardPage.overwrite"));
+ overwrite.setText(Policy.bind("UpdateWizardPage.overwrite")); //$NON-NLS-1$
overwrite.setSelection(doOverwrite);
overwrite.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event event) {
