You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2009/09/11 08:48:11 UTC
svn commit: r813677 - in /turbine/fulcrum/trunk/mimetype/src:
java/org/apache/fulcrum/mimetype/ java/org/apache/fulcrum/mimetype/util/
test/org/apache/fulcrum/mimetype/ test/org/apache/fulcrum/mimetype/util/
Author: tv
Date: Fri Sep 11 06:48:11 2009
New Revision: 813677
URL: http://svn.apache.org/viewvc?rev=813677&view=rev
Log:
Fixed some Javadoc errors and compiler warnings
Modified:
turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/DefaultMimeTypeService.java
turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeType.java
turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeTypeMap.java
turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeTypeMapper.java
turbine/fulcrum/trunk/mimetype/src/test/org/apache/fulcrum/mimetype/MimetypeTest.java
turbine/fulcrum/trunk/mimetype/src/test/org/apache/fulcrum/mimetype/util/MimeTypeMapperTest.java
Modified: turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/DefaultMimeTypeService.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/DefaultMimeTypeService.java?rev=813677&r1=813676&r2=813677&view=diff
==============================================================================
--- turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/DefaultMimeTypeService.java (original)
+++ turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/DefaultMimeTypeService.java Fri Sep 11 06:48:11 2009
@@ -30,7 +30,6 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.fulcrum.mimetype.util.CharSetMap;
import org.apache.fulcrum.mimetype.util.MimeType;
import org.apache.fulcrum.mimetype.util.MimeTypeMap;
@@ -83,13 +82,13 @@
* The charset map used by the service.
*/
private CharSetMap charSetMap;
- /** The Avalon Context */
- private Context context = null;
+
/**
* Constructs a new service.
*/
public DefaultMimeTypeService()
{
+ // empty
}
/**
* Sets a MIME content type mapping to extensions to the map.
@@ -170,7 +169,7 @@
* Gets the default file name extension for a MIME type.
* Note that the mappers are called in the reverse order.
*
- * @param mime the MIME type as a string.
+ * @param type the MIME type as a string.
* @return the file name extension or null.
*/
public String getDefaultExtension(String type)
@@ -325,7 +324,6 @@
*/
public void contextualize(Context context) throws ContextException
{
- this.context = context;
this.applicationRoot = context.get( "urn:avalon:home" ).toString();
}
Modified: turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeType.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeType.java?rev=813677&r1=813676&r2=813677&view=diff
==============================================================================
--- turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeType.java (original)
+++ turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeType.java Fri Sep 11 06:48:11 2009
@@ -131,8 +131,8 @@
/**
* Constructs a new MIME type by parsing a specification string.
*
- * @parameter spec a string representing a MIME type.
- * @throws IllegalArgument for parsing errors.
+ * @param spec a string representing a MIME type.
+ * @throws IllegalArgumentException for parsing errors.
*/
public MimeType(String spec)
{
@@ -170,7 +170,7 @@
while ((start < length) &&
((look = spec.charAt(start)) != '/'))
{
- sb.append((char) look);
+ sb.append(look);
start++;
}
if (look != '/')
@@ -187,7 +187,7 @@
((look = spec.charAt(start)) != ';') &&
!Character.isWhitespace(look))
{
- sb.append((char) look);
+ sb.append(look);
start++;
}
mimeSubtype = sb.toString();
@@ -223,7 +223,7 @@
((look=spec.charAt(start)) != '=') &&
!Character.isWhitespace(look))
{
- sb.append(Character.toLowerCase((char) look));
+ sb.append(Character.toLowerCase(look));
start++ ;
}
String name = sb.toString();
@@ -257,7 +257,7 @@
((delim == '"') ||
!Character.isWhitespace(look)))
{
- sb.append((char) look);
+ sb.append(look);
start++;
}
while ((start < length) &&
@@ -470,7 +470,7 @@
*
* @param params an array of parameter names.
* @param values an array of parameter values.
- * @throw IllegalArgumentException for incorrect parameters.
+ * @throws IllegalArgumentException for incorrect parameters.
*/
public synchronized void addParameters(String[] params,
String[] values)
Modified: turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeTypeMap.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeTypeMap.java?rev=813677&r1=813676&r2=813677&view=diff
==============================================================================
--- turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeTypeMap.java (original)
+++ turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeTypeMap.java Fri Sep 11 06:48:11 2009
@@ -114,7 +114,7 @@
* Loads mappings from a file path.
*
* @param path a file path.
- * @returns the mappings.
+ * @return the mappings.
* @throws IOException for an incorrect file.
*/
protected static MimeTypeMapper loadPath(String path)
@@ -203,7 +203,7 @@
/**
* Contructs a MIME type map read from a file.
*
- * @param path an input file.
+ * @param file an input file.
* @throws IOException for an incorrect input file.
*/
public MimeTypeMap(File file)
Modified: turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeTypeMapper.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeTypeMapper.java?rev=813677&r1=813676&r2=813677&view=diff
==============================================================================
--- turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeTypeMapper.java (original)
+++ turbine/fulcrum/trunk/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeTypeMapper.java Fri Sep 11 06:48:11 2009
@@ -151,7 +151,7 @@
/**
* Gets a file name extension corresponding to a specified MIME content type.
*
- * @param mime a MIME type as a string.
+ * @param type a MIME type as a string.
* @return the corresponding file name extension or null.
*/
public String getExtension(String type)
Modified: turbine/fulcrum/trunk/mimetype/src/test/org/apache/fulcrum/mimetype/MimetypeTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/src/test/org/apache/fulcrum/mimetype/MimetypeTest.java?rev=813677&r1=813676&r2=813677&view=diff
==============================================================================
--- turbine/fulcrum/trunk/mimetype/src/test/org/apache/fulcrum/mimetype/MimetypeTest.java (original)
+++ turbine/fulcrum/trunk/mimetype/src/test/org/apache/fulcrum/mimetype/MimetypeTest.java Fri Sep 11 06:48:11 2009
@@ -27,7 +27,7 @@
import org.apache.fulcrum.mimetype.util.MimeTypeMapperTest;
/**
- * Tests for {@link TurbineMimeTypeService}.
+ * Tests for {@link DefaultMimeTypeService}.
*
* @author <a href="paulsp@apache.org">Paul Spencer</a>
* @author <a href="epugh@upstate.com">Eric Pugh</a>
Modified: turbine/fulcrum/trunk/mimetype/src/test/org/apache/fulcrum/mimetype/util/MimeTypeMapperTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/src/test/org/apache/fulcrum/mimetype/util/MimeTypeMapperTest.java?rev=813677&r1=813676&r2=813677&view=diff
==============================================================================
--- turbine/fulcrum/trunk/mimetype/src/test/org/apache/fulcrum/mimetype/util/MimeTypeMapperTest.java (original)
+++ turbine/fulcrum/trunk/mimetype/src/test/org/apache/fulcrum/mimetype/util/MimeTypeMapperTest.java Fri Sep 11 06:48:11 2009
@@ -22,11 +22,11 @@
import junit.framework.TestCase;
/**
+ * Tests for the MimeTypeMapper
+ *
* @author Eric Pugh
* @author Daniel Rall
*
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
*/
public class MimeTypeMapperTest extends TestCase
{