Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix checkstyle warnings, add missing AL header. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1715492 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Neidhart 2015-11-21 10:09:31 +00:00
parent 7d2507ee16
commit 52372e8f2b
3 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
View File

@ -74,7 +74,6 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
/**
* Constructor that wraps (not copies).
*
* @param <C> the collection type
* @param map the map to wrap, must not be null
* @throws NullPointerException if the map is null
*/

27
src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java
View File

@ -1,3 +1,19 @@
/*
* 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.commons.collections4.multimap;
import java.io.IOException;
@ -9,11 +25,10 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.collections4.ListValuedMap;
import org.apache.commons.collections4.MultiValuedMap;
/**
* Implements a {@link ListValuedMap}, using a {@link HashMap} to provide data
* Implements a {@code ListValuedMap}, using a {@link HashMap} to provide data
* storage and {@link ArrayList}s as value collections. This is the standard
* implementation of a ListValuedMap.
* <p>
@ -48,7 +63,7 @@ public class ArrayListValuedHashMap<K, V> extends AbstractListValuedMap<K, V>
/**
* Creates an empty ArrayListValuedHashMap with the default initial
* map capacity (16) and the default initial list capacity (3).
* map capacity (16) and the default initial list capacity (3).
*/
public ArrayListValuedHashMap() {
this(DEFAULT_INITIAL_MAP_CAPACITY, DEFAULT_INITIAL_LIST_CAPACITY);
@ -56,7 +71,7 @@ public class ArrayListValuedHashMap<K, V> extends AbstractListValuedMap<K, V>
/**
* Creates an empty ArrayListValuedHashMap with the default initial
* map capacity (16) and the specified initial list capacity.
* map capacity (16) and the specified initial list capacity.
*
* @param initialListCapacity the initial capacity used for value collections
*/
@ -66,7 +81,7 @@ public class ArrayListValuedHashMap<K, V> extends AbstractListValuedMap<K, V>
/**
* Creates an empty ArrayListValuedHashMap with the specified initial
* map and list capacities.
* map and list capacities.
*
* @param initialMapCapacity the initial hashmap capacity
* @param initialListCapacity the initial capacity used for value collections
@ -118,7 +133,7 @@ public class ArrayListValuedHashMap<K, V> extends AbstractListValuedMap<K, V>
oos.defaultWriteObject();
doWriteObject(oos);
}
private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
ois.defaultReadObject();
setMap(new HashMap<K, ArrayList<V>>());

27
src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java
View File

@ -1,3 +1,19 @@
/*
* 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.commons.collections4.multimap;
import java.io.IOException;
@ -9,10 +25,9 @@ import java.util.HashSet;
import java.util.Map;
import org.apache.commons.collections4.MultiValuedMap;
import org.apache.commons.collections4.SetValuedMap;
/**
* Implements a {@link SetValuedMap}, using a {@link HashMap} to provide data
* Implements a {@code SetValuedMap}, using a {@link HashMap} to provide data
* storage and {@link HashSet}s as value collections. This is the standard
* implementation of a SetValuedMap.
* <p>
@ -47,7 +62,7 @@ public class HashSetValuedHashMap<K, V> extends AbstractSetValuedMap<K, V>
/**
* Creates an empty HashSetValuedHashMap with the default initial
* map capacity (16) and the default initial set capacity (3).
* map capacity (16) and the default initial set capacity (3).
*/
public HashSetValuedHashMap() {
this(DEFAULT_INITIAL_MAP_CAPACITY, DEFAULT_INITIAL_SET_CAPACITY);
@ -55,7 +70,7 @@ public class HashSetValuedHashMap<K, V> extends AbstractSetValuedMap<K, V>
/**
* Creates an empty HashSetValuedHashMap with the default initial
* map capacity (16) and the specified initial set capacity.
* map capacity (16) and the specified initial set capacity.
*
* @param initialSetCapacity the initial capacity used for value collections
*/
@ -65,7 +80,7 @@ public class HashSetValuedHashMap<K, V> extends AbstractSetValuedMap<K, V>
/**
* Creates an empty HashSetValuedHashMap with the specified initial
* map and list capacities.
* map and list capacities.
*
* @param initialMapCapacity the initial hashmap capacity
* @param initialSetCapacity the initial capacity used for value collections
@ -106,7 +121,7 @@ public class HashSetValuedHashMap<K, V> extends AbstractSetValuedMap<K, V>
oos.defaultWriteObject();
doWriteObject(oos);
}
private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
ois.defaultReadObject();
setMap(new HashMap<K, HashSet<V>>());