[Laszlo-checkins] r13805 - openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler

[max@openlaszlo.org]

Author: max
Date: 2009-05-04 14:53:01 -0700 (Mon, 04 May 2009)
New Revision: 13805

Modified:
   openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/DHTMLWriter.java
Log:
Change 20090504-maxcarlson-K by maxcarlson at Bank on 2009-05-04 11:57:36 PDT
    in /Users/maxcarlson/openlaszlo/trunk-clean
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Fix compilation when LPS_HOME has a period in it

Bugs Fixed: LPP-8125 - openlaszlo compile fails if LPS_HOME has a period in it

Technical Reviewer: ptw
QA Reviewer: hminsky

Details: Use FileUtils.getExtension() to compute offset for image montage filenames.

Tests: See LPP-8125



Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/DHTMLWriter.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/DHTMLWriter.java	2009-05-04 19:09:31 UTC (rev 13804)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/DHTMLWriter.java	2009-05-04 21:53:01 UTC (rev 13805)
@@ -298,7 +298,9 @@
         // create a montage for multiframe resources
         if (sources.size() > 1) {
             String montageFile = (String)sources.get(0);
-            montageFile = montageFile.substring(0, montageFile.indexOf('.')) + mEnv.IMAGEMONTAGE_STRING + montageFile.substring(montageFile.indexOf('.') + 1);
+            // offset of one character to the left of the extension, e.g. '.png'
+            int extoffset = montageFile.lastIndexOf(FileUtils.getExtension(montageFile)) - 1;
+            montageFile = montageFile.substring(0, extoffset) + mEnv.IMAGEMONTAGE_STRING + montageFile.substring(extoffset + 1);
             try {
                 ImageMontageMaker.assemble(sources, montageFile);
                 String[] fileInfo = getRelPath(new File(montageFile));