Java 1.6+ compatibility (at least) instead of 1.8+ only

[jvcard.git] / src / be / nikiroo / jvcard / tui / Main.java

diff --git a/src/be/nikiroo/jvcard/tui/Main.java b/src/be/nikiroo/jvcard/tui/Main.java
index eda0c69407059a7a200fa4e43d6dce2186eeae4e..4884e70f8d44efb5835ebbf121332fdad2209f68 100644 (file)
--- a/src/be/nikiroo/jvcard/tui/Main.java
+++ b/src/be/nikiroo/jvcard/tui/Main.java
@@ -11,18 +11,8 @@ import be.nikiroo.jvcard.i18n.Trans;
 import be.nikiroo.jvcard.i18n.Trans.StringId;
 import be.nikiroo.jvcard.tui.panes.FileList;
 
-import com.googlecode.lanterna.TextColor;
-import com.googlecode.lanterna.gui2.BasicWindow;
-import com.googlecode.lanterna.gui2.DefaultWindowManager;
-import com.googlecode.lanterna.gui2.EmptySpace;
-import com.googlecode.lanterna.gui2.MultiWindowTextGUI;
 import com.googlecode.lanterna.gui2.Window;
-import com.googlecode.lanterna.gui2.table.Table;
 import com.googlecode.lanterna.input.KeyStroke;
-import com.googlecode.lanterna.screen.Screen;
-import com.googlecode.lanterna.screen.TerminalScreen;
-import com.googlecode.lanterna.terminal.DefaultTerminalFactory;
-import com.googlecode.lanterna.terminal.Terminal;
 
 /**
  * This class contains the runnable Main method. It will parse the user supplied
@@ -34,7 +24,7 @@ import com.googlecode.lanterna.terminal.Terminal;
  */
 public class Main {
        public static final String APPLICATION_TITLE = "jVcard";
-       public static final String APPLICATION_VERSION = "1.0-beta2-dev";
+       public static final String APPLICATION_VERSION = "1.0-beta2";
 
        static private Trans transService;
 
@@ -99,7 +89,6 @@ public class Main {
                                                                + "\t--tui: force pure text mode even if swing treminal is available\n"
                                                                + "\t--gui: force swing terminal mode\n"
                                                                + "\t--noutf: force non-utf8 mode if you need it\n"
-                                                               + "\t--noutfa: force non-utf8 and no accents mode if you need it\n"
                                                                + "everyhing else is either a file to open or a directory to open\n"
                                                                + "(we will only open 1st level files in given directories)");
                                return;
@@ -181,40 +170,10 @@ public class Main {
                        Field charset = Charset.class.getDeclaredField("defaultCharset");
                        charset.setAccessible(true);
                        charset.set(null, null);
-               } catch (SecurityException | NoSuchFieldException
-                               | IllegalArgumentException | IllegalAccessException e) {
+               } catch (SecurityException e) {
+               } catch (NoSuchFieldException e) {
+               } catch (IllegalArgumentException e) {
+               } catch (IllegalAccessException e) {
                }
        }
-
-       static private void fullTestTable() throws IOException {
-               final Table<String> table = new Table<String>("Column 1", "Column 2",
-                               "Column 3");
-               table.getTableModel().addRow("1", "2", "3");
-               table.setSelectAction(new Runnable() {
-                       @Override
-                       public void run() {
-                               List<String> data = table.getTableModel().getRow(
-                                               table.getSelectedRow());
-                               for (int i = 0; i < data.size(); i++) {
-                                       System.out.println(data.get(i));
-                               }
-                       }
-               });
-
-               Window win = new BasicWindow();
-               win.setComponent(table);
-
-               DefaultTerminalFactory factory = new DefaultTerminalFactory();
-               Terminal terminal = factory.createTerminal();
-
-               Screen screen = new TerminalScreen(terminal);
-               screen.startScreen();
-
-               // Create gui and start gui
-               MultiWindowTextGUI gui = new MultiWindowTextGUI(screen,
-                               new DefaultWindowManager(), new EmptySpace(TextColor.ANSI.BLUE));
-               gui.addWindowAndWait(win);
-
-               screen.stopScreen();
-       }
 }