Create own internal StringUtil

Author: adangel

net.sourceforge.pmd.eclipse.plugin.test/src/main/java/net/sourceforge/pmd/eclipse/util/internal/StringUtilTest.java

@@ -0,0 +1,28 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.eclipse.util.internal;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class StringUtilTest {
+
+    @Test
+    public void testMaxCommonLeadingWhitespaceForAll() {
+        Assert.assertEquals(4, StringUtil.maxCommonLeadingWhitespaceForAll(new String[] { "    a", "    b" }));
+        Assert.assertEquals(0, StringUtil.maxCommonLeadingWhitespaceForAll(new String[] { "    a", "b" }));
+        Assert.assertEquals(4, StringUtil.maxCommonLeadingWhitespaceForAll(new String[] { "    a", "        b" }));
+    }
+
+    @Test
+    public void testTrimStartOn() {
+        Assert.assertArrayEquals(new String[] { "a", "b" },
+                StringUtil.trimStartOn(new String[] { "    a", "    b" }, 4));
+        Assert.assertArrayEquals(new String[] { "a", "  b" },
+                StringUtil.trimStartOn(new String[] { "  a", "    b" }, 2));
+        Assert.assertArrayEquals(new String[] { "    a", "    b" },
+                StringUtil.trimStartOn(new String[] { "    a", "    b" }, 0));
+    }
+}

net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF

@@ -158,6 +158,7 @@ Export-Package: ch.qos.logback.classic;x-friends:="net.sourceforge.pmd.eclipse.p
    net.sourceforge.pmd.eclipse.ui.model,
    org.eclipse.jface.viewers,
    org.eclipse.swt.widgets",
+ net.sourceforge.pmd.eclipse.util.internal;x-friends:="net.sourceforge.pmd.eclipse.plugin.test",
  net.sourceforge.pmd.lang,
  net.sourceforge.pmd.lang.java.rule,
  net.sourceforge.pmd.lang.rule,

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/panelmanagers/ExamplePanelManager.java

@@ -18,12 +18,11 @@
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 
-import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.Rule;
 import net.sourceforge.pmd.eclipse.ui.editors.SyntaxManager;
 import net.sourceforge.pmd.eclipse.ui.preferences.br.ValueChangeListener;
+import net.sourceforge.pmd.eclipse.util.internal.StringUtil;
 import net.sourceforge.pmd.lang.rule.RuleReference;
-import net.sourceforge.pmd.util.StringUtil;
 
 /**
  *
@@ -116,7 +115,7 @@ private void formatExampleOn(StringBuilder sb, String example) {
             lines = StringUtil.trimStartOn(lines, trimDepth);
         }
         for (String line : lines) {
-            sb.append(line).append(PMD.EOL);
+            sb.append(line).append(System.lineSeparator());
         }
     }
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/views/cpd2/CPDView2.java

@@ -39,7 +39,7 @@
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
 import net.sourceforge.pmd.eclipse.runtime.PMDRuntimeConstants;
 import net.sourceforge.pmd.eclipse.ui.nls.StringKeys;
-import net.sourceforge.pmd.util.StringUtil;
+import net.sourceforge.pmd.eclipse.util.internal.StringUtil;
 
 /**
  * An updated view for Cut & Paste Detector that shows the results in a tree

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/util/internal/StringUtil.java

@@ -0,0 +1,40 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.eclipse.util.internal;
+
+public final class StringUtil {
+
+    private StringUtil() {
+        // utility
+    }
+
+    public static int maxCommonLeadingWhitespaceForAll(String[] lines) {
+        int max = Integer.MAX_VALUE;
+
+        for (String line : lines) {
+            int current = 0;
+            for (int i = 0; i < line.length() && Character.isWhitespace(line.charAt(i)); i++) {
+                current++;
+            }
+            if (current < max) {
+                max = current;
+            }
+        }
+
+        return max;
+    }
+
+    public static String[] trimStartOn(String[] lines, int count) {
+        if (count == 0) {
+            return lines;
+        }
+
+        String[] result = new String[lines.length];
+        for (int i = 0; i < lines.length; i++) {
+            result[i] = lines[i].substring(count);
+        }
+        return result;
+    }
+}