You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2007/11/12 23:23:28 UTC
svn commit: r594319 [6/40] - in /tapestry/tapestry5/trunk: ./
tapestry-annotations/
tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/
tapestry-annotations/src/site/ tapestry-component-report/
tapestry-component-report/src/main/java/org...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableEmbeddedComponentModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableEmbeddedComponentModelImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableEmbeddedComponentModelImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableEmbeddedComponentModelImpl.java Mon Nov 12 14:22:31 2007
@@ -14,20 +14,19 @@
package org.apache.tapestry.internal.model;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
import org.apache.tapestry.ioc.BaseLocatable;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.MutableEmbeddedComponentModel;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
public class MutableEmbeddedComponentModelImpl extends BaseLocatable implements
- MutableEmbeddedComponentModel
+ MutableEmbeddedComponentModel
{
private final String _id;
@@ -39,11 +38,13 @@
private Map<String, String> _parameters;
- /** List of mixin class names. */
+ /**
+ * List of mixin class names.
+ */
private List<String> _mixinClassNames;
public MutableEmbeddedComponentModelImpl(String id, String componentType,
- String componentClassName, String declaredClass, Location location)
+ String componentClassName, String declaredClass, Location location)
{
super(location);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/AttributeToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/AttributeToken.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/AttributeToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/AttributeToken.java Mon Nov 12 14:22:31 2007
@@ -1,25 +1,23 @@
-// Copyright 2006 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
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.internal.parser;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.ioc.Location;
/**
* Stores an attribute/value pair (as part of an XML element).
- *
- *
*/
public class AttributeToken extends TemplateToken
{
@@ -35,13 +33,17 @@
_value = value;
}
- /** Returns local name for the attribute. */
+ /**
+ * Returns local name for the attribute.
+ */
public String getName()
{
return _name;
}
- /** Returns the value for the attribute. */
+ /**
+ * Returns the value for the attribute.
+ */
public String getValue()
{
return _value;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/BlockToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/BlockToken.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/BlockToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/BlockToken.java Mon Nov 12 14:22:31 2007
@@ -25,10 +25,8 @@
private final String _id;
/**
- * @param id
- * the id of the block, or null for an anonymous block
- * @param location
- * of the block element
+ * @param id the id of the block, or null for an anonymous block
+ * @param location of the block element
*/
public BlockToken(String id, Location location)
{
@@ -37,7 +35,9 @@
_id = id;
}
- /** Returns the block's template-unique id, or null if the block element did not specify an id. */
+ /**
+ * Returns the block's template-unique id, or null if the block element did not specify an id.
+ */
public String getId()
{
return _id;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/BodyToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/BodyToken.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/BodyToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/BodyToken.java Mon Nov 12 14:22:31 2007
@@ -1,25 +1,23 @@
-// Copyright 2006 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
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.internal.parser;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.ioc.Location;
/**
* Placeholder for a component's body (within the component's template).
- *
- *
*/
public class BodyToken extends TemplateToken
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/CDATAToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/CDATAToken.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/CDATAToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/CDATAToken.java Mon Nov 12 14:22:31 2007
@@ -1,26 +1,24 @@
-// Copyright 2006 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
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.internal.parser;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.ioc.Location;
/**
* Literal text that was enclosed within a !CDATA in the input template (so we should do the same
* during output).
- *
- *
*/
public class CDATAToken extends TemplateToken
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/CommentToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/CommentToken.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/CommentToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/CommentToken.java Mon Nov 12 14:22:31 2007
@@ -1,25 +1,23 @@
-// Copyright 2006 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
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.internal.parser;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.ioc.Location;
/**
* A node representing a comment embedded in the source input.
- *
- *
*/
public class CommentToken extends TemplateToken
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplate.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplate.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplate.java Mon Nov 12 14:22:31 2007
@@ -14,20 +14,24 @@
package org.apache.tapestry.internal.parser;
+import org.apache.tapestry.ioc.Resource;
+
import java.util.List;
import java.util.Set;
-import org.apache.tapestry.ioc.Resource;
-
/**
* A parsed component template, containing all the tokens parsed from the template.
*/
public interface ComponentTemplate
{
- /** Returns true if no template could be found for the component. */
+ /**
+ * Returns true if no template could be found for the component.
+ */
boolean isMissing();
- /** Returns the resource that was parsed to form the template. */
+ /**
+ * Returns the resource that was parsed to form the template.
+ */
Resource getResource();
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplateImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplateImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplateImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplateImpl.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,13 @@
package org.apache.tapestry.internal.parser;
+import org.apache.tapestry.ioc.Resource;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
import java.util.List;
import java.util.Set;
-import org.apache.tapestry.ioc.Resource;
-
public class ComponentTemplateImpl implements ComponentTemplate
{
private final Resource _resource;
@@ -31,15 +30,12 @@
private final Set<String> _componentIds;
/**
- * @param resource
- * the resource from which the template was parsed
- * @param tokens
- * the tokens of the template, a copy of this list will be made
- * @param componentIds
- * TODO
+ * @param resource the resource from which the template was parsed
+ * @param tokens the tokens of the template, a copy of this list will be made
+ * @param componentIds TODO
*/
public ComponentTemplateImpl(Resource resource, List<TemplateToken> tokens,
- Set<String> componentIds)
+ Set<String> componentIds)
{
_resource = resource;
_tokens = newList(tokens);
@@ -61,7 +57,9 @@
return _componentIds;
}
- /** Returns false. */
+ /**
+ * Returns false.
+ */
public boolean isMissing()
{
return false;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DTDToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DTDToken.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DTDToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DTDToken.java Mon Nov 12 14:22:31 2007
@@ -39,19 +39,25 @@
_systemId = systemId;
}
- /** Returns the doctype name (the name of the document root element) */
+ /**
+ * Returns the doctype name (the name of the document root element)
+ */
public String getName()
{
return _name;
}
- /** Returns the public identifier of the DTD */
+ /**
+ * Returns the public identifier of the DTD
+ */
public String getPublicId()
{
return _publicId;
}
- /** Returns the system identifier of the DTD */
+ /**
+ * Returns the system identifier of the DTD
+ */
public String getSystemId()
{
return _systemId;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ExpansionToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ExpansionToken.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ExpansionToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ExpansionToken.java Mon Nov 12 14:22:31 2007
@@ -1,27 +1,25 @@
-// Copyright 2006 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
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.internal.parser;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.ioc.Location;
/**
* A token containing an expression expansion from the template. Expression expansions look like Ant
* variables, i.e., "${xyz}", where xyz is a binding expression. It may have a prefix or not
* ("prop:" will be the default prefix if not specified).
- *
- *
*/
public class ExpansionToken extends TemplateToken
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ParameterToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ParameterToken.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ParameterToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ParameterToken.java Mon Nov 12 14:22:31 2007
@@ -16,16 +16,16 @@
import org.apache.tapestry.ioc.Location;
-/** A parameter block to be passed to a component as a parameter. */
+/**
+ * A parameter block to be passed to a component as a parameter.
+ */
public class ParameterToken extends TemplateToken
{
private final String _name;
/**
- * @param name
- * the name of the parameter to be bound
- * @param location
- * location of the element
+ * @param name the name of the parameter to be bound
+ * @param location location of the element
*/
public ParameterToken(String name, Location location)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/StartComponentToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/StartComponentToken.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/StartComponentToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/StartComponentToken.java Mon Nov 12 14:22:31 2007
@@ -33,21 +33,16 @@
private final String _mixins;
/**
- * @param elementName
- * the name of the element from which this component was parsed, or null if the
- * element was the t:comp placeholder
- * @param id
- * the id of the component (may be null for anonymous components)
- * @param type
- * the type of component (may be null if the component type is specified outside the
- * template)
- * @param mixins
- * a comma-separated list of mixins (possibly null)
- * @param location
- * the location within the template at which the element was parsed
+ * @param elementName the name of the element from which this component was parsed, or null if the
+ * element was the t:comp placeholder
+ * @param id the id of the component (may be null for anonymous components)
+ * @param type the type of component (may be null if the component type is specified outside the
+ * template)
+ * @param mixins a comma-separated list of mixins (possibly null)
+ * @param location the location within the template at which the element was parsed
*/
public StartComponentToken(String elementName, String id, String type, String mixins,
- Location location)
+ Location location)
{
super(TokenType.START_COMPONENT, location);
@@ -63,7 +58,7 @@
* Returns the element for this component. When using the <t:comp> placeholder, this value
* will be null. When using "invisible instrumentation", where t:id or t:type attributes are
* added to existing elements, this is the local name of the element so attached.
- *
+ *
* @return the element name or null
*/
public String getElementName()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/StartElementToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/StartElementToken.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/StartElementToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/StartElementToken.java Mon Nov 12 14:22:31 2007
@@ -1,20 +1,20 @@
-// Copyright 2006 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
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.internal.parser;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.ioc.Location;
/**
* The start of an ordinary element within the template (as opposed to
@@ -24,8 +24,6 @@
* associated with the element. A start element token will always be balanced by a
* {@link org.apache.tapestry.internal.parser.EndElementToken} (though there will likely be some
* amount of intermediate tokens).
- *
- *
*/
public class StartElementToken extends TemplateToken
{
@@ -38,7 +36,9 @@
_name = name;
}
- /** Returns local name for the element. */
+ /**
+ * Returns local name for the element.
+ */
public String getName()
{
return _name;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TemplateToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TemplateToken.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TemplateToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TemplateToken.java Mon Nov 12 14:22:31 2007
@@ -1,27 +1,25 @@
-// Copyright 2006 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
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.internal.parser;
-import org.apache.tapestry.ioc.BaseLocatable;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.ioc.BaseLocatable;
+import org.apache.tapestry.ioc.Location;
/**
* Base class for tokens parsed out of a template. The set of classes rooted here are effectively
* object encapsulations of the events generated by a SAX parser.
- *
- *
*/
public abstract class TemplateToken extends BaseLocatable
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TextToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TextToken.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TextToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TextToken.java Mon Nov 12 14:22:31 2007
@@ -1,23 +1,23 @@
-// Copyright 2006 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
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.internal.parser;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.ioc.Location;
/**
- *
+ *
*/
public class TextToken extends TemplateToken
{
@@ -30,7 +30,9 @@
_text = text;
}
- /** Returns the text extracted from that part of the template. */
+ /**
+ * Returns the text extracted from that part of the template.
+ */
public String getText()
{
return _text;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TokenType.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TokenType.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TokenType.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TokenType.java Mon Nov 12 14:22:31 2007
@@ -18,7 +18,8 @@
* Defines the different types of {@link org.apache.tapestry.internal.parser.TemplateToken}s. Each
* value maps to a particular subclass of TemplateToken.
*/
-public enum TokenType {
+public enum TokenType
+{
ATTRIBUTE, CDATA, COMMENT, END_ELEMENT, START_COMPONENT, START_ELEMENT, TEXT, BODY, EXPANSION, PARAMETER, BLOCK, DTD
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/package.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/package.html?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/package.html (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/package.html Mon Nov 12 14:22:31 2007
@@ -1,5 +1,5 @@
<html>
- <body>
- Classes related to parsing of Tapestry component templates.
- </body>
+<body>
+Classes related to parsing of Tapestry component templates.
+</body>
</html>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractSessionPersistentFieldStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractSessionPersistentFieldStrategy.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractSessionPersistentFieldStrategy.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractSessionPersistentFieldStrategy.java Mon Nov 12 14:22:31 2007
@@ -16,16 +16,15 @@
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
import org.apache.tapestry.services.PersistentFieldChange;
import org.apache.tapestry.services.PersistentFieldStrategy;
import org.apache.tapestry.services.Request;
import org.apache.tapestry.services.Session;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
/**
* Base class for strategies that store their values as keys in the session. Implements a uniform
* format for the keys, based on a prefix to identify the particular strategy.
@@ -67,11 +66,9 @@
/**
* Called after each key is read by {@link #gatherFieldChanges(String)}. This implementation
* does nothing, subclasses may override.
- *
- * @param session
- * the session from which a value was just read
- * @param attributeName
- * the name of the attribute used to read a value
+ *
+ * @param session the session from which a value was just read
+ * @param attributeName the name of the attribute used to read a value
*/
protected void didReadChange(Session session, String attributeName)
{
@@ -92,7 +89,7 @@
}
public final void postChange(String pageName, String componentId, String fieldName,
- Object newValue)
+ Object newValue)
{
notBlank(pageName, "pageName");
notBlank(fieldName, "fieldName");
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxFilter.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxFilter.java Mon Nov 12 14:22:31 2007
@@ -26,8 +26,8 @@
public class AjaxFilter implements ComponentActionRequestFilter
{
public ActionResponseGenerator handle(String logicalPageName, String nestedComponentId,
- String eventType, String[] context, String[] activationContext,
- ComponentActionRequestHandler handler)
+ String eventType, String[] context, String[] activationContext,
+ ComponentActionRequestHandler handler)
{
return handler.handle(
logicalPageName,
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasImpl.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,15 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-
-import java.util.Map;
-
import org.apache.tapestry.ioc.AnnotationProvider;
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.ObjectProvider;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import org.apache.tapestry.services.Alias;
import org.apache.tapestry.services.AliasManager;
+import java.util.Map;
+
public class AliasImpl implements Alias, ObjectProvider
{
// Derived from the managers when first needed
@@ -64,7 +63,7 @@
}
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider,
- ObjectLocator locator)
+ ObjectLocator locator)
{
initialize();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasManagerImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasManagerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasManagerImpl.java Mon Nov 12 14:22:31 2007
@@ -15,13 +15,12 @@
package org.apache.tapestry.internal.services;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-
-import java.util.Collection;
-import java.util.Map;
-
import org.apache.tapestry.services.AliasContribution;
import org.apache.tapestry.services.AliasManager;
import org.slf4j.Logger;
+
+import java.util.Collection;
+import java.util.Map;
public class AliasManagerImpl implements AliasManager
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationGlobalsImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationGlobalsImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationGlobalsImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationGlobalsImpl.java Mon Nov 12 14:22:31 2007
@@ -14,10 +14,10 @@
package org.apache.tapestry.internal.services;
-import javax.servlet.ServletContext;
-
import org.apache.tapestry.services.ApplicationGlobals;
import org.apache.tapestry.services.Context;
+
+import javax.servlet.ServletContext;
public class ApplicationGlobalsImpl implements ApplicationGlobals
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateManagerImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateManagerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateManagerImpl.java Mon Nov 12 14:22:31 2007
@@ -15,15 +15,10 @@
package org.apache.tapestry.internal.services;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
+import org.apache.tapestry.services.*;
import java.util.Map;
-import org.apache.tapestry.services.ApplicationStateContribution;
-import org.apache.tapestry.services.ApplicationStateCreator;
-import org.apache.tapestry.services.ApplicationStateManager;
-import org.apache.tapestry.services.ApplicationStatePersistenceStrategy;
-import org.apache.tapestry.services.ApplicationStatePersistenceStrategySource;
-
public class ApplicationStateManagerImpl implements ApplicationStateManager
{
static final String DEFAULT_STRATEGY = "session";
@@ -37,7 +32,7 @@
private final ApplicationStateCreator<T> _creator;
ApplicationStateAdapter(Class<T> asoClass, ApplicationStatePersistenceStrategy strategy,
- ApplicationStateCreator<T> creator)
+ ApplicationStateCreator<T> creator)
{
_asoClass = asoClass;
_strategy = strategy;
@@ -58,7 +53,9 @@
{
return _strategy.exists(_asoClass);
}
- };
+ }
+
+ ;
/**
* The map will be extended periodically as new ASOs, not in the configuration, are encountered.
@@ -70,7 +67,7 @@
@SuppressWarnings("unchecked")
public ApplicationStateManagerImpl(Map<Class, ApplicationStateContribution> configuration,
- ApplicationStatePersistenceStrategySource source)
+ ApplicationStatePersistenceStrategySource source)
{
_source = source;
@@ -90,7 +87,7 @@
@SuppressWarnings("unchecked")
private <T> ApplicationStateAdapter<T> newAdapter(final Class<T> asoClass, String strategyName,
- ApplicationStateCreator<T> creator)
+ ApplicationStateCreator<T> creator)
{
if (creator == null) creator = new ApplicationStateCreator<T>()
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStatePersistenceStrategySourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStatePersistenceStrategySourceImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStatePersistenceStrategySourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStatePersistenceStrategySourceImpl.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry.internal.services;
-import java.util.Map;
-
import org.apache.tapestry.services.ApplicationStatePersistenceStrategy;
import org.apache.tapestry.services.ApplicationStatePersistenceStrategySource;
+import java.util.Map;
+
public class ApplicationStatePersistenceStrategySourceImpl implements
- ApplicationStatePersistenceStrategySource
+ ApplicationStatePersistenceStrategySource
{
private final Map<String, ApplicationStatePersistenceStrategy> _configuration;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateWorker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateWorker.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,6 @@
package org.apache.tapestry.internal.services;
-import static java.lang.String.format;
-
-import java.lang.reflect.Modifier;
-import java.util.List;
-
import org.apache.tapestry.annotations.ApplicationState;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ApplicationStateManager;
@@ -26,6 +21,10 @@
import org.apache.tapestry.services.ComponentClassTransformWorker;
import org.apache.tapestry.services.TransformMethodSignature;
+import static java.lang.String.format;
+import java.lang.reflect.Modifier;
+import java.util.List;
+
/**
* Looks for the {@link ApplicationState} annotation and converts read and write access on such
* fields into calls to the {@link ApplicationStateManager}.
@@ -90,12 +89,12 @@
}
private void replaceFlagRead(ClassTransformation transformation, String booleanFieldName,
- String typeFieldName, String managerFieldName)
+ String typeFieldName, String managerFieldName)
{
String readMethodName = transformation.newMemberName("read", booleanFieldName);
TransformMethodSignature sig = new TransformMethodSignature(Modifier.PRIVATE, "boolean", readMethodName,
- null, null);
+ null, null);
String body = format("return %s.exists(%s);", managerFieldName, typeFieldName);
@@ -107,13 +106,13 @@
}
private void replaceWrite(ClassTransformation transformation, String fieldName,
- String fieldType, String managerFieldName, String typeFieldName)
+ String fieldType, String managerFieldName, String typeFieldName)
{
String writeMethodName = transformation.newMemberName("write", fieldName);
TransformMethodSignature writeSignature = new TransformMethodSignature(Modifier.PRIVATE, "void",
- writeMethodName, new String[]
- { fieldType }, null);
+ writeMethodName, new String[]
+ {fieldType}, null);
String body = format("%s.set(%s, $1);", managerFieldName, typeFieldName);
@@ -123,13 +122,13 @@
}
private void replaceRead(ClassTransformation transformation, String fieldName,
- String fieldType, String managerFieldName, String typeFieldName)
+ String fieldType, String managerFieldName, String typeFieldName)
{
String readMethodName = transformation.newMemberName("read", fieldName);
TransformMethodSignature readMethodSignature = new TransformMethodSignature(Modifier.PRIVATE, fieldType,
- readMethodName, null, null);
+ readMethodName, null, null);
String body = format("return (%s) %s.get(%s);", fieldType, managerFieldName, typeFieldName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetDispatcher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetDispatcher.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetDispatcher.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetDispatcher.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,6 @@
package org.apache.tapestry.internal.services;
-import java.io.IOException;
-import java.net.URL;
-
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.internal.util.ClasspathResource;
@@ -27,10 +22,14 @@
import org.apache.tapestry.services.Request;
import org.apache.tapestry.services.Response;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URL;
+
/**
* Recognizes requests where the path begins with "/asset/" and delivers the content therein as a
* bytestream. Also handles requests that are simply polling for a change to the file.
- *
+ *
* @see ResourceStreamer
* @see ClasspathAssetAliasManager
* @see ResourceCache
@@ -46,7 +45,7 @@
static final String IF_MODIFIED_SINCE_HEADER = "If-Modified-Since";
public AssetDispatcher(ResourceStreamer streamer, ClasspathAssetAliasManager aliasManager,
- ResourceCache resourceCache)
+ ResourceCache resourceCache)
{
_streamer = streamer;
_aliasManager = aliasManager;
@@ -98,10 +97,8 @@
}
/**
- * @param response
- * used to send errors back to the client
- * @param resourcePath
- * the path to the requested resource, from the request
+ * @param response used to send errors back to the client
+ * @param resourcePath the path to the requested resource, from the request
* @return the resource for the path, with the digest stripped out of the URL, or null if the
* digest is invalid (and an error has been sent back to the client)
* @throws IOException
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetInjectionProvider.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetInjectionProvider.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.internal.services;
-import static java.lang.String.format;
-
import org.apache.tapestry.annotations.Path;
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.services.SymbolSource;
@@ -24,6 +22,8 @@
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.InjectionProvider;
+import static java.lang.String.format;
+
/**
* Performs injection of assets, based on the presence of the {@link Path} annotation. This is more
* useful than the general {@link AssetObjectProvider}, becase relative assets are supported.
@@ -41,7 +41,7 @@
}
public boolean provideInjection(String fieldName, Class fieldType, ObjectLocator locator,
- ClassTransformation transformation, MutableComponentModel componentModel)
+ ClassTransformation transformation, MutableComponentModel componentModel)
{
Path path = transformation.getFieldAnnotation(fieldName, Path.class);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java Mon Nov 12 14:22:31 2007
@@ -41,11 +41,11 @@
public AssetObjectProvider(@Core
AssetSource source,
- @Builtin
- TypeCoercer typeCoercer,
+ @Builtin
+ TypeCoercer typeCoercer,
- @Builtin
- SymbolSource symbolSource)
+ @Builtin
+ SymbolSource symbolSource)
{
_source = source;
_typeCoercer = typeCoercer;
@@ -55,17 +55,14 @@
/**
* Provides the asset. If the expression does not identify an asset domain, with a prefix, it is
* assumed to be a path on the classpath, relative to the root of the classpath.
- *
- * @param expression
- * expression used to find the asset, passed to
- * {@link AssetSource#findAsset(Resource, String, java.util.Locale)
- * @param objectType
- * the type of object (which must be Object or Asset)
- * @param locator
- * not used
+ *
+ * @param expression expression used to find the asset, passed to
+ * {@link AssetSource#findAsset(Resource, String, java.util.Locale)
+ * @param objectType the type of object (which must be Object or Asset)
+ * @param locator not used
*/
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider,
- ObjectLocator locator)
+ ObjectLocator locator)
{
Path path = annotationProvider.getAnnotation(Path.class);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetSourceImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetSourceImpl.java Mon Nov 12 14:22:31 2007
@@ -14,20 +14,19 @@
package org.apache.tapestry.internal.services;
+import org.apache.tapestry.Asset;
+import org.apache.tapestry.ioc.Resource;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.services.ThreadLocale;
import org.apache.tapestry.ioc.util.StrategyRegistry;
import org.apache.tapestry.services.AssetFactory;
import org.apache.tapestry.services.AssetSource;
+import java.util.Locale;
+import java.util.Map;
+
public class AssetSourceImpl implements AssetSource
{
private static final String CLASSPATH = "classpath";
@@ -42,7 +41,7 @@
public AssetSourceImpl(ThreadLocale threadLocale,
- Map<String, AssetFactory> configuration)
+ Map<String, AssetFactory> configuration)
{
_threadLocale = threadLocale;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AttributeExpansionBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AttributeExpansionBinding.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AttributeExpansionBinding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AttributeExpansionBinding.java Mon Nov 12 14:22:31 2007
@@ -37,7 +37,9 @@
return _provider.provideString();
}
- /** Returns false. Expansions reference properties that may change arbitrarily. */
+ /**
+ * Returns false. Expansions reference properties that may change arbitrarily.
+ */
@Override
public boolean isInvariant()
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BasePropertyConduit.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BasePropertyConduit.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BasePropertyConduit.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BasePropertyConduit.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
package org.apache.tapestry.internal.services;
-import java.lang.annotation.Annotation;
-
import org.apache.tapestry.PropertyConduit;
import org.apache.tapestry.ioc.AnnotationProvider;
import org.apache.tapestry.services.PropertyConduitSource;
+import java.lang.annotation.Annotation;
+
/**
* Base class for {@link PropertyConduit} instances created by the {@link PropertyConduitSource}.
*/
@@ -32,7 +32,7 @@
private final String _description;
public BasePropertyConduit(final Class propertyType,
- final AnnotationProvider annotationProvider, final String description)
+ final AnnotationProvider annotationProvider, final String description)
{
_propertyType = propertyType;
_annotationProvider = annotationProvider;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanBlockSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanBlockSourceImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanBlockSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanBlockSourceImpl.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,15 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
-
-import java.util.Collection;
-import java.util.Map;
-
import org.apache.tapestry.Block;
import org.apache.tapestry.internal.structure.Page;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
import org.apache.tapestry.services.BeanBlockContribution;
import org.apache.tapestry.services.BeanBlockSource;
+import java.util.Collection;
+import java.util.Map;
+
public class BeanBlockSourceImpl implements BeanBlockSource
{
private final RequestPageCache _pageCache;
@@ -33,7 +32,7 @@
private final Map<String, BeanBlockContribution> _edit = newCaseInsensitiveMap();
public BeanBlockSourceImpl(RequestPageCache pageCache,
- Collection<BeanBlockContribution> configuration)
+ Collection<BeanBlockContribution> configuration)
{
_pageCache = pageCache;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,6 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-
-import java.util.List;
-import java.util.Map;
-
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.beaneditor.BeanModel;
import org.apache.tapestry.beaneditor.NonVisual;
@@ -28,15 +21,17 @@
import org.apache.tapestry.internal.beaneditor.BeanModelImpl;
import org.apache.tapestry.ioc.LoggerSource;
import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.ioc.services.PropertyAdapter;
-import org.apache.tapestry.ioc.services.TypeCoercer;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry.ioc.services.*;
import org.apache.tapestry.services.BeanModelSource;
import org.apache.tapestry.services.DataTypeAnalyzer;
import org.apache.tapestry.services.PropertyConduitSource;
+import java.util.List;
+import java.util.Map;
+
public class BeanModelSourceImpl implements BeanModelSource
{
private final LoggerSource _loggerSource;
@@ -52,8 +47,8 @@
private final DataTypeAnalyzer _dataTypeAnalyzer;
public BeanModelSourceImpl(LoggerSource loggerSource, TypeCoercer typeCoercer,
- PropertyAccess propertyAccess, PropertyConduitSource propertyConduitSource,
- ClassFactory classFactory, DataTypeAnalyzer dataTypeAnalyzer)
+ PropertyAccess propertyAccess, PropertyConduitSource propertyConduitSource,
+ ClassFactory classFactory, DataTypeAnalyzer dataTypeAnalyzer)
{
_loggerSource = loggerSource;
_typeCoercer = typeCoercer;
@@ -64,7 +59,7 @@
}
public BeanModel create(Class beanClass, boolean filterReadOnlyProperties,
- ComponentResources resources)
+ ComponentResources resources)
{
notNull(beanClass, "beanClass");
notNull(resources, "resources");
@@ -74,7 +69,7 @@
ClassPropertyAdapter adapter = _propertyAccess.getAdapter(beanClass);
final BeanModel model = new BeanModelImpl(beanClass, _propertyConduitSource, _typeCoercer,
- messages);
+ messages);
List<String> propertyNames = newList();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BindingSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BindingSourceImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BindingSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BindingSourceImpl.java Mon Nov 12 14:22:31 2007
@@ -14,18 +14,17 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-
-import java.util.Map;
-
import org.apache.tapestry.Binding;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.ioc.Location;
+import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
import org.apache.tapestry.ioc.internal.util.TapestryException;
import org.apache.tapestry.services.BindingFactory;
import org.apache.tapestry.services.BindingSource;
+import java.util.Map;
+
public class BindingSourceImpl implements BindingSource
{
private final Map<String, BindingFactory> _factories;
@@ -36,13 +35,13 @@
}
public Binding newBinding(String description, ComponentResources container,
- String defaultPrefix, String expression)
+ String defaultPrefix, String expression)
{
return newBinding(description, container, container, defaultPrefix, expression, null);
}
public Binding newBinding(String description, ComponentResources container,
- ComponentResources component, String defaultPrefix, String expression, Location location)
+ ComponentResources component, String defaultPrefix, String expression, Location location)
{
notBlank(description, "description");
notNull(container, "container");
@@ -78,7 +77,7 @@
catch (Exception ex)
{
throw new TapestryException(ServicesMessages.bindingSourceFailure(expression, ex),
- location, ex);
+ location, ex);
}
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BlockInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BlockInjectionProvider.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BlockInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BlockInjectionProvider.java Mon Nov 12 14:22:31 2007
@@ -28,7 +28,7 @@
* Identifies fields of type {@link Block} that have the {@link Inject} annotation and converts them
* into read-only fields containing the injected Block from the template. The annotation's value is
* the id of the block to inject; if omitted, the block id is deduced from the field id.
- * <p>
+ * <p/>
* Must be scheduled before {@link DefaultInjectionProvider} because it uses the same annotation,
* Inject, with a different interpretation.
*/
@@ -36,7 +36,7 @@
{
public boolean provideInjection(String fieldName, Class fieldType, ObjectLocator locator,
- ClassTransformation transformation, MutableComponentModel componentModel)
+ ClassTransformation transformation, MutableComponentModel componentModel)
{
if (!fieldType.equals(Block.class)) return false;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CheckForUpdatesFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CheckForUpdatesFilter.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CheckForUpdatesFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CheckForUpdatesFilter.java Mon Nov 12 14:22:31 2007
@@ -14,9 +14,6 @@
package org.apache.tapestry.internal.services;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
import org.apache.tapestry.internal.util.Holder;
import org.apache.tapestry.ioc.internal.util.ConcurrentBarrier;
import org.apache.tapestry.ioc.internal.util.Invokable;
@@ -25,6 +22,9 @@
import org.apache.tapestry.services.RequestHandler;
import org.apache.tapestry.services.Response;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
/**
* Implements a barrier that periodically asks the
* {@link org.apache.tapestry.internal.services.UpdateListenerHub} to check for updates to files.
@@ -64,12 +64,9 @@
};
/**
- * @param updateListenerHub
- * invoked, at intervals, to spur the process of detecting changes
- * @param checkInterval
- * interval, in milliseconds, between checks
- * @param updateTimeout
- * time, in milliseconds, to wait to obtain update lock.
+ * @param updateListenerHub invoked, at intervals, to spur the process of detecting changes
+ * @param checkInterval interval, in milliseconds, between checks
+ * @param updateTimeout time, in milliseconds, to wait to obtain update lock.
*/
public CheckForUpdatesFilter(UpdateListenerHub updateListenerHub, long checkInterval, long updateTimeout)
{
@@ -79,7 +76,7 @@
}
public boolean service(final Request request, final Response response,
- final RequestHandler handler) throws IOException
+ final RequestHandler handler) throws IOException
{
final Holder<IOException> exceptionHolder = new Holder<IOException>();
@@ -91,7 +88,7 @@
_barrier.tryWithWrite(_checker, _updateTimeout, TimeUnit.MILLISECONDS);
// And, now, back to code within the read lock.
-
+
try
{
return handler.service(request, response);
@@ -106,7 +103,7 @@
// Obtain a read lock while handling the request. This will not impair parallel operations, except when a file check
// is needed (the exclusive write lock will block threads attempting to get a read lock).
-
+
boolean result = _barrier.withRead(invokable);
IOException ex = exceptionHolder.get();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassNameLocator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassNameLocator.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassNameLocator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassNameLocator.java Mon Nov 12 14:22:31 2007
@@ -26,7 +26,7 @@
* top-level classes in the indicated package (or a sub-package), but excludes inner classes. No
* other filtering (beyond inner classes) occurs, so there's no guarantee that the class names
* returned are public (for example)
- *
+ *
* @param packageName
* @return fully qualified class names
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassNameLocatorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassNameLocatorImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassNameLocatorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassNameLocatorImpl.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,11 @@
package org.apache.tapestry.internal.services;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.io.Reader;
+import org.apache.tapestry.internal.TapestryInternalUtils;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry.ioc.util.Stack;
+
+import java.io.*;
import java.net.JarURLConnection;
import java.net.URL;
import java.net.URLConnection;
@@ -30,10 +27,6 @@
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.util.Stack;
-
public class ClassNameLocatorImpl implements ClassNameLocator
{
private static final String CLASS_SUFFIX = ".class";
@@ -139,7 +132,7 @@
/**
* Check whether container supports opening a stream on a dir/package to get a list of its
* contents.
- *
+ *
* @param packageURL
* @return
*/
@@ -166,7 +159,7 @@
}
private void scanDirStream(String packagePath, URL packageURL,
- Collection<String> componentClassNames, Stack<Queued> queue) throws IOException
+ Collection<String> componentClassNames, Stack<Queued> queue) throws IOException
{
InputStream is = null;
@@ -235,7 +228,7 @@
}
private void scanJarFile(String packagePath, Collection<String> componentClassNames,
- JarFile jarFile) throws IOException
+ JarFile jarFile) throws IOException
{
Enumeration<JarEntry> e = jarFile.entries();
@@ -262,13 +255,10 @@
/**
* Scan a dir for classes. Will recursively look in the supplied directory and all sub
* directories.
- *
- * @param packageName
- * Name of package that this directory corresponds to.
- * @param dir
- * Dir to scan for clases.
- * @param componentClassNames
- * List of class names that have been found.
+ *
+ * @param packageName Name of package that this directory corresponds to.
+ * @param dir Dir to scan for clases.
+ * @param componentClassNames List of class names that have been found.
*/
private void scanDir(String packageName, File dir, Collection<String> componentClassNames)
{
@@ -296,12 +286,10 @@
* produce a JarFile object all the same. Known servlet engines that function like this include
* Weblogic and OC4J. This is not a full solution, since an unpacked WAR or EAR will not have
* JAR "files" as such.
- *
- * @param url
- * URL of jar
+ *
+ * @param url URL of jar
* @return JarFile or null
- * @throws java.io.IOException
- * If error occurs creating jar file
+ * @throws java.io.IOException If error occurs creating jar file
*/
private JarFile getAlternativeJarFile(URL url) throws IOException
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassResultProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassResultProcessor.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassResultProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassResultProcessor.java Mon Nov 12 14:22:31 2007
@@ -1,30 +1,30 @@
-// Copyright 2007 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
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2007 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
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.ActionResponseGenerator;
-import org.apache.tapestry.services.ComponentClassResolver;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
+import org.apache.tapestry.Link;
+import org.apache.tapestry.internal.structure.Page;
+import org.apache.tapestry.runtime.Component;
+import org.apache.tapestry.services.ActionResponseGenerator;
+import org.apache.tapestry.services.ComponentClassResolver;
+import org.apache.tapestry.services.ComponentEventResultProcessor;
/**
* Used when a component event handler returns a class value. The value is interpreted as the page
* class. A link to the page will be sent.
- *
+ *
* @see LinkActionResponseGenerator
*/
public class ClassResultProcessor implements ComponentEventResultProcessor<Class>
@@ -36,7 +36,7 @@
private final LinkFactory _linkFactory;
public ClassResultProcessor(ComponentClassResolver resolver, RequestPageCache requestPageCache,
- LinkFactory linkFactory)
+ LinkFactory linkFactory)
{
_resolver = resolver;
_requestPageCache = requestPageCache;
@@ -44,7 +44,7 @@
}
public ActionResponseGenerator processComponentEvent(Class value, Component component,
- String methodDescripion)
+ String methodDescripion)
{
String className = value.getName();
String pageName = _resolver.resolvePageClassNameToPageName(className);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImpl.java Mon Nov 12 14:22:31 2007
@@ -14,26 +14,29 @@
package org.apache.tapestry.internal.services;
+import org.apache.tapestry.TapestryConstants;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry.services.ClasspathAssetAliasManager;
+import org.apache.tapestry.services.Request;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
-import org.apache.tapestry.TapestryConstants;
-import org.apache.tapestry.services.ClasspathAssetAliasManager;
-import org.apache.tapestry.services.Request;
-
public class ClasspathAssetAliasManagerImpl implements ClasspathAssetAliasManager
{
private final Request _request;
- /** Map from alias to path. */
+ /**
+ * Map from alias to path.
+ */
private final Map<String, String> _aliasToPathPrefix = newMap();
- /** Map from path to alias. */
+ /**
+ * Map from path to alias.
+ */
private final Map<String, String> _pathPrefixToAlias = newMap();
private final List<String> _sortedAliases;
@@ -46,7 +49,7 @@
*/
public ClasspathAssetAliasManagerImpl(Request request,
- Map<String, String> configuration)
+ Map<String, String> configuration)
{
_request = request;
@@ -112,8 +115,11 @@
for (String alias : _sortedAliases)
{
- if (basePath.startsWith(alias)) { return _aliasToPathPrefix.get(alias)
- + basePath.substring(alias.length()); }
+ if (basePath.startsWith(alias))
+ {
+ return _aliasToPathPrefix.get(alias)
+ + basePath.substring(alias.length());
+ }
}
return basePath;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetFactory.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetFactory.java Mon Nov 12 14:22:31 2007
@@ -14,21 +14,20 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
-
-import java.util.Map;
-
import org.apache.tapestry.Asset;
import org.apache.tapestry.internal.events.InvalidationListener;
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.internal.util.ClasspathResource;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
import org.apache.tapestry.services.AssetFactory;
import org.apache.tapestry.services.ClasspathAssetAliasManager;
+import java.util.Map;
+
/**
* Generates Assets for files on the classpath. Caches generated client URLs internally, and clears
* that cache when notified to do so by the {@link ResourceCache}.
- *
+ *
* @see AssetDispatcher
*/
public class ClasspathAssetFactory implements AssetFactory, InvalidationListener
@@ -40,7 +39,7 @@
private final Map<Resource, String> _resourceToClientURL = newConcurrentMap();
public ClasspathAssetFactory(final ResourceCache cache,
- final ClasspathAssetAliasManager aliasManager)
+ final ClasspathAssetAliasManager aliasManager)
{
_cache = cache;
_aliasManager = aliasManager;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorage.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorage.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorage.java Mon Nov 12 14:22:31 2007
@@ -26,7 +26,7 @@
{
/**
* Updates a link, adding a query parameter to it (if necessary) to store
- *
+ *
* @param link
*/
void updateLink(Link link);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImpl.java Mon Nov 12 14:22:31 2007
@@ -14,24 +14,23 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-
import org.apache.tapestry.Link;
import org.apache.tapestry.internal.TapestryInternalUtils;
import org.apache.tapestry.internal.util.Base64ObjectInputStream;
import org.apache.tapestry.internal.util.Base64ObjectOutputStream;
+import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
import org.apache.tapestry.ioc.annotations.Scope;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import org.apache.tapestry.services.PersistentFieldChange;
import org.apache.tapestry.services.Request;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
/**
* Manages client-persistent values on behalf of a {@link ClientPersistentFieldStorageImpl}. Some
* effort is made to ensure that we don't uncessarily convert between objects and Base64 (the
@@ -67,7 +66,7 @@
public PersistentFieldChange toChange(Object value)
{
return new PersistentFieldChangeImpl(_componentId == null ? "" : _componentId,
- _fieldName, value);
+ _fieldName, value);
}
@Override
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStrategy.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStrategy.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStrategy.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,11 @@
package org.apache.tapestry.internal.services;
-import java.util.Collection;
-
import org.apache.tapestry.Link;
import org.apache.tapestry.services.PersistentFieldChange;
import org.apache.tapestry.services.PersistentFieldStrategy;
+
+import java.util.Collection;
/**
* Implements simple client-persistent properties. Most of the logic is delegated to an instance of
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CoercingPropertyConduitWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CoercingPropertyConduitWrapper.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CoercingPropertyConduitWrapper.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CoercingPropertyConduitWrapper.java Mon Nov 12 14:22:31 2007
@@ -14,10 +14,10 @@
package org.apache.tapestry.internal.services;
-import java.lang.annotation.Annotation;
-
import org.apache.tapestry.PropertyConduit;
import org.apache.tapestry.ioc.services.TypeCoercer;
+
+import java.lang.annotation.Annotation;
public class CoercingPropertyConduitWrapper implements PropertyConduit
{