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/06 13:50:04 UTC
[1/2] git commit: ISIS-676: fix to edit/cancel/edit issue
Updated Branches:
refs/heads/master 4ce9e812f -> 2cb6f17c9
ISIS-676: fix to edit/cancel/edit issue
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/75ca7c1e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/75ca7c1e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/75ca7c1e
Branch: refs/heads/master
Commit: 75ca7c1e37d067848dd04f061a732cf625740a39
Parents: 4ce9e81
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Feb 6 12:30:06 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Feb 6 12:30:06 2014 +0000
----------------------------------------------------------------------
.../ui/components/widgets/entitylink/EntityLinkSelect2Panel.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/75ca7c1e/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
index 36d3861..ddebba3 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
@@ -199,7 +199,10 @@ public class EntityLinkSelect2Panel extends FormComponentPanelAbstract<ObjectAda
private void doSyncWithInputIfAutoCompleteOrChoices() {
if(!isEditableWithEitherAutoCompleteOrChoices()) {
+ // this is horrid; adds a label to the id
+ // should instead be a 'temporary hide'
permanentlyHide(ID_AUTO_COMPLETE);
+ select2Field = null; // this forces recreation next time around
return;
}
[2/2] git commit: ISIS-654: very minor tidy-up of code.
Posted by da...@apache.org.
ISIS-654: very minor tidy-up of code.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2cb6f17c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2cb6f17c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2cb6f17c
Branch: refs/heads/master
Commit: 2cb6f17c98eededdc5d5c59b48f206e4ee1e20cf
Parents: 75ca7c1
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Feb 6 12:42:51 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Feb 6 12:42:51 2014 +0000
----------------------------------------------------------------------
.../services/queryresultscache/QueryResultsCache.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2cb6f17c/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
index f62f888..eb8bc52 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
@@ -96,10 +96,10 @@ public class QueryResultsCache {
}
public static class Value<T> {
+ private T result;
public Value(T result) {
this.result = result;
}
- private T result;
public T getResult() {
return result;
}
@@ -135,13 +135,13 @@ public class QueryResultsCache {
}
@Programmatic
- public <T> QueryResultsCache.Value<T> get(final Class<?> callingClass, final String methodName, final Object... keys) {
+ public <T> Value<T> get(final Class<?> callingClass, final String methodName, final Object... keys) {
return get(new Key(callingClass, methodName, keys));
}
@Programmatic
@SuppressWarnings("unchecked")
- public <T> QueryResultsCache.Value<T> get(final QueryResultsCache.Key cacheKey) {
+ public <T> Value<T> get(final Key cacheKey) {
Value<T> value = (Value<T>) cache.get(cacheKey);
logHitOrMiss(cacheKey, value);
return value;
@@ -162,7 +162,4 @@ public class QueryResultsCache {
String hitOrMiss = cacheValue != null ? "HIT" : "MISS";
LOG.debug( hitOrMiss + ": " + cacheKey.toString());
}
-
-
-
}