ICU-6411 Upgraded ICU4J default target JDK to 6. Also updated the eclipse project file for the change.

X-SVN-Rev: 25279
This commit is contained in:
Yoshito Umaoka 2009-01-21 22:04:51 +00:00
parent 16b0bc1ffa
commit 5f3a26ec4b
78 changed files with 195 additions and 177 deletions

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**/.svn/**|com/ibm/icu/dev/eclipse/|com/ibm/icu/dev/tool/docs/" kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java5"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java6"/>
<classpathentry kind="output" path="classes"/>
</classpath>

View file

@ -1,6 +1,5 @@
#Thu Jul 17 14:46:50 EDT 2008
#Wed Jan 21 15:00:59 EST 2009
eclipse.preferences.version=1
instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
org.eclipse.jdt.core.codeComplete.fieldPrefixes=
@ -26,6 +25,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
@ -49,6 +49,7 @@ org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warnin
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@ -61,14 +62,18 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.3
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

View file

@ -24,7 +24,7 @@ current.year=2009
api.report.out=${api.dir}/icu4j_compare_${icu4j.previous.version.number}_${icu4j.version.number}.html
copyright=Copyright (c) 2000-2009, International Business Machines Corporation and others. All Rights Reserved.
corp=IBM Corporation
default.target.rt.version=J2SE15
default.target.rt.version=J2SE16
icu4j.plugin.impl.version.string=4.1.2
copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2009. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.

View file

@ -251,8 +251,7 @@
</javac>
<!-- Run CodeMangler -->
<antcall target="doMangle">
<param name="target.defs" value="${target.rt.version}" />
<param name="input.file" value="@preprocessor.txt" />
<param name="mangler.args" value="-d${target.rt.version} @preprocessor.txt"/>
</antcall>
</target>
@ -260,8 +259,7 @@
depends="buildMangle"
description="Run the preprocessor to normalize Java sources to the ICU source repository target JDK version">
<antcall target="doMangle">
<param name="target.defs" value="${default.target.rt.version}" />
<param name="input.file" value="@preprocessor.txt" />
<param name="mangler.args" value="-d${default.target.rt.version} -n -f @preprocessor.txt"/>
</antcall>
</target>
@ -272,10 +270,9 @@
</target>
<target name="doMangle" unless="dontMangle">
<echo message="Running source code preprocessor for [${target.defs}]"/>
<echo message="Running source code preprocessor [java com.ibm.icu.dev.tool.docs.CodeMangler ${mangler.args}]"/>
<java classname="com.ibm.icu.dev.tool.docs.CodeMangler" classpath="${build.dir}" logError="true" fork="true" dir="${basedir}">
<arg value="-d${target.defs}" />
<arg value="${input.file}" />
<arg line="${mangler.args}"/>
</java>
</target>
@ -1652,8 +1649,7 @@
<target name="eclipseMangle" depends="buildMangle">
<antcall target="doMangle">
<param name="target.defs" value="FOUNDATION10" />
<param name="input.file" value="@preprocessor.txt" />
<param name="mangler.args" value="-dFOUNDATION10 @preprocessor.txt"/>
</antcall>
</target>
@ -1875,8 +1871,7 @@
<target name="eclipseFragmentMangle" depends="buildMangle">
<antcall target="initSrc"/>
<antcall target="doMangle">
<param name="target.defs" value="ECLIPSE_FRAGMENT" />
<param name="input.file" value="@eclipseFragment.txt" />
<param name="mangler.args" value="-dECLIPSE_FRAGMENT @eclipseFragment.txt"/>
</antcall>
</target>

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
**********************************************************************
* Copyright (c) 2006-2007, International Business Machines
* Copyright (c) 2006-2009, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Created on 2006-4-21

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2007, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/**
*******************************************************************************
* Copyright (C) 2001-2007, International Business Machines Corporation and *
* Copyright (C) 2001-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2008, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/**
*******************************************************************************
* Copyright (C) 2001-2006, International Business Machines Corporation and *
* Copyright (C) 2001-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 2001-2007, International Business Machines
* Copyright (C) 2001-2009, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 2007, International Business Machines
* Copyright (C) 2007-2009, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*/

View file

