WICKET-6004 Wicket 8 cleanup - removed wildcard collection models
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/467a4a8e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/467a4a8e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/467a4a8e Branch: refs/heads/master Commit: 467a4a8ebd765fae1b016c88285d331ae6681baf Parents: 2f866fb Author: Sven Meier <[email protected]> Authored: Tue Oct 13 10:45:54 2015 +0200 Committer: Sven Meier <[email protected]> Committed: Fri Oct 16 14:24:41 2015 +0200 ---------------------------------------------------------------------- .../model/util/WildcardCollectionModel.java | 59 ------------------ .../wicket/model/util/WildcardListModel.java | 64 -------------------- .../wicket/model/util/WildcardSetModel.java | 59 ------------------ 3 files changed, 182 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/467a4a8e/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardCollectionModel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardCollectionModel.java b/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardCollectionModel.java deleted file mode 100644 index fe81b5f..0000000 --- a/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardCollectionModel.java +++ /dev/null @@ -1,59 +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.wicket.model.util; - -import java.util.ArrayList; -import java.util.Collection; - - -/** - * Based on <code>Model</code> but for any collections of serializable objects. - * - * @author Timo Rantalaiho - * @param <T> - * type of object inside collection - * @deprecated Will be removed in Wicket 8 - */ -@Deprecated -public class WildcardCollectionModel<T> extends GenericBaseModel<Collection<? extends T>> -{ - private static final long serialVersionUID = 1L; - - /** - * Creates empty model - */ - public WildcardCollectionModel() - { - } - - /** - * Creates model that will contain <code>collection</code> - * - * @param collection - */ - public WildcardCollectionModel(Collection<? extends T> collection) - { - setObject(collection); - } - - /** {@inheritDoc} */ - @Override - protected Collection<? extends T> createSerializableVersionOf(Collection<? extends T> object) - { - return new ArrayList<>(object); - } -} http://git-wip-us.apache.org/repos/asf/wicket/blob/467a4a8e/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardListModel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardListModel.java b/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardListModel.java deleted file mode 100644 index 5f241d5..0000000 --- a/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardListModel.java +++ /dev/null @@ -1,64 +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.wicket.model.util; - -import java.util.ArrayList; -import java.util.List; - - -/** - * Based on <code>Model</code> but for lists of serializable objects. - * - * @author Timo Rantalaiho - * @param <T> - * type of object inside list - * @deprecated Will be removed in Wicket 8 - */ -@Deprecated -public class WildcardListModel<T> extends GenericBaseModel<List<? extends T>> -{ - private static final long serialVersionUID = 1L; - - /** - * Creates empty model - */ - public WildcardListModel() - { - } - - /** - * Creates model that will contain <code>list</code> - * - * @param list - * - */ - public WildcardListModel(List<? extends T> list) - { - setObject(list); - } - - /** {@inheritDoc} */ - @Override - protected List<? extends T> createSerializableVersionOf(List<? extends T> object) - { - if (object == null) - { - return null; - } - return new ArrayList<T>(object); - } -} http://git-wip-us.apache.org/repos/asf/wicket/blob/467a4a8e/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardSetModel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardSetModel.java b/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardSetModel.java deleted file mode 100644 index bd3e11f..0000000 --- a/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardSetModel.java +++ /dev/null @@ -1,59 +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.wicket.model.util; - -import java.util.HashSet; -import java.util.Set; - - -/** - * Based on <code>Model</code> but for sets of serializable objects. - * - * @author Timo Rantalaiho - * @param <T> - * type of object inside set - * @deprecated Will be removed in Wicket 8 - */ -@Deprecated -public class WildcardSetModel<T> extends GenericBaseModel<Set<? extends T>> -{ - private static final long serialVersionUID = 1L; - - /** - * Creates empty model - */ - public WildcardSetModel() - { - } - - /** - * Creates model that will contain <code>set</code> - * - * @param set - */ - public WildcardSetModel(Set<? extends T> set) - { - setObject(set); - } - - /** {@inheritDoc} */ - @Override - protected Set<? extends T> createSerializableVersionOf(Set<? extends T> object) - { - return new HashSet<T>(object); - } -}
