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

equal deleted inserted replaced

-:e0d6e9bd3ca7
+:bf7ee68962da
 *
 */
 package javax.microedition.lcdui;
 import java.util.Vector;
+import java.lang.ref.WeakReference;
 import javax.microedition.lcdui.EventDispatcher.LCDUIEvent;
 import com.nokia.mj.impl.nokialcdui.ItemControlStateChangeListener;
 import org.eclipse.swt.graphics.Point;
 static final int LAYOUT_HORIZONTAL_MASK = LAYOUT_CENTER; // 15;
 static final int LAYOUT_VERTICAL_MASK = LAYOUT_VCENTER; // 48;
+/**
-static final int UPDATE_NONE = 0;
+* If Item is changed, reasons for Re-layouting.
+*/
-static final int UPDATE_ADDCOMMAND = 1;
+	static final int UPDATE_NONE = 0;
-static final int UPDATE_REMOVECOMMAND = 2;
+	static final int UPDATE_ADDCOMMAND = 1;
+	static final int UPDATE_REMOVECOMMAND = 1 << 1;
-/**
+	static final int UPDATE_DEFAULTCOMMAND = 1 << 2;
-* Item content has changed. Re-layouting not needed.
+	static final int UPDATE_ITEMCOMMANDLISTENER = 1 << 3;
-*/
+	static final int UPDATE_LABEL = 1 << 4;
-static final int UPDATE_CONTENT = 3; // general update value
+	static final int UPDATE_LAYOUT = 1 << 5;
+	static final int UPDATE_PREFERREDSIZE = 1 << 6;
-static final int UPDATE_REASON_MASK = 255;
+static final int UPDATE_HEIGHT_CHANGED = 1 << 7;
-/**
+static final int UPDATE_WIDTH_CHANGED = 1 << 8;
-* Item height has changed. Re-layouting not needed.
-*/
-static final int UPDATE_HEIGHT_CHANGED = 256;
-/**
-* Item width is changed. Re-layouting asap.
-*/
-static final int UPDATE_WIDTH_CHANGED = 512;
-/**
-* Item width and height changed. Re-layouting asap.
-*/
 static final int UPDATE_SIZE_CHANGED =
 UPDATE_HEIGHT_CHANGED | UPDATE_WIDTH_CHANGED;
