X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FContactDetailsRaw.java;h=2de99192050af84249affc547dbaa5a073e596d7;hb=a857dca4094360ac213ea3e333826fe75d66e530;hp=5ceee7d6ba2336fa31fee9ea5b371904adf5ad01;hpb=e119a1c1a924998b9315e46c96b1c750aab1deb9;p=jvcard.git diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java index 5ceee7d..2de9919 100644 --- a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java +++ b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java @@ -36,15 +36,19 @@ public class ContactDetailsRaw extends MainContentList { @Override public List getKeyBindings() { - // TODO Auto-generated method stub List actions = new LinkedList(); - // TODO: add, remove actions.add(new KeyAction(Mode.ASK_USER, KeyType.Enter, - StringId.DUMMY) { + StringId.KEY_ACTION_EDIT_FIELD) { @Override public Object getObject() { - return getSelectedData(); + Data data = getSelectedData(); + if (data != null && data.getB64Key() != -1) { + setMessage("Cannot modify binary values in RAW mode", true); + data = null; + } + + return data; } @Override @@ -79,7 +83,8 @@ public class ContactDetailsRaw extends MainContentList { return "Cannot modify value"; } }); - actions.add(new KeyAction(Mode.ASK_USER_KEY, 'd', StringId.DUMMY) { + actions.add(new KeyAction(Mode.ASK_USER_KEY, 'd', + StringId.KEY_ACTION_DELETE) { @Override public Object getObject() { return getSelectedData(); @@ -108,7 +113,7 @@ public class ContactDetailsRaw extends MainContentList { } }); // TODO: ui - actions.add(new KeyAction(Mode.ASK_USER, 'a', StringId.DUMMY) { + actions.add(new KeyAction(Mode.ASK_USER, 'a', StringId.KEY_ACTION_ADD) { @Override public Object getObject() { return contact; @@ -263,6 +268,7 @@ public class ContactDetailsRaw extends MainContentList { @Override protected List getLabel(int index, int width, boolean selected, boolean focused) { + // TODO: from ini file? int SIZE_COL_1 = 15; int SIZE_COL_2_OPT = 10; @@ -297,7 +303,12 @@ public class ContactDetailsRaw extends MainContentList { StringBuilder valueBuilder = new StringBuilder(" "); if (!extMode) { - valueBuilder.append(data.getValue().replaceAll("\n", "\\\\n")); + if (data.getB64Key() != -1) { + // TODO: i18n + valueBuilder.append(""); + } else { + valueBuilder.append(data.getValue().replaceAll("\n", "\\\\n")); + } if (data.getGroup() != null && data.getGroup().length() > 0) { valueBuilder.append("("); valueBuilder.append(data.getGroup()); @@ -352,7 +363,7 @@ public class ContactDetailsRaw extends MainContentList { * @param data * the {@link Data} from which to take the {@link TypeInfo}s * @param builder - * an optional {@link StringBuilder} to append the serialized + * an optional {@link StringBuilder} to append the serialised * version to * * @return the given {@link StringBuilder} or a new one if the given one is @@ -398,12 +409,29 @@ public class ContactDetailsRaw extends MainContentList { } if (previous != '\\' && car == ',') { - String[] tab = value.substring(done, index).split("\\:"); - infos.add(new TypeInfo( // - tab[0].replaceAll("\\,", ",").replaceAll("\\:", ":") - .trim(), // - tab[1].replaceAll("\\,", ",").replaceAll("\\:", ":") - .trim())); + String subValue = value.substring(done, index); + int indexColumn = subValue.indexOf(':'); + while (indexColumn > 0 + && subValue.charAt(indexColumn - 1) == '\\') { + if (indexColumn == subValue.length() - 1) { + indexColumn = -1; + } else { + indexColumn = subValue.indexOf(':', indexColumn + 1); + } + } + + String n = ""; + String v = ""; + if (indexColumn >= 0) { + n = subValue.substring(0, indexColumn).trim(); + v = subValue.substring(indexColumn + 1) + .replaceAll("\\\\:", ":").trim(); + } else { + n = subValue.trim(); + } + + infos.add(new TypeInfo(n, v)); + done = index + 1; }