Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2005-04-19 18:19:40 +0000
committerMichael Valenta2005-04-19 18:19:40 +0000
commit551a8b912b5aa087e673bf4c74900777aaa2e404 (patch)
treef84a2a2a8b2a3a6b584d72c6b0d6e890c61efd10
parent2532a404bcceddcc2cc934e7393fac37e1e5a695 (diff)
downloadeclipse.platform.team-551a8b912b5aa087e673bf4c74900777aaa2e404.tar.gz
eclipse.platform.team-551a8b912b5aa087e673bf4c74900777aaa2e404.tar.xz
eclipse.platform.team-551a8b912b5aa087e673bf4c74900777aaa2e404.zip
Bug 91783 Missing space in Synchronize view
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java10
2 files changed, 6 insertions, 6 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
index 2dbf8d272..aa31ce77e 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
@@ -168,7 +168,7 @@ AbstractSynchronizeParticipant_4=Cannot initialize synchronization. Wrong descri
SynchronizeManager_11=Error creating Synchronization {0}:
AbstractSynchronizeParticipant_5=Exception notifying participant listeners of changes.
-ChangesSection_filterHides=The current ''{0}'' mode is empty.
+ChangesSection_filterHides=The current ''{0}'' mode is empty. {1}
ChangesSection_filterHidesSingular=However there is {0} change in the ''{1}'' mode.
ChangesSection_filterHidesPlural=However there are {0} changes in the ''{1}'' mode.
ChangesSection_filterChange=Change to ''{0}'' mode.
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java
index 76b26c76c..550a92382 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java
@@ -236,13 +236,13 @@ public class ChangesSection extends Composite {
if (candidateMode != currentMode) {
long numChanges = getChangesInMode(participantSet, candidateMode);
if (numChanges > 0) {
- StringBuffer text = new StringBuffer();
- text.append(NLS.bind(TeamUIMessages.ChangesSection_filterHides, new String[] { Utils.modeToString(configuration.getMode()) })); //$NON-NLS-1$
+ String message;
if(numChanges > 1) {
- text.append(NLS.bind(TeamUIMessages.ChangesSection_filterHidesPlural, new String[] { Long.toString(numChanges), Utils.modeToString(candidateMode) })); //$NON-NLS-1$
+ message = NLS.bind(TeamUIMessages.ChangesSection_filterHidesPlural, new String[] { Long.toString(numChanges), Utils.modeToString(candidateMode) });
} else {
- text.append(NLS.bind(TeamUIMessages.ChangesSection_filterHidesSingular, new String[] { Long.toString(numChanges), Utils.modeToString(candidateMode) })); //$NON-NLS-1$
+ message = NLS.bind(TeamUIMessages.ChangesSection_filterHidesSingular, new String[] { Long.toString(numChanges), Utils.modeToString(candidateMode) });
}
+ message = NLS.bind(TeamUIMessages.ChangesSection_filterHides, new String[] { Utils.modeToString(configuration.getMode()), message });
Label warning = new Label(composite, SWT.NONE);
warning.setImage(TeamUIPlugin.getPlugin().getImage(ISharedImages.IMG_WARNING_OVR));
@@ -254,7 +254,7 @@ public class ChangesSection extends Composite {
}
});
forms.getHyperlinkGroup().add(link);
- createDescriptionLabel(composite, text.toString());
+ createDescriptionLabel(composite, message);
return composite;
}
}

Back to the top