Author: hlship Date: Wed Jun 8 18:09:36 2011 New Revision: 1133491 URL: http://svn.apache.org/viewvc?rev=1133491&view=rev Log: TAP5-1528: Fix a number of JavaDoc errors and warnings
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Import.java tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Path.java tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Service.java tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/model/EmbeddedComponentModel.java Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Import.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Import.java?rev=1133491&r1=1133490&r2=1133491&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Import.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Import.java Wed Jun 8 18:09:36 2011 @@ -1,4 +1,4 @@ -// Copyright 2010 The Apache Software Foundation +// Copyright 2010, 2011 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -72,8 +72,7 @@ public @interface Import * Stylesheets to import. Each value is an asset path; symbols in each path are expanded. The stylesheet may be * localized. The stylesheet is imported with no options. * - * @see JavaScriptSupport#importStylesheet(org.apache.tapestry5.Asset, - * org.apache.tapestry5.services.javascript.StylesheetOptions) + * @see JavaScriptSupport#importStylesheet(org.apache.tapestry5.Asset) */ String[] stylesheet() default {}; Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Path.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Path.java?rev=1133491&r1=1133490&r2=1133491&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Path.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Path.java Wed Jun 8 18:09:36 2011 @@ -1,10 +1,10 @@ -// Copyright 2007, 2009 The Apache Software Foundation +// Copyright 2007, 2009, 2011 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -14,7 +14,6 @@ package org.apache.tapestry5.annotations; - import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.PARAMETER; @@ -23,16 +22,20 @@ import static java.lang.annotation.Reten import java.lang.annotation.Target; import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.*; + +import org.apache.tapestry5.Asset; +import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.annotations.UseWith; /** * Used in conjunction with the {@link Inject} annotation to inject an {@link Asset} based on a path. */ @Target( - { FIELD, PARAMETER }) +{ FIELD, PARAMETER }) @Documented @Retention(RUNTIME) -@UseWith({COMPONENT,MIXIN,PAGE,SERVICE}) +@UseWith( +{ COMPONENT, MIXIN, PAGE, SERVICE }) public @interface Path { /** Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Service.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Service.java?rev=1133491&r1=1133490&r2=1133491&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Service.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Service.java Wed Jun 8 18:09:36 2011 @@ -1,4 +1,4 @@ -// Copyright 2007, 2009 The Apache Software Foundation +// Copyright 2007, 2009, 2011 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,6 +23,8 @@ import static java.lang.annotation.Reten import java.lang.annotation.Target; import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.*; + +import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.annotations.UseWith; /** Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/model/EmbeddedComponentModel.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/model/EmbeddedComponentModel.java?rev=1133491&r1=1133490&r2=1133491&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/model/EmbeddedComponentModel.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/model/EmbeddedComponentModel.java Wed Jun 8 18:09:36 2011 @@ -1,4 +1,4 @@ -// Copyright 2006, 2008, 2009 The Apache Software Foundation +// Copyright 2006, 2008, 2009, 2011 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -73,7 +73,7 @@ public interface EmbeddedComponentModel /** * @param mixinClassName * @return the ordering constraints for the specified mixin, or null. - * @Since 5.2.0.0 + * @since 5.2.0.0 */ String[] getConstraintsForMixin(String mixinClassName); }