Added the possibility for having machine descriptions

[Mograsim.git] / plugins / net.mograsim.machine / src / net / mograsim / machine / ModelMemory.java

diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/ModelMemory.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/ModelMemory.java
index d0459dc..9b820eb 100644 (file)
--- a/plugins/net.mograsim.machine/src/net/mograsim/machine/ModelMemory.java
+++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/ModelMemory.java
@@ -4,16 +4,16 @@ import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.components.ModelComponent;
+import net.mograsim.logic.model.preferences.RenderPreferences;
 import net.mograsim.logic.model.snippets.Renderer;
 import net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer;
 import net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer;
 import net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer.SimpleRectangularLikeParams;
 
-public abstract class ModelMemory<M extends Machine> extends ModelComponent
+public abstract class ModelMemory extends ModelComponent
 {
        private Renderer symbolRenderer;
        private Renderer outlineRenderer;
-       private M machine;
 
        protected ModelMemory(LogicModelModifiable model, int width, int height, String name, String centerText, boolean callInit)
        {
@@ -35,19 +35,9 @@ public abstract class ModelMemory<M extends Machine> extends ModelComponent
        }
 
        @Override
-       public void render(GeneralGC gc, Rectangle visibleRegion)
+       public void render(GeneralGC gc, RenderPreferences renderPrefs, Rectangle visibleRegion)
        {
-               symbolRenderer.render(gc, visibleRegion);
-               outlineRenderer.render(gc, visibleRegion);
+               symbolRenderer.render(gc, renderPrefs, visibleRegion);
+               outlineRenderer.render(gc, renderPrefs, visibleRegion);
        }
-
-       public void setMachine(M machine)
-       {
-               this.machine = machine;
-       }
-
-       public M getMachine()
-       {
-               return machine;
-       }
-}
+}
\ No newline at end of file