Fixed checkstyle errors - could we all now get into the habit of running
"checkstyle.checkstyle" before committing.
This commit is contained in:
parent
93bba09f70
commit
c9bcfe0be0
|
|
@ -152,6 +152,7 @@ public class CheckStyleTask
|
|||
mFileName = aFile.getAbsolutePath();
|
||||
}
|
||||
|
||||
/** @param aFile the configuration file to use */
|
||||
public void setConfig(File aFile)
|
||||
{
|
||||
mConfigFile = aFile;
|
||||
|
|
|
|||
|
|
@ -131,7 +131,10 @@ class StringArrayReader extends Reader
|
|||
}
|
||||
}
|
||||
|
||||
/** Throws an IOException if the reader has already been closed. */
|
||||
/**
|
||||
* Throws an IOException if the reader has already been closed.
|
||||
* @throws IOException if the stream has been closed
|
||||
*/
|
||||
private void ensureOpen() throws IOException
|
||||
{
|
||||
if (mClosed) {
|
||||
|
|
|
|||
|
|
@ -18,21 +18,18 @@
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
package com.puppycrawl.tools.checkstyle;
|
||||
|
||||
import com.puppycrawl.tools.checkstyle.api.LocalizedMessage;
|
||||
import com.puppycrawl.tools.checkstyle.api.LocalizedMessages;
|
||||
import com.puppycrawl.tools.checkstyle.api.Utils;
|
||||
import org.apache.regexp.RE;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.ListIterator;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.Stack;
|
||||
|
||||
import org.apache.regexp.RE;
|
||||
|
||||
import com.puppycrawl.tools.checkstyle.api.LocalizedMessage;
|
||||
import com.puppycrawl.tools.checkstyle.api.LocalizedMessages;
|
||||
import com.puppycrawl.tools.checkstyle.api.Utils;
|
||||
|
||||
/**
|
||||
* Verifier of Java rules. Each rule verifier takes the form of
|
||||
* <code>void verifyXXX(args)</code>. The implementation must not throw any
|
||||
|
|
|
|||
|
|
@ -286,7 +286,8 @@ public abstract class Check
|
|||
* @param aArg0 first argument
|
||||
* @param aArg1 second argument
|
||||
*/
|
||||
protected final void log(int aLineNo, String aKey, Object aArg0, Object aArg1)
|
||||
protected final void log(int aLineNo, String aKey,
|
||||
Object aArg0, Object aArg1)
|
||||
{
|
||||
log(aLineNo, aKey, new Object[] {aArg0, aArg1});
|
||||
}
|
||||
|
|
@ -356,7 +357,8 @@ public abstract class Check
|
|||
* @param aKey key to locale message format
|
||||
* @param aArgs arguments for message
|
||||
*/
|
||||
protected final void log(int aLineNo, int aColNo, String aKey, Object[] aArgs)
|
||||
protected final void log(int aLineNo, int aColNo,
|
||||
String aKey, Object[] aArgs)
|
||||
{
|
||||
final int col = 1 + Utils.lengthExpandedTabs(
|
||||
getLines()[aLineNo - 1], aColNo, getTabWidth());
|
||||
|
|
|
|||
|
|
@ -26,11 +26,16 @@ package com.puppycrawl.tools.checkstyle.checks;
|
|||
public final class BlockOption
|
||||
extends AbstractOption
|
||||
{
|
||||
/**
|
||||
* Creates a new <code>BlockOption</code> instance.
|
||||
*
|
||||
* @param aStrRep the string representation
|
||||
*/
|
||||
private BlockOption(String aStrRep)
|
||||
{
|
||||
super(aStrRep);
|
||||
}
|
||||
|
||||
|
||||
/** require that there is some text in the block **/
|
||||
public static final BlockOption TEXT = new BlockOption("text");
|
||||
/** require that there is a statement in the block **/
|
||||
|
|
|
|||
Loading…
Reference in New Issue