@ -1,4 +1,4 @@
//##header J2SE15
//##header
/* Generated from 'DiagBigDecimal.nrx' 27 Mar 2000 22:38:44 [v1.162] */
/* Options: Binary Comments Crossref Format Java Logo Trace1 Verbose3 */
package com.ibm.icu.dev.test.bigdec;
@ -9,7 +9,7 @@ import com.ibm.icu.util.VersionInfo;
/* ------------------------------------------------------------------ */
/* Decimal diagnostic tests mfc */
/* Copyright (c) IBM Corporation 1996-2007. All Rights Reserved. */
/* Copyright (c) IBM Corporation 1996-2009. All Rights Reserved. */
/* ------------------------------------------------------------------ */
/* DiagBigDecimal */
/* */

View file

@ -1,4 +1,4 @@
//##header J2SE15
//##header
/**
*******************************************************************************
* Copyright (C) 2000-2009, International Business Machines Corporation and *

View file

@ -1,4 +1,4 @@
//##header J2SE15
//##header
/**
*******************************************************************************
* Copyright (C) 2000-2009, International Business Machines Corporation and *

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/**
*******************************************************************************
* Copyright (C) 2005-2008, International Business Machines Corporation and *
* Copyright (C) 2005-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
**********************************************************************
* Copyright (c) 2002-2008, International Business Machines
* Copyright (c) 2002-2009, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Author: Mark Davis

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 2008, International Business Machines Corporation and *
* Copyright (C) 2008-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 2002-2008, International Business Machines Corporation and *
* Copyright (C) 2002-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 2007-2008, International Business Machines Corporation and *
* Copyright (C) 2007-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2008, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 2001-2008, International Business Machines Corporation and *
* Copyright (C) 2001-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,4 +1,4 @@
//##header J2SE15
//##header
/*****************************************************************************************
*
* Copyright (C) 1996-2009, International Business Machines

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 2001-2007, International Business Machines Corporation and *
* Copyright (C) 2001-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*****************************************************************************************
*
* Copyright (C) 1996-2008, International Business Machines
* Copyright (C) 1996-2009, International Business Machines
* Corporation and others. All Rights Reserved.
**/
/**

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 2001-2008, International Business Machines Corporation and *
* Copyright (C) 2001-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,4 +1,4 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 2001-2009, International Business Machines Corporation and *

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*****************************************************************************************
*
* Copyright (C) 1996-2008, International Business Machines
* Copyright (C) 1996-2009, International Business Machines
* Corporation and others. All Rights Reserved.
**/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2008, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
**********************************************************************
* Copyright (c) 2004-2008, International Business Machines
* Copyright (c) 2004-2009, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Author: Alan Liu

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
**********************************************************************
* Copyright (c) 2002-2007, International Business Machines *
* Copyright (c) 2002-2009, International Business Machines *
* Corporation and others. All Rights Reserved. *
**********************************************************************
*/
@ -694,13 +694,13 @@ public class NormalizerPerformanceTest extends PerfTest {
void normalizerTest(String line, boolean compose) {
//#if defined(FOUNDATION10) || defined(J2SE13) || defined(J2SE14) || defined(J2SE15)
sun.text.Normalizer.normalize(line, compose
? sun.text.Normalizer.COMPOSE
: sun.text.Normalizer.DECOMP, 0);
//## sun.text.Normalizer.normalize(line, compose
//## ? sun.text.Normalizer.COMPOSE
//## : sun.text.Normalizer.DECOMP, 0);
//#else
//## java.text.Normalizer.normalize(line, compose
//## ? java.text.Normalizer.Form.NFC
//## : java.text.Normalizer.Form.NFD);
java.text.Normalizer.normalize(line, compose
? java.text.Normalizer.Form.NFC
: java.text.Normalizer.Form.NFD);
//#endif
}
}

View file

@ -1,4 +1,4 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2009, International Business Machines Corporation and *

View file

