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 2010/01/22 17:45:06 UTC
svn commit: r902165 - in
/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal:
model/ services/ structure/ transform/
Author: hlship
Date: Fri Jan 22 16:45:06 2010
New Revision: 902165
URL: http://svn.apache.org/viewvc?rev=902165&view=rev
Log:
Remove @Override annotations not compatible with JDK 1.5 compiler
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetInjectionProvider.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BlockInjectionProvider.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CommonResourcesInjectionProvider.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/AbstractIncludeAssetWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/BindParameterWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectContainerWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MixinWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java?rev=902165&r1=902164&r2=902165&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java Fri Jan 22 16:45:06 2010
@@ -14,20 +14,24 @@
package org.apache.tapestry5.internal.model;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.tapestry5.ioc.Location;
import org.apache.tapestry5.ioc.Resource;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.ioc.internal.util.IdAllocator;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
-import org.apache.tapestry5.model.*;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.model.EmbeddedComponentModel;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.model.MutableEmbeddedComponentModel;
+import org.apache.tapestry5.model.ParameterModel;
import org.slf4j.Logger;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/**
* Internal implementation of {@link org.apache.tapestry5.model.MutableComponentModel}.
*/
@@ -145,8 +149,7 @@
return result;
}
-
- @Override
+
public boolean isFormalParameter(String parameterName)
{
return getParameterModel(parameterName) != null;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetInjectionProvider.java?rev=902165&r1=902164&r2=902165&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetInjectionProvider.java Fri Jan 22 16:45:06 2010
@@ -56,10 +56,10 @@
final String expanded = symbolSource.expandSymbols(path.value());
final Resource baseResource = componentModel.getBaseResource();
-
+
ComponentValueProvider<Asset> provider = new ComponentValueProvider<Asset>()
{
- @Override
+
public Asset get(ComponentResources resources)
{
Locale locale = resources.getLocale();
@@ -69,7 +69,7 @@
};
transformation.injectFieldIndirect(fieldName, provider);
-
+
return true;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BlockInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BlockInjectionProvider.java?rev=902165&r1=902164&r2=902165&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BlockInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BlockInjectionProvider.java Fri Jan 22 16:45:06 2010
@@ -33,8 +33,8 @@
* block to inject; if
* omitted, the block id is deduced from the field id.
* <p/>
- * Must be scheduled before {@link DefaultInjectionProvider} because it uses the same annotation,
- * Inject, with a different interpretation.
+ * Must be scheduled before {@link DefaultInjectionProvider} because it uses the same annotation, Inject, with a
+ * different interpretation.
*/
public class BlockInjectionProvider implements InjectionProvider
{
@@ -51,8 +51,6 @@
ComponentValueProvider<Block> provider = new ComponentValueProvider<Block>()
{
-
- @Override
public Block get(ComponentResources resources)
{
return resources.getBlock(blockId);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CommonResourcesInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CommonResourcesInjectionProvider.java?rev=902165&r1=902164&r2=902165&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CommonResourcesInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CommonResourcesInjectionProvider.java Fri Jan 22 16:45:06 2010
@@ -35,7 +35,6 @@
private static ComponentValueProvider<Messages> messagesProvider = new ComponentValueProvider<Messages>()
{
- @Override
public Messages get(ComponentResources resources)
{
return resources.getMessages();
@@ -45,7 +44,6 @@
private static ComponentValueProvider<Locale> localeProvider = new ComponentValueProvider<Locale>()
{
- @Override
public Locale get(ComponentResources resources)
{
return resources.getLocale();
@@ -54,7 +52,7 @@
private static ComponentValueProvider<Logger> loggerProvider = new ComponentValueProvider<Logger>()
{
- @Override
+
public Logger get(ComponentResources resources)
{
return resources.getLogger();
@@ -63,8 +61,6 @@
private static ComponentValueProvider<String> completeIdProvider = new ComponentValueProvider<String>()
{
-
- @Override
public String get(ComponentResources resources)
{
return resources.getCompleteId();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java?rev=902165&r1=902164&r2=902165&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java Fri Jan 22 16:45:06 2010
@@ -23,17 +23,7 @@
import java.util.Map;
import java.util.Set;
-import javassist.CannotCompileException;
-import javassist.ClassPool;
-import javassist.CtBehavior;
-import javassist.CtClass;
-import javassist.CtConstructor;
-import javassist.CtField;
-import javassist.CtMember;
-import javassist.CtMethod;
-import javassist.CtNewConstructor;
-import javassist.CtNewMethod;
-import javassist.NotFoundException;
+import javassist.*;
import javassist.expr.ExprEditor;
import javassist.expr.FieldAccess;
@@ -62,8 +52,7 @@
import org.slf4j.Logger;
/**
- * Implementation of the {@link org.apache.tapestry5.internal.services.InternalClassTransformation}
- * interface.
+ * Implementation of the {@link org.apache.tapestry5.internal.services.InternalClassTransformation} interface.
*/
public final class InternalClassTransformationImpl implements InternalClassTransformation
{
@@ -1429,7 +1418,6 @@
makeReadOnly(fieldName);
}
- @Override
public <T> void injectFieldIndirect(String fieldName, ComponentValueProvider<T> provider)
{
Defense.notBlank(fieldName, "fieldName");
@@ -1725,7 +1713,6 @@
}
}
- @Override
public String toString()
{
StringBuilder builder = new StringBuilder("InternalClassTransformation[\n");
@@ -1866,7 +1853,7 @@
ExprEditor editor = new ExprEditor()
{
- @Override
+
public void edit(FieldAccess access) throws CannotCompileException
{
CtBehavior where = access.where();
@@ -1987,7 +1974,6 @@
return "$" + constructorArgs.size();
}
- @Override
public <T> void assignFieldIndirect(String fieldName, TransformMethodSignature methodSig,
ComponentValueProvider<T> provider)
{
@@ -2008,7 +1994,6 @@
makeReadOnly(fieldName);
}
- @Override
public void replaceFieldAccess(String fieldName,
ComponentValueProvider<FieldValueConduit> conduitProvider)
{
@@ -2016,7 +2001,6 @@
+ "$conduit", conduitProvider));
}
- @Override
public void replaceFieldAccess(String fieldName, String conduitFieldName)
{
String fieldType = getFieldType(fieldName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java?rev=902165&r1=902164&r2=902165&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java Fri Jan 22 16:45:06 2010
@@ -151,7 +151,7 @@
component = componentInstantiator.newInstance(this);
}
- @Override
+
public boolean isMixin()
{
return mixin;
@@ -162,7 +162,7 @@
return element.getLocation();
}
- @Override
+
public String toString()
{
return String.format("InternalComponentResources[%s]", getCompleteId());
@@ -601,13 +601,13 @@
page.addResetListener(listener);
}
- @Override
+
public ParameterConduit getParameterConduit(String parameterName)
{
return InternalUtils.get(conduits, parameterName);
}
- @Override
+
public void setParameterConduit(String parameterName, ParameterConduit conduit)
{
if (conduits == null)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/AbstractIncludeAssetWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/AbstractIncludeAssetWorker.java?rev=902165&r1=902164&r2=902165&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/AbstractIncludeAssetWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/AbstractIncludeAssetWorker.java Fri Jan 22 16:45:06 2010
@@ -73,13 +73,12 @@
ComponentValueProvider<Runnable> provider = new ComponentValueProvider<Runnable>()
{
- @Override
public Runnable get(final ComponentResources resources)
{
- // This code is re-executed for each new component instance. We could
+ // This code is re-executed for each new component instance. We could
// possibly cache on resources.getCompleteId() + locale, but that's
// probably not worth the effort.
-
+
final Locale locale = resources.getLocale();
final List<Asset> assets = CollectionFactory.newList();
@@ -93,7 +92,6 @@
return new Runnable()
{
- @Override
public void run()
{
for (Asset asset : assets)
@@ -117,8 +115,7 @@
/**
* Invoked, from the component's setup render phase, for each asset. This method must be
* threadsafe. Most
- * implementations pass the asset to a particular method of
- * {@link org.apache.tapestry5.RenderSupport}.
+ * implementations pass the asset to a particular method of {@link org.apache.tapestry5.RenderSupport}.
*
* @param asset
* to be processed
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/BindParameterWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/BindParameterWorker.java?rev=902165&r1=902164&r2=902165&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/BindParameterWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/BindParameterWorker.java Fri Jan 22 16:45:06 2010
@@ -16,11 +16,8 @@
import java.util.List;
-import javax.xml.ws.ServiceMode;
-
import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.annotations.BindParameter;
-import org.apache.tapestry5.corelib.pages.ServiceStatus;
import org.apache.tapestry5.internal.InternalComponentResources;
import org.apache.tapestry5.internal.services.ComponentClassCache;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
@@ -76,7 +73,6 @@
ComponentValueProvider<FieldValueConduit> provider = new ComponentValueProvider<FieldValueConduit>()
{
- @Override
public FieldValueConduit get(final ComponentResources resources)
{
if (!resources.isMixin())
@@ -116,14 +112,12 @@
return conduit;
}
- @Override
public void set(Object newValue)
{
getParameterConduit().set(newValue);
}
@SuppressWarnings("unchecked")
- @Override
public Object get()
{
// For the moment, this results in two passes through the TypeCoercer; we'll look
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentWorker.java?rev=902165&r1=902164&r2=902165&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentWorker.java Fri Jan 22 16:45:06 2010
@@ -82,8 +82,7 @@
}
ComponentValueProvider<Object> provider = new ComponentValueProvider<Object>()
- {
- @Override
+ {
public Object get(ComponentResources resources)
{
return resources.getEmbeddedComponent(id);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectContainerWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectContainerWorker.java?rev=902165&r1=902164&r2=902165&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectContainerWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectContainerWorker.java Fri Jan 22 16:45:06 2010
@@ -52,7 +52,6 @@
ComponentValueProvider<Object> provider = new ComponentValueProvider<Object>()
{
- @Override
public Object get(ComponentResources resources)
{
Component container = resources.getContainer();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MixinWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MixinWorker.java?rev=902165&r1=902164&r2=902165&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MixinWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MixinWorker.java Fri Jan 22 16:45:06 2010
@@ -14,6 +14,8 @@
package org.apache.tapestry5.internal.transform;
+import java.util.List;
+
import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.annotations.Mixin;
import org.apache.tapestry5.internal.InternalComponentResources;
@@ -25,8 +27,6 @@
import org.apache.tapestry5.services.ComponentValueProvider;
import org.apache.tapestry5.services.TransformConstants;
-import java.util.List;
-
/**
* Supports the {@link org.apache.tapestry5.annotations.Mixin} annotation, which allows a mixin to
* be part of the
@@ -66,8 +66,6 @@
ComponentValueProvider<Object> provider = new ComponentValueProvider<Object>()
{
-
- @Override
public Object get(ComponentResources resources)
{
InternalComponentResources icr = (InternalComponentResources) resources;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java?rev=902165&r1=902164&r2=902165&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java Fri Jan 22 16:45:06 2010
@@ -59,7 +59,6 @@
this.typeCoercer = typeCoercer;
}
- @Override
public void transform(ClassTransformation transformation, MutableComponentModel model)
{
List<String> fieldNames = transformation.findFieldsWithAnnotation(Parameter.class);
@@ -113,7 +112,6 @@
// issues
// are addressed by deferring some behaviors until the load() method.
- @Override
public ParameterConduit get(ComponentResources resources)
{
final InternalComponentResources icr = (InternalComponentResources) resources;
@@ -168,7 +166,6 @@
return loaded;
}
- @Override
public void set(Object newValue)
{
// Assignments before the page is loaded ultimately exist to set the
@@ -196,7 +193,6 @@
cached = enableCaching && icr.isRendering();
}
- @Override
public void reset()
{
if (!isInvariant())
@@ -206,7 +202,6 @@
}
}
- @Override
public void load()
{
// If it's bound at this point, that's because of an explicit binding
@@ -248,14 +243,12 @@
return defaultBinding;
}
- @Override
public boolean isBound()
{
return parameterAccess.isBound();
}
@SuppressWarnings("unchecked")
- @Override
public Object get()
{
if (!isLoaded()) { return defaultValue; }
@@ -279,7 +272,6 @@
return result;
}
- @Override
public void setDefault(Object value)
{
if (value == null)