projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed GUI to Model:
[Mograsim.git]
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
util
/
ModellingTool.java
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java
index
1f19edb
..
06ce3ca
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java
@@
-1,10
+1,10
@@
package net.mograsim.logic.model.util;
import net.mograsim.logic.model.model.ViewModelModifiable;
package net.mograsim.logic.model.util;
import net.mograsim.logic.model.model.ViewModelModifiable;
-import net.mograsim.logic.model.model.components.
GUI
Component;
-import net.mograsim.logic.model.model.wires.
GUI
Wire;
+import net.mograsim.logic.model.model.components.
Model
Component;
+import net.mograsim.logic.model.model.wires.
Model
Wire;
import net.mograsim.logic.model.model.wires.Pin;
import net.mograsim.logic.model.model.wires.Pin;
-import net.mograsim.logic.model.model.wires.WireCrossPoint;
+import net.mograsim.logic.model.model.wires.
Model
WireCrossPoint;
public class ModellingTool
{
public class ModellingTool
{
@@
-15,94
+15,94
@@
public class ModellingTool
this.model = model;
}
this.model = model;
}
- public
GUIWire connect(GUIComponent a, GUI
Component b, String pinA, String pinB)
+ public
ModelWire connect(ModelComponent a, Model
Component b, String pinA, String pinB)
{
return connect(null, a, b, pinA, pinB);
}
{
return connect(null, a, b, pinA, pinB);
}
- public
GUIWire connect(WireCrossPoint a, GUI
Component b, String pinB)
+ public
ModelWire connect(ModelWireCrossPoint a, Model
Component b, String pinB)
{
return connect(null, a, b, pinB);
}
{
return connect(null, a, b, pinB);
}
- public
GUIWire connect(Pin a, GUI
Component b, String pinB)
+ public
ModelWire connect(Pin a, Model
Component b, String pinB)
{
return connect(null, a, b, pinB);
}
{
return connect(null, a, b, pinB);
}
- public
GUIWire connect(GUIComponent a,
WireCrossPoint b, String pinA)
+ public
ModelWire connect(ModelComponent a, Model
WireCrossPoint b, String pinA)
{
return connect(null, a, b, pinA);
}
{
return connect(null, a, b, pinA);
}
- public
GUIWire connect(WireCrossPoint a,
WireCrossPoint b)
+ public
ModelWire connect(ModelWireCrossPoint a, Model
WireCrossPoint b)
{
return connect(null, a, b);
}
{
return connect(null, a, b);
}
- public
GUIWire connect(Pin a,
WireCrossPoint b)
+ public
ModelWire connect(Pin a, Model
WireCrossPoint b)
{
return connect(null, a, b);
}
{
return connect(null, a, b);
}
- public
GUIWire connect(GUI
Component a, Pin b, String pinA)
+ public
ModelWire connect(Model
Component a, Pin b, String pinA)
{
return connect(null, a, b, pinA);
}
{
return connect(null, a, b, pinA);
}
- public
GUIWire connect(
WireCrossPoint a, Pin b)
+ public
ModelWire connect(Model
WireCrossPoint a, Pin b)
{
return connect(null, a, b);
}
{
return connect(null, a, b);
}
- public
GUI
Wire connect(Pin a, Pin b)
+ public
Model
Wire connect(Pin a, Pin b)
{
return connect(null, a, b);
}
{
return connect(null, a, b);
}
- public
GUIWire connect(String name, GUIComponent a, GUI
Component b, String pinA, String pinB)
+ public
ModelWire connect(String name, ModelComponent a, Model
Component b, String pinA, String pinB)
{
return connect(name, a.getPin(pinA), b.getPin(pinB));
}
{
return connect(name, a.getPin(pinA), b.getPin(pinB));
}
- public
GUIWire connect(String name, WireCrossPoint a, GUI
Component b, String pinB)
+ public
ModelWire connect(String name, ModelWireCrossPoint a, Model
Component b, String pinB)
{
return connect(name, a.getPin(), b.getPin(pinB));
}
{
return connect(name, a.getPin(), b.getPin(pinB));
}
- public
GUIWire connect(String name, Pin a, GUI
Component b, String pinB)
+ public
ModelWire connect(String name, Pin a, Model
Component b, String pinB)
{
return connect(name, a, b.getPin(pinB));
}
{
return connect(name, a, b.getPin(pinB));
}
- public
GUIWire connect(String name, GUIComponent a,
WireCrossPoint b, String pinA)
+ public
ModelWire connect(String name, ModelComponent a, Model
WireCrossPoint b, String pinA)
{
return connect(name, a.getPin(pinA), b.getPin());
}
{
return connect(name, a.getPin(pinA), b.getPin());
}
- public
GUIWire connect(String name, WireCrossPoint a,
WireCrossPoint b)
+ public
ModelWire connect(String name, ModelWireCrossPoint a, Model
WireCrossPoint b)
{
return connect(name, a.getPin(), b.getPin());
}
{
return connect(name, a.getPin(), b.getPin());
}
- public
GUIWire connect(String name, Pin a,
WireCrossPoint b)
+ public
ModelWire connect(String name, Pin a, Model
WireCrossPoint b)
{
return connect(name, a, b.getPin());
}
{
return connect(name, a, b.getPin());
}
- public
GUIWire connect(String name, GUI
Component a, Pin b, String pinA)
+ public
ModelWire connect(String name, Model
Component a, Pin b, String pinA)
{
return connect(name, a.getPin(pinA), b);
}
{
return connect(name, a.getPin(pinA), b);
}
- public
GUIWire connect(String name,
WireCrossPoint a, Pin b)
+ public
ModelWire connect(String name, Model
WireCrossPoint a, Pin b)
{
return connect(name, a.getPin(), b);
}
{
return connect(name, a.getPin(), b);
}
- public
GUI
Wire connect(String name, Pin a, Pin b)
+ public
Model
Wire connect(String name, Pin a, Pin b)
{
{
- return new
GUI
Wire(model, name, a, b);
+ return new
Model
Wire(model, name, a, b);
}
public static ModellingTool createFor(ViewModelModifiable model)
}
public static ModellingTool createFor(ViewModelModifiable model)