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/05/03 09:44:50 UTC
svn commit: r1098948 [4/16] - in /incubator/isis/trunk/viewer:
restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/
restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/providers/
restful/applib/src/main/java/org/apache/isi...
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationModifyAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationModifyAbstract.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationModifyAbstract.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationModifyAbstract.java Tue May 3 07:44:41 2011
@@ -16,113 +16,105 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects;
-
-import java.text.MessageFormat;
-
-import nu.xom.Attribute;
-import nu.xom.Element;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public abstract class TableColumnNakedObjectAssociationModifyAbstract<T extends ObjectAssociation> extends
- TableColumnNakedObjectAssociation<T> {
-
- private final boolean inputField;
-
- public TableColumnNakedObjectAssociationModifyAbstract(
- final String columnName,
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- this(columnName, session, nakedObject, resourceContext, true);
- }
-
- /**
- * @param field
- * - whether to include an input field.
- */
- public TableColumnNakedObjectAssociationModifyAbstract(
- final String columnName,
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext,
- final boolean field) {
- super(columnName, session, nakedObject, resourceContext);
- this.inputField = field;
- }
-
- @Override
- public Element doTd(final T association) {
- if (!association.isVisible(getSession(), getNakedObject()).isAllowed()) {
- return xhtmlRenderer.p(null, getHtmlClassAttribute());
- }
- if (!association.isUsable(getSession(), getNakedObject()).isAllowed()) {
- return xhtmlRenderer.p(null, getHtmlClassAttribute());
- }
-
- final Element div = xhtmlRenderer.div(getHtmlClassAttribute());
-
- div.appendChild(form(association));
- return div;
- }
-
- private Element form(final T association) {
- final String associationId = association.getId();
- final String formName = getFormNamePrefix() + associationId;
- final Element form = xhtmlRenderer.form(formName, getHtmlClassAttribute());
- form.addAttribute(new Attribute("class", associationId));
-
- final String inputFieldName = "proposedValue";
- if (inputField) {
- final Element inputValue = new Element("input");
- inputValue.addAttribute(new Attribute("type", "value"));
- inputValue.addAttribute(new Attribute("name", inputFieldName));
- form.appendChild(inputValue);
- }
-
- final Element inputButton = new Element("input");
- inputButton.addAttribute(new Attribute("type", "button"));
- inputButton.addAttribute(new Attribute("value", getFormButtonLabel()));
- final String servletContextName = getContextPath();
- final String url = MessageFormat.format("{0}/object/{1}", servletContextName, getOidStr());
- inputButton.addAttribute(new Attribute("onclick", invokeJavascript(url, associationId, inputFieldName)));
-
- form.appendChild(inputButton);
- form.addAttribute(new Attribute("action", url));
-
- return form;
- }
-
- protected abstract String getFormButtonLabel();
-
- /**
- * Used to construct the <tt><form name="xxx"></tt> that holds the value used to make the
- * change.
- *
- * @return
- */
- protected abstract String getFormNamePrefix();
-
- /**
- * Used HTML Class attribute used variously throughout the rendered HTML form.
- *
- * @return
- */
- protected abstract String getHtmlClassAttribute();
-
- /**
- * Invoke the appropriate Javascript function from <tt>nof-rest-support.js</tt>.
- *
- * @param url
- * @param associationId
- * @param inputFieldName
- * @return
- */
- protected abstract String invokeJavascript(String url, String associationId, String inputFieldName);
-
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects;
+
+import java.text.MessageFormat;
+
+import nu.xom.Attribute;
+import nu.xom.Element;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public abstract class TableColumnNakedObjectAssociationModifyAbstract<T extends ObjectAssociation> extends
+ TableColumnNakedObjectAssociation<T> {
+
+ private final boolean inputField;
+
+ public TableColumnNakedObjectAssociationModifyAbstract(final String columnName,
+ final AuthenticationSession session, final ObjectAdapter nakedObject, final ResourceContext resourceContext) {
+ this(columnName, session, nakedObject, resourceContext, true);
+ }
+
+ /**
+ * @param field
+ * - whether to include an input field.
+ */
+ public TableColumnNakedObjectAssociationModifyAbstract(final String columnName,
+ final AuthenticationSession session, final ObjectAdapter nakedObject, final ResourceContext resourceContext,
+ final boolean field) {
+ super(columnName, session, nakedObject, resourceContext);
+ this.inputField = field;
+ }
+
+ @Override
+ public Element doTd(final T association) {
+ if (!association.isVisible(getSession(), getNakedObject()).isAllowed()) {
+ return xhtmlRenderer.p(null, getHtmlClassAttribute());
+ }
+ if (!association.isUsable(getSession(), getNakedObject()).isAllowed()) {
+ return xhtmlRenderer.p(null, getHtmlClassAttribute());
+ }
+
+ final Element div = xhtmlRenderer.div(getHtmlClassAttribute());
+
+ div.appendChild(form(association));
+ return div;
+ }
+
+ private Element form(final T association) {
+ final String associationId = association.getId();
+ final String formName = getFormNamePrefix() + associationId;
+ final Element form = xhtmlRenderer.form(formName, getHtmlClassAttribute());
+ form.addAttribute(new Attribute("class", associationId));
+
+ final String inputFieldName = "proposedValue";
+ if (inputField) {
+ final Element inputValue = new Element("input");
+ inputValue.addAttribute(new Attribute("type", "value"));
+ inputValue.addAttribute(new Attribute("name", inputFieldName));
+ form.appendChild(inputValue);
+ }
+
+ final Element inputButton = new Element("input");
+ inputButton.addAttribute(new Attribute("type", "button"));
+ inputButton.addAttribute(new Attribute("value", getFormButtonLabel()));
+ final String servletContextName = getContextPath();
+ final String url = MessageFormat.format("{0}/object/{1}", servletContextName, getOidStr());
+ inputButton.addAttribute(new Attribute("onclick", invokeJavascript(url, associationId, inputFieldName)));
+
+ form.appendChild(inputButton);
+ form.addAttribute(new Attribute("action", url));
+
+ return form;
+ }
+
+ protected abstract String getFormButtonLabel();
+
+ /**
+ * Used to construct the <tt><form name="xxx"></tt> that holds the value used to make the change.
+ *
+ * @return
+ */
+ protected abstract String getFormNamePrefix();
+
+ /**
+ * Used HTML Class attribute used variously throughout the rendered HTML form.
+ *
+ * @return
+ */
+ protected abstract String getHtmlClassAttribute();
+
+ /**
+ * Invoke the appropriate Javascript function from <tt>nof-rest-support.js</tt>.
+ *
+ * @param url
+ * @param associationId
+ * @param inputFieldName
+ * @return
+ */
+ protected abstract String invokeJavascript(String url, String associationId, String inputFieldName);
+
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationType.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationType.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationType.java Tue May 3 07:44:41 2011
@@ -16,33 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects;
-
-import java.text.MessageFormat;
-
-import nu.xom.Element;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public final class TableColumnNakedObjectAssociationType<T extends ObjectAssociation> extends
- TableColumnNakedObjectAssociation<T> {
-
- public TableColumnNakedObjectAssociationType(
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super("Type", session, nakedObject, resourceContext);
- }
-
- @Override
- public Element doTd(final T association) {
- final String assocTypeFullName = association.getSpecification().getFullIdentifier();
- final String uri = MessageFormat.format("{0}/specs/{1}", getContextPath(), assocTypeFullName);
- return xhtmlRenderer.aHref(uri, assocTypeFullName, "propertyTypeSpec", "property", HtmlClass.PROPERTY);
- }
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects;
+
+import java.text.MessageFormat;
+
+import nu.xom.Element;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public final class TableColumnNakedObjectAssociationType<T extends ObjectAssociation> extends
+ TableColumnNakedObjectAssociation<T> {
+
+ public TableColumnNakedObjectAssociationType(final AuthenticationSession session, final ObjectAdapter nakedObject,
+ final ResourceContext resourceContext) {
+ super("Type", session, nakedObject, resourceContext);
+ }
+
+ @Override
+ public Element doTd(final T association) {
+ final String assocTypeFullName = association.getSpecification().getFullIdentifier();
+ final String uri = MessageFormat.format("{0}/specs/{1}", getContextPath(), assocTypeFullName);
+ return xhtmlRenderer.aHref(uri, assocTypeFullName, "propertyTypeSpec", "property", HtmlClass.PROPERTY);
+ }
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMember.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMember.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMember.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMember.java Tue May 3 07:44:41 2011
@@ -16,41 +16,36 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects;
-
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-import org.apache.isis.viewer.restful.viewer.xom.TableColumnAbstract;
-
-
-public abstract class TableColumnNakedObjectMember<T extends ObjectMember> extends TableColumnAbstract<T> {
-
- private final ObjectAdapter nakedObject;
- private final AuthenticationSession session;
-
- protected TableColumnNakedObjectMember(
- final String headerText,
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super(headerText, resourceContext);
- this.nakedObject = nakedObject;
- this.session = session;
- }
-
- protected String getOidStr() {
- return getOidStr(getNakedObject());
- }
-
- public ObjectAdapter getNakedObject() {
- return nakedObject;
- }
-
- public AuthenticationSession getSession() {
- return session;
- }
-
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.restful.viewer.xom.TableColumnAbstract;
+
+public abstract class TableColumnNakedObjectMember<T extends ObjectMember> extends TableColumnAbstract<T> {
+
+ private final ObjectAdapter nakedObject;
+ private final AuthenticationSession session;
+
+ protected TableColumnNakedObjectMember(final String headerText, final AuthenticationSession session,
+ final ObjectAdapter nakedObject, final ResourceContext resourceContext) {
+ super(headerText, resourceContext);
+ this.nakedObject = nakedObject;
+ this.session = session;
+ }
+
+ protected String getOidStr() {
+ return getOidStr(getNakedObject());
+ }
+
+ public ObjectAdapter getNakedObject() {
+ return nakedObject;
+ }
+
+ public AuthenticationSession getSession() {
+ return session;
+ }
+
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabled.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabled.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabled.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabled.java Tue May 3 07:44:41 2011
@@ -16,29 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects;
-
-import nu.xom.Element;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public final class TableColumnNakedObjectMemberDisabled<T extends ObjectMember> extends TableColumnNakedObjectMember<T> {
-
- public TableColumnNakedObjectMemberDisabled(
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super("Disabled", session, nakedObject, resourceContext);
- }
-
- @Override
- public Element doTd(final T member) {
- final boolean disabled = !member.isUsable(getSession(), getNakedObject()).isAllowed();
- return xhtmlRenderer.p(disabled, HtmlClass.USABLE);
- }
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects;
+
+import nu.xom.Element;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public final class TableColumnNakedObjectMemberDisabled<T extends ObjectMember> extends TableColumnNakedObjectMember<T> {
+
+ public TableColumnNakedObjectMemberDisabled(final AuthenticationSession session, final ObjectAdapter nakedObject,
+ final ResourceContext resourceContext) {
+ super("Disabled", session, nakedObject, resourceContext);
+ }
+
+ @Override
+ public Element doTd(final T member) {
+ final boolean disabled = !member.isUsable(getSession(), getNakedObject()).isAllowed();
+ return xhtmlRenderer.p(disabled, HtmlClass.USABLE);
+ }
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabledReason.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabledReason.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabledReason.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabledReason.java Tue May 3 07:44:41 2011
@@ -16,35 +16,32 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects;
-
-import nu.xom.Element;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public final class TableColumnNakedObjectMemberDisabledReason<T extends ObjectMember> extends
- TableColumnNakedObjectMember<T> {
-
- public TableColumnNakedObjectMemberDisabledReason(
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super("Disabled Reason", session, nakedObject, resourceContext);
- }
-
- @Override
- public Element doTd(final T property) {
- final Consent usable = property.isUsable(getSession(), getNakedObject());
- if (usable.isAllowed()) {
- return xhtmlRenderer.p(null, null);
- }
-
- return xhtmlRenderer.p(usable.getReason(), HtmlClass.USABLE);
- }
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects;
+
+import nu.xom.Element;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public final class TableColumnNakedObjectMemberDisabledReason<T extends ObjectMember> extends
+ TableColumnNakedObjectMember<T> {
+
+ public TableColumnNakedObjectMemberDisabledReason(final AuthenticationSession session,
+ final ObjectAdapter nakedObject, final ResourceContext resourceContext) {
+ super("Disabled Reason", session, nakedObject, resourceContext);
+ }
+
+ @Override
+ public Element doTd(final T property) {
+ final Consent usable = property.isUsable(getSession(), getNakedObject());
+ if (usable.isAllowed()) {
+ return xhtmlRenderer.p(null, null);
+ }
+
+ return xhtmlRenderer.p(usable.getReason(), HtmlClass.USABLE);
+ }
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberHidden.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberHidden.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberHidden.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberHidden.java Tue May 3 07:44:41 2011
@@ -16,29 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects;
-
-import nu.xom.Element;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public final class TableColumnNakedObjectMemberHidden<T extends ObjectMember> extends TableColumnNakedObjectMember<T> {
-
- public TableColumnNakedObjectMemberHidden(
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super("Hidden", session, nakedObject, resourceContext);
- }
-
- @Override
- public Element doTd(final T member) {
- final boolean hidden = !member.isVisible(getSession(), getNakedObject()).isAllowed();
- return xhtmlRenderer.p(hidden, HtmlClass.VISIBLE);
- }
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects;
+
+import nu.xom.Element;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public final class TableColumnNakedObjectMemberHidden<T extends ObjectMember> extends TableColumnNakedObjectMember<T> {
+
+ public TableColumnNakedObjectMemberHidden(final AuthenticationSession session, final ObjectAdapter nakedObject,
+ final ResourceContext resourceContext) {
+ super("Hidden", session, nakedObject, resourceContext);
+ }
+
+ @Override
+ public Element doTd(final T member) {
+ final boolean hidden = !member.isVisible(getSession(), getNakedObject()).isAllowed();
+ return xhtmlRenderer.p(hidden, HtmlClass.VISIBLE);
+ }
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberInvalidReason.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberInvalidReason.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberInvalidReason.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberInvalidReason.java Tue May 3 07:44:41 2011
@@ -16,36 +16,33 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects;
-
-import nu.xom.Element;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public abstract class TableColumnNakedObjectMemberInvalidReason<T extends ObjectMember> extends
- TableColumnNakedObjectMember<T> {
-
- public TableColumnNakedObjectMemberInvalidReason(
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super("Invalid Reason", session, nakedObject, resourceContext);
- }
-
- /**
- * Creates a <p id="association-invalid-<i>associationId</i>"/> element so that Javascript
- * code can populate during validation.
- */
- @Override
- public Element doTd(final T member) {
- return builder().el("p").classAttr(HtmlClass.VALID).idAttr(getDomId(member)).build();
- }
-
- protected abstract String getDomId(T member);
-
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects;
+
+import nu.xom.Element;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public abstract class TableColumnNakedObjectMemberInvalidReason<T extends ObjectMember> extends
+ TableColumnNakedObjectMember<T> {
+
+ public TableColumnNakedObjectMemberInvalidReason(final AuthenticationSession session,
+ final ObjectAdapter nakedObject, final ResourceContext resourceContext) {
+ super("Invalid Reason", session, nakedObject, resourceContext);
+ }
+
+ /**
+ * Creates a <p id="association-invalid-<i>associationId</i>"/> element so that Javascript code can
+ * populate during validation.
+ */
+ @Override
+ public Element doTd(final T member) {
+ return builder().el("p").classAttr(HtmlClass.VALID).idAttr(getDomId(member)).build();
+ }
+
+ protected abstract String getDomId(T member);
+
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberName.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberName.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberName.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberName.java Tue May 3 07:44:41 2011
@@ -16,30 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects;
-
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public abstract class TableColumnNakedObjectMemberName<T extends ObjectMember> extends TableColumnNakedObjectMember<T> {
- private final ObjectSpecification noSpec;
-
- public TableColumnNakedObjectMemberName(
- final ObjectSpecification noSpec,
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super("Name", session, nakedObject, resourceContext);
- this.noSpec = noSpec;
- }
-
- protected ObjectSpecification getNoSpec() {
- return noSpec;
- }
-
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public abstract class TableColumnNakedObjectMemberName<T extends ObjectMember> extends TableColumnNakedObjectMember<T> {
+ private final ObjectSpecification noSpec;
+
+ public TableColumnNakedObjectMemberName(final ObjectSpecification noSpec, final AuthenticationSession session,
+ final ObjectAdapter nakedObject, final ResourceContext resourceContext) {
+ super("Name", session, nakedObject, resourceContext);
+ this.noSpec = noSpec;
+ }
+
+ protected ObjectSpecification getNoSpec() {
+ return noSpec;
+ }
+
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectAction.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectAction.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectAction.java Tue May 3 07:44:41 2011
@@ -16,30 +16,24 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
-
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMember;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public abstract class TableColumnNakedObjectAction extends TableColumnNakedObjectMember<ObjectAction> {
-
- TableColumnNakedObjectAction(
- final String headerText,
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super(headerText, session, nakedObject, resourceContext);
- }
-
- protected final String getOidStrRealTarget(ObjectAction action) {
- ObjectAdapter realTarget = action.realTarget(getNakedObject());
- return getOidStr(realTarget);
- }
-
-
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMember;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public abstract class TableColumnNakedObjectAction extends TableColumnNakedObjectMember<ObjectAction> {
+
+ TableColumnNakedObjectAction(final String headerText, final AuthenticationSession session,
+ final ObjectAdapter nakedObject, final ResourceContext resourceContext) {
+ super(headerText, session, nakedObject, resourceContext);
+ }
+
+ protected final String getOidStrRealTarget(final ObjectAction action) {
+ final ObjectAdapter realTarget = action.realTarget(getNakedObject());
+ return getOidStr(realTarget);
+ }
+
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionInvalidReason.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionInvalidReason.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionInvalidReason.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionInvalidReason.java Tue May 3 07:44:41 2011
@@ -16,28 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
-
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMemberInvalidReason;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public final class TableColumnNakedObjectActionInvalidReason extends TableColumnNakedObjectMemberInvalidReason<ObjectAction> {
-
- public TableColumnNakedObjectActionInvalidReason(
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super(session, nakedObject, resourceContext);
- }
-
- @Override
- protected String getDomId(final ObjectAction action) {
- return "action-invalid-" + action.getId();
- }
-
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMemberInvalidReason;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public final class TableColumnNakedObjectActionInvalidReason extends
+ TableColumnNakedObjectMemberInvalidReason<ObjectAction> {
+
+ public TableColumnNakedObjectActionInvalidReason(final AuthenticationSession session,
+ final ObjectAdapter nakedObject, final ResourceContext resourceContext) {
+ super(session, nakedObject, resourceContext);
+ }
+
+ @Override
+ protected String getDomId(final ObjectAction action) {
+ return "action-invalid-" + action.getId();
+ }
+
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionInvoke.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionInvoke.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionInvoke.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionInvoke.java Tue May 3 07:44:41 2011
@@ -16,85 +16,82 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
-
-import java.text.MessageFormat;
-import java.util.List;
-
-import nu.xom.Attribute;
-import nu.xom.Element;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public final class TableColumnNakedObjectActionInvoke extends TableColumnNakedObjectAction {
-
- private final static String INPUT_FIELD_NAME_PREFIX = "arg";
-
- public TableColumnNakedObjectActionInvoke(
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super("Invoke", session, nakedObject, resourceContext);
- }
-
- @Override
- public Element doTd(final ObjectAction action) {
- final Identifier actionIdentifier = action.getIdentifier();
- final String actionId = actionIdentifier.toNameParmsIdentityString();
-
- final String formName = "action-" + actionId;
- final String uri = MessageFormat.format("{0}/object/{1}/action/{2}",
- resourceContext.getHttpServletRequest().getContextPath(), getOidStrRealTarget(action), actionId);
- final List<ObjectActionParameter> parameters = action.getParameters();
-
- final Element div = xhtmlRenderer.div(HtmlClass.ACTION);
- div.appendChild(renderForm(formName, uri, parameters));
- return div;
- }
-
- private Element renderForm(final String formName, final String uri, final List<ObjectActionParameter> parameters) {
-
- final Element form = xhtmlRenderer.form(formName, HtmlClass.ACTION);
- form.addAttribute(new Attribute("method", "POST"));
- form.addAttribute(new Attribute("action", uri));
-
- renderInputFieldsForParameters(parameters, form);
-
- renderInputButton(form);
-
- return form;
- }
-
- private void renderInputFieldsForParameters(final List<ObjectActionParameter> parameters, final Element form) {
- for (int i = 0; i < parameters.size(); i++) {
- final ObjectActionParameter parameter = parameters.get(i);
- final String inputFieldName = INPUT_FIELD_NAME_PREFIX + i;
-
- final Element inputLabel = new Element("p");
- inputLabel.appendChild(parameter.getName());
- form.appendChild(inputLabel);
-
- final Element inputValue = new Element("input");
- inputValue.addAttribute(new Attribute("type", "value"));
- inputValue.addAttribute(new Attribute("name", inputFieldName));
- inputValue.addAttribute(new Attribute("class", parameter.getName()));
- form.appendChild(inputValue);
- }
- }
-
- private void renderInputButton(final Element form) {
- final Element inputButton = new Element("input");
- inputButton.addAttribute(new Attribute("type", "submit"));
- inputButton.addAttribute(new Attribute("value", "Invoke"));
- form.appendChild(inputButton);
- }
-
-
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
+
+import java.text.MessageFormat;
+import java.util.List;
+
+import nu.xom.Attribute;
+import nu.xom.Element;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
+import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public final class TableColumnNakedObjectActionInvoke extends TableColumnNakedObjectAction {
+
+ private final static String INPUT_FIELD_NAME_PREFIX = "arg";
+
+ public TableColumnNakedObjectActionInvoke(final AuthenticationSession session, final ObjectAdapter nakedObject,
+ final ResourceContext resourceContext) {
+ super("Invoke", session, nakedObject, resourceContext);
+ }
+
+ @Override
+ public Element doTd(final ObjectAction action) {
+ final Identifier actionIdentifier = action.getIdentifier();
+ final String actionId = actionIdentifier.toNameParmsIdentityString();
+
+ final String formName = "action-" + actionId;
+ final String uri =
+ MessageFormat.format("{0}/object/{1}/action/{2}", resourceContext.getHttpServletRequest().getContextPath(),
+ getOidStrRealTarget(action), actionId);
+ final List<ObjectActionParameter> parameters = action.getParameters();
+
+ final Element div = xhtmlRenderer.div(HtmlClass.ACTION);
+ div.appendChild(renderForm(formName, uri, parameters));
+ return div;
+ }
+
+ private Element renderForm(final String formName, final String uri, final List<ObjectActionParameter> parameters) {
+
+ final Element form = xhtmlRenderer.form(formName, HtmlClass.ACTION);
+ form.addAttribute(new Attribute("method", "POST"));
+ form.addAttribute(new Attribute("action", uri));
+
+ renderInputFieldsForParameters(parameters, form);
+
+ renderInputButton(form);
+
+ return form;
+ }
+
+ private void renderInputFieldsForParameters(final List<ObjectActionParameter> parameters, final Element form) {
+ for (int i = 0; i < parameters.size(); i++) {
+ final ObjectActionParameter parameter = parameters.get(i);
+ final String inputFieldName = INPUT_FIELD_NAME_PREFIX + i;
+
+ final Element inputLabel = new Element("p");
+ inputLabel.appendChild(parameter.getName());
+ form.appendChild(inputLabel);
+
+ final Element inputValue = new Element("input");
+ inputValue.addAttribute(new Attribute("type", "value"));
+ inputValue.addAttribute(new Attribute("name", inputFieldName));
+ inputValue.addAttribute(new Attribute("class", parameter.getName()));
+ form.appendChild(inputValue);
+ }
+ }
+
+ private void renderInputButton(final Element form) {
+ final Element inputButton = new Element("input");
+ inputButton.addAttribute(new Attribute("type", "submit"));
+ inputButton.addAttribute(new Attribute("value", "Invoke"));
+ form.appendChild(inputButton);
+ }
+
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionName.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionName.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionName.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionName.java Tue May 3 07:44:41 2011
@@ -16,37 +16,36 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
-
-import java.text.MessageFormat;
-
-import nu.xom.Element;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMemberName;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public class TableColumnNakedObjectActionName extends TableColumnNakedObjectMemberName<ObjectAction> {
-
- public TableColumnNakedObjectActionName(
- final ObjectSpecification noSpec,
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super(noSpec, session, nakedObject, resourceContext);
- }
-
- @Override
- public Element doTd(final ObjectAction nakedObjectAction) {
- final String actionId = nakedObjectAction.getIdentifier().toNameParmsIdentityString();
- final String memberType = "action";
- final String uri = MessageFormat.format("{0}/specs/{1}/{2}/{3}", getContextPath(), getNoSpec().getFullIdentifier(), memberType, actionId);
- return new Element(xhtmlRenderer.aHref(uri, nakedObjectAction.getName(), "actionSpec", memberType, HtmlClass.ACTION));
- }
-
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
+
+import java.text.MessageFormat;
+
+import nu.xom.Element;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
+import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMemberName;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public class TableColumnNakedObjectActionName extends TableColumnNakedObjectMemberName<ObjectAction> {
+
+ public TableColumnNakedObjectActionName(final ObjectSpecification noSpec, final AuthenticationSession session,
+ final ObjectAdapter nakedObject, final ResourceContext resourceContext) {
+ super(noSpec, session, nakedObject, resourceContext);
+ }
+
+ @Override
+ public Element doTd(final ObjectAction nakedObjectAction) {
+ final String actionId = nakedObjectAction.getIdentifier().toNameParmsIdentityString();
+ final String memberType = "action";
+ final String uri =
+ MessageFormat.format("{0}/specs/{1}/{2}/{3}", getContextPath(), getNoSpec().getFullIdentifier(),
+ memberType, actionId);
+ return new Element(xhtmlRenderer.aHref(uri, nakedObjectAction.getName(), "actionSpec", memberType,
+ HtmlClass.ACTION));
+ }
+
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionParamCount.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionParamCount.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionParamCount.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionParamCount.java Tue May 3 07:44:41 2011
@@ -16,29 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
-
-import nu.xom.Element;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public final class TableColumnNakedObjectActionParamCount extends TableColumnNakedObjectAction {
-
- public TableColumnNakedObjectActionParamCount(
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super("# Params", session, nakedObject, resourceContext);
- }
-
- @Override
- public Element doTd(final ObjectAction action) {
- return xhtmlRenderer.p("" + action.getParameterCount(), HtmlClass.ACTION);
- }
-
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
+
+import nu.xom.Element;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public final class TableColumnNakedObjectActionParamCount extends TableColumnNakedObjectAction {
+
+ public TableColumnNakedObjectActionParamCount(final AuthenticationSession session, final ObjectAdapter nakedObject,
+ final ResourceContext resourceContext) {
+ super("# Params", session, nakedObject, resourceContext);
+ }
+
+ @Override
+ public Element doTd(final ObjectAction action) {
+ return xhtmlRenderer.p("" + action.getParameterCount(), HtmlClass.ACTION);
+ }
+
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionRealTarget.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionRealTarget.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionRealTarget.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionRealTarget.java Tue May 3 07:44:41 2011
@@ -16,34 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
-
-import java.text.MessageFormat;
-
-import nu.xom.Element;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public final class TableColumnNakedObjectActionRealTarget extends TableColumnNakedObjectAction {
-
- public TableColumnNakedObjectActionRealTarget(
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super("Real Target", session, nakedObject, resourceContext);
- }
-
- @Override
- public Element doTd(final ObjectAction action) {
- String oidStrRealTarget = getOidStrRealTarget(action);
- final String uri = MessageFormat.format("{0}/object/{1}", getContextPath(), oidStrRealTarget);
- return new Element(xhtmlRenderer.aHref(uri, oidStrRealTarget, "actionRealTarget", "action", HtmlClass.ACTION));
- }
-
-
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
+
+import java.text.MessageFormat;
+
+import nu.xom.Element;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public final class TableColumnNakedObjectActionRealTarget extends TableColumnNakedObjectAction {
+
+ public TableColumnNakedObjectActionRealTarget(final AuthenticationSession session, final ObjectAdapter nakedObject,
+ final ResourceContext resourceContext) {
+ super("Real Target", session, nakedObject, resourceContext);
+ }
+
+ @Override
+ public Element doTd(final ObjectAction action) {
+ final String oidStrRealTarget = getOidStrRealTarget(action);
+ final String uri = MessageFormat.format("{0}/object/{1}", getContextPath(), oidStrRealTarget);
+ return new Element(xhtmlRenderer.aHref(uri, oidStrRealTarget, "actionRealTarget", "action", HtmlClass.ACTION));
+ }
+
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionReturnType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionReturnType.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionReturnType.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionReturnType.java Tue May 3 07:44:41 2011
@@ -16,33 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
-
-import java.text.MessageFormat;
-
-import nu.xom.Element;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public final class TableColumnNakedObjectActionReturnType extends TableColumnNakedObjectAction {
-
- public TableColumnNakedObjectActionReturnType(
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super("Type", session, nakedObject, resourceContext);
- }
-
- @Override
- public Element doTd(final ObjectAction action) {
- final String returnTypeFullName = action.getReturnType().getFullIdentifier();
- final String uri = MessageFormat.format("{0}/specs/{1}", getContextPath(), returnTypeFullName);
- return xhtmlRenderer.aHref(uri, returnTypeFullName, "actionReturnTypeSpec", "action", HtmlClass.ACTION);
- }
-
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
+
+import java.text.MessageFormat;
+
+import nu.xom.Element;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public final class TableColumnNakedObjectActionReturnType extends TableColumnNakedObjectAction {
+
+ public TableColumnNakedObjectActionReturnType(final AuthenticationSession session, final ObjectAdapter nakedObject,
+ final ResourceContext resourceContext) {
+ super("Type", session, nakedObject, resourceContext);
+ }
+
+ @Override
+ public Element doTd(final ObjectAction action) {
+ final String returnTypeFullName = action.getReturnType().getFullIdentifier();
+ final String uri = MessageFormat.format("{0}/specs/{1}", getContextPath(), returnTypeFullName);
+ return xhtmlRenderer.aHref(uri, returnTypeFullName, "actionReturnTypeSpec", "action", HtmlClass.ACTION);
+ }
+
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionType.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionType.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionType.java Tue May 3 07:44:41 2011
@@ -16,28 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
-
-import nu.xom.Element;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public final class TableColumnNakedObjectActionType extends TableColumnNakedObjectAction {
-
- public TableColumnNakedObjectActionType(
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super("Type", session, nakedObject, resourceContext);
- }
-
- @Override
- public Element doTd(final ObjectAction action) {
- return xhtmlRenderer.p(action.getType().name(), HtmlClass.ACTION);
- }
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
+
+import nu.xom.Element;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public final class TableColumnNakedObjectActionType extends TableColumnNakedObjectAction {
+
+ public TableColumnNakedObjectActionType(final AuthenticationSession session, final ObjectAdapter nakedObject,
+ final ResourceContext resourceContext) {
+ super("Type", session, nakedObject, resourceContext);
+ }
+
+ @Override
+ public Element doTd(final ObjectAction action) {
+ return xhtmlRenderer.p(action.getType().name(), HtmlClass.ACTION);
+ }
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationAccess.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationAccess.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationAccess.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationAccess.java Tue May 3 07:44:41 2011
@@ -16,39 +16,38 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects.collections;
-
-import java.text.MessageFormat;
-
-import nu.xom.Element;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectAssociation;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public final class TableColumnOneToManyAssociationAccess extends TableColumnNakedObjectAssociation<OneToManyAssociation> {
-
- public TableColumnOneToManyAssociationAccess(
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super("Access", session, nakedObject, resourceContext);
- }
-
- @Override
- public Element doTd(final OneToManyAssociation collection) {
- if (!collection.isVisible(getSession(), getNakedObject()).isAllowed()) {
- return xhtmlRenderer.p(null, HtmlClass.PROPERTY);
- }
-
- final String contextPath = resourceContext.getHttpServletRequest().getContextPath();
- final String collectionId = collection.getId();
- final String uri = MessageFormat.format("{0}/object/{1}/collection/{2}", contextPath, getOidStr(), collectionId);
- return xhtmlRenderer.aHref(uri, collectionId, "collection", "nakedObject", HtmlClass.COLLECTION);
- }
-
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects.collections;
+
+import java.text.MessageFormat;
+
+import nu.xom.Element;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
+import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectAssociation;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public final class TableColumnOneToManyAssociationAccess extends
+ TableColumnNakedObjectAssociation<OneToManyAssociation> {
+
+ public TableColumnOneToManyAssociationAccess(final AuthenticationSession session, final ObjectAdapter nakedObject,
+ final ResourceContext resourceContext) {
+ super("Access", session, nakedObject, resourceContext);
+ }
+
+ @Override
+ public Element doTd(final OneToManyAssociation collection) {
+ if (!collection.isVisible(getSession(), getNakedObject()).isAllowed()) {
+ return xhtmlRenderer.p(null, HtmlClass.PROPERTY);
+ }
+
+ final String contextPath = resourceContext.getHttpServletRequest().getContextPath();
+ final String collectionId = collection.getId();
+ final String uri =
+ MessageFormat.format("{0}/object/{1}/collection/{2}", contextPath, getOidStr(), collectionId);
+ return xhtmlRenderer.aHref(uri, collectionId, "collection", "nakedObject", HtmlClass.COLLECTION);
+ }
+
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationAddTo.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationAddTo.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationAddTo.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationAddTo.java Tue May 3 07:44:41 2011
@@ -16,57 +16,54 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects.collections;
-
-import java.text.MessageFormat;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectAssociationModifyAbstract;
-import org.apache.isis.viewer.restful.viewer.util.StringUtil;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public final class TableColumnOneToManyAssociationAddTo extends
- TableColumnNakedObjectAssociationModifyAbstract<OneToManyAssociation> {
-
- public TableColumnOneToManyAssociationAddTo(
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super("AddTo", session, nakedObject, resourceContext);
- }
-
- @Override
- protected String getFormNamePrefix() {
- return "collection-";
- }
-
- @Override
- protected String getHtmlClassAttribute() {
- return HtmlClass.COLLECTION;
- }
-
- @Override
- protected String getFormButtonLabel() {
- return "Add";
- }
-
- /**
- * Calls the <tt>addToCollection()</tt> Javascript function that lives in <tt>nof-rest-support.js</tt>
- *
- * @param url
- * @param associationId
- * @param inputFieldName
- * - the name of the field in the form to read the value.
- * @return
- */
- @Override
- protected String invokeJavascript(final String url, final String associationId, final String inputFieldName) {
- return MessageFormat.format("addToCollection({0}, {1}, {2}.value);", StringUtil.quote(url), StringUtil
- .quote(associationId), inputFieldName);
- }
-
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects.collections;
+
+import java.text.MessageFormat;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
+import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectAssociationModifyAbstract;
+import org.apache.isis.viewer.restful.viewer.util.StringUtil;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public final class TableColumnOneToManyAssociationAddTo extends
+ TableColumnNakedObjectAssociationModifyAbstract<OneToManyAssociation> {
+
+ public TableColumnOneToManyAssociationAddTo(final AuthenticationSession session, final ObjectAdapter nakedObject,
+ final ResourceContext resourceContext) {
+ super("AddTo", session, nakedObject, resourceContext);
+ }
+
+ @Override
+ protected String getFormNamePrefix() {
+ return "collection-";
+ }
+
+ @Override
+ protected String getHtmlClassAttribute() {
+ return HtmlClass.COLLECTION;
+ }
+
+ @Override
+ protected String getFormButtonLabel() {
+ return "Add";
+ }
+
+ /**
+ * Calls the <tt>addToCollection()</tt> Javascript function that lives in <tt>nof-rest-support.js</tt>
+ *
+ * @param url
+ * @param associationId
+ * @param inputFieldName
+ * - the name of the field in the form to read the value.
+ * @return
+ */
+ @Override
+ protected String invokeJavascript(final String url, final String associationId, final String inputFieldName) {
+ return MessageFormat.format("addToCollection({0}, {1}, {2}.value);", StringUtil.quote(url),
+ StringUtil.quote(associationId), inputFieldName);
+ }
+
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationInvalidReason.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationInvalidReason.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationInvalidReason.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationInvalidReason.java Tue May 3 07:44:41 2011
@@ -16,29 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects.collections;
-
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMemberInvalidReason;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public final class TableColumnOneToManyAssociationInvalidReason extends
- TableColumnNakedObjectMemberInvalidReason<OneToManyAssociation> {
-
- public TableColumnOneToManyAssociationInvalidReason(
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super(session, nakedObject, resourceContext);
- }
-
- @Override
- protected String getDomId(final OneToManyAssociation member) {
- return "collection-invalid-" + member.getId();
- }
-
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects.collections;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMemberInvalidReason;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public final class TableColumnOneToManyAssociationInvalidReason extends
+ TableColumnNakedObjectMemberInvalidReason<OneToManyAssociation> {
+
+ public TableColumnOneToManyAssociationInvalidReason(final AuthenticationSession session,
+ final ObjectAdapter nakedObject, final ResourceContext resourceContext) {
+ super(session, nakedObject, resourceContext);
+ }
+
+ @Override
+ protected String getDomId(final OneToManyAssociation member) {
+ return "collection-invalid-" + member.getId();
+ }
+
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationName.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationName.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationName.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationName.java Tue May 3 07:44:41 2011
@@ -16,41 +16,36 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects.collections;
-
-import java.text.MessageFormat;
-
-import nu.xom.Element;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMemberName;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public class TableColumnOneToManyAssociationName extends TableColumnNakedObjectMemberName<OneToManyAssociation> {
-
- public TableColumnOneToManyAssociationName(
- final ObjectSpecification noSpec,
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super(noSpec, session, nakedObject, resourceContext);
- }
-
- @Override
- public Element doTd(final OneToManyAssociation oneToManyAssociation) {
- final String memberName = oneToManyAssociation.getIdentifier().getMemberName();
- final String memberType = "collection";
- final String uri = MessageFormat.format("{0}/specs/{1}/{2}/{3}", getContextPath(), getNoSpec().getFullIdentifier(), memberType,
- memberName);
- return new Element(xhtmlRenderer.aHref(uri, oneToManyAssociation.getName(), "propertySpec", memberType,
- HtmlClass.COLLECTION));
- }
-
-
-
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects.collections;
+
+import java.text.MessageFormat;
+
+import nu.xom.Element;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
+import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMemberName;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public class TableColumnOneToManyAssociationName extends TableColumnNakedObjectMemberName<OneToManyAssociation> {
+
+ public TableColumnOneToManyAssociationName(final ObjectSpecification noSpec, final AuthenticationSession session,
+ final ObjectAdapter nakedObject, final ResourceContext resourceContext) {
+ super(noSpec, session, nakedObject, resourceContext);
+ }
+
+ @Override
+ public Element doTd(final OneToManyAssociation oneToManyAssociation) {
+ final String memberName = oneToManyAssociation.getIdentifier().getMemberName();
+ final String memberType = "collection";
+ final String uri =
+ MessageFormat.format("{0}/specs/{1}/{2}/{3}", getContextPath(), getNoSpec().getFullIdentifier(),
+ memberType, memberName);
+ return new Element(xhtmlRenderer.aHref(uri, oneToManyAssociation.getName(), "propertySpec", memberType,
+ HtmlClass.COLLECTION));
+ }
+
+}
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationRemoveFrom.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationRemoveFrom.java?rev=1098948&r1=1098947&r2=1098948&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationRemoveFrom.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationRemoveFrom.java Tue May 3 07:44:41 2011
@@ -16,58 +16,54 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer.resources.objects.collections;
-
-import java.text.MessageFormat;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectAssociationModifyAbstract;
-import org.apache.isis.viewer.restful.viewer.util.StringUtil;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-
-
-public final class TableColumnOneToManyAssociationRemoveFrom extends
- TableColumnNakedObjectAssociationModifyAbstract<OneToManyAssociation> {
-
- public TableColumnOneToManyAssociationRemoveFrom(
- final AuthenticationSession session,
- final ObjectAdapter nakedObject,
- final ResourceContext resourceContext) {
- super("RemoveFrom", session, nakedObject, resourceContext);
- }
-
- @Override
- protected String getFormNamePrefix() {
- return "collection-";
- }
-
- @Override
- protected String getHtmlClassAttribute() {
- return HtmlClass.COLLECTION;
- }
-
- @Override
- protected String getFormButtonLabel() {
- return "Remove";
- }
-
- /**
- * Calls the <tt>removeFromCollection()</tt> Javascript function that lives in
- * <tt>nof-rest-support.js</tt>
- *
- * @param url
- * @param associationId
- * @param inputFieldName
- * - the name of the field in the form to read the value.
- * @return
- */
- @Override
- protected String invokeJavascript(final String url, final String associationId, final String inputFieldName) {
- return MessageFormat.format("removeFromCollection({0}, {1}, {2}.value);", StringUtil.quote(url), StringUtil
- .quote(associationId), inputFieldName);
- }
-
-}
+package org.apache.isis.viewer.restful.viewer.resources.objects.collections;
+
+import java.text.MessageFormat;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
+import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectAssociationModifyAbstract;
+import org.apache.isis.viewer.restful.viewer.util.StringUtil;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+
+public final class TableColumnOneToManyAssociationRemoveFrom extends
+ TableColumnNakedObjectAssociationModifyAbstract<OneToManyAssociation> {
+
+ public TableColumnOneToManyAssociationRemoveFrom(final AuthenticationSession session,
+ final ObjectAdapter nakedObject, final ResourceContext resourceContext) {
+ super("RemoveFrom", session, nakedObject, resourceContext);
+ }
+
+ @Override
+ protected String getFormNamePrefix() {
+ return "collection-";
+ }
+
+ @Override
+ protected String getHtmlClassAttribute() {
+ return HtmlClass.COLLECTION;
+ }
+
+ @Override
+ protected String getFormButtonLabel() {
+ return "Remove";
+ }
+
+ /**
+ * Calls the <tt>removeFromCollection()</tt> Javascript function that lives in <tt>nof-rest-support.js</tt>
+ *
+ * @param url
+ * @param associationId
+ * @param inputFieldName
+ * - the name of the field in the form to read the value.
+ * @return
+ */
+ @Override
+ protected String invokeJavascript(final String url, final String associationId, final String inputFieldName) {
+ return MessageFormat.format("removeFromCollection({0}, {1}, {2}.value);", StringUtil.quote(url),
+ StringUtil.quote(associationId), inputFieldName);
+ }
+
+}