summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets
diff options
context:
space:
mode:
authorFelipe Heidrich <Felipe_Heidrich@ca.ibm.com>2012-02-24 14:19:18 -0500
committerFelipe Heidrich <Felipe_Heidrich@ca.ibm.com>2012-02-24 14:19:18 -0500
commitbaeb2750ab3cd98721ca3f9c69fc2805adaf6cf2 (patch)
treea0b30073fa8e6ba6e678da10264e550cc37878f4 /bundles/org.eclipse.swt/Eclipse SWT Custom Widgets
parentbda61fcf4d94db1af2718e1a5f14c99c4ec12c81 (diff)
downloadeclipse.platform.swt-baeb2750ab3cd98721ca3f9c69fc2805adaf6cf2.tar.gz
eclipse.platform.swt-baeb2750ab3cd98721ca3f9c69fc2805adaf6cf2.tar.xz
eclipse.platform.swt-baeb2750ab3cd98721ca3f9c69fc2805adaf6cf2.zip
review bug230854, changes to API, fix code to handle surrogates in linux, other fixes
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Custom Widgets')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BidiSegmentEvent.java16
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BidiSegmentListener.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextEvent.java3
3 files changed, 4 insertions, 19 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BidiSegmentEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BidiSegmentEvent.java
index 47e655a880..b688cb6368 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BidiSegmentEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BidiSegmentEvent.java
@@ -60,7 +60,7 @@ import org.eclipse.swt.events.*;
* </pre>
*
* <p>
- * The segments and segementsChars fields can be used together to obtain different
+ * The segments and segmentsChars fields can be used together to obtain different
* types of bidi reordering and text display. The application can use these two fields
* to insert Unicode Control Characters in specific offsets in the line, the character
* at segmentsChars[i] is inserted at the offset specified by segments[i]. When both fields
@@ -75,21 +75,9 @@ import org.eclipse.swt.events.*;
*/
public class BidiSegmentEvent extends SegmentEvent {
- /**
- * line start offset
- */
- public int lineOffset;
-
- /**
- * line text
- */
- public String lineText;
-
- static final long serialVersionUID = 3257846571587547957L;
+ static final long serialVersionUID = -3712986188155944253L;
BidiSegmentEvent(StyledTextEvent e) {
super(e);
- lineOffset = e.detail;
- lineText = e.text;
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BidiSegmentListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BidiSegmentListener.java
index e1d9770623..1e7e196fc3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BidiSegmentListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BidiSegmentListener.java
@@ -26,8 +26,8 @@ public interface BidiSegmentListener extends SWTEventListener {
* The following event fields are used:<ul>
* <li>event.lineOffset line start offset (input)</li>
* <li>event.lineText line text (input)</li>
- * <li>event.segments text segments that should be reordered
- * separately. (output)</li>
+ * <li>event.segments text segments that should be reordered separately (output)</li>
+ * <li>event.segmentsChars characters that should be inserted (output)</li>
* </ul>
*
* @param event the given event
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextEvent.java
index 98ee4ef27e..435fa651c1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextEvent.java
@@ -29,9 +29,6 @@ class StyledTextEvent extends Event {
int[] tabStops;
// used by LineBackgroundEvent
Color lineBackground;
- // used by BidiSegmentEvent
- int[] segments;
- char[] segmentsChars;
// used by TextChangedEvent
int replaceCharCount;
int newCharCount;