git://git.nikiroo.be
/
jvcard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VCard format: correctly co/decode escaped values
[jvcard.git]
/
src
/
be
/
nikiroo
/
jvcard
/
tui
/
panes
/
ContactDetailsRaw.java
diff --git
a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
index be74d1c8cbef3a31b382afa45c9446534cedcf55..97fede0af7022a6c6b76ac0f56fd768ccb452a23 100644
(file)
--- 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.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.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;
import be.nikiroo.jvcard.tui.UiColors.Element;
import com.googlecode.lanterna.input.KeyType;
@@
-61,7
+61,7
@@
public class ContactDetailsRaw extends MainContentList {
public String getDefaultAnswer() {
Data data = getData();
if (data != null) {
public String getDefaultAnswer() {
Data data = getData();
if (data != null) {
- return data.getValue();
+ return data.getValue()
.replaceAll("\n", "\\\\n")
;
}
return null;
}
return null;
@@
-71,7
+71,7
@@
public class ContactDetailsRaw extends MainContentList {
public String callback(String answer) {
Data data = getData();
if (data != null) {
public String callback(String answer) {
Data data = getData();
if (data != null) {
- data.setValue(answer);
+ data.setValue(answer
.replaceAll("\\\\n", "\n")
);
return null;
}
return null;
}
@@
-297,7
+297,7
@@
public class ContactDetailsRaw extends MainContentList {
StringBuilder valueBuilder = new StringBuilder(" ");
if (!extMode) {
StringBuilder valueBuilder = new StringBuilder(" ");
if (!extMode) {
- valueBuilder.append(data.getValue());
+ valueBuilder.append(data.getValue()
.replaceAll("\n", "\\\\n")
);
if (data.getGroup() != null && data.getGroup().length() > 0) {
valueBuilder.append("(");
valueBuilder.append(data.getGroup());
if (data.getGroup() != null && data.getGroup().length() > 0) {
valueBuilder.append("(");
valueBuilder.append(data.getGroup());
@@
-314,8
+314,8
@@
public class ContactDetailsRaw extends MainContentList {
value = valueBuilder.toString();
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);
name = StringUtils.padString(name, SIZE_COL_1);
group = StringUtils.padString(group, SIZE_COL_2_OPT);
@@
-362,8
+362,7
@@
public class ContactDetailsRaw extends MainContentList {
if (builder == null)
builder = new StringBuilder();
if (builder == null)
builder = new StringBuilder();
- for (int indexType = 0; indexType < data.size(); indexType++) {
- TypeInfo type = data.get(indexType);
+ for (TypeInfo type : data) {
if (builder.length() > 1)
builder.append(", ");
builder.append(type.getName().replaceAll(",", "\\,"));
if (builder.length() > 1)
builder.append(", ");
builder.append(type.getName().replaceAll(",", "\\,"));