@ -1,4 +1,4 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2009, International Business Machines Corporation and *

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 2002-2008, International Business Machines Corporation and *
* Copyright (C) 2002-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/**
*******************************************************************************
* Copyright (C) 2000-2007, International Business Machines Corporation and *
* Copyright (C) 2000-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 1996-2007, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 2002-2006, International Business Machines Corporation and *
* Copyright (C) 2002-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 2002-2008, International Business Machines Corporation and *
* Copyright (C) 2002-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2007, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 1996-2006, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 1996-2007, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 2002-2008, International Business Machines Corporation and *
* Copyright (C) 2002-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 2002-2008, International Business Machines Corporation and *
* Copyright (C) 2002-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/**
*******************************************************************************
* Copyright (C) 2001-2008, International Business Machines Corporation and *
* Copyright (C) 2001-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 2002-2007, International Business Machines Corporation and *
* Copyright (C) 2002-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 2002-2007, International Business Machines Corporation and *
* Copyright (C) 2002-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 1996-2008, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 2002-2007, International Business Machines Corporation and *
* Copyright (C) 2002-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 2002-2007, International Business Machines Corporation and *
* Copyright (C) 2002-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 1996-2007, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 1996-2008, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
**********************************************************************
* Copyright (c) 2003-2008, International Business Machines
* Copyright (c) 2003-2009, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Author: Alan Liu

View file

@ -1,6 +1,6 @@
/**
*******************************************************************************
* Copyright (C) 2004-2007, International Business Machines Corporation and *
* Copyright (C) 2004-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -38,6 +38,7 @@ public class CodeMangler {
private boolean force; // true if force reprocess of files
private boolean clean; // true if output is to be cleaned
private boolean timestamp; // true if we read/write timestamp
private boolean nonames; // true if no names in header
private HashMap map; // defines
private ArrayList names; // files/directories to process
private String header; // sorted list of defines passed in
@ -62,6 +63,7 @@ public class CodeMangler {
"-t[imestamp] - expect/write timestamp in header\n" +
"-dNAME[=VALUE] - define NAME with optional value VALUE\n" +
" (or -d NAME[=VALUE])\n" +
"-n - do not put NAME/VALUE in header\n" +
"-help - print this usage message and exit.\n" +
"\n" +
"For file arguments, output '.java' files using the same path/name under the output directory.\n" +
@ -125,6 +127,8 @@ public class CodeMangler {
break; // stop before processing arguments, so we will do nothing
} else if (arg.startsWith("-v")) {
verbose = true;
} else if (arg.startsWith("-n")) {
nonames = true;
} else {
System.err.println("Error: unrecognized argument '" + arg + "'");
System.err.println(usage);
@ -225,16 +229,18 @@ public class CodeMangler {
sort.putAll(map);
Iterator iter = sort.entrySet().iterator();
StringBuffer buf = new StringBuffer();
while (iter.hasNext()) {
Map.Entry e = (Map.Entry)iter.next();
if (buf.length() > 0) {
buf.append(", ");
}
buf.append(e.getKey());
String v = (String)e.getValue();
if (v != null && v.length() > 0) {
buf.append('=');
buf.append(v);
if (!nonames) {
while (iter.hasNext()) {
Map.Entry e = (Map.Entry)iter.next();
if (buf.length() > 0) {
buf.append(", ");
}
buf.append(e.getKey());
String v = (String)e.getValue();
if (v != null && v.length() > 0) {
buf.append('=');
buf.append(v);
}
}
}
header = buf.toString();
@ -350,9 +356,15 @@ public class CodeMangler {
boolean hasHeader = line.startsWith(HEADER_PREFIX);
if (hasHeader && !force) {
long expectLastModified = ((infile.lastModified() + 999)/1000)*1000;
String headerline = HEADER_PREFIX + ' ' + header + ' ' +
(timestamp ? String.valueOf(expectLastModified) : "");
headerline = headerline.trim();
String headerline = HEADER_PREFIX;
if (header.length() > 0) {
headerline += " ";
headerline += header;
}
if (timestamp) {
headerline += " ";
headerline += String.valueOf(expectLastModified);
}
if (line.equals(headerline)) {
if (verbose) System.out.println("no changes necessary to " + infile.getCanonicalPath());
instream.close();
@ -388,9 +400,15 @@ public class CodeMangler {
outModTime = ((outfile.lastModified()+999)/1000)*1000; // round up
outstream = new PrintStream(new FileOutputStream(outfile));
String headerline = HEADER_PREFIX + ' ' + header + ' ' +
(timestamp ? String.valueOf(outModTime) : "");
headerline = headerline.trim();
String headerline = HEADER_PREFIX;
if (header.length() > 0) {
headerline += " ";
headerline += header;
}
if (timestamp) {
headerline += " ";
headerline += String.valueOf(outModTime);
}
outstream.println(headerline);
if (verbose) System.out.println("header: " + headerline);

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/**
*******************************************************************************
* Copyright (C) 2002-2008, International Business Machines Corporation and *
* Copyright (C) 2002-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,8 +1,8 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13) || defined(ECLIPSE_FRAGMENT)
//##/*
//## * *****************************************************************************
//## * Copyright (C) 2006-2007, International Business Machines
//## * Copyright (C) 2006-2009, International Business Machines
//## * Corporation and others. All Rights Reserved.
//## * *****************************************************************************
//## */

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 2007-2008, International Business Machines
* Copyright (C) 2007-2009, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 2004-2008, International Business Machines Corporation and *
* Copyright (C) 2004-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 2008, International Business Machines Corporation and *
* Copyright (C) 2008-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 2006-2008, Google, International Business Machines Corporation *
* Copyright (C) 2006-2009, Google, International Business Machines Corporation *
* and others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2008, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 2007-2008, International Business Machines Corporation and *
* Copyright (C) 2007-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/**
*******************************************************************************
* Copyright (C) 1996-2008, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,4 +1,4 @@
//##header J2SE15
//##header
/* Generated from 'BigDecimal.nrx' 8 Sep 2000 11:10:50 [v2.00] */
/* Options: Binary Comments Crossref Format Java Logo Strictargs Strictcase Trace2 Verbose3 */
package com.ibm.icu.math;
@ -9,7 +9,7 @@ import com.ibm.icu.lang.UCharacter;
/* ------------------------------------------------------------------ */
/* BigDecimal -- Decimal arithmetic for Java */
/* ------------------------------------------------------------------ */
/* Copyright IBM Corporation, 1996-2008. All Rights Reserved. */
/* Copyright IBM Corporation, 1996-2009. All Rights Reserved. */
/* */
/* The BigDecimal class provides immutable arbitrary-precision */
/* floating point (including integer) decimal numbers. */

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 2001-2008, International Business Machines
* Copyright (C) 2001-2009, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*/

