You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/01/22 07:59:23 UTC
svn commit: r1234453 [11/33] - in /incubator/isis/trunk/framework/core:
commons/src/main/java/org/apache/isis/core/commons/authentication/
commons/src/main/java/org/apache/isis/core/commons/components/
commons/src/main/java/org/apache/isis/core/commons...
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_GetEndStateTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_GetEndStateTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_GetEndStateTest.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_GetEndStateTest.java Sun Jan 22 06:58:43 2012
@@ -49,10 +49,8 @@ public class ResolveState_GetEndStateTes
@Parameters
public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { { NEW, null }, { GHOST, null }, { TRANSIENT, null },
- { RESOLVING_PART, PART_RESOLVED }, { PART_RESOLVED, null }, { RESOLVING, RESOLVED }, { RESOLVED, null },
- { UPDATING, RESOLVED }, { SERIALIZING_TRANSIENT, TRANSIENT }, { SERIALIZING_PART_RESOLVED, PART_RESOLVED },
- { SERIALIZING_RESOLVED, RESOLVED }, { SERIALIZING_GHOST, GHOST }, { VALUE, null }, { DESTROYED, null }, });
+ return Arrays.asList(new Object[][] { { NEW, null }, { GHOST, null }, { TRANSIENT, null }, { RESOLVING_PART, PART_RESOLVED }, { PART_RESOLVED, null }, { RESOLVING, RESOLVED }, { RESOLVED, null }, { UPDATING, RESOLVED }, { SERIALIZING_TRANSIENT, TRANSIENT },
+ { SERIALIZING_PART_RESOLVED, PART_RESOLVED }, { SERIALIZING_RESOLVED, RESOLVED }, { SERIALIZING_GHOST, GHOST }, { VALUE, null }, { DESTROYED, null }, });
}
private final ResolveState from;
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsDestroyedTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsDestroyedTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsDestroyedTest.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsDestroyedTest.java Sun Jan 22 06:58:43 2012
@@ -49,10 +49,8 @@ public class ResolveState_IsDestroyedTes
@Parameters
public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { false, PART_RESOLVED },
- { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT },
- { true, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT }, { false, SERIALIZING_GHOST },
- { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { false, PART_RESOLVED }, { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT }, { true, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT },
+ { false, SERIALIZING_GHOST }, { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
}
private final boolean whetherIs;
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsGhostTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsGhostTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsGhostTest.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsGhostTest.java Sun Jan 22 06:58:43 2012
@@ -49,11 +49,10 @@ public class ResolveState_IsGhostTest {
@Parameters
public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { { true, GHOST }, { false, NEW }, { false, PART_RESOLVED },
- { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT },
- { false, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT }, { false, SERIALIZING_GHOST }, // surprisingly
- // not?
- { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ return Arrays.asList(new Object[][] { { true, GHOST }, { false, NEW }, { false, PART_RESOLVED }, { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT }, { false, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT },
+ { false, SERIALIZING_GHOST }, // surprisingly
+ // not?
+ { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
}
private final boolean whetherIs;
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsNewTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsNewTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsNewTest.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsNewTest.java Sun Jan 22 06:58:43 2012
@@ -49,10 +49,8 @@ public class ResolveState_IsNewTest {
@Parameters
public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { { false, GHOST }, { true, NEW }, { false, PART_RESOLVED },
- { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT },
- { false, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT }, { false, SERIALIZING_GHOST },
- { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ return Arrays.asList(new Object[][] { { false, GHOST }, { true, NEW }, { false, PART_RESOLVED }, { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT }, { false, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT },
+ { false, SERIALIZING_GHOST }, { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
}
private final boolean whetherIs;
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPartlyResolvedTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPartlyResolvedTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPartlyResolvedTest.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPartlyResolvedTest.java Sun Jan 22 06:58:43 2012
@@ -49,10 +49,8 @@ public class ResolveState_IsPartlyResolv
@Parameters
public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { true, PART_RESOLVED },
- { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT },
- { false, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT }, { false, SERIALIZING_GHOST },
- { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { true, PART_RESOLVED }, { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT }, { false, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT },
+ { false, SERIALIZING_GHOST }, { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
}
private final boolean whetherIs;
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPersistentTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPersistentTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPersistentTest.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPersistentTest.java Sun Jan 22 06:58:43 2012
@@ -49,10 +49,8 @@ public class ResolveState_IsPersistentTe
@Parameters
public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { { true, GHOST }, { false, NEW }, { true, PART_RESOLVED },
- { true, RESOLVED }, { true, RESOLVING }, { true, RESOLVING_PART }, { false, TRANSIENT },
- { false, DESTROYED }, { true, UPDATING }, { false, SERIALIZING_TRANSIENT }, { true, SERIALIZING_GHOST },
- { true, SERIALIZING_PART_RESOLVED }, { true, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ return Arrays.asList(new Object[][] { { true, GHOST }, { false, NEW }, { true, PART_RESOLVED }, { true, RESOLVED }, { true, RESOLVING }, { true, RESOLVING_PART }, { false, TRANSIENT }, { false, DESTROYED }, { true, UPDATING }, { false, SERIALIZING_TRANSIENT }, { true, SERIALIZING_GHOST },
+ { true, SERIALIZING_PART_RESOLVED }, { true, SERIALIZING_RESOLVED }, { false, VALUE }, });
}
private final boolean whetherIs;
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvableOrDeserializableTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvableOrDeserializableTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvableOrDeserializableTest.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvableOrDeserializableTest.java Sun Jan 22 06:58:43 2012
@@ -50,126 +50,59 @@ public class ResolveState_IsResolvableOr
@Parameters
public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { { null, null, NEW, GHOST }, { null, null, NEW, NEW },
- { null, null, NEW, PART_RESOLVED }, { null, null, NEW, RESOLVED }, { false, false, NEW, RESOLVING },
- { false, false, NEW, RESOLVING_PART }, { null, null, NEW, TRANSIENT }, { null, null, NEW, DESTROYED },
- { false, false, NEW, UPDATING }, { null, false, NEW, SERIALIZING_TRANSIENT },
- { null, null, NEW, SERIALIZING_GHOST }, { null, null, NEW, SERIALIZING_PART_RESOLVED },
- { null, null, NEW, SERIALIZING_RESOLVED }, { null, null, NEW, VALUE },
-
- { null, null, GHOST, GHOST }, { null, null, GHOST, NEW }, { null, null, GHOST, PART_RESOLVED },
- { null, null, GHOST, RESOLVED }, { true, true, GHOST, RESOLVING }, { true, true, GHOST, RESOLVING_PART },
- { null, null, GHOST, TRANSIENT }, { null, null, GHOST, DESTROYED }, { true, true, GHOST, UPDATING },
- { null, false, GHOST, SERIALIZING_TRANSIENT }, { null, null, GHOST, SERIALIZING_GHOST },
- { null, null, GHOST, SERIALIZING_PART_RESOLVED }, { null, null, GHOST, SERIALIZING_RESOLVED },
- { null, null, GHOST, VALUE },
-
- { null, null, TRANSIENT, GHOST }, { null, null, TRANSIENT, NEW }, { null, null, TRANSIENT, PART_RESOLVED },
- { null, null, TRANSIENT, RESOLVED }, { false, false, TRANSIENT, RESOLVING },
- { false, false, TRANSIENT, RESOLVING_PART }, { null, null, TRANSIENT, TRANSIENT },
- { null, null, TRANSIENT, DESTROYED }, { false, false, TRANSIENT, UPDATING },
- { null, true, TRANSIENT, SERIALIZING_TRANSIENT }, { null, null, TRANSIENT, SERIALIZING_GHOST },
- { null, null, TRANSIENT, SERIALIZING_PART_RESOLVED }, { null, null, TRANSIENT, SERIALIZING_RESOLVED },
- { null, null, TRANSIENT, VALUE },
-
- { null, null, RESOLVING_PART, GHOST }, { null, null, RESOLVING_PART, NEW },
- { null, null, RESOLVING_PART, PART_RESOLVED }, { null, null, RESOLVING_PART, RESOLVED },
- { false, false, RESOLVING_PART, RESOLVING }, { false, false, RESOLVING_PART, RESOLVING_PART },
- { null, null, RESOLVING_PART, TRANSIENT }, { null, null, RESOLVING_PART, DESTROYED },
- { false, false, RESOLVING_PART, UPDATING }, { null, false, RESOLVING_PART, SERIALIZING_TRANSIENT },
- { null, null, RESOLVING_PART, SERIALIZING_GHOST },
- { null, null, RESOLVING_PART, SERIALIZING_PART_RESOLVED },
- { null, null, RESOLVING_PART, SERIALIZING_RESOLVED }, { null, null, RESOLVING_PART, VALUE },
-
- { null, null, PART_RESOLVED, GHOST }, { null, null, PART_RESOLVED, NEW },
- { null, null, PART_RESOLVED, PART_RESOLVED }, { null, null, PART_RESOLVED, RESOLVED },
- { true, true, PART_RESOLVED, RESOLVING }, { true, true, PART_RESOLVED, RESOLVING_PART },
- { null, null, PART_RESOLVED, TRANSIENT }, { null, null, PART_RESOLVED, DESTROYED },
- { true, true, PART_RESOLVED, UPDATING }, { null, false, PART_RESOLVED, SERIALIZING_TRANSIENT },
- { null, null, PART_RESOLVED, SERIALIZING_GHOST }, { null, null, PART_RESOLVED, SERIALIZING_PART_RESOLVED },
- { null, null, PART_RESOLVED, SERIALIZING_RESOLVED }, { null, null, PART_RESOLVED, VALUE },
-
- { null, null, RESOLVING, GHOST }, { null, null, RESOLVING, NEW }, { null, null, RESOLVING, PART_RESOLVED },
- { null, null, RESOLVING, RESOLVED }, { false, false, RESOLVING, RESOLVING },
- { false, false, RESOLVING, RESOLVING_PART }, { null, null, RESOLVING, TRANSIENT },
- { null, null, RESOLVING, DESTROYED }, { false, false, RESOLVING, UPDATING },
- { null, false, RESOLVING, SERIALIZING_TRANSIENT }, { null, null, RESOLVING, SERIALIZING_GHOST },
- { null, null, RESOLVING, SERIALIZING_PART_RESOLVED }, { null, null, RESOLVING, SERIALIZING_RESOLVED },
- { null, null, RESOLVING, VALUE },
-
- { null, null, RESOLVED, GHOST }, { null, null, RESOLVED, NEW }, { null, null, RESOLVED, PART_RESOLVED },
- { null, null, RESOLVED, RESOLVED }, { false, false, RESOLVED, RESOLVING },
- { false, false, RESOLVED, RESOLVING_PART }, { null, null, RESOLVED, TRANSIENT },
- { null, null, RESOLVED, DESTROYED }, { true, true, RESOLVED, UPDATING },
- { null, false, RESOLVED, SERIALIZING_TRANSIENT }, { null, null, RESOLVED, SERIALIZING_GHOST },
- { null, null, RESOLVED, SERIALIZING_PART_RESOLVED }, { null, null, RESOLVED, SERIALIZING_RESOLVED },
- { null, null, RESOLVED, VALUE },
-
- { null, null, UPDATING, GHOST }, { null, null, UPDATING, NEW }, { null, null, UPDATING, PART_RESOLVED },
- { null, null, UPDATING, RESOLVED }, { false, false, UPDATING, RESOLVING },
- { false, false, UPDATING, RESOLVING_PART }, { null, null, UPDATING, TRANSIENT },
- { null, null, UPDATING, DESTROYED }, { false, false, UPDATING, UPDATING },
- { null, false, UPDATING, SERIALIZING_TRANSIENT }, { null, null, UPDATING, SERIALIZING_GHOST },
- { null, null, UPDATING, SERIALIZING_PART_RESOLVED }, { null, null, UPDATING, SERIALIZING_RESOLVED },
- { null, null, UPDATING, VALUE },
-
- { null, null, SERIALIZING_TRANSIENT, GHOST }, { null, null, SERIALIZING_TRANSIENT, NEW },
- { null, null, SERIALIZING_TRANSIENT, PART_RESOLVED }, { null, null, SERIALIZING_TRANSIENT, RESOLVED },
- { false, false, SERIALIZING_TRANSIENT, RESOLVING },
- { false, false, SERIALIZING_TRANSIENT, RESOLVING_PART }, { null, null, SERIALIZING_TRANSIENT, TRANSIENT },
- { null, null, SERIALIZING_TRANSIENT, DESTROYED }, { false, false, SERIALIZING_TRANSIENT, UPDATING },
- { null, false, SERIALIZING_TRANSIENT, SERIALIZING_TRANSIENT },
- { null, null, SERIALIZING_TRANSIENT, SERIALIZING_GHOST },
- { null, null, SERIALIZING_TRANSIENT, SERIALIZING_PART_RESOLVED },
- { null, null, SERIALIZING_TRANSIENT, SERIALIZING_RESOLVED }, { null, null, SERIALIZING_TRANSIENT, VALUE },
-
- { null, null, SERIALIZING_PART_RESOLVED, GHOST }, { null, null, SERIALIZING_PART_RESOLVED, NEW },
- { null, null, SERIALIZING_PART_RESOLVED, PART_RESOLVED },
- { null, null, SERIALIZING_PART_RESOLVED, RESOLVED },
- { false, false, SERIALIZING_PART_RESOLVED, RESOLVING },
- { false, false, SERIALIZING_PART_RESOLVED, RESOLVING_PART },
- { null, null, SERIALIZING_PART_RESOLVED, TRANSIENT }, { null, null, SERIALIZING_PART_RESOLVED, DESTROYED },
- { false, false, SERIALIZING_PART_RESOLVED, UPDATING },
- { null, false, SERIALIZING_PART_RESOLVED, SERIALIZING_TRANSIENT },
- { null, null, SERIALIZING_PART_RESOLVED, SERIALIZING_GHOST },
- { null, null, SERIALIZING_PART_RESOLVED, SERIALIZING_PART_RESOLVED },
- { null, null, SERIALIZING_PART_RESOLVED, SERIALIZING_RESOLVED },
- { null, null, SERIALIZING_PART_RESOLVED, VALUE },
-
- { null, null, SERIALIZING_RESOLVED, GHOST }, { null, null, SERIALIZING_RESOLVED, NEW },
- { null, null, SERIALIZING_RESOLVED, PART_RESOLVED }, { null, null, SERIALIZING_RESOLVED, RESOLVED },
- { false, false, SERIALIZING_RESOLVED, RESOLVING }, { false, false, SERIALIZING_RESOLVED, RESOLVING_PART },
- { null, null, SERIALIZING_RESOLVED, TRANSIENT }, { null, null, SERIALIZING_RESOLVED, DESTROYED },
- { false, false, SERIALIZING_RESOLVED, UPDATING },
- { null, false, SERIALIZING_RESOLVED, SERIALIZING_TRANSIENT },
- { null, null, SERIALIZING_RESOLVED, SERIALIZING_GHOST },
- { null, null, SERIALIZING_RESOLVED, SERIALIZING_PART_RESOLVED },
- { null, null, SERIALIZING_RESOLVED, SERIALIZING_RESOLVED }, { null, null, SERIALIZING_RESOLVED, VALUE },
-
- { null, null, SERIALIZING_GHOST, GHOST }, { null, null, SERIALIZING_GHOST, NEW },
- { null, null, SERIALIZING_GHOST, PART_RESOLVED }, { null, null, SERIALIZING_GHOST, RESOLVED },
- { false, false, SERIALIZING_GHOST, RESOLVING }, { false, false, SERIALIZING_GHOST, RESOLVING_PART },
- { null, null, SERIALIZING_GHOST, TRANSIENT }, { null, null, SERIALIZING_GHOST, DESTROYED },
- { false, false, SERIALIZING_GHOST, UPDATING }, { null, false, SERIALIZING_GHOST, SERIALIZING_TRANSIENT },
- { null, null, SERIALIZING_GHOST, SERIALIZING_GHOST },
- { null, null, SERIALIZING_GHOST, SERIALIZING_PART_RESOLVED },
- { null, null, SERIALIZING_GHOST, SERIALIZING_RESOLVED }, { null, null, SERIALIZING_GHOST, VALUE },
-
- { null, null, VALUE, GHOST }, { null, null, VALUE, NEW }, { null, null, VALUE, PART_RESOLVED },
- { null, null, VALUE, RESOLVED }, { false, false, VALUE, RESOLVING },
- { false, false, VALUE, RESOLVING_PART }, { null, null, VALUE, TRANSIENT },
- { null, null, VALUE, DESTROYED }, { false, false, VALUE, UPDATING },
- { null, false, VALUE, SERIALIZING_TRANSIENT }, { null, null, VALUE, SERIALIZING_GHOST },
- { null, null, VALUE, SERIALIZING_PART_RESOLVED }, { null, null, VALUE, SERIALIZING_RESOLVED },
- { null, null, VALUE, VALUE },
-
- { null, null, DESTROYED, GHOST }, { null, null, DESTROYED, NEW }, { null, null, DESTROYED, PART_RESOLVED },
- { null, null, DESTROYED, RESOLVED }, { false, false, DESTROYED, RESOLVING },
- { false, false, DESTROYED, RESOLVING_PART }, { null, null, DESTROYED, TRANSIENT },
- { null, null, DESTROYED, DESTROYED }, { false, false, DESTROYED, UPDATING },
- { null, false, DESTROYED, SERIALIZING_TRANSIENT }, { null, null, DESTROYED, SERIALIZING_GHOST },
- { null, null, DESTROYED, SERIALIZING_PART_RESOLVED }, { null, null, DESTROYED, SERIALIZING_RESOLVED },
- { null, null, DESTROYED, VALUE },
+ return Arrays.asList(new Object[][] { { null, null, NEW, GHOST }, { null, null, NEW, NEW }, { null, null, NEW, PART_RESOLVED }, { null, null, NEW, RESOLVED }, { false, false, NEW, RESOLVING }, { false, false, NEW, RESOLVING_PART }, { null, null, NEW, TRANSIENT },
+ { null, null, NEW, DESTROYED }, { false, false, NEW, UPDATING }, { null, false, NEW, SERIALIZING_TRANSIENT }, { null, null, NEW, SERIALIZING_GHOST }, { null, null, NEW, SERIALIZING_PART_RESOLVED }, { null, null, NEW, SERIALIZING_RESOLVED }, { null, null, NEW, VALUE },
+
+ { null, null, GHOST, GHOST }, { null, null, GHOST, NEW }, { null, null, GHOST, PART_RESOLVED }, { null, null, GHOST, RESOLVED }, { true, true, GHOST, RESOLVING }, { true, true, GHOST, RESOLVING_PART }, { null, null, GHOST, TRANSIENT }, { null, null, GHOST, DESTROYED },
+ { true, true, GHOST, UPDATING }, { null, false, GHOST, SERIALIZING_TRANSIENT }, { null, null, GHOST, SERIALIZING_GHOST }, { null, null, GHOST, SERIALIZING_PART_RESOLVED }, { null, null, GHOST, SERIALIZING_RESOLVED }, { null, null, GHOST, VALUE },
+
+ { null, null, TRANSIENT, GHOST }, { null, null, TRANSIENT, NEW }, { null, null, TRANSIENT, PART_RESOLVED }, { null, null, TRANSIENT, RESOLVED }, { false, false, TRANSIENT, RESOLVING }, { false, false, TRANSIENT, RESOLVING_PART }, { null, null, TRANSIENT, TRANSIENT },
+ { null, null, TRANSIENT, DESTROYED }, { false, false, TRANSIENT, UPDATING }, { null, true, TRANSIENT, SERIALIZING_TRANSIENT }, { null, null, TRANSIENT, SERIALIZING_GHOST }, { null, null, TRANSIENT, SERIALIZING_PART_RESOLVED }, { null, null, TRANSIENT, SERIALIZING_RESOLVED },
+ { null, null, TRANSIENT, VALUE },
+
+ { null, null, RESOLVING_PART, GHOST }, { null, null, RESOLVING_PART, NEW }, { null, null, RESOLVING_PART, PART_RESOLVED }, { null, null, RESOLVING_PART, RESOLVED }, { false, false, RESOLVING_PART, RESOLVING }, { false, false, RESOLVING_PART, RESOLVING_PART },
+ { null, null, RESOLVING_PART, TRANSIENT }, { null, null, RESOLVING_PART, DESTROYED }, { false, false, RESOLVING_PART, UPDATING }, { null, false, RESOLVING_PART, SERIALIZING_TRANSIENT }, { null, null, RESOLVING_PART, SERIALIZING_GHOST },
+ { null, null, RESOLVING_PART, SERIALIZING_PART_RESOLVED }, { null, null, RESOLVING_PART, SERIALIZING_RESOLVED }, { null, null, RESOLVING_PART, VALUE },
+
+ { null, null, PART_RESOLVED, GHOST }, { null, null, PART_RESOLVED, NEW }, { null, null, PART_RESOLVED, PART_RESOLVED }, { null, null, PART_RESOLVED, RESOLVED }, { true, true, PART_RESOLVED, RESOLVING }, { true, true, PART_RESOLVED, RESOLVING_PART },
+ { null, null, PART_RESOLVED, TRANSIENT }, { null, null, PART_RESOLVED, DESTROYED }, { true, true, PART_RESOLVED, UPDATING }, { null, false, PART_RESOLVED, SERIALIZING_TRANSIENT }, { null, null, PART_RESOLVED, SERIALIZING_GHOST },
+ { null, null, PART_RESOLVED, SERIALIZING_PART_RESOLVED }, { null, null, PART_RESOLVED, SERIALIZING_RESOLVED }, { null, null, PART_RESOLVED, VALUE },
+
+ { null, null, RESOLVING, GHOST }, { null, null, RESOLVING, NEW }, { null, null, RESOLVING, PART_RESOLVED }, { null, null, RESOLVING, RESOLVED }, { false, false, RESOLVING, RESOLVING }, { false, false, RESOLVING, RESOLVING_PART }, { null, null, RESOLVING, TRANSIENT },
+ { null, null, RESOLVING, DESTROYED }, { false, false, RESOLVING, UPDATING }, { null, false, RESOLVING, SERIALIZING_TRANSIENT }, { null, null, RESOLVING, SERIALIZING_GHOST }, { null, null, RESOLVING, SERIALIZING_PART_RESOLVED }, { null, null, RESOLVING, SERIALIZING_RESOLVED },
+ { null, null, RESOLVING, VALUE },
+
+ { null, null, RESOLVED, GHOST }, { null, null, RESOLVED, NEW }, { null, null, RESOLVED, PART_RESOLVED }, { null, null, RESOLVED, RESOLVED }, { false, false, RESOLVED, RESOLVING }, { false, false, RESOLVED, RESOLVING_PART }, { null, null, RESOLVED, TRANSIENT },
+ { null, null, RESOLVED, DESTROYED }, { true, true, RESOLVED, UPDATING }, { null, false, RESOLVED, SERIALIZING_TRANSIENT }, { null, null, RESOLVED, SERIALIZING_GHOST }, { null, null, RESOLVED, SERIALIZING_PART_RESOLVED }, { null, null, RESOLVED, SERIALIZING_RESOLVED },
+ { null, null, RESOLVED, VALUE },
+
+ { null, null, UPDATING, GHOST }, { null, null, UPDATING, NEW }, { null, null, UPDATING, PART_RESOLVED }, { null, null, UPDATING, RESOLVED }, { false, false, UPDATING, RESOLVING }, { false, false, UPDATING, RESOLVING_PART }, { null, null, UPDATING, TRANSIENT },
+ { null, null, UPDATING, DESTROYED }, { false, false, UPDATING, UPDATING }, { null, false, UPDATING, SERIALIZING_TRANSIENT }, { null, null, UPDATING, SERIALIZING_GHOST }, { null, null, UPDATING, SERIALIZING_PART_RESOLVED }, { null, null, UPDATING, SERIALIZING_RESOLVED },
+ { null, null, UPDATING, VALUE },
+
+ { null, null, SERIALIZING_TRANSIENT, GHOST }, { null, null, SERIALIZING_TRANSIENT, NEW }, { null, null, SERIALIZING_TRANSIENT, PART_RESOLVED }, { null, null, SERIALIZING_TRANSIENT, RESOLVED }, { false, false, SERIALIZING_TRANSIENT, RESOLVING },
+ { false, false, SERIALIZING_TRANSIENT, RESOLVING_PART }, { null, null, SERIALIZING_TRANSIENT, TRANSIENT }, { null, null, SERIALIZING_TRANSIENT, DESTROYED }, { false, false, SERIALIZING_TRANSIENT, UPDATING }, { null, false, SERIALIZING_TRANSIENT, SERIALIZING_TRANSIENT },
+ { null, null, SERIALIZING_TRANSIENT, SERIALIZING_GHOST }, { null, null, SERIALIZING_TRANSIENT, SERIALIZING_PART_RESOLVED }, { null, null, SERIALIZING_TRANSIENT, SERIALIZING_RESOLVED }, { null, null, SERIALIZING_TRANSIENT, VALUE },
+
+ { null, null, SERIALIZING_PART_RESOLVED, GHOST }, { null, null, SERIALIZING_PART_RESOLVED, NEW }, { null, null, SERIALIZING_PART_RESOLVED, PART_RESOLVED }, { null, null, SERIALIZING_PART_RESOLVED, RESOLVED }, { false, false, SERIALIZING_PART_RESOLVED, RESOLVING },
+ { false, false, SERIALIZING_PART_RESOLVED, RESOLVING_PART }, { null, null, SERIALIZING_PART_RESOLVED, TRANSIENT }, { null, null, SERIALIZING_PART_RESOLVED, DESTROYED }, { false, false, SERIALIZING_PART_RESOLVED, UPDATING },
+ { null, false, SERIALIZING_PART_RESOLVED, SERIALIZING_TRANSIENT }, { null, null, SERIALIZING_PART_RESOLVED, SERIALIZING_GHOST }, { null, null, SERIALIZING_PART_RESOLVED, SERIALIZING_PART_RESOLVED }, { null, null, SERIALIZING_PART_RESOLVED, SERIALIZING_RESOLVED },
+ { null, null, SERIALIZING_PART_RESOLVED, VALUE },
+
+ { null, null, SERIALIZING_RESOLVED, GHOST }, { null, null, SERIALIZING_RESOLVED, NEW }, { null, null, SERIALIZING_RESOLVED, PART_RESOLVED }, { null, null, SERIALIZING_RESOLVED, RESOLVED }, { false, false, SERIALIZING_RESOLVED, RESOLVING },
+ { false, false, SERIALIZING_RESOLVED, RESOLVING_PART }, { null, null, SERIALIZING_RESOLVED, TRANSIENT }, { null, null, SERIALIZING_RESOLVED, DESTROYED }, { false, false, SERIALIZING_RESOLVED, UPDATING }, { null, false, SERIALIZING_RESOLVED, SERIALIZING_TRANSIENT },
+ { null, null, SERIALIZING_RESOLVED, SERIALIZING_GHOST }, { null, null, SERIALIZING_RESOLVED, SERIALIZING_PART_RESOLVED }, { null, null, SERIALIZING_RESOLVED, SERIALIZING_RESOLVED }, { null, null, SERIALIZING_RESOLVED, VALUE },
+
+ { null, null, SERIALIZING_GHOST, GHOST }, { null, null, SERIALIZING_GHOST, NEW }, { null, null, SERIALIZING_GHOST, PART_RESOLVED }, { null, null, SERIALIZING_GHOST, RESOLVED }, { false, false, SERIALIZING_GHOST, RESOLVING }, { false, false, SERIALIZING_GHOST, RESOLVING_PART },
+ { null, null, SERIALIZING_GHOST, TRANSIENT }, { null, null, SERIALIZING_GHOST, DESTROYED }, { false, false, SERIALIZING_GHOST, UPDATING }, { null, false, SERIALIZING_GHOST, SERIALIZING_TRANSIENT }, { null, null, SERIALIZING_GHOST, SERIALIZING_GHOST },
+ { null, null, SERIALIZING_GHOST, SERIALIZING_PART_RESOLVED }, { null, null, SERIALIZING_GHOST, SERIALIZING_RESOLVED }, { null, null, SERIALIZING_GHOST, VALUE },
+
+ { null, null, VALUE, GHOST }, { null, null, VALUE, NEW }, { null, null, VALUE, PART_RESOLVED }, { null, null, VALUE, RESOLVED }, { false, false, VALUE, RESOLVING }, { false, false, VALUE, RESOLVING_PART }, { null, null, VALUE, TRANSIENT }, { null, null, VALUE, DESTROYED },
+ { false, false, VALUE, UPDATING }, { null, false, VALUE, SERIALIZING_TRANSIENT }, { null, null, VALUE, SERIALIZING_GHOST }, { null, null, VALUE, SERIALIZING_PART_RESOLVED }, { null, null, VALUE, SERIALIZING_RESOLVED }, { null, null, VALUE, VALUE },
+
+ { null, null, DESTROYED, GHOST }, { null, null, DESTROYED, NEW }, { null, null, DESTROYED, PART_RESOLVED }, { null, null, DESTROYED, RESOLVED }, { false, false, DESTROYED, RESOLVING }, { false, false, DESTROYED, RESOLVING_PART }, { null, null, DESTROYED, TRANSIENT },
+ { null, null, DESTROYED, DESTROYED }, { false, false, DESTROYED, UPDATING }, { null, false, DESTROYED, SERIALIZING_TRANSIENT }, { null, null, DESTROYED, SERIALIZING_GHOST }, { null, null, DESTROYED, SERIALIZING_PART_RESOLVED }, { null, null, DESTROYED, SERIALIZING_RESOLVED },
+ { null, null, DESTROYED, VALUE },
});
}
@@ -179,8 +112,7 @@ public class ResolveState_IsResolvableOr
private final ResolveState from;
private final ResolveState to;
- public ResolveState_IsResolvableOrDeserializableTest(final Boolean whetherIsResolvable,
- final Boolean whetherIsDeserializable, final ResolveState from, final ResolveState to) {
+ public ResolveState_IsResolvableOrDeserializableTest(final Boolean whetherIsResolvable, final Boolean whetherIsDeserializable, final ResolveState from, final ResolveState to) {
this.whetherIsResolvable = whetherIsResolvable;
this.whetherIsDeserializable = whetherIsDeserializable;
this.from = from;
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvedTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvedTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvedTest.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvedTest.java Sun Jan 22 06:58:43 2012
@@ -49,10 +49,8 @@ public class ResolveState_IsResolvedTest
@Parameters
public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { false, PART_RESOLVED },
- { true, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT },
- { false, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT }, { false, SERIALIZING_GHOST },
- { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { false, PART_RESOLVED }, { true, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT }, { false, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT },
+ { false, SERIALIZING_GHOST }, { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
}
private final boolean whetherIs;
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvingTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvingTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvingTest.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvingTest.java Sun Jan 22 06:58:43 2012
@@ -49,10 +49,8 @@ public class ResolveState_IsResolvingTes
@Parameters
public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { false, PART_RESOLVED },
- { false, RESOLVED }, { true, RESOLVING }, { true, RESOLVING_PART }, { false, TRANSIENT },
- { false, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT }, { false, SERIALIZING_GHOST },
- { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { false, PART_RESOLVED }, { false, RESOLVED }, { true, RESOLVING }, { true, RESOLVING_PART }, { false, TRANSIENT }, { false, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT },
+ { false, SERIALIZING_GHOST }, { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
}
private final boolean whetherIs;
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsSerializingTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsSerializingTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsSerializingTest.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsSerializingTest.java Sun Jan 22 06:58:43 2012
@@ -49,10 +49,8 @@ public class ResolveState_IsSerializingT
@Parameters
public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { false, PART_RESOLVED },
- { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT },
- { false, DESTROYED }, { false, UPDATING }, { true, SERIALIZING_TRANSIENT }, { true, SERIALIZING_GHOST },
- { true, SERIALIZING_PART_RESOLVED }, { true, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { false, PART_RESOLVED }, { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT }, { false, DESTROYED }, { false, UPDATING }, { true, SERIALIZING_TRANSIENT },
+ { true, SERIALIZING_GHOST }, { true, SERIALIZING_PART_RESOLVED }, { true, SERIALIZING_RESOLVED }, { false, VALUE }, });
}
private final boolean whetherIs;
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsTransientTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsTransientTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsTransientTest.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsTransientTest.java Sun Jan 22 06:58:43 2012
@@ -49,10 +49,8 @@ public class ResolveState_IsTransientTes
@Parameters
public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { false, PART_RESOLVED },
- { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { true, TRANSIENT },
- { false, DESTROYED }, { false, UPDATING }, { true, SERIALIZING_TRANSIENT }, { false, SERIALIZING_GHOST },
- { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { false, PART_RESOLVED }, { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { true, TRANSIENT }, { false, DESTROYED }, { false, UPDATING }, { true, SERIALIZING_TRANSIENT },
+ { false, SERIALIZING_GHOST }, { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
}
private final boolean whetherIs;
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsValidToChangeToTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsValidToChangeToTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsValidToChangeToTest.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsValidToChangeToTest.java Sun Jan 22 06:58:43 2012
@@ -49,112 +49,53 @@ public class ResolveState_IsValidToChang
@Parameters
public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { { true, NEW, GHOST }, { false, NEW, NEW }, { false, NEW, PART_RESOLVED },
- { false, NEW, RESOLVED }, { false, NEW, RESOLVING }, { false, NEW, RESOLVING_PART },
- { true, NEW, TRANSIENT }, { false, NEW, DESTROYED }, { false, NEW, UPDATING },
- { false, NEW, SERIALIZING_TRANSIENT }, { false, NEW, SERIALIZING_GHOST },
- { false, NEW, SERIALIZING_PART_RESOLVED }, { false, NEW, SERIALIZING_RESOLVED }, { true, NEW, VALUE },
-
- { false, GHOST, GHOST }, { false, GHOST, NEW }, { false, GHOST, PART_RESOLVED },
- { false, GHOST, RESOLVED }, { true, GHOST, RESOLVING }, { true, GHOST, RESOLVING_PART },
- { false, GHOST, TRANSIENT }, { true, GHOST, DESTROYED }, { true, GHOST, UPDATING },
- { false, GHOST, SERIALIZING_TRANSIENT }, { true, GHOST, SERIALIZING_GHOST },
- { false, GHOST, SERIALIZING_PART_RESOLVED }, { false, GHOST, SERIALIZING_RESOLVED },
- { false, GHOST, VALUE },
-
- { false, TRANSIENT, GHOST }, { false, TRANSIENT, NEW }, { false, TRANSIENT, PART_RESOLVED },
- { true, TRANSIENT, RESOLVED }, { false, TRANSIENT, RESOLVING }, { false, TRANSIENT, RESOLVING_PART },
- { false, TRANSIENT, TRANSIENT }, { false, TRANSIENT, DESTROYED }, { false, TRANSIENT, UPDATING },
- { true, TRANSIENT, SERIALIZING_TRANSIENT }, { false, TRANSIENT, SERIALIZING_GHOST },
- { false, TRANSIENT, SERIALIZING_PART_RESOLVED }, { false, TRANSIENT, SERIALIZING_RESOLVED },
- { false, TRANSIENT, VALUE },
-
- { false, RESOLVING_PART, GHOST }, { false, RESOLVING_PART, NEW }, { true, RESOLVING_PART, PART_RESOLVED },
- { true, RESOLVING_PART, RESOLVED }, { false, RESOLVING_PART, RESOLVING },
- { false, RESOLVING_PART, RESOLVING_PART }, { false, RESOLVING_PART, TRANSIENT },
- { false, RESOLVING_PART, DESTROYED }, { false, RESOLVING_PART, UPDATING },
- { false, RESOLVING_PART, SERIALIZING_TRANSIENT }, { false, RESOLVING_PART, SERIALIZING_GHOST },
- { false, RESOLVING_PART, SERIALIZING_PART_RESOLVED }, { false, RESOLVING_PART, SERIALIZING_RESOLVED },
- { false, RESOLVING_PART, VALUE },
-
- { false, PART_RESOLVED, GHOST }, { false, PART_RESOLVED, NEW }, { false, PART_RESOLVED, PART_RESOLVED },
- { false, PART_RESOLVED, RESOLVED }, { true, PART_RESOLVED, RESOLVING },
- { true, PART_RESOLVED, RESOLVING_PART }, { false, PART_RESOLVED, TRANSIENT },
- { true, PART_RESOLVED, DESTROYED }, { true, PART_RESOLVED, UPDATING },
- { false, PART_RESOLVED, SERIALIZING_TRANSIENT }, { false, PART_RESOLVED, SERIALIZING_GHOST },
- { true, PART_RESOLVED, SERIALIZING_PART_RESOLVED }, { false, PART_RESOLVED, SERIALIZING_RESOLVED },
- { false, PART_RESOLVED, VALUE },
-
- { false, RESOLVING, GHOST }, { false, RESOLVING, NEW }, { false, RESOLVING, PART_RESOLVED },
- { true, RESOLVING, RESOLVED }, { false, RESOLVING, RESOLVING }, { false, RESOLVING, RESOLVING_PART },
- { false, RESOLVING, TRANSIENT }, { false, RESOLVING, DESTROYED }, { false, RESOLVING, UPDATING },
- { false, RESOLVING, SERIALIZING_TRANSIENT }, { false, RESOLVING, SERIALIZING_GHOST },
- { false, RESOLVING, SERIALIZING_PART_RESOLVED }, { false, RESOLVING, SERIALIZING_RESOLVED },
- { false, RESOLVING, VALUE },
-
- { true, RESOLVED, GHOST }, { false, RESOLVED, NEW }, { false, RESOLVED, PART_RESOLVED },
- { false, RESOLVED, RESOLVED }, { false, RESOLVED, RESOLVING }, { false, RESOLVED, RESOLVING_PART },
- { false, RESOLVED, TRANSIENT }, { true, RESOLVED, DESTROYED }, { true, RESOLVED, UPDATING },
- { false, RESOLVED, SERIALIZING_TRANSIENT }, { false, RESOLVED, SERIALIZING_GHOST },
- { false, RESOLVED, SERIALIZING_PART_RESOLVED }, { true, RESOLVED, SERIALIZING_RESOLVED },
- { false, RESOLVED, VALUE },
-
- { false, UPDATING, GHOST }, { false, UPDATING, NEW }, { false, UPDATING, PART_RESOLVED },
- { true, UPDATING, RESOLVED }, { false, UPDATING, RESOLVING }, { false, UPDATING, RESOLVING_PART },
- { false, UPDATING, TRANSIENT }, { false, UPDATING, DESTROYED }, { false, UPDATING, UPDATING },
- { false, UPDATING, SERIALIZING_TRANSIENT }, { false, UPDATING, SERIALIZING_GHOST },
- { false, UPDATING, SERIALIZING_PART_RESOLVED }, { false, UPDATING, SERIALIZING_RESOLVED },
- { false, UPDATING, VALUE },
-
- { false, SERIALIZING_TRANSIENT, GHOST }, { false, SERIALIZING_TRANSIENT, NEW },
- { false, SERIALIZING_TRANSIENT, PART_RESOLVED }, { false, SERIALIZING_TRANSIENT, RESOLVED },
- { false, SERIALIZING_TRANSIENT, RESOLVING }, { false, SERIALIZING_TRANSIENT, RESOLVING_PART },
- { true, SERIALIZING_TRANSIENT, TRANSIENT }, { false, SERIALIZING_TRANSIENT, DESTROYED },
- { false, SERIALIZING_TRANSIENT, UPDATING }, { false, SERIALIZING_TRANSIENT, SERIALIZING_TRANSIENT },
- { false, SERIALIZING_TRANSIENT, SERIALIZING_GHOST },
- { false, SERIALIZING_TRANSIENT, SERIALIZING_PART_RESOLVED },
- { false, SERIALIZING_TRANSIENT, SERIALIZING_RESOLVED }, { false, SERIALIZING_TRANSIENT, VALUE },
-
- { false, SERIALIZING_PART_RESOLVED, GHOST }, { false, SERIALIZING_PART_RESOLVED, NEW },
- { true, SERIALIZING_PART_RESOLVED, PART_RESOLVED }, { false, SERIALIZING_PART_RESOLVED, RESOLVED },
- { false, SERIALIZING_PART_RESOLVED, RESOLVING }, { false, SERIALIZING_PART_RESOLVED, RESOLVING_PART },
- { false, SERIALIZING_PART_RESOLVED, TRANSIENT }, { false, SERIALIZING_PART_RESOLVED, DESTROYED },
- { false, SERIALIZING_PART_RESOLVED, UPDATING },
- { false, SERIALIZING_PART_RESOLVED, SERIALIZING_TRANSIENT },
- { false, SERIALIZING_PART_RESOLVED, SERIALIZING_GHOST },
- { false, SERIALIZING_PART_RESOLVED, SERIALIZING_PART_RESOLVED },
- { false, SERIALIZING_PART_RESOLVED, SERIALIZING_RESOLVED }, { false, SERIALIZING_PART_RESOLVED, VALUE },
-
- { false, SERIALIZING_RESOLVED, GHOST }, { false, SERIALIZING_RESOLVED, NEW },
- { false, SERIALIZING_RESOLVED, PART_RESOLVED }, { true, SERIALIZING_RESOLVED, RESOLVED },
- { false, SERIALIZING_RESOLVED, RESOLVING }, { false, SERIALIZING_RESOLVED, RESOLVING_PART },
- { false, SERIALIZING_RESOLVED, TRANSIENT }, { false, SERIALIZING_RESOLVED, DESTROYED },
- { false, SERIALIZING_RESOLVED, UPDATING }, { false, SERIALIZING_RESOLVED, SERIALIZING_TRANSIENT },
- { false, SERIALIZING_RESOLVED, SERIALIZING_GHOST },
- { false, SERIALIZING_RESOLVED, SERIALIZING_PART_RESOLVED },
- { false, SERIALIZING_RESOLVED, SERIALIZING_RESOLVED }, { false, SERIALIZING_RESOLVED, VALUE },
-
- { true, SERIALIZING_GHOST, GHOST }, { false, SERIALIZING_GHOST, NEW },
- { false, SERIALIZING_GHOST, PART_RESOLVED }, { false, SERIALIZING_GHOST, RESOLVED },
- { false, SERIALIZING_GHOST, RESOLVING }, { false, SERIALIZING_GHOST, RESOLVING_PART },
- { false, SERIALIZING_GHOST, TRANSIENT }, { false, SERIALIZING_GHOST, DESTROYED },
- { false, SERIALIZING_GHOST, UPDATING }, { false, SERIALIZING_GHOST, SERIALIZING_TRANSIENT },
- { false, SERIALIZING_GHOST, SERIALIZING_GHOST }, { false, SERIALIZING_GHOST, SERIALIZING_PART_RESOLVED },
- { false, SERIALIZING_GHOST, SERIALIZING_RESOLVED }, { false, SERIALIZING_GHOST, VALUE },
-
- { false, VALUE, GHOST }, { false, VALUE, NEW }, { false, VALUE, PART_RESOLVED },
- { false, VALUE, RESOLVED }, { false, VALUE, RESOLVING }, { false, VALUE, RESOLVING_PART },
- { false, VALUE, TRANSIENT }, { false, VALUE, DESTROYED }, { false, VALUE, UPDATING },
- { false, VALUE, SERIALIZING_TRANSIENT }, { false, VALUE, SERIALIZING_GHOST },
- { false, VALUE, SERIALIZING_PART_RESOLVED }, { false, VALUE, SERIALIZING_RESOLVED },
- { false, VALUE, VALUE },
-
- { false, DESTROYED, GHOST }, { false, DESTROYED, NEW }, { false, DESTROYED, PART_RESOLVED },
- { false, DESTROYED, RESOLVED }, { false, DESTROYED, RESOLVING }, { false, DESTROYED, RESOLVING_PART },
- { false, DESTROYED, TRANSIENT }, { false, DESTROYED, DESTROYED }, { false, DESTROYED, UPDATING },
- { false, DESTROYED, SERIALIZING_TRANSIENT }, { false, DESTROYED, SERIALIZING_GHOST },
- { false, DESTROYED, SERIALIZING_PART_RESOLVED }, { false, DESTROYED, SERIALIZING_RESOLVED },
- { false, DESTROYED, VALUE },
+ return Arrays.asList(new Object[][] { { true, NEW, GHOST }, { false, NEW, NEW }, { false, NEW, PART_RESOLVED }, { false, NEW, RESOLVED }, { false, NEW, RESOLVING }, { false, NEW, RESOLVING_PART }, { true, NEW, TRANSIENT }, { false, NEW, DESTROYED }, { false, NEW, UPDATING },
+ { false, NEW, SERIALIZING_TRANSIENT }, { false, NEW, SERIALIZING_GHOST }, { false, NEW, SERIALIZING_PART_RESOLVED }, { false, NEW, SERIALIZING_RESOLVED }, { true, NEW, VALUE },
+
+ { false, GHOST, GHOST }, { false, GHOST, NEW }, { false, GHOST, PART_RESOLVED }, { false, GHOST, RESOLVED }, { true, GHOST, RESOLVING }, { true, GHOST, RESOLVING_PART }, { false, GHOST, TRANSIENT }, { true, GHOST, DESTROYED }, { true, GHOST, UPDATING },
+ { false, GHOST, SERIALIZING_TRANSIENT }, { true, GHOST, SERIALIZING_GHOST }, { false, GHOST, SERIALIZING_PART_RESOLVED }, { false, GHOST, SERIALIZING_RESOLVED }, { false, GHOST, VALUE },
+
+ { false, TRANSIENT, GHOST }, { false, TRANSIENT, NEW }, { false, TRANSIENT, PART_RESOLVED }, { true, TRANSIENT, RESOLVED }, { false, TRANSIENT, RESOLVING }, { false, TRANSIENT, RESOLVING_PART }, { false, TRANSIENT, TRANSIENT }, { false, TRANSIENT, DESTROYED },
+ { false, TRANSIENT, UPDATING }, { true, TRANSIENT, SERIALIZING_TRANSIENT }, { false, TRANSIENT, SERIALIZING_GHOST }, { false, TRANSIENT, SERIALIZING_PART_RESOLVED }, { false, TRANSIENT, SERIALIZING_RESOLVED }, { false, TRANSIENT, VALUE },
+
+ { false, RESOLVING_PART, GHOST }, { false, RESOLVING_PART, NEW }, { true, RESOLVING_PART, PART_RESOLVED }, { true, RESOLVING_PART, RESOLVED }, { false, RESOLVING_PART, RESOLVING }, { false, RESOLVING_PART, RESOLVING_PART }, { false, RESOLVING_PART, TRANSIENT },
+ { false, RESOLVING_PART, DESTROYED }, { false, RESOLVING_PART, UPDATING }, { false, RESOLVING_PART, SERIALIZING_TRANSIENT }, { false, RESOLVING_PART, SERIALIZING_GHOST }, { false, RESOLVING_PART, SERIALIZING_PART_RESOLVED }, { false, RESOLVING_PART, SERIALIZING_RESOLVED },
+ { false, RESOLVING_PART, VALUE },
+
+ { false, PART_RESOLVED, GHOST }, { false, PART_RESOLVED, NEW }, { false, PART_RESOLVED, PART_RESOLVED }, { false, PART_RESOLVED, RESOLVED }, { true, PART_RESOLVED, RESOLVING }, { true, PART_RESOLVED, RESOLVING_PART }, { false, PART_RESOLVED, TRANSIENT },
+ { true, PART_RESOLVED, DESTROYED }, { true, PART_RESOLVED, UPDATING }, { false, PART_RESOLVED, SERIALIZING_TRANSIENT }, { false, PART_RESOLVED, SERIALIZING_GHOST }, { true, PART_RESOLVED, SERIALIZING_PART_RESOLVED }, { false, PART_RESOLVED, SERIALIZING_RESOLVED },
+ { false, PART_RESOLVED, VALUE },
+
+ { false, RESOLVING, GHOST }, { false, RESOLVING, NEW }, { false, RESOLVING, PART_RESOLVED }, { true, RESOLVING, RESOLVED }, { false, RESOLVING, RESOLVING }, { false, RESOLVING, RESOLVING_PART }, { false, RESOLVING, TRANSIENT }, { false, RESOLVING, DESTROYED },
+ { false, RESOLVING, UPDATING }, { false, RESOLVING, SERIALIZING_TRANSIENT }, { false, RESOLVING, SERIALIZING_GHOST }, { false, RESOLVING, SERIALIZING_PART_RESOLVED }, { false, RESOLVING, SERIALIZING_RESOLVED }, { false, RESOLVING, VALUE },
+
+ { true, RESOLVED, GHOST }, { false, RESOLVED, NEW }, { false, RESOLVED, PART_RESOLVED }, { false, RESOLVED, RESOLVED }, { false, RESOLVED, RESOLVING }, { false, RESOLVED, RESOLVING_PART }, { false, RESOLVED, TRANSIENT }, { true, RESOLVED, DESTROYED }, { true, RESOLVED, UPDATING },
+ { false, RESOLVED, SERIALIZING_TRANSIENT }, { false, RESOLVED, SERIALIZING_GHOST }, { false, RESOLVED, SERIALIZING_PART_RESOLVED }, { true, RESOLVED, SERIALIZING_RESOLVED }, { false, RESOLVED, VALUE },
+
+ { false, UPDATING, GHOST }, { false, UPDATING, NEW }, { false, UPDATING, PART_RESOLVED }, { true, UPDATING, RESOLVED }, { false, UPDATING, RESOLVING }, { false, UPDATING, RESOLVING_PART }, { false, UPDATING, TRANSIENT }, { false, UPDATING, DESTROYED }, { false, UPDATING, UPDATING },
+ { false, UPDATING, SERIALIZING_TRANSIENT }, { false, UPDATING, SERIALIZING_GHOST }, { false, UPDATING, SERIALIZING_PART_RESOLVED }, { false, UPDATING, SERIALIZING_RESOLVED }, { false, UPDATING, VALUE },
+
+ { false, SERIALIZING_TRANSIENT, GHOST }, { false, SERIALIZING_TRANSIENT, NEW }, { false, SERIALIZING_TRANSIENT, PART_RESOLVED }, { false, SERIALIZING_TRANSIENT, RESOLVED }, { false, SERIALIZING_TRANSIENT, RESOLVING }, { false, SERIALIZING_TRANSIENT, RESOLVING_PART },
+ { true, SERIALIZING_TRANSIENT, TRANSIENT }, { false, SERIALIZING_TRANSIENT, DESTROYED }, { false, SERIALIZING_TRANSIENT, UPDATING }, { false, SERIALIZING_TRANSIENT, SERIALIZING_TRANSIENT }, { false, SERIALIZING_TRANSIENT, SERIALIZING_GHOST },
+ { false, SERIALIZING_TRANSIENT, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_TRANSIENT, SERIALIZING_RESOLVED }, { false, SERIALIZING_TRANSIENT, VALUE },
+
+ { false, SERIALIZING_PART_RESOLVED, GHOST }, { false, SERIALIZING_PART_RESOLVED, NEW }, { true, SERIALIZING_PART_RESOLVED, PART_RESOLVED }, { false, SERIALIZING_PART_RESOLVED, RESOLVED }, { false, SERIALIZING_PART_RESOLVED, RESOLVING },
+ { false, SERIALIZING_PART_RESOLVED, RESOLVING_PART }, { false, SERIALIZING_PART_RESOLVED, TRANSIENT }, { false, SERIALIZING_PART_RESOLVED, DESTROYED }, { false, SERIALIZING_PART_RESOLVED, UPDATING }, { false, SERIALIZING_PART_RESOLVED, SERIALIZING_TRANSIENT },
+ { false, SERIALIZING_PART_RESOLVED, SERIALIZING_GHOST }, { false, SERIALIZING_PART_RESOLVED, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_PART_RESOLVED, SERIALIZING_RESOLVED }, { false, SERIALIZING_PART_RESOLVED, VALUE },
+
+ { false, SERIALIZING_RESOLVED, GHOST }, { false, SERIALIZING_RESOLVED, NEW }, { false, SERIALIZING_RESOLVED, PART_RESOLVED }, { true, SERIALIZING_RESOLVED, RESOLVED }, { false, SERIALIZING_RESOLVED, RESOLVING }, { false, SERIALIZING_RESOLVED, RESOLVING_PART },
+ { false, SERIALIZING_RESOLVED, TRANSIENT }, { false, SERIALIZING_RESOLVED, DESTROYED }, { false, SERIALIZING_RESOLVED, UPDATING }, { false, SERIALIZING_RESOLVED, SERIALIZING_TRANSIENT }, { false, SERIALIZING_RESOLVED, SERIALIZING_GHOST },
+ { false, SERIALIZING_RESOLVED, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED, SERIALIZING_RESOLVED }, { false, SERIALIZING_RESOLVED, VALUE },
+
+ { true, SERIALIZING_GHOST, GHOST }, { false, SERIALIZING_GHOST, NEW }, { false, SERIALIZING_GHOST, PART_RESOLVED }, { false, SERIALIZING_GHOST, RESOLVED }, { false, SERIALIZING_GHOST, RESOLVING }, { false, SERIALIZING_GHOST, RESOLVING_PART }, { false, SERIALIZING_GHOST, TRANSIENT },
+ { false, SERIALIZING_GHOST, DESTROYED }, { false, SERIALIZING_GHOST, UPDATING }, { false, SERIALIZING_GHOST, SERIALIZING_TRANSIENT }, { false, SERIALIZING_GHOST, SERIALIZING_GHOST }, { false, SERIALIZING_GHOST, SERIALIZING_PART_RESOLVED },
+ { false, SERIALIZING_GHOST, SERIALIZING_RESOLVED }, { false, SERIALIZING_GHOST, VALUE },
+
+ { false, VALUE, GHOST }, { false, VALUE, NEW }, { false, VALUE, PART_RESOLVED }, { false, VALUE, RESOLVED }, { false, VALUE, RESOLVING }, { false, VALUE, RESOLVING_PART }, { false, VALUE, TRANSIENT }, { false, VALUE, DESTROYED }, { false, VALUE, UPDATING },
+ { false, VALUE, SERIALIZING_TRANSIENT }, { false, VALUE, SERIALIZING_GHOST }, { false, VALUE, SERIALIZING_PART_RESOLVED }, { false, VALUE, SERIALIZING_RESOLVED }, { false, VALUE, VALUE },
+
+ { false, DESTROYED, GHOST }, { false, DESTROYED, NEW }, { false, DESTROYED, PART_RESOLVED }, { false, DESTROYED, RESOLVED }, { false, DESTROYED, RESOLVING }, { false, DESTROYED, RESOLVING_PART }, { false, DESTROYED, TRANSIENT }, { false, DESTROYED, DESTROYED },
+ { false, DESTROYED, UPDATING }, { false, DESTROYED, SERIALIZING_TRANSIENT }, { false, DESTROYED, SERIALIZING_GHOST }, { false, DESTROYED, SERIALIZING_PART_RESOLVED }, { false, DESTROYED, SERIALIZING_RESOLVED }, { false, DESTROYED, VALUE },
});
}
@@ -163,8 +104,7 @@ public class ResolveState_IsValidToChang
private final ResolveState from;
private final ResolveState to;
- public ResolveState_IsValidToChangeToTest(final boolean whetherValidToChangeTo, final ResolveState from,
- final ResolveState to) {
+ public ResolveState_IsValidToChangeToTest(final boolean whetherValidToChangeTo, final ResolveState from, final ResolveState to) {
this.whetherValidToChangeTo = whetherValidToChangeTo;
this.from = from;
this.to = to;
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_RespondToChangesInPersistentObjectsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_RespondToChangesInPersistentObjectsTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_RespondToChangesInPersistentObjectsTest.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_RespondToChangesInPersistentObjectsTest.java Sun Jan 22 06:58:43 2012
@@ -49,10 +49,8 @@ public class ResolveState_RespondToChang
@Parameters
public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { { true, GHOST }, { false, NEW }, { true, PART_RESOLVED },
- { true, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT },
- { true, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT }, { false, SERIALIZING_GHOST },
- { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { true, VALUE }, });
+ return Arrays.asList(new Object[][] { { true, GHOST }, { false, NEW }, { true, PART_RESOLVED }, { true, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT }, { true, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT },
+ { false, SERIALIZING_GHOST }, { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { true, VALUE }, });
}
private final boolean whetherIs;
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_SerializeFromTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_SerializeFromTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_SerializeFromTest.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_SerializeFromTest.java Sun Jan 22 06:58:43 2012
@@ -49,11 +49,8 @@ public class ResolveState_SerializeFromT
@Parameters
public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { { GHOST, SERIALIZING_GHOST }, { NEW, null },
- { PART_RESOLVED, SERIALIZING_PART_RESOLVED }, { RESOLVED, SERIALIZING_RESOLVED }, { RESOLVING, null },
- { RESOLVING_PART, null }, { TRANSIENT, SERIALIZING_TRANSIENT }, { DESTROYED, null }, { UPDATING, null },
- { SERIALIZING_TRANSIENT, null }, { SERIALIZING_GHOST, null }, { SERIALIZING_PART_RESOLVED, null },
- { SERIALIZING_RESOLVED, null }, { VALUE, null }, });
+ return Arrays.asList(new Object[][] { { GHOST, SERIALIZING_GHOST }, { NEW, null }, { PART_RESOLVED, SERIALIZING_PART_RESOLVED }, { RESOLVED, SERIALIZING_RESOLVED }, { RESOLVING, null }, { RESOLVING_PART, null }, { TRANSIENT, SERIALIZING_TRANSIENT }, { DESTROYED, null }, { UPDATING, null },
+ { SERIALIZING_TRANSIENT, null }, { SERIALIZING_GHOST, null }, { SERIALIZING_PART_RESOLVED, null }, { SERIALIZING_RESOLVED, null }, { VALUE, null }, });
}
private final ResolveState state;
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FeatureTypeTest_identifierFor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FeatureTypeTest_identifierFor.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FeatureTypeTest_identifierFor.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FeatureTypeTest_identifierFor.java Sun Jan 22 06:58:43 2012
@@ -17,8 +17,8 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.facetapi;
-
+package org.apache.isis.core.metamodel.facetapi;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -27,38 +27,58 @@ import java.math.BigDecimal;
import org.apache.isis.applib.Identifier;
import org.junit.Test;
-
-public class FeatureTypeTest_identifierFor {
-
- public static class SomeDomainClass {
- private BigDecimal aBigDecimal;
- public BigDecimal getABigDecimal() {
- return aBigDecimal;
- }
- public void setABigDecimal(BigDecimal aBigDecimal) {
- this.aBigDecimal = aBigDecimal;
- }
- private BigDecimal anotherBigDecimal;
- public BigDecimal getAnotherBigDecimal() {
- return anotherBigDecimal;
- }
- public void setAnotherBigDecimal(BigDecimal anotherBigDecimal) {
- this.anotherBigDecimal = anotherBigDecimal;
- }
- }
-
- @Test
- public void property_whenMethodNameIs_XYyyZzz() throws Exception {
- Method method = SomeDomainClass.class.getMethod("getABigDecimal");
- final Identifier identifierFor = FeatureType.PROPERTY.identifierFor(SomeDomainClass.class, method);
- assertThat(identifierFor.getMemberName(), is("ABigDecimal")); // very odd compared to anotherBigDecimal, but arises from Introspector class, so presumably part of the javabeans spec.
- }
-
- @Test
- public void property_whenMethodNameIs_XxxxYyyZzz() throws Exception {
- Method method = SomeDomainClass.class.getMethod("getAnotherBigDecimal");
- final Identifier identifierFor = FeatureType.PROPERTY.identifierFor(SomeDomainClass.class, method);
- assertThat(identifierFor.getMemberName(), is("anotherBigDecimal"));
- }
-
-}
+
+public class FeatureTypeTest_identifierFor {
+
+ public static class SomeDomainClass {
+ private BigDecimal aBigDecimal;
+
+ public BigDecimal getABigDecimal() {
+ return aBigDecimal;
+ }
+
+ public void setABigDecimal(final BigDecimal aBigDecimal) {
+ this.aBigDecimal = aBigDecimal;
+ }
+
+ private BigDecimal anotherBigDecimal;
+
+ public BigDecimal getAnotherBigDecimal() {
+ return anotherBigDecimal;
+ }
+
+ public void setAnotherBigDecimal(final BigDecimal anotherBigDecimal) {
+ this.anotherBigDecimal = anotherBigDecimal;
+ }
+ }
+
+ @Test
+ public void property_whenMethodNameIs_XYyyZzz() throws Exception {
+ final Method method = SomeDomainClass.class.getMethod("getABigDecimal");
+ final Identifier identifierFor = FeatureType.PROPERTY.identifierFor(SomeDomainClass.class, method);
+ assertThat(identifierFor.getMemberName(), is("ABigDecimal")); // very
+ // odd
+ // compared
+ // to
+ // anotherBigDecimal,
+ // but
+ // arises
+ // from
+ // Introspector
+ // class,
+ // so
+ // presumably
+ // part of
+ // the
+ // javabeans
+ // spec.
+ }
+
+ @Test
+ public void property_whenMethodNameIs_XxxxYyyZzz() throws Exception {
+ final Method method = SomeDomainClass.class.getMethod("getAnotherBigDecimal");
+ final Identifier identifierFor = FeatureType.PROPERTY.identifierFor(SomeDomainClass.class, method);
+ assertThat(identifierFor.getMemberName(), is("anotherBigDecimal"));
+ }
+
+}
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java Sun Jan 22 06:58:43 2012
@@ -57,8 +57,7 @@ public class ObjectAssociationFiltersTes
mockery.checking(new Expectations() {
{
never(mockAssociation).containsFacet(HiddenFacet.class);
- allowing(mockAssociation).isVisible(with(any(AuthenticationSession.class)),
- with(any(ObjectAdapter.class)));
+ allowing(mockAssociation).isVisible(with(any(AuthenticationSession.class)), with(any(ObjectAdapter.class)));
}
});
final Filter<ObjectAssociation> filter = ObjectAssociationFilters.dynamicallyVisible(mockSession, mockTarget);
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java Sun Jan 22 06:58:43 2012
@@ -45,19 +45,19 @@ import com.google.common.collect.Lists;
public class ObjectActionParameterAbstractTest_getId_and_getName {
private final static class ObjectActionParameterAbstractToTest extends ObjectActionParameterAbstract {
- private ObjectActionParameterAbstractToTest(int number, ObjectActionImpl objectAction, TypedHolder peer) {
+ private ObjectActionParameterAbstractToTest(final int number, final ObjectActionImpl objectAction, final TypedHolder peer) {
super(number, objectAction, peer);
}
private ObjectSpecification objectSpec;
@Override
- public ObjectAdapter get(ObjectAdapter owner) {
+ public ObjectAdapter get(final ObjectAdapter owner) {
return null;
}
@Override
- public Instance getInstance(ObjectAdapter adapter) {
+ public Instance getInstance(final ObjectAdapter adapter) {
return null;
}
@@ -67,7 +67,7 @@ public class ObjectActionParameterAbstra
}
@Override
- public String isValid(ObjectAdapter adapter, Object proposedValue) {
+ public String isValid(final ObjectAdapter adapter, final Object proposedValue) {
return null;
}
@@ -76,7 +76,7 @@ public class ObjectActionParameterAbstra
return objectSpec;
}
- public void setSpecification(ObjectSpecification objectSpec) {
+ public void setSpecification(final ObjectSpecification objectSpec) {
this.objectSpec = objectSpec;
}
}
@@ -197,8 +197,7 @@ public class ObjectActionParameterAbstra
will(returnValue(null));
one(parentAction).getParameters((Filter<ObjectActionParameter>) with(anything()));
- will(returnValue(Lists.newArrayList(stubObjectActionParameterString, objectActionParameter,
- stubObjectActionParameterString2)));
+ will(returnValue(Lists.newArrayList(stubObjectActionParameterString, objectActionParameter, stubObjectActionParameterString2)));
}
});
@@ -217,13 +216,11 @@ public class ObjectActionParameterAbstra
will(returnValue(null));
one(parentAction).getParameters((Filter<ObjectActionParameter>) with(anything()));
- will(returnValue(Lists.newArrayList(stubObjectActionParameterString, objectActionParameter,
- stubObjectActionParameterString2)));
+ will(returnValue(Lists.newArrayList(stubObjectActionParameterString, objectActionParameter, stubObjectActionParameterString2)));
}
});
assertThat(objectActionParameter.getName(), is("string 2"));
}
-
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java Sun Jan 22 06:58:43 2012
@@ -69,62 +69,58 @@ public class ObjectAssociationAbstractTe
@Before
public void setup() {
facetedMethod = FacetedMethod.createProperty(Customer.class, "firstName");
- objectAssociation =
- new ObjectAssociationAbstract(facetedMethod, FeatureType.PROPERTY, new TestProxySpecification("test"),
- new ObjectMemberContext(null, null, null, null, null)) {
-
- @Override
- public ObjectAdapter get(final ObjectAdapter fromObject) {
- return null;
- }
-
- @Override
- public boolean isEmpty(final ObjectAdapter adapter) {
- return false;
- }
-
- @Override
- public ObjectAdapter[] getChoices(final ObjectAdapter object) {
- return null;
- }
-
- @Override
- public ObjectAdapter getDefault(final ObjectAdapter adapter) {
- return null;
- }
-
- @Override
- public void toDefault(final ObjectAdapter target) {
- }
-
- @Override
- public UsabilityContext<?> createUsableInteractionContext(final AuthenticationSession session,
- final InteractionInvocationMethod invocationMethod, final ObjectAdapter target) {
- return null;
- }
-
- @Override
- public VisibilityContext<?> createVisibleInteractionContext(final AuthenticationSession session,
- final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter) {
- return null;
- }
-
- @Override
- public String debugData() {
- return null;
- }
-
- @Override
- public Instance getInstance(final ObjectAdapter adapter) {
- return null;
- }
-
- @Override
- public boolean containsDoOpFacet(final Class<? extends Facet> facetType) {
- // TODO Auto-generated method stub
- return false;
- }
- };
+ objectAssociation = new ObjectAssociationAbstract(facetedMethod, FeatureType.PROPERTY, new TestProxySpecification("test"), new ObjectMemberContext(null, null, null, null, null)) {
+
+ @Override
+ public ObjectAdapter get(final ObjectAdapter fromObject) {
+ return null;
+ }
+
+ @Override
+ public boolean isEmpty(final ObjectAdapter adapter) {
+ return false;
+ }
+
+ @Override
+ public ObjectAdapter[] getChoices(final ObjectAdapter object) {
+ return null;
+ }
+
+ @Override
+ public ObjectAdapter getDefault(final ObjectAdapter adapter) {
+ return null;
+ }
+
+ @Override
+ public void toDefault(final ObjectAdapter target) {
+ }
+
+ @Override
+ public UsabilityContext<?> createUsableInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target) {
+ return null;
+ }
+
+ @Override
+ public VisibilityContext<?> createVisibleInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter) {
+ return null;
+ }
+
+ @Override
+ public String debugData() {
+ return null;
+ }
+
+ @Override
+ public Instance getInstance(final ObjectAdapter adapter) {
+ return null;
+ }
+
+ @Override
+ public boolean containsDoOpFacet(final Class<? extends Facet> facetType) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+ };
}
@Test
Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java Sun Jan 22 06:58:43 2012
@@ -194,8 +194,7 @@ public class TestProxySpecification exte
}
@Override
- public ObjectAction getObjectAction(final ActionType type, final String name,
- final List<ObjectSpecification> parameters) {
+ public ObjectAction getObjectAction(final ActionType type, final String name, final List<ObjectSpecification> parameters) {
if (action != null && action.getId().equals(name)) {
return action;
}
@@ -209,15 +208,15 @@ public class TestProxySpecification exte
}
@Override
- public List<ObjectAction> getObjectActions(final ActionType type, Contributed contributed) {
+ public List<ObjectAction> getObjectActions(final ActionType type, final Contributed contributed) {
return null;
}
@Override
public ObjectAction getObjectAction(final String nameParmsIdentityString) {
- for(ActionType type: ActionType.values()) {
- ObjectAction action = getObjectAction(type, nameParmsIdentityString);
- if(action != null) {
+ for (final ActionType type : ActionType.values()) {
+ final ObjectAction action = getObjectAction(type, nameParmsIdentityString);
+ if (action != null) {
return action;
}
}
@@ -418,14 +417,12 @@ public class TestProxySpecification exte
}
@Override
- public ObjectValidityContext createValidityInteractionContext(final AuthenticationSession session,
- final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter) {
+ public ObjectValidityContext createValidityInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter) {
return null;
}
@Override
- public ObjectTitleContext createTitleInteractionContext(final AuthenticationSession session,
- final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter) {
+ public ObjectTitleContext createTitleInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter) {
return null;
}
@@ -469,13 +466,13 @@ public class TestProxySpecification exte
}
@Override
- public List<ObjectAction> getObjectActions(Contributed contributed) {
+ public List<ObjectAction> getObjectActions(final Contributed contributed) {
return null;
}
- @Override
- public List<ObjectAction> getObjectActions(List<ActionType> types, Contributed contributed) {
- return null;
- }
+ @Override
+ public List<ObjectAction> getObjectActions(final List<ActionType> types, final Contributed contributed) {
+ return null;
+ }
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/HelpFacetDecoratorUsingHelpManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/HelpFacetDecoratorUsingHelpManager.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/HelpFacetDecoratorUsingHelpManager.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/HelpFacetDecoratorUsingHelpManager.java Sun Jan 22 06:58:43 2012
@@ -52,8 +52,7 @@ public class HelpFacetDecoratorUsingHelp
final String helpText = helpManager.getHelpText(identifier);
if (helpText != null) {
- final HelpFacetLookedUpViaHelpManager decoratingFacet =
- new HelpFacetLookedUpViaHelpManager(helpText, facet.getFacetHolder());
+ final HelpFacetLookedUpViaHelpManager decoratingFacet = new HelpFacetLookedUpViaHelpManager(helpText, facet.getFacetHolder());
identifiedHolder.addFacet(decoratingFacet);
return decoratingFacet;
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/HelpManagerUsingFiles.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/HelpManagerUsingFiles.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/HelpManagerUsingFiles.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/HelpManagerUsingFiles.java Sun Jan 22 06:58:43 2012
@@ -35,7 +35,8 @@ public class HelpManagerUsingFiles exten
private static final Logger LOG = Logger.getLogger(HelpManagerUsingFiles.class);
/**
- * The name of the file used unless overridden with {@link #setFileName(String)}.
+ * The name of the file used unless overridden with
+ * {@link #setFileName(String)}.
*/
public static final String DEFAULT_FILE_NAME = "help.txt";
private static final String CLASS_PREFIX = "c:";
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/I18nFacetDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/I18nFacetDecorator.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/I18nFacetDecorator.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/I18nFacetDecorator.java Sun Jan 22 06:58:43 2012
@@ -77,8 +77,7 @@ public class I18nFacetDecorator extends
if (i18nDescription == null) {
return null;
}
- final DescribedAsFacetWrapI18n decoratingFacet =
- new DescribedAsFacetWrapI18n(i18nDescription, facet.getFacetHolder());
+ final DescribedAsFacetWrapI18n decoratingFacet = new DescribedAsFacetWrapI18n(i18nDescription, facet.getFacetHolder());
identifiedHolder.addFacet(decoratingFacet);
return decoratingFacet;
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/I18nManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/I18nManager.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/I18nManager.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/I18nManager.java Sun Jan 22 06:58:43 2012
@@ -41,7 +41,8 @@ public interface I18nManager extends App
String getName(Identifier identifier);
/**
- * Get the localized description for the specified identified action/property.
+ * Get the localized description for the specified identified
+ * action/property.
*
* <p>
* Returns null if no description available.
@@ -57,12 +58,14 @@ public interface I18nManager extends App
String getHelp(Identifier identifier);
/**
- * Get the localized parameter names for the specified identified action/property.
+ * Get the localized parameter names for the specified identified
+ * action/property.
*
* <p>
- * Returns null if no parameters are available. Otherwise returns an array of String objects the size of the number
- * of parameters, where each element is the localised name for the corresponding parameter, or is null if no
- * parameter name is available.
+ * Returns null if no parameters are available. Otherwise returns an array
+ * of String objects the size of the number of parameters, where each
+ * element is the localised name for the corresponding parameter, or is null
+ * if no parameter name is available.
*/
List<String> getParameterNames(Identifier identifier);
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/internal/I18nManagerUsingResourceBundle.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/internal/I18nManagerUsingResourceBundle.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/internal/I18nManagerUsingResourceBundle.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/internal/I18nManagerUsingResourceBundle.java Sun Jan 22 06:58:43 2012
@@ -153,8 +153,7 @@ public class I18nManagerUsingResourceBun
}
private static String buildParameterTypeKey(final Identifier identifier, final String textType, final int paramNum) {
- return identifier.getClassName() + "." + MEMBER_TYPE_ACTION + "." + identifier.getMemberName() + "."
- + MEMBER_TYPE_PARAMETER + (paramNum + 1) + "." + textType;
+ return identifier.getClassName() + "." + MEMBER_TYPE_ACTION + "." + identifier.getMemberName() + "." + MEMBER_TYPE_PARAMETER + (paramNum + 1) + "." + textType;
}
// //////////////////////////////////////////////////////////////
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/CollectionUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/CollectionUtils.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/CollectionUtils.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/CollectionUtils.java Sun Jan 22 06:58:43 2012
@@ -29,8 +29,7 @@ public final class CollectionUtils {
private CollectionUtils() {
}
- public static Object[] getCollectionAsObjectArray(final Object option, final ObjectSpecification spec,
- final AdapterMap adapterMap) {
+ public static Object[] getCollectionAsObjectArray(final Object option, final ObjectSpecification spec, final AdapterMap adapterMap) {
final ObjectAdapter collection = adapterMap.adapterFor(option);
final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection);
final Object[] optionArray = new Object[facet.size(collection)];