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/11/03 22:02:44 UTC
[1/3] isis git commit: Add @Override to an overridden method
Repository: isis
Updated Branches:
refs/heads/ISIS-1224-select2-v4 7c27df445 -> a6fe41c3a
Add @Override to an overridden method
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2d89e3f2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2d89e3f2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2d89e3f2
Branch: refs/heads/ISIS-1224-select2-v4
Commit: 2d89e3f29b88420291ddfd9e854a62832b050244
Parents: 7c27df4
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Nov 3 21:59:11 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Nov 3 21:59:11 2015 +0100
----------------------------------------------------------------------
.../multiple/CollectionContentsMultipleViewsPanel.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2d89e3f2/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
index 8c3a1e6..020a878 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
@@ -80,12 +80,12 @@ public class CollectionContentsMultipleViewsPanel
/**
* Build UI only after added to parent.
*/
+ @Override
public void onInitialize() {
super.onInitialize();
addUnderlyingViews();
}
-
private void addUnderlyingViews() {
final EntityCollectionModel model = getModel();
[3/3] isis git commit: ISIS-1223 Use Wicket 7.0.0 until 7.1.0+ is
released (due to WICKET-6021)
Posted by mg...@apache.org.
ISIS-1223 Use Wicket 7.0.0 until 7.1.0+ is released (due to WICKET-6021)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a6fe41c3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a6fe41c3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a6fe41c3
Branch: refs/heads/ISIS-1224-select2-v4
Commit: a6fe41c3ab4f22052af1f826a1f48b885e2cb874
Parents: fe4e2b8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Nov 3 22:01:21 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Nov 3 22:01:21 2015 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a6fe41c3/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8b0fba2..0f61ee0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -122,7 +122,7 @@
<jetty.version>9.2.11.v20150529</jetty.version>
- <wicket.version>7.1.0</wicket.version>
+ <wicket.version>7.0.0</wicket.version>
<wicketstuff.version>7.1.0</wicketstuff.version>
<wicket-webjars.version>0.5.3</wicket-webjars.version>
[2/3] isis git commit: Use WebMarkupContainer instead of Label with
empty string
Posted by mg...@apache.org.
Use WebMarkupContainer instead of Label with empty string
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fe4e2b8c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fe4e2b8c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fe4e2b8c
Branch: refs/heads/ISIS-1224-select2-v4
Commit: fe4e2b8c67cfd7fb8b1eb92f86544004bdb4dce1
Parents: 2d89e3f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Nov 3 22:00:31 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Nov 3 22:00:31 2015 +0100
----------------------------------------------------------------------
.../org/apache/isis/viewer/wicket/ui/util/Components.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fe4e2b8c/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java
index 93939c1..b33ff7b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java
@@ -21,6 +21,7 @@ package org.apache.isis.viewer.wicket.ui.util;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.isis.viewer.wicket.ui.ComponentType;
@@ -55,9 +56,9 @@ public final class Components {
* on JDK6u18 (Ubuntu)
*/
private static void permanentlyHideSingle(final MarkupContainer container, final String id) {
- final Label label = new Label(id, "");
- label.setVisible(false);
- container.addOrReplace(label);
+ final WebMarkupContainer invisible = new WebMarkupContainer(id);
+ invisible.setVisible(false);
+ container.addOrReplace(invisible);
}
/**