diff --git a/app/src/main/java/xl/gui/XL.java b/app/src/main/java/xl/gui/XL.java index c2b232b..163ad20 100644 --- a/app/src/main/java/xl/gui/XL.java +++ b/app/src/main/java/xl/gui/XL.java @@ -9,7 +9,7 @@ import javax.swing.JPanel; import xl.controller.EditorController; import xl.controller.SlotLabelController; -import xl.gui.menu.XLMenuBar; +import xl.menu.XLMenuBar; import xl.model.XLModel; public class XL extends JFrame { diff --git a/app/src/main/java/xl/gui/menu/ClearAllMenuItem.java b/app/src/main/java/xl/menu/ClearAllMenuItem.java similarity index 95% rename from app/src/main/java/xl/gui/menu/ClearAllMenuItem.java rename to app/src/main/java/xl/menu/ClearAllMenuItem.java index 10d3738..7724184 100644 --- a/app/src/main/java/xl/gui/menu/ClearAllMenuItem.java +++ b/app/src/main/java/xl/menu/ClearAllMenuItem.java @@ -1,4 +1,4 @@ -package xl.gui.menu; +package xl.menu; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/app/src/main/java/xl/gui/menu/ClearMenuItem.java b/app/src/main/java/xl/menu/ClearMenuItem.java similarity index 96% rename from app/src/main/java/xl/gui/menu/ClearMenuItem.java rename to app/src/main/java/xl/menu/ClearMenuItem.java index 0351e09..9f3336c 100644 --- a/app/src/main/java/xl/gui/menu/ClearMenuItem.java +++ b/app/src/main/java/xl/menu/ClearMenuItem.java @@ -1,4 +1,4 @@ -package xl.gui.menu; +package xl.menu; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/app/src/main/java/xl/gui/menu/CloseMenuItem.java b/app/src/main/java/xl/menu/CloseMenuItem.java similarity index 96% rename from app/src/main/java/xl/gui/menu/CloseMenuItem.java rename to app/src/main/java/xl/menu/CloseMenuItem.java index 5126b0e..13c75a7 100644 --- a/app/src/main/java/xl/gui/menu/CloseMenuItem.java +++ b/app/src/main/java/xl/menu/CloseMenuItem.java @@ -1,4 +1,4 @@ -package xl.gui.menu; +package xl.menu; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/app/src/main/java/xl/gui/menu/LoadMenuItem.java b/app/src/main/java/xl/menu/LoadMenuItem.java similarity index 96% rename from app/src/main/java/xl/gui/menu/LoadMenuItem.java rename to app/src/main/java/xl/menu/LoadMenuItem.java index 453c52f..6eddb62 100644 --- a/app/src/main/java/xl/gui/menu/LoadMenuItem.java +++ b/app/src/main/java/xl/menu/LoadMenuItem.java @@ -1,4 +1,4 @@ -package xl.gui.menu; +package xl.menu; import java.io.FileNotFoundException; import javax.swing.JFileChooser; diff --git a/app/src/main/java/xl/gui/menu/NewMenuItem.java b/app/src/main/java/xl/menu/NewMenuItem.java similarity index 95% rename from app/src/main/java/xl/gui/menu/NewMenuItem.java rename to app/src/main/java/xl/menu/NewMenuItem.java index e808916..204712b 100644 --- a/app/src/main/java/xl/gui/menu/NewMenuItem.java +++ b/app/src/main/java/xl/menu/NewMenuItem.java @@ -1,4 +1,4 @@ -package xl.gui.menu; +package xl.menu; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/app/src/main/java/xl/gui/menu/OpenMenuItem.java b/app/src/main/java/xl/menu/OpenMenuItem.java similarity index 98% rename from app/src/main/java/xl/gui/menu/OpenMenuItem.java rename to app/src/main/java/xl/menu/OpenMenuItem.java index fca8951..0109a8b 100644 --- a/app/src/main/java/xl/gui/menu/OpenMenuItem.java +++ b/app/src/main/java/xl/menu/OpenMenuItem.java @@ -1,4 +1,4 @@ -package xl.gui.menu; +package xl.menu; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/app/src/main/java/xl/gui/menu/SaveMenuItem.java b/app/src/main/java/xl/menu/SaveMenuItem.java similarity index 96% rename from app/src/main/java/xl/gui/menu/SaveMenuItem.java rename to app/src/main/java/xl/menu/SaveMenuItem.java index ea10dd8..8cfb892 100644 --- a/app/src/main/java/xl/gui/menu/SaveMenuItem.java +++ b/app/src/main/java/xl/menu/SaveMenuItem.java @@ -1,4 +1,4 @@ -package xl.gui.menu; +package xl.menu; import java.io.FileNotFoundException; import javax.swing.JFileChooser; diff --git a/app/src/main/java/xl/gui/menu/WindowMenu.java b/app/src/main/java/xl/menu/WindowMenu.java similarity index 96% rename from app/src/main/java/xl/gui/menu/WindowMenu.java rename to app/src/main/java/xl/menu/WindowMenu.java index 8b5073f..95f1a2b 100644 --- a/app/src/main/java/xl/gui/menu/WindowMenu.java +++ b/app/src/main/java/xl/menu/WindowMenu.java @@ -1,4 +1,4 @@ -package xl.gui.menu; +package xl.menu; import java.util.Observable; import java.util.Observer; diff --git a/app/src/main/java/xl/gui/menu/WindowMenuItem.java b/app/src/main/java/xl/menu/WindowMenuItem.java similarity index 95% rename from app/src/main/java/xl/gui/menu/WindowMenuItem.java rename to app/src/main/java/xl/menu/WindowMenuItem.java index a560ac1..025a75b 100644 --- a/app/src/main/java/xl/gui/menu/WindowMenuItem.java +++ b/app/src/main/java/xl/menu/WindowMenuItem.java @@ -1,4 +1,4 @@ -package xl.gui.menu; +package xl.menu; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/app/src/main/java/xl/gui/menu/XLMenuBar.java b/app/src/main/java/xl/menu/XLMenuBar.java similarity index 97% rename from app/src/main/java/xl/gui/menu/XLMenuBar.java rename to app/src/main/java/xl/menu/XLMenuBar.java index 1191e19..d964b79 100644 --- a/app/src/main/java/xl/gui/menu/XLMenuBar.java +++ b/app/src/main/java/xl/menu/XLMenuBar.java @@ -1,4 +1,4 @@ -package xl.gui.menu; +package xl.menu; import javax.swing.JMenu; import javax.swing.JMenuBar;