Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-02-15 17:13:15 -0500
committerjames2002-02-15 17:13:15 -0500
commite1e0a47535cca35af4d0a6815d1562304970cb97 (patch)
tree7c31a05b596368069d657e99fbc6c3fb0440744e
parentdb0ea152394a7cd8fd4c8671c80ac53f6b4b1c82 (diff)
downloadeclipse.platform.team-e1e0a47535cca35af4d0a6815d1562304970cb97.tar.gz
eclipse.platform.team-e1e0a47535cca35af4d0a6815d1562304970cb97.tar.xz
eclipse.platform.team-e1e0a47535cca35af4d0a6815d1562304970cb97.zip
9722: Empty error text in dialog
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java2
3 files changed, 5 insertions, 2 deletions
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 c7067afff..ce4985a67 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
@@ -9,6 +9,7 @@ confirmOverwriteTitle=Confirm Overwrite Project
confirmOverwrite=The project already exists in the workspace. Its contents will be overwritten.
question=Question
localChanges=You have local changes which you are about to overwrite. Do you wish to continue?
+error=Error
AddAction.add=Add
AddAction.adding=Adding...
@@ -120,6 +121,7 @@ CommitSyncAction.titleRelease=Release Conflicts?
CommitSyncAction.releaseAll=Release all changes, overriding any conflicting changes on the server.
CommitSyncAction.releasePart=Only release the changes that don't conflict with changes on the server.
CommitSyncAction.cancelRelease=Cancel the release operation.
+CommitSyncAction.errorCommitting=An error occurred while committing changes.
CompareWithRemoteAction.compare=Compare
CompareWithRemoteAction.noRemote=No Remote Resource
@@ -187,6 +189,7 @@ GetSyncAction.titleCatchup=Catch up Over Conflicts?
GetSyncAction.catchupAll=Catch up to all incoming changes, overriding any conflicting local changes.
GetSyncAction.catchupPart=Only catch up to the changes that don't conflict with local changes.
GetSyncAction.cancelCatchup=Cancel the catch up operation.
+UpdateSyncAction.errorUpdating=An error occurred while updating changes.
HistoryView.addToWorkspace=&Get
HistoryView.copy=&Copy
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 baf0eaeb2..a19ad8af2 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
@@ -189,7 +189,7 @@ public class CommitSyncAction extends MergeAction {
} catch (final TeamException e) {
getShell().getDisplay().syncExec(new Runnable() {
public void run() {
- ErrorDialog.openError(getShell(), null, null, e.getStatus());
+ ErrorDialog.openError(getShell(), Policy.bind("error"), Policy.bind("CommitSyncAction.errorCommitting"), e.getStatus());
}
});
return null;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java
index f794ee17c..8edc2aef1 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java
@@ -278,7 +278,7 @@ public class UpdateSyncAction extends MergeAction {
} catch (final TeamException e) {
getShell().getDisplay().syncExec(new Runnable() {
public void run() {
- ErrorDialog.openError(getShell(), null, null, e.getStatus());
+ ErrorDialog.openError(getShell(), Policy.bind("error"), Policy.bind("UpdateSyncAction.errorUpdating"), e.getStatus());
}
});
return null;

Back to the top