You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2005/03/04 17:45:15 UTC
svn commit: r156182 -
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Assets.java
Author: andreas
Date: Fri Mar 4 08:45:15 2005
New Revision: 156182
URL: http://svn.apache.org/viewcvs?view=rev&rev=156182
Log:
fixed un-initialized variable
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Assets.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Assets.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Assets.java?view=diff&r1=156181&r2=156182
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Assets.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Assets.java Fri Mar 4 08:45:15 2005
@@ -18,8 +18,6 @@
import java.io.File;
import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -36,8 +34,8 @@
* @version $Id: Assets.java 123984 2005-01-03 15:02:18Z andreas $
*/
public class Assets extends SiteUsecase {
-
- private ResourcesManager resourcesManager = null;
+
+ private ResourcesManager resourcesManager = null;
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#doInitialize()
@@ -46,8 +44,8 @@
super.doInitialize();
this.resourcesManager = getSourceDocument().getResourcesManager();
}
-
- /**
+
+ /**
* Validates the request parameters.
* @throws UsecaseException if an error occurs.
*/
@@ -58,7 +56,7 @@
addErrorMessage("Please enter a title.");
}
- }
+ }
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#doCheckExecutionConditions()
@@ -73,29 +71,33 @@
protected void initParameters() {
super.initParameters();
File[] resources = this.resourcesManager.getResources();
-
+
if (resources != null) {
Map[] assets = new Map[resources.length];
- for(int i = 0; i < resources.length; i++) {
+ for (int i = 0; i < resources.length; i++) {
Map asset = new HashMap();
String title = "";
String format = "";
org.w3c.dom.Document metaDoc;
try {
- metaDoc = DocumentHelper.readDocument(this.resourcesManager.getMetaFile(resources[i]));
- title = metaDoc.getElementsByTagNameNS("http://purl.org/dc/elements/1.1/", "title").item(0).getChildNodes().item(0).getNodeValue();
- format = metaDoc.getElementsByTagNameNS("http://purl.org/dc/elements/1.1/", "format").item(0).getChildNodes().item(0).getNodeValue();
- } catch(final Exception e) {
+ metaDoc = DocumentHelper.readDocument(this.resourcesManager
+ .getMetaFile(resources[i]));
+ title = metaDoc.getElementsByTagNameNS("http://purl.org/dc/elements/1.1/",
+ "title").item(0).getChildNodes().item(0).getNodeValue();
+ format = metaDoc.getElementsByTagNameNS("http://purl.org/dc/elements/1.1/",
+ "format").item(0).getChildNodes().item(0).getNodeValue();
+ } catch (final Exception e) {
throw new RuntimeException(e);
}
asset.put("source", resources[i].getName());
asset.put("title", title);
- asset.put("date", DateFormat.getDateInstance().format(new Date(resources[i].lastModified())));
+ asset.put("date", DateFormat.getDateInstance().format(new Date(resources[i]
+ .lastModified())));
asset.put("format", format);
- asset.put("extent", new Long(resources[i].length()/1024));
+ asset.put("extent", new Long(resources[i].length() / 1024));
assets[i] = asset;
- }
+ }
setParameter("assets", assets);
}
}
@@ -108,14 +110,14 @@
String title = getParameterAsString("title");
String creator = getParameterAsString("creator");
String rights = getParameterAsString("rights");
- Part file = (Part)getParameter("file");
+ Part file = getPart("file");
- Map metadata = null;
- metadata.put("title",title);
- metadata.put("creator",creator);
- metadata.put("rights",rights);
+ Map metadata = new HashMap();
+ metadata.put("title", title);
+ metadata.put("creator", creator);
+ metadata.put("rights", rights);
try {
- this.resourcesManager.addResource(file, metadata);
+ this.resourcesManager.addResource(file, metadata);
} catch (final Exception e) {
getLogger().error("The resource could not be added: ", e);
addErrorMessage("The resource could not be added (see log files for details).");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org