From a28f7aa0dab4248e99159c5a647676170cb17a4e Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Wed, 29 May 2019 22:59:35 +0200 Subject: [PATCH] Renamed project to MoGraSim --- LogicUI/.project | 4 +- LogicUI/.settings/org.eclipse.jdt.ui.prefs | 2 +- LogicUI/META-INF/MANIFEST.MF | 22 ++++----- .../componentadapters/ComponentAdapter.java | 18 ------- .../logic/ui}/ColorHelper.java | 6 +-- .../logic/ui}/LogicExecuter.java | 4 +- .../logic/ui}/LogicUICanvas.java | 10 ++-- .../logic/ui}/LogicUIStandaloneGUI.java | 6 +-- .../logic/ui}/SimpleLogicUIStandalone.java | 10 ++-- .../logic/ui}/examples/RSLatchExample.java | 18 +++---- .../logic/ui}/model/ViewModel.java | 6 +-- .../ui}/model/components/GUIAndGate.java | 4 +- .../ui}/model/components/GUIComponent.java | 6 +-- .../ui}/model/components/GUIManualSwitch.java | 12 ++--- .../ui}/model/components/GUINotGate.java | 4 +- .../logic/ui}/model/components/GUIOrGate.java | 4 +- .../components/SimpleRectangularGUIGate.java | 8 +-- .../logic/ui}/model/wires/GUIWire.java | 10 ++-- .../logic/ui}/model/wires/MovablePin.java | 4 +- .../logic/ui}/model/wires/Pin.java | 4 +- .../logic/ui}/model/wires/WireCrossPoint.java | 12 ++--- .../modeladapter/LogicModelParameters.java | 2 +- .../modeladapter/ViewLogicModelAdapter.java | 38 +++++++------- .../componentadapters/ComponentAdapter.java | 18 +++++++ .../ManualSwitchAdapter.java | 18 +++---- .../componentadapters/SimpleGateAdapter.java | 18 +++---- SampleERCP/.project | 4 +- SampleERCP/.settings/org.eclipse.jdt.ui.prefs | 2 +- SampleERCP/Application.e4xmi | 22 ++++----- SampleERCP/META-INF/MANIFEST.MF | 11 ++--- ...ampleERCP.product => mograsim.rcp.product} | 49 ++++--------------- SampleERCP/plugin.xml | 20 +++----- .../rcp}/handlers/AboutHandler.java | 2 +- .../rcp}/handlers/OpenHandler.java | 2 +- .../rcp}/handlers/QuitHandler.java | 2 +- .../rcp}/handlers/SaveHandler.java | 2 +- .../rcp}/parts/LogicUIPart.java | 16 +++--- .../rcp}/parts/SamplePart.java | 2 +- .../ExtensibleSplashHandler.java | 2 +- era.mi/.project | 2 +- era.mi/.settings/org.eclipse.jdt.core.prefs | 1 + era.mi/.settings/org.eclipse.jdt.ui.prefs | 2 +- era.mi/META-INF/MANIFEST.MF | 20 ++++---- .../mi/logic/components/gates/AndGate.java | 14 ------ .../era/mi/logic/components/gates/OrGate.java | 14 ------ .../src/era/mi/logic/wires/WireObserver.java | 9 ---- .../logic => mograsim/logic/core}/Util.java | 4 +- .../core}/components/BasicComponent.java | 10 ++-- .../logic/core}/components/BitDisplay.java | 12 ++--- .../logic/core}/components/Clock.java | 16 +++--- .../logic/core}/components/Component.java | 8 +-- .../logic/core}/components/Connector.java | 12 ++--- .../logic/core}/components/Demux.java | 10 ++-- .../logic/core}/components/ManualSwitch.java | 10 ++-- .../logic/core}/components/Merger.java | 14 +++--- .../logic/core}/components/Mux.java | 10 ++-- .../logic/core}/components/Splitter.java | 12 ++--- .../core}/components/TriStateBuffer.java | 10 ++-- .../logic/core/components/gates/AndGate.java | 14 ++++++ .../components/gates/MultiInputGate.java | 14 +++--- .../logic/core}/components/gates/NotGate.java | 10 ++-- .../logic/core/components/gates/OrGate.java | 14 ++++++ .../logic/core}/components/gates/XorGate.java | 10 ++-- .../logic/core}/tests/ComponentTest.java | 34 ++++++------- .../logic/core}/tests/GUITest.java | 14 +++--- .../logic/core}/tests/TestBitDisplay.java | 10 ++-- .../logic/core}/timeline/Timeline.java | 2 +- .../logic/core}/timeline/TimelineEvent.java | 2 +- .../core}/timeline/TimelineEventHandler.java | 2 +- .../logic/core}/types/Bit.java | 2 +- .../logic/core}/types/BitVector.java | 2 +- .../logic/core}/types/BitVectorFormatter.java | 6 +-- .../logic/core}/types/ColorDefinition.java | 2 +- .../logic/core}/types/LogicType.java | 2 +- .../logic/core}/types/MutationOperation.java | 4 +- .../logic/core}/types/StrictLogicType.java | 2 +- .../logic/core}/wires/Wire.java | 14 +++--- .../logic/core/wires/WireObserver.java | 9 ++++ 78 files changed, 363 insertions(+), 400 deletions(-) delete mode 100644 LogicUI/src/era/mi/gui/modeladapter/componentadapters/ComponentAdapter.java rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/ColorHelper.java (94%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/LogicExecuter.java (97%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/LogicUICanvas.java (93%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/LogicUIStandaloneGUI.java (91%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/SimpleLogicUIStandalone.java (77%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/examples/RSLatchExample.java (82%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/model/ViewModel.java (97%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/model/components/GUIAndGate.java (69%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/model/components/GUIComponent.java (96%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/model/components/GUIManualSwitch.java (85%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/model/components/GUINotGate.java (67%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/model/components/GUIOrGate.java (68%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/model/components/SimpleRectangularGUIGate.java (93%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/model/wires/GUIWire.java (91%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/model/wires/MovablePin.java (73%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/model/wires/Pin.java (93%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/model/wires/WireCrossPoint.java (76%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/modeladapter/LogicModelParameters.java (69%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/modeladapter/ViewLogicModelAdapter.java (83%) create mode 100644 LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/ComponentAdapter.java rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/modeladapter/componentadapters/ManualSwitchAdapter.java (57%) rename LogicUI/src/{era/mi/gui => mograsim/logic/ui}/modeladapter/componentadapters/SimpleGateAdapter.java (71%) rename SampleERCP/{SampleERCP.product => mograsim.rcp.product} (68%) rename SampleERCP/src/{sampleercp => mograsim/rcp}/handlers/AboutHandler.java (90%) rename SampleERCP/src/{sampleercp => mograsim/rcp}/handlers/OpenHandler.java (89%) rename SampleERCP/src/{sampleercp => mograsim/rcp}/handlers/QuitHandler.java (92%) rename SampleERCP/src/{sampleercp => mograsim/rcp}/handlers/SaveHandler.java (93%) rename SampleERCP/src/{sampleercp => mograsim/rcp}/parts/LogicUIPart.java (77%) rename SampleERCP/src/{sampleercp => mograsim/rcp}/parts/SamplePart.java (98%) rename SampleERCP/src/{sampleercp => mograsim/rcp}/splashhandlers/ExtensibleSplashHandler.java (99%) delete mode 100644 era.mi/src/era/mi/logic/components/gates/AndGate.java delete mode 100644 era.mi/src/era/mi/logic/components/gates/OrGate.java delete mode 100644 era.mi/src/era/mi/logic/wires/WireObserver.java rename era.mi/src/{era/mi/logic => mograsim/logic/core}/Util.java (97%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/components/BasicComponent.java (76%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/components/BitDisplay.java (71%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/components/Clock.java (70%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/components/Component.java (74%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/components/Connector.java (82%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/components/Demux.java (90%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/components/ManualSwitch.java (82%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/components/Merger.java (83%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/components/Mux.java (90%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/components/Splitter.java (80%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/components/TriStateBuffer.java (82%) create mode 100644 era.mi/src/mograsim/logic/core/components/gates/AndGate.java rename era.mi/src/{era/mi/logic => mograsim/logic/core}/components/gates/MultiInputGate.java (75%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/components/gates/NotGate.java (72%) create mode 100644 era.mi/src/mograsim/logic/core/components/gates/OrGate.java rename era.mi/src/{era/mi/logic => mograsim/logic/core}/components/gates/XorGate.java (53%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/tests/ComponentTest.java (94%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/tests/GUITest.java (95%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/tests/TestBitDisplay.java (79%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/timeline/Timeline.java (99%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/timeline/TimelineEvent.java (91%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/timeline/TimelineEventHandler.java (71%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/types/Bit.java (98%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/types/BitVector.java (99%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/types/BitVectorFormatter.java (89%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/types/ColorDefinition.java (97%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/types/LogicType.java (98%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/types/MutationOperation.java (70%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/types/StrictLogicType.java (91%) rename era.mi/src/{era/mi/logic => mograsim/logic/core}/wires/Wire.java (97%) create mode 100644 era.mi/src/mograsim/logic/core/wires/WireObserver.java diff --git a/LogicUI/.project b/LogicUI/.project index cc7eae3e..9ba08bbd 100644 --- a/LogicUI/.project +++ b/LogicUI/.project @@ -1,9 +1,9 @@ - LogicUI + mograsim.logic.ui - era.mi + mograsim.logic.core SWTZoomableCanvas diff --git a/LogicUI/.settings/org.eclipse.jdt.ui.prefs b/LogicUI/.settings/org.eclipse.jdt.ui.prefs index 715c6cc2..8f2c0a47 100644 --- a/LogicUI/.settings/org.eclipse.jdt.ui.prefs +++ b/LogicUI/.settings/org.eclipse.jdt.ui.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_ERA-MI +formatter_profile=_MoGraSim formatter_settings_version=16 sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false diff --git a/LogicUI/META-INF/MANIFEST.MF b/LogicUI/META-INF/MANIFEST.MF index 9f8199a3..c1dcd55a 100644 --- a/LogicUI/META-INF/MANIFEST.MF +++ b/LogicUI/META-INF/MANIFEST.MF @@ -1,17 +1,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: LogicUI -Bundle-SymbolicName: LogicUI;singleton:=true +Bundle-Name: mograsim.logic.ui +Bundle-SymbolicName: mograsim.logic.ui;singleton:=true Bundle-Version: 1.0.0 -Export-Package: era.mi.gui, - era.mi.gui.examples, - era.mi.gui.model, - era.mi.gui.model.components, - era.mi.gui.model.wires, - era.mi.gui.modeladapter, - era.mi.gui.modeladapter.componentadapters +Export-Package: mograsim.logic.ui, + mograsim.logic.ui.examples, + mograsim.logic.ui.model, + mograsim.logic.ui.model.components, + mograsim.logic.ui.model.wires, + mograsim.logic.ui.modeladapter, + mograsim.logic.ui.modeladapter.componentadapters Bundle-RequiredExecutionEnvironment: JavaSE-10 Require-Bundle: org.eclipse.swt;bundle-version="3.110.0", SWTZoomableCanvas;bundle-version="1.0.0";visibility:=reexport, - era.mi;bundle-version="1.0.0";visibility:=reexport -Automatic-Module-Name: LogicUI + mograsim.logic.core;bundle-version="1.0.0";visibility:=reexport +Automatic-Module-Name: mograsim.logic.ui diff --git a/LogicUI/src/era/mi/gui/modeladapter/componentadapters/ComponentAdapter.java b/LogicUI/src/era/mi/gui/modeladapter/componentadapters/ComponentAdapter.java deleted file mode 100644 index c109d732..00000000 --- a/LogicUI/src/era/mi/gui/modeladapter/componentadapters/ComponentAdapter.java +++ /dev/null @@ -1,18 +0,0 @@ -package era.mi.gui.modeladapter.componentadapters; - -import java.util.Map; - -import era.mi.gui.model.components.GUIComponent; -import era.mi.gui.model.wires.Pin; -import era.mi.gui.modeladapter.LogicModelParameters; -import era.mi.logic.components.Component; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.wires.Wire; - -public interface ComponentAdapter -{ - public Class getSupportedClass(); - - public Component createAndLinkComponent(Timeline timeline, LogicModelParameters params, G guiComponent, - Map logicWiresPerPin); -} \ No newline at end of file diff --git a/LogicUI/src/era/mi/gui/ColorHelper.java b/LogicUI/src/mograsim/logic/ui/ColorHelper.java similarity index 94% rename from LogicUI/src/era/mi/gui/ColorHelper.java rename to LogicUI/src/mograsim/logic/ui/ColorHelper.java index ff6a4950..886c6f76 100644 --- a/LogicUI/src/era/mi/gui/ColorHelper.java +++ b/LogicUI/src/mograsim/logic/ui/ColorHelper.java @@ -1,4 +1,4 @@ -package era.mi.gui; +package mograsim.logic.ui; import java.util.function.Consumer; import java.util.function.Supplier; @@ -7,8 +7,8 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Device; -import era.mi.logic.types.ColorDefinition; -import era.mi.logic.types.ColorDefinition.BuiltInColor; +import mograsim.logic.core.types.ColorDefinition; +import mograsim.logic.core.types.ColorDefinition.BuiltInColor; import net.haspamelodica.swt.helper.gcs.GeneralGC; //TODO replace with a proper ColorManager diff --git a/LogicUI/src/era/mi/gui/LogicExecuter.java b/LogicUI/src/mograsim/logic/ui/LogicExecuter.java similarity index 97% rename from LogicUI/src/era/mi/gui/LogicExecuter.java rename to LogicUI/src/mograsim/logic/ui/LogicExecuter.java index 65abd4c9..dec5c53a 100644 --- a/LogicUI/src/era/mi/gui/LogicExecuter.java +++ b/LogicUI/src/mograsim/logic/ui/LogicExecuter.java @@ -1,9 +1,9 @@ -package era.mi.gui; +package mograsim.logic.ui; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import era.mi.logic.timeline.Timeline; +import mograsim.logic.core.timeline.Timeline; //TODO maybe move to logic core? public class LogicExecuter diff --git a/LogicUI/src/era/mi/gui/LogicUICanvas.java b/LogicUI/src/mograsim/logic/ui/LogicUICanvas.java similarity index 93% rename from LogicUI/src/era/mi/gui/LogicUICanvas.java rename to LogicUI/src/mograsim/logic/ui/LogicUICanvas.java index 63550443..4761839b 100644 --- a/LogicUI/src/era/mi/gui/LogicUICanvas.java +++ b/LogicUI/src/mograsim/logic/ui/LogicUICanvas.java @@ -1,4 +1,4 @@ -package era.mi.gui; +package mograsim.logic.ui; import java.util.function.Consumer; @@ -6,10 +6,10 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; -import era.mi.gui.model.ViewModel; -import era.mi.gui.model.components.GUIComponent; -import era.mi.gui.model.wires.GUIWire; -import era.mi.gui.model.wires.Pin; +import mograsim.logic.ui.model.ViewModel; +import mograsim.logic.ui.model.components.GUIComponent; +import mograsim.logic.ui.model.wires.GUIWire; +import mograsim.logic.ui.model.wires.Pin; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; diff --git a/LogicUI/src/era/mi/gui/LogicUIStandaloneGUI.java b/LogicUI/src/mograsim/logic/ui/LogicUIStandaloneGUI.java similarity index 91% rename from LogicUI/src/era/mi/gui/LogicUIStandaloneGUI.java rename to LogicUI/src/mograsim/logic/ui/LogicUIStandaloneGUI.java index 55931cfb..f39727c8 100644 --- a/LogicUI/src/era/mi/gui/LogicUIStandaloneGUI.java +++ b/LogicUI/src/mograsim/logic/ui/LogicUIStandaloneGUI.java @@ -1,12 +1,12 @@ -package era.mi.gui; +package mograsim.logic.ui; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import era.mi.gui.model.ViewModel; -import era.mi.gui.modeladapter.LogicModelParameters; +import mograsim.logic.ui.model.ViewModel; +import mograsim.logic.ui.modeladapter.LogicModelParameters; import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasOverlay; import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInput; diff --git a/LogicUI/src/era/mi/gui/SimpleLogicUIStandalone.java b/LogicUI/src/mograsim/logic/ui/SimpleLogicUIStandalone.java similarity index 77% rename from LogicUI/src/era/mi/gui/SimpleLogicUIStandalone.java rename to LogicUI/src/mograsim/logic/ui/SimpleLogicUIStandalone.java index 0573aa90..ef0beb32 100644 --- a/LogicUI/src/era/mi/gui/SimpleLogicUIStandalone.java +++ b/LogicUI/src/mograsim/logic/ui/SimpleLogicUIStandalone.java @@ -1,11 +1,11 @@ -package era.mi.gui; +package mograsim.logic.ui; import java.util.function.Consumer; -import era.mi.gui.model.ViewModel; -import era.mi.gui.modeladapter.LogicModelParameters; -import era.mi.gui.modeladapter.ViewLogicModelAdapter; -import era.mi.logic.timeline.Timeline; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.ui.model.ViewModel; +import mograsim.logic.ui.modeladapter.LogicModelParameters; +import mograsim.logic.ui.modeladapter.ViewLogicModelAdapter; public class SimpleLogicUIStandalone { diff --git a/LogicUI/src/era/mi/gui/examples/RSLatchExample.java b/LogicUI/src/mograsim/logic/ui/examples/RSLatchExample.java similarity index 82% rename from LogicUI/src/era/mi/gui/examples/RSLatchExample.java rename to LogicUI/src/mograsim/logic/ui/examples/RSLatchExample.java index 08c42c5d..f787c815 100644 --- a/LogicUI/src/era/mi/gui/examples/RSLatchExample.java +++ b/LogicUI/src/mograsim/logic/ui/examples/RSLatchExample.java @@ -1,12 +1,12 @@ -package era.mi.gui.examples; - -import era.mi.gui.SimpleLogicUIStandalone; -import era.mi.gui.model.ViewModel; -import era.mi.gui.model.components.GUIManualSwitch; -import era.mi.gui.model.components.GUINotGate; -import era.mi.gui.model.components.GUIOrGate; -import era.mi.gui.model.wires.GUIWire; -import era.mi.gui.model.wires.WireCrossPoint; +package mograsim.logic.ui.examples; + +import mograsim.logic.ui.SimpleLogicUIStandalone; +import mograsim.logic.ui.model.ViewModel; +import mograsim.logic.ui.model.components.GUIManualSwitch; +import mograsim.logic.ui.model.components.GUINotGate; +import mograsim.logic.ui.model.components.GUIOrGate; +import mograsim.logic.ui.model.wires.GUIWire; +import mograsim.logic.ui.model.wires.WireCrossPoint; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; public class RSLatchExample diff --git a/LogicUI/src/era/mi/gui/model/ViewModel.java b/LogicUI/src/mograsim/logic/ui/model/ViewModel.java similarity index 97% rename from LogicUI/src/era/mi/gui/model/ViewModel.java rename to LogicUI/src/mograsim/logic/ui/model/ViewModel.java index 7eb55c18..31cd1a8e 100644 --- a/LogicUI/src/era/mi/gui/model/ViewModel.java +++ b/LogicUI/src/mograsim/logic/ui/model/ViewModel.java @@ -1,12 +1,12 @@ -package era.mi.gui.model; +package mograsim.logic.ui.model; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.function.Consumer; -import era.mi.gui.model.components.GUIComponent; -import era.mi.gui.model.wires.GUIWire; +import mograsim.logic.ui.model.components.GUIComponent; +import mograsim.logic.ui.model.wires.GUIWire; public class ViewModel { diff --git a/LogicUI/src/era/mi/gui/model/components/GUIAndGate.java b/LogicUI/src/mograsim/logic/ui/model/components/GUIAndGate.java similarity index 69% rename from LogicUI/src/era/mi/gui/model/components/GUIAndGate.java rename to LogicUI/src/mograsim/logic/ui/model/components/GUIAndGate.java index 65f1db4e..8efea1c4 100644 --- a/LogicUI/src/era/mi/gui/model/components/GUIAndGate.java +++ b/LogicUI/src/mograsim/logic/ui/model/components/GUIAndGate.java @@ -1,6 +1,6 @@ -package era.mi.gui.model.components; +package mograsim.logic.ui.model.components; -import era.mi.gui.model.ViewModel; +import mograsim.logic.ui.model.ViewModel; public class GUIAndGate extends SimpleRectangularGUIGate { diff --git a/LogicUI/src/era/mi/gui/model/components/GUIComponent.java b/LogicUI/src/mograsim/logic/ui/model/components/GUIComponent.java similarity index 96% rename from LogicUI/src/era/mi/gui/model/components/GUIComponent.java rename to LogicUI/src/mograsim/logic/ui/model/components/GUIComponent.java index b8f49f34..c3e4529f 100644 --- a/LogicUI/src/era/mi/gui/model/components/GUIComponent.java +++ b/LogicUI/src/mograsim/logic/ui/model/components/GUIComponent.java @@ -1,12 +1,12 @@ -package era.mi.gui.model.components; +package mograsim.logic.ui.model.components; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.function.Consumer; -import era.mi.gui.model.ViewModel; -import era.mi.gui.model.wires.Pin; +import mograsim.logic.ui.model.ViewModel; +import mograsim.logic.ui.model.wires.Pin; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; diff --git a/LogicUI/src/era/mi/gui/model/components/GUIManualSwitch.java b/LogicUI/src/mograsim/logic/ui/model/components/GUIManualSwitch.java similarity index 85% rename from LogicUI/src/era/mi/gui/model/components/GUIManualSwitch.java rename to LogicUI/src/mograsim/logic/ui/model/components/GUIManualSwitch.java index b2a8b018..a89bc6a6 100644 --- a/LogicUI/src/era/mi/gui/model/components/GUIManualSwitch.java +++ b/LogicUI/src/mograsim/logic/ui/model/components/GUIManualSwitch.java @@ -1,10 +1,10 @@ -package era.mi.gui.model.components; +package mograsim.logic.ui.model.components; -import era.mi.gui.model.ViewModel; -import era.mi.gui.model.wires.Pin; -import era.mi.logic.components.ManualSwitch; -import era.mi.logic.types.BitVectorFormatter; -import era.mi.logic.wires.Wire.ReadEnd; +import mograsim.logic.core.components.ManualSwitch; +import mograsim.logic.core.types.BitVectorFormatter; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.ui.model.ViewModel; +import mograsim.logic.ui.model.wires.Pin; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Font; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; diff --git a/LogicUI/src/era/mi/gui/model/components/GUINotGate.java b/LogicUI/src/mograsim/logic/ui/model/components/GUINotGate.java similarity index 67% rename from LogicUI/src/era/mi/gui/model/components/GUINotGate.java rename to LogicUI/src/mograsim/logic/ui/model/components/GUINotGate.java index c22d9b28..7a6865f3 100644 --- a/LogicUI/src/era/mi/gui/model/components/GUINotGate.java +++ b/LogicUI/src/mograsim/logic/ui/model/components/GUINotGate.java @@ -1,6 +1,6 @@ -package era.mi.gui.model.components; +package mograsim.logic.ui.model.components; -import era.mi.gui.model.ViewModel; +import mograsim.logic.ui.model.ViewModel; public class GUINotGate extends SimpleRectangularGUIGate { diff --git a/LogicUI/src/era/mi/gui/model/components/GUIOrGate.java b/LogicUI/src/mograsim/logic/ui/model/components/GUIOrGate.java similarity index 68% rename from LogicUI/src/era/mi/gui/model/components/GUIOrGate.java rename to LogicUI/src/mograsim/logic/ui/model/components/GUIOrGate.java index a732509b..3a3c3241 100644 --- a/LogicUI/src/era/mi/gui/model/components/GUIOrGate.java +++ b/LogicUI/src/mograsim/logic/ui/model/components/GUIOrGate.java @@ -1,6 +1,6 @@ -package era.mi.gui.model.components; +package mograsim.logic.ui.model.components; -import era.mi.gui.model.ViewModel; +import mograsim.logic.ui.model.ViewModel; public class GUIOrGate extends SimpleRectangularGUIGate { diff --git a/LogicUI/src/era/mi/gui/model/components/SimpleRectangularGUIGate.java b/LogicUI/src/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java similarity index 93% rename from LogicUI/src/era/mi/gui/model/components/SimpleRectangularGUIGate.java rename to LogicUI/src/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java index eb396cca..b09d9c9d 100644 --- a/LogicUI/src/era/mi/gui/model/components/SimpleRectangularGUIGate.java +++ b/LogicUI/src/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java @@ -1,12 +1,12 @@ -package era.mi.gui.model.components; +package mograsim.logic.ui.model.components; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import era.mi.gui.model.ViewModel; -import era.mi.gui.model.wires.MovablePin; -import era.mi.gui.model.wires.Pin; +import mograsim.logic.ui.model.ViewModel; +import mograsim.logic.ui.model.wires.MovablePin; +import mograsim.logic.ui.model.wires.Pin; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Font; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; diff --git a/LogicUI/src/era/mi/gui/model/wires/GUIWire.java b/LogicUI/src/mograsim/logic/ui/model/wires/GUIWire.java similarity index 91% rename from LogicUI/src/era/mi/gui/model/wires/GUIWire.java rename to LogicUI/src/mograsim/logic/ui/model/wires/GUIWire.java index 6bcbd1c5..2512b884 100644 --- a/LogicUI/src/era/mi/gui/model/wires/GUIWire.java +++ b/LogicUI/src/mograsim/logic/ui/model/wires/GUIWire.java @@ -1,13 +1,13 @@ -package era.mi.gui.model.wires; +package mograsim.logic.ui.model.wires; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -import era.mi.gui.ColorHelper; -import era.mi.gui.model.ViewModel; -import era.mi.logic.types.BitVectorFormatter; -import era.mi.logic.wires.Wire.ReadEnd; +import mograsim.logic.core.types.BitVectorFormatter; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.ui.ColorHelper; +import mograsim.logic.ui.model.ViewModel; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; diff --git a/LogicUI/src/era/mi/gui/model/wires/MovablePin.java b/LogicUI/src/mograsim/logic/ui/model/wires/MovablePin.java similarity index 73% rename from LogicUI/src/era/mi/gui/model/wires/MovablePin.java rename to LogicUI/src/mograsim/logic/ui/model/wires/MovablePin.java index 949e7d76..40364320 100644 --- a/LogicUI/src/era/mi/gui/model/wires/MovablePin.java +++ b/LogicUI/src/mograsim/logic/ui/model/wires/MovablePin.java @@ -1,6 +1,6 @@ -package era.mi.gui.model.wires; +package mograsim.logic.ui.model.wires; -import era.mi.gui.model.components.GUIComponent; +import mograsim.logic.ui.model.components.GUIComponent; public class MovablePin extends Pin { diff --git a/LogicUI/src/era/mi/gui/model/wires/Pin.java b/LogicUI/src/mograsim/logic/ui/model/wires/Pin.java similarity index 93% rename from LogicUI/src/era/mi/gui/model/wires/Pin.java rename to LogicUI/src/mograsim/logic/ui/model/wires/Pin.java index abafc071..350de8d2 100644 --- a/LogicUI/src/era/mi/gui/model/wires/Pin.java +++ b/LogicUI/src/mograsim/logic/ui/model/wires/Pin.java @@ -1,10 +1,10 @@ -package era.mi.gui.model.wires; +package mograsim.logic.ui.model.wires; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -import era.mi.gui.model.components.GUIComponent; +import mograsim.logic.ui.model.components.GUIComponent; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; diff --git a/LogicUI/src/era/mi/gui/model/wires/WireCrossPoint.java b/LogicUI/src/mograsim/logic/ui/model/wires/WireCrossPoint.java similarity index 76% rename from LogicUI/src/era/mi/gui/model/wires/WireCrossPoint.java rename to LogicUI/src/mograsim/logic/ui/model/wires/WireCrossPoint.java index 04c5f1e8..34f69032 100644 --- a/LogicUI/src/era/mi/gui/model/wires/WireCrossPoint.java +++ b/LogicUI/src/mograsim/logic/ui/model/wires/WireCrossPoint.java @@ -1,10 +1,10 @@ -package era.mi.gui.model.wires; +package mograsim.logic.ui.model.wires; -import era.mi.gui.ColorHelper; -import era.mi.gui.model.ViewModel; -import era.mi.gui.model.components.GUIComponent; -import era.mi.logic.types.BitVectorFormatter; -import era.mi.logic.wires.Wire.ReadEnd; +import mograsim.logic.core.types.BitVectorFormatter; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.ui.ColorHelper; +import mograsim.logic.ui.model.ViewModel; +import mograsim.logic.ui.model.components.GUIComponent; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; diff --git a/LogicUI/src/era/mi/gui/modeladapter/LogicModelParameters.java b/LogicUI/src/mograsim/logic/ui/modeladapter/LogicModelParameters.java similarity index 69% rename from LogicUI/src/era/mi/gui/modeladapter/LogicModelParameters.java rename to LogicUI/src/mograsim/logic/ui/modeladapter/LogicModelParameters.java index 435f7086..010cdd1f 100644 --- a/LogicUI/src/era/mi/gui/modeladapter/LogicModelParameters.java +++ b/LogicUI/src/mograsim/logic/ui/modeladapter/LogicModelParameters.java @@ -1,4 +1,4 @@ -package era.mi.gui.modeladapter; +package mograsim.logic.ui.modeladapter; public class LogicModelParameters { diff --git a/LogicUI/src/era/mi/gui/modeladapter/ViewLogicModelAdapter.java b/LogicUI/src/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java similarity index 83% rename from LogicUI/src/era/mi/gui/modeladapter/ViewLogicModelAdapter.java rename to LogicUI/src/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java index 1e7d341e..076d64b6 100644 --- a/LogicUI/src/era/mi/gui/modeladapter/ViewLogicModelAdapter.java +++ b/LogicUI/src/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java @@ -1,4 +1,4 @@ -package era.mi.gui.modeladapter; +package mograsim.logic.ui.modeladapter; import java.util.ArrayList; import java.util.Collections; @@ -11,24 +11,24 @@ import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; -import era.mi.gui.model.ViewModel; -import era.mi.gui.model.components.GUIAndGate; -import era.mi.gui.model.components.GUIComponent; -import era.mi.gui.model.components.GUINotGate; -import era.mi.gui.model.components.GUIOrGate; -import era.mi.gui.model.wires.GUIWire; -import era.mi.gui.model.wires.Pin; -import era.mi.gui.model.wires.WireCrossPoint; -import era.mi.gui.modeladapter.componentadapters.ComponentAdapter; -import era.mi.gui.modeladapter.componentadapters.ManualSwitchAdapter; -import era.mi.gui.modeladapter.componentadapters.SimpleGateAdapter; -import era.mi.logic.components.Component; -import era.mi.logic.components.gates.AndGate; -import era.mi.logic.components.gates.NotGate; -import era.mi.logic.components.gates.OrGate; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.wires.Wire; -import era.mi.logic.wires.Wire.ReadEnd; +import mograsim.logic.core.components.Component; +import mograsim.logic.core.components.gates.AndGate; +import mograsim.logic.core.components.gates.NotGate; +import mograsim.logic.core.components.gates.OrGate; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.wires.Wire; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.ui.model.ViewModel; +import mograsim.logic.ui.model.components.GUIAndGate; +import mograsim.logic.ui.model.components.GUIComponent; +import mograsim.logic.ui.model.components.GUINotGate; +import mograsim.logic.ui.model.components.GUIOrGate; +import mograsim.logic.ui.model.wires.GUIWire; +import mograsim.logic.ui.model.wires.Pin; +import mograsim.logic.ui.model.wires.WireCrossPoint; +import mograsim.logic.ui.modeladapter.componentadapters.ComponentAdapter; +import mograsim.logic.ui.modeladapter.componentadapters.ManualSwitchAdapter; +import mograsim.logic.ui.modeladapter.componentadapters.SimpleGateAdapter; public class ViewLogicModelAdapter { diff --git a/LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/ComponentAdapter.java b/LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/ComponentAdapter.java new file mode 100644 index 00000000..9be1b96e --- /dev/null +++ b/LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/ComponentAdapter.java @@ -0,0 +1,18 @@ +package mograsim.logic.ui.modeladapter.componentadapters; + +import java.util.Map; + +import mograsim.logic.core.components.Component; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.wires.Wire; +import mograsim.logic.ui.model.components.GUIComponent; +import mograsim.logic.ui.model.wires.Pin; +import mograsim.logic.ui.modeladapter.LogicModelParameters; + +public interface ComponentAdapter +{ + public Class getSupportedClass(); + + public Component createAndLinkComponent(Timeline timeline, LogicModelParameters params, G guiComponent, + Map logicWiresPerPin); +} \ No newline at end of file diff --git a/LogicUI/src/era/mi/gui/modeladapter/componentadapters/ManualSwitchAdapter.java b/LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/ManualSwitchAdapter.java similarity index 57% rename from LogicUI/src/era/mi/gui/modeladapter/componentadapters/ManualSwitchAdapter.java rename to LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/ManualSwitchAdapter.java index 3a6ea050..c27cbdf2 100644 --- a/LogicUI/src/era/mi/gui/modeladapter/componentadapters/ManualSwitchAdapter.java +++ b/LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/ManualSwitchAdapter.java @@ -1,15 +1,15 @@ -package era.mi.gui.modeladapter.componentadapters; +package mograsim.logic.ui.modeladapter.componentadapters; import java.util.Map; -import era.mi.gui.model.components.GUIManualSwitch; -import era.mi.gui.model.wires.Pin; -import era.mi.gui.modeladapter.LogicModelParameters; -import era.mi.logic.components.Component; -import era.mi.logic.components.ManualSwitch; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.wires.Wire; -import era.mi.logic.wires.Wire.ReadWriteEnd; +import mograsim.logic.core.components.Component; +import mograsim.logic.core.components.ManualSwitch; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.wires.Wire; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; +import mograsim.logic.ui.model.components.GUIManualSwitch; +import mograsim.logic.ui.model.wires.Pin; +import mograsim.logic.ui.modeladapter.LogicModelParameters; public class ManualSwitchAdapter implements ComponentAdapter { diff --git a/LogicUI/src/era/mi/gui/modeladapter/componentadapters/SimpleGateAdapter.java b/LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/SimpleGateAdapter.java similarity index 71% rename from LogicUI/src/era/mi/gui/modeladapter/componentadapters/SimpleGateAdapter.java rename to LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/SimpleGateAdapter.java index b244973b..f88308bd 100644 --- a/LogicUI/src/era/mi/gui/modeladapter/componentadapters/SimpleGateAdapter.java +++ b/LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/SimpleGateAdapter.java @@ -1,16 +1,16 @@ -package era.mi.gui.modeladapter.componentadapters; +package mograsim.logic.ui.modeladapter.componentadapters; import java.util.List; import java.util.Map; -import era.mi.gui.model.components.SimpleRectangularGUIGate; -import era.mi.gui.model.wires.Pin; -import era.mi.gui.modeladapter.LogicModelParameters; -import era.mi.logic.components.Component; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.wires.Wire; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; +import mograsim.logic.core.components.Component; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.wires.Wire; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; +import mograsim.logic.ui.model.components.SimpleRectangularGUIGate; +import mograsim.logic.ui.model.wires.Pin; +import mograsim.logic.ui.modeladapter.LogicModelParameters; public class SimpleGateAdapter implements ComponentAdapter { diff --git a/SampleERCP/.project b/SampleERCP/.project index dd05f6c6..4577bb5e 100644 --- a/SampleERCP/.project +++ b/SampleERCP/.project @@ -1,9 +1,9 @@ - SampleERCP + mograsim.rcp - LogicUI + mograsim.rcp diff --git a/SampleERCP/.settings/org.eclipse.jdt.ui.prefs b/SampleERCP/.settings/org.eclipse.jdt.ui.prefs index 614cb32e..5ae94b62 100644 --- a/SampleERCP/.settings/org.eclipse.jdt.ui.prefs +++ b/SampleERCP/.settings/org.eclipse.jdt.ui.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_ERA-MI +formatter_profile=_MoGraSim formatter_settings_version=16 org.eclipse.jdt.ui.text.custom_code_templates= sp_cleanup.add_default_serial_version_id=true diff --git a/SampleERCP/Application.e4xmi b/SampleERCP/Application.e4xmi index 6e2ca3e3..75815684 100644 --- a/SampleERCP/Application.e4xmi +++ b/SampleERCP/Application.e4xmi @@ -1,10 +1,10 @@ - + - - + + @@ -12,8 +12,8 @@ - - + + @@ -22,15 +22,15 @@ - - + + - - - - + + + + diff --git a/SampleERCP/META-INF/MANIFEST.MF b/SampleERCP/META-INF/MANIFEST.MF index c0a156bd..2597b53f 100644 --- a/SampleERCP/META-INF/MANIFEST.MF +++ b/SampleERCP/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name -Bundle-SymbolicName: SampleERCP;singleton:=true +Bundle-SymbolicName: mograsim.rcp;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime;bundle-version="3.15.200", @@ -12,10 +12,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.15.200", org.eclipse.e4.ui.di;bundle-version="1.2.500", org.eclipse.ui.workbench;bundle-version="3.113.0", javax.annotation;bundle-version="1.2.0", - LogicUI, - era.mi + mograsim.logic.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Automatic-Module-Name: Sample -Export-Package: sampleercp.handlers;uses:="org.eclipse.swt.widgets,org.eclipse.e4.ui.workbench,org.eclipse.e4.ui.workbench.modeling", - sampleercp.parts;uses:="org.eclipse.swt.widgets", - sampleercp.splashhandlers +Export-Package: mograsim.rcp.handlers;uses:="org.eclipse.swt.widgets,org.eclipse.e4.ui.workbench,org.eclipse.e4.ui.workbench.modeling", + mograsim.rcp.parts;uses:="org.eclipse.swt.widgets", + mograsim.rcp.splashhandlers diff --git a/SampleERCP/SampleERCP.product b/SampleERCP/mograsim.rcp.product similarity index 68% rename from SampleERCP/SampleERCP.product rename to SampleERCP/mograsim.rcp.product index 5d61b95a..3614ce7d 100644 --- a/SampleERCP/SampleERCP.product +++ b/SampleERCP/mograsim.rcp.product @@ -1,7 +1,7 @@ - + @@ -19,19 +19,20 @@ - + - - + + - + + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 @@ -58,17 +59,16 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - - - - + + + @@ -76,25 +76,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - - - - - - - - - - @@ -110,49 +100,34 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - - - - - - - - - - - - - - - @@ -160,10 +135,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - - - - @@ -172,7 +143,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - + diff --git a/SampleERCP/plugin.xml b/SampleERCP/plugin.xml index 50915730..06832aae 100644 --- a/SampleERCP/plugin.xml +++ b/SampleERCP/plugin.xml @@ -11,7 +11,7 @@ name="Simulator WIP"> + value="platform:/plugin/mograsim.rcp/css/default.css"> + class="mograsim.rcp.splashhandlers.ExtensibleSplashHandler" + id="mograsim.rcp.splashHandlers.extensible"> - - - - + productId="mograsim.rcp.product" + splashId="mograsim.rcp.splashHandlers.extensible"> + point="mograsim.rcp.splashExtension"> - era.mi + mograsim.logic.core diff --git a/era.mi/.settings/org.eclipse.jdt.core.prefs b/era.mi/.settings/org.eclipse.jdt.core.prefs index 7ac9c4c1..020d5585 100644 --- a/era.mi/.settings/org.eclipse.jdt.core.prefs +++ b/era.mi/.settings/org.eclipse.jdt.core.prefs @@ -9,6 +9,7 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=10 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=10 diff --git a/era.mi/.settings/org.eclipse.jdt.ui.prefs b/era.mi/.settings/org.eclipse.jdt.ui.prefs index e383c7ed..94658822 100644 --- a/era.mi/.settings/org.eclipse.jdt.ui.prefs +++ b/era.mi/.settings/org.eclipse.jdt.ui.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_ERA-MI +formatter_profile=_MoGraSim formatter_settings_version=16 sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false diff --git a/era.mi/META-INF/MANIFEST.MF b/era.mi/META-INF/MANIFEST.MF index 47ff164b..fad3aa8a 100644 --- a/era.mi/META-INF/MANIFEST.MF +++ b/era.mi/META-INF/MANIFEST.MF @@ -1,14 +1,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: MI -Bundle-SymbolicName: era.mi +Bundle-Name: mograsim.logic.core +Bundle-SymbolicName: mograsim.logic.core Bundle-Version: 1.0.0.qualifier -Export-Package: era.mi.logic, - era.mi.logic.components, - era.mi.logic.components.gates, - era.mi.logic.tests, - era.mi.logic.timeline, - era.mi.logic.types, - era.mi.logic.wires +Export-Package: mograsim.logic.core, + mograsim.logic.core.components, + mograsim.logic.core.components.gates, + mograsim.logic.core.tests, + mograsim.logic.core.timeline, + mograsim.logic.core.types, + mograsim.logic.core.wires Bundle-RequiredExecutionEnvironment: JavaSE-10 -Automatic-Module-Name: era.mi +Automatic-Module-Name: mograsim.logic.core diff --git a/era.mi/src/era/mi/logic/components/gates/AndGate.java b/era.mi/src/era/mi/logic/components/gates/AndGate.java deleted file mode 100644 index edd34d70..00000000 --- a/era.mi/src/era/mi/logic/components/gates/AndGate.java +++ /dev/null @@ -1,14 +0,0 @@ -package era.mi.logic.components.gates; - -import era.mi.logic.timeline.Timeline; -import era.mi.logic.types.BitVector.BitVectorMutator; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; - -public class AndGate extends MultiInputGate -{ - public AndGate(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd... in) - { - super(timeline, processTime, BitVectorMutator::and, out, in); - } -} diff --git a/era.mi/src/era/mi/logic/components/gates/OrGate.java b/era.mi/src/era/mi/logic/components/gates/OrGate.java deleted file mode 100644 index f34206fa..00000000 --- a/era.mi/src/era/mi/logic/components/gates/OrGate.java +++ /dev/null @@ -1,14 +0,0 @@ -package era.mi.logic.components.gates; - -import era.mi.logic.timeline.Timeline; -import era.mi.logic.types.BitVector.BitVectorMutator; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; - -public class OrGate extends MultiInputGate -{ - public OrGate(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd... in) - { - super(timeline, processTime, BitVectorMutator::or, out, in); - } -} diff --git a/era.mi/src/era/mi/logic/wires/WireObserver.java b/era.mi/src/era/mi/logic/wires/WireObserver.java deleted file mode 100644 index 4c4bce0b..00000000 --- a/era.mi/src/era/mi/logic/wires/WireObserver.java +++ /dev/null @@ -1,9 +0,0 @@ -package era.mi.logic.wires; - -import era.mi.logic.types.BitVector; -import era.mi.logic.wires.Wire.ReadEnd; - -public interface WireObserver -{ - public void update(ReadEnd initiator, BitVector oldValues); -} diff --git a/era.mi/src/era/mi/logic/Util.java b/era.mi/src/mograsim/logic/core/Util.java similarity index 97% rename from era.mi/src/era/mi/logic/Util.java rename to era.mi/src/mograsim/logic/core/Util.java index d621a44c..5f88e834 100644 --- a/era.mi/src/era/mi/logic/Util.java +++ b/era.mi/src/mograsim/logic/core/Util.java @@ -1,8 +1,8 @@ -package era.mi.logic; +package mograsim.logic.core; import java.util.Arrays; -import era.mi.logic.types.Bit; +import mograsim.logic.core.types.Bit; public final class Util { diff --git a/era.mi/src/era/mi/logic/components/BasicComponent.java b/era.mi/src/mograsim/logic/core/components/BasicComponent.java similarity index 76% rename from era.mi/src/era/mi/logic/components/BasicComponent.java rename to era.mi/src/mograsim/logic/core/components/BasicComponent.java index 47a3057a..720c1259 100644 --- a/era.mi/src/era/mi/logic/components/BasicComponent.java +++ b/era.mi/src/mograsim/logic/core/components/BasicComponent.java @@ -1,9 +1,9 @@ -package era.mi.logic.components; +package mograsim.logic.core.components; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.types.BitVector; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.WireObserver; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.types.BitVector; +import mograsim.logic.core.wires.WireObserver; +import mograsim.logic.core.wires.Wire.ReadEnd; /** * A basic component that recomputes all outputs (with a delay), when it is updated. diff --git a/era.mi/src/era/mi/logic/components/BitDisplay.java b/era.mi/src/mograsim/logic/core/components/BitDisplay.java similarity index 71% rename from era.mi/src/era/mi/logic/components/BitDisplay.java rename to era.mi/src/mograsim/logic/core/components/BitDisplay.java index d8691f3b..0d398dab 100644 --- a/era.mi/src/era/mi/logic/components/BitDisplay.java +++ b/era.mi/src/mograsim/logic/core/components/BitDisplay.java @@ -1,12 +1,12 @@ -package era.mi.logic.components; +package mograsim.logic.core.components; import java.util.List; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.types.Bit; -import era.mi.logic.types.BitVector; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.types.Bit; +import mograsim.logic.core.types.BitVector; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; public class BitDisplay extends BasicComponent { diff --git a/era.mi/src/era/mi/logic/components/Clock.java b/era.mi/src/mograsim/logic/core/components/Clock.java similarity index 70% rename from era.mi/src/era/mi/logic/components/Clock.java rename to era.mi/src/mograsim/logic/core/components/Clock.java index 01795e01..4b15ed38 100644 --- a/era.mi/src/era/mi/logic/components/Clock.java +++ b/era.mi/src/mograsim/logic/core/components/Clock.java @@ -1,14 +1,14 @@ -package era.mi.logic.components; +package mograsim.logic.core.components; import java.util.List; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.timeline.TimelineEvent; -import era.mi.logic.timeline.TimelineEventHandler; -import era.mi.logic.types.Bit; -import era.mi.logic.wires.Wire; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.timeline.TimelineEvent; +import mograsim.logic.core.timeline.TimelineEventHandler; +import mograsim.logic.core.types.Bit; +import mograsim.logic.core.wires.Wire; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; public class Clock extends Component implements TimelineEventHandler { diff --git a/era.mi/src/era/mi/logic/components/Component.java b/era.mi/src/mograsim/logic/core/components/Component.java similarity index 74% rename from era.mi/src/era/mi/logic/components/Component.java rename to era.mi/src/mograsim/logic/core/components/Component.java index e26b6cd3..54109df7 100644 --- a/era.mi/src/era/mi/logic/components/Component.java +++ b/era.mi/src/mograsim/logic/core/components/Component.java @@ -1,10 +1,10 @@ -package era.mi.logic.components; +package mograsim.logic.core.components; import java.util.List; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; public abstract class Component { diff --git a/era.mi/src/era/mi/logic/components/Connector.java b/era.mi/src/mograsim/logic/core/components/Connector.java similarity index 82% rename from era.mi/src/era/mi/logic/components/Connector.java rename to era.mi/src/mograsim/logic/core/components/Connector.java index 5fd7ee4c..0972cfad 100644 --- a/era.mi/src/era/mi/logic/components/Connector.java +++ b/era.mi/src/mograsim/logic/core/components/Connector.java @@ -1,12 +1,12 @@ -package era.mi.logic.components; +package mograsim.logic.core.components; import java.util.List; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.types.BitVector; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; -import era.mi.logic.wires.WireObserver; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.types.BitVector; +import mograsim.logic.core.wires.WireObserver; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; public class Connector extends Component implements WireObserver { diff --git a/era.mi/src/era/mi/logic/components/Demux.java b/era.mi/src/mograsim/logic/core/components/Demux.java similarity index 90% rename from era.mi/src/era/mi/logic/components/Demux.java rename to era.mi/src/mograsim/logic/core/components/Demux.java index 3b267dfe..f1efb726 100644 --- a/era.mi/src/era/mi/logic/components/Demux.java +++ b/era.mi/src/mograsim/logic/core/components/Demux.java @@ -1,11 +1,11 @@ -package era.mi.logic.components; +package mograsim.logic.core.components; import java.util.List; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.wires.Wire; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.wires.Wire; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; /** * Models a multiplexer. Takes an arbitrary amount of input {@link Wire}s, one of which, as determined by select, is put through to the diff --git a/era.mi/src/era/mi/logic/components/ManualSwitch.java b/era.mi/src/mograsim/logic/core/components/ManualSwitch.java similarity index 82% rename from era.mi/src/era/mi/logic/components/ManualSwitch.java rename to era.mi/src/mograsim/logic/core/components/ManualSwitch.java index 9ae08eba..5012761e 100644 --- a/era.mi/src/era/mi/logic/components/ManualSwitch.java +++ b/era.mi/src/mograsim/logic/core/components/ManualSwitch.java @@ -1,11 +1,11 @@ -package era.mi.logic.components; +package mograsim.logic.core.components; import java.util.List; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.types.Bit; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.types.Bit; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; /** * This class models a simple on/off (ONE/ZERO) switch for user interaction. diff --git a/era.mi/src/era/mi/logic/components/Merger.java b/era.mi/src/mograsim/logic/core/components/Merger.java similarity index 83% rename from era.mi/src/era/mi/logic/components/Merger.java rename to era.mi/src/mograsim/logic/core/components/Merger.java index ab380665..114dbe7b 100644 --- a/era.mi/src/era/mi/logic/components/Merger.java +++ b/era.mi/src/mograsim/logic/core/components/Merger.java @@ -1,13 +1,13 @@ -package era.mi.logic.components; +package mograsim.logic.core.components; import java.util.List; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.types.BitVector; -import era.mi.logic.wires.Wire; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; -import era.mi.logic.wires.WireObserver; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.types.BitVector; +import mograsim.logic.core.wires.Wire; +import mograsim.logic.core.wires.WireObserver; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; public class Merger extends Component implements WireObserver { diff --git a/era.mi/src/era/mi/logic/components/Mux.java b/era.mi/src/mograsim/logic/core/components/Mux.java similarity index 90% rename from era.mi/src/era/mi/logic/components/Mux.java rename to era.mi/src/mograsim/logic/core/components/Mux.java index 5391e655..44c2a1d8 100644 --- a/era.mi/src/era/mi/logic/components/Mux.java +++ b/era.mi/src/mograsim/logic/core/components/Mux.java @@ -1,14 +1,14 @@ -package era.mi.logic.components; +package mograsim.logic.core.components; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.wires.Wire; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.wires.Wire; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; /** * Models a multiplexer. Takes an arbitrary amount of input {@link Wire}s, one of which, as determined by select, is put through to the diff --git a/era.mi/src/era/mi/logic/components/Splitter.java b/era.mi/src/mograsim/logic/core/components/Splitter.java similarity index 80% rename from era.mi/src/era/mi/logic/components/Splitter.java rename to era.mi/src/mograsim/logic/core/components/Splitter.java index 8c54d0f9..34749527 100644 --- a/era.mi/src/era/mi/logic/components/Splitter.java +++ b/era.mi/src/mograsim/logic/core/components/Splitter.java @@ -1,12 +1,12 @@ -package era.mi.logic.components; +package mograsim.logic.core.components; import java.util.List; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.types.BitVector; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; -import era.mi.logic.wires.WireObserver; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.types.BitVector; +import mograsim.logic.core.wires.WireObserver; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; public class Splitter extends Component implements WireObserver { diff --git a/era.mi/src/era/mi/logic/components/TriStateBuffer.java b/era.mi/src/mograsim/logic/core/components/TriStateBuffer.java similarity index 82% rename from era.mi/src/era/mi/logic/components/TriStateBuffer.java rename to era.mi/src/mograsim/logic/core/components/TriStateBuffer.java index 123e2c54..b8ba0650 100644 --- a/era.mi/src/era/mi/logic/components/TriStateBuffer.java +++ b/era.mi/src/mograsim/logic/core/components/TriStateBuffer.java @@ -1,11 +1,11 @@ -package era.mi.logic.components; +package mograsim.logic.core.components; import java.util.List; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.types.Bit; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.types.Bit; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; public class TriStateBuffer extends BasicComponent { diff --git a/era.mi/src/mograsim/logic/core/components/gates/AndGate.java b/era.mi/src/mograsim/logic/core/components/gates/AndGate.java new file mode 100644 index 00000000..1f02a193 --- /dev/null +++ b/era.mi/src/mograsim/logic/core/components/gates/AndGate.java @@ -0,0 +1,14 @@ +package mograsim.logic.core.components.gates; + +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.types.BitVector.BitVectorMutator; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; + +public class AndGate extends MultiInputGate +{ + public AndGate(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd... in) + { + super(timeline, processTime, BitVectorMutator::and, out, in); + } +} diff --git a/era.mi/src/era/mi/logic/components/gates/MultiInputGate.java b/era.mi/src/mograsim/logic/core/components/gates/MultiInputGate.java similarity index 75% rename from era.mi/src/era/mi/logic/components/gates/MultiInputGate.java rename to era.mi/src/mograsim/logic/core/components/gates/MultiInputGate.java index 038e2272..40b10780 100644 --- a/era.mi/src/era/mi/logic/components/gates/MultiInputGate.java +++ b/era.mi/src/mograsim/logic/core/components/gates/MultiInputGate.java @@ -1,13 +1,13 @@ -package era.mi.logic.components.gates; +package mograsim.logic.core.components.gates; import java.util.List; -import era.mi.logic.components.BasicComponent; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.types.BitVector.BitVectorMutator; -import era.mi.logic.types.MutationOperation; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; +import mograsim.logic.core.components.BasicComponent; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.types.MutationOperation; +import mograsim.logic.core.types.BitVector.BitVectorMutator; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; public abstract class MultiInputGate extends BasicComponent { diff --git a/era.mi/src/era/mi/logic/components/gates/NotGate.java b/era.mi/src/mograsim/logic/core/components/gates/NotGate.java similarity index 72% rename from era.mi/src/era/mi/logic/components/gates/NotGate.java rename to era.mi/src/mograsim/logic/core/components/gates/NotGate.java index 685bc229..ebad7e3a 100644 --- a/era.mi/src/era/mi/logic/components/gates/NotGate.java +++ b/era.mi/src/mograsim/logic/core/components/gates/NotGate.java @@ -1,11 +1,11 @@ -package era.mi.logic.components.gates; +package mograsim.logic.core.components.gates; import java.util.List; -import era.mi.logic.components.BasicComponent; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; +import mograsim.logic.core.components.BasicComponent; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; public class NotGate extends BasicComponent { diff --git a/era.mi/src/mograsim/logic/core/components/gates/OrGate.java b/era.mi/src/mograsim/logic/core/components/gates/OrGate.java new file mode 100644 index 00000000..69d64111 --- /dev/null +++ b/era.mi/src/mograsim/logic/core/components/gates/OrGate.java @@ -0,0 +1,14 @@ +package mograsim.logic.core.components.gates; + +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.types.BitVector.BitVectorMutator; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; + +public class OrGate extends MultiInputGate +{ + public OrGate(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd... in) + { + super(timeline, processTime, BitVectorMutator::or, out, in); + } +} diff --git a/era.mi/src/era/mi/logic/components/gates/XorGate.java b/era.mi/src/mograsim/logic/core/components/gates/XorGate.java similarity index 53% rename from era.mi/src/era/mi/logic/components/gates/XorGate.java rename to era.mi/src/mograsim/logic/core/components/gates/XorGate.java index a177695e..ea960364 100644 --- a/era.mi/src/era/mi/logic/components/gates/XorGate.java +++ b/era.mi/src/mograsim/logic/core/components/gates/XorGate.java @@ -1,9 +1,9 @@ -package era.mi.logic.components.gates; +package mograsim.logic.core.components.gates; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.types.BitVector.BitVectorMutator; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.types.BitVector.BitVectorMutator; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; /** * Outputs 1 when the number of 1 inputs is odd. diff --git a/era.mi/src/era/mi/logic/tests/ComponentTest.java b/era.mi/src/mograsim/logic/core/tests/ComponentTest.java similarity index 94% rename from era.mi/src/era/mi/logic/tests/ComponentTest.java rename to era.mi/src/mograsim/logic/core/tests/ComponentTest.java index 0e2b3460..c080d1a7 100644 --- a/era.mi/src/era/mi/logic/tests/ComponentTest.java +++ b/era.mi/src/mograsim/logic/core/tests/ComponentTest.java @@ -1,4 +1,4 @@ -package era.mi.logic.tests; +package mograsim.logic.core.tests; import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertArrayEquals; @@ -9,22 +9,22 @@ import java.util.function.LongConsumer; import org.junit.jupiter.api.Test; -import era.mi.logic.components.Connector; -import era.mi.logic.components.Demux; -import era.mi.logic.components.Merger; -import era.mi.logic.components.Mux; -import era.mi.logic.components.Splitter; -import era.mi.logic.components.TriStateBuffer; -import era.mi.logic.components.gates.AndGate; -import era.mi.logic.components.gates.NotGate; -import era.mi.logic.components.gates.OrGate; -import era.mi.logic.components.gates.XorGate; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.types.Bit; -import era.mi.logic.types.BitVector; -import era.mi.logic.wires.Wire; -import era.mi.logic.wires.Wire.ReadEnd; -import era.mi.logic.wires.Wire.ReadWriteEnd; +import mograsim.logic.core.components.Connector; +import mograsim.logic.core.components.Demux; +import mograsim.logic.core.components.Merger; +import mograsim.logic.core.components.Mux; +import mograsim.logic.core.components.Splitter; +import mograsim.logic.core.components.TriStateBuffer; +import mograsim.logic.core.components.gates.AndGate; +import mograsim.logic.core.components.gates.NotGate; +import mograsim.logic.core.components.gates.OrGate; +import mograsim.logic.core.components.gates.XorGate; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.types.Bit; +import mograsim.logic.core.types.BitVector; +import mograsim.logic.core.wires.Wire; +import mograsim.logic.core.wires.Wire.ReadEnd; +import mograsim.logic.core.wires.Wire.ReadWriteEnd; class ComponentTest { diff --git a/era.mi/src/era/mi/logic/tests/GUITest.java b/era.mi/src/mograsim/logic/core/tests/GUITest.java similarity index 95% rename from era.mi/src/era/mi/logic/tests/GUITest.java rename to era.mi/src/mograsim/logic/core/tests/GUITest.java index 0581812b..0a0929c2 100644 --- a/era.mi/src/era/mi/logic/tests/GUITest.java +++ b/era.mi/src/mograsim/logic/core/tests/GUITest.java @@ -1,4 +1,4 @@ -package era.mi.logic.tests; +package mograsim.logic.core.tests; import java.awt.Color; import java.awt.Graphics; @@ -15,12 +15,12 @@ import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.WindowConstants; -import era.mi.logic.components.ManualSwitch; -import era.mi.logic.components.gates.NotGate; -import era.mi.logic.components.gates.OrGate; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.timeline.Timeline.ExecutionResult; -import era.mi.logic.wires.Wire; +import mograsim.logic.core.components.ManualSwitch; +import mograsim.logic.core.components.gates.NotGate; +import mograsim.logic.core.components.gates.OrGate; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.timeline.Timeline.ExecutionResult; +import mograsim.logic.core.wires.Wire; public class GUITest extends JPanel { diff --git a/era.mi/src/era/mi/logic/tests/TestBitDisplay.java b/era.mi/src/mograsim/logic/core/tests/TestBitDisplay.java similarity index 79% rename from era.mi/src/era/mi/logic/tests/TestBitDisplay.java rename to era.mi/src/mograsim/logic/core/tests/TestBitDisplay.java index 28dc1cc1..80eef5fb 100644 --- a/era.mi/src/era/mi/logic/tests/TestBitDisplay.java +++ b/era.mi/src/mograsim/logic/core/tests/TestBitDisplay.java @@ -1,13 +1,13 @@ -package era.mi.logic.tests; +package mograsim.logic.core.tests; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import java.util.function.LongConsumer; -import era.mi.logic.components.BitDisplay; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.types.Bit; -import era.mi.logic.wires.Wire.ReadEnd; +import mograsim.logic.core.components.BitDisplay; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.types.Bit; +import mograsim.logic.core.wires.Wire.ReadEnd; public final class TestBitDisplay extends BitDisplay { diff --git a/era.mi/src/era/mi/logic/timeline/Timeline.java b/era.mi/src/mograsim/logic/core/timeline/Timeline.java similarity index 99% rename from era.mi/src/era/mi/logic/timeline/Timeline.java rename to era.mi/src/mograsim/logic/core/timeline/Timeline.java index c0100632..1a380b41 100644 --- a/era.mi/src/era/mi/logic/timeline/Timeline.java +++ b/era.mi/src/mograsim/logic/core/timeline/Timeline.java @@ -1,4 +1,4 @@ -package era.mi.logic.timeline; +package mograsim.logic.core.timeline; import java.util.ArrayList; import java.util.List; diff --git a/era.mi/src/era/mi/logic/timeline/TimelineEvent.java b/era.mi/src/mograsim/logic/core/timeline/TimelineEvent.java similarity index 91% rename from era.mi/src/era/mi/logic/timeline/TimelineEvent.java rename to era.mi/src/mograsim/logic/core/timeline/TimelineEvent.java index 46decf5f..6372bde8 100644 --- a/era.mi/src/era/mi/logic/timeline/TimelineEvent.java +++ b/era.mi/src/mograsim/logic/core/timeline/TimelineEvent.java @@ -1,4 +1,4 @@ -package era.mi.logic.timeline; +package mograsim.logic.core.timeline; /** * A class that stores all relevant information about an event in the {@link Timeline}. Currently, there is not much relevant information to diff --git a/era.mi/src/era/mi/logic/timeline/TimelineEventHandler.java b/era.mi/src/mograsim/logic/core/timeline/TimelineEventHandler.java similarity index 71% rename from era.mi/src/era/mi/logic/timeline/TimelineEventHandler.java rename to era.mi/src/mograsim/logic/core/timeline/TimelineEventHandler.java index 921ad1b5..dd58c0b3 100644 --- a/era.mi/src/era/mi/logic/timeline/TimelineEventHandler.java +++ b/era.mi/src/mograsim/logic/core/timeline/TimelineEventHandler.java @@ -1,4 +1,4 @@ -package era.mi.logic.timeline; +package mograsim.logic.core.timeline; @FunctionalInterface public interface TimelineEventHandler diff --git a/era.mi/src/era/mi/logic/types/Bit.java b/era.mi/src/mograsim/logic/core/types/Bit.java similarity index 98% rename from era.mi/src/era/mi/logic/types/Bit.java rename to era.mi/src/mograsim/logic/core/types/Bit.java index 6674f9a7..60c4e192 100644 --- a/era.mi/src/era/mi/logic/types/Bit.java +++ b/era.mi/src/mograsim/logic/core/types/Bit.java @@ -1,4 +1,4 @@ -package era.mi.logic.types; +package mograsim.logic.core.types; import java.util.Arrays; import java.util.Map; diff --git a/era.mi/src/era/mi/logic/types/BitVector.java b/era.mi/src/mograsim/logic/core/types/BitVector.java similarity index 99% rename from era.mi/src/era/mi/logic/types/BitVector.java rename to era.mi/src/mograsim/logic/core/types/BitVector.java index 38d7d263..2d28b2ce 100644 --- a/era.mi/src/era/mi/logic/types/BitVector.java +++ b/era.mi/src/mograsim/logic/core/types/BitVector.java @@ -1,4 +1,4 @@ -package era.mi.logic.types; +package mograsim.logic.core.types; import static java.lang.String.format; diff --git a/era.mi/src/era/mi/logic/types/BitVectorFormatter.java b/era.mi/src/mograsim/logic/core/types/BitVectorFormatter.java similarity index 89% rename from era.mi/src/era/mi/logic/types/BitVectorFormatter.java rename to era.mi/src/mograsim/logic/core/types/BitVectorFormatter.java index 6dab1d7b..9a61c11a 100644 --- a/era.mi/src/era/mi/logic/types/BitVectorFormatter.java +++ b/era.mi/src/mograsim/logic/core/types/BitVectorFormatter.java @@ -1,7 +1,7 @@ -package era.mi.logic.types; +package mograsim.logic.core.types; -import era.mi.logic.types.ColorDefinition.BuiltInColor; -import era.mi.logic.wires.Wire.ReadEnd; +import mograsim.logic.core.types.ColorDefinition.BuiltInColor; +import mograsim.logic.core.wires.Wire.ReadEnd; public class BitVectorFormatter { diff --git a/era.mi/src/era/mi/logic/types/ColorDefinition.java b/era.mi/src/mograsim/logic/core/types/ColorDefinition.java similarity index 97% rename from era.mi/src/era/mi/logic/types/ColorDefinition.java rename to era.mi/src/mograsim/logic/core/types/ColorDefinition.java index b9e851fd..7d69837a 100644 --- a/era.mi/src/era/mi/logic/types/ColorDefinition.java +++ b/era.mi/src/mograsim/logic/core/types/ColorDefinition.java @@ -1,4 +1,4 @@ -package era.mi.logic.types; +package mograsim.logic.core.types; /** * A way to define a color with the possibility to use colors built into the system (called "system colors" in SWT). diff --git a/era.mi/src/era/mi/logic/types/LogicType.java b/era.mi/src/mograsim/logic/core/types/LogicType.java similarity index 98% rename from era.mi/src/era/mi/logic/types/LogicType.java rename to era.mi/src/mograsim/logic/core/types/LogicType.java index 9a3180e7..b4e4efbc 100644 --- a/era.mi/src/era/mi/logic/types/LogicType.java +++ b/era.mi/src/mograsim/logic/core/types/LogicType.java @@ -1,4 +1,4 @@ -package era.mi.logic.types; +package mograsim.logic.core.types; /** * Interface for types that support the basic logic operations diff --git a/era.mi/src/era/mi/logic/types/MutationOperation.java b/era.mi/src/mograsim/logic/core/types/MutationOperation.java similarity index 70% rename from era.mi/src/era/mi/logic/types/MutationOperation.java rename to era.mi/src/mograsim/logic/core/types/MutationOperation.java index 2ed9dc28..998e5979 100644 --- a/era.mi/src/era/mi/logic/types/MutationOperation.java +++ b/era.mi/src/mograsim/logic/core/types/MutationOperation.java @@ -1,8 +1,8 @@ -package era.mi.logic.types; +package mograsim.logic.core.types; import java.util.function.BiFunction; -import era.mi.logic.types.BitVector.BitVectorMutator; +import mograsim.logic.core.types.BitVector.BitVectorMutator; @FunctionalInterface public interface MutationOperation extends BiFunction diff --git a/era.mi/src/era/mi/logic/types/StrictLogicType.java b/era.mi/src/mograsim/logic/core/types/StrictLogicType.java similarity index 91% rename from era.mi/src/era/mi/logic/types/StrictLogicType.java rename to era.mi/src/mograsim/logic/core/types/StrictLogicType.java index 560bb96f..91cb10f2 100644 --- a/era.mi/src/era/mi/logic/types/StrictLogicType.java +++ b/era.mi/src/mograsim/logic/core/types/StrictLogicType.java @@ -1,4 +1,4 @@ -package era.mi.logic.types; +package mograsim.logic.core.types; /** * Interface for types that support the basic logic operations only among themselves, making it mathematically closed diff --git a/era.mi/src/era/mi/logic/wires/Wire.java b/era.mi/src/mograsim/logic/core/wires/Wire.java similarity index 97% rename from era.mi/src/era/mi/logic/wires/Wire.java rename to era.mi/src/mograsim/logic/core/wires/Wire.java index 9a173877..746e9269 100644 --- a/era.mi/src/era/mi/logic/wires/Wire.java +++ b/era.mi/src/mograsim/logic/core/wires/Wire.java @@ -1,15 +1,15 @@ -package era.mi.logic.wires; +package mograsim.logic.core.wires; -import static era.mi.logic.types.Bit.U; -import static era.mi.logic.types.Bit.Z; +import static mograsim.logic.core.types.Bit.U; +import static mograsim.logic.core.types.Bit.Z; import java.util.ArrayList; import java.util.List; -import era.mi.logic.timeline.Timeline; -import era.mi.logic.types.Bit; -import era.mi.logic.types.BitVector; -import era.mi.logic.types.BitVector.BitVectorMutator; +import mograsim.logic.core.timeline.Timeline; +import mograsim.logic.core.types.Bit; +import mograsim.logic.core.types.BitVector; +import mograsim.logic.core.types.BitVector.BitVectorMutator; /** * Represents an array of wires that can store n bits of information. diff --git a/era.mi/src/mograsim/logic/core/wires/WireObserver.java b/era.mi/src/mograsim/logic/core/wires/WireObserver.java new file mode 100644 index 00000000..2082bd34 --- /dev/null +++ b/era.mi/src/mograsim/logic/core/wires/WireObserver.java @@ -0,0 +1,9 @@ +package mograsim.logic.core.wires; + +import mograsim.logic.core.types.BitVector; +import mograsim.logic.core.wires.Wire.ReadEnd; + +public interface WireObserver +{ + public void update(ReadEnd initiator, BitVector oldValues); +} -- 2.17.1