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

moved a package

Browse Source
This commit is contained in:
hneemann 2016-03-27 10:55:46 +02:00
parent ed015c16af
commit c935fea6d4
58 changed files with 225 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/neemann/digital/core/element/ShapeFactory.java
View File

@ -1,6 +1,6 @@
package de.neemann.digital.core.element; package de.neemann.digital.core.element;
import de.neemann.digital.gui.draw.shapes.Shape; import de.neemann.digital.draw.shapes.Shape;
/** /**
* @author hneemann * @author hneemann

6
src/main/java/de/neemann/digital/core/wiring/DataBus.java
View File

@ -3,9 +3,9 @@ package de.neemann.digital.core.wiring;
import de.neemann.digital.core.BurnException; import de.neemann.digital.core.BurnException;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.gui.draw.elements.Pin; import de.neemann.digital.draw.elements.Pin;
import de.neemann.digital.gui.draw.elements.PinException; import de.neemann.digital.draw.elements.PinException;
import de.neemann.digital.gui.draw.model.Net; import de.neemann.digital.draw.model.Net;
import de.neemann.digital.lang.Lang; import de.neemann.digital.lang.Lang;
import java.util.ArrayList; import java.util.ArrayList;

10
src/main/java/de/neemann/digital/gui/draw/elements/Circuit.java → src/main/java/de/neemann/digital/draw/elements/Circuit.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.elements; package de.neemann.digital.draw.elements;
import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.PrettyPrintWriter; import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
@ -11,10 +11,10 @@ import de.neemann.digital.core.element.ElementTypeDescription;
import de.neemann.digital.core.io.In; import de.neemann.digital.core.io.In;
import de.neemann.digital.core.io.Out; import de.neemann.digital.core.io.Out;
import de.neemann.digital.core.memory.DataField; import de.neemann.digital.core.memory.DataField;
import de.neemann.digital.gui.draw.graphics.Graphic; import de.neemann.digital.draw.graphics.Graphic;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
import de.neemann.digital.gui.draw.library.ElementLibrary; import de.neemann.digital.draw.library.ElementLibrary;
import de.neemann.digital.gui.draw.shapes.Drawable; import de.neemann.digital.draw.shapes.Drawable;
import de.neemann.digital.lang.Lang; import de.neemann.digital.lang.Lang;
import java.io.*; import java.io.*;

4
src/main/java/de/neemann/digital/gui/draw/elements/DotCreator.java → src/main/java/de/neemann/digital/draw/elements/DotCreator.java
View File

@ -1,6 +1,6 @@
package de.neemann.digital.gui.draw.elements; package de.neemann.digital.draw.elements;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

2
src/main/java/de/neemann/digital/gui/draw/elements/IOState.java → src/main/java/de/neemann/digital/draw/elements/IOState.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.elements; package de.neemann.digital.draw.elements;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;

10
src/main/java/de/neemann/digital/draw/elements/Moveable.java Normal file
View File

@ -0,0 +1,10 @@
package de.neemann.digital.draw.elements;
import de.neemann.digital.draw.graphics.Vector;
/**
* @author hneemann
*/
public interface Moveable {
void move(Vector delta);
}

4
src/main/java/de/neemann/digital/gui/draw/elements/Pin.java → src/main/java/de/neemann/digital/draw/elements/Pin.java
View File

