Author: elecharny
Date: Mon Apr 27 10:18:41 2009
New Revision: 768918
URL: http://svn.apache.org/viewvc?rev=768918&view=rev
Log:
Lot of warning removals, accordingly to the PMC report produced by Ashish
Modified:
mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachine.java
mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/transition/MethodTransition.java
mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/StateMachineProxyBuilderTest.java
Modified:
mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachine.java
URL:
http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachine.java?rev=768918&r1=768917&r2=768918&view=diff
==============================================================================
---
mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachine.java
(original)
+++
mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachine.java
Mon Apr 27 10:18:41 2009
@@ -45,7 +45,7 @@
* @version $Rev$, $Date$
*/
public class StateMachine {
- private static final Logger log =
LoggerFactory.getLogger(StateMachine.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(StateMachine.class);
private static final String CALL_STACK = StateMachine.class.getName() +
".callStack";
private final State startState;
private final Map<String, State> states;
@@ -135,8 +135,8 @@
* This thread is already processing an event. Queue this
* event.
*/
- if (log.isDebugEnabled()) {
- log.debug("State machine called recursively. Queuing event
" + event
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("State machine called recursively. Queuing
event " + event
+ " for later processing.");
}
} else {
@@ -166,22 +166,22 @@
StateContext context = event.getContext();
for (Transition t : state.getTransitions()) {
- if (log.isDebugEnabled()) {
- log.debug("Trying transition " + t);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Trying transition " + t);
}
try {
if (t.execute(event)) {
- if (log.isDebugEnabled()) {
- log.debug("Transition " + t + " executed
successfully.");
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Transition " + t + " executed
successfully.");
}
setCurrentState(context, t.getNextState());
return;
}
} catch (BreakAndContinueException bace) {
- if (log.isDebugEnabled()) {
- log.debug("BreakAndContinueException thrown in "
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("BreakAndContinueException thrown in "
+ "transition " + t
+ ". Continuing with next transition.");
}
@@ -189,16 +189,16 @@
State newState = getState(bage.getStateId());
if (bage.isNow()) {
- if (log.isDebugEnabled()) {
- log.debug("BreakAndGotoException thrown in "
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("BreakAndGotoException thrown in "
+ "transition " + t + ". Moving to state "
+ newState.getId() + " now.");
}
setCurrentState(context, newState);
handle(newState, event);
} else {
- if (log.isDebugEnabled()) {
- log.debug("BreakAndGotoException thrown in "
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("BreakAndGotoException thrown in "
+ "transition " + t + ". Moving to state "
+ newState.getId() + " next.");
}
@@ -215,16 +215,16 @@
callStack.push(returnTo);
if (bace.isNow()) {
- if (log.isDebugEnabled()) {
- log.debug("BreakAndCallException thrown in "
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("BreakAndCallException thrown in "
+ "transition " + t + ". Moving to state "
+ newState.getId() + " now.");
}
setCurrentState(context, newState);
handle(newState, event);
} else {
- if (log.isDebugEnabled()) {
- log.debug("BreakAndCallException thrown in "
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("BreakAndCallException thrown in "
+ "transition " + t + ". Moving to state "
+ newState.getId() + " next.");
}
@@ -236,16 +236,16 @@
State newState = callStack.pop();
if (bare.isNow()) {
- if (log.isDebugEnabled()) {
- log.debug("BreakAndReturnException thrown in "
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("BreakAndReturnException thrown in "
+ "transition " + t + ". Moving to state "
+ newState.getId() + " now.");
}
setCurrentState(context, newState);
handle(newState, event);
} else {
- if (log.isDebugEnabled()) {
- log.debug("BreakAndReturnException thrown in "
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("BreakAndReturnException thrown in "
+ "transition " + t + ". Moving to state "
+ newState.getId() + " next.");
}
@@ -279,10 +279,10 @@
private void setCurrentState(StateContext context, State newState) {
if (newState != null) {
- if (log.isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled()) {
if (newState != context.getCurrentState()) {
- log.debug("Leaving state " +
context.getCurrentState().getId());
- log.debug("Entering state " + newState.getId());
+ LOGGER.debug("Leaving state " +
context.getCurrentState().getId());
+ LOGGER.debug("Entering state " + newState.getId());
}
}
context.setCurrentState(newState);
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=768918&r1=768917&r2=768918&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
Mon Apr 27 10:18:41 2009
@@ -59,7 +59,7 @@
* @version $Rev$, $Date$
*/
public class MethodTransition extends AbstractTransition {
- private static final Logger log = LoggerFactory.getLogger(
MethodTransition.class );
+ private static final Logger LOGGER = LoggerFactory.getLogger(
MethodTransition.class );
private static final Object[] EMPTY_ARGUMENTS = new Object[0];
private final Method method;
@@ -266,8 +266,8 @@
private void invokeMethod(Object[] arguments) {
try {
- if (log.isDebugEnabled()) {
- log.debug("Executing method " + method
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Executing method " + method
+ " with arguments " + Arrays.asList(arguments));
}
method.invoke(target, arguments);
Modified:
mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/StateMachineProxyBuilderTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/StateMachineProxyBuilderTest.java?rev=768918&r1=768917&r2=768918&view=diff
==============================================================================
---
mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/StateMachineProxyBuilderTest.java
(original)
+++
mina/trunk/statemachine/src/test/java/org/apache/mina/statemachine/StateMachineProxyBuilderTest.java
Mon Apr 27 10:18:41 2009
@@ -134,8 +134,7 @@
proxy.call3(proxy);
}
- public void call3(
- @SuppressWarnings("unused") Reentrant proxy) {
+ public void call3(Reentrant proxy) {
finished = true;
}
}
@@ -188,5 +187,5 @@
public void error(Event event) {
messages.add("Error: Cannot " + event.getId() + " at this time");
}
- };
+ }
}
