You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2016/03/25 15:11:24 UTC
[48/50] isis git commit: ISIS-1351: extended ConfigurationService,
added new ConfigurationServiceMenu. Also minor fix to UiHintContainer.
ISIS-1351: extended ConfigurationService, added new ConfigurationServiceMenu. Also minor fix to UiHintContainer.
Also updated release notes for changes from 1.12.0 RC1 to RC2.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d780a9a3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d780a9a3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d780a9a3
Branch: refs/heads/ISIS-1223-upgrade-to-wicket-7
Commit: d780a9a3986819064bbf6458239ba2cfb72b1c47
Parents: 5e51898
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Mar 25 08:30:21 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 25 08:30:21 2016 +0000
----------------------------------------------------------------------
.../main/asciidoc/_release-notes_1.12.0.adoc | 7 ++
.../guides/_rgsvc_api_ConfigurationService.adoc | 6 ++
.../asciidoc/guides/_rgsvc_core-domain-api.adoc | 4 +-
.../services/config/ConfigurationProperty.java | 87 +++++++++++++++++++
.../config/ConfigurationProperty.layout.xml | 58 +++++++++++++
.../services/config/ConfigurationProperty.png | Bin 0 -> 927 bytes
.../services/config/ConfigurationService.java | 9 +-
.../config/ConfigurationServiceMenu.java | 67 ++++++++++++++
.../config/ConfigurationServiceDefault.java | 24 +++++
.../ajaxtable/IsisAjaxNavigationToolbar.java | 6 +-
.../ajaxtable/IsisAjaxPagingNavigationLink.java | 5 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 1 +
12 files changed, 267 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d780a9a3/adocs/documentation/src/main/asciidoc/_release-notes_1.12.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_release-notes_1.12.0.adoc b/adocs/documentation/src/main/asciidoc/_release-notes_1.12.0.adoc
index 15ec361..862bf42 100644
--- a/adocs/documentation/src/main/asciidoc/_release-notes_1.12.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/_release-notes_1.12.0.adoc
@@ -42,6 +42,7 @@ Apache Isis 1.12.0-SNAPSHOT is currently being voted on for release; expectation
=== New Feature
+* link:https://issues.apache.org/jira/browse/ISIS-1351[ISIS-1351] - Extend ConfigurationService to list all configuration properties in the UI
* link:https://issues.apache.org/jira/browse/ISIS-1326[ISIS-1326] - Add a link to a "quotes" page on the main website.
* link:https://issues.apache.org/jira/browse/ISIS-1325[ISIS-1325] - New SessionManagementService
* link:https://issues.apache.org/jira/browse/ISIS-1317[ISIS-1317] - Allow single domain object class to be invalidated through a mixin.
@@ -78,6 +79,12 @@ Apache Isis 1.12.0-SNAPSHOT is currently being voted on for release; expectation
=== Bug
+* link:https://issues.apache.org/jira/browse/ISIS-1348[ISIS-1348] - Bug with SoapEndpointPublishingRule when multiple endpoints.
+* link:https://issues.apache.org/jira/browse/ISIS-1347[ISIS-1347] - Missing annotation in SimpleObject
+* link:https://issues.apache.org/jira/browse/ISIS-1346[ISIS-1346] - ActionInvocationContext isn't populated properly
+* link:https://issues.apache.org/jira/browse/ISIS-1342[ISIS-1342] - The metamodel validation error page doesn't reliably render itself if there are errors.
+* link:https://issues.apache.org/jira/browse/ISIS-1341[ISIS-1341] - Restful Objects viewer should perform a flush transaction before generating representations.
+* link:https://issues.apache.org/jira/browse/ISIS-1340[ISIS-1340] - Rebuild metamodel mixin action isn't working reliably
* link:https://issues.apache.org/jira/browse/ISIS-1328[ISIS-1328] - Bookmark hints are not being honoured
* link:https://issues.apache.org/jira/browse/ISIS-1319[ISIS-1319] - Input dialog for action label for mandatory parameter not shown when the parameter is an view model
* link:https://issues.apache.org/jira/browse/ISIS-1318[ISIS-1318] - contributed actions/mixins breaks publishing; also flush any pending actions to be published as the result of doing a wrapped action via the WrapperFactory
http://git-wip-us.apache.org/repos/asf/isis/blob/d780a9a3/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_ConfigurationService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_ConfigurationService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_ConfigurationService.adoc
index cb6cb5f2..54aa8df 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_ConfigurationService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_ConfigurationService.adoc
@@ -25,11 +25,14 @@ public interface ConfigurationService {
String getProperty(String name); // <1>
String getProperty(String name, String defaultValue); // <2>
List<String> getPropertyNames(); // <3>
+ Set<ConfigurationProperty> allProperties(); // <4>
+
}
----
<1> Return the configuration property with the specified name; else return null.
<2> Return the configuration property with the specified name; if it doesn't exist then return the specified default value.
<3> Return the names of all the available properties.
+<4> Returns all properties, each as an instance of the `ConfigurationProperty` view model.
For example, here's a fictitious service that might wrap link:http://twitter4j.org/en/configuration.html[Twitter4J]. say:
@@ -80,3 +83,6 @@ in the xref:rgsvc.adoc#_rgsvc_intro_overriding-the-services[introduction] to thi
+== Related services
+
+The ``ConfigurationServiceMenu`` exposes the ``allConfigurationProperties`` action in the user interface.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/d780a9a3/adocs/documentation/src/main/asciidoc/guides/_rgsvc_core-domain-api.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc_core-domain-api.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc_core-domain-api.adoc
index 31287a1..b7b42dc 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc_core-domain-api.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc_core-domain-api.adoc
@@ -41,7 +41,9 @@ The table below summarizes the core/domain APIs defined by Apache Isis. It also
``Default`` +
``o.a.i.core`` +
``isis-core-runtime``
-|Supercedes methods in xref:rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`].
+|The ``ConfigurationServiceMenu`` exposes the ``allConfigurationProperties`` action in the user interface. +
++
+Supercedes methods in xref:rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`].
|xref:rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`o.a.i.applib` +
http://git-wip-us.apache.org/repos/asf/isis/blob/d780a9a3/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.java b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.java
new file mode 100644
index 0000000..5760ea1
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.java
@@ -0,0 +1,87 @@
+/*
+ * 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.applib.services.config;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import com.google.common.collect.ComparisonChain;
+
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.Title;
+
+@XmlRootElement(name = "configurationProperty")
+@XmlType(
+ propOrder = {
+ "key",
+ "value"
+ }
+)
+@DomainObject(
+ editing = Editing.DISABLED
+)
+@DomainObjectLayout(
+ paged = 999
+)
+public class ConfigurationProperty implements Comparable<ConfigurationProperty> {
+
+ public ConfigurationProperty(){}
+
+ public ConfigurationProperty(final String key, final String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+
+ @XmlElement(required = true)
+ @Title
+ public String getKey() {
+ return key;
+ }
+ public void setKey(final String key) {
+ this.key = key;
+ }
+
+
+ private String value;
+
+ @XmlElement(required = true)
+ public String getValue() {
+ return getKey().toLowerCase().contains("password")
+ ? "********"
+ : value;
+ }
+ public void setValue(final String value) {
+ this.value = value;
+ }
+
+
+ @Override
+ public int compareTo(final ConfigurationProperty other) {
+ return ComparisonChain.start()
+ .compare(getKey(), other.getKey())
+ .result();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/d780a9a3/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.layout.xml
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.layout.xml b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.layout.xml
new file mode 100644
index 0000000..dbf6b31
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.layout.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
+<grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:ns2="http://isis.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <row>
+ <col span="12" unreferencedActions="true">
+ <ns2:domainObject/>
+ <ns2:action id="clearHints" hidden="EVERYWHERE"/>
+ </col>
+ </row>
+ <row>
+ <col span="12">
+ <tabGroup>
+ <tab name="General">
+ <row>
+ <col span="8">
+ <ns2:fieldSet name="Property" id="key">
+ <ns2:action id="downloadLayoutXml" position="PANEL_DROPDOWN"/>
+ <ns2:action id="rebuildMetamodel" position="PANEL_DROPDOWN"/>
+ <ns2:property id="key"/>
+ <ns2:property id="value" multiLine="5"/>
+ </ns2:fieldSet>
+ </col>
+ </row>
+ </tab>
+ <tab name="Other">
+ <row>
+ <col span="12">
+ <ns2:fieldSet name="Other" id="other" unreferencedProperties="true">
+ </ns2:fieldSet>
+ </col>
+ </row>
+ </tab>
+ </tabGroup>
+ </col>
+ </row>
+ <row>
+ <col span="12">
+ <tabGroup unreferencedCollections="true"/>
+ </col>
+ </row>
+</grid>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/d780a9a3/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.png
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.png b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.png
new file mode 100644
index 0000000..9d9e1c3
Binary files /dev/null and b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/d780a9a3/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationService.java b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationService.java
index c621565..eda7bc4 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationService.java
@@ -20,6 +20,7 @@
package org.apache.isis.applib.services.config;
import java.util.List;
+import java.util.Set;
import org.apache.isis.applib.annotation.Programmatic;
@@ -41,7 +42,13 @@ public interface ConfigurationService {
/**
* Get the names of all the available properties.
*/
- @Programmatic List<String> getPropertyNames();
+ @Programmatic
+ List<String> getPropertyNames();
+ /**
+ * Returns all properties, each as an instance of {@link ConfigurationProperty} (a view model).
+ */
+ @Programmatic
+ Set<ConfigurationProperty> allProperties();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d780a9a3/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java
new file mode 100644
index 0000000..5780b88
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java
@@ -0,0 +1,67 @@
+/*
+ * 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.applib.services.config;
+
+import java.util.Set;
+
+import javax.inject.Inject;
+
+import org.apache.isis.applib.IsisApplibModule;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.SemanticsOf;
+
+@DomainService(
+ nature = NatureOfService.VIEW_MENU_ONLY
+)
+@DomainServiceLayout(
+ named = "Prototyping",
+ menuBar = DomainServiceLayout.MenuBar.SECONDARY,
+ menuOrder = "500.900"
+)
+public class ConfigurationServiceMenu {
+
+ public static abstract class ActionDomainEvent
+ extends IsisApplibModule.ActionDomainEvent<ConfigurationServiceMenu> { }
+
+ // //////////////////////////////////////
+
+ public static class AllConfigurationPropertiesDomainEvent extends ActionDomainEvent { }
+
+ @Action(
+ domainEvent = AllConfigurationPropertiesDomainEvent.class,
+ semantics = SemanticsOf.SAFE
+ )
+ @ActionLayout(
+ cssClassFa = "fa-wrench"
+ )
+ @MemberOrder(sequence = "500.900.1")
+ public Set<ConfigurationProperty> allConfigurationProperties(){
+ return configurationService.allProperties();
+ }
+
+ @Inject
+ private ConfigurationService configurationService;
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/d780a9a3/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
index c72f142..10c12e1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
@@ -20,10 +20,16 @@
package org.apache.isis.core.metamodel.services.config;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.annotation.PostConstruct;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.services.config.ConfigurationProperty;
@DomainService(
nature = NatureOfService.DOMAIN
@@ -33,6 +39,24 @@ public class ConfigurationServiceDefault
org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceAware {
+ private Map<String, String> properties;
+
+ @Programmatic
+ @PostConstruct
+ public void init(final Map<String,String> properties) {
+ this.properties = properties;
+ }
+
+ @Programmatic
+ public Set<ConfigurationProperty> allProperties() {
+ final Set<ConfigurationProperty> kv = new TreeSet<>();
+ for (Map.Entry<String, String> propertyPair : properties.entrySet()) {
+ kv.add(new ConfigurationProperty(propertyPair.getKey(),propertyPair.getValue()));
+
+ }
+ return kv;
+ }
+
@Programmatic
@Override
public String getProperty(final String name) {
http://git-wip-us.apache.org/repos/asf/isis/blob/d780a9a3/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
index f7ffd7e..1442072 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
@@ -19,12 +19,10 @@ package org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.event.Broadcast;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
-import org.apache.isis.viewer.wicket.model.hints.IsisSelectorEvent;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
@@ -49,7 +47,9 @@ public class IsisAjaxNavigationToolbar extends AjaxNavigationToolbar {
public void onClick(AjaxRequestTarget target) {
showAllItemsOn(table);
final UiHintContainer hintContainer = getUiHintContainer();
- hintContainer.setHint(table, HINT_KEY_SHOW_ALL, "true");
+ if(hintContainer != null) {
+ hintContainer.setHint(table, HINT_KEY_SHOW_ALL, "true");
+ }
target.add(table);
}
});
http://git-wip-us.apache.org/repos/asf/isis/blob/d780a9a3/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationLink.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationLink.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationLink.java
index 8ec643b..70b42ee 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationLink.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationLink.java
@@ -16,8 +16,6 @@
*/
package org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable;
-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigationBehavior;
-
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigationBehavior;
@@ -26,6 +24,8 @@ import org.apache.wicket.markup.html.navigation.paging.IPageable;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
+import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigationBehavior;
+
public class IsisAjaxPagingNavigationLink extends AjaxPagingNavigationLink {
private static final long serialVersionUID = 1L;
@@ -49,6 +49,7 @@ public class IsisAjaxPagingNavigationLink extends AjaxPagingNavigationLink {
return new BootstrapAjaxPagingNavigationBehavior(this, pageable, event);
}
+ // seemes to be unused
public UiHintContainer getUiHintContainer() {
return UiHintContainer.Util.hintContainerOf(component);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d780a9a3/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index 92dcd2d..f165950 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -121,6 +121,7 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel implement
return UiHintContainer.Util.hintContainerOf(this);
}
+ // seemes to be unused
public <T extends UiHintContainer> T getUiHintContainer(final Class<T> additionalConstraint) {
return UiHintContainer.Util.hintContainerOf(this, additionalConstraint);
}