From: <die...@us...> - 2010-08-31 16:09:19
|
Revision: 2961 http://openutils.svn.sourceforge.net/openutils/?rev=2961&view=rev Author: diego_schivo Date: 2010-08-31 16:09:12 +0000 (Tue, 31 Aug 2010) Log Message: ----------- formatting only Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporter.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporterException.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2010-08-31 16:05:19 UTC (rev 2960) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2010-08-31 16:09:12 UTC (rev 2961) @@ -133,7 +133,7 @@ ZipFile zip = new ZipFile(temp); ZipImporter importer = MediaEl.module().getZipimporter(); if (importer == null) - { // Fallback to the default if nothing is set. + { // Fallback to the default if nothing is set. importer = new DefaultZipImporter(); } importer.importFromZip(zip, parentPath); @@ -332,7 +332,9 @@ public String getMessage(String key, String arg) { - return super.getMsgs().get(key, new String[]{arg }); + return super.getMsgs().get(key, new String[]{ + arg + }); } /** Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java 2010-08-31 16:05:19 UTC (rev 2960) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java 2010-08-31 16:09:12 UTC (rev 2961) @@ -28,17 +28,19 @@ import org.apache.commons.lang.StringUtils; + /** * Default zip importer. Simply takes files in the provided zip file and store them in the media repository. - * * @author Danilo Ghirardelli */ -public class DefaultZipImporter implements ZipImporter { +public class DefaultZipImporter implements ZipImporter +{ /** * {@inheritDoc} */ - public void importFromZip(ZipFile zip, String parentPath) throws ZipImporterException { + public void importFromZip(ZipFile zip, String parentPath) throws ZipImporterException + { try { Enumeration< ? extends ZipEntry> entries = zip.entries(); Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporter.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporter.java 2010-08-31 16:05:19 UTC (rev 2960) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporter.java 2010-08-31 16:09:12 UTC (rev 2961) @@ -27,15 +27,14 @@ * images. Common cases are: - Title, description or other metadata are included in the media file name or folder. - * Metadata for all medias are included in a file (xml, txt) in the zip. - Metadata for the media is stored within the * zip file metadata. Implementing this interface you can cover any of the aforementioned cases. - * * @author Danilo Ghirardelli */ -public interface ZipImporter { +public interface ZipImporter +{ /** * Stores in the media repository the images found in the zip file. Implementing this method you have control over * the (eventual) metadata handling. - * * @param zipFile The file from request * @param parentPath Repo folder selected for storing the images. May be null. * @throws ZipImporterException Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporterException.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporterException.java 2010-08-31 16:05:19 UTC (rev 2960) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporterException.java 2010-08-31 16:09:12 UTC (rev 2961) @@ -23,7 +23,8 @@ * Exception for zip import. * @author Danilo Ghirardelli */ -public class ZipImporterException extends RuntimeException { +public class ZipImporterException extends RuntimeException +{ /** * Stable serialVersionUID. @@ -33,7 +34,8 @@ /** * @param message */ - public ZipImporterException(String message) { + public ZipImporterException(String message) + { super(message); } @@ -41,7 +43,8 @@ * @param message * @param cause */ - public ZipImporterException(String message, Throwable cause) { + public ZipImporterException(String message, Throwable cause) + { super(message, cause); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |