Skip to content
Snippets Groups Projects
Commit 3b4ba61f authored by Dallin Nickel (djn011)'s avatar Dallin Nickel (djn011)
Browse files

Reformat and Rename files,

Add controller package
parent c4bf0a3c
No related branches found
No related tags found
2 merge requests!45Prototype to Master for Milestone 5,!44Demo
package model;
package Controller;
import model.Hotkey;
public class Binding {
/**
......
package model;
package Controller;
import model.OSInterface;
import ui.MainScreen;
import java.util.ArrayList;
import java.util.List;
public class Demo implements Runnable {
int id;
public class RunHotkeys implements Runnable {
boolean stop = false;
ArrayList<Binding> list = MainScreen.list;
public Demo() {
public RunHotkeys() {
}
......
import javafx.application.Application;
import javafx.stage.Stage;
import model.Demo;
import Controller.RunHotkeys;
import model.OSInterface;
import ui.MainScreen;
......@@ -16,15 +16,15 @@ public class Main extends Application {
public static void main(String[] args) {
Demo demo = new Demo();
RunHotkeys runHotkeys = new RunHotkeys();
Thread thread = new Thread(OSInterface.getInstance());
Thread demoThread = new Thread(demo);
Thread demoThread = new Thread(runHotkeys);
thread.start();
demoThread.start();
launch(args);
OSInterface.getInstance().stop();
demo.stop();
runHotkeys.stop();
}
}
......@@ -5,13 +5,12 @@ import javafx.scene.control.Button;
import javafx.scene.control.ComboBox;
import javafx.scene.layout.Pane;
import javafx.stage.Stage;
import model.Binding;
import Controller.Binding;
import model.Hotkey;
import model.Modifier;
import model.OSInterface;
import java.util.ArrayList;
import java.util.List;
/**
* mainScreen is the main UI page for the program. All user functions start here.
......
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