X-Git-Url: https://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FContactDetailsRaw.java;h=47b5e8addb103c25c3f63f4658f70751609fd5a1;hb=f82bad11bbabc89805a5a8000f59a3b1df3e5c3d;hp=1347b0ee11698d94a18180142e28ea605c44b99c;hpb=78e4af97505df331618f9c13dd5d98440d364764;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
index 1347b0e..47b5e8a 100644
--- a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
+++ b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
@@ -31,70 +31,6 @@ public class ContactDetailsRaw extends MainContentList {
 		}
 	}
 
-	@Override
-	protected List<TextPart> getLabel(int index, int width, boolean selected,
-			boolean focused) {
-		// TODO: from ini file?
-		int SIZE_COL_1 = 15;
-
-		Element el = (focused && selected) ? Element.CONTACT_LINE_SELECTED
-				: Element.CONTACT_LINE;
-		Element elSep = (focused && selected) ? Element.CONTACT_LINE_SEPARATOR_SELECTED
-				: Element.CONTACT_LINE_SEPARATOR;
-		Element elDirty = (focused && selected) ? Element.CONTACT_LINE_DIRTY_SELECTED
-				: Element.CONTACT_LINE_DIRTY;
-
-		Data data = contact.get(index);
-
-		List<TextPart> parts = new LinkedList<TextPart>();
-		if (data.isDirty()) {
-			parts.add(new TextPart(" ", el));
-			parts.add(new TextPart("*", elDirty));
-		} else {
-			parts.add(new TextPart("  ", elSep));
-		}
-		String name = " " + data.getName() + " ";
-		String value = null;
-
-		StringBuilder valueBuilder = new StringBuilder(" ");
-		switch (mode) {
-		case 0:
-			valueBuilder.append(data.getValue());
-			if (data.getGroup() != null && data.getGroup().length() > 0) {
-				valueBuilder.append("(");
-				valueBuilder.append(data.getGroup());
-				valueBuilder.append(")");
-			}
-			break;
-		case 1:
-			for (int indexType = 0; indexType < data.size(); indexType++) {
-				TypeInfo type = data.get(indexType);
-				if (valueBuilder.length() > 1)
-					valueBuilder.append(", ");
-				valueBuilder.append(type.getName());
-				valueBuilder.append(": ");
-				valueBuilder.append(type.getValue());
-			}
-			break;
-		}
-		valueBuilder.append(" ");
-
-		value = valueBuilder.toString();
-
-		name = StringUtils.sanitize(name, UiColors.getInstance().isUnicode());
-		value = StringUtils.sanitize(value, UiColors.getInstance().isUnicode());
-
-		name = StringUtils.padString(name, SIZE_COL_1);
-		value = StringUtils.padString(value, width - SIZE_COL_1
-				- getSeparator().length() - 2);
-
-		parts.add(new TextPart(name, el));
-		parts.add(new TextPart(getSeparator(), elSep));
-		parts.add(new TextPart(value, el));
-
-		return parts;
-	};
-
 	@Override
 	public DataType getDataType() {
 		return DataType.DATA;
@@ -178,4 +114,69 @@ public class ContactDetailsRaw extends MainContentList {
 		// TODO Auto-generated method stub
 		return null;
 	}
+
+	@Override
+	protected List<TextPart> getLabel(int index, int width, boolean selected,
+			boolean focused) {
+		// TODO: from ini file?
+		int SIZE_COL_1 = 15;
+
+		Element el = (focused && selected) ? Element.CONTACT_LINE_SELECTED
+				: Element.CONTACT_LINE;
+		Element elSep = (focused && selected) ? Element.CONTACT_LINE_SEPARATOR_SELECTED
+				: Element.CONTACT_LINE_SEPARATOR;
+		Element elDirty = (focused && selected) ? Element.CONTACT_LINE_DIRTY_SELECTED
+				: Element.CONTACT_LINE_DIRTY;
+
+		Data data = contact.get(index);
+
+		List<TextPart> parts = new LinkedList<TextPart>();
+		if (data.isDirty()) {
+			parts.add(new TextPart(" ", el));
+			parts.add(new TextPart("*", elDirty));
+		} else {
+			parts.add(new TextPart("  ", elSep));
+		}
+		String name = " " + data.getName() + " ";
+		String value = null;
+
+		StringBuilder valueBuilder = new StringBuilder(" ");
+		switch (mode) {
+		case 0:
+			valueBuilder.append(data.getValue());
+			if (data.getGroup() != null && data.getGroup().length() > 0) {
+				valueBuilder.append("(");
+				valueBuilder.append(data.getGroup());
+				valueBuilder.append(")");
+			}
+			break;
+		case 1:
+			for (int indexType = 0; indexType < data.size(); indexType++) {
+				TypeInfo type = data.get(indexType);
+				if (valueBuilder.length() > 1)
+					valueBuilder.append(", ");
+				valueBuilder.append(type.getName());
+				valueBuilder.append(": ");
+				valueBuilder.append(type.getValue());
+			}
+			break;
+		}
+		valueBuilder.append(" ");
+
+		value = valueBuilder.toString();
+
+		name = StringUtils.sanitize(name, UiColors.getInstance().isUnicode());
+		value = StringUtils.sanitize(value, UiColors.getInstance().isUnicode());
+
+		name = StringUtils.padString(name, SIZE_COL_1);
+		value = StringUtils.padString(value, width - SIZE_COL_1
+				- getSeparator().length() - 2);
+
+		parts.add(new TextPart(name, el));
+		parts.add(new TextPart(getSeparator(), elSep));
+		parts.add(new TextPart(value, el));
+
+		return parts;
+	};
+
 }