Complete reset to original sources

app/build.gradle.kts

@@ -37,7 +37,7 @@ java {
 
 application {
     // Define the main class for the application.
-    mainClass.set("gui.XL")
+    mainClass.set("xl.gui.XL")
 }
 
 tasks.named<Test>("test") {

app/src/main/java/xl/expr/Add.java

@@ -1,4 +1,4 @@
-package expr;
+package xl.expr;
 
 class Add extends BinaryExpr {
 

app/src/main/java/xl/expr/BinaryExpr.java

@@ -1,4 +1,4 @@
-package expr;
+package xl.expr;
 
 abstract class BinaryExpr extends Expr {
 

app/src/main/java/xl/expr/Div.java

@@ -1,6 +1,6 @@
-package expr;
+package xl.expr;
 
-import util.XLException;
+import xl.util.XLException;
 
 class Div extends BinaryExpr {
 

app/src/main/java/xl/expr/Environment.java

@@ -1,4 +1,4 @@
-package expr;
+package xl.expr;
 
 public interface Environment {
 

app/src/main/java/xl/expr/Expr.java

@@ -1,4 +1,4 @@
-package expr;
+package xl.expr;
 
 /**
  * An <code>Expr</code> object represents a real valued expression that may contain variables. The

app/src/main/java/xl/expr/ExprParser.java

@@ -1,11 +1,11 @@
-package expr;
+package xl.expr;
 
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StreamTokenizer;
 import java.io.StringReader;
 import java.util.regex.Pattern;
-import util.XLException;
+import xl.util.XLException;
 
 /**
  * An <code>ExprParser</code> object is a parser provides a factory method for building <code>Expr

app/src/main/java/xl/expr/Mul.java

@@ -1,4 +1,4 @@
-package expr;
+package xl.expr;
 
 class Mul extends BinaryExpr {
 

app/src/main/java/xl/expr/Num.java

@@ -1,6 +1,6 @@
-package expr;
+package xl.expr;
 
-import util.NumberAdjustment;
+import xl.util.NumberAdjustment;
 
 class Num extends Expr {
 

app/src/main/java/xl/expr/Sub.java

@@ -1,4 +1,4 @@
-package expr;
+package xl.expr;
 
 class Sub extends BinaryExpr {
 

app/src/main/java/xl/expr/TestExpr.java

@@ -1,4 +1,4 @@
-package expr;
+package xl.expr;
 
 import java.io.IOException;
 

app/src/main/java/xl/expr/Variable.java

@@ -1,4 +1,4 @@
-package expr;
+package xl.expr;
 
 class Variable extends Expr {
 

app/src/main/java/xl/gui/BorderPanel.java

@@ -1,4 +1,4 @@
-package gui;
+package xl.gui;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

app/src/main/java/xl/gui/ColoredLabel.java

@@ -1,4 +1,4 @@
-package gui;
+package xl.gui;
 
 import java.awt.Color;
 import javax.swing.JLabel;

app/src/main/java/xl/gui/CurrentLabel.java

@@ -1,4 +1,4 @@
-package gui;
+package xl.gui;
 
 import java.awt.Color;
 

app/src/main/java/xl/gui/Editor.java

@@ -1,4 +1,4 @@
-package gui;
+package xl.gui;
 
 import java.awt.Color;
 import javax.swing.JTextField;

app/src/main/java/xl/gui/GridPanel.java

@@ -1,4 +1,4 @@
-package gui;
+package xl.gui;
 
 import java.awt.Color;
 import java.awt.GridLayout;

app/src/main/java/xl/gui/RowLabels.java

@@ -1,4 +1,4 @@
-package gui;
+package xl.gui;
 
 import static java.awt.Color.LIGHT_GRAY;
 import static javax.swing.SwingConstants.RIGHT;

app/src/main/java/xl/gui/SheetPanel.java

@@ -1,4 +1,4 @@
-package gui;
+package xl.gui;
 
 import static java.awt.BorderLayout.CENTER;
 import static java.awt.BorderLayout.WEST;

app/src/main/java/xl/gui/SlotLabel.java

@@ -1,4 +1,4 @@
-package gui;
+package xl.gui;
 
 import java.awt.Color;
 

app/src/main/java/xl/gui/SlotLabels.java

@@ -1,4 +1,4 @@
-package gui;
+package xl.gui;
 
 import java.awt.Color;
 import java.util.ArrayList;

app/src/main/java/xl/gui/StatusLabel.java

@@ -1,4 +1,4 @@
-package gui;
+package xl.gui;
 
 import java.awt.Color;
 import java.util.Observable;

app/src/main/java/xl/gui/StatusPanel.java

@@ -1,4 +1,4 @@
-package gui;
+package xl.gui;
 
 import static java.awt.BorderLayout.CENTER;
 import static java.awt.BorderLayout.WEST;

app/src/main/java/xl/gui/XL.java

@@ -1,4 +1,4 @@
-package gui;
+package xl.gui;
 
 import static java.awt.BorderLayout.CENTER;
 import static java.awt.BorderLayout.NORTH;
@@ -6,8 +6,7 @@ import static java.awt.BorderLayout.SOUTH;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
+import xl.gui.menu.XLMenuBar;
-import gui.menu.XLMenuBar;
 
 public class XL extends JFrame {
 
@@ -45,7 +44,6 @@ public class XL extends JFrame {
     }
 
     public static void main(String[] args) {
-        // Run on the Event Dispatch Thread
+        new XL(new XLList(), new XLCounter());
-        SwingUtilities.invokeLater(() -> new XL(new XLList(), new XLCounter()));
     }
 }

app/src/main/java/xl/gui/XLCounter.java

@@ -1,4 +1,4 @@
-package gui;
+package xl.gui;
 
 public class XLCounter {
 

app/src/main/java/xl/gui/XLList.java

@@ -1,4 +1,4 @@
-package gui;
+package xl.gui;
 
 import java.util.ArrayList;
 import java.util.Iterator;

app/src/main/java/xl/gui/menu/ClearAllMenuItem.java

@@ -1,4 +1,4 @@
-package gui.menu;
+package xl.gui.menu;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

app/src/main/java/xl/gui/menu/ClearMenuItem.java

@@ -1,4 +1,4 @@
-package gui.menu;
+package xl.gui.menu;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

app/src/main/java/xl/gui/menu/CloseMenuItem.java

@@ -1,10 +1,10 @@
-package gui.menu;
+package xl.gui.menu;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import javax.swing.JMenuItem;
-import gui.XL;
+import xl.gui.XL;
-import gui.XLList;
+import xl.gui.XLList;
 
 class CloseMenuItem extends JMenuItem implements ActionListener {
 

app/src/main/java/xl/gui/menu/LoadMenuItem.java

@@ -1,9 +1,9 @@
-package gui.menu;
+package xl.gui.menu;
 
 import java.io.FileNotFoundException;
 import javax.swing.JFileChooser;
-import gui.StatusLabel;
+import xl.gui.StatusLabel;
-import gui.XL;
+import xl.gui.XL;
 
 class LoadMenuItem extends OpenMenuItem {
 

app/src/main/java/xl/gui/menu/NewMenuItem.java

@@ -1,9 +1,9 @@
-package gui.menu;
+package xl.gui.menu;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import javax.swing.JMenuItem;
-import gui.XL;
+import xl.gui.XL;
 
 class NewMenuItem extends JMenuItem implements ActionListener {
 

app/src/main/java/xl/gui/menu/OpenMenuItem.java

@@ -1,4 +1,4 @@
-package gui.menu;
+package xl.gui.menu;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -8,8 +8,8 @@ import javax.swing.JFileChooser;
 import javax.swing.JMenuItem;
 import javax.swing.filechooser.FileFilter;
 import javax.swing.filechooser.FileNameExtensionFilter;
-import gui.StatusLabel;
+import xl.gui.StatusLabel;
-import gui.XL;
+import xl.gui.XL;
 
 public abstract class OpenMenuItem extends JMenuItem implements ActionListener {
 

app/src/main/java/xl/gui/menu/SaveMenuItem.java

@@ -1,9 +1,9 @@
-package gui.menu;
+package xl.gui.menu;
 
 import java.io.FileNotFoundException;
 import javax.swing.JFileChooser;
-import gui.StatusLabel;
+import xl.gui.StatusLabel;
-import gui.XL;
+import xl.gui.XL;
 
 class SaveMenuItem extends OpenMenuItem {
 

app/src/main/java/xl/gui/menu/WindowMenu.java

@@ -1,10 +1,10 @@
-package gui.menu;
+package xl.gui.menu;
 
 import java.util.Observable;
 import java.util.Observer;
 import javax.swing.JMenu;
-import gui.XL;
+import xl.gui.XL;
-import gui.XLList;
+import xl.gui.XLList;
 
 public class WindowMenu extends JMenu implements Observer {
 

app/src/main/java/xl/gui/menu/WindowMenuItem.java

@@ -1,9 +1,9 @@
-package gui.menu;
+package xl.gui.menu;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import javax.swing.JMenuItem;
-import gui.XL;
+import xl.gui.XL;
 
 class WindowMenuItem extends JMenuItem implements ActionListener {
 

app/src/main/java/xl/gui/menu/XLMenuBar.java

@@ -1,10 +1,10 @@
-package gui.menu;
+package xl.gui.menu;
 
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
-import gui.StatusLabel;
+import xl.gui.StatusLabel;
-import gui.XL;
+import xl.gui.XL;
-import gui.XLList;
+import xl.gui.XLList;
 
 public class XLMenuBar extends JMenuBar {
 

app/src/main/java/xl/util/Adjustment.java

@@ -1,4 +1,4 @@
-package util;
+package xl.util;
 
 /**
  * Adjustment.java Created: Tue Oct 24 2005

app/src/main/java/xl/util/NumberAdjustment.java

@@ -1,4 +1,4 @@
-package util;
+package xl.util;
 
 /**
  * NumberAdjustment.java Created: Mon OTue 24 2005

app/src/main/java/xl/util/XLBufferedReader.java

@@ -1,4 +1,4 @@
-package util;
+package xl.util;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;

app/src/main/java/xl/util/XLException.java

@@ -1,4 +1,4 @@
-package util;
+package xl.util;
 
 public class XLException extends RuntimeException {
 

app/src/main/java/xl/util/XLPrintStream.java

@@ -1,4 +1,4 @@
-package util;
+package xl.util;
 
 import java.io.FileNotFoundException;
 import java.io.PrintStream;