X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FModelTextComponent.java;h=ac0f64d7fee122480c459b5a209e4e327becea63;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=628cb13a7ff7e32a5e9710583ea2e9bcf2d95909;hpb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelTextComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelTextComponent.java index 628cb13a..ac0f64d7 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelTextComponent.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelTextComponent.java @@ -5,9 +5,9 @@ import org.eclipse.swt.graphics.Color; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.model.model.ViewModelModifiable; +import net.mograsim.logic.model.model.LogicModelModifiable; import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; +import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; import net.mograsim.logic.model.modeladapter.componentadapters.NoLogicAdapter; import net.mograsim.logic.model.serializing.IdentifyParams; import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; @@ -19,18 +19,20 @@ public class ModelTextComponent extends ModelComponent private final String text; private boolean calculatedSize; - public ModelTextComponent(ViewModelModifiable model, String text) + public ModelTextComponent(LogicModelModifiable model, String text) { this(model, text, null); } - public ModelTextComponent(ViewModelModifiable model, String text, String name) + public ModelTextComponent(LogicModelModifiable model, String text, String name) { - super(model, name); + super(model, name, false); this.text = text; // If size is unset, it defaults to 0, which could prohibit this component from being rendered, which would prohibit the size being // set to a better guess setSize(1, 1); + + init(); } @Override @@ -65,7 +67,7 @@ public class ModelTextComponent extends ModelComponent static { - ViewLogicModelAdapter.addComponentAdapter(new NoLogicAdapter<>(ModelTextComponent.class)); + LogicCoreAdapter.addComponentAdapter(new NoLogicAdapter<>(ModelTextComponent.class)); IndirectModelComponentCreator.setComponentSupplier(ModelTextComponent.class.getName(), (m, p, n) -> new ModelTextComponent(m, p.getAsString(), n)); }