From e115f87f65ad1ba28df0d2b837e700a1f92bfba8 Mon Sep 17 00:00:00 2001
From: bancika <bancika@813357f0-ed8a-11de-91ba-91c70a792394>
Date: Thu, 30 Aug 2012 09:38:15 +0000
Subject: [PATCH] v1 pot and label import bug

---
 .../diylc-library/build.xml                   |  3 ++
 .../src/org/diylc/components/misc/Label.java  | 31 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/build.xml b/ diy-layout-creator --username bancika@gmail.com/diylc-library/build.xml
index ec00f750..eaf3f0af 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/build.xml	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/build.xml	
@@ -49,6 +49,9 @@
 		<copy todir="../diylc-swing/library" overwrite="true">
 			<fileset dir="${jar.dir}" includes="${ant.project.name}.jar" />
 		</copy>
+		<copy todir="../diylc-core/library" overwrite="true">
+			<fileset dir="${jar.dir}" includes="${ant.project.name}.jar" />
+		</copy>
 	</target>
 
 	<target name="javadoc">
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/misc/Label.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/misc/Label.java
index 6e8a0a12..bf13a3e9 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/misc/Label.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/misc/Label.java	
@@ -7,6 +7,8 @@ import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.geom.Rectangle2D;
 
+import org.diylc.common.HorizontalAlignment;
+import org.diylc.common.VerticalAlignment;
 import org.diylc.components.AbstractComponent;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
@@ -30,8 +32,8 @@ public class Label extends AbstractComponent<Void> {
 	private Color color = LABEL_COLOR;
 	@Deprecated
 	private boolean center;
-	private HorizontalAlignment horizontalAlignment = HorizontalAlignment.Center;
-	private VerticalAlignment verticalAlignment = VerticalAlignment.Center;
+	private HorizontalAlignment horizontalAlignment = HorizontalAlignment.CENTER;
+	private VerticalAlignment verticalAlignment = VerticalAlignment.CENTER;
 
 	@Override
 	public void draw(Graphics2D g2d, ComponentState componentState,
@@ -50,13 +52,13 @@ public class Label extends AbstractComponent<Void> {
 		int x = point.x;
 		int y = point.y;
 		switch (verticalAlignment) {
-		case Center:
+		case CENTER:
 			y = point.y - textHeight / 2 + fontMetrics.getAscent();
 			break;
-		case Top:
+		case TOP:
 			y = point.y - textHeight + fontMetrics.getAscent();			
 			break;
-		case Bottom:
+		case BOTTOM:
 			y = point.y + fontMetrics.getAscent();
 			break;
 		default:
@@ -64,13 +66,13 @@ public class Label extends AbstractComponent<Void> {
 					+ verticalAlignment);
 		}
 		switch (horizontalAlignment) {
-		case Center:
+		case CENTER:
 			x = point.x - textWidth / 2;
 			break;
-		case Left:
+		case LEFT:
 			x = point.x;
 			break;
-		case Right:
+		case RIGHT:
 			x = point.x - textWidth;
 			break;
 		default:
@@ -212,13 +214,16 @@ public class Label extends AbstractComponent<Void> {
 	}
 
 	public void setVerticalAlignment(VerticalAlignment verticalAlignment) {
+		if (verticalAlignment == null) {
+			verticalAlignment = VerticalAlignment.CENTER;
+		}
 		this.verticalAlignment = verticalAlignment;
 	}
 
 	@EditableProperty(name = "Horizontal alignment")
 	public HorizontalAlignment getHorizontalAlignment() {
 		if (horizontalAlignment == null) {
-			horizontalAlignment = HorizontalAlignment.Center;
+			horizontalAlignment = HorizontalAlignment.CENTER;
 		}
 		return horizontalAlignment;
 	}
@@ -240,12 +245,4 @@ public class Label extends AbstractComponent<Void> {
 	@Override
 	public void setValue(Void value) {
 	}
-
-	public enum HorizontalAlignment {
-		Left, Center, Right;
-	}
-
-	public enum VerticalAlignment {
-		Top, Center, Bottom;
-	}
 }