[Omegat-svn-changes] SF.net SVN: omegat:[3003] trunk

[<did...@us...>]

Revision: 3003
          http://omegat.svn.sourceforge.net/omegat/?rev=3003&view=rev
Author:   didierbr
Date:     2010-05-17 09:40:28 +0000 (Mon, 17 May 2010)

Log Message:
-----------
#3000377 Project Files list not sorted on some systems and 
#3002616 Sort Project Files according to locale

Modified Paths:
--------------
    trunk/release/changes.txt
    trunk/src/org/omegat/core/data/IProject.java
    trunk/src/org/omegat/core/data/RealProject.java

Modified: trunk/release/changes.txt
===================================================================
--- trunk/release/changes.txt	2010-05-17 09:39:10 UTC (rev 3002)
+++ trunk/release/changes.txt	2010-05-17 09:40:28 UTC (rev 3003)
@@ -1,15 +1,25 @@
 ----------------------------------------------------------------------
  OmegaT 2.1.6 update 1
 ----------------------------------------------------------------------
-  2 Enhancements
-  0 Bugfix
+  3 Enhancements
+  1 Bugfix
 ----------------------------------------------------------------------
 2.1.6 update 1 vs. 2.1.6
 
+  Implemented requests:
+
+  - Sort Project Files according to locale
+  http://sourceforge.net/support/tracker.php?aid=3002616
+
   Other enhancements:
   - Catalan localisation updated to 2.1.4 (UI, Readme, Instant Start, documentation)
   - Hungarian localisation updated to 2.1.x (UI, Readme, Instant Start, documentation)
 
+  Bug fixes:
+
+  - Project Files list not sorted on some systems
+  http://sourceforge.net/support/tracker.php?aid=3000377
+
 ----------------------------------------------------------------------
  OmegaT 2.1.6
 ----------------------------------------------------------------------

Modified: trunk/src/org/omegat/core/data/IProject.java
===================================================================
--- trunk/src/org/omegat/core/data/IProject.java	2010-05-17 09:39:10 UTC (rev 3002)
+++ trunk/src/org/omegat/core/data/IProject.java	2010-05-17 09:40:28 UTC (rev 3003)
@@ -4,6 +4,7 @@
           glossaries, and translation leveraging into updated projects.
 
  Copyright (C) 2008 Alex Buloichik
+               2010 Didier Briel
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -25,8 +26,10 @@
 package org.omegat.core.data;
 
 import java.io.IOException;
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -39,6 +42,7 @@
  * instance of IProject.
  * 
  * @author Alex Buloichik (ale...@gm...)
+ * @author Didier Briel
  */
 public interface IProject {
 
@@ -149,9 +153,15 @@
      */
     List<FileInfo> getProjectFiles();
 
-    public static class FileInfo {
+    public static class FileInfo implements Comparable<FileInfo> {
         public String filePath;
         
         public List<SourceTextEntry> entries = new ArrayList<SourceTextEntry>();
+        public int compareTo(FileInfo o) {
+            //Get the local collator and set its strength to PRIMARY
+            Collator localCollator = Collator.getInstance(Locale.getDefault());
+            localCollator.setStrength(Collator.PRIMARY);
+            return localCollator.compare(filePath, o.filePath);
+        }
     }
 }

Modified: trunk/src/org/omegat/core/data/RealProject.java
===================================================================
--- trunk/src/org/omegat/core/data/RealProject.java	2010-05-17 09:39:10 UTC (rev 3002)
+++ trunk/src/org/omegat/core/data/RealProject.java	2010-05-17 09:40:28 UTC (rev 3003)
@@ -632,6 +632,7 @@
                 projectFilesList.add(fi);
             }
         }
+        Collections.sort(projectFilesList);
         Core.getMainWindow().showStatusMessageRB("CT_LOAD_SRC_COMPLETE");
         long en = System.currentTimeMillis();
         Log.log("Load project source files: " + (en - st) + "ms");


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