projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup; Cleared warnings in the logic core
[Mograsim.git]
/
net.mograsim.logic.core
/
src
/
net
/
mograsim
/
logic
/
core
/
wires
/
Wire.java
diff --git
a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java
b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java
index
404aacd
..
ffbbd32
100644
(file)
--- a/
net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java
+++ b/
net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java
@@
-23,10
+23,10
@@
public class Wire
{
\r
private BitVector values;
\r
public final int travelTime;
\r
{
\r
private BitVector values;
\r
public final int travelTime;
\r
- private List<ReadEnd> attached = new ArrayList<
ReadEnd
>();
\r
+ private List<ReadEnd> attached = new ArrayList<>();
\r
public final int length;
\r
public final int length;
\r
-
private List<ReadWriteEnd> inputs = new ArrayList<ReadWriteEnd
>();
\r
-
private
Timeline timeline;
\r
+
List<ReadWriteEnd> inputs = new ArrayList<
>();
\r
+ Timeline timeline;
\r
\r
public Wire(Timeline timeline, int length, int travelTime)
\r
{
\r
\r
public Wire(Timeline timeline, int length, int travelTime)
\r
{
\r
@@
-61,12
+61,12
@@
public class Wire
{
\r
if (values.equals(newValues))
\r
return;
\r
{
\r
if (values.equals(newValues))
\r
return;
\r
-
BitVector oldValues = values;
\r
+
//
BitVector oldValues = values;
\r
values = newValues;
\r
values = newValues;
\r
- notifyObservers(
oldValues
);
\r
+ notifyObservers();
\r
}
\r
\r
}
\r
\r
-
private
void recalculate()
\r
+ void recalculate()
\r
{
\r
switch (inputs.size())
\r
{
\r
{
\r
switch (inputs.size())
\r
{
\r
@@
-174,20
+174,20
@@
public class Wire
*
\r
* @author Fabian Stemmler
\r
*/
\r
*
\r
* @author Fabian Stemmler
\r
*/
\r
-
private
void attachEnd(ReadEnd end)
\r
+ void attachEnd(ReadEnd end)
\r
{
\r
attached.add(end);
\r
}
\r
\r
{
\r
attached.add(end);
\r
}
\r
\r
-
private
void detachEnd(ReadEnd end)
\r
+ void detachEnd(ReadEnd end)
\r
{
\r
attached.remove(end);
\r
}
\r
\r
{
\r
attached.remove(end);
\r
}
\r
\r
- private void notifyObservers(
BitVector oldValues
)
\r
+ private void notifyObservers()
\r
{
\r
for (ReadEnd o : attached)
\r
{
\r
for (ReadEnd o : attached)
\r
- o.update(
oldValues
);
\r
+ o.update();
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r
@@
-206,7
+206,7
@@
public class Wire
return new ReadEnd();
\r
}
\r
\r
return new ReadEnd();
\r
}
\r
\r
-
private
void registerInput(ReadWriteEnd toRegister)
\r
+ void registerInput(ReadWriteEnd toRegister)
\r
{
\r
inputs.add(toRegister);
\r
}
\r
{
\r
inputs.add(toRegister);
\r
}
\r
@@
-220,15
+220,15
@@
public class Wire
*/
\r
public class ReadEnd implements LogicObservable
\r
{
\r
*/
\r
public class ReadEnd implements LogicObservable
\r
{
\r
- private List<LogicObserver> observers = new ArrayList<
LogicObserver
>();
\r
+ private List<LogicObserver> observers = new ArrayList<>();
\r
\r
\r
-
private
ReadEnd()
\r
+ ReadEnd()
\r
{
\r
super();
\r
Wire.this.attachEnd(this);
\r
}
\r
\r
{
\r
super();
\r
Wire.this.attachEnd(this);
\r
}
\r
\r
- public void update(
BitVector oldValues
)
\r
+ public void update()
\r
{
\r
notifyObservers();
\r
}
\r
{
\r
notifyObservers();
\r
}
\r
@@
-345,6
+345,12
@@
public class Wire
observers.add(ob);
\r
}
\r
\r
observers.add(ob);
\r
}
\r
\r
+ @Override
\r
+ public void deregisterObserver(LogicObserver ob)
\r
+ {
\r
+ observers.remove(ob);
\r
+ }
\r
+
\r
@Override
\r
public void notifyObservers()
\r
{
\r
@Override
\r
public void notifyObservers()
\r
{
\r
@@
-358,7
+364,7
@@
public class Wire
private boolean open;
\r
private BitVector inputValues;
\r
\r
private boolean open;
\r
private BitVector inputValues;
\r
\r
-
private
ReadWriteEnd()
\r
+ ReadWriteEnd()
\r
{
\r
super();
\r
open = true;
\r
{
\r
super();
\r
open = true;
\r