You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2012/01/27 08:54:05 UTC
svn commit: r1236557 - in
/incubator/clerezza/trunk/parent/utils.imageprocessing: LICENSE NOTICE
src/main/java/org/apache/clerezza/utils/imageprocessing/metadataprocessing/MultivaluedMapImpl.java
Author: reto
Date: Fri Jan 27 07:54:05 2012
New Revision: 1236557
URL: http://svn.apache.org/viewvc?rev=1236557&view=rev
Log:
CLEREZZA-677: removed CDDL file inclusion
Modified:
incubator/clerezza/trunk/parent/utils.imageprocessing/LICENSE
incubator/clerezza/trunk/parent/utils.imageprocessing/NOTICE
incubator/clerezza/trunk/parent/utils.imageprocessing/src/main/java/org/apache/clerezza/utils/imageprocessing/metadataprocessing/MultivaluedMapImpl.java
Modified: incubator/clerezza/trunk/parent/utils.imageprocessing/LICENSE
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/utils.imageprocessing/LICENSE?rev=1236557&r1=1236556&r2=1236557&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/utils.imageprocessing/LICENSE (original)
+++ incubator/clerezza/trunk/parent/utils.imageprocessing/LICENSE Fri Jan 27 07:54:05 2012
@@ -199,390 +199,3 @@
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.
-
-APACHE CLEREZZA UTILS IMAGEPROCESSING SUBCOMPONENTS:
-
-Portions of Apache Clerezza Utils Imageprocessing are licensed under the
-CDDL License. Your use of the source code for the these subcomponents is
-subject to the terms and conditions of the following license.
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-1. Definitions.
-
-1.1. "Contributor" means each individual or entity that
-creates or contributes to the creation of Modifications.
-
-1.2. "Contributor Version" means the combination of the
-Original Software, prior Modifications used by a
-Contributor (if any), and the Modifications made by that
-particular Contributor.
-
-1.3. "Covered Software" means (a) the Original Software, or
-(b) Modifications, or (c) the combination of files
-containing Original Software with files containing
-Modifications, in each case including portions thereof.
-
-1.4. "Executable" means the Covered Software in any form
-other than Source Code.
-
-1.5. "Initial Developer" means the individual or entity
-that first makes Original Software available under this
-License.
-
-1.6. "Larger Work" means a work which combines Covered
-Software or portions thereof with code not governed by the
-terms of this License.
-
-1.7. "License" means this document.
-
-1.8. "Licensable" means having the right to grant, to the
-maximum extent possible, whether at the time of the initial
-grant or subsequently acquired, any and all of the rights
-conveyed herein.
-
-1.9. "Modifications" means the Source Code and Executable
-form of any of the following:
-
-A. Any file that results from an addition to,
-deletion from or modification of the contents of a
-file containing Original Software or previous
-Modifications;
-
-B. Any new file that contains any part of the
-Original Software or previous Modification; or
-
-C. Any new file that is contributed or otherwise made
-available under the terms of this License.
-
-1.10. "Original Software" means the Source Code and
-Executable form of computer software code that is
-originally released under this License.
-
-1.11. "Patent Claims" means any patent claim(s), now owned
-or hereafter acquired, including without limitation,
-method, process, and apparatus claims, in any patent
-Licensable by grantor.
-
-1.12. "Source Code" means (a) the common form of computer
-software code in which modifications are made and (b)
-associated documentation included in or with such code.
-
-1.13. "You" (or "Your") means an individual or a legal
-entity exercising rights under, and complying with all of
-the terms of, this License. For legal entities, "You"
-includes any entity which controls, is controlled by, or is
-under common control with You. For purposes of this
-definition, "control" means (a) the power, direct or
-indirect, to cause the direction or management of such
-entity, whether by contract or otherwise, or (b) ownership
-of more than fifty percent (50%) of the outstanding shares
-or beneficial ownership of such entity.
-
-2. License Grants.
-
-2.1. The Initial Developer Grant.
-
-Conditioned upon Your compliance with Section 3.1 below and
-subject to third party intellectual property claims, the
-Initial Developer hereby grants You a world-wide,
-royalty-free, non-exclusive license:
-
-(a) under intellectual property rights (other than
-patent or trademark) Licensable by Initial Developer,
-to use, reproduce, modify, display, perform,
-sublicense and distribute the Original Software (or
-portions thereof), with or without Modifications,
-and/or as part of a Larger Work; and
-
-(b) under Patent Claims infringed by the making,
-using or selling of Original Software, to make, have
-made, use, practice, sell, and offer for sale, and/or
-otherwise dispose of the Original Software (or
-portions thereof).
-
-(c) The licenses granted in Sections 2.1(a) and (b)
-are effective on the date Initial Developer first
-distributes or otherwise makes the Original Software
-available to a third party under the terms of this
-License.
-
-(d) Notwithstanding Section 2.1(b) above, no patent
-license is granted: (1) for code that You delete from
-the Original Software, or (2) for infringements
-caused by: (i) the modification of the Original
-Software, or (ii) the combination of the Original
-Software with other software or devices.
-
-2.2. Contributor Grant.
-
-Conditioned upon Your compliance with Section 3.1 below and
-subject to third party intellectual property claims, each
-Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than
-patent or trademark) Licensable by Contributor to
-use, reproduce, modify, display, perform, sublicense
-and distribute the Modifications created by such
-Contributor (or portions thereof), either on an
-unmodified basis, with other Modifications, as
-Covered Software and/or as part of a Larger Work; and
-
-(b) under Patent Claims infringed by the making,
-using, or selling of Modifications made by that
-Contributor either alone and/or in combination with
-its Contributor Version (or portions of such
-combination), to make, use, sell, offer for sale,
-have made, and/or otherwise dispose of: (1)
-Modifications made by that Contributor (or portions
-thereof); and (2) the combination of Modifications
-made by that Contributor with its Contributor Version
-(or portions of such combination).
-
-(c) The licenses granted in Sections 2.2(a) and
-2.2(b) are effective on the date Contributor first
-distributes or otherwise makes the Modifications
-available to a third party.
-
-(d) Notwithstanding Section 2.2(b) above, no patent
-license is granted: (1) for any code that Contributor
-has deleted from the Contributor Version; (2) for
-infringements caused by: (i) third party
-modifications of Contributor Version, or (ii) the
-combination of Modifications made by that Contributor
-with other software (except as part of the
-Contributor Version) or other devices; or (3) under
-Patent Claims infringed by Covered Software in the
-absence of Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-3.1. Availability of Source Code.
-
-Any Covered Software that You distribute or otherwise make
-available in Executable form must also be made available in
-Source Code form and that Source Code form must be
-distributed only under the terms of this License. You must
-include a copy of this License with every copy of the
-Source Code form of the Covered Software You distribute or
-otherwise make available. You must inform recipients of any
-such Covered Software in Executable form as to how they can
-obtain such Covered Software in Source Code form in a
-reasonable manner on or through a medium customarily used
-for software exchange.
-
-3.2. Modifications.
-
-The Modifications that You create or to which You
-contribute are governed by the terms of this License. You
-represent that You believe Your Modifications are Your
-original creation(s) and/or You have sufficient rights to
-grant the rights conveyed by this License.
-
-3.3. Required Notices.
-
-You must include a notice in each of Your Modifications
-that identifies You as the Contributor of the Modification.
-You may not remove or alter any copyright, patent or
-trademark notices contained within the Covered Software, or
-any notices of licensing or any descriptive text giving
-attribution to any Contributor or the Initial Developer.
-
-3.4. Application of Additional Terms.
-
-You may not offer or impose any terms on any Covered
-Software in Source Code form that alters or restricts the
-applicable version of this License or the recipients'
-rights hereunder. You may choose to offer, and to charge a
-fee for, warranty, support, indemnity or liability
-obligations to one or more recipients of Covered Software.
-However, you may do so only on Your own behalf, and not on
-behalf of the Initial Developer or any Contributor. You
-must make it absolutely clear that any such warranty,
-support, indemnity or liability obligation is offered by
-You alone, and You hereby agree to indemnify the Initial
-Developer and every Contributor for any liability incurred
-by the Initial Developer or such Contributor as a result of
-warranty, support, indemnity or liability terms You offer.
-
-3.5. Distribution of Executable Versions.
-
-You may distribute the Executable form of the Covered
-Software under the terms of this License or under the terms
-of a license of Your choice, which may contain terms
-different from this License, provided that You are in
-compliance with the terms of this License and that the
-license for the Executable form does not attempt to limit
-or alter the recipient's rights in the Source Code form
-from the rights set forth in this License. If You
-distribute the Covered Software in Executable form under a
-different license, You must make it absolutely clear that
-any terms which differ from this License are offered by You
-alone, not by the Initial Developer or Contributor. You
-hereby agree to indemnify the Initial Developer and every
-Contributor for any liability incurred by the Initial
-Developer or such Contributor as a result of any such terms
-You offer.
-
-3.6. Larger Works.
-
-You may create a Larger Work by combining Covered Software
-with other code not governed by the terms of this License
-and distribute the Larger Work as a single product. In such
-a case, You must make sure the requirements of this License
-are fulfilled for the Covered Software.
-
-4. Versions of the License.
-
-4.1. New Versions.
-
-Sun Microsystems, Inc. is the initial license steward and
-may publish revised and/or new versions of this License
-from time to time. Each version will be given a
-distinguishing version number. Except as provided in
-Section 4.3, no one other than the license steward has the
-right to modify this License.
-
-4.2. Effect of New Versions.
-
-You may always continue to use, distribute or otherwise
-make the Covered Software available under the terms of the
-version of the License under which You originally received
-the Covered Software. If the Initial Developer includes a
-notice in the Original Software prohibiting it from being
-distributed or otherwise made available under any
-subsequent version of the License, You must distribute and
-make the Covered Software available under the terms of the
-version of the License under which You originally received
-the Covered Software. Otherwise, You may also choose to
-use, distribute or otherwise make the Covered Software
-available under the terms of any subsequent version of the
-License published by the license steward.
-
-4.3. Modified Versions.
-
-When You are an Initial Developer and You want to create a
-new license for Your Original Software, You may create and
-use a modified version of this License if You: (a) rename
-the license and remove any references to the name of the
-license steward (except to note that the license differs
-from this License); and (b) otherwise make it clear that
-the license contains terms which differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
-COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
-COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
-ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-DISCLAIMER.
-
-6. TERMINATION.
-
-6.1. This License and the rights granted hereunder will
-terminate automatically if You fail to comply with terms
-herein and fail to cure such breach within 30 days of
-becoming aware of the breach. Provisions which, by their
-nature, must remain in effect beyond the termination of
-this License shall survive.
-
-6.2. If You assert a patent infringement claim (excluding
-declaratory judgment actions) against Initial Developer or
-a Contributor (the Initial Developer or Contributor against
-whom You assert such claim is referred to as "Participant")
-alleging that the Participant Software (meaning the
-Contributor Version where the Participant is a Contributor
-or the Original Software where the Participant is the
-Initial Developer) directly or indirectly infringes any
-patent, then any and all rights granted directly or
-indirectly to You by such Participant, the Initial
-Developer (if the Initial Developer is not the Participant)
-and all Contributors under Sections 2.1 and/or 2.2 of this
-License shall, upon 60 days notice from Participant
-terminate prospectively and automatically at the expiration
-of such 60 day notice period, unless if within such 60 day
-period You withdraw Your claim with respect to the
-Participant Software against such Participant either
-unilaterally or pursuant to a written agreement with
-Participant.
-
-6.3. In the event of termination under Sections 6.1 or 6.2
-above, all end user licenses that have been validly granted
-by You or any distributor hereunder prior to termination
-(excluding licenses granted to You by any distributor)
-shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
-The Covered Software is a "commercial item," as that term is
-defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-computer software" (as that term is defined at 48 C.F.R. ¤
-252.227-7014(a)(1)) and "commercial computer software
-documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
-1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-through 227.7202-4 (June 1995), all U.S. Government End Users
-acquire Covered Software with only those rights set forth herein.
-This U.S. Government Rights clause is in lieu of, and supersedes,
-any other FAR, DFAR, or other clause or provision that addresses
-Government rights in computer software under this License.
-
-9. MISCELLANEOUS.
-
-This License represents the complete agreement concerning subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the
-extent necessary to make it enforceable. This License shall be
-governed by the law of the jurisdiction specified in a notice
-contained within the Original Software (except to the extent
-applicable law, if any, provides otherwise), excluding such
-jurisdiction's conflict-of-law provisions. Any litigation
-relating to this License shall be subject to the jurisdiction of
-the courts located in the jurisdiction and venue specified in a
-notice contained within the Original Software, with the losing
-party responsible for costs, including, without limitation, court
-costs and reasonable attorneys' fees and expenses. The
-application of the United Nations Convention on Contracts for the
-International Sale of Goods is expressly excluded. Any law or
-regulation which provides that the language of a contract shall
-be construed against the drafter shall not apply to this License.
-You agree that You alone are responsible for compliance with the
-United States export administration regulations (and the export
-control laws and regulation of any other countries) when You use,
-distribute or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
-As between Initial Developer and the Contributors, each party is
-responsible for claims and damages arising, directly or
-indirectly, out of its utilization of rights under this License
-and You agree to work with Initial Developer and Contributors to
-distribute such responsibility on an equitable basis. Nothing
-herein is intended or shall be deemed to constitute any admission
-of liability.
Modified: incubator/clerezza/trunk/parent/utils.imageprocessing/NOTICE
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/utils.imageprocessing/NOTICE?rev=1236557&r1=1236556&r2=1236557&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/utils.imageprocessing/NOTICE (original)
+++ incubator/clerezza/trunk/parent/utils.imageprocessing/NOTICE Fri Jan 27 07:54:05 2012
@@ -6,10 +6,3 @@ The Apache Software Foundation (http://w
Adobe, Photoshop and XMP are either registered trademarks or trademarks of
Adobe Systems Incorporated in the United States and/or other countries.
-
-Portions are licensed under the COMMON DEVELOPMENT AND DISTRIBUTION
-LICENSE (CDDL) Version 1.0, see the file LICENSE. When redistributing
-this portions of the software you must ensure to comply with the CDDL license,
-if you do not modify the respective files this is done by indicating where the
-original sources can be retrieved, if you modify the files you must publish the
-modifications.
Modified: incubator/clerezza/trunk/parent/utils.imageprocessing/src/main/java/org/apache/clerezza/utils/imageprocessing/metadataprocessing/MultivaluedMapImpl.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/utils.imageprocessing/src/main/java/org/apache/clerezza/utils/imageprocessing/metadataprocessing/MultivaluedMapImpl.java?rev=1236557&r1=1236556&r2=1236557&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/utils.imageprocessing/src/main/java/org/apache/clerezza/utils/imageprocessing/metadataprocessing/MultivaluedMapImpl.java (original)
+++ incubator/clerezza/trunk/parent/utils.imageprocessing/src/main/java/org/apache/clerezza/utils/imageprocessing/metadataprocessing/MultivaluedMapImpl.java Fri Jan 27 07:54:05 2012
@@ -1,45 +1,4 @@
-/*
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-*
-* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
-*
-* The contents of this file are subject to the terms of either the GNU
-* General Public License Version 2 only ("GPL") or the Common Development
-* and Distribution License("CDDL") (collectively, the "License"). You
-* may not use this file except in compliance with the License. You can obtain
-* a copy of the License at https://jersey.dev.java.net/CDDL+GPL.html
-* or jersey/legal/LICENSE.txt. See the License for the specific
-* language governing permissions and limitations under the License.
-*
-* When distributing the software, include this License Header Notice in each
-* file and include the License file at jersey/legal/LICENSE.txt.
-* Sun designates this particular file as subject to the "Classpath" exception
-* as provided by Sun in the GPL Version 2 section of the License file that
-* accompanied this code. If applicable, add the following below the License
-* Header, with the fields enclosed by brackets [] replaced by your own
-* identifying information: "Portions Copyrighted [year]
-* [name of copyright owner]"
-*
-* Contributor(s):
-*
-* If you wish your version of this file to be governed by only the CDDL or
-* only the GPL Version 2, indicate your decision by adding "[Contributor]
-* elects to include this software in this distribution under the [CDDL or GPL
-* Version 2] license." If you don't indicate a single choice of license, a
-* recipient has the option to distribute your version of this file under
-* either the CDDL, the GPL Version 2 or to extend the choice of license to
-* its licensees as provided above. However, if you add GPL Version 2 code
-* and therefore, elected the GPL Version 2 license, then the option applies
-* only if the new code is made subject to such option by the copyright
-* holder.
-*
-* trialox.org (trialox AG, Switzerland) elects to include this software in this
-* distribution under the CDDL license.
-*/
-package org.apache.clerezza.utils.imageprocessing.metadataprocessing;
-/*
- *
+/*******************************************************************************
* 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
@@ -50,147 +9,225 @@ package org.apache.clerezza.utils.imagep
*
* 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.
+ * 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.clerezza.utils.imageprocessing.metadataprocessing;
-import java.lang.reflect.Constructor;
import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
import javax.ws.rs.core.MultivaluedMap;
-/**
-*
-* @author Paul.Sandoz@Sun.Com
-*/
-
-public class MultivaluedMapImpl<K, V> extends HashMap<K, List<V>>
- implements MultivaluedMap<K, V> {
+public class MultivaluedMapImpl<K, V> // extends LinkedHashMap<K,List<V>>
+ implements MultivaluedMap<K, V>, Cloneable {
- // MultivaluedMap
- @Override
- public final void putSingle(K key, V value) {
- List<V> l = getList(key);
-
- l.clear();
- if (value != null) {
- l.add(value);
- } else {
- throw new NullPointerException("Adding nulls not (yet) supported");
- }
- }
-
- @Override
- public final void add(K key, V value) {
- List<V> l = getList(key);
+ private static final long serialVersionUID = -1942980976209902832L;
+ private final Map<K, List<V>> map;
- if (value != null) {
- l.add(value);
- } else {
- throw new NullPointerException("Adding nulls not (yet) supported");
- }
- }
+ public MultivaluedMapImpl() {
+ map = new LinkedHashMap<K, List<V>>();
+ }
+
+ /**
+ * Used to create a CaseInsensitiveMultivaluedMap
+ *
+ * @param keyComparator
+ */
+ MultivaluedMapImpl(Comparator<K> keyComparator) {
+ map = new TreeMap<K, List<V>>(keyComparator);
+ }
+
+ public MultivaluedMapImpl(Map<K, V> map) {
+ this();
+ for (K key : map.keySet()) {
+ add(key, map.get(key));
+ }
+ }
+
+ public void add(K key, V value) {
+ List<V> list = getOrCreate(key);
+ list.add(value);
+ }
+
+ public V getFirst(K key) {
+ List<V> list = get(key);
+ if (list == null || list.size() == 0) {
+ return null;
+ }
+ return list.get(0);
+ }
+
+ public void putSingle(K key, V value) {
+ List<V> list = getOrCreate(key);
+ list.clear();
+ list.add(value);
+ }
+
+ private List<V> getOrCreate(K key) {
+ List<V> list = this.get(key);
+ if (list == null) {
+ list = createValueList(key);
+ this.put(key, list);
+ }
+ return list;
+ }
+
+ private List<V> createValueList(K key) {
+ return new ArrayList<V>();
+ }
+
+ public MultivaluedMapImpl<K, V> clone() {
+ return clone(this);
+ }
+
+ public static <K, V> MultivaluedMapImpl<K, V> clone(MultivaluedMap<K, V> src) {
+ MultivaluedMapImpl<K, V> clone = new MultivaluedMapImpl<K, V>();
+ copy(src, clone);
+ return clone;
+ }
+
+ public static <K, V> void copy(MultivaluedMap<K, V> src, MultivaluedMap<K, V> dest) {
+ for (K key : src.keySet()) {
+ List<V> value = src.get(key);
+ List<V> newValue = new ArrayList<V>();
+ newValue.addAll(value);
+ dest.put(key, newValue);
+ }
+ }
+
+ public static <K, V> void addAll(MultivaluedMap<K, V> src, MultivaluedMap<K, V> dest) {
+ for (K key : src.keySet()) {
+ List<V> srcList = src.get(key);
+ List<V> destList = dest.get(key);
+ if (destList == null) {
+ destList = new ArrayList<V>(srcList.size());
+ dest.put(key, destList);
+ }
+ destList.addAll(srcList);
+ }
+ }
@Override
- public final V getFirst(K key) {
- List<V> values = get(key);
- if (values != null && values.size() > 0) {
- return values.get(0);
- } else {
- return null;
- }
- }
- //
- public final void addFirst(K key, V value) {
- List<V> l = getList(key);
-
- if (value != null) {
- l.add(0, value);
- } else {
- throw new NullPointerException("Adding nulls not (yet) supported");
- }
- }
-
- public final <A> List<A> get(K key, Class<A> type) {
- Constructor<A> c = null;
- try {
- c = type.getConstructor(String.class);
- } catch (Exception ex) {
- throw new IllegalArgumentException(type.getName() + " has no String constructor", ex);
- }
-
- ArrayList<A> l = null;
- List<V> values = get(key);
- if (values != null) {
- l = new ArrayList<A>();
- for (V value : values) {
- try {
- l.add(c.newInstance(value));
- } catch (Exception ex) {
- l.add(null);
- }
- }
- }
- return l;
- }
-
-
- private final List<V> getList(K key) {
- List<V> l = get(key);
- if (l == null) {
- l = new LinkedList<V>();
- put(key, l);
- }
- return l;
- }
-
- public final <A> A getFirst(K key, Class<A> type) {
- V value = getFirst(key);
- if (value == null) {
- return null;
- }
- Constructor<A> c = null;
- try {
- c = type.getConstructor(String.class);
- } catch (Exception ex) {
- throw new IllegalArgumentException(type.getName() + " has no String constructor", ex);
- }
- A retVal = null;
- try {
- retVal = c.newInstance(value);
- } catch (Exception ex) {
- }
- return retVal;
- }
-
- @SuppressWarnings("unchecked")
- public final <A> A getFirst(K key, A defaultValue) {
- V value = getFirst(key);
- if (value == null) {
- return defaultValue;
- }
- Class<A> type = (Class<A>) defaultValue.getClass();
-
- Constructor<A> c = null;
- try {
- c = type.getConstructor(String.class);
- } catch (Exception ex) {
- throw new IllegalArgumentException(type.getName() + " has no String constructor", ex);
- }
- A retVal = defaultValue;
- try {
- retVal = c.newInstance(value);
- } catch (Exception ex) {
- }
- return retVal;
- }
-}// $Log: $
+ public String toString() {
+ return "[" + toString(this, ",") + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+
+ public static String toString(MultivaluedMap<?, ?> map, String delimiter) {
+ StringBuilder result = new StringBuilder();
+ MultivaluedMap<?, ?> params = map;
+ String delim = ""; //$NON-NLS-1$
+ for (Object name : params.keySet()) {
+ for (Object value : params.get(name)) {
+ result.append(delim);
+ if (name == null) {
+ result.append("null"); //$NON-NLS-1$
+ } else {
+ result.append(name.toString());
+ }
+ if (value != null) {
+ result.append('=');
+ result.append(value.toString());
+ }
+ delim = delimiter;
+ }
+ }
+ return result.toString();
+ }
+
+ public static MultivaluedMap<String, String> toMultivaluedMapString(Map<String, ? extends Object> values) {
+ MultivaluedMap<String, String> mValues = new MultivaluedMapImpl<String, String>();
+ for (String key : values.keySet()) {
+ Object value = values.get(key);
+ if (value == null) {
+ mValues.add(key, null);
+ } else if (value instanceof Object[]) {
+ for (Object obj : (Object[]) value) {
+ if (obj == null) {
+ mValues.add(key, null);
+ } else {
+ mValues.add(key, obj.toString());
+ }
+ }
+ } else if (value instanceof List<?>) {
+ for (Object obj : (List<?>) value) {
+ if (obj == null) {
+ mValues.add(key, null);
+ } else {
+ mValues.add(key, obj.toString());
+ }
+ }
+ } else {
+ mValues.add(key, value.toString());
+ }
+ }
+ return mValues;
+ }
+
+ public void clear() {
+ map.clear();
+ }
+
+ public boolean containsKey(Object key) {
+ return map.containsKey(key);
+ }
+
+ public boolean containsValue(Object value) {
+ return map.containsValue(value);
+ }
+
+ public Set<java.util.Map.Entry<K, List<V>>> entrySet() {
+ return map.entrySet();
+ }
+
+ public boolean equals(Object o) {
+ return map.equals(o);
+ }
+
+ public List<V> get(Object key) {
+ return map.get(key);
+ }
+
+ public int hashCode() {
+ return map.hashCode();
+ }
+
+ public boolean isEmpty() {
+ return map.isEmpty();
+ }
+
+ public Set<K> keySet() {
+ return map.keySet();
+ }
+
+ public List<V> put(K key, List<V> value) {
+ return map.put(key, value);
+ }
+
+ public void putAll(Map<? extends K, ? extends List<V>> t) {
+ map.putAll(t);
+ }
+
+ public List<V> remove(Object key) {
+ return map.remove(key);
+ }
+
+ public int size() {
+ return map.size();
+ }
+
+ public Collection<List<V>> values() {
+ return map.values();
+ }
+}