New launcher class to start all 3 modes:

[jvcard.git] / src / be / nikiroo / jvcard / tui / panes / ContactList.java

diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactList.java b/src/be/nikiroo/jvcard/tui/panes/ContactList.java
index 3cec44e0dafcd989e8ac472c562ec023e7ba8b93..73c6a84c65e8de094dbdb2afffd8b01277180986 100644 (file)
--- a/src/be/nikiroo/jvcard/tui/panes/ContactList.java
+++ b/src/be/nikiroo/jvcard/tui/panes/ContactList.java
@@ -7,12 +7,12 @@ import java.util.List;
 import be.nikiroo.jvcard.Card;
 import be.nikiroo.jvcard.Contact;
 import be.nikiroo.jvcard.Data;
-import be.nikiroo.jvcard.i18n.Trans;
+import be.nikiroo.jvcard.launcher.Main;
 import be.nikiroo.jvcard.resources.Bundles;
+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.UiColors;
 import be.nikiroo.jvcard.tui.UiColors.Element;
 
 import com.googlecode.lanterna.input.KeyType;
@@ -54,8 +54,7 @@ public class ContactList extends MainContentList {
                this.contacts = new LinkedList<Contact>();
 
                if (card != null) {
-                       for (int i = 0; i < card.size(); i++) {
-                               Contact c = card.get(i);
+                       for (Contact c : card) {
                                if (filter == null
                                                || c.toString(format).toLowerCase()
                                                                .contains(filter.toLowerCase())) {
@@ -255,7 +254,7 @@ public class ContactList extends MainContentList {
                width -= 2; // dirty mark space
 
                String[] array = contact.toStringArray(format, getSeparator(), " ",
-                               width, UiColors.getInstance().isUnicode());
+                               width, Main.isUnicode());
 
                if (contact.isDirty()) {
                        parts.add(new TextPart(" ", el));