diff options
| author | Andre Weinand | 2005-04-06 10:43:07 +0000 |
|---|---|---|
| committer | Andre Weinand | 2005-04-06 10:43:07 +0000 |
| commit | 83a0c7caecdbddedc33e39ef53d37e7d33e542ea (patch) | |
| tree | dee3c89a78c1e27d3de37fcec824f9ce33b140ce /bundles | |
| parent | 57482e9aeb73c61fe0648ec70b1646679ea2941e (diff) | |
| download | eclipse.platform.team-83a0c7caecdbddedc33e39ef53d37e7d33e542ea.tar.gz eclipse.platform.team-83a0c7caecdbddedc33e39ef53d37e7d33e542ea.tar.xz eclipse.platform.team-83a0c7caecdbddedc33e39ef53d37e7d33e542ea.zip | |
simplified two NLS key calculations
Diffstat (limited to 'bundles')
2 files changed, 12 insertions, 6 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index 1e458655d..590981777 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -3678,10 +3678,13 @@ public class TextMergeViewer extends ContentMergeViewer { c.getDisplay().beep(); - String key= down ? "atEnd" : "atBeginning"; //$NON-NLS-1$ //$NON-NLS-2$ + if (down) + return MessageDialog.openQuestion(c.getShell(), + CompareMessages.getString("TextMergeViewer.atEnd.title"), //$NON-NLS-1$ + CompareMessages.getString("TextMergeViewer.atEnd.message")); //$NON-NLS-1$ return MessageDialog.openQuestion(c.getShell(), - CompareMessages.getString("TextMergeViewer."+key+".title"), //$NON-NLS-1$ //$NON-NLS-2$ - CompareMessages.getString("TextMergeViewer."+key+".message")); //$NON-NLS-1$ //$NON-NLS-2$ + CompareMessages.getString("TextMergeViewer.atBeginning.title"), //$NON-NLS-1$ + CompareMessages.getString("TextMergeViewer.atBeginning.message")); //$NON-NLS-1$ } return false; } diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index 1e458655d..590981777 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -3678,10 +3678,13 @@ public class TextMergeViewer extends ContentMergeViewer { c.getDisplay().beep(); - String key= down ? "atEnd" : "atBeginning"; //$NON-NLS-1$ //$NON-NLS-2$ + if (down) + return MessageDialog.openQuestion(c.getShell(), + CompareMessages.getString("TextMergeViewer.atEnd.title"), //$NON-NLS-1$ + CompareMessages.getString("TextMergeViewer.atEnd.message")); //$NON-NLS-1$ return MessageDialog.openQuestion(c.getShell(), - CompareMessages.getString("TextMergeViewer."+key+".title"), //$NON-NLS-1$ //$NON-NLS-2$ - CompareMessages.getString("TextMergeViewer."+key+".message")); //$NON-NLS-1$ //$NON-NLS-2$ + CompareMessages.getString("TextMergeViewer.atBeginning.title"), //$NON-NLS-1$ + CompareMessages.getString("TextMergeViewer.atBeginning.message")); //$NON-NLS-1$ } return false; } |