From: Daniel Kirschten Date: Fri, 9 Aug 2019 18:48:19 +0000 (+0200) Subject: Renderers can now be used for atomic GUI components X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=7201c9170353eed94815da8a34df85bfb380ec7b;p=Mograsim.git Renderers can now be used for atomic GUI components --- diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java index 7c691a81..394eec0c 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Map; +import net.mograsim.logic.model.model.components.GUIComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; import net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler; import net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer; @@ -12,8 +13,8 @@ import net.mograsim.logic.model.util.JsonHandler; public class SubmodelComponentSnippetSuppliers { - public static final CodeSnippetSupplier symbolRendererSupplier; - public static final CodeSnippetSupplier outlineRendererSupplier; + public static final CodeSnippetSupplier symbolRendererSupplier; + public static final CodeSnippetSupplier outlineRendererSupplier; public static final CodeSnippetSupplier highLevelStateHandlerSupplier; static diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/outlinerenderers/DefaultOutlineRenderer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/outlinerenderers/DefaultOutlineRenderer.java index 13a8eb4c..2bee25f3 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/outlinerenderers/DefaultOutlineRenderer.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/outlinerenderers/DefaultOutlineRenderer.java @@ -3,7 +3,6 @@ package net.mograsim.logic.model.snippets.outlinerenderers; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.model.model.components.GUIComponent; -import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; import net.mograsim.logic.model.serializing.IdentifierGetter; import net.mograsim.logic.model.snippets.Renderer; import net.mograsim.logic.model.snippets.SnippetDefinintion; @@ -16,12 +15,12 @@ public class DefaultOutlineRenderer implements Renderer { private final GUIComponent component; - public DefaultOutlineRenderer(SubmodelComponent component) + public DefaultOutlineRenderer(GUIComponent component) { this(component, null); } - public DefaultOutlineRenderer(SubmodelComponent component, @SuppressWarnings("unused") Void params) + public DefaultOutlineRenderer(GUIComponent component, @SuppressWarnings("unused") Void params) { this.component = component; } diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/CenteredTextSymbolRenderer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/CenteredTextSymbolRenderer.java index 7705203c..515b7b6b 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/CenteredTextSymbolRenderer.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/CenteredTextSymbolRenderer.java @@ -5,7 +5,6 @@ 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.model.model.components.GUIComponent; -import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; import net.mograsim.logic.model.serializing.IdentifierGetter; import net.mograsim.logic.model.snippets.Renderer; import net.mograsim.logic.model.snippets.SnippetDefinintion; @@ -25,7 +24,7 @@ public class CenteredTextSymbolRenderer implements Renderer private final String text; private final double fontHeight; - public CenteredTextSymbolRenderer(SubmodelComponent component, CenteredTextParams params) + public CenteredTextSymbolRenderer(GUIComponent component, CenteredTextParams params) { this.component = component; this.text = params.text; diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/DefaultSymbolRenderer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/DefaultSymbolRenderer.java index d24ff221..9e097aa2 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/DefaultSymbolRenderer.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/DefaultSymbolRenderer.java @@ -4,7 +4,6 @@ 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.components.GUIComponent; -import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; import net.mograsim.logic.model.serializing.IdentifierGetter; import net.mograsim.logic.model.snippets.Renderer; import net.mograsim.logic.model.snippets.SnippetDefinintion; @@ -19,12 +18,12 @@ public class DefaultSymbolRenderer implements Renderer private final GUIComponent component; - public DefaultSymbolRenderer(SubmodelComponent component) + public DefaultSymbolRenderer(GUIComponent component) { this(component, null); } - public DefaultSymbolRenderer(SubmodelComponent component, @SuppressWarnings("unused") Void params) + public DefaultSymbolRenderer(GUIComponent component, @SuppressWarnings("unused") Void params) { this.component = component; } diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/SimpleRectangularLikeSymbolRenderer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/SimpleRectangularLikeSymbolRenderer.java index be820a68..2eda106b 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/SimpleRectangularLikeSymbolRenderer.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/SimpleRectangularLikeSymbolRenderer.java @@ -9,7 +9,6 @@ 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.model.model.components.GUIComponent; -import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.serializing.IdentifierGetter; import net.mograsim.logic.model.snippets.Renderer; @@ -34,7 +33,7 @@ public class SimpleRectangularLikeSymbolRenderer implements Renderer private final double pinLabelHeight; private final double pinLabelMargin; - public SimpleRectangularLikeSymbolRenderer(SubmodelComponent component, SimpleRectangularLikeParams params) + public SimpleRectangularLikeSymbolRenderer(GUIComponent component, SimpleRectangularLikeParams params) { this.component = component; this.centerText = params.centerText;