You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2009/05/18 09:49:44 UTC
svn commit: r775849 -
/incubator/sling/trunk/bundles/commons/mime/src/main/java/org/apache/sling/commons/mime/internal/MimeTypeServiceImpl.java
Author: fmeschbe
Date: Mon May 18 07:49:44 2009
New Revision: 775849
URL: http://svn.apache.org/viewvc?rev=775849&view=rev
Log:
Code reorder and make an internal method private (was public)
Modified:
incubator/sling/trunk/bundles/commons/mime/src/main/java/org/apache/sling/commons/mime/internal/MimeTypeServiceImpl.java
Modified: incubator/sling/trunk/bundles/commons/mime/src/main/java/org/apache/sling/commons/mime/internal/MimeTypeServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/commons/mime/src/main/java/org/apache/sling/commons/mime/internal/MimeTypeServiceImpl.java?rev=775849&r1=775848&r2=775849&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/commons/mime/src/main/java/org/apache/sling/commons/mime/internal/MimeTypeServiceImpl.java (original)
+++ incubator/sling/trunk/bundles/commons/mime/src/main/java/org/apache/sling/commons/mime/internal/MimeTypeServiceImpl.java Mon May 18 07:49:44 2009
@@ -47,7 +47,8 @@
* @scr.component immediate="false" label="%mime.service.name"
* description="%mime.service.description"
* @scr.property name="service.vendor" value="The Apache Software Foundation"
- * @scr.property name="service.description" value="Apache Sling MIME Type Service"
+ * @scr.property name="service.description"
+ * value="Apache Sling MIME Type Service"
* @scr.service interface="org.apache.sling.commons.mime.MimeTypeService"
* @scr.reference name="MimeTypeProvider"
* interface="org.apache.sling.commons.mime.MimeTypeProvider"
@@ -61,7 +62,7 @@
/** @scr.property cardinality="-2147483647" type="String" */
private static final String PROP_MIME_TYPES = "mime.types";
-
+
/** @scr.reference cardinality="0..1" policy="dynamic" */
private LogService logService;
@@ -77,9 +78,8 @@
private ServiceRegistration webConsolePluginService;
- /**
- * @see org.apache.sling.commons.mime.MimeTypeService#getMimeType(java.lang.String)
- */
+ // --------- MimeTypeService interface
+
public String getMimeType(String name) {
if (name == null) {
return null;
@@ -99,9 +99,6 @@
return type;
}
- /**
- * @see org.apache.sling.commons.mime.MimeTypeService#getExtension(java.lang.String)
- */
public String getExtension(String mimeType) {
if (mimeType == null) {
return null;
@@ -120,15 +117,6 @@
return ext;
}
- public void registerMimeType(String line) {
- String[] parts = line.split("\\s+");
- if (parts.length > 1) {
- String[] extensions = new String[parts.length - 1];
- System.arraycopy(parts, 1, extensions, 0, extensions.length);
- this.registerMimeType(parts[0], extensions);
- }
- }
-
public void registerMimeType(String mimeType, String... extensions) {
if (mimeType == null || mimeType.length() == 0 || extensions == null
|| extensions.length == 0) {
@@ -188,58 +176,6 @@
}
}
- // ---------- internal -----------------------------------------------------
-
- private MimeTypeProvider[] getMimeTypeProviders() {
- MimeTypeProvider[] list = this.typeProviders;
-
- if (list == null) {
- synchronized (this.typeProviderList) {
- this.typeProviders = this.typeProviderList.toArray(new MimeTypeProvider[this.typeProviderList.size()]);
- list = this.typeProviders;
- }
- }
-
- return list;
- }
-
- private void registerMimeType(URL mimetypes) {
- if (mimetypes != null) {
- InputStream ins = null;
- try {
- ins = mimetypes.openStream();
- this.registerMimeType(ins);
- } catch (IOException ioe) {
- // log but don't actually care
- this.log(LogService.LOG_WARNING, "An error occurred reading "
- + mimetypes, ioe);
- } finally {
- if (ins != null) {
- try {
- ins.close();
- } catch (IOException ioe) {
- // ignore
- }
- }
- }
- }
- }
-
- private void log(int level, String message, Throwable t) {
- LogService log = this.logService;
- if (log != null) {
- log.log(level, message, t);
- } else {
- PrintStream out = (level == LogService.LOG_ERROR)
- ? System.err
- : System.out;
- out.println(message);
- if (t != null) {
- t.printStackTrace(out);
- }
- }
- }
-
// ---------- SCR implementation -------------------------------------------
protected void activate(ComponentContext context) {
@@ -268,7 +204,7 @@
registerMimeType(configType);
}
}
-
+
try {
MimeTypeWebConsolePlugin plugin = new MimeTypeWebConsolePlugin(this);
plugin.activate(context.getBundleContext());
@@ -330,4 +266,73 @@
Map<String, String> getExtensionMap() {
return extensionMap;
}
+
+ // ---------- internal -----------------------------------------------------
+
+ private MimeTypeProvider[] getMimeTypeProviders() {
+ MimeTypeProvider[] list = this.typeProviders;
+
+ if (list == null) {
+ synchronized (this.typeProviderList) {
+ this.typeProviders = this.typeProviderList.toArray(new MimeTypeProvider[this.typeProviderList.size()]);
+ list = this.typeProviders;
+ }
+ }
+
+ return list;
+ }
+
+ private void registerMimeType(URL mimetypes) {
+ if (mimetypes != null) {
+ InputStream ins = null;
+ try {
+ ins = mimetypes.openStream();
+ this.registerMimeType(ins);
+ } catch (IOException ioe) {
+ // log but don't actually care
+ this.log(LogService.LOG_WARNING, "An error occurred reading "
+ + mimetypes, ioe);
+ } finally {
+ if (ins != null) {
+ try {
+ ins.close();
+ } catch (IOException ioe) {
+ // ignore
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Splits the <code>line</code> on whitespace an registers the MIME type
+ * mappings provided the line contains more than one whitespace separated
+ * fields.
+ *
+ * @throws NullPointerException if <code>line</code> is <code>null</code>.
+ */
+ private void registerMimeType(String line) {
+ String[] parts = line.split("\\s+");
+ if (parts.length > 1) {
+ String[] extensions = new String[parts.length - 1];
+ System.arraycopy(parts, 1, extensions, 0, extensions.length);
+ this.registerMimeType(parts[0], extensions);
+ }
+ }
+
+ private void log(int level, String message, Throwable t) {
+ LogService log = this.logService;
+ if (log != null) {
+ log.log(level, message, t);
+ } else {
+ PrintStream out = (level == LogService.LOG_ERROR)
+ ? System.err
+ : System.out;
+ out.println(message);
+ if (t != null) {
+ t.printStackTrace(out);
+ }
+ }
+ }
+
}