You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/06/23 14:42:23 UTC

svn commit: r957174 - in /pivot/trunk: tutorials/src/org/apache/pivot/tutorials/menus/ wtk-terra/src/org/apache/pivot/wtk/skin/terra/ wtk/src/org/apache/pivot/wtk/ wtk/src/org/apache/pivot/wtk/media/ wtk/src/org/apache/pivot/wtk/skin/

Author: gbrown
Date: Wed Jun 23 12:42:22 2010
New Revision: 957174

URL: http://svn.apache.org/viewvc?rev=957174&view=rev
Log:
Eliminate unused Menu.Item and Menu.Section name properties; minor fix to MenuButton tutorial.


Modified:
    pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuButtons.java
    pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
    pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java
    pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Drawing.java
    pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuItemSkin.java

Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuButtons.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuButtons.java?rev=957174&r1=957173&r2=957174&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuButtons.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuButtons.java Wed Jun 23 12:42:22 2010
@@ -32,6 +32,7 @@ import org.apache.pivot.wtk.Point;
 import org.apache.pivot.wtk.Window;
 import org.apache.pivot.wtk.content.ColorItem;
 import org.apache.pivot.wtk.media.Drawing;
+import org.apache.pivot.wtk.media.drawing.Canvas;
 import org.apache.pivot.wtk.media.drawing.Ellipse;
 import org.apache.pivot.wtk.media.drawing.Rectangle;
 import org.apache.pivot.wtk.media.drawing.Shape;
@@ -98,14 +99,16 @@ public class MenuButtons implements Appl
         colorListButton = (ListButton)beanSerializer.get("colorListButton");
         imageView = (ImageView)beanSerializer.get("imageView");
 
-        drawing = new Drawing();
 
         Rectangle borderRectangle = new Rectangle();
         borderRectangle.setSize(MAX_X, MAX_Y);
         borderRectangle.setStroke((Paint)null);
         borderRectangle.setFill("#eeeeee");
 
-        drawing.getCanvas().add(borderRectangle);
+        Canvas canvas = new Canvas();
+        canvas.add(borderRectangle);
+
+        drawing = new Drawing(canvas);
 
         imageView.setImage(drawing);
 

Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java?rev=957174&r1=957173&r2=957174&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java Wed Jun 23 12:42:22 2010
@@ -620,9 +620,4 @@ public class TerraMenuSkin extends Conta
     public void activeItemChanged(Menu menu, Menu.Item previousActiveItem) {
         // No-op
     }
-
-    @Override
-    public void nameChanged(Menu.Section section, String previousName) {
-        // No-op
-    }
 }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java?rev=957174&r1=957173&r2=957174&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java Wed Jun 23 12:42:22 2010
@@ -39,13 +39,6 @@ public class Menu extends Container {
         private static class ItemListenerList extends ListenerList<ItemListener>
             implements ItemListener {
             @Override
-            public void nameChanged(Item item, String previousName) {
-                for (ItemListener listener : this) {
-                    listener.nameChanged(item, previousName);
-                }
-            }
-
-            @Override
             public void menuChanged(Item item, Menu previousMenu) {
                 for (ItemListener listener : this) {
                     listener.menuChanged(item, previousMenu);
@@ -107,34 +100,6 @@ public class Menu extends Container {
             return section;
         }
 
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            String previousName = this.name;
-
-            if (name != previousName) {
-                if (section != null
-                    && section.menu != null) {
-                    if (section.menu.itemMap.containsKey(name)) {
-                        throw new IllegalArgumentException("A menu item named \"" + name
-                            + "\" already exists.");
-                    }
-
-                    if (previousName != null) {
-                        section.menu.itemMap.remove(previousName);
-                    }
-
-                    section.menu.itemMap.put(name, this);
-                }
-
-                this.name = name;
-
-                itemListeners.nameChanged(this, previousName);
-            }
-        }
-
         public Menu getMenu() {
             return menu;
         }
@@ -242,14 +207,6 @@ public class Menu extends Container {
      */
     public interface ItemListener {
         /**
-         * Called when an item's name has changed.
-         *
-         * @param item
-         * @param previousName
-         */
-        public void nameChanged(Item item, String previousName);
-
-        /**
          * Called when an item's menu has changed.
          *
          * @param item
@@ -285,13 +242,6 @@ public class Menu extends Container {
                     listener.itemsRemoved(section, index, removed);
                 }
             }
-
-            @Override
-            public void nameChanged(Menu.Section section, String previousName) {
-                for (SectionListener listener : this) {
-                    listener.nameChanged(section, previousName);
-                }
-            }
         }
 
         private Menu menu = null;
@@ -305,33 +255,6 @@ public class Menu extends Container {
             return menu;
         }
 
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            String previousName = this.name;
-
-            if (name != previousName) {
-                if (menu != null) {
-                    if (menu.sectionMap.containsKey(name)) {
-                        throw new IllegalArgumentException("A menu section named \"" + name
-                            + "\" already exists.");
-                    }
-
-                    if (previousName != null) {
-                        menu.sectionMap.remove(previousName);
-                    }
-
-                    menu.sectionMap.put(name, this);
-                }
-
-                this.name = name;
-
-                sectionListeners.nameChanged(this, previousName);
-            }
-        }
-
         @Override
         public int add(Item item) {
             int index = getLength();
@@ -434,14 +357,6 @@ public class Menu extends Container {
          * @param removed
          */
         public void itemsRemoved(Section section, int index, Sequence<Item> removed);
-
-        /**
-         * Called when a section's name has changed.
-         *
-         * @param section
-         * @param previousName
-         */
-        public void nameChanged(Section section, String previousName);
     }
 
     /**

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Drawing.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Drawing.java?rev=957174&r1=957173&r2=957174&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Drawing.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Drawing.java Wed Jun 23 12:42:22 2010
@@ -76,6 +76,14 @@ public class Drawing extends Image {
 
     private DrawingListenerList drawingListeners = new DrawingListenerList();
 
+    public Drawing() {
+        this(null);
+    }
+
+    public Drawing(Canvas canvas) {
+        setCanvas(canvas);
+    }
+
     @Override
     public int getWidth() {
         validate();

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuItemSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuItemSkin.java?rev=957174&r1=957173&r2=957174&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuItemSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuItemSkin.java Wed Jun 23 12:42:22 2010
@@ -171,11 +171,6 @@ public abstract class MenuItemSkin exten
     }
 
     @Override
-    public void nameChanged(Menu.Item menuItem, String previousName) {
-        // No-op
-    }
-
-    @Override
     public void menuChanged(Menu.Item menuItem, Menu previousMenu) {
         menuPopup.setMenu(menuItem.getMenu());
         repaintComponent();