You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2007/11/12 23:23:28 UTC
svn commit: r594319 [9/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/services/PageRenderRequestHandlerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderRequestHandlerImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderRequestHandlerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderRequestHandlerImpl.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.internal.services;
-import java.io.IOException;
-
import org.apache.tapestry.ComponentEventHandler;
import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.internal.structure.Page;
@@ -26,6 +24,8 @@
import org.apache.tapestry.services.PageRenderRequestHandler;
import org.apache.tapestry.services.Response;
+import java.io.IOException;
+
/**
* Handles a PageLink as specified by a PageLinkPathSource by activating and then rendering the
* page.
@@ -41,8 +41,8 @@
private final Response _response;
public PageRenderRequestHandlerImpl(RequestPageCache cache,
- ComponentEventResultProcessor resultProcessor,
- PageResponseRenderer pageResponseRenderer, Response response)
+ ComponentEventResultProcessor resultProcessor,
+ PageResponseRenderer pageResponseRenderer, Response response)
{
_cache = cache;
_resultProcessor = resultProcessor;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderSupportImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderSupportImpl.java Mon Nov 12 14:22:31 2007
@@ -14,18 +14,17 @@
package org.apache.tapestry.internal.services;
-import static java.lang.String.format;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-
-import java.util.Arrays;
-import java.util.List;
-
import org.apache.tapestry.Asset;
import org.apache.tapestry.PageRenderSupport;
+import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
import org.apache.tapestry.ioc.internal.util.IdAllocator;
import org.apache.tapestry.ioc.services.SymbolSource;
import org.apache.tapestry.services.AssetSource;
+import static java.lang.String.format;
+import java.util.Arrays;
+import java.util.List;
+
public class PageRenderSupportImpl implements PageRenderSupport
{
private final IdAllocator _idAllocator = new IdAllocator();
@@ -41,19 +40,15 @@
private boolean _coreAssetsAdded;
/**
- * @param builder
- * Used to assemble JavaScript includes and snippets
- * @param symbolSource
- * Used to example symbols (in
- * {@linkplain #addClasspathScriptLink(String...) in classpath scripts)
- * @param assetSource
- * Used to convert classpath scripts to {@link Asset}s
- * @param coreScripts
- * core scripts (evaluated as classpaths scripts) that are added to any page that
- * includes a script link or script block
+ * @param builder Used to assemble JavaScript includes and snippets
+ * @param symbolSource Used to example symbols (in
+ * {@linkplain #addClasspathScriptLink(String...) in classpath scripts)
+ * @param assetSource Used to convert classpath scripts to {@link Asset}s
+ * @param coreScripts core scripts (evaluated as classpaths scripts) that are added to any page that
+ * includes a script link or script block
*/
public PageRenderSupportImpl(DocumentHeadBuilder builder, SymbolSource symbolSource,
- AssetSource assetSource, String... coreScripts)
+ AssetSource assetSource, String... coreScripts)
{
_builder = builder;
_symbolSource = symbolSource;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRenderer.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRenderer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRenderer.java Mon Nov 12 14:22:31 2007
@@ -14,10 +14,10 @@
package org.apache.tapestry.internal.services;
-import java.io.IOException;
-
import org.apache.tapestry.internal.structure.Page;
import org.apache.tapestry.services.Response;
+
+import java.io.IOException;
/**
* Service responsible for writing a full page markup response.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRendererImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRendererImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRendererImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRendererImpl.java Mon Nov 12 14:22:31 2007
@@ -14,9 +14,6 @@
package org.apache.tapestry.internal.services;
-import java.io.IOException;
-import java.io.PrintWriter;
-
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.TapestryConstants;
@@ -26,6 +23,9 @@
import org.apache.tapestry.services.MetaDataLocator;
import org.apache.tapestry.services.Response;
+import java.io.IOException;
+import java.io.PrintWriter;
+
public class PageResponseRendererImpl implements PageResponseRenderer
{
public static final String CHARSET = "charset";
@@ -37,7 +37,7 @@
private final MetaDataLocator _metaDataLocator;
public PageResponseRendererImpl(MarkupWriterFactory markupWriterFactory,
- PageMarkupRenderer markupRenderer, MetaDataLocator metaDataLocator)
+ PageMarkupRenderer markupRenderer, MetaDataLocator metaDataLocator)
{
_markupWriterFactory = markupWriterFactory;
_markupRenderer = markupRenderer;
@@ -54,7 +54,7 @@
ContentType contentType = new ContentType(contentTypeString);
// Make sure thre's always a charset specified.
-
+
String encoding = contentType.getParameter(CHARSET);
if (encoding == null)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageTemplateLocator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageTemplateLocator.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageTemplateLocator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageTemplateLocator.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,11 @@
package org.apache.tapestry.internal.services;
-import java.util.Locale;
-
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.model.ComponentModel;
+import java.util.Locale;
+
/**
* Responsible for locating page templates in the web application context.
*/
@@ -27,11 +27,9 @@
/**
* Given model, determines if the model is for a page (rather than a component) and if so, sees
* if there is a localized template for the page in the web application context.
- *
- * @param model
- * the component model defining the page to search for
- * @param locale
- * the desired localization of the template
+ *
+ * @param model the component model defining the page to search for
+ * @param locale the desired localization of the template
* @return the template resource, or null if not found or the model is not a page
*/
Resource findPageTemplateResource(ComponentModel model, Locale locale);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageTemplateLocatorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageTemplateLocatorImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageTemplateLocatorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageTemplateLocatorImpl.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,14 @@
package org.apache.tapestry.internal.services;
-import static java.lang.String.format;
-
-import java.util.Locale;
-
import org.apache.tapestry.internal.InternalConstants;
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.ComponentModel;
import org.apache.tapestry.services.ComponentClassResolver;
+
+import static java.lang.String.format;
+import java.util.Locale;
public class PageTemplateLocatorImpl implements PageTemplateLocator
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ParameterWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ParameterWorker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ParameterWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ParameterWorker.java Mon Nov 12 14:22:31 2007
@@ -14,9 +14,6 @@
package org.apache.tapestry.internal.services;
-import java.lang.reflect.Modifier;
-import java.util.List;
-
import org.apache.tapestry.Binding;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.internal.InternalComponentResources;
@@ -24,14 +21,10 @@
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.util.BodyBuilder;
import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.BindingSource;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.FieldFilter;
-import org.apache.tapestry.services.MethodFilter;
-import org.apache.tapestry.services.TransformConstants;
-import org.apache.tapestry.services.TransformMethodSignature;
-import org.apache.tapestry.services.TransformUtils;
+import org.apache.tapestry.services.*;
+
+import java.lang.reflect.Modifier;
+import java.util.List;
/**
* Responsible for identifying parameters via the {@link org.apache.tapestry.annotations.Parameter}
@@ -73,14 +66,14 @@
}
private void convertFieldsIntoParameters(ClassTransformation transformation,
- MutableComponentModel model, List<String> fieldNames)
+ MutableComponentModel model, List<String> fieldNames)
{
for (String name : fieldNames)
convertFieldIntoParameter(name, transformation, model);
}
private void convertFieldIntoParameter(String name, ClassTransformation transformation,
- MutableComponentModel model)
+ MutableComponentModel model)
{
Parameter annotation = transformation.getFieldAnnotation(name, Parameter.class);
@@ -134,8 +127,8 @@
* Returns the name of a field that stores whether the parameter binding is invariant.
*/
private String addParameterSetup(String fieldName, String defaultPrefix, String defaultBinding,
- String parameterName, String cachedFieldName, boolean cache, String fieldType,
- String resourcesFieldName, ClassTransformation transformation)
+ String parameterName, String cachedFieldName, boolean cache, String fieldType,
+ String resourcesFieldName, ClassTransformation transformation)
{
String defaultFieldName = transformation.addField(Modifier.PRIVATE, fieldType, fieldName
+ "_default");
@@ -192,8 +185,9 @@
}
private void addDefaultBindingSetup(String parameterName, String defaultPrefix,
- String defaultBinding, String resourcesFieldName, ClassTransformation transformation,
- BodyBuilder builder)
+ String defaultBinding, String resourcesFieldName,
+ ClassTransformation transformation,
+ BodyBuilder builder)
{
if (InternalUtils.isNonBlank(defaultBinding))
{
@@ -249,8 +243,8 @@
}
private void addWriterMethod(String fieldName, String cachedFieldName, boolean cache,
- String parameterName, String fieldType, String resourcesFieldName,
- ClassTransformation transformation)
+ String parameterName, String fieldType, String resourcesFieldName,
+ ClassTransformation transformation)
{
BodyBuilder builder = new BodyBuilder();
builder.begin();
@@ -282,18 +276,20 @@
String methodName = transformation.newMemberName("update_parameter", parameterName);
TransformMethodSignature signature = new TransformMethodSignature(Modifier.PRIVATE, "void", methodName,
- new String[]
- { fieldType }, null);
+ new String[]
+ {fieldType}, null);
transformation.addMethod(signature, builder.toString());
transformation.replaceWriteAccess(fieldName, methodName);
}
- /** Adds a private method that will be the replacement for read-access to the field. */
+ /**
+ * Adds a private method that will be the replacement for read-access to the field.
+ */
private void addReaderMethod(String fieldName, String cachedFieldName,
- String invariantFieldName, boolean cache, String parameterName, String fieldType,
- String resourcesFieldName, ClassTransformation transformation)
+ String invariantFieldName, boolean cache, String parameterName, String fieldType,
+ String resourcesFieldName, ClassTransformation transformation)
{
BodyBuilder builder = new BodyBuilder();
builder.begin();
@@ -342,7 +338,7 @@
String methodName = transformation.newMemberName("read_parameter", parameterName);
TransformMethodSignature signature = new TransformMethodSignature(Modifier.PRIVATE, fieldType, methodName,
- null, null);
+ null, null);
transformation.addMethod(signature, builder.toString());
@@ -371,6 +367,6 @@
}
resources.bindParameter(parameterName, new LiteralBinding("default " + parameterName,
- value, null));
+ value, null));
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistWorker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistWorker.java Mon Nov 12 14:22:31 2007
@@ -14,19 +14,13 @@
package org.apache.tapestry.internal.services;
-import static java.lang.String.format;
-
-import java.lang.reflect.Modifier;
-
import org.apache.tapestry.annotations.Persist;
import org.apache.tapestry.ioc.util.BodyBuilder;
import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.PersistentFieldBundle;
-import org.apache.tapestry.services.TransformConstants;
-import org.apache.tapestry.services.TransformMethodSignature;
-import org.apache.tapestry.services.TransformUtils;
+import org.apache.tapestry.services.*;
+
+import static java.lang.String.format;
+import java.lang.reflect.Modifier;
/**
* Converts fields with the {@link Persist} annotation into persistent fields.
@@ -52,13 +46,13 @@
* <li>When the page attaches, pull the persisted value for the field out of the
* {@link PersistentFieldBundle}</li>
* </ul>
- *
+ *
* @param fieldName
* @param transformation
* @param model
*/
private void makeFieldPersistent(String fieldName, ClassTransformation transformation,
- MutableComponentModel model)
+ MutableComponentModel model)
{
String fieldType = transformation.getFieldType(fieldName);
Persist annotation = transformation.getFieldAnnotation(fieldName, Persist.class);
@@ -94,8 +88,8 @@
builder.end();
transformation.addMethod(new TransformMethodSignature(Modifier.PRIVATE, "void", writeMethodName,
- new String[]
- { fieldType }, null), builder.toString());
+ new String[]
+ {fieldType}, null), builder.toString());
transformation.replaceWriteAccess(fieldName, writeMethodName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldBundleImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldBundleImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldBundleImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldBundleImpl.java Mon Nov 12 14:22:31 2007
@@ -1,26 +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.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-
-import java.util.Collection;
-import java.util.Map;
-
-import org.apache.tapestry.services.PersistentFieldBundle;
-import org.apache.tapestry.services.PersistentFieldChange;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry.services.PersistentFieldBundle;
+import org.apache.tapestry.services.PersistentFieldChange;
+
+import java.util.Collection;
+import java.util.Map;
public class PersistentFieldBundleImpl implements PersistentFieldBundle
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldChangeImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldChangeImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldChangeImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldChangeImpl.java Mon Nov 12 14:22:31 2007
@@ -16,7 +16,6 @@
import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-
import org.apache.tapestry.services.PersistentFieldChange;
public class PersistentFieldChangeImpl implements PersistentFieldChange
@@ -28,7 +27,7 @@
private final Object _value;
public PersistentFieldChangeImpl(final String componentId, final String fieldName,
- final Object value)
+ final Object value)
{
notNull(componentId, "componentId");
notBlank(fieldName, "fieldName");
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java Mon Nov 12 14:22:31 2007
@@ -14,18 +14,14 @@
package org.apache.tapestry.internal.services;
-import java.util.Collection;
-import java.util.Map;
-
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.services.MetaDataLocator;
-import org.apache.tapestry.services.PersistentFieldBundle;
-import org.apache.tapestry.services.PersistentFieldChange;
-import org.apache.tapestry.services.PersistentFieldManager;
-import org.apache.tapestry.services.PersistentFieldStrategy;
+import org.apache.tapestry.services.*;
+
+import java.util.Collection;
+import java.util.Map;
public class PersistentFieldManagerImpl implements PersistentFieldManager
{
@@ -38,7 +34,7 @@
private final Map<String, PersistentFieldStrategy> _strategies;
public PersistentFieldManagerImpl(MetaDataLocator locator,
- Map<String, PersistentFieldStrategy> strategies)
+ Map<String, PersistentFieldStrategy> strategies)
{
_metaDataLocator = locator;
@@ -70,7 +66,7 @@
}
public void postChange(String pageName, ComponentResources resources, String fieldName,
- Object newValue)
+ Object newValue)
{
String strategyName = findStrategy(resources, fieldName);
PersistentFieldStrategy strategy = getStrategy(strategyName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentLocaleImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentLocaleImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentLocaleImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentLocaleImpl.java Mon Nov 12 14:22:31 2007
@@ -14,10 +14,10 @@
package org.apache.tapestry.internal.services;
-import java.util.Locale;
-
import org.apache.tapestry.services.Cookies;
import org.apache.tapestry.services.PersistentLocale;
+
+import java.util.Locale;
public class PersistentLocaleImpl implements PersistentLocale
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PropertyConduitSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PropertyConduitSourceImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PropertyConduitSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PropertyConduitSourceImpl.java Mon Nov 12 14:22:31 2007
@@ -14,29 +14,22 @@
package org.apache.tapestry.internal.services;
+import org.apache.tapestry.PropertyConduit;
+import org.apache.tapestry.internal.events.InvalidationListener;
+import org.apache.tapestry.internal.util.MultiKey;
+import org.apache.tapestry.ioc.AnnotationProvider;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
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.services.*;
+import org.apache.tapestry.ioc.util.BodyBuilder;
+import org.apache.tapestry.services.PropertyConduitSource;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Map;
-import org.apache.tapestry.PropertyConduit;
-import org.apache.tapestry.internal.events.InvalidationListener;
-import org.apache.tapestry.internal.util.MultiKey;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.services.ClassFab;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
-import org.apache.tapestry.ioc.services.MethodSignature;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.ioc.services.PropertyAdapter;
-import org.apache.tapestry.ioc.util.BodyBuilder;
-import org.apache.tapestry.services.PropertyConduitSource;
-
public class PropertyConduitSourceImpl implements PropertyConduitSource, InvalidationListener
{
private static final String PARENS = "()";
@@ -47,16 +40,19 @@
private final Map<Class, Class> _classToEffectiveClass = newConcurrentMap();
- /** Keyed on combination of root class and expression. */
+ /**
+ * Keyed on combination of root class and expression.
+ */
private final Map<MultiKey, PropertyConduit> _cache = newConcurrentMap();
private static final MethodSignature GET_SIGNATURE = new MethodSignature(Object.class, "get",
- new Class[]
- { Object.class }, null);
+ new Class[]
+ {Object.class}, null);
private static final MethodSignature SET_SIGNATURE = new MethodSignature(void.class, "set",
- new Class[]
- { Object.class, Object.class }, null);
+ new Class[]
+ {Object.class, Object.class},
+ null);
public PropertyConduitSourceImpl(final PropertyAccess access, final ClassFactory classFactory)
{
@@ -115,7 +111,7 @@
* and overrides the constructor. In a worst-case race condition, we may build two (or more)
* conduits for the same rootClass/expression, and it will get sorted out when the conduit is
* stored into the cache.
- *
+ *
* @param rootClass
* @param expression
* @return the conduit
@@ -127,7 +123,7 @@
ClassFab classFab = _classFactory.newClass(name, BasePropertyConduit.class);
classFab.addConstructor(new Class[]
- { Class.class, AnnotationProvider.class, String.class }, null, "super($$);");
+ {Class.class, AnnotationProvider.class, String.class}, null, "super($$);");
String[] terms = expression.split("\\.");
@@ -341,7 +337,7 @@
}
private Method readMethodForTerm(Class activeType, String expression, String term,
- boolean mustExist)
+ boolean mustExist)
{
if (term.endsWith(PARENS))
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ReflectiveInstantiator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ReflectiveInstantiator.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ReflectiveInstantiator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ReflectiveInstantiator.java Mon Nov 12 14:22:31 2007
@@ -1,24 +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.services;
-import java.lang.reflect.Constructor;
-
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.runtime.Component;
+import org.apache.tapestry.internal.InternalComponentResources;
+import org.apache.tapestry.model.ComponentModel;
+import org.apache.tapestry.runtime.Component;
+
+import java.lang.reflect.Constructor;
/**
* Implementation of {@link Instantiator} based on a class, a list of parameters to the class'
@@ -35,17 +35,14 @@
/**
* Creates a new instance that will instantiate the given class. The
- *
- * @param componentModel
- * model defining the behavior of the component
- * @param instanceClass
- * class to instantiate
- * @param parameters
- * passed to the constructor; the first instance is ignored (and overriden) as the
- * {@link org.apache.tapestry.internal.InternalComponentResources} instance.
+ *
+ * @param componentModel model defining the behavior of the component
+ * @param instanceClass class to instantiate
+ * @param parameters passed to the constructor; the first instance is ignored (and overriden) as the
+ * {@link org.apache.tapestry.internal.InternalComponentResources} instance.
*/
ReflectiveInstantiator(ComponentModel componentModel, Class instanceClass,
- Object[] constructorParameters)
+ Object[] constructorParameters)
{
_componentModel = componentModel;
_constructorParameters = constructorParameters;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderCommandWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderCommandWorker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderCommandWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderCommandWorker.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.internal.services;
-import java.lang.reflect.Modifier;
-
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.internal.InternalComponentResourcesCommon;
import org.apache.tapestry.model.MutableComponentModel;
@@ -25,6 +23,8 @@
import org.apache.tapestry.services.ComponentClassTransformWorker;
import org.apache.tapestry.services.TransformMethodSignature;
+import java.lang.reflect.Modifier;
+
/**
* Ensures that all components implement {@link RenderCommand} by delegating to
* {@link InternalComponentResourcesCommon#queueRender(org.apache.tapestry.runtime.RenderQueue)}.
@@ -32,8 +32,8 @@
public class RenderCommandWorker implements ComponentClassTransformWorker
{
private final TransformMethodSignature RENDER_SIGNATURE = new TransformMethodSignature(Modifier.PUBLIC, "void",
- "render", new String[]
- { MarkupWriter.class.getName(), RenderQueue.class.getName() }, null);
+ "render", new String[]
+ {MarkupWriter.class.getName(), RenderQueue.class.getName()}, null);
public void transform(ClassTransformation transformation, MutableComponentModel model)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializer.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializer.java Mon Nov 12 14:22:31 2007
@@ -22,9 +22,8 @@
{
/**
* Initializes the request encoding to match the encoding defined for the page.
- *
- * @param pageName
- * logical name of the page
+ *
+ * @param pageName logical name of the page
*/
void initializeRequestEncoding(String pageName);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImpl.java Mon Nov 12 14:22:31 2007
@@ -30,7 +30,7 @@
private final Request _request;
public RequestEncodingInitializerImpl(RequestPageCache cache, MetaDataLocator locator,
- Request request)
+ Request request)
{
_cache = cache;
_locator = locator;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestGlobalsImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestGlobalsImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestGlobalsImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestGlobalsImpl.java Mon Nov 12 14:22:31 2007
@@ -15,14 +15,13 @@
package org.apache.tapestry.internal.services;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.tapestry.ioc.annotations.Scope;
import org.apache.tapestry.services.Request;
import org.apache.tapestry.services.RequestGlobals;
import org.apache.tapestry.services.Response;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* Dumb data holder for per-request data.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestImpl.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,15 @@
package org.apache.tapestry.internal.services;
-import java.io.UnsupportedEncodingException;
-import java.util.List;
-import java.util.Locale;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.services.Request;
import org.apache.tapestry.services.Session;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+import java.util.Locale;
/**
* Basic implementation of {@link org.apache.tapestry.services.Request} that wraps around an
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCache.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCache.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCache.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCache.java Mon Nov 12 14:22:31 2007
@@ -25,13 +25,11 @@
/**
* Gets the page via its page name, in the current locale. The page name is resolved to a class
* name, which is used to obtain the page (from the page pool).
- *
- * @param logicalPageName
- * the name of the page to retrieve (this is the logical page name, not the fully
- * qualified class name)
+ *
+ * @param logicalPageName the name of the page to retrieve (this is the logical page name, not the fully
+ * qualified class name)
* @return a page instance reserved for this request
- * @throws IllegalArgumentException
- * if the name can not be resolved to a page instance
+ * @throws IllegalArgumentException if the name can not be resolved to a page instance
*/
Page get(String logicalPageName);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCacheImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCacheImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCacheImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCacheImpl.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,11 @@
package org.apache.tapestry.internal.services;
+import org.apache.tapestry.internal.structure.Page;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
+import org.apache.tapestry.ioc.services.ThreadCleanupListener;
import java.util.Map;
-
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.ioc.services.ThreadCleanupListener;
public class RequestPageCacheImpl implements RequestPageCache, ThreadCleanupListener
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestRenderer.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestRenderer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestRenderer.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
package org.apache.tapestry.internal.services;
-import java.util.List;
-
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.internal.InternalConstants;
import org.apache.tapestry.services.ObjectRenderer;
import org.apache.tapestry.services.Request;
+
+import java.util.List;
public class RequestRenderer implements ObjectRenderer<Request>
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCache.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCache.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCache.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCache.java Mon Nov 12 14:22:31 2007
@@ -28,7 +28,7 @@
/**
* Returns true if the path requires that the client URL for the resource include a digest to
* validate that the client is authorized to access the resource.
- *
+ *
* @param resource
* @return true if digest is required for the resource
* @see ResourceDigestGenerator#requiresDigest(String)
@@ -37,7 +37,7 @@
/**
* Returns the digest for the given path.
- *
+ *
* @param resource
* @return the digest, or null if the resource does not exist
*/
@@ -45,7 +45,7 @@
/**
* Returns the time modified for the resource.
- *
+ *
* @param resource
* @return the date time modified for the path, or a negative value if the resource does not
* exist
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCacheImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCacheImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCacheImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCacheImpl.java Mon Nov 12 14:22:31 2007
@@ -14,19 +14,18 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
-
-import java.net.URL;
-import java.util.Map;
-
import org.apache.tapestry.internal.event.InvalidationEventHubImpl;
import org.apache.tapestry.internal.events.UpdateListener;
import org.apache.tapestry.internal.util.URLChangeTracker;
import org.apache.tapestry.ioc.Resource;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
import org.apache.tapestry.services.ResourceDigestGenerator;
+import java.net.URL;
+import java.util.Map;
+
public class ResourceCacheImpl extends InvalidationEventHubImpl implements ResourceCache,
- UpdateListener
+ UpdateListener
{
private final URLChangeTracker _tracker;
@@ -57,7 +56,7 @@
// to an actual resource.
_digest = (_requiresDigest && url != null) ? _digestGenerator.generateDigest(url)
- : null;
+ : null;
_timeModified = url != null ? _tracker.add(url) : MISSING_RESOURCE_TIME_MODIFIED;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceDigestGeneratorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceDigestGeneratorImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceDigestGeneratorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceDigestGeneratorImpl.java Mon Nov 12 14:22:31 2007
@@ -14,6 +14,11 @@
package org.apache.tapestry.internal.services;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.tapestry.internal.TapestryInternalUtils;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry.services.ResourceDigestGenerator;
+
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -22,11 +27,6 @@
import java.util.Collection;
import java.util.Set;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.ResourceDigestGenerator;
-
/**
* Implementation of {@link ResourceDigestGenerator} that generates MD5 digests.
*/
@@ -85,7 +85,9 @@
}
}
- /** Current implementation is based on the path extension, and a configured list of extensions. */
+ /**
+ * Current implementation is based on the path extension, and a configured list of extensions.
+ */
public boolean requiresDigest(String path)
{
int dotx = path.lastIndexOf('.');
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamer.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamer.java Mon Nov 12 14:22:31 2007
@@ -14,17 +14,19 @@
package org.apache.tapestry.internal.services;
-import java.io.IOException;
-
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.internal.util.ClasspathResource;
+import java.io.IOException;
+
/**
* Responsible for streaming the contents of a resource to the client. The {@link Resource} to
* stream is almost always a {@link ClasspathResource}.
*/
public interface ResourceStreamer
{
- /** Streams the content of the resource to the client. */
+ /**
+ * Streams the content of the resource to the client.
+ */
void streamResource(Resource resource) throws IOException;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamerImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamerImpl.java Mon Nov 12 14:22:31 2007
@@ -14,6 +14,10 @@
package org.apache.tapestry.internal.services;
+import org.apache.tapestry.internal.TapestryInternalUtils;
+import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry.services.Response;
+
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -21,10 +25,6 @@
import java.net.URL;
import java.net.URLConnection;
import java.util.Map;
-
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.services.Response;
public class ResourceStreamerImpl implements ResourceStreamer
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResponseImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResponseImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResponseImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResponseImpl.java Mon Nov 12 14:22:31 2007
@@ -14,17 +14,15 @@
package org.apache.tapestry.internal.services;
+import org.apache.tapestry.ioc.internal.util.Defense;
import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
+import org.apache.tapestry.services.Response;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.services.Response;
-
/**
* Implementation of {@link Response} that wraps around an underlying {@link HttpServletResponse}.
*/
@@ -89,14 +87,13 @@
public void setHeader(String name, String value)
{
- _response.setHeader(name,value);
+ _response.setHeader(name, value);
}
public void setIntHeader(String name, int value)
{
_response.setIntHeader(name, value);
}
-
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RetainWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RetainWorker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RetainWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RetainWorker.java Mon Nov 12 14:22:31 2007
@@ -1,29 +1,27 @@
-// 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.services;
-import org.apache.tapestry.annotations.Retain;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
+import org.apache.tapestry.annotations.Retain;
+import org.apache.tapestry.model.MutableComponentModel;
+import org.apache.tapestry.services.ClassTransformation;
+import org.apache.tapestry.services.ComponentClassTransformWorker;
/**
* Identifies fields with the {@link org.apache.tapestry.annotations.Retain} annotation, and
* "claims" them so that no special work will occur on them.
- *
- *
*/
public final class RetainWorker implements ComponentClassTransformWorker
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,9 @@
package org.apache.tapestry.internal.services;
-import java.io.IOException;
+import org.apache.tapestry.services.*;
-import org.apache.tapestry.services.ComponentClassResolver;
-import org.apache.tapestry.services.Dispatcher;
-import org.apache.tapestry.services.PageRenderRequestHandler;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import java.io.IOException;
/**
* Recognizes a request for the application root (i.e., "/") and handles this the same as a render
@@ -32,13 +28,13 @@
private final PageRenderRequestHandler _handler;
-
+
private final String _startPageName;
private final String[] _emptyContext = new String[0];
public RootPathDispatcher(final ComponentClassResolver componentClassResolver,
- final PageRenderRequestHandler handler, final String startPageName)
+ final PageRenderRequestHandler handler, final String startPageName)
{
_componentClassResolver = componentClassResolver;
_handler = handler;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceAnnotationObjectProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceAnnotationObjectProvider.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceAnnotationObjectProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceAnnotationObjectProvider.java Mon Nov 12 14:22:31 2007
@@ -27,7 +27,7 @@
public class ServiceAnnotationObjectProvider implements ObjectProvider
{
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider,
- ObjectLocator locator)
+ ObjectLocator locator)
{
Service annotation = annotationProvider.getAnnotation(Service.class);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceInjectionProvider.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceInjectionProvider.java Mon Nov 12 14:22:31 2007
@@ -35,7 +35,7 @@
@SuppressWarnings("unchecked")
public boolean provideInjection(String fieldName, Class fieldType, ObjectLocator locator,
- ClassTransformation transformation, MutableComponentModel componentModel)
+ ClassTransformation transformation, MutableComponentModel componentModel)
{
Object inject = _locator.getService(fieldType);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServicesMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServicesMessages.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServicesMessages.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServicesMessages.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,7 @@
package org.apache.tapestry.internal.services;
-import java.net.URL;
-import java.util.Collection;
-import java.util.List;
-
import javassist.CtClass;
-
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.Resource;
@@ -31,12 +26,16 @@
import org.apache.tapestry.runtime.RenderCommand;
import org.apache.tapestry.services.TransformMethodSignature;
+import java.net.URL;
+import java.util.Collection;
+import java.util.List;
+
class ServicesMessages
{
private static final Messages MESSAGES = MessagesImpl.forClass(ServicesMessages.class);
static final String duplicateContribution(Object conflict, Class contributionType,
- Object existing)
+ Object existing)
{
return MESSAGES.format(
"duplicate-contribution",
@@ -66,10 +65,10 @@
}
static String fieldAlreadyClaimed(String fieldName, CtClass ctClass, Object existingTag,
- Object newTag)
+ Object newTag)
{
return MESSAGES.format("field-already-claimed", new Object[]
- { fieldName, ctClass.getName(), existingTag, newTag });
+ {fieldName, ctClass.getName(), existingTag, newTag});
}
static String noDeclaredMethod(CtClass ctClass, TransformMethodSignature methodSignature)
@@ -114,7 +113,7 @@
}
static String methodCompileError(TransformMethodSignature signature, String methodBody,
- Throwable cause)
+ Throwable cause)
{
return MESSAGES.format("method-compile-error", signature, methodBody, cause);
}
@@ -179,7 +178,7 @@
}
static String unknownPersistentFieldStrategy(String stategyName,
- Collection<String> strategyNames)
+ Collection<String> strategyNames)
{
return MESSAGES.format("unknown-persistent-field-strategy", stategyName, InternalUtils
.joinSorted(strategyNames));
@@ -198,7 +197,7 @@
}
static String couldNotResolveComponentType(String componentType,
- Collection<String> componentTypes)
+ Collection<String> componentTypes)
{
return MESSAGES.format("could-not-resolve-component-type", componentType, InternalUtils
.joinSorted(componentTypes));
@@ -221,7 +220,7 @@
}
static String componentInstanceIsNotAPage(String methodDescription, Component component,
- Component result)
+ Component result)
{
return MESSAGES.format("component-instance-is-not-a-page", methodDescription, component
.getComponentResources().getCompleteId(), result.getComponentResources()
@@ -249,7 +248,7 @@
}
static String componentNotAssignableToField(Component component, String fieldName,
- String fieldType)
+ String fieldType)
{
return MESSAGES.format("component-not-assignable-to-field", component
.getComponentResources().getCompleteId(), fieldName, fieldType);
@@ -294,7 +293,7 @@
}
static String invalidComponentEventResult(Component component, Object result,
- String methodDescription, Collection<Class> configuredResultTypes)
+ String methodDescription, Collection<Class> configuredResultTypes)
{
List<String> classNames = CollectionFactory.newList();
@@ -307,7 +306,7 @@
}
static String undefinedTapestryAttribute(String elementName, String attributeName,
- String allowedAttributeName)
+ String allowedAttributeName)
{
return MESSAGES.format(
"undefined-tapestry-attribute",
@@ -322,7 +321,7 @@
}
static String missingApplicationStatePersistenceStrategy(String name,
- Collection<String> availableNames)
+ Collection<String> availableNames)
{
return MESSAGES.format(
"missing-application-state-persistence-strategy",
@@ -345,7 +344,7 @@
}
static String noSuchProperty(Class targetClass, String propertyName, String propertyExpression,
- Collection<String> propertyNames)
+ Collection<String> propertyNames)
{
return MESSAGES.format(
"no-such-property",
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionApplicationStatePersistenceStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionApplicationStatePersistenceStrategy.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionApplicationStatePersistenceStrategy.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionApplicationStatePersistenceStrategy.java Mon Nov 12 14:22:31 2007
@@ -21,12 +21,12 @@
/**
* Stores ASOs in the {@link Session}, which will be created as necessary.
- * <p>
+ * <p/>
* TODO: Re-storing the object back into the session at the end of the request. That's going to
* require some kind of end-of-request notification.
*/
public class SessionApplicationStatePersistenceStrategy implements
- ApplicationStatePersistenceStrategy
+ ApplicationStatePersistenceStrategy
{
static final String PREFIX = "aso:";
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionImpl.java Mon Nov 12 14:22:31 2007
@@ -15,15 +15,13 @@
package org.apache.tapestry.internal.services;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry.services.Session;
+import javax.servlet.http.HttpSession;
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
-
-import javax.servlet.http.HttpSession;
-
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.Session;
/**
* A thin wrapper around {@link HttpSession}.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategy.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategy.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategy.java Mon Nov 12 14:22:31 2007
@@ -19,7 +19,7 @@
/**
* A strategy for storing persistent page properties into the {@link Session session}.
- * <p>
+ * <p/>
* Builds attribute names as:
* <code>state:<em>page-name</em>:<em>component-id</em>:<em>field-name</em></code>
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StaticFilesFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StaticFilesFilter.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StaticFilesFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StaticFilesFilter.java Mon Nov 12 14:22:31 2007
@@ -14,17 +14,12 @@
package org.apache.tapestry.internal.services;
-import java.io.IOException;
-import java.net.URL;
+import org.apache.tapestry.internal.InternalConstants;
+import org.apache.tapestry.services.*;
import javax.servlet.http.HttpServletResponse;
-
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.services.Context;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.RequestFilter;
-import org.apache.tapestry.services.RequestHandler;
-import org.apache.tapestry.services.Response;
+import java.io.IOException;
+import java.net.URL;
/**
* Identifies requests that are for actual resource files in the context. For those, Tapestry allows
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StreamResponseResultProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StreamResponseResultProcessor.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StreamResponseResultProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StreamResponseResultProcessor.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,6 @@
package org.apache.tapestry.internal.services;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
import org.apache.tapestry.StreamResponse;
import org.apache.tapestry.internal.TapestryInternalUtils;
import org.apache.tapestry.runtime.Component;
@@ -26,12 +21,17 @@
import org.apache.tapestry.services.ComponentEventResultProcessor;
import org.apache.tapestry.services.Response;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
public class StreamResponseResultProcessor implements ComponentEventResultProcessor<StreamResponse>
{
private static final int BUFFER_SIZE = 5000;
public ActionResponseGenerator processComponentEvent(final StreamResponse streamResponse,
- Component component, final String methodDescripion)
+ Component component, final String methodDescripion)
{
return new ActionResponseGenerator()
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StringResultProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StringResultProcessor.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StringResultProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StringResultProcessor.java Mon Nov 12 14:22:31 2007
@@ -23,7 +23,7 @@
/**
* Used when a component event handler returns a string value. The value is interpreted as the
* logical name of a page. A link to the page will be sent.
- *
+ *
* @see LinkActionResponseGenerator
*/
public class StringResultProcessor implements ComponentEventResultProcessor<String>
@@ -39,7 +39,7 @@
}
public ActionResponseGenerator processComponentEvent(String value, Component component,
- String methodDescripion)
+ String methodDescripion)
{
Page page = _requestPageCache.get(value);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SupportsInformalParametersWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SupportsInformalParametersWorker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SupportsInformalParametersWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SupportsInformalParametersWorker.java Mon Nov 12 14:22:31 2007
@@ -21,8 +21,7 @@
/**
* Checks for the {@link SupportsInformalParameters} annotation, settting the corresponding
- * flag on the model if present.
- *
+ * flag on the model if present.
*/
public class SupportsInformalParametersWorker implements ComponentClassTransformWorker
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParser.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParser.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParser.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParser.java Mon Nov 12 14:22:31 2007
@@ -19,19 +19,17 @@
/**
* Parses a resource into a {@link org.apache.tapestry.internal.parser.ComponentTemplate}.
- *
+ *
* @see PageLoader
*/
public interface TemplateParser
{
/**
* Parses the given resource into a component template.
- *
- * @param templateResource
- * the path
+ *
+ * @param templateResource the path
* @return the parsed template contents
- * @throws RuntimeException
- * if the resource does not exist, or if there is any kind of parse error
+ * @throws RuntimeException if the resource does not exist, or if there is any kind of parse error
*/
ComponentTemplate parseTemplate(Resource templateResource);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java Mon Nov 12 14:22:31 2007
@@ -14,57 +14,36 @@
package org.apache.tapestry.internal.services;
+import org.apache.tapestry.internal.parser.*;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.tapestry.internal.parser.AttributeToken;
-import org.apache.tapestry.internal.parser.BlockToken;
-import org.apache.tapestry.internal.parser.BodyToken;
-import org.apache.tapestry.internal.parser.CDATAToken;
-import org.apache.tapestry.internal.parser.CommentToken;
-import org.apache.tapestry.internal.parser.ComponentTemplate;
-import org.apache.tapestry.internal.parser.ComponentTemplateImpl;
-import org.apache.tapestry.internal.parser.DTDToken;
-import org.apache.tapestry.internal.parser.EndElementToken;
-import org.apache.tapestry.internal.parser.ExpansionToken;
-import org.apache.tapestry.internal.parser.ParameterToken;
-import org.apache.tapestry.internal.parser.StartComponentToken;
-import org.apache.tapestry.internal.parser.StartElementToken;
-import org.apache.tapestry.internal.parser.TemplateToken;
-import org.apache.tapestry.internal.parser.TextToken;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.annotations.Scope;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.internal.util.LocationImpl;
import org.apache.tapestry.ioc.internal.util.TapestryException;
import org.apache.tapestry.ioc.util.Stack;
import org.slf4j.Logger;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
+import org.xml.sax.*;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.XMLReaderFactory;
+import java.io.IOException;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
/**
* Non-threadsafe implementation; the IOC service uses the perthread lifecycle.
*/
@Scope(PERTHREAD_SCOPE)
public class TemplateParserImpl implements TemplateParser, LexicalHandler, ContentHandler,
- EntityResolver
+ EntityResolver
{
private static final String MIXINS_ATTRIBUTE_NAME = "mixins";
@@ -178,7 +157,7 @@
catch (Exception ex)
{
throw new RuntimeException(ServicesMessages.newParserError(templateResource, ex),
- ex);
+ ex);
}
}
@@ -205,7 +184,7 @@
_reader = null;
throw new TapestryException(ServicesMessages.templateParseError(templateResource, ex),
- getCurrentLocation(), ex);
+ getCurrentLocation(), ex);
}
finally
{
@@ -218,7 +197,9 @@
_locator = locator;
}
- /** Accumulates the characters into a text buffer. */
+ /**
+ * Accumulates the characters into a text buffer.
+ */
public void characters(char[] ch, int start, int length) throws SAXException
{
if (_ignoreEvents) return;
@@ -255,7 +236,7 @@
/**
* Scans the text, using a regular expression pattern, for expansion patterns, and adds
* appropriate tokens for what it finds.
- *
+ *
* @param text
*/
private void addTokensForText(String text)
@@ -323,7 +304,7 @@
* Checks to see if currently inside a t:body element (which should always be empty). Content is
* ignored inside a body. If inside a body, then a warning is logged (but only one warning per
* body element).
- *
+ *
* @return true if inside t:body, false otherwise
*/
private boolean insideBody()
@@ -399,14 +380,14 @@
if (InternalUtils.isBlank(parameterName))
throw new TapestryException(ServicesMessages.parameterElementNameRequired(),
- getCurrentLocation(), null);
+ getCurrentLocation(), null);
_tokens.add(new ParameterToken(parameterName, getCurrentLocation()));
_endTagHandlerStack.push(_addEndElementToken);
}
private String findSingleParameter(String elementName, String attributeName,
- Attributes attributes)
+ Attributes attributes)
{
String result = null;
@@ -437,17 +418,14 @@
}
/**
- * @param attributes
- * the attributes for the element
- * @param elementName
- * the name of the element (to be assigned to the new token), may be null for a
- * component in the Tapestry namespace
- * @param identifiedType
- * the type of the element, usually null, but may be the component type derived from
- * the element name (for an element in the Tapestry namespace)
+ * @param attributes the attributes for the element
+ * @param elementName the name of the element (to be assigned to the new token), may be null for a
+ * component in the Tapestry namespace
+ * @param identifiedType the type of the element, usually null, but may be the component type derived from
+ * the element name (for an element in the Tapestry namespace)
*/
private void startPossibleComponent(Attributes attributes, String elementName,
- String identifiedType)
+ String identifiedType)
{
String id = null;
String type = identifiedType;
@@ -501,7 +479,7 @@
if (mixins != null && !isComponent)
throw new TapestryException(ServicesMessages.mixinsInvalidWithoutIdOrType(elementName),
- location, null);
+ location, null);
if (isComponent)
{
@@ -662,7 +640,7 @@
}
public InputSource resolveEntity(String publicId, String systemId) throws SAXException,
- IOException
+ IOException
{
URL url = _configuration.get(publicId);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorDefaultSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorDefaultSourceImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorDefaultSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorDefaultSourceImpl.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
package org.apache.tapestry.internal.services;
-import java.util.Map;
-
import org.apache.tapestry.Translator;
import org.apache.tapestry.internal.events.InvalidationListener;
import org.apache.tapestry.ioc.util.StrategyRegistry;
import org.apache.tapestry.services.TranslatorDefaultSource;
+
+import java.util.Map;
public class TranslatorDefaultSourceImpl implements TranslatorDefaultSource, InvalidationListener
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorSourceImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorSourceImpl.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,11 @@
package org.apache.tapestry.internal.services;
-import java.util.Map;
-
import org.apache.tapestry.Translator;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.services.TranslatorSource;
+
+import java.util.Map;
public class TranslatorSourceImpl implements TranslatorSource
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UnclaimedFieldWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UnclaimedFieldWorker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UnclaimedFieldWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UnclaimedFieldWorker.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,14 @@
package org.apache.tapestry.internal.services;
+import org.apache.tapestry.model.MutableComponentModel;
+import org.apache.tapestry.services.ClassTransformation;
+import org.apache.tapestry.services.ComponentClassTransformWorker;
import static org.apache.tapestry.services.TransformConstants.CONTAINING_PAGE_DID_DETACH_SIGNATURE;
import static org.apache.tapestry.services.TransformConstants.CONTAINING_PAGE_DID_LOAD_SIGNATURE;
import java.lang.reflect.Modifier;
import java.util.List;
-
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
/**
* Designed to be just about the last worker in the pipeline. Its job is to add cleanup code that