Merge pull request #7 from Eric-Butcher/refactor_user_interface

Refactor user interface

Author: Eric-Butcher

.idea/workspace.xml

@@ -4,10 +4,9 @@
 
 public class Main {
 
-    public static void main(String[] args)
-    {
+    public static void main(String[] args) {
         View view = new View();
         Model model = new Model();
-        Controller controller = new Controller(model,view);
+        Controller controller = new Controller(model, view);
     }
 }

src/Main.java

@@ -8,8 +8,7 @@ public class Controller {
     private final Model model;
     private final View view;
 
-    public Controller(Model model, View view)
-    {
+    public Controller(Model model, View view) {
         this.model = model;
         this.view = view;
 
@@ -21,13 +20,6 @@ public Controller(Model model, View view)
 
         this.view.getMenuPanel().getFinishButton().addActionListener(new FinishAction(this.model, this.view));
         this.view.getMenuPanel().getStepButton().addActionListener(new StepAction(this.model, this.view));
-
-        this.view.getMenuPanel().getRegenerateButton().addActionListener(new RegenerateAction(this.model, this.view));
-        this.view.getMenuPanel().getClearButton().addActionListener(new ClearAction(this.model, this.view));
-
-
-
-
     }
 
 }

src/controller/ClearAction.java

@@ -11,15 +11,14 @@ public class FinishAction implements ActionListener {
     private final Model model;
     private final View view;
 
-    public FinishAction(Model model, View view){
+    public FinishAction(Model model, View view) {
         this.model = model;
         this.view = view;
     }
+
     @Override
     public void actionPerformed(ActionEvent e) {
-        System.out.println("Finish pressed.");
         this.model.finish();
-        // TODO
         this.view.updateView(this.model.updateView());
     }
 }

src/controller/Controller.java

@@ -11,10 +11,11 @@ public class GenerateAction implements ActionListener {
     private final Model model;
     private final View view;
 
-    public GenerateAction(Model model, View view){
+    public GenerateAction(Model model, View view) {
         this.model = model;
         this.view = view;
     }
+
     @Override
     public void actionPerformed(ActionEvent e) {
         this.model.generate();

src/controller/FinishAction.java

@@ -14,13 +14,14 @@ public class GenerateSelectAction implements ActionListener {
     private final Model model;
     private final View view;
 
-    public GenerateSelectAction(Model model, View view){
+    public GenerateSelectAction(Model model, View view) {
         this.model = model;
         this.view = view;
     }
+
     @Override
     public void actionPerformed(ActionEvent e) {
-        String algoString = ((JComboBox)e.getSource()).getSelectedItem().toString();
+        String algoString = ((JComboBox) e.getSource()).getSelectedItem().toString();
         GeneratorAlgorithms algoEnum = GeneratorAlgorithms.valueOf(algoString);
         Class<Generator> algoClass = (Class<Generator>) algoEnum.getClazz();
         this.model.changeSelectedGenerationAlgo(algoClass);

src/controller/GenerateAction.java

@@ -11,10 +11,11 @@ public class SolveAction implements ActionListener {
     private final Model model;
     private final View view;
 
-    public SolveAction(Model model, View view){
+    public SolveAction(Model model, View view) {
         this.model = model;
         this.view = view;
     }
+
     @Override
     public void actionPerformed(ActionEvent e) {
         this.model.solve();

src/controller/GenerateSelectAction.java

@@ -14,13 +14,14 @@ public class SolverSelectAction implements ActionListener {
     private final Model model;
     private final View view;
 
-    public SolverSelectAction(Model model, View view){
+    public SolverSelectAction(Model model, View view) {
         this.model = model;
         this.view = view;
     }
+
     @Override
     public void actionPerformed(ActionEvent e) {
-        String algoString = ((JComboBox)e.getSource()).getSelectedItem().toString();
+        String algoString = ((JComboBox) e.getSource()).getSelectedItem().toString();
         SolverAlgorithms algoEnum = SolverAlgorithms.valueOf(algoString);
         Class<Solver> algoClass = (Class<Solver>) algoEnum.getClazz();
         this.model.changeSelectedSolvingAlgo(algoClass);