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 2012/07/05 22:55:56 UTC
svn commit: r1357906 -
/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/Selector.java
Author: rmatthews
Date: Thu Jul 5 20:55:56 2012
New Revision: 1357906
URL: http://svn.apache.org/viewvc?rev=1357906&view=rev
Log:
ISIS-162 - For consistency the selector now shows selection list even for single items.
Modified:
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/Selector.java
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/Selector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/Selector.java?rev=1357906&r1=1357905&r2=1357906&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/Selector.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/Selector.java Thu Jul 5 20:55:56 2012
@@ -100,9 +100,7 @@ public class Selector extends AbstractEl
final String field = request.getRequiredProperty(FIELD);
final CollectionFacet facet = collection.getSpecification().getFacet(CollectionFacet.class);
- if (facet.size(collection) == 1 && !allowNotSet) {
- return onlyItem(request, field, collection, facet);
- } else if (type.equals("radio")) {
+ if (type.equals("radio")) {
return radioButtonList(request, field, allowNotSet, collection, selectedItem, facet);
} else if (type.equals("list")) {
final String size = request.getOptionalProperty("size", "5");
@@ -114,17 +112,6 @@ public class Selector extends AbstractEl
}
}
- private String onlyItem(final Request request, final String field, final ObjectAdapter collection, final CollectionFacet facet) {
- final RequestContext context = request.getContext();
- final Iterator<ObjectAdapter> iterator = facet.iterator(collection);
- final StringBuffer buffer = new StringBuffer();
- final ObjectAdapter element = iterator.next();
- final String elementId = context.mapObject(element, Scope.INTERACTION);
- buffer.append("<img class=\"small-icon\" src=\"" + request.getContext().imagePath(element) + "\" alt=\"" + element.getSpecification().getShortIdentifier() + "\"/>" + element.titleString() + "\n");
- buffer.append("<input type=\"hidden\" name=\"" + field + "\" value=\"" + elementId + "\" />\n");
- return buffer.toString();
- }
-
private String radioButtonList(final Request request, final String field, final boolean allowNotSet, final ObjectAdapter collection, final ObjectAdapter selectedItem, final CollectionFacet facet) {
final RequestContext context = request.getContext();
final Iterator<ObjectAdapter> iterator = facet.iterator(collection);