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/09/14 08:54:09 UTC
[1/3] git commit: ISIS-529: hidden versions of setting services.
Updated Branches:
refs/heads/master b31ace2c6 -> 655b6c0b7
ISIS-529: hidden versions of setting services.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/57336c1b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/57336c1b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/57336c1b
Branch: refs/heads/master
Commit: 57336c1b41f027e253130a26982795812cecafc9
Parents: b31ace2
Author: Dan Haywood <da...@apache.org>
Authored: Sat Sep 14 07:50:41 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Sat Sep 14 07:50:41 2013 +0100
----------------------------------------------------------------------
.../settings/ApplicationSettingsServiceJdo.java | 2 -
.../ApplicationSettingsServiceJdoHidden.java | 81 ++++++++++++++++++
.../settings/UserSettingsServiceJdo.java | 2 -
.../settings/UserSettingsServiceJdoHidden.java | 88 ++++++++++++++++++++
4 files changed, 169 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/57336c1b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/ApplicationSettingsServiceJdo.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/ApplicationSettingsServiceJdo.java b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/ApplicationSettingsServiceJdo.java
index d73aa6f..ba75719 100644
--- a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/ApplicationSettingsServiceJdo.java
+++ b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/ApplicationSettingsServiceJdo.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.joda.time.LocalDate;
import org.apache.isis.applib.AbstractService;
-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.Optional;
@@ -42,7 +41,6 @@ import org.apache.isis.applib.services.settings.SettingType;
@Named("Application Settings")
public class ApplicationSettingsServiceJdo extends AbstractService implements ApplicationSettingsServiceRW {
- @Hidden
@Override
public ApplicationSetting find(@Named("Key") String key) {
return firstMatch(
http://git-wip-us.apache.org/repos/asf/isis/blob/57336c1b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/ApplicationSettingsServiceJdoHidden.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/ApplicationSettingsServiceJdoHidden.java b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/ApplicationSettingsServiceJdoHidden.java
new file mode 100644
index 0000000..95512c0
--- /dev/null
+++ b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/ApplicationSettingsServiceJdoHidden.java
@@ -0,0 +1,81 @@
+/*
+ * 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.objectstore.jdo.applib.service.settings;
+
+import java.util.List;
+
+import org.joda.time.LocalDate;
+
+import org.apache.isis.applib.annotation.Hidden;
+import org.apache.isis.applib.annotation.Named;
+import org.apache.isis.applib.services.settings.ApplicationSetting;
+
+/**
+ * An implementation intended to be hidden in the UI, and delegated to by other services.
+ */
+public class ApplicationSettingsServiceJdoHidden extends ApplicationSettingsServiceJdo {
+
+ @Hidden
+ @Override
+ public ApplicationSetting find(@Named("Key") String key) {
+ return super.find(key);
+ }
+
+ // //////////////////////////////////////
+
+ @Hidden
+ @Override
+ public List<ApplicationSetting> listAll() {
+ return super.listAll();
+ }
+
+ // //////////////////////////////////////
+
+ @Hidden
+ @Override
+ public ApplicationSetting newString(String key, String description, String value) {
+ return super.newString(key, description, value);
+ }
+
+ @Hidden
+ @Override
+ public ApplicationSettingJdo newInt(String key, String description, Integer value) {
+ return super.newInt(key, description, value);
+ }
+
+ @Hidden
+ @Override
+ public ApplicationSettingJdo newLong(String key, String description, Long value) {
+ return super.newLong(key, description, value);
+ }
+
+ @Hidden
+ @Override
+ public ApplicationSettingJdo newLocalDate(String key, String description, LocalDate value) {
+ return super.newLocalDate(key, description, value);
+ }
+
+ @Hidden
+ @Override
+ public ApplicationSettingJdo newBoolean(String key, String description, Boolean value) {
+ return super.newBoolean(key, description, value);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/57336c1b/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 5d46b4e..f5fdd26 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
@@ -29,7 +29,6 @@ import com.google.common.collect.Sets;
import org.joda.time.LocalDate;
import org.apache.isis.applib.AbstractService;
-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.Optional;
@@ -47,7 +46,6 @@ import org.apache.isis.applib.services.settings.UserSettingsServiceRW;
@Named("User Settings")
public class UserSettingsServiceJdo extends AbstractService implements UserSettingsServiceRW {
- @Hidden
@Override
public UserSetting find(
@Named("User") String user,
http://git-wip-us.apache.org/repos/asf/isis/blob/57336c1b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/UserSettingsServiceJdoHidden.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/UserSettingsServiceJdoHidden.java b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/UserSettingsServiceJdoHidden.java
new file mode 100644
index 0000000..a1f2595
--- /dev/null
+++ b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/UserSettingsServiceJdoHidden.java
@@ -0,0 +1,88 @@
+/*
+ * 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.objectstore.jdo.applib.service.settings;
+
+import java.util.List;
+
+import org.joda.time.LocalDate;
+
+import org.apache.isis.applib.annotation.Hidden;
+import org.apache.isis.applib.services.settings.UserSetting;
+
+/**
+ * An implementation intended to be hidden in the UI, and delegated to by other services.
+ */
+public class UserSettingsServiceJdoHidden extends UserSettingsServiceJdo {
+
+ @Hidden
+ @Override
+ public UserSetting find(String user, String key) {
+ return super.find(user, key);
+ }
+
+ // //////////////////////////////////////
+
+ @Hidden
+ @Override
+ public List<UserSetting> listAll() {
+ return super.listAll();
+ }
+
+ @Hidden
+ @Override
+ public List<UserSetting> listAllFor(String user) {
+ return super.listAllFor(user);
+ }
+
+ // //////////////////////////////////////
+
+ @Hidden
+ @Override
+ public UserSettingJdo newString(String user, String key, String description, String value) {
+ return super.newString(user, key, description, value);
+ }
+
+ @Hidden
+ @Override
+ public UserSettingJdo newInt(String user, String key, String description, Integer value) {
+ return super.newInt(user, key, description, value);
+ }
+
+ @Hidden
+ @Override
+ public UserSettingJdo newLong(String user, String key, String description, Long value) {
+ return super.newLong(user, key, description, value);
+ }
+
+ @Hidden
+ @Override
+ public UserSettingJdo newLocalDate(String user, String key, String description, LocalDate value) {
+ return super.newLocalDate(user, key, description, value);
+ }
+
+ @Hidden
+ @Override
+ public UserSettingJdo newBoolean(String user, String key, String description, Boolean value) {
+ return super.newBoolean(user, key, description, value);
+ }
+
+
+
+}
[3/3] git commit: ISIS-531: reinstating metamodel "API" classes.
Posted by da...@apache.org.
ISIS-531: reinstating metamodel "API" classes.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/655b6c0b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/655b6c0b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/655b6c0b
Branch: refs/heads/master
Commit: 655b6c0b73f38ea8983471ea7d304b944bb9d223
Parents: d066778
Author: Dan Haywood <da...@apache.org>
Authored: Sat Sep 14 07:53:54 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Sat Sep 14 07:53:54 2013 +0100
----------------------------------------------------------------------
.../metamodel/spec/ObjectSpecification.java | 4 +
.../feature/ObjectAssociationContainer.java | 7 ++
.../spec/feature/ObjectAssociationFilters.java | 93 ++++++++++++++++++++
.../specimpl/ObjectSpecificationAbstract.java | 6 ++
.../dflt/ObjectSpecificationDefault.java | 1 +
.../testspec/ObjectSpecificationStub.java | 6 ++
6 files changed, 117 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/655b6c0b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index 539817e..0f00dcf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -26,6 +26,7 @@ import java.util.List;
import com.google.common.base.Function;
import org.apache.isis.applib.annotation.ObjectType;
+import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -52,6 +53,7 @@ import org.apache.isis.core.metamodel.interactions.InteractionContext;
import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionContainer;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationContainer;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
@@ -346,4 +348,6 @@ public interface ObjectSpecification extends Specification, ObjectActionContaine
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/655b6c0b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java
index a72eae9..76644ab 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java
@@ -43,6 +43,13 @@ public interface ObjectAssociationContainer {
List<ObjectAssociation> getAssociations(Contributed contributed);
/**
+ * Returns all {@link ObjectAssociation} ({@link Contributed#INCLUDED including contributed actions})
+ * that match the supplied filter.
+ */
+ @Deprecated
+ List<ObjectAssociation> getAssociations(Filter<ObjectAssociation> filter);
+
+ /**
* Return all {@link ObjectAssociation}s matching the supplied filter.
*
* To get the statically visible fields (where any invisible and
http://git-wip-us.apache.org/repos/asf/isis/blob/655b6c0b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java
new file mode 100644
index 0000000..68500be
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java
@@ -0,0 +1,93 @@
+/**
+ * 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.core.metamodel.spec.feature;
+
+import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.applib.filter.Filter;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+
+@Deprecated
+public class ObjectAssociationFilters {
+
+ /**
+ * @deprecated - use {@link ObjectAssociation.Filters#PROPERTIES}
+ */
+ @Deprecated
+ public final static Filter<ObjectAssociation> PROPERTIES = ObjectAssociation.Filters.PROPERTIES;
+
+ /**
+ * @deprecated - use {@link ObjectAssociation.Filters#REFERENCE_PROPERTIES}
+ */
+ @Deprecated
+ public final static Filter<ObjectAssociation> REFERENCE_PROPERTIES = ObjectAssociation.Filters.REFERENCE_PROPERTIES;
+
+ /**
+ * @deprecated - use {@link ObjectAssociation.Filters#WHERE_VISIBLE_IN_COLLECTION_TABLE}
+ */
+ @Deprecated
+ public final static Filter<ObjectAssociation> WHERE_VISIBLE_IN_COLLECTION_TABLE = ObjectAssociation.Filters.WHERE_VISIBLE_IN_COLLECTION_TABLE;
+
+ /**
+ * @deprecated - use {@link ObjectAssociation.Filters#WHERE_VISIBLE_IN_STANDALONE_TABLE}
+ */
+ @Deprecated
+ public final static Filter<ObjectAssociation> WHERE_VISIBLE_IN_STANDALONE_TABLE = ObjectAssociation.Filters.WHERE_VISIBLE_IN_STANDALONE_TABLE;
+
+ /**
+ * @deprecated - use {@link ObjectAssociation.Filters#ALL}
+ */
+ @Deprecated
+ public final static Filter<ObjectAssociation> ALL = ObjectAssociation.Filters.ALL;
+
+ /**
+ * @deprecated - use {@link ObjectAssociation.Filters#COLLECTIONS}
+ */
+ @Deprecated
+ public final static Filter<ObjectAssociation> COLLECTIONS = ObjectAssociation.Filters.COLLECTIONS;
+
+ /**
+ * @deprecated - use {@link ObjectAssociation.Filters#VISIBLE_AT_LEAST_SOMETIMES}
+ */
+ @Deprecated
+ public static final Filter<ObjectAssociation> VISIBLE_AT_LEAST_SOMETIMES = ObjectAssociation.Filters.VISIBLE_AT_LEAST_SOMETIMES;
+
+ /**
+ * @deprecated - use {@link ObjectAssociation.Filters#dynamicallyVisible(AuthenticationSession, ObjectAdapter, Where)}
+ */
+ @Deprecated
+ public static final Filter<ObjectAssociation> staticallyVisible(final Where context) {
+ return ObjectAssociation.Filters.staticallyVisible(context);
+ }
+
+ /**
+ * @deprecated - use {@link ObjectAssociation.Filters#dynamicallyVisible(AuthenticationSession, ObjectAdapter, Where)}
+ */
+ @Deprecated
+ public static Filter<ObjectAssociation> dynamicallyVisible(final AuthenticationSession session, final ObjectAdapter target, final Where where) {
+ return ObjectAssociation.Filters.dynamicallyVisible(session, target, where);
+ }
+
+ /**
+ * @deprecated - use {@link ObjectAssociation.Filters#enabled(AuthenticationSession, ObjectAdapter, Where)}
+ */
+ @Deprecated
+ public static Filter<ObjectAssociation> enabled(final AuthenticationSession session, final ObjectAdapter adapter, final Where where) {
+ return ObjectAssociation.Filters.enabled(session, adapter, where);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/655b6c0b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 8712b7e..481170c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -694,6 +694,12 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
throw new ObjectSpecificationException("No association called '" + id + "' in '" + getSingularName() + "'");
}
+ @Deprecated
+ @Override
+ public List<ObjectAssociation> getAssociations(Filter<ObjectAssociation> filter) {
+ return getAssociations(Contributed.INCLUDED, filter);
+ }
+
@Override
public List<ObjectAssociation> getAssociations(Contributed contributed, final Filter<ObjectAssociation> filter) {
final List<ObjectAssociation> allAssociations = getAssociations(contributed);
http://git-wip-us.apache.org/repos/asf/isis/blob/655b6c0b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 5071ac3..b82603a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -507,4 +507,5 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
return introspectionContext.getClassSubstitutor();
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/655b6c0b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index eb0a53b..5b51307 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -155,6 +155,12 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
return fields;
}
+ @Deprecated
+ @Override
+ public List<ObjectAssociation> getAssociations(Filter<ObjectAssociation> filter) {
+ return getAssociations(Contributed.INCLUDED, filter);
+ }
+
@Override
@SuppressWarnings("unchecked")
public List<OneToOneAssociation> getProperties(Contributed contributed) {
[2/3] git commit: ISIS-530: upgrades to wicket 6.10.0
Posted by da...@apache.org.
ISIS-530: upgrades to wicket 6.10.0
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d0667784
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d0667784
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d0667784
Branch: refs/heads/master
Commit: d06677846295b9110e3887667533d78070c89940
Parents: 57336c1
Author: Dan Haywood <da...@apache.org>
Authored: Sat Sep 14 07:52:22 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Sat Sep 14 07:52:22 2013 +0100
----------------------------------------------------------------------
component/viewer/wicket/pom.xml | 6 +++---
.../ui/components/scalars/TextFieldWithDatePicker.java | 8 ++++++--
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d0667784/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index ff96661..13950e2 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -40,9 +40,9 @@
<siteBaseDir>.</siteBaseDir>
<relativeUrl />
- <wicket.version>6.9.1</wicket.version>
- <wicket-jquery-ui.version>6.9.0</wicket-jquery-ui.version>
- <wicketstuff.version>6.9.0</wicketstuff.version>
+ <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-select2.version>2.2.2</wicket-select2.version>
<docbkxGuideTitle>Apache Isis Wicket Viewer</docbkxGuideTitle>
http://git-wip-us.apache.org/repos/asf/isis/blob/d0667784/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldWithDatePicker.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldWithDatePicker.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldWithDatePicker.java
index 36f2a85..4efaf9b 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldWithDatePicker.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldWithDatePicker.java
@@ -65,7 +65,7 @@ public class TextFieldWithDatePicker<T> extends TextField<T> implements IConvert
*
* @param behavior the {@link JQueryBehavior}
*/
- protected void onConfigure(JQueryBehavior behavior)
+ public void onConfigure(JQueryBehavior behavior)
{
}
@@ -109,7 +109,11 @@ public class TextFieldWithDatePicker<T> extends TextField<T> implements IConvert
this.add(newWidgetBehavior); //cannot be in ctor as the markupId may be set manually afterward
}
-
+ // IJQueryWidget //
+ @Override
+ public void onBeforeRender(JQueryBehavior behavior) {
+ }
+
// IJQueryWidget //
@Override
public JQueryBehavior newWidgetBehavior(String selector)