Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[1779] trunk/openutils-mgnlmedia/src/main
|
From: <die...@us...> - 2010-02-03 07:56:35
|
Revision: 1779
http://openutils.svn.sourceforge.net/openutils/?rev=1779&view=rev
Author: diego_schivo
Date: 2010-02-03 07:56:27 +0000 (Wed, 03 Feb 2010)
Log Message:
-----------
MEDIA-64 i18n for mediainfo-details
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2010-02-03 07:37:21 UTC (rev 1778)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2010-02-03 07:56:27 UTC (rev 1779)
@@ -24,6 +24,7 @@
import info.magnolia.cms.util.NodeDataUtil;
import java.io.InputStream;
+import java.util.Map;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.utils.ImageUtils;
@@ -47,7 +48,7 @@
*/
private Logger log = LoggerFactory.getLogger(ImageTypeHandler.class);
- protected final String BITS_PER_PIXEL_ATTRIBUTE = "bitsPerPixel";
+ protected final String BIT_DEPTH_ATTRIBUTE = "bitDepth";
/**
* {@inheritDoc}
@@ -90,12 +91,12 @@
ii.setInput(stream);
if (ii.check()) {
Content originalAsNode = ContentUtil.getContent(media, BaseTypeHandler.ORGINAL_NODEDATA_NAME);
- NodeDataUtil.getOrCreateAndSet(originalAsNode, BITS_PER_PIXEL_ATTRIBUTE, ii.getBitsPerPixel());
+ NodeDataUtil.getOrCreateAndSet(originalAsNode, BIT_DEPTH_ATTRIBUTE, ii.getBitsPerPixel());
originalAsNode.save();
}
}
catch (Throwable e) {
- log.warn("Error determining bits-per-pixel "
+ log.warn("Error determining bit depth "
+ getOriginalFileNodeData(media).getHandle()
+ " "
+ e.getClass().getName()
@@ -108,4 +109,16 @@
return super.onPostSave(media);
}
+
+ @Override
+ public Map<String, String> getMediaInfo(Content media)
+ {
+ Map<String, String> info = super.getMediaInfo(media);
+
+ Content originalAsNode = ContentUtil.getContent(media, BaseTypeHandler.ORGINAL_NODEDATA_NAME);
+ long bitDepth = originalAsNode.getNodeData(BIT_DEPTH_ATTRIBUTE).getLong();
+ info.put("bitDepth", String.valueOf(bitDepth));
+
+ return info;
+ }
}
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-02-03 07:37:21 UTC (rev 1778)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2010-02-03 07:56:27 UTC (rev 1779)
@@ -20,7 +20,6 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.NodeData;
import java.io.InputStream;
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-03 07:37:21 UTC (rev 1778)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-03 07:56:27 UTC (rev 1779)
@@ -78,3 +78,7 @@
media.footer.text=SimpleMedia module version {0} by Openmind. <a href="http://www.openmindlab.com/lab/products/media/getsupport.html" target="blank">Need support?</a> <a href="http://www.openmindlab.com/lab/products/media/getsupport.html" target="blank">Want more?</a>
media.move.error.samenode=It is not allowed to move a node inside itself.
+
+media.info.size=Size
+media.info.bitDepth=Bit depth
+media.info.duration=Duration
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-02-03 07:37:21 UTC (rev 1778)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-02-03 07:56:27 UTC (rev 1779)
@@ -79,3 +79,7 @@
media.footer.text=SimpleMedia module versione {0} by Openmind. <a href="http://www.openmindlab.com/lab/products/media/getsupport.html" target="blank">Desideri supporto?</a> <a href="http://www.openmindlab.com/lab/products/media/getsupport.html" target="blank">Hai bisogno di altre funzionalit\u00E0?</a>
media.move.error.samenode=Non \u00E8 possibile spostare all'interno dello stesso nodo.
+
+media.info.size=Dimensione
+media.info.bitDepth=Profondit\u00E0 di colore
+media.info.duration=Durata
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-03 07:37:21 UTC (rev 1778)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-03 07:56:27 UTC (rev 1779)
@@ -259,7 +259,7 @@
<div class="details">
<#list media.mediaInfo?keys as key>
<#if key != 'extension' && key != 'width' && key != 'height'>
- ${key}: ${media.mediaInfo[key]}<br/>
+ ${this.msgs.get("media.info.${key}")}: ${media.mediaInfo[key]}<br/>
</#if>
</#list>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
