X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FContactDetails.java;h=2137bd885b1588312590eb15183037a554d6a801;hb=24e66f8322565f83abd73cfddb6838cbd0f52f58;hp=a221f6b885f5a79a4449d8a584a7a12817e238a7;hpb=8002675fff4eaeeb292c4b1a1e4182bd999a548c;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactDetails.java b/src/be/nikiroo/jvcard/tui/panes/ContactDetails.java
index a221f6b..2137bd8 100644
--- a/src/be/nikiroo/jvcard/tui/panes/ContactDetails.java
+++ b/src/be/nikiroo/jvcard/tui/panes/ContactDetails.java
@@ -7,16 +7,17 @@ import java.util.List;
 import be.nikiroo.jvcard.Contact;
 import be.nikiroo.jvcard.Data;
 import be.nikiroo.jvcard.TypeInfo;
-import be.nikiroo.jvcard.resources.StringUtils;
-import be.nikiroo.jvcard.resources.bundles.DisplayBundle;
-import be.nikiroo.jvcard.resources.enums.ColorOption;
-import be.nikiroo.jvcard.resources.enums.DisplayOption;
-import be.nikiroo.jvcard.resources.enums.StringId;
+import be.nikiroo.jvcard.resources.ColorOption;
+import be.nikiroo.jvcard.resources.DisplayBundle;
+import be.nikiroo.jvcard.resources.DisplayOption;
+import be.nikiroo.jvcard.resources.StringId;
 import be.nikiroo.jvcard.tui.ImageTextControl;
 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.UiColors;
+import be.nikiroo.utils.StringUtils;
+import be.nikiroo.utils.ui.ImageUtilsAwt;
 
 import com.googlecode.lanterna.TerminalSize;
 import com.googlecode.lanterna.gui2.BorderLayout;
@@ -115,22 +116,27 @@ public class ContactDetails extends MainContent {
 
 				boolean hl = false;
 				boolean all = false;
-				if (info.contains("+") || info.contains("#"))
+				if (info.contains("+") || info.contains("#")) {
 					hl = true;
-				if (info.contains("*") || info.contains("#"))
+				}
+				if (info.contains("*") || info.contains("#")) {
 					all = true;
+				}
 
 				if (all || hl || info.contains("=")) {
 					ColorOption el = hl ? ColorOption.VIEW_CONTACT_HIGHLIGHT
 							: ColorOption.VIEW_CONTACT_NORMAL;
 
 					int index = info.indexOf('=');
-					if (index < 0)
+					if (index < 0) {
 						index = info.indexOf('+');
-					if (index < 0)
+					}
+					if (index < 0) {
 						index = info.indexOf('#');
-					if (index < 0)
+					}
+					if (index < 0) {
 						index = info.indexOf('*');
+					}
 
 					String label = info.substring(0, index);
 					String field = info.substring(index + 1);
@@ -151,8 +157,9 @@ public class ContactDetails extends MainContent {
 						}
 					} else {
 						String val = contact.getPreferredDataValue(field);
-						if (val == null)
+						if (val == null) {
 							val = "";
+						}
 						infoPanel.addComponent(UiColors.createLabel(el,
 								StringUtils.padString(label, labelSize) + val));
 					}
@@ -169,8 +176,9 @@ public class ContactDetails extends MainContent {
 					ColorOption.VIEW_CONTACT_NORMAL, ""));
 
 			String notes = contact.getPreferredDataValue("NOTE");
-			if (notes == null)
+			if (notes == null) {
 				notes = "";
+			}
 			note.setText(notes);
 
 			Data photo = contact.getPreferredData("PHOTO");
@@ -187,9 +195,14 @@ public class ContactDetails extends MainContent {
 
 				if (encoding != null && encoding.getValue() != null
 						&& encoding.getValue().equalsIgnoreCase("b")) {
-
 					try {
-						image = StringUtils.toImage(photo.getValue());
+						be.nikiroo.utils.Image img = new be.nikiroo.utils.Image(
+								photo.getValue());
+						try {
+							image = ImageUtilsAwt.fromImage(img);
+						} finally {
+							img.close();
+						}
 					} catch (Exception e) {
 						System.err.println("Cannot parse image for contact: "
 								+ contact.getPreferredDataValue("UID"));
@@ -269,15 +282,17 @@ public class ContactDetails extends MainContent {
 	private void setImage(Image image) {
 		this.image = image;
 
-		if (txtImage != null && top.containsComponent(txtImage))
+		if (txtImage != null && top.containsComponent(txtImage)) {
 			top.removeComponent(txtImage);
+		}
 
 		TerminalSize size = getTxtSize();
 		if (size != null) {
-			if (txtImage != null)
+			if (txtImage != null) {
 				txtImage.setSize(size);
-			else
+			} else {
 				txtImage = new ImageTextControl(image, size);
+			}
 		}
 
 		if (size != null) {
@@ -298,15 +313,16 @@ public class ContactDetails extends MainContent {
 				&& getSize().getRows() > 0) {
 			if (fullscreenImage) {
 				return getSize();
-			} else {
-				// TODO: configure size?
-				int w = getSize().getColumns() - 40;
-				int h = getSize().getRows() - 9;
-				if (w <= 0 || h <= 0)
-					return null;
+			}
 
-				return new TerminalSize(w, h);
+			// TODO: configure size?
+			int w = getSize().getColumns() - 40;
+			int h = getSize().getRows() - 9;
+			if (w <= 0 || h <= 0) {
+				return null;
 			}
+
+			return new TerminalSize(w, h);
 		}
 
 		return null;