switch to java 1.6.x

Update README.md
improved potentiometer symbol
2026-11-10 01:02:08 +10:00 · 2016-04-28 13:44:52 +02:00 · 2016-04-25 15:03:26 +02:00 · 2016-04-25 15:00:25 +02:00 · 2016-04-21 18:05:08 +02:00 · 2016-04-21 18:04:25 +02:00
755 changed files with 34077 additions and 330 deletions
@@ -0,0 +1 @@
+/bin/
@@ -5,7 +5,7 @@
  </entry>
  <entry>
    <string>lastPath</string>
-    <string>C:\Documents and Settings\Branislav Stojkovic\Desktop</string>
+    <string>C:\Documents and Settings\Branislav Stojkovic\My Documents\Downloads</string>
  </entry>
  <entry>
    <string>abnormalExit</string>
@@ -31,6 +31,12 @@
        <blue>240</blue>
        <alpha>240</alpha>
      </gridColor>
+      <outlineColor>
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+        <alpha>255</alpha>
+      </outlineColor>
    </org.diylc.core.Theme>
  </entry>
  <entry>
@@ -45,6 +51,10 @@
    <string>hiQualityRender</string>
    <boolean>false</boolean>
  </entry>
+  <entry>
+    <string>outline</string>
+    <boolean>true</boolean>
+  </entry>
  <entry>
    <string>exportGrid</string>
    <boolean>true</boolean>
@@ -63,11 +73,11 @@
  </entry>
  <entry>
    <string>autoCreatePads</string>
-    <boolean>false</boolean>
+    <boolean>true</boolean>
  </entry>
  <entry>
    <string>continuousCreation</string>
-    <boolean>false</boolean>
+    <boolean>true</boolean>
  </entry>
  <entry>
    <string>showTemplatesAtStartup</string>
@@ -32,5 +32,9 @@ public enum DrawOption {
 	/**
 	 * Anti-aliasing is used when drawing.
 	 */
-	ANTIALIASING;
+	ANTIALIASING,
+	/**
+	 * Draw components in outline mode.
+	 */
+	OUTLINE_MODE;
 }
@@ -43,6 +43,9 @@ public interface IPlugInPort {
 	public static final String AUTO_EDIT_KEY = "autoEdit";
 	public static final String ABNORMAL_EXIT_KEY = "abnormalExit";
 	public static final String WHEEL_ZOOM_KEY = "wheelZoom";
+	public static final String OUTLINE_KEY = "outline";
+	public static final String THEME_KEY = "theme";
+	public static final String RECENT_COMPONENTS_KEY = "recentComponents";

 	/**
 	 * Returns size of the canvas that takes project dimensions into account as
@@ -98,7 +101,7 @@ public interface IPlugInPort {
 	 * Saves the current project into the specified file.
 	 * 
 	 * @param fileName
-	 * @param isBackup 
+	 * @param isBackup
 	 */
 	void saveProjectToFile(String fileName, boolean isBackup);

@@ -169,7 +172,8 @@ public interface IPlugInPort {
 	 * @param altDown
 	 * @param clickCount
 	 */
-	void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown, int clickCount);
+	void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown,
+			int clickCount);

 	/**
 	 * Notifies the presenter that mouse is moved.
@@ -190,6 +194,15 @@ public interface IPlugInPort {
 	 */
 	List<IDIYComponent<?>> getSelectedComponents();

+	/**
+	 * Updates the selection with the specified list of component. Also, updates
+	 * control point map with all components that are stuck to the newly
+	 * selected components.
+	 * 
+	 * @param newSelection
+	 */
+	void updateSelection(List<IDIYComponent<?>> newSelection);
+
 	/**
 	 * Selects all components in the project.
 	 */
