Merge "Add per-view custom initialization logic"

3 files changed, 27 insertions, 31 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/api/RectTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/api/RectTest.java
index 043c9ee..36fa743 100755
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/api/RectTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/api/RectTest.java
@@ -16,11 +16,6 @@
 
 package com.android.ide.common.api;
 
-import com.android.ide.common.api.Point;
-import com.android.ide.common.api.Rect;
-
-import org.eclipse.swt.graphics.Rectangle;
-
 import junit.framework.TestCase;
 
 public class RectTest extends TestCase {
@@ -54,16 +49,6 @@ public class RectTest extends TestCase {
         assertEquals(r2, r);
     }
 
-    public final void testRectRectangle() {
-        Rectangle r = new Rectangle(3, 4, 20, 30);
-        Rect r2 = new Rect(r);
-
-        assertEquals(3, r2.x);
-        assertEquals(4, r2.y);
-        assertEquals(20, r2.w);
-        assertEquals(30, r2.h);
-    }
-
     public final void testSetIntIntIntInt() {
         Rect r = new Rect(1, 2, 3, 4);
         Rect r2 = r.set(3, 4, 20, 30);
@@ -88,19 +73,6 @@ public class RectTest extends TestCase {
         assertEquals(30, r.h);
     }
 
-    public final void testSetRectangle() {
-        Rect r = new Rect(1, 2, 3, 4);
-        Rectangle r2 = new Rectangle(3, 4, 20, 30);
-        Rect r3 = r.set(r2);
-
-        assertSame(r3, r);
-        assertNotSame(r3, r2);
-        assertEquals(3, r.x);
-        assertEquals(4, r.y);
-        assertEquals(20, r.w);
-        assertEquals(30, r.h);
-    }
-
     public final void testCopy() {
         Rect r = new Rect(1, 2, 3, 4);
         Rect r2 = r.copy();
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/AbsoluteLayoutRuleTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/AbsoluteLayoutRuleTest.java
index 2f4e22f..7853410 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/AbsoluteLayoutRuleTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/AbsoluteLayoutRuleTest.java
@@ -54,10 +54,10 @@ public class AbsoluteLayoutRuleTest extends AbstractLayoutRuleTest {
                 "useStyle(DROP_RECIPIENT), drawRect(Rect[0,0,240,480])",
 
                 // Drop preview
-                "useStyle(DROP_PREVIEW), drawRect(Rect[30,-10,105,80])");
+                "useStyle(DROP_PREVIEW), drawRect(Rect[-22,-50,105,80])");
 
-        assertEquals("30dip", inserted.getStringAttr(BaseLayout.ANDROID_URI, "layout_x"));
-        assertEquals("-10dip", inserted.getStringAttr(BaseLayout.ANDROID_URI, "layout_y"));
+        assertEquals("-22dip", inserted.getStringAttr(BaseLayout.ANDROID_URI, "layout_x"));
+        assertEquals("-50dip", inserted.getStringAttr(BaseLayout.ANDROID_URI, "layout_y"));
 
         // Without drag bounds we should just draw guide lines instead
         inserted = dragInto(new Rect(0, 0, 0, 0), new Point(30, -10), 4, -1,
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/gle2/SwtUtilsTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/gle2/SwtUtilsTest.java
index e383796..c575f46 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/gle2/SwtUtilsTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/gle2/SwtUtilsTest.java
@@ -16,8 +16,11 @@
 
 package com.android.ide.eclipse.adt.internal.editors.layout.gle2;
 
+import com.android.ide.common.api.Rect;
+
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
@@ -134,4 +137,25 @@ public class SwtUtilsTest extends TestCase {
         }
     }
 
+    public final void testSetRectangle() {
+        Rect r = new Rect(1, 2, 3, 4);
+        Rectangle r2 = new Rectangle(3, 4, 20, 30);
+        SwtUtils.set(r, r2);
+
+        assertEquals(3, r.x);
+        assertEquals(4, r.y);
+        assertEquals(20, r.w);
+        assertEquals(30, r.h);
+    }
+
+    public final void testRectRectangle() {
+        Rectangle r = new Rectangle(3, 4, 20, 30);
+        Rect r2 = SwtUtils.toRect(r);
+
+        assertEquals(3, r2.x);
+        assertEquals(4, r2.y);
+        assertEquals(20, r2.w);
+        assertEquals(30, r2.h);
+    }
+
 }