@ -1,7 +1,7 @@
package de.neemann.digital.gui.draw.elements; package de.neemann.digital.draw.elements;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
/** /**
* Puts the pins name and the pins x-y-position together! * Puts the pins name and the pins x-y-position together!

4
src/main/java/de/neemann/digital/gui/draw/elements/PinException.java → src/main/java/de/neemann/digital/draw/elements/PinException.java
View File

@ -1,6 +1,6 @@
package de.neemann.digital.gui.draw.elements; package de.neemann.digital.draw.elements;
import de.neemann.digital.gui.draw.model.Net; import de.neemann.digital.draw.model.Net;
/** /**
* @author hneemann * @author hneemann

2
src/main/java/de/neemann/digital/gui/draw/elements/PinOrder.java → src/main/java/de/neemann/digital/draw/elements/PinOrder.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.elements; package de.neemann.digital.draw.elements;
import de.neemann.digital.core.element.AttributeKey; import de.neemann.digital.core.element.AttributeKey;
import de.neemann.digital.gui.components.ElementOrderer; import de.neemann.digital.gui.components.ElementOrderer;

2
src/main/java/de/neemann/digital/gui/draw/elements/Pins.java → src/main/java/de/neemann/digital/draw/elements/Pins.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.elements; package de.neemann.digital.draw.elements;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.lang.Lang; import de.neemann.digital.lang.Lang;

12
src/main/java/de/neemann/digital/gui/draw/elements/VisualElement.java → src/main/java/de/neemann/digital/draw/elements/VisualElement.java
View File

@ -1,15 +1,15 @@
package de.neemann.digital.gui.draw.elements; package de.neemann.digital.draw.elements;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.core.element.AttributeKey; import de.neemann.digital.core.element.AttributeKey;
import de.neemann.digital.core.element.AttributeListener; import de.neemann.digital.core.element.AttributeListener;
import de.neemann.digital.core.element.ElementAttributes; import de.neemann.digital.core.element.ElementAttributes;
import de.neemann.digital.draw.graphics.*;
import de.neemann.digital.draw.shapes.Drawable;
import de.neemann.digital.draw.shapes.Interactor;
import de.neemann.digital.draw.shapes.Shape;
import de.neemann.digital.draw.shapes.ShapeFactory;
import de.neemann.digital.gui.components.CircuitComponent; import de.neemann.digital.gui.components.CircuitComponent;
import de.neemann.digital.gui.draw.graphics.*;
import de.neemann.digital.gui.draw.shapes.Drawable;
import de.neemann.digital.gui.draw.shapes.Interactor;
import de.neemann.digital.gui.draw.shapes.Shape;
import de.neemann.digital.gui.draw.shapes.ShapeFactory;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

12
src/main/java/de/neemann/digital/gui/draw/elements/Wire.java → src/main/java/de/neemann/digital/draw/elements/Wire.java
View File

@ -1,10 +1,10 @@
package de.neemann.digital.gui.draw.elements; package de.neemann.digital.draw.elements;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.gui.draw.graphics.Graphic; import de.neemann.digital.draw.graphics.Graphic;
import de.neemann.digital.gui.draw.graphics.Style; import de.neemann.digital.draw.graphics.Style;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
import de.neemann.digital.gui.draw.shapes.Drawable; import de.neemann.digital.draw.shapes.Drawable;
/** /**
* @author hneemann * @author hneemann
@ -40,7 +40,7 @@ public class Wire implements Drawable, Moveable {
if (value != null && p1.y == p2.y && Math.abs(p1.x - p2.x) > MIN_LABEL_LEN && value.getBits() > 1) { if (value != null && p1.y == p2.y && Math.abs(p1.x - p2.x) > MIN_LABEL_LEN && value.getBits() > 1) {
Vector pos = p1.add(p2).div(2).add(0, -2); Vector pos = p1.add(p2).div(2).add(0, -2);
graphic.drawText(pos, pos.add(1, 0), value.getValueString(), de.neemann.digital.gui.draw.graphics.Orientation.CENTERBOTTOM, Style.SHAPE_PIN); graphic.drawText(pos, pos.add(1, 0), value.getValueString(), de.neemann.digital.draw.graphics.Orientation.CENTERBOTTOM, Style.SHAPE_PIN);
} }
if (p1Dot || p2Dot) { if (p1Dot || p2Dot) {

2
src/main/java/de/neemann/digital/gui/draw/elements/WireConsistencyChecker.java → src/main/java/de/neemann/digital/draw/elements/WireConsistencyChecker.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.elements; package de.neemann.digital.draw.elements;
import java.util.ArrayList; import java.util.ArrayList;

4
src/main/java/de/neemann/digital/gui/draw/elements/WireMerger.java → src/main/java/de/neemann/digital/draw/elements/WireMerger.java
View File

@ -1,6 +1,6 @@
package de.neemann.digital.gui.draw.elements; package de.neemann.digital.draw.elements;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

2
src/main/java/de/neemann/digital/gui/draw/graphics/Graphic.java → src/main/java/de/neemann/digital/draw/graphics/Graphic.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.graphics; package de.neemann.digital.draw.graphics;
/** /**
* @author hneemann * @author hneemann

2
src/main/java/de/neemann/digital/gui/draw/graphics/GraphicMinMax.java → src/main/java/de/neemann/digital/draw/graphics/GraphicMinMax.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.graphics; package de.neemann.digital.draw.graphics;
/** /**
* @author hneemann * @author hneemann

2
src/main/java/de/neemann/digital/gui/draw/graphics/GraphicSwing.java → src/main/java/de/neemann/digital/draw/graphics/GraphicSwing.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.graphics; package de.neemann.digital.draw.graphics;
import java.awt.*; import java.awt.*;

2
src/main/java/de/neemann/digital/gui/draw/graphics/GraphicTransform.java → src/main/java/de/neemann/digital/draw/graphics/GraphicTransform.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.graphics; package de.neemann.digital.draw.graphics;
/** /**
* @author hneemann * @author hneemann

2
src/main/java/de/neemann/digital/gui/draw/graphics/Orientation.java → src/main/java/de/neemann/digital/draw/graphics/Orientation.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.graphics; package de.neemann.digital.draw.graphics;
/** /**
* @author hneemann * @author hneemann

2
src/main/java/de/neemann/digital/gui/draw/graphics/Polygon.java → src/main/java/de/neemann/digital/draw/graphics/Polygon.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.graphics; package de.neemann.digital.draw.graphics;
import java.util.ArrayList; import java.util.ArrayList;

2
src/main/java/de/neemann/digital/gui/draw/graphics/Style.java → src/main/java/de/neemann/digital/draw/graphics/Style.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.graphics; package de.neemann.digital.draw.graphics;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;

2
src/main/java/de/neemann/digital/gui/draw/graphics/Transform.java → src/main/java/de/neemann/digital/draw/graphics/Transform.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.graphics; package de.neemann.digital.draw.graphics;
/** /**
* @author hneemann * @author hneemann

4
src/main/java/de/neemann/digital/gui/draw/graphics/Vector.java → src/main/java/de/neemann/digital/draw/graphics/Vector.java
View File

@ -1,6 +1,6 @@
package de.neemann.digital.gui.draw.graphics; package de.neemann.digital.draw.graphics;
import de.neemann.digital.gui.draw.elements.Moveable; import de.neemann.digital.draw.elements.Moveable;
/** /**
* @author hneemann * @author hneemann

10
src/main/java/de/neemann/digital/gui/draw/library/CustomElement.java → src/main/java/de/neemann/digital/draw/library/CustomElement.java
View File

@ -1,13 +1,13 @@
package de.neemann.digital.gui.draw.library; package de.neemann.digital.draw.library;
import de.neemann.digital.core.Model; import de.neemann.digital.core.Model;
import de.neemann.digital.core.NodeException; import de.neemann.digital.core.NodeException;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.core.element.Element; import de.neemann.digital.core.element.Element;
import de.neemann.digital.gui.draw.elements.Circuit; import de.neemann.digital.draw.elements.Circuit;
import de.neemann.digital.gui.draw.elements.PinException; import de.neemann.digital.draw.elements.PinException;
import de.neemann.digital.gui.draw.model.ModelDescription; import de.neemann.digital.draw.model.ModelDescription;
import de.neemann.digital.gui.draw.model.NetList; import de.neemann.digital.draw.model.NetList;
/** /**
* @author hneemann * @author hneemann

2
src/main/java/de/neemann/digital/gui/draw/library/ElementLibrary.java → src/main/java/de/neemann/digital/draw/library/ElementLibrary.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.library; package de.neemann.digital.draw.library;
import de.neemann.digital.core.arithmetic.Add; import de.neemann.digital.core.arithmetic.Add;
import de.neemann.digital.core.arithmetic.Comparator; import de.neemann.digital.core.arithmetic.Comparator;

2
src/main/java/de/neemann/digital/gui/draw/library/ElementNotFoundNotification.java → src/main/java/de/neemann/digital/draw/library/ElementNotFoundNotification.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.library; package de.neemann.digital.draw.library;
import de.neemann.digital.core.element.ElementTypeDescription; import de.neemann.digital.core.element.ElementTypeDescription;

8
src/main/java/de/neemann/digital/gui/draw/model/ModelBuilder.java → src/main/java/de/neemann/digital/draw/model/ModelBuilder.java
View File

@ -1,12 +1,12 @@
package de.neemann.digital.gui.draw.model; package de.neemann.digital.draw.model;
import de.neemann.digital.core.Model; import de.neemann.digital.core.Model;
import de.neemann.digital.core.NodeException; import de.neemann.digital.core.NodeException;
import de.neemann.digital.core.wiring.Clock; import de.neemann.digital.core.wiring.Clock;
import de.neemann.digital.draw.elements.Circuit;
import de.neemann.digital.draw.elements.PinException;
import de.neemann.digital.draw.library.ElementLibrary;
import de.neemann.digital.gui.Main; import de.neemann.digital.gui.Main;
import de.neemann.digital.gui.draw.elements.Circuit;
import de.neemann.digital.gui.draw.elements.PinException;
import de.neemann.digital.gui.draw.library.ElementLibrary;
import java.util.ArrayList; import java.util.ArrayList;

8
src/main/java/de/neemann/digital/gui/draw/model/ModelDescription.java → src/main/java/de/neemann/digital/draw/model/ModelDescription.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.model; package de.neemann.digital.draw.model;
import de.neemann.digital.core.*; import de.neemann.digital.core.*;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
@ -7,9 +7,9 @@ import de.neemann.digital.core.element.Element;
import de.neemann.digital.core.element.ElementTypeDescription; import de.neemann.digital.core.element.ElementTypeDescription;
import de.neemann.digital.core.io.In; import de.neemann.digital.core.io.In;
import de.neemann.digital.core.io.Out; import de.neemann.digital.core.io.Out;
import de.neemann.digital.gui.draw.elements.*; import de.neemann.digital.draw.elements.*;
import de.neemann.digital.gui.draw.library.CustomElement; import de.neemann.digital.draw.library.CustomElement;
import de.neemann.digital.gui.draw.library.ElementLibrary; import de.neemann.digital.draw.library.ElementLibrary;
import de.neemann.digital.lang.Lang; import de.neemann.digital.lang.Lang;
import java.util.*; import java.util.*;

4
src/main/java/de/neemann/digital/gui/draw/model/ModelEntry.java → src/main/java/de/neemann/digital/draw/model/ModelEntry.java
View File

@ -1,11 +1,11 @@
package de.neemann.digital.gui.draw.model; package de.neemann.digital.draw.model;
import de.neemann.digital.core.NodeException; import de.neemann.digital.core.NodeException;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.core.element.Element; import de.neemann.digital.core.element.Element;
import de.neemann.digital.core.wiring.Splitter; import de.neemann.digital.core.wiring.Splitter;
import de.neemann.digital.gui.draw.elements.*; import de.neemann.digital.draw.elements.*;
import de.neemann.digital.lang.Lang; import de.neemann.digital.lang.Lang;
import java.util.ArrayList; import java.util.ArrayList;

10
src/main/java/de/neemann/digital/gui/draw/model/Net.java → src/main/java/de/neemann/digital/draw/model/Net.java
View File

@ -1,11 +1,11 @@
package de.neemann.digital.gui.draw.model; package de.neemann.digital.draw.model;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.core.wiring.DataBus; import de.neemann.digital.core.wiring.DataBus;
import de.neemann.digital.gui.draw.elements.Pin; import de.neemann.digital.draw.elements.Pin;
import de.neemann.digital.gui.draw.elements.PinException; import de.neemann.digital.draw.elements.PinException;
import de.neemann.digital.gui.draw.elements.Wire; import de.neemann.digital.draw.elements.Wire;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
import de.neemann.digital.lang.Lang; import de.neemann.digital.lang.Lang;
import java.util.ArrayList; import java.util.ArrayList;

8
src/main/java/de/neemann/digital/gui/draw/model/NetList.java → src/main/java/de/neemann/digital/draw/model/NetList.java
View File

@ -1,8 +1,8 @@
package de.neemann.digital.gui.draw.model; package de.neemann.digital.draw.model;
import de.neemann.digital.gui.draw.elements.Pin; import de.neemann.digital.draw.elements.Pin;
import de.neemann.digital.gui.draw.elements.Wire; import de.neemann.digital.draw.elements.Wire;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;

14
src/main/java/de/neemann/digital/gui/draw/shapes/ClockShape.java → src/main/java/de/neemann/digital/draw/shapes/ClockShape.java
View File

@ -1,17 +1,17 @@
package de.neemann.digital.gui.draw.shapes; package de.neemann.digital.draw.shapes;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.draw.elements.IOState;
import de.neemann.digital.draw.elements.Pin;
import de.neemann.digital.draw.elements.Pins;
import de.neemann.digital.draw.graphics.*;
import de.neemann.digital.draw.graphics.Polygon;
import de.neemann.digital.gui.components.CircuitComponent; import de.neemann.digital.gui.components.CircuitComponent;
import de.neemann.digital.gui.draw.elements.IOState;
import de.neemann.digital.gui.draw.elements.Pin;
import de.neemann.digital.gui.draw.elements.Pins;
import de.neemann.digital.gui.draw.graphics.*;
import de.neemann.digital.gui.draw.graphics.Polygon;
import java.awt.*; import java.awt.*;
import static de.neemann.digital.gui.draw.shapes.OutputShape.SIZE; import static de.neemann.digital.draw.shapes.OutputShape.SIZE;
/** /**
* @author hneemann * @author hneemann

16
src/main/java/de/neemann/digital/gui/draw/shapes/ConstShape.java → src/main/java/de/neemann/digital/draw/shapes/ConstShape.java
View File

@ -1,14 +1,14 @@
package de.neemann.digital.gui.draw.shapes; package de.neemann.digital.draw.shapes;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.gui.draw.elements.IOState; import de.neemann.digital.draw.elements.IOState;
import de.neemann.digital.gui.draw.elements.Pin; import de.neemann.digital.draw.elements.Pin;
import de.neemann.digital.gui.draw.elements.Pins; import de.neemann.digital.draw.elements.Pins;
import de.neemann.digital.gui.draw.graphics.Graphic; import de.neemann.digital.draw.graphics.Graphic;
import de.neemann.digital.gui.draw.graphics.Orientation; import de.neemann.digital.draw.graphics.Orientation;
import de.neemann.digital.gui.draw.graphics.Style; import de.neemann.digital.draw.graphics.Style;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
/** /**
* @author hneemann * @author hneemann

18
src/main/java/de/neemann/digital/gui/draw/shapes/DemuxerShape.java → src/main/java/de/neemann/digital/draw/shapes/DemuxerShape.java
View File

@ -1,15 +1,15 @@
package de.neemann.digital.gui.draw.shapes; package de.neemann.digital.draw.shapes;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.gui.draw.elements.IOState; import de.neemann.digital.draw.elements.IOState;
import de.neemann.digital.gui.draw.elements.Pin; import de.neemann.digital.draw.elements.Pin;
import de.neemann.digital.gui.draw.elements.Pins; import de.neemann.digital.draw.elements.Pins;
import de.neemann.digital.gui.draw.graphics.Graphic; import de.neemann.digital.draw.graphics.Graphic;
import de.neemann.digital.gui.draw.graphics.Polygon; import de.neemann.digital.draw.graphics.Polygon;
import de.neemann.digital.gui.draw.graphics.Style; import de.neemann.digital.draw.graphics.Style;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
import static de.neemann.digital.gui.draw.shapes.GenericShape.SIZE; import static de.neemann.digital.draw.shapes.GenericShape.SIZE;
/** /**
* @author hneemann * @author hneemann

4
src/main/java/de/neemann/digital/gui/draw/shapes/Drawable.java → src/main/java/de/neemann/digital/draw/shapes/Drawable.java
View File

@ -1,6 +1,6 @@
package de.neemann.digital.gui.draw.shapes; package de.neemann.digital.draw.shapes;
import de.neemann.digital.gui.draw.graphics.Graphic; import de.neemann.digital.draw.graphics.Graphic;
/** /**
* @author hneemann * @author hneemann

18
src/main/java/de/neemann/digital/gui/draw/shapes/DriverShape.java → src/main/java/de/neemann/digital/draw/shapes/DriverShape.java
View File

@ -1,15 +1,15 @@
package de.neemann.digital.gui.draw.shapes; package de.neemann.digital.draw.shapes;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.gui.draw.elements.IOState; import de.neemann.digital.draw.elements.IOState;
import de.neemann.digital.gui.draw.elements.Pin; import de.neemann.digital.draw.elements.Pin;
import de.neemann.digital.gui.draw.elements.Pins; import de.neemann.digital.draw.elements.Pins;
import de.neemann.digital.gui.draw.graphics.Graphic; import de.neemann.digital.draw.graphics.Graphic;
import de.neemann.digital.gui.draw.graphics.Polygon; import de.neemann.digital.draw.graphics.Polygon;
import de.neemann.digital.gui.draw.graphics.Style; import de.neemann.digital.draw.graphics.Style;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
import static de.neemann.digital.gui.draw.shapes.GenericShape.SIZE; import static de.neemann.digital.draw.shapes.GenericShape.SIZE;
/** /**
* @author hneemann * @author hneemann

10
src/main/java/de/neemann/digital/gui/draw/shapes/GenericShape.java → src/main/java/de/neemann/digital/draw/shapes/GenericShape.java
View File

@ -1,10 +1,10 @@
package de.neemann.digital.gui.draw.shapes; package de.neemann.digital.draw.shapes;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.gui.draw.elements.IOState; import de.neemann.digital.draw.elements.IOState;
import de.neemann.digital.gui.draw.elements.Pin; import de.neemann.digital.draw.elements.Pin;
import de.neemann.digital.gui.draw.elements.Pins; import de.neemann.digital.draw.elements.Pins;
import de.neemann.digital.gui.draw.graphics.*; import de.neemann.digital.draw.graphics.*;
/** /**
* Universal Shape. Used for most components. * Universal Shape. Used for most components.

16
src/main/java/de/neemann/digital/gui/draw/shapes/InputShape.java → src/main/java/de/neemann/digital/draw/shapes/InputShape.java
View File

@ -1,19 +1,19 @@
package de.neemann.digital.gui.draw.shapes; package de.neemann.digital.draw.shapes;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.draw.elements.IOState;
import de.neemann.digital.draw.elements.Pin;
import de.neemann.digital.draw.elements.Pins;
import de.neemann.digital.draw.graphics.*;
import de.neemann.digital.draw.graphics.Polygon;
import de.neemann.digital.gui.components.CircuitComponent; import de.neemann.digital.gui.components.CircuitComponent;
import de.neemann.digital.gui.components.SingleValueDialog; import de.neemann.digital.gui.components.SingleValueDialog;
import de.neemann.digital.gui.draw.elements.IOState;
import de.neemann.digital.gui.draw.elements.Pin;
import de.neemann.digital.gui.draw.elements.Pins;
import de.neemann.digital.gui.draw.graphics.*;
import de.neemann.digital.gui.draw.graphics.Polygon;
import java.awt.*; import java.awt.*;
import static de.neemann.digital.gui.draw.shapes.OutputShape.RAD; import static de.neemann.digital.draw.shapes.OutputShape.RAD;
import static de.neemann.digital.gui.draw.shapes.OutputShape.SIZE; import static de.neemann.digital.draw.shapes.OutputShape.SIZE;
/** /**
* @author hneemann * @author hneemann

4
src/main/java/de/neemann/digital/gui/draw/shapes/Interactor.java → src/main/java/de/neemann/digital/draw/shapes/Interactor.java
View File

@ -1,7 +1,7 @@
package de.neemann.digital.gui.draw.shapes; package de.neemann.digital.draw.shapes;
import de.neemann.digital.draw.elements.IOState;
import de.neemann.digital.gui.components.CircuitComponent; import de.neemann.digital.gui.components.CircuitComponent;
import de.neemann.digital.gui.draw.elements.IOState;
import java.awt.*; import java.awt.*;

18
src/main/java/de/neemann/digital/gui/draw/shapes/LEDShape.java → src/main/java/de/neemann/digital/draw/shapes/LEDShape.java
View File

@ -1,18 +1,18 @@
package de.neemann.digital.gui.draw.shapes; package de.neemann.digital.draw.shapes;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.gui.draw.elements.IOState; import de.neemann.digital.draw.elements.IOState;
import de.neemann.digital.gui.draw.elements.Pin; import de.neemann.digital.draw.elements.Pin;
import de.neemann.digital.gui.draw.elements.Pins; import de.neemann.digital.draw.elements.Pins;
import de.neemann.digital.gui.draw.graphics.Graphic; import de.neemann.digital.draw.graphics.Graphic;
import de.neemann.digital.gui.draw.graphics.Orientation; import de.neemann.digital.draw.graphics.Orientation;
import de.neemann.digital.gui.draw.graphics.Style; import de.neemann.digital.draw.graphics.Style;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
import java.awt.*; import java.awt.*;
import static de.neemann.digital.gui.draw.shapes.OutputShape.SIZE; import static de.neemann.digital.draw.shapes.OutputShape.SIZE;
/** /**
* @author hneemann * @author hneemann

14
src/main/java/de/neemann/digital/gui/draw/shapes/MissingShape.java → src/main/java/de/neemann/digital/draw/shapes/MissingShape.java
View File

@ -1,12 +1,12 @@
package de.neemann.digital.gui.draw.shapes; package de.neemann.digital.draw.shapes;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.gui.draw.elements.IOState; import de.neemann.digital.draw.elements.IOState;
import de.neemann.digital.gui.draw.elements.Pins; import de.neemann.digital.draw.elements.Pins;
import de.neemann.digital.gui.draw.graphics.Graphic; import de.neemann.digital.draw.graphics.Graphic;
import de.neemann.digital.gui.draw.graphics.Orientation; import de.neemann.digital.draw.graphics.Orientation;
import de.neemann.digital.gui.draw.graphics.Style; import de.neemann.digital.draw.graphics.Style;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
import de.neemann.digital.lang.Lang; import de.neemann.digital.lang.Lang;
/** /**

18
src/main/java/de/neemann/digital/gui/draw/shapes/MuxerShape.java → src/main/java/de/neemann/digital/draw/shapes/MuxerShape.java
View File

@ -1,15 +1,15 @@
package de.neemann.digital.gui.draw.shapes; package de.neemann.digital.draw.shapes;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.gui.draw.elements.IOState; import de.neemann.digital.draw.elements.IOState;
import de.neemann.digital.gui.draw.elements.Pin; import de.neemann.digital.draw.elements.Pin;
import de.neemann.digital.gui.draw.elements.Pins; import de.neemann.digital.draw.elements.Pins;
import de.neemann.digital.gui.draw.graphics.Graphic; import de.neemann.digital.draw.graphics.Graphic;
import de.neemann.digital.gui.draw.graphics.Polygon; import de.neemann.digital.draw.graphics.Polygon;
import de.neemann.digital.gui.draw.graphics.Style; import de.neemann.digital.draw.graphics.Style;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
import static de.neemann.digital.gui.draw.shapes.GenericShape.SIZE; import static de.neemann.digital.draw.shapes.GenericShape.SIZE;
/** /**
* @author hneemann * @author hneemann

16
src/main/java/de/neemann/digital/gui/draw/shapes/OutputShape.java → src/main/java/de/neemann/digital/draw/shapes/OutputShape.java
View File

@ -1,14 +1,14 @@
package de.neemann.digital.gui.draw.shapes; package de.neemann.digital.draw.shapes;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.gui.draw.elements.IOState; import de.neemann.digital.draw.elements.IOState;
import de.neemann.digital.gui.draw.elements.Pin; import de.neemann.digital.draw.elements.Pin;
import de.neemann.digital.gui.draw.elements.Pins; import de.neemann.digital.draw.elements.Pins;
import de.neemann.digital.gui.draw.graphics.Graphic; import de.neemann.digital.draw.graphics.Graphic;
import de.neemann.digital.gui.draw.graphics.Orientation; import de.neemann.digital.draw.graphics.Orientation;
import de.neemann.digital.gui.draw.graphics.Style; import de.neemann.digital.draw.graphics.Style;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
/** /**
* @author hneemann * @author hneemann

16
src/main/java/de/neemann/digital/gui/draw/shapes/ProbeShape.java → src/main/java/de/neemann/digital/draw/shapes/ProbeShape.java
View File

@ -1,13 +1,13 @@
package de.neemann.digital.gui.draw.shapes; package de.neemann.digital.draw.shapes;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.gui.draw.elements.IOState; import de.neemann.digital.draw.elements.IOState;
import de.neemann.digital.gui.draw.elements.Pin; import de.neemann.digital.draw.elements.Pin;
import de.neemann.digital.gui.draw.elements.Pins; import de.neemann.digital.draw.elements.Pins;
import de.neemann.digital.gui.draw.graphics.Graphic; import de.neemann.digital.draw.graphics.Graphic;
import de.neemann.digital.gui.draw.graphics.Orientation; import de.neemann.digital.draw.graphics.Orientation;
import de.neemann.digital.gui.draw.graphics.Style; import de.neemann.digital.draw.graphics.Style;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
/** /**
* @author hneemann * @author hneemann

6
src/main/java/de/neemann/digital/gui/draw/shapes/Shape.java → src/main/java/de/neemann/digital/draw/shapes/Shape.java
View File

@ -1,8 +1,8 @@
package de.neemann.digital.gui.draw.shapes; package de.neemann.digital.draw.shapes;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.gui.draw.elements.IOState; import de.neemann.digital.draw.elements.IOState;
import de.neemann.digital.gui.draw.elements.Pins; import de.neemann.digital.draw.elements.Pins;
/** /**
* @author hneemann * @author hneemann

4
src/main/java/de/neemann/digital/gui/draw/shapes/ShapeFactory.java → src/main/java/de/neemann/digital/draw/shapes/ShapeFactory.java
View File

@ -1,4 +1,4 @@
package de.neemann.digital.gui.draw.shapes; package de.neemann.digital.draw.shapes;
import de.neemann.digital.core.NodeException; import de.neemann.digital.core.NodeException;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;
@ -13,7 +13,7 @@ import de.neemann.digital.core.io.Const;
import de.neemann.digital.core.io.In; import de.neemann.digital.core.io.In;
import de.neemann.digital.core.io.Out; import de.neemann.digital.core.io.Out;
import de.neemann.digital.core.wiring.*; import de.neemann.digital.core.wiring.*;
import de.neemann.digital.gui.draw.library.ElementLibrary; import de.neemann.digital.draw.library.ElementLibrary;
import de.neemann.digital.lang.Lang; import de.neemann.digital.lang.Lang;
import java.util.HashMap; import java.util.HashMap;

12
src/main/java/de/neemann/digital/gui/draw/shapes/SplitterShape.java → src/main/java/de/neemann/digital/draw/shapes/SplitterShape.java
View File

@ -1,14 +1,14 @@
package de.neemann.digital.gui.draw.shapes; package de.neemann.digital.draw.shapes;
import de.neemann.digital.core.BitsException; import de.neemann.digital.core.BitsException;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.core.wiring.Splitter; import de.neemann.digital.core.wiring.Splitter;
import de.neemann.digital.gui.draw.elements.IOState; import de.neemann.digital.draw.elements.IOState;
import de.neemann.digital.gui.draw.elements.Pin; import de.neemann.digital.draw.elements.Pin;
import de.neemann.digital.gui.draw.elements.Pins; import de.neemann.digital.draw.elements.Pins;
import de.neemann.digital.gui.draw.graphics.*; import de.neemann.digital.draw.graphics.*;
import static de.neemann.digital.gui.draw.shapes.GenericShape.SIZE; import static de.neemann.digital.draw.shapes.GenericShape.SIZE;
/** /**
* @author hneemann * @author hneemann

12
src/main/java/de/neemann/digital/gui/LibrarySelector.java
View File

@ -1,13 +1,13 @@
package de.neemann.digital.gui; package de.neemann.digital.gui;
import de.neemann.digital.core.element.ElementTypeDescription; import de.neemann.digital.core.element.ElementTypeDescription;
import de.neemann.digital.draw.elements.Circuit;
import de.neemann.digital.draw.elements.VisualElement;
import de.neemann.digital.draw.graphics.Vector;
import de.neemann.digital.draw.library.CustomElement;
import de.neemann.digital.draw.library.ElementLibrary;
import de.neemann.digital.draw.library.ElementNotFoundNotification;
import de.neemann.digital.gui.components.CircuitComponent; import de.neemann.digital.gui.components.CircuitComponent;
import de.neemann.digital.gui.draw.elements.Circuit;
import de.neemann.digital.gui.draw.elements.VisualElement;
import de.neemann.digital.gui.draw.graphics.Vector;
import de.neemann.digital.gui.draw.library.CustomElement;
import de.neemann.digital.gui.draw.library.ElementLibrary;
import de.neemann.digital.gui.draw.library.ElementNotFoundNotification;
import de.neemann.digital.lang.Lang; import de.neemann.digital.lang.Lang;
import de.process.utils.gui.ErrorMessage; import de.process.utils.gui.ErrorMessage;
import de.process.utils.gui.ToolTipAction; import de.process.utils.gui.ToolTipAction;

14
src/main/java/de/neemann/digital/gui/Main.java
View File

@ -4,15 +4,15 @@ import de.neemann.digital.core.Model;
import de.neemann.digital.core.NodeException; import de.neemann.digital.core.NodeException;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.core.SpeedTest; import de.neemann.digital.core.SpeedTest;
import de.neemann.digital.draw.elements.Circuit;
import de.neemann.digital.draw.elements.PinException;
import de.neemann.digital.draw.elements.PinOrder;
import de.neemann.digital.draw.library.ElementLibrary;
import de.neemann.digital.draw.model.ModelBuilder;
import de.neemann.digital.draw.model.ModelDescription;
import de.neemann.digital.draw.shapes.ShapeFactory;
import de.neemann.digital.gui.components.CircuitComponent; import de.neemann.digital.gui.components.CircuitComponent;
import de.neemann.digital.gui.components.ElementOrderer; import de.neemann.digital.gui.components.ElementOrderer;
import de.neemann.digital.gui.draw.elements.Circuit;
import de.neemann.digital.gui.draw.elements.PinException;
import de.neemann.digital.gui.draw.elements.PinOrder;
import de.neemann.digital.gui.draw.library.ElementLibrary;
import de.neemann.digital.gui.draw.model.ModelBuilder;
import de.neemann.digital.gui.draw.model.ModelDescription;
import de.neemann.digital.gui.draw.shapes.ShapeFactory;
import de.neemann.digital.lang.Lang; import de.neemann.digital.lang.Lang;
import de.process.utils.gui.*; import de.process.utils.gui.*;

6
src/main/java/de/neemann/digital/gui/TraceGenerator.java
View File

@ -7,9 +7,9 @@ import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.core.element.AttributeKey; import de.neemann.digital.core.element.AttributeKey;
import de.neemann.digital.core.io.In; import de.neemann.digital.core.io.In;
import de.neemann.digital.core.io.Out; import de.neemann.digital.core.io.Out;
import de.neemann.digital.gui.draw.library.ElementLibrary; import de.neemann.digital.draw.library.ElementLibrary;
import de.neemann.digital.gui.draw.model.ModelDescription; import de.neemann.digital.draw.model.ModelDescription;
import de.neemann.digital.gui.draw.model.ModelEntry; import de.neemann.digital.draw.model.ModelEntry;
/** /**
* @author hneemann * @author hneemann

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

@ -2,15 +2,15 @@ package de.neemann.digital.gui.components;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.core.element.AttributeKey; import de.neemann.digital.core.element.AttributeKey;
import de.neemann.digital.gui.draw.elements.Circuit; import de.neemann.digital.draw.elements.Circuit;
import de.neemann.digital.gui.draw.elements.Moveable; import de.neemann.digital.draw.elements.Moveable;
import de.neemann.digital.gui.draw.elements.VisualElement; import de.neemann.digital.draw.elements.VisualElement;
import de.neemann.digital.gui.draw.elements.Wire; import de.neemann.digital.draw.elements.Wire;
import de.neemann.digital.gui.draw.graphics.*; import de.neemann.digital.draw.graphics.*;
import de.neemann.digital.gui.draw.graphics.Polygon; import de.neemann.digital.draw.graphics.Polygon;
import de.neemann.digital.gui.draw.library.ElementLibrary; import de.neemann.digital.draw.library.ElementLibrary;
import de.neemann.digital.gui.draw.shapes.Drawable; import de.neemann.digital.draw.shapes.Drawable;
import de.neemann.digital.gui.draw.shapes.GenericShape; import de.neemann.digital.draw.shapes.GenericShape;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

10
src/main/java/de/neemann/digital/gui/draw/elements/Moveable.java
View File

@ -1,10 +0,0 @@
package de.neemann.digital.gui.draw.elements;
import de.neemann.digital.gui.draw.graphics.Vector;
/**
* @author hneemann
*/
public interface Moveable {
void move(Vector delta);
}

12
src/test/java/de/neemann/digital/TestExecuter.java
View File

@ -4,12 +4,12 @@ import de.neemann.digital.core.Model;
import de.neemann.digital.core.NodeException; import de.neemann.digital.core.NodeException;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.core.element.Element; import de.neemann.digital.core.element.Element;
import de.neemann.digital.gui.draw.elements.Circuit; import de.neemann.digital.draw.elements.Circuit;
import de.neemann.digital.gui.draw.elements.PinException; import de.neemann.digital.draw.elements.PinException;
import de.neemann.digital.gui.draw.library.ElementLibrary; import de.neemann.digital.draw.library.ElementLibrary;
import de.neemann.digital.gui.draw.model.ModelBuilder; import de.neemann.digital.draw.model.ModelBuilder;
import de.neemann.digital.gui.draw.model.ModelDescription; import de.neemann.digital.draw.model.ModelDescription;
import de.neemann.digital.gui.draw.model.ModelEntry; import de.neemann.digital.draw.model.ModelEntry;
import de.neemann.digital.integration.Resources; import de.neemann.digital.integration.Resources;
import java.io.File; import java.io.File;

2
src/test/java/de/neemann/digital/core/wiring/DataBusTest.java
View File

@ -3,7 +3,7 @@ package de.neemann.digital.core.wiring;
import de.neemann.digital.core.BurnException; import de.neemann.digital.core.BurnException;
import de.neemann.digital.core.HighZException; import de.neemann.digital.core.HighZException;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.gui.draw.elements.PinException; import de.neemann.digital.draw.elements.PinException;
import junit.framework.TestCase; import junit.framework.TestCase;
/** /**

4
src/test/java/de/neemann/digital/gui/draw/elements/WireMergerTest.java → src/test/java/de/neemann/digital/draw/elements/WireMergerTest.java
View File

@ -1,6 +1,6 @@
package de.neemann.digital.gui.draw.elements; package de.neemann.digital.draw.elements;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
import junit.framework.TestCase; import junit.framework.TestCase;
import java.util.ArrayList; import java.util.ArrayList;

6
src/test/java/de/neemann/digital/gui/draw/model/NetListTest.java → src/test/java/de/neemann/digital/draw/model/NetListTest.java
View File

@ -1,7 +1,7 @@
package de.neemann.digital.gui.draw.model; package de.neemann.digital.draw.model;
import de.neemann.digital.gui.draw.elements.Wire; import de.neemann.digital.draw.elements.Wire;
import de.neemann.digital.gui.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
import junit.framework.TestCase; import junit.framework.TestCase;
import java.util.ArrayList; import java.util.ArrayList;

8
src/test/java/de/neemann/digital/integration/TestAnd.java
View File

@ -3,10 +3,10 @@ package de.neemann.digital.integration;
import de.neemann.digital.TestExecuter; import de.neemann.digital.TestExecuter;
import de.neemann.digital.core.Model; import de.neemann.digital.core.Model;
import de.neemann.digital.core.Node; import de.neemann.digital.core.Node;
import de.neemann.digital.gui.draw.elements.Circuit; import de.neemann.digital.draw.elements.Circuit;
import de.neemann.digital.gui.draw.library.ElementLibrary; import de.neemann.digital.draw.library.ElementLibrary;
import de.neemann.digital.gui.draw.model.ModelBuilder; import de.neemann.digital.draw.model.ModelBuilder;
import de.neemann.digital.gui.draw.model.ModelEntry; import de.neemann.digital.draw.model.ModelEntry;
import junit.framework.TestCase; import junit.framework.TestCase;
import java.io.File; import java.io.File;

6
src/test/java/de/neemann/digital/integration/TestNesting.java
View File

@ -2,10 +2,10 @@ package de.neemann.digital.integration;
import de.neemann.digital.TestExecuter; import de.neemann.digital.TestExecuter;
import de.neemann.digital.core.NodeException; import de.neemann.digital.core.NodeException;
import de.neemann.digital.draw.elements.PinException;
import de.neemann.digital.draw.library.ElementLibrary;
import de.neemann.digital.draw.shapes.ShapeFactory;
import de.neemann.digital.gui.LibrarySelector; import de.neemann.digital.gui.LibrarySelector;
import de.neemann.digital.gui.draw.elements.PinException;
import de.neemann.digital.gui.draw.library.ElementLibrary;
import de.neemann.digital.gui.draw.shapes.ShapeFactory;
import junit.framework.TestCase; import junit.framework.TestCase;
import java.io.File; import java.io.File;