Return-Path: X-Original-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D2AFF3C6C for ; Mon, 2 May 2011 16:59:38 +0000 (UTC) Received: (qmail 78552 invoked by uid 500); 2 May 2011 16:59:38 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 78537 invoked by uid 500); 2 May 2011 16:59:38 -0000 Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: isis-dev@incubator.apache.org Delivered-To: mailing list isis-commits@incubator.apache.org Received: (qmail 78530 invoked by uid 99); 2 May 2011 16:59:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 May 2011 16:59:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_FRT_ADULT2 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 May 2011 16:59:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9152A23889EC; Mon, 2 May 2011 16:59:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098662 [1/4] - in /incubator/isis/trunk/viewer/html/src: main/java/org/apache/isis/viewer/html/ main/java/org/apache/isis/viewer/html/action/ main/java/org/apache/isis/viewer/html/action/edit/ main/java/org/apache/isis/viewer/html/action/... Date: Mon, 02 May 2011 16:59:13 -0000 To: isis-commits@incubator.apache.org From: danhaywood@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110502165914.9152A23889EC@eris.apache.org> Author: danhaywood Date: Mon May 2 16:59:09 2011 New Revision: 1098662 URL: http://svn.apache.org/viewvc?rev=1098662&view=rev Log: ISIS-37: cleanup of oai.viewer:html Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerConstants.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Action.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ActionException.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ChangeContext.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/LogOut.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Welcome.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/AddItemToCollection.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/EditObject.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/RemoveItemFromCollection.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/Save.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/About.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SetUser.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SwapUser.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/CollectionView.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/FieldCollectionView.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectView.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectViewAbstract.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ServiceView.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/TableUtil.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Block.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Component.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentAbstract.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentComposite.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentFactory.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/DebugPane.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Form.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Page.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Table.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ViewPane.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ActionComponent.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/BreadCrumbs.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Checkbox.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionLink.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Div.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/DynamicHtmlPage.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ErrorMessage.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Heading.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Html.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlDebug.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlException.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlForm.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlTable.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Link.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/LogonFormPage.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/MenuItem.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Row.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ServiceComponent.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Span.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Submenu.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TableHeader.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TextBlock.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/UserSwapLink.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ViewDiv.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/WebViewerException.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/HistoryEntry.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectHistory.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectLookupException.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectMapping.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/TransientObjectMapping.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/CollectionCrumb.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/Crumb.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectCrumb.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectFieldCrumb.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/TaskCrumb.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageLookup.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProvider.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderAbstract.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderDirectoryBased.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderDirectoryBasedReworked.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderResourceBased.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/ForwardRequest.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/Request.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/ServletRequest.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/ControllerServlet.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/HtmlServletConstants.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/LogonServlet.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/MethodTask.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskLookupException.java incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextSessionDataTest.java incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest.java incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ObjectActionNoop.java incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/request/ImageProviderResourceBasedTest.java Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerConstants.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerConstants.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerConstants.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerConstants.java Mon May 2 16:59:09 2011 @@ -17,31 +17,28 @@ * under the License. */ +package org.apache.isis.viewer.html; -package org.apache.isis.viewer.html; - import org.apache.isis.core.commons.config.ConfigurationConstants; - -public final class HtmlViewerConstants { - - - public static final String PROPERTY_BASE = - ConfigurationConstants.ROOT + "viewer.html."; - public static final String STYLE_SHEET = PROPERTY_BASE + "style-sheet"; - public static final String HEADER_FILE = PROPERTY_BASE + "header-file"; - /** - * Used if {@link #HEADER_FILE} is not specified or does not refer to a valid resource. - */ - public static final String HEADER = PROPERTY_BASE + "header"; - public static final String FOOTER_FILE = PROPERTY_BASE + "footer-file"; - /** - * Used if {@link #FOOTER_FILE} is not specified or does not refer to a valid resource. - */ - public static final String FOOTER = PROPERTY_BASE + "footer"; - - public static final String VIEWER_HTML_RESOURCE_BASE_KEY = PROPERTY_BASE + "resourceBase"; - - - private HtmlViewerConstants() {} - -} + +public final class HtmlViewerConstants { + + public static final String PROPERTY_BASE = ConfigurationConstants.ROOT + "viewer.html."; + public static final String STYLE_SHEET = PROPERTY_BASE + "style-sheet"; + public static final String HEADER_FILE = PROPERTY_BASE + "header-file"; + /** + * Used if {@link #HEADER_FILE} is not specified or does not refer to a valid resource. + */ + public static final String HEADER = PROPERTY_BASE + "header"; + public static final String FOOTER_FILE = PROPERTY_BASE + "footer-file"; + /** + * Used if {@link #FOOTER_FILE} is not specified or does not refer to a valid resource. + */ + public static final String FOOTER = PROPERTY_BASE + "footer"; + + public static final String VIEWER_HTML_RESOURCE_BASE_KEY = PROPERTY_BASE + "resourceBase"; + + private HtmlViewerConstants() { + } + +} Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java Mon May 2 16:59:09 2011 @@ -17,12 +17,11 @@ * under the License. */ - package org.apache.isis.viewer.html; import org.apache.isis.core.commons.lang.MapUtils; -import org.apache.isis.core.webapp.content.StaticContentFilter; import org.apache.isis.core.webapp.content.ResourceServlet; +import org.apache.isis.core.webapp.content.StaticContentFilter; import org.apache.isis.runtimes.dflt.runtime.Isis; import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.IsisViewerInstallerAbstract; import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewer; @@ -33,57 +32,51 @@ import org.apache.isis.viewer.html.servl import org.apache.isis.viewer.html.servlet.HtmlServletConstants; import org.apache.isis.viewer.html.servlet.LogonServlet; - /** - * Convenience implementation of a {@link IsisViewer} providing the - * ability to run a Jetty web server configured for the HTML viewer from the - * {@link Isis command line}. + * Convenience implementation of a {@link IsisViewer} providing the ability to run a Jetty web server configured for the + * HTML viewer from the {@link Isis command line}. * *

