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
/
ContactDetails.java
diff --git
a/src/be/nikiroo/jvcard/tui/panes/ContactDetails.java
b/src/be/nikiroo/jvcard/tui/panes/ContactDetails.java
index 4cbbdf7d38e2e27a6264880123c647d3fd2f7410..1d6beb9998bf01b461fb4590746edf1bb4d13868 100644
(file)
--- a/
src/be/nikiroo/jvcard/tui/panes/ContactDetails.java
+++ b/
src/be/nikiroo/jvcard/tui/panes/ContactDetails.java
@@
-151,23
+151,25
@@
public class ContactDetails extends MainContent {
if (all) {
for (Data data : contact.getData(field)) {
if (data.isPreferred()) {
if (all) {
for (Data data : contact.getData(field)) {
if (data.isPreferred()) {
- infoPanel
- .addComponent(el.createLabel(StringUtils
- .padString(label, labelSize)
- + contact
- .getPreferredDataValue(field)));
+ infoPanel.addComponent(el
+ .createLabel(StringUtils.padString(
+ label, labelSize)
+ + data.toString()));
} else {
infoPanel
} else {
infoPanel
- .addComponent(UiColors.Element.VIEW_CONTACT_NORMAL.createLabel(StringUtils
- .padString(label, labelSize)
- + contact
- .getPreferredDataValue(field)));
+ .addComponent(UiColors.Element.VIEW_CONTACT_NORMAL
+ .createLabel(StringUtils
+ .padString(label,
+ labelSize)
+ + data.toString()));
}
}
} else {
}
}
} else {
+ String val = contact.getPreferredDataValue(field);
+ if (val == null)
+ val = "";
infoPanel.addComponent(el.createLabel(StringUtils
infoPanel.addComponent(el.createLabel(StringUtils
- .padString(label, labelSize)
- + contact.getPreferredDataValue(field)));
+ .padString(label, labelSize) + val));
}
} else {
String label = info;
}
} else {
String label = info;
@@
-184,7
+186,7
@@
public class ContactDetails extends MainContent {
String notes = contact.getPreferredDataValue("NOTE");
if (notes == null)
notes = "";
String notes = contact.getPreferredDataValue("NOTE");
if (notes == null)
notes = "";
- note.setText(notes
.replaceAll("\\\\n", "\n")
);
+ note.setText(notes);
Data photo = contact.getPreferredData("PHOTO");
if (photo != null) {
Data photo = contact.getPreferredData("PHOTO");
if (photo != null) {
@@
-319,7
+321,7
@@
public class ContactDetails extends MainContent {
} else {
// TODO: configure size?
int w = getSize().getColumns() - 40;
} else {
// TODO: configure size?
int w = getSize().getColumns() - 40;
- int h = getSize().getRows() -
5
;
+ int h = getSize().getRows() -
9
;
if (w <= 0 || h <= 0)
return null;
if (w <= 0 || h <= 0)
return null;