[dcm4che-commits] SF.net SVN: dcm4che:[15733] weasis/weasis_framework/trunk/weasis-dicom/ weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/DicomModel. java

[<nr...@us...>]

Revision: 15733
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15733&view=rev
Author:   nroduit
Date:     2011-07-29 07:34:53 +0000 (Fri, 29 Jul 2011)

Log Message:
-----------
fix issue: read two time portable  folder on Windows

Modified Paths:
--------------
    weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/DicomModel.java

Modified: weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/DicomModel.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/DicomModel.java	2011-07-28 20:42:33 UTC (rev 15732)
+++ weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/DicomModel.java	2011-07-29 07:34:53 UTC (rev 15733)
@@ -569,19 +569,21 @@
 
                     if (prop != null && baseDir != null) {
                         String[] dirs = prop.split(","); //$NON-NLS-1$
+                        for (int i = 0; i < dirs.length; i++) {
+                            dirs[i] = dirs[i].trim().replaceAll("/", File.separator);
+                        }
                         File[] files = new File[dirs.length];
                         boolean notCaseSensitive = AbstractProperties.OPERATING_SYSTEM.startsWith("win");//$NON-NLS-1$
                         if (notCaseSensitive) {
-                            Arrays.sort(files);
+                            Arrays.sort(dirs, String.CASE_INSENSITIVE_ORDER);
                         }
                         String last = null;
                         for (int i = 0; i < files.length; i++) {
-                            String dir = dirs[i].trim().replaceAll("/", File.separator);
-                            if (notCaseSensitive && last != null && dir.equalsIgnoreCase(last)) {
+                            if (notCaseSensitive && last != null && dirs[i].equalsIgnoreCase(last)) {
                                 last = null;
                             } else {
-                                last = dir;
-                                files[i] = new File(baseDir, dir); //$NON-NLS-1$
+                                last = dirs[i];
+                                files[i] = new File(baseDir, dirs[i]);
                             }
                         }
                         loadingExecutor.execute(new LoadLocalDicom(files, true, DicomModel.this, true));


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