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 2015/03/26 11:29:59 UTC
isis git commit: ISIS-1116 Use ResourceModel for labels in Wicket
viewer
Repository: isis
Updated Branches:
refs/heads/master f60ce0249 -> 647ec490d
ISIS-1116 Use ResourceModel for labels in Wicket viewer
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/647ec490
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/647ec490
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/647ec490
Branch: refs/heads/master
Commit: 647ec490de6e48816ee3cd5be00c01a95d15f4ac
Parents: f60ce02
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 26 12:29:32 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 26 12:29:32 2015 +0200
----------------------------------------------------------------------
.../ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java | 3 ++-
.../summary/CollectionContentsAsSummaryFactory.java | 3 ++-
.../unresolved/CollectionContentsAsUnresolvedPanelFactory.java | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/647ec490/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
index 0307822..e922ac9 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
@@ -22,6 +22,7 @@ package org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.ui.CollectionContentsAsFactory;
@@ -55,7 +56,7 @@ public class CollectionContentsAsAjaxTablePanelFactory extends ComponentFactoryA
@Override
public IModel<String> getTitleLabel() {
- return Model.of("Table");
+ return new ResourceModel("CollectionContentsAsAjaxTablePanelFactory.Table", "Table");
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/647ec490/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
index 1c75d2a..e0d25cf 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.isis.applib.filter.Filter;
@@ -83,7 +84,7 @@ public class CollectionContentsAsSummaryFactory extends ComponentFactoryAbstract
@Override
public IModel<String> getTitleLabel() {
- return Model.of("Summary");
+ return new ResourceModel("CollectionContentsAsSummaryFactory.Summary", "Summary");
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/647ec490/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolvedPanelFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolvedPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolvedPanelFactory.java
index d2f340b..2d06eda 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolvedPanelFactory.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolvedPanelFactory.java
@@ -22,6 +22,7 @@ package org.apache.isis.viewer.wicket.ui.components.collectioncontents.unresolve
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.ui.CollectionContentsAsFactory;
@@ -59,7 +60,7 @@ public class CollectionContentsAsUnresolvedPanelFactory extends ComponentFactory
@Override
public IModel<String> getTitleLabel() {
- return Model.of("Hide");
+ return new ResourceModel("CollectionContentsAsUnresolvedPanel.Hide", "Hide");
}
@Override