Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ThreadsafeCompoundRequestMapper.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ThreadsafeCompoundRequestMapper.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ThreadsafeCompoundRequestMapper.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ThreadsafeCompoundRequestMapper.java Wed Dec 23 19:24:13 2009 @@ -37,28 +37,9 @@ */ public class ThreadsafeCompoundRequestMapper implements ICompoundRequestMapper { - /* - * (non-Javadoc) - * - * @seeorg.apache.wicket.request.ICompoundRequestMapper#register(org.apache.wicket.request. - * IRequestMapper) - */ - public void register(IRequestMapper encoder) - { - mappers.add(0, encoder); - } - - /* - * (non-Javadoc) + /** * - * @seeorg.apache.wicket.request.ICompoundRequestMapper#unregister(org.apache.wicket.request. - * IRequestMapper) */ - public void unregister(IRequestMapper encoder) - { - mappers.remove(encoder); - } - private static class EncoderWithSegmentsCount implements Comparable<EncoderWithSegmentsCount> { private final IRequestMapper mapper; @@ -79,7 +60,32 @@ { return mapper; } - }; + } + + private final List<IRequestMapper> mappers = new CopyOnWriteArrayList<IRequestMapper>(); + + /** + * Construct. + */ + public ThreadsafeCompoundRequestMapper() + { + } + + /** + * @see org.apache.wicket.ng.request.ICompoundRequestMapper#register(org.apache.wicket.ng.request.IRequestMapper) + */ + public void register(IRequestMapper encoder) + { + mappers.add(0, encoder); + } + + /** + * @see org.apache.wicket.ng.request.ICompoundRequestMapper#unregister(org.apache.wicket.ng.request.IRequestMapper) + */ + public void unregister(IRequestMapper encoder) + { + mappers.remove(encoder); + } /** * Searches the registered {...@link IRequestMapper}s to find one that can decode the @@ -142,8 +148,6 @@ return null; } - private final List<IRequestMapper> mappers = new CopyOnWriteArrayList<IRequestMapper>(); - /** * The scope of the compound mapper is the highest score of the registered mappers. * @@ -158,5 +162,4 @@ } return score; } - }
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java Wed Dec 23 19:24:13 2009 @@ -31,14 +31,57 @@ */ public class ComponentInfo { + private static final char BEHAVIOR_INDEX_SEPARATOR = '.'; + private static final char SEPARATOR = '-'; + + private static final String TMP_PLACEHOLDER = "[[[[[[[WICKET[[TMP]]DASH]]" + Math.random() + + "]]]]"; + + /** + * + * @param path + * @return + */ + private static String encodeComponentPath(String path) + { + if (path != null) + { + path = path.replace("" + SEPARATOR, TMP_PLACEHOLDER); + path = path.replace(':', SEPARATOR); + path = path.replace(TMP_PLACEHOLDER, "" + SEPARATOR + SEPARATOR); + return path; + } + else + { + return null; + } + } + + /** + * + * @param path + * @return + */ + private static String decodeComponentPath(String path) + { + if (path != null) + { + path = path.replace("" + SEPARATOR + SEPARATOR, TMP_PLACEHOLDER); + path = path.replace(SEPARATOR, ':'); + path = path.replace(TMP_PLACEHOLDER, "" + SEPARATOR); + return path; + } + else + { + return null; + } + } + private final String listenerInterface; private final String componentPath; private final Integer behaviorIndex; private final Integer renderCount; - private static final char BEHAVIOR_INDEX_SEPARATOR = '.'; - private static final char SEPARATOR = '-'; - /** * Construct. * @@ -82,7 +125,7 @@ { return behaviorIndex; } - + /** * * @return render count @@ -92,50 +135,20 @@ return renderCount; } - private static final String TMP_PLACEHOLDER = "[[[[[[[WICKET[[TMP]]DASH]]" + Math.random() + - "]]]]"; - - private static String encodeComponentPath(String path) - { - if (path != null) - { - path = path.replace("" + SEPARATOR, TMP_PLACEHOLDER); - path = path.replace(':', SEPARATOR); - path = path.replace(TMP_PLACEHOLDER, "" + SEPARATOR + SEPARATOR); - return path; - } - else - { - return null; - } - } - - private static String decodeComponentPath(String path) - { - if (path != null) - { - path = path.replace("" + SEPARATOR + SEPARATOR, TMP_PLACEHOLDER); - path = path.replace(SEPARATOR, ':'); - path = path.replace(TMP_PLACEHOLDER, "" + SEPARATOR); - return path; - } - else - { - return null; - } - } - + /** + * @see java.lang.Object#toString() + */ @Override public String toString() { StringBuilder result = new StringBuilder(); - + if (renderCount != null) { result.append(renderCount); result.append(BEHAVIOR_INDEX_SEPARATOR); } - + result.append(listenerInterface); if (behaviorIndex != null) @@ -170,7 +183,7 @@ } return true; } - + /** * Parses the given string. * @@ -204,7 +217,7 @@ Integer behaviorIndex = null; Integer renderCount = null; - + String listenerParts[] = Strings.split(listenerInterface, BEHAVIOR_INDEX_SEPARATOR); if (listenerParts.length == 2) { @@ -216,7 +229,7 @@ else if (isNumber(listenerParts[1])) { listenerInterface = listenerParts[0]; - behaviorIndex = Integer.valueOf(listenerParts[1]); + behaviorIndex = Integer.valueOf(listenerParts[1]); } else { @@ -241,5 +254,4 @@ return new ComponentInfo(renderCount, listenerInterface, componentPath, behaviorIndex); } } - } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfo.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfo.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfo.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfo.java Wed Dec 23 19:24:13 2009 @@ -20,27 +20,29 @@ import org.apache.wicket.util.string.Strings; /** - * Encapsulates both page and component info. - * Rendered in form of <pageInfo>:<componentInfo> + * Encapsulates both page and component info. Rendered in form of + * <pageInfo>:<componentInfo> * * @author Matej Knopp */ public class PageComponentInfo { + private static final char SEPARATOR = '-'; + private final PageInfo pageInfo; + private final ComponentInfo componentInfo; - private static final char SEPARATOR = '-'; - /** * Construct. + * * @param pageInfo * @param componentInfo */ public PageComponentInfo(PageInfo pageInfo, ComponentInfo componentInfo) { Checks.argumentNotNull(pageInfo, "pageInfo"); - + this.pageInfo = pageInfo; this.componentInfo = componentInfo; } @@ -52,7 +54,7 @@ { return pageInfo; } - + /** * @return component info instance or <code>null</code> */ @@ -60,7 +62,10 @@ { return componentInfo; } - + + /** + * @see java.lang.Object#toString() + */ @Override public String toString() { @@ -68,16 +73,16 @@ if (pageInfo != null) { result.append(pageInfo.toString()); - } + } if (componentInfo != null) { result.append(SEPARATOR); result.append(componentInfo); } - + return result.toString(); } - + /** * Parses the given string * @@ -90,13 +95,13 @@ { return null; } - + final PageInfo pageInfo; final ComponentInfo componentInfo; - + int i = s.indexOf(SEPARATOR); if (i == -1) - + { pageInfo = PageInfo.parse(s); componentInfo = null; @@ -104,14 +109,14 @@ else { pageInfo = PageInfo.parse(s.substring(0, i)); - componentInfo = ComponentInfo.parse(s.substring(i + 1)); + componentInfo = ComponentInfo.parse(s.substring(i + 1)); } - + if (pageInfo == null) { return null; } - + return new PageComponentInfo(pageInfo, componentInfo); } } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageInfo.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageInfo.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageInfo.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageInfo.java Wed Dec 23 19:24:13 2009 @@ -59,7 +59,7 @@ { Checks.argumentNotNull(page, "page"); - this.pageId = page.getPageId(); + pageId = page.getPageId(); } /** @@ -116,4 +116,4 @@ } } } -}; +} Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/IMountedRequestMapper.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/IMountedRequestMapper.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/IMountedRequestMapper.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/IMountedRequestMapper.java Wed Dec 23 19:24:13 2009 @@ -23,7 +23,6 @@ * TODO javadoc, explain "parameters resolved from the mount" * * @author igor.vaynberg - * */ public interface IMountedRequestMapper { Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/Mount.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/Mount.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/Mount.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/Mount.java Wed Dec 23 19:24:13 2009 @@ -18,30 +18,49 @@ import org.apache.wicket.ng.request.Url; +/** + * + */ public class Mount { private final Url url; + private MountParameters mountParameters = new MountParameters(); + /** + * Construct. + * + * @param url + */ public Mount(Url url) { this.url = url; } + /** + * + * @param mountParameters + */ public void setMountParameters(MountParameters mountParameters) { this.mountParameters = mountParameters; } + /** + * + * @return + */ public MountParameters getMountParameters() { return mountParameters; } + /** + * + * @return + */ public Url getUrl() { return url; } - - } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountMapper.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountMapper.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountMapper.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountMapper.java Wed Dec 23 19:24:13 2009 @@ -34,6 +34,12 @@ private final String[] mountSegments; private final IMountedRequestMapper mapper; + /** + * Construct. + * + * @param mountPath + * @param mapper + */ public MountMapper(String mountPath, IMountedRequestMapper mapper) { Checks.argumentNotEmpty(mountPath, "mountPath"); @@ -43,6 +49,12 @@ this.mapper = mapper; } + /** + * Construct. + * + * @param mountPath + * @param mapper + */ public MountMapper(String mountPath, IRequestMapper mapper) { Checks.argumentNotEmpty(mountPath, "mountPath"); @@ -52,6 +64,12 @@ this.mapper = new UnmountedMapperAdapter(mapper); } + /** + * Construct. + * + * @param mountPath + * @param handler + */ public MountMapper(String mountPath, IRequestHandler handler) { Checks.argumentNotEmpty(mountPath, "mountPath"); @@ -61,6 +79,9 @@ mapper = new UnmountedRequestHandlerAdapter(handler); } + /** + * @see org.apache.wicket.ng.request.IRequestMapper#getCompatibilityScore(org.apache.wicket.Request) + */ public int getCompatibilityScore(Request request) { if (urlStartsWith(request.getUrl(), mountSegments)) @@ -73,6 +94,11 @@ } } + /** + * + * @param request + * @return + */ private Request dismountRequest(Request request) { Url dismountedUrl = new Url(request.getUrl()); @@ -80,7 +106,9 @@ return request.requestWithUrl(dismountedUrl); } - + /** + * @see org.apache.wicket.ng.request.IRequestMapper#mapRequest(org.apache.wicket.Request) + */ public final IRequestHandler mapRequest(Request request) { final Url url = request.getUrl(); @@ -103,10 +131,12 @@ return null; } + /** + * @see org.apache.wicket.ng.request.IRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler) + */ public Url mapHandler(IRequestHandler handler) { Mount mount = mapper.mapHandler(handler); - if (mount == null) { return null; @@ -136,6 +166,4 @@ return mount.getUrl(); } - - } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountParameters.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountParameters.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountParameters.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountParameters.java Wed Dec 23 19:24:13 2009 @@ -28,27 +28,43 @@ * TODO docs and unit test * * @author igor.vaynberg - * */ public class MountParameters { private final Map<String, String> map = new HashMap<String, String>(); + /** + * + * @param parameterName + * @return + */ public final StringValue getValue(String parameterName) { return StringValue.valueOf(map.get(parameterName)); } + /** + * + * @param parameterName + * @param value + */ public final void setValue(String parameterName, StringValue value) { map.put(parameterName, value.toString()); } + /** + * + * @return + */ public final Collection<String> getParameterNames() { return map.keySet(); } + /** + * @see java.lang.Object#hashCode() + */ @Override public int hashCode() { @@ -58,6 +74,9 @@ return result; } + /** + * @see java.lang.Object#equals(java.lang.Object) + */ @Override public boolean equals(Object obj) { @@ -78,11 +97,12 @@ return true; } + /** + * @see java.lang.Object#toString() + */ @Override public String toString() { return "MountParameters [" + map + "]"; } - - } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/UnmountedMapperAdapter.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/UnmountedMapperAdapter.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/UnmountedMapperAdapter.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/UnmountedMapperAdapter.java Wed Dec 23 19:24:13 2009 @@ -27,23 +27,33 @@ * TODO javadoc * * @author igor.vaynberg - * */ class UnmountedMapperAdapter implements IMountedRequestMapper { private final IRequestMapper mapper; + /** + * Construct. + * + * @param mapper + */ public UnmountedMapperAdapter(IRequestMapper mapper) { super(); this.mapper = mapper; } + /** + * @see org.apache.wicket.ng.request.mapper.mount.IMountedRequestMapper#getCompatibilityScore(org.apache.wicket.Request) + */ public int getCompatibilityScore(Request request) { return mapper.getCompatibilityScore(request); } + /** + * @see org.apache.wicket.ng.request.mapper.mount.IMountedRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler) + */ public Mount mapHandler(IRequestHandler requestHandler) { Url url = mapper.mapHandler(requestHandler); @@ -54,6 +64,10 @@ return null; } + /** + * @see org.apache.wicket.ng.request.mapper.mount.IMountedRequestMapper#mapRequest(org.apache.wicket.Request, + * org.apache.wicket.ng.request.mapper.mount.MountParameters) + */ public IRequestHandler mapRequest(Request request, MountParameters mountParams) { return mapper.mapRequest(request); Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/UnmountedRequestHandlerAdapter.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/UnmountedRequestHandlerAdapter.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/UnmountedRequestHandlerAdapter.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/UnmountedRequestHandlerAdapter.java Wed Dec 23 19:24:13 2009 @@ -26,22 +26,32 @@ * TODO javadoc * * @author igor.vaynberg - * */ class UnmountedRequestHandlerAdapter implements IMountedRequestMapper { private final IRequestHandler handler; + /** + * Construct. + * + * @param handler + */ public UnmountedRequestHandlerAdapter(IRequestHandler handler) { this.handler = handler; } + /** + * @see org.apache.wicket.ng.request.mapper.mount.IMountedRequestMapper#getCompatibilityScore(org.apache.wicket.Request) + */ public int getCompatibilityScore(Request request) { return 0; } + /** + * @see org.apache.wicket.ng.request.mapper.mount.IMountedRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler) + */ public Mount mapHandler(IRequestHandler requestHandler) { if (requestHandler.equals(handler)) @@ -51,9 +61,12 @@ return null; } + /** + * @see org.apache.wicket.ng.request.mapper.mount.IMountedRequestMapper#mapRequest(org.apache.wicket.Request, + * org.apache.wicket.ng.request.mapper.mount.MountParameters) + */ public IRequestHandler mapRequest(Request request, MountParameters mountParams) { return handler; } - } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/IPageParametersEncoder.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/IPageParametersEncoder.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/IPageParametersEncoder.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/IPageParametersEncoder.java Wed Dec 23 19:24:13 2009 @@ -35,7 +35,7 @@ * @param pageParameters * @return Url generated from the page parameters */ - public Url encodePageParameters(PageParametersNg pageParameters); + Url encodePageParameters(PageParametersNg pageParameters); /** * Decodes the given URL to {...@link PageParametersNg}. The URL will have all @@ -44,5 +44,5 @@ * @param request * @return {...@link PageParametersNg} instance */ - public PageParametersNg decodePageParameters(Request request); + PageParametersNg decodePageParameters(Request request); } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java Wed Dec 23 19:24:13 2009 @@ -38,6 +38,9 @@ { } + /** + * @see org.apache.wicket.ng.request.mapper.parameters.IPageParametersEncoder#decodePageParameters(org.apache.wicket.Request) + */ public PageParametersNg decodePageParameters(Request request) { PageParametersNg parameters = new PageParametersNg(); @@ -57,6 +60,9 @@ return parameters; } + /** + * @see org.apache.wicket.ng.request.mapper.parameters.IPageParametersEncoder#encodePageParameters(org.apache.wicket.ng.request.component.PageParametersNg) + */ public Url encodePageParameters(PageParametersNg pageParameters) { Url url = new Url(); @@ -81,5 +87,4 @@ return url; } - } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/CombinedRequestParametersAdapter.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/CombinedRequestParametersAdapter.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/CombinedRequestParametersAdapter.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/CombinedRequestParametersAdapter.java Wed Dec 23 19:24:13 2009 @@ -48,6 +48,9 @@ this.parameters = parameters; } + /** + * @see org.apache.wicket.ng.request.IRequestParameters#getParameterNames() + */ public Set<String> getParameterNames() { Set<String> result = new HashSet<String>(); @@ -58,6 +61,9 @@ return Collections.unmodifiableSet(result); } + /** + * @see org.apache.wicket.ng.request.IRequestParameters#getParameterValue(java.lang.String) + */ public StringValue getParameterValue(String name) { for (IRequestParameters p : parameters) @@ -71,6 +77,9 @@ return StringValue.valueOf((String)null); } + /** + * @see org.apache.wicket.ng.request.IRequestParameters#getParameterValues(java.lang.String) + */ public List<StringValue> getParameterValues(String name) { List<StringValue> result = new ArrayList<StringValue>(); @@ -98,5 +107,4 @@ return Collections.unmodifiableList(result); } } - } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/EmptyRequestParameters.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/EmptyRequestParameters.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/EmptyRequestParameters.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/EmptyRequestParameters.java Wed Dec 23 19:24:13 2009 @@ -30,29 +30,37 @@ */ public class EmptyRequestParameters implements IRequestParameters { + /** Singleton instance. */ + public static final EmptyRequestParameters INSTANCE = new EmptyRequestParameters(); + /** + * Construct. + */ private EmptyRequestParameters() { } /** - * Singleton instance. + * @see org.apache.wicket.ng.request.IRequestParameters#getParameterNames() */ - public static final EmptyRequestParameters INSTANCE = new EmptyRequestParameters(); - public Set<String> getParameterNames() { return Collections.emptySet(); } + /** + * @see org.apache.wicket.ng.request.IRequestParameters#getParameterValue(java.lang.String) + */ public StringValue getParameterValue(String name) { return StringValue.valueOf((String)null); } + /** + * @see org.apache.wicket.ng.request.IRequestParameters#getParameterValues(java.lang.String) + */ public List<StringValue> getParameterValues(String name) { return null; } - } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java Wed Dec 23 19:24:13 2009 @@ -50,6 +50,9 @@ this.url = url; } + /** + * @see org.apache.wicket.ng.request.IRequestParameters#getParameterNames() + */ public Set<String> getParameterNames() { Set<String> result = new HashSet<String>(); @@ -60,11 +63,17 @@ return Collections.unmodifiableSet(result); } + /** + * @see org.apache.wicket.ng.request.IRequestParameters#getParameterValue(java.lang.String) + */ public StringValue getParameterValue(String name) { return url.getQueryParameterValue(name); } + /** + * @see org.apache.wicket.ng.request.IRequestParameters#getParameterValues(java.lang.String) + */ public List<StringValue> getParameterValues(String name) { List<StringValue> values = null; Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/IResource.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/IResource.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/IResource.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/IResource.java Wed Dec 23 19:24:13 2009 @@ -136,12 +136,12 @@ { return parameters; } - }; + } /** * Renders this resource to response using the provided attributes. * * @param attributes */ - public void respond(Attributes attributes); + void respond(Attributes attributes); } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java Wed Dec 23 19:24:13 2009 @@ -108,6 +108,9 @@ return variation; } + /** + * @see java.lang.Object#equals(java.lang.Object) + */ @Override public boolean equals(Object obj) { @@ -127,6 +130,9 @@ Objects.equal(variation, that.variation); } + /** + * @see java.lang.Object#hashCode() + */ @Override public int hashCode() { Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java?rev=893608&r1=893607&r2=893608&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java Wed Dec 23 19:24:13 2009 @@ -50,6 +50,9 @@ this.variation = variation; } + /** + * @see java.lang.Object#equals(java.lang.Object) + */ @Override public boolean equals(Object obj) { @@ -69,6 +72,9 @@ Objects.equal(variation, that.variation); } + /** + * @see java.lang.Object#hashCode() + */ @Override public int hashCode() { @@ -79,6 +85,13 @@ private final Map<Key, ResourceReference> map = new ConcurrentHashMap<Key, ResourceReference>(); /** + * Construct. + */ + public ResourceReferenceRegistry() + { + } + + /** * Registers the given {...@link ResourceReference}. * * @param reference @@ -106,22 +119,33 @@ map.remove(key); } + /** + * + * @param scope + * @param name + * @param locale + * @param style + * @param variation + * @param strict + * @param createIfNotFound + * @return + */ protected ResourceReference getResourceReference(Class<?> scope, String name, Locale locale, String style, String variation, boolean strict, boolean createIfNotFound) - { + { Key key = new Key(scope.getName(), name, locale, style, variation); - ResourceReference res = map.get(key); - if (strict || res != null) - { - return res; - } - else - { + ResourceReference res = map.get(key); + if (strict || res != null) + { + return res; + } + else + { res = getResourceReference(scope, name, locale, style, null, true, false); - if (res == null) - { + if (res == null) + { res = getResourceReference(scope, name, locale, null, variation, true, false); - } + } if (res == null) { res = getResourceReference(scope, name, locale, null, null, true, false); @@ -142,14 +166,14 @@ { res = getResourceReference(scope, name, null, null, null, true, false); } - if (res == null && createIfNotFound) - { + if (res == null && createIfNotFound) + { res = createDefaultResourceReference(scope, name, locale, style, variation); - } - return res; } + return res; } - + } + /** * Looks up resource reference with specified attributes. If the reference is not found and * <code>strict</code> is set to <code>false</code>, result of @@ -178,11 +202,20 @@ strict, false); if (reference == null) { - // TODO: Check the class static member for ResourceReferences and register those + // TODO: Check the class static member for ResourceReferences and register those } return reference; } + /** + * + * @param scope + * @param name + * @param locale + * @param style + * @param variation + * @return + */ protected ResourceReference createDefaultResourceReference(Class<?> scope, String name, Locale locale, String style, String variation) {
