svn commit: r1162019 - in /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper: AbstractComponentMapper.java PageInstanceMapper.java

[mgrigorov]

Author: mgrigorov
Date: Fri Aug 26 08:15:46 2011
New Revision: 1162019

URL: http://svn.apache.org/viewvc?rev=1162019&view=rev
Log:
Minor improvements.

Use getComponentPath() instead of getPageRelativePath() because the latter may 
need to get the page instance from the stores.
Use Args.notNull().


Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractComponentMapper.java
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractComponentMapper.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractComponentMapper.java?rev=1162019&r1=1162018&r2=1162019&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractComponentMapper.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractComponentMapper.java
 Fri Aug 26 08:15:46 2011
@@ -112,10 +112,8 @@ public abstract class AbstractComponentM
         */
        protected void encodePageComponentInfo(Url url, PageComponentInfo info)
        {
-               if (url == null)
-               {
-                       throw new IllegalStateException("Argument 'url' may not 
be null.");
-               }
+               Args.notNull(url, "url");
+
                if (info != null)
                {
                        String s = info.toString();

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java?rev=1162019&r1=1162018&r2=1162019&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java
 Fri Aug 26 08:15:46 2011
@@ -114,7 +114,7 @@ public class PageInstanceMapper extends 
                {
                        ListenerInterfaceRequestHandler handler = 
(ListenerInterfaceRequestHandler)requestHandler;
                        IRequestablePage page = handler.getPage();
-                       String componentPath = 
handler.getComponent().getPageRelativePath();
+                       String componentPath = handler.getComponentPath();
                        RequestListenerInterface listenerInterface = 
handler.getListenerInterface();
 
                        Integer renderCount = null;