You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/12/09 18:21:46 UTC
[4/7] isis git commit: so far so good
so far so good
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bf76ed2e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bf76ed2e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bf76ed2e
Branch: refs/heads/maint-1.13.2
Commit: bf76ed2e5ddda36a10fcb98212ab4009fc979545
Parents: 0cc7954
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Dec 9 17:23:20 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Dec 9 17:23:20 2016 +0000
----------------------------------------------------------------------
.../actions/ActionParametersFormPanel.java | 5 +--
.../components/property/FormPanelAbstract.java | 35 ++++++++++++++++++++
.../property/PropertyEditFormPanel.java | 8 ++---
3 files changed, 42 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bf76ed2e/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
index 444d336..7e384ae 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
@@ -43,6 +43,7 @@ import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
import org.apache.isis.viewer.wicket.model.models.ExecutingPanel;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.components.property.FormPanelAbstract;
import org.apache.isis.viewer.wicket.ui.components.property.PropertyEditFormPanel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarModelSubscriber;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
@@ -61,7 +62,7 @@ import static org.hamcrest.CoreMatchers.nullValue;
* {@link PanelAbstract Panel} to capture the arguments for an action
* invocation.
*/
-public class ActionParametersFormPanel extends PanelAbstract<ActionModel> {
+public class ActionParametersFormPanel extends FormPanelAbstract<ActionModel> {
private static final long serialVersionUID = 1L;
@@ -95,7 +96,7 @@ public class ActionParametersFormPanel extends PanelAbstract<ActionModel> {
public ActionParameterForm(
final String id,
- final Component parentPanel,
+ final FormPanelAbstract<?> parentPanel,
final ActionModel actionModel) {
super(id, parentPanel, actionModel);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/bf76ed2e/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/FormPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/FormPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/FormPanelAbstract.java
new file mode 100644
index 0000000..d80f463
--- /dev/null
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/FormPanelAbstract.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.viewer.wicket.ui.components.property;
+
+import org.apache.wicket.model.IModel;
+
+import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
+
+/**
+ * {@link PanelAbstract Panel} to capture the arguments for an action
+ * invocation.
+ */
+public abstract class FormPanelAbstract<T extends IModel<?>> extends PanelAbstract<T> {
+
+ public FormPanelAbstract(final String id, final T model) {
+ super(id, model);
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/bf76ed2e/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
index c53183a..57e9476 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
@@ -57,7 +57,7 @@ import static org.hamcrest.CoreMatchers.nullValue;
* {@link PanelAbstract Panel} to capture the arguments for an action
* invocation.
*/
-public class PropertyEditFormPanel extends PanelAbstract<ScalarModel> {
+public class PropertyEditFormPanel extends FormPanelAbstract<ScalarModel> {
private static final long serialVersionUID = 1L;
@@ -89,9 +89,9 @@ public class PropertyEditFormPanel extends PanelAbstract<ScalarModel> {
protected static final String ID_FEEDBACK = "feedback";
protected final List<ScalarPanelAbstract> paramPanels = Lists.newArrayList();
- private final Component parentPanel;
+ private final FormPanelAbstract<?> parentPanel;
- public FormAbstract(final String id, final Component parentPanel, final IModel<ObjectAdapter> model) {
+ public FormAbstract(final String id, final FormPanelAbstract<?> parentPanel, final IModel<ObjectAdapter> model) {
super(id, model);
this.parentPanel = parentPanel;
@@ -122,7 +122,7 @@ public class PropertyEditFormPanel extends PanelAbstract<ScalarModel> {
public PropertyEditForm(
final String id,
- final Component parentPanel,
+ final FormPanelAbstract<?> parentPanel,
final ScalarModel propertyModel) {
super(id, parentPanel, propertyModel);
}