svn commit: r1377358 [2/2] - in /incubator/isis/trunk: examples/quickstart/webapp/src/main/webapp/WEB-INF/ examples/quickstart/wicket/src/main/webapp/WEB-INF/ framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/mgr/ framework/...

[da...@apache.org]

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=1377358&r1=1377357&r2=1377358&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 Sat Aug 25 21:34:42 2012
@@ -21,14 +21,15 @@ package org.apache.isis.viewer.wicket.ui
 
 import java.util.List;
 
+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.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
-import org.apache.isis.core.metamodel.adapter.oid.RootOid;
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
 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;
 
 public class DropDownChoicesForObjectAdapterMementos extends DropDownChoice<ObjectAdapterMemento> {
 
@@ -38,12 +39,12 @@ public class DropDownChoicesForObjectAda
 
         @Override
         public Object getDisplayValue(final ObjectAdapterMemento nom) {
-            return nom.getObjectAdapter().titleString();
+            return nom.getObjectAdapter(ConcurrencyChecking.NO_CHECK).titleString();
         }
 
         @Override
         public String getIdValue(final ObjectAdapterMemento nom, final int index) {
-            final Oid oid = nom.getObjectAdapter().getOid();
+            final Oid oid = nom.getObjectAdapter(ConcurrencyChecking.NO_CHECK).getOid();
             return oid.enString(getOidMarshaller());
         }
     }

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=1377358&r1=1377357&r2=1377358&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 Sat Aug 25 21:34:42 2012
@@ -25,6 +25,7 @@ import org.apache.wicket.markup.html.for
 import org.apache.wicket.markup.html.form.IChoiceRenderer;
 import org.apache.wicket.model.IModel;
 
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
 import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
 
 public class DropDownChoicesForValueMementos extends DropDownChoice<ObjectAdapterMemento> {
@@ -35,7 +36,7 @@ public class DropDownChoicesForValueMeme
 
         @Override
         public Object getDisplayValue(final ObjectAdapterMemento nom) {
-            return nom.getObjectAdapter().titleString();
+            return nom.getObjectAdapter(ConcurrencyChecking.NO_CHECK).titleString();
         }
 
         @Override

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=1377358&r1=1377357&r2=1377358&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 Sat Aug 25 21:34:42 2012
@@ -38,6 +38,7 @@ import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
 import org.apache.isis.core.metamodel.facets.object.icon.IconFacet;
 import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -213,7 +214,7 @@ public class EntityLink extends FormComp
 
     private ObjectAdapter getPendingAdapter() {
         final ObjectAdapterMemento memento = entityOidField.getModelObject();
-        return memento != null ? memento.getObjectAdapter() : null;
+        return memento != null ? memento.getObjectAdapter(ConcurrencyChecking.NO_CHECK) : null;
     }
 
     @Override

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=1377358&r1=1377357&r2=1377358&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 Sat Aug 25 21:34:42 2012
@@ -31,6 +31,7 @@ import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
 import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet;
 import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -113,7 +114,7 @@ public class ValueChoicesPanel extends S
                     if (LOG.isDebugEnabled()) {
                         LOG.debug("TextField: setting to pending: " + pending.toString());
                     }
-                    scalarModel.setObject(pending.getObjectAdapter());
+                    scalarModel.setObject(pending.getObjectAdapter(ConcurrencyChecking.NO_CHECK));
                 }
 
             }

Added: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/AjaxButtonWithPreSubmitHook.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/AjaxButtonWithPreSubmitHook.java?rev=1377358&view=auto
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/AjaxButtonWithPreSubmitHook.java (added)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/AjaxButtonWithPreSubmitHook.java Sat Aug 25 21:34:42 2012
@@ -0,0 +1,11 @@
+package org.apache.isis.viewer.wicket.ui.panels;
+
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.model.IModel;
+
+public abstract class AjaxButtonWithPreSubmitHook extends AjaxButton implements IFormSubmittingComponentWithPreSubmitHook {
+    private static final long serialVersionUID = 1L;
+    public AjaxButtonWithPreSubmitHook(String id, IModel<String> model) {
+        super(id, model);
+    }
+}
\ No newline at end of file

Added: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ButtonWithPreSubmitHook.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/ButtonWithPreSubmitHook.java?rev=1377358&view=auto
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ButtonWithPreSubmitHook.java (added)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ButtonWithPreSubmitHook.java Sat Aug 25 21:34:42 2012
@@ -0,0 +1,11 @@
+package org.apache.isis.viewer.wicket.ui.panels;
+
+import org.apache.wicket.markup.html.form.Button;
+import org.apache.wicket.model.IModel;
+
+public abstract class ButtonWithPreSubmitHook extends Button implements IFormSubmittingComponentWithPreSubmitHook {
+    private static final long serialVersionUID = 1L;
+    public ButtonWithPreSubmitHook(String id, IModel<String> model) {
+        super(id, model);
+    }
+}
\ No newline at end of file

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=1377358&r1=1377357&r2=1377358&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 Sat Aug 25 21:34:42 2012
@@ -25,6 +25,7 @@ import org.apache.wicket.ResourceReferen
 import org.apache.wicket.markup.html.IHeaderContributor;
 import org.apache.wicket.markup.html.IHeaderResponse;
 import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.IFormSubmittingComponent;
 import org.apache.wicket.model.IModel;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
@@ -73,6 +74,21 @@ public abstract class FormAbstract<T> ex
         response.renderCSSReference(new ResourceReference(cls, url));
     }
 
+
+    // ///////////////////////////////////////////////////////////////////
+    // process() override
+    // ///////////////////////////////////////////////////////////////////
+
+    @Override
+    public void process(IFormSubmittingComponent submittingComponent) {
+        if(submittingComponent instanceof IFormSubmittingComponentWithPreSubmitHook) {
+            IFormSubmittingComponentWithPreSubmitHook componentWithPreSubmitHook = (IFormSubmittingComponentWithPreSubmitHook) submittingComponent;
+            componentWithPreSubmitHook.preSubmit();
+        }
+        super.process(submittingComponent);
+    }
+    
+
     // ///////////////////////////////////////////////////////////////////
     // Convenience
     // ///////////////////////////////////////////////////////////////////

Added: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmittingComponentWithPreSubmitHook.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/IFormSubmittingComponentWithPreSubmitHook.java?rev=1377358&view=auto
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmittingComponentWithPreSubmitHook.java (added)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmittingComponentWithPreSubmitHook.java Sat Aug 25 21:34:42 2012
@@ -0,0 +1,5 @@
+package org.apache.isis.viewer.wicket.ui.panels;
+
+public interface IFormSubmittingComponentWithPreSubmitHook {
+    void preSubmit();
+}
\ No newline at end of file

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java?rev=1377358&r1=1377357&r2=1377358&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java Sat Aug 25 21:34:42 2012
@@ -24,6 +24,7 @@ import java.util.Locale;
 import org.apache.commons.lang.StringUtils;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
 import org.apache.isis.core.metamodel.adapter.oid.RootOid;
@@ -66,7 +67,7 @@ public class ConverterForObjectAdapterMe
             return null;
         }
         final ObjectAdapterMemento memento = (ObjectAdapterMemento) object;
-        final Oid oid = memento.getObjectAdapter().getOid();
+        final Oid oid = memento.getObjectAdapter(ConcurrencyChecking.NO_CHECK).getOid();
         if (oid == null) {
             // values don't have an Oid...
             // REVIEW: is this right?