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 2011/09/23 18:52:49 UTC
svn commit: r1174880 - in /tapestry/tapestry5/trunk:
tapestry-core/src/main/java/org/apache/tapestry5/internal/services/
tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/
tapestry-core/src/test/java/org/apache/tapestry5/internal/serv...
Author: hlship
Date: Fri Sep 23 16:52:48 2011
New Revision: 1174880
URL: http://svn.apache.org/viewvc?rev=1174880&view=rev
Log:
TAP5-1636: Tapestry does not compile using OpenJDK
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JavaScriptSupportImplTest.java
tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImpl.java?rev=1174880&r1=1174879&r2=1174880&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImpl.java Fri Sep 23 16:52:48 2011
@@ -14,12 +14,6 @@
package org.apache.tapestry5.internal.services;
-import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.Field;
import org.apache.tapestry5.FieldValidator;
@@ -34,6 +28,12 @@ import org.apache.tapestry5.services.Fie
import org.apache.tapestry5.services.FormSupport;
import org.apache.tapestry5.validator.ValidatorMacro;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+
@SuppressWarnings("all")
public class FieldValidatorSourceImpl implements FieldValidatorSource
{
@@ -48,7 +48,7 @@ public class FieldValidatorSourceImpl im
private final ValidatorMacro validatorMacro;
public FieldValidatorSourceImpl(Messages globalMessages, TypeCoercer typeCoercer,
- FormSupport formSupport, Map<String, Validator> validators, ValidatorMacro validatorMacro)
+ FormSupport formSupport, Map<String, Validator> validators, ValidatorMacro validatorMacro)
{
this.globalMessages = globalMessages;
this.typeCoercer = typeCoercer;
@@ -73,14 +73,16 @@ public class FieldValidatorSourceImpl im
}
public FieldValidator createValidator(Field field, String validatorType, String constraintValue, String overrideId,
- Messages overrideMessages, Locale locale)
+ Messages overrideMessages, Locale locale)
{
ValidatorSpecification originalSpec = new ValidatorSpecification(validatorType, constraintValue);
- List<ValidatorSpecification> specs = expandMacros(newList(originalSpec));
+ List<ValidatorSpecification> org = CollectionFactory.newList(originalSpec);
- List<FieldValidator> fieldValidators = CollectionFactory.newList();
+ List<ValidatorSpecification> specs = expandMacros(org);
+
+ List<FieldValidator> fieldValidators = CollectionFactory.<FieldValidator>newList();
for (ValidatorSpecification spec : specs)
{
@@ -91,7 +93,7 @@ public class FieldValidatorSourceImpl im
}
private FieldValidator createValidator(Field field, ValidatorSpecification spec, String overrideId,
- Messages overrideMessages)
+ Messages overrideMessages)
{
String validatorType = spec.getValidatorType();
@@ -118,7 +120,7 @@ public class FieldValidatorSourceImpl im
}
private Object computeConstraintValue(String validatorType, Validator validator, String constraintValue,
- String formId, String overrideId, Messages overrideMessages)
+ String formId, String overrideId, Messages overrideMessages)
{
Class constraintType = validator.getConstraintType();
@@ -132,7 +134,7 @@ public class FieldValidatorSourceImpl im
}
private String findConstraintValue(String validatorType, Class constraintType, String constraintValue,
- String formValidationId, String overrideId, Messages overrideMessages)
+ String formValidationId, String overrideId, Messages overrideMessages)
{
if (constraintValue != null)
return constraintValue;
@@ -158,7 +160,7 @@ public class FieldValidatorSourceImpl im
}
private MessageFormatter findMessageFormatter(String formId, String overrideId, Messages overrideMessages,
- String validatorType, Validator validator)
+ String validatorType, Validator validator)
{
String overrideKey = formId + "-" + overrideId + "-" + validatorType + "-message";
@@ -232,8 +234,7 @@ public class FieldValidatorSourceImpl im
{
queue.add(i, parsed.get(i));
}
- }
- else
+ } else
{
result.add(head);
}
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=1174880&r1=1174879&r2=1174880&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 Sep 23 16:52:48 2011
@@ -35,6 +35,8 @@ import org.apache.tapestry5.services.Com
import org.apache.tapestry5.services.transform.ComponentClassTransformWorker2;
import org.apache.tapestry5.services.transform.TransformationSupport;
+import java.util.List;
+
/**
* Finds fields with the {@link org.apache.tapestry5.annotations.Component} annotation and updates
* the model. Also
@@ -97,7 +99,7 @@ public class ComponentWorker implements
}
private ComputedValue<FieldConduit<Object>> createProviderForEmbeddedComponentConduit(final String fieldName,
- final String id)
+ final String id)
{
return new ComputedValue<FieldConduit<Object>>()
{
@@ -121,7 +123,11 @@ public class ComponentWorker implements
String names = annotation.publishParameters();
if (InternalUtils.isNonBlank(names))
- embedded.setPublishedParameters(CollectionFactory.newList(TapestryInternalUtils.splitAtCommas(names)));
+ {
+ List<String> published = CollectionFactory.newList(TapestryInternalUtils.splitAtCommas(names));
+ embedded.setPublishedParameters(published);
+ }
+
}
private void addMixinClasses(PlasticField field, MutableEmbeddedComponentModel model)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JavaScriptSupportImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JavaScriptSupportImplTest.java?rev=1174880&r1=1174879&r2=1174880&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JavaScriptSupportImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JavaScriptSupportImplTest.java Fri Sep 23 16:52:48 2011
@@ -14,10 +14,6 @@
package org.apache.tapestry5.internal.services.ajax;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
import org.apache.tapestry5.Asset;
import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.internal.InternalConstants;
@@ -28,14 +24,13 @@ import org.apache.tapestry5.ioc.internal
import org.apache.tapestry5.ioc.util.IdAllocator;
import org.apache.tapestry5.json.JSONArray;
import org.apache.tapestry5.json.JSONObject;
-import org.apache.tapestry5.services.javascript.InitializationPriority;
-import org.apache.tapestry5.services.javascript.JavaScriptStack;
-import org.apache.tapestry5.services.javascript.JavaScriptStackSource;
-import org.apache.tapestry5.services.javascript.JavaScriptSupport;
-import org.apache.tapestry5.services.javascript.StylesheetLink;
-import org.apache.tapestry5.services.javascript.StylesheetOptions;
+import org.apache.tapestry5.services.javascript.*;
import org.testng.annotations.Test;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
public class JavaScriptSupportImplTest extends InternalBaseTestCase
{
@Test
@@ -106,35 +101,37 @@ public class JavaScriptSupportImplTest e
}
private void trainForEmptyCoreStack(DocumentLinker linker, JavaScriptStackSource stackSource,
- JavaScriptStackPathConstructor pathConstructor)
+ JavaScriptStackPathConstructor pathConstructor)
{
JavaScriptStack stack = mockJavaScriptStack();
expect(stackSource.getStack(InternalConstants.CORE_STACK_NAME)).andReturn(stack);
expect(pathConstructor.constructPathsForJavaScriptStack(InternalConstants.CORE_STACK_NAME)).andReturn(
- Collections.<String> emptyList());
- expect(stack.getStylesheets()).andReturn(Collections.<StylesheetLink> emptyList());
+ Collections.<String>emptyList());
+ expect(stack.getStylesheets()).andReturn(Collections.<StylesheetLink>emptyList());
expect(stack.getInitialization()).andReturn(null);
- expect(stack.getStacks()).andReturn(Collections.<String> emptyList());
+ expect(stack.getStacks()).andReturn(Collections.<String>emptyList());
}
private void trainForCoreStack(DocumentLinker linker, JavaScriptStackSource stackSource,
- JavaScriptStackPathConstructor pathConstructor)
+ JavaScriptStackPathConstructor pathConstructor)
{
JavaScriptStack stack = mockJavaScriptStack();
StylesheetLink stylesheetLink = new StylesheetLink("style.css");
+ List<String> stackList = CollectionFactory.newList("stack1.js", "stack2.js");
expect(stackSource.getStack(InternalConstants.CORE_STACK_NAME)).andReturn(stack);
expect(pathConstructor.constructPathsForJavaScriptStack(InternalConstants.CORE_STACK_NAME)).andReturn(
- CollectionFactory.newList("stack1.js", "stack2.js"));
- expect(stack.getStylesheets()).andReturn(CollectionFactory.newList(stylesheetLink));
+ stackList);
+ List<StylesheetLink> stylesheetLst = CollectionFactory.newList(stylesheetLink);
+ expect(stack.getStylesheets()).andReturn(stylesheetLst);
expect(stack.getInitialization()).andReturn("stackInit();");
- expect(stack.getStacks()).andReturn(Collections.<String> emptyList());
+ expect(stack.getStacks()).andReturn(Collections.<String>emptyList());
linker.addScriptLink("stack1.js");
linker.addScriptLink("stack2.js");
@@ -216,12 +213,12 @@ public class JavaScriptSupportImplTest e
expect(stackSource.getStackNames()).andReturn(Arrays.asList("mystack"));
expect(stackSource.getStack("mystack")).andReturn(mystack).atLeastOnce();
- expect(mystack.getStacks()).andReturn(Collections.<String> emptyList());
+ expect(mystack.getStacks()).andReturn(Collections.<String>emptyList());
expect(mystack.getJavaScriptLibraries()).andReturn(Arrays.asList(library1, library2));
expect(pathConstructor.constructPathsForJavaScriptStack("mystack")).andReturn(
Arrays.asList("stacks/mystack.js"));
- expect(mystack.getStylesheets()).andReturn(Collections.<StylesheetLink> emptyList());
+ expect(mystack.getStylesheets()).andReturn(Collections.<StylesheetLink>emptyList());
expect(mystack.getInitialization()).andReturn(null);
@@ -242,7 +239,7 @@ public class JavaScriptSupportImplTest e
{
// This is slightly odd, as it would normally return "core" at a minimum, but we test for that separately.
- expect(stackSource.getStackNames()).andReturn(Collections.<String> emptyList());
+ expect(stackSource.getStackNames()).andReturn(Collections.<String>emptyList());
}
@Test
@@ -257,11 +254,13 @@ public class JavaScriptSupportImplTest e
JavaScriptStack stack = mockJavaScriptStack();
StylesheetLink stylesheetLink = new StylesheetLink("stack.css");
+ List<String> stackLst = CollectionFactory.newList("stack.js");
expect(stackSource.getStack("custom")).andReturn(stack);
expect(pathConstructor.constructPathsForJavaScriptStack("custom")).andReturn(
- CollectionFactory.newList("stack.js"));
- expect(stack.getStylesheets()).andReturn(CollectionFactory.newList(stylesheetLink));
+ stackLst);
+ List<StylesheetLink> stylesheetLst = CollectionFactory.newList(stylesheetLink);
+ expect(stack.getStylesheets()).andReturn(stylesheetLst);
expect(stack.getInitialization()).andReturn("customInit();");
@@ -320,7 +319,7 @@ public class JavaScriptSupportImplTest e
expect(child.getInitialization()).andReturn("childInit();");
- expect(parent.getStacks()).andReturn(Collections.<String> emptyList());
+ expect(parent.getStacks()).andReturn(Collections.<String>emptyList());
linker.addScriptLink("parent.js");
linker.addScriptLink("child.js");
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java?rev=1174880&r1=1174879&r2=1174880&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java Fri Sep 23 16:52:48 2011
@@ -27,7 +27,6 @@ import javax.persistence.spi.Persistence
import javax.sql.DataSource;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
@@ -152,7 +151,8 @@ public class PersistenceUnitInfoImpl imp
*/
public List<String> getMappingFileNames()
{
- return Collections.unmodifiableList(CollectionFactory.newList(mappingFilesNames));
+ List<String> tmp = CollectionFactory.newList(mappingFilesNames);
+ return Collections.unmodifiableList(tmp);
}
/**
@@ -233,7 +233,8 @@ public class PersistenceUnitInfoImpl imp
*/
public List<String> getManagedClassNames()
{
- return Collections.unmodifiableList(CollectionFactory.newList(managedClassNames));
+ List<String> tmp = CollectionFactory.newList(managedClassNames);
+ return Collections.<String>unmodifiableList(tmp);
}
/**