Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[3017] trunk/openutils-mgnlmedia/src
|
From: <fg...@us...> - 2010-09-10 08:42:00
|
Revision: 3017
http://openutils.svn.sourceforge.net/openutils/?rev=3017&view=rev
Author: fgiust
Date: 2010-09-10 08:41:52 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
formatting/cleanup
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
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/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BaseImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/RoundedCornersProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/FLVMedataUtils.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/RtmpMedatadaFetcher.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageProcessorsManagerMock.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -52,8 +52,12 @@
try
{
- ctx.put("media", BeansWrapper.getDefaultInstance().getStaticModels().get(
- net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl.class.getName()));
+ ctx.put(
+ "media",
+ BeansWrapper
+ .getDefaultInstance()
+ .getStaticModels()
+ .get(net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl.class.getName()));
}
catch (TemplateModelException e)
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -55,8 +55,12 @@
try
{
- ctx.put("media", BeansWrapper.getDefaultInstance().getStaticModels().get(
- net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl.class.getName()));
+ ctx.put(
+ "media",
+ BeansWrapper
+ .getDefaultInstance()
+ .getStaticModels()
+ .get(net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl.class.getName()));
}
catch (TemplateModelException e)
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -69,9 +69,11 @@
Messages msgs)
{
column.put("editor", "new Ed(new MediaField({}))");
- column.put("renderer", "function(v, p, record){ return v ? '<img border=\"0\" alt=\"\" src=\""
- + MgnlContext.getContextPath()
- + "/mediathumbnail/' + v + '\" />' : v; }");
+ column.put(
+ "renderer",
+ "function(v, p, record){ return v ? '<img border=\"0\" alt=\"\" src=\""
+ + MgnlContext.getContextPath()
+ + "/mediathumbnail/' + v + '\" />' : v; }");
}
/**
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -89,8 +89,10 @@
{
if (dateMatcher.find())
{
- cal.set(Integer.parseInt(dateMatcher.group(1)), Integer.parseInt(dateMatcher.group(2)), Integer
- .parseInt(dateMatcher.group(3)));
+ cal.set(
+ Integer.parseInt(dateMatcher.group(1)),
+ Integer.parseInt(dateMatcher.group(2)),
+ Integer.parseInt(dateMatcher.group(3)));
}
}
catch (Exception e)
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -54,7 +54,7 @@
criterionList.add(Restrictions.eq(META_DATA_MGNL_ACTIVATED, "true"));
}
- if(!values[0].equals("ALL") && "NOTPUB".equals(values[0]))
+ if (!values[0].equals("ALL") && "NOTPUB".equals(values[0]))
{
criterionList.add(Restrictions.eq(META_DATA_MGNL_ACTIVATED, false));
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -105,8 +105,10 @@
public AdvancedResult search(HttpServletRequest request, String mediaType, String path, boolean descendants,
String sorting, int itemsPerPage, int pageNumberStartingFromOne)
{
- Criteria c = JCRCriteriaFactory.createCriteria().setWorkspace(MediaModule.REPO).add(
- Restrictions.eq("@jcr:primaryType", MediaConfigurationManager.MEDIA.getSystemName()));
+ Criteria c = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(MediaModule.REPO)
+ .add(Restrictions.eq("@jcr:primaryType", MediaConfigurationManager.MEDIA.getSystemName()));
// base path
String searchPath = StringUtils.removeEnd(StringUtils.defaultString(path, defaultBasePath), "/")
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -150,14 +150,16 @@
Set<String> handles = new HashSet<String>();
QueryManager qm = MgnlContext.getQueryManager(uiw.getWorkspaceName());
- Query q = qm.createQuery("select * from nt:base where jcr:path like '"
- + uiw.getBasePath()
- + (StringUtils.endsWith(uiw.getBasePath(), "/") ? StringUtils.EMPTY : "/")
- + "%' and contains("
- + uiw.getPropertyName()
- + ", '"
- + mediaUUID
- + "')", Query.SQL);
+ Query q = qm.createQuery(
+ "select * from nt:base where jcr:path like '"
+ + uiw.getBasePath()
+ + (StringUtils.endsWith(uiw.getBasePath(), "/") ? StringUtils.EMPTY : "/")
+ + "%' and contains("
+ + uiw.getPropertyName()
+ + ", '"
+ + mediaUUID
+ + "')",
+ Query.SQL);
QueryResult qr = q.execute();
Collection<Content> qrNodes = qr.getContent(uiw.getNodeType());
if (qrNodes != null)
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -179,7 +179,7 @@
out.write("</div>\n"); //$NON-NLS-1$
out.write("<div style=\"position:absolute;top:-500px;left:-500px;visibility:hidden;\">\n<textarea id=\""); //$NON-NLS-1$
out.write(this.getName());
- out.write("_contentEmpty\">");//$NON-NLS-1$
+ out.write("_contentEmpty\">");
out.write(htmlContentEmpty);
// @todo should be escaped, but we need to test it
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -198,7 +198,7 @@
out.write("</div>\n"); //$NON-NLS-1$
out.write("<div style=\"position:absolute;top:-500px;left:-500px;visibility:hidden;\">\n<textarea id=\""); //$NON-NLS-1$
out.write(this.getName());
- out.write("_contentEmpty\">");//$NON-NLS-1$
+ out.write("_contentEmpty\">");
out.write(htmlContentEmpty);
// @todo should be escaped, but we need to test it
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -46,7 +46,6 @@
/**
* With {@link LayerDialog} allows to have a dialog in an Ext js layer.
- *
* @author molaschi
* @version $Id$
*/
@@ -174,12 +173,14 @@
log.error("error getting {}", control.getPath(), e);
return false;
}
- control.setNodeName(Path.getUniqueLabel(c, Path.getValidatedLabel(MediaConfigurationManager
- .getInstance()
- .getTypes()
- .get(type)
- .getHandler()
- .getNewNodeName(form, request))));
+ control.setNodeName(Path.getUniqueLabel(
+ c,
+ Path.getValidatedLabel(MediaConfigurationManager
+ .getInstance()
+ .getTypes()
+ .get(type)
+ .getHandler()
+ .getNewNodeName(form, request))));
}
return super.onPreSave(control);
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-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -323,7 +323,7 @@
{
this.zipFile = file;
}
-
+
/**
* {@inheritDoc}
*/
@@ -335,9 +335,7 @@
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/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -217,14 +217,10 @@
return 0;
}
// sorting must be specified for total-size to work (-1 otherwise)
- AdvancedResult typeResult = MediaEl.module().getSearch().search(
- request,
- type.getName(),
- path,
- false,
- getDefaultSorting(),
- 0,
- 1);
+ AdvancedResult typeResult = MediaEl
+ .module()
+ .getSearch()
+ .search(request, type.getName(), path, false, getDefaultSorting(), 0, 1);
return typeResult.getTotalSize();
}
@@ -245,14 +241,10 @@
}
writable = folder.isGranted(Permission.WRITE);
canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
- return MediaEl.module().getSearch().search(
- request,
- type,
- path,
- false,
- sorting,
- MediaEl.module().getFolderViewItemsPerPage(),
- page);
+ return MediaEl
+ .module()
+ .getSearch()
+ .search(request, type, path, false, sorting, MediaEl.module().getFolderViewItemsPerPage(), page);
}
/**
@@ -836,9 +828,7 @@
public String getMessage(String key, String param)
{
- return getMsgs().get(key, new String[]{
- param
- });
+ return getMsgs().get(key, new String[]{param });
}
/**
@@ -851,9 +841,7 @@
String s = request.getQueryString();
s = StringUtils.isEmpty(s) ? StringUtils.EMPTY : "&" + s;
int p1;
- while ((p1 = StringUtils.indexOfAny(s, new String[]{
- "&type=", "&command="
- })) != -1)
+ while ((p1 = StringUtils.indexOfAny(s, new String[]{"&type=", "&command=" })) != -1)
{
int p2 = s.indexOf('&', p1 + 1);
s = s.substring(0, p1) + (p2 != -1 ? s.substring(p2) : StringUtils.EMPTY);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -21,19 +21,12 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.cms.core.search.QueryResult;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
@@ -43,7 +36,6 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
-import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,19 +55,15 @@
*/
private Logger log = LoggerFactory.getLogger(MediaSearchPage.class);
- private static final String langs[] = new String[]{"it", "de", "fr", "en" };
-
private List<MediaTypeConfiguration> mtc;
private String type;
private String filename;
- private Map<String, Set<String>> tagsMap;
-
private String tags;
- private String paths[];
+ private String[] paths;
private String attributes;
@@ -120,37 +108,6 @@
log.error("Error retrieving root media node", ex);
}
- tagsMap = new HashMap<String, Set<String>>();
- try
- {
- Query q = mgr.getQueryManager().createQuery(
- "select * from " + MediaConfigurationManager.MEDIA.getSystemName(),
- Query.SQL);
- QueryResult qr = q.execute();
- Collection<Content> medias = qr.getContent(MediaConfigurationManager.MEDIA.getSystemName());
- for (Content media : medias)
- {
- for (String lang : langs)
- {
- String tagsNd = NodeDataUtil.getString(media, "tags-" + lang);
- if (!StringUtils.isEmpty(tagsNd))
- {
- Set<String> tagsLang = tagsMap.get(lang);
- if (tagsLang == null)
- {
- tagsLang = new TreeSet<String>();
- tagsMap.put(lang, tagsLang);
- }
- tagsLang.addAll(Arrays.asList(StringUtils.split(tagsNd, ",")));
- }
- }
- }
- }
- catch (RepositoryException ex)
- {
- log.error("Error retrieving tags", ex);
- }
-
return super.show();
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BaseImageResolutionProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BaseImageResolutionProcessor.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BaseImageResolutionProcessor.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -136,7 +136,8 @@
BufferedImage filled = ImageUtils.resizeImage(original, newX, y);
return cropCentered ? ImageUtils.cropImage(filled, (newX - x) / 2, 0, x, y) : filled;
}
- else // if (oDelta < delta)
+ else
+ // if (oDelta < delta)
{
int newY = (int) (x * oY / oX);
BufferedImage filled = ImageUtils.resizeImage(original, x, newY);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/RoundedCornersProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/RoundedCornersProcessor.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/RoundedCornersProcessor.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -39,7 +39,8 @@
* <li>int value: processor draws roundcorners with passed radius</li>
* </ul>
* If the "background" parameter is specified (hex color), it will be applied when rounding corners.<br/>
- * If no "background" parameter is found, if the image format is png a transparent background is applied else a white background is applied.
+ * If no "background" parameter is found, if the image format is png a transparent background is applied else a white
+ * background is applied.
* @author molaschi
* @version $Id: $
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -77,18 +77,24 @@
NodeData image = node.createNodeData("image", PropertyType.BINARY);
image.setValue(thumbnail.getStream());
- image.setAttribute(FileProperties.PROPERTY_EXTENSION, thumbnail
- .getAttribute(FileProperties.PROPERTY_EXTENSION));
- image.setAttribute(FileProperties.PROPERTY_FILENAME, thumbnail
- .getAttribute(FileProperties.PROPERTY_FILENAME));
- image.setAttribute(FileProperties.PROPERTY_CONTENTTYPE, thumbnail
- .getAttribute(FileProperties.PROPERTY_CONTENTTYPE));
- image.setAttribute(FileProperties.PROPERTY_LASTMODIFIED, thumbnail
- .getAttribute(FileProperties.PROPERTY_LASTMODIFIED));
- image.setAttribute(FileProperties.PROPERTY_WIDTH, thumbnail
- .getAttribute(FileProperties.PROPERTY_WIDTH));
- image.setAttribute(FileProperties.PROPERTY_HEIGHT, thumbnail
- .getAttribute(FileProperties.PROPERTY_HEIGHT));
+ image.setAttribute(
+ FileProperties.PROPERTY_EXTENSION,
+ thumbnail.getAttribute(FileProperties.PROPERTY_EXTENSION));
+ image.setAttribute(
+ FileProperties.PROPERTY_FILENAME,
+ thumbnail.getAttribute(FileProperties.PROPERTY_FILENAME));
+ image.setAttribute(
+ FileProperties.PROPERTY_CONTENTTYPE,
+ thumbnail.getAttribute(FileProperties.PROPERTY_CONTENTTYPE));
+ image.setAttribute(
+ FileProperties.PROPERTY_LASTMODIFIED,
+ thumbnail.getAttribute(FileProperties.PROPERTY_LASTMODIFIED));
+ image.setAttribute(
+ FileProperties.PROPERTY_WIDTH,
+ thumbnail.getAttribute(FileProperties.PROPERTY_WIDTH));
+ image.setAttribute(
+ FileProperties.PROPERTY_HEIGHT,
+ thumbnail.getAttribute(FileProperties.PROPERTY_HEIGHT));
thumbnail.delete();
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -480,14 +480,11 @@
{
return new int[]{
NumberUtils.toInt(res.getAttribute(FileProperties.PROPERTY_WIDTH)),
- NumberUtils.toInt(res.getAttribute(FileProperties.PROPERTY_HEIGHT))
- };
+ NumberUtils.toInt(res.getAttribute(FileProperties.PROPERTY_HEIGHT)) };
}
}
- return new int[]{
- -1, -1
- };
+ return new int[]{-1, -1 };
}
/**
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -185,8 +185,9 @@
{
if (e.getCause() instanceof ClassCastException)
{
- log.warn("Two conflicting versions of pdfbox are loaded, only one pdfbox jar version 1.x must be loaded in order to make thumbnail generation work. "
- + "Not generating preview for pdf document");
+ log
+ .warn("Two conflicting versions of pdfbox are loaded, only one pdfbox jar version 1.x must be loaded in order to make thumbnail generation work. "
+ + "Not generating preview for pdf document");
}
else
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -50,7 +50,8 @@
protected FLVMetaData parseFLVMetaData(Content media) throws Exception
{
InputStream stream = getOriginalFileNodeData(media).getStream();
- try {
+ try
+ {
return FLVMedataUtils.parseFLVfromStream(stream);
}
finally
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/FLVMedataUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/FLVMedataUtils.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/FLVMedataUtils.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -302,7 +302,9 @@
if (source[i] != first)
{
while (++i <= max && source[i] != first)
+ {
;
+ }
}
/* Found first character, now look at the rest of v2 */
@@ -311,7 +313,9 @@
int j = i + 1;
int end = j + target.length - 1;
for (int k = 1; j < end && source[j] == target[k]; j++, k++)
+ {
;
+ }
if (j == end)
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -428,8 +428,9 @@
nd.setAttribute(FileProperties.PROPERTY_EXTENSION, outputformat);
nd.setAttribute(FileProperties.PROPERTY_FILENAME, saveTo.getName());
nd.setAttribute(FileProperties.PROPERTY_CONTENTTYPE, mimetype);
- nd.setAttribute(FileProperties.PROPERTY_LASTMODIFIED, GregorianCalendar.getInstance(TimeZone
- .getDefault()));
+ nd.setAttribute(
+ FileProperties.PROPERTY_LASTMODIFIED,
+ GregorianCalendar.getInstance(TimeZone.getDefault()));
nd.setAttribute(FileProperties.PROPERTY_WIDTH, "" + image.getWidth());
nd.setAttribute(FileProperties.PROPERTY_HEIGHT, "" + image.getHeight());
@@ -895,11 +896,10 @@
if (ImageProcessorsManager.getInstance().isValidControlChar(controlChar))
{
- img = ImageProcessorsManager.getInstance().getImageResolutionProcessor(controlChar).getImageForResolution(
- original,
- size.x,
- size.y,
- params);
+ img = ImageProcessorsManager
+ .getInstance()
+ .getImageResolutionProcessor(controlChar)
+ .getImageForResolution(original, size.x, size.y, params);
}
else if (controlChar < '0' || controlChar > '9')
{
@@ -907,11 +907,10 @@
}
else
{
- img = ImageProcessorsManager.getInstance().getDefaultImageResolutionProcessor().getImageForResolution(
- original,
- size.x,
- size.y,
- params);
+ img = ImageProcessorsManager
+ .getInstance()
+ .getDefaultImageResolutionProcessor()
+ .getImageForResolution(original, size.x, size.y, params);
}
for (ImagePostProcessor ipp : ImageProcessorsManager.getInstance().getImagePostProcessorsList())
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/RtmpMedatadaFetcher.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/RtmpMedatadaFetcher.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/RtmpMedatadaFetcher.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -45,7 +45,9 @@
/**
- * <p>Utility class to fetch flv headers from a rtmp URL using flazr (http://flazr.com)</p>
+ * <p>
+ * Utility class to fetch flv headers from a rtmp URL using flazr (http://flazr.com)
+ * </p>
* @author fgiust
* @version $Id$
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -202,9 +202,10 @@
.getI18nSupport()
.getNodeData(media, "title")
.getString());
- entry.setDescription(I18nContentSupportFactory.getI18nSupport().getNodeData(
- media,
- "description").getString());
+ entry.setDescription(I18nContentSupportFactory
+ .getI18nSupport()
+ .getNodeData(media, "description")
+ .getString());
entry
.setTags(I18nContentSupportFactory.getI18nSupport().getNodeData(media, "tags").getString());
entries.add(entry);
@@ -213,9 +214,7 @@
{
log.warn(
"Node {} referenced by entry {} of playlist {} does not exist in media repository",
- new Object[]{
- mediaUUID, subNode.getName(), playlist.getHandle()
- });
+ new Object[]{mediaUUID, subNode.getName(), playlist.getHandle() });
}
}
playlist.setEntries(entries);
Modified: trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageProcessorsManagerMock.java
===================================================================
--- trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageProcessorsManagerMock.java 2010-09-09 21:27:36 UTC (rev 3016)
+++ trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageProcessorsManagerMock.java 2010-09-10 08:41:52 UTC (rev 3017)
@@ -19,8 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.utils;
-import org.apache.commons.lang.ArrayUtils;
-
import net.sourceforge.openutils.mgnlmedia.media.configuration.ImageProcessorsManager;
import net.sourceforge.openutils.mgnlmedia.media.processors.FitInAndFillWithBandsImageResolutionProcessor;
import net.sourceforge.openutils.mgnlmedia.media.processors.FitInImageResolutionProcessor;
@@ -28,7 +26,9 @@
import net.sourceforge.openutils.mgnlmedia.media.processors.ResizeCropCenteredImageResolutionProcessor;
import net.sourceforge.openutils.mgnlmedia.media.processors.ResizeNoCropImageResolutionProcessor;
+import org.apache.commons.lang.ArrayUtils;
+
/**
* @author molaschi
* @version $Id: $
@@ -36,7 +36,7 @@
public class ImageProcessorsManagerMock extends ImageProcessorsManager
{
- private final char controlChars[] = new char[]{'o', 'b', 'l', '<', 'x' };
+ private final char[] controlChars = new char[]{'o', 'b', 'l', '<', 'x' };
/**
* {@inheritDoc}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
