Organized imports

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 8ab22a4..cea9bdc 100644 (file)
--- 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 9c082dd..b625e85 100644 (file)
--- 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 453dcd8..97dc932 100644 (file)
--- 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 1c06c52..a1ba19c 100644 (file)
--- 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 d730194..b50b195 100644 (file)
--- 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 7bf5961..ccb85ed 100644 (file)
--- 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 e913641..93f7fb4 100644 (file)
--- 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 cb807b6..8b33dd0 100644 (file)
--- 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 58a86ea..581286f 100644 (file)
--- 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 d9b9068..6630a96 100644 (file)
--- 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 0d55c75..3637fd7 100644 (file)
--- 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 414054e..857b727 100644 (file)
--- 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 332f4f6..05e5cd0 100644 (file)
--- 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 2596647..0e38b78 100644 (file)
--- 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 c085c52..f9af150 100644 (file)
--- 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