From b1fcb107235bb9af361e0f71f56407c12482f728 Mon Sep 17 00:00:00 2001 From: Sebastian Bazley Date: Thu, 13 May 2010 00:22:19 +0000 Subject: [PATCH] SVN eol-style:native git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@943758 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/http/entity/mime/Header.java | 290 +++++++++--------- .../mime/content/ContentDescriptor.java | 178 +++++------ 2 files changed, 234 insertions(+), 234 deletions(-) diff --git a/httpmime/src/main/java/org/apache/http/entity/mime/Header.java b/httpmime/src/main/java/org/apache/http/entity/mime/Header.java index 2c4c6dd0c..e95b86b67 100644 --- a/httpmime/src/main/java/org/apache/http/entity/mime/Header.java +++ b/httpmime/src/main/java/org/apache/http/entity/mime/Header.java @@ -1,145 +1,145 @@ -/* - * ==================================================================== - * 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. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - */ - -package org.apache.http.entity.mime; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -/** - * The header of an entity (see RFC 2045). - */ -public class Header implements Iterable { - - private final List fields; - private final Map> fieldMap; - - public Header() { - super(); - this.fields = new LinkedList(); - this.fieldMap = new HashMap>(); - } - - public void addField(final MinimalField field) { - if (field == null) { - return; - } - String key = field.getName().toLowerCase(Locale.US); - List values = this.fieldMap.get(key); - if (values == null) { - values = new LinkedList(); - this.fieldMap.put(key, values); - } - values.add(field); - this.fields.add(field); - } - - public List getFields() { - return new ArrayList(this.fields); - } - - public MinimalField getField(final String name) { - if (name == null) { - return null; - } - String key = name.toLowerCase(Locale.US); - List list = this.fieldMap.get(key); - if (list != null && !list.isEmpty()) { - return list.get(0); - } - return null; - } - - public List getFields(final String name) { - if (name == null) { - return null; - } - String key = name.toLowerCase(Locale.US); - List list = this.fieldMap.get(key); - if (list == null || list.isEmpty()) { - return Collections.emptyList(); - } else { - return new ArrayList(list); - } - } - - public int removeFields(final String name) { - if (name == null) { - return 0; - } - String key = name.toLowerCase(Locale.US); - List removed = fieldMap.remove(key); - if (removed == null || removed.isEmpty()) { - return 0; - } - this.fields.removeAll(removed); - return removed.size(); - } - - public void setField(final MinimalField field) { - if (field == null) { - return; - } - String key = field.getName().toLowerCase(Locale.US); - List list = fieldMap.get(key); - if (list == null || list.isEmpty()) { - addField(field); - return; - } - list.clear(); - list.add(field); - int firstOccurrence = -1; - int index = 0; - for (Iterator it = this.fields.iterator(); it.hasNext(); index++) { - MinimalField f = it.next(); - if (f.getName().equalsIgnoreCase(field.getName())) { - it.remove(); - if (firstOccurrence == -1) { - firstOccurrence = index; - } - } - } - this.fields.add(firstOccurrence, field); - } - - public Iterator iterator() { - return Collections.unmodifiableList(fields).iterator(); - } - - @Override - public String toString() { - return this.fields.toString(); - } - -} - +/* + * ==================================================================== + * 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. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.http.entity.mime; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +/** + * The header of an entity (see RFC 2045). + */ +public class Header implements Iterable { + + private final List fields; + private final Map> fieldMap; + + public Header() { + super(); + this.fields = new LinkedList(); + this.fieldMap = new HashMap>(); + } + + public void addField(final MinimalField field) { + if (field == null) { + return; + } + String key = field.getName().toLowerCase(Locale.US); + List values = this.fieldMap.get(key); + if (values == null) { + values = new LinkedList(); + this.fieldMap.put(key, values); + } + values.add(field); + this.fields.add(field); + } + + public List getFields() { + return new ArrayList(this.fields); + } + + public MinimalField getField(final String name) { + if (name == null) { + return null; + } + String key = name.toLowerCase(Locale.US); + List list = this.fieldMap.get(key); + if (list != null && !list.isEmpty()) { + return list.get(0); + } + return null; + } + + public List getFields(final String name) { + if (name == null) { + return null; + } + String key = name.toLowerCase(Locale.US); + List list = this.fieldMap.get(key); + if (list == null || list.isEmpty()) { + return Collections.emptyList(); + } else { + return new ArrayList(list); + } + } + + public int removeFields(final String name) { + if (name == null) { + return 0; + } + String key = name.toLowerCase(Locale.US); + List removed = fieldMap.remove(key); + if (removed == null || removed.isEmpty()) { + return 0; + } + this.fields.removeAll(removed); + return removed.size(); + } + + public void setField(final MinimalField field) { + if (field == null) { + return; + } + String key = field.getName().toLowerCase(Locale.US); + List list = fieldMap.get(key); + if (list == null || list.isEmpty()) { + addField(field); + return; + } + list.clear(); + list.add(field); + int firstOccurrence = -1; + int index = 0; + for (Iterator it = this.fields.iterator(); it.hasNext(); index++) { + MinimalField f = it.next(); + if (f.getName().equalsIgnoreCase(field.getName())) { + it.remove(); + if (firstOccurrence == -1) { + firstOccurrence = index; + } + } + } + this.fields.add(firstOccurrence, field); + } + + public Iterator iterator() { + return Collections.unmodifiableList(fields).iterator(); + } + + @Override + public String toString() { + return this.fields.toString(); + } + +} + diff --git a/httpmime/src/main/java/org/apache/http/entity/mime/content/ContentDescriptor.java b/httpmime/src/main/java/org/apache/http/entity/mime/content/ContentDescriptor.java index 6320d383b..b7c58f19c 100644 --- a/httpmime/src/main/java/org/apache/http/entity/mime/content/ContentDescriptor.java +++ b/httpmime/src/main/java/org/apache/http/entity/mime/content/ContentDescriptor.java @@ -1,89 +1,89 @@ -/* - * ==================================================================== - * 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. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - */ - -package org.apache.http.entity.mime.content; - -/** - * Represents common content properties. - */ -public interface ContentDescriptor { - - /** - * Returns the body descriptors MIME type. - * @see #getMediaType() - * @see #getSubType() - * @return The MIME type, which has been parsed from the - * content-type definition. Must not be null, but - * "text/plain", if no content-type was specified. - */ - String getMimeType(); - - /** - * Gets the defaulted MIME media type for this content. - * For example TEXT, IMAGE, MULTIPART - * @see #getMimeType() - * @return the MIME media type when content-type specified, - * otherwise the correct default (TEXT) - */ - String getMediaType(); - - /** - * Gets the defaulted MIME sub type for this content. - * @see #getMimeType() - * @return the MIME media type when content-type is specified, - * otherwise the correct default (PLAIN) - */ - String getSubType(); - - /** - *

The body descriptors character set, defaulted appropriately for the MIME type.

- *

- * For TEXT types, this will be defaulted to us-ascii. - * For other types, when the charset parameter is missing this property will be null. - *

- * @return Character set, which has been parsed from the - * content-type definition. Not null for TEXT types, when unset will - * be set to default us-ascii. For other types, when unset, - * null will be returned. - */ - String getCharset(); - - /** - * Returns the body descriptors transfer encoding. - * @return The transfer encoding. Must not be null, but "7bit", - * if no transfer-encoding was specified. - */ - String getTransferEncoding(); - - /** - * Returns the body descriptors content-length. - * @return Content length, if known, or -1, to indicate the absence of a - * content-length header. - */ - long getContentLength(); - -} +/* + * ==================================================================== + * 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. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.http.entity.mime.content; + +/** + * Represents common content properties. + */ +public interface ContentDescriptor { + + /** + * Returns the body descriptors MIME type. + * @see #getMediaType() + * @see #getSubType() + * @return The MIME type, which has been parsed from the + * content-type definition. Must not be null, but + * "text/plain", if no content-type was specified. + */ + String getMimeType(); + + /** + * Gets the defaulted MIME media type for this content. + * For example TEXT, IMAGE, MULTIPART + * @see #getMimeType() + * @return the MIME media type when content-type specified, + * otherwise the correct default (TEXT) + */ + String getMediaType(); + + /** + * Gets the defaulted MIME sub type for this content. + * @see #getMimeType() + * @return the MIME media type when content-type is specified, + * otherwise the correct default (PLAIN) + */ + String getSubType(); + + /** + *

The body descriptors character set, defaulted appropriately for the MIME type.

+ *

+ * For TEXT types, this will be defaulted to us-ascii. + * For other types, when the charset parameter is missing this property will be null. + *

+ * @return Character set, which has been parsed from the + * content-type definition. Not null for TEXT types, when unset will + * be set to default us-ascii. For other types, when unset, + * null will be returned. + */ + String getCharset(); + + /** + * Returns the body descriptors transfer encoding. + * @return The transfer encoding. Must not be null, but "7bit", + * if no transfer-encoding was specified. + */ + String getTransferEncoding(); + + /** + * Returns the body descriptors content-length. + * @return Content length, if known, or -1, to indicate the absence of a + * content-length header. + */ + long getContentLength(); + +}