fenggui-svn Mailing List for FengGUI

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 660
          http://fenggui.svn.sourceforge.net/fenggui/?rev=660&view=rev
Author:   marcmenghin
Date:     2009-11-14 21:33:27 +0000 (Sat, 14 Nov 2009)

Log Message:
-----------
- moved StateManager from StatefullWidget to the new BaseStateWidget to get state handling in all widgets.
- fixed missing states on clone of RadioButton
- fixed CursorExample

Modified Paths:
--------------
    optional/org/fenggui/GameMenuButton.java
    src/org/fenggui/RadioButton.java
    src/org/fenggui/StatefullWidget.java
    src/org/fenggui/Widget.java
    test/org/fenggui/example/CursorExample.java

Added Paths:
-----------
    src/org/fenggui/BaseStateWidget.java

Modified: optional/org/fenggui/GameMenuButton.java
===================================================================

--- optional/org/fenggui/GameMenuButton.java	2009-11-09 20:28:00 UTC (rev 659)
+++ optional/org/fenggui/GameMenuButton.java	2009-11-14 21:33:27 UTC (rev 660)
@@ -106,7 +106,7 @@
 
     size.setSize(defaultState.getWidth(), defaultState.getHeight());
 
-    getAppearance().add(new PixmapBackground(defaultState, true));
+    getAppearance().add(STATE_DEFAULT.toString(), new PixmapBackground(defaultState, true));
     getAppearance().add(STATE_HOVERED.toString(), new PixmapBackground(hoverState, true));
     getAppearance().add(STATE_FOCUSED.toString(), new PixmapBackground(focusState, true));
     getAppearance().add(STATE_PRESSED.toString(), new PixmapBackground(pressedState, true));

Added: src/org/fenggui/BaseStateWidget.java
===================================================================
--- src/org/fenggui/BaseStateWidget.java	                        (rev 0)
+++ src/org/fenggui/BaseStateWidget.java	2009-11-14 21:33:27 UTC (rev 660)
@@ -0,0 +1,58 @@
+/*
+ * FengGUI - Java GUIs in OpenGL (http://www.fenggui.org)
+ * 
+ * Copyright (C) 2005-2009 FengGUI Project
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details:
+ * http://www.gnu.org/copyleft/lesser.html#TOC3
+ * 
+ * Created on Nov 14, 2009
+ * $Id$
+ */
+package org.fenggui;
+
+import org.fenggui.util.StateManager;
+
+/**
+ * 
+ * @author Marc Menghin, last edited by $Author$, $Date$
+ * @version $Revision$
+ */
+public abstract class BaseStateWidget extends BaseEventWidget
+{
+  private StateManager                stateManager;
+
+  /**
+   * 
+   */
+  public BaseStateWidget()
+  {
+    stateManager = new StateManager();
+  }
+
+  protected StateManager getStateManager()
+  {
+    return stateManager;
+  }
+
+  /* (non-Javadoc)
+   * @see org.fenggui.BaseEventWidget#clone()
+   */
+  @Override
+  public BaseStateWidget clone()
+  {
+    BaseStateWidget result = (BaseStateWidget) super.clone();
+    result.stateManager = new StateManager();
+    return result;
+  }
+  
+
+}

Modified: src/org/fenggui/RadioButton.java
===================================================================
--- src/org/fenggui/RadioButton.java	2009-11-09 20:28:00 UTC (rev 659)
+++ src/org/fenggui/RadioButton.java	2009-11-14 21:33:27 UTC (rev 660)
@@ -191,7 +191,7 @@
     RadioButton<E> result = (RadioButton<E>) super.clone();
     result.value = null;
     result.radioButtonGroup = null;
-
+    result.getStateManager().addStates(STATE_SELECTED, STATE_DESELECTED);
     return result;
   }
 

Modified: src/org/fenggui/StatefullWidget.java
===================================================================
--- src/org/fenggui/StatefullWidget.java	2009-11-09 20:28:00 UTC (rev 659)
+++ src/org/fenggui/StatefullWidget.java	2009-11-14 21:33:27 UTC (rev 660)
@@ -29,7 +29,6 @@
 import org.fenggui.event.mouse.MouseEnteredEvent;
 import org.fenggui.event.mouse.MouseExitedEvent;
 import org.fenggui.util.StateIdentifier;
-import org.fenggui.util.StateManager;
 
 /**
  * Implementation of a statefull Widget. All widgets where the user is able to interact
@@ -54,7 +53,6 @@
 
   private T                           appearance             = null;
   private CursorType                  defaultHoverCursorType = CursorType.HAND;
-  private StateManager                stateManager;
 
   /**
    * creates a new StatefullWidget.
@@ -62,18 +60,13 @@
   public StatefullWidget()
   {
     super();
-    stateManager = new StateManager();
-    stateManager.addStates(STATE_DEFAULT, STATE_FOCUSED, STATE_UNFOCUSED, STATE_HOVERED, STATE_NONHOVERED,
+
+    getStateManager().addStates(STATE_DEFAULT, STATE_FOCUSED, STATE_UNFOCUSED, STATE_HOVERED, STATE_NONHOVERED,
       STATE_ENABLED, STATE_DISABLED, STATE_ERROR, STATE_NOERROR);
     getStateManager().activate(STATE_DEFAULT);
-    stateManager.addStateChangedListener(new StateChangedListener(this));
+    getStateManager().addStateChangedListener(new StateChangedListener(this));
   }
 
-  protected StateManager getStateManager()
-  {
-    return stateManager;
-  }
-
   /* (non-Javadoc)
    * @see org.fenggui.BaseEventWidget#onMouseEntered(org.fenggui.event.mouse.MouseEnteredEvent)
    */
@@ -177,11 +170,10 @@
   {
     StatefullWidget<T> result = (StatefullWidget<T>) super.clone();
     result.appearance = (T) appearance.clone(result);
-    result.stateManager = new StateManager();
-    result.stateManager.addStates(STATE_DEFAULT, STATE_FOCUSED, STATE_UNFOCUSED, STATE_HOVERED, STATE_NONHOVERED, STATE_ENABLED,
-      STATE_DISABLED, STATE_ERROR, STATE_NOERROR);
-    result.stateManager.activate(STATE_DEFAULT);
-    result.stateManager.addStateChangedListener(new StateChangedListener(result));
+    result.getStateManager().addStates(STATE_DEFAULT, STATE_FOCUSED, STATE_UNFOCUSED, STATE_HOVERED, STATE_NONHOVERED,
+      STATE_ENABLED, STATE_DISABLED, STATE_ERROR, STATE_NOERROR);
+    result.getStateManager().activate(STATE_DEFAULT);
+    result.getStateManager().addStateChangedListener(new StateChangedListener(result));
 
     return result;
   }
@@ -205,7 +197,7 @@
       //      this.widget.getAppearance().disableStates(this.widget.stateManager.getInactiveStates());
 
       this.widget.getAppearance().disableAll();
-      this.widget.getAppearance().enableStates(this.widget.stateManager.getActiveStates());
+      this.widget.getAppearance().enableStates(this.widget.getStateManager().getActiveStates());
 
     }
 

Modified: src/org/fenggui/Widget.java
===================================================================
--- src/org/fenggui/Widget.java	2009-11-09 20:28:00 UTC (rev 659)
+++ src/org/fenggui/Widget.java	2009-11-14 21:33:27 UTC (rev 660)
@@ -52,7 +52,7 @@
  * @see org.fenggui.background.Background
  * @see org.fenggui.border.Border
   */
-public class Widget extends BaseEventWidget implements IWidget
+public class Widget extends BaseStateWidget implements IWidget
 {
   private Dimension           size;
   private Dimension           minSize;

Modified: test/org/fenggui/example/CursorExample.java
===================================================================
--- test/org/fenggui/example/CursorExample.java	2009-11-09 20:28:00 UTC (rev 659)
+++ test/org/fenggui/example/CursorExample.java	2009-11-14 21:33:27 UTC (rev 660)
@@ -22,15 +22,15 @@
 import org.fenggui.binding.render.Binding;
 import org.fenggui.binding.render.Cursor;
 import org.fenggui.binding.render.CursorFactory;
+import org.fenggui.binding.render.Graphics;
 import org.fenggui.binding.render.ImageFont;
-import org.fenggui.binding.render.Graphics;
 import org.fenggui.decorator.background.Background;
 import org.fenggui.decorator.background.PlainBackground;
 import org.fenggui.decorator.border.Border;
 import org.fenggui.decorator.border.PlainBorder;
+import org.fenggui.event.mouse.MouseClickedEvent;
 import org.fenggui.event.mouse.MouseEnteredEvent;
 import org.fenggui.event.mouse.MouseExitedEvent;
-import org.fenggui.event.mouse.MousePressedEvent;
 import org.fenggui.util.Color;
 import org.fenggui.util.Point;
 
@@ -100,17 +100,42 @@
       background = new PlainBackground(Color.LIGHT_GRAY);
     }
 
-    protected void onEventFired(String eventType, MouseEnteredEvent mouseEnteredEvent)
+    
+    /* (non-Javadoc)
+     * @see org.fenggui.BaseEventWidget#onMouseEntered(org.fenggui.event.mouse.MouseEnteredEvent)
+     */
+    @Override
+    protected void onMouseEntered(MouseEnteredEvent event)
     {
       cursor.show();
+      super.onMouseEntered(event);
     }
 
-    protected void onEventFired(String eventType, MouseExitedEvent mouseExitedEvent)
+
+    /* (non-Javadoc)
+     * @see org.fenggui.BaseEventWidget#onMouseExited(org.fenggui.event.mouse.MouseExitedEvent)
+     */
+    @Override
+    protected void onMouseExited(MouseExitedEvent event)
     {
       Binding.getInstance().getCursorFactory().getDefaultCursor().show();
+      super.onMouseExited(event);
     }
 
+    
+
+    /* (non-Javadoc)
+     * @see org.fenggui.BaseEventWidget#onMouseClicked(org.fenggui.event.mouse.MouseClickedEvent)
+     */
     @Override
+    protected void onMouseClicked(MouseClickedEvent event)
+    {
+      pressed = new Point(event.getDisplayX() - this.getX(), event.getDisplayY() - this.getY());
+      super.onMouseClicked(event);
+    }
+
+
+    @Override
     public void paint(Graphics g)
     {
       background.paint(g, 0, 0, getWidth(), getHeight());
@@ -125,11 +150,6 @@
       g.drawLine(pressed.getX() + 2, pressed.getY() - 2, pressed.getX() - 2, pressed.getY() + 2);
     }
 
-    protected void onEventFired(String eventType, MousePressedEvent mp)
-    {
-      pressed = new Point(mp.getDisplayX() - this.getX(), mp.getDisplayY() - this.getY());
-    }
-
   }
 
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (8)	Nov (12)	Dec (26)
2007	Jan (30)	Feb (51)	Mar (26)	Apr (32)	May (15)	Jun (17)	Jul (11)	Aug (33)	Sep (10)	Oct (28)	Nov (32)	Dec (6)
2008	Jan (36)	Feb (3)	Mar (23)	Apr (29)	May (37)	Jun (18)	Jul (5)	Aug (1)	Sep (1)	Oct (7)	Nov	Dec
2009	Jan (8)	Feb (2)	Mar (18)	Apr (18)	May (5)	Jun (10)	Jul (2)	Aug (6)	Sep	Oct (2)	Nov (2)	Dec