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 2013/10/03 14:54:22 UTC
git commit: ISIS-552: upgrade to Wicket 6.11 ...
Updated Branches:
refs/heads/master 1d9859944 -> 1dd9e813c
ISIS-552: upgrade to Wicket 6.11 ...
taking advantage of the reverted behavior w.r.t. HTML5 attributes
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1dd9e813
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1dd9e813
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1dd9e813
Branch: refs/heads/master
Commit: 1dd9e813c86647fdb62ec459c7898f8cef37cf7b
Parents: 1d98599
Author: Dan Haywood <da...@apache.org>
Authored: Thu Oct 3 13:53:59 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Oct 3 13:53:59 2013 +0100
----------------------------------------------------------------------
.gitignore | 1 +
component/viewer/wicket/pom.xml | 6 +++---
.../ui/components/scalars/ScalarPanelTextFieldAbstract.java | 7 +------
.../dom/src/main/java/dom/todo/ToDoItem.java | 2 +-
.../dom/src/main/java/dom/todo/ToDoItem.layout.json | 4 ++--
.../webapp/src/main/webapp/css/application.css | 2 +-
6 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1dd9e813/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index a597ec3..3cdb102 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,5 +34,6 @@ pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
+.clover/
*.jdproj
JArchitectOut/
http://git-wip-us.apache.org/repos/asf/isis/blob/1dd9e813/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index 13950e2..2051c47 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -40,9 +40,9 @@
<siteBaseDir>.</siteBaseDir>
<relativeUrl />
- <wicket.version>6.10.0</wicket.version>
- <wicket-jquery-ui.version>6.10.0</wicket-jquery-ui.version>
- <wicketstuff.version>6.10.0</wicketstuff.version>
+ <wicket.version>6.11.0</wicket.version>
+ <wicket-jquery-ui.version>6.11.0</wicket-jquery-ui.version>
+ <wicketstuff.version>6.11.0</wicketstuff.version>
<wicket-select2.version>2.2.2</wicket-select2.version>
<docbkxGuideTitle>Apache Isis Wicket Viewer</docbkxGuideTitle>
http://git-wip-us.apache.org/repos/asf/isis/blob/1dd9e813/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 0f55f99..2bd7c5e 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -130,14 +130,9 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
}
protected void addStandardSemantics() {
- // removed because change introduced in
- // https://issues.apache.org/jira/browse/WICKET-5289
- // interferes with the veil.
- // setRequiredIfSpecified();
- setTextFieldSizeIfSpecified(textField);
+ setRequiredIfSpecified();
}
- @SuppressWarnings("unused")
private void setRequiredIfSpecified() {
final ScalarModel scalarModel = getModel();
final boolean required = scalarModel.isRequired();
http://git-wip-us.apache.org/repos/asf/isis/blob/1dd9e813/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
index 58f306f..c7eff06 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
@@ -483,7 +483,6 @@ public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3
// nb: method is not called "clone()" is inherited by java.lang.Object and
// (a) has different semantics and (b) is in any case automatically ignored
// by the framework
- @CssClass("x-caution")
public ToDoItem duplicate(
@Named("Description")
String description,
@@ -517,6 +516,7 @@ public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3
// //////////////////////////////////////
@Bulk
+ @CssClass("x-caution")
public List<ToDoItem> delete() {
container.removeIfNotAlready(this);
container.informUser("Deleted " + container.titleOf(this));
http://git-wip-us.apache.org/repos/asf/isis/blob/1dd9e813/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.layout.json
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.layout.json b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.layout.json
index d6deec6..c96a868 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.layout.json
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.layout.json
@@ -83,8 +83,8 @@
}
],
actions: {
- delete: {},
- duplicate: {}
+ duplicate: {},
+ delete: {}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/1dd9e813/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/css/application.css
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/css/application.css b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/css/application.css
index 6d1ac97..74d58c4 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/css/application.css
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/css/application.css
@@ -53,7 +53,7 @@ example: uncomment to hide the sliding bookmark panel
.entityActions .cssMenuPanel .menuh li.x-caution a,
li.x-caution a {
- background-color: #DBB437;
+ background-color: #C94316;
}
.entityActions .cssMenuPanel .menuh li.x-caution a:hover {
background-color:#20B5C2;