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

equal deleted inserted replaced

-:abc41079b313
+:59b3b4473dc8
 {
 /**
 * Abstract layouting policy.
 */
-private FormLayoutPolicy layoutPolicy;
+private FormLayouter formLayouter;
 /**
 * Item vector.
 */
 private Vector items = new Vector();
 */
 public Form(String title)
 {
 super(title);
 construct();
-layoutPolicy = new DefaultFormInteraction(this);
+formLayouter = new FormLayouter(this);
 }
 /**
 * Constructor.
 *
 ScrollBar vBar = getContentComp().getVerticalBar();
 if(vBar != null)
 {
 vBar.addSelectionListener(fsbl);
 }
-layoutPolicy.handleShowCurrentEvent();
+formLayouter.handleShowCurrentEvent();
 }
 /* (non-Javadoc)
 * @see Displayable#eswtHandleHideCurrentEvent()
 */
 ScrollBar vBar = getContentComp().getVerticalBar();
 if(vBar != null)
 {
 vBar.removeSelectionListener(fsbl);
 }
-layoutPolicy.handleHideCurrentEvent();
+formLayouter.handleHideCurrentEvent();
 }
 /* (non-Javadoc)
 * @see Displayable#eswtHandleResizeEvent(int, int)
 */
 {
 formComposite.setRedraw(false);
 formComposite.setOrigin(0, 0, true);
 formComposite.setSize(width, height);
 formComposite.setRedraw(true);
-layoutPolicy.handleResizeEvent(width, height);
+formLayouter.handleResizeEvent(width, height);
 resetLayoutTimer(0);
 }
 }
 /**
 {
 e.doit = false;
 }
 else
 {
-layoutPolicy.handleKeyEvent(e.keyCode, e.type);
+formLayouter.handleKeyEvent(e.keyCode, e.type);
 }
 }
 /**
 * Append Item to a Form.
 {
 throw new IllegalStateException(
 MsgRepository.FORM_EXCEPTION_ITEM_OWNED_BY_CONTAINER);
 }
 int returnValue = -1;
-synchronized(layoutPolicy)
+synchronized(formLayouter)
 {
 item.setParent(this);
 items.addElement(item);
 returnValue = items.indexOf(item);
 resetLayoutTimer(returnValue);
 if ((position < 0) || (position > items.size() ))
 {
 throw new IndexOutOfBoundsException(
 MsgRepository.FORM_EXCEPTION_INVALID_ITEM_INDEX);
 }
-synchronized(layoutPolicy)
+synchronized(formLayouter)
 {
 item.setParent(this);
 items.insertElementAt(item, position);
 resetLayoutTimer(items.indexOf(item));
 }
 if((position < 0) || (position > (items.size() - 1)))
 {
 throw new IndexOutOfBoundsException(
 MsgRepository.FORM_EXCEPTION_INVALID_ITEM_INDEX);
 }
-synchronized(layoutPolicy)
+synchronized(formLayouter)
 {
-((Item) items.elementAt(position)).setParent(null);
+	Item item = ((Item) items.elementAt(position));
+item.clearParent();
+	formLayouter.removeLayoutObject(item);
 items.removeElementAt(position);
 resetLayoutTimer(position - 1);
 }
 }
 /**
 * Delete all items from the formComposite.
 */
 public void deleteAll()
 {
-synchronized(layoutPolicy)
+synchronized(formLayouter)
 {
 for(int i = 0; i < items.size(); i++)
 {
-((Item) items.elementAt(i)).setParent(null);
+	        	Item item = ((Item) items.elementAt(i));
+item.clearParent();
+	        	formLayouter.removeLayoutObject(item);
 }
 items.removeAllElements();
 resetLayoutTimer(0);
 }
 }
 if((position < 0) || (position > (items.size() - 1)))
 {
 throw new IndexOutOfBoundsException(
 MsgRepository.FORM_EXCEPTION_INVALID_ITEM_INDEX);
 }
