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
Java 1.6+ compatibility (at least) instead of 1.8+ only
[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 8aeac19f27002419035c58ba6218cf36a692bc82..06c88fc9ec02a66f71011f6842ecb54d6e1e0603 100644
(file)
--- a/
src/be/nikiroo/jvcard/tui/panes/ContactDetails.java
+++ b/
src/be/nikiroo/jvcard/tui/panes/ContactDetails.java
@@
-1,10
+1,10
@@
package be.nikiroo.jvcard.tui.panes;
import java.awt.Image;
package be.nikiroo.jvcard.tui.panes;
import java.awt.Image;
-import java.util.Base64;
import java.util.LinkedList;
import java.util.List;
import java.util.LinkedList;
import java.util.List;
+import javax.xml.bind.DatatypeConverter;
import javax.swing.ImageIcon;
import be.nikiroo.jvcard.Contact;
import javax.swing.ImageIcon;
import be.nikiroo.jvcard.Contact;
@@
-62,19
+62,16
@@
public class ContactDetails extends MainContent {
/**
* Change the enclosed {@link Contact} from this {@link ContactDetails}.
/**
* Change the enclosed {@link Contact} from this {@link ContactDetails}.
+ * Also re-set the image.
*
* @param contact
* the new {@link Contact}
*/
public void setContact(Contact contact) {
*
* @param contact
* the new {@link Contact}
*/
public void setContact(Contact contact) {
- if (this.contact == contact)
- return;
-
this.contact = contact;
this.contact = contact;
+ image = null;
- if (contact == null) {
- image = null;
- } else {
+ if (contact != null) {
infoPanel.removeAllComponents();
String name = contact.getPreferredDataValue("FN");
infoPanel.removeAllComponents();
String name = contact.getPreferredDataValue("FN");
@@
-106,21
+103,20
@@
public class ContactDetails extends MainContent {
Data photo = contact.getPreferredData("PHOTO");
if (photo != null) {
TypeInfo encoding = null;
Data photo = contact.getPreferredData("PHOTO");
if (photo != null) {
TypeInfo encoding = null;
- TypeInfo type = null;
for (int index = 0; index < photo.size(); index++) {
TypeInfo info = photo.get(index);
if (info.getName() != null) {
if (info.getName().equalsIgnoreCase("ENCODING"))
encoding = info;
for (int index = 0; index < photo.size(); index++) {
TypeInfo info = photo.get(index);
if (info.getName() != null) {
if (info.getName().equalsIgnoreCase("ENCODING"))
encoding = info;
- if (info.getName().equalsIgnoreCase("TYPE"))
- type = info;
+ // We don't check for the "TYPE" anymore, we just defer
+ // it to ImageIcon
}
}
if (encoding != null && encoding.getValue() != null
&& encoding.getValue().equalsIgnoreCase("b")) {
}
}
if (encoding != null && encoding.getValue() != null
&& encoding.getValue().equalsIgnoreCase("b")) {
- image = new ImageIcon(
Base64.getDecoder().decode
(
+ image = new ImageIcon(
DatatypeConverter.parseBase64Binary
(
photo.getValue())).getImage();
}
}
photo.getValue())).getImage();
}
}
@@
-170,6
+166,14
@@
public class ContactDetails extends MainContent {
return false;
}
});
return false;
}
});
+ // TODO: add "normal" edit and remove this one into RAW edit
+ actions.add(new KeyAction(Mode.CONTACT_DETAILS_RAW, 'e',
+ Trans.StringId.KEY_ACTION_EDIT_CONTACT) {
+ @Override
+ public Object getObject() {
+ return contact;
+ }
+ });
return actions;
}
return actions;
}