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 2014/02/15 16:17:26 UTC
[1/3] git commit: ISIS-698: support scalar values in SELECT clause of
JDOQL
Repository: isis
Updated Branches:
refs/heads/master dd39f14b3 -> 8357cdf50
ISIS-698: support scalar values in SELECT clause of JDOQL
eg "SELECT startDate FROM ..."
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ee3b0f73
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ee3b0f73
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ee3b0f73
Branch: refs/heads/master
Commit: ee3b0f7369c6c6759f10121aea9f1eff8f110b53
Parents: dd39f14
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Feb 15 15:01:31 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Feb 15 15:01:31 2014 +0000
----------------------------------------------------------------------
.../queries/PersistenceQueryProcessorAbstract.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ee3b0f73/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
index 1e30ca0..119ea19 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
@@ -79,8 +79,15 @@ public abstract class PersistenceQueryProcessorAbstract<T extends PersistenceQue
for (final Object pojo : pojos) {
// ought not to be necessary, however for some queries it seems that the
// lifecycle listener is not called
- frameworkSynchronizer.postLoadProcessingFor((PersistenceCapable) pojo, CalledFrom.OS_QUERY);
- ObjectAdapter adapter = getAdapterManager().getAdapterFor(pojo);
+ ObjectAdapter adapter;
+ if(pojo instanceof PersistenceCapable) {
+ // an entity
+ frameworkSynchronizer.postLoadProcessingFor((PersistenceCapable) pojo, CalledFrom.OS_QUERY);
+ adapter = getAdapterManager().getAdapterFor(pojo);
+ } else {
+ // a value type
+ adapter = getAdapterManager().adapterFor(pojo);
+ }
Assert.assertNotNull(adapter);
adapters.add(adapter);
}
[2/3] git commit: ISIS-692: removing inadvertant spacing of
references in tables
Posted by da...@apache.org.
ISIS-692: removing inadvertant spacing of references in tables
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a67ad553
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a67ad553
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a67ad553
Branch: refs/heads/master
Commit: a67ad5535eb8099c33719f00a0acdaf99fe9e80e
Parents: ee3b0f7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Feb 15 15:02:41 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Feb 15 15:02:41 2014 +0000
----------------------------------------------------------------------
.../ui/components/widgets/entitylink/EntityLinkSelect2Panel.css | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a67ad553/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.css
index c118a6f..3c18b39 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.css
@@ -37,6 +37,10 @@ div.entityLinkSelect2Panel > div {
font-size: smaller;
}
+.collectionContentsAsAjaxTablePanel .entityLinkSelect2Panel .autoCompletePlaceholder {
+ height: 0px;
+}
+
.entityLinkSelect2Panel .autoCompletePlaceholder {
display: block;
height: 30px;
[3/3] git commit: ISIS-697: cosmetic fix to todo example app
Posted by da...@apache.org.
ISIS-697: cosmetic fix to todo example app
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8357cdf5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8357cdf5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8357cdf5
Branch: refs/heads/master
Commit: 8357cdf50f00b89b53a703af482831996c6e4937
Parents: a67ad55
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Feb 15 15:03:52 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Feb 15 15:03:52 2014 +0000
----------------------------------------------------------------------
.../src/main/java/webapp/prototyping/DeveloperUtilities.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8357cdf5/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/prototyping/DeveloperUtilities.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/prototyping/DeveloperUtilities.java b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/prototyping/DeveloperUtilities.java
index 70100e4..19b342d 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/prototyping/DeveloperUtilities.java
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/prototyping/DeveloperUtilities.java
@@ -39,5 +39,10 @@ public class DeveloperUtilities extends DeveloperUtilitiesServiceDefault {
return super.downloadLayouts();
}
+ @MemberOrder(name="Prototyping", sequence="90.3")
+ @Override
+ public void refreshServices() {
+ super.refreshServices();
+ }
}