Merge commit 'c273eaeb2e7f84eb5e002982d62bcbff90f15a2d'

[jindolf/JinParser.git] / src / main / java / jp / osdn / jindolf / parser / AbstractParser.java

diff --git a/src/main/java/jp/sourceforge/jindolf/parser/AbstractParser.java b/src/main/java/jp/osdn/jindolf/parser/AbstractParser.java
similarity index 94%
rename from src/main/java/jp/sourceforge/jindolf/parser/AbstractParser.java
rename to src/main/java/jp/osdn/jindolf/parser/AbstractParser.java
index ac5dbb6..5281bcd 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/parser/AbstractParser.java
+++ b/src/main/java/jp/osdn/jindolf/parser/AbstractParser.java
@@ -5,10 +5,11 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import jp.osdn.jindolf.parser.content.DecodedContent;
 import jp.sourceforge.jindolf.corelib.GameRole;
 
 /**
@@ -192,8 +193,8 @@ public abstract class AbstractParser implements ChainedParser{
      */
     protected boolean findProbe(Pattern pattern){
         switchPattern(pattern);
-        if( getMatcher().find() ) return true;
-        return false;
+        boolean result = getMatcher().find();
+        return result;
     }
 
     /**
@@ -203,8 +204,8 @@ public abstract class AbstractParser implements ChainedParser{
      */
     protected boolean lookingAtProbe(Pattern pattern){
         switchPattern(pattern);
-        if( getMatcher().lookingAt() ) return true;
-        return false;
+        boolean result = getMatcher().lookingAt();
+        return result;
     }
 
     /**
@@ -214,8 +215,8 @@ public abstract class AbstractParser implements ChainedParser{
      */
     protected boolean matchesProbe(Pattern pattern){
         switchPattern(pattern);
-        if( getMatcher().matches() ) return true;
-        return false;
+        boolean result = getMatcher().matches();
+        return result;
     }
 
     /**
@@ -266,8 +267,8 @@ public abstract class AbstractParser implements ChainedParser{
      * @return ヒットしていたらtrue
      */
     protected boolean isGroupMatched(int group){
-        if(matchStart(group) >= 0) return true;
-        return false;
+        boolean result = matchStart(group) >= 0;
+        return result;
     }
 
     /**
@@ -355,18 +356,24 @@ public abstract class AbstractParser implements ChainedParser{
         for( ; regionStart < regionEnd; regionStart++){
             char letter = rawContent.charAt(regionStart);
 
+            boolean spaceCh;
             switch(letter){
             case '\u0020':
             case '\t':
             case '\n':
             case '\r':
-                hasSpace = true;
-                continue;
+                spaceCh = true;
+                break;
             default:
+                spaceCh = false;
                 break;
             }
 
-            break;
+            if(spaceCh){
+                hasSpace = true;
+            }else{
+                break;
+            }
         }
 
         if(hasSpace){