X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FContactDetailsRaw.java;h=be74d1c8cbef3a31b382afa45c9446534cedcf55;hb=b9f192ed5290f3263f60dc5a2dc9fd754eead958;hp=a81cec8dbc393e85b8473da2bbb0818b03915545;hpb=176a83279a5aafb7e44cc7c34bf78f0bc35225fe;p=jvcard.git diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java index a81cec8..be74d1c 100644 --- a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java +++ b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java @@ -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; } }); @@ -169,7 +177,7 @@ public class ContactDetailsRaw extends MainContentList { Data data = getData(); if (data != null) { if (!answer.equals(previous)) { - data.setTypes(stringToTypes(answer)); + data.replaceListContent(stringToTypes(answer)); } return null; }