Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4343] magnoliamodules/trunk/openutils-mgnlmedia/src/ main/java/net/sourceforge/openutils/mgnlmedia/media
|
From: <luc...@us...> - 2013-09-26 13:23:42
|
Revision: 4343
http://openutils.svn.sourceforge.net/openutils/?rev=4343&view=rev
Author: lucaboati
Date: 2013-09-26 13:23:38 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
remove deprecations, content to node, setAttribute addAttribute removed
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2013-09-25 17:22:52 UTC (rev 4342)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2013-09-26 13:23:38 UTC (rev 4343)
@@ -19,25 +19,24 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
+import java.io.InputStream;
+
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.cms.core.search.QueryManager;
-import info.magnolia.cms.core.search.QueryResult;
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractTask;
import info.magnolia.module.delta.TaskExecutionException;
import it.openutils.mgnlutils.api.NodeUtilsExt;
-import java.util.Collection;
-
-import javax.jcr.Binary;
import javax.jcr.Node;
-import javax.jcr.Property;
-import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import javax.jcr.nodetype.NodeType;
+import org.apache.jackrabbit.value.BinaryValue;
+
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
@@ -70,7 +69,7 @@
{
try
{
- // [LB] FIXME
+ // [LB] FIXME?
Session hm = installContext.getJCRSession(MediaModule.REPO);
Criteria criteria = JCRCriteriaFactory
.createCriteria()
@@ -81,42 +80,37 @@
AdvancedResult result = criteria.execute();
for (AdvancedResultItem node : result.getItems())
{
- if (node.hasProperty("thumbnail"))
+ if (node.hasNode("thumbnail"))
{
- Property thumbnail = node.getProperty("thumbnail");
- if (thumbnail.getType() == PropertyType.BINARY)
+ Node thumbnail = node.getNode("thumbnail");
+ if (NodeUtil.isNodeType(thumbnail, NodeType.NT_RESOURCE))
{
- // [LB] FIXME
- NodeUtilsExt.setAttribute(
- thumbnail,
- "image",
+ Node image = node.addNode("image", NodeType.NT_RESOURCE);
+ InputStream stream = node.getProperty(MgnlNodeType.JCR_DATA).getValue().getBinary().getStream();
+ try
+ {
+ image.setProperty(MgnlNodeType.JCR_DATA, new BinaryValue(stream));
+ }
+ catch (RepositoryException e)
+ {
+ log.error(e.getMessage(), e);
+ }
+
+ image.setProperty(
FileProperties.PROPERTY_EXTENSION,
- NodeUtilsExt.getAttribute(thumbnail, FileProperties.PROPERTY_EXTENSION));
- NodeUtilsExt.setAttribute(
- thumbnail,
- "image",
+ PropertyUtil.getString(thumbnail, FileProperties.PROPERTY_EXTENSION));
+ image.setProperty(
FileProperties.PROPERTY_FILENAME,
- NodeUtilsExt.getAttribute(thumbnail, FileProperties.PROPERTY_FILENAME));
- NodeUtilsExt.setAttribute(
- thumbnail,
- "image",
- FileProperties.PROPERTY_CONTENTTYPE,
- NodeUtilsExt.getAttribute(thumbnail, FileProperties.PROPERTY_CONTENTTYPE));
- NodeUtilsExt.setAttribute(
- thumbnail,
- "image",
+ PropertyUtil.getString(thumbnail, FileProperties.PROPERTY_FILENAME));
+ image.setProperty(
FileProperties.PROPERTY_LASTMODIFIED,
- NodeUtilsExt.getAttribute(thumbnail, FileProperties.PROPERTY_LASTMODIFIED));
- NodeUtilsExt.setAttribute(
- thumbnail,
- "image",
+ PropertyUtil.getString(thumbnail, FileProperties.PROPERTY_LASTMODIFIED));
+ image.setProperty(
FileProperties.PROPERTY_WIDTH,
- NodeUtilsExt.getAttribute(thumbnail, FileProperties.PROPERTY_WIDTH));
- NodeUtilsExt.setAttribute(
- thumbnail,
- "image",
+ PropertyUtil.getString(thumbnail, FileProperties.PROPERTY_WIDTH));
+ image.setProperty(
FileProperties.PROPERTY_HEIGHT,
- NodeUtilsExt.getAttribute(thumbnail, FileProperties.PROPERTY_HEIGHT));
+ PropertyUtil.getString(thumbnail, FileProperties.PROPERTY_HEIGHT));
thumbnail.remove();
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-09-25 17:22:52 UTC (rev 4342)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-09-26 13:23:38 UTC (rev 4343)
@@ -314,52 +314,53 @@
if (media != null)
{
-
- Property res = null;
- if ("original".equals(resolution))
+ try
{
- res = PropertyUtil.getPropertyOrNull(media, "original");
- }
- else
- {
- Node resolutions = getResolutionsNode(media);
- if (resolutions != null)
+ Node res = null;
+ if ("original".equals(resolution))
{
- try
+ res = media.getNode("original");
+ }
+ else
+ {
+ Node resolutions = getResolutionsNode(media);
+ if (resolutions != null)
{
- if (resolutions.hasProperty(ImageUtils.getResolutionPath("res-" + resolution)))
+
+ if (resolutions.hasNode(ImageUtils.getResolutionPath("res-" + resolution)))
{
- res = resolutions.getProperty(ImageUtils.getResolutionPath("res-" + resolution));
+ res = resolutions.getNode(ImageUtils.getResolutionPath("res-" + resolution));
}
+
}
- catch (RepositoryException e)
- {
- // do nothing
- }
}
- }
- if (res != null)
- {
- return new int[]{
- NumberUtils.toInt(NodeUtilsExt.getAttribute(res, FileProperties.PROPERTY_WIDTH)),
- NumberUtils.toInt(NodeUtilsExt.getAttribute(res, FileProperties.PROPERTY_HEIGHT)) };
- }
- else
- {
- // MEDIA-231
- res = PropertyUtil.getPropertyOrNull(media, "original");
if (res != null)
{
- Point size = ImageUtils.parseForSize(resolution);
- if (NumberUtils.toInt(NodeUtilsExt.getAttribute(res, FileProperties.PROPERTY_WIDTH)) == size.x
- && NumberUtils.toInt(NodeUtilsExt.getAttribute(res, FileProperties.PROPERTY_HEIGHT)) == size.y)
+ return new int[]{
+ NumberUtils.toInt(PropertyUtil.getString(res, FileProperties.PROPERTY_WIDTH)),
+ NumberUtils.toInt(PropertyUtil.getString(res, FileProperties.PROPERTY_HEIGHT)) };
+ }
+ else
+ {
+ // MEDIA-231
+ res = media.getNode("original");
+ if (res != null)
{
- return new int[]{size.x, size.y };
+ Point size = ImageUtils.parseForSize(resolution);
+ if (NumberUtils.toInt(PropertyUtil.getString(res, FileProperties.PROPERTY_WIDTH)) == size.x
+ && NumberUtils.toInt(PropertyUtil.getString(res, FileProperties.PROPERTY_HEIGHT)) == size.y)
+ {
+ return new int[]{size.x, size.y };
+ }
}
+
}
-
}
+ catch (RepositoryException e)
+ {
+ // do nothing
+ }
}
return new int[]{-1, -1 };
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java 2013-09-25 17:22:52 UTC (rev 4342)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java 2013-09-26 13:23:38 UTC (rev 4343)
@@ -21,12 +21,12 @@
import info.magnolia.cms.beans.config.URI2RepositoryMapping;
import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.link.Link;
import it.openutils.mgnlutils.api.NodeUtilsExt;
import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
-import javax.jcr.Property;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
@@ -127,8 +127,8 @@
String ndName = StringUtils.substringBefore(handle.substring(p + search.length()), "/");
if (resolutionsNode != null && !StringUtils.isEmpty(ndName))
{
- Property nd = resolutionsNode.getProperty(ndName);
- String resolution = NodeUtilsExt.getAttribute(nd, "resolutionNotYetCreated");
+ Node nd = resolutionsNode.getNode(ndName);
+ String resolution = PropertyUtil.getString(nd, "resolutionNotYetCreated");
if (!StringUtils.isEmpty(resolution))
{
ImageUtils.checkOrCreateResolution(mediaNode, resolution, null);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
