[dcm4che-commits] SF.net SVN: dcm4che:[15715] dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/ src/main

[<rob...@us...>]

Revision: 15715
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15715&view=rev
Author:   robertdavid
Date:     2011-07-26 15:19:49 +0000 (Tue, 26 Jul 2011)

Log Message:
-----------
[#WEB-419] Show absolute path of file system in file details in addition to file path and file system path

Modified Paths:
--------------
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/FilePanel.java
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/model/FileModel.java
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/FilePanel.html

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/FilePanel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/FilePanel.java	2011-07-26 14:34:32 UTC (rev 15714)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/FilePanel.java	2011-07-26 15:19:49 UTC (rev 15715)
@@ -82,6 +82,7 @@
         add(new Label("fileObject.fileStatus"));
         add(new Label("fileObject.filePath"));
         add(new Label("fileObject.fileSystem.directoryPath"));
+        add(new Label("absoluteDirectoryPath"));
         add(new Label("fileObject.fileSystem.groupID"));
         add(new Label("fileObject.fileSystem.retrieveAET"));
         add(new Label("fileObject.fileSystem.availability"));

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java	2011-07-26 14:34:32 UTC (rev 15714)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java	2011-07-26 15:19:49 UTC (rev 15715)
@@ -2058,6 +2058,7 @@
             item.add(new Label("fileObject.fileSize").add(tooltip));
             item.add(new Label("fileObject.transferSyntaxUID").add(tooltip));
             item.add(new Label("fileObject.fileSystem.directoryPath").add(tooltip));
+            item.add(new Label("absoluteDirectoryPath").add(tooltip));
             item.add(new Label("fileObject.filePath").add(tooltip));
             item.add(new Label("fileObject.fileSystem.availability").add(tooltip));
             item.add(new AjaxFallbackLink<Object>("toggledetails") {

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/model/FileModel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/model/FileModel.java	2011-07-26 14:34:32 UTC (rev 15714)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/model/FileModel.java	2011-07-26 15:19:49 UTC (rev 15715)
@@ -41,6 +41,7 @@
 import java.io.Serializable;
 
 import org.dcm4chee.archive.entity.File;
+import org.dcm4chee.web.common.util.FileUtils;
 
 /**
  * @author Gunter Zeilinger <gun...@gm...>
@@ -63,6 +64,10 @@
         return file;
     }
 
+    public String getAbsoluteDirectoryPath() {
+        return FileUtils.resolve(new java.io.File(file.getFileSystem().getDirectoryPath())).getAbsolutePath();
+    }
+
     public boolean isSelected() {
         return selected;
     }

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/FilePanel.html
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/FilePanel.html	2011-07-26 14:34:32 UTC (rev 15714)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/FilePanel.html	2011-07-26 15:19:49 UTC (rev 15715)
@@ -51,6 +51,10 @@
 		        <td>File System Path/URL</td>
 		        <td wicket:id="fileObject.fileSystem.directoryPath">[File System Path/URL]</td>
 		      </tr>
+              <tr>
+                <td>Absolute File System Path/URL</td>
+                <td wicket:id="absoluteDirectoryPath">[Absolute File System Path/URL]</td>
+              </tr>
 		      <tr>
 		        <td>File System Group ID</td>
 		        <td wicket:id="fileObject.fileSystem.groupID">[File System Group ID]</td>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.