From: Olivier G. <og...@us...> - 2005-11-20 21:45:39
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/export In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18136/osmose/src/osmose/application/export Modified Files: OSMExportHTML.java Log Message: translated Fin du diaporama, and improved the replaceTag method (feature request #1277567). Index: OSMExportHTML.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/export/OSMExportHTML.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMExportHTML.java 14 Nov 2005 22:15:09 -0000 1.2 --- OSMExportHTML.java 20 Nov 2005 21:45:30 -0000 1.3 *************** *** 818,821 **** --- 818,823 ---- // Writing of the contents of the "end" file + String slideShowEnd = convert2HTML(OSMApplication.Localisation.getString("SVW_StopText")); + tmpeStr = replaceTag(tmpeStr,"{SLIDESHOW.END}", slideShowEnd); File endfile = new File(path + "theend.html"); endfile.getParentFile().mkdirs(); *************** *** 1165,1172 **** String replaceStr=""; int index = oldText.indexOf(regexp); ! if (index != -1) { replaceStr = oldText.substring(0, index); replaceStr += newText; replaceStr += oldText.substring(index + regexp.length()); } else replaceStr = oldText; --- 1167,1176 ---- String replaceStr=""; int index = oldText.indexOf(regexp); ! if ((index != -1) && !newText.equals(regexp)) { replaceStr = oldText.substring(0, index); replaceStr += newText; replaceStr += oldText.substring(index + regexp.length()); + // to replace all occurences, we use recursive calls + replaceStr = replaceTag(replaceStr, regexp, newText); } else replaceStr = oldText; |