X-Git-Url: http://git.nikiroo.be/?p=jvcard.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FContactDetailsRaw.java;h=d0cc8a872543b4b5942464ac2e7ccaca9ded720e;hp=d3bd18d1d39fe9f3580b99b3fe526d1fbfeb1655;hb=7da41ecd30228908bf2afcd07ff7943ab59d4c01;hpb=26d2bd0591901a8d52bd24802a8d6827d0e9b833

diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
index d3bd18d..d0cc8a8 100644
--- a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
+++ b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
@@ -6,12 +6,12 @@ import java.util.List;
 import be.nikiroo.jvcard.Contact;
 import be.nikiroo.jvcard.Data;
 import be.nikiroo.jvcard.TypeInfo;
-import be.nikiroo.jvcard.i18n.Trans;
+import be.nikiroo.jvcard.launcher.Main;
+import be.nikiroo.jvcard.resources.StringUtils;
+import be.nikiroo.jvcard.resources.Trans;
 import be.nikiroo.jvcard.tui.KeyAction;
 import be.nikiroo.jvcard.tui.KeyAction.DataType;
 import be.nikiroo.jvcard.tui.KeyAction.Mode;
-import be.nikiroo.jvcard.tui.StringUtils;
-import be.nikiroo.jvcard.tui.UiColors;
 import be.nikiroo.jvcard.tui.UiColors.Element;
 
 import com.googlecode.lanterna.input.KeyType;
@@ -117,19 +117,27 @@ public class ContactDetailsRaw extends MainContentList {
 			@Override
 			public String getQuestion() {
 				// TODO i18n
-				return "new data (xx = yy): ";
+				return "new data (xx.group = yy): ";
 			}
 
 			@Override
 			public String callback(String answer) {
-				if (answer.length() > 0 && answer.contains("=")) {
-					String[] tab = answer.split("=");
-					Data data = new Data(null, tab[0].trim(), tab[1].trim(),
-							null);
+				int indexEq = answer.indexOf('=');
+				if (indexEq >= 0) {
+					String name = answer.substring(0, indexEq).trim();
+					String value = answer.substring(indexEq + 1).trim();
+					String group = null;
+
+					int indexDt = name.indexOf('.');
+					if (indexDt >= 0) {
+						group = name.substring(indexDt + 1).trim();
+						name = name.substring(0, indexDt).trim();
+					}
+
+					Data data = new Data(null, name, value, group);
 					getContact().add(data);
 					addItem("x");
 				}
-
 				return null;
 			}
 		});
@@ -306,8 +314,8 @@ public class ContactDetailsRaw extends MainContentList {
 
 		value = valueBuilder.toString();
 
-		name = StringUtils.sanitize(name, UiColors.getInstance().isUnicode());
-		value = StringUtils.sanitize(value, UiColors.getInstance().isUnicode());
+		name = StringUtils.sanitize(name, Main.isUnicode());
+		value = StringUtils.sanitize(value, Main.isUnicode());
 
 		name = StringUtils.padString(name, SIZE_COL_1);
 		group = StringUtils.padString(group, SIZE_COL_2_OPT);