LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix für Ticket 379 

git-svn-id: https://svn.libreccm.org/ccm/trunk@972 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-06-19 08:22:06 +00:00
parent f16a543f86
commit c3e8aa14b3
2 changed files with 69 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ccm-cms/src/com/arsdigita/cms/ReusableImageAsset.java
View File

@ -54,7 +54,6 @@ public class ReusableImageAsset extends ImageAsset {
private static final Logger s_log = private static final Logger s_log =
Logger.getLogger(ReusableImageAsset.class); Logger.getLogger(ReusableImageAsset.class);
public static final String BASE_DATA_OBJECT_TYPE = public static final String BASE_DATA_OBJECT_TYPE =
"com.arsdigita.cms.ReusableImageAsset"; "com.arsdigita.cms.ReusableImageAsset";
@ -153,7 +152,8 @@ public class ReusableImageAsset extends ImageAsset {
// Guess mime type // Guess mime type
MimeType mime = MimeType.guessMimeTypeFromFile(fileName); MimeType mime = MimeType.guessMimeTypeFromFile(fileName);
if (s_log.isDebugEnabled()) { if (s_log.isDebugEnabled()) {
s_log.debug( "Mime type is " + ( null == mime ? "null" : mime.getMimeType() ) ); s_log.debug("Mime type is " + (null == mime ? "null" : mime.
getMimeType()));
} }
RenderedImage image = JAI.create("FileLoad", file.getPath()); RenderedImage image = JAI.create("FileLoad", file.getPath());
@ -217,17 +217,22 @@ public class ReusableImageAsset extends ImageAsset {
} }
} }
/** /**
* Retrieve all images in the database. Expensive operation. * Retrieve all images in the database. Expensive operation.
* *
* @return a collection of ReusableImageAssets * @return a collection of ReusableImageAssets
*/ */
public static ImageAssetCollection getAllReusableImages() { public static ImageAssetCollection getAllReusableImages() {
DataCollection da = SessionManager.getSession().retrieve DataCollection da = SessionManager.getSession().retrieve(
(BASE_DATA_OBJECT_TYPE); BASE_DATA_OBJECT_TYPE);
da.addEqualsFilter(VersionedACSObject.IS_DELETED, new Integer(0)); //da.addEqualsFilter(VersionedACSObject.IS_DELETED, new Integer(0));
da.addEqualsFilter(ACSObject.OBJECT_TYPE, BASE_DATA_OBJECT_TYPE); //da.addEqualsFilter(ACSObject.OBJECT_TYPE, BASE_DATA_OBJECT_TYPE);
da.addFilter(String.format("%s = '%s'",
VersionedACSObject.IS_DELETED,
"0"));
da.addFilter(String.format("%s = '%s'",
ACSObject.OBJECT_TYPE,
BASE_DATA_OBJECT_TYPE));
return new ImageAssetCollection(da); return new ImageAssetCollection(da);
} }
@ -240,8 +245,7 @@ public class ReusableImageAsset extends ImageAsset {
* @return a collection of images whose name matches the keyword * @return a collection of images whose name matches the keyword
*/ */
public static ImageAssetCollection getReusableImagesByKeyword( public static ImageAssetCollection getReusableImagesByKeyword(
String keyword, String context String keyword, String context) {
) {
ImageAssetCollection c = getAllReusableImages(); ImageAssetCollection c = getAllReusableImages();
c.addOrder(Asset.NAME); c.addOrder(Asset.NAME);
Filter f; Filter f;
@ -263,6 +267,4 @@ public class ReusableImageAsset extends ImageAsset {
public static ImageAssetCollection getReusableImagesByKeyword(String keyword) { public static ImageAssetCollection getReusableImagesByKeyword(String keyword) {
return getReusableImagesByKeyword(keyword, ContentItem.DRAFT); return getReusableImagesByKeyword(keyword, ContentItem.DRAFT);
} }
} }

13
ccm-cms/src/com/arsdigita/cms/ui/DefaultImageBrowserModelBuilder.java
View File

@ -44,11 +44,9 @@ public class DefaultImageBrowserModelBuilder extends LockableImpl
private SingleSelectionModel m_keywordModel; private SingleSelectionModel m_keywordModel;
private static ImageBrowserModel EMPTY_MODEL = private static ImageBrowserModel EMPTY_MODEL =
new EmptyImageBrowserModel(); new EmptyImageBrowserModel();
private ImageBrowser m_imageBrowser; private ImageBrowser m_imageBrowser;
private RequestLocal m_size; private RequestLocal m_size;
private RequestLocal m_imageColl; private RequestLocal m_imageColl;
private String m_context; private String m_context;
/** /**
@ -60,8 +58,7 @@ public class DefaultImageBrowserModelBuilder extends LockableImpl
* {@link ContentItem#DRAFT} or {@link ContentItem#LIVE} * {@link ContentItem#DRAFT} or {@link ContentItem#LIVE}
*/ */
public DefaultImageBrowserModelBuilder( public DefaultImageBrowserModelBuilder(
SingleSelectionModel keywordModel, String context SingleSelectionModel keywordModel, String context) {
) {
super(); super();
m_keywordModel = keywordModel; m_keywordModel = keywordModel;
m_context = context; m_context = context;
@ -87,7 +84,8 @@ public class DefaultImageBrowserModelBuilder extends LockableImpl
// pass through key even if null -- null key will return all rows in m_context. // pass through key even if null -- null key will return all rows in m_context.
//ImageAssetCollection c = ReusableImageAsset.getReusableImagesByKeyword(key, m_context); //ImageAssetCollection c = ReusableImageAsset.getReusableImagesByKeyword(key, m_context);
return new DefaultImageBrowserModel((ImageAssetCollection) m_imageColl.get(s)); return new DefaultImageBrowserModel((ImageAssetCollection) m_imageColl.
get(s));
} }
/** /**
@ -113,7 +111,8 @@ public class DefaultImageBrowserModelBuilder extends LockableImpl
if (size == null) { if (size == null) {
String key = (String) m_keywordModel.getSelectedKey(state); String key = (String) m_keywordModel.getSelectedKey(state);
ImageAssetCollection c = ReusableImageAsset.getReusableImagesByKeyword(key, m_context); ImageAssetCollection c = ReusableImageAsset.
getReusableImagesByKeyword(key, m_context);
if (c == null) { if (c == null) {
return 0; return 0;
} }
@ -133,6 +132,7 @@ public class DefaultImageBrowserModelBuilder extends LockableImpl
public void setImageBrowser(ImageBrowser ib) { public void setImageBrowser(ImageBrowser ib) {
m_imageBrowser = ib; m_imageBrowser = ib;
} }
/** /**
* Indicates whether the paginator should be visible, * Indicates whether the paginator should be visible,
* based on the visibility of the image browser itself. * based on the visibility of the image browser itself.
@ -143,5 +143,4 @@ public class DefaultImageBrowserModelBuilder extends LockableImpl
public boolean isVisible(PageState state) { public boolean isVisible(PageState state) {
return (m_imageBrowser != null) ? m_imageBrowser.isVisible(state) : true; return (m_imageBrowser != null) ? m_imageBrowser.isVisible(state) : true;
} }
} }