removed unused variables

This commit is contained in:
hneemann 2017-05-26 17:56:18 +02:00
parent 096ac11054
commit ca30aa154e
2 changed files with 272 additions and 5 deletions

View File

@ -0,0 +1,269 @@
<?xml version="1.0" encoding="utf-8"?>
<circuit>
<version>1</version>
<attributes>
<entry>
<string>Description</string>
<string>simple red-yellow-green traffic light with wired and</string>
</entry>
</attributes>
<visualElements>
<visualElement>
<elementName>7476.dig</elementName>
<elementAttributes/>
<pos x="300" y="180"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="280" y="160"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="440" y="160"/>
</visualElement>
<visualElement>
<elementName>Clock</elementName>
<elementAttributes/>
<pos x="240" y="180"/>
</visualElement>
<visualElement>
<elementName>LightBulb</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="1"/>
</entry>
</elementAttributes>
<pos x="540" y="220"/>
</visualElement>
<visualElement>
<elementName>LightBulb</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="1"/>
</entry>
<entry>
<string>Color</string>
<awt-color>
<red>255</red>
<green>255</green>
<blue>0</blue>
<alpha>255</alpha>
</awt-color>
</entry>
</elementAttributes>
<pos x="540" y="260"/>
</visualElement>
<visualElement>
<elementName>LightBulb</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="1"/>
</entry>
<entry>
<string>Color</string>
<awt-color>
<red>0</red>
<green>255</green>
<blue>0</blue>
<alpha>255</alpha>
</awt-color>
</entry>
</elementAttributes>
<pos x="540" y="300"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="600" y="200"/>
</visualElement>
<visualElement>
<elementName>DiodeForward</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="1"/>
</entry>
</elementAttributes>
<pos x="460" y="420"/>
</visualElement>
<visualElement>
<elementName>DiodeForward</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="1"/>
</entry>
</elementAttributes>
<pos x="460" y="300"/>
</visualElement>
<visualElement>
<elementName>PullDown</elementName>
<elementAttributes/>
<pos x="500" y="440"/>
</visualElement>
</visualElements>
<wires>
<wire>
<p1 x="420" y="260"/>
<p2 x="540" y="260"/>
</wire>
<wire>
<p1 x="580" y="260"/>
<p2 x="600" y="260"/>
</wire>
<wire>
<p1 x="280" y="260"/>
<p2 x="300" y="260"/>
</wire>
<wire>
<p1 x="420" y="340"/>
<p2 x="440" y="340"/>
</wire>
<wire>
<p1 x="420" y="180"/>
<p2 x="440" y="180"/>
</wire>
<wire>
<p1 x="240" y="180"/>
<p2 x="260" y="180"/>
</wire>
<wire>
<p1 x="260" y="180"/>
<p2 x="300" y="180"/>
</wire>
<wire>
<p1 x="280" y="420"/>
<p2 x="300" y="420"/>
</wire>
<wire>
<p1 x="420" y="420"/>
<p2 x="460" y="420"/>
</wire>
<wire>
<p1 x="480" y="420"/>
<p2 x="500" y="420"/>
</wire>
<wire>
<p1 x="440" y="300"/>
<p2 x="460" y="300"/>
</wire>
<wire>
<p1 x="580" y="300"/>
<p2 x="600" y="300"/>
</wire>
<wire>
<p1 x="280" y="300"/>
<p2 x="300" y="300"/>
</wire>
<wire>
<p1 x="480" y="300"/>
<p2 x="500" y="300"/>
</wire>
<wire>
<p1 x="500" y="300"/>
<p2 x="540" y="300"/>
</wire>
<wire>
<p1 x="520" y="220"/>
<p2 x="540" y="220"/>
</wire>
<wire>
<p1 x="580" y="220"/>
<p2 x="600" y="220"/>
</wire>
<wire>
<p1 x="420" y="220"/>
<p2 x="440" y="220"/>
</wire>
<wire>
<p1 x="280" y="220"/>
<p2 x="300" y="220"/>
</wire>
<wire>
<p1 x="420" y="380"/>
<p2 x="520" y="380"/>
</wire>
<wire>
<p1 x="260" y="380"/>
<p2 x="300" y="380"/>
</wire>
<wire>
<p1 x="280" y="460"/>
<p2 x="300" y="460"/>
</wire>
<wire>
<p1 x="420" y="460"/>
<p2 x="440" y="460"/>
</wire>
<wire>
<p1 x="260" y="180"/>
<p2 x="260" y="380"/>
</wire>
<wire>
<p1 x="500" y="300"/>
<p2 x="500" y="420"/>
</wire>
<wire>
<p1 x="500" y="420"/>
<p2 x="500" y="440"/>
</wire>
<wire>
<p1 x="280" y="160"/>
<p2 x="280" y="220"/>
</wire>
<wire>
<p1 x="280" y="220"/>
<p2 x="280" y="260"/>
</wire>
<wire>
<p1 x="280" y="420"/>
<p2 x="280" y="460"/>
</wire>
<wire>
<p1 x="280" y="300"/>
<p2 x="280" y="420"/>
</wire>
<wire>
<p1 x="280" y="260"/>
<p2 x="280" y="300"/>
</wire>
<wire>
<p1 x="440" y="160"/>
<p2 x="440" y="180"/>
</wire>
<wire>
<p1 x="440" y="220"/>
<p2 x="440" y="300"/>
</wire>
<wire>
<p1 x="440" y="340"/>
<p2 x="440" y="460"/>
</wire>
<wire>
<p1 x="440" y="300"/>
<p2 x="440" y="340"/>
</wire>
<wire>
<p1 x="520" y="220"/>
<p2 x="520" y="380"/>
</wire>
<wire>
<p1 x="600" y="200"/>
<p2 x="600" y="220"/>
</wire>
<wire>
<p1 x="600" y="220"/>
<p2 x="600" y="260"/>
</wire>
<wire>
<p1 x="600" y="260"/>
<p2 x="600" y="300"/>
</wire>
</wires>
<measurementOrdering/>
</circuit>

View File

@ -291,7 +291,7 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
*
* @param modification the modification
*/
public void addModificationAlreadyMade(Modification modification) {
private void addModificationAlreadyMade(Modification modification) {
while (modifications.size() > undoPosition)
modifications.remove(modifications.size() - 1);
redoAction.setEnabled(false);
@ -313,7 +313,7 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
/**
* undo last action
*/
public void undo() {
private void undo() {
if (undoPosition > 0) {
circuit = new Circuit(initialCircuit);
undoPosition--;
@ -330,7 +330,7 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
/**
* redo last undo
*/
public void redo() {
private void redo() {
if (undoPosition < modifications.size()) {
modifications.get(undoPosition).modify(circuit);
undoPosition++;
@ -1020,7 +1020,6 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
private Vector delta;
private Vector initialPos;
private int initialRot;
private boolean deleted = false;
private MouseControllerMoveElement(Cursor cursor) {
super(cursor);
@ -1067,7 +1066,6 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
if (!isLocked()) {
circuit.delete(visualElement);
addModificationAlreadyMade(new ModifyDeleteElement(visualElement, initialPos));
deleted = true;
mouseNormal.activate();
isManualScale = true;
}