From d3a382377768fdb1434d5baebf73c9413e61e46f Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Thu, 16 May 2019 10:47:03 +0200 Subject: [PATCH] Restructured packages --- .../gui => gui/components}/BasicGUIComponent.java | 2 +- .../gui => gui/components}/GUIAndGate.java | 2 +- .../gui => gui/components}/GUIManualSwitch.java | 2 +- .../gui => gui/components}/GUIMerger.java | 2 +- .../{components/gui => gui/components}/GUIMux.java | 2 +- .../gui => gui/components}/GUINotGate.java | 2 +- .../gui => gui/components}/GUIOrGate.java | 2 +- .../gui => gui/components}/GUISplitter.java | 2 +- .../mi/{examples/gui => gui/examples}/LogicUI.java | 14 +++++++------- .../era/mi/{wires/gui => gui/wires}/GUIWire.java | 4 ++-- .../gui => gui/wires}/WireConnectionPoint.java | 4 ++-- 11 files changed, 19 insertions(+), 19 deletions(-) rename LogicUI/src/era/mi/{components/gui => gui/components}/BasicGUIComponent.java (97%) rename LogicUI/src/era/mi/{components/gui => gui/components}/GUIAndGate.java (98%) rename LogicUI/src/era/mi/{components/gui => gui/components}/GUIManualSwitch.java (98%) rename LogicUI/src/era/mi/{components/gui => gui/components}/GUIMerger.java (98%) rename LogicUI/src/era/mi/{components/gui => gui/components}/GUIMux.java (98%) rename LogicUI/src/era/mi/{components/gui => gui/components}/GUINotGate.java (98%) rename LogicUI/src/era/mi/{components/gui => gui/components}/GUIOrGate.java (98%) rename LogicUI/src/era/mi/{components/gui => gui/components}/GUISplitter.java (98%) rename LogicUI/src/era/mi/{examples/gui => gui/examples}/LogicUI.java (95%) rename LogicUI/src/era/mi/{wires/gui => gui/wires}/GUIWire.java (96%) rename LogicUI/src/era/mi/{wires/gui => gui/wires}/WireConnectionPoint.java (93%) diff --git a/LogicUI/src/era/mi/components/gui/BasicGUIComponent.java b/LogicUI/src/era/mi/gui/components/BasicGUIComponent.java similarity index 97% rename from LogicUI/src/era/mi/components/gui/BasicGUIComponent.java rename to LogicUI/src/era/mi/gui/components/BasicGUIComponent.java index a7212f98..29696e13 100644 --- a/LogicUI/src/era/mi/components/gui/BasicGUIComponent.java +++ b/LogicUI/src/era/mi/gui/components/BasicGUIComponent.java @@ -1,4 +1,4 @@ -package era.mi.components.gui; +package era.mi.gui.components; import era.mi.logic.wires.WireArray; import net.haspamelodica.swt.helper.gcs.GeneralGC; diff --git a/LogicUI/src/era/mi/components/gui/GUIAndGate.java b/LogicUI/src/era/mi/gui/components/GUIAndGate.java similarity index 98% rename from LogicUI/src/era/mi/components/gui/GUIAndGate.java rename to LogicUI/src/era/mi/gui/components/GUIAndGate.java index 93429e84..8ff6068c 100644 --- a/LogicUI/src/era/mi/components/gui/GUIAndGate.java +++ b/LogicUI/src/era/mi/gui/components/GUIAndGate.java @@ -1,4 +1,4 @@ -package era.mi.components.gui; +package era.mi.gui.components; import java.util.ArrayList; import java.util.Arrays; diff --git a/LogicUI/src/era/mi/components/gui/GUIManualSwitch.java b/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java similarity index 98% rename from LogicUI/src/era/mi/components/gui/GUIManualSwitch.java rename to LogicUI/src/era/mi/gui/components/GUIManualSwitch.java index b12177f7..9d58cac9 100644 --- a/LogicUI/src/era/mi/components/gui/GUIManualSwitch.java +++ b/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java @@ -1,4 +1,4 @@ -package era.mi.components.gui; +package era.mi.gui.components; import java.util.ArrayList; import java.util.Collections; diff --git a/LogicUI/src/era/mi/components/gui/GUIMerger.java b/LogicUI/src/era/mi/gui/components/GUIMerger.java similarity index 98% rename from LogicUI/src/era/mi/components/gui/GUIMerger.java rename to LogicUI/src/era/mi/gui/components/GUIMerger.java index 69a47a22..601b434d 100644 --- a/LogicUI/src/era/mi/components/gui/GUIMerger.java +++ b/LogicUI/src/era/mi/gui/components/GUIMerger.java @@ -1,4 +1,4 @@ -package era.mi.components.gui; +package era.mi.gui.components; import java.util.ArrayList; import java.util.Arrays; diff --git a/LogicUI/src/era/mi/components/gui/GUIMux.java b/LogicUI/src/era/mi/gui/components/GUIMux.java similarity index 98% rename from LogicUI/src/era/mi/components/gui/GUIMux.java rename to LogicUI/src/era/mi/gui/components/GUIMux.java index df61ca77..0082a768 100644 --- a/LogicUI/src/era/mi/components/gui/GUIMux.java +++ b/LogicUI/src/era/mi/gui/components/GUIMux.java @@ -1,4 +1,4 @@ -package era.mi.components.gui; +package era.mi.gui.components; import java.util.ArrayList; import java.util.Arrays; diff --git a/LogicUI/src/era/mi/components/gui/GUINotGate.java b/LogicUI/src/era/mi/gui/components/GUINotGate.java similarity index 98% rename from LogicUI/src/era/mi/components/gui/GUINotGate.java rename to LogicUI/src/era/mi/gui/components/GUINotGate.java index b428888a..78bed33f 100644 --- a/LogicUI/src/era/mi/components/gui/GUINotGate.java +++ b/LogicUI/src/era/mi/gui/components/GUINotGate.java @@ -1,4 +1,4 @@ -package era.mi.components.gui; +package era.mi.gui.components; import java.util.ArrayList; import java.util.Collections; diff --git a/LogicUI/src/era/mi/components/gui/GUIOrGate.java b/LogicUI/src/era/mi/gui/components/GUIOrGate.java similarity index 98% rename from LogicUI/src/era/mi/components/gui/GUIOrGate.java rename to LogicUI/src/era/mi/gui/components/GUIOrGate.java index 3b497f28..4ca09f58 100644 --- a/LogicUI/src/era/mi/components/gui/GUIOrGate.java +++ b/LogicUI/src/era/mi/gui/components/GUIOrGate.java @@ -1,4 +1,4 @@ -package era.mi.components.gui; +package era.mi.gui.components; import java.util.ArrayList; import java.util.Arrays; diff --git a/LogicUI/src/era/mi/components/gui/GUISplitter.java b/LogicUI/src/era/mi/gui/components/GUISplitter.java similarity index 98% rename from LogicUI/src/era/mi/components/gui/GUISplitter.java rename to LogicUI/src/era/mi/gui/components/GUISplitter.java index aab18cf4..8d09cc70 100644 --- a/LogicUI/src/era/mi/components/gui/GUISplitter.java +++ b/LogicUI/src/era/mi/gui/components/GUISplitter.java @@ -1,4 +1,4 @@ -package era.mi.components.gui; +package era.mi.gui.components; import java.util.ArrayList; import java.util.Arrays; diff --git a/LogicUI/src/era/mi/examples/gui/LogicUI.java b/LogicUI/src/era/mi/gui/examples/LogicUI.java similarity index 95% rename from LogicUI/src/era/mi/examples/gui/LogicUI.java rename to LogicUI/src/era/mi/gui/examples/LogicUI.java index a0ef151d..1c39c7c8 100644 --- a/LogicUI/src/era/mi/examples/gui/LogicUI.java +++ b/LogicUI/src/era/mi/gui/examples/LogicUI.java @@ -1,4 +1,4 @@ -package era.mi.examples.gui; +package era.mi.gui.examples; import java.util.HashMap; import java.util.HashSet; @@ -12,14 +12,14 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Shell; -import era.mi.components.gui.BasicGUIComponent; -import era.mi.components.gui.GUIManualSwitch; -import era.mi.components.gui.GUINotGate; -import era.mi.components.gui.GUIOrGate; +import era.mi.gui.components.BasicGUIComponent; +import era.mi.gui.components.GUIManualSwitch; +import era.mi.gui.components.GUINotGate; +import era.mi.gui.components.GUIOrGate; +import era.mi.gui.wires.GUIWire; +import era.mi.gui.wires.WireConnectionPoint; import era.mi.logic.Simulation; import era.mi.logic.wires.WireArray; -import era.mi.wires.gui.GUIWire; -import era.mi.wires.gui.WireConnectionPoint; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.gcs.TranslatedGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; diff --git a/LogicUI/src/era/mi/wires/gui/GUIWire.java b/LogicUI/src/era/mi/gui/wires/GUIWire.java similarity index 96% rename from LogicUI/src/era/mi/wires/gui/GUIWire.java rename to LogicUI/src/era/mi/gui/wires/GUIWire.java index 65f82c7e..3b04fae8 100644 --- a/LogicUI/src/era/mi/wires/gui/GUIWire.java +++ b/LogicUI/src/era/mi/gui/wires/GUIWire.java @@ -1,11 +1,11 @@ -package era.mi.wires.gui; +package era.mi.gui.wires; import java.util.Objects; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; -import era.mi.components.gui.BasicGUIComponent; +import era.mi.gui.components.BasicGUIComponent; import era.mi.logic.wires.WireArray; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; diff --git a/LogicUI/src/era/mi/wires/gui/WireConnectionPoint.java b/LogicUI/src/era/mi/gui/wires/WireConnectionPoint.java similarity index 93% rename from LogicUI/src/era/mi/wires/gui/WireConnectionPoint.java rename to LogicUI/src/era/mi/gui/wires/WireConnectionPoint.java index 753d61e9..9c1aae14 100644 --- a/LogicUI/src/era/mi/wires/gui/WireConnectionPoint.java +++ b/LogicUI/src/era/mi/gui/wires/WireConnectionPoint.java @@ -1,8 +1,8 @@ -package era.mi.wires.gui; +package era.mi.gui.wires; import org.eclipse.swt.graphics.Color; -import era.mi.components.gui.BasicGUIComponent; +import era.mi.gui.components.BasicGUIComponent; import era.mi.logic.wires.WireArray; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -- 2.17.1