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/06/13 12:19:52 UTC
[1/2] git commit: ISIS-436: also updating UserSettings to be
read/write.
Updated Branches:
refs/heads/master 77041d893 -> fb2e5c5b0
ISIS-436: also updating UserSettings to be read/write.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a4ad1913
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a4ad1913
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a4ad1913
Branch: refs/heads/master
Commit: a4ad1913a3ba5cd1046ae486af98590ee3c69114
Parents: 77041d8
Author: Dan Haywood <da...@apache.org>
Authored: Thu Jun 13 11:16:03 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Jun 13 11:16:03 2013 +0100
----------------------------------------------------------------------
.../settings/UserSettingsServiceJdo.java | 21 +++++------
.../settings/ApplicationSettingsService.java | 3 ++
.../settings/ApplicationSettingsServiceRW.java | 13 +++++--
.../services/settings/UserSettingsService.java | 9 +++++
.../settings/UserSettingsServiceRW.java | 38 ++++++++++++++++++++
5 files changed, 71 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a4ad1913/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/UserSettingsServiceJdo.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/UserSettingsServiceJdo.java b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/UserSettingsServiceJdo.java
index a269699..5d46b4e 100644
--- a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/UserSettingsServiceJdo.java
+++ b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/UserSettingsServiceJdo.java
@@ -38,13 +38,14 @@ import org.apache.isis.applib.services.settings.SettingAbstract;
import org.apache.isis.applib.services.settings.SettingType;
import org.apache.isis.applib.services.settings.UserSetting;
import org.apache.isis.applib.services.settings.UserSettingsService;
+import org.apache.isis.applib.services.settings.UserSettingsServiceRW;
/**
* An implementation of {@link UserSettingsService} that persists settings
* as entities into a JDO-backed database.
*/
@Named("User Settings")
-public class UserSettingsServiceJdo extends AbstractService implements UserSettingsService {
+public class UserSettingsServiceJdo extends AbstractService implements UserSettingsServiceRW {
@Hidden
@Override
@@ -60,16 +61,16 @@ public class UserSettingsServiceJdo extends AbstractService implements UserSetti
// //////////////////////////////////////
- @MemberOrder(sequence="1")
- public List<UserSettingJdo> listAll() {
- return allMatches(
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ public List<UserSetting> listAll() {
+ return (List)allMatches(
new QueryDefault<UserSettingJdo>(UserSettingJdo.class,
"usersetting_all"));
}
- @MemberOrder(sequence="1")
- public List<UserSettingJdo> listAllFor(@Named("User") String user) {
- return allMatches(
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ public List<UserSetting> listAllFor(String user) {
+ return (List)allMatches(
new QueryDefault<UserSettingJdo>(UserSettingJdo.class,
"usersetting_by_user",
"user", user));
@@ -79,12 +80,12 @@ public class UserSettingsServiceJdo extends AbstractService implements UserSetti
}
private List<String> existingUsers() {
- final List<UserSettingJdo> listAll = listAll();
+ final List<UserSetting> listAll = listAll();
return Lists.newArrayList(Sets.newTreeSet(Iterables.transform(listAll, GET_USER)));
}
- private final static Function<UserSettingJdo, String> GET_USER = new Function<UserSettingJdo, String>() {
- public String apply(UserSettingJdo input) {
+ private final static Function<UserSetting, String> GET_USER = new Function<UserSetting, String>() {
+ public String apply(UserSetting input) {
return input.getUser();
}
};
http://git-wip-us.apache.org/repos/asf/isis/blob/a4ad1913/core/applib/src/main/java/org/apache/isis/applib/services/settings/ApplicationSettingsService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/settings/ApplicationSettingsService.java b/core/applib/src/main/java/org/apache/isis/applib/services/settings/ApplicationSettingsService.java
index 6eefcb5..d6ded31 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/settings/ApplicationSettingsService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/settings/ApplicationSettingsService.java
@@ -20,12 +20,15 @@ package org.apache.isis.applib.services.settings;
import java.util.List;
+import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Named;
public interface ApplicationSettingsService {
+ @MemberOrder(sequence="1")
ApplicationSetting find(@Named("Key") String key);
+ @MemberOrder(sequence="2")
List<ApplicationSetting> listAll();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a4ad1913/core/applib/src/main/java/org/apache/isis/applib/services/settings/ApplicationSettingsServiceRW.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/settings/ApplicationSettingsServiceRW.java b/core/applib/src/main/java/org/apache/isis/applib/services/settings/ApplicationSettingsServiceRW.java
index ba5c651..ae680eb 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/settings/ApplicationSettingsServiceRW.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/settings/ApplicationSettingsServiceRW.java
@@ -20,12 +20,19 @@ package org.apache.isis.applib.services.settings;
import org.joda.time.LocalDate;
+import org.apache.isis.applib.annotation.MemberOrder;
+
public interface ApplicationSettingsServiceRW extends ApplicationSettingsService {
- ApplicationSetting newInt(String name, String description, Integer defaultValue);
+ @MemberOrder(sequence="11")
+ ApplicationSetting newBoolean(String name, String description, Boolean defaultValue);
+ @MemberOrder(sequence="12")
+ ApplicationSetting newString(String name, String description, String defaultValue);
+ @MemberOrder(sequence="13")
ApplicationSetting newLocalDate(String name, String description, LocalDate defaultValue);
+ @MemberOrder(sequence="14")
+ ApplicationSetting newInt(String name, String description, Integer defaultValue);
+ @MemberOrder(sequence="15")
ApplicationSetting newLong(String name, String description, Long defaultValue);
- ApplicationSetting newString(String name, String description, String defaultValue);
- ApplicationSetting newBoolean(String name, String description, Boolean defaultValue);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a4ad1913/core/applib/src/main/java/org/apache/isis/applib/services/settings/UserSettingsService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/settings/UserSettingsService.java b/core/applib/src/main/java/org/apache/isis/applib/services/settings/UserSettingsService.java
index 24484de..f798e62 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/settings/UserSettingsService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/settings/UserSettingsService.java
@@ -18,10 +18,19 @@
*/
package org.apache.isis.applib.services.settings;
+import java.util.List;
+
+import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Named;
public interface UserSettingsService {
+ @MemberOrder(sequence="1")
UserSetting find(@Named("User") String user, @Named("Key") String key);
+ @MemberOrder(sequence="2")
+ List<UserSetting> listAll();
+
+ @MemberOrder(sequence="3")
+ List<UserSetting> listAllFor(@Named("User") String user);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a4ad1913/core/applib/src/main/java/org/apache/isis/applib/services/settings/UserSettingsServiceRW.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/settings/UserSettingsServiceRW.java b/core/applib/src/main/java/org/apache/isis/applib/services/settings/UserSettingsServiceRW.java
new file mode 100644
index 0000000..8b048ea
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/settings/UserSettingsServiceRW.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.applib.services.settings;
+
+import org.joda.time.LocalDate;
+
+import org.apache.isis.applib.annotation.MemberOrder;
+
+public interface UserSettingsServiceRW extends UserSettingsService {
+
+ @MemberOrder(sequence="11")
+ UserSetting newBoolean(String user, String name, String description, Boolean defaultValue);
+ @MemberOrder(sequence="12")
+ UserSetting newString(String user, String name, String description, String defaultValue);
+ @MemberOrder(sequence="13")
+ UserSetting newLocalDate(String user, String name, String description, LocalDate defaultValue);
+ @MemberOrder(sequence="14")
+ UserSetting newInt(String user, String name, String description, Integer defaultValue);
+ @MemberOrder(sequence="15")
+ UserSetting newLong(String user, String name, String description, Long defaultValue);
+
+}
[2/2] git commit: ISIS-437: tiny update to UI in archetype.
Posted by da...@apache.org.
ISIS-437: tiny update to UI in archetype.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fb2e5c5b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fb2e5c5b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fb2e5c5b
Branch: refs/heads/master
Commit: fb2e5c5b06c66c33ece76f7715fd92d58ea1f268
Parents: a4ad191
Author: Dan Haywood <da...@apache.org>
Authored: Thu Jun 13 11:19:28 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Jun 13 11:19:28 2013 +0100
----------------------------------------------------------------------
.../dom/src/main/java/dom/todo/ToDoItem.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fb2e5c5b/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 a8b1a98..8995291 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
@@ -262,7 +262,7 @@ public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3
@Column(scale = 2)
@Optional
- @MemberOrder(sequence = "4.1")
+ @MemberOrder(name="Detail", sequence = "4.1")
public BigDecimal getCost() {
return cost;
}