223732 StyledStringBuilder to StyledString [ma]
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java
index 3ad0d4c..a9bcde0 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java
@@ -39,7 +39,7 @@
import org.eclipse.jface.internal.text.TableOwnerDrawSupport;
import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.StyledStringBuilder;
+import org.eclipse.jface.viewers.StyledString;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.DocumentEvent;
@@ -552,9 +552,9 @@
String displayString;
StyleRange[] styleRanges= null;
if (fIsColoredLabelsSupportEnabled && p instanceof ICompletionProposalExtension6) {
- StyledStringBuilder stringBuilder= ((ICompletionProposalExtension6)p).getStyledDisplayString();
- displayString= stringBuilder.toString();
- styleRanges= stringBuilder.toStyleRanges();
+ StyledString stringBuilder= ((ICompletionProposalExtension6)p).getStyledDisplayString();
+ displayString= stringBuilder.getString();
+ styleRanges= stringBuilder.getStyleRanges();
} else
displayString= p.getDisplayString();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java
index f437b64..7ec976e 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java
@@ -61,7 +61,7 @@
import org.eclipse.jface.internal.text.TableOwnerDrawSupport;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.util.Geometry;
-import org.eclipse.jface.viewers.StyledStringBuilder;
+import org.eclipse.jface.viewers.StyledString;
import org.eclipse.jface.text.AbstractInformationControlManager;
import org.eclipse.jface.text.BadLocationException;
@@ -790,9 +790,9 @@
String displayString;
StyleRange[] styleRanges= null;
if (fIsColoredLabelsSupportEnabled && current instanceof ICompletionProposalExtension6) {
- StyledStringBuilder stringBuilder= ((ICompletionProposalExtension6)current).getStyledDisplayString();
- displayString= stringBuilder.toString();
- styleRanges= stringBuilder.toStyleRanges();
+ StyledString stringBuilder= ((ICompletionProposalExtension6)current).getStyledDisplayString();
+ displayString= stringBuilder.getString();
+ styleRanges= stringBuilder.getStyleRanges();
} else
displayString= current.getDisplayString();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ICompletionProposalExtension6.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ICompletionProposalExtension6.java
index ec787a4..5434dbc 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ICompletionProposalExtension6.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ICompletionProposalExtension6.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.jface.text.contentassist;
-import org.eclipse.jface.viewers.StyledStringBuilder;
+import org.eclipse.jface.viewers.StyledString;
/**
@@ -25,7 +25,7 @@
public interface ICompletionProposalExtension6 {
/**
- * Returns the string builder used to display this proposal in the list of completion proposals.
+ * Returns the styled string used to display this proposal in the list of completion proposals.
* This can for example be used to draw mixed colored labels.
* <p>
* <strong>Note:</strong> {@link ICompletionProposal#getDisplayString()} still needs to be
@@ -35,5 +35,5 @@
*
* @return the string builder used to display this proposal
*/
- StyledStringBuilder getStyledDisplayString();
+ StyledString getStyledDisplayString();
}