* To run, use the --viewer html flag. * *

- * In a production deployment the configuration represented by the - * {@link WebAppSpecification} would be specified in the web.xml file. + * In a production deployment the configuration represented by the {@link WebAppSpecification} would be specified in the + * web.xml file. */ public class HtmlViewerInstaller extends IsisViewerInstallerAbstract { - - private static final String LOGON_PAGE = HtmlServletConstants.LOGON_APP_PAGE; - private static final String LOGON_PAGE_MAPPED = "/"+LOGON_PAGE; - private static final String ROOT_PAGE_MAPPED = "/"; - - private static final String[] STATIC_CONTENT = new String[]{"*.gif", "*.png", "*.jpg", "*.css"}; - private static final String DYNAMIC_CONTENT = "*.app"; + private static final String LOGON_PAGE = HtmlServletConstants.LOGON_APP_PAGE; + private static final String LOGON_PAGE_MAPPED = "/" + LOGON_PAGE; + private static final String ROOT_PAGE_MAPPED = "/"; + + private static final String[] STATIC_CONTENT = new String[] { "*.gif", "*.png", "*.jpg", "*.css" }; + private static final String DYNAMIC_CONTENT = "*.app"; + + public HtmlViewerInstaller() { + super("html"); + } - public HtmlViewerInstaller() { - super("html"); - } - - - @Override + @Override public IsisViewer doCreateViewer() { return new EmbeddedWebViewer() { @Override public WebAppSpecification getWebAppSpecification() { - WebAppSpecification webAppSpec = new WebAppSpecification(); - + final WebAppSpecification webAppSpec = new WebAppSpecification(); + webAppSpec.addContextParams("isis.viewers", "html"); - - webAppSpec.addFilterSpecification( - IsisSessionFilter.class, - MapUtils.asMap(IsisSessionFilter.LOGON_PAGE_KEY, LOGON_PAGE_MAPPED), - DYNAMIC_CONTENT); + + webAppSpec.addFilterSpecification(IsisSessionFilter.class, + MapUtils.asMap(IsisSessionFilter.LOGON_PAGE_KEY, LOGON_PAGE_MAPPED), DYNAMIC_CONTENT); webAppSpec.addServletSpecification(LogonServlet.class, LOGON_PAGE_MAPPED); webAppSpec.addServletSpecification(ControllerServlet.class, DYNAMIC_CONTENT); - - webAppSpec.addFilterSpecification(StaticContentFilter.class, - MapUtils.asMap("CacheTime", "86400"), - STATIC_CONTENT); - webAppSpec.addServletSpecification(ResourceServlet.class, STATIC_CONTENT ); - final String resourceBaseDir = getConfiguration().getString(HtmlViewerConstants.VIEWER_HTML_RESOURCE_BASE_KEY); + webAppSpec.addFilterSpecification(StaticContentFilter.class, MapUtils.asMap("CacheTime", "86400"), + STATIC_CONTENT); + webAppSpec.addServletSpecification(ResourceServlet.class, STATIC_CONTENT); + + final String resourceBaseDir = + getConfiguration().getString(HtmlViewerConstants.VIEWER_HTML_RESOURCE_BASE_KEY); if (resourceBaseDir != null) { webAppSpec.addResourcePath(resourceBaseDir); } @@ -92,13 +85,11 @@ public class HtmlViewerInstaller extends webAppSpec.addResourcePath("./web"); webAppSpec.addResourcePath("."); - webAppSpec.setLogHint("open a web browser and browse to logon.app to connect"); + webAppSpec.setLogHint("open a web browser and browse to logon.app to connect"); return webAppSpec; } - }; + }; } } - - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Action.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Action.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Action.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Action.java Mon May 2 16:59:09 2011 @@ -17,15 +17,12 @@ * under the License. */ - package org.apache.isis.viewer.html.action; import org.apache.isis.viewer.html.component.Page; import org.apache.isis.viewer.html.context.Context; import org.apache.isis.viewer.html.request.Request; - - public interface Action { void execute(Request request, Context context, Page page); @@ -33,4 +30,3 @@ public interface Action { String name(); } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ActionException.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ActionException.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ActionException.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ActionException.java Mon May 2 16:59:09 2011 @@ -17,12 +17,10 @@ * under the License. */ - package org.apache.isis.viewer.html.action; import org.apache.isis.core.commons.exceptions.IsisException; - public class ActionException extends IsisException { private static final long serialVersionUID = 1L; @@ -43,4 +41,3 @@ public class ActionException extends Isi } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ChangeContext.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ChangeContext.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ChangeContext.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ChangeContext.java Mon May 2 16:59:09 2011 @@ -17,25 +17,23 @@ * under the License. */ - package org.apache.isis.viewer.html.action; import org.apache.isis.viewer.html.component.Page; import org.apache.isis.viewer.html.context.Context; import org.apache.isis.viewer.html.request.Request; - - public class ChangeContext implements Action { + @Override public void execute(final Request request, final Context context, final Page page) { final int id = Integer.valueOf(request.getObjectId()).intValue(); request.forward(context.changeContext(id)); } + @Override public String name() { return "context"; } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/LogOut.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/LogOut.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/LogOut.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/LogOut.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.action; import org.apache.isis.core.commons.authentication.AuthenticationSession; @@ -27,26 +26,25 @@ import org.apache.isis.viewer.html.compo import org.apache.isis.viewer.html.context.Context; import org.apache.isis.viewer.html.request.Request; - - public class LogOut implements Action { + @Override public void execute(final Request request, final Context context, final Page page) { - AuthenticationSession authSession = IsisContext.getAuthenticationSession(); - if (authSession != null) { - getAuthenticationManager().closeSession(authSession); - } + final AuthenticationSession authSession = IsisContext.getAuthenticationSession(); + if (authSession != null) { + getAuthenticationManager().closeSession(authSession); + } context.setSession(null); // setSession is probably redundant since now always available via IsisContext - // can't rely on it being set because Filter may set httpSession - // (if in exploration mode) rather than ever hitting the LogonServlet + // can't rely on it being set because Filter may set httpSession + // (if in exploration mode) rather than ever hitting the LogonServlet context.invalidate(); } - private static AuthenticationManager getAuthenticationManager() { - return IsisContext.getAuthenticationManager(); - } + private static AuthenticationManager getAuthenticationManager() { + return IsisContext.getAuthenticationManager(); + } + @Override public String name() { return "logout"; } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Welcome.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Welcome.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Welcome.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Welcome.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.action; import org.apache.isis.core.runtime.about.AboutIsis; @@ -26,11 +25,10 @@ import org.apache.isis.viewer.html.compo import org.apache.isis.viewer.html.context.Context; import org.apache.isis.viewer.html.request.Request; - - public class Welcome implements Action { public static final String COMMAND = "start"; + @Override public void execute(final Request request, final Context context, final Page page) { page.setTitle("Isis Application"); @@ -44,12 +42,12 @@ public class Welcome implements Action { name = AboutIsis.getFrameworkName(); } content.add(context.getComponentFactory().createInlineBlock("message", - "Welcome to " + name + ", accessed via the Web Viewer", null)); + "Welcome to " + name + ", accessed via the Web Viewer", null)); } + @Override public String name() { return COMMAND; } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/AddItemToCollection.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/AddItemToCollection.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/AddItemToCollection.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/AddItemToCollection.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.action.edit; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; @@ -31,10 +30,9 @@ import org.apache.isis.viewer.html.reque import org.apache.isis.viewer.html.request.Request; import org.apache.isis.viewer.html.task.AddItemToCollectionTask; - - public class AddItemToCollection implements Action { + @Override public void execute(final Request request, final Context context, final Page page) { final String collectionField = request.getProperty(); @@ -50,9 +48,9 @@ public class AddItemToCollection impleme request.forward(ForwardRequest.task(addTask)); } + @Override public String name() { return "add"; } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/EditObject.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/EditObject.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/EditObject.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/EditObject.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.action.edit; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; @@ -30,10 +29,9 @@ import org.apache.isis.viewer.html.reque import org.apache.isis.viewer.html.request.Request; import org.apache.isis.viewer.html.task.EditTask; - - public class EditObject implements Action { + @Override public void execute(final Request request, final Context context, final Page page) { final String idString = request.getObjectId(); if (idString == null) { @@ -48,8 +46,8 @@ public class EditObject implements Actio request.forward(ForwardRequest.task(editTask)); } + @Override public String name() { return Request.EDIT_COMMAND; } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/RemoveItemFromCollection.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/RemoveItemFromCollection.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/RemoveItemFromCollection.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/RemoveItemFromCollection.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.action.edit; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; @@ -29,10 +28,9 @@ import org.apache.isis.viewer.html.conte import org.apache.isis.viewer.html.request.ForwardRequest; import org.apache.isis.viewer.html.request.Request; - - public class RemoveItemFromCollection implements Action { + @Override public void execute(final Request request, final Context context, final Page page) { final String objectId = request.getObjectId(); final String elementId = request.getElementId(); @@ -47,9 +45,9 @@ public class RemoveItemFromCollection im request.forward(ForwardRequest.viewObject(objectId, collectionField)); } + @Override public String name() { return "remove"; } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/Save.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/Save.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/Save.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/Save.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.action.edit; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; @@ -30,28 +29,25 @@ import org.apache.isis.viewer.html.conte import org.apache.isis.viewer.html.request.ForwardRequest; import org.apache.isis.viewer.html.request.Request; - - public class Save implements Action { + @Override public void execute(final Request request, final Context context, final Page page) { - + final ObjectAdapter adapter = context.getMappedObject(request.getObjectId()); - + // xactn mgmt now done by PersistenceSession#makePersistent() // getTransactionManager().startTransaction(); getPersistenceSession().makePersistent(adapter); // getTransactionManager().endTransaction(); - + // return to view request.forward(ForwardRequest.viewObject(request.getObjectId())); } - - - /////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////// // Dependencies (from context) - /////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////// private IsisTransactionManager getTransactionManager() { return getPersistenceSession().getTransactionManager(); @@ -61,9 +57,9 @@ public class Save implements Action { return IsisContext.getPersistenceSession(); } + @Override public String name() { return "save"; } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/About.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/About.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/About.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/About.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.action.misc; import org.apache.isis.core.runtime.about.AboutIsis; @@ -27,10 +26,9 @@ import org.apache.isis.viewer.html.compo import org.apache.isis.viewer.html.context.Context; import org.apache.isis.viewer.html.request.Request; - - public class About implements Action { + @Override public void execute(final Request request, final Context context, final Page page) { final ViewPane content = page.getViewPane(); content.setTitle("About", null); @@ -38,17 +36,17 @@ public class About implements Action { content.add(context.getComponentFactory().createInlineBlock("about", AboutIsis.getApplicationName(), null)); content.add(context.getComponentFactory().createInlineBlock("about", AboutIsis.getApplicationVersion(), null)); content.add(context.getComponentFactory().createInlineBlock("about", AboutIsis.getApplicationCopyrightNotice(), - null)); + null)); content.add(context.getComponentFactory().createInlineBlock("about", AboutIsis.getFrameworkName(), null)); content.add(context.getComponentFactory().createInlineBlock("about", AboutIsis.getFrameworkVersion(), null)); content.add(context.getComponentFactory().createInlineBlock("about", AboutIsis.getFrameworkCopyrightNotice(), - null)); + null)); } + @Override public String name() { return "about"; } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SetUser.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SetUser.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SetUser.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SetUser.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.action.misc; import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.MultiUserExplorationSession; @@ -28,12 +27,13 @@ import org.apache.isis.viewer.html.compo import org.apache.isis.viewer.html.context.Context; import org.apache.isis.viewer.html.request.Request; - public class SetUser implements Action { + @Override public void execute(final Request request, final Context context, final Page page) { final String name = request.getName(); - final MultiUserExplorationSession session = (MultiUserExplorationSession) IsisContext.getAuthenticationSession(); + final MultiUserExplorationSession session = + (MultiUserExplorationSession) IsisContext.getAuthenticationSession(); session.setCurrentSession(name); final ViewPane content = page.getViewPane(); @@ -41,8 +41,8 @@ public class SetUser implements Action { } + @Override public String name() { return "setuser"; } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SwapUser.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SwapUser.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SwapUser.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SwapUser.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.action.misc; import java.util.StringTokenizer; @@ -30,16 +29,16 @@ import org.apache.isis.viewer.html.compo import org.apache.isis.viewer.html.context.Context; import org.apache.isis.viewer.html.request.Request; - - public class SwapUser implements Action { + @Override public void execute(final Request request, final Context context, final Page page) { final ViewPane content = page.getViewPane(); content.setTitle("Swap Exploration User", null); // TODO pick out users from the perspectives, but only show when in exploration mode - final String users = IsisContext.getConfiguration().getString(ExplorationAuthenticatorConstants.NAKEDOBJECTS_USERS); + final String users = + IsisContext.getConfiguration().getString(ExplorationAuthenticatorConstants.NAKEDOBJECTS_USERS); if (users != null) { final StringTokenizer st = new StringTokenizer(users, ","); if (st.countTokens() > 0) { @@ -58,22 +57,19 @@ public class SwapUser implements Action // TODO find user list and interate through them /* - * content.add(context.getFactory().createInlineBlock("title", AboutIsis.getApplicationName(), - * null)); content.add(context.getFactory().createInlineBlock("title", - * AboutIsis.getApplicationVersion(), null)); - * content.add(context.getFactory().createInlineBlock("title", - * AboutIsis.getApplicationCopyrightNotice(), null)); + * content.add(context.getFactory().createInlineBlock("title", AboutIsis.getApplicationName(), null)); + * content.add(context.getFactory().createInlineBlock("title", AboutIsis.getApplicationVersion(), null)); + * content.add(context.getFactory().createInlineBlock("title", AboutIsis.getApplicationCopyrightNotice(), + * null)); * - * content.add(context.getFactory().createInlineBlock("title", AboutIsis.getFrameworkName(), - * null)); content.add(context.getFactory().createInlineBlock("title", - * AboutIsis.getFrameworkVersion(), null)); - * content.add(context.getFactory().createInlineBlock("title", - * AboutIsis.getFrameworkCopyrightNotice(), null)); + * content.add(context.getFactory().createInlineBlock("title", AboutIsis.getFrameworkName(), null)); + * content.add(context.getFactory().createInlineBlock("title", AboutIsis.getFrameworkVersion(), null)); + * content.add(context.getFactory().createInlineBlock("title", AboutIsis.getFrameworkCopyrightNotice(), null)); */ } + @Override public String name() { return "swapuser"; } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/CollectionView.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/CollectionView.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/CollectionView.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/CollectionView.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.action.view; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; @@ -33,8 +32,6 @@ import org.apache.isis.viewer.html.compo import org.apache.isis.viewer.html.context.Context; import org.apache.isis.viewer.html.request.Request; - - public class CollectionView implements Action { @Override @@ -81,4 +78,3 @@ public class CollectionView implements A } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/FieldCollectionView.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/FieldCollectionView.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/FieldCollectionView.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/FieldCollectionView.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.action.view; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; @@ -30,18 +29,17 @@ import org.apache.isis.viewer.html.compo import org.apache.isis.viewer.html.context.Context; import org.apache.isis.viewer.html.request.Request; - - public class FieldCollectionView extends ObjectViewAbstract { @Override - protected void doExecute(final Context context, final ViewPane content, final ObjectAdapter object, final String field) { + protected void doExecute(final Context context, final ViewPane content, final ObjectAdapter object, + final String field) { final String id = context.mapObject(object); final ObjectSpecification specification = object.getSpecification(); final OneToManyAssociation collection = (OneToManyAssociation) specification.getAssociation(field); - + IsisContext.getPersistenceSession().resolveField(object, collection); - + context.addCollectionFieldCrumb(collection.getName()); content.add(context.getComponentFactory().createHeading(collection.getName())); final Table table = TableUtil.createTable(context, id, object, collection); @@ -51,9 +49,9 @@ public class FieldCollectionView extends } } + @Override public String name() { return Request.FIELD_COLLECTION_COMMAND; } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectView.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectView.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectView.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectView.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.action.view; import java.util.List; @@ -36,8 +35,6 @@ import org.apache.isis.viewer.html.compo import org.apache.isis.viewer.html.context.Context; import org.apache.isis.viewer.html.request.Request; - - public class ObjectView extends ObjectViewAbstract { @Override protected boolean addObjectToHistory() { @@ -45,14 +42,16 @@ public class ObjectView extends ObjectVi } @Override - protected void doExecute(final Context context, final ViewPane content, final ObjectAdapter adapter, final String field) { + protected void doExecute(final Context context, final ViewPane content, final ObjectAdapter adapter, + final String field) { final String id = context.mapObject(adapter); createObjectView(context, adapter, content, id); final ObjectSpecification specification = adapter.getSpecification(); // TODO: this test should be done by the ImmutableFacetFactory installing an immutableFacet on every // member - boolean immutable = ImmutableFacetUtils.isAlwaysImmutable(specification) + final boolean immutable = + ImmutableFacetUtils.isAlwaysImmutable(specification) || (adapter.isPersistent() && ImmutableFacetUtils.isImmutableOncePersisted(specification)); boolean allFieldUneditable = true; @@ -69,10 +68,12 @@ public class ObjectView extends ObjectVi context.setObjectCrumb(adapter); } - private void createObjectView(final Context context, final ObjectAdapter object, final ViewPane pane, final String id) { + private void createObjectView(final Context context, final ObjectAdapter object, final ViewPane pane, + final String id) { final ObjectSpecification specification = object.getSpecification(); - final List visibleFields = specification.getAssociations(ObjectAssociationFilters - .dynamicallyVisible(IsisContext.getAuthenticationSession(), object)); + final List visibleFields = + specification.getAssociations(ObjectAssociationFilters.dynamicallyVisible( + IsisContext.getAuthenticationSession(), object)); for (int i = 0; i < visibleFields.size(); i++) { final ObjectAssociation field = visibleFields.get(i); @@ -117,4 +118,3 @@ public class ObjectView extends ObjectVi } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectViewAbstract.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectViewAbstract.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectViewAbstract.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectViewAbstract.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.action.view; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; @@ -30,17 +29,16 @@ import org.apache.isis.viewer.html.compo import org.apache.isis.viewer.html.context.Context; import org.apache.isis.viewer.html.request.Request; - - public abstract class ObjectViewAbstract implements Action { + @Override public final void execute(final Request request, final Context context, final Page page) { final String idString = request.getObjectId(); final ObjectAdapter adapter = context.getMappedObject(idString); if (adapter == null) { throw new ActionException("No such object: " + idString); } - + IsisContext.getPersistenceSession().resolveImmediately(adapter); page.setTitle(adapter.titleString()); @@ -71,10 +69,11 @@ public abstract class ObjectViewAbstract context.clearMessagesAndWarnings(); } - protected void doExecute(final Context context, final ViewPane content, final ObjectAdapter object, final String field) {} + protected void doExecute(final Context context, final ViewPane content, final ObjectAdapter object, + final String field) { + } protected boolean addObjectToHistory() { return false; } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ServiceView.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ServiceView.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ServiceView.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ServiceView.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.action.view; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; @@ -25,17 +24,16 @@ import org.apache.isis.viewer.html.compo import org.apache.isis.viewer.html.context.Context; import org.apache.isis.viewer.html.request.Request; - - public class ServiceView extends ObjectViewAbstract { @Override - protected void doExecute(final Context context, final ViewPane content, final ObjectAdapter object, final String field) { + protected void doExecute(final Context context, final ViewPane content, final ObjectAdapter object, + final String field) { context.setObjectCrumb(object); } + @Override public String name() { return Request.SERVICE_COMMAND; } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java Mon May 2 16:59:09 2011 @@ -17,14 +17,11 @@ * under the License. */ - package org.apache.isis.viewer.html.action.view.util; import java.util.ArrayList; import java.util.List; -import com.google.inject.internal.Lists; - import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.consent.Consent; import org.apache.isis.core.metamodel.spec.ActionType; @@ -34,6 +31,7 @@ import org.apache.isis.runtimes.dflt.run import org.apache.isis.viewer.html.component.Component; import org.apache.isis.viewer.html.context.Context; +import com.google.inject.internal.Lists; public class MenuUtil { @@ -47,21 +45,15 @@ public class MenuUtil { return menuItems; } - private static List concat( - final List actions1, - final List actions2) { - final List actions = Lists.newArrayList(); - actions.addAll(actions1); - actions.addAll(actions2); - return actions; - } - - private static Component[] createMenu( - final String menuName, - final ObjectAdapter target, - final List actions, - final Context context, - final String targetObjectId) { + private static List concat(final List actions1, final List actions2) { + final List actions = Lists.newArrayList(); + actions.addAll(actions1); + actions.addAll(actions2); + return actions; + } + + private static Component[] createMenu(final String menuName, final ObjectAdapter target, + final List actions, final Context context, final String targetObjectId) { final List menuItems = new ArrayList(); for (int j = 0; j < actions.size(); j++) { final ObjectAction action = actions.get(j); @@ -74,30 +66,30 @@ public class MenuUtil { if (!action.isVisible(IsisContext.getAuthenticationSession(), target).isAllowed()) { continue; } - + if (action.getType() == ActionType.USER) { - // carry on, process this action + // carry on, process this action } else if (action.getType() == ActionType.EXPLORATION) { - boolean isExploring = IsisContext.getDeploymentType().isExploring(); - if (isExploring) { - // carry on, process this action - } else { - // ignore this action, skip onto next - continue; - } + final boolean isExploring = IsisContext.getDeploymentType().isExploring(); + if (isExploring) { + // carry on, process this action + } else { + // ignore this action, skip onto next + continue; + } } else if (action.getType() == ActionType.PROTOTYPE) { - boolean isPrototyping = IsisContext.getDeploymentType().isPrototyping(); - if (isPrototyping) { - // carry on, process this action - } else { - // ignore this action, skip onto next - continue; - } + final boolean isPrototyping = IsisContext.getDeploymentType().isPrototyping(); + if (isPrototyping) { + // carry on, process this action + } else { + // ignore this action, skip onto next + continue; + } } else if (action.getType() == ActionType.DEBUG) { - // TODO: show if debug "gesture" present + // TODO: show if debug "gesture" present } else { - // ignore this action, skip onto next - continue; + // ignore this action, skip onto next + continue; } final String actionId = context.mapAction(action); @@ -106,23 +98,22 @@ public class MenuUtil { collectParameters = false; // TODO use new promptForParameters method instead of all this } else if (action.getParameterCount() == 1 && action.isContributed() - && target.getSpecification().isOfType(action.getParameters().get(0).getSpecification())) { + && target.getSpecification().isOfType(action.getParameters().get(0).getSpecification())) { collectParameters = false; } else { collectParameters = true; } final Consent consent = action.isUsable(IsisContext.getAuthenticationSession(), target); final String consentReason = consent.getReason(); - menuItem = context.getComponentFactory().createMenuItem( - actionId, action.getName(), action.getDescription(), + menuItem = + context.getComponentFactory().createMenuItem(actionId, action.getName(), action.getDescription(), consentReason, action.getType(), collectParameters, targetObjectId); } if (menuItem != null) { menuItems.add(menuItem); } } - return menuItems.toArray(new Component[]{}); + return menuItems.toArray(new Component[] {}); } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/TableUtil.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/TableUtil.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/TableUtil.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/TableUtil.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.action.view.util; import static org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters.PROPERTIES; @@ -40,15 +39,10 @@ import org.apache.isis.viewer.html.compo import org.apache.isis.viewer.html.component.Table; import org.apache.isis.viewer.html.context.Context; - - public class TableUtil { - public static Table createTable( - final Context context, - final String id, - final ObjectAdapter object, - final OneToManyAssociation collectionField) { + public static Table createTable(final Context context, final String id, final ObjectAdapter object, + final OneToManyAssociation collectionField) { final ObjectAdapter collection = collectionField.get(object); final String name = collectionField.getName(); @@ -58,79 +52,73 @@ public class TableUtil { return createTable(context, collectionField != null, collection, summary, type); } - public static Table createTable( - final Context context, - final boolean addSelector, - final ObjectAdapter collection, - final String summary, - final ObjectSpecification elementType) { - - final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection); - final List columnAssociations = - elementType.getAssociations(Filters.and(STATICALLY_VISIBLE_ASSOCIATIONS, PROPERTIES)); - - int len = columnAssociations.size(); + public static Table createTable(final Context context, final boolean addSelector, final ObjectAdapter collection, + final String summary, final ObjectSpecification elementType) { - ComponentFactory factory = context.getComponentFactory(); + final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection); + final List columnAssociations = + elementType.getAssociations(Filters.and(STATICALLY_VISIBLE_ASSOCIATIONS, PROPERTIES)); + + final int len = columnAssociations.size(); + + final ComponentFactory factory = context.getComponentFactory(); final Table table = factory.createTable(len, addSelector); table.setSummary(summary); - for (ObjectAssociation columnAssociation : columnAssociations) { - table.addColumnHeader(columnAssociation.getName()); - } - - for(ObjectAdapter rowAdapter: facet.iterable(collection)) { - getPersistenceSession().resolveImmediately(rowAdapter); - final String elementId = context.mapObject(rowAdapter); - table.addRowHeader(factory.createObjectIcon(rowAdapter, elementId, "icon")); - - for (ObjectAssociation columnAssociation : columnAssociations) { - final ObjectAdapter columnAdapter = columnAssociation.get(rowAdapter); - - ObjectSpecification columnSpec = columnAssociation.getSpecification(); - if (!columnAssociation.isVisible(getAuthenticationSession(), rowAdapter).isAllowed()) { - table.addEmptyCell(); - } else if (columnSpec.isParseable()) { - final MultiLineFacet multiline = columnSpec.getFacet(MultiLineFacet.class); - final boolean shouldTruncate = multiline != null && multiline.numberOfLines() > 1; - final String titleString = columnAdapter != null ? columnAdapter.titleString() : ""; - table.addCell(titleString, shouldTruncate); - } else if (columnAdapter == null) { - table.addEmptyCell(); - } else { - getPersistenceSession().resolveImmediately(columnAdapter); - final String objectId = context.mapObject(columnAdapter); + for (final ObjectAssociation columnAssociation : columnAssociations) { + table.addColumnHeader(columnAssociation.getName()); + } + + for (final ObjectAdapter rowAdapter : facet.iterable(collection)) { + getPersistenceSession().resolveImmediately(rowAdapter); + final String elementId = context.mapObject(rowAdapter); + table.addRowHeader(factory.createObjectIcon(rowAdapter, elementId, "icon")); + + for (final ObjectAssociation columnAssociation : columnAssociations) { + final ObjectAdapter columnAdapter = columnAssociation.get(rowAdapter); + + final ObjectSpecification columnSpec = columnAssociation.getSpecification(); + if (!columnAssociation.isVisible(getAuthenticationSession(), rowAdapter).isAllowed()) { + table.addEmptyCell(); + } else if (columnSpec.isParseable()) { + final MultiLineFacet multiline = columnSpec.getFacet(MultiLineFacet.class); + final boolean shouldTruncate = multiline != null && multiline.numberOfLines() > 1; + final String titleString = columnAdapter != null ? columnAdapter.titleString() : ""; + table.addCell(titleString, shouldTruncate); + } else if (columnAdapter == null) { + table.addEmptyCell(); + } else { + getPersistenceSession().resolveImmediately(columnAdapter); + final String objectId = context.mapObject(columnAdapter); table.addCell(factory.createObjectIcon(columnAssociation, columnAdapter, objectId, "icon")); } - } - /* - * if (addSelector) { table.addCell(context.getFactory().createRemoveOption(id, elementId, - * collectionField.getId())); } - */ - // TODO add selection box - // table.addCell(); - /* - * if (collectionField != null) { if (collectionField.isValidToRemove(object, - * element).isAllowed()) { table.addCell(context.getFactory().createRemoveOption(id, elementId, - * collectionField.getId())); } else { table.addEmptyCell(); } } - */ - - } + } + /* + * if (addSelector) { table.addCell(context.getFactory().createRemoveOption(id, elementId, + * collectionField.getId())); } + */ + // TODO add selection box + // table.addCell(); + /* + * if (collectionField != null) { if (collectionField.isValidToRemove(object, element).isAllowed()) { + * table.addCell(context.getFactory().createRemoveOption(id, elementId, collectionField.getId())); } else { + * table.addEmptyCell(); } } + */ + + } return table; } - - ////////////////////////////////////////////////////////////////////////////////// + // //////////////////////////////////////////////////////////////////////////////// // Dependencies (from context) - ////////////////////////////////////////////////////////////////////////////////// - - private static PersistenceSession getPersistenceSession() { - return IsisContext.getPersistenceSession(); - } - - private static AuthenticationSession getAuthenticationSession() { - return IsisContext.getAuthenticationSession(); - } + // //////////////////////////////////////////////////////////////////////////////// -} + private static PersistenceSession getPersistenceSession() { + return IsisContext.getPersistenceSession(); + } + private static AuthenticationSession getAuthenticationSession() { + return IsisContext.getAuthenticationSession(); + } + +} Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Block.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Block.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Block.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Block.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.component; public interface Block extends Component { @@ -25,4 +24,3 @@ public interface Block extends Component void add(Component component); } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Component.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Component.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Component.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Component.java Mon May 2 16:59:09 2011 @@ -17,14 +17,11 @@ * under the License. */ - package org.apache.isis.viewer.html.component; import java.io.PrintWriter; - public interface Component { void write(PrintWriter writer); } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentAbstract.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentAbstract.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentAbstract.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentAbstract.java Mon May 2 16:59:09 2011 @@ -17,13 +17,10 @@ * under the License. */ - package org.apache.isis.viewer.html.component; import java.io.PrintWriter; - - public abstract class ComponentAbstract implements Component { private String id; private String cls; @@ -57,4 +54,3 @@ public abstract class ComponentAbstract } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentComposite.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentComposite.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentComposite.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentComposite.java Mon May 2 16:59:09 2011 @@ -17,21 +17,19 @@ * under the License. */ - package org.apache.isis.viewer.html.component; import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; - - public class ComponentComposite implements Component { private final List components = new ArrayList(); + @Override public void write(final PrintWriter writer) { writeBefore(writer); - for(Component component: components) { + for (final Component component : components) { write(writer, component); } writeAfter(writer); @@ -42,13 +40,14 @@ public class ComponentComposite implemen component.write(writer); } - protected void writeBefore(final PrintWriter writer) {} + protected void writeBefore(final PrintWriter writer) { + } - protected void writeAfter(final PrintWriter writer) {} + protected void writeAfter(final PrintWriter writer) { + } public void add(final Component component) { components.add(component); } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentFactory.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentFactory.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentFactory.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentFactory.java Mon May 2 16:59:09 2011 @@ -17,14 +17,12 @@ * under the License. */ - package org.apache.isis.viewer.html.component; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.spec.ActionType; import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation; - public interface ComponentFactory { Component createAddOption(String id, String id2); @@ -50,14 +48,8 @@ public interface ComponentFactory { Component createSubmenu(String menuName, Component[] items); - Component createMenuItem( - String actionId, - String name, - String description, - String reasonDisabled, - ActionType type, - boolean hasParameters, - String targetObjectId); + Component createMenuItem(String actionId, String name, String description, String reasonDisabled, ActionType type, + boolean hasParameters, String targetObjectId); Component createCollectionIcon(ObjectAdapter object, String collectionId); @@ -78,8 +70,8 @@ public interface ComponentFactory { /** * * @param field - * @param value - - * may be null so subclass should handle. + * @param value + * - may be null so subclass should handle. * @param isEditable * @return */ @@ -87,4 +79,3 @@ public interface ComponentFactory { Component createLink(String link, String name, String description); } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/DebugPane.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/DebugPane.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/DebugPane.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/DebugPane.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.component; public interface DebugPane extends Component { @@ -31,4 +30,3 @@ public interface DebugPane extends Compo void unindent(); } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Form.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Form.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Form.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Form.java Mon May 2 16:59:09 2011 @@ -17,26 +17,15 @@ * under the License. */ - package org.apache.isis.viewer.html.component; import org.apache.isis.core.metamodel.spec.ObjectSpecification; - public interface Form extends Component { - void addField( - ObjectSpecification type, - String fieldLabel, - String fieldDescription, - String fieldId, - String currentEntryTitle, - int noLines, - boolean wrap, - int maxLength, - int typicalLength, - boolean required, - String error); + void addField(ObjectSpecification type, String fieldLabel, String fieldDescription, String fieldId, + String currentEntryTitle, int noLines, boolean wrap, int maxLength, int typicalLength, boolean required, + String error); /* * REVIEW the form should be asked to create specific types, like see HTMLForm.addForm() @@ -48,17 +37,9 @@ public interface Form extends Component * void addMultilineField(....) */ - void addLookup( - String fieldLabel, - String fieldDescription, - String fieldId, - int selectedIndex, - String[] options, - String[] ids, - boolean required, - String errorMessage); + void addLookup(String fieldLabel, String fieldDescription, String fieldId, int selectedIndex, String[] options, + String[] ids, boolean required, String errorMessage); void addReadOnlyField(String fieldLabel, String title, String fieldDescription); } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Page.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Page.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Page.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Page.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.component; public interface Page extends Component { @@ -39,4 +38,3 @@ public interface Page extends Component void setTitle(String title); } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Table.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Table.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Table.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Table.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.component; public interface Table extends Component { @@ -35,4 +34,3 @@ public interface Table extends Component void addEmptyCell(); } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ViewPane.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ViewPane.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ViewPane.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ViewPane.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.component; import java.util.List; @@ -34,4 +33,3 @@ public interface ViewPane extends Compon void setWarningsAndMessages(List list, List list2); } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ActionComponent.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ActionComponent.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ActionComponent.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ActionComponent.java Mon May 2 16:59:09 2011 @@ -17,14 +17,12 @@ * under the License. */ - package org.apache.isis.viewer.html.component.html; import java.io.PrintWriter; import org.apache.isis.viewer.html.component.Component; - class ActionComponent implements Component { private final String objectId; private final String name; @@ -33,13 +31,8 @@ class ActionComponent implements Compone private final String action; private final String elementId; - public ActionComponent( - final String action, - final String name, - final String description, - final String objectId, - final String elementId, - final String field) { + public ActionComponent(final String action, final String name, final String description, final String objectId, + final String elementId, final String field) { this.action = action; this.name = name; this.description = description; @@ -48,6 +41,7 @@ class ActionComponent implements Compone this.field = field; } + @Override public void write(final PrintWriter writer) { writer.print("

"); writer.print(""); @@ -59,4 +58,3 @@ public class BreadCrumbs extends Compone } } - Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Checkbox.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Checkbox.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Checkbox.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Checkbox.java Mon May 2 16:59:09 2011 @@ -17,35 +17,34 @@ * under the License. */ +/** + * + */ +package org.apache.isis.viewer.html.component.html; + +import java.io.PrintWriter; -/** - * - */ -package org.apache.isis.viewer.html.component.html; - -import java.io.PrintWriter; - import org.apache.isis.viewer.html.component.Component; - - -final class Checkbox implements Component { - private final boolean set; - - private final boolean editable; - - Checkbox(final boolean set, final boolean editable) { - this.set = set; - this.editable = editable; - } - - public void write(final PrintWriter writer) { - writer.print(""); - } -} + +final class Checkbox implements Component { + private final boolean set; + + private final boolean editable; + + Checkbox(final boolean set, final boolean editable) { + this.set = set; + this.editable = editable; + } + + @Override + public void write(final PrintWriter writer) { + writer.print(""); + } +} Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java?rev=1098662&r1=1098661&r2=1098662&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java Mon May 2 16:59:09 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.viewer.html.component.html; import java.io.PrintWriter; @@ -30,8 +29,6 @@ import org.apache.isis.viewer.html.compo import org.apache.isis.viewer.html.image.ImageLookup; import org.apache.isis.viewer.html.request.Request; - - public class CollectionIcon implements Component { private final ObjectAdapter collection; private final String id; @@ -47,7 +44,8 @@ public class CollectionIcon implements C public void write(final PrintWriter writer) { final TypeOfFacet facet = collection.getSpecification().getFacet(TypeOfFacet.class); final Class elementType = facet.value(); - final ObjectSpecification elementSpecification = IsisContext.getSpecificationLoader().loadSpecification(elementType); + final ObjectSpecification elementSpecification = + IsisContext.getSpecificationLoader().loadSpecification(elementType); writer.print("
"); writer.print(""); writer.println(e.getMessage()); @@ -47,4 +46,3 @@ public class ErrorMessage implements Com } } -