You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/10/29 04:13:00 UTC
svn commit: r589475 - in /mina/trunk/statemachine/src:
main/java/org/apache/mina/statemachine/
main/java/org/apache/mina/statemachine/context/
main/java/org/apache/mina/statemachine/mina/
main/java/org/apache/mina/statemachine/transition/ test/java/org...
Author: trustin
Date: Sun Oct 28 20:12:59 2007
New Revision: 589475
URL: http://svn.apache.org/viewvc?rev=589475&view=rev
Log:
Fixed compiler warnings
Modified:
mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachineFactory.java
mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachineProxyFactory.java
mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/AbstractStateContextLookup.java
mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/mina/MinaStateContextLookup.java
mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/transition/MethodTransition.java
mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/StateMachineProxyFactoryTest.java
mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/context/AbstractStateContextLookupTest.java
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachineFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachineFactory.java?rev=589475&r1=589474&r2=589475&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachineFactory.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachineFactory.java Sun Oct 28 20:12:59 2007
@@ -109,7 +109,7 @@
LinkedList<Field> fields = new LinkedList<Field>();
for (Object h : handlersList) {
- fields.addAll(getFields(h instanceof Class ? (Class) h : h.getClass()));
+ fields.addAll(getFields(h instanceof Class ? (Class<?>) h : h.getClass()));
}
for (State state : createStates(fields)) {
states.put(state.getId(), state);
@@ -191,7 +191,7 @@
}
}
- static List<Field> getFields(Class clazz) {
+ static List<Field> getFields(Class<?> clazz) {
LinkedList<Field> fields = new LinkedList<Field>();
for (Field f : clazz.getDeclaredFields()) {
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachineProxyFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachineProxyFactory.java?rev=589475&r1=589474&r2=589475&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachineProxyFactory.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachineProxyFactory.java Sun Oct 28 20:12:59 2007
@@ -48,34 +48,34 @@
private StateMachineProxyFactory() {
}
- public static Object create(Class iface, StateMachine sm) {
+ public static Object create(Class<?> iface, StateMachine sm) {
return create(new Class[] { iface }, sm);
}
- public static Object create(Class iface, StateMachine sm, StateContextLookup contextLookup) {
+ public static Object create(Class<?> iface, StateMachine sm, StateContextLookup contextLookup) {
return create(new Class[] { iface }, sm, contextLookup);
}
- public static Object create(Class iface, StateMachine sm, StateContextLookup contextLookup,
+ public static Object create(Class<?> iface, StateMachine sm, StateContextLookup contextLookup,
EventArgumentsInterceptor interceptor) {
return create(new Class[] { iface }, sm, contextLookup, interceptor, new DefaultEventFactory());
}
- public static Object create(Class iface, StateMachine sm, StateContextLookup contextLookup,
+ public static Object create(Class<?> iface, StateMachine sm, StateContextLookup contextLookup,
EventArgumentsInterceptor interceptor, EventFactory eventFactory) {
return create(new Class[] { iface }, sm, contextLookup, interceptor, eventFactory);
}
- public static Object create(Class[] ifaces, StateMachine sm) {
+ public static Object create(Class<?>[] ifaces, StateMachine sm) {
return create(ifaces, sm, new SingletonStateContextLookup());
}
- public static Object create(Class[] ifaces, StateMachine sm, StateContextLookup contextLookup) {
+ public static Object create(Class<?>[] ifaces, StateMachine sm, StateContextLookup contextLookup) {
return create(ifaces, sm, contextLookup, null, new DefaultEventFactory());
}
- public static Object create(Class[] ifaces, StateMachine sm, StateContextLookup contextLookup,
+ public static Object create(Class<?>[] ifaces, StateMachine sm, StateContextLookup contextLookup,
EventArgumentsInterceptor interceptor, EventFactory eventFactory) {
ClassLoader cl = StateMachineProxyFactory.class.getClassLoader();
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/AbstractStateContextLookup.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/AbstractStateContextLookup.java?rev=589475&r1=589474&r2=589475&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/AbstractStateContextLookup.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/AbstractStateContextLookup.java Sun Oct 28 20:12:59 2007
@@ -89,5 +89,5 @@
* @param c the class.
* @return <code>true</code> or <code>false</code>.
*/
- protected abstract boolean supports(Class c);
+ protected abstract boolean supports(Class<?> c);
}
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/mina/MinaStateContextLookup.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/mina/MinaStateContextLookup.java?rev=589475&r1=589474&r2=589475&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/mina/MinaStateContextLookup.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/mina/MinaStateContextLookup.java Sun Oct 28 20:12:59 2007
@@ -69,7 +69,7 @@
session.setAttribute(STATE_CONTEXT, context);
}
- protected boolean supports(Class c) {
+ protected boolean supports(Class<?> c) {
return IoSession.class.isAssignableFrom(c);
}
}
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/transition/MethodTransition.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/transition/MethodTransition.java?rev=589475&r1=589474&r2=589475&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/transition/MethodTransition.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/transition/MethodTransition.java Sun Oct 28 20:12:59 2007
@@ -196,7 +196,7 @@
}
public boolean doExecute(Event event) {
- Class[] types = method.getParameterTypes();
+ Class<?>[] types = method.getParameterTypes();
if (types.length == 0) {
invokeMethod(EMPTY_ARGUMENTS);
@@ -232,7 +232,8 @@
return true;
}
- private boolean match(Class paramType, Object arg, Class argType) {
+ @SuppressWarnings("unchecked")
+ private boolean match(Class<?> paramType, Object arg, Class argType) {
if (paramType.isPrimitive()) {
if (paramType.equals(Boolean.TYPE)) {
return arg instanceof Boolean;
Modified: mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/StateMachineProxyFactoryTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/StateMachineProxyFactoryTest.java?rev=589475&r1=589474&r2=589475&view=diff
==============================================================================
--- mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/StateMachineProxyFactoryTest.java (original)
+++ mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/StateMachineProxyFactoryTest.java Sun Oct 28 20:12:59 2007
@@ -85,7 +85,7 @@
player.stop();
player.eject();
- LinkedList messages = handler.messages;
+ LinkedList<String> messages = handler.messages;
assertEquals("Tape 'Kings of convenience - Riot on an empty street' inserted", messages.removeFirst());
assertEquals("Playing", messages.removeFirst());
assertEquals("Paused", messages.removeFirst());
@@ -110,7 +110,7 @@
player.stop();
player.eject();
- LinkedList messages = handler.messages;
+ LinkedList<String> messages = handler.messages;
assertEquals("Tape 'Kings of convenience - Riot on an empty street' inserted", messages.removeFirst());
assertEquals("Playing", messages.removeFirst());
assertEquals("Paused", messages.removeFirst());
@@ -138,7 +138,8 @@
proxy.call3(proxy);
}
- public void call3(Reentrant proxy) {
+ public void call3(
+ @SuppressWarnings("unused") Reentrant proxy) {
finished = true;
}
}
Modified: mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/context/AbstractStateContextLookupTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/context/AbstractStateContextLookupTest.java?rev=589475&r1=589474&r2=589475&view=diff
==============================================================================
--- mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/context/AbstractStateContextLookupTest.java (original)
+++ mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/context/AbstractStateContextLookupTest.java Sun Oct 28 20:12:59 2007
@@ -37,18 +37,20 @@
public class AbstractStateContextLookupTest extends TestCase {
public void testLookup() throws Exception {
- Map map = new HashMap();
+ Map<String, StateContext> map = new HashMap<String, StateContext>();
AbstractStateContextLookup lookup = new AbstractStateContextLookup(
new DefaultStateContextFactory()) {
- protected boolean supports(Class c) {
+ protected boolean supports(Class<?> c) {
return Map.class.isAssignableFrom(c);
}
+ @SuppressWarnings("unchecked")
protected StateContext lookup(Object eventArg) {
- Map map = (Map) eventArg;
- return (StateContext) map.get("context");
+ Map<String, StateContext> map = (Map<String, StateContext>) eventArg;
+ return map.get("context");
}
+ @SuppressWarnings("unchecked")
protected void store(Object eventArg, StateContext context) {
- Map map = (Map) eventArg;
+ Map<String, StateContext> map = (Map<String, StateContext>) eventArg;
map.put("context", context);
}
};