Move MainContent and its derivative to a new package, rework ContactList

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

diff --git a/src/be/nikiroo/jvcard/tui/MainWindow.java b/src/be/nikiroo/jvcard/tui/MainWindow.java
index a17e549b84a33d8152bf759300e8528ba4bacb37..7f438d918a717792f2686d6a86379c8949d74dd2 100644 (file)
--- a/src/be/nikiroo/jvcard/tui/MainWindow.java
+++ b/src/be/nikiroo/jvcard/tui/MainWindow.java
@@ -10,6 +10,9 @@ import be.nikiroo.jvcard.i18n.Trans;
 import be.nikiroo.jvcard.i18n.Trans.StringId;
 import be.nikiroo.jvcard.tui.KeyAction.Mode;
 import be.nikiroo.jvcard.tui.UiColors.Element;
+import be.nikiroo.jvcard.tui.panes.ContactDetails;
+import be.nikiroo.jvcard.tui.panes.ContactList;
+import be.nikiroo.jvcard.tui.panes.MainContent;
 
 import com.googlecode.lanterna.TerminalSize;
 import com.googlecode.lanterna.gui2.BasicWindow;
@@ -272,7 +275,7 @@ public class MainWindow extends BasicWindow {
                        messagePanel.addComponent(hpanel, LinearLayout
                                        .createLayoutData(LinearLayout.Alignment.Beginning));
 
-                       this.setFocusedInteractable(text);
+                       text.takeFocus();
                }
        }
 
@@ -296,7 +299,7 @@ public class MainWindow extends BasicWindow {
                                // focus = content.get(0).getDefaultFocusElement();
                                focus = content.get(0).nextFocus(null);
 
-                       this.setFocusedInteractable(focus);
+                       focus.takeFocus();
                }
 
                return answer;