Redo feature

.externalToolBuilders/Launch4j.launch

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\Program Files (x86)\Launch4j\launch4j.exe"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>

.gitignore

@@ -4,6 +4,9 @@ build
 .gradle
 .project
 .classpath
+*sonar*.properties
+.sonar
 .settings
 bin
-/nbproject/private/
+*.class
+/nbproject/private/

README.md

@@ -1,9 +1,33 @@
 # README
 
-Logisim is a circuit simulator, [available here](http://ozark.hendrix.edu/~burch/logisim/).
+Logisim is a circuit simulator, [originally available here](http://ozark.hendrix.edu/~burch/logisim/).
+
+## Why this fork of Logisim?
+Carl Burch, the original author of Logisim, abandoned development in 2011 and moved on to a similar successor project, [Toves](http://www.toves.org/) in 2013, because Logisim's code base is in need of a major overhaul. Rather than start from scratch ([something you should never do](http://www.joelonsoftware.com/articles/fog0000000069.html)), this fork of Logisim picks up where Dr. Burch left off to incrementally improve Logisim.
+
+## What's wrong with Logisim?
+Logisim's code itself has numerous smells. Here's an incomplete list of these:
+
+* No test suite!
+* Undocumented packages, classes, methods
+* Duplicated and dead code
+* No coherent organization (it should be MVC)
+* High coupling, low cohesion (it would benefit from IoC)
+* Unnecessarily reimplements functionality found in standard or third party libraries (e.g., it has it's own Toolbar classes)
+* Code to draw components is too low-level
+
+Logisim's user interface has numerous gotchas that need to be addressed. Here's some of the more important issues:
+
+* The file format is not merge-friendly, making it impossible for students to collaborate on circuits
+* Unreasonable defaults
+* Limited interaction styles
+* Single (graphical) view of circuit
+
+## What's right with Logisim?
+It is arguably the best free tool for teaching circuit design, which is why its development must continue.
 
 ## Getting started for developers
-Logisim developers: Logisim uses the [Gradle build system](http://www.gradle.org), so set that up first before attempting to develop Logisim. Ensure that the gradle executable is in the system path. To build the executable for Windows, you must install [launch4j](http://launch4j.sourceforge.net/) and ensure it is on the system path.
+Logisim developers: Logisim uses the [Gradle build system](http://www.gradle.org), so set that up first before attempting to develop Logisim. Ensure that the gradle executable is in the system path. To build the executable for Windows, you must install [launch4j](http://launch4j.sourceforge.net/) and ensure it is in the system path.
 
 The build script recognizes the following commands:
 

build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'application'
 apply plugin: 'launch4j'
+apply plugin: 'sonar-runner'
 
 mainClassName = "com.cburch.logisim.Main"
 version = '2.7.2'
@@ -32,7 +33,7 @@ repositories {
 }
 
 dependencies {
-	compile 'javax.help:javahelp:2.0.05', 'com.connectina.swing:fontchooser:1.0', 'org.apache.commons:commons-lang3:3.1', 'net.sourceforge.collections:collections-generic:4.01', fileTree(dir: 'libs', include: '*.jar')
+	compile 'javax.help:javahelp:2.0.05', 'com.connectina.swing:fontchooser:1.0', 'org.apache.commons:commons-lang3:3.1', 'net.sourceforge.collections:collections-generic:4.01', 'org.apache.xmlgraphics:batik-svggen:1.7', 'org.apache.xmlgraphics:batik-swing:1.7', 'org.apache.xmlgraphics:batik-transcoder:1.7', fileTree(dir: 'libs', include: '*.jar')
 	testCompile 'junit:junit:4.11'
 }
 

src/main/java/com/cburch/draw/shapes/SvgReader.java

@@ -254,7 +254,7 @@ private static Color getColor(String hue, String opacity) {
 						String repl = opacity.substring(0, comma) + "."
 							+ opacity.substring(comma + 1);
 						x = Double.parseDouble(repl);
-					} catch (Throwable t) {
+					} catch (NumberFormatException ex) {
 						throw e;
 					}
 				} else {

src/main/java/com/cburch/draw/toolbar/ToolbarButton.java

@@ -11,6 +11,8 @@
 
 import javax.swing.JComponent;
 
+import org.apache.batik.swing.JSVGCanvas;
+
 import com.cburch.logisim.util.GraphicsUtil;
 
 class ToolbarButton extends JComponent implements MouseListener {
@@ -58,7 +60,7 @@ public void paintComponent(Graphics g) {
 
 		Graphics g2 = g.create();
 		g2.translate(BORDER, BORDER);
-		item.paintIcon(ToolbarButton.this, g2);
+		item.paintIcon(this, g2);
 		g2.dispose();
 
 		// draw selection indicator

src/main/java/com/cburch/draw/toolbar/ToolbarItem.java

@@ -7,6 +7,8 @@
 import java.awt.Dimension;
 import java.awt.Graphics;
 
+import javax.swing.JPanel;
+
 public interface ToolbarItem {
 	public boolean isSelectable();
 	public void paintIcon(Component destination, Graphics g);

src/main/java/com/cburch/draw/tools/CurveTool.java

@@ -47,7 +47,7 @@ public CurveTool(DrawingAttributeSet attrs) {
 
 	@Override
 	public Icon getIcon() {
-		return Icons.getIcon("drawcurv.gif");
+		return Icons.getIcon("drawcurv.svg");
 	}
 
 	@Override

src/main/java/com/cburch/draw/tools/LineTool.java

@@ -42,7 +42,7 @@ public LineTool(DrawingAttributeSet attrs) {
 
 	@Override
 	public Icon getIcon() {
-		return Icons.getIcon("drawline.gif");
+		return Icons.getIcon("drawline.svg");
 	}
 
 	@Override

src/main/java/com/cburch/draw/tools/OvalTool.java

@@ -23,7 +23,7 @@ public OvalTool(DrawingAttributeSet attrs) {
 
 	@Override
 	public Icon getIcon() {
-		return Icons.getIcon("drawoval.gif");
+		return Icons.getIcon("drawoval.svg");
 	}
 
 	@Override

src/main/java/com/cburch/draw/tools/PolyTool.java

@@ -47,9 +47,9 @@ public PolyTool(boolean closed, DrawingAttributeSet attrs) {
 	@Override
 	public Icon getIcon() {
 		if (closed) {
-			return Icons.getIcon("drawpoly.gif");
+			return Icons.getIcon("drawpoly.svg");
 		} else {
-			return Icons.getIcon("drawplin.gif");
+			return Icons.getIcon("drawplin.svg");
 		}
 	}
 

src/main/java/com/cburch/draw/tools/RectangleTool.java

@@ -23,7 +23,7 @@ public RectangleTool(DrawingAttributeSet attrs) {
 
 	@Override
 	public Icon getIcon() {
-		return Icons.getIcon("drawrect.gif");
+		return Icons.getIcon("drawrect.svg");
 	}
 
 	@Override

src/main/java/com/cburch/draw/tools/RoundRectangleTool.java

@@ -23,7 +23,7 @@ public RoundRectangleTool(DrawingAttributeSet attrs) {
 
 	@Override
 	public Icon getIcon() {
-		return Icons.getIcon("drawrrct.gif");
+		return Icons.getIcon("drawrrct.svg");
 	}
 
 	@Override

src/main/java/com/cburch/draw/tools/SVGIcon.java

@@ -0,0 +1,72 @@
+package com.cburch.draw.tools;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.geom.AffineTransform;
+import java.io.IOException;
+import java.net.URL;
+
+import javax.swing.Icon;
+
+import org.apache.batik.bridge.BridgeContext;
+import org.apache.batik.bridge.DocumentLoader;
+import org.apache.batik.bridge.GVTBuilder;
+import org.apache.batik.bridge.UserAgent;
+import org.apache.batik.bridge.UserAgentAdapter;
+import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+import org.apache.batik.gvt.GraphicsNode;
+import org.apache.batik.util.XMLResourceDescriptor;
+import org.w3c.dom.svg.SVGDocument;
+
+public class SVGIcon implements Icon {
+
+	String path;
+	GraphicsNode svgIcon = null;
+
+	public SVGIcon(String path) {
+		try {
+			this.path = (path.startsWith("/logisim/icons/")) ? path : "/logisim/icons/" + path; // Quick and dirty hack. We should probably use a path resolver.
+			URL url = SVGIcon.class.getResource(this.path);
+			String xmlParser = XMLResourceDescriptor.getXMLParserClassName();
+			SAXSVGDocumentFactory df = new SAXSVGDocumentFactory(xmlParser);
+			SVGDocument doc = df.createSVGDocument(url.toString());
+			UserAgent userAgent = new UserAgentAdapter();
+			DocumentLoader loader = new DocumentLoader(userAgent);
+			BridgeContext ctx = new BridgeContext(userAgent, loader);
+			ctx.setDynamicState(BridgeContext.DYNAMIC);
+			GVTBuilder builder = new GVTBuilder();
+			this.svgIcon = builder.build(ctx, doc);
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public int getIconHeight() {
+		//return (int)svgIcon.getPrimitiveBounds().getHeight();
+		return 16;
+	}
+
+	@Override
+	public int getIconWidth() {
+		//return (int)svgIcon.getPrimitiveBounds().getWidth();
+		return 16;
+	}
+
+	private void paintSvgIcon(Graphics2D g, int x, int y, double scaleX, double scaleY) {
+			AffineTransform transform = new AffineTransform(scaleX, 0.0, 0.0, scaleY, x, y);
+			svgIcon.setTransform(transform);
+			svgIcon.paint(g);
+		}
+
+	@Override
+	public void paintIcon(Component arg0, Graphics g, int x, int y) {
+/*		Graphics2D g2 = (Graphics2D) g.create();
+		arg0.paint(getGraphics());
+		g.drawImage(canvas.createImage(canvas.getWidth(), canvas.getHeight()), x, y, arg0);*/
+		paintSvgIcon((Graphics2D)g,x,y,1,1);
+	}
+
+}

src/main/java/com/cburch/draw/tools/SelectTool.java

@@ -63,7 +63,7 @@ public SelectTool() {
 
 	@Override
 	public Icon getIcon() {
-		return Icons.getIcon("select.gif");
+		return Icons.getIcon("select.svg");
 	}
 
 	@Override

src/main/java/com/cburch/draw/tools/TextTool.java

@@ -85,7 +85,7 @@ public TextTool(DrawingAttributeSet attrs) {
 
 	@Override
 	public Icon getIcon() {
-		return Icons.getIcon("text.gif");
+		return Icons.getIcon("text.svg");
 	}
 
 	@Override

src/main/java/com/cburch/draw/undo/Action.java

@@ -8,8 +8,12 @@ public abstract class Action {
 
 	public abstract String getName();
 
+	/** Redo
+	 */
 	public abstract void doIt();
 
+	/** Undo
+	 */
 	public abstract void undo();
 
 	public boolean shouldAppendTo(Action other) { return false; }

src/main/java/com/cburch/gray/GrayCounter.java

@@ -46,7 +46,7 @@ public GrayCounter() {
 		// These next two lines set it up so that the explorer window shows a
 		// customized icon representing the component type. This should be a
 		// 16x16 image.
-		URL url = getClass().getClassLoader().getResource("com/cburch/gray/counter.gif");
+		URL url = getClass().getClassLoader().getResource("com/cburch/gray/counter.svg");
 		if (url != null) setIcon(new ImageIcon(url));
 	}