Add more warnings source to 1.6) and fix warnings

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

diff --git a/src/be/nikiroo/jvcard/tui/panes/FileList.java b/src/be/nikiroo/jvcard/tui/panes/FileList.java
index 376aae9feb503e7c8c492fa3c5d3ca2c2fa74c90..55f85cc6cd3a5d58047616a01bbdb259b3532785 100644 (file)
--- a/src/be/nikiroo/jvcard/tui/panes/FileList.java
+++ b/src/be/nikiroo/jvcard/tui/panes/FileList.java
@@ -11,12 +11,12 @@ import be.nikiroo.jvcard.launcher.CardResult;
 import be.nikiroo.jvcard.launcher.CardResult.MergeCallback;
 import be.nikiroo.jvcard.launcher.Main;
 import be.nikiroo.jvcard.parsers.Format;
-import be.nikiroo.jvcard.resources.StringUtils;
-import be.nikiroo.jvcard.resources.Trans;
+import be.nikiroo.jvcard.resources.ColorOption;
+import be.nikiroo.jvcard.resources.StringId;
 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.Element;
+import be.nikiroo.utils.StringUtils;
 
 import com.googlecode.lanterna.input.KeyType;
 
@@ -63,10 +63,10 @@ public class FileList extends MainContentList {
                // TODO: from ini file?
                int SIZE_COL_1 = 3;
 
-               Element el = (focused && selected) ? Element.CONTACT_LINE_SELECTED
-                               : Element.CONTACT_LINE;
-               Element elSep = (focused && selected) ? Element.CONTACT_LINE_SEPARATOR_SELECTED
-                               : Element.CONTACT_LINE_SEPARATOR;
+               ColorOption el = (focused && selected) ? ColorOption.CONTACT_LINE_SELECTED
+                               : ColorOption.CONTACT_LINE;
+               ColorOption elSep = (focused && selected) ? ColorOption.CONTACT_LINE_SEPARATOR_SELECTED
+                               : ColorOption.CONTACT_LINE_SEPARATOR;
 
                List<TextPart> parts = new LinkedList<TextPart>();
 
@@ -96,7 +96,7 @@ public class FileList extends MainContentList {
                parts.add(new TextPart(name, el));
 
                return parts;
-       };
+       }
 
        @Override
        public List<KeyAction> getKeyBindings() {
@@ -104,7 +104,7 @@ public class FileList extends MainContentList {
 
                // TODO del, save...
                actions.add(new KeyAction(Mode.CONTACT_LIST, KeyType.Enter,
-                               Trans.StringId.KEY_ACTION_VIEW_CARD) {
+                               StringId.KEY_ACTION_VIEW_CARD) {
                        private Object obj = null;
 
                        @Override