You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2013/03/24 18:45:01 UTC
[04/24] Restructuring Scimpi to remove dependencies and enable easier
testing.
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/ListView.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/ListView.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/ListView.java
index e2e6cdb..cf957fb 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/ListView.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/ListView.java
@@ -24,10 +24,11 @@ import java.util.Iterator;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractObjectProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.Names;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request.Scope;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractObjectProcessor;
import org.apache.isis.viewer.scimpi.dispatcher.view.field.LinkedObject;
public class ListView extends AbstractObjectProcessor {
@@ -38,24 +39,24 @@ public class ListView extends AbstractObjectProcessor {
}
@Override
- public void process(final Request request, final ObjectAdapter object) {
- final String linkRowView = request.getOptionalProperty(LINK_VIEW);
- final String linkObjectName = request.getOptionalProperty(ELEMENT_NAME, RequestContext.RESULT);
- final String linkObjectScope = request.getOptionalProperty(SCOPE, Scope.INTERACTION.toString());
+ public void process(final TagProcessor tagProcessor, final ObjectAdapter object) {
+ final String linkRowView = tagProcessor.getOptionalProperty(LINK_VIEW);
+ final String linkObjectName = tagProcessor.getOptionalProperty(ELEMENT_NAME, Names.RESULT);
+ final String linkObjectScope = tagProcessor.getOptionalProperty(SCOPE, Scope.INTERACTION.toString());
LinkedObject linkedRow = null;
if (linkRowView != null) {
- linkedRow = new LinkedObject(linkObjectName, linkObjectScope, request.getContext().fullUriPath(linkRowView));
+ linkedRow = new LinkedObject(linkObjectName, linkObjectScope, tagProcessor.getContext().fullUriPath(linkRowView));
}
- final String bulletType = request.getOptionalProperty("type");
- write(request, object, linkedRow, bulletType);
+ final String bulletType = tagProcessor.getOptionalProperty("type");
+ write(tagProcessor, object, linkedRow, bulletType);
}
- public static void write(final Request request, final ObjectAdapter collection, final LinkedObject linkRow, final String bulletType) {
+ public static void write(final TagProcessor tagProcessor, final ObjectAdapter collection, final LinkedObject linkRow, final String bulletType) {
if (bulletType == null) {
- request.appendHtml("<ol>");
+ tagProcessor.appendHtml("<ol>");
} else {
- request.appendHtml("<ul type=\"" + bulletType + "\">");
+ tagProcessor.appendHtml("<ul type=\"" + bulletType + "\">");
}
final CollectionFacet facet = collection.getSpecification().getFacet(CollectionFacet.class);
@@ -63,23 +64,23 @@ public class ListView extends AbstractObjectProcessor {
while (iterator.hasNext()) {
final ObjectAdapter element = iterator.next();
- request.appendHtml("<li>");
+ tagProcessor.appendHtml("<li>");
if (linkRow != null) {
- final Scope scope = linkRow == null ? Scope.INTERACTION : RequestContext.scope(linkRow.getScope());
- final String rowId = request.getContext().mapObject(element, scope);
- request.appendHtml("<a class=\"item-select\" href=\"" + linkRow.getForwardView() + "?" + linkRow.getVariable() + "=" + rowId + "\">");
+ final Scope scope = linkRow == null ? Scope.INTERACTION : Request.scope(linkRow.getScope());
+ final String rowId = tagProcessor.getContext().mapObject(element, scope);
+ tagProcessor.appendHtml("<a class=\"item-select\" href=\"" + linkRow.getForwardView() + "?" + linkRow.getVariable() + "=" + rowId + "\">");
}
- request.appendAsHtmlEncoded(element.titleString());
+ tagProcessor.appendAsHtmlEncoded(element.titleString());
if (linkRow != null) {
- request.appendHtml("</a>");
+ tagProcessor.appendHtml("</a>");
}
- request.appendHtml("</li>\n");
+ tagProcessor.appendHtml("</li>\n");
}
if (bulletType == null) {
- request.appendHtml("</ol>");
+ tagProcessor.appendHtml("</ol>");
} else {
- request.appendHtml("</ul>");
+ tagProcessor.appendHtml("</ul>");
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/LongFormView.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/LongFormView.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/LongFormView.java
index 5bbb44f..a157858 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/LongFormView.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/LongFormView.java
@@ -26,18 +26,18 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
import org.apache.isis.viewer.scimpi.dispatcher.view.display.TableView.SimpleTableBuilder;
import org.apache.isis.viewer.scimpi.dispatcher.view.field.LinkedObject;
public class LongFormView extends AbstractFormView {
@Override
- protected void addField(final Request request, final ObjectAdapter object, final ObjectAssociation field, final LinkedObject linkedObject, final boolean showIcons) {
+ protected void addField(final TagProcessor tagProcessor, final ObjectAdapter object, final ObjectAssociation field, final LinkedObject linkedObject, final boolean showIcons) {
if (field.isOneToManyAssociation()) {
- final String noColumnsString = request.getOptionalProperty("no-columns", "3");
- final String tableClass = request.getOptionalProperty("table-class");
- final String rowClassesList = request.getOptionalProperty("row-classes", ODD_ROW_CLASS + "|" + EVEN_ROW_CLASS);
+ final String noColumnsString = tagProcessor.getOptionalProperty("no-columns", "3");
+ final String tableClass = tagProcessor.getOptionalProperty("table-class");
+ final String rowClassesList = tagProcessor.getOptionalProperty("row-classes", ODD_ROW_CLASS + "|" + EVEN_ROW_CLASS);
String[] rowClasses = new String[0];
if (rowClassesList != null) {
rowClasses = rowClassesList.split("[,|/]");
@@ -71,9 +71,9 @@ public class LongFormView extends AbstractFormView {
final TableContentWriter rowBuilder =new SimpleTableBuilder(object.titleString(), true, false, "", noColumns, headers, fields, false,
showIcons, false, false, false, field.getName(), linkedFields, null);
- TableView.write(request, collection, summary, rowBuilder, null, tableClass, rowClasses);
+ TableView.write(tagProcessor, collection, summary, rowBuilder, null, tableClass, rowClasses);
} else {
- super.addField(request, object, field, linkedObject, showIcons);
+ super.addField(tagProcessor, object, field, linkedObject, showIcons);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Messages.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Messages.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Messages.java
index a6c8213..21fae12 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Messages.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Messages.java
@@ -23,20 +23,20 @@ import java.util.List;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.transaction.MessageBroker;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
public class Messages extends AbstractElementProcessor {
@Override
- public void process(final Request request) {
- final String cls = request.getOptionalProperty(CLASS);
+ public void process(final TagProcessor tagProcessor) {
+ final String cls = tagProcessor.getOptionalProperty(CLASS);
final StringBuffer buffer = new StringBuffer();
write(cls, buffer);
if (buffer.length() > 0) {
- request.appendHtml("<div class=\"feedback\">");
- request.appendHtml(buffer.toString());
- request.appendHtml("</div>");
+ tagProcessor.appendHtml("<div class=\"feedback\">");
+ tagProcessor.appendHtml(buffer.toString());
+ tagProcessor.appendHtml("</div>");
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/SelectedObject.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/SelectedObject.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/SelectedObject.java
index 7af46ab..bba9d03 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/SelectedObject.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/SelectedObject.java
@@ -20,9 +20,9 @@
package org.apache.isis.viewer.scimpi.dispatcher.view.display;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request.Scope;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
/**
* <swf:selected name="selected" object="${action}" equals="${subaction}" />
@@ -30,21 +30,21 @@ import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
public class SelectedObject extends AbstractElementProcessor {
@Override
- public void process(final Request request) {
- final String name = request.getOptionalProperty(NAME, "selected");
- final String objectId = request.getRequiredProperty(OBJECT);
- final String equalsId = request.getOptionalProperty("equals");
- final String title = request.getOptionalProperty(BUTTON_TITLE);
+ public void process(final TagProcessor tagProcessor) {
+ final String name = tagProcessor.getOptionalProperty(NAME, "selected");
+ final String objectId = tagProcessor.getRequiredProperty(OBJECT);
+ final String equalsId = tagProcessor.getOptionalProperty("equals");
+ final String title = tagProcessor.getOptionalProperty(BUTTON_TITLE);
- final ObjectAdapter object = request.getContext().getMappedObjectOrResult(objectId);
- final ObjectAdapter other = request.getContext().getMappedObjectOrResult(equalsId);
+ final ObjectAdapter object = tagProcessor.getContext().getMappedObjectOrResult(objectId);
+ final ObjectAdapter other = tagProcessor.getContext().getMappedObjectOrResult(equalsId);
if (object == other || object.equals(title)) {
// TODO title is not being used!
- request.getContext().addVariable(ID, " id=\"" + name + "\" ", Scope.INTERACTION);
+ tagProcessor.getContext().addVariable(ID, " id=\"" + name + "\" ", Scope.INTERACTION);
} else {
- request.getContext().addVariable(ID, "", Scope.INTERACTION);
+ tagProcessor.getContext().addVariable(ID, "", Scope.INTERACTION);
}
- request.closeEmpty();
+ tagProcessor.closeEmpty();
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableBlock.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableBlock.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableBlock.java
index 2927fab..6fa85b9 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableBlock.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableBlock.java
@@ -20,8 +20,8 @@
package org.apache.isis.viewer.scimpi.dispatcher.view.display;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.viewer.scimpi.dispatcher.BlockContent;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request.RepeatMarker;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.BlockContent;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor.RepeatMarker;
public class TableBlock implements BlockContent {
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableBuilder.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableBuilder.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableBuilder.java
index e726e29..b1d526b 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableBuilder.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableBuilder.java
@@ -23,28 +23,28 @@ import java.util.List;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request.Scope;
import org.apache.isis.viewer.scimpi.dispatcher.processor.PageWriter;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request.RepeatMarker;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor.RepeatMarker;
public class TableBuilder extends AbstractTableView {
@Override
- protected TableContentWriter createRowBuilder(final Request request, final RequestContext context, final String parent, final List<ObjectAssociation> allFields, final ObjectAdapter collection) {
+ protected TableContentWriter createRowBuilder(final TagProcessor tagProcessor, final Request context, final String parent, final List<ObjectAssociation> allFields, final ObjectAdapter collection) {
- final String title = request.getOptionalProperty(TABLE_TITLE);
- final String variable = request.getOptionalProperty(ELEMENT_NAME, ELEMENT);
- final String headerClass = request.getOptionalProperty("head-" + CLASS);
+ final String title = tagProcessor.getOptionalProperty(TABLE_TITLE);
+ final String variable = tagProcessor.getOptionalProperty(ELEMENT_NAME, ELEMENT);
+ final String headerClass = tagProcessor.getOptionalProperty("head-" + CLASS);
final TableBlock block = new TableBlock();
block.setCollection(collection);
block.setElementName(variable);
- request.setBlockContent(block);
- request.pushNewBuffer();
- request.processUtilCloseTag();
- final String headers = request.popBuffer();
+ tagProcessor.setBlockContent(block);
+ tagProcessor.pushNewBuffer();
+ tagProcessor.processUtilCloseTag();
+ final String headers = tagProcessor.popBuffer();
return new TableContentWriter() {
@Override
@@ -52,7 +52,7 @@ public class TableBuilder extends AbstractTableView {
}
public void tidyUp() {
- request.popBlockContent();
+ tagProcessor.popBlockContent();
}
@Override
@@ -73,12 +73,12 @@ public class TableBuilder extends AbstractTableView {
}
@Override
- public void writeElement(final Request request, final RequestContext context, final ObjectAdapter element) {
+ public void writeElement(final TagProcessor tagProcessor, final Request context, final ObjectAdapter element) {
context.addVariable(variable, context.mapObject(element, Scope.REQUEST), Scope.REQUEST);
- final RepeatMarker end = request.createMarker();
+ final RepeatMarker end = tagProcessor.createMarker();
final RepeatMarker marker = block.getMarker();
marker.repeat();
- request.processUtilCloseTag();
+ tagProcessor.processUtilCloseTag();
end.repeat();
}
};
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableCell.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableCell.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableCell.java
index 3f99218..80f1753 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableCell.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableCell.java
@@ -23,11 +23,12 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.ScimpiException;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.Names;
+import org.apache.isis.viewer.scimpi.ScimpiException;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request.Scope;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
public class TableCell extends AbstractElementProcessor {
@@ -39,51 +40,51 @@ public class TableCell extends AbstractElementProcessor {
private final Where where = Where.ALL_TABLES;
@Override
- public void process(final Request request) {
- final TableBlock tableBlock = (TableBlock) request.getBlockContent();
- final String id = request.getOptionalProperty(OBJECT);
- final String fieldName = request.getRequiredProperty(FIELD);
- final String linkView = request.getOptionalProperty(LINK_VIEW);
- String className = request.getOptionalProperty(CLASS);
+ public void process(final TagProcessor tagProcessor) {
+ final TableBlock tableBlock = (TableBlock) tagProcessor.getBlockContent();
+ final String id = tagProcessor.getOptionalProperty(OBJECT);
+ final String fieldName = tagProcessor.getRequiredProperty(FIELD);
+ final String linkView = tagProcessor.getOptionalProperty(LINK_VIEW);
+ String className = tagProcessor.getOptionalProperty(CLASS);
className = className == null ? "" : " class=\"" + className + "\"";
- RequestContext context = request.getContext();
+ Request context = tagProcessor.getContext();
final ObjectAdapter object = context.getMappedObjectOrVariable(id, tableBlock.getElementName());
final ObjectAssociation field = object.getSpecification().getAssociation(fieldName);
if (field == null) {
throw new ScimpiException("No field " + fieldName + " in " + object.getSpecification().getFullIdentifier());
}
- request.appendHtml("<td" + className + ">");
+ tagProcessor.appendHtml("<td" + className + ">");
if (field.isVisible(IsisContext.getAuthenticationSession(), object, where).isAllowed()) {
final ObjectAdapter fieldReference = field.get(object);
final String source = fieldReference == null ? "" : context.mapObject(fieldReference, Scope.REQUEST);
- final String name = request.getOptionalProperty(RESULT_NAME, fieldName);
- context.addVariable(name, Request.getEncoder().encoder(source), Scope.REQUEST);
+ final String name = tagProcessor.getOptionalProperty(RESULT_NAME, fieldName);
+ context.addVariable(name, TagProcessor.getEncoder().encoder(source), Scope.REQUEST);
if (linkView != null) {
final String linkId = context.mapObject(object, Scope.REQUEST);
- final String linkName = request.getOptionalProperty(LINK_NAME, RequestContext.RESULT);
- final String linkObject = request.getOptionalProperty(LINK_OBJECT, linkId);
- request.appendHtml("<a href=\"" + linkView + "?" + linkName + "=" + linkObject + context.encodedInteractionParameters() + "\">");
+ final String linkName = tagProcessor.getOptionalProperty(LINK_NAME, Names.RESULT);
+ final String linkObject = tagProcessor.getOptionalProperty(LINK_OBJECT, linkId);
+ tagProcessor.appendHtml("<a href=\"" + linkView + "?" + linkName + "=" + linkObject + context.encodedInteractionParameters() + "\">");
} else if(tableBlock.getlinkView() != null) {
String linkObjectInVariable = tableBlock.getElementName();
final String linkId = (String) context.getVariable(linkObjectInVariable);
- request.appendHtml("<a href=\"" + tableBlock.getlinkView() + "?" + tableBlock.getlinkName() + "=" + linkId + context.encodedInteractionParameters() + "\">");
+ tagProcessor.appendHtml("<a href=\"" + tableBlock.getlinkView() + "?" + tableBlock.getlinkName() + "=" + linkId + context.encodedInteractionParameters() + "\">");
}
- request.pushNewBuffer();
- request.processUtilCloseTag();
- final String buffer = request.popBuffer();
+ tagProcessor.pushNewBuffer();
+ tagProcessor.processUtilCloseTag();
+ final String buffer = tagProcessor.popBuffer();
if (buffer.trim().length() == 0) {
- request.appendAsHtmlEncoded(fieldReference == null ? "" : fieldReference.titleString());
+ tagProcessor.appendAsHtmlEncoded(fieldReference == null ? "" : fieldReference.titleString());
} else {
- request.appendHtml(buffer);
+ tagProcessor.appendHtml(buffer);
}
if (linkView != null) {
- request.appendHtml("</a>");
+ tagProcessor.appendHtml("</a>");
}
} else {
- request.skipUntilClose();
+ tagProcessor.skipUntilClose();
}
- request.appendHtml("</td>");
+ tagProcessor.appendHtml("</td>");
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableContentWriter.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableContentWriter.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableContentWriter.java
index 10da109..92a9929 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableContentWriter.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableContentWriter.java
@@ -20,9 +20,9 @@
package org.apache.isis.viewer.scimpi.dispatcher.view.display;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request;
import org.apache.isis.viewer.scimpi.dispatcher.processor.PageWriter;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
public interface TableContentWriter {
@@ -32,7 +32,7 @@ public interface TableContentWriter {
void writeFooters(PageWriter writer);
- void writeElement(Request request, RequestContext context, ObjectAdapter element);
+ void writeElement(TagProcessor tagProcessor, Request context, ObjectAdapter element);
void tidyUp();
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableEmpty.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableEmpty.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableEmpty.java
index 5595207..145733f 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableEmpty.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableEmpty.java
@@ -21,27 +21,27 @@ package org.apache.isis.viewer.scimpi.dispatcher.view.display;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
public class TableEmpty extends AbstractElementProcessor {
@Override
- public void process(final Request request) {
- final TableBlock tableBlock = (TableBlock) request.getBlockContent();
+ public void process(final TagProcessor tagProcessor) {
+ final TableBlock tableBlock = (TableBlock) tagProcessor.getBlockContent();
final ObjectAdapter collection = tableBlock.getCollection();
final CollectionFacet facet = collection.getSpecification().getFacet(CollectionFacet.class);
if (facet.size(collection) == 0) {
- String className = request.getOptionalProperty(CLASS);
+ String className = tagProcessor.getOptionalProperty(CLASS);
className = className == null ? "" : " class=\"" + className + "\"";
- request.appendHtml("<tr" + className + ">");
- request.pushNewBuffer();
- request.processUtilCloseTag();
- final String buffer = request.popBuffer();
- request.appendHtml(buffer);
- request.appendHtml("</td>");
+ tagProcessor.appendHtml("<tr" + className + ">");
+ tagProcessor.pushNewBuffer();
+ tagProcessor.processUtilCloseTag();
+ final String buffer = tagProcessor.popBuffer();
+ tagProcessor.appendHtml(buffer);
+ tagProcessor.appendHtml("</td>");
} else {
- request.skipUntilClose();
+ tagProcessor.skipUntilClose();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableHeader.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableHeader.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableHeader.java
index ff04389..22a8e7f 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableHeader.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableHeader.java
@@ -19,8 +19,8 @@
package org.apache.isis.viewer.scimpi.dispatcher.view.display;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
public class TableHeader extends AbstractElementProcessor {
@@ -30,10 +30,10 @@ public class TableHeader extends AbstractElementProcessor {
}
@Override
- public void process(final Request request) {
- request.appendHtml("<thead><tr>");
- request.processUtilCloseTag();
- request.appendHtml("</tr></thead>");
+ public void process(final TagProcessor tagProcessor) {
+ tagProcessor.appendHtml("<thead><tr>");
+ tagProcessor.processUtilCloseTag();
+ tagProcessor.appendHtml("</tr></thead>");
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableRow.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableRow.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableRow.java
index eb92656..e8ba18a 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableRow.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableRow.java
@@ -19,10 +19,10 @@
package org.apache.isis.viewer.scimpi.dispatcher.view.display;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request.RepeatMarker;
+import org.apache.isis.viewer.scimpi.Names;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor.RepeatMarker;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
public class TableRow extends AbstractElementProcessor {
@@ -32,18 +32,18 @@ public class TableRow extends AbstractElementProcessor {
}
@Override
- public void process(final Request request) {
- final TableBlock block = (TableBlock) request.getBlockContent();
+ public void process(final TagProcessor tagProcessor) {
+ final TableBlock block = (TableBlock) tagProcessor.getBlockContent();
- final RepeatMarker start = request.createMarker();
+ final RepeatMarker start = tagProcessor.createMarker();
block.setMarker(start);
- final String linkView = request.getOptionalProperty(LINK_VIEW);
+ final String linkView = tagProcessor.getOptionalProperty(LINK_VIEW);
if (linkView != null) {
block.setlinkView(linkView);
- block.setlinkName(request.getOptionalProperty(LINK_NAME, RequestContext.RESULT));
+ block.setlinkName(tagProcessor.getOptionalProperty(LINK_NAME, Names.RESULT));
}
- request.skipUntilClose();
+ tagProcessor.skipUntilClose();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java
index caf984f..aa19f74 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java
@@ -25,11 +25,11 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
-import org.apache.isis.viewer.scimpi.dispatcher.Dispatcher;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
+import org.apache.isis.viewer.scimpi.Names;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request.Scope;
import org.apache.isis.viewer.scimpi.dispatcher.processor.PageWriter;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
import org.apache.isis.viewer.scimpi.dispatcher.view.field.LinkedFieldsBlock;
import org.apache.isis.viewer.scimpi.dispatcher.view.field.LinkedObject;
import org.apache.isis.viewer.scimpi.dispatcher.view.simple.RemoveElement;
@@ -137,120 +137,120 @@ public class TableView extends AbstractTableView {
}
@Override
- public void writeElement(final Request request, final RequestContext context, final ObjectAdapter element) {
+ public void writeElement(final TagProcessor tagProcessor, final Request context, final ObjectAdapter element) {
final String rowId = context.mapObject(element, Scope.INTERACTION);
final String scope = linkRow == null ? "" : "&" + SCOPE + "=" + linkRow.getScope();
String result = "";
result = context.encodedInteractionParameters();
if (noColumns == 0) {
- request.appendHtml("<td>");
+ tagProcessor.appendHtml("<td>");
if (linkRow != null) {
- request.appendHtml("<td><a href=\"" + linkRow.getForwardView() + "?" + linkRow.getVariable() + "=" + rowId + result + scope + "\">");
- request.appendAsHtmlEncoded(element.titleString());
- request.appendHtml("</a>");
+ tagProcessor.appendHtml("<td><a href=\"" + linkRow.getForwardView() + "?" + linkRow.getVariable() + "=" + rowId + result + scope + "\">");
+ tagProcessor.appendAsHtmlEncoded(element.titleString());
+ tagProcessor.appendHtml("</a>");
} else {
- request.appendAsHtmlEncoded(element.titleString());
+ tagProcessor.appendAsHtmlEncoded(element.titleString());
}
- request.appendHtml("</td>");
+ tagProcessor.appendHtml("</td>");
} else {
if (showTitle) {
- request.appendHtml("<td>");
- request.appendAsHtmlEncoded(element.titleString());
- request.appendHtml("</td>");
+ tagProcessor.appendHtml("<td>");
+ tagProcessor.appendAsHtmlEncoded(element.titleString());
+ tagProcessor.appendHtml("</td>");
}
for (int i = 0; i < noColumns; i++) {
if (fields.get(i).isOneToManyAssociation()) {
continue;
}
- request.appendHtml("<td>");
+ tagProcessor.appendHtml("<td>");
final ObjectAdapter field = fields.get(i).get(element);
if (field != null) {
if (showIcons && !fields.get(i).getSpecification().containsFacet(ParseableFacet.class)) {
- request.appendHtml("<img class=\"" + "small-icon" + "\" src=\"" + request.getContext().imagePath(field) + "\" alt=\"" + fields.get(i).getSpecification().getShortIdentifier() + "\"/>");
+ tagProcessor.appendHtml("<img class=\"" + "small-icon" + "\" src=\"" + tagProcessor.getContext().imagePath(field) + "\" alt=\"" + fields.get(i).getSpecification().getShortIdentifier() + "\"/>");
}
if (linkRow != null) {
- request.appendHtml("<a href=\"" + linkRow.getForwardView() + "?" + linkRow.getVariable() + "=" + rowId + result + scope + "\">");
+ tagProcessor.appendHtml("<a href=\"" + linkRow.getForwardView() + "?" + linkRow.getVariable() + "=" + rowId + result + scope + "\">");
} else if (linkedFields[i] != null) {
final ObjectAdapter fieldObject = fields.get(i).get(element);
final String id = context.mapObject(fieldObject, Scope.INTERACTION);
- request.appendHtml("<a href=\"" + linkedFields[i].getForwardView() + "?" + linkedFields[i].getVariable() + "=" + id + "\">");
- context.mapObject(fieldObject, RequestContext.scope(linkedFields[i].getScope()));
+ tagProcessor.appendHtml("<a href=\"" + linkedFields[i].getForwardView() + "?" + linkedFields[i].getVariable() + "=" + id + "\">");
+ context.mapObject(fieldObject, Request.scope(linkedFields[i].getScope()));
}
try {
- request.appendAsHtmlEncoded(field.titleString());
+ tagProcessor.appendAsHtmlEncoded(field.titleString());
} catch (final ObjectNotFoundException e) {
- request.appendAsHtmlEncoded(e.getMessage());
+ tagProcessor.appendAsHtmlEncoded(e.getMessage());
}
if (linkRow != null || linkedFields[i] != null) {
- request.appendHtml("</a>");
+ tagProcessor.appendHtml("</a>");
}
}
- request.appendHtml("</td>");
+ tagProcessor.appendHtml("</td>");
}
}
- request.appendHtml("<td class=\"controls\">");
+ tagProcessor.appendHtml("<td class=\"controls\">");
if (showSelectOption) {
- request.appendHtml("<a class=\"button element-select\" href=\"" + "_generic." + Dispatcher.EXTENSION + "?" + RequestContext.RESULT + "=" + rowId + result + scope + "\">view</a>");
+ tagProcessor.appendHtml("<a class=\"button element-select\" href=\"" + "_generic." + Names.EXTENSION + "?" + Names.RESULT + "=" + rowId + result + scope + "\">view</a>");
}
if (showEditOption) {
- request.appendHtml(" <a class=\"button element-edit\" href=\"" + "_generic_edit." + Dispatcher.EXTENSION + "?" + RequestContext.RESULT + "=" + rowId + result + scope + "\">edit</a>");
+ tagProcessor.appendHtml(" <a class=\"button element-edit\" href=\"" + "_generic_edit." + Names.EXTENSION + "?" + Names.RESULT + "=" + rowId + result + scope + "\">edit</a>");
}
if (showDeleteOption && parent != null) {
- String view = request.getViewPath();
+ String view = tagProcessor.getViewPath();
view = context.fullFilePath(view == null ? context.getResourceFile() : view);
- RemoveElement.write(request, context.getMappedObject(parent), fieldName, element, null, view, view, "delete", "action in-line element-delete confirm");
+ RemoveElement.write(tagProcessor, context.getMappedObject(parent), fieldName, element, null, view, view, "delete", "action in-line element-delete confirm");
}
- request.appendHtml("</td>");
+ tagProcessor.appendHtml("</td>");
}
}
@Override
protected TableContentWriter createRowBuilder(
- final Request request,
- final RequestContext context,
+ final TagProcessor tagProcessor,
+ final Request context,
final String parent,
final List<ObjectAssociation> allFields,
final ObjectAdapter collection) {
- final String fieldName = request.getOptionalProperty(FIELD);
- final String title = request.getOptionalProperty(FORM_TITLE);
- return rowBuilder(request, context, title, parent, fieldName, allFields, showIconByDefault());
+ final String fieldName = tagProcessor.getOptionalProperty(FIELD);
+ final String title = tagProcessor.getOptionalProperty(FORM_TITLE);
+ return rowBuilder(tagProcessor, context, title, parent, fieldName, allFields, showIconByDefault());
}
private static TableContentWriter rowBuilder(
- final Request request,
- final RequestContext context,
+ final TagProcessor tagProcessor,
+ final Request context,
final String title,
final String object,
final String fieldName,
final List<ObjectAssociation> allFields,
final boolean showIconByDefault) {
- final String linkRowView = request.getOptionalProperty(LINK_VIEW);
- final String linkObjectName = request.getOptionalProperty(ELEMENT_NAME, RequestContext.RESULT);
- final String linkObjectScope = request.getOptionalProperty(SCOPE, Scope.INTERACTION.toString());
+ final String linkRowView = tagProcessor.getOptionalProperty(LINK_VIEW);
+ final String linkObjectName = tagProcessor.getOptionalProperty(ELEMENT_NAME, Names.RESULT);
+ final String linkObjectScope = tagProcessor.getOptionalProperty(SCOPE, Scope.INTERACTION.toString());
final LinkedObject linkRow = linkRowView == null ? null : new LinkedObject(linkObjectName, linkObjectScope, context.fullUriPath(linkRowView));
- final boolean includeHeader = request.isRequested(HEADER, true);
- final boolean includeFooter = request.isRequested(FOOTER, false);
+ final boolean includeHeader = tagProcessor.isRequested(HEADER, true);
+ final boolean includeFooter = tagProcessor.isRequested(FOOTER, false);
- final boolean linkFields = request.isRequested("link-fields", true);
- final boolean showTitle = request.isRequested(SHOW_TITLE, false);
- final boolean showIcons = request.isRequested(SHOW_ICON, showIconByDefault);
- final boolean showSelectOption = request.isRequested(SHOW_SELECT, true);
- final boolean showEditOption = request.isRequested(SHOW_EDIT, true);
- final boolean showDeleteOption = request.isRequested(SHOW_DELETE, true);
+ final boolean linkFields = tagProcessor.isRequested("link-fields", true);
+ final boolean showTitle = tagProcessor.isRequested(SHOW_TITLE, false);
+ final boolean showIcons = tagProcessor.isRequested(SHOW_ICON, showIconByDefault);
+ final boolean showSelectOption = tagProcessor.isRequested(SHOW_SELECT, true);
+ final boolean showEditOption = tagProcessor.isRequested(SHOW_EDIT, true);
+ final boolean showDeleteOption = tagProcessor.isRequested(SHOW_DELETE, true);
- final String noColumnsString = request.getOptionalProperty("no-columns", "3");
+ final String noColumnsString = tagProcessor.getOptionalProperty("no-columns", "3");
final LinkedFieldsBlock block = new LinkedFieldsBlock();
- request.setBlockContent(block);
- request.processUtilCloseTag();
+ tagProcessor.setBlockContent(block);
+ tagProcessor.processUtilCloseTag();
final List<ObjectAssociation> fields = block.includedFields(allFields);
final LinkedObject[] linkedFields = block.linkedFields(fields);
for (int i = 0; i < linkedFields.length; i++) {
@@ -278,14 +278,14 @@ public class TableView extends AbstractTableView {
headers[h++] = fields.get(i).getName();
}
- request.popBlockContent();
+ tagProcessor.popBlockContent();
return new SimpleTableBuilder(object, includeHeader, includeFooter, title, noColumns, headers, fields, showTitle,
showIcons, showSelectOption, showDeleteOption, showEditOption, fieldName, linkedFields, linkRow);
}
public static void write(
- final Request request,
+ final TagProcessor tagProcessor,
final String summary,
final ObjectAdapter object,
final ObjectAssociation field,
@@ -315,10 +315,10 @@ public class TableView extends AbstractTableView {
headers[h++] = fields.get(i).getName();
}
- final RequestContext context = request.getContext();
- final TableContentWriter rowBuilder = rowBuilder(request, context, null, context.mapObject(object, Scope.REQUEST), field.getIdentifier().getMemberName(), fields,
+ final Request context = tagProcessor.getContext();
+ final TableContentWriter rowBuilder = rowBuilder(tagProcessor, context, null, context.mapObject(object, Scope.REQUEST), field.getIdentifier().getMemberName(), fields,
showIconByDefault);
- write(request, collection, summary, rowBuilder, null, null, null);
+ write(tagProcessor, collection, summary, rowBuilder, null, null, null);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Title.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Title.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Title.java
index d3b6904..76f8278 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Title.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Title.java
@@ -23,22 +23,22 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.ForbiddenException;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.ForbiddenException;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
import org.apache.isis.viewer.scimpi.dispatcher.util.MethodsUtils;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
public class Title extends AbstractElementProcessor {
@Override
- public void process(final Request request) {
- final String id = request.getOptionalProperty(OBJECT);
- final String fieldName = request.getOptionalProperty(FIELD);
- final int truncateTo = Integer.valueOf(request.getOptionalProperty(TRUNCATE, "0")).intValue();
- final boolean isIconShowing = request.isRequested(SHOW_ICON, showIconByDefault());
- String className = request.getOptionalProperty(CLASS);
+ public void process(final TagProcessor tagProcessor) {
+ final String id = tagProcessor.getOptionalProperty(OBJECT);
+ final String fieldName = tagProcessor.getOptionalProperty(FIELD);
+ final int truncateTo = Integer.valueOf(tagProcessor.getOptionalProperty(TRUNCATE, "0")).intValue();
+ final boolean isIconShowing = tagProcessor.isRequested(SHOW_ICON, showIconByDefault());
+ String className = tagProcessor.getOptionalProperty(CLASS);
className = className == null ? "title-icon" : className;
- ObjectAdapter object = MethodsUtils.findObject(request.getContext(), id);
+ ObjectAdapter object = MethodsUtils.findObject(tagProcessor.getContext(), id);
if (fieldName != null) {
final ObjectAssociation field = object.getSpecification().getAssociation(fieldName);
if (field.isVisible(IsisContext.getAuthenticationSession(), object, Where.ANYWHERE).isVetoed()) {
@@ -48,16 +48,16 @@ public class Title extends AbstractElementProcessor {
}
if (object != null) {
- request.appendHtml("<span class=\"object\">");
+ tagProcessor.appendHtml("<span class=\"object\">");
IsisContext.getPersistenceSession().resolveImmediately(object);
if (isIconShowing) {
- final String iconPath = request.getContext().imagePath(object);
- request.appendHtml("<img class=\"" + className + "\" src=\"" + iconPath + "\" />");
+ final String iconPath = tagProcessor.getContext().imagePath(object);
+ tagProcessor.appendHtml("<img class=\"" + className + "\" src=\"" + iconPath + "\" />");
}
- request.appendTruncated(object.titleString(), truncateTo);
- request.appendHtml("</span>");
+ tagProcessor.appendTruncated(object.titleString(), truncateTo);
+ tagProcessor.appendHtml("</span>");
}
- request.closeEmpty();
+ tagProcessor.closeEmpty();
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Warnings.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Warnings.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Warnings.java
index ca0becb..f6ea1a3 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Warnings.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Warnings.java
@@ -23,20 +23,20 @@ import java.util.List;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.transaction.MessageBroker;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
public class Warnings extends AbstractElementProcessor {
@Override
- public void process(final Request request) {
- final String cls = request.getOptionalProperty(CLASS);
+ public void process(final TagProcessor tagProcessor) {
+ final String cls = tagProcessor.getOptionalProperty(CLASS);
final StringBuffer buffer = new StringBuffer();
write(cls, buffer);
if (buffer.length() > 0) {
- request.appendHtml("<div class=\"feedback\">");
- request.appendHtml(buffer.toString());
- request.appendHtml("</div>");
+ tagProcessor.appendHtml("<div class=\"feedback\">");
+ tagProcessor.appendHtml(buffer.toString());
+ tagProcessor.appendHtml("</div>");
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java
index 9ff4eff..468fc6a 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java
@@ -33,16 +33,18 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
import org.apache.isis.core.progmodel.facets.object.choices.enums.EnumFacet;
import org.apache.isis.core.progmodel.facets.value.booleans.BooleanValueFacet;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
-import org.apache.isis.viewer.scimpi.dispatcher.edit.EditAction;
-import org.apache.isis.viewer.scimpi.dispatcher.edit.FieldEditState;
-import org.apache.isis.viewer.scimpi.dispatcher.edit.FormState;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.action.EditAction;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request.Scope;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.structure.FieldEditState;
+import org.apache.isis.viewer.scimpi.dispatcher.structure.FormState;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
import org.apache.isis.viewer.scimpi.dispatcher.view.form.HiddenInputField;
import org.apache.isis.viewer.scimpi.dispatcher.view.form.HtmlFormBuilder;
import org.apache.isis.viewer.scimpi.dispatcher.view.form.InputField;
+import org.apache.isis.viewer.scimpi.dispatcher.view.widget.FieldFactory;
+import org.apache.isis.viewer.scimpi.dispatcher.view.widget.FormFieldBlock;
public class EditObject extends AbstractElementProcessor {
@@ -50,30 +52,30 @@ public class EditObject extends AbstractElementProcessor {
private final Where where = Where.OBJECT_FORMS;
@Override
- public void process(final Request request) {
- final RequestContext context = request.getContext();
-
- final String objectId = request.getOptionalProperty(OBJECT);
- final String forwardEditedTo = request.getOptionalProperty(VIEW);
- final String forwardErrorTo = request.getOptionalProperty(ERROR);
- final String cancelTo = request.getOptionalProperty(CANCEL_TO);
- final boolean hideNonEditableFields = request.isRequested(HIDE_UNEDITABLE, false);
- final boolean showIcon = request.isRequested(SHOW_ICON, showIconByDefault());
- final String labelDelimiter = request.getOptionalProperty(LABEL_DELIMITER, ":");
- String buttonTitle = request.getOptionalProperty(BUTTON_TITLE);
- String formTitle = request.getOptionalProperty(FORM_TITLE);
- final String formId = request.getOptionalProperty(FORM_ID, request.nextFormId());
- final String variable = request.getOptionalProperty(RESULT_NAME);
- final String resultOverride = request.getOptionalProperty(RESULT_OVERRIDE);
- final String scope = request.getOptionalProperty(SCOPE);
- final String className = request.getOptionalProperty(CLASS, "edit full");
- final String completionMessage = request.getOptionalProperty(MESSAGE);
+ public void process(final TagProcessor tagProcessor) {
+ final Request context = tagProcessor.getContext();
+
+ final String objectId = tagProcessor.getOptionalProperty(OBJECT);
+ final String forwardEditedTo = tagProcessor.getOptionalProperty(VIEW);
+ final String forwardErrorTo = tagProcessor.getOptionalProperty(ERROR);
+ final String cancelTo = tagProcessor.getOptionalProperty(CANCEL_TO);
+ final boolean hideNonEditableFields = tagProcessor.isRequested(HIDE_UNEDITABLE, false);
+ final boolean showIcon = tagProcessor.isRequested(SHOW_ICON, showIconByDefault());
+ final String labelDelimiter = tagProcessor.getOptionalProperty(LABEL_DELIMITER, ":");
+ String buttonTitle = tagProcessor.getOptionalProperty(BUTTON_TITLE);
+ String formTitle = tagProcessor.getOptionalProperty(FORM_TITLE);
+ final String formId = tagProcessor.getOptionalProperty(FORM_ID, tagProcessor.nextFormId());
+ final String variable = tagProcessor.getOptionalProperty(RESULT_NAME);
+ final String resultOverride = tagProcessor.getOptionalProperty(RESULT_OVERRIDE);
+ final String scope = tagProcessor.getOptionalProperty(SCOPE);
+ final String className = tagProcessor.getOptionalProperty(CLASS, "edit full");
+ final String completionMessage = tagProcessor.getOptionalProperty(MESSAGE);
final ObjectAdapter object = context.getMappedObjectOrResult(objectId);
final String actualObjectId = context.mapObject(object, Scope.INTERACTION);
final String version = context.mapVersion(object);
- final String id = request.getOptionalProperty(ID, object.getSpecification().getShortIdentifier());
+ final String id = tagProcessor.getOptionalProperty(ID, object.getSpecification().getShortIdentifier());
final FormState entryState = (FormState) context.getVariable(ENTRY_FIELDS);
@@ -108,8 +110,8 @@ public class EditObject extends AbstractElementProcessor {
}
};
- request.setBlockContent(containedBlock);
- request.processUtilCloseTag();
+ tagProcessor.setBlockContent(containedBlock);
+ tagProcessor.processUtilCloseTag();
final AuthenticationSession session = IsisContext.getAuthenticationSession();
List<ObjectAssociation> viewFields = specification.getAssociations(ObjectAssociationFilters.dynamicallyVisible(session, object, where));
@@ -163,9 +165,9 @@ public class EditObject extends AbstractElementProcessor {
}
final HiddenInputField[] hiddenFieldArray = hiddenFields.toArray(new HiddenInputField[hiddenFields.size()]);
- HtmlFormBuilder.createForm(request, EditAction.ACTION + ".app", hiddenFieldArray, formFields, className, id, formTitle,
+ HtmlFormBuilder.createForm(tagProcessor, EditAction.ACTION + ".app", hiddenFieldArray, formFields, className, id, formTitle,
labelDelimiter, null, null, buttonTitle, errors, cancelTo);
- request.popBlockContent();
+ tagProcessor.popBlockContent();
}
private InputField[] createFields(final List<ObjectAssociation> fields) {
@@ -187,7 +189,7 @@ public class EditObject extends AbstractElementProcessor {
}
// TODO duplicated in ActionForm#initializeFields
- private void initializeFields(final RequestContext context, final ObjectAdapter object, final InputField[] formFields, final FormState entryState, final boolean includeUnusableFields) {
+ private void initializeFields(final Request context, final ObjectAdapter object, final InputField[] formFields, final FormState entryState, final boolean includeUnusableFields) {
for (final InputField formField : formFields) {
final String fieldId = formField.getName();
final ObjectAssociation field = object.getSpecification().getAssociation(fieldId);
@@ -210,7 +212,7 @@ public class EditObject extends AbstractElementProcessor {
}
}
- private void copyFieldContent(final RequestContext context, final ObjectAdapter object, final InputField[] formFields, final boolean showIcon) {
+ private void copyFieldContent(final Request context, final ObjectAdapter object, final InputField[] formFields, final boolean showIcon) {
for (final InputField inputField : formFields) {
final String fieldName = inputField.getName();
final ObjectAssociation field = object.getSpecification().getAssociation(fieldName);
@@ -243,7 +245,7 @@ public class EditObject extends AbstractElementProcessor {
}
}
- private void setDefaults(final RequestContext context, final ObjectAdapter object, final InputField[] formFields, final FormState entryState, final boolean showIcon) {
+ private void setDefaults(final Request context, final ObjectAdapter object, final InputField[] formFields, final FormState entryState, final boolean showIcon) {
for (final InputField formField : formFields) {
final String fieldId = formField.getName();
final ObjectAssociation field = object.getSpecification().getAssociation(fieldId);
@@ -268,7 +270,7 @@ public class EditObject extends AbstractElementProcessor {
}
}
- private void overrideWithHtml(final RequestContext context, final FormFieldBlock containedBlock, final InputField[] formFields) {
+ private void overrideWithHtml(final Request context, final FormFieldBlock containedBlock, final InputField[] formFields) {
for (final InputField formField : formFields) {
final String fieldId = formField.getName();
if (containedBlock.hasContent(fieldId)) {
@@ -282,7 +284,7 @@ public class EditObject extends AbstractElementProcessor {
}
}
- private void copyEntryState(final RequestContext context, final ObjectAdapter object, final InputField[] formFields, final FormState entryState) {
+ private void copyEntryState(final Request context, final ObjectAdapter object, final InputField[] formFields, final FormState entryState) {
for (final InputField formField : formFields) {
final String fieldId = formField.getName();
final ObjectAssociation field = object.getSpecification().getAssociation(fieldId);
@@ -296,7 +298,7 @@ public class EditObject extends AbstractElementProcessor {
}
}
- private String getValue(final RequestContext context, final ObjectAdapter field) {
+ private String getValue(final Request context, final ObjectAdapter field) {
if (field == null || field.isTransient()) {
return "";
}
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java
deleted file mode 100644
index 8a90db3..0000000
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.viewer.scimpi.dispatcher.view.edit;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.help.HelpFacet;
-import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet;
-import org.apache.isis.core.metamodel.facets.multiline.MultiLineFacet;
-import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
-import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.progmodel.facets.value.booleans.BooleanValueFacet;
-import org.apache.isis.core.progmodel.facets.value.password.PasswordValueFacet;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
-import org.apache.isis.viewer.scimpi.dispatcher.view.form.InputField;
-
-public class FieldFactory {
-
- public static void initializeField(final RequestContext context, final ObjectAdapter object, final ObjectFeature param, final ObjectAdapter[] optionsForParameter, final boolean isRequired, final InputField field) {
-
- field.setLabel(param.getName());
- field.setDescription(param.getDescription());
- field.setDataType(param.getSpecification().getShortIdentifier());
- if (param instanceof ObjectMember) {
- field.setHelpReference(((ObjectMember) param).getHelp());
- } else {
- final HelpFacet helpFacet = param.getFacet(HelpFacet.class);
- final String value = helpFacet.value();
- field.setHelpReference(value);
- }
- field.setRequired(isRequired);
- field.setHidden(false);
-
- if (param.getSpecification().getFacet(ParseableFacet.class) != null) {
- final int maxLength = param.getFacet(MaxLengthFacet.class).value();
- field.setMaxLength(maxLength);
-
- final TypicalLengthFacet typicalLengthFacet = param.getFacet(TypicalLengthFacet.class);
- if (typicalLengthFacet.isDerived() && maxLength > 0) {
- field.setWidth(maxLength);
- } else {
- field.setWidth(typicalLengthFacet.value());
- }
-
- final MultiLineFacet multiLineFacet = param.getFacet(MultiLineFacet.class);
- field.setHeight(multiLineFacet.numberOfLines());
- field.setWrapped(!multiLineFacet.preventWrapping());
-
- final ObjectSpecification spec = param.getSpecification();
- if (spec.containsFacet(BooleanValueFacet.class)) {
- field.setType(InputField.CHECKBOX);
- } else if (spec.containsFacet(PasswordValueFacet.class)) {
- field.setType(InputField.PASSWORD);
- } else {
- field.setType(InputField.TEXT);
- }
-
- } else {
- field.setType(InputField.REFERENCE);
- }
-
- if (optionsForParameter != null) {
- final int noOptions = optionsForParameter.length;
- final String[] optionValues = new String[noOptions];
- final String[] optionTitles = new String[noOptions];
- for (int j = 0; j < optionsForParameter.length; j++) {
- final int i = j; // + (field.isRequired() ? 0 : 1);
- optionValues[i] = getValue(context, optionsForParameter[j]);
- optionTitles[i] = optionsForParameter[j].titleString();
- }
- field.setOptions(optionTitles, optionValues);
- }
- }
-
- private static String getValue(final RequestContext context, final ObjectAdapter field) {
- if (field == null) {
- return "";
- }
- if (field.getSpecification().getFacet(ParseableFacet.class) == null) {
- return context.mapObject(field, Scope.INTERACTION);
- } else {
- return field.getObject().toString();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FormEntry.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FormEntry.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FormEntry.java
deleted file mode 100644
index 5d57740..0000000
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FormEntry.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.viewer.scimpi.dispatcher.view.edit;
-
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
-
-public class FormEntry extends AbstractElementProcessor {
-
- @Override
- public void process(final Request request) {
- final FormFieldBlock block = (FormFieldBlock) request.getBlockContent();
- final String field = request.getRequiredProperty(FIELD);
- final String value = request.getRequiredProperty(VALUE);
- final boolean isHidden = request.isRequested(HIDDEN, true);
- block.exclude(field);
- // TODO this is replaced because the field is marked as hidden!
- final String content = "reference <input type=\"" + (isHidden ? "hidden" : "text") + "\" disabled=\"disabled\" name=\"" + field + "\" value=\"" + value + "\" />";
- block.replaceContent(field, content);
- }
-
- @Override
- public String getName() {
- return "form-entry";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FormField.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FormField.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FormField.java
deleted file mode 100644
index 55c7425..0000000
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FormField.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.viewer.scimpi.dispatcher.view.edit;
-
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
-
-public class FormField extends AbstractElementProcessor {
-
- @Override
- public void process(final Request request) {
- final FormFieldBlock block = (FormFieldBlock) request.getBlockContent();
- final String field = request.getRequiredProperty(FIELD);
- if (block.isVisible(field)) {
- request.pushNewBuffer();
- request.processUtilCloseTag();
- final String content = request.popBuffer();
- block.replaceContent(field, content);
- }
- }
-
- @Override
- public String getName() {
- return "form-field";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FormFieldBlock.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FormFieldBlock.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FormFieldBlock.java
deleted file mode 100644
index 294a239..0000000
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FormFieldBlock.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.viewer.scimpi.dispatcher.view.edit;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.viewer.scimpi.dispatcher.view.field.InclusionList;
-import org.apache.isis.viewer.scimpi.dispatcher.view.form.InputField;
-
-public class FormFieldBlock extends InclusionList {
- private final Map<String, String> content = new HashMap<String, String>();
- private final Map<String, String> values = new HashMap<String, String>();
-
- public void replaceContent(final String field, final String htmlString) {
- content.put(field, htmlString);
- }
-
- public boolean hasContent(final String name) {
- return content.containsKey(name);
- }
-
- public String getContent(final String name) {
- return content.get(name);
- }
-
- public boolean isVisible(final String name) {
- return true;
- }
-
- public boolean isNullable(final String name) {
- return true;
- }
-
- public ObjectAdapter getCurrent(final String name) {
- return null;
- }
-
- public void value(final String field, final String value) {
- values.put(field, value);
- }
-
- public void setUpValues(final InputField[] inputFields) {
- for (final InputField inputField : inputFields) {
- final String name = inputField.getName();
- inputField.setValue(values.get(name));
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/HiddenField.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/HiddenField.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/HiddenField.java
deleted file mode 100644
index 71019ea..0000000
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/HiddenField.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.viewer.scimpi.dispatcher.view.edit;
-
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.BlockContent;
-import org.apache.isis.viewer.scimpi.dispatcher.TagOrderException;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
-
-public class HiddenField extends AbstractElementProcessor {
-
- @Override
- public void process(final Request request) {
- final BlockContent blockContent = request.getBlockContent();
- if (!(blockContent instanceof FormFieldBlock)) {
- throw new TagOrderException(request);
- }
-
- final String field = request.getOptionalProperty("name");
- final String value = request.getRequiredProperty("value");
- final FormFieldBlock block = (FormFieldBlock) blockContent;
- block.value(field, value);
- block.exclude(field);
- }
-
- @Override
- public String getName() {
- return "hidden-field";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/RadioListField.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/RadioListField.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/RadioListField.java
deleted file mode 100644
index 7b3c1e6..0000000
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/RadioListField.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.viewer.scimpi.dispatcher.view.edit;
-
-import java.util.Iterator;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
-
-public class RadioListField extends AbstractElementProcessor {
-
- @Override
- public void process(final Request request) {
- final FormFieldBlock block = (FormFieldBlock) request.getBlockContent();
- final String field = request.getRequiredProperty(FIELD);
- if (block.isVisible(field)) {
- final String id = request.getRequiredProperty(COLLECTION);
- final String exclude = request.getOptionalProperty("exclude");
-
- final ObjectAdapter collection = request.getContext().getMappedObjectOrResult(id);
-
- final RequestContext context = request.getContext();
- final CollectionFacet facet = collection.getSpecification().getFacet(CollectionFacet.class);
- final Iterator<ObjectAdapter> iterator = facet.iterator(collection);
-
- final StringBuffer buffer = new StringBuffer();
-
- while (iterator.hasNext()) {
- final ObjectAdapter element = iterator.next();
- final Scope scope = Scope.INTERACTION;
- final String elementId = context.mapObject(element, scope);
- if (exclude != null && context.getMappedObject(exclude) == element) {
- continue;
- }
- final String title = element.titleString();
- final String checked = "";
- buffer.append("<input type=\"radio\" name=\"" + field + "\" value=\"" + elementId + "\"" + checked + " />" + title + "</input><br/>\n");
- }
-
- block.replaceContent(field, buffer.toString());
- }
- }
-
- @Override
- public String getName() {
- return "radio-list";
- }
-
-}