code format

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/common/ComponentSelection.java

@@ -10,25 +10,22 @@ import java.util.List;
 
 import com.diyfever.diylc.model.IComponentInstance;
 
-public class ComponentSelection extends ArrayList<IComponentInstance> implements
+public class ComponentSelection extends ArrayList<IComponentInstance> implements Transferable {
-		Transferable {
 
 	private static final long serialVersionUID = 1L;
 
-	public static final DataFlavor listFlavor = new DataFlavor(List.class,
+	public static final DataFlavor listFlavor = new DataFlavor(List.class, "Java List");
-			"Java List");
+
-	
 	public ComponentSelection() {
 		super();
 	}
-	
+
 	public ComponentSelection(Collection<IComponentInstance> selectedComponents) {
 		super(selectedComponents);
 	}
 
 	@Override
-	public Object getTransferData(DataFlavor flavor)
+	public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException {
-			throws UnsupportedFlavorException, IOException {
 		if (flavor.equals(listFlavor)) {
 			return this;
 		}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/common/ControlPointWrapper.java

@@ -17,8 +17,8 @@ public class ControlPointWrapper {
 	private boolean sticky;
 	private VisibilityPolicy visibilityPolicy;
 
-	public ControlPointWrapper(String name, Method getter, Method setter,
+	public ControlPointWrapper(String name, Method getter, Method setter, boolean editable,
-			boolean editable, boolean sticky, VisibilityPolicy visibilityPolicy) {
+			boolean sticky, VisibilityPolicy visibilityPolicy) {
 		super();
 		this.name = name;
 		this.getter = getter;
@@ -28,15 +28,13 @@ public class ControlPointWrapper {
 		this.visibilityPolicy = visibilityPolicy;
 	}
 
-	public void readFrom(IComponentInstance component)
+	public void readFrom(IComponentInstance component) throws IllegalArgumentException,
-			throws IllegalArgumentException, IllegalAccessException,
+			IllegalAccessException, InvocationTargetException {
-			InvocationTargetException {
 		value = (Point) getter.invoke(component);
 	}
 
-	public void writeTo(IComponentInstance component)
+	public void writeTo(IComponentInstance component) throws IllegalArgumentException,
-			throws IllegalArgumentException, IllegalAccessException,
+			IllegalAccessException, InvocationTargetException {
-			InvocationTargetException {
 		setter.invoke(component, value);
 	}
 

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/common/IPlugInPort.java

@@ -108,8 +108,7 @@ public interface IPlugInPort {
 	 * @throws BadPositionException
 	 *             in case invalid position is specified
 	 */
-	void injectGUIComponent(JComponent component, int position)
+	void injectGUIComponent(JComponent component, int position) throws BadPositionException;
-			throws BadPositionException;
 
 	/**
 	 * Injects a custom menu action into application's main menu. If
@@ -144,8 +143,7 @@ public interface IPlugInPort {
 	 * 
 	 * @param point
 	 */
-	void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown,
+	void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
-			boolean altDown);
 
 	void mouseMoved(Point point);
 
@@ -266,8 +264,7 @@ public interface IPlugInPort {
 	 * @param properties
 	 * @throws Exception
 	 */
-	void applyPropertiesToSelection(List<PropertyWrapper> properties)
+	void applyPropertiesToSelection(List<PropertyWrapper> properties) throws Exception;
-			throws Exception;
 
 	// void setCursorIcon(Icon icon);
 

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/common/PropertyWrapper.java

@@ -14,8 +14,8 @@ public class PropertyWrapper implements Cloneable {
 	private Method getter;
 	private boolean defaultable;
 
-	public PropertyWrapper(String name, Class<?> type, Method getter,
+	public PropertyWrapper(String name, Class<?> type, Method getter, Method setter,
-			Method setter, boolean defaultable) {
+			boolean defaultable) {
 		super();
 		this.name = name;
 		this.type = type;
@@ -24,24 +24,22 @@ public class PropertyWrapper implements Cloneable {
 		this.defaultable = defaultable;
 	}
 
-	public void readFrom(IComponentInstance component)
+	public void readFrom(IComponentInstance component) throws IllegalArgumentException,
-			throws IllegalArgumentException, IllegalAccessException,
+			IllegalAccessException, InvocationTargetException {
-			InvocationTargetException {
 		this.value = getter.invoke(component);
 	}
 
-//	public void readUniqueFrom(IComponentInstance component)
+	// public void readUniqueFrom(IComponentInstance component)
-//			throws IllegalArgumentException, IllegalAccessException,
+	// throws IllegalArgumentException, IllegalAccessException,
-//			InvocationTargetException {
+	// InvocationTargetException {
-//		Object newValue = getter.invoke(component);
+	// Object newValue = getter.invoke(component);
-//		if (!newValue.equals(value)) {
+	// if (!newValue.equals(value)) {
-//			this.value = null;
+	// this.value = null;
-//		}
+	// }
-//	}
+	// }
 
-	public void writeTo(IComponentInstance component)
+	public void writeTo(IComponentInstance component) throws IllegalArgumentException,
-			throws IllegalArgumentException, IllegalAccessException,
+			IllegalAccessException, InvocationTargetException {
-			InvocationTargetException {
 		setter.invoke(component, value);
 	}
 

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/gui/DialogFactory.java

@@ -55,10 +55,8 @@ public class DialogFactory {
 		}
 	}
 
-	public PropertyEditorDialog createPropertyEditorDialog(
+	public PropertyEditorDialog createPropertyEditorDialog(List<PropertyWrapper> properties) {
-			List<PropertyWrapper> properties) {
+		PropertyEditorDialog editor = new PropertyEditorDialog(mainFrame, properties);
-		PropertyEditorDialog editor = new PropertyEditorDialog(mainFrame,
-				properties);
 		return editor;
 	}
 
@@ -67,33 +65,28 @@ public class DialogFactory {
 		return dialog;
 	}
 
-	public File showOpenDialog(FileFilter fileFilter, File initialFile,
+	public File showOpenDialog(FileFilter fileFilter, File initialFile, String defaultExtension,
-			String defaultExtension, IFileChooserAccessory accessory) {
+			IFileChooserAccessory accessory) {
 		JFileChooser openFileChooser = new JFileChooser();
-		initializeFileChooser(openFileChooser, fileFilter, initialFile,
+		initializeFileChooser(openFileChooser, fileFilter, initialFile, defaultExtension, accessory);
-				defaultExtension, accessory);
 
 		int result = openFileChooser.showOpenDialog(mainFrame);
 
-		return processFileChooserResult(result, openFileChooser,
+		return processFileChooserResult(result, openFileChooser, defaultExtension);
-				defaultExtension);
 	}
 
-	public File showSaveDialog(FileFilter fileFilter, File initialFile,
+	public File showSaveDialog(FileFilter fileFilter, File initialFile, String defaultExtension,
-			String defaultExtension, IFileChooserAccessory accessory) {
+			IFileChooserAccessory accessory) {
 		JFileChooser saveFileChooser = new OverwritePromptFileChooser();
-		initializeFileChooser(saveFileChooser, fileFilter, initialFile,
+		initializeFileChooser(saveFileChooser, fileFilter, initialFile, defaultExtension, accessory);
-				defaultExtension, accessory);
 
 		int result = saveFileChooser.showSaveDialog(mainFrame);
 
-		return processFileChooserResult(result, saveFileChooser,
+		return processFileChooserResult(result, saveFileChooser, defaultExtension);
-				defaultExtension);
 	}
 
-	private void initializeFileChooser(JFileChooser fileChooser,
+	private void initializeFileChooser(JFileChooser fileChooser, FileFilter fileFilter,
-			FileFilter fileFilter, File initialFile, String defaultExtension,
+			File initialFile, String defaultExtension, IFileChooserAccessory accessory) {
-			IFileChooserAccessory accessory) {
 		if (accessory != null) {
 			accessory.install(fileChooser);
 		}
@@ -101,8 +94,7 @@ public class DialogFactory {
 			fileChooser.removeChoosableFileFilter(filter);
 		}
 		if (fileChooser instanceof OverwritePromptFileChooser) {
-			((OverwritePromptFileChooser) fileChooser).setFileFilter(
+			((OverwritePromptFileChooser) fileChooser).setFileFilter(fileFilter, defaultExtension);
-					fileFilter, defaultExtension);
 		} else {
 			fileChooser.setFileFilter(fileFilter);
 		}
@@ -122,19 +114,18 @@ public class DialogFactory {
 			if (fileChooser.getSelectedFile().getAbsolutePath().contains(".")) {
 				return fileChooser.getSelectedFile();
 			} else {
-				return new File(fileChooser.getSelectedFile().getAbsoluteFile()
+				return new File(fileChooser.getSelectedFile().getAbsoluteFile() + "."
-						+ "." + defaultExtension);
+						+ defaultExtension);
 			}
 		} else {
 			return null;
 		}
 	}
 
-	public AboutDialog createAboutDialog(String appName, Icon icon,
+	public AboutDialog createAboutDialog(String appName, Icon icon, String version, String author,
-			String version, String author, String url, String mail,
+			String url, String mail, String htmlContent) {
-			String htmlContent) {
+		AboutDialog dialog = new AboutDialog(mainFrame, appName, icon, version, author, url, mail,
-		AboutDialog dialog = new AboutDialog(mainFrame, appName, icon, version,
+				htmlContent);
-				author, url, mail, htmlContent);
 		return dialog;
 	}
 
@@ -153,10 +144,10 @@ public class DialogFactory {
 		return dialog;
 	}
 
-	public ProgressDialog createProgressDialog(String title,
+	public ProgressDialog createProgressDialog(String title, String[] buttonCaptions,
-			String[] buttonCaptions, String description, boolean useProgress) {
+			String description, boolean useProgress) {
-		ProgressDialog dialog = new ProgressDialog(mainFrame, title,
+		ProgressDialog dialog = new ProgressDialog(mainFrame, title, buttonCaptions, description,
-				buttonCaptions, description, useProgress);
+				useProgress);
 		return dialog;
 	}
 }

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/gui/IView.java

@@ -25,8 +25,7 @@ public interface IView {
 	 * 
 	 * @see IPlugInPort#injectGUIComponent
 	 */
-	void addComponent(JComponent component, int position)
+	void addComponent(JComponent component, int position) throws BadPositionException;
-			throws BadPositionException;
 
 	/**
 	 * Adds a menu action.

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/gui/MainFrame.java

@@ -124,8 +124,7 @@ public class MainFrame extends JFrame implements IView {
 	// IView
 
 	@Override
-	public void addComponent(JComponent component, int position)
+	public void addComponent(JComponent component, int position) throws BadPositionException {
-			throws BadPositionException {
 		switch (position) {
 		case SwingConstants.TOP:
 			topPanel.add(component);

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/gui/components/OverwritePromptFileChooser.java

@@ -16,16 +16,13 @@ public class OverwritePromptFileChooser extends JFileChooser {
 		if (getSelectedFile().getAbsolutePath().contains(".")) {
 			lSelectedFile = getSelectedFile();
 		} else {
-			lSelectedFile = new File(getSelectedFile().getAbsoluteFile() + "."
+			lSelectedFile = new File(getSelectedFile().getAbsoluteFile() + "." + defaultExtension);
-					+ defaultExtension);
 		}
 
 		if (lSelectedFile != null && lSelectedFile.exists()) {
-			int lResponse = JOptionPane.showConfirmDialog(this, lSelectedFile
+			int lResponse = JOptionPane.showConfirmDialog(this, lSelectedFile.getAbsolutePath()
-					.getAbsolutePath()
+					+ " already exists.\nDo you " + "want to replace it?", "Warning",
-					+ " already exists.\nDo you " + "want to replace it?",
+					JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
-					"Warning", JOptionPane.YES_NO_OPTION,
-					JOptionPane.WARNING_MESSAGE);
 
 			if (lResponse != JOptionPane.YES_OPTION) {
 				return;

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/gui/editor/ColorEditor.java

@@ -27,8 +27,8 @@ public class ColorEditor extends JLabel {
 
 			@Override
 			public void mouseClicked(MouseEvent e) {
-				Color newColor = JColorChooser.showDialog(ColorEditor.this,
+				Color newColor = JColorChooser.showDialog(ColorEditor.this, "Choose Color",
-						"Choose Color", getBackground());
+						getBackground());
 				if (newColor != null) {
 					property.setValue(newColor);
 					setBackground(newColor);

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/gui/editor/MeasureEditor.java

@@ -35,8 +35,7 @@ public class MeasureEditor extends Container {
 		add(valueField, BorderLayout.CENTER);
 		try {
 			Method method = measure.getUnit().getClass().getMethod("values");
-			final JComboBox unitBox = new JComboBox((Object[]) method
+			final JComboBox unitBox = new JComboBox((Object[]) method.invoke(measure.getUnit()));
-					.invoke(measure.getUnit()));
 			unitBox.setSelectedItem(measure.getUnit());
 			unitBox.addActionListener(new ActionListener() {
 

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/gui/editor/PropertyEditorDialog.java

@@ -24,8 +24,7 @@ import com.diyfever.gui.ButtonDialog;
 
 public class PropertyEditorDialog extends ButtonDialog {
 
-	private static final Logger LOG = Logger
+	private static final Logger LOG = Logger.getLogger(PropertyEditorDialog.class);
-			.getLogger(PropertyEditorDialog.class);
 
 	private static final long serialVersionUID = 1L;
 
@@ -35,8 +34,7 @@ public class PropertyEditorDialog extends ButtonDialog {
 	private Set<PropertyWrapper> defaultedProperties;
 
 	public PropertyEditorDialog(JFrame owner, List<PropertyWrapper> properties) {
-		super(owner, "Editor", new String[] { ButtonDialog.OK,
+		super(owner, "Editor", new String[] { ButtonDialog.OK, ButtonDialog.CANCEL });
-				ButtonDialog.CANCEL });
 
 		LOG.debug("Creating property editor for: " + properties);
 
@@ -85,8 +83,7 @@ public class PropertyEditorDialog extends ButtonDialog {
 			gbc.fill = GridBagConstraints.HORIZONTAL;
 			gbc.weightx = 1;
 
-			editorPanel
+			editorPanel.add(FieldEditorFactory.createFieldEditor(property), gbc);
-					.add(FieldEditorFactory.createFieldEditor(property), gbc);
 
 			if (property.isDefaultable()) {
 				gbc.gridx = 2;
@@ -124,8 +121,7 @@ public class PropertyEditorDialog extends ButtonDialog {
 	}
 
 	public static boolean showFor(JFrame owner, List<PropertyWrapper> properties) {
-		PropertyEditorDialog editor = new PropertyEditorDialog(owner,
+		PropertyEditorDialog editor = new PropertyEditorDialog(owner, properties);
-				properties);
 		editor.setVisible(true);
 		if (OK.equals(editor.getSelectedButtonCaption())) {
 			return true;

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/images/IconLoader.java

@@ -10,48 +10,18 @@ import javax.swing.ImageIcon;
  */
 public enum IconLoader {
 
-	Delete("delete.png"),
+	Delete("delete.png"), Add("add.png"), FolderOut("folder_out.png"), Garbage("garbage.png"), DiskBlue(
-	Add("add.png"),
+			"disk_blue.png"), SaveAs("save_as.png"), Exit("exit.png"), DocumentPlainYellow(
-	FolderOut("folder_out.png"),
+			"document_plain_yellow.png"), PhotoScenery("photo_scenery.png"), LightBulbOn(
-	Garbage("garbage.png"),
+			"lightbulb_on.png"), LightBulbOff("lightbulb_off.png"), NotebookAdd("notebook_add.png"), FormGreen(
-	DiskBlue("disk_blue.png"),
+			"form_green.png"), Gears("gears.png"), About("about.png"), Donate("donate.gif"), WindowColors(
-	SaveAs("save_as.png"),
+			"window_colors.png"), WindowGear("window_gear.png"), NavigateCheck("navigate_check.png"), Undo(
-	Exit("exit.png"),
+			"undo.png"), Error("error.png"), Warning("warning.png"), ZoomSmall("zoom_small.png"), MoveSmall(
-	DocumentPlainYellow("document_plain_yellow.png"),
+			"move_small.png"), Print("print.png"), PDF("pdf.png"), Excel("excel.png"), CSV(
-	PhotoScenery("photo_scenery.png"),
+			"csv.png"), HTML("html.png"), Image("image.png"), Cut("cut.png"), Copy("copy.png"), Paste(
-	LightBulbOn("lightbulb_on.png"),
+			"paste.png"), Selection("selection.png"), BOM("bom.png"), BlackBoard("blackboard.png"), IdCard(
-	LightBulbOff("lightbulb_off.png"),
+			"id_card.png"), IdCardAdd("id_card_add.png"), Chest("chest.png"), Upload("upload.png"), Wrench(
-	NotebookAdd("notebook_add.png"),
+			"wrench.png"), ;
-	FormGreen("form_green.png"),
-	Gears("gears.png"),
-	About("about.png"), 
-	Donate("donate.gif"),
-	WindowColors("window_colors.png"),
-	WindowGear("window_gear.png"),
-	NavigateCheck("navigate_check.png"),
-	Undo("undo.png"),
-	Error("error.png"),
-	Warning("warning.png"),
-	ZoomSmall("zoom_small.png"),
-	MoveSmall("move_small.png"),
-	Print("print.png"),
-	PDF("pdf.png"),
-	Excel("excel.png"),
-	CSV("csv.png"),
-	HTML("html.png"),
-	Image("image.png"),
-	Cut("cut.png"),
-	Copy("copy.png"),
-	Paste("paste.png"),
-	Selection("selection.png"),
-	BOM("bom.png"),
-	BlackBoard("blackboard.png"),
-	IdCard("id_card.png"),
-	IdCardAdd("id_card_add.png"),
-	Chest("chest.png"),
-	Upload("upload.png"),
-	Wrench("wrench.png"),
-	;
 
 	protected String name;
 

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/model/IComponentInstance.java

@@ -24,5 +24,5 @@ public interface IComponentInstance extends Serializable {
 	 */
 	void draw(Graphics2D g2d, ComponentState componentState);
 
-//	IComponentInstance clone() throws CloneNotSupportedException;
+	// IComponentInstance clone() throws CloneNotSupportedException;
 }

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/model/Project.java

@@ -27,8 +27,8 @@ public class Project implements Serializable {
 		height = new Size(21d, SizeUnit.cm);
 	}
 
-	public Project(String title, String author, String description, Size width,
+	public Project(String title, String author, String description, Size width, Size height,
-			Size height, List<IComponentInstance> components) {
+			List<IComponentInstance> components) {
 		super();
 		this.title = title;
 		this.author = author;
@@ -92,10 +92,8 @@ public class Project implements Serializable {
 		final int prime = 31;
 		int result = 1;
 		result = prime * result + ((author == null) ? 0 : author.hashCode());
-		result = prime * result
+		result = prime * result + ((components == null) ? 0 : components.hashCode());
-				+ ((components == null) ? 0 : components.hashCode());
+		result = prime * result + ((description == null) ? 0 : description.hashCode());
-		result = prime * result
-				+ ((description == null) ? 0 : description.hashCode());
 		result = prime * result + ((height == null) ? 0 : height.hashCode());
 		result = prime * result + ((title == null) ? 0 : title.hashCode());
 		result = prime * result + ((width == null) ? 0 : width.hashCode());
@@ -144,14 +142,15 @@ public class Project implements Serializable {
 		return true;
 	}
 
-//	@Override
+	// @Override
-//	public Project clone() throws CloneNotSupportedException {
+	// public Project clone() throws CloneNotSupportedException {
-//		List<IComponentInstance> clonedComponents = new ArrayList<IComponentInstance>();
+	// List<IComponentInstance> clonedComponents = new
-//		for (IComponentInstance component : components) {
+	// ArrayList<IComponentInstance>();
-//			clonedComponents.add(component.clone());
+	// for (IComponentInstance component : components) {
-//		}
+	// clonedComponents.add(component.clone());
-//		Project project = new Project(title, author, description,
+	// }
-//				width.clone(), height.clone(), clonedComponents);
+	// Project project = new Project(title, author, description,
-//		return project;
+	// width.clone(), height.clone(), clonedComponents);
-//	}
+	// return project;
+	// }
 }

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/model/annotations/ControlPoint.java

@@ -38,11 +38,11 @@ public @interface ControlPoint {
 	 */
 	boolean sticky() default true;
 
-//	/**
+	// /**
-//	 * If true, the control point is the main control point for the component.
+	// * If true, the control point is the main control point for the component.
-//	 * There cannot be more than one control point for a single component.
+	// * There cannot be more than one control point for a single component.
-//	 * 
+	// *
-//	 * @return
+	// * @return
-//	 */
+	// */
-//	boolean main() default false;
+	// boolean main() default false;
 }

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/model/measures/AbstractMeasure.java

@@ -4,8 +4,7 @@ import java.io.Serializable;
 import java.text.DecimalFormat;
 import java.text.Format;
 
-public class AbstractMeasure<T extends Enum<? extends Unit>> implements
+public class AbstractMeasure<T extends Enum<? extends Unit>> implements Serializable, Cloneable {
-		Serializable, Cloneable {
 
 	private static final long serialVersionUID = 1L;
 

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/model/measures/Converter.java

@@ -4,7 +4,7 @@ public class Converter {
 
 	public static <T extends Enum<? extends Unit>> AbstractMeasure<T> convert(
 			AbstractMeasure<T> measure, T newUnit) {
-		
+
 		return null;
 	}
 }

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/model/measures/Size.java

@@ -6,8 +6,7 @@ public class Size extends AbstractMeasure<SizeUnit> {
 
 	private static final long serialVersionUID = 1L;
 
-	public static final int PIXELS_PER_INCH = Toolkit.getDefaultToolkit()
+	public static final int PIXELS_PER_INCH = Toolkit.getDefaultToolkit().getScreenResolution();
-			.getScreenResolution();
 
 	public Size() {
 		super();

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/canvas/CanvasGestureListener.java

@@ -23,7 +23,7 @@ class CanvasGestureListener implements DragGestureListener {
 	@Override
 	public void dragGestureRecognized(DragGestureEvent dge) {
 		presenter.dragStarted(dge.getDragOrigin());
-		dge.startDrag(Cursor.getDefaultCursor(), new EmptyTransferable(),
+		dge.startDrag(Cursor.getDefaultCursor(), new EmptyTransferable(), new CanvasSourceListener(
-				new CanvasSourceListener(presenter));
+				presenter));
 	}
 }

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/canvas/CanvasPanel.java

@@ -48,9 +48,9 @@ class CanvasPanel extends JComponent implements Autoscroll {
 	private VolatileImage bufferImage;
 	private GraphicsConfiguration screenGraphicsConfiguration;
 
-	private static final EnumSet<DrawOption> drawOptions = EnumSet.of(
+	private static final EnumSet<DrawOption> drawOptions = EnumSet.of(DrawOption.GRID,
-			DrawOption.GRID, DrawOption.SELECTION, DrawOption.ZOOM,
+			DrawOption.SELECTION, DrawOption.ZOOM, DrawOption.ANTIALIASING,
-			DrawOption.ANTIALIASING, DrawOption.CONTROL_POINTS);
+			DrawOption.CONTROL_POINTS);
 
 	public CanvasPanel(IPlugInPort plugInPort) {
 		super();
@@ -59,8 +59,7 @@ class CanvasPanel extends JComponent implements Autoscroll {
 		setFocusable(true);
 		initializeListeners();
 		initializeDnD();
-		GraphicsEnvironment graphicsEnvironment = GraphicsEnvironment
+		GraphicsEnvironment graphicsEnvironment = GraphicsEnvironment.getLocalGraphicsEnvironment();
-				.getLocalGraphicsEnvironment();
 		GraphicsDevice[] devices = graphicsEnvironment.getScreenDevices();
 		screenGraphicsConfiguration = devices[0].getDefaultConfiguration();
 
@@ -73,9 +72,8 @@ class CanvasPanel extends JComponent implements Autoscroll {
 
 	private void initializeDnD() {
 		// Initialize drag source recognizer.
-		DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
+		DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(this,
-				this, DnDConstants.ACTION_MOVE,
+				DnDConstants.ACTION_MOVE, new CanvasGestureListener(plugInPort));
-				new CanvasGestureListener(plugInPort));
 		// Initialize drop target.
 		new DropTarget(this, DnDConstants.ACTION_COPY_OR_MOVE,
 				new CanvasTargetListener(plugInPort), true);
@@ -96,8 +94,8 @@ class CanvasPanel extends JComponent implements Autoscroll {
 	}
 
 	protected void createBufferImage() {
-		bufferImage = screenGraphicsConfiguration
+		bufferImage = screenGraphicsConfiguration.createCompatibleVolatileImage(getWidth(),
-				.createCompatibleVolatileImage(getWidth(), getHeight());
+				getHeight());
 		bufferImage.validate(screenGraphicsConfiguration);
 		Graphics2D g2d = (Graphics2D) bufferImage.getGraphics();
 		plugInPort.draw(g2d, drawOptions);
@@ -157,24 +155,19 @@ class CanvasPanel extends JComponent implements Autoscroll {
 							if (properties.isEmpty()) {
 
 							} else {
-								PropertyEditorDialog editor = DialogFactory
+								PropertyEditorDialog editor = DialogFactory.getInstance()
-										.getInstance()
 										.createPropertyEditorDialog(properties);
 								editor.setVisible(true);
-								if (ButtonDialog.OK.equals(editor
+								if (ButtonDialog.OK.equals(editor.getSelectedButtonCaption())) {
-										.getSelectedButtonCaption())) {
 									try {
-										plugInPort
+										plugInPort.applyPropertiesToSelection(properties);
-												.applyPropertiesToSelection(properties);
 									} catch (Exception e1) {
 										// TODO Auto-generated catch block
 										e1.printStackTrace();
 									}
-									for (PropertyWrapper property : editor
+									for (PropertyWrapper property : editor.getDefaultedProperties()) {
-											.getDefaultedProperties()) {
 										if (property.getValue() != null) {
-											plugInPort.setDefaultPropertyValue(
+											plugInPort.setDefaultPropertyValue(property.getName(),
-													property.getName(),
 													property.getValue());
 										}
 									}
@@ -182,9 +175,8 @@ class CanvasPanel extends JComponent implements Autoscroll {
 							}
 						}
 					} else {
-						plugInPort.mouseClicked(e.getPoint(),
+						plugInPort.mouseClicked(e.getPoint(), e.isControlDown(), e.isShiftDown(), e
-								e.isControlDown(), e.isShiftDown(), e
+								.isAltDown());
-										.isAltDown());
 					}
 				}
 			}
@@ -195,14 +187,13 @@ class CanvasPanel extends JComponent implements Autoscroll {
 
 	@Override
 	public void autoscroll(Point cursorLocn) {
-		scrollRectToVisible(new Rectangle(cursorLocn.x - 15, cursorLocn.y - 15,
+		scrollRectToVisible(new Rectangle(cursorLocn.x - 15, cursorLocn.y - 15, 30, 30));
-				30, 30));
 	}
 
 	@Override
 	public Insets getAutoscrollInsets() {
 		Rectangle rect = getVisibleRect();
-		return new Insets(rect.y - 15, rect.x - 15, rect.y + rect.height + 15,
+		return new Insets(rect.y - 15, rect.x - 15, rect.y + rect.height + 15, rect.x + rect.width
-				rect.x + rect.width + 15);
+				+ 15);
 	}
 }

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/canvas/CanvasPlugin.java

@@ -33,8 +33,7 @@ public class CanvasPlugin implements IPlugIn {
 		this.plugInPort = plugInPort;
 		canvasPanel = new CanvasPanel(plugInPort);
 		try {
-			plugInPort.injectGUIComponent(getScrollPane(),
+			plugInPort.injectGUIComponent(getScrollPane(), SwingConstants.CENTER);
-					SwingConstants.CENTER);
 		} catch (BadPositionException e) {
 			e.printStackTrace();
 		}
@@ -42,10 +41,9 @@ public class CanvasPlugin implements IPlugIn {
 
 	private RulerScrollPane getScrollPane() {
 		if (scrollPane == null) {
-			scrollPane = new RulerScrollPane(canvasPanel,
+			scrollPane = new RulerScrollPane(canvasPanel, new ProjectDrawingProvider(plugInPort));
-					new ProjectDrawingProvider(plugInPort));
+			Boolean metric = (Boolean) ConfigurationManager.getInstance().getConfigurationItem(
-			Boolean metric = (Boolean) ConfigurationManager.getInstance()
+					METRIC_KEY);
-					.getConfigurationItem(METRIC_KEY);
 			if (metric == null) {
 				metric = true;
 			}
@@ -54,8 +52,7 @@ public class CanvasPlugin implements IPlugIn {
 
 				@Override
 				public void unitsChanged(boolean isMetric) {
-					ConfigurationManager.getInstance().setConfigurationItem(
+					ConfigurationManager.getInstance().setConfigurationItem(METRIC_KEY, isMetric);
-							METRIC_KEY, isMetric);
 				}
 			});
 		}
@@ -64,8 +61,7 @@ public class CanvasPlugin implements IPlugIn {
 
 	@Override
 	public EnumSet<EventType> getSubscribedEventTypes() {
-		return EnumSet.of(EventType.PROJECT_LOADED, EventType.ZOOM_CHANGED,
+		return EnumSet.of(EventType.PROJECT_LOADED, EventType.ZOOM_CHANGED, EventType.REPAINT);
-				EventType.REPAINT);
 	}
 
 	@Override
@@ -81,8 +77,7 @@ public class CanvasPlugin implements IPlugIn {
 			if ((Boolean) params[1]) {
 				// Scroll to the center.
 				Rectangle visibleRect = canvasPanel.getVisibleRect();
-				visibleRect.setLocation(
+				visibleRect.setLocation((canvasPanel.getWidth() - visibleRect.width) / 2,
-						(canvasPanel.getWidth() - visibleRect.width) / 2,
 						(canvasPanel.getHeight() - visibleRect.height) / 2);
 				canvasPanel.scrollRectToVisible(visibleRect);
 				canvasPanel.revalidate();

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/canvas/CanvasSourceListener.java

@@ -39,8 +39,7 @@ class CanvasSourceListener implements DragSourceListener {
 	public void dragOver(DragSourceDragEvent dsde) {
 		Point p = dsde.getDragSourceContext().getComponent().getMousePosition();
 		if (p != null) {
-			dsde.getDragSourceContext().getComponent().firePropertyChange(
+			dsde.getDragSourceContext().getComponent().firePropertyChange("dragPoint", p.x, p.y);
-					"dragPoint", p.x, p.y);
 		}
 	}
 

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/canvas/EmptyTransferable.java

@@ -8,8 +8,7 @@ import java.io.IOException;
 public class EmptyTransferable implements Transferable {
 
 	@Override
-	public Object getTransferData(DataFlavor flavor)
+	public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException {
-			throws UnsupportedFlavorException, IOException {
 		throw new UnsupportedFlavorException(flavor);
 	}
 

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/canvas/PointTransferable.java

@@ -8,8 +8,7 @@ import java.io.IOException;
 
 public class PointTransferable implements Transferable {
 
-	public static final DataFlavor pointFlavor = new DataFlavor(Point.class,
+	public static final DataFlavor pointFlavor = new DataFlavor(Point.class, "Java Point");
-			"Java Point");
 
 	private Point startPoint;
 
@@ -19,8 +18,7 @@ public class PointTransferable implements Transferable {
 	}
 
 	@Override
-	public Object getTransferData(DataFlavor flavor)
+	public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException {
-			throws UnsupportedFlavorException, IOException {
 		if (flavor.equals(pointFlavor)) {
 			return startPoint;
 		}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/canvas/SelectionTransferable.java

@@ -17,16 +17,14 @@ public class SelectionTransferable implements Transferable {
 	private Point startPoint;
 	private List<IComponentInstance> selection;
 
-	public SelectionTransferable(List<IComponentInstance> selection,
+	public SelectionTransferable(List<IComponentInstance> selection, Point startPoint) {
-			Point startPoint) {
 		super();
 		this.selection = selection;
 		this.startPoint = startPoint;
 	}
 
 	@Override
-	public Object getTransferData(DataFlavor flavor)
+	public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException {
-			throws UnsupportedFlavorException, IOException {
 		if (flavor.equals(selectionFlavor)) {
 			return selection;
 		}
@@ -38,8 +36,7 @@ public class SelectionTransferable implements Transferable {
 
 	@Override
 	public DataFlavor[] getTransferDataFlavors() {
-		return new DataFlavor[] { selectionFlavor,
+		return new DataFlavor[] { selectionFlavor, PointTransferable.pointFlavor };
-				PointTransferable.pointFlavor };
 	}
 
 	@Override

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/clipboard/ClipboardManager.java

@@ -82,8 +82,7 @@ public class ClipboardManager implements IPlugIn, ClipboardOwner {
 
 	@Override
 	public EnumSet<EventType> getSubscribedEventTypes() {
-		return EnumSet.of(EventType.SELECTION_CHANGED,
+		return EnumSet.of(EventType.SELECTION_CHANGED, EventType.PROJECT_MODIFIED);
-				EventType.PROJECT_MODIFIED);
 	}
 
 	@Override
@@ -93,8 +92,7 @@ public class ClipboardManager implements IPlugIn, ClipboardOwner {
 			refreshActions();
 			break;
 		case PROJECT_MODIFIED:
-			undoHandler.stateChanged((Project) params[0], (Project) params[1],
+			undoHandler.stateChanged((Project) params[0], (Project) params[1], (String) params[2]);
-					(String) params[2]);
 			break;
 		}
 	}
@@ -104,8 +102,7 @@ public class ClipboardManager implements IPlugIn, ClipboardOwner {
 		cutAction.setEnabled(enabled);
 		copyAction.setEnabled(enabled);
 		try {
-			pasteAction.setEnabled(clipboard
+			pasteAction.setEnabled(clipboard.isDataFlavorAvailable(ComponentSelection.listFlavor));
-					.isDataFlavorAvailable(ComponentSelection.listFlavor));
 		} catch (Exception e) {
 			pasteAction.setEnabled(false);
 		}
@@ -118,8 +115,8 @@ public class ClipboardManager implements IPlugIn, ClipboardOwner {
 		public CutAction() {
 			super();
 			putValue(AbstractAction.NAME, "Cut");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_X,
-					KeyEvent.VK_X, ActionEvent.CTRL_MASK));
+					ActionEvent.CTRL_MASK));
 			putValue(AbstractAction.SMALL_ICON, IconLoader.Cut.getIcon());
 		}
 
@@ -136,16 +133,16 @@ public class ClipboardManager implements IPlugIn, ClipboardOwner {
 		public CopyAction() {
 			super();
 			putValue(AbstractAction.NAME, "Copy");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C,
-					KeyEvent.VK_C, ActionEvent.CTRL_MASK));
+					ActionEvent.CTRL_MASK));
 			putValue(AbstractAction.SMALL_ICON, IconLoader.Copy.getIcon());
 		}
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
 			LOG.info("Copy triggered");
-			clipboard.setContents(cloner.deepClone(plugInPort
+			clipboard.setContents(cloner.deepClone(plugInPort.getSelectedComponents()),
-					.getSelectedComponents()), ClipboardManager.this);
+					ClipboardManager.this);
 		}
 	}
 
@@ -156,8 +153,8 @@ public class ClipboardManager implements IPlugIn, ClipboardOwner {
 		public PasteAction() {
 			super();
 			putValue(AbstractAction.NAME, "Paste");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_V,
-					KeyEvent.VK_V, ActionEvent.CTRL_MASK));
+					ActionEvent.CTRL_MASK));
 			putValue(AbstractAction.SMALL_ICON, IconLoader.Paste.getIcon());
 		}
 
@@ -182,8 +179,8 @@ public class ClipboardManager implements IPlugIn, ClipboardOwner {
 		public SelectAllAction() {
 			super();
 			putValue(AbstractAction.NAME, "Select All");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A,
-					KeyEvent.VK_A, ActionEvent.CTRL_MASK));
+					ActionEvent.CTRL_MASK));
 			putValue(AbstractAction.SMALL_ICON, IconLoader.Selection.getIcon());
 		}
 

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/file/BomDialog.java

@@ -54,9 +54,8 @@ public class BomDialog extends JDialog {
 	private ObjectListTable<BomEntry> getTable() {
 		if (table == null) {
 			try {
-				table = new ObjectListTable<BomEntry>(BomEntry.class,
+				table = new ObjectListTable<BomEntry>(BomEntry.class, new String[] { "getName",
-						new String[] { "getName", "getValue", "getQuantity",
+						"getValue", "getQuantity", "getNotes/setNotes" }, null);
-								"getNotes/setNotes" }, null);
 			} catch (SecurityException e) {
 				e.printStackTrace();
 			} catch (NoSuchMethodException e) {
@@ -115,9 +114,8 @@ public class BomDialog extends JDialog {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			File file = DialogFactory.getInstance().showSaveDialog(
+			File file = DialogFactory.getInstance().showSaveDialog(FileFilterEnum.CSV.getFilter(),
-					FileFilterEnum.CSV.getFilter(), null,
+					null, FileFilterEnum.CSV.getExtensions()[0], null);
-					FileFilterEnum.CSV.getExtensions()[0], null);
 			if (file != null) {
 				try {
 					TableExporter.getInstance().exportToCSV(getTable(), file);
@@ -141,9 +139,8 @@ public class BomDialog extends JDialog {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			File file = DialogFactory.getInstance().showSaveDialog(
+			File file = DialogFactory.getInstance().showSaveDialog(FileFilterEnum.HTML.getFilter(),
-					FileFilterEnum.HTML.getFilter(), null,
+					null, FileFilterEnum.HTML.getExtensions()[0], null);
-					FileFilterEnum.HTML.getExtensions()[0], null);
 			if (file != null) {
 				try {
 					TableExporter.getInstance().exportToHTML(getTable(), file);
@@ -167,9 +164,8 @@ public class BomDialog extends JDialog {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			File file = DialogFactory.getInstance().showSaveDialog(
+			File file = DialogFactory.getInstance().showSaveDialog(FileFilterEnum.PNG.getFilter(),
-					FileFilterEnum.PNG.getFilter(), null,
+					null, FileFilterEnum.PNG.getExtensions()[0], null);
-					FileFilterEnum.PNG.getExtensions()[0], null);
 			if (file != null) {
 				try {
 					TableExporter.getInstance().exportToPNG(getTable(), file);

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/file/FileFilterEnum.java

@@ -6,12 +6,9 @@ import javax.swing.filechooser.FileFilter;
 
 enum FileFilterEnum {
 
-	PNG("PNG Images (*.png)", "png"),
+	PNG("PNG Images (*.png)", "png"), PDF("PDF Files (*.pdf)", "pdf"), DIY(
-	PDF("PDF Files (*.pdf)", "pdf"),
+			"DIY Project Files (*.diy)", "diy"), EXCEL("Excel Workbooks (*.xls)", "xls"), CSV(
-	DIY("DIY Project Files (*.diy)", "diy"),
+			"Comma Separated Files (*.csv)", "csv"), HTML("HTML Files (*.html)", "html");
-	EXCEL("Excel Workbooks (*.xls)", "xls"),
-	CSV("Comma Separated Files (*.csv)", "csv"),
-	HTML("HTML Files (*.html)", "html");
 
 	FileFilter filter;
 	String[] extensions;
@@ -23,8 +20,7 @@ enum FileFilterEnum {
 			@Override
 			public boolean accept(File f) {
 				String fileExt = f.getName();
-				fileExt = fileExt.substring(fileExt.lastIndexOf('.') + 1)
+				fileExt = fileExt.substring(fileExt.lastIndexOf('.') + 1).toLowerCase();
-						.toLowerCase();
 				for (String ext : extensions) {
 					if (ext.equals(fileExt)) {
 						return true;

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/file/FileManager.java

@@ -59,8 +59,7 @@ public class FileManager implements IPlugIn {
 		public NewAction() {
 			super();
 			putValue(AbstractAction.NAME, "New");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.DocumentPlainYellow
+			putValue(AbstractAction.SMALL_ICON, IconLoader.DocumentPlainYellow.getIcon());
-					.getIcon());
 		}
 
 		@Override
@@ -82,10 +81,8 @@ public class FileManager implements IPlugIn {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			File file = DialogFactory.getInstance()
+			File file = DialogFactory.getInstance().showOpenDialog(FileFilterEnum.DIY.getFilter(),
-					.showOpenDialog(FileFilterEnum.DIY.getFilter(), null,
+					null, FileFilterEnum.DIY.getExtensions()[0], new ProjectPreview());
-							FileFilterEnum.DIY.getExtensions()[0],
-							new ProjectPreview());
 			if (file != null) {
 				LOG.info("Loading project from file.");
 				FileInputStream fis;
@@ -117,10 +114,8 @@ public class FileManager implements IPlugIn {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			File file = DialogFactory.getInstance()
+			File file = DialogFactory.getInstance().showSaveDialog(FileFilterEnum.DIY.getFilter(),
-					.showSaveDialog(FileFilterEnum.DIY.getFilter(), null,
+					null, FileFilterEnum.DIY.getExtensions()[0], new ProjectPreview());
-							FileFilterEnum.DIY.getExtensions()[0],
-							new ProjectPreview());
 			if (file != null) {
 				LOG.info("Saving project to file.");
 				FileOutputStream fos;
@@ -151,10 +146,8 @@ public class FileManager implements IPlugIn {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			File file = DialogFactory.getInstance()
+			File file = DialogFactory.getInstance().showSaveDialog(FileFilterEnum.DIY.getFilter(),
-					.showSaveDialog(FileFilterEnum.DIY.getFilter(), null,
+					null, FileFilterEnum.DIY.getExtensions()[0], new ProjectPreview());
-							FileFilterEnum.DIY.getExtensions()[0],
-							new ProjectPreview());
 			if (file != null) {
 				LOG.info("Saving project to file.");
 				FileOutputStream fos;
@@ -204,9 +197,8 @@ public class FileManager implements IPlugIn {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			File file = DialogFactory.getInstance().showSaveDialog(
+			File file = DialogFactory.getInstance().showSaveDialog(FileFilterEnum.PDF.getFilter(),
-					FileFilterEnum.PDF.getFilter(), null,
+					null, FileFilterEnum.PDF.getExtensions()[0], null);
-					FileFilterEnum.PDF.getExtensions()[0], null);
 			if (file != null) {
 				DrawingExporter.getInstance().exportPDF(drawingProvider, file);
 			}
@@ -225,9 +217,8 @@ public class FileManager implements IPlugIn {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			File file = DialogFactory.getInstance().showSaveDialog(
+			File file = DialogFactory.getInstance().showSaveDialog(FileFilterEnum.PNG.getFilter(),
-					FileFilterEnum.PNG.getFilter(), null,
+					null, FileFilterEnum.PNG.getExtensions()[0], null);
-					FileFilterEnum.PNG.getExtensions()[0], null);
 			if (file != null) {
 				DrawingExporter.getInstance().exportPNG(drawingProvider, file);
 			}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/file/ProjectDrawingProvider.java

@@ -26,8 +26,7 @@ public class ProjectDrawingProvider implements IDrawingProvider {
 
 	@Override
 	public void draw(Graphics g) {
-		plugInPort.draw((Graphics2D) g, EnumSet.of(DrawOption.ZOOM,
+		plugInPort.draw((Graphics2D) g, EnumSet.of(DrawOption.ZOOM, DrawOption.ANTIALIASING));
-				DrawOption.ANTIALIASING));
 	}
 
 	@Override

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/file/ProjectPreview.java

@@ -35,8 +35,7 @@ import com.thoughtworks.xstream.io.xml.DomDriver;
  * 
  * @author Branislav Stojkovic
  */
-public class ProjectPreview extends JPanel implements PropertyChangeListener,
+public class ProjectPreview extends JPanel implements PropertyChangeListener, IFileChooserAccessory {
-		IFileChooserAccessory {
 
 	private static final long serialVersionUID = 1L;
 
@@ -148,8 +147,7 @@ public class ProjectPreview extends JPanel implements PropertyChangeListener,
 			presenter.draw(g2d, EnumSet.noneOf(DrawOption.class));
 
 			g2d.setColor(Color.black);
-			g2d.drawRect(0, 0, d.width - (int) (1 / zoomRatio), d.height
+			g2d.drawRect(0, 0, d.width - (int) (1 / zoomRatio), d.height - (int) (1 / zoomRatio));
-					- (int) (1 / zoomRatio));
 		}
 	}
 

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/help/HelpManager.java

@@ -37,10 +37,10 @@ public class HelpManager implements IPlugIn {
 
 	private AboutDialog getAboutDialog() {
 		if (aboutDialog == null) {
-			aboutDialog = DialogFactory.getInstance().createAboutDialog(
+			aboutDialog = DialogFactory.getInstance().createAboutDialog("DIY Layout Creator 4",
-					"DIY Layout Creator 4", IconLoader.BlackBoard.getIcon(),
+					IconLoader.BlackBoard.getIcon(),
-					plugInPort.getCurrentVersionNumber().toString(),
+					plugInPort.getCurrentVersionNumber().toString(), "Bane Stojkovic",
-					"Bane Stojkovic", "diy-fever.com", "bancika@gmail.com", "");
+					"diy-fever.com", "bancika@gmail.com", "");
 		}
 		return aboutDialog;
 	}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/online/OnlineManager.java

@@ -95,8 +95,7 @@ public class OnlineManager implements IPlugIn {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			LoginDialog dialog = DialogFactory.getInstance()
+			LoginDialog dialog = DialogFactory.getInstance().createLoginDialog();
-					.createLoginDialog();
 			dialog.setVisible(true);
 		}
 	}
@@ -113,8 +112,7 @@ public class OnlineManager implements IPlugIn {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			NewUserDialog dialog = DialogFactory.getInstance()
+			NewUserDialog dialog = DialogFactory.getInstance().createNewUserDialog();
-					.createNewUserDialog();
 			dialog.setVisible(true);
 		}
 	}
@@ -131,8 +129,7 @@ public class OnlineManager implements IPlugIn {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			UploadDialog dialog = DialogFactory.getInstance()
+			UploadDialog dialog = DialogFactory.getInstance().createUploadDialog();
-					.createUploadDialog();
 			dialog.setVisible(true);
 		}
 	}
@@ -149,9 +146,8 @@ public class OnlineManager implements IPlugIn {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			ProgressDialog dialog = DialogFactory.getInstance()
+			ProgressDialog dialog = DialogFactory.getInstance().createProgressDialog("Test",
-					.createProgressDialog("Test", new String[] {}, "Some text",
+					new String[] {}, "Some text", false);
-							false);
 			dialog.setVisible(true);
 		}
 	}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/online/Test.java

@@ -4,7 +4,6 @@ import org.apache.log4j.BasicConfigurator;
 
 import com.diyfever.diylc.plugins.online.presenter.LibraryPresenter;
 
-
 public class Test {
 
 	/**
@@ -13,17 +12,17 @@ public class Test {
 	 */
 	public static void main(String[] args) throws Exception {
 		BasicConfigurator.configure();
-		 LibraryPresenter pres = new LibraryPresenter();
+		LibraryPresenter pres = new LibraryPresenter();
-//		 pres.createUser("bancika", "pwd", "bancika@gmail.com");
+		// pres.createUser("bancika", "pwd", "bancika@gmail.com");
-		 System.out.println(pres.fetchCategories());
+		System.out.println(pres.fetchCategories());
-		 pres.login("bancika", "pwd");
+		pres.login("bancika", "pwd");
-		 int id = pres.fetchMyProjectRows().get(0).getId();
+		int id = pres.fetchMyProjectRows().get(0).getId();
-		 // InputStream stream = pres.downloadProjectContent(id);
+		// InputStream stream = pres.downloadProjectContent(id);
-		 // byte[] buf = new byte[100];
+		// byte[] buf = new byte[100];
-		 // int len = stream.read(buf);
+		// int len = stream.read(buf);
-		 System.out.println(pres.downloadProjectContent(id));
+		System.out.println(pres.downloadProjectContent(id));
-		 // System.out.println(pres.hashPassword("bancikabancikabancikabancikabancika"));
+		// System.out.println(pres.hashPassword("bancikabancikabancikabancikabancika"));
-		 pres.dispose();
+		pres.dispose();
 	}
 
 }

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/online/model/ProjectEntity.java

@@ -21,8 +21,7 @@ public class ProjectEntity implements Serializable {
 		super();
 	}
 
-	public ProjectEntity(int id, String name, String description, String owner,
+	public ProjectEntity(int id, String name, String description, String owner, String category) {
-			String category) {
 		super();
 		this.id = id;
 		this.name = name;
@@ -88,10 +87,8 @@ public class ProjectEntity implements Serializable {
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
-		result = prime * result
+		result = prime * result + ((category == null) ? 0 : category.hashCode());
-				+ ((category == null) ? 0 : category.hashCode());
+		result = prime * result + ((description == null) ? 0 : description.hashCode());
-		result = prime * result
-				+ ((description == null) ? 0 : description.hashCode());
 		result = prime * result + id;
 		result = prime * result + ((name == null) ? 0 : name.hashCode());
 		result = prime * result + ((owner == null) ? 0 : owner.hashCode());

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/online/presenter/LibraryPresenter.java

@@ -53,19 +53,17 @@ public class LibraryPresenter {
 		}
 	}
 
-	public void createUser(String userName, String password, String email)
+	public void createUser(String userName, String password, String email) throws SQLException,
-			throws SQLException, NotConnectedException, AlreadyExistsException {
+			NotConnectedException, AlreadyExistsException {
 		LOG.info("Creating user: " + userName);
 		if (dbManager.isConnected()) {
-			ResultSet resultSet = dbManager.getResultSet(String.format(
+			ResultSet resultSet = dbManager.getResultSet(String.format(USER_SQL, userName));
-					USER_SQL, userName));
 			if (resultSet.next()) {
 				throw new AlreadyExistsException();
 			}
-			dbManager.updateDB(String.format(CREATE_USER_SQL, userName,
+			dbManager.updateDB(String.format(CREATE_USER_SQL, userName, hashPassword(password),
-					hashPassword(password), email));
+					email));
-			resultSet = dbManager.getResultSet(String
+			resultSet = dbManager.getResultSet(String.format(USER_SQL, userName));
-					.format(USER_SQL, userName));
 			if (resultSet.next()) {
 				LOG.info("Logged in as \"" + userName + "\"");
 				currentUserId = resultSet.getInt("user_id");
@@ -80,8 +78,7 @@ public class LibraryPresenter {
 			NotConnectedException {
 		LOG.info("Logging in as: " + userName);
 		if (dbManager.isConnected()) {
-			ResultSet resultSet = dbManager.getResultSet(String.format(
+			ResultSet resultSet = dbManager.getResultSet(String.format(USER_SQL, userName));
-					USER_SQL, userName));
 			if (resultSet.next()) {
 				String dbPassword = resultSet.getString("password");
 				String hashPassword = hashPassword(password);
@@ -99,15 +96,13 @@ public class LibraryPresenter {
 		}
 	}
 
-	public Map<Integer, String> fetchCategories() throws SQLException,
+	public Map<Integer, String> fetchCategories() throws SQLException, NotConnectedException {
-			NotConnectedException {
 		LOG.info("Fetching categories");
 		if (dbManager.isConnected()) {
 			Map<Integer, String> categories = new HashMap<Integer, String>();
 			ResultSet resultSet = dbManager.getResultSet(CATEGORY_SQL);
 			while (resultSet.next()) {
-				categories.put(resultSet.getInt("category_id"), resultSet
+				categories.put(resultSet.getInt("category_id"), resultSet.getString("name"));
-						.getString("name"));
 			}
 			return categories;
 		} else {
@@ -116,19 +111,18 @@ public class LibraryPresenter {
 		}
 	}
 
-	public List<ProjectEntity> fetchMyProjectRows()
+	public List<ProjectEntity> fetchMyProjectRows() throws NotLoggedInException,
-			throws NotLoggedInException, NotConnectedException, SQLException {
+			NotConnectedException, SQLException {
 		if (dbManager.isConnected()) {
 			if (isLoggedIn()) {
 				Map<Integer, String> categories = fetchCategories();
 				List<ProjectEntity> projects = new ArrayList<ProjectEntity>();
-				ResultSet resultSet = dbManager.getResultSet(String.format(
+				ResultSet resultSet = dbManager.getResultSet(String.format(MY_PROJECTS_SQL,
-						MY_PROJECTS_SQL, currentUserId));
+						currentUserId));
 				while (resultSet.next()) {
-					projects.add(new ProjectEntity(resultSet
+					projects.add(new ProjectEntity(resultSet.getInt("project_id"), resultSet
-							.getInt("project_id"), resultSet.getString("name"),
+							.getString("name"), resultSet.getString("description"), "", categories
-							resultSet.getString("description"), "", categories
+							.get(resultSet.getInt("category_id"))));
-									.get(resultSet.getInt("category_id"))));
 				}
 				return projects;
 			} else {
@@ -141,16 +135,14 @@ public class LibraryPresenter {
 		}
 	}
 
-	public String downloadProjectContent(int projectId)
+	public String downloadProjectContent(int projectId) throws NotConnectedException,
-			throws NotConnectedException, NotExistsException, SQLException {
+			NotExistsException, SQLException {
 		if (dbManager.isConnected()) {
-			ResultSet resultSet = dbManager.getResultSet(String.format(
+			ResultSet resultSet = dbManager.getResultSet(String.format(PROJECT_SQL, projectId));
-					PROJECT_SQL, projectId));
 			if (resultSet.next()) {
 				return resultSet.getString("content");
 			}
-			throw new NotExistsException("Project with id = " + projectId
+			throw new NotExistsException("Project with id = " + projectId + " does not exist.");
-					+ " does not exist.");
 		} else {
 			LOG.error("Not connected");
 			throw new NotConnectedException();

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/online/view/LoginDialog.java

@@ -82,31 +82,29 @@ public class LoginDialog extends ButtonDialog {
 		this.password = new String(getPasswordField().getPassword());
 
 		JButton okButton = getButton(OK);
-		okButton.setEnabled((this.userName.length() > 0)
+		okButton.setEnabled((this.userName.length() > 0) && (this.password.length() > 0));
-				&& (this.password.length() > 0));
 	}
 
 	private JTextField getUserNameField() {
 		if (userNameField == null) {
 			userNameField = new JTextField();
-			userNameField.getDocument().addDocumentListener(
+			userNameField.getDocument().addDocumentListener(new DocumentListener() {
-					new DocumentListener() {
 
-						@Override
+				@Override
-						public void removeUpdate(DocumentEvent e) {
+				public void removeUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
 
-						@Override
+				@Override
-						public void insertUpdate(DocumentEvent e) {
+				public void insertUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
 
-						@Override
+				@Override
-						public void changedUpdate(DocumentEvent e) {
+				public void changedUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
-					});
+			});
 		}
 		return userNameField;
 	}
@@ -114,24 +112,23 @@ public class LoginDialog extends ButtonDialog {
 	private JPasswordField getPasswordField() {
 		if (passwordField == null) {
 			passwordField = new JPasswordField();
-			passwordField.getDocument().addDocumentListener(
+			passwordField.getDocument().addDocumentListener(new DocumentListener() {
-					new DocumentListener() {
 
-						@Override
+				@Override
-						public void removeUpdate(DocumentEvent e) {
+				public void removeUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
 
-						@Override
+				@Override
-						public void insertUpdate(DocumentEvent e) {
+				public void insertUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
 
-						@Override
+				@Override
-						public void changedUpdate(DocumentEvent e) {
+				public void changedUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
-					});
+			});
 		}
 		return passwordField;
 	}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/online/view/NewUserDialog.java

@@ -100,8 +100,7 @@ public class NewUserDialog extends ButtonDialog {
 	private void refreshState() {
 		this.userName = getUserNameField().getText();
 		String password = new String(getPasswordField().getPassword());
-		String confirmPassword = new String(getConfirmPasswordField()
+		String confirmPassword = new String(getConfirmPasswordField().getPassword());
-				.getPassword());
 		if (password.equals(confirmPassword)) {
 			this.password = password;
 		} else {
@@ -109,31 +108,30 @@ public class NewUserDialog extends ButtonDialog {
 		}
 		this.email = getEmailField().getText();
 		JButton okButton = getButton(OK);
-		okButton.setEnabled((this.userName.length() > 0)
+		okButton.setEnabled((this.userName.length() > 0) && (this.password != null)
-				&& (this.password != null) && (this.password.length() > 0));
+				&& (this.password.length() > 0));
 	}
 
 	private JTextField getUserNameField() {
 		if (userNameField == null) {
 			userNameField = new JTextField();
-			userNameField.getDocument().addDocumentListener(
+			userNameField.getDocument().addDocumentListener(new DocumentListener() {
-					new DocumentListener() {
 
-						@Override
+				@Override
-						public void removeUpdate(DocumentEvent e) {
+				public void removeUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
 
-						@Override
+				@Override
-						public void insertUpdate(DocumentEvent e) {
+				public void insertUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
 
-						@Override
+				@Override
-						public void changedUpdate(DocumentEvent e) {
+				public void changedUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
-					});
+			});
 		}
 		return userNameField;
 	}
@@ -141,24 +139,23 @@ public class NewUserDialog extends ButtonDialog {
 	private JPasswordField getPasswordField() {
 		if (passwordField == null) {
 			passwordField = new JPasswordField();
-			passwordField.getDocument().addDocumentListener(
+			passwordField.getDocument().addDocumentListener(new DocumentListener() {
-					new DocumentListener() {
 
-						@Override
+				@Override
-						public void removeUpdate(DocumentEvent e) {
+				public void removeUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
 
-						@Override
+				@Override
-						public void insertUpdate(DocumentEvent e) {
+				public void insertUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
 
-						@Override
+				@Override
-						public void changedUpdate(DocumentEvent e) {
+				public void changedUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
-					});
+			});
 		}
 		return passwordField;
 	}
@@ -166,24 +163,23 @@ public class NewUserDialog extends ButtonDialog {
 	private JPasswordField getConfirmPasswordField() {
 		if (confirmPasswordField == null) {
 			confirmPasswordField = new JPasswordField();
-			confirmPasswordField.getDocument().addDocumentListener(
+			confirmPasswordField.getDocument().addDocumentListener(new DocumentListener() {
-					new DocumentListener() {
 
-						@Override
+				@Override
-						public void removeUpdate(DocumentEvent e) {
+				public void removeUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
 
-						@Override
+				@Override
-						public void insertUpdate(DocumentEvent e) {
+				public void insertUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
 
-						@Override
+				@Override
-						public void changedUpdate(DocumentEvent e) {
+				public void changedUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
-					});
+			});
 		}
 		return confirmPasswordField;
 	}
@@ -191,24 +187,23 @@ public class NewUserDialog extends ButtonDialog {
 	private JTextField getEmailField() {
 		if (emailField == null) {
 			emailField = new JTextField();
-			emailField.getDocument().addDocumentListener(
+			emailField.getDocument().addDocumentListener(new DocumentListener() {
-					new DocumentListener() {
 
-						@Override
+				@Override
-						public void removeUpdate(DocumentEvent e) {
+				public void removeUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
 
-						@Override
+				@Override
-						public void insertUpdate(DocumentEvent e) {
+				public void insertUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
 
-						@Override
+				@Override
-						public void changedUpdate(DocumentEvent e) {
+				public void changedUpdate(DocumentEvent e) {
-							refreshState();
+					refreshState();
-						}
+				}
-					});
+			});
 		}
 		return emailField;
 	}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/online/view/UploadDialog.java

@@ -34,9 +34,7 @@ public class UploadDialog extends ButtonDialog {
 			+ "You can <b>not</b> use Online Library to advertise products or services.<br>"
 			+ BULLET
 			+ "Users that do not follow these terms may be banned from the server, with or without notice.<br>"
-			+ BULLET
+			+ BULLET + "Administrator is not responsible for library contents.<br>" + "</html>";
-			+ "Administrator is not responsible for library contents.<br>"
-			+ "</html>";
 
 	private JPanel mainPanel;
 	private JLabel termsLabel;
@@ -98,9 +96,8 @@ public class UploadDialog extends ButtonDialog {
 			termsLabel = new JLabel();
 			termsLabel.setOpaque(true);
 			termsLabel.setBackground(UIManager.getColor("ToolTip.background"));
-			termsLabel.setBorder(BorderFactory.createCompoundBorder(
+			termsLabel.setBorder(BorderFactory.createCompoundBorder(BorderFactory
-					BorderFactory.createEtchedBorder(), BorderFactory
+					.createEtchedBorder(), BorderFactory.createEmptyBorder(2, 2, 2, 2)));
-							.createEmptyBorder(2, 2, 2, 2)));
 			termsLabel.setText(TERMS_HTML);
 		}
 		return termsLabel;

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/statusbar/StatusBar.java

@@ -49,8 +49,7 @@ public class StatusBar extends JPanel implements IPlugIn {
 
 	private JComboBox getZoomBox() {
 		if (zoomBox == null) {
-			zoomBox = new JComboBox(new Double[] { 0.25d, 0.5d, 0.75d, 1d,
+			zoomBox = new JComboBox(new Double[] { 0.25d, 0.5d, 0.75d, 1d, 1.5d, 2d });
-					1.5d, 2d });
 			zoomBox.setSelectedItem(1d);
 			zoomBox.setFocusable(false);
 			zoomBox.setRenderer(new PercentageListCellRenderer());
@@ -168,8 +167,7 @@ public class StatusBar extends JPanel implements IPlugIn {
 
 	private void refreshStatusText() {
 		if (componentSlot == null) {
-			if ((componentsUnderCursor == null)
+			if ((componentsUnderCursor == null) || (componentsUnderCursor.isEmpty())) {
-					|| (componentsUnderCursor.isEmpty())) {
 				getStatusLabel().setText("");
 			} else {
 				String formattedNames = "";
@@ -178,17 +176,14 @@ public class StatusBar extends JPanel implements IPlugIn {
 					if (n > 1) {
 						formattedNames += ", ";
 					}
-					formattedNames += ComponentProcessor.getInstance()
+					formattedNames += ComponentProcessor.getInstance().extractBomName(component)
-							.extractBomName(component)
 							+ " (<b><font color=\"blue\">" + n++ + "</font></b>)";
 				}
-				getStatusLabel().setText(
+				getStatusLabel().setText("<html>" + "Edit: " + formattedNames + "</html>");
-						"<html>" + "Edit: " + formattedNames + "</html>");
 			}
 		} else {
 			getStatusLabel().setText(
-					"Click on the canvas to create a new "
+					"Click on the canvas to create a new " + componentSlot.getName()
-							+ componentSlot.getName()
 							+ " or press Esc to cancel");
 		}
 	}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/toolbox/ComponentButton.java

@@ -23,8 +23,7 @@ class ComponentButton extends JButton {
 	private IPlugInPort plugInPort;
 	private IComponentType componentType;
 
-	public ComponentButton(final IPlugInPort plugInPort,
+	public ComponentButton(final IPlugInPort plugInPort, final IComponentType componentType) {
-			final IComponentType componentType) {
 		super(componentType.getIcon());
 		this.plugInPort = plugInPort;
 		this.componentType = componentType;
@@ -62,7 +61,7 @@ class ComponentButton extends JButton {
 		DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
 				this,
 				DnDConstants.ACTION_MOVE,
-				new ToolboxGestureListener(plugInPort, componentType
+				new ToolboxGestureListener(plugInPort, componentType.getComponentInstanceClass()
-						.getComponentInstanceClass().getName()));
+						.getName()));
 	}
 }

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/toolbox/ComponentTabbedPane.java

@@ -19,18 +19,15 @@ class ComponentTabbedPane extends JTabbedPane {
 	public ComponentTabbedPane(IPlugInPort plugInPort) {
 		super();
 		this.plugInPort = plugInPort;
-		Map<String, List<IComponentType>> componentTypes = plugInPort
+		Map<String, List<IComponentType>> componentTypes = plugInPort.getComponentTypes();
-				.getComponentTypes();
+		for (Map.Entry<String, List<IComponentType>> entry : componentTypes.entrySet()) {
-		for (Map.Entry<String, List<IComponentType>> entry : componentTypes
-				.entrySet()) {
 			addTab(entry.getKey(), createComponentPanel(entry.getValue()));
 		}
 	}
 
 	private Container createComponentPanel(List<IComponentType> componentTypes) {
 		Container componentPanel = new Container();
-		componentPanel
+		componentPanel.setLayout(new BoxLayout(componentPanel, BoxLayout.X_AXIS));
-				.setLayout(new BoxLayout(componentPanel, BoxLayout.X_AXIS));
 		for (IComponentType componentType : componentTypes) {
 			JButton button = new ComponentButton(plugInPort, componentType);
 			componentPanel.add(button);

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/toolbox/ToolBox.java

@@ -14,8 +14,7 @@ public class ToolBox implements IPlugIn {
 	@Override
 	public void connect(IPlugInPort plugInPort) {
 		try {
-			plugInPort.injectGUIComponent(new ComponentTabbedPane(plugInPort),
+			plugInPort.injectGUIComponent(new ComponentTabbedPane(plugInPort), SwingConstants.TOP);
-					SwingConstants.TOP);
 		} catch (BadPositionException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/toolbox/ToolboxGestureListener.java

@@ -26,8 +26,7 @@ class ToolboxGestureListener implements DragGestureListener {
 	@Override
 	public void dragGestureRecognized(DragGestureEvent dge) {
 		presenter.dragStarted(dge.getDragOrigin());
-		dge.startDrag(Cursor.getDefaultCursor(),
+		dge.startDrag(Cursor.getDefaultCursor(), new StringSelection(className),
-				new StringSelection(className), new ToolboxSourceListener(
+				new ToolboxSourceListener(presenter));
-						presenter));
 	}
 }

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/presenter/ComponentProcessor.java

@@ -20,8 +20,7 @@ import com.rits.cloning.Cloner;
 
 public class ComponentProcessor {
 
-	private static final Logger LOG = Logger
+	private static final Logger LOG = Logger.getLogger(ComponentProcessor.class);
-			.getLogger(ComponentProcessor.class);
 
 	private static ComponentProcessor instance;
 
@@ -44,8 +43,7 @@ public class ComponentProcessor {
 		this.controlPointCache = new HashMap<Class<?>, List<ControlPointWrapper>>();
 	}
 
-	public List<PropertyWrapper> extractProperties(
+	public List<PropertyWrapper> extractProperties(Class<? extends IComponentInstance> clazz) {
-			Class<? extends IComponentInstance> clazz) {
 		if (propertyCache.containsKey(clazz)) {
 			return cloner.deepClone(propertyCache.get(clazz));
 		}
@@ -53,12 +51,10 @@ public class ComponentProcessor {
 		for (Method method : clazz.getMethods()) {
 			if (method.getName().startsWith("get")) {
 				try {
-					Method setter = clazz.getMethod("set"
+					Method setter = clazz.getMethod("set" + method.getName().substring(3), method
-							+ method.getName().substring(3), method
 							.getReturnType());
 					if (method.isAnnotationPresent(EditableProperty.class)) {
-						EditableProperty annotation = method
+						EditableProperty annotation = method.getAnnotation(EditableProperty.class);
-								.getAnnotation(EditableProperty.class);
 						String name;
 						if (annotation.name().equals("")) {
 							name = method.getName().substring(3);
@@ -66,13 +62,12 @@ public class ComponentProcessor {
 							name = annotation.name();
 						}
 						PropertyWrapper property = new PropertyWrapper(name,
-								method.getReturnType(), method, setter,
+								method.getReturnType(), method, setter, annotation.defaultable());
-								annotation.defaultable());
 						properties.add(property);
 					}
 				} catch (NoSuchMethodException e) {
-					LOG.debug("No matching setter found for \""
+					LOG.debug("No matching setter found for \"" + method.getName()
-							+ method.getName() + "\". Skipping...");
+							+ "\". Skipping...");
 				}
 			}
 		}
@@ -81,8 +76,7 @@ public class ComponentProcessor {
 		return cloner.deepClone(properties);
 	}
 
-	public List<ControlPointWrapper> extractControlPoints(
+	public List<ControlPointWrapper> extractControlPoints(Class<? extends IComponentInstance> clazz) {
-			Class<? extends IComponentInstance> clazz) {
 		if (controlPointCache.containsKey(clazz)) {
 			return cloner.deepClone(controlPointCache.get(clazz));
 		}
@@ -90,27 +84,22 @@ public class ComponentProcessor {
 		for (Method method : clazz.getMethods()) {
 			if (method.getName().startsWith("get")) {
 				try {
-					Method setter = clazz.getMethod("set"
+					Method setter = clazz.getMethod("set" + method.getName().substring(3), method
-							+ method.getName().substring(3), method
 							.getReturnType());
 					if (method.isAnnotationPresent(ControlPoint.class)) {
 						if (method.getReturnType().equals(Point.class)) {
-							ControlPoint annotation = method
+							ControlPoint annotation = method.getAnnotation(ControlPoint.class);
-									.getAnnotation(ControlPoint.class);
+							ControlPointWrapper controlPoint = new ControlPointWrapper(method
-							ControlPointWrapper controlPoint = new ControlPointWrapper(
+									.getName().substring(3), method, setter, annotation.editable(),
-									method.getName().substring(3), method,
+									annotation.sticky(), annotation.visibilityPolicy());
-									setter, annotation.editable(), annotation
-											.sticky(), annotation
-											.visibilityPolicy());
 							controlPoints.add(controlPoint);
 						} else {
-							LOG
+							LOG.debug("Control point return type must be java.awt.Point.");
-									.debug("Control point return type must be java.awt.Point.");
 						}
 					}
 				} catch (NoSuchMethodException e) {
-					LOG.debug("No matching setter found for \""
+					LOG.debug("No matching setter found for \"" + method.getName()
-							+ method.getName() + "\". Skipping...");
+							+ "\". Skipping...");
 				}
 			}
 		}
@@ -138,8 +127,7 @@ public class ComponentProcessor {
 		}
 		for (int i = 1; i < selectedComponents.size(); i++) {
 			IComponentInstance component = selectedComponents.get(i);
-			List<PropertyWrapper> newProperties = extractProperties(component
+			List<PropertyWrapper> newProperties = extractProperties(component.getClass());
-					.getClass());
 			for (PropertyWrapper property : newProperties) {
 				try {
 					property.readFrom(component);

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/presenter/G2DWrapper.java

@@ -180,8 +180,7 @@ class G2DWrapper extends Graphics2D {
 	 *{@inheritDoc}
 	 **/
 	@Override
-	public void drawString(AttributedCharacterIterator iterator, float x,
+	public void drawString(AttributedCharacterIterator iterator, float x, float y) {
-			float y) {
 		canvasGraphics.drawString(iterator, x, y);
 		// FIXME: process map
 	}
@@ -441,8 +440,7 @@ class G2DWrapper extends Graphics2D {
 	 *{@inheritDoc}
 	 **/
 	@Override
-	public void drawArc(int x, int y, int width, int height, int startAngle,
+	public void drawArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
-			int arcAngle) {
 		canvasGraphics.drawArc(x, y, width, height, startAngle, arcAngle);
 	}
 
@@ -459,8 +457,7 @@ class G2DWrapper extends Graphics2D {
 	 *{@inheritDoc}
 	 **/
 	@Override
-	public boolean drawImage(Image img, int x, int y, Color bgcolor,
+	public boolean drawImage(Image img, int x, int y, Color bgcolor, ImageObserver observer) {
-			ImageObserver observer) {
 		// FIXME: map
 		return canvasGraphics.drawImage(img, x, y, bgcolor, observer);
 	}
@@ -469,8 +466,7 @@ class G2DWrapper extends Graphics2D {
 	 *{@inheritDoc}
 	 **/
 	@Override
-	public boolean drawImage(Image img, int x, int y, int width, int height,
+	public boolean drawImage(Image img, int x, int y, int width, int height, ImageObserver observer) {
-			ImageObserver observer) {
 		// FIXME: map
 		return canvasGraphics.drawImage(img, x, y, width, height, observer);
 	}
@@ -479,34 +475,30 @@ class G2DWrapper extends Graphics2D {
 	 *{@inheritDoc}
 	 **/
 	@Override
-	public boolean drawImage(Image img, int x, int y, int width, int height,
+	public boolean drawImage(Image img, int x, int y, int width, int height, Color bgcolor,
-			Color bgcolor, ImageObserver observer) {
-		// FIXME: map
-		return canvasGraphics.drawImage(img, x, y, width, height, bgcolor,
-				observer);
-	}
-
-	/**
-	 *{@inheritDoc}
-	 **/
-	@Override
-	public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2,
-			int sx1, int sy1, int sx2, int sy2, ImageObserver observer) {
-		// FIXME: map
-		return canvasGraphics.drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2,
-				sy2, observer);
-	}
-
-	/**
-	 *{@inheritDoc}
-	 **/
-	@Override
-	public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2,
-			int sx1, int sy1, int sx2, int sy2, Color bgcolor,
 			ImageObserver observer) {
 		// FIXME: map
-		return drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, bgcolor,
+		return canvasGraphics.drawImage(img, x, y, width, height, bgcolor, observer);
-				observer);
+	}
+
+	/**
+	 *{@inheritDoc}
+	 **/
+	@Override
+	public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1,
+			int sx2, int sy2, ImageObserver observer) {
+		// FIXME: map
+		return canvasGraphics.drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, observer);
+	}
+
+	/**
+	 *{@inheritDoc}
+	 **/
+	@Override
+	public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1,
+			int sx2, int sy2, Color bgcolor, ImageObserver observer) {
+		// FIXME: map
+		return drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, bgcolor, observer);
 	}
 
 	/**
@@ -545,8 +537,7 @@ class G2DWrapper extends Graphics2D {
 	 *{@inheritDoc}
 	 **/
 	@Override
-	public void drawRoundRect(int x, int y, int width, int height,
+	public void drawRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) {
-			int arcWidth, int arcHeight) {
 		canvasGraphics.drawRoundRect(x, y, width, height, arcWidth, arcHeight);
 	}
 
@@ -554,11 +545,9 @@ class G2DWrapper extends Graphics2D {
 	 *{@inheritDoc}
 	 **/
 	@Override
-	public void fillArc(int x, int y, int width, int height, int startAngle,
+	public void fillArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
-			int arcAngle) {
 		canvasGraphics.fillArc(x, y, width, height, startAngle, arcAngle);
-		appendShape(new Arc2D.Double(x, y, width, height, startAngle, arcAngle,
+		appendShape(new Arc2D.Double(x, y, width, height, startAngle, arcAngle, Arc2D.PIE));
-				Arc2D.PIE));
 	}
 
 	/**
@@ -592,11 +581,9 @@ class G2DWrapper extends Graphics2D {
 	 *{@inheritDoc}
 	 **/
 	@Override
-	public void fillRoundRect(int x, int y, int width, int height,
+	public void fillRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) {
-			int arcWidth, int arcHeight) {
 		canvasGraphics.fillRoundRect(x, y, width, height, arcWidth, arcHeight);
-		appendShape(new RoundRectangle2D.Double(x, y, width, height, arcWidth,
+		appendShape(new RoundRectangle2D.Double(x, y, width, height, arcWidth, arcHeight));
-				arcHeight));
 	}
 
 	/**

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/presenter/Presenter.java

@@ -55,8 +55,7 @@ public class Presenter implements IPlugInPort {
 
 	private static final Logger LOG = Logger.getLogger(Presenter.class);
 
-	private static final VersionNumber CURRENT_VERSION = new VersionNumber(0,
+	private static final VersionNumber CURRENT_VERSION = new VersionNumber(0, 0, 0);
-			0, 0);
 	private static final String DEFAULTS_KEY = "defaults";
 	private static final int CONTROL_POINT_SENSITIVITY = 4;
 
@@ -104,8 +103,7 @@ public class Presenter implements IPlugInPort {
 	}
 
 	public void installPlugin(IPlugIn plugIn) {
-		LOG.debug(String.format("installPlugin(%s)", plugIn.getClass()
+		LOG.debug(String.format("installPlugin(%s)", plugIn.getClass().getSimpleName()));
-				.getSimpleName()));
 		plugIns.add(plugIn);
 		plugIn.connect(this);
 		messageDispatcher.registerListener(plugIn);
@@ -135,10 +133,8 @@ public class Presenter implements IPlugInPort {
 	@Override
 	public Cursor getCursorAt(Point point) {
 		// Scale point to remove zoom factor.
-		Point2D scaledPoint = new Point2D.Double(point.getX() / zoomLevel,
+		Point2D scaledPoint = new Point2D.Double(point.getX() / zoomLevel, point.getY() / zoomLevel);
-				point.getY() / zoomLevel);
+		for (Map.Entry<IComponentInstance, Area> entry : componentAreaMap.entrySet()) {
-		for (Map.Entry<IComponentInstance, Area> entry : componentAreaMap
-				.entrySet()) {
 			if (entry.getValue().contains(scaledPoint)) {
 				return Cursor.getPredefinedCursor(Cursor.HAND_CURSOR);
 			}
@@ -167,8 +163,7 @@ public class Presenter implements IPlugInPort {
 		LOG.info("Loading project: " + project.getTitle());
 		this.currentProject = project;
 		selectedComponents.clear();
-		messageDispatcher.dispatchMessage(EventType.PROJECT_LOADED, project,
+		messageDispatcher.dispatchMessage(EventType.PROJECT_LOADED, project, freshStart);
-				freshStart);
 		messageDispatcher.dispatchMessage(EventType.REPAINT);
 	}
 
@@ -177,20 +172,17 @@ public class Presenter implements IPlugInPort {
 		if (componentTypes == null) {
 			LOG.info("Loading component types.");
 			componentTypes = new HashMap<String, List<IComponentType>>();
-			List<Class<?>> componentTypeClasses = JarScanner.getInstance()
+			List<Class<?>> componentTypeClasses = JarScanner.getInstance().scanFolder("library/",
-					.scanFolder("library/", IComponentType.class);
+					IComponentType.class);
 			for (Class<?> clazz : componentTypeClasses) {
 				try {
-					IComponentType componentType = (IComponentType) clazz
+					IComponentType componentType = (IComponentType) clazz.newInstance();
-							.newInstance();
 					List<IComponentType> nestedList;
 					if (componentTypes.containsKey(componentType.getCategory())) {
-						nestedList = componentTypes.get(componentType
+						nestedList = componentTypes.get(componentType.getCategory());
-								.getCategory());
 					} else {
 						nestedList = new ArrayList<IComponentType>();
-						componentTypes.put(componentType.getCategory(),
+						componentTypes.put(componentType.getCategory(), nestedList);
-								nestedList);
 					}
 					nestedList.add(componentType);
 				} catch (InstantiationException e) {
@@ -211,8 +203,9 @@ public class Presenter implements IPlugInPort {
 		G2DWrapper g2dWrapper = new G2DWrapper(g2d);
 
 		if (drawOptions.contains(DrawOption.ANTIALIASING)) {
-			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+			g2d
-					RenderingHints.VALUE_ANTIALIAS_ON);
+					.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+							RenderingHints.VALUE_ANTIALIAS_ON);
 		}
 
 		AffineTransform initialTx = g2d.getTransform();
@@ -236,15 +229,13 @@ public class Presenter implements IPlugInPort {
 			}
 		}
 
-		if ((drawOptions.contains(DrawOption.ZOOM))
+		if ((drawOptions.contains(DrawOption.ZOOM)) && (Math.abs(1.0 - zoomLevel) > 1e-4)) {
-				&& (Math.abs(1.0 - zoomLevel) > 1e-4)) {
 			g2dWrapper.scale(zoomLevel, zoomLevel);
 		}
 
 		g2dWrapper.resetTx();
 
-		List<IComponentInstance> components = getCurrentProject()
+		List<IComponentInstance> components = getCurrentProject().getComponents();
-				.getComponents();
 		componentAreaMap.clear();
 		if (components != null) {
 			for (IComponentInstance component : components) {
@@ -253,14 +244,12 @@ public class Presenter implements IPlugInPort {
 						.contains(DrawOption.SELECTION)) ? ComponentState.SELECTED
 						: ComponentState.NORMAL;
 				component.draw(g2dWrapper, state);
-				componentAreaMap.put(component, g2dWrapper
+				componentAreaMap.put(component, g2dWrapper.finishedDrawingComponent());
-						.finishedDrawingComponent());
 
 				// Draw control points
 				if (drawOptions.contains(DrawOption.CONTROL_POINTS)) {
-					List<ControlPointWrapper> controlPoints = ComponentProcessor
+					List<ControlPointWrapper> controlPoints = ComponentProcessor.getInstance()
-							.getInstance().extractControlPoints(
+							.extractControlPoints(component.getClass());
-									component.getClass());
 					for (ControlPointWrapper controlPoint : controlPoints) {
 						try {
 							controlPoint.readFrom(component);
@@ -273,9 +262,8 @@ public class Presenter implements IPlugInPort {
 								// .getValue().y - 2, 5, 5);
 							}
 						} catch (Exception e) {
-							LOG
+							LOG.error("Could not obtain control points for component of type "
-									.error("Could not obtain control points for component of type "
+									+ component.getClass().getName());
-											+ component.getClass().getName());
 						}
 					}
 				}
@@ -285,8 +273,7 @@ public class Presenter implements IPlugInPort {
 		g2d.setTransform(initialTx);
 
 		// At the end draw selection rectangle.
-		if (drawOptions.contains(DrawOption.SELECTION)
+		if (drawOptions.contains(DrawOption.SELECTION) && (selectionRect != null)) {
-				&& (selectionRect != null)) {
 			g2d.setColor(Color.white);
 			g2d.drawRect(selectionRect.x, selectionRect.y, selectionRect.width,
 					selectionRect.height);
@@ -298,8 +285,7 @@ public class Presenter implements IPlugInPort {
 	}
 
 	@Override
-	public void injectGUIComponent(JComponent component, int position)
+	public void injectGUIComponent(JComponent component, int position) throws BadPositionException {
-			throws BadPositionException {
 		view.addComponent(component, position);
 	}
 
@@ -321,8 +307,7 @@ public class Presenter implements IPlugInPort {
 	 */
 	private List<IComponentInstance> findComponentsAt(Point point) {
 		List<IComponentInstance> components = new ArrayList<IComponentInstance>();
-		for (Map.Entry<IComponentInstance, Area> entry : componentAreaMap
+		for (Map.Entry<IComponentInstance, Area> entry : componentAreaMap.entrySet()) {
-				.entrySet()) {
 			if (entry.getValue().contains(point)) {
 				components.add(entry.getKey());
 			}
@@ -331,15 +316,13 @@ public class Presenter implements IPlugInPort {
 	}
 
 	@Override
-	public void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown,
+	public void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown) {
-			boolean altDown) {
+		LOG.debug(String
-		LOG.debug(String.format("mouseClicked(%s, %s, %s, %s)", point,
+				.format("mouseClicked(%s, %s, %s, %s)", point, ctrlDown, shiftDown, altDown));
-				ctrlDown, shiftDown, altDown));
 		Point scaledPoint = scalePoint(point);
 		if (componentSlot != null) {
 			try {
-				instantiateComponent(componentSlot.getComponentInstanceClass(),
+				instantiateComponent(componentSlot.getComponentInstanceClass(), scaledPoint);
-						scaledPoint);
 			} catch (Exception e) {
 				LOG.error("Error instatiating component of type: "
 						+ componentSlot.getComponentInstanceClass().getName());
@@ -366,8 +349,7 @@ public class Presenter implements IPlugInPort {
 					selectedComponents.add(component);
 				}
 			}
-			messageDispatcher.dispatchMessage(EventType.SELECTION_CHANGED,
+			messageDispatcher.dispatchMessage(EventType.SELECTION_CHANGED, selectedComponents);
-					selectedComponents);
 			messageDispatcher.dispatchMessage(EventType.REPAINT);
 		}
 	}
@@ -377,8 +359,8 @@ public class Presenter implements IPlugInPort {
 		List<IComponentInstance> components = new ArrayList<IComponentInstance>();
 		Point scaledPoint = scalePoint(point);
 		for (IComponentInstance component : currentProject.getComponents()) {
-			List<ControlPointWrapper> currentPoints = ComponentProcessor
+			List<ControlPointWrapper> currentPoints = ComponentProcessor.getInstance()
-					.getInstance().extractControlPoints(component.getClass());
+					.extractControlPoints(component.getClass());
 			for (ControlPointWrapper controlPoint : currentPoints) {
 				if (shouldShowControlPoint(controlPoint, component)) {
 					try {
@@ -388,17 +370,15 @@ public class Presenter implements IPlugInPort {
 							break;
 						}
 					} catch (Exception e) {
-						LOG
+						LOG.warn("Error reading control point for component of type: "
-								.warn("Error reading control point for component of type: "
+								+ component.getClass().getName());
-										+ component.getClass().getName());
 					}
 				}
 			}
 		}
 		if (!components.equals(componentsUnderCursor)) {
 			componentsUnderCursor = components;
-			messageDispatcher.dispatchMessage(
+			messageDispatcher.dispatchMessage(EventType.AVAILABLE_CTRL_POINTS_CHANGED, components);
-					EventType.AVAILABLE_CTRL_POINTS_CHANGED, components);
 		}
 	}
 
@@ -426,16 +406,14 @@ public class Presenter implements IPlugInPort {
 		List<IComponentInstance> components = findComponentsAt(scaledPoint);
 		if (components.isEmpty()) {
 			selectedComponents.clear();
-			messageDispatcher.dispatchMessage(EventType.SELECTION_CHANGED,
+			messageDispatcher.dispatchMessage(EventType.SELECTION_CHANGED, selectedComponents);
-					selectedComponents);
 			messageDispatcher.dispatchMessage(EventType.REPAINT);
 		} else {
 			IComponentInstance component = components.get(0);
 			if (!selectedComponents.contains(component)) {
 				selectedComponents.clear();
 				selectedComponents.add(component);
-				messageDispatcher.dispatchMessage(EventType.SELECTION_CHANGED,
+				messageDispatcher.dispatchMessage(EventType.SELECTION_CHANGED, selectedComponents);
-						selectedComponents);
 				messageDispatcher.dispatchMessage(EventType.REPAINT);
 			}
 		}
@@ -445,8 +423,7 @@ public class Presenter implements IPlugInPort {
 	public boolean dragOver(Point point) {
 		if (selectedComponents.isEmpty()) {
 			this.selectionRect = Utils.createRectangle(point, dragStartPoint);
-			messageDispatcher.dispatchMessage(EventType.SELECTION_RECT_CHANGED,
+			messageDispatcher.dispatchMessage(EventType.SELECTION_RECT_CHANGED, selectionRect);
-					selectionRect);
 			messageDispatcher.dispatchMessage(EventType.REPAINT);
 		}
 		return true;
@@ -462,23 +439,20 @@ public class Presenter implements IPlugInPort {
 			// If there's no selection finalize selectionRect and see which
 			// components intersect with it.
 			if (point != null) {
-				this.selectionRect = Utils.createRectangle(point,
+				this.selectionRect = Utils.createRectangle(point, dragStartPoint);
-						dragStartPoint);
 			}
 			selectedComponents.clear();
 			for (IComponentInstance component : currentProject.getComponents()) {
 				Area area = componentAreaMap.get(component);
 				if ((area != null)
 						&& area.intersects(selectionRect.x / zoomLevel,
-								selectionRect.y / zoomLevel,
+								selectionRect.y / zoomLevel, selectionRect.width / zoomLevel,
-								selectionRect.width / zoomLevel,
 								selectionRect.height / zoomLevel)) {
 					selectedComponents.add(component);
 				}
 			}
 			selectionRect = null;
-			messageDispatcher.dispatchMessage(EventType.SELECTION_CHANGED,
+			messageDispatcher.dispatchMessage(EventType.SELECTION_CHANGED, selectedComponents);
-					selectedComponents);
 		} else {
 			Project oldProject = cloner.deepClone(currentProject);
 
@@ -486,9 +460,8 @@ public class Presenter implements IPlugInPort {
 			int dx = (int) ((point.x - dragStartPoint.x) / zoomLevel);
 			int dy = (int) ((point.y - dragStartPoint.y) / zoomLevel);
 			for (IComponentInstance component : selectedComponents) {
-				List<ControlPointWrapper> controlPoints = ComponentProcessor
+				List<ControlPointWrapper> controlPoints = ComponentProcessor.getInstance()
-						.getInstance().extractControlPoints(
+						.extractControlPoints(component.getClass());
-								component.getClass());
 				for (ControlPointWrapper controlPoint : controlPoints) {
 					try {
 						controlPoint.readFrom(component);
@@ -497,14 +470,13 @@ public class Presenter implements IPlugInPort {
 						}
 						controlPoint.writeTo(component);
 					} catch (Exception e) {
-						LOG.error("Could not translate control points: "
+						LOG.error("Could not translate control points: " + e.getMessage());
-								+ e.getMessage());
 					}
 				}
 			}
 			if (!oldProject.equals(currentProject)) {
-				messageDispatcher.dispatchMessage(EventType.PROJECT_MODIFIED,
+				messageDispatcher.dispatchMessage(EventType.PROJECT_MODIFIED, oldProject, cloner
-						oldProject, cloner.deepClone(currentProject), "Move");
+						.deepClone(currentProject), "Move");
 			}
 		}
 		messageDispatcher.dispatchMessage(EventType.REPAINT);
@@ -512,13 +484,12 @@ public class Presenter implements IPlugInPort {
 	}
 
 	@Override
-	public void addComponents(List<IComponentInstance> components,
+	public void addComponents(List<IComponentInstance> components, Point preferredPoint) {
-			Point preferredPoint) {
 		LOG.debug(String.format("addComponents(%s)", components));
 		Project oldProject = cloner.deepClone(currentProject);
 		currentProject.getComponents().addAll(components);
-		messageDispatcher.dispatchMessage(EventType.PROJECT_MODIFIED,
+		messageDispatcher.dispatchMessage(EventType.PROJECT_MODIFIED, oldProject, cloner
-				oldProject, cloner.deepClone(currentProject), "Add");
+				.deepClone(currentProject), "Add");
 		messageDispatcher.dispatchMessage(EventType.REPAINT);
 	}
 
@@ -558,27 +529,23 @@ public class Presenter implements IPlugInPort {
 	// componentClass.getName() + ":" + propertyName);
 	// }
 	public void setDefaultPropertyValue(String propertyName, Object value) {
-		LOG.debug(String.format("setDefaultPropertyValue(%s, %s)",
+		LOG.debug(String.format("setDefaultPropertyValue(%s, %s)", propertyName, value));
-				propertyName, value));
+		Map<String, Object> defaultMap = (Map<String, Object>) ConfigurationManager.getInstance()
-		Map<String, Object> defaultMap = (Map<String, Object>) ConfigurationManager
+				.getConfigurationItem(DEFAULTS_KEY);
-				.getInstance().getConfigurationItem(DEFAULTS_KEY);
 		if (defaultMap == null) {
 			defaultMap = new HashMap<String, Object>();
-			ConfigurationManager.getInstance().setConfigurationItem(
+			ConfigurationManager.getInstance().setConfigurationItem(DEFAULTS_KEY, defaultMap);
-					DEFAULTS_KEY, defaultMap);
 		}
 		for (IComponentInstance component : selectedComponents) {
 			String className = component.getClass().getName();
-			LOG.debug("Default property value set for " + className + ":"
+			LOG.debug("Default property value set for " + className + ":" + propertyName);
-					+ propertyName);
 			defaultMap.put(className + ":" + propertyName, value);
 		}
 	}
 
 	@SuppressWarnings("unchecked")
-	private void instantiateComponent(
+	private void instantiateComponent(Class<? extends IComponentInstance> componentClass,
-			Class<? extends IComponentInstance> componentClass, Point point)
+			Point point) throws Exception {
-			throws Exception {
 		LOG.info("Instatiating component of type: " + componentClass.getName());
 
 		Project oldProject = cloner.deepClone(currentProject);
@@ -589,8 +556,8 @@ public class Presenter implements IPlugInPort {
 		currentProject.getComponents().add(component);
 
 		// Extract control points.
-		List<ControlPointWrapper> controlPoints = ComponentProcessor
+		List<ControlPointWrapper> controlPoints = ComponentProcessor.getInstance()
-				.getInstance().extractControlPoints(componentClass);
+				.extractControlPoints(componentClass);
 		// Translate them to the desired location.
 		if (point != null) {
 			for (ControlPointWrapper controlPoint : controlPoints) {
@@ -601,16 +568,15 @@ public class Presenter implements IPlugInPort {
 		}
 
 		// Extract properties.
-		List<PropertyWrapper> properties = ComponentProcessor.getInstance()
+		List<PropertyWrapper> properties = ComponentProcessor.getInstance().extractProperties(
-				.extractProperties(componentClass);
+				componentClass);
 		// Override with default values if available.
 		for (PropertyWrapper property : properties) {
 			Object defaultValue = null;
 			Map<String, Object> defaultMap = (Map<String, Object>) ConfigurationManager
 					.getInstance().getConfigurationItem(DEFAULTS_KEY);
 			if (defaultMap != null) {
-				defaultValue = defaultMap.get(componentClass.getName() + ":"
+				defaultValue = defaultMap.get(componentClass.getName() + ":" + property.getName());
-						+ property.getName());
 			}
 			if (defaultValue != null) {
 				property.setValue(cloner.deepClone(defaultValue));
@@ -620,21 +586,19 @@ public class Presenter implements IPlugInPort {
 
 		// Notify the listeners.
 		if (!oldProject.equals(currentProject)) {
-			messageDispatcher.dispatchMessage(EventType.PROJECT_MODIFIED,
+			messageDispatcher.dispatchMessage(EventType.PROJECT_MODIFIED, oldProject, cloner
-					oldProject, cloner.deepClone(currentProject), "Create");
+					.deepClone(currentProject), "Create");
 		}
 		messageDispatcher.dispatchMessage(EventType.REPAINT);
 	}
 
 	@Override
 	public List<PropertyWrapper> getMutualSelectionProperties() {
-		return ComponentProcessor.getInstance().getMutualSelectionProperties(
+		return ComponentProcessor.getInstance().getMutualSelectionProperties(selectedComponents);
-				selectedComponents);
 	}
 
 	@Override
-	public void applyPropertiesToSelection(List<PropertyWrapper> properties)
+	public void applyPropertiesToSelection(List<PropertyWrapper> properties) throws Exception {
-			throws Exception {
 		LOG.debug(String.format("applyPropertiesToSelection(%s)", properties));
 		Project oldProject = cloner.deepClone(currentProject);
 		try {
@@ -646,8 +610,8 @@ public class Presenter implements IPlugInPort {
 		} finally {
 			// Notify the listeners.
 			if (!oldProject.equals(currentProject)) {
-				messageDispatcher.dispatchMessage(EventType.PROJECT_MODIFIED,
+				messageDispatcher.dispatchMessage(EventType.PROJECT_MODIFIED, oldProject, cloner
-						oldProject, cloner.deepClone(currentProject), "Edit");
+						.deepClone(currentProject), "Edit");
 			}
 			messageDispatcher.dispatchMessage(EventType.REPAINT);
 		}
@@ -655,26 +619,22 @@ public class Presenter implements IPlugInPort {
 
 	@Override
 	public void setNewComponentSlot(IComponentType componentType) {
-		LOG.debug(String.format("setNewComponentSlot(%s)",
+		LOG.debug(String.format("setNewComponentSlot(%s)", componentType == null ? null
-				componentType == null ? null : componentType.getName()));
+				: componentType.getName()));
 		this.componentSlot = componentType;
 		selectedComponents.clear();
 		messageDispatcher.dispatchMessage(EventType.SELECTION_CHANGED);
-		messageDispatcher
+		messageDispatcher.dispatchMessage(EventType.SLOT_CHANGED, componentSlot);
-				.dispatchMessage(EventType.SLOT_CHANGED, componentSlot);
 	}
 
 	private Point scalePoint(Point point) {
-		return new Point((int) (point.x / zoomLevel),
+		return new Point((int) (point.x / zoomLevel), (int) (point.y / zoomLevel));
-				(int) (point.y / zoomLevel));
 	}
 
 	private boolean shouldShowControlPoint(ControlPointWrapper controlPoint,
 			IComponentInstance component) {
-		return controlPoint.getVisibilityPolicy().equals(
+		return controlPoint.getVisibilityPolicy().equals(VisibilityPolicy.ALWAYS)
-				VisibilityPolicy.ALWAYS)
+				|| ((controlPoint.getVisibilityPolicy().equals(VisibilityPolicy.WHEN_SELECTED)) && (getSelectedComponents()
-				|| ((controlPoint.getVisibilityPolicy()
-						.equals(VisibilityPolicy.WHEN_SELECTED)) && (getSelectedComponents()
 						.contains(component)));
 	}
 }

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/utils/Constants.java

@@ -7,12 +7,10 @@ import java.awt.Toolkit;
 
 public class Constants {
 
-	public static final float GRID = Toolkit.getDefaultToolkit()
+	public static final float GRID = Toolkit.getDefaultToolkit().getScreenResolution() / 10f;
-			.getScreenResolution() / 10f;
 
 	public static final Color GRID_COLOR = new Color(240, 240, 240);
 
-	public static final Stroke dashedStroke = new BasicStroke(1.0f,
+	public static final Stroke dashedStroke = new BasicStroke(1.0f, BasicStroke.CAP_BUTT,
-			BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 2.0f,
+			BasicStroke.JOIN_MITER, 2.0f, new float[] { 2.0f }, 0.0f);
-			new float[] { 2.0f }, 0.0f);
 }

diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/utils/dnd/GhostedDragImage.java

@@ -57,10 +57,10 @@ public class GhostedDragImage extends AbstractComponentDecorator {
 	 * @param imageOffset
 	 *            offset of the image from the cursor
 	 */
-	public GhostedDragImage(JComponent dragSource, Point screenLocation,
+	public GhostedDragImage(JComponent dragSource, Point screenLocation, Icon icon,
-			Icon icon, Point imageOffset) {
+			Point imageOffset) {
-		this(dragSource, dragSource.getRootPane().getLayeredPane(),
+		this(dragSource, dragSource.getRootPane().getLayeredPane(), screenLocation, icon,
-				screenLocation, icon, imageOffset, true);
+				imageOffset, true);
 	}
 
 	/**
@@ -80,29 +80,26 @@ public class GhostedDragImage extends AbstractComponentDecorator {
 	 *            if true, creates additional ghosts for all extant frames which
 	 *            contain a {@link JLayeredPane} where the image can be painted.
 	 */
-	protected GhostedDragImage(JComponent dragSource, JLayeredPane root,
+	protected GhostedDragImage(JComponent dragSource, JLayeredPane root, Point screenLocation,
-			Point screenLocation, Icon icon, Point imageOffset,
+			Icon icon, Point imageOffset, boolean trackFrames) {
-			boolean trackFrames) {
 		super(root);
 		this.dragSource = dragSource;
 		this.icon = icon;
 		this.imageOffset = imageOffset;
 		Point loc = root.getLocationOnScreen();
-		setLocation(screenLocation.x - loc.x + imageOffset.x, screenLocation.y
+		setLocation(screenLocation.x - loc.x + imageOffset.x, screenLocation.y - loc.y
-				- loc.y + imageOffset.y);
+				+ imageOffset.y);
 		if (trackFrames) {
 			Window w = SwingUtilities.getWindowAncestor(root);
 			Frame[] frames = Frame.getFrames();
 			// Log.debug("track " + frames.length + " other frames");
 			for (int i = 0; i < frames.length; i++) {
 				Frame frame = frames[i];
-				if (frame instanceof RootPaneContainer && frame.isShowing()
+				if (frame instanceof RootPaneContainer && frame.isShowing() && frame != w) {
-						&& frame != w) {
 					// Log.debug("Track " + frame);
-					JLayeredPane p = ((RootPaneContainer) frame)
+					JLayeredPane p = ((RootPaneContainer) frame).getLayeredPane();
-							.getLayeredPane();
+					GhostedDragImage slave = new GhostedDragImage(dragSource, p, screenLocation,
-					GhostedDragImage slave = new GhostedDragImage(dragSource,
+							icon, imageOffset, false);
-							p, screenLocation, icon, imageOffset, false);
 					ghosts.add(slave);
 					slave.move(screenLocation);
 				}
@@ -143,8 +140,7 @@ public class GhostedDragImage extends AbstractComponentDecorator {
 	 * with {@link #returnToOrigin}.
 	 */
 	private void setLocation(int x, int y) {
-		location = SwingUtilities
+		location = SwingUtilities.convertPoint(getComponent(), x, y, dragSource);
-				.convertPoint(getComponent(), x, y, dragSource);
 		if (origin == null)
 			origin = location;
 		setDecorationBounds(x, y, icon.getIconWidth(), icon.getIconHeight());
@@ -176,8 +172,7 @@ public class GhostedDragImage extends AbstractComponentDecorator {
 	public void move(Point screen) {
 		// Log.debug("Move to " + screen);
 		Point loc = getComponent().getLocationOnScreen();
-		setLocation(screen.x - loc.x + imageOffset.x, screen.y - loc.y
+		setLocation(screen.x - loc.x + imageOffset.x, screen.y - loc.y + imageOffset.y);
-				+ imageOffset.y);
 		for (Iterator i = ghosts.iterator(); i.hasNext();) {
 			GhostedDragImage g = (GhostedDragImage) i.next();
 			// Log.debug("Move on other frame");
@@ -189,8 +184,7 @@ public class GhostedDragImage extends AbstractComponentDecorator {
 	public void paint(Graphics graphics) {
 		Rectangle r = getDecorationBounds();
 		Graphics2D g = (Graphics2D) graphics.create();
-		g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,
+		g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, ghostAlpha));
-				ghostAlpha));
 		g.translate(CURSOR_SIZE, CURSOR_SIZE);
 		icon.paintIcon(getPainter(), g, r.x, r.y);
 		g.dispose();
@@ -208,9 +202,8 @@ public class GhostedDragImage extends AbstractComponentDecorator {
 				int dy = (origin.y - location.y) / 2;
 				if (dx != 0 || dy != 0) {
 					Point loc = dragSource.getLocationOnScreen();
-					Point where = new Point(loc.x + location.x + dx
+					Point where = new Point(loc.x + location.x + dx - imageOffset.x, loc.y
-							- imageOffset.x, loc.y + location.y + dy
+							+ location.y + dy - imageOffset.y);
-							- imageOffset.y);
 					move(where);
 				} else {
 					timer.stop();

diy-layout-creator --username bancika@gmail.com/DIYLC/test/com/diyfever/diylc/TableTest.java

@@ -24,22 +24,16 @@ public class TableTest {
 		BasicConfigurator.configure();
 
 		List<ProjectEntity> projects = new ArrayList<ProjectEntity>();
-		projects
+		projects.add(new ProjectEntity(1, "first", "some text", "bane", "none"));
-				.add(new ProjectEntity(1, "first", "some text", "bane", "none"));
+		projects.add(new ProjectEntity(2, "second", "anoter text", "bisera", "none"));
-		projects.add(new ProjectEntity(2, "second", "anoter text", "bisera",
-				"none"));
 
-		ObjectListTable<ProjectEntity> t = new ObjectListTable<ProjectEntity>(
+		ObjectListTable<ProjectEntity> t = new ObjectListTable<ProjectEntity>(ProjectEntity.class,
-				ProjectEntity.class, new String[] { "getName",
+				new String[] { "getName", "getDescription", "getCategory", "getOwner",
-						"getDescription", "getCategory", "getOwner",
+						"action:Download" }, new IActionProcessor<ProjectEntity>() {
-						"action:Download" },
-				new IActionProcessor<ProjectEntity>() {
 
 					@Override
-					public void actionExecuted(ProjectEntity value,
+					public void actionExecuted(ProjectEntity value, String actionColumnName) {
-							String actionColumnName) {
+						System.out.println("row clicked: " + actionColumnName + " - " + value);
-						System.out.println("row clicked: " + actionColumnName
-								+ " - " + value);
 					}
 
 					@Override

diy-layout-creator --username bancika@gmail.com/DIYLC/test/com/diyfever/diylc/Test.java

@@ -18,20 +18,19 @@ public class Test {
 	 * @param args
 	 */
 	public static void main(String[] args) {
-//		 XStream xstream = new XStream(new JettisonMappedXmlDriver());
+		// XStream xstream = new XStream(new JettisonMappedXmlDriver());
-//		xstream.setMode(XStream.NO_REFERENCES);
+		// xstream.setMode(XStream.NO_REFERENCES);
-//
+		//
-//		List<ProjectEntity> projects = new ArrayList<ProjectEntity>();
+		// List<ProjectEntity> projects = new ArrayList<ProjectEntity>();
-////		projects.add(new ProjectEntity(1, "first project", "some text",
+		// // projects.add(new ProjectEntity(1, "first project", "some text",
-////				"bancika", "some category"));
+		// // "bancika", "some category"));
-////		projects.add(new ProjectEntity(2, "second project", "some text",
+		// // projects.add(new ProjectEntity(2, "second project", "some text",
-////				"bancika", "some category"));
+		// // "bancika", "some category"));
-//		System.out.println(xstream.toXML(projects));
+		// System.out.println(xstream.toXML(projects));
-		
+
 		BasicConfigurator.configure();
-		ProjectSearch search = new ProxyFactory(new PhpFlatProxy())
+		ProjectSearch search = new ProxyFactory(new PhpFlatProxy()).createProxy(
-				.createProxy(ProjectSearch.class,
+				ProjectSearch.class, "http://host07.dwhost.net/~diyfever/diylc/db/");
-						"http://host07.dwhost.net/~diyfever/diylc/db/");
 		List<ProjectEntity> results = search.project_search("TestProject");
 		System.out.println(results);
 	}

diy-layout-creator --username bancika@gmail.com/DIYLC/test/com/diyfever/diylc/components/MockComponentInstance.java

@@ -30,8 +30,8 @@ public class MockComponentInstance implements IComponentInstance {
 	private Point leftTopCorner = new Point(0, 0);
 	private String name = "something";
 
-	public MockComponentInstance(String testField, Capacitance c, Resistance r,
+	public MockComponentInstance(String testField, Capacitance c, Resistance r, Size s,
-			Size s, Color color, Point leftTopCorner) {
+			Color color, Point leftTopCorner) {
 		super();
 		this.testField = testField;
 		this.c = c;
@@ -113,16 +113,14 @@ public class MockComponentInstance implements IComponentInstance {
 
 	@Override
 	public void draw(Graphics2D g2d, ComponentState componentState) {
-		g2d.setColor(componentState.equals(ComponentState.SELECTED) ? color
+		g2d.setColor(componentState.equals(ComponentState.SELECTED) ? color : color.darker());
-				: color.darker());
 		g2d.fillRect(leftTopCorner.x, leftTopCorner.y, 200, 50);
 	}
 
 	@Override
 	public MockComponentInstance clone() throws CloneNotSupportedException {
-		MockComponentInstance newInstance = new MockComponentInstance(
+		MockComponentInstance newInstance = new MockComponentInstance(testField, c.clone(), r
-				testField, c.clone(), r.clone(), s.clone(), color,
+				.clone(), s.clone(), color, (Point) leftTopCorner.clone());
-				(Point) leftTopCorner.clone());
 		return newInstance;
 	}
 }

diy-layout-creator --username bancika@gmail.com/DIYLC/test/com/diyfever/diylc/presenter/ClassProcessorTest.java

@@ -15,16 +15,15 @@ public class ClassProcessorTest {
 
 	@Test
 	public void testExtractProperties() {
-		List<PropertyWrapper> properties = ComponentProcessor.getInstance()
+		List<PropertyWrapper> properties = ComponentProcessor.getInstance().extractProperties(
-				.extractProperties(MockComponentInstance.class);
+				MockComponentInstance.class);
 		assertNotNull(properties);
 		assertEquals(4, properties.size());
 	};
 
 	@Test
 	public void testExtractControlPoints() {
-		List<ControlPointWrapper> controlPoints = ComponentProcessor
+		List<ControlPointWrapper> controlPoints = ComponentProcessor.getInstance()
-				.getInstance()
 				.extractControlPoints(MockComponentInstance.class);
 		assertNotNull(controlPoints);
 		assertEquals(1, controlPoints.size());