projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented GUIAm2901ALUFuncDecode
[Mograsim.git]
/
net.mograsim.logic.ui
/
src
/
net
/
mograsim
/
logic
/
ui
/
model
/
components
/
GUIComponent.java
diff --git
a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java
b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java
index
ca21622
..
7254d8b
100644
(file)
--- a/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java
+++ b/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java
@@
-4,15
+4,16
@@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.function.Consumer;
import java.util.Collections;
import java.util.List;
import java.util.function.Consumer;
+import java.util.function.Supplier;
-import net.mograsim.logic.ui.model.ViewModel;
-import net.mograsim.logic.ui.model.wires.Pin;
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
+import net.mograsim.logic.ui.model.ViewModelModifiable;
+import net.mograsim.logic.ui.model.wires.Pin;
public abstract class GUIComponent
{
public abstract class GUIComponent
{
- protected final ViewModel model;
+ protected final ViewModel
Modifiable
model;
private final Rectangle bounds;
private final List<Pin> pins;
protected final List<Pin> pinsUnmodifiable;
private final Rectangle bounds;
private final List<Pin> pins;
protected final List<Pin> pinsUnmodifiable;
@@
-23,8
+24,10
@@
public abstract class GUIComponent
private final List<Runnable> redrawListeners;
private final Runnable redrawListenerForSubcomponents;
private final List<Runnable> redrawListeners;
private final Runnable redrawListenerForSubcomponents;
+ // Defines how the GUIComponent is referenced in SubmodelComponentParams
+ protected Supplier<String> identifierDelegate = () -> "class:".concat(getClass().getCanonicalName());
- public GUIComponent(ViewModel model)
+ public GUIComponent(ViewModel
Modifiable
model)
{
this.model = model;
this.bounds = new Rectangle(0, 0, 0, 0);
{
this.model = model;
this.bounds = new Rectangle(0, 0, 0, 0);
@@
-129,4
+132,12
@@
public abstract class GUIComponent
pin.removeRedrawListener(redrawListenerForSubcomponents);
callRedrawListeners();
}
pin.removeRedrawListener(redrawListenerForSubcomponents);
callRedrawListeners();
}
+
+ /**
+ * @return an identifier used to reference this GUIComponent inside of {@link SubmodelComponentParams}
+ */
+ public String getIdentifier()
+ {
+ return identifierDelegate.get();
+ }
}
\ No newline at end of file
}
\ No newline at end of file