You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2012/06/21 19:28:19 UTC
[1/9] git commit: Rename the classes and interfaces used by
InheritanceSearchSpec for clarity - too many Foos and Bars ruin the cake!
Updated Branches:
refs/heads/master 313b7bfe1 -> 26f41f2b2
Rename the classes and interfaces used by InheritanceSearchSpec for clarity
- too many Foos and Bars ruin the cake!
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/26f41f2b
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/26f41f2b
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/26f41f2b
Branch: refs/heads/master
Commit: 26f41f2b21e1b4681a3cf36919561c0909fef431
Parents: 91b0adc
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Thu Jun 21 10:27:49 2012 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Thu Jun 21 10:27:49 2012 -0700
----------------------------------------------------------------------
.../groovy/ioc/specs/InheritanceSearchSpec.groovy | 24 +++++++-------
.../apache/tapestry5/ioc/internal/util/Bar.java | 9 -----
.../tapestry5/ioc/internal/util/BarImpl.java | 15 ---------
.../tapestry5/ioc/internal/util/Drivable.java | 9 +++++
.../tapestry5/ioc/internal/util/DrivableImpl.java | 15 +++++++++
.../apache/tapestry5/ioc/internal/util/Foo.java | 10 ------
.../apache/tapestry5/ioc/internal/util/FooBar.java | 10 ------
.../tapestry5/ioc/internal/util/FooBarImpl.java | 15 ---------
.../tapestry5/ioc/internal/util/FooImpl.java | 14 --------
.../tapestry5/ioc/internal/util/Playable.java | 11 +++++++
.../tapestry5/ioc/internal/util/PlayableImpl.java | 14 ++++++++
.../tapestry5/ioc/internal/util/ToyTruck.java | 10 ++++++
.../tapestry5/ioc/internal/util/ToyTruckImpl.java | 15 +++++++++
13 files changed, 86 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/26f41f2b/tapestry-ioc/src/test/groovy/ioc/specs/InheritanceSearchSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/InheritanceSearchSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/InheritanceSearchSpec.groovy
index eabedeb..6f68f9d 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/InheritanceSearchSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/InheritanceSearchSpec.groovy
@@ -48,18 +48,18 @@ class InheritanceSearchSpec extends Specification {
where:
- clazz | expected
- Object | [Object]
- String | [String, Serializable, Comparable, CharSequence, Object]
- Comparable | [Comparable, Object]
- FooBar | [FooBar, Foo, Bar, Object]
- FooBarImpl | [FooBarImpl, FooImpl, BarImpl, Bar, FooBar, Foo, Object]
- long | [long, Long, Number, Comparable, Serializable, Object]
- void | [void, Object]
- long[] | [long[], Cloneable, Serializable, Object]
- int[][] | [int[][], Cloneable, Serializable, Object]
- String[] | [String[], Object[], Cloneable, Serializable, Object]
- String[][] | [String[][], Object[], Cloneable, Serializable, Object]
+ clazz | expected
+ Object | [Object]
+ String | [String, Serializable, Comparable, CharSequence, Object]
+ Comparable | [Comparable, Object]
+ ToyTruck | [ToyTruck, Playable, Drivable, Object]
+ ToyTruckImpl | [ToyTruckImpl, PlayableImpl, DrivableImpl, Drivable, ToyTruck, Playable, Object]
+ long | [long, Long, Number, Comparable, Serializable, Object]
+ void | [void, Object]
+ long[] | [long[], Cloneable, Serializable, Object]
+ int[][] | [int[][], Cloneable, Serializable, Object]
+ String[] | [String[], Object[], Cloneable, Serializable, Object]
+ String[][] | [String[][], Object[], Cloneable, Serializable, Object]
className = PlasticUtils.toTypeName(clazz)
expectedNames = expected.collect { PlasticUtils.toTypeName(it) }.join(", ")
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/26f41f2b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Bar.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Bar.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Bar.java
deleted file mode 100644
index 472c7eb..0000000
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Bar.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.apache.tapestry5.ioc.internal.util;
-
-/**
- * Used by {@link ioc.specs.InheritanceSearchSpec}.
- */
-public interface Bar
-{
- void bar();
-}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/26f41f2b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BarImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BarImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BarImpl.java
deleted file mode 100644
index 3451819..0000000
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BarImpl.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.apache.tapestry5.ioc.internal.util;
-
-
-/**
- * Used by {@link ioc.specs.InheritanceSearchSpec}.
- */
-public class BarImpl implements Bar
-{
-
- public void bar()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/26f41f2b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Drivable.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Drivable.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Drivable.java
new file mode 100644
index 0000000..b6cf120
--- /dev/null
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Drivable.java
@@ -0,0 +1,9 @@
+package org.apache.tapestry5.ioc.internal.util;
+
+/**
+ * Used by {@link ioc.specs.InheritanceSearchSpec}.
+ */
+public interface Drivable
+{
+ void drive();
+}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/26f41f2b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java
new file mode 100644
index 0000000..523e665
--- /dev/null
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java
@@ -0,0 +1,15 @@
+package org.apache.tapestry5.ioc.internal.util;
+
+
+/**
+ * Used by {@link ioc.specs.InheritanceSearchSpec}.
+ */
+public class DrivableImpl implements Drivable
+{
+
+ public void drive()
+ {
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/26f41f2b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Foo.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Foo.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Foo.java
deleted file mode 100644
index e41a9c7..0000000
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Foo.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.apache.tapestry5.ioc.internal.util;
-
-
-/**
- * Used by {@link ioc.specs.InheritanceSearchSpec}.
- */
-public interface Foo extends Bar
-{
- void foo();
-}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/26f41f2b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBar.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBar.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBar.java
deleted file mode 100644
index 497d389..0000000
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBar.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.apache.tapestry5.ioc.internal.util;
-
-
-/**
- * Used by {@link ioc.specs.InheritanceSearchSpec}.
- */
-public interface FooBar extends Foo, Bar
-{
- void foobar();
-}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/26f41f2b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBarImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBarImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBarImpl.java
deleted file mode 100644
index c54f201..0000000
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBarImpl.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.apache.tapestry5.ioc.internal.util;
-
-
-/**
- * Used by {@link ioc.specs.InheritanceSearchSpec}.
- */
-public class FooBarImpl extends FooImpl implements Bar, FooBar
-{
-
- public void foobar()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/26f41f2b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooImpl.java
deleted file mode 100644
index 241e4b3..0000000
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooImpl.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.apache.tapestry5.ioc.internal.util;
-
-/**
- * Used by {@link ioc.specs.InheritanceSearchSpec}.
- */
-public class FooImpl extends BarImpl implements Foo
-{
-
- public void foo()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/26f41f2b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Playable.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Playable.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Playable.java
new file mode 100644
index 0000000..1181ae1
--- /dev/null
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Playable.java
@@ -0,0 +1,11 @@
+package org.apache.tapestry5.ioc.internal.util;
+
+
+/**
+ * Used by {@link ioc.specs.InheritanceSearchSpec}.
+ * Kind of dubious that anything Playable is also Drivable, but this is an edge case.
+ */
+public interface Playable extends Drivable
+{
+ void play();
+}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/26f41f2b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java
new file mode 100644
index 0000000..307501b
--- /dev/null
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java
@@ -0,0 +1,14 @@
+package org.apache.tapestry5.ioc.internal.util;
+
+/**
+ * Used by {@link ioc.specs.InheritanceSearchSpec}.
+ */
+public class PlayableImpl extends DrivableImpl implements Playable
+{
+
+ public void play()
+ {
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/26f41f2b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruck.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruck.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruck.java
new file mode 100644
index 0000000..79fb4fd
--- /dev/null
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruck.java
@@ -0,0 +1,10 @@
+package org.apache.tapestry5.ioc.internal.util;
+
+
+/**
+ * Used by {@link ioc.specs.InheritanceSearchSpec}.
+ */
+public interface ToyTruck extends Playable, Drivable
+{
+ void playDrive();
+}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/26f41f2b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java
new file mode 100644
index 0000000..db6c7e7
--- /dev/null
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java
@@ -0,0 +1,15 @@
+package org.apache.tapestry5.ioc.internal.util;
+
+
+/**
+ * Used by {@link ioc.specs.InheritanceSearchSpec}.
+ */
+public class ToyTruckImpl extends PlayableImpl implements Drivable, ToyTruck
+{
+
+ public void playDrive()
+ {
+
+ }
+
+}