Author: gbrown
Date: Thu May  6 22:08:50 2010
New Revision: 941952

URL: http://svn.apache.org/viewvc?rev=941952&view=rev
Log:
Update popup accessor methods for naming consistency.

Modified:
    pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java
    pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java
    pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java
    pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java
    pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java
    pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
    pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java
    pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java
URL: 
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java?rev=941952&r1=941951&r2=941952&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java Thu May  6 
22:08:50 2010
@@ -110,7 +110,7 @@ public class CalendarButton extends Butt
      * component and the skin.
      */
     public interface Skin {
-        public Window getListPopup();
+        public Window getCalendarPopup();
     }
 
     private int year;
@@ -169,7 +169,7 @@ public class CalendarButton extends Butt
      * @return the popup window associated with this components skin
      */
     public Window getListPopup() {
-        return ((CalendarButton.Skin) getSkin()).getListPopup();
+        return ((CalendarButton.Skin) getSkin()).getCalendarPopup();
     }
 
     /**

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java
URL: 
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java?rev=941952&r1=941951&r2=941952&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java Thu May  6 
22:08:50 2010
@@ -82,7 +82,7 @@ public class ColorChooserButton extends 
      * component and the skin.
      */
     public interface Skin {
-        public Window getListPopup();
+        public Window getColorChooserPopup();
     }
 
     private Color selectedColor = null;
@@ -124,7 +124,7 @@ public class ColorChooserButton extends 
      * @return the popup window associated with this components skin
      */
     public Window getListPopup() {
-        return ((ColorChooserButton.Skin) getSkin()).getListPopup();
+        return ((ColorChooserButton.Skin) getSkin()).getColorChooserPopup();
     }
 
     /**

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java
URL: 
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java?rev=941952&r1=941951&r2=941952&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java Thu May  6 
22:08:50 2010
@@ -125,7 +125,7 @@ public class ListButton extends Button {
      * component and the skin.
      */
     public interface Skin {
-        public Window getListPopup();
+        public Window getListViewPopup();
     }
 
     private List<?> listData;
@@ -203,7 +203,7 @@ public class ListButton extends Button {
      * @return the popup window associated with this components skin
      */
     public Window getListPopup() {
-        return ((ListButton.Skin) getSkin()).getListPopup();
+        return ((ListButton.Skin) getSkin()).getListViewPopup();
     }
 
     /**

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java
URL: 
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java?rev=941952&r1=941951&r2=941952&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java Thu May  6 
22:08:50 2010
@@ -54,7 +54,7 @@ public class MenuButton extends Button {
      * component and the skin.
      */
     public interface Skin {
-        public Window getListPopup();
+        public Window getMenuPopup();
     }
 
     private Menu menu = null;
@@ -83,7 +83,7 @@ public class MenuButton extends Button {
      * @return the popup window associated with this components skin
      */
     public Window getListPopup() {
-        return ((MenuButton.Skin) getSkin()).getListPopup();
+        return ((MenuButton.Skin) getSkin()).getMenuPopup();
     }
 
     @Override

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java
URL: 
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java?rev=941952&r1=941951&r2=941952&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java 
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java Thu 
May  6 22:08:50 2010
@@ -178,7 +178,7 @@ public abstract class CalendarButtonSkin
 
     // CalendarButton.Skin methods
 
-    public Window getListPopup() {
+    public Window getCalendarPopup() {
         return calendarPopup;
     }
 

Modified: 
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
URL: 
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java?rev=941952&r1=941951&r2=941952&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java 
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java 
Thu May  6 22:08:50 2010
@@ -189,7 +189,7 @@ public abstract class ColorChooserButton
 
     // ColorChooserButton.Skin methods
 
-    public Window getListPopup() {
+    public Window getColorChooserPopup() {
         return colorChooserPopup;
     }
 

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java
URL: 
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java?rev=941952&r1=941951&r2=941952&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java Thu May  
6 22:08:50 2010
@@ -175,7 +175,7 @@ public abstract class ListButtonSkin ext
 
     // ListButton.Skin methods
 
-    public Window getListPopup() {
+    public Window getListViewPopup() {
         return listViewPopup;
     }
 

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java
URL: 
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java?rev=941952&r1=941951&r2=941952&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java Thu May  
6 22:08:50 2010
@@ -82,7 +82,7 @@ public abstract class MenuButtonSkin ext
 
     // MenuButton.Skin methods
 
-    public Window getListPopup() {
+    public Window getMenuPopup() {
         return menuPopup;
     }
 


Reply via email to