X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FFileList.java;h=75f9352cf92f389060276e67c1983b7f811068c3;hb=7f82bf682ab5747b2d4ccdccae9ea3fcdb013cee;hp=dfc3b73114cf3ffda2f2989d74841a1e602a9e69;hpb=bcb54330afff6a443ab43ee3d38cc7f863c701b7;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/tui/panes/FileList.java b/src/be/nikiroo/jvcard/tui/panes/FileList.java
index dfc3b73..75f9352 100644
--- a/src/be/nikiroo/jvcard/tui/panes/FileList.java
+++ b/src/be/nikiroo/jvcard/tui/panes/FileList.java
@@ -19,13 +19,10 @@ import be.nikiroo.jvcard.tui.UiColors.Element;
 import com.googlecode.lanterna.input.KeyType;
 
 public class FileList extends MainContentList {
-	private List<File> files;
+	private List<String> files;
 	private List<Card> cards;
 
-	public FileList(List<File> files) {
-		super(UiColors.Element.CONTACT_LINE,
-				UiColors.Element.CONTACT_LINE_SELECTED);
-
+	public FileList(List<String> files) {
 		setFiles(files);
 	}
 
@@ -35,13 +32,13 @@ public class FileList extends MainContentList {
 	 * @param files
 	 *            the new files
 	 */
-	public void setFiles(List<File> files) {
+	public void setFiles(List<String> files) {
 		clearItems();
 		this.files = files;
 		cards = new ArrayList<Card>();
 
-		for (File file : files) {
-			addItem(file.getName());
+		for (String file : files) {
+			addItem(file); // TODO
 			cards.add(null);
 		}
 
@@ -70,7 +67,13 @@ public class FileList extends MainContentList {
 		if (cards.get(index) != null)
 			count += cards.get(index).size();
 
-		String name = files.get(index).getName();
+		String name = files.get(index).replaceAll("\\\\", "/");
+		int indexSl = name.lastIndexOf('/');
+		if (indexSl >= 0) {
+			name = name.substring(indexSl + 1);
+		}
+
+		name = StringUtils.sanitize(name, UiColors.getInstance().isUnicode());
 
 		count = " " + StringUtils.padString(count, SIZE_COL_1) + " ";
 		name = " "
@@ -101,18 +104,10 @@ public class FileList extends MainContentList {
 				if (cards.get(index) != null)
 					return cards.get(index);
 
-				File file = files.get(index);
-				Format format = Format.Abook;
-				String ext = file.getName();
-				if (ext.contains(".")) {
-					String tab[] = ext.split("\\.");
-					if (tab.length > 1
-							&& tab[tab.length - 1].equalsIgnoreCase("vcf")) {
-						format = Format.VCard21;
-					}
-				}
+				String file = files.get(index);
+
 				try {
-					Card card = new Card(file, format);
+					Card card = FileList.getCard(file);
 					cards.set(index, card);
 
 					invalidate();
@@ -128,8 +123,24 @@ public class FileList extends MainContentList {
 		return actions;
 	}
 
-	@Override
-	public Mode getMode() {
-		return Mode.FILE_LIST;
+	static private Card getCard(String input) throws IOException {
+		Format format = Format.Abook;
+		String ext = input;
+		if (ext.contains(".")) {
+			String tab[] = ext.split("\\.");
+			if (tab.length > 1 && tab[tab.length - 1].equalsIgnoreCase("vcf")) {
+				format = Format.VCard21;
+			}
+		}
+
+		Card card = null;
+		try {
+			card = new Card(new File(input), format);
+		} catch (IOException ioe) {
+			ioe.printStackTrace();
+			throw ioe;
+		}
+
+		return card;
 	}
 }