Author: snoopdave
Date: Mon Sep 7 16:48:11 2009
New Revision: 812224
URL: http://svn.apache.org/viewvc?rev=812224&view=rev
Log:
fixing formatting only
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBean.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBean.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java?rev=812224&r1=812223&r2=812224&view=diff
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
Mon Sep 7 16:48:11 2009
@@ -15,7 +15,6 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-
package org.apache.roller.weblogger.ui.struts2.editor;
import java.util.ArrayList;
@@ -39,57 +38,54 @@
*/
@SuppressWarnings("serial")
public class MediaFileBase extends UIAction {
- private static Log log = LogFactory.getLog(MediaFileBase.class);
+ private static Log log = LogFactory.getLog(MediaFileBase.class);
private String[] selectedMediaFiles;
private String selectedDirectory;
private String mediaFileId;
-
private List<MediaFileDirectory> allDirectories;
-
private boolean overlayMode;
-
+
/**
* Deletes media file
*/
protected void doDeleteMediaFile() {
-
- try {
- log.debug("Processing delete of file id - " +
this.mediaFileId);
- MediaFileManager manager =
WebloggerFactory.getWeblogger().getMediaFileManager();
- MediaFile mediaFile =
manager.getMediaFile(this.mediaFileId);
- manager.removeMediaFile(getActionWeblog(), mediaFile);
- // flush changes
- WebloggerFactory.getWeblogger().flush();
- addMessage("mediaFile.delete.success");
- } catch (WebloggerException e) {
+
+ try {
+ log.debug("Processing delete of file id - " + this.mediaFileId);
+ MediaFileManager manager =
WebloggerFactory.getWeblogger().getMediaFileManager();
+ MediaFile mediaFile = manager.getMediaFile(this.mediaFileId);
+ manager.removeMediaFile(getActionWeblog(), mediaFile);
+ // flush changes
+ WebloggerFactory.getWeblogger().flush();
+ addMessage("mediaFile.delete.success");
+ } catch (WebloggerException e) {
log.error("Error deleting media file", e);
// TODO: i18n
addError("Error deleting media file - " + this.mediaFileId);
- }
+ }
}
-
+
/**
* Shares media file for public gallery
*/
protected void doIncludeMediaFileInGallery() {
-
- try {
- log.debug("Processing include-in-gallery of file id - "
+ this.mediaFileId);
- MediaFileManager manager =
WebloggerFactory.getWeblogger().getMediaFileManager();
- MediaFile mediaFile =
manager.getMediaFile(this.mediaFileId);
- mediaFile.setSharedForGallery(true);
- manager.updateMediaFile(getActionWeblog(), mediaFile);
- // flush changes
- WebloggerFactory.getWeblogger().flush();
- addMessage("mediaFile.includeInGallery.success");
- } catch (WebloggerException e) {
+
+ try {
+ log.debug("Processing include-in-gallery of file id - " +
this.mediaFileId);
+ MediaFileManager manager =
WebloggerFactory.getWeblogger().getMediaFileManager();
+ MediaFile mediaFile = manager.getMediaFile(this.mediaFileId);
+ mediaFile.setSharedForGallery(true);
+ manager.updateMediaFile(getActionWeblog(), mediaFile);
+ // flush changes
+ WebloggerFactory.getWeblogger().flush();
+ addMessage("mediaFile.includeInGallery.success");
+ } catch (WebloggerException e) {
log.error("Error including media file in gallery", e);
// TODO: i18n
addError("Error including media file in gallery - " +
this.mediaFileId);
- }
+ }
}
-
/**
* Delete selected media files.
@@ -97,54 +93,52 @@
protected void doDeleteSelected() {
String[] fileIds = getSelectedMediaFiles();
if (fileIds != null && fileIds.length > 0) {
- try {
- log.debug("Processing delete of " +
fileIds.length + " media files.");
- MediaFileManager manager =
WebloggerFactory.getWeblogger().getMediaFileManager();
- for (int index = 0; index < fileIds.length;
index++) {
- log.debug("Deleting media file - " +
fileIds[index]);
- MediaFile mediaFile =
manager.getMediaFile(fileIds[index]);
- manager.removeMediaFile(getActionWeblog(),
mediaFile);
- }
- // flush changes
- WebloggerFactory.getWeblogger().flush();
- addMessage("mediaFile.delete.success");
- } catch (WebloggerException e) {
- log.error("Error deleting selected media files", e);
+ try {
+ log.debug("Processing delete of " + fileIds.length + " media
files.");
+ MediaFileManager manager =
WebloggerFactory.getWeblogger().getMediaFileManager();
+ for (int index = 0; index < fileIds.length; index++) {
+ log.debug("Deleting media file - " + fileIds[index]);
+ MediaFile mediaFile = manager.getMediaFile(fileIds[index]);
+ manager.removeMediaFile(getActionWeblog(), mediaFile);
+ }
+ // flush changes
+ WebloggerFactory.getWeblogger().flush();
+ addMessage("mediaFile.delete.success");
+ } catch (WebloggerException e) {
+ log.error("Error deleting selected media files", e);
// TODO: i18n
addError("Error deleting selected media files");
- }
- }
- else {
- addError("mediaFile.error.noneSelectedForDelete");
+ }
+ } else {
+ addError("mediaFile.error.noneSelectedForDelete");
}
}
-
+
/**
* Move selected media files to a directory.
*/
protected void doMoveSelected() {
String[] fileIds = getSelectedMediaFiles();
if (fileIds != null && fileIds.length > 0) {
- try {
- log.debug("Processing move of " +
fileIds.length + " media files.");
- MediaFileManager manager =
WebloggerFactory.getWeblogger().getMediaFileManager();
- MediaFileDirectory targetDirectory =
manager.getMediaFileDirectory(this.selectedDirectory);
- for (int index = 0; index < fileIds.length;
index++) {
- log.debug("Moving media file - " +
fileIds[index] + " to directory - " + this.selectedDirectory);
- MediaFile mediaFile =
manager.getMediaFile(fileIds[index]);
- manager.moveMediaFile(mediaFile,
targetDirectory);
- }
- // flush changes
- WebloggerFactory.getWeblogger().flush();
- addMessage("mediaFile.move.success");
- } catch (WebloggerException e) {
- log.error("Error moving selected media files", e);
+ try {
+ log.debug("Processing move of " + fileIds.length + " media
files.");
+ MediaFileManager manager =
WebloggerFactory.getWeblogger().getMediaFileManager();
+ MediaFileDirectory targetDirectory =
manager.getMediaFileDirectory(this.selectedDirectory);
+ for (int index = 0; index < fileIds.length; index++) {
+ log.debug("Moving media file - " + fileIds[index] + " to
directory - " + this.selectedDirectory);
+ MediaFile mediaFile = manager.getMediaFile(fileIds[index]);
+ manager.moveMediaFile(mediaFile, targetDirectory);
+ }
+ // flush changes
+ WebloggerFactory.getWeblogger().flush();
+ addMessage("mediaFile.move.success");
+ } catch (WebloggerException e) {
+ log.error("Error moving selected media files", e);
// TODO: i18n
addError("Error moving selected media files");
- }
- }
- else {
- addError("mediaFile.error.noneSelectedForMove");
+ }
+ } else {
+ addError("mediaFile.error.noneSelectedForMove");
}
}
@@ -163,53 +157,52 @@
log.error("Error looking up media file directories", ex);
}
}
-
+
/**
* Constructs the external URL for a given media file
*/
protected String getMediaFileURL(MediaFile mediaFile) {
- return getSiteURL() + "/roller-ui/rendering/media-resources/" +
mediaFile.getId();
+ return getSiteURL() + "/roller-ui/rendering/media-resources/" +
mediaFile.getId();
+ }
+
+ public String[] getSelectedMediaFiles() {
+ return selectedMediaFiles;
}
- public String[] getSelectedMediaFiles() {
- return selectedMediaFiles;
- }
-
- public void setSelectedMediaFiles(String[] selectedMediaFiles) {
- this.selectedMediaFiles = selectedMediaFiles;
- }
-
- public String getSelectedDirectory() {
- return selectedDirectory;
- }
-
- public void setSelectedDirectory(String selectedDirectory) {
- this.selectedDirectory = selectedDirectory;
- }
-
-
- public List<MediaFileDirectory> getAllDirectories() {
- return allDirectories;
- }
-
- public void setAllDirectories(List<MediaFileDirectory> allDirectories) {
- this.allDirectories = allDirectories;
- }
-
- public String getMediaFileId() {
- return mediaFileId;
- }
-
- public void setMediaFileId(String mediaFileId) {
- this.mediaFileId = mediaFileId;
- }
-
- public boolean isOverlayMode() {
- return overlayMode;
-
- }
-
- public void setOverlayMode(boolean mode) {
- this.overlayMode = mode;
- }
+ public void setSelectedMediaFiles(String[] selectedMediaFiles) {
+ this.selectedMediaFiles = selectedMediaFiles;
+ }
+
+ public String getSelectedDirectory() {
+ return selectedDirectory;
+ }
+
+ public void setSelectedDirectory(String selectedDirectory) {
+ this.selectedDirectory = selectedDirectory;
+ }
+
+ public List<MediaFileDirectory> getAllDirectories() {
+ return allDirectories;
+ }
+
+ public void setAllDirectories(List<MediaFileDirectory> allDirectories) {
+ this.allDirectories = allDirectories;
+ }
+
+ public String getMediaFileId() {
+ return mediaFileId;
+ }
+
+ public void setMediaFileId(String mediaFileId) {
+ this.mediaFileId = mediaFileId;
+ }
+
+ public boolean isOverlayMode() {
+ return overlayMode;
+
+ }
+
+ public void setOverlayMode(boolean mode) {
+ this.overlayMode = mode;
+ }
}
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBean.java?rev=812224&r1=812223&r2=812224&view=diff
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBean.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBean.java
Mon Sep 7 16:48:11 2009
@@ -15,7 +15,6 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-
package org.apache.roller.weblogger.ui.struts2.editor;
import java.util.HashSet;
@@ -25,133 +24,115 @@
import org.apache.roller.weblogger.pojos.MediaFile;
import org.apache.roller.weblogger.pojos.MediaFileTag;
-
/**
* Bean for managing media file.
*/
public class MediaFileBean {
-
+
String id;
- String name;
+ String name;
String description;
String copyrightText;
String tags;
String directoryId;
boolean isSharedForGallery;
- public String getName() {
- return name;
- }
-
-
- public void setName(String name) {
- this.name = name;
- }
-
-
- public String getDescription() {
- return description;
- }
-
-
- public void setDescription(String description) {
- this.description = description;
- }
-
-
- public String getCopyrightText() {
- return copyrightText;
- }
-
-
- public void setCopyrightText(String copyrightText) {
- this.copyrightText = copyrightText;
- }
-
-
- public String getTags() {
- return tags;
- }
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
- public void setTags(String tags) {
- this.tags = tags;
- }
+ public String getDescription() {
+ return description;
+ }
+ public void setDescription(String description) {
+ this.description = description;
+ }
- public String getDirectoryId() {
- return directoryId;
- }
+ public String getCopyrightText() {
+ return copyrightText;
+ }
+ public void setCopyrightText(String copyrightText) {
+ this.copyrightText = copyrightText;
+ }
- public void setDirectoryId(String directoryId) {
- this.directoryId = directoryId;
- }
+ public String getTags() {
+ return tags;
+ }
+ public void setTags(String tags) {
+ this.tags = tags;
+ }
- public boolean isSharedForGallery() {
- return isSharedForGallery;
- }
+ public String getDirectoryId() {
+ return directoryId;
+ }
+ public void setDirectoryId(String directoryId) {
+ this.directoryId = directoryId;
+ }
- public void setSharedForGallery(boolean isSharedForGallery) {
- this.isSharedForGallery = isSharedForGallery;
- }
+ public boolean isSharedForGallery() {
+ return isSharedForGallery;
+ }
+ public void setSharedForGallery(boolean isSharedForGallery) {
+ this.isSharedForGallery = isSharedForGallery;
+ }
- public String getId() {
- return id;
- }
+ public String getId() {
+ return id;
+ }
+ public void setId(String id) {
+ this.id = id;
+ }
- public void setId(String id) {
- this.id = id;
- }
-
-
/**
* Copies the contents of this bean to a media file object
*
*/
- public void copyTo(MediaFile dataHolder) throws WebloggerException {
-
- dataHolder.setName(this.name);
- dataHolder.setDescription(this.description);
- dataHolder.setCopyrightText(this.copyrightText);
-
- Set<MediaFileTag> tagsSet = new HashSet<MediaFileTag>();
- for (String tag: this.tags.split(" ")) {
- tagsSet.add(new MediaFileTag(tag, dataHolder));
- }
- dataHolder.setTags(tagsSet);
- dataHolder.setSharedForGallery(this.isSharedForGallery);
+ public void copyTo(MediaFile dataHolder) throws WebloggerException {
+
+ dataHolder.setName(this.name);
+ dataHolder.setDescription(this.description);
+ dataHolder.setCopyrightText(this.copyrightText);
+
+ Set<MediaFileTag> tagsSet = new HashSet<MediaFileTag>();
+ for (String tag : this.tags.split(" ")) {
+ tagsSet.add(new MediaFileTag(tag, dataHolder));
+ }
+ dataHolder.setTags(tagsSet);
+ dataHolder.setSharedForGallery(this.isSharedForGallery);
}
-
-
+
/**
* Populates this bean from a media file object.
*
*/
public void copyFrom(MediaFile dataHolder) {
- this.setId(dataHolder.getId());
- this.setName(dataHolder.getName());
- this.setDescription(dataHolder.getDescription());
- this.setCopyrightText(dataHolder.getCopyrightText());
-
- Set<MediaFileTag> tags = dataHolder.getTags();
- if (tags != null && !tags.isEmpty()) {
- StringBuffer tagDisplayBuffer = new StringBuffer();
- for (MediaFileTag tag: dataHolder.getTags()) {
- tagDisplayBuffer.append(tag.getName());
- tagDisplayBuffer.append(" ");
- }
- tagDisplayBuffer.deleteCharAt(tagDisplayBuffer.length() - 1);
- this.setTags(tagDisplayBuffer.toString());
- }
-
- this.setSharedForGallery(dataHolder.isSharedForGallery());
- this.setDirectoryId(dataHolder.getDirectory().getId());
- }
-
+ this.setId(dataHolder.getId());
+ this.setName(dataHolder.getName());
+ this.setDescription(dataHolder.getDescription());
+ this.setCopyrightText(dataHolder.getCopyrightText());
+
+ Set<MediaFileTag> tags = dataHolder.getTags();
+ if (tags != null && !tags.isEmpty()) {
+ StringBuffer tagDisplayBuffer = new StringBuffer();
+ for (MediaFileTag tag : dataHolder.getTags()) {
+ tagDisplayBuffer.append(tag.getName());
+ tagDisplayBuffer.append(" ");
+ }
+ tagDisplayBuffer.deleteCharAt(tagDisplayBuffer.length() - 1);
+ this.setTags(tagDisplayBuffer.toString());
+ }
+ this.setSharedForGallery(dataHolder.isSharedForGallery());
+ this.setDirectoryId(dataHolder.getDirectory().getId());
+ }
}
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java?rev=812224&r1=812223&r2=812224&view=diff
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java
Mon Sep 7 16:48:11 2009
@@ -15,7 +15,6 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-
package org.apache.roller.weblogger.ui.struts2.editor;
import org.apache.commons.lang.StringUtils;
@@ -34,43 +33,43 @@
*/
@SuppressWarnings("serial")
public class MediaFileEdit extends MediaFileBase {
+
private static Log log = LogFactory.getLog(MediaFileEdit.class);
-
- private MediaFileBean bean = new MediaFileBean();
+ private MediaFileBean bean = new MediaFileBean();
private MediaFileDirectory directory;
-
+
public MediaFileEdit() {
this.actionName = "mediaFileEdit";
this.desiredMenu = "editor";
this.pageTitle = "mediaFile.edit.title";
}
-
+
/**
* Prepares edit action.
*/
public void myPrepare() {
- refreshAllDirectories();
- try {
+ refreshAllDirectories();
+ try {
MediaFileManager mgr =
WebloggerFactory.getWeblogger().getMediaFileManager();
- if(!StringUtils.isEmpty(bean.getDirectoryId())) {
+ if (!StringUtils.isEmpty(bean.getDirectoryId())) {
setDirectory(mgr.getMediaFileDirectory(bean.getDirectoryId()));
}
} catch (WebloggerException ex) {
log.error("Error looking up media file directory", ex);
}
-
+
}
/**
* Validates media file metadata to be updated.
*/
public void myValidate() {
- MediaFile fileWithSameName =
getDirectory().getMediaFile(getBean().getName());
+ MediaFile fileWithSameName =
getDirectory().getMediaFile(getBean().getName());
if (fileWithSameName != null &&
!fileWithSameName.getId().equals(getMediaFileId())) {
addError("MediaFile.error.duplicateName", getBean().getName());
}
}
-
+
/**
* Show form for adding a new media file.
*
@@ -78,63 +77,62 @@
*/
@SkipValidation
public String execute() {
- MediaFileManager manager =
WebloggerFactory.getWeblogger().getMediaFileManager();
- try {
- MediaFile mediaFile =
manager.getMediaFile(getMediaFileId());
- this.bean.copyFrom(mediaFile);
+ MediaFileManager manager =
WebloggerFactory.getWeblogger().getMediaFileManager();
+ try {
+ MediaFile mediaFile = manager.getMediaFile(getMediaFileId());
+ this.bean.copyFrom(mediaFile);
} catch (FileIOException ex) {
addError("uploadFiles.error.upload", bean.getName());
- } catch (Exception e) {
+ } catch (Exception e) {
log.error("Error saving new entry", e);
// TODO: i18n
addError("Error reading uploaded file - " + bean.getName());
- }
+ }
- return INPUT;
+ return INPUT;
}
-
+
/**
* Save a media file.
*
* @return String The result of the action.
*/
public String save() {
- myValidate();
- if (!hasActionErrors()) {
- MediaFileManager manager =
WebloggerFactory.getWeblogger().getMediaFileManager();
- try {
- MediaFile mediaFile =
manager.getMediaFile(getMediaFileId());
- bean.copyTo(mediaFile);
- manager.updateMediaFile(getActionWeblog(),
mediaFile);
- WebloggerFactory.getWeblogger().flush();
- addMessage("mediaFile.update.success");
- return SUCCESS;
+ myValidate();
+ if (!hasActionErrors()) {
+ MediaFileManager manager =
WebloggerFactory.getWeblogger().getMediaFileManager();
+ try {
+ MediaFile mediaFile = manager.getMediaFile(getMediaFileId());
+ bean.copyTo(mediaFile);
+ manager.updateMediaFile(getActionWeblog(), mediaFile);
+ WebloggerFactory.getWeblogger().flush();
+ addMessage("mediaFile.update.success");
+ return SUCCESS;
} catch (FileIOException ex) {
addError("uploadFiles.error.upload", bean.getName());
- } catch (Exception e) {
- log.error("Error saving new entry", e);
+ } catch (Exception e) {
+ log.error("Error saving new entry", e);
// TODO: i18n
addError("Error reading uploaded file - " + bean.getName());
- }
-
- }
- return INPUT;
+ }
+
+ }
+ return INPUT;
}
-
+
public MediaFileBean getBean() {
- return bean;
+ return bean;
}
-
+
public void setBean(MediaFileBean b) {
- this.bean = b;
+ this.bean = b;
+ }
+
+ public MediaFileDirectory getDirectory() {
+ return directory;
}
-
- public MediaFileDirectory getDirectory() {
- return directory;
- }
-
- public void setDirectory(MediaFileDirectory directory) {
- this.directory = directory;
- }
+ public void setDirectory(MediaFileDirectory directory) {
+ this.directory = directory;
+ }
}
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java?rev=812224&r1=812223&r2=812224&view=diff
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java
Mon Sep 7 16:48:11 2009
@@ -15,7 +15,6 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-
package org.apache.roller.weblogger.ui.struts2.editor;
import org.apache.commons.logging.Log;
@@ -31,14 +30,14 @@
*/
@SuppressWarnings("serial")
public class MediaFileImageDim extends MediaFileBase {
+
private static Log log = LogFactory.getLog(MediaFileImageDim.class);
-
- private MediaFileBean bean = new MediaFileBean();
-
+ private MediaFileBean bean = new MediaFileBean();
+
public MediaFileImageDim() {
this.actionName = "mediaFileImageDim";
}
-
+
/**
* Show form for choosing image dimension.
*
@@ -46,22 +45,21 @@
*/
@SkipValidation
public String execute() {
- try {
+ try {
MediaFileManager mgr =
WebloggerFactory.getWeblogger().getMediaFileManager();
MediaFile mediaFile = mgr.getMediaFile(getMediaFileId());
bean.copyFrom(mediaFile);
} catch (WebloggerException ex) {
log.error("Error looking up media file directory", ex);
}
- return SUCCESS;
+ return SUCCESS;
}
- public MediaFileBean getBean() {
- return bean;
- }
-
- public void setBean(MediaFileBean bean) {
- this.bean = bean;
- }
-
+ public MediaFileBean getBean() {
+ return bean;
+ }
+
+ public void setBean(MediaFileBean bean) {
+ this.bean = bean;
+ }
}
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBean.java?rev=812224&r1=812223&r2=812224&view=diff
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBean.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBean.java
Mon Sep 7 16:48:11 2009
@@ -15,7 +15,6 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-
package org.apache.roller.weblogger.ui.struts2.editor;
import java.util.ArrayList;
@@ -31,152 +30,177 @@
* Bean for holding media file search criteria.
*/
public class MediaFileSearchBean {
- public static int PAGE_SIZE = 10;
- // Media file name as search criteria
- String name;
+ public static int PAGE_SIZE = 10;
+ // Media file name as search criteria
+ String name;
+ // Media file type as search criteria
+ String type;
+ // Type of size filter as search criteria
+ int sizeFilterType;
+ // Size of file as search criteria
+ long size;
+ // Size unit
+ int sizeUnit;
+ // Tags as search criteria
+ String tags;
+ // Page number of results
+ int pageNum = 0;
+ // Sort option for search results
+ int sortOption;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public int getSizeFilterType() {
+ return sizeFilterType;
+ }
+
+ public void setSizeFilterType(int sizeFilterType) {
+ this.sizeFilterType = sizeFilterType;
+ }
+
+ public long getSize() {
+ return size;
+ }
- // Media file type as search criteria
- String type;
+ public void setSize(long size) {
+ this.size = size;
+ }
+
+ public int getSizeUnit() {
+ return sizeUnit;
+ }
+
+ public void setSizeUnit(int sizeUnit) {
+ this.sizeUnit = sizeUnit;
+ }
+
+ public String getTags() {
+ return tags;
+ }
+
+ public void setTags(String tags) {
+ this.tags = tags;
+ }
- // Type of size filter as search criteria
- int sizeFilterType;
-
- // Size of file as search criteria
- long size;
-
- // Size unit
- int sizeUnit;
-
- // Tags as search criteria
- String tags;
-
- // Page number of results
- int pageNum = 0;
-
- // Sort option for search results
- int sortOption;
-
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getType() {
- return type;
- }
- public void setType(String type) {
- this.type = type;
- }
- public int getSizeFilterType() {
- return sizeFilterType;
- }
- public void setSizeFilterType(int sizeFilterType) {
- this.sizeFilterType = sizeFilterType;
- }
- public long getSize() {
- return size;
- }
- public void setSize(long size) {
- this.size = size;
- }
- public int getSizeUnit() {
- return sizeUnit;
- }
- public void setSizeUnit(int sizeUnit) {
- this.sizeUnit = sizeUnit;
- }
- public String getTags() {
- return tags;
- }
- public void setTags(String tags) {
- this.tags = tags;
- }
-
public int getPageNum() {
- return pageNum;
- }
- public void setPageNum(int pageNum) {
- this.pageNum = pageNum;
- }
-
- public int getSortOption() {
- return sortOption;
- }
- public void setSortOption(int sortOption) {
- this.sortOption = sortOption;
- }
-
- /**
- * Copies data from this bean to media file filter object.
- *
- */
- public void copyTo(MediaFileFilter dataHolder) {
- dataHolder.setName(this.name);
-
- if (!StringUtils.isEmpty(this.type)) {
- MediaFileType filterType = null;
- if ("Audio".equals(this.type)) {
- filterType = MediaFileType.AUDIO;
- }
- else if ("Video".equals(this.type)) {
- filterType = MediaFileType.VIDEO;
- }
- else if ("Image".equals(this.type)) {
- filterType = MediaFileType.IMAGE;
- }
- else if ("Others".equals(this.type)) {
- filterType = MediaFileType.OTHERS;
- }
-
- dataHolder.setType(filterType);
- }
-
- if (this.size > 0) {
- SizeFilterType type;
- switch(this.sizeFilterType) {
- case 0: type = SizeFilterType.GT;break;
- case 1: type = SizeFilterType.GTE;break;
- case 2: type = SizeFilterType.EQ;break;
- case 3: type = SizeFilterType.LTE;break;
- case 4: type = SizeFilterType.LT;break;
- default: type = null;
- }
- dataHolder.setSizeFilterType(type);
-
- long filterSize;
- switch (this.sizeUnit) {
- case 1: filterSize = this.size * 1024;break;
- case 2: filterSize = this.size * 1024 * 1024;break;
- default: filterSize = this.size;
- }
- dataHolder.setSize(filterSize);
- }
-
- if (!StringUtils.isEmpty(this.tags)) {
- List<String> tagsSet = new ArrayList<String>();
- for (String tag: this.tags.split(" ")) {
- tagsSet.add(tag);
- }
- dataHolder.setTags(tagsSet);
- }
-
- dataHolder.setStartIndex(pageNum * PAGE_SIZE);
- /**
- * Set length to fetch to one more than what is required.
- * This would help us determine whether there are more pages
- */
- dataHolder.setLength(PAGE_SIZE + 1);
-
- MediaFileOrder order;
- switch(this.sortOption) {
- case 0: order = MediaFileOrder.NAME;break;
- case 1: order = MediaFileOrder.DATE_UPLOADED;break;
- case 2: order = MediaFileOrder.TYPE;break;
- default: order = null;
- }
- dataHolder.setOrder(order);
+ return pageNum;
}
+ public void setPageNum(int pageNum) {
+ this.pageNum = pageNum;
+ }
+
+ public int getSortOption() {
+ return sortOption;
+ }
+
+ public void setSortOption(int sortOption) {
+ this.sortOption = sortOption;
+ }
+
+ /**
+ * Copies data from this bean to media file filter object.
+ *
+ */
+ public void copyTo(MediaFileFilter dataHolder) {
+ dataHolder.setName(this.name);
+
+ if (!StringUtils.isEmpty(this.type)) {
+ MediaFileType filterType = null;
+ if ("Audio".equals(this.type)) {
+ filterType = MediaFileType.AUDIO;
+ } else if ("Video".equals(this.type)) {
+ filterType = MediaFileType.VIDEO;
+ } else if ("Image".equals(this.type)) {
+ filterType = MediaFileType.IMAGE;
+ } else if ("Others".equals(this.type)) {
+ filterType = MediaFileType.OTHERS;
+ }
+
+ dataHolder.setType(filterType);
+ }
+
+ if (this.size > 0) {
+ SizeFilterType type;
+ switch (this.sizeFilterType) {
+ case 0:
+ type = SizeFilterType.GT;
+ break;
+ case 1:
+ type = SizeFilterType.GTE;
+ break;
+ case 2:
+ type = SizeFilterType.EQ;
+ break;
+ case 3:
+ type = SizeFilterType.LTE;
+ break;
+ case 4:
+ type = SizeFilterType.LT;
+ break;
+ default:
+ type = null;
+ }
+ dataHolder.setSizeFilterType(type);
+
+ long filterSize;
+ switch (this.sizeUnit) {
+ case 1:
+ filterSize = this.size * 1024;
+ break;
+ case 2:
+ filterSize = this.size * 1024 * 1024;
+ break;
+ default:
+ filterSize = this.size;
+ }
+ dataHolder.setSize(filterSize);
+ }
+
+ if (!StringUtils.isEmpty(this.tags)) {
+ List<String> tagsSet = new ArrayList<String>();
+ for (String tag : this.tags.split(" ")) {
+ tagsSet.add(tag);
+ }
+ dataHolder.setTags(tagsSet);
+ }
+
+ dataHolder.setStartIndex(pageNum * PAGE_SIZE);
+ /**
+ * Set length to fetch to one more than what is required.
+ * This would help us determine whether there are more pages
+ */
+ dataHolder.setLength(PAGE_SIZE + 1);
+
+ MediaFileOrder order;
+ switch (this.sortOption) {
+ case 0:
+ order = MediaFileOrder.NAME;
+ break;
+ case 1:
+ order = MediaFileOrder.DATE_UPLOADED;
+ break;
+ case 2:
+ order = MediaFileOrder.TYPE;
+ break;
+ default:
+ order = null;
+ }
+ dataHolder.setOrder(order);
+ }
}
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java?rev=812224&r1=812223&r2=812224&view=diff
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
Mon Sep 7 16:48:11 2009
@@ -59,8 +59,8 @@
private String directoryPath;
private String sortBy;
private String newDirectoryName;
- private List<MediaFile> childFiles;
- private MediaFileDirectory currentDirectory;
+ private List<MediaFile> childFiles;
+ private MediaFileDirectory currentDirectory;
private List<MediaFileDirectory> childDirectories;
public MediaFileView() {
@@ -149,7 +149,7 @@
if ("type".equals(sortBy)) {
Collections.sort(this.childFiles,
new MediaFileComparator(MediaFileComparatorType.TYPE));
-
+
} else if ("date_uploaded".equals(sortBy)) {
Collections.sort(this.childFiles,
new
MediaFileComparator(MediaFileComparatorType.DATE_UPLOADED));
