diff options
author | Mickael Istria | 2017-01-30 12:51:28 +0000 |
---|---|---|
committer | Mickael Istria | 2017-04-19 12:23:18 +0000 |
commit | 1decb507efc4c69c54a27f5ded7d90c1ee296140 (patch) | |
tree | 24abb10eb8c844966d76edaa3a460b4ab64dc5a7 /org.eclipse.jface.text | |
parent | e1010f3d804f87745414135ba639256fbb8e9284 (diff) | |
download | eclipse.platform.text-1decb507efc4c69c54a27f5ded7d90c1ee296140.tar.gz eclipse.platform.text-1decb507efc4c69c54a27f5ded7d90c1ee296140.tar.xz eclipse.platform.text-1decb507efc4c69c54a27f5ded7d90c1ee296140.zip |
Bug 511302 - More explicit message for async content assistY20170420-1000I20170425-0700I20170425-0240I20170425-0215I20170424-2000I20170423-2000I20170422-2000I20170422-0300I20170421-2000I20170420-2000I20170419-2000
Change-Id: I1e8848a930453d3079363ea33d8c7c2917577b59
Signed-off-by: Mickael Istria <mistria@redhat.com>
Diffstat (limited to 'org.eclipse.jface.text')
2 files changed, 8 insertions, 4 deletions
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java index 39538bce28b..1dafdf5fd46 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java @@ -62,7 +62,7 @@ class AsyncCompletionProposalPopup extends CompletionProposalPopup { @Override public void apply(IDocument document) { - // Nothing to do + // Nothing to do, maybe show some progress report? } @Override @@ -82,12 +82,15 @@ class AsyncCompletionProposalPopup extends CompletionProposalPopup { @Override public String getDisplayString() { - return NLS.bind(JFaceTextMessages.getString("AsyncCompletionProposalPopup.computing"), Integer.valueOf(fSize - fRemaining), Integer.valueOf(fSize)); //$NON-NLS-1$ + return NLS.bind(JFaceTextMessages.getString("AsyncCompletionProposalPopup.computing"), Long.valueOf(Math.round(100. * (fSize - fRemaining)/fSize))); //$NON-NLS-1$ } @Override public String getAdditionalProposalInfo() { - return null; + return NLS.bind(JFaceTextMessages.getString("AsyncCompletionProposalPopup.computingDetails"), new Object[] { //$NON-NLS-1$; + Integer.valueOf(fSize), + Integer.valueOf(fSize - fRemaining), + Integer.valueOf(fRemaining) }); } @Override diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/JFaceTextMessages.properties b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/JFaceTextMessages.properties index 543ab27f2d4..88131ad1380 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/JFaceTextMessages.properties +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/JFaceTextMessages.properties @@ -21,4 +21,5 @@ ContentAssistant.error_computing_context=Error computing context information. CompletionProposalPopup.no_proposals=no proposals CompletionProposalPopup.error_retrieving_proposal=Error retrieving proposal text CompletionProposalPopup.unexpected_error=Unexpected error while retrieving text for a content assistance proposal. -AsyncCompletionProposalPopup.computing=Computing ({0}/{1}) ... +AsyncCompletionProposalPopup.computing=Computing proposals ({0}%) ... +AsyncCompletionProposalPopup.computingDetails={0} completion proposal processors requested.\n{1} completed; {2} pending. |