X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FGUIClock.java;h=5d314cc19cc42f62d2b2633bb8165289dd1cc8ad;hb=0a04a4ed66ecebd4254541c4977599f6052c115a;hp=a3ff96c7259d5a15e3ac85f16757d30ea4ec57e1;hpb=8604106a28c3de0b93e46b406a74dc3611e7bca5;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIClock.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIClock.java
index a3ff96c7..5d314cc1 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIClock.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIClock.java
@@ -9,7 +9,7 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.core.LogicObserver;
-import net.mograsim.logic.core.components.Clock;
+import net.mograsim.logic.core.components.CoreClock;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.model.components.Orientation;
@@ -18,7 +18,7 @@ import net.mograsim.logic.model.model.wires.Pin;
 import net.mograsim.logic.model.model.wires.PinUsage;
 import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
 import net.mograsim.logic.model.modeladapter.componentadapters.ClockAdapter;
-import net.mograsim.logic.model.serializing.IdentifierGetter;
+import net.mograsim.logic.model.serializing.IdentifyParams;
 import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
 import net.mograsim.logic.model.util.JsonHandler;
 import net.mograsim.preferences.Preferences;
@@ -34,7 +34,7 @@ public class GUIClock extends GUIComponent
 	private final LogicObserver logicObs;
 	private GUIClockParams params;
 	private OrientationCalculator oc;
-	private Clock clock;
+	private CoreClock clock;
 
 	public GUIClock(ViewModelModifiable model, GUIClockParams params)
 	{
@@ -73,7 +73,7 @@ public class GUIClock extends GUIComponent
 		gc.setFont(oldFont);
 	}
 
-	public void setLogicModelBinding(Clock clock)
+	public void setLogicModelBinding(CoreClock clock)
 	{
 		if (this.clock != null)
 			this.clock.deregisterObserver(logicObs);
@@ -113,7 +113,7 @@ public class GUIClock extends GUIComponent
 		}
 	}
 
-	public Clock getClock()
+	public CoreClock getClock()
 	{
 		return clock;
 	}
@@ -129,7 +129,13 @@ public class GUIClock extends GUIComponent
 	}
 
 	@Override
-	public GUIClockParams getParamsForSerializing(IdentifierGetter idGetter)
+	public String getIDForSerializing(IdentifyParams idParams)
+	{
+		return "GUIClock";
+	}
+
+	@Override
+	public GUIClockParams getParamsForSerializing(IdentifyParams idParams)
 	{
 		return params;
 	}