svn commit: r1148851 - in /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/resolver: ComponentResolvers.java IComponentResolver.java

[svenmeier]

Author: svenmeier
Date: Wed Jul 20 17:01:27 2011
New Revision: 1148851

URL: http://svn.apache.org/viewvc?rev=1148851&view=rev
Log:
corrected javadoc

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/resolver/ComponentResolvers.java
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/resolver/ComponentResolvers.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/resolver/ComponentResolvers.java?rev=1148851&r1=1148850&r2=1148851&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/resolver/ComponentResolvers.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/resolver/ComponentResolvers.java
 Wed Jul 20 17:01:27 2011
@@ -42,10 +42,14 @@ public class ComponentResolvers
         * </p>
         * 
         * @param container
+        *            The container parsing its markup
         * @param markupStream
+        *            The current markupStream
         * @param tag
+        *            The current component tag while parsing the markup
         * @param filter
-        * @return <code>null</code> if a component was could not be found
+        *            A filter for application-wide resolvers
+        * @return component or {@code null} if not found
         */
        public static Component resolve(final MarkupContainer container,
                final MarkupStream markupStream, final ComponentTag tag, final 
ResolverFilter filter)

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java?rev=1148851&r1=1148850&r2=1148851&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java
 Wed Jul 20 17:01:27 2011
@@ -21,17 +21,21 @@ import org.apache.wicket.IClusterable;
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.settings.def.PageSettings;
 
 /**
- * ApplicationSettings maintains a list of IComponentResolvers. 
IComponentResolvers are responsible
- * for mapping component names to Wicket components.
+ * IComponentResolvers are responsible for mapping component names to Wicket 
components. Resolvers
+ * are first looked up in a component's hierarchy before falling back to a 
list of
+ * IComponentResolvers maintained in {@link PageSettings}.
+ * 
+ * @see ComponentResolvers
  * 
  * @author Juergen Donnerstag
  */
 public interface IComponentResolver extends IClusterable
 {
        /**
-        * Try to resolve the tag, then create a component, add it to the 
container and render it.
+        * Try to resolve a component.
         * 
         * @param container
         *            The container parsing its markup
@@ -39,7 +43,7 @@ public interface IComponentResolver exte
         *            The current markupStream
         * @param tag
         *            The current component tag while parsing the markup
-        * @return null, if not found
+        * @return component or {@code null} if not found
         */
        public Component resolve(final MarkupContainer container, final 
MarkupStream markupStream,
                final ComponentTag tag);