import java.util.List;
import be.nikiroo.jvcard.launcher.Main;
-import be.nikiroo.jvcard.resources.StringUtils;
-import be.nikiroo.jvcard.resources.enums.ColorOption;
-import be.nikiroo.jvcard.resources.enums.StringId;
+import be.nikiroo.jvcard.resources.ColorOption;
+import be.nikiroo.jvcard.resources.StringId;
import be.nikiroo.jvcard.tui.KeyAction.Mode;
import be.nikiroo.jvcard.tui.panes.ContactDetails;
import be.nikiroo.jvcard.tui.panes.ContactDetailsRaw;
import be.nikiroo.jvcard.tui.panes.ContactList;
import be.nikiroo.jvcard.tui.panes.MainContent;
+import be.nikiroo.utils.StringUtils;
+import be.nikiroo.utils.Version;
import com.googlecode.lanterna.TerminalSize;
import com.googlecode.lanterna.gui2.BasicWindow;
* Information about a question to ask the user and its answer.
*
* @author niki
- *
+ *
*/
private class UserQuestion {
private boolean oneKeyAnswer;
*/
private void setTitle() {
String prefix = " " + Main.APPLICATION_TITLE + " (version "
- + Main.APPLICATION_VERSION + ")";
+ + Version.getCurrentVersion() + ")";
String title = null;
int count = -1;
UiColors.themeLabel(ColorOption.TITLE_VARIABLE, lblTitle);
}
- Label lblCount = null;
- if (countStr != null) {
- lblCount = new Label(countStr);
- UiColors.themeLabel(ColorOption.TITLE_COUNT, lblCount);
- }
+ Label lblCount = new Label(countStr);
+ UiColors.themeLabel(ColorOption.TITLE_COUNT, lblCount);
titlePanel.removeAllComponents();
titlePanel.addComponent(lblPrefix, BorderLayout.Location.LEFT);
- if (lblTitle != null)
+ if (lblTitle != null) {
titlePanel.addComponent(lblTitle, BorderLayout.Location.CENTER);
- if (lblCount != null)
- titlePanel.addComponent(lblCount, BorderLayout.Location.RIGHT);
+ }
+ titlePanel.addComponent(lblCount, BorderLayout.Location.RIGHT);
}
}
*
* @param key
* the key that was pressed
- * @param answer
- * the answer given for this key
*
* @return if the window handled the input
*/
/**
* Handle the input in case of "normal" (not "ask for answer") mode.
*
- * @param key
- * the key that was pressed
+ * @param action
+ * the key that was pressed and the action to take
* @param answer
* the answer given for this key
*
- * @return if the window handled the input
*/
private void handleAction(KeyAction action, String answer) {
MainContent content = getContent();