Merge branch 'development' of

[Mograsim.git] / net.mograsim.machine / src / net / mograsim / machine / Machine.java

diff --git a/net.mograsim.machine/src/net/mograsim/machine/Machine.java b/net.mograsim.machine/src/net/mograsim/machine/Machine.java
index 621af8e..0849b8a 100644 (file)
--- a/net.mograsim.machine/src/net/mograsim/machine/Machine.java
+++ b/net.mograsim.machine/src/net/mograsim/machine/Machine.java
@@ -1,19 +1,19 @@
 package net.mograsim.machine;
 
-import net.mograsim.logic.core.components.Clock;
+import net.mograsim.logic.core.components.CoreClock;
 import net.mograsim.logic.core.timeline.Timeline;
 import net.mograsim.logic.core.types.BitVector;
-import net.mograsim.logic.model.model.ViewModel;
 import net.mograsim.machine.mi.MicroInstructionMemory;
+import net.mograsim.logic.model.model.LogicModel;
 
 public interface Machine {
        MachineDefinition getDefinition();
        
        void reset();
        
-       ViewModel getModel();
+       LogicModel getModel();
        
-       Clock getClock();
+       CoreClock getClock();
        
        BitVector getRegister(Register r);