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

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

Revision: 15716
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15716&view=rev
Author:   robertdavid
Date:     2011-07-26 15:49:27 +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/StudyListPage.java
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/package.properties
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/package_de.properties

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 15:19:49 UTC (rev 15715)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java	2011-07-26 15:49:27 UTC (rev 15716)
@@ -2058,7 +2058,6 @@
             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") {
@@ -2204,13 +2203,7 @@
                         FileUtils.resolve(new File(fsID, fileID));
                     dis =new DicomInputStream(file);
                     modalWindow.setContent(new DicomObjectPanel("content", dis.readDicomObject(), true));
-                    modalWindow.setTitle(new StringResourceModel("folder.dcmfileview.title", 
-                            new AbstractReadOnlyModel<String>(){
-                                private static final long serialVersionUID = 1L;
-                                @Override
-                                public String getObject() {
-                                    return file.getAbsolutePath().replace('\\', '/');
-                                }}));
+                    modalWindow.setTitle(new ResourceModel("folder.dcmfileview.title"));
                     modalWindow.show(target);
                     super.onClick(target);
                 } catch (Exception e) {

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/package.properties
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/package.properties	2011-07-26 15:19:49 UTC (rev 15715)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/package.properties	2011-07-26 15:49:27 UTC (rev 15716)
@@ -282,7 +282,7 @@
 folder.studyview.selectAllSeries.tooltip=Select all Series
 folder.studyview.deselectAllSeries.tooltip=Deselect all Series
 
-folder.dcmfileview.title=DICOM File: ${}
+folder.dcmfileview.title=DICOM File
 
 # WicketExceptionWithMsgKey msgKeys
 fuzzyError=Wildcard not supported by fuzzy matching!

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/package_de.properties
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/package_de.properties	2011-07-26 15:19:49 UTC (rev 15715)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/package_de.properties	2011-07-26 15:49:27 UTC (rev 15716)
@@ -282,7 +282,7 @@
 folder.studyview.selectAllSeries.tooltip=Auswahl aller Serien
 folder.studyview.deselectAllSeries.tooltip=Auswahl aller Serien aufheben
 
-folder.dcmfileview.title=DICOM Datei: ${}
+folder.dcmfileview.title=DICOM Datei
 
 # WicketExceptionWithMsgKey msgKeys
 fuzzyError=Wildcard wird von Fuzzy Suche nicht unterst\xFCtzt!


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