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 2015/10/14 02:28:48 UTC
[03/12] isis git commit: ISIS-1194: deleting ParseableEntryFeature
interface and related classes/modified implementors.
ISIS-1194: deleting ParseableEntryFeature interface and related classes/modified implementors.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9961b391
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9961b391
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9961b391
Branch: refs/heads/ISIS-1213
Commit: 9961b391645db88032f036e558be76d2bf39061b
Parents: 3fc01b5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 12 23:50:44 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 12 23:50:44 2015 +0100
----------------------------------------------------------------------
.../feature/ParseableEntryActionParameter.java | 28 ------------
.../spec/feature/ParseableEntryFeature.java | 45 --------------------
.../specimpl/ObjectActionParameterAbstract.java | 6 +--
.../ObjectActionParameterParseable.java | 30 +------------
4 files changed, 4 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9961b391/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ParseableEntryActionParameter.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ParseableEntryActionParameter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ParseableEntryActionParameter.java
deleted file mode 100644
index 958ba1a..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ParseableEntryActionParameter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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;
-
-/**
- * Equivalent to {@link ObjectAssociation}, but for parameter rather than
- * properties.
- */
-public interface ParseableEntryActionParameter extends OneToOneActionParameter, ParseableEntryFeature {
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9961b391/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ParseableEntryFeature.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ParseableEntryFeature.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ParseableEntryFeature.java
deleted file mode 100644
index be86dd1..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ParseableEntryFeature.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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;
-
-public interface ParseableEntryFeature extends OneToOneFeature {
-
- /**
- * The typical length of each line for this value, as a number of
- * characters.
- */
- int getTypicalLineLength();
-
- /**
- * Returns the maximum number of characters for a value of this type.
- */
- int getMaximumLength();
-
- /**
- * Returns the number of lines for a multi-line value.
- */
- int getNoLines();
-
- /**
- * Determines if a multi-line value can be wrapped when displayed.
- */
- boolean canWrap();
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9961b391/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index f43090b..9f664fc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -191,12 +191,12 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
@Override
public boolean containsFacet(final Class<? extends Facet> facetType) {
- return peer != null ? peer.containsFacet(facetType) : false;
+ return peer != null && peer.containsFacet(facetType);
}
@Override
public boolean containsDoOpFacet(final Class<? extends Facet> facetType) {
- return peer == null ? false : peer.containsDoOpFacet(facetType);
+ return peer != null && peer.containsDoOpFacet(facetType);
}
@Override
@@ -332,7 +332,7 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
addAllInstancesForType(adapters);
}
*/
- return adapters.toArray(new ObjectAdapter[0]);
+ return adapters.toArray(new ObjectAdapter[adapters.size()]);
}
// /////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/9961b391/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java
index 70fa8ef..40318c2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java
@@ -25,45 +25,17 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.TypedHolder;
-import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
-import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
-import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.ParseableEntryActionParameter;
-public class ObjectActionParameterParseable extends ObjectActionParameterAbstract implements ParseableEntryActionParameter {
+public class ObjectActionParameterParseable extends ObjectActionParameterAbstract implements OneToOneActionParameter {
public ObjectActionParameterParseable(final int index, final ObjectActionImpl action, final TypedHolder peer) {
super(index, action, peer);
}
- @Override
- public int getNoLines() {
- final MultiLineFacet facet = getFacet(MultiLineFacet.class);
- return facet.numberOfLines();
- }
-
- @Override
- public boolean canWrap() {
- final MultiLineFacet facet = getFacet(MultiLineFacet.class);
- return !facet.preventWrapping();
- }
-
- @Override
- public int getMaximumLength() {
- final MaxLengthFacet facet = getFacet(MaxLengthFacet.class);
- return facet.value();
- }
-
- @Override
- public int getTypicalLineLength() {
- final TypicalLengthFacet facet = getFacet(TypicalLengthFacet.class);
- return facet.value();
- }
-
protected ObjectAdapter doCoerceProposedValue(
final ObjectAdapter adapter,
final Object proposedValue,