[Laszlo-checkins] r16832 - in openlaszlo/branches/4.8: . WEB-INF/lps/server/src/org/openlaszlo/compiler WEB-INF/lps/server/src/org/openlaszlo/utils credits test/lfc test/lfc/multiframe test/lfc/multiframe/resources
ptw@openlaszlo.org
ptw at openlaszlo.org
Tue Jun 29 11:36:14 PDT 2010
Author: ptw
Date: 2010-06-29 11:36:04 -0700 (Tue, 29 Jun 2010)
New Revision: 16832
Added:
openlaszlo/branches/4.8/WEB-INF/lps/server/src/org/openlaszlo/utils/NaturalOrderComparator.java
openlaszlo/branches/4.8/credits/naturalorder.txt
openlaszlo/branches/4.8/test/lfc/multiframe/
openlaszlo/branches/4.8/test/lfc/multiframe/frames.lzx
openlaszlo/branches/4.8/test/lfc/multiframe/resources/
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f0.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f1.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f10.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f11.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f2.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f3.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f4.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f5.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f6.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f7.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f8.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f9.png
Removed:
openlaszlo/branches/4.8/test/lfc/multiframe/frames.lzx
openlaszlo/branches/4.8/test/lfc/multiframe/resources/
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f0.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f1.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f10.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f11.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f2.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f3.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f4.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f5.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f6.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f7.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f8.png
openlaszlo/branches/4.8/test/lfc/multiframe/resources/f9.png
Modified:
openlaszlo/branches/4.8/
openlaszlo/branches/4.8/WEB-INF/lps/server/src/org/openlaszlo/compiler/DHTMLWriter.java
openlaszlo/branches/4.8/WEB-INF/lps/server/src/org/openlaszlo/compiler/SWF9Writer.java
openlaszlo/branches/4.8/WEB-INF/lps/server/src/org/openlaszlo/compiler/SWFWriter.java
Log:
Merged revisions 16796 via svnmerge from
http://svn.openlaszlo.org/openlaszlo/trunk
.......
r16796 | hqm | 2010-06-25 15:10:15 -0400 (Fri, 25 Jun 2010) | 46 lines
Change 20100625-hqm-g by hqm at new-host-4.home on 2010-06-25 13:18:27 EDT
in /Users/hqm/openlaszlo/trunk
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: fix for "Image order when resource src is a folder"
New Features:
Bugs Fixed: LPP-9143
Technical Reviewer: max
QA Reviewer: ptw
Doc Reviewer: (pending)
Documentation:
Release Notes:
Overview:
The sort order on a directory comes back in strict lexicographic order,
which is not intuitive for people.
This changes uses a "natural order sort" on the directory listing, so
that files come out in the "natural" order humans expect, e.g., sorted
numerically where possible.
So for example a directory with files named
["f1.png", "f10.png", "f11.png", "f2.png" ]
would be sorted to this order:
["f1.png", "f2.png" , "f10.png", "f11.png"]
Details:
+ added new Comparator, NaturalOrderComparator, which looks for a digit string
to sort on preferentially.
+ made the importResouce methods of the ObjectWriters for the runtimes sort the
files that way
Tests:
test case in test/lfc/multiframe/frames.lzx, when clicking the 'frame'
button, image of letter should advance in alphabetical order
.......
Property changes on: openlaszlo/branches/4.8
___________________________________________________________________
Name: svnmerge-integrated
- /openlaszlo/trunk:1-3892,3894-3952,3954-4393,4395-4461,4463-4467,4469-4471,4473-5085,5087-5171,5173-5203,5205-5209,5211-5331,5333-5334,16597,16605,16610,16628,16650,16724,16757,16767,16771,16824-16825 /openlaszlo/branches/4.7:1-15424,15759-15761,16592,16634 /openlaszlo/branches/4.2:1-12154,12181,13205,13778,14112,14287,14316,14508,14517-14590 /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/4.4:1-13936,14007 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554,13476,13629,15650,15685 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872
+ /openlaszlo/trunk:1-3892,3894-3952,3954-4393,4395-4461,4463-4467,4469-4471,4473-5085,5087-5171,5173-5203,5205-5209,5211-5331,5333-5334,16597,16605,16610,16628,16650,16724,16757,16767,16771,16796,16824-16825 /openlaszlo/branches/4.7:1-15424,15759-15761,16592,16634 /openlaszlo/branches/4.2:1-12154,12181,13205,13778,14112,14287,14316,14508,14517-14590 /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/4.4:1-13936,14007 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554,13476,13629,15650,15685 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872
Modified: openlaszlo/branches/4.8/WEB-INF/lps/server/src/org/openlaszlo/compiler/DHTMLWriter.java
===================================================================
--- openlaszlo/branches/4.8/WEB-INF/lps/server/src/org/openlaszlo/compiler/DHTMLWriter.java 2010-06-29 13:00:21 UTC (rev 16831)
+++ openlaszlo/branches/4.8/WEB-INF/lps/server/src/org/openlaszlo/compiler/DHTMLWriter.java 2010-06-29 18:36:04 UTC (rev 16832)
@@ -14,6 +14,7 @@
import org.openlaszlo.utils.ChainedException;
import org.openlaszlo.utils.FileUtils;
import org.openlaszlo.utils.ListFormat;
+import org.openlaszlo.utils.NaturalOrderComparator;
import org.openlaszlo.compiler.CompilationEnvironment;
import org.openlaszlo.compiler.ObjectWriter.ImportResourceError;
import org.openlaszlo.compiler.ObjectWriter.Resource;
@@ -166,6 +167,7 @@
if (inputFile.isDirectory()) {
//mLogger.debug("DHTMLWriter Is directory: " + inputFile.toString());
sources = inputFile.listFiles();
+ Arrays.sort(sources, NaturalOrderComparator.NUMERICAL_ORDER);
//mLogger.debug("DHTMLWriter: "+inputFile.toString()+" is a directory containing "+ sources.length +" files.");
for (int i = 0; i < sources.length; i++) {
// Construct path from directory and file names.
Modified: openlaszlo/branches/4.8/WEB-INF/lps/server/src/org/openlaszlo/compiler/SWF9Writer.java
===================================================================
--- openlaszlo/branches/4.8/WEB-INF/lps/server/src/org/openlaszlo/compiler/SWF9Writer.java 2010-06-29 13:00:21 UTC (rev 16831)
+++ openlaszlo/branches/4.8/WEB-INF/lps/server/src/org/openlaszlo/compiler/SWF9Writer.java 2010-06-29 18:36:04 UTC (rev 16832)
@@ -16,6 +16,7 @@
import org.openlaszlo.utils.ChainedException;
import org.openlaszlo.utils.FileUtils;
import org.openlaszlo.utils.ListFormat;
+import org.openlaszlo.utils.NaturalOrderComparator;
import org.openlaszlo.compiler.CompilationEnvironment;
import org.openlaszlo.compiler.ObjectWriter.ImportResourceError;
import org.openlaszlo.compiler.ObjectWriter.Resource;
@@ -170,6 +171,7 @@
if (inputFile.isDirectory()) {
//mLogger.debug("SWF9Writer Is directory: " + inputFile.toString());
sources = inputFile.listFiles();
+ Arrays.sort(sources, NaturalOrderComparator.NUMERICAL_ORDER);
//mLogger.debug("SWF9Writer: "+inputFile.toString()+" is a directory containing "+ sources.length +" files.");
for (int i = 0; i < sources.length; i++) {
// Construct path from directory and file names.
Modified: openlaszlo/branches/4.8/WEB-INF/lps/server/src/org/openlaszlo/compiler/SWFWriter.java
===================================================================
--- openlaszlo/branches/4.8/WEB-INF/lps/server/src/org/openlaszlo/compiler/SWFWriter.java 2010-06-29 13:00:21 UTC (rev 16831)
+++ openlaszlo/branches/4.8/WEB-INF/lps/server/src/org/openlaszlo/compiler/SWFWriter.java 2010-06-29 18:36:04 UTC (rev 16832)
@@ -15,6 +15,7 @@
import org.openlaszlo.utils.ChainedException;
import org.openlaszlo.utils.FileUtils;
import org.openlaszlo.utils.ListFormat;
+import org.openlaszlo.utils.NaturalOrderComparator;
import org.openlaszlo.iv.flash.api.*;
import org.openlaszlo.iv.flash.api.action.*;
import org.openlaszlo.iv.flash.api.button.*;
@@ -575,6 +576,7 @@
File inputFile = new File(fileName);
if (inputFile.isDirectory()) {
String[] sources = inputFile.list();
+ Arrays.sort(sources, NaturalOrderComparator.NUMERICAL_ORDER);
ArrayList outsources = new ArrayList();
for (int i = 0; i < sources.length; i++) {
Copied: openlaszlo/branches/4.8/WEB-INF/lps/server/src/org/openlaszlo/utils/NaturalOrderComparator.java (from rev 16796, openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/utils/NaturalOrderComparator.java)
Copied: openlaszlo/branches/4.8/credits/naturalorder.txt (from rev 16796, openlaszlo/trunk/credits/naturalorder.txt)
Copied: openlaszlo/branches/4.8/test/lfc/multiframe (from rev 16796, openlaszlo/trunk/test/lfc/multiframe)
Deleted: openlaszlo/branches/4.8/test/lfc/multiframe/frames.lzx
Copied: openlaszlo/branches/4.8/test/lfc/multiframe/frames.lzx (from rev 16796, openlaszlo/trunk/test/lfc/multiframe/frames.lzx)
Copied: openlaszlo/branches/4.8/test/lfc/multiframe/resources (from rev 16796, openlaszlo/trunk/test/lfc/multiframe/resources)
Deleted: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f0.png
Copied: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f0.png (from rev 16796, openlaszlo/trunk/test/lfc/multiframe/resources/f0.png)
Deleted: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f1.png
Copied: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f1.png (from rev 16796, openlaszlo/trunk/test/lfc/multiframe/resources/f1.png)
Deleted: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f10.png
Copied: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f10.png (from rev 16796, openlaszlo/trunk/test/lfc/multiframe/resources/f10.png)
Deleted: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f11.png
Copied: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f11.png (from rev 16796, openlaszlo/trunk/test/lfc/multiframe/resources/f11.png)
Deleted: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f2.png
Copied: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f2.png (from rev 16796, openlaszlo/trunk/test/lfc/multiframe/resources/f2.png)
Deleted: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f3.png
Copied: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f3.png (from rev 16796, openlaszlo/trunk/test/lfc/multiframe/resources/f3.png)
Deleted: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f4.png
Copied: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f4.png (from rev 16796, openlaszlo/trunk/test/lfc/multiframe/resources/f4.png)
Deleted: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f5.png
Copied: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f5.png (from rev 16796, openlaszlo/trunk/test/lfc/multiframe/resources/f5.png)
Deleted: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f6.png
Copied: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f6.png (from rev 16796, openlaszlo/trunk/test/lfc/multiframe/resources/f6.png)
Deleted: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f7.png
Copied: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f7.png (from rev 16796, openlaszlo/trunk/test/lfc/multiframe/resources/f7.png)
Deleted: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f8.png
Copied: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f8.png (from rev 16796, openlaszlo/trunk/test/lfc/multiframe/resources/f8.png)
Deleted: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f9.png
Copied: openlaszlo/branches/4.8/test/lfc/multiframe/resources/f9.png (from rev 16796, openlaszlo/trunk/test/lfc/multiframe/resources/f9.png)
More information about the Laszlo-checkins
mailing list