View file

@ -1,6 +1,6 @@
//##header J2SE15
//##header
/*********************************************************************
* Copyright (C) 2000-2008, International Business Machines Corporation and
* Copyright (C) 2000-2009, International Business Machines Corporation and
* others. All Rights Reserved.
*********************************************************************
*/

View file

@ -1,6 +1,6 @@
//##header J2SE15
//##header
/*
* Copyright (C) 1996-2008, International Business Machines
* Copyright (C) 1996-2009, International Business Machines
* Corporation and others. All Rights Reserved.
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
********************************************************************************
* Copyright (C) 2006-2008, Google, International Business Machines Corporation *
* Copyright (C) 2006-2009, Google, International Business Machines Corporation *
* and others. All Rights Reserved. *
********************************************************************************
*/

View file

@ -1,4 +1,4 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2009, International Business Machines Corporation and *

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2008, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,9 +1,9 @@
//##header J2SE15
//##header
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
*******************************************************************************
* Copyright (C) 2008, Google Inc, International Business Machines Corporation
* Copyright (C) 2008-2009, Google Inc, International Business Machines Corporation
* and others. All Rights Reserved.
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
**********************************************************************
* Copyright (c) 2004-2008, International Business Machines
* Copyright (c) 2004-2009, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Author: Alan Liu

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2008, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/**
*******************************************************************************
* Copyright (C) 1996-2008, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2008, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2008, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/**
*******************************************************************************
* Copyright (C) 1996-2007, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2008, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/**
*******************************************************************************
* Copyright (C) 1996-2008, International Business Machines Corporation and *
* Copyright (C) 1996-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/

View file

@ -1,7 +1,7 @@
//##header J2SE15
//##header
/*
*******************************************************************************
* Copyright (C) 2004-2008, International Business Machines Corporation and *
* Copyright (C) 2004-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/