Author: ivaynberg
Date: Sat Apr  3 00:31:30 2010
New Revision: 930446

URL: http://svn.apache.org/viewvc?rev=930446&view=rev
Log:
some tweaks

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=930446&r1=930445&r2=930446&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java 
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Sat Apr  
3 00:31:30 2010
@@ -4316,19 +4316,8 @@ public abstract class Component implemen
 
 
        /** TODO WICKET-NG javadoc */
-       public boolean canCallListenerInterface()
+       public final boolean canCallListenerInterface()
        {
-               if (!isEnabledInHierarchy() || !determineVisibility())
-               {
-                       return false;
-               }
-               else if (getParent() != null)
-               {
-                       return getParent().canCallListenerInterface();
-               }
-               else
-               {
-                       return false;
-               }
+               return isEnabledInHierarchy() && isVisibleInHierarchy();
        }
 }

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java?rev=930446&r1=930445&r2=930446&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java Sat Apr  3 
00:31:30 2010
@@ -1227,15 +1227,6 @@ public abstract class Page extends Marku
                return renderCount;
        }
 
-       /**
-        * @see org.apache.wicket.Component#canCallListenerInterface()
-        */
-       @Override
-       public boolean canCallListenerInterface()
-       {
-               return true;
-       }
-
        /** TODO WICKET-NG javadoc */
        public final void setWasCreatedBookmarkable(boolean 
wasCreatedBookmarkable)
        {

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java?rev=930446&r1=930445&r2=930446&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java
 Sat Apr  3 00:31:30 2010
@@ -247,7 +247,7 @@ public class RequestListenerInterface
                {
                        // just return so that we have a silent fail and just 
re-render the
                        // page
-                       log.info("component not enabled or visible; ignoring 
call. Component: " + component);
+                       log.warn("component not enabled or visible; ignoring 
call. Component: " + component);
                        return;
                }
 


Reply via email to