src/fetch/commands/SpawnWidget.java

@@ -1,44 +0,0 @@
-package fetch.commands;
-
-import fetch.widgets.Widget;
-import javafx.scene.Node;
-
-public class SpawnWidget<T extends Node> extends Command {
-    private int x, y;
-    private Widget<T> widget;
-
-    public SpawnWidget(int x, int y, Widget<T> widget) {
-        setX(x);
-        setY(y);
-        setWidget(widget);
-    }
-
-    @Override
-    public void run() {
-
-    }
-
-    public int getX() {
-        return x;
-    }
-
-    public void setX(int x) {
-        this.x = x;
-    }
-
-    public int getY() {
-        return y;
-    }
-
-    public void setY(int y) {
-        this.y = y;
-    }
-
-    public Widget<T> getWidget() {
-        return widget;
-    }
-
-    public void setWidget(Widget<T> widget) {
-        this.widget = widget;
-    }
-}

src/fetch/controller/App.java

@@ -6,20 +6,20 @@ import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.HBox;
-import javafx.scene.paint.Color;
 import javafx.stage.Stage;
 
 public final class App extends Application {
     public static final HBox root = new HBox();
     public static final Scene scene = new Scene(root);
 
+
     @Override
     public void init() {
-        scene.setFill(Color.BLACK);
-//        scene.getStylesheets().add("");
+        // Put more init stuff here if need be.
         System.out.println("Initialization Completed");
     }
 
+
     @Override
     public void start(Stage stage) {
         // There's got to be a cleaner way..
@@ -30,4 +30,6 @@ public final class App extends Application {
         stage.show();
     }
 
-}
+
+
+}

src/fetch/events/WidgetAdd.java

@@ -1,16 +1,13 @@
 package fetch.events;
 
-import java.util.Random;
-
 import fetch.controller.App;
-import fetch.widgets.*;
-
 import javafx.event.EventHandler;
-import javafx.scene.control.TextArea;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.*;
 import javafx.scene.input.*;
 import javafx.scene.Node;
 
+import java.util.Random;
 
 /**
  *   UIOP to spawn widgets
@@ -22,35 +19,32 @@ import javafx.scene.Node;
 public class WidgetAdd implements EventHandler<KeyEvent> {
 
     // Find better way of doing this, maybe each widget has x,y associated with it?
-    private int yAmount = 0;
+    // private int yAmount = 0;
     private int xAmount = 0;
 
     @Override
     public void handle(KeyEvent keyEvent) {
-        // Debug Stuffs
-        debug();
-
         System.out.println(keyEvent.getCode().getName());
         if (keyEvent.getCode() == KeyCode.P) { // Spawn Widget Right
             xAmount++;
-            var terminalWidget = new TerminalWidget(xAmount,yAmount);
-            terminalWidget.setStyle(
+            StackPane sp = new StackPane();
+            sp.setStyle(
                     String.format("-fx-background-color: rgb(%02d, %02d, %02d);",
                             new Random().nextInt(256),
                             new Random().nextInt(256),
                             new Random().nextInt(256)));
-            App.root.getChildren().add(terminalWidget);
+            App.root.getChildren().add(sp);
             for(Node n : App.root.getChildren()){
-                if(n instanceof Widget){
-                    ((Widget)n).setMinSize(App.scene.getWidth() / xAmount, App.scene.getHeight());
+                if(n instanceof StackPane){
+                    ((StackPane)n).setMinSize(App.scene.getWidth() / xAmount, App.scene.getHeight());
                 }
             }
         } else if (keyEvent.getCode() == KeyCode.U) { // Delete Widget Left
             App.root.getChildren().remove(App.root.getChildren().size() - 1);
             xAmount--;
             for(Node n : App.root.getChildren()){
-                if(n instanceof Widget){
-                    ((Widget)n).setMinSize(App.scene.getWidth() /xAmount, App.scene.getHeight());
+                if(n instanceof StackPane){
+                    ((StackPane)n).setMinSize(App.scene.getWidth() /xAmount, App.scene.getHeight());
                 }
             }
         } else if (keyEvent.getCode() == KeyCode.I) { // Spawn Widget Down
@@ -58,34 +52,6 @@ public class WidgetAdd implements EventHandler<KeyEvent> {
         } else if (keyEvent.getCode() == KeyCode.O) { // Delete Widget Up
 
         }
-        else if(keyEvent.getCode() == KeyCode.E) {
-            for(Node n : App.root.getChildren()) {
-                if(n instanceof Widget) {
-                    Widget w = (Widget) n;
-                    if(w.getHost().isFocused()){
-                    ((TextArea) ((Widget)n).getHost()).setEditable(true);
-                    }
-                }
-            }
-        }
-        else if(keyEvent.getCode() == KeyCode.ESCAPE) {
-            for(Node n : App.root.getChildren()) {
-                if(n instanceof Widget) {
-                    var w = (Widget) n;
-                    if(w.getHost().isFocused()){
-                        ((TextArea) ((Widget)n).getHost()).setEditable(false);
-                    }
-                }
-            }
-        }
     }
 
-    private void debug(){
-        if(xAmount == 5){
-            for(Node n: App.root.getChildren()){
-                System.out.println(n);
-            }
-        }
-    }
-
-}
+}

src/fetch/widgets/EmptyWidget.java

@@ -1,17 +0,0 @@
-package fetch.widgets;
-
-import javafx.scene.layout.StackPane;
-
-public class EmptyWidget extends Widget<StackPane> {
-
-    public EmptyWidget(int x, int y) {
-        super(x, y, new StackPane());
-    }
-    @Override
-    public String toString() {
-        return "EmptyWidget{" +
-                "x=" + getX() +
-                ", y=" + getY() +
-                '}';
-    }
-}

src/fetch/widgets/TerminalWidget.java

@@ -1,20 +0,0 @@
-package fetch.widgets;
-
-
-import javafx.scene.control.TextArea;
-
-public class TerminalWidget extends Widget<TextArea> {
-
-    public TerminalWidget(int x,int y) {
-        super(x,y, new TextArea());
-        getHost().setEditable(false);
-    }
-
-    @Override
-    public String toString() {
-        return "TerminalWidget{" +
-                "x=" + getX() +
-                ", y=" + getY() +
-                '}';
-    }
-}

src/fetch/widgets/Widget.java

@@ -1,50 +0,0 @@
-package fetch.widgets;
-
-import javafx.scene.Node;
-import javafx.scene.layout.StackPane;
-
-
-public abstract class Widget<T extends Node> extends StackPane {
-    private int x, y;
-    private T host; // i wanted to use parent, but that's taken by the StackPane already
-
-    public Widget(int x,int y, T host) {
-        setX(x);
-        setY(y);
-        setHost(host);
-
-    }
-
-    protected void setX(int x) {
-        this.x = x;
-    }
-
-    protected void setY(int y) {
-        this.y = y;
-    }
-
-    public int getX() {
-        return x;
-    }
-
-    public int getY() {
-        return y;
-    }
-
-    public T getHost(){
-        return host;
-    }
-
-    protected void setHost(T host){
-        this.host = host;
-        this.getChildren().add(getHost());
-    }
-
-    @Override
-    public String toString() {
-        return "Widget{" +
-                "x=" + getX() +
-                ", y=" + getY() +
-                '}';
-    }
-}