isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1234460 [29/30] - in /incubator/isis/trunk/framework/viewer: bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/ bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/ bdd/common/src/main/java/org/apache/isis/viewer...
Date Sun, 22 Jan 2012 08:05:57 GMT
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/simple/CollectionContentsInstanceAsTableRow.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/simple/CollectionContentsInstanceAsTableRow.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/simple/CollectionContentsInstanceAsTableRow.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/simple/CollectionContentsInstanceAsTableRow.java Sun Jan 22 08:05:17 2012
@@ -36,7 +36,8 @@ import org.apache.wicket.markup.repeater
  * Renders a single entity instance within the HTML table.
  * 
  * <p>
- * TODO: it ought to be possible to in-line this into {@link CollectionContentsAsSimpleTable}.
+ * TODO: it ought to be possible to in-line this into
+ * {@link CollectionContentsAsSimpleTable}.
  */
 class CollectionContentsInstanceAsTableRow extends PanelAbstract<EntityModel> {
 
@@ -52,8 +53,7 @@ class CollectionContentsInstanceAsTableR
 
         final ObjectAdapter adapter = model.getObject();
         final ObjectSpecification typeOfSpec = model.getTypeOfSpecification();
-        final List<? extends ObjectAssociation> propertyList =
-            typeOfSpec.getAssociations(ObjectAssociationFilters.PROPERTIES);
+        final List<? extends ObjectAssociation> propertyList = typeOfSpec.getAssociations(ObjectAssociationFilters.PROPERTIES);
 
         add(new Label("title", adapter.titleString()));
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolved.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolved.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolved.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolved.java Sun Jan 22 08:05:17 2012
@@ -23,8 +23,9 @@ import org.apache.isis.viewer.wicket.mod
 import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
 
 /**
- * {@link PanelAbstract Panel} that represents a placeholder for a {@link EntityCollectionModel collection of entity}s
- * so that they can be only lazily resolved.
+ * {@link PanelAbstract Panel} that represents a placeholder for a
+ * {@link EntityCollectionModel collection of entity}s so that they can be only
+ * lazily resolved.
  */
 public class CollectionContentsAsUnresolved extends PanelAbstract<EntityCollectionModel> {
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java Sun Jan 22 08:05:17 2012
@@ -29,8 +29,9 @@ import org.apache.wicket.Component;
 import org.apache.wicket.model.IModel;
 
 /**
- * Convenience adapter for a number of {@link ComponentFactoryAbstract component factory}s that where the created
- * {@link Component} are backed by an {@link EntityModel}.
+ * Convenience adapter for a number of {@link ComponentFactoryAbstract component
+ * factory}s that where the created {@link Component} are backed by an
+ * {@link EntityModel}.
  */
 public abstract class EntityComponentFactoryAbstract extends ComponentFactoryAbstract {
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/action/EntityActionLinkFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/action/EntityActionLinkFactory.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/action/EntityActionLinkFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/action/EntityActionLinkFactory.java Sun Jan 22 08:05:17 2012
@@ -54,8 +54,7 @@ public final class EntityActionLinkFacto
     }
 
     @Override
-    public LinkAndLabel newLink(final ObjectAdapterMemento adapterMemento, final ObjectAction action,
-        final String linkId) {
+    public LinkAndLabel newLink(final ObjectAdapterMemento adapterMemento, final ObjectAction action, final String linkId) {
         final ObjectAdapter adapter = adapterMemento.getObjectAdapter();
 
         final Link<?> link = createLink(adapterMemento, action, linkId, adapter);
@@ -65,8 +64,7 @@ public final class EntityActionLinkFacto
         return new LinkAndLabel(link, label);
     }
 
-    private Link<?> createLink(final ObjectAdapterMemento adapterMemento, final ObjectAction action,
-        final String linkId, final ObjectAdapter adapter) {
+    private Link<?> createLink(final ObjectAdapterMemento adapterMemento, final ObjectAction action, final String linkId, final ObjectAdapter adapter) {
         final Boolean persistent = adapter.isPersistent();
         if (persistent) {
             return createLinkForPersistent(linkId, adapterMemento, action);
@@ -75,14 +73,11 @@ public final class EntityActionLinkFacto
         }
     }
 
-    private Link<?> createLinkForPersistent(final String linkId, final ObjectAdapterMemento adapterMemento,
-        final ObjectAction action) {
+    private Link<?> createLinkForPersistent(final String linkId, final ObjectAdapterMemento adapterMemento, final ObjectAction action) {
         final ObjectAdapter adapter = adapterMemento.getObjectAdapter();
         final ObjectAdapter contextAdapter = summaryPanel.getEntityModel().getObject();
 
-        final PageParameters pageParameters =
-            ActionModel.createPageParameters(adapter, action, getOidStringifier(), contextAdapter,
-                ActionModel.SingleResultsMode.REDIRECT);
+        final PageParameters pageParameters = ActionModel.createPageParameters(adapter, action, getOidStringifier(), contextAdapter, ActionModel.SingleResultsMode.REDIRECT);
         final Class<? extends Page> pageClass = getPageClassRegistry().getPageClass(PageType.ACTION);
         return newBookmarkablePageLink(linkId, pageClass, pageParameters);
     }
@@ -90,13 +85,11 @@ public final class EntityActionLinkFacto
     /*
      * Separate method in order to capture the generic
      */
-    private <T extends Page> Link<T> newBookmarkablePageLink(final String linkId, final Class<T> pageClass,
-        final PageParameters pageParameters) {
+    private <T extends Page> Link<T> newBookmarkablePageLink(final String linkId, final Class<T> pageClass, final PageParameters pageParameters) {
         return new BookmarkablePageLink<T>(linkId, pageClass, pageParameters);
     }
 
-    private Link<?> createLinkForTransient(final String linkId, final ObjectAdapterMemento adapterMemento,
-        final ObjectAction action) {
+    private Link<?> createLinkForTransient(final String linkId, final ObjectAdapterMemento adapterMemento, final ObjectAction action) {
         final ActionMemento actionMemento = new ActionMemento(action);
         final ActionModel.Mode actionMode = ActionModel.determineMode(action);
         return new Link<String>(linkId) {
@@ -107,8 +100,7 @@ public final class EntityActionLinkFacto
                 // TODO: seems like can't use REDIRECT, since won't
                 // let multiple setResponsePage() calls once
                 // committed to redirecting (I'm guessing)
-                final ActionModel actionModel =
-                    ActionModel.create(adapterMemento, actionMemento, actionMode, SingleResultsMode.INLINE);
+                final ActionModel actionModel = ActionModel.create(adapterMemento, actionMemento, actionMode, SingleResultsMode.INLINE);
                 summaryPanel.onClick(actionModel);
             }
         };

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/propcoll/EntityPropertiesAndOrCollectionsPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/propcoll/EntityPropertiesAndOrCollectionsPanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/propcoll/EntityPropertiesAndOrCollectionsPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/propcoll/EntityPropertiesAndOrCollectionsPanel.java Sun Jan 22 08:05:17 2012
@@ -60,7 +60,8 @@ import org.apache.wicket.markup.repeater
 import org.apache.wicket.model.Model;
 
 /**
- * {@link PanelAbstract Panel} representing the properties of an entity, as per the provided {@link EntityModel}.
+ * {@link PanelAbstract Panel} representing the properties of an entity, as per
+ * the provided {@link EntityModel}.
  */
 public class EntityPropertiesAndOrCollectionsPanel extends PanelAbstract<EntityModel> {
 
@@ -136,8 +137,7 @@ public class EntityPropertiesAndOrCollec
         private Button cancelButton;
         private FeedbackPanel feedback;
 
-        public PropCollForm(final String id, final EntityModel entityModel, final Render render,
-            final Component owningPanel) {
+        public PropCollForm(final String id, final EntityModel entityModel, final Render render, final Component owningPanel) {
             super(id, entityModel);
             this.owningPanel = owningPanel; // for repainting
             this.render = render;
@@ -175,21 +175,15 @@ public class EntityPropertiesAndOrCollec
                     final PropertyMemento pm = new PropertyMemento(otoa);
 
                     final ScalarModel scalarModel = entityModel.getPropertyModel(pm);
-                    component =
-                        getComponentFactoryRegistry().addOrReplaceComponent(container, ID_PROPERTY_OR_COLLECTION,
-                            ComponentType.SCALAR_NAME_AND_VALUE, scalarModel);
+                    component = getComponentFactoryRegistry().addOrReplaceComponent(container, ID_PROPERTY_OR_COLLECTION, ComponentType.SCALAR_NAME_AND_VALUE, scalarModel);
                 } else {
                     final OneToManyAssociation otma = (OneToManyAssociation) association;
 
-                    final EntityCollectionModel entityCollectionModel =
-                        EntityCollectionModel.createParented(entityModel, otma);
-                    final CollectionPanel collectionPanel =
-                        new CollectionPanel(ID_PROPERTY_OR_COLLECTION, entityCollectionModel);
+                    final EntityCollectionModel entityCollectionModel = EntityCollectionModel.createParented(entityModel, otma);
+                    final CollectionPanel collectionPanel = new CollectionPanel(ID_PROPERTY_OR_COLLECTION, entityCollectionModel);
                     container.addOrReplace(collectionPanel);
 
-                    component =
-                        getComponentFactoryRegistry().addOrReplaceComponent(container, ID_PROPERTY_OR_COLLECTION,
-                            ComponentType.COLLECTION_NAME_AND_CONTENTS, entityCollectionModel);
+                    component = getComponentFactoryRegistry().addOrReplaceComponent(container, ID_PROPERTY_OR_COLLECTION, ComponentType.COLLECTION_NAME_AND_CONTENTS, entityCollectionModel);
                 }
             }
 
@@ -201,14 +195,12 @@ public class EntityPropertiesAndOrCollec
         }
 
         @SuppressWarnings("unchecked")
-        private List<ObjectAssociation> visibleAssociations(final ObjectAdapter adapter,
-            final ObjectSpecification noSpec) {
+        private List<ObjectAssociation> visibleAssociations(final ObjectAdapter adapter, final ObjectSpecification noSpec) {
             return noSpec.getAssociations(visibleAssociationFilter(adapter));
         }
 
         private Filter<ObjectAssociation> visibleAssociationFilter(final ObjectAdapter adapter) {
-            return Filters.and(render.getFilters(),
-                ObjectAssociationFilters.dynamicallyVisible(getAuthenticationSession(), adapter));
+            return Filters.and(render.getFilters(), ObjectAssociationFilters.dynamicallyVisible(getAuthenticationSession(), adapter));
         }
 
         private void addButtons() {
@@ -235,9 +227,12 @@ public class EntityPropertiesAndOrCollec
                     if (!getForm().hasError()) {
                         final ObjectAdapter object = getEntityModel().getObject();
                         final Memento snapshotToRollbackToIfInvalid = new Memento(object);
-                        // to perform object-level validation, we must apply the changes first
-                        // contrast this with ActionPanel (for validating action arguments) where
-                        // we do the validation prior to the execution of the action
+                        // to perform object-level validation, we must apply the
+                        // changes first
+                        // contrast this with ActionPanel (for validating action
+                        // arguments) where
+                        // we do the validation prior to the execution of the
+                        // action
                         getEntityModel().apply();
                         final String invalidReasonIfAny = getEntityModel().getReasonInvalidIfAny();
                         if (invalidReasonIfAny != null) {
@@ -321,8 +316,7 @@ public class EntityPropertiesAndOrCollec
                     }
                     final String invalidReasonIfAny = facet.invalidReason(adapter);
                     if (invalidReasonIfAny != null) {
-                        Session.get().getFeedbackMessages()
-                            .add(new FeedbackMessage(form, invalidReasonIfAny, FeedbackMessage.ERROR));
+                        Session.get().getFeedbackMessages().add(new FeedbackMessage(form, invalidReasonIfAny, FeedbackMessage.ERROR));
                     }
                 }
             });

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java Sun Jan 22 08:05:17 2012
@@ -44,8 +44,8 @@ import org.apache.wicket.markup.html.ima
 import com.google.inject.Inject;
 
 /**
- * {@link PanelAbstract Panel} representing the summary details (title, icon and actions) of an entity, as per the
- * provided {@link EntityModel}.
+ * {@link PanelAbstract Panel} representing the summary details (title, icon and
+ * actions) of an entity, as per the provided {@link EntityModel}.
  */
 public class EntitySummaryPanel extends PanelAbstract<EntityModel> implements ActionInvokeHandler {
 
@@ -90,7 +90,8 @@ public class EntitySummaryPanel extends 
 
     private String determineTitle() {
         final ObjectAdapter adapter = getModel().getObject();
-        final String titleString = adapter != null ? adapter.titleString() : "(no object)"; // TODO: i18n
+        final String titleString = adapter != null ? adapter.titleString() : "(no object)"; // TODO:
+                                                                                            // i18n
         return titleString;
     }
 
@@ -125,8 +126,7 @@ public class EntitySummaryPanel extends 
         if (adapter != null) {
             final List<ObjectAction> userActions = adapter.getSpecification().getObjectActions(ActionType.USER, Contributed.INCLUDED);
 
-            final CssMenuBuilder cssMenuBuilder =
-                new CssMenuBuilder(adapterMemento, getServiceAdapters(), userActions, linkFactory);
+            final CssMenuBuilder cssMenuBuilder = new CssMenuBuilder(adapterMemento, getServiceAdapters(), userActions, linkFactory);
             // TODO: i18n
             final CssMenuPanel cssMenuPanel = cssMenuBuilder.buildPanel(ID_ENTITY_ACTIONS, "Actions");
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/combined/EntityCombinedPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/combined/EntityCombinedPanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/combined/EntityCombinedPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/combined/EntityCombinedPanel.java Sun Jan 22 08:05:17 2012
@@ -24,7 +24,8 @@ import org.apache.isis.viewer.wicket.ui.
 import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
 
 /**
- * {@link PanelAbstract Panel} to represent an entity on a single page made up of several &lt;div&gt; regions.
+ * {@link PanelAbstract Panel} to represent an entity on a single page made up
+ * of several &lt;div&gt; regions.
  */
 public class EntityCombinedPanel extends PanelAbstract<EntityModel> {
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.java Sun Jan 22 08:05:17 2012
@@ -25,14 +25,16 @@ import org.apache.isis.viewer.wicket.ui.
 import org.apache.isis.viewer.wicket.ui.selector.SelectorPanelAbstract;
 
 /**
- * Provides a drop-down for selecting other views that support {@link ComponentType#ENTITY} with a backing
- * {@link EntityModel}.
+ * Provides a drop-down for selecting other views that support
+ * {@link ComponentType#ENTITY} with a backing {@link EntityModel}.
  * 
  * <p>
- * Most of the heavy lifting is factored out into the superclass, {@link SelectorPanelAbstract}.
+ * Most of the heavy lifting is factored out into the superclass,
+ * {@link SelectorPanelAbstract}.
  * 
  * <p>
- * Note that this class should be registered (in <tt>ComponentFactoryListDefault</tt>) prior to any other views.
+ * Note that this class should be registered (in
+ * <tt>ComponentFactoryListDefault</tt>) prior to any other views.
  */
 public class EntitySelector extends SelectorPanelAbstract<EntityModel> {
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabbed/EntityCollectionTab.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabbed/EntityCollectionTab.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabbed/EntityCollectionTab.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabbed/EntityCollectionTab.java Sun Jan 22 08:05:17 2012
@@ -35,8 +35,7 @@ class EntityCollectionTab extends TabAbs
     public EntityCollectionTab(final String id, final EntityCollectionModel entityCollectionModel) {
         super(id, entityCollectionModel);
 
-        getComponentFactoryRegistry().addOrReplaceComponent(this, ID_ENTITY_COLLECTION,
-            ComponentType.COLLECTION_CONTENTS, entityCollectionModel);
+        getComponentFactoryRegistry().addOrReplaceComponent(this, ID_ENTITY_COLLECTION, ComponentType.COLLECTION_CONTENTS, entityCollectionModel);
     }
 
 }
\ No newline at end of file

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabbed/EntityTabbedPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabbed/EntityTabbedPanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabbed/EntityTabbedPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabbed/EntityTabbedPanel.java Sun Jan 22 08:05:17 2012
@@ -34,8 +34,8 @@ import org.apache.wicket.markup.html.pan
 import org.apache.wicket.model.Model;
 
 /**
- * {@link PanelAbstract Panel} for entity, with separate tabs for the summary info (icon, title, actions), the
- * properties, and for each of the collections.
+ * {@link PanelAbstract Panel} for entity, with separate tabs for the summary
+ * info (icon, title, actions), the properties, and for each of the collections.
  */
 public class EntityTabbedPanel extends TabbedPanelAbstract<EntityModel> {
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java Sun Jan 22 08:05:17 2012
@@ -19,21 +19,21 @@
 
 package org.apache.isis.viewer.wicket.ui.components.scalars;
 
+import org.apache.isis.viewer.wicket.model.models.ScalarModel;
+import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
 import org.apache.wicket.Component;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.form.FormComponentLabel;
 import org.apache.wicket.markup.html.form.LabeledWebMarkupContainer;
 import org.apache.wicket.model.Model;
 
-import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-
 /**
- * Adapter for {@link PanelAbstract panel}s that use a {@link ScalarModel} as their backing model.
+ * Adapter for {@link PanelAbstract panel}s that use a {@link ScalarModel} as
+ * their backing model.
  * 
  * <p>
- * Supports the concept of being {@link Format#COMPACT} (eg within a table) or {@link Format#REGULAR regular} (eg within
- * a form).
+ * Supports the concept of being {@link Format#COMPACT} (eg within a table) or
+ * {@link Format#REGULAR regular} (eg within a form).
  */
 public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> {
 
@@ -125,7 +125,8 @@ public abstract class ScalarPanelAbstrac
      * Builds GUI lazily prior to first render.
      * 
      * <p>
-     * This design allows the panel to be configured first, using {@link #setFormat(Format)}.
+     * This design allows the panel to be configured first, using
+     * {@link #setFormat(Format)}.
      * 
      * @see #onBeforeRender()
      * @see #setFormat(Format)
@@ -145,7 +146,8 @@ public abstract class ScalarPanelAbstrac
     }
 
     /**
-     * Mandatory hook method to build the component to render the model when in {@link Format#REGULAR regular} format.
+     * Mandatory hook method to build the component to render the model when in
+     * {@link Format#REGULAR regular} format.
      */
     protected abstract FormComponentLabel addComponentForRegular();
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java Sun Jan 22 08:05:17 2012
@@ -32,7 +32,8 @@ import org.apache.wicket.markup.html.pan
 import org.apache.wicket.model.Model;
 
 /**
- * Adapter for {@link ScalarPanelAbstract scalar panel}s that are implemented using a simple {@link TextField}.
+ * Adapter for {@link ScalarPanelAbstract scalar panel}s that are implemented
+ * using a simple {@link TextField}.
  */
 public abstract class ScalarPanelTextFieldAbstract<T> extends ScalarPanelAbstract {
 
@@ -128,7 +129,8 @@ public abstract class ScalarPanelTextFie
     }
 
     /**
-     * Mandatory hook method to build the component to render the model when in {@link Format#COMPACT compact} format.
+     * Mandatory hook method to build the component to render the model when in
+     * {@link Format#COMPACT compact} format.
      */
     @Override
     protected Component addComponentForCompact() {

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java Sun Jan 22 08:05:17 2012
@@ -19,6 +19,9 @@
 
 package org.apache.isis.viewer.wicket.ui.components.scalars;
 
+import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.viewer.wicket.model.models.ScalarModel;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.validation.IValidatable;
@@ -26,21 +29,17 @@ import org.apache.wicket.validation.IVal
 import org.apache.wicket.validation.ValidationError;
 import org.apache.wicket.validation.validator.StringValidator;
 
-import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-
 /**
- * Adapter for {@link ScalarPanelTextFieldAbstract textField-based scalar panel}s where moreover the scalar parameter or
- * property is a value type that is parseable.
+ * Adapter for {@link ScalarPanelTextFieldAbstract textField-based scalar panel}
+ * s where moreover the scalar parameter or property is a value type that is
+ * parseable.
  */
 public abstract class ScalarPanelTextFieldParseableAbstract extends ScalarPanelTextFieldAbstract<String> {
 
     private static final long serialVersionUID = 1L;
     protected final String idTextField;
 
-    public ScalarPanelTextFieldParseableAbstract(final String id, final String idTextField,
-        final ScalarModel scalarModel) {
+    public ScalarPanelTextFieldParseableAbstract(final String id, final String idTextField, final ScalarModel scalarModel) {
         super(id, scalarModel);
         this.idTextField = idTextField;
     }

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java Sun Jan 22 08:05:17 2012
@@ -32,7 +32,8 @@ import org.apache.wicket.markup.html.ima
 import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
 
 /**
- * {@link FormComponentPanel} representing a reference to an entity: a link and a findUsing button.
+ * {@link FormComponentPanel} representing a reference to an entity: a link and
+ * a findUsing button.
  */
 public class JavaAwtImagePanel extends PanelAbstract<ScalarModel> {
 
@@ -56,18 +57,17 @@ public class JavaAwtImagePanel extends P
         final ObjectAdapter adapter = getModel().getObject();
         if (adapter != null) {
             final java.awt.Image imageValue = imageValueFacet.getImage(adapter);
-            final RenderedDynamicImageResource imageResource =
-                new RenderedDynamicImageResource(imageValue.getWidth(null), imageValue.getHeight(null)) {
+            final RenderedDynamicImageResource imageResource = new RenderedDynamicImageResource(imageValue.getWidth(null), imageValue.getHeight(null)) {
 
-                    private static final long serialVersionUID = 1L;
+                private static final long serialVersionUID = 1L;
 
-                    @Override
-                    protected boolean render(final Graphics2D graphics) {
-                        graphics.drawImage(imageValue, 0, 0, null);
-                        return true;
-                    }
+                @Override
+                protected boolean render(final Graphics2D graphics) {
+                    graphics.drawImage(imageValue, 0, 0, null);
+                    return true;
+                }
 
-                };
+            };
             final Image image = new Image(ID_SCALAR_VALUE, imageResource);
             addOrReplace(image);
             addOrReplace(new ComponentFeedbackPanel(ID_FEEDBACK, image));

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/noapplib/IsisDatePanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/noapplib/IsisDatePanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/noapplib/IsisDatePanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/noapplib/IsisDatePanel.java Sun Jan 22 08:05:17 2012
@@ -47,27 +47,26 @@ public class IsisDatePanel extends Scala
 
     @Override
     protected TextField<java.util.Date> createTextField() {
-        final TextField<java.util.Date> textField =
-            DateTextField.forDatePattern(ID_SCALAR_VALUE, new Model<java.util.Date>() {
-                private static final long serialVersionUID = 1L;
-
-                @Override
-                public java.util.Date getObject() {
-                    final ObjectAdapter adapter = getModel().getObject();
-                    if (adapter == null) {
-                        return null;
-                    }
-                    final Date noDate = (Date) adapter.getObject();
-                    return noDate.dateValue();
-                }
+        final TextField<java.util.Date> textField = DateTextField.forDatePattern(ID_SCALAR_VALUE, new Model<java.util.Date>() {
+            private static final long serialVersionUID = 1L;
 
-                @Override
-                public void setObject(final java.util.Date date) {
-                    final Date noDate = new Date(date);
-                    final ObjectAdapter adapter = adapterFor(noDate);
-                    getModel().setObject(adapter);
+            @Override
+            public java.util.Date getObject() {
+                final ObjectAdapter adapter = getModel().getObject();
+                if (adapter == null) {
+                    return null;
                 }
-            }, DATE_PATTERN);
+                final Date noDate = (Date) adapter.getObject();
+                return noDate.dateValue();
+            }
+
+            @Override
+            public void setObject(final java.util.Date date) {
+                final Date noDate = new Date(date);
+                final ObjectAdapter adapter = adapterFor(noDate);
+                getModel().setObject(adapter);
+            }
+        }, DATE_PATTERN);
         return textField;
     }
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/noapplib/IsisPasswordPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/noapplib/IsisPasswordPanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/noapplib/IsisPasswordPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/noapplib/IsisPasswordPanel.java Sun Jan 22 08:05:17 2012
@@ -19,13 +19,13 @@
 
 package org.apache.isis.viewer.wicket.ui.components.scalars.noapplib;
 
+import org.apache.isis.applib.value.Password;
+import org.apache.isis.viewer.wicket.model.models.ScalarModel;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
 import org.apache.wicket.markup.html.form.PasswordTextField;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.Model;
 
-import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
-
 /**
  * Panel for rendering scalars of type {@link Password Isis' applib.Password}.
  */
@@ -45,7 +45,7 @@ public class IsisPasswordPanel extends S
 
     @Override
     protected TextField<String> createTextField() {
-        PasswordTextField passwordField = new PasswordTextField(idTextField, new Model<String>() {
+        final PasswordTextField passwordField = new PasswordTextField(idTextField, new Model<String>() {
             private static final long serialVersionUID = 1L;
 
             @Override

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/noapplib/IsisPercentagePanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/noapplib/IsisPercentagePanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/noapplib/IsisPercentagePanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/noapplib/IsisPercentagePanel.java Sun Jan 22 08:05:17 2012
@@ -24,7 +24,8 @@ import org.apache.isis.viewer.wicket.mod
 import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
 
 /**
- * Panel for rendering scalars of type {@link Percentage Isis' applib.Percentage}.
+ * Panel for rendering scalars of type {@link Percentage Isis'
+ * applib.Percentage}.
  */
 public class IsisPercentagePanel extends ScalarPanelTextFieldParseableAbstract {
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java Sun Jan 22 08:05:17 2012
@@ -70,7 +70,8 @@ public class BooleanPanel extends Scalar
     }
 
     /**
-     * Mandatory hook method to build the component to render the model when in {@link Format#COMPACT compact} format.
+     * Mandatory hook method to build the component to render the model when in
+     * {@link Format#COMPACT compact} format.
      */
     @Override
     protected Component addComponentForCompact() {
@@ -97,7 +98,8 @@ public class BooleanPanel extends Scalar
             }
         });
         checkBox.setOutputMarkupId(true);
-        checkBox.setEnabled(false); // will be enabled before rendering if required
+        checkBox.setEnabled(false); // will be enabled before rendering if
+                                    // required
         return checkBox;
     }
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java Sun Jan 22 08:05:17 2012
@@ -34,7 +34,8 @@ import org.apache.wicket.validation.IVal
 import org.apache.wicket.validation.ValidationError;
 
 /**
- * Panel for rendering scalars which of are of reference type (as opposed to value types).
+ * Panel for rendering scalars which of are of reference type (as opposed to
+ * value types).
  */
 public class ReferencePanel extends ScalarPanelAbstract {
 
@@ -135,7 +136,8 @@ public class ReferencePanel extends Scal
     }
 
     /**
-     * Mandatory hook method to build the component to render the model when in {@link Format#COMPACT compact} format.
+     * Mandatory hook method to build the component to render the model when in
+     * {@link Format#COMPACT compact} format.
      */
     @Override
     protected Component addComponentForCompact() {

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java Sun Jan 22 08:05:17 2012
@@ -19,17 +19,18 @@
 
 package org.apache.isis.viewer.wicket.ui.components.scalars.value;
 
+import org.apache.isis.applib.annotation.Value;
 import org.apache.isis.viewer.wicket.model.models.ScalarModel;
 import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
 import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
 
 /**
- * Panel for rendering any value types that do not have their own custom {@link ScalarPanelAbstract panel} to render
- * them.
+ * Panel for rendering any value types that do not have their own custom
+ * {@link ScalarPanelAbstract panel} to render them.
  * 
  * <p>
- * This is a fallback panel; values are expected to be {@link Parser parseable} (typically through the Isis'
- * {@link Value} annotation.
+ * This is a fallback panel; values are expected to be {@link Parser parseable}
+ * (typically through the Isis' {@link Value} annotation.
  */
 public class ValuePanel extends ScalarPanelTextFieldParseableAbstract {
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java Sun Jan 22 08:05:17 2012
@@ -30,8 +30,8 @@ import org.apache.wicket.model.IModel;
  * {@link ComponentFactory} to represent an action that returns void.
  * 
  * <p>
- * TODO: not yet implemented; what should we do here? Perhaps render the object on which the action was invoked, along
- * with an informational message?
+ * TODO: not yet implemented; what should we do here? Perhaps render the object
+ * on which the action was invoked, along with an informational message?
  */
 public class VoidReturnPanelFactory extends ComponentFactoryAbstract {
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java Sun Jan 22 08:05:17 2012
@@ -25,7 +25,8 @@ import org.apache.isis.viewer.wicket.ui.
 import org.apache.wicket.markup.html.basic.Label;
 
 /**
- * {@link PanelAbstract Panel} displaying welcome message (as used on {@link HomePage}).
+ * {@link PanelAbstract Panel} displaying welcome message (as used on
+ * {@link HomePage}).
  */
 public class WelcomePanel extends PanelAbstract<WelcomeModel> {
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java Sun Jan 22 08:05:17 2012
@@ -38,8 +38,9 @@ import org.apache.wicket.Application;
 import com.google.common.collect.Collections2;
 
 /**
- * Used to build a {@link CssMenuItem} hierarchy from a {@link ObjectAdapterMemento object adapter}'s actions and any
- * contributed actions from services.
+ * Used to build a {@link CssMenuItem} hierarchy from a
+ * {@link ObjectAdapterMemento object adapter}'s actions and any contributed
+ * actions from services.
  */
 public class CssMenuBuilder {
 
@@ -49,8 +50,7 @@ public class CssMenuBuilder {
 
     private final CssMenuLinkFactory cssMenuLinkFactory;
 
-    public CssMenuBuilder(final ObjectAdapterMemento adapterMemento, final List<ObjectAdapter> serviceAdapters,
-        final List<ObjectAction> actions, final CssMenuLinkFactory cssMenuLinkFactory) {
+    public CssMenuBuilder(final ObjectAdapterMemento adapterMemento, final List<ObjectAdapter> serviceAdapters, final List<ObjectAction> actions, final CssMenuLinkFactory cssMenuLinkFactory) {
         this.adapterMemento = adapterMemento;
         this.serviceAdapters = serviceAdapters;
         this.actions = actions;
@@ -87,12 +87,12 @@ public class CssMenuBuilder {
      */
     protected boolean isDebugMode() {
         // TODO: need to figure out how to switch into debug mode;
-        // probably call a Debug toggle page, and stuff into Session.getMetaData()
+        // probably call a Debug toggle page, and stuff into
+        // Session.getMetaData()
         return true;
     }
 
-    private void addMenuItemsForActionsOfType(final CssMenuItem parent, final List<ObjectAction> actions,
-        final ActionType type) {
+    private void addMenuItemsForActionsOfType(final CssMenuItem parent, final List<ObjectAction> actions, final ActionType type) {
         final Collection<ObjectAction> filterActionsOfType = Collections2.filter(actions, Actions.ofType(type));
         for (final ObjectAction action : filterActionsOfType) {
             addMenuItem(parent, action);
@@ -129,8 +129,7 @@ public class CssMenuBuilder {
 
         final ObjectAdapterMemento serviceAdapterMemento = determineAdapterFor(contributedAction);
 
-        final Builder subMenuItemBuilder =
-            parent.newSubMenuItem(serviceAdapterMemento, contributedAction, cssMenuLinkFactory);
+        final Builder subMenuItemBuilder = parent.newSubMenuItem(serviceAdapterMemento, contributedAction, cssMenuLinkFactory);
         if (subMenuItemBuilder != null) {
             // could be null if invisible
             subMenuItemBuilder.build();
@@ -139,9 +138,10 @@ public class CssMenuBuilder {
 
     /**
      * It's a bit hokey to have to do this, but the
-     * {@link ObjectSpecification#getServiceActionsReturning(ActionType...) method we call} on
-     * {@link ObjectSpecification}, while nicely traversing the services for us, unfortunately does not pass us back the
-     * service adapters also.
+     * {@link ObjectSpecification#getServiceActionsReturning(ActionType...)
+     * method we call} on {@link ObjectSpecification}, while nicely traversing
+     * the services for us, unfortunately does not pass us back the service
+     * adapters also.
      */
     private ObjectAdapterMemento determineAdapterFor(final ObjectAction action) {
         // search through service adapters first

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java Sun Jan 22 08:05:17 2012
@@ -92,7 +92,8 @@ public class CssMenuItem implements Seri
         }
 
         /**
-         * Returns the built {@link CssMenuItem}, associating with {@link #parent(CssMenuItem) parent} (if specified).
+         * Returns the built {@link CssMenuItem}, associating with
+         * {@link #parent(CssMenuItem) parent} (if specified).
          */
         public CssMenuItem build() {
             if (cssMenuItem.parent != null) {
@@ -183,10 +184,10 @@ public class CssMenuItem implements Seri
     // //////////////////////////////////////////////////////////////
 
     /**
-     * @return the builder, else <tt>null</tt> if the action is not visible for the current user.
+     * @return the builder, else <tt>null</tt> if the action is not visible for
+     *         the current user.
      */
-    public Builder newSubMenuItem(final ObjectAdapterMemento adapterMemento, final ObjectAction noAction,
-        final CssMenuLinkFactory cssMenuLinkFactory) {
+    public Builder newSubMenuItem(final ObjectAdapterMemento adapterMemento, final ObjectAction noAction, final CssMenuLinkFactory cssMenuLinkFactory) {
 
         final AuthenticationSession session = getAuthenticationSession();
 
@@ -198,8 +199,7 @@ public class CssMenuItem implements Seri
             return null;
         }
 
-        final LinkAndLabel linkAndLabel =
-            cssMenuLinkFactory.newLink(adapterMemento, noAction, PageAbstract.ID_MENU_LINK);
+        final LinkAndLabel linkAndLabel = cssMenuLinkFactory.newLink(adapterMemento, noAction, PageAbstract.ID_MENU_LINK);
 
         final Link<?> link = linkAndLabel.getLink();
         final String actionLabel = linkAndLabel.getLabel();

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java Sun Jan 22 08:05:17 2012
@@ -31,7 +31,8 @@ import org.apache.wicket.markup.repeater
 import org.apache.wicket.model.util.ListModel;
 
 /**
- * Top level panel for a CSS menu, consisting of a number of unparented {@link CssMenuItem}s.
+ * Top level panel for a CSS menu, consisting of a number of unparented
+ * {@link CssMenuItem}s.
  * 
  * <p>
  * The {@link Style} enum allows the presentation to be altered.

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.java Sun Jan 22 08:05:17 2012
@@ -26,7 +26,8 @@ import org.apache.wicket.markup.repeater
 import org.apache.wicket.model.util.ListModel;
 
 /**
- * Panel containing a list of {@link CssMenuItem}s acting as submenus of a parent {@link CssMenuItem}.
+ * Panel containing a list of {@link CssMenuItem}s acting as submenus of a
+ * parent {@link CssMenuItem}.
  */
 public class CssSubMenuItemsPanel extends CssMenuItemPanelAbstract<CssSubMenuItemsPanel.MyModel> {
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/DropDownChoicesForObjectAdapterMementos.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/DropDownChoicesForObjectAdapterMementos.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/DropDownChoicesForObjectAdapterMementos.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/DropDownChoicesForObjectAdapterMementos.java Sun Jan 22 08:05:17 2012
@@ -58,14 +58,11 @@ public class DropDownChoicesForObjectAda
 
     private static final long serialVersionUID = 1L;
 
-    public DropDownChoicesForObjectAdapterMementos(final String id, final IModel<ObjectAdapterMemento> model,
-        final IModel<? extends List<? extends ObjectAdapterMemento>> choices) {
+    public DropDownChoicesForObjectAdapterMementos(final String id, final IModel<ObjectAdapterMemento> model, final IModel<? extends List<? extends ObjectAdapterMemento>> choices) {
         this(id, model, choices, new ObjectAdapterMementoRenderer());
     }
 
-    private DropDownChoicesForObjectAdapterMementos(final String id, final IModel<ObjectAdapterMemento> model,
-        final IModel<? extends List<? extends ObjectAdapterMemento>> choices,
-        final IChoiceRenderer<? super ObjectAdapterMemento> renderer) {
+    private DropDownChoicesForObjectAdapterMementos(final String id, final IModel<ObjectAdapterMemento> model, final IModel<? extends List<? extends ObjectAdapterMemento>> choices, final IChoiceRenderer<? super ObjectAdapterMemento> renderer) {
         super(id, model, choices, renderer);
     }
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/DropDownChoicesForValueMementos.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/DropDownChoicesForValueMementos.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/DropDownChoicesForValueMementos.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/DropDownChoicesForValueMementos.java Sun Jan 22 08:05:17 2012
@@ -21,12 +21,11 @@ package org.apache.isis.viewer.wicket.ui
 
 import java.util.List;
 
+import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.IChoiceRenderer;
 import org.apache.wicket.model.IModel;
 
-import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-
 public class DropDownChoicesForValueMementos extends DropDownChoice<ObjectAdapterMemento> {
 
     private final static class ValueMementoRenderer implements IChoiceRenderer<ObjectAdapterMemento> {
@@ -47,14 +46,11 @@ public class DropDownChoicesForValueMeme
 
     private static final long serialVersionUID = 1L;
 
-    public DropDownChoicesForValueMementos(final String id, final IModel<ObjectAdapterMemento> model,
-        final IModel<? extends List<? extends ObjectAdapterMemento>> choices) {
+    public DropDownChoicesForValueMementos(final String id, final IModel<ObjectAdapterMemento> model, final IModel<? extends List<? extends ObjectAdapterMemento>> choices) {
         this(id, model, choices, new ValueMementoRenderer());
     }
 
-    private DropDownChoicesForValueMementos(final String id, final IModel<ObjectAdapterMemento> model,
-        final IModel<? extends List<? extends ObjectAdapterMemento>> choices,
-        final IChoiceRenderer<? super ObjectAdapterMemento> renderer) {
+    private DropDownChoicesForValueMementos(final String id, final IModel<ObjectAdapterMemento> model, final IModel<? extends List<? extends ObjectAdapterMemento>> choices, final IChoiceRenderer<? super ObjectAdapterMemento> renderer) {
         super(id, model, choices, renderer);
     }
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java Sun Jan 22 08:05:17 2012
@@ -63,10 +63,10 @@ import org.apache.wicket.model.Model;
 import com.google.common.collect.Lists;
 
 /**
- * {@link FormComponentPanel} representing a reference to an entity: a link and a findUsing button.
+ * {@link FormComponentPanel} representing a reference to an entity: a link and
+ * a findUsing button.
  */
-public class EntityLink extends FormComponentPanelAbstract<ObjectAdapter> implements CancelHintRequired,
-    ActionInvokeHandler {
+public class EntityLink extends FormComponentPanelAbstract<ObjectAdapter> implements CancelHintRequired, ActionInvokeHandler {
 
     private static final long serialVersionUID = 1L;
 
@@ -151,40 +151,39 @@ public class EntityLink extends FormComp
         final List<ObjectAction> actions = findServiceActionsFor(entityModel.getTypeOfSpecification());
         findUsing = new WebMarkupContainer(ID_FIND_USING);
         switch (actions.size()) {
-            case 0:
-                permanentlyHide(findUsing, ComponentType.ACTION);
-                break;
-            default:
-                // TODO: i18n
-
-                final CssMenuBuilder cssMenuBuilder =
-                    new CssMenuBuilder(null, getServiceAdapters(), actions, linkFactory);
-                final CssMenuPanel cssMenuPanel =
-                    cssMenuBuilder.buildPanel(ComponentType.ACTION.getWicketId(), "find using...");
-
-                findUsing.addOrReplace(cssMenuPanel);
-                actionFindUsingComponent = cssMenuPanel;
-                break;
+        case 0:
+            permanentlyHide(findUsing, ComponentType.ACTION);
+            break;
+        default:
+            // TODO: i18n
+
+            final CssMenuBuilder cssMenuBuilder = new CssMenuBuilder(null, getServiceAdapters(), actions, linkFactory);
+            final CssMenuPanel cssMenuPanel = cssMenuBuilder.buildPanel(ComponentType.ACTION.getWicketId(), "find using...");
+
+            findUsing.addOrReplace(cssMenuPanel);
+            actionFindUsingComponent = cssMenuPanel;
+            break;
         }
         addOrReplace(findUsing);
     }
 
     /**
-     * Must be called after {@link #setEnabled(boolean)} to ensure that the <tt>findUsing</tt> button is shown/not shown
-     * as required.
+     * Must be called after {@link #setEnabled(boolean)} to ensure that the
+     * <tt>findUsing</tt> button is shown/not shown as required.
      * 
      * <p>
-     * REVIEW: there ought to be a better way to do this. I'd hoped to override {@link #setEnabled(boolean)}, but it is
-     * <tt>final</tt>, and there doesn't seem to be anyway to install a listener. One option might be to move it to
-     * {@link #onBeforeRender()} ?
+     * REVIEW: there ought to be a better way to do this. I'd hoped to override
+     * {@link #setEnabled(boolean)}, but it is <tt>final</tt>, and there doesn't
+     * seem to be anyway to install a listener. One option might be to move it
+     * to {@link #onBeforeRender()} ?
      */
     public void syncFindUsingVisibility() {
         findUsing.setVisible(isEnabled() && !getEntityModel().isViewMode());
     }
 
     /**
-     * Since we override {@link #convertInput()}, it is (apparently) enough to just return a value that is suitable for
-     * error reporting.
+     * Since we override {@link #convertInput()}, it is (apparently) enough to
+     * just return a value that is suitable for error reporting.
      * 
      * @see DateField#getInput() for reference
      */
@@ -194,8 +193,8 @@ public class EntityLink extends FormComp
     }
 
     /**
-     * Ensures that the link is always enabled and traversable, even if (in the context of an entity property form) the
-     * entity model is in view mode.
+     * Ensures that the link is always enabled and traversable, even if (in the
+     * context of an entity property form) the entity model is in view mode.
      * 
      * <p>
      * A slight hack, but works...
@@ -325,8 +324,7 @@ public class EntityLink extends FormComp
                 return null;
             }
             // take a copy otherwise is only lazily evaluated
-            final List<ObjectAdapterMemento> choicesMementos =
-                Lists.newArrayList(Lists.transform(choices, Mementos.fromAdapter()));
+            final List<ObjectAdapterMemento> choicesMementos = Lists.newArrayList(Lists.transform(choices, Mementos.fromAdapter()));
             return Model.ofList(choicesMementos);
         }
         return null;
@@ -364,8 +362,7 @@ public class EntityLink extends FormComp
     private void addOrReplaceLink(final ObjectAdapter adapter) {
         final PageParameters pageParameters = EntityModel.createPageParameters(adapter, getOidStringifier());
         final Class<? extends Page> pageClass = getPageClassRegistry().getPageClass(PageType.ENTITY);
-        final BookmarkablePageLink<EntityPage> link =
-            new BookmarkablePageLink<EntityPage>(ID_ENTITY_LINK, pageClass, pageParameters);
+        final BookmarkablePageLink<EntityPage> link = new BookmarkablePageLink<EntityPage>(ID_ENTITY_LINK, pageClass, pageParameters);
         label = new Label(ID_ENTITY_TITLE, adapter.titleString());
         link.add(label);
         final WebMarkupContainer entityLinkWrapper = new WebMarkupContainer(ID_ENTITY_LINK_WRAPPER);
@@ -385,16 +382,14 @@ public class EntityLink extends FormComp
         return actionList;
     }
 
-    private static void addServiceActionsFor(final ObjectSpecification noSpec, final ActionType actionType,
-        final List<ObjectAction> actionList) {
+    private static void addServiceActionsFor(final ObjectSpecification noSpec, final ActionType actionType, final List<ObjectAction> actionList) {
         final List<ObjectAction> serviceActionsFor = noSpec.getServiceActionsReturning(actionType);
         actionList.addAll(serviceActionsFor);
     }
 
     @Override
     public void onClick(final ActionModel actionModel) {
-        final ActionPanel actionPanel =
-            new ActionPanel(actionFindUsingComponent.getComponentType().toString(), actionModel);
+        final ActionPanel actionPanel = new ActionPanel(actionFindUsingComponent.getComponentType().toString(), actionModel);
         actionFindUsingComponent.replaceWith(actionPanel);
     }
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/FindUsingLinkFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/FindUsingLinkFactory.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/FindUsingLinkFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/FindUsingLinkFactory.java Sun Jan 22 08:05:17 2012
@@ -43,12 +43,10 @@ final class FindUsingLinkFactory impleme
     }
 
     @Override
-    public LinkAndLabel newLink(final ObjectAdapterMemento adapterMemento, final ObjectAction action,
-        final String linkId) {
+    public LinkAndLabel newLink(final ObjectAdapterMemento adapterMemento, final ObjectAction action, final String linkId) {
         final ActionMemento actionMemento = new ActionMemento(action);
         final ActionModel.Mode actionMode = ActionModel.determineMode(action);
-        final ActionModel actionModel =
-            ActionModel.create(adapterMemento, actionMemento, actionMode, SingleResultsMode.SELECT);
+        final ActionModel actionModel = ActionModel.create(adapterMemento, actionMemento, actionMode, SingleResultsMode.SELECT);
 
         actionModel.setSelectionHandler(new SelectionHandler() {
             private static final long serialVersionUID = 1L;

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java Sun Jan 22 08:05:17 2012
@@ -23,8 +23,8 @@ import org.apache.wicket.markup.html.for
 import org.apache.wicket.markup.html.form.FormComponent;
 
 /**
- * {@link FormComponent}s that require explicit notification that their owning {@link Form} has been cancelled should
- * implement this interface.
+ * {@link FormComponent}s that require explicit notification that their owning
+ * {@link Form} has been cancelled should implement this interface.
  */
 public interface CancelHintRequired {
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java Sun Jan 22 08:05:17 2012
@@ -44,11 +44,11 @@ import org.apache.wicket.markup.html.for
 import org.apache.wicket.model.IModel;
 
 /**
- * Convenience adapter for {@link FormComponent}s that are implemented using the Wicket {@link FormComponentPanel},
- * providing the ability to build up the panel using other {@link ComponentType}s.
+ * Convenience adapter for {@link FormComponent}s that are implemented using the
+ * Wicket {@link FormComponentPanel}, providing the ability to build up the
+ * panel using other {@link ComponentType}s.
  */
-public abstract class FormComponentPanelAbstract<T> extends FormComponentPanel<T> implements
-    PersistenceSessionAccessor, AuthenticationSessionAccessor {
+public abstract class FormComponentPanelAbstract<T> extends FormComponentPanel<T> implements PersistenceSessionAccessor, AuthenticationSessionAccessor {
 
     private static final long serialVersionUID = 1L;
 
@@ -132,7 +132,8 @@ public abstract class FormComponentPanel
     }
 
     /**
-     * The underlying {@link AuthenticationSession Isis session} wrapped in the {@link #getWebSession() Wicket session}.
+     * The underlying {@link AuthenticationSession Isis session} wrapped in the
+     * {@link #getWebSession() Wicket session}.
      * 
      * @return
      */

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java Sun Jan 22 08:05:17 2012
@@ -25,8 +25,9 @@ import org.apache.wicket.markup.html.for
 import org.apache.wicket.markup.html.panel.FeedbackPanel;
 
 /**
- * {@link FeedbackPanel} designed for forms; filters out any {@link FeedbackMessage}s from {@link FormComponent}s (the
- * idea being that they will have their own {@link FeedbackPanel}s.
+ * {@link FeedbackPanel} designed for forms; filters out any
+ * {@link FeedbackMessage}s from {@link FormComponent}s (the idea being that
+ * they will have their own {@link FeedbackPanel}s.
  */
 public class FormFeedbackPanel extends FeedbackPanel {
     private static final long serialVersionUID = 1L;

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java Sun Jan 22 08:05:17 2012
@@ -65,11 +65,11 @@ public class ValueChoicesPanel extends S
 
     @Override
     protected FormComponentLabel addComponentForRegular() {
-        
+
         final IModel<ObjectAdapterMemento> modelObject = createModel();
         final IModel<List<? extends ObjectAdapterMemento>> choicesMementos = getChoicesModel();
         valueField = createDropDownChoices(choicesMementos, modelObject);
-        
+
         addStandardSemantics();
         // addSemantics();
 
@@ -114,7 +114,7 @@ public class ValueChoicesPanel extends S
 
     protected void addStandardSemantics() {
         setRequiredIfSpecified();
-        //setSizeIfSpecified();
+        // setSizeIfSpecified();
     }
 
     private void setRequiredIfSpecified() {
@@ -125,7 +125,7 @@ public class ValueChoicesPanel extends S
 
     private void setSizeIfSpecified() {
         final int size = determineSize();
-        
+
         if (size != -1) {
             valueField.add(new AttributeModifier("size", true, new Model<String>("" + size)));
         }
@@ -173,9 +173,8 @@ public class ValueChoicesPanel extends S
         return scalarModel.getObject();
     }
 
-
     private DropDownChoicesForValueMementos createDropDownChoices(final IModel<List<? extends ObjectAdapterMemento>> choicesMementos, final IModel<ObjectAdapterMemento> modelObject) {
-        String id = ID_VALUE_ID;
+        final String id = ID_VALUE_ID;
         return new DropDownChoicesForValueMementos(id, modelObject, choicesMementos);
     }
 
@@ -195,8 +194,7 @@ public class ValueChoicesPanel extends S
             return null;
         }
         // take a copy otherwise is only lazily evaluated
-        final List<ObjectAdapterMemento> choicesMementos =
-            Lists.newArrayList(Lists.transform(choices, Mementos.fromAdapter()));
+        final List<ObjectAdapterMemento> choicesMementos = Lists.newArrayList(Lists.transform(choices, Mementos.fromAdapter()));
         return Model.ofList(choicesMementos);
     }
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java Sun Jan 22 08:05:17 2012
@@ -40,13 +40,12 @@ import org.apache.wicket.RestartResponse
 import org.apache.wicket.markup.MarkupStream;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.link.PageLink;
 import org.apache.wicket.model.IModel;
 
 /**
- * Convenience adapter for {@link WebPage}s built up using {@link ComponentType}s.
+ * Convenience adapter for {@link WebPage}s built up using {@link ComponentType}
+ * s.
  */
 public abstract class PageAbstract extends WebPage {
 
@@ -64,21 +63,24 @@ public abstract class PageAbstract exten
     }
 
     private void addLogoutLink() {
-		add(new Link<Object>(ID_LOGOUT_LINK){
-			private static final long serialVersionUID = 1L;
-			@Override
-			public void onClick() {
-				getSession().invalidate();
-				throw new RestartResponseAtInterceptPageException(WicketSignInPage.class);
-			}});
-	}
+        add(new Link<Object>(ID_LOGOUT_LINK) {
+            private static final long serialVersionUID = 1L;
 
-	/**
+            @Override
+            public void onClick() {
+                getSession().invalidate();
+                throw new RestartResponseAtInterceptPageException(WicketSignInPage.class);
+            }
+        });
+    }
+
+    /**
      * As provided in the {@link #PageAbstract(ComponentType) constructor}.
      * 
      * <p>
-     * This superclass doesn't do anything with this property directly, but requiring it to be provided enforces
-     * standardization of the implementation of the subclasses.
+     * This superclass doesn't do anything with this property directly, but
+     * requiring it to be provided enforces standardization of the
+     * implementation of the subclasses.
      */
     public List<ComponentType> getChildModelTypes() {
         return childComponentIds;
@@ -101,7 +103,8 @@ public abstract class PageAbstract exten
      * Should be called in the subclass' constructor.
      * 
      * @param model
-     *            - used to find the best matching {@link ComponentFactory} to render the model.
+     *            - used to find the best matching {@link ComponentFactory} to
+     *            render the model.
      */
     protected void addChildComponents(final IModel<?> model) {
         for (final ComponentType componentType : getChildModelTypes()) {

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java Sun Jan 22 08:05:17 2012
@@ -23,9 +23,11 @@ package org.apache.isis.viewer.wicket.ui
  * Specify the pages to use for each {@link PageType}.
  * 
  * <p>
- * The <tt>PageClassListDefault</tt> default implementation returns pages that all inherit from {@link PageAbstract} and
- * which (by component markup inheritance) therefore define a set of CSS, along with the overall layout of each pages.
- * This interface can be used to selectively replace some or all of these pages.
+ * The <tt>PageClassListDefault</tt> default implementation returns pages that
+ * all inherit from {@link PageAbstract} and which (by component markup
+ * inheritance) therefore define a set of CSS, along with the overall layout of
+ * each pages. This interface can be used to selectively replace some or all of
+ * these pages.
  */
 public interface PageClassList {
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java Sun Jan 22 08:05:17 2012
@@ -27,7 +27,8 @@ import org.apache.wicket.Page;
 public interface PageClassRegistry {
 
     /**
-     * Used by <tt>WicketObjectsApplication</tt> to lookup pages from the registry.
+     * Used by <tt>WicketObjectsApplication</tt> to lookup pages from the
+     * registry.
      */
     public Class<? extends Page> getPageClass(PageType pageType);
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageType.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageType.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageType.java Sun Jan 22 08:05:17 2012
@@ -29,8 +29,9 @@ import org.apache.wicket.markup.html.Web
  * Enumerates the different types of pages that can be rendered.
  * 
  * <p>
- * Is used by {@link PageClassRegistry} to lookup the concrete page to render different types of pages. This allows the
- * large-scale structure of page layout (eg headers, footers) to be altered.
+ * Is used by {@link PageClassRegistry} to lookup the concrete page to render
+ * different types of pages. This allows the large-scale structure of page
+ * layout (eg headers, footers) to be altered.
  */
 public enum PageType {
     SIGN_IN(WebPage.class), HOME(HomePage.class), ENTITY(EntityPage.class), ACTION(ActionPage.class);
@@ -46,10 +47,12 @@ public enum PageType {
     }
 
     /**
-     * The class that pages registered against this page type must be assignable from (ie have as their superclass).
+     * The class that pages registered against this page type must be assignable
+     * from (ie have as their superclass).
      * 
      * <p>
-     * This allows us to perform fail-fast checking when pages are registered, rather than when they are used.
+     * This allows us to perform fail-fast checking when pages are registered,
+     * rather than when they are used.
      */
     public Class<? extends Page> getPageClass() {
         return superClass;

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java Sun Jan 22 08:05:17 2012
@@ -19,14 +19,13 @@
 
 package org.apache.isis.viewer.wicket.ui.pages.entity;
 
-import org.apache.wicket.PageParameters;
-import org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation;
-import org.apache.wicket.model.IModel;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.viewer.wicket.model.models.EntityModel;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
 import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.model.IModel;
 
 /**
  * Web page representing an entity.

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/UserPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/UserPanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/UserPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/UserPanel.java Sun Jan 22 08:05:17 2012
@@ -28,8 +28,10 @@ public class UserPanel /* extends PanelA
 
     // public UserPanel(String id, Class<? extends Page> signoutClass) {
     // super(id);
-    // AuthenticatedWebSessionForIsis session = getIsisAuthenticatedWebSession();
-    // add(new Label("fullname", session.getAuthenticationSession().getUserName()));
+    // AuthenticatedWebSessionForIsis session =
+    // getIsisAuthenticatedWebSession();
+    // add(new Label("fullname",
+    // session.getAuthenticationSession().getUserName()));
     // add(new BookmarkablePageLink("signout", signoutClass));
     // }
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java Sun Jan 22 08:05:17 2012
@@ -38,8 +38,7 @@ import org.apache.wicket.markup.html.IHe
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.IModel;
 
-public abstract class FormAbstract<T> extends Form<T> implements IHeaderContributor, ComponentFactoryRegistryAccessor,
-    PageClassRegistryAccessor, AuthenticationSessionAccessor, PersistenceSessionAccessor {
+public abstract class FormAbstract<T> extends Form<T> implements IHeaderContributor, ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, AuthenticationSessionAccessor, PersistenceSessionAccessor {
 
     private static final long serialVersionUID = 1L;
 
@@ -65,7 +64,8 @@ public abstract class FormAbstract<T> ex
     }
 
     /**
-     * Factored out to allow non-concrete subclasses to additionally render their own CSS if required.
+     * Factored out to allow non-concrete subclasses to additionally render
+     * their own CSS if required.
      */
     protected void renderHead(final IHeaderResponse response, final Class<?> cls) {
         final String url = cls.getSimpleName() + ".css";



Mime
View raw message