isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1189531 [2/2] - in /incubator/isis/trunk/framework: core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/util/ core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/ tck/tck-dom/src/main/java/org/apache/isis/t...
Date Wed, 26 Oct 2011 23:12:47 GMT
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAdapterLinkTo.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAdapterLinkTo.java?rev=1189531&r1=1189530&r2=1189531&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAdapterLinkTo.java
(original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAdapterLinkTo.java
Wed Oct 26 23:12:46 2011
@@ -20,6 +20,7 @@ package org.apache.isis.viewer.json.view
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.viewer.json.applib.RepresentationType;
 import org.apache.isis.viewer.json.viewer.ResourceContext;
 import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
 import org.apache.isis.viewer.json.viewer.representations.Rel;
@@ -30,11 +31,11 @@ public interface ObjectAdapterLinkTo {
     
     ObjectAdapterLinkTo with(ObjectAdapter objectAdapter);
 
-    ObjectAdapterLinkTo with(Rel rel);
-
     LinkBuilder builder();
+    LinkBuilder builder(Rel rel);
 
-    LinkBuilder linkToMember(Rel rel, MemberType memberType, ObjectMember objectMember, String...
parts);
-
+    LinkBuilder memberBuilder(Rel rel, MemberType memberType, ObjectMember objectMember,
String... parts);
+    LinkBuilder memberBuilder(Rel rel, MemberType memberType, ObjectMember objectMember,
RepresentationType representationType, String... parts);
+
 
 }

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java?rev=1189531&r1=1189530&r2=1189531&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java
(original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java
Wed Oct 26 23:12:46 2011
@@ -34,6 +34,7 @@ import org.apache.isis.viewer.json.viewe
 import org.apache.isis.viewer.json.viewer.resources.domainobjects.AbstractObjectMemberReprRenderer.Mode;
 import org.apache.isis.viewer.json.viewer.resources.domaintypes.DomainTypeReprRenderer;
 import org.apache.isis.viewer.json.viewer.resources.domaintypes.TypePropertyReprRenderer;
+import org.codehaus.jackson.node.NullNode;
 
 import com.google.common.collect.Lists;
 
@@ -83,7 +84,7 @@ public class ObjectPropertyReprRenderer 
     private Object valueRep() {
         ObjectAdapter valueAdapter = objectMember.get(objectAdapter);
         if(valueAdapter == null) {
-            return null;
+            return NullNode.getInstance();
         }
         return DomainObjectReprRenderer.valueOrRef(resourceContext, valueAdapter, objectMember.getSpecification());
     }

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/JsonValueEncoderTest_asAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/JsonValueEncoderTest_asAdapter.java?rev=1189531&r1=1189530&r2=1189531&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/JsonValueEncoderTest_asAdapter.java
(original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/JsonValueEncoderTest_asAdapter.java
Wed Oct 26 23:12:46 2011
@@ -171,6 +171,8 @@ public class JsonValueEncoderTest_asAdap
         // given
         allowingObjectSpecHas(EncodableFacet.class, encodableFacet);
         allowingObjectSpecCorrespondingClassIs(int.class);
+        
+        representation = JsonRepresentation.newMap("foo", "bar");
         
         // when
         jsonValueEncoder.asAdapter(objectSpec, representation);
@@ -251,7 +253,9 @@ public class JsonValueEncoderTest_asAdap
         // given
         allowingObjectSpecHas(EncodableFacet.class, encodableFacet);
         allowingObjectSpecCorrespondingClassIs(double.class);
-        
+
+        representation = JsonRepresentation.newMap("foo", "bar");
+
         // when
         jsonValueEncoder.asAdapter(objectSpec, representation);
     }
@@ -283,6 +287,8 @@ public class JsonValueEncoderTest_asAdap
         allowingObjectSpecHas(EncodableFacet.class, encodableFacet);
         allowingObjectSpecCorrespondingClassIs(BigInteger.class);
         
+        representation = JsonRepresentation.newMap("foo", "bar");
+
         // when
         jsonValueEncoder.asAdapter(objectSpec, representation);
     }
@@ -313,7 +319,9 @@ public class JsonValueEncoderTest_asAdap
         // given
         allowingObjectSpecHas(EncodableFacet.class, encodableFacet);
         allowingObjectSpecCorrespondingClassIs(BigDecimal.class);
-        
+
+        representation = JsonRepresentation.newMap("foo", "bar");
+
         // when
         jsonValueEncoder.asAdapter(objectSpec, representation);
     }

Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/src/main/webapp/WEB-INF/isis.properties?rev=1189531&r1=1189530&r2=1189531&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/src/main/webapp/WEB-INF/isis.properties
(original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/src/main/webapp/WEB-INF/isis.properties
Wed Oct 26 23:12:46 2011
@@ -14,13 +14,15 @@
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
+isis.services.prefix = org.apache.isis.tck.objstore.dflt
 isis.services =\
     scalars.ApplibValuedEntityRepositoryDefault,\
     scalars.JdkValuedEntityRepositoryDefault,\
     scalars.PrimitiveValuedEntityRepositoryDefault,\
     scalars.WrapperValuedEntityRepositoryDefault, \
     simples.SimpleEntityRepositoryDefault,\
-    stables.StableEntityRepositoryDefault
+    stables.StableEntityRepositoryDefault,\
+    assocs.ParentEntityRepositoryDefault
 
 isis.fixtures.prefix= org.apache.isis.tck.fixture
 isis.fixtures=\
@@ -30,7 +32,8 @@ isis.fixtures=\
     scalars.PrimitiveValuedEntityFixture,\
     scalars.WrapperValuedEntityFixture,\
     simples.SimpleEntityFixture,\
-    stables.StableEntityFixture
+    stables.StableEntityFixture,\
+    assocs.ParentAndChildEntityFixture
 
 isis.exploration.users=sven, dick, bob
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-tck/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-tck/src/main/webapp/WEB-INF/isis.properties?rev=1189531&r1=1189530&r2=1189531&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-tck/src/main/webapp/WEB-INF/isis.properties
(original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-tck/src/main/webapp/WEB-INF/isis.properties
Wed Oct 26 23:12:46 2011
@@ -21,7 +21,8 @@ isis.services =\
     scalars.PrimitiveValuedEntityRepositoryDefault,\
     scalars.WrapperValuedEntityRepositoryDefault, \
     simples.SimpleEntityRepositoryDefault,\
-    stables.StableEntityRepositoryDefault
+    stables.StableEntityRepositoryDefault,\
+    assocs.ParentEntityRepositoryDefault
 
 isis.fixtures.prefix= org.apache.isis.tck.fixture
 isis.fixtures=\
@@ -31,7 +32,8 @@ isis.fixtures=\
     scalars.PrimitiveValuedEntityFixture,\
     scalars.WrapperValuedEntityFixture,\
     simples.SimpleEntityFixture,\
-    stables.StableEntityFixture
+    stables.StableEntityFixture,\
+    assocs.ParentAndChildEntityFixture
 
 
 isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor

Modified: incubator/isis/trunk/framework/viewer/xhtml/xhtml-tck/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/xhtml/xhtml-tck/src/main/webapp/WEB-INF/isis.properties?rev=1189531&r1=1189530&r2=1189531&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/xhtml/xhtml-tck/src/main/webapp/WEB-INF/isis.properties
(original)
+++ incubator/isis/trunk/framework/viewer/xhtml/xhtml-tck/src/main/webapp/WEB-INF/isis.properties
Wed Oct 26 23:12:46 2011
@@ -21,7 +21,8 @@ isis.services =\
     scalars.PrimitiveValuedEntityRepositoryDefault,\
     scalars.WrapperValuedEntityRepositoryDefault, \
     simples.SimpleEntityRepositoryDefault,\
-    stables.StableEntityRepositoryDefault
+    stables.StableEntityRepositoryDefault,\
+    assocs.ParentEntityRepositoryDefault
 
 isis.fixtures.prefix= org.apache.isis.tck.fixture
 isis.fixtures=\
@@ -31,7 +32,8 @@ isis.fixtures=\
     scalars.PrimitiveValuedEntityFixture,\
     scalars.WrapperValuedEntityFixture,\
     simples.SimpleEntityFixture,\
-    stables.StableEntityFixture
+    stables.StableEntityFixture,\
+    assocs.ParentAndChildEntityFixture
 
 
 isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor



Mime
View raw message