This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new ec077d5 ISIS-2031: minor simplifications
ec077d5 is described below
commit ec077d5e5edbf701daf2a25226cbea801b10950b
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Fri Nov 9 19:54:15 2018 +0100
ISIS-2031: minor simplifications
Task-Url: https://issues.apache.org/jira/browse/ISIS-2031
---
.../ajaxtable/IsisAjaxNavigationToolbar.java | 9 +--------
.../ajaxtable/IsisTotalRecordsToolbar.java | 12 -----------
.../ajaxtable/PrototypingMessageProvider.java | 23 ++++++++++++++++++++++
3 files changed, 24 insertions(+), 20 deletions(-)
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 0e0f0a8..ac7bca1 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
@@ -24,7 +24,6 @@ import
org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
@@ -81,13 +80,7 @@ public class IsisAjaxNavigationToolbar extends
AjaxNavigationToolbar {
}
});
- final boolean isPrototyping = IsisContext.getEnvironment()
- .getDeploymentCategory().isPrototyping();
-
- span.add(new Label("prototyping", isPrototyping
- ? PrototypingMessageProvider.getTookTimingMessage()
- : ""));
-
+ span.add(new Label("prototyping",
PrototypingMessageProvider.getTookTimingMessageModel()));
}
diff --git
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java
index d5b959b..103c15a 100644
---
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java
+++
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java
@@ -27,8 +27,6 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-
/**
* Responsibility: Display 'Showing all of 123' at the bottom of data tables.
* <p>
@@ -48,16 +46,6 @@ public class IsisTotalRecordsToolbar extends AbstractToolbar
{
@Override
public String getObject() {
-
- final boolean isPrototyping = IsisContext.getEnvironment()
- .getDeploymentCategory().isPrototyping();
-
- if(!isPrototyping) {
- return String.format("Showing all of %d",
table.getRowCount());
- }
-
- // when prototyping append a 'took seconds message' ...
-
return String.format("Showing all of %d %s",
table.getRowCount(),
PrototypingMessageProvider.getTookTimingMessage());
diff --git
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
index a05dd85..6b6c677 100644
---
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
+++
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
@@ -20,6 +20,9 @@ package
org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable
import java.util.Locale;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
import org.apache.isis.commons.internal.base._Timing;
import org.apache.isis.commons.internal.base._Timing.StopWatch;
import org.apache.isis.core.runtime.system.context.IsisContext;
@@ -37,6 +40,13 @@ class PrototypingMessageProvider {
public static String getTookTimingMessage() {
+ final boolean isPrototyping = IsisContext.getEnvironment()
+ .getDeploymentCategory().isPrototyping();
+
+ if(!isPrototyping) {
+ return "";
+ }
+
final StringBuilder tookTimingMessage = new StringBuilder();
IsisContext.getPersistenceSession().ifPresent(session->{
@@ -47,4 +57,17 @@ class PrototypingMessageProvider {
return tookTimingMessage.toString();
}
+ public static IModel<String> getTookTimingMessageModel() {
+ return new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getObject() {
+ return getTookTimingMessage();
+ }
+
+ };
+ }
+
}
