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 2013/02/08 14:16:19 UTC
[1/24] ISIS-323: starting to factor our json rendering...
http://git-wip-us.apache.org/repos/asf/isis/blob/c7d129a7/component/viewer/restfulobjects/impl/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/version/VersionReprRenderer.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/impl/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/version/VersionReprRenderer.java b/component/viewer/restfulobjects/impl/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/version/VersionReprRenderer.java
index 2b9faf1..136ddf0 100644
--- a/component/viewer/restfulobjects/impl/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/version/VersionReprRenderer.java
+++ b/component/viewer/restfulobjects/impl/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/version/VersionReprRenderer.java
@@ -24,6 +24,7 @@ import com.google.common.io.Resources;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
+import org.apache.isis.viewer.restfulobjects.viewer.RendererContext;
import org.apache.isis.viewer.restfulobjects.viewer.RestfulObjectsApplication;
import org.apache.isis.viewer.restfulobjects.viewer.ResourceContext;
import org.apache.isis.viewer.restfulobjects.viewer.representations.LinkFollower;
@@ -41,12 +42,12 @@ public class VersionReprRenderer extends ReprRendererAbstract<VersionReprRendere
}
@Override
- public ReprRenderer<?, ?> newRenderer(final ResourceContext resourceContext, final LinkFollower linkFollower, final JsonRepresentation representation) {
+ public ReprRenderer<?, ?> newRenderer(final RendererContext resourceContext, final LinkFollower linkFollower, final JsonRepresentation representation) {
return new VersionReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
}
}
- private VersionReprRenderer(final ResourceContext resourceContext, final LinkFollower linkFollower, final RepresentationType representationType, final JsonRepresentation representation) {
+ private VersionReprRenderer(final RendererContext resourceContext, final LinkFollower linkFollower, final RepresentationType representationType, final JsonRepresentation representation) {
super(resourceContext, linkFollower, representationType, representation);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/c7d129a7/component/viewer/restfulobjects/impl/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/util/OidUtils.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/impl/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/util/OidUtils.java b/component/viewer/restfulobjects/impl/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/util/OidUtils.java
index 081d5b3..b160490 100644
--- a/component/viewer/restfulobjects/impl/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/util/OidUtils.java
+++ b/component/viewer/restfulobjects/impl/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/util/OidUtils.java
@@ -23,20 +23,20 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
-import org.apache.isis.viewer.restfulobjects.viewer.ResourceContext;
+import org.apache.isis.viewer.restfulobjects.viewer.RendererContext;
public final class OidUtils {
private OidUtils() {
}
- public static ObjectAdapter getObjectAdapter(final ResourceContext resourceContext, final String oidEncodedStr) {
+ public static ObjectAdapter getObjectAdapter(final RendererContext resourceContext, final String oidEncodedStr) {
final String oidStr = UrlDecoderUtils.urlDecode(oidEncodedStr);
final RootOid rootOid = RootOidDefault.deStringEncoded(oidStr, getOidMarshaller());
return resourceContext.getAdapterManager().adapterFor(rootOid);
}
- public static String getOidStr(final ResourceContext resourceContext, final ObjectAdapter objectAdapter) {
+ public static String getOidStr(final RendererContext resourceContext, final ObjectAdapter objectAdapter) {
final Oid oid = objectAdapter.getOid();
if(!(oid instanceof RootOid)) {
throw new IllegalArgumentException("objectAdapter must be a root adapter");