Skip to content
Snippets Groups Projects
Commit b3a19d67 authored by Nico's avatar Nico
Browse files

Get Briar running

parent 08b3edeb
No related branches found
No related tags found
No related merge requests found
...@@ -53,7 +53,7 @@ public class MainUI extends JFrame implements EventListener { ...@@ -53,7 +53,7 @@ public class MainUI extends JFrame implements EventListener {
private final PrivateMessageFactory privateMessageFactory; private final PrivateMessageFactory privateMessageFactory;
private final EventBus eventBus; private final EventBus eventBus;
private final PasswordStrengthEstimator passwordStrengthEstimator; private final PasswordStrengthEstimator passwordStrengthEstimator;
private final Configuration configuration; // private final Configuration configuration;
private JPanel mainPanel; private JPanel mainPanel;
private JPanel contentPanel; private JPanel contentPanel;
...@@ -70,8 +70,8 @@ public class MainUI extends JFrame implements EventListener { ...@@ -70,8 +70,8 @@ public class MainUI extends JFrame implements EventListener {
IntroductionManager introductionManager, IntroductionManager introductionManager,
PrivateMessageFactory privateMessageFactory, PrivateMessageFactory privateMessageFactory,
EventBus eventBus, EventBus eventBus,
PasswordStrengthEstimator passwordStrengthEstimator, PasswordStrengthEstimator passwordStrengthEstimator
Configuration configuration) { /*Configuration configuration*/) {
this.briarService = briarService; this.briarService = briarService;
this.accountManager = accountManager; this.accountManager = accountManager;
this.contactManager = contactManager; this.contactManager = contactManager;
...@@ -81,16 +81,16 @@ public class MainUI extends JFrame implements EventListener { ...@@ -81,16 +81,16 @@ public class MainUI extends JFrame implements EventListener {
this.privateMessageFactory = privateMessageFactory; this.privateMessageFactory = privateMessageFactory;
this.eventBus = eventBus; this.eventBus = eventBus;
this.passwordStrengthEstimator = passwordStrengthEstimator; this.passwordStrengthEstimator = passwordStrengthEstimator;
this.configuration = configuration; // this.configuration = configuration;
String lookAndFeel = configuration.getLookAndFeel(); // String lookAndFeel = configuration.getLookAndFeel();
if (lookAndFeel != null) { // if (lookAndFeel != null) {
try { // try {
UIManager.setLookAndFeel(lookAndFeel); // UIManager.setLookAndFeel(lookAndFeel);
} catch (Exception e) { // } catch (Exception e) {
logger.error("error while setting look and feel", e); // logger.error("error while setting look and feel", e);
} // }
} // }
setTitle("Briar Swing"); setTitle("Briar Swing");
// setJMenuBar(new MainMenu(this)); // setJMenuBar(new MainMenu(this));
...@@ -119,9 +119,9 @@ public class MainUI extends JFrame implements EventListener { ...@@ -119,9 +119,9 @@ public class MainUI extends JFrame implements EventListener {
// eventBus.addListener(this); // eventBus.addListener(this);
} }
public Configuration getConfiguration() { // public Configuration getConfiguration() {
return configuration; // return configuration;
} // }
public AccountManager getAccountManager() { public AccountManager getAccountManager() {
return accountManager; return accountManager;
......
...@@ -35,7 +35,7 @@ constructor( ...@@ -35,7 +35,7 @@ constructor(
) { ) {
private val logger = getLogger(UI::javaClass.name) private val logger = getLogger(UI::javaClass.name)
private val configuration = Configuration() // private val configuration = Configuration()
internal fun startBriar() { internal fun startBriar() {
briarService.start(); briarService.start();
...@@ -52,7 +52,7 @@ constructor( ...@@ -52,7 +52,7 @@ constructor(
privateMessageFactory, privateMessageFactory,
eventBus, eventBus,
passwordStrengthEstimator, passwordStrengthEstimator,
configuration // configuration
); );
mainUI.defaultCloseOperation = JFrame.EXIT_ON_CLOSE; mainUI.defaultCloseOperation = JFrame.EXIT_ON_CLOSE;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment