You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/01/19 11:30:12 UTC
[isis] branch master updated (29a8b9a -> a6405a1)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 29a8b9a supposed to fix shell syntax (2)
new 8aea479 ISIS-2223: remove redundant code
new a6405a1 ISIS-2223: Rename this method; there is a "private" method in the parent class with the same name.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../autocomplete/AutoCompleteFacetAbstract.java | 6 ------
.../JodaDateTimeValueSemanticsProvider.java | 25 +++++-----------------
2 files changed, 5 insertions(+), 26 deletions(-)
[isis] 01/02: ISIS-2223: remove redundant code
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 8aea479544227122133f4602c09d206ae0f333e5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jan 19 12:20:39 2020 +0100
ISIS-2223: remove redundant code
---
.../facets/object/autocomplete/AutoCompleteFacetAbstract.java | 6 ------
1 file changed, 6 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java
index 74861b2..5bf4654 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java
@@ -30,7 +30,6 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.collections.CollectionFacet;
import org.apache.isis.core.metamodel.facets.param.autocomplete.MinLengthUtil;
import org.apache.isis.core.metamodel.services.publishing.PublisherDispatchService;
import org.apache.isis.core.metamodel.spec.ManagedObject;
@@ -89,11 +88,6 @@ implements AutoCompleteFacet {
}
});
- // check a collection was returned
- if(CollectionFacet.lookup(resultAdapter) == null) {
- return Collections.emptyList();
- }
-
return ManagedObject.VisibilityUtil.streamVisibleAdapters(resultAdapter, interactionInitiatedBy)
.collect(Collectors.toList());
[isis] 02/02: ISIS-2223: Rename this method;
there is a "private" method in the parent class with the same name.
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a6405a115e79c50fc63d120fd3c64e0004233277
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jan 19 12:29:17 2020 +0100
ISIS-2223: Rename this method; there is a "private" method in the parent
class with the same name.
also make encoding truly thread-safe
---
.../JodaDateTimeValueSemanticsProvider.java | 25 +++++-----------------
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProvider.java
index 24bc9d5..bd106f5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProvider.java
@@ -140,16 +140,6 @@ public class JodaDateTimeValueSemanticsProvider extends ValueSemanticsProviderAb
attributeMap.put("configuredFormat", configuredFormat);
}
-
-
-
-
-
- // no default
- private static final DateTime DEFAULT_VALUE = null;
-
-
-
@Override
protected DateTime add(final DateTime original, final int years, final int months, final int days, final int hours, final int minutes) {
if(hours != 0 || minutes != 0) {
@@ -177,29 +167,24 @@ public class JodaDateTimeValueSemanticsProvider extends ValueSemanticsProviderAb
// EncoderDecoder
// //////////////////////////////////////////////////////////////////
- private final DateTimeFormatter encodingFormatter = ISODateTimeFormat.basicDateTime();
+ private final static DateTimeFormatter encodingFormatter() {
+ return ISODateTimeFormat.basicDateTime();
+ }
@Override
protected String doEncode(final Object object) {
final DateTime date = (DateTime) object;
- return encode(date);
- }
-
- private synchronized String encode(final DateTime date) {
- return encodingFormatter.print(date);
+ return encodingFormatter().print(date);
}
@Override
protected DateTime doRestore(final String data) {
try {
- return parse(data);
+ return encodingFormatter().parseDateTime(data);
} catch (final IllegalArgumentException e) {
throw new EncodingException(e);
}
}
- private synchronized DateTime parse(final String data) {
- return encodingFormatter.parseDateTime(data);
- }
}