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/14 09:45:59 UTC
[1/3] git commit: ISIS-695: deprecating @ActionOrder and @FieldOrder
annotation
Updated Branches:
refs/heads/master 7a7836e3d -> dd39f14b3
ISIS-695: deprecating @ActionOrder and @FieldOrder annotation
also:
- removed redundant imports
- reformatted
- updated comments
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/13c3f834
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/13c3f834
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/13c3f834
Branch: refs/heads/master
Commit: 13c3f834beab946d4bea2ddddc76dfdb63c03874
Parents: 7a7836e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Feb 14 07:53:24 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Feb 14 07:53:24 2014 +0000
----------------------------------------------------------------------
.../java/org/apache/isis/applib/annotation/ActionOrder.java | 3 +++
.../java/org/apache/isis/applib/annotation/FieldOrder.java | 3 +++
.../isis/applib/snapshot/SnapshottableWithInclusions.java | 7 +++++--
.../org/apache/isis/core/wrapper/WrapperFactoryDefault.java | 1 -
.../dom/src/main/java/dom/todo/ToDoItem.java | 9 +++++----
5 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/13c3f834/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionOrder.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionOrder.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionOrder.java
index 534a9a1..920afe9 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionOrder.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionOrder.java
@@ -27,10 +27,13 @@ import java.lang.annotation.Target;
/**
* Indicates the order that actions should be grouped/displayed in.
+ *
+ * @deprecated - use {@link MemberOrder} instead.
*/
@Inherited
@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
+@Deprecated
public @interface ActionOrder {
String value();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/13c3f834/core/applib/src/main/java/org/apache/isis/applib/annotation/FieldOrder.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/FieldOrder.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/FieldOrder.java
index f2b3494..3aef642 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/FieldOrder.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/FieldOrder.java
@@ -27,10 +27,13 @@ import java.lang.annotation.Target;
/**
* Indicates the order that properties should be displayed in.
+ *
+ * @deprecated - use {@link MemberOrder} instead.
*/
@Inherited
@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
+@Deprecated
public @interface FieldOrder {
String value();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/13c3f834/core/applib/src/main/java/org/apache/isis/applib/snapshot/SnapshottableWithInclusions.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/snapshot/SnapshottableWithInclusions.java b/core/applib/src/main/java/org/apache/isis/applib/snapshot/SnapshottableWithInclusions.java
index 3091165..c64727e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/snapshot/SnapshottableWithInclusions.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/snapshot/SnapshottableWithInclusions.java
@@ -21,9 +21,12 @@ package org.apache.isis.applib.snapshot;
import java.util.List;
+import org.apache.isis.applib.services.xmlsnapshot.XmlSnapshotService;
+
/**
- * Optional subinterface of {@link Snapshottable}s, used by <tt>XmlSnapshot</tt>
- * to automatically include additional paths within the snapshot.
+ * Optional interface for domain objects with which an
+ * snapshot is to be created using the {@link XmlSnapshotService}, indicating
+ * paths to be {@link XmlSnapshotService.Snapshot#} automatically include additional paths within the snapshot.
*/
public interface SnapshottableWithInclusions extends Snapshottable {
http://git-wip-us.apache.org/repos/asf/isis/blob/13c3f834/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
index 5e86d7d..1e89bc2 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.events.ActionArgumentEvent;
import org.apache.isis.applib.events.ActionInvocationEvent;
http://git-wip-us.apache.org/repos/asf/isis/blob/13c3f834/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 f7fe8d6..e60fd65 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
@@ -607,10 +607,6 @@ public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3
return total.setScale(2);
}
- private Scratchpad scratchpad;
- public void injectScratchpad(Scratchpad scratchpad) {
- this.scratchpad = scratchpad;
- }
// //////////////////////////////////////
@@ -836,6 +832,11 @@ public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3
@javax.inject.Inject
private BackgroundService backgroundService;
+ private Scratchpad scratchpad;
+ public void injectScratchpad(Scratchpad scratchpad) {
+ this.scratchpad = scratchpad;
+ }
+
// //////////////////////////////////////
// Extensions
// //////////////////////////////////////
[2/3] git commit: ISIS-696: BookmarkService#lookup(Bookmark, Class)
Posted by da...@apache.org.
ISIS-696: BookmarkService#lookup(Bookmark, Class<T>)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e84537f9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e84537f9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e84537f9
Branch: refs/heads/master
Commit: e84537f9b554efea08f7b67f54ba9143aa0cb2da
Parents: 13c3f83
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Feb 14 07:57:26 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Feb 14 07:57:26 2014 +0000
----------------------------------------------------------------------
.../isis/applib/services/bookmark/BookmarkService.java | 6 ++++++
.../services/bookmarks/BookmarkServiceDefault.java | 9 +++++++++
2 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e84537f9/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
index 6f951b3..0de2213 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
@@ -31,6 +31,12 @@ public interface BookmarkService {
@Programmatic
Object lookup(Bookmark bookmarkHolder);
+ /**
+ * As {@link #lookup(Bookmark)}, but downcasting to the specified type.
+ */
+ @Programmatic
+ <T> T lookup(Bookmark bookmarkHolder, Class<T> cls);
+
@Programmatic
Bookmark bookmarkFor(Object domainObject);
http://git-wip-us.apache.org/repos/asf/isis/blob/e84537f9/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
index 8619d33..de4505e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
@@ -76,6 +76,7 @@ public class BookmarkServiceDefault implements BookmarkService, DomainObjectServ
}
@Hidden
+ @Override
public Object lookup(final Bookmark bookmark) {
if(bookmark == null) {
return null;
@@ -83,8 +84,15 @@ public class BookmarkServiceDefault implements BookmarkService, DomainObjectServ
return domainObjectServices.lookup(bookmark);
}
+ @SuppressWarnings("unchecked")
+ @Hidden
@Override
+ public <T> T lookup(final Bookmark bookmark, Class<T> cls) {
+ return (T) lookup(bookmark);
+ }
+
@Hidden
+ @Override
public Bookmark bookmarkFor(final Object domainObject) {
return domainObjectServices.bookmarkFor(domainObject);
}
@@ -102,4 +110,5 @@ public class BookmarkServiceDefault implements BookmarkService, DomainObjectServ
}
+
}
[3/3] git commit: ISIS-697: DeveloperUtilitiesService
(refreshServices, refreshLayout deprecated)
Posted by da...@apache.org.
ISIS-697: DeveloperUtilitiesService (refreshServices, refreshLayout deprecated)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/dd39f14b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/dd39f14b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/dd39f14b
Branch: refs/heads/master
Commit: dd39f14b329496af76441ac9c0eca3ef5e4b2fe5
Parents: e84537f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Feb 14 08:05:41 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Feb 14 08:05:41 2014 +0000
----------------------------------------------------------------------
.../devutils/DeveloperUtilitiesService.java | 18 +++++++++++++++++-
.../DeveloperUtilitiesServiceDefault.java | 13 +++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/dd39f14b/core/applib/src/main/java/org/apache/isis/applib/services/devutils/DeveloperUtilitiesService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/devutils/DeveloperUtilitiesService.java b/core/applib/src/main/java/org/apache/isis/applib/services/devutils/DeveloperUtilitiesService.java
index 3b7c9ea..6a25cfc 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/devutils/DeveloperUtilitiesService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/devutils/DeveloperUtilitiesService.java
@@ -18,6 +18,7 @@ package org.apache.isis.applib.services.devutils;
import org.apache.isis.applib.annotation.ActionSemantics;
import org.apache.isis.applib.annotation.ActionSemantics.Of;
+import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Named;
import org.apache.isis.applib.annotation.NotInServiceMenu;
@@ -33,6 +34,7 @@ public interface DeveloperUtilitiesService {
@Prototype
public Clob downloadMetaModel();
+
/**
* Downloads a zip of the layout of all domain classes.
*/
@@ -42,6 +44,14 @@ public interface DeveloperUtilitiesService {
public Blob downloadLayouts();
/**
+ * Rebuilds the metamodel of all registered domain services.
+ */
+ @ActionSemantics(Of.SAFE)
+ @MemberOrder(sequence="3")
+ @Prototype
+ public void refreshServices();
+
+ /**
* Download the JSON layout of the domain object's type.
*/
@NotInServiceMenu
@@ -49,7 +59,13 @@ public interface DeveloperUtilitiesService {
@MemberOrder(sequence="2")
@Prototype
public Clob downloadLayout(Object domainObject);
-
+
+ /**
+ * @deprecated - in prototype mode the Wicket viewer (at least) will automatically invalidate
+ * the Isis metamodel whenever the object is re-rendered.
+ */
+ @Deprecated
+ @Hidden
@NotInServiceMenu
@ActionSemantics(Of.SAFE)
@MemberOrder(sequence="99")
http://git-wip-us.apache.org/repos/asf/isis/blob/dd39f14b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/devutils/DeveloperUtilitiesServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/devutils/DeveloperUtilitiesServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/devutils/DeveloperUtilitiesServiceDefault.java
index 7239695..e88217c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/devutils/DeveloperUtilitiesServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/devutils/DeveloperUtilitiesServiceDefault.java
@@ -141,6 +141,18 @@ public class DeveloperUtilitiesServiceDefault implements DeveloperUtilitiesServi
}
// //////////////////////////////////////
+
+ @Override
+ public void refreshServices() {
+ Collection<ObjectSpecification> specifications = Lists.newArrayList(specificationLoader.allSpecifications());
+ for (ObjectSpecification objectSpec : specifications) {
+ if(objectSpec.isService()){
+ specificationLoader.invalidateCache(objectSpec.getCorrespondingClass());
+ }
+ }
+ }
+
+ // //////////////////////////////////////
@Override
public Object refreshLayout(Object domainObject) {
@@ -215,4 +227,5 @@ public class DeveloperUtilitiesServiceDefault implements DeveloperUtilitiesServi
this.adapterManager = adapterManager;
}
+
}