japi-cvs Mailing List for JAPI (Page 26)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 785
          http://japi.svn.sourceforge.net/japi/?rev=785&view=rev
Author:   christianhujer
Date:     2009-02-01 16:28:43 +0000 (Sun, 01 Feb 2009)

Log Message:
-----------
Improved logging mechanisms. They can now be less verbose and more identical to the output of compiler error messages.

Modified Paths:
--------------
    tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java
    tools/archStat/trunk/src/prj/net/sf/japi/archstat/FileStat.java
    tools/archStat/trunk/src/prj/net/sf/japi/archstat/LineCheck.java

Modified: tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java
===================================================================

--- tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java	2009-02-01 16:27:10 UTC (rev 784)
+++ tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java	2009-02-01 16:28:43 UTC (rev 785)
@@ -46,6 +46,9 @@
     /** Whether or not to output memory statistics. */
     private boolean memoryStatistics;
 
+    /** Whether or not to print summaries. */
+    private boolean printSummaries;
+
     /** {@inheritDoc} */
     @SuppressWarnings({"InstanceMethodNamingConvention"})
     public int run(@NotNull final List<String> args) throws Exception {
@@ -61,7 +64,7 @@
         readDefaultCheckers();
         final FileStat fileStat = new FileStat(checkers);
         for (final String arg : args) {
-            fileStat.addChild(arg);
+            fileStat.addChild(arg, printSummaries);
         }
         fileStat.printStatistic(System.out, depth);
         if (memoryStatistics) {
@@ -73,7 +76,7 @@
     }
 
     /** The default depth. */
-    private static final int DEFAULT_DEPTH = Integer.MAX_VALUE;
+    private static final int DEFAULT_DEPTH = 0; //Integer.MAX_VALUE;
 
     /** The depth up to which statistics are printed.
      */
@@ -95,6 +98,14 @@
         this.depth = depth;
     }
 
+    /** Sets whether or not to print summaries.
+     * @param printSummaries <code>true</code> to print summaries, otherwise <code>false</code>.
+     */
+    @Option({"s", "summary"})
+    public void setPrintSummary(@NotNull final Boolean printSummaries) {
+        this.printSummaries = printSummaries;
+    }
+
     /** Returns the depth up to which statistics are printed.
      * @return The depth up to which statistics are printed.
      */

Modified: tools/archStat/trunk/src/prj/net/sf/japi/archstat/FileStat.java
===================================================================
--- tools/archStat/trunk/src/prj/net/sf/japi/archstat/FileStat.java	2009-02-01 16:27:10 UTC (rev 784)
+++ tools/archStat/trunk/src/prj/net/sf/japi/archstat/FileStat.java	2009-02-01 16:28:43 UTC (rev 785)
@@ -53,7 +53,7 @@
     }
 
     @SuppressWarnings({"AssignmentToCollectionOrArrayFieldFromParameter"})
