User: kz Date: 2008-05-05 13:36:30+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
Log: INTEGRATION: CWS dba30beta (1.4.6); FILE MERGED 2008/04/22 10:30:24 oj 1.4.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/ ============================================================== File [changed]: DefaultNameGenerator.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/DefaultNameGenerator.java?r1=1.4&r2=1.5 Delta lines: +30 -30 --------------------- --- DefaultNameGenerator.java 2008-04-10 17:18:18+0000 1.4 +++ DefaultNameGenerator.java 2008-05-05 13:36:27+0000 1.5 @@ -36,7 +36,7 @@ public class DefaultNameGenerator { - private OutputRepository outputRepository; + private final OutputRepository outputRepository; public DefaultNameGenerator(final OutputRepository outputRepository) { @@ -67,7 +67,7 @@ * @param mimeType the mime type of the resource to be stored in the repository. * @return the generated, fully qualified name. */ - private String generateName(final String namePrefix, final String mimeType, boolean isStream) + private String generateName(final String namePrefix, final String mimeType, final boolean isStream) throws IOException { final String name; @@ -81,13 +81,17 @@ } String firstFileName = name; - String suffix = null; + final String suffix; if (mimeType != null) { suffix = getSuffixForType(mimeType); firstFileName += "." + suffix; } - boolean exists = false; + else + { + suffix = null; + } + boolean exists; if (isStream) { exists = outputRepository.exists(firstFileName); @@ -96,37 +100,33 @@ { exists = outputRepository.existsStorage(firstFileName); } - if (exists == false) + if (exists) { - return firstFileName; - } int counter = 0; - while (true) + while (exists) { if (counter < 0) // wraparound should not happen.. { throw new IOException(); } - String filename = name + counter; + firstFileName = name + counter; if (suffix != null) { - filename += "." + suffix; + firstFileName += "." + suffix; } if (isStream) { - exists = outputRepository.exists(filename); + exists = outputRepository.exists(firstFileName); } else { - exists = outputRepository.existsStorage(filename); - } - if (exists == false) - { - return filename; + exists = outputRepository.existsStorage(firstFileName); } counter += 1; } } + return firstFileName; + } protected String getSuffixForType(final String mimeType) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
