You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jo...@apache.org on 2011/06/27 07:13:16 UTC
svn commit: r1140019 - in /tapestry/tapestry5/trunk:
tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/
tapestry-func/src/main/java/org/apache/tapestry5/func/
tapestry-func/src/test/java/org/apache/tapestry5/func/
tapestry-ioc/src/mai...
Author: joshcanfield
Date: Mon Jun 27 05:13:16 2011
New Revision: 1140019
URL: http://svn.apache.org/viewvc?rev=1140019&view=rev
Log:
TAP5-1559 - Excessive warnings
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentWorker.java
tapestry/tapestry5/trunk/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java
tapestry/tapestry5/trunk/tapestry-func/src/test/java/org/apache/tapestry5/func/ZippedFlowTests.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java
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=1140019&r1=1140018&r2=1140019&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 Mon Jun 27 05:13:16 2011
@@ -27,16 +27,11 @@ import org.apache.tapestry5.ioc.internal
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.internal.util.TapestryException;
-import org.apache.tapestry5.ioc.services.FieldValueConduit;
import org.apache.tapestry5.model.ComponentModel;
import org.apache.tapestry5.model.MutableComponentModel;
import org.apache.tapestry5.model.MutableEmbeddedComponentModel;
import org.apache.tapestry5.plastic.*;
-import org.apache.tapestry5.services.ClassTransformation;
import org.apache.tapestry5.services.ComponentClassResolver;
-import org.apache.tapestry5.services.ComponentClassTransformWorker;
-import org.apache.tapestry5.services.ComponentValueProvider;
-import org.apache.tapestry5.services.TransformField;
import org.apache.tapestry5.services.transform.ComponentClassTransformWorker2;
import org.apache.tapestry5.services.transform.TransformationSupport;
@@ -86,13 +81,13 @@ public class ComponentWorker implements
updateModelWithPublishedParameters(embedded, annotation);
- convertAccessToField(transformation, field, id);
+ convertAccessToField(field, id);
addMixinClasses(field, embedded);
addMixinTypes(field, embedded);
}
- private void convertAccessToField(PlasticClass plasticClass, PlasticField field, String id)
+ private void convertAccessToField(PlasticField field, String id)
{
String fieldName = field.getName();
Modified: tapestry/tapestry5/trunk/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java?rev=1140019&r1=1140018&r2=1140019&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java (original)
+++ tapestry/tapestry5/trunk/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java Mon Jun 27 05:13:16 2011
@@ -47,7 +47,7 @@ public class F
}
/**
- * A Predicate factory for equality of q Comparable element from a flow against a specified
+ * A Predicate factory for equality of an element from a flow against a specified
* value.
*/
public static <T> Predicate<T> eql(final T value)
@@ -57,7 +57,7 @@ public class F
public boolean accept(T element)
{
return element.equals(value);
- };
+ }
};
}
@@ -169,7 +169,7 @@ public class F
public String map(T value)
{
return String.valueOf(value);
- };
+ }
};
}
@@ -259,7 +259,7 @@ public class F
public boolean accept(S object)
{
return mapper.map(object);
- };
+ }
};
}
@@ -271,7 +271,7 @@ public class F
public Integer reduce(Integer accumulator, Integer value)
{
return accumulator + value;
- };
+ }
};
/**
@@ -283,7 +283,7 @@ public class F
public Integer map(Integer first, Integer second)
{
return first + second;
- };
+ }
};
/**
@@ -402,7 +402,6 @@ public class F
* Creates an infinite lazy flow from an initial value and a function to map from the current value to the
* next value.
*
- * @param <T>
* @param initial
* initial value in flow
* @param function
@@ -523,11 +522,10 @@ public class F
*
* @since 5.3.0
*/
- public static <A extends Comparable, B> Comparator<Tuple<A, B>> orderByFirst()
+ public static <A extends Comparable<A>, B> Comparator<Tuple<A, B>> orderByFirst()
{
return new Comparator<Tuple<A, B>>()
{
-
public int compare(Tuple<A, B> o1, Tuple<A, B> o2)
{
return o1.first.compareTo(o2.first);
@@ -541,7 +539,7 @@ public class F
*
* @since 5.3.0
*/
- public static <A, B extends Comparable> Comparator<Tuple<A, B>> orderBySecond()
+ public static <A, B extends Comparable<B>> Comparator<Tuple<A, B>> orderBySecond()
{
return new Comparator<Tuple<A, B>>()
{
@@ -555,7 +553,6 @@ public class F
/**
* Inverts a predicate.
*
- * @param <T>
* @param delegate
* the predicate to invert
* @return a new predicate that is inverse to the existing predicate
@@ -577,9 +574,6 @@ public class F
/**
* Combines two mappers into a composite mapping from type A to type C via type B.
*
- * @param <A>
- * @param <B>
- * @param <C>
* @param abMapper
* maps from A to B
* @param bcMapper
@@ -608,7 +602,6 @@ public class F
* Combines any number of delegates as a logical and operation. Evaluation terminates
* with the first delegate predicate that returns false.
*
- * @param <T>
* @param delegates
* to evaluate
* @return combined delegate
@@ -635,7 +628,6 @@ public class F
* Combines any number of delegates as a logical or operation. Evaluation terminates
* with the first delegate predicate that returns true.
*
- * @param <T>
* @param delegates
* to evaluate
* @return combined delegate
Modified: tapestry/tapestry5/trunk/tapestry-func/src/test/java/org/apache/tapestry5/func/ZippedFlowTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-func/src/test/java/org/apache/tapestry5/func/ZippedFlowTests.java?rev=1140019&r1=1140018&r2=1140019&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-func/src/test/java/org/apache/tapestry5/func/ZippedFlowTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-func/src/test/java/org/apache/tapestry5/func/ZippedFlowTests.java Mon Jun 27 05:13:16 2011
@@ -14,16 +14,15 @@
package org.apache.tapestry5.func;
+import org.apache.commons.lang.StringUtils;
+import org.testng.annotations.Test;
+
import java.util.Arrays;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.commons.lang.StringUtils;
-import org.testng.annotations.Test;
-
public class ZippedFlowTests extends BaseFuncTest
{
Flow<Integer> numbers = F.flow(1, 2, 3);
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java?rev=1140019&r1=1140018&r2=1140019&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java Mon Jun 27 05:13:16 2011
@@ -14,7 +14,7 @@
package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry5.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.plastic.PlasticUtils;
import java.util.Iterator;
import java.util.LinkedList;
@@ -127,7 +127,7 @@ public class InheritanceSearch implement
*/
private Class parentOf(Class clazz)
{
- if (clazz != void.class && clazz.isPrimitive()) return ClassFabUtils.getWrapperType(clazz);
+ if (clazz != void.class && clazz.isPrimitive()) return PlasticUtils.toWrapperType(clazz);
if (clazz.isArray() && clazz != Object[].class)
{
Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java?rev=1140019&r1=1140018&r2=1140019&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java Mon Jun 27 05:13:16 2011
@@ -29,7 +29,7 @@ import org.testng.annotations.AfterMetho
* <p/>
* Provides a common mock factory method, {@link #newMock(Class)}. A single <em>standard</em> mock control is used for
* all mock objects. Standard mocks do not care about the exact order in which methods are invoked, though they are as
- * rigourous as strict mocks when checking that parameters are the correct values.
+ * rigorous as strict mocks when checking that parameters are the correct values.
* <p/>
* This base class is created with the intention of use within a TestNG test suite; if using JUnit, you can get the same
* functionality using {@link MockTester}.
@@ -45,19 +45,10 @@ import org.testng.annotations.AfterMetho
*/
public class TestBase extends TestUtils
{
- private static class ThreadLocalControl extends ThreadLocal<IMocksControl>
- {
- @Override
- protected IMocksControl initialValue()
- {
- return EasyMock.createControl();
- }
- }
-
private final MockTester tester = new MockTester();
/**
- * Returns the {@link IMocksControl} for this thread.
+ * @return the {@link IMocksControl} for this thread.
*/
protected final IMocksControl getMocksControl()
{
@@ -124,16 +115,15 @@ public class TestBase extends TestUtils
* @param answer
* callback for the most recent method invocation
*/
- protected static void setAnswer(IAnswer answer)
+ protected static void setAnswer(IAnswer<?> answer)
{
EasyMock.expectLastCall().andAnswer(answer);
}
/**
- * Convienience for {@link EasyMock#expect(Object)}.
+ * Convenience for {@link EasyMock#expect(Object)}.
*
- * @param <T>
- * @param value
+ * @param value to expect
* @return expectation setter, for setting return value, etc.
*/
@SuppressWarnings("unchecked")
@@ -144,7 +134,9 @@ public class TestBase extends TestUtils
/**
* A factory method to create EasyMock Capture objects.
+ * @return new Capture
*/
+ @SuppressWarnings({"UnusedDeclaration"})
protected static <T> Capture<T> newCapture()
{
return new Capture<T>();