-synchronized(layoutPolicy)
+synchronized(formLayouter)
 {
 newItem.setParent(this);
 // clear reference to a form for "old" item.
-get(position).setParent(null);
+Item oldItem = get(position);
+			oldItem.clearParent();
+			formLayouter.removeLayoutObject(oldItem);
 items.setElementAt(newItem, position);
 resetLayoutTimer(position);
 }
 }
 * @throws IndexOutOfBoundsException if position is incorrect.
 */
 public Item get(int position)
 {
 Item returnItem = null;
-synchronized(layoutPolicy)
+synchronized(formLayouter)
 {
 try
 {
 returnItem = (Item) items.elementAt(position);
 }
 *
 * @param item The Item which should be set visible.
 */
 void setCurrentItem(Item item)
 {
-layoutPolicy.setCurrentItem(item);
+formLayouter.setCurrentItem(item);
 }
 /**
 * Notify item state listener about state change.
 *
 *
 * @param item
 * @param updateReason
 * @param param additional parameter
 */
-void updateItemState(Item item, int updateReason, Object param)
+	void updateItemState(Item item, int updateReason, Object param)
-{
+	{
-if(item != null && item.getParent() == this)
+		if(item != null && item.getParent() == this)
-{
+		{
-if((updateReason & Item.UPDATE_WIDTH_CHANGED) != 0)
+			if(layoutTimer != null)
-{
+			{
-synchronized(layoutPolicy)
+				formLayouter.updateItemState(item, updateReason, param);
-{
+			}
-resetLayoutTimer(items.indexOf(item));
-}
+			if((updateReason & Item.UPDATE_SIZE_CHANGED) != 0)
-}
+			{
-else
+				synchronized(formLayouter)
-{
+				{
-if(layoutPolicy instanceof DefaultFormInteraction)
+					resetLayoutTimer(items.indexOf(item));
-{
+				}
-if(layoutTimer != null)
+			}
-{
+		}
-((DefaultFormInteraction) layoutPolicy)
+	}
-.updateItemState(item, updateReason, param);
-}
-}
-}
-}
-}
 /**
 * Get Vector of items.
 *
 * @return Vector of items
 return formComposite;
 }
 /**
-* Returns form layout policy.
+* Returns form Form Layouter.
 * @return Reference to layout policy.
 *
 */
-FormLayoutPolicy getLayoutPolicy()
+FormLayouter getFormLayouter()
 {
-return layoutPolicy;
+return formLayouter;
 }
 // =========================================================================
 // TODO: remove this
 public Form(boolean leftRightLanguage, String title)
 {
 super(title);
 construct();
 layoutLR = leftRightLanguage;
-layoutPolicy = new DefaultFormInteraction(this);
+formLayouter = new FormLayouter(this);
 }
 // =========================================================================
 /**
 formTimerTask.cancel();
 formTimerTask = null;
 }
 // schedule new timer
 startIndex = Math.max(0, Math.min(newStartIndex, startIndex));
-// layoutPolicy.layoutForm(startIndex);
+// formLayouter.layoutForm(startIndex);
 formTimerTask = new FormTimerTask(startIndex);
 layoutTimer.schedule(formTimerTask, Config.FORM_LAYOUT_TIMER_DELAY);
 }
 }
 /**
+* Cancel Layout Timer.
+*/
+private void cancelLayoutTimer()
+{
+if(layoutTimer != null)
+{
+if(formTimerTask != null)
+{
+formTimerTask.cancel();
+formTimerTask = null;
+}
+layoutTimer.cancel();
+			layoutTimer = null;
+}
+}
+/**
 * Form Timer task. Triggers the formComposite to Layout.
 */
 class FormTimerTask extends TimerTask
 {
 }
 public void run()
 {
 Logger.method(Form.this, "layout");
-layoutPolicy.layoutForm(index);
+formLayouter.layoutForm(index);
 startIndex = items.size();
 }
 }
 if (e.widget instanceof Control) {
 // translate this control's coordinates to display coordinates
 Point p = ((Control) e.widget).toDisplay(new Point(e.x, e.y));
 // translate display coordinates to composite coordinates
 p = formComposite.toControl(p);
-layoutPolicy.handlePointerEvent(p.x, p.y, e.type);
+formLayouter.handlePointerEvent(p.x, p.y, e.type);
 }
 }
 }*/
 /**
 }
 public void widgetSelected(SelectionEvent se)
 {
 ScrollBar sb = (ScrollBar) se.widget;
-layoutPolicy.updateScrolling(sb.getSelection(), false);
+formLayouter.updateScrolling(sb.getSelection(), false);
 }
 }
 /**
 * Dispose Form.
 */
 void dispose()
 {
+cancelLayoutTimer();
 super.dispose();
-layoutTimer.cancel();
-layoutTimer = null;
 deleteAll();
-((DefaultFormInteraction) layoutPolicy).dispose();
+formLayouter.dispose();
-layoutPolicy = null;
+		items = null;
+formLayouter = null;
 }
 /*
 * Dispatcher thread calls.
 */
 void doCallback(LCDUIEvent event)
 {
 if((event.type & LCDUIEvent.CUSTOMITEMBIT) != 0)
 {
 // Synchronize with Form content modification operations.
-synchronized(layoutPolicy)
+synchronized(formLayouter)
 {
 // If the eSWT widget has been explicitly disposed while the event
 // was in the queue then ignore the event.
 if(event.widget != null && event.widget.isDisposed())
 {

changeset 57	59b3b4473dc8
parent 35	85266cc22c7f