[Japi-cvs] SF.net SVN: japi:[966] tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep

[<chr...@us...>]

Revision: 966
          http://japi.svn.sourceforge.net/japi/?rev=966&view=rev
Author:   christianhujer
Date:     2009-02-18 06:00:41 +0000 (Wed, 18 Feb 2009)

Log Message:
-----------
Fixed checkstyle issues.

Modified Paths:
--------------
    tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.java
    tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.properties

Modified: tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.java
===================================================================
--- tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.java	2009-02-18 06:00:26 UTC (rev 965)
+++ tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.java	2009-02-18 06:00:41 UTC (rev 966)
@@ -86,7 +86,7 @@
      * Key: Flag character.
      * Value: integer flag value for {@link Pattern#compile(String, int)} resp. returned by {@link Pattern#flags()}.
      */
-    private static final Map<Character, Integer> flagMap = createFlagMap();
+    private static final Map<Character, Integer> FLAG_MAP = createFlagMap();
 
     /** Whether or not to recurse into subdirectories or not.
      * If <code>true</code>, directories will be opened recursively and substitution performed on all files found.
@@ -151,7 +151,7 @@
         if (flagString != null) {
             StringBuilder bogusFlags = null;
             for (final char c : flagString.toCharArray()) {
-                final Integer flag = flagMap.get(c);
+                final Integer flag = FLAG_MAP.get(c);
                 if (flag == null) {
                     if (bogusFlags == null) {
                         bogusFlags = new StringBuilder();
@@ -231,7 +231,8 @@
         @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
         final BufferedReader in = reader instanceof BufferedReader ? (BufferedReader) reader : new BufferedReader(reader);
         int lineNumber = 0;
-        for (String line; (line = in.readLine()) != null; ) {
+        //noinspection NestedAssignment
+        for (String line; (line = in.readLine()) != null;) {
             ++lineNumber;
             matcher.reset(line);
             final boolean found = matchWholeLines ? matcher.matches() : matcher.find();

Modified: tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.properties
===================================================================
--- tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.properties	2009-02-18 06:00:26 UTC (rev 965)
+++ tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.properties	2009-02-18 06:00:41 UTC (rev 966)
@@ -16,4 +16,4 @@
 #
 
 recursive=Scan subdirectories recursively. (same as --directories=recurse)
-setDirectories=Sets how to handle subdirectories. Possible values are: recurse (recursive handling), read, skip.
\ No newline at end of file
+setDirectories=Sets how to handle subdirectories. Possible values are: recurse (recursive handling), read, skip.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.