-    FileStat(final List<LineCheck> checkers, @NotNull final File file) {
+    FileStat(final List<LineCheck> checkers, @NotNull final File file, final boolean printSummaries) {
         this.checkers = checkers;
         this.file = file;
         title = file.toString();
@@ -79,16 +79,18 @@
         }
         if (file.isDirectory()) {
             for (final File member : file.listFiles()) {
-                addChild(member);
+                addChild(member, printSummaries);
             }
         }
-        treeWarnings();
+        if (printSummaries) {
+            treeWarnings();
+        }
     }
     void treeWarnings() {
         for (final LineCheck lineCheck : checkers) {
             final Integer i = checkWarnings.get(lineCheck);
             if (i != null && i > 0) {
-                System.err.println(file + ": " + lineCheck.getType() + ": " + i + " " + lineCheck.getPlural());
+                System.err.println(file + ": " + lineCheck.getMessageType() + ": " + i + " " + lineCheck.getPlural());
             }
         }
         if (warnings > 0) {
@@ -111,17 +113,29 @@
     /** Adds a child with the specified filename.
      * @param filename Filename of the child to add.
      */
-    public void addChild(final String filename) {
-        addChild(new File(filename));
+    public void addChild(final String filename, final boolean printSummaries) {
+        addChild(new File(filename), printSummaries);
     }
 
     /** Adds a child with the specified file.
      * @param file File of the child to add.
      */
-    public void addChild(final File file) {
-        addChild(new FileStat(checkers, file));
+    public void addChild(final File file, final boolean printSummaries) {
+        if (!isIgnored(file)) {
+            addChild(new FileStat(checkers, file, printSummaries));
+        }
     }
 
+    /** Returns whether or not a file is ignored.
+     * @param file File that might be ignored.
+     * @return <code>true</code> if <var>file</var> is ignored, otherwise <code>false</code>.
+     */
+    public boolean isIgnored(@NotNull final File file) {
+        final String filename = file.getName();
+        // TODO:christianhujer:This should be configurable.
+        return ".svn".equals(filename);
+    }
+
     /** Adds a child with the specified statistics.
      * @param child Child to add.
      */
@@ -153,8 +167,10 @@
      * @throws IOException In case of I/O problems.
      */
     public void printStatistic(@NotNull final Appendable out, final int level) throws IOException {
-        out.append("Title;Errors;Raw lines;Lines w/o comments;Comment lines;Sloc\n");
-        print(out, level);
+        if (level > 0) {
+            out.append("Title;Errors;Raw lines;Lines w/o comments;Comment lines;Sloc\n");
+            print(out, level);
+        }
     }
 
     /** Prints recursive statistics to the specified appendable.
@@ -165,7 +181,7 @@
     public void print(final Appendable out, final int level) throws IOException {
         out.append(toString());
         out.append("\n");
-        if (level > 0) {
+        if (level > 1) {
             for (final File file : new TreeSet<File>(children.keySet())) {
                 children.get(file).print(out, level - 1);
             }

Modified: tools/archStat/trunk/src/prj/net/sf/japi/archstat/LineCheck.java
===================================================================
--- tools/archStat/trunk/src/prj/net/sf/japi/archstat/LineCheck.java	2009-02-01 16:27:10 UTC (rev 784)
+++ tools/archStat/trunk/src/prj/net/sf/japi/archstat/LineCheck.java	2009-02-01 16:28:43 UTC (rev 785)
@@ -13,7 +13,7 @@
 public class LineCheck {
 
     /** The message type to emit if this check found something. */
-    @NotNull private final MessageType type;
+    @NotNull private final MessageType messageType;
 
     /** The name of this check. */
     @NotNull private final String name;
@@ -30,17 +30,17 @@
      * @param elem XML Element with the check information.
      */
     public LineCheck(@NotNull final Element elem) {
-        this(Enum.valueOf(MessageType.class, elem.getAttribute("type")), elem.getAttribute("name"), Pattern.compile(elem.getAttribute("regex")), elem.getAttribute("message"));
+        this(Enum.valueOf(MessageType.class, elem.getAttribute("messageType")), elem.getAttribute("name"), Pattern.compile(elem.getAttribute("regex")), elem.getAttribute("message"));
     }
 
     /** Create a line check.
-     * @param type The message type to emit if this check found something.
+     * @param messageType The message type to emit if this check found something.
      * @param name The name of this check.
      * @param regex The regular expression for this check.
      * @param message The message to emit if this check found something.
      */
-    public LineCheck(@NotNull final MessageType type, @NotNull final String name, @NotNull final Pattern regex, @NotNull final String message) {
-        this.type = type;
+    public LineCheck(@NotNull final MessageType messageType, @NotNull final String name, @NotNull final Pattern regex, @NotNull final String message) {
+        this.messageType = messageType;
         this.name = name;
         this.regex = regex;
         this.message = message;
@@ -58,7 +58,7 @@
         if (m.find()) {
             final int column = m.start();
             ret = true;
-            LogSystem.log(new LogEntry(file, line, lineNumber, column + 1, type, name, message));
+            LogSystem.log(new LogEntry(file, line, lineNumber, column + 1, messageType, name, message));
         }
         return ret;
     }
@@ -70,14 +70,14 @@
         return name;
     }
 
-    /** Returns the type of this check.
-     * @return The type of this check.
+    /** Returns the message type of this check.
+     * @return The message type of this check.
      */
-    @NotNull public MessageType getType() {
-        return type;
+    @NotNull public MessageType getMessageType() {
+        return messageType;
     }
 
-    /** returns the plural name of this check.
+    /** Returns the plural name of this check.
      * @return The plural name of this check.
      */
     @NotNull public String getPlural() {


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




2006	Jan	Feb	Mar	Apr (115)	May (11)	Jun (5)	Jul (2)	Aug (10)	Sep (35)	Oct (14)	Nov (49)	Dec (27)
2007	Jan (57)	Feb (1)	Mar	Apr (2)	May (25)	Jun (134)	Jul (76)	Aug (34)	Sep (27)	Oct (5)	Nov	Dec (1)
2008	Jan (3)	Feb	Mar (2)	Apr	May	Jun	Jul	Aug	Sep	Oct (63)	Nov (30)	Dec (43)
2009	Jan (10)	Feb (420)	Mar (67)	Apr (3)	May (61)	Jun (21)	Jul (19)	Aug	Sep (6)	Oct (16)	Nov (1)	Dec
2010	Jan (1)	Feb	Mar	Apr (7)	May (3)	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec (1)

japi-cvs Mailing List for JAPI (Page 26)

japi-cvs — svn commit digest list