1) Fixed calculation of the new indentation method of splitted strings.

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / wizards / html / StringDivider.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/html/StringDivider.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/html/StringDivider.java
index b66137a..8439fbc 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/html/StringDivider.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/html/StringDivider.java
@@ -1,5 +1,5 @@
 /*
- * $Id: StringDivider.java,v 1.1 2004-10-05 20:51:57 jsurfer Exp $
+ * $Id: StringDivider.java,v 1.2 2006-10-21 23:18:43 pombredanne Exp $
  * Copyright Narushima Hironori. All rights reserved.
  */
 package net.sourceforge.phpeclipse.wizards.html;
@@ -9,33 +9,29 @@ import java.util.regex.Pattern;
 
 public class StringDivider {
 
-       static Pattern tagNameChoosePattern = Pattern.compile("<[\\s/]*(\\w+)\\s*.*>");
+       static Pattern tagNameChoosePattern = Pattern
+                       .compile("<[\\s/]*(\\w+)\\s*.*>");
+
+       String[] splitRegexpCandidates = { "\t", ",", "\\s", "\\s+", };
 
-       String[] splitRegexpCandidates = {
-               "\t",
-               ",",
-               "\\s",
-               "\\s+",
-       };
-       
        public StringDivider() {
        }
 
-       public String[][] divide(String content){
+       public String[][] divide(String content) {
                return divide(content, getDivideSuitedRegexp(content));
        }
-       
-       public String[][] divide(String content, String regexp){
+
+       public String[][] divide(String content, String regexp) {
                String[] lines = content.split("\n");
                int len = lines.length;
                String[][] dist = new String[len][];
-               
+
                int max = Integer.MIN_VALUE;
                for (int i = 0; i < len; i++) {
                        String line = lines[i];
                        String[] cells = line.split(regexp);
                        dist[i] = cells;
-                       if(max < cells.length){
+                       if (max < cells.length) {
                                max = cells.length;
                        }
                }
@@ -47,27 +43,27 @@ public class StringDivider {
                }
                return dist;
        }
-       
-       public String getDivideSuitedRegexp(String content){
+
+       public String getDivideSuitedRegexp(String content) {
                String[] lines = content.split("\n");
-               
+
                String resultRegexp = null;
                int score = Integer.MAX_VALUE, cellCount = Integer.MIN_VALUE;
-               
+
                for (int i = 0; i < splitRegexpCandidates.length; i++) {
                        String regexp = splitRegexpCandidates[i];
                        int max = Integer.MIN_VALUE, min = Integer.MAX_VALUE;
                        for (int j = 0; j < lines.length; j++) {
                                String[] vals = lines[j].split(regexp);
-                               if(max < vals.length){
+                               if (max < vals.length) {
                                        max = vals.length;
                                }
-                               if(min > vals.length){
+                               if (min > vals.length) {
                                        min = vals.length;
                                }
                        }
                        int s = max - min;
-                       if( score > s || (score == s && max > cellCount)){
+                       if (score > s || (score == s && max > cellCount)) {
                                cellCount = max;
                                score = s;
                                resultRegexp = regexp;