+static final int UPDATE_SIZE_MASK = ~UPDATE_SIZE_CHANGED;
+	static final int UPDATE_ITEM_MAX = 1 << 15;
 private String label;
 /**
 * Vector of commands added to this item that have eSWT Command associated
 private Vector commands = new Vector();
 private ItemCommandListener itemCommandListener;
 private ItemControlStateChangeListener controlListener;
 private Command defaultCommand;
-private Screen parent;
+	private WeakReference wParent;
 private int layout;
 private int lockedPrefWidth = -1;
 private int lockedPrefHeight = -1;
 private boolean focused;
 private boolean visible;
 /**
 * Sets the parent of this Item.
-* @param parent new Parent. If null, current parent is removed.
+* @param parent new Parent. If null, current parent is to be removed.
 */
 void setParent(Screen parent)
 {
-this.parent = parent;
+	if(parent != null)
+	{
+		wParent = new WeakReference(parent);
+	}
+		else
+		{
+			clearParent();
+		}
 }
 /**
 * Gets the Item's parent.
 *
 * @return the Item's parent or null if it has none.
 */
 Screen getParent()
 {
-return parent;
+	if(wParent != null)
+	{
+		return (Screen)wParent.get();
+	}
+		else
+		{
+			return null;
+		}
+}
+/**
+* Clears the Item's parent.
+*
+*/
+void clearParent()
+{
+	if(wParent != null)
+	{
+		wParent.clear();
+			wParent = null;
+	}
 }
 /**
 * Sets the label of the item.
 *
 if(isContainedInAlert())
 {
 throw new IllegalStateException(
 MsgRepository.ITEM_EXCEPTION_OWNED_BY_ALERT);
 }
+	if((newLabel == null) && (label == null))
+		{
+			return;
+		}
 label = newLabel;
-updateParent(UPDATE_SIZE_CHANGED);
+updateParent(UPDATE_LABEL | UPDATE_SIZE_CHANGED);
 }
 /**
 * Gets the label of the item.
 *
 throw new IllegalArgumentException(
 MsgRepository.ITEM_EXCEPTION_INVALID_LAYOUT);
 }
 layout = newLayout;
 Logger.method(this, "setLayout", String.valueOf(layout));
-updateParent(UPDATE_SIZE_CHANGED);
+updateParent(UPDATE_LAYOUT | UPDATE_SIZE_CHANGED);
 }
 /**
 * Adds command to this item. If same command is already added to this item,
 * nothing happens.
 MsgRepository.ITEM_EXCEPTION_NULL_COMMAND_ADDED);
 }
 if(!commands.contains(command))
 {
 commands.addElement(command);
+updateParent(UPDATE_ADDCOMMAND, command);
-int reason = UPDATE_ADDCOMMAND;
-if(this instanceof StringItem && commands.size() == 1)
-{
-reason |= UPDATE_SIZE_CHANGED;
-}
-if(this instanceof ImageItem && commands.size() == 1)
-{
-reason |= UPDATE_SIZE_CHANGED;
-}
-updateParent(reason, command);
 }
 }
 /**
 * Removes command from the item. If command doesn't exists in this item,
 // called with null-parameter !
 if(command != null && commands.contains(command))
 {
 // Remove command from commands-vector
 commands.removeElement(command);
+			if(defaultCommand == command)
-defaultCommand = null;
+			{
+	defaultCommand = null;
-int reason = UPDATE_REMOVECOMMAND;
+			}
+updateParent(UPDATE_REMOVECOMMAND, command);
-if(this instanceof StringItem && commands.size() == 0)
-{
-reason |= UPDATE_SIZE_CHANGED;
-}
-if(this instanceof ImageItem && commands.size() == 0)
-{
-reason |= UPDATE_SIZE_CHANGED;
-}
-updateParent(reason, command);
 }
 }
 /**
 lockedPrefHeight = h;
 checkLockedSizes();
 Logger.method(this, "setPrefSize",
 String.valueOf(lockedPrefWidth),
 String.valueOf(lockedPrefHeight));
-updateParent(UPDATE_SIZE_CHANGED);
+updateParent(UPDATE_PREFERREDSIZE | UPDATE_SIZE_CHANGED);
 }
 /**
 * Sets the default command of this item. This method doesn't remove
 * commands from the item, it just tells which command is the default one.
 {
 throw new IllegalStateException(
 MsgRepository.ITEM_EXCEPTION_NOT_OWNED_BY_FORM);
 }
 // Notify item state listener
-((Form) parent).notifyItemStateChanged(this);
+((Form) getParent()).notifyItemStateChanged(this);
 }
 /**
 * Is this item's size locked.
 */
 /**
 * If the item is owned by an Alert.
 */
 boolean isContainedInAlert()
 {
-return (parent != null && parent instanceof Alert);
+return ((wParent != null) && (getParent() instanceof Alert));
 }
 /**
 * If the item is owned by an Form.
 */
 boolean isContainedInForm()
 {
-return (parent != null && parent instanceof Form);
+return ((wParent != null) && (getParent() instanceof Form));
 }
 /**
 * Return internal layout with optional custom flags.
 *
 {
 invalidateCachedSizes();
 }
 if(isContainedInForm())
 {
-((Form) parent).updateItemState(this, updateReason, param);
+	((Form) getParent()).updateItemState(this, updateReason, param);
 }
 }
 boolean hasLayout(int aLayout)
 {

changeset 61	bf7ee68962da
parent 23	98ccebc37403
child 72	1f0034e370aa