X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FMainContentList.java;h=f7aaec4373c9c50a03f60e655933310c156d093d;hb=d5260eeb873fcf2ef9855dedcd9e2a3a3a990582;hp=4b6d8ad13b2ad40d77d1f0f02caf90b645638210;hpb=176a83279a5aafb7e44cc7c34bf78f0bc35225fe;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/tui/panes/MainContentList.java b/src/be/nikiroo/jvcard/tui/panes/MainContentList.java
index 4b6d8ad..f7aaec4 100644
--- a/src/be/nikiroo/jvcard/tui/panes/MainContentList.java
+++ b/src/be/nikiroo/jvcard/tui/panes/MainContentList.java
@@ -3,11 +3,11 @@ package be.nikiroo.jvcard.tui.panes;
 import java.util.LinkedList;
 import java.util.List;
 
-import be.nikiroo.jvcard.i18n.Trans.StringId;
-import be.nikiroo.jvcard.tui.Main;
-import be.nikiroo.jvcard.tui.StringUtils;
+import be.nikiroo.jvcard.launcher.Main;
+import be.nikiroo.jvcard.resources.ColorOption;
+import be.nikiroo.jvcard.resources.StringId;
 import be.nikiroo.jvcard.tui.UiColors;
-import be.nikiroo.jvcard.tui.UiColors.Element;
+import be.nikiroo.utils.StringUtils;
 
 import com.googlecode.lanterna.TextColor;
 import com.googlecode.lanterna.gui2.AbstractListBox.ListItemRenderer;
@@ -28,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;
 		}
@@ -39,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);
 		}
 	}
 
@@ -88,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) {
@@ -103,7 +104,7 @@ abstract public class MainContentList extends MainContent implements Runnable {
 					graphics.setBackgroundColor(part.getBackgroundColor());
 
 					String label = StringUtils.sanitize(part.getText(),
-							UiColors.getInstance().isUnicode());
+							Main.isUnicode());
 
 					graphics.putString(position, 0, label);
 					position += label.length();
@@ -154,7 +155,7 @@ abstract public class MainContentList extends MainContent implements Runnable {
 			addItem(run.toString());
 		}
 		setSelectedIndex(index);
-		
+
 		return deleted;
 	}
 
@@ -225,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;