From 755e58d6a8e550cb1b7225b7f05b941fe088590c Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Fri, 27 Mar 2020 20:21:46 +0100 Subject: [PATCH] Organized imports --- .../machine/registers/InstrRegister.java | 1 - .../am2900/machine/registers/PCRegister.java | 1 - .../machine/registers/muInstrRegister.java | 1 - .../model/editor/states/CreateWireState.java | 2 +- .../model/editor/states/EditorState.java | 2 +- .../model/editor/states/SelectionState.java | 2 +- .../mograsim/logic/model/model/wires/Pin.java | 1 + .../model/modeladapter/LogicCoreAdapter.java | 2 +- .../logic/model/util/ModellingTool.java | 2 +- .../logic/core/types/BitVectorTest.java | 20 +++++++++++--- .../logic/model/am2900/am2901/Am2901Test.java | 26 ++++++++++++++----- .../model/am2900/am2901/Am2901Testbench.java | 2 +- .../logic/model/am2900/am2904/Am2904Test.java | 2 +- .../logic/model/am2900/am2910/Am2910Test.java | 6 ++--- .../model/am2900/util/SwitchWithDisplay.java | 2 +- 15 files changed, 48 insertions(+), 24 deletions(-) diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/InstrRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/InstrRegister.java index 8ab22a4e..cea9bdc8 100644 --- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/InstrRegister.java +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/InstrRegister.java @@ -1,6 +1,5 @@ package net.mograsim.logic.model.am2900.machine.registers; -import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; import net.mograsim.machine.registers.HighLevelStateBasedRegister; public class InstrRegister extends HighLevelStateBasedRegister implements Am2900Register diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/PCRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/PCRegister.java index 9c082dd0..b625e85e 100644 --- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/PCRegister.java +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/PCRegister.java @@ -1,6 +1,5 @@ package net.mograsim.logic.model.am2900.machine.registers; -import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; import net.mograsim.machine.registers.HighLevelStateBasedRegister; public class PCRegister extends HighLevelStateBasedRegister implements Am2900Register diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/muInstrRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/muInstrRegister.java index 453dcd82..97dc932c 100644 --- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/muInstrRegister.java +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/muInstrRegister.java @@ -1,6 +1,5 @@ package net.mograsim.logic.model.am2900.machine.registers; -import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; import net.mograsim.machine.registers.HighLevelStateBasedRegister; public class muInstrRegister extends HighLevelStateBasedRegister implements Am2900Register diff --git a/plugins/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/CreateWireState.java b/plugins/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/CreateWireState.java index 1c06c52e..a1ba19cd 100644 --- a/plugins/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/CreateWireState.java +++ b/plugins/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/CreateWireState.java @@ -7,8 +7,8 @@ import org.eclipse.swt.widgets.Shell; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.zoomablecanvas.ZoomableCanvas.ZoomedRenderer; import net.mograsim.logic.model.editor.Editor; -import net.mograsim.logic.model.editor.handles.PinHandle; import net.mograsim.logic.model.editor.handles.Handle.HandleClickInfo; +import net.mograsim.logic.model.editor.handles.PinHandle; public class CreateWireState extends EditorState { diff --git a/plugins/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/EditorState.java b/plugins/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/EditorState.java index d7301945..b50b1958 100644 --- a/plugins/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/EditorState.java +++ b/plugins/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/EditorState.java @@ -2,8 +2,8 @@ package net.mograsim.logic.model.editor.states; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.mograsim.logic.model.editor.Editor; -import net.mograsim.logic.model.editor.handles.InterfacePinHandle; import net.mograsim.logic.model.editor.handles.Handle.HandleClickInfo; +import net.mograsim.logic.model.editor.handles.InterfacePinHandle; public abstract class EditorState { diff --git a/plugins/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/SelectionState.java b/plugins/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/SelectionState.java index 7bf5961d..ccb85ed2 100644 --- a/plugins/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/SelectionState.java +++ b/plugins/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/SelectionState.java @@ -8,9 +8,9 @@ import net.haspamelodica.swt.helper.zoomablecanvas.ZoomableCanvas.ZoomedRenderer import net.mograsim.logic.model.editor.Editor; import net.mograsim.logic.model.editor.Selection; import net.mograsim.logic.model.editor.handles.Handle; +import net.mograsim.logic.model.editor.handles.Handle.HandleClickInfo; import net.mograsim.logic.model.editor.handles.PinHandle; import net.mograsim.logic.model.editor.handles.WireHandle; -import net.mograsim.logic.model.editor.handles.Handle.HandleClickInfo; import net.mograsim.logic.model.editor.handles.WireHandle.WireHandleClickInfo; import net.mograsim.logic.model.editor.ui.DialogManager; import net.mograsim.logic.model.model.wires.MovablePin; diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/Pin.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/Pin.java index e9136416..93f7fb4d 100644 --- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/Pin.java +++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/Pin.java @@ -8,6 +8,7 @@ import java.util.Set; import java.util.function.Consumer; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; +import net.mograsim.logic.model.model.LogicModel; import net.mograsim.logic.model.model.LogicModelModifiable; import net.mograsim.logic.model.model.components.ModelComponent; diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/LogicCoreAdapter.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/LogicCoreAdapter.java index cb807b65..8b33dd04 100644 --- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/LogicCoreAdapter.java +++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/LogicCoreAdapter.java @@ -18,8 +18,8 @@ import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelInterface; import net.mograsim.logic.model.model.wires.ModelWire; -import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; +import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.modeladapter.componentadapters.ComponentAdapter; public class LogicCoreAdapter diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java index 58a86ea0..581286f2 100644 --- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java +++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java @@ -3,8 +3,8 @@ package net.mograsim.logic.model.util; import net.mograsim.logic.model.model.LogicModelModifiable; import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.wires.ModelWire; -import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; +import net.mograsim.logic.model.model.wires.Pin; public class ModellingTool { diff --git a/tests/net.mograsim.logic.core.tests/src/net/mograsim/logic/core/types/BitVectorTest.java b/tests/net.mograsim.logic.core.tests/src/net/mograsim/logic/core/types/BitVectorTest.java index d9b90688..6630a965 100644 --- a/tests/net.mograsim.logic.core.tests/src/net/mograsim/logic/core/types/BitVectorTest.java +++ b/tests/net.mograsim.logic.core.tests/src/net/mograsim/logic/core/types/BitVectorTest.java @@ -1,8 +1,22 @@ package net.mograsim.logic.core.types; -import static net.mograsim.logic.core.types.BitVector.*; -import static net.mograsim.logic.core.types.Bit.*; -import static org.junit.jupiter.api.Assertions.*; +import static net.mograsim.logic.core.types.Bit.ONE; +import static net.mograsim.logic.core.types.Bit.U; +import static net.mograsim.logic.core.types.Bit.X; +import static net.mograsim.logic.core.types.Bit.Z; +import static net.mograsim.logic.core.types.Bit.ZERO; +import static net.mograsim.logic.core.types.BitVector.SINGLE_0; +import static net.mograsim.logic.core.types.BitVector.SINGLE_1; +import static net.mograsim.logic.core.types.BitVector.SINGLE_U; +import static net.mograsim.logic.core.types.BitVector.SINGLE_X; +import static net.mograsim.logic.core.types.BitVector.SINGLE_Z; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.math.BigInteger; import java.util.Iterator; diff --git a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2901/Am2901Test.java b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2901/Am2901Test.java index 0d55c750..3637fd7d 100644 --- a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2901/Am2901Test.java +++ b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2901/Am2901Test.java @@ -1,11 +1,23 @@ package net.mograsim.logic.model.am2900.am2901; -import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Dest.*; -import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Func.*; -import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Src.*; -import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Register.*; -import static net.mograsim.logic.model.am2900.util.TestUtil.*; -import static org.junit.jupiter.api.Assertions.*; +import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Dest.NOP; +import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Dest.QREG; +import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Dest.RAMF; +import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Func.ADD; +import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Func.AND; +import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Func.EXOR; +import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Func.OR; +import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Func.SUBR; +import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Src.AB; +import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Src.DA; +import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Src.DZ; +import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Register.Q; +import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Register.r0; +import static net.mograsim.logic.model.am2900.util.TestUtil.signed4ToSigned32; +import static net.mograsim.logic.model.am2900.util.TestUtil.to1bitBin; +import static net.mograsim.logic.model.am2900.util.TestUtil.to4bitBin; +import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.awt.Point; import java.util.stream.IntStream; @@ -13,8 +25,8 @@ import java.util.stream.Stream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Order; import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2901/Am2901Testbench.java b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2901/Am2901Testbench.java index 414054e9..857b727b 100644 --- a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2901/Am2901Testbench.java +++ b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2901/Am2901Testbench.java @@ -16,9 +16,9 @@ import net.mograsim.logic.model.model.components.atomic.ModelBitDisplay; import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; import net.mograsim.logic.model.model.components.atomic.ModelNotGate; import net.mograsim.logic.model.model.components.atomic.ModelTextComponent; +import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.util.ModellingTool; diff --git a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/Am2904Test.java b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/Am2904Test.java index 332f4f64..05e5cd0b 100644 --- a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/Am2904Test.java +++ b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/Am2904Test.java @@ -4,11 +4,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; diff --git a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/Am2910Test.java b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/Am2910Test.java index 25966477..0e38b789 100644 --- a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/Am2910Test.java +++ b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/Am2910Test.java @@ -1,15 +1,15 @@ package net.mograsim.logic.model.am2900.am2910; -import static net.mograsim.logic.model.am2900.am2910.TestableAm2910.Am2910_Inst.*; -import static net.mograsim.logic.core.types.Bit.*; +import static net.mograsim.logic.core.types.Bit.U; +import static net.mograsim.logic.model.am2900.am2910.TestableAm2910.Am2910_Inst.JZ; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; diff --git a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/util/SwitchWithDisplay.java b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/util/SwitchWithDisplay.java index c085c52e..f9af1507 100644 --- a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/util/SwitchWithDisplay.java +++ b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/util/SwitchWithDisplay.java @@ -6,8 +6,8 @@ import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.model.model.LogicModelModifiable; import net.mograsim.logic.model.model.components.atomic.ModelBitDisplay; import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; -import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; +import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.util.ModellingTool; public class SwitchWithDisplay -- 2.17.1