@@ -274,9 +287,8 @@ public interface IPlugInPort {
 	 */
 	List<PropertyWrapper> getMutualSelectionProperties();

-	
 	void editSelection();
-	
+
 	/**
 	 * @return a list of editable properties of the current project.
 	 */
@@ -353,4 +365,11 @@ public interface IPlugInPort {
 	 * @param theme
 	 */
 	void setSelectedTheme(Theme theme);
+
+	/**
+	 * Renumbers all the selected components.
+	 * 
+	 * @param xAxisFirst
+	 */
+	void renumberSelectedComponents(boolean xAxisFirst);
 }
@@ -1,7 +1,6 @@
 package org.diylc.common;

 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;

 import org.diylc.core.IPropertyValidator;

@@ -16,12 +15,14 @@ public class PropertyWrapper implements Cloneable {
 	private String name;
 	private Class<?> type;
 	private Object value;
-	private Method setter;
-	private Method getter;
+	private String setter;
+	private String getter;
 	private boolean defaultable;
 	private IPropertyValidator validator;
+	private boolean unique = true;
+	private boolean changed = false;

-	public PropertyWrapper(String name, Class<?> type, Method getter, Method setter,
+	public PropertyWrapper(String name, Class<?> type, String getter, String setter,
 			boolean defaultable, IPropertyValidator validator) {
 		super();
 		this.name = name;
@@ -33,8 +34,8 @@ public class PropertyWrapper implements Cloneable {
 	}

 	public void readFrom(Object object) throws IllegalArgumentException, IllegalAccessException,
-			InvocationTargetException {
-		this.value = getter.invoke(object);
+			InvocationTargetException, SecurityException, NoSuchMethodException {
+		this.value = object.getClass().getMethod(getter).invoke(object);
 	}

 	// public void readUniqueFrom(IDIYComponent component)
@@ -47,8 +48,8 @@ public class PropertyWrapper implements Cloneable {
 	// }

 	public void writeTo(Object object) throws IllegalArgumentException, IllegalAccessException,
-			InvocationTargetException {
-		setter.invoke(object, value);
+			InvocationTargetException, SecurityException, NoSuchMethodException {
+		object.getClass().getMethod(setter, type).invoke(object, this.value);
 	}

 	public String getName() {
@@ -74,6 +75,22 @@ public class PropertyWrapper implements Cloneable {
 	public IPropertyValidator getValidator() {
 		return validator;
 	}
+	
+	public boolean isUnique() {
+		return unique;
+	}
+	
+	public void setUnique(boolean unique) {
+		this.unique = unique;
+	}
+	
+	public boolean isChanged() {
+		return changed;
+	}
+	
+	public void setChanged(boolean changed) {
+		this.changed = changed;
+	}

 	// @Override
 	// public Object clone() throws CloneNotSupportedException {
@@ -95,7 +112,6 @@ public class PropertyWrapper implements Cloneable {
 		result = prime * result + ((name == null) ? 0 : name.hashCode());
 		result = prime * result + ((setter == null) ? 0 : setter.hashCode());
 		result = prime * result + ((type == null) ? 0 : type.hashCode());
-		result = prime * result + ((value == null) ? 0 : value.hashCode());
 		return result;
 	}

@@ -130,11 +146,6 @@ public class PropertyWrapper implements Cloneable {
 				return false;
 		} else if (!type.equals(other.type))
 			return false;
-		if (value == null) {
-			if (other.value != null)
-				return false;
-		} else if (!value.equals(other.value))
-			return false;
 		return true;
 	}

@@ -63,8 +63,8 @@ public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComp
 	}

 	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
-			IDrawingObserver drawingObserver) {
+	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
+			Project project, IDrawingObserver drawingObserver) {
 		if (checkPointsClipped(g2d.getClip())) {
 			return;
 		}
@@ -13,14 +13,19 @@ import java.awt.geom.Ellipse2D;
 import java.awt.geom.Rectangle2D;

 import org.diylc.common.Display;
+import org.diylc.common.IPlugInPort;
 import org.diylc.common.ObjectCache;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;
+import org.diylc.core.Theme;
 import org.diylc.core.VisibilityPolicy;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
+import org.diylc.utils.Constants;
+
+import com.diyfever.gui.miscutils.ConfigurationManager;

 /**
 * Base class for all leaded components such as resistors or capacitors. Has two
@@ -45,7 +50,7 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 	protected Color bodyColor = Color.white;
 	protected Color borderColor = Color.black;
 	protected Color labelColor = LABEL_COLOR;
-	protected Display display = Display.NAME;
+	protected Display display = Display.VALUE;

 	protected AbstractLeadedComponent() {
 		super();
@@ -60,8 +65,8 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 	}

 	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
-			IDrawingObserver drawingObserver) {
+	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
+			Project project, IDrawingObserver drawingObserver) {
 		double distance = points[0].distance(points[1]);
 		Shape shape = getBodyShape();
 		// If there's no body, just draw the line connecting the ending points.
@@ -74,13 +79,32 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 			int width = getClosestOdd(this.width.convertToPixels());
 			Shape body = new Ellipse2D.Double(points[0].x - width / 2, points[0].y - width / 2,
 					width, width);
-			g2d.setColor(bodyColor);
+			Composite oldComposite = g2d.getComposite();
+			if (alpha < MAX_ALPHA) {
+				g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
+						/ MAX_ALPHA));
+			}
+			g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : bodyColor);
 			g2d.fill(body);
-			Color finalBorderColor = componentState == ComponentState.SELECTED
-					|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : borderColor;
+			g2d.setComposite(oldComposite);
+			Color finalBorderColor;
+			if (outlineMode) {
+				Theme theme = (Theme) ConfigurationManager.getInstance().readObject(
+						IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+				finalBorderColor = componentState == ComponentState.SELECTED
+						|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : theme
+						.getOutlineColor();
+			} else {
+				finalBorderColor = componentState == ComponentState.SELECTED
+						|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+						: borderColor;
+			}
+
 			g2d.setColor(finalBorderColor);
 			g2d.draw(body);
-			drawLead(g2d, componentState);
+			if (!outlineMode) {
+				drawLead(g2d, componentState);
+			}
 		} else {
 			// Normal mode with component body in the center and two lead parts.
 			Rectangle shapeRect = shape.getBounds();
@@ -99,23 +123,42 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 			}
 			if (bodyColor != null) {
 				if (bodyColor != null) {
-					g2d.setColor(bodyColor);
+					g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : bodyColor);
 					g2d.fill(shape);
 				}
 			}
-			decorateComponentBody(g2d);
+			decorateComponentBody(g2d, outlineMode);
 			g2d.setComposite(oldComposite);
 			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
-			Color finalBorderColor = componentState == ComponentState.SELECTED
-					|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : borderColor;
+			Color finalBorderColor;
+			if (outlineMode) {
+				Theme theme = (Theme) ConfigurationManager.getInstance().readObject(
+						IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+				finalBorderColor = componentState == ComponentState.SELECTED
+						|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : theme
+						.getOutlineColor();
+			} else {
+				finalBorderColor = componentState == ComponentState.SELECTED
+						|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+						: borderColor;
+			}
 			g2d.setColor(finalBorderColor);
 			g2d.draw(shape);
 			// Draw label.
 			g2d.setFont(LABEL_FONT);
-			Color finalLabelFont = componentState == ComponentState.SELECTED
-					|| componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
-					: labelColor;
-			g2d.setColor(finalLabelFont);
+			Color finalLabelColor;
+			if (outlineMode) {
+				Theme theme = (Theme) ConfigurationManager.getInstance().readObject(
+						IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+				finalLabelColor = componentState == ComponentState.SELECTED
+						|| componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED : theme
+						.getOutlineColor();
+			} else {
+				finalLabelColor = componentState == ComponentState.SELECTED
+						|| componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
+						: labelColor;
+			}
+			g2d.setColor(finalLabelColor);
 			FontMetrics fontMetrics = g2d.getFontMetrics();
 			String label = display == Display.NAME ? getName() : getValue().toString();
 			// Adjust label angle if needed to make sure that it's readable.
@@ -128,30 +171,31 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 					calculateLabelYCoordinate(shapeRect, textRect, fontMetrics));

 			// Go back to the original transformation to draw leads.
-			g2d.setTransform(oldTransform);
-			int leadThickness = getClosestOdd(getLeadThickness());
-			double leadLength = (distance - shapeRect.width) / 2 - leadThickness / 2;
-			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
-			Color leadColor = shouldShadeLeads() ? getLeadColor(componentState).darker()
-					: getLeadColor(componentState);
-			g2d.setColor(leadColor);
-			int endX = (int) (points[0].x + Math.cos(theta) * leadLength);
-			int endY = (int) Math.round(points[0].y + Math.sin(theta) * leadLength);
-			g2d.drawLine(points[0].x, points[0].y, endX, endY);
-			endX = (int) (points[1].x + Math.cos(theta - Math.PI) * leadLength);
-			endY = (int) Math.round(points[1].y + Math.sin(theta - Math.PI) * leadLength);
-			g2d.drawLine(points[1].x, points[1].y, endX, endY);
-			if (shouldShadeLeads()) {
-				g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
-				leadColor = getLeadColor(componentState);
+			if (!outlineMode) {
+				g2d.setTransform(oldTransform);
+				int leadThickness = getClosestOdd(getLeadThickness());
+				double leadLength = (distance - shapeRect.width) / 2 - leadThickness / 2;
+				g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
+				Color leadColor = shouldShadeLeads() ? getLeadColor(componentState).darker()
+						: getLeadColor(componentState);
 				g2d.setColor(leadColor);
-				g2d.drawLine(points[0].x, points[0].y, (int) (points[0].x + Math.cos(theta)
-						* leadLength), (int) (points[0].y + Math.sin(theta) * leadLength));
-				g2d
-						.drawLine(points[1].x, points[1].y, (int) (points[1].x + Math.cos(theta
-								- Math.PI)
-								* leadLength), (int) (points[1].y + Math.sin(theta - Math.PI)
-								* leadLength));
+				int endX = (int) (points[0].x + Math.cos(theta) * leadLength);
+				int endY = (int) Math.round(points[0].y + Math.sin(theta) * leadLength);
+				g2d.drawLine(points[0].x, points[0].y, endX, endY);
+				endX = (int) (points[1].x + Math.cos(theta - Math.PI) * leadLength);
+				endY = (int) Math.round(points[1].y + Math.sin(theta - Math.PI) * leadLength);
+				g2d.drawLine(points[1].x, points[1].y, endX, endY);
+				if (shouldShadeLeads()) {
+					g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
+					leadColor = getLeadColor(componentState);
+					g2d.setColor(leadColor);
+					g2d.drawLine(points[0].x, points[0].y, (int) (points[0].x + Math.cos(theta)
+							* leadLength), (int) (points[0].y + Math.sin(theta) * leadLength));
+					g2d.drawLine(points[1].x, points[1].y, (int) (points[1].x + Math.cos(theta
+							- Math.PI)
+							* leadLength), (int) (points[1].y + Math.sin(theta - Math.PI)
+							* leadLength));
+				}
 			}
 		}
 	}
@@ -170,7 +214,7 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 		}
 	}

-	protected void decorateComponentBody(Graphics2D g2d) {
+	protected void decorateComponentBody(Graphics2D g2d, boolean outlineMode) {
 		// Do nothing.
 	}

@@ -103,10 +103,11 @@ public interface IDIYComponent<T> extends Serializable {
 	 * 
 	 * @param g2d
 	 * @param componentState
+	 * @param outlineMode
 	 * @param project
 	 * @param drawingObserver
 	 */
-	void draw(Graphics2D g2d, ComponentState componentState, Project project,
+	void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
 			IDrawingObserver drawingObserver);

 	/**
@@ -10,12 +10,14 @@ public class Theme implements Serializable {
 	private String name;
 	private Color bgColor;
 	private Color gridColor;
+	private Color outlineColor;

-	public Theme(String name, Color bgColor, Color gridColor) {
+	public Theme(String name, Color bgColor, Color gridColor, Color outlineColor) {
 		super();
 		this.name = name;
 		this.bgColor = bgColor;
 		this.gridColor = gridColor;
+		this.outlineColor = outlineColor;
 	}

 	public String getName() {
@@ -30,12 +32,17 @@ public class Theme implements Serializable {
 		return gridColor;
 	}

+	public Color getOutlineColor() {
+		return outlineColor;
+	}
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
 		result = prime * result + ((bgColor == null) ? 0 : bgColor.hashCode());
 		result = prime * result + ((gridColor == null) ? 0 : gridColor.hashCode());
+		result = prime * result + ((outlineColor == null) ? 0 : outlineColor.hashCode());
 		result = prime * result + ((name == null) ? 0 : name.hashCode());
 		return result;
 	}
@@ -59,6 +66,11 @@ public class Theme implements Serializable {
 				return false;
 		} else if (!gridColor.equals(other.gridColor))
 			return false;
+		if (outlineColor == null) {
+			if (other.outlineColor != null)
+				return false;
+		} else if (!outlineColor.equals(other.outlineColor))
+			return false;
 		if (name == null) {
 			if (other.name != null)
 				return false;
@@ -10,7 +10,7 @@ public class PositiveMeasureValidator implements IPropertyValidator {
 	public void validate(Object value) throws ValidationException {
 		if (value instanceof AbstractMeasure) {
 			AbstractMeasure measure = (AbstractMeasure) value;
-			if (measure.getValue() <= 0) {
+			if (measure.getValue() < 0) {
 				throw new ValidationException("must be greater than zero.");
 			}
 		} else {
@@ -31,7 +31,7 @@ public enum IconLoader {
 			"donate.png"), Bug("bug.png"), IconLarge("icon_large.png"), IconMedium(
 			"icon_medium.png"), IconSmall("icon_small.png"), DocumentEdit("document_edit.png"), EditComponent(
 			"edit_component.png"), Size("size.png"), Front("front.png"), Back("back.png"), Pens(
-			"pens.png");
+			"pens.png"), Sort("sort.png");

 	protected String name;

--- a/Show More
+++ b/Show More