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;
@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;
}
});
Data data = getData();
if (data != null) {
if (!answer.equals(previous)) {
- data.setTypes(stringToTypes(answer));
+ data.replaceListContent(stringToTypes(answer));
}
return null;
}
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);