projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made finding the ID of a JsonSerializable less ugly
[Mograsim.git]
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
model
/
components
/
atomic
/
GUIBitDisplay.java
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java
index
9d6b57e
..
8d96d0a
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java
@@
-2,9
+2,6
@@
package net.mograsim.logic.model.model.components.atomic;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Color;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonPrimitive;
-
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
@@
-15,9
+12,10
@@
import net.mograsim.logic.core.types.BitVectorFormatter;
import net.mograsim.logic.model.model.ViewModelModifiable;
import net.mograsim.logic.model.model.components.GUIComponent;
import net.mograsim.logic.model.model.wires.Pin;
import net.mograsim.logic.model.model.ViewModelModifiable;
import net.mograsim.logic.model.model.components.GUIComponent;
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.BitDisplayAdapter;
import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
import net.mograsim.logic.model.modeladapter.componentadapters.BitDisplayAdapter;
-import net.mograsim.logic.model.serializing.Identif
ierGetter
;
+import net.mograsim.logic.model.serializing.Identif
yParams
;
import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
import net.mograsim.preferences.Preferences;
import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
import net.mograsim.preferences.Preferences;
@@
-45,7
+43,7
@@
public class GUIBitDisplay extends GUIComponent
logicObs = (i) -> model.requestRedraw();
setSize(width, height);
logicObs = (i) -> model.requestRedraw();
setSize(width, height);
- addPin(this.inputPin = new Pin(this, "", logicWidth, 0, height / 2));
+ addPin(this.inputPin = new Pin(this, "", logicWidth,
PinUsage.INPUT,
0, height / 2));
}
@Override
}
@Override
@@
-93,9
+91,15
@@
public class GUIBitDisplay extends GUIComponent
}
@Override
}
@Override
- public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
+ public String getIDForSerializing(IdentifyParams idParams)
+ {
+ return "GUIBitDisplay";
+ }
+
+ @Override
+ public Integer getParamsForSerializing(IdentifyParams idParams)
{
{
- return
new JsonPrimitive(logicWidth)
;
+ return
logicWidth
;
}
static
}
static