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 2011/01/07 14:51:50 UTC
svn commit: r1056315 - in
/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher:
./ view/action/ view/display/ view/edit/ view/form/ view/logon/ view/simple/
Author: rmatthews
Date: Fri Jan 7 13:51:49 2011
New Revision: 1056315
URL: http://svn.apache.org/viewvc?rev=1056315&view=rev
Log:
Improved table structure and changed class names for titles.
Modified:
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/AbstractElementProcessor.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Names.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionForm.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/CreateFormParameter.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Methods.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractFormView.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractTableView.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/SelectedObject.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableCell.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/Selector.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/form/InputForm.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Logon.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractLink.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/AbstractElementProcessor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/AbstractElementProcessor.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/AbstractElementProcessor.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/AbstractElementProcessor.java Fri Jan 7 13:51:49 2011
@@ -39,45 +39,5 @@ public abstract class AbstractElementPro
}
return cls;
}
- /*
- protected static final String COLLECTION = "collection";
- protected static final String CONFIRM = "confirm";
- protected static final String CLASS = "class";
- protected static final String DEFAULT = "default";
- protected static final String ELEMENT_NAME = "element-name";
- protected static final String EVEN_ROW_CLASS = "even-row";
- protected static final String ERRORS = "error";
- protected static final String FIELD = "field";
- protected static final String FIELD_NAME = "field-name";
- protected static final String FORMS = "show-forms";
- protected static final String HEADING = "heading";
- protected static final String ICON_CLASS = "icon";
- protected static final String HIDDEN = "hidden";
- protected static final String HEADER_LEVEL = "header";
- protected static final String ID = "id";
- protected static final String LEGEND = "legend";
- protected static final String LINK = "link";
- protected static final String METHOD = "method";
- protected static final String NAME = "name";
- protected static final String ODD_ROW_CLASS = "odd-row";
- protected static final String OBJECT = "object";
- protected static final String PARAMETER_NUMBER = "number";
- protected static final String PLURAL = "plural";
- protected static final String REFERENCE_NAME = "reference-name";
- protected static final String RESULT_NAME = "result-name";
- protected static final String RESULT_OVERRIDE = "result-override";
- protected static final String SCOPE = "scope";
- protected static final String SHOW_ICON = "icon";
- protected static final String SHOW_SELECT = "select";
- protected static final String SHOW_EDIT = "edit";
- protected static final String SHOW_DELETE = "delete";
- protected static final String TITLE = "title";
- protected static final String TRUNCATE = "truncate";
- protected static final String TYPE = "type";
- protected static final String VIEW = "view";
- protected static final String VALUE = "value";
- protected static final String VOID = "void";
- protected static final String WHEN = "when";
- */
}
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Names.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Names.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Names.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Names.java Fri Jan 7 13:51:49 2011
@@ -21,6 +21,7 @@
package org.apache.isis.viewer.scimpi.dispatcher;
public interface Names {
+ static final String BUTTON_TITLE = "button-title";
static final String COLLECTION = "collection";
static final String CONFIRM = "confirm";
static final String CLASS = "class";
@@ -33,13 +34,13 @@ public interface Names {
static final String FIELD = "field";
static final String FIELD_NAME = "field-name";
static final String FOOTING = "footing";
+ static final String FORM_TITLE = "title";
static final String FORMS = "show-forms";
static final String HEADING = "heading";
static final String ICON_CLASS = "icon";
static final String HIDDEN = "hidden";
static final String HEADER_LEVEL = "header";
static final String ID = "id";
- static final String LEGEND = "legend";
static final String LINK = "link";
static final String METHOD = "method";
static final String NAME = "name";
@@ -57,7 +58,6 @@ public interface Names {
static final String SHOW_SELECT = "select";
static final String SHOW_EDIT = "edit";
static final String SHOW_DELETE = "delete";
- static final String TITLE = "title";
static final String TRUNCATE = "truncate";
static final String TYPE = "type";
static final String VIEW = "view";
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java Fri Jan 7 13:51:49 2011
@@ -44,7 +44,7 @@ public class ActionButton extends Abstra
String forwardErrorTo = request.getOptionalProperty(ERRORS);
String variable = request.getOptionalProperty(RESULT_NAME);
String scope = request.getOptionalProperty(SCOPE);
- String buttonTitle = request.getOptionalProperty(TITLE);
+ String buttonTitle = request.getOptionalProperty(BUTTON_TITLE);
String resultOverride = request.getOptionalProperty(RESULT_OVERRIDE);
String idName = request.getOptionalProperty(ID);
String className = request.getOptionalProperty(CLASS);
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionForm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionForm.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionForm.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionForm.java Fri Jan 7 13:51:49 2011
@@ -51,8 +51,8 @@ public class ActionForm extends Abstract
parameters.forwardResultTo = request.getOptionalProperty(VIEW);
parameters.forwardVoidTo = request.getOptionalProperty(VOID);
parameters.forwardErrorTo = request.getOptionalProperty(ERRORS);
- parameters.buttonTitle = request.getOptionalProperty(TITLE, "OK");
- parameters.legend = request.getOptionalProperty(LEGEND);
+ parameters.buttonTitle = request.getOptionalProperty(BUTTON_TITLE, "OK");
+ parameters.formTitle = request.getOptionalProperty(FORM_TITLE);
parameters.resultName = request.getOptionalProperty(RESULT_NAME);
parameters.resultOverride = request.getOptionalProperty(RESULT_OVERRIDE);
parameters.scope = request.getOptionalProperty(SCOPE);
@@ -132,15 +132,15 @@ public class ActionForm extends Abstract
}
overrideWithHtml(context, containedBlock, formFields);
- String legend;
- if (parameterObject.legend == null) {
- legend = action.getName();
+ String formTitle;
+ if (parameterObject.formTitle == null) {
+ formTitle = action.getName();
} else {
- legend = parameterObject.legend;
+ formTitle = parameterObject.formTitle;
}
InputForm.createForm(request, ActionAction.ACTION + ".app", parameterObject.buttonTitle, formFields, hiddenFields,
- legend, parameterObject.className, parameterObject.id);
+ formTitle, parameterObject.className, parameterObject.id);
request.popBlockContent();
}
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/CreateFormParameter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/CreateFormParameter.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/CreateFormParameter.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/CreateFormParameter.java Fri Jan 7 13:51:49 2011
@@ -26,7 +26,7 @@ public class CreateFormParameter {
public String forwardVoidTo;
public String forwardErrorTo;
public String buttonTitle;
- public String legend;
+ public String formTitle;
public String resultName;
public String scope;
public String objectId;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Methods.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Methods.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Methods.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Methods.java Fri Jan 7 13:51:49 2011
@@ -133,7 +133,7 @@ public class Methods extends AbstractEle
params.methodName = action.getId();
params.forwardResultTo = "_generic." + Dispatcher.EXTENSION;
params.buttonTitle = "OK";
- params.legend = action.getName();
+ params.formTitle = action.getName();
// parameters.resultName = request.getOptionalProperty(RESULT_NAME);
// parameters.resultOverride = request.getOptionalProperty(RESULT_OVERRIDE);
// parameters.scope = request.getOptionalProperty(SCOPE);
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractFormView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractFormView.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractFormView.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractFormView.java Fri Jan 7 13:51:49 2011
@@ -44,7 +44,7 @@ public abstract class AbstractFormView e
public void process(Request request, ObjectAdapter object) {
String cls = request.getOptionalProperty(CLASS, "form");
String classString = " class=\"" + cls + "\"";
- String title = request.getOptionalProperty(TITLE);
+ String title = request.getOptionalProperty(FORM_TITLE);
String oddRowClass = request.getOptionalProperty(ODD_ROW_CLASS);
String evenRowClass = request.getOptionalProperty(EVEN_ROW_CLASS);;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractTableView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractTableView.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractTableView.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractTableView.java Fri Jan 7 13:51:49 2011
@@ -100,7 +100,9 @@ public abstract class AbstractTableView
request.appendHtml("<table summary=\"" + summary + "\">");
rowBuilder.writeHeaders(request);
+ rowBuilder.writeFooters(request);
+ request.appendHtml("<tbody>");
CollectionFacet facet = collection.getSpecification().getFacet(CollectionFacet.class);
Iterator<ObjectAdapter> iterator = facet.iterator(collection);
int row = 1;
@@ -117,7 +119,7 @@ public abstract class AbstractTableView
request.appendHtml("</tr>");
row++;
}
- rowBuilder.writeFooters(request);
+ request.appendHtml("</tbody>");
request.appendHtml("</table>");
}
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/SelectedObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/SelectedObject.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/SelectedObject.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/SelectedObject.java Fri Jan 7 13:51:49 2011
@@ -34,11 +34,12 @@ public class SelectedObject extends Abst
String name = request.getOptionalProperty(NAME, "selected");
String objectId = request.getRequiredProperty(OBJECT);
String equalsId = request.getOptionalProperty("equals");
- String title = request.getOptionalProperty(TITLE);
+ String title = request.getOptionalProperty(BUTTON_TITLE);
ObjectAdapter object = request.getContext().getMappedObjectOrResult(objectId);
ObjectAdapter other = request.getContext().getMappedObjectOrResult(equalsId);
if (object == other || object.equals(title)) {
+ // TODO title is not being used!
request.getContext().addVariable(ID, " id=\"" + name + "\" ", Scope.INTERACTION);
} else {
request.getContext().addVariable(ID, "", Scope.INTERACTION);
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableCell.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableCell.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableCell.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableCell.java Fri Jan 7 13:51:49 2011
@@ -35,6 +35,8 @@ public class TableCell extends AbstractE
public void process(Request request) {
String id = request.getOptionalProperty(OBJECT);
String fieldName = request.getRequiredProperty(FIELD);
+ String className = request.getOptionalProperty(CLASS);
+ className = className == null ? "cell" : className;
ObjectAdapter object = request.getContext().getMappedObjectOrVariable(id, ELEMENT);
ObjectAssociation field = object.getSpecification().getAssociation(fieldName);
if (field == null) {
@@ -43,7 +45,7 @@ public class TableCell extends AbstractE
if (field.isVisible(IsisContext.getAuthenticationSession(), object).isVetoed()) {
throw new ForbiddenException("Field " + fieldName + " in " + object + " is not visible");
}
- request.appendHtml("<td>");
+ request.appendHtml("<td " + className + ">");
ObjectAdapter fieldReference = field.get(object);
String source = fieldReference == null ? "" : request.getContext().mapObject(fieldReference, Scope.REQUEST);
String name = request.getOptionalProperty(RESULT_NAME, fieldName);
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java Fri Jan 7 13:51:49 2011
@@ -41,6 +41,7 @@ public class TableView extends AbstractT
private final String parent;
private final boolean includeHeading;
private final boolean includeFooting;
+ private final String title;
private final String[] headers;
private final List<ObjectAssociation> fields;
private final boolean showSelectOption;
@@ -54,6 +55,7 @@ public class TableView extends AbstractT
String parent,
boolean includeHeading,
boolean includeFooting,
+ String title,
String[] headers,
List<ObjectAssociation> fields,
boolean showSelectOption,
@@ -65,6 +67,7 @@ public class TableView extends AbstractT
this.parent = parent;
this.includeHeading = includeHeading;
this.includeFooting = includeFooting;
+ this.title = title;
this.headers = headers;
this.fields = fields;
this.showSelectOption = showSelectOption;
@@ -78,27 +81,40 @@ public class TableView extends AbstractT
@Override
public void writeFooters(PageWriter writer) {
if (includeFooting) {
+ writer.appendHtml("<tfooter>");
headerRow(writer, headers);
+ writer.appendHtml("</tfooter>");
}
}
@Override
public void writeHeaders(PageWriter writer) {
if (includeHeading) {
+ writer.appendHtml("<theader>");
+ titleRow(writer);
headerRow(writer, headers);
+ writer.appendHtml("</theader>");
}
}
- private void headerRow(final PageWriter request, final String[] headers) {
- request.appendHtml("<tr>");
+ private void titleRow(final PageWriter writer) {
+ if (title != null) {
+ writer.appendHtml("<tr colspan=\"" + fields.size() +"\">");
+ writer.appendHtml("<th class=\"title\">" + title + "</th>");
+ writer.appendHtml("</tr>");
+ }
+ }
+
+ private void headerRow(final PageWriter writer, final String[] headers) {
+ writer.appendHtml("<tr>");
String[] columnHeaders = headers;
for (int i = 0; i < columnHeaders.length; i++) {
if (columnHeaders[i] != null) {
- request.appendHtml("<th>" + columnHeaders[i] + "</th>");
+ writer.appendHtml("<th>" + columnHeaders[i] + "</th>");
}
}
- request.appendHtml("<th>" + "</th>");
- request.appendHtml("</tr>");
+ writer.appendHtml("<th>" + "</th>");
+ writer.appendHtml("</tr>");
}
@Override
@@ -195,7 +211,8 @@ public class TableView extends AbstractT
context.fullUriPath(linkRowView));
final boolean includeHeading = request.isRequested(HEADING, true);
final boolean includeFooting = request.isRequested(FOOTING, false);
-
+ final String title = request.getOptionalProperty(FORM_TITLE);
+
boolean linkFields = request.isRequested("link-fields", true);
final boolean showSelectOption = request.isRequested(SHOW_SELECT, true);
final boolean showEditOption = request.isRequested(SHOW_EDIT, true);
@@ -226,7 +243,7 @@ public class TableView extends AbstractT
request.popBlockContent();
- return new SimpleTableBuilder(object, includeHeading, includeFooting, headers, fields, showSelectOption, showDeleteOption,
+ return new SimpleTableBuilder(object, includeHeading, includeFooting, title, headers, fields, showSelectOption, showDeleteOption,
showEditOption, fieldName, linkedFields, linkRow);
}
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java Fri Jan 7 13:51:49 2011
@@ -52,8 +52,8 @@ public class EditObject extends Abstract
String forwardEditedTo = request.getOptionalProperty(VIEW);
String forwardErrorTo = request.getOptionalProperty(ERRORS);
boolean hideNonEditableFields = request.isRequested("hide-uneditable", false);
- String buttonTitle = request.getOptionalProperty(TITLE, "Save");
- String legend = request.getOptionalProperty(LEGEND);
+ String buttonTitle = request.getOptionalProperty(BUTTON_TITLE, "Save");
+ String formTitle = request.getOptionalProperty(FORM_TITLE);
String variable = request.getOptionalProperty(RESULT_NAME);
String resultOverride = request.getOptionalProperty(RESULT_OVERRIDE);
String scope = request.getOptionalProperty(SCOPE);
@@ -99,7 +99,7 @@ public class EditObject extends Abstract
resultOverride == null ? null : new HiddenInputField(RESULT_OVERRIDE, resultOverride),
scope == null ? null : new HiddenInputField(SCOPE, scope) };
- InputForm.createForm(request, EditAction.ACTION + ".app", buttonTitle, formFields, hiddenFields, legend, className, id);
+ InputForm.createForm(request, EditAction.ACTION + ".app", buttonTitle, formFields, hiddenFields, formTitle, className, id);
request.popBlockContent();
}
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/Selector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/Selector.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/Selector.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/Selector.java Fri Jan 7 13:51:49 2011
@@ -69,8 +69,8 @@ public class Selector extends AbstractEl
CreateFormParameter parameters = new CreateFormParameter();
parameters.objectId = objectId;
parameters.methodName = methodName;
- parameters.buttonTitle = request.getOptionalProperty(TITLE, "Search");
- parameters.legend = request.getOptionalProperty(LEGEND);
+ parameters.buttonTitle = request.getOptionalProperty(BUTTON_TITLE, "Search");
+ parameters.formTitle = request.getOptionalProperty(FORM_TITLE);
parameters.className = request.getOptionalProperty(CLASS, "selector");
parameters.id = request.getOptionalProperty(ID);
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/form/InputForm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/form/InputForm.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/form/InputForm.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/form/InputForm.java Fri Jan 7 13:51:49 2011
@@ -33,15 +33,15 @@ public class InputForm {
String buttonTitle,
InputField[] fields,
HiddenInputField[] hiddenFields,
- String legend,
+ String formTitle,
String className,
String id) {
String classSegment = " class=\"" + className + (id == null ? "\"" : "\" id=\"" + id + "\"");
request.appendHtml("<form " + classSegment + " action=\"" + action + "\" method=\"post\" accept-charset=\"ISO-8859-1\">\n");
- if (legend != null && legend.trim().length() > 0) {
- classSegment = " class=\"legend\"";
- request.appendHtml("<div" + classSegment +">" + legend + "</div>\n");
+ if (formTitle != null && formTitle.trim().length() > 0) {
+ classSegment = " class=\"title\"";
+ request.appendHtml("<div" + classSegment +">" + formTitle + "</div>\n");
}
// TODO reinstate fieldsets when we can specify them
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Logon.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Logon.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Logon.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Logon.java Fri Jan 7 13:51:49 2011
@@ -64,11 +64,11 @@ public class Logon extends AbstractEleme
InputField[] fields = new InputField[] { nameField, passwordField, };
- String legend = request.getOptionalProperty(LEGEND);
- String loginButtonTitle = request.getOptionalProperty(TITLE, "Log in");
+ String formTitle = request.getOptionalProperty(FORM_TITLE);
+ String loginButtonTitle = request.getOptionalProperty(BUTTON_TITLE, "Log in");
String className = request.getOptionalProperty(CLASS, "login");
String id = request.getOptionalProperty(ID);
- InputForm.createForm(request, "logon.app", loginButtonTitle, fields, hiddenFields.toArray(new HiddenInputField[hiddenFields.size()]), legend, className, id);
+ InputForm.createForm(request, "logon.app", loginButtonTitle, fields, hiddenFields.toArray(new HiddenInputField[hiddenFields.size()]), formTitle, className, id);
}
public String getName() {
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractLink.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractLink.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractLink.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractLink.java Fri Jan 7 13:51:49 2011
@@ -35,7 +35,7 @@ import org.apache.isis.viewer.scimpi.dis
public abstract class AbstractLink extends AbstractElementProcessor {
public void process(Request request) {
- String title = request.getOptionalProperty(TITLE);
+ String title = request.getOptionalProperty(FORM_TITLE);
String name = request.getOptionalProperty(NAME);
String cls = request.getOptionalProperty(CLASS, "action");
String object = request.getOptionalProperty(OBJECT);
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java?rev=1056315&r1=1056314&r2=1056315&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java Fri Jan 7 13:51:49 2011
@@ -43,7 +43,7 @@ public class RemoveElement extends Abstr
@Override
public void process(Request request) {
- String title = request.getOptionalProperty(TITLE, "Delete");
+ String title = request.getOptionalProperty(BUTTON_TITLE, "Delete");
String cls = request.getOptionalProperty(CLASS, "element-delete");
String object = request.getOptionalProperty(OBJECT);
String resultOverride = request.getOptionalProperty(RESULT_OVERRIDE);