ISIS-309: working towards getting icons sorted for gmap2
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5aec3572 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5aec3572 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5aec3572 Branch: refs/heads/master Commit: 5aec357271b74d290fc64848a2b25015537891f1 Parents: f8c1953 Author: Dan Haywood <danhayw...@apache.org> Authored: Sun Jan 20 08:59:32 2013 +0000 Committer: Dan Haywood <danhayw...@apache.org> Committed: Sun Jan 20 08:59:32 2013 +0000 ---------------------------------------------------------------------- .../quickstart_wicket_restful_jdo/dom/pom.xml | 6 ++++++ .../dom/src/main/java/dom/todo/ToDoItem.java | 15 ++++++++++++--- .../dom/src/main/java/dom/todo/ToDoItems.java | 1 + .../quickstart_wicket_restful_jdo/pom.xml | 10 ++++++++++ .../viewer-webapp/pom.xml | 8 ++++++++ .../viewer-webapp/src/main/webapp/WEB-INF/web.xml | 4 ++++ 6 files changed, 41 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/5aec3572/example/application/quickstart_wicket_restful_jdo/dom/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_wicket_restful_jdo/dom/pom.xml b/example/application/quickstart_wicket_restful_jdo/dom/pom.xml index 3000acb..0ff30f6 100644 --- a/example/application/quickstart_wicket_restful_jdo/dom/pom.xml +++ b/example/application/quickstart_wicket_restful_jdo/dom/pom.xml @@ -117,6 +117,12 @@ <groupId>org.datanucleus</groupId> <artifactId>datanucleus-api-jdo</artifactId> </dependency> + + <dependency> + <groupId>com.danhaywood.isis.wicket.ui.components</groupId> + <artifactId>danhaywood-isis-wicket-gmap2-applib</artifactId> + </dependency> + </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/isis/blob/5aec3572/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 641aff2..3e093fb 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 @@ -28,7 +28,6 @@ import javax.jdo.annotations.VersionStrategy; import javax.jdo.spi.PersistenceCapable; import org.apache.isis.applib.DomainObjectContainer; -import org.apache.isis.applib.annotation.ActionSemantics; import org.apache.isis.applib.annotation.AutoComplete; import org.apache.isis.applib.annotation.Bulk; import org.apache.isis.applib.annotation.Disabled; @@ -43,7 +42,6 @@ import org.apache.isis.applib.annotation.Optional; import org.apache.isis.applib.annotation.Programmatic; import org.apache.isis.applib.annotation.RegEx; import org.apache.isis.applib.annotation.Resolve; -import org.apache.isis.applib.annotation.ActionSemantics.Of; import org.apache.isis.applib.annotation.Resolve.Type; import org.apache.isis.applib.annotation.Where; import org.apache.isis.applib.clock.Clock; @@ -54,6 +52,8 @@ import org.apache.isis.applib.value.Blob; import org.apache.isis.core.objectstore.jdo.applib.annotations.Auditable; import org.joda.time.LocalDate; +import com.danhaywood.isis.wicket.gmap2.applib.Locatable; +import com.danhaywood.isis.wicket.gmap2.applib.Location; import com.google.common.base.Objects; @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE) @@ -80,7 +80,7 @@ import com.google.common.base.Objects; @Auditable @AutoComplete(repository=ToDoItems.class, action="autoComplete") @MemberGroups({"General", "Detail"}) -public class ToDoItem implements Comparable<ToDoItem> { +public class ToDoItem implements Comparable<ToDoItem> /*, Locatable */{ private static final long ONE_WEEK_IN_MILLIS = 7 * 24 * 60 * 60 * 1000L; @@ -454,6 +454,15 @@ public class ToDoItem implements Comparable<ToDoItem> { } // }} +// @Override +// public Location getLocation() { +// //51.5172� N, 0.1182� is Central London +// return new Location(51.5172+random(-0.05, +0.05), 0.1182 + random(-0.05, +0.05) ); +// } +// +// private static double random(double from, double to) { +// return Math.random() * (to-from) + from; +// } } http://git-wip-us.apache.org/repos/asf/isis/blob/5aec3572/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java ---------------------------------------------------------------------- diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java index 09f7844..7950778 100644 --- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java +++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java @@ -27,6 +27,7 @@ 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.NotContributed; import org.apache.isis.applib.annotation.NotInServiceMenu; import org.apache.isis.applib.filter.Filter; import org.joda.time.LocalDate; http://git-wip-us.apache.org/repos/asf/isis/blob/5aec3572/example/application/quickstart_wicket_restful_jdo/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_wicket_restful_jdo/pom.xml b/example/application/quickstart_wicket_restful_jdo/pom.xml index 321ed5e..767a85c 100644 --- a/example/application/quickstart_wicket_restful_jdo/pom.xml +++ b/example/application/quickstart_wicket_restful_jdo/pom.xml @@ -225,8 +225,18 @@ </dependency> + <!-- 3rd party extensions --> + <dependency> + <groupId>com.danhaywood.isis.wicket.ui.components</groupId> + <artifactId>danhaywood-isis-wicket-gmap2</artifactId> + <version>0.0.1-SNAPSHOT</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> </dependencyManagement> + <profiles> <profile> http://git-wip-us.apache.org/repos/asf/isis/blob/5aec3572/example/application/quickstart_wicket_restful_jdo/viewer-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/pom.xml b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/pom.xml index c646872..f8c05f7 100644 --- a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/pom.xml +++ b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/pom.xml @@ -165,6 +165,14 @@ <artifactId>log4jdbc-remix</artifactId> </dependency> + <!-- 3rd party dependency --> + <!-- + <dependency> + <groupId>com.danhaywood.isis.wicket.ui.components</groupId> + <artifactId>danhaywood-isis-wicket-gmap2-ui</artifactId> + </dependency> + --> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/isis/blob/5aec3572/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/web.xml b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/web.xml index 7e7f2ad..b81eada 100644 --- a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/web.xml +++ b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/web.xml @@ -146,6 +146,10 @@ <param-name>applicationClassName</param-name> <param-value>app.QuickStartApplication</param-value> </init-param> + <init-param> + <param-name>GOOGLE_MAPS_API_KEY</param-name> + <param-value>AIzaSyDdSqWOwFXOG6VDe8EAuig5UXfPL4reukU</param-value> + </init-param> </filter> <filter-mapping>