From b7ad7366990d4ca2c11323b6d56285b1c7c5742a Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 18 May 2011 08:05:11 +0000
Subject: [PATCH] [LMS-2104] minor: added relative path to demo reporting
plugin
SVN: 21354
---
.../server/plugins/demo/DemoReportingPlugin.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoReportingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoReportingPlugin.java
index 490069f8d5d..f39b5097155 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoReportingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoReportingPlugin.java
@@ -53,12 +53,14 @@ public class DemoReportingPlugin extends AbstractTableModelReportingPlugin
super(properties, storeRoot);
}
- public TableModel createReport(List<DatasetDescription> datasets, DataSetProcessingContext context)
+ public TableModel createReport(List<DatasetDescription> datasets,
+ DataSetProcessingContext context)
{
SimpleTableModelBuilder builder = new SimpleTableModelBuilder();
builder.addHeader("Dataset Code");
builder.addHeader("Thumbnail");
builder.addHeader("Name");
+ builder.addHeader("Relative Path");
builder.addHeader("Last Modified");
builder.addHeader("Size");
for (DatasetDescription dataset : datasets)
@@ -70,8 +72,7 @@ public class DemoReportingPlugin extends AbstractTableModelReportingPlugin
private void describe(SimpleTableModelBuilder builder, DatasetDescription dataset)
{
- IHierarchicalContentNodeVisitor visitor =
- createFileDescribingVisitor(builder, dataset);
+ IHierarchicalContentNodeVisitor visitor = createFileDescribingVisitor(builder, dataset);
IHierarchicalContentProvider provider = ServiceProvider.getHierarchicalContentProvider();
HierarchicalContentTraverseUtil.traverse(provider, dataset.getDataSetCode(), visitor);
}
@@ -107,7 +108,9 @@ public class DemoReportingPlugin extends AbstractTableModelReportingPlugin
List<ISerializableComparable> row =
Arrays.<ISerializableComparable> asList(
new StringTableCell(dataset.getDataSetCode()), image, new StringTableCell(
- fileNode.getName()), new DateTableCell(new Date(lastModified)),
+ fileNode.getName()),
+ new StringTableCell(fileNode.getRelativePath()), new DateTableCell(
+ new Date(lastModified)),
new DoubleTableCell(fileNode.getFileLength()));
builder.addRow(row);
}
@@ -126,8 +129,7 @@ public class DemoReportingPlugin extends AbstractTableModelReportingPlugin
if (fileOnDisk != null && ImageUtil.isImageFile(fileOnDisk))
{
- return new ImageTableCell(dataset.getDataSetCode(), fileNode.getRelativePath(), 100,
- 60);
+ return new ImageTableCell(dataset.getDataSetCode(), fileNode.getRelativePath(), 100, 60);
}
return new StringTableCell(fileNode.getName());
}
--
GitLab