From 448f87666dcbf43a7f7609294845c1efee7ea4dc Mon Sep 17 00:00:00 2001
From: bancika <bancika@813357f0-ed8a-11de-91ba-91c70a792394>
Date: Thu, 15 Aug 2013 11:47:52 +0000
Subject: [PATCH] selection & multi d&d fix

---
 .../diylc-swing/.classpath                    |  4 ++--
 .../swing/plugins/canvas/CanvasPlugin.java    | 23 +++++++++----------
 .../diylc-swing/update.xml                    | 20 ++++++++++++++++
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/.classpath b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/.classpath
index 3172ad17..6b78366d 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/.classpath	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/.classpath	
@@ -12,9 +12,9 @@
 	<classpathentry kind="lib" path="lib/org-openide-awt.jar"/>
 	<classpathentry kind="lib" path="lib/org-openide-util.jar"/>
 	<classpathentry kind="lib" path="lib/org-openide-util-lookup.jar"/>
+	<classpathentry kind="lib" path="lib/app-framework.jar"/>
+	<classpathentry kind="lib" path="lib/swing-framework.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/app-framework"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/swing-framework"/>
 	<classpathentry kind="lib" path="lib/xstream-1.4.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
index 894dde42..de0b8c19 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java	
@@ -100,26 +100,15 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 			canvasPanel = new CanvasPanel(plugInPort);
 			canvasPanel.addMouseListener(new MouseAdapter() {
 
-				private boolean processedPressed = false;
-
 				@Override
 				public void mousePressed(MouseEvent e) {
 					canvasPanel.requestFocus();
 					mouseReleased(e);
-					processedPressed = true;
 				}
 
 				@Override
 				public void mouseReleased(final MouseEvent e) {
-					// Do not send mouseClicked on release if it was already
-					// process on pressed.
-					if (processedPressed) {
-						processedPressed = false;
-					} else {
-						plugInPort.mouseClicked(e.getPoint(), e.getButton(), e
-								.isControlDown(), e.isShiftDown(), e
-								.isAltDown(), e.getClickCount());
-					}
+
 					// Invoke the rest of the code later so we get the chance to
 					// process selection messages.
 					SwingUtilities.invokeLater(new Runnable() {
@@ -185,6 +174,16 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 							.isShiftDown(), e.isAltDown());
 				}
 			});
+
+			canvasPanel.addMouseListener(new MouseAdapter() {
+
+				@Override
+				public void mouseClicked(MouseEvent e) {
+					plugInPort.mouseClicked(e.getPoint(), e.getButton(), e
+							.isControlDown(), e.isShiftDown(), e.isAltDown(), e
+							.getClickCount());
+				}
+			});
 		}
 		return canvasPanel;
 	}
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml
index 63077d51..fd49decd 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml	
@@ -1249,5 +1249,25 @@
 			</changes>
 			<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
 		</org.diylc.appframework.update.Version>
+		<org.diylc.appframework.update.Version>
+			<versionNumber>
+				<major>3</major>
+				<minor>29</minor>
+				<build>0</build>
+			</versionNumber>
+			<releaseDate>2013-08-15 20:00:00.000 CET</releaseDate>
+			<name></name>
+			<changes>					
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Issue with dragging multiple components</description>
+				</org.diylc.appframework.update.Change>				
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Issue with component selection</description>
+				</org.diylc.appframework.update.Change>
+			</changes>
+			<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
+		</org.diylc.appframework.update.Version>
 	</a>
 </java.util.Arrays_-ArrayList>
\ No newline at end of file