Skip to content
Browse files

HttpClient 4.1-alpha2 release tag

  • Loading branch information...
2 parents 42dce9f + 80b0758 commit 4a7f330e67184983f6e35c7a14bef3f43b4feaec @ok2c ok2c committed May 13, 2010
View
290 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
- * <http://www.apache.org/>.
- *
- */
-
-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<MinimalField> {
-
- private final List<MinimalField> fields;
- private final Map<String, List<MinimalField>> fieldMap;
-
- public Header() {
- super();
- this.fields = new LinkedList<MinimalField>();
- this.fieldMap = new HashMap<String, List<MinimalField>>();
- }
-
- public void addField(final MinimalField field) {
- if (field == null) {
- return;
- }
- String key = field.getName().toLowerCase(Locale.US);
- List<MinimalField> values = this.fieldMap.get(key);
- if (values == null) {
- values = new LinkedList<MinimalField>();
- this.fieldMap.put(key, values);
- }
- values.add(field);
- this.fields.add(field);
- }
-
- public List<MinimalField> getFields() {
- return new ArrayList<MinimalField>(this.fields);
- }
-
- public MinimalField getField(final String name) {
- if (name == null) {
- return null;
- }
- String key = name.toLowerCase(Locale.US);
- List<MinimalField> list = this.fieldMap.get(key);
- if (list != null && !list.isEmpty()) {
- return list.get(0);
- }
- return null;
- }
-
- public List<MinimalField> getFields(final String name) {
- if (name == null) {
- return null;
- }
- String key = name.toLowerCase(Locale.US);
- List<MinimalField> list = this.fieldMap.get(key);
- if (list == null || list.isEmpty()) {
- return Collections.emptyList();
- } else {
- return new ArrayList<MinimalField>(list);
- }
- }
-
- public int removeFields(final String name) {
- if (name == null) {
- return 0;
- }
- String key = name.toLowerCase(Locale.US);
- List<MinimalField> 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<MinimalField> 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<MinimalField> 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<MinimalField> 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
+ * <http://www.apache.org/>.
+ *
+ */
+
+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<MinimalField> {
+
+ private final List<MinimalField> fields;
+ private final Map<String, List<MinimalField>> fieldMap;
+
+ public Header() {
+ super();
+ this.fields = new LinkedList<MinimalField>();
+ this.fieldMap = new HashMap<String, List<MinimalField>>();
+ }
+
+ public void addField(final MinimalField field) {
+ if (field == null) {
+ return;
+ }
+ String key = field.getName().toLowerCase(Locale.US);
+ List<MinimalField> values = this.fieldMap.get(key);
+ if (values == null) {
+ values = new LinkedList<MinimalField>();
+ this.fieldMap.put(key, values);
+ }
+ values.add(field);
+ this.fields.add(field);
+ }
+
+ public List<MinimalField> getFields() {
+ return new ArrayList<MinimalField>(this.fields);
+ }
+
+ public MinimalField getField(final String name) {
+ if (name == null) {
+ return null;
+ }
+ String key = name.toLowerCase(Locale.US);
+ List<MinimalField> list = this.fieldMap.get(key);
+ if (list != null && !list.isEmpty()) {
+ return list.get(0);
+ }
+ return null;
+ }
+
+ public List<MinimalField> getFields(final String name) {
+ if (name == null) {
+ return null;
+ }
+ String key = name.toLowerCase(Locale.US);
+ List<MinimalField> list = this.fieldMap.get(key);
+ if (list == null || list.isEmpty()) {
+ return Collections.emptyList();
+ } else {
+ return new ArrayList<MinimalField>(list);
+ }
+ }
+
+ public int removeFields(final String name) {
+ if (name == null) {
+ return 0;
+ }
+ String key = name.toLowerCase(Locale.US);
+ List<MinimalField> 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<MinimalField> 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<MinimalField> 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<MinimalField> iterator() {
+ return Collections.unmodifiableList(fields).iterator();
+ }
+
+ @Override
+ public String toString() {
+ return this.fields.toString();
+ }
+
+}
+
View
178 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
- * <http://www.apache.org/>.
- *
- */
-
-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 <code>TEXT</code>, <code>IMAGE</code>, <code>MULTIPART</code>
- * @see #getMimeType()
- * @return the MIME media type when content-type specified,
- * otherwise the correct default (<code>TEXT</code>)
- */
- 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 (<code>PLAIN</code>)
- */
- String getSubType();
-
- /**
- * <p>The body descriptors character set, defaulted appropriately for the MIME type.</p>
- * <p>
- * For <code>TEXT</code> types, this will be defaulted to <code>us-ascii</code>.
- * For other types, when the charset parameter is missing this property will be null.
- * </p>
- * @return Character set, which has been parsed from the
- * content-type definition. Not null for <code>TEXT</code> types, when unset will
- * be set to default <code>us-ascii</code>. 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
+ * <http://www.apache.org/>.
+ *
+ */
+
+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 <code>TEXT</code>, <code>IMAGE</code>, <code>MULTIPART</code>
+ * @see #getMimeType()
+ * @return the MIME media type when content-type specified,
+ * otherwise the correct default (<code>TEXT</code>)
+ */
+ 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 (<code>PLAIN</code>)
+ */
+ String getSubType();
+
+ /**
+ * <p>The body descriptors character set, defaulted appropriately for the MIME type.</p>
+ * <p>
+ * For <code>TEXT</code> types, this will be defaulted to <code>us-ascii</code>.
+ * For other types, when the charset parameter is missing this property will be null.
+ * </p>
+ * @return Character set, which has been parsed from the
+ * content-type definition. Not null for <code>TEXT</code> types, when unset will
+ * be set to default <code>us-ascii</code>. 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();
+
+}

0 comments on commit 4a7f330

Please sign in to comment.
Something went wrong with that request. Please try again.