[apache-rat-pd commit] r39 - Decomposer of words is improved.

[codesite-noreply]

Author: maka82
Date: Sun Jul 12 13:34:46 2009
New Revision: 39
Modified:
   trunk/src/main/java/org/apache/rat/pd/core/SourceCodeAnalyser.java
    
trunk/src/main/java/org/apache/rat/pd/heuristic/comment/JavaCommentHeuristicChecker.java

Log:
Decomposer of words is improved.

Modified: trunk/src/main/java/org/apache/rat/pd/core/SourceCodeAnalyser.java
==============================================================================
--- trunk/src/main/java/org/apache/rat/pd/core/SourceCodeAnalyser.java	 
(original)
+++ trunk/src/main/java/org/apache/rat/pd/core/SourceCodeAnalyser.java	Sun  
Jul 12 13:34:46 2009
@@ -201,10 +201,11 @@
        private StringBuffer combineTokens(String[] tokens, int start, int end) 
{

                StringBuffer sb = new StringBuffer();
-               for (int k = start; k <= end; k++) {
+               for (int k = start; k < end; k++) {
                        sb.append(tokens[k]);
                        sb.append(" ");
                }
+               sb.append(tokens[end]);
                return sb;
        }

@@ -212,6 +213,7 @@
         * extract tokens
         */
        private String[] tokeniseString(String file) {
+               file = file.replaceAll("\\n", "\n ");
                String[] tokens = file.split(STRING_DELIMETER_REGEX);
                // this simple tokeniser returns array {""} when "" is tokenised
                // I must avoid that behavior

Modified:  
trunk/src/main/java/org/apache/rat/pd/heuristic/comment/JavaCommentHeuristicChecker.java
==============================================================================
---  
trunk/src/main/java/org/apache/rat/pd/heuristic/comment/JavaCommentHeuristicChecker.java	 
(original)
+++  
trunk/src/main/java/org/apache/rat/pd/heuristic/comment/JavaCommentHeuristicChecker.java	 
Sun Jul 12 13:34:46 2009
@@ -33,7 +33,7 @@
         * This regular expression match comments in Java. More info 
on:{...@link}
         * http://ostermiller.org/findcomment.html
         */
-	private static final String JAVA_COMMENT_REGEX = "(/\\*(?:[^*]| 
(?:\\*+[^*/]))*\\*+/)|(//.*[\\n\\r])";
+	private static final String JAVA_COMMENT_REGEX = "(/\\*(?:[^*]| 
(?:\\*+[^*/]))*\\*+/[\\n\\r]*)|(//.*[\\n\\r])";

        public JavaCommentHeuristicChecker(int limit) {
                super(JAVA_COMMENT_REGEX, limit);