TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-15 15:58:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

removed some unused vars; see #155

Browse Source
This commit is contained in:
hneemann 2019-05-13 07:44:49 +02:00
parent 84ee0fc836
commit d6a0e37cda
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
View File

@ -421,7 +421,7 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
* *
* @param attrList the list of keys to edit * @param attrList the list of keys to edit
*/ */
public void editCircuitAttributes(java.util.List<Key> attrList) { private void editCircuitAttributes(java.util.List<Key> attrList) {
ElementAttributes modifiedAttributes = new AttributeDialog(parent, attrList, getCircuit().getAttributes()).showDialog(); ElementAttributes modifiedAttributes = new AttributeDialog(parent, attrList, getCircuit().getAttributes()).showDialog();
if (modifiedAttributes != null) if (modifiedAttributes != null)
modify(new ModifyCircuitAttributes(modifiedAttributes)); modify(new ModifyCircuitAttributes(modifiedAttributes));
@ -657,8 +657,7 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
public void addHighLightedWires(ImmutableList<ObservableValue> values) { public void addHighLightedWires(ImmutableList<ObservableValue> values) {
if (values == null) return; if (values == null) return;
HashSet<ObservableValue> ov = new HashSet<>(); HashSet<ObservableValue> ov = new HashSet<>(values);
ov.addAll(values);
for (Wire w : getCircuit().getWires()) for (Wire w : getCircuit().getWires())
if (ov.contains(w.getValue())) if (ov.contains(w.getValue()))
addHighLighted(w); addHighLighted(w);
@ -1499,7 +1498,6 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
private final class MouseControllerMoveElement extends MouseController { private final class MouseControllerMoveElement extends MouseController {
private VisualElement visualElement; private VisualElement visualElement;
private Vector delta; private Vector delta;
private boolean normalEnd;
private VisualElement originalVisualElement; private VisualElement originalVisualElement;
private MouseControllerMoveElement(Cursor cursor) { private MouseControllerMoveElement(Cursor cursor) {
@ -1516,7 +1514,6 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
deleteAction.setEnabled(true); deleteAction.setEnabled(true);
rotateAction.setEnabled(true); rotateAction.setEnabled(true);
copyAction.setEnabled(true); copyAction.setEnabled(true);
normalEnd = false;
repaintNeeded(); repaintNeeded();
} }
@ -1529,7 +1526,6 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
modify(new ModifyMoveAndRotElement(originalVisualElement, visualElement.getPos(), visualElement.getRotate())); modify(new ModifyMoveAndRotElement(originalVisualElement, visualElement.getPos(), visualElement.getRotate()));
insertWires(visualElement); insertWires(visualElement);
} }
normalEnd = true;
} }
mouseNormal.activate(); mouseNormal.activate();
} }
@ -1825,7 +1821,7 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
@Override @Override
void clicked(MouseEvent e) { void clicked(MouseEvent e) {
if (mouse.isPrimaryClick(e)) { if (mouse.isPrimaryClick(e)) {
Modifications.Builder<Circuit> m = new Modifications.Builder<Circuit>(Lang.get("mod_splitWire")); Modifications.Builder<Circuit> m = new Modifications.Builder<>(Lang.get("mod_splitWire"));
m.add(new ModifyDeleteWire(origWire)); m.add(new ModifyDeleteWire(origWire));
m.add(new ModifyInsertWire(wire1)); m.add(new ModifyInsertWire(wire1));
m.add(new ModifyInsertWire(wire2)); m.add(new ModifyInsertWire(wire2));