Add more warnings source to 1.6) and fix warnings

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

diff --git a/src/be/nikiroo/jvcard/tui/panes/MainContentList.java b/src/be/nikiroo/jvcard/tui/panes/MainContentList.java
index e4c40ba0bc5aaa1a4031d736c79a4867814a60c5..f7aaec4373c9c50a03f60e655933310c156d093d 100644 (file)
--- a/src/be/nikiroo/jvcard/tui/panes/MainContentList.java
+++ b/src/be/nikiroo/jvcard/tui/panes/MainContentList.java
@@ -4,9 +4,10 @@ import java.util.LinkedList;
 import java.util.List;
 
 import be.nikiroo.jvcard.launcher.Main;
-import be.nikiroo.jvcard.resources.StringUtils;
-import be.nikiroo.jvcard.resources.Trans.StringId;
-import be.nikiroo.jvcard.tui.UiColors.Element;
+import be.nikiroo.jvcard.resources.ColorOption;
+import be.nikiroo.jvcard.resources.StringId;
+import be.nikiroo.jvcard.tui.UiColors;
+import be.nikiroo.utils.StringUtils;
 
 import com.googlecode.lanterna.TextColor;
 import com.googlecode.lanterna.gui2.AbstractListBox.ListItemRenderer;
@@ -27,9 +28,9 @@ abstract public class MainContentList extends MainContent implements Runnable {
         */
        public class TextPart {
                private String text;
-               private Element element;
+               private ColorOption element;
 
-               public TextPart(String text, Element element) {
+               public TextPart(String text, ColorOption element) {
                        this.text = text;
                        this.element = element;
                }
@@ -38,20 +39,20 @@ abstract public class MainContentList extends MainContent implements Runnable {
                        return text;
                }
 
-               public Element getElement() {
+               public ColorOption getElement() {
                        return element;
                }
 
                public TextColor getForegroundColor() {
                        if (element != null)
-                               return element.getForegroundColor();
-                       return Element.DEFAULT.getForegroundColor();
+                               return UiColors.getForegroundColor(element);
+                       return UiColors.getForegroundColor(ColorOption.DEFAULT);
                }
 
                public TextColor getBackgroundColor() {
                        if (element != null)
-                               return element.getBackgroundColor();
-                       return Element.DEFAULT.getBackgroundColor();
+                               return UiColors.getBackgroundColor(element);
+                       return UiColors.getBackgroundColor(ColorOption.DEFAULT);
                }
        }
 
@@ -87,6 +88,7 @@ abstract public class MainContentList extends MainContent implements Runnable {
                         *            Will be set to {@code true} if the list box currently
                         *            has input focus, otherwise {@code false}
                         */
+                       @Override
                        public void drawItem(TextGUIGraphics graphics,
                                        ActionListBox listBox, int index, Runnable item,
                                        boolean selected, boolean focused) {
@@ -153,7 +155,7 @@ abstract public class MainContentList extends MainContent implements Runnable {
                        addItem(run.toString());
                }
                setSelectedIndex(index);
-               
+
                return deleted;
        }
 
@@ -224,16 +226,17 @@ abstract public class MainContentList extends MainContent implements Runnable {
         * 
         * @return the text representation
         */
-       protected List<TextPart> getLabel(int index, int width, boolean selected,
+       protected List<TextPart> getLabel(int index,
+                       @SuppressWarnings("unused") int width, boolean selected,
                        boolean focused) {
                List<TextPart> parts = new LinkedList<TextPart>();
 
                if (selected && focused) {
                        parts.add(new TextPart("" + lines.getItems().get(index),
-                                       Element.CONTACT_LINE_SELECTED));
+                                       ColorOption.CONTACT_LINE_SELECTED));
                } else {
                        parts.add(new TextPart("" + lines.getItems().get(index),
-                                       Element.CONTACT_LINE));
+                                       ColorOption.CONTACT_LINE));
                }
 
                return parts;