projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work on image support.
[lgpl/argeo-commons.git]
/
org.argeo.cms.ui
/
src
/
org
/
argeo
/
cms
/
ui
/
util
/
DefaultImageManager.java
diff --git
a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java
b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java
index 1c6f7198413942206a04c5694a06b5073e0036b1..4c1a731084ad87225df154133cc6158769231886 100644
(file)
--- a/
org.argeo.cms.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java
+++ b/
org.argeo.cms.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java
@@
-118,7
+118,7
@@
public class DefaultImageManager implements CmsImageManager {
public Point getImageSize(Node node) throws RepositoryException {
// TODO optimise
Image image = getSwtImage(node);
public Point getImageSize(Node node) throws RepositoryException {
// TODO optimise
Image image = getSwtImage(node);
- return new Point(image.getBounds().width,image.getBounds().height);
+ return new Point(image.getBounds().width,
image.getBounds().height);
}
/** @return null if not available */
}
/** @return null if not available */
@@
-203,7
+203,8
@@
public class DefaultImageManager implements CmsImageManager {
}
@Override
}
@Override
- public String uploadImage(Node parentNode, String fileName, InputStream in) throws RepositoryException {
+ public String uploadImage(Node parentNode, String fileName, InputStream in, String contentType)
+ throws RepositoryException {
InputStream inputStream = null;
try {
String previousResourceName = null;
InputStream inputStream = null;
try {
String previousResourceName = null;
@@
-222,8
+223,9
@@
public class DefaultImageManager implements CmsImageManager {
ImageData id = new ImageData(inputStream);
processNewImageFile(fileNode, id);
ImageData id = new ImageData(inputStream);
processNewImageFile(fileNode, id);
- String mime = Files.probeContentType(Paths.get(fileName));
- fileNode.setProperty(Property.JCR_MIMETYPE, mime);
+ String mime = contentType != null ? contentType : Files.probeContentType(Paths.get(fileName));
+ if (mime != null)
+ fileNode.setProperty(Property.JCR_MIMETYPE, mime);
fileNode.getSession().save();
// reset resource manager
fileNode.getSession().save();
// reset resource manager
@@
-241,7
+243,7
@@
public class DefaultImageManager implements CmsImageManager {
}
}
}
}
- /** Does nothi
gn
by default. */
+ /** Does nothi
ng
by default. */
protected void processNewImageFile(Node fileNode, ImageData id) throws RepositoryException, IOException {
}
}
protected void processNewImageFile(Node fileNode, ImageData id) throws RepositoryException, IOException {
}
}