X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fmain%2Fjustify.java;h=2a83389ea047f75838ce7c46b5e288aedb0f7d1c;hp=68f5358833b144d2479b2b2bf4d14b5d9bcb0928;hb=dc22eb95c9b74c41e229f48e021a8a0c85992f35;hpb=a5d976cda8048c53a4b4fdeee458eab05959bec5

diff --git a/src/be/nikiroo/utils/main/justify.java b/src/be/nikiroo/utils/main/justify.java
index 68f5358..2a83389 100644
--- a/src/be/nikiroo/utils/main/justify.java
+++ b/src/be/nikiroo/utils/main/justify.java
@@ -1,9 +1,7 @@
 package be.nikiroo.utils.main;
 
-import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map.Entry;
 import java.util.Scanner;
 
 import be.nikiroo.utils.StringUtils;
@@ -37,123 +35,19 @@ public class justify {
 			width = Integer.parseInt(args[1]);
 		}
 
-		// TODO: move to utils?
-		// Content <-> Bullet spacing (null = no spacing)
-		List<Entry<String, String>> lines = new ArrayList<Entry<String, String>>();
 		Scanner scan = new Scanner(System.in);
 		scan.useDelimiter("\r\n|[\r\n]");
 		try {
-			StringBuilder previous = null;
-			StringBuilder tmp = new StringBuilder();
-			String previousItemBulletSpacing = null;
-			String itemBulletSpacing = null;
+			List<String> lines = new ArrayList<String>();
 			while (scan.hasNext()) {
-				boolean previousLineComplete = true;
-
-				String current = scan.next().replace("\t", "    ");
-				itemBulletSpacing = getItemSpacing(current);
-				boolean bullet = isItemLine(current);
-				if ((previousItemBulletSpacing == null || itemBulletSpacing
-						.length() <= previousItemBulletSpacing.length())
-						&& !bullet) {
-					itemBulletSpacing = null;
-				}
-
-				if (itemBulletSpacing != null) {
-					current = current.trim();
-					if (!current.isEmpty() && bullet) {
-						current = current.substring(1);
-					}
-					current = current.trim();
-					previousLineComplete = bullet;
-				} else {
-					tmp.setLength(0);
-					for (String word : current.split(" ")) {
-						if (word.isEmpty()) {
-							continue;
-						}
-
-						if (tmp.length() > 0) {
-							tmp.append(' ');
-						}
-						tmp.append(word.trim());
-					}
-					current = tmp.toString();
-
-					previousLineComplete = current.isEmpty()
-							|| previousItemBulletSpacing != null
-							|| (previous != null && isFullLine(previous));
-				}
-
-				if (previous == null) {
-					previous = new StringBuilder();
-				} else {
-					if (previousLineComplete) {
-						lines.add(new AbstractMap.SimpleEntry<String, String>(
-								previous.toString(), previousItemBulletSpacing));
-						previous.setLength(0);
-						previousItemBulletSpacing = itemBulletSpacing;
-					} else {
-						previous.append(' ');
-					}
-				}
-
-				previous.append(current);
-
+				lines.add(scan.next());
 			}
 
-			if (previous != null) {
-				lines.add(new AbstractMap.SimpleEntry<String, String>(previous
-						.toString(), previousItemBulletSpacing));
+			for (String line : StringUtils.justifyText(lines, width, align)) {
+				System.out.println(line);
 			}
 		} finally {
 			scan.close();
 		}
-
-		for (Entry<String, String> line : lines) {
-			String content = line.getKey();
-			String spacing = line.getValue();
-
-			String bullet = "- ";
-			if (spacing == null) {
-				bullet = "";
-				spacing = "";
-			}
-
-			if (spacing.length() > width + 3) {
-				spacing = "";
-			}
-
-			for (String subline : StringUtils.justifyText(content, width
-					- (spacing.length() + bullet.length()), align)) {
-				System.out.println(spacing + bullet + subline);
-				if (!bullet.isEmpty()) {
-					bullet = "  ";
-				}
-			}
-		}
-	}
-
-	static private boolean isFullLine(StringBuilder line) {
-		return line.length() == 0 //
-				|| line.charAt(line.length() - 1) == '.'
-				|| line.charAt(line.length() - 1) == '"'
-				|| line.charAt(line.length() - 1) == '»';
-	}
-
-	static private boolean isItemLine(String line) {
-		String spacing = getItemSpacing(line);
-		return spacing != null && line.charAt(spacing.length()) == '-';
-	}
-
-	static private String getItemSpacing(String line) {
-		int i;
-		for (i = 0; i < line.length(); i++) {
-			if (line.charAt(i) != ' ') {
-				return line.substring(0, i);
-			}
-		}
-
-		return "";
 	}
 }