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 2017/10/16 12:43:43 UTC
[isis] 18/26: ISIS-1742: deletes OidMatchers & OidMatchers (two
different classes, unrelated except with same name, both unused).
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 140f99230d36c459bcbf62c646c76b7e4c0cf5dd
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 12:56:31 2017 +0100
ISIS-1742: deletes OidMatchers & OidMatchers (two different classes, unrelated except with same name, both unused).
---
.../core/metamodel/adapter/oid/OidMatchers.java | 48 --------------------
.../isis/viewer/wicket/model/util/OidMatchers.java | 51 ----------------------
2 files changed, 99 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/OidMatchers.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/OidMatchers.java
deleted file mode 100644
index 65f1ff1..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/OidMatchers.java
+++ /dev/null
@@ -1,48 +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.adapter.oid;
-
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-
-public class OidMatchers {
-
- private OidMatchers(){}
-
- public static Matcher<Oid> matching(final String objectType, final String identifier) {
- return new TypeSafeMatcher<Oid>() {
-
- @Override
- public void describeTo(Description arg0) {
- arg0.appendText("matching [" + objectType + ", " + identifier +"]");
- }
-
- @Override
- public boolean matchesSafely(Oid oid) {
- if(oid instanceof RootOid) {
- RootOid rootOid = (RootOid) oid;
- return rootOid.getObjectSpecId().equals(objectType) && rootOid.getIdentifier().equals(identifier);
- }
- return false;
- }
- };
- }
-
-}
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/OidMatchers.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/OidMatchers.java
deleted file mode 100644
index 7904a35..0000000
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/OidMatchers.java
+++ /dev/null
@@ -1,51 +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.viewer.wicket.model.util;
-
-import org.hamcrest.Matcher;
-
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-
-/**
- * @deprecated - use {@link Oid.Matchers}
- */
-@Deprecated
-public final class OidMatchers {
-
- private OidMatchers() {
- }
-
- /**
- * @deprecated - use {@link Oid.Matchers}
- */
- @Deprecated
- public static Matcher<Oid> isTransient() {
- return Oid.Matchers.isTransient();
- }
-
- /**
- * @deprecated - use {@link Oid.Matchers}
- */
- @Deprecated
- public static Matcher<Oid> isPersistent() {
- return Oid.Matchers.isPersistent();
- }
-
-}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.