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

diff --git a/src/be/nikiroo/jvcard/tui/panes/FileList.java b/src/be/nikiroo/jvcard/tui/panes/FileList.java
index 75f9352..e7632e0 100644
--- a/src/be/nikiroo/jvcard/tui/panes/FileList.java
+++ b/src/be/nikiroo/jvcard/tui/panes/FileList.java
@@ -1,19 +1,17 @@
 package be.nikiroo.jvcard.tui.panes;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
 import be.nikiroo.jvcard.Card;
-import be.nikiroo.jvcard.i18n.Trans;
-import be.nikiroo.jvcard.parsers.Format;
+import be.nikiroo.jvcard.launcher.Main;
+import be.nikiroo.jvcard.resources.StringUtils;
+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.StringUtils;
-import be.nikiroo.jvcard.tui.UiColors;
 import be.nikiroo.jvcard.tui.UiColors.Element;
 
 import com.googlecode.lanterna.input.KeyType;
@@ -73,7 +71,7 @@ public class FileList extends MainContentList {
 			name = name.substring(indexSl + 1);
 		}
 
-		name = StringUtils.sanitize(name, UiColors.getInstance().isUnicode());
+		name = StringUtils.sanitize(name, Main.isUnicode());
 
 		count = " " + StringUtils.padString(count, SIZE_COL_1) + " ";
 		name = " "
@@ -107,7 +105,7 @@ public class FileList extends MainContentList {
 				String file = files.get(index);
 
 				try {
-					Card card = FileList.getCard(file);
+					Card card = Main.getCard(file);
 					cards.set(index, card);
 
 					invalidate();
@@ -122,25 +120,4 @@ public class FileList extends MainContentList {
 
 		return actions;
 	}
-
-	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;
-	}
 }