FCL/sf/app/jrt: comparison javauis/lcdui_qt/src/javax/microedition/lcdui/TextWrapper.java

equal deleted inserted replaced

-:dc7c549001d5
+:85266cc22c7f
 * Description:
 *
 */
 package javax.microedition.lcdui;
-import org.eclipse.ercp.swt.mobile.ConstrainedText;
 import org.eclipse.ercp.swt.mobile.TextExtension;
+import org.eclipse.swt.internal.extension.TextExtensionExtension;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Rectangle;
 {
 if(control instanceof TextExtension)
 {
 retTopPixel = ((TextExtension) control).getTopPixel();
 }
-// ConstrainedText does not scroll -> value is 0
 }
 });
 }
 return retTopPixel;
 }
 {
 if(control instanceof TextExtension)
 {
 ((TextExtension) control).addModifyListener(ltnr);
 }
-else
-{
-((ConstrainedText) control).addModifyListener(ltnr);
-}
 }
 }
 /**
 * Add selection listener.
 if(control != null && ltnr != null)
 {
 if(control instanceof TextExtension)
 {
 ((TextExtension) control).addSelectionListener(ltnr);
-}
-else
-{
-((ConstrainedText) control).addSelectionListener(ltnr);
 }
 }
 }
 /**
 * @param aConstraints
 * @return
 */
 static Control eswtConstructText(Composite parent, int aStyle, int aConstraints)
 {
-Control ret = null;
 int style = aStyle;
 int extractedFlag = aConstraints & ~TextField.CONSTRAINT_MASK;
 int extractedConstraint = aConstraints & TextField.CONSTRAINT_MASK;
 if((extractedFlag & TextField.PASSWORD) == TextField.PASSWORD)
 {
 // Text class will remove incompatible flags for SINGLE
+style &= ~SWT.MULTI;
 style |= SWT.SINGLE | SWT.PASSWORD;
 }
 if((extractedFlag & TextField.UNEDITABLE) == TextField.UNEDITABLE)
 {
 style |= SWT.READ_ONLY;
 }
 if(extractedConstraint == TextField.NUMERIC)
 {
-ret = new ConstrainedText(parent, style, ConstrainedText.NUMERIC);
+extractedConstraint = TextExtensionExtension.NUMERIC;
 }
 else if(extractedConstraint == TextField.DECIMAL)
 {
-ret = new ConstrainedText(parent, style, ConstrainedText.DECIMAL);
+extractedConstraint = TextExtensionExtension.DECIMAL;
 }
 else if(extractedConstraint == TextField.PHONENUMBER)
 {
-ret = new ConstrainedText(parent, style, ConstrainedText.PHONENUMBER);
+extractedConstraint = TextExtensionExtension.PHONENUMBER;
 }
-else if(extractedConstraint == TextField.NON_PREDICTIVE
+else {
-|| extractedConstraint == TextField.SENSITIVE)
+extractedConstraint = 0;
-{
+}
-// We treat non-predictive and sensitive to be equal
+return new TextExtensionExtension(parent, style,extractedConstraint);
-ret = new TextExtension(parent, style, TextExtension.NON_PREDICTIVE);
+}
-}
-else
+/**
-{
+* Get caret position.
-ret = new TextExtension(parent, style);
+*
+* @param control text control
+*/
+static int eswtGetCaretPosition(Control control)
+{
+int ret = 0;
+if(control != null)
+{
+if(control instanceof TextExtension)
+{
+ret = ((TextExtension) control).getCaretPosition();
+}
 }
 return ret;
 }
 /**
-* Get caret position.
+* Get caret line number.
 *
 * @param control text control
 */
-static int eswtGetCaretPosition(Control control)
+static int eswtGetCaretLine(Control control)
 {
 int ret = 0;
 if(control != null)
 {
 if(control instanceof TextExtension)
 {
-ret = ((TextExtension) control).getCaretPosition();
+ret = ((TextExtension) control).getCaretLineNumber();
-}
-else
-{
-ret = ((ConstrainedText) control).getCaretPosition();
 }
 }
 return ret;
 }
 /**
-* Get caret line number.
+* Get content.
 *
 * @param control text control
 */
-static int eswtGetCaretLine(Control control)
+static String eswtGetContent(Control control)
+{
+String ret = "";
+if(control != null)
+{
+if(control instanceof TextExtension)
+{
+ret = ((TextExtension) control).getText();
+}
+}
+return ret;
+}
+/**
+* Get line count.
+*
+* @param control text control
+*/
+static int eswtGetLineCount(Control control)
+{
+int ret = 1;
+if(control != null)
+{
+if(control instanceof TextExtension)
+{
+ret = ((TextExtension) control).getLineCount();
+}
+}
+return ret;
+}
+/**
+* Get line height.
+*
+* @param control text control
+*/
+static int eswtGetLineHeight(Control control)
 {
 int ret = 0;
 if(control != null)
 {
 if(control instanceof TextExtension)
 {
-ret = ((TextExtension) control).getCaretLineNumber();
+ret = ((TextExtension) control).getLineHeight();
 }
 }
 return ret;
 }
 /**
-* Get content.
+* Get maximum content size.
 *
 * @param control text control
 */
-static String eswtGetContent(Control control)
+static int eswtGetMaxSize(Control control)
+{
+int ret = 0;
+if(control != null)
+{
+if(control instanceof TextExtension)
+{
+ret = ((TextExtension) control).getTextLimit();
+}
+}
+return ret;
+}
+/**
+* Get selected content.
+*
+* @param control text control
+*/
+static String eswtGetSelectedContent(Control control)
 {
 String ret = "";
 if(control != null)
 {
 if(control instanceof TextExtension)
 {
-ret = ((TextExtension) control).getText();
+ret = ((TextExtension) control).getSelectionText();
-}
-else
-{
-ret = ((ConstrainedText) control).getText();
 }
 }
 return ret;
 }
 /**
-* Get line count.
+* Get content size.
 *
 * @param control text control
 */
-static int eswtGetLineCount(Control control)
+static int eswtGetSize(Control control)
 {
-int ret = 1;
+int ret = 0;
 if(control != null)
 {
 if(control instanceof TextExtension)
 {
-ret = ((TextExtension) control).getLineCount();
+ret = ((TextExtension) control).getCharCount();
 }
 }
 return ret;
 }
 /**
-* Get line height.
-*
-* @param control text control
-*/
-static int eswtGetLineHeight(Control control)
-{
-int ret = 0;
-if(control != null)
-{
-if(control instanceof TextExtension)
-{
-ret = ((TextExtension) control).getLineHeight();
-}
-else
-{
-ret = ((ConstrainedText) control).getSize().y;
-}
-}
-return ret;
-}
-/**
-* Get maximum content size.
-*
-* @param control text control
-*/
-static int eswtGetMaxSize(Control control)
-{
-int ret = 0;
-if(control != null)
-{
-if(control instanceof TextExtension)
-{
-ret = ((TextExtension) control).getTextLimit();
-}
-else
-{
-ret = ((ConstrainedText) control).getTextLimit();
-}
-}
-return ret;
-}
-/**
-* Get selected content.
-*
-* @param control text control
-*/
-static String eswtGetSelectedContent(Control control)
-{
-String ret = "";
-if(control != null)
-{
-if(control instanceof TextExtension)
-{
-ret = ((TextExtension) control).getSelectionText();
-}
-else
-{
-// TODO: eSWT support required - get selection in ConstrainedText
-ret = ((ConstrainedText) control).getText();
-}
-}
-return ret;
-}
-/**
-* Get content size.
-*
-* @param control text control
-*/
-static int eswtGetSize(Control control)
-{
-int ret = 0;
-if(control != null)
-{
-if(control instanceof TextExtension)
-{
-ret = ((TextExtension) control).getCharCount();
-}
-else
-{
-ret = ((ConstrainedText) control).getCharCount();
-}
-}
-return ret;
-}
-/**
 * Remove modify listener.
 *
 * @param control text control
 * @param ltnr listener
 */
 {
 if(control instanceof TextExtension)
 {
 ((TextExtension) control).removeModifyListener(ltnr);
 }
-else
-{
-((ConstrainedText) control).removeModifyListener(ltnr);
-}
 }
 }
 /**
 * Remove modify listener.
 {
 if(control instanceof TextExtension)
 {
 ((TextExtension) control).removeSelectionListener(ltnr);
 }
-else
-{
-((ConstrainedText) control).removeSelectionListener(ltnr);
-}
 }
 }
 /**
 * Set content.
 if(control != null)
 {
 if(control instanceof TextExtension)
 {
 ((TextExtension) control).setText(text);
-}
-else
-{
-((ConstrainedText) control).setText(text);
 }
 }
 }
 /**
 {
 if(control instanceof TextExtension)
 {
 ((TextExtension) control).setTextLimit(maxSize);
 }
-else
-{
-((ConstrainedText) control).setTextLimit(maxSize);
-}
 }
 }
 /**
 * Set selection.
 if(control != null)
 {
 if(control instanceof TextExtension)
 {
 ((TextExtension) control).setSelection(sta, end);
-}
-else
-{
-((ConstrainedText) control).setSelection(sta, end);
 }
 }
 }
 /**

changeset 35	85266cc22c7f
parent 23	98ccebc37403