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 2011/09/30 09:00:13 UTC
svn commit: r1177533 - in
/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer:
representations/ resources/domainobjects/ resources/user/
Author: danhaywood
Date: Fri Sep 30 07:00:12 2011
New Revision: 1177533
URL: http://svn.apache.org/viewvc?rev=1177533&view=rev
Log:
ISIS-109: fixing compile bug in json viewer (see http://stackoverflow.com/questions/5666027/why-does-the-compiler-state-no-unique-maximal-instance-exists)
Modified:
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/TypedReprBuilderFactory.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/TypedReprBuilderFactoryAbstract.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectResourceServerside.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainServiceResourceServerside.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/user/UserResourceServerside.java
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/TypedReprBuilderFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/TypedReprBuilderFactory.java?rev=1177533&r1=1177532&r2=1177533&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/TypedReprBuilderFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/TypedReprBuilderFactory.java Fri Sep 30 07:00:12 2011
@@ -9,6 +9,4 @@ public interface TypedReprBuilderFactory
TypedReprBuilder<?, ?> newBuilder(ResourceContext resourceContext);
- <R extends TypedReprBuilder<R, T>, T> R newBuilder(ResourceContext resourceContext, Class<T> cls);
-
}
\ No newline at end of file
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/TypedReprBuilderFactoryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/TypedReprBuilderFactoryAbstract.java?rev=1177533&r1=1177532&r2=1177533&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/TypedReprBuilderFactoryAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/TypedReprBuilderFactoryAbstract.java Fri Sep 30 07:00:12 2011
@@ -16,10 +16,6 @@ public abstract class TypedReprBuilderFa
return representationType;
}
- @SuppressWarnings("unchecked")
- public final <R extends TypedReprBuilder<R, T>, T> R newBuilder(ResourceContext resourceContext, Class<T> cls) {
- return (R) newBuilder(resourceContext);
- }
}
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectResourceServerside.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/DomainObjectResourceServerside.java?rev=1177533&r1=1177532&r2=1177533&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectResourceServerside.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectResourceServerside.java Fri Sep 30 07:00:12 2011
@@ -75,7 +75,7 @@ public class DomainObjectResourceServers
builderFactoryRegistry.find(RepresentationType.DOMAIN_OBJECT);
final DomainObjectReprBuilder repBuilder =
- reprBuilderBuilder.newBuilder(getResourceContext(), ObjectAdapter.class);
+ (DomainObjectReprBuilder) reprBuilderBuilder.newBuilder(getResourceContext());
repBuilder.with(objectAdapter);
ResponseBuilder respBuilder =
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainServiceResourceServerside.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/DomainServiceResourceServerside.java?rev=1177533&r1=1177532&r2=1177533&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainServiceResourceServerside.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainServiceResourceServerside.java Fri Sep 30 07:00:12 2011
@@ -74,7 +74,7 @@ public class DomainServiceResourceServer
final TypedReprBuilderFactory factory = builderFactoryRegistry.find(RepresentationType.DOMAIN_OBJECT);
final DomainObjectReprBuilder reprBuilder =
- factory.newBuilder(getResourceContext(), ObjectAdapter.class);
+ (DomainObjectReprBuilder) factory.newBuilder(getResourceContext());
reprBuilder.usingLinkToBuilder(new DomainServiceLinkToBuilder())
.withSelf()
.with(serviceAdapter);
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/user/UserResourceServerside.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/user/UserResourceServerside.java?rev=1177533&r1=1177532&r2=1177533&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/user/UserResourceServerside.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/user/UserResourceServerside.java Fri Sep 30 07:00:12 2011
@@ -38,7 +38,7 @@ public class UserResourceServerside exte
final TypedReprBuilderFactory factory = builderFactoryRegistry.find(RepresentationType.USER);
final UserReprBuilder reprBuilder =
- factory.newBuilder(getResourceContext(), AuthenticationSession.class);
+ (UserReprBuilder) factory.newBuilder(getResourceContext());
reprBuilder.with(getAuthenticationSession());
return responseOfOk(RepresentationType.USER, Caching.ONE_HOUR, reprBuilder.build()).build();