Commit upstream/6.0-b02 - jtharness

+1

-0

.hgtags less more

4	4	dc134cf8fb40b026885020cb70d62b492bc55547 jt4.6
5	5	142b98326aafe755c2460af671bcf0ee834b97cc jt5.0
6	6	014e959a8f2dd58020517c715ce7a0aca60c9a2d jt5.0-b01
	7	032f60f06c6b98f6f8bd60557ed2d3f4ccad6888 jt6.0-b01

+132

-107

build/build.xml less more

0	0	<?xml version='1.0' encoding='ISO-8859-1' ?>
1	1	<!--
2		Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
	2	Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
3	3	DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4
5	5	This code is free software; you can redistribute it and/or modify it

104	104	<exclude name="com/sun/javatest/servlets/*.java" unless="servlet.present"/>
105	105	</patternset>
106	106
107		<patternset id="test.packages">
108		<include name="com/sun/jct/utils/copyrightcheck/**" />
109		</patternset>
	107	<patternset id="test.packages">
	108	<include name="com/sun/jct/utils/copyrightcheck/**" />
	109	</patternset>
110	110
111	111	<patternset id="javatest.jdk11.files">
112	112	<include name="com/sun/javatest/Command.java"/>

190	190	</fileset>
191	191	</copy>
192	192
193		<replace file="${BUILD_DIR}/binaries/ReleaseNotes-jtharness.html">
194		<replacetoken><![CDATA[href="../../legal/copyright.txt"]]></replacetoken>
	193	<replace file="${BUILD_DIR}/binaries/ReleaseNotes-jtharness.html">
	194	<replacetoken><![CDATA[href="../../legal/copyright.txt"]]></replacetoken>
195	195	<replacevalue><![CDATA[href="legal/copyright.txt"]]></replacevalue>
196		</replace>
197
198		<replace file="${BUILD_DIR}/binaries/ReleaseNotes-jtharness.html">
199		<replacetoken><![CDATA[href="../../document.css"]]></replacetoken>
	196	</replace>
	197
	198	<replace file="${BUILD_DIR}/binaries/ReleaseNotes-jtharness.html">
	199	<replacetoken><![CDATA[href="../../document.css"]]></replacetoken>
200	200	<replacevalue><![CDATA[href="doc/document.css"]]></replacevalue>
201		</replace>
202
203		<replace file="${BUILD_DIR}/binaries/ReleaseNotes-jtharness.html"
	201	</replace>
	202
	203	<replace file="${BUILD_DIR}/binaries/ReleaseNotes-jtharness.html"
204	204	token="BUILD_VERSION"
205	205	value="${build.version}"/>
	206
	207	<replace file="${BUILD_DIR}/binaries/ReleaseNotes-jtharness.html"
	208	token="BUILD_DATE"
	209	value="${build.date}"/>
206	210
207	211	<!-- clone release notes as index.html for convenience -->
208	212	<copy tofile="${BUILD_DIR}/binaries/index.html"

286	290	destdir="${build.classes}"
287	291	classpath="${jdk14.classpath}:${jcommjar}">
288	292	<patternset refid="javatest.packages"/>
	293	<compilerarg value="-version"/>
	294	<compilerarg value="-Xlint:rawtypes"/>
	295	<compilerarg value="-Xlint:cast"/>
289	296	</javac>
290	297	<copy todir="${build.classes}">
291	298	<fileset dir="${legal.dir}">

302	309	destdir="${build.classes}"
303	310	classpath="${jdk14.classpath}">
304	311	<patternset refid="test.packages"/>
305		</javac>
306		</target>
	312	<compilerarg value="-version"/>
	313	<compilerarg value="-Xlint:rawtypes"/>
	314	<compilerarg value="-Xlint:cast"/>
	315	</javac>
	316	</target>
307	317
308	318	<target name="compile.junit.classes" if="jar.junit.dependencies.present" depends="verify-dependencies, compile.classes,compile.junit.resources">
309	319	<mkdir dir="${build.junit.classes}"/>

312	322	destdir="${build.junit.classes}"
313	323	classpath="${jdk14.classpath}:${build.classes}:${asmjar}:${asmcommonsjar}:${junitlib}">
314	324	<patternset refid="javatest.junit.packages"/>
	325	<compilerarg value="-version"/>
	326	<compilerarg value="-Xlint:rawtypes"/>
	327	<compilerarg value="-Xlint:cast"/>
315	328	</javac>
316	329
317	330	<copy todir="${build.junit.classes}">

331	344	<patternset refid="javatest.resources"/>
332	345	</fileset>
333	346	</copy>
334		<mkdir dir="${build.classes}/META-INF/"/>
	347	<mkdir dir="${build.classes}/META-INF/"/>
335	348	<buildinfo/>
336	349	<copy file="${src.dir}/com/sun/javatest/tool/i18n.properties"
337	350	tofile="${build.classes}/com/sun/javatest/tool/i18n_fr.properties"/>
338		<mkdir dir="${build.classes}/META-INF/services"/>
	351	<mkdir dir="${build.classes}/META-INF/services"/>
339	352	<copy file="${build.dir}/JavaTest.cmdMgrs.lst" tofile="${build.classes}/META-INF/services/com.sun.javatest.tool.CommandManager.lst"/>
340	353	<copy file="${build.dir}/JavaTest.toolMgrs.lst" tofile="${build.classes}/META-INF/services/com.sun.javatest.tool.ToolManager.lst"/>
341	354	<copy file="${build.dir}/com.sun.javatest.report.ReportFormat" tofile="${build.classes}/META-INF/services/com.sun.javatest.report.ReportFormat"/>

347	360	<patternset refid="javatest.junit.resources"/>
348	361	</fileset>
349	362	</copy>
350		<mkdir dir="${build.classes}/META-INF/"/>
	363	<mkdir dir="${build.classes}/META-INF/"/>
351	364	<buildinfo/>
352	365	</target>
353	366

407	420	</java>
408	421	</target>
409	422
410		<target name="test-sanity" depends="test-sanity-version,test-sanity-simpletck" />
411
412		<target name="test-sanity-version" depends="jar">
413		<java fork="true" failonerror="false" classname="${run.class}"
414		outputproperty="test.sanity.version.output"
415		resultproperty="test.sanity.version.result">
416		<classpath>
417		<path path="${BUILD_DIR}/binaries/lib/javatest.jar"/>
418		</classpath>
419		<arg value="-version"/>
420		</java>
421
422		<property name="test-sanity-version-pattern" value="JT Harness, version ${build.version}.*\nCopyright $C$ 1996-[0-9][0-9][0-9][0-9] Sun Microsystems, Inc\. All rights reserved" />
423
424		<condition property="test.sanity.version.success">
425		<and>
426		<equals arg1="${test.sanity.version.result}" arg2="0" />
427		<!--<matches singleline="true" string="${test.sanity.version.output}" pattern="${test-sanity-version-pattern}" />-->
428		</and>
429		</condition>
430		<fail unless="test.sanity.version.success">
431		"java ${run.class} -version" exited with code "${test.sanity.version.result}"
432
433		The output:
434		${test.sanity.version.output}
435
436		Pattern: ${test-sanity-version-pattern}</fail>
437		</target>
438
439		<target name="test-sanity-simpletck" depends="jar,build-examples">
440		<property name="libs" value="${BUILD_DIR}/binaries/examples/tutorial/demots/lib" />
441		<delete dir="${build.tmp}/sanity-demo-wd" />
442		<java fork="true" failonerror="false" jar="${BUILD_DIR}/binaries/lib/javatest.jar"
443		outputproperty="test.sanity.simpletck.output"
444		resultproperty="test.sanity.simpletck.result">
445		<classpath>
446		<path path="${libs}/demots.jar" />
447		<path path="${libs}/demoapi.jar" />
448		</classpath>
449		<arg line="-verbose:max -ts ${BUILD_DIR}/binaries/examples/tutorial/demots/ -wd -create ${build.tmp}/sanity-demo-wd -config ${libs}/demots.jti -set demoTS.jvm ${java.home}/bin/java -excludelist lib/demo.jtx -runtests -writeReport report" />
450		</java>
451
452		<property name="test-sanity-simpletck-pattern" value="Test results: passed: 16" />
453
454		<condition property="test.sanity.simpletck.success">
455		<and>
456		<equals arg1="${test.sanity.simpletck.result}" arg2="0" />
457		<!--<matches singleline="true" string="${test.sanity.simpletck.output}" pattern="${test-sanity-simpletck-pattern}" />-->
458		</and>
459		</condition>
460		<fail unless="test.sanity.simpletck.success">
461		Simple tck run exited with code "${test.sanity.simpletck.result}"
462
463		The output:
464		${test.sanity.simpletck.output}
465
466		Pattern: ${test-sanity-simpletck-pattern}</fail>
467		</target>
	423	<target name="test-sanity" depends="test-sanity-version,test-sanity-simpletck" />
	424
	425	<target name="test-sanity-version" depends="jar">
	426	<java fork="true" failonerror="false" classname="${run.class}"
	427	outputproperty="test.sanity.version.output"
	428	resultproperty="test.sanity.version.result">
	429	<classpath>
	430	<path path="${BUILD_DIR}/binaries/lib/javatest.jar"/>
	431	</classpath>
	432	<arg value="-version"/>
	433	</java>
	434
	435	<property name="test-sanity-version-pattern" value="JT Harness, version ${build.version}.*\nCopyright $C$ 1996-[0-9][0-9][0-9][0-9] Sun Microsystems, Inc\. All rights reserved" />
	436
	437	<condition property="test.sanity.version.success">
	438	<and>
	439	<equals arg1="${test.sanity.version.result}" arg2="0" />
	440	<!--<matches singleline="true" string="${test.sanity.version.output}" pattern="${test-sanity-version-pattern}" />-->
	441	</and>
	442	</condition>
	443	<fail unless="test.sanity.version.success">
	444	"java ${run.class} -version" exited with code "${test.sanity.version.result}"
	445
	446	The output:
	447	${test.sanity.version.output}
	448
	449	Pattern: ${test-sanity-version-pattern}</fail>
	450	</target>
	451
	452	<target name="test-sanity-simpletck" depends="jar,build-examples">
	453	<property name="libs" value="${BUILD_DIR}/binaries/examples/tutorial/demots/lib" />
	454	<delete dir="${build.tmp}/sanity-demo-wd" />
	455	<java fork="true" failonerror="false" jar="${BUILD_DIR}/binaries/lib/javatest.jar"
	456	outputproperty="test.sanity.simpletck.output"
	457	resultproperty="test.sanity.simpletck.result">
	458	<classpath>
	459	<path path="${libs}/demots.jar" />
	460	<path path="${libs}/demoapi.jar" />
	461	</classpath>
	462	<arg line="-verbose:max -ts ${BUILD_DIR}/binaries/examples/tutorial/demots/ -wd -create ${build.tmp}/sanity-demo-wd -config ${libs}/demots.jti -set demoTS.jvm ${java.home}/bin/java -excludelist lib/demo.jtx -runtests -writeReport report" />
	463	</java>
	464
	465	<property name="test-sanity-simpletck-pattern" value="Test results: passed: 16" />
	466
	467	<condition property="test.sanity.simpletck.success">
	468	<and>
	469	<equals arg1="${test.sanity.simpletck.result}" arg2="0" />
	470	<!--<matches singleline="true" string="${test.sanity.simpletck.output}" pattern="${test-sanity-simpletck-pattern}" />-->
	471	</and>
	472	</condition>
	473	<fail unless="test.sanity.simpletck.success">
	474	Simple tck run exited with code "${test.sanity.simpletck.result}"
	475
	476	The output:
	477	${test.sanity.simpletck.output}
	478
	479	Pattern: ${test-sanity-simpletck-pattern}</fail>
	480	</target>
468	481
469	482	<target name="test-nohead" depends="dist" description="Runs all tests, which do not need display">
470	483	<antcall target="test-statusmsg"/>

530	543	<include name="com/sun/jct/utils/glossarygen/**"/>
531	544	<include name="com/sun/jct/utils/indexgen/**"/>
532	545	<include name="com/sun/jct/utils/mapmerge/**"/>
	546	<compilerarg value="-version"/>
	547	<compilerarg value="-Xlint:rawtypes"/>
	548	<compilerarg value="-Xlint:cast"/>
533	549	</javac>
534	550	</target>
535	551

545	561	<javac encoding="iso-8859-1" debug="true" source="1.6"
546	562	srcdir="${exam.dir}/tutorial/demoapi"
547	563	destdir="${build.tmp}/${exam.dir}/demoapi">
	564	<compilerarg value="-version"/>
	565	<compilerarg value="-Xlint:rawtypes"/>
	566	<compilerarg value="-Xlint:cast"/>
548	567	</javac>
549	568	<jar destfile="${build.examples}/demots/lib/demoapi.jar"
550	569	basedir="${build.tmp}/${exam.dir}/demoapi" index="false">

562	581	srcdir="${exam.dir}/tutorial/simpleTags"
563	582	destdir="${build.tmp}/${exam.dir}/simpleTags"
564	583	classpath="${BUILD_DIR}/binaries/lib/javatest.jar:${build.examples}/demots/lib/demoapi.jar">
	584	<compilerarg value="-version"/>
	585	<compilerarg value="-Xlint:rawtypes"/>
	586	<compilerarg value="-Xlint:cast"/>
565	587	</javac>
566	588	<copy todir="${build.tmp}/${exam.dir}/simpleTags">
567	589	<fileset dir="${exam.dir}/tutorial/simpleTags/src">

588	610	</copy>
589	611
590	612
591		</target>
	613	</target>
592	614
593	615
594	616	<target name="build-services-ts" depends="build-tutorial">
595		<property name="services.ts" location="${BUILD_DIR}/binaries/examples/services_ts"/>
596		<mkdir dir="${build.tmp}/${exam.dir}/services_demo/classes"/>
	617	<property name="services.ts" location="${BUILD_DIR}/binaries/examples/services_ts"/>
	618	<mkdir dir="${build.tmp}/${exam.dir}/services_demo/classes"/>
597	619	<mkdir dir="${services.ts}/lib"/>
598	620
599		<copy todir="${services.ts}/lib">
600		<fileset file="${BUILD_DIR}/binaries/lib/javatest.jar"/>
	621	<copy todir="${services.ts}/lib">
	622	<fileset file="${BUILD_DIR}/binaries/lib/javatest.jar"/>
601	623	<fileset file="${build.examples}/demots/lib/demoapi.jar"/>
602		</copy>
	624	</copy>
603	625
604	626
605	627	<javac encoding="iso-8859-1" debug="true"
606		srcdir="${exam.dir}/services_demo/src"
607		destdir="${build.tmp}/${exam.dir}/services_demo/classes"
608		classpath="${BUILD_DIR}/binaries/lib/javatest.jar">
	628	srcdir="${exam.dir}/services_demo/src"
	629	destdir="${build.tmp}/${exam.dir}/services_demo/classes"
	630	classpath="${BUILD_DIR}/binaries/lib/javatest.jar">
	631	<compilerarg value="-version"/>
	632	<compilerarg value="-Xlint:rawtypes"/>
	633	<compilerarg value="-Xlint:cast"/>
609	634	</javac>
610		<copy todir="${build.tmp}/${exam.dir}/services_demo/classes">
611		<fileset dir="${exam.dir}/services_demo/src">
612		<include name="/moreinfo/"/>
	635	<copy todir="${build.tmp}/${exam.dir}/services_demo/classes">
	636	<fileset dir="${exam.dir}/services_demo/src">
	637	<include name="/moreinfo/"/>
613	638	<include name="*/.properties"/>
614		</fileset>
	639	</fileset>
615	640	</copy>
616	641
617		<jar destfile="${services.ts}/lib/jtservices.jar"
618		basedir="${build.tmp}/${exam.dir}/services_demo/classes" index="false">
619		<manifest>
	642	<jar destfile="${services.ts}/lib/jtservices.jar"
	643	basedir="${build.tmp}/${exam.dir}/services_demo/classes" index="false">
	644	<manifest>
620	645	<attribute name="Built-By" value="${user.name}"/>
621		<attribute name="Main-Class" value="${run.class}"/>
622		</manifest>
	646	<attribute name="Main-Class" value="${run.class}"/>
	647	</manifest>
623	648	</jar>
624	649
625		<copy todir="${services.ts}">
626		<fileset dir="${exam.dir}/services_demo/services_ts"/>
	650	<copy todir="${services.ts}">
	651	<fileset dir="${exam.dir}/services_demo/services_ts"/>
627	652	</copy>
628	653
629		</target>
630
631
632		<!--
633		******** copyright checker ********************************************
634		-->
635		<property file="build/copyright.properties"/>
636		<target name="test-copyrights" depends="compile.test.copyright.classes">
637		<taskdef name="checkCopyrights" classpath="${build.classes}" classname="com.sun.jct.utils.copyrightcheck.CheckCopyrights"/>
638		<checkCopyrights pattern="${copyright.pattern}" dir="${src.dir}" includes="${copyright.includes}" excludes="${copyright.excludes}" failOnError="yes"/>
639		</target>
	654	</target>
	655
	656
	657	<!--
	658	******** copyright checker ********************************************
	659	-->
	660	<property file="build/copyright.properties"/>
	661	<target name="test-copyrights" depends="compile.test.copyright.classes">
	662	<taskdef name="checkCopyrights" classpath="${build.classes}" classname="com.sun.jct.utils.copyrightcheck.CheckCopyrights"/>
	663	<checkCopyrights pattern="${copyright.pattern}" dir="${src.dir}" includes="${copyright.includes}" excludes="${copyright.excludes}" failOnError="yes"/>
	664	</target>
640	665	</project>

+0

-1

build/com.sun.javatest.report.ReportFormat less more

0	0	com.sun.javatest.report.HTMLReport
1	1	com.sun.javatest.report.PlainTextReport
2	2	com.sun.javatest.report.XMLReport
3		com.sun.javatest.report.COFReport
4	3	com.sun.javatest.report.CustomReportFormat
5	4

+3

-4

doc/deliverables/ReleaseNotes-jtharness.html less more

41	41
42	42	<h4 class="h4.title">
43	43	Version BUILD_VERSION<br>
44		June 2013
	44	BUILD_DATE
45	45	<hr class="hr.light">
46	46	<p class="navtop" ><a href="#_maincontent">Skip TOC <img src="shared/downicon.gif" alt="skip TOC"></a></p>
47	47	<h2>Table of Contents</h2>

135	135	<th scope="col"> Notes </th>
136	136	</tr>
137	137	<tr valign="top">
138		<td> JDK™ version 1.6 or later </td>
	138	<td> JDK™ version 7 or later </td>
139	139	<td> <a href="http://www.oracle.com/technetwork/java/javase/overview/index.html">http://www.oracle.com/technetwork/java/javase/overview/index.html</a>
140	140	</td>
141	141	<td>See <a href="#secjava7">Security Exceptions With Java 7 on Windows</a> for known issues with Java 7.

203	203	<h2>Security Exceptions With Java 7 on Windows</h2>
204	204	<p>When using Java 7 on Windows, the harness might experience problems executing particular parts of the Java 7 APIs because, by default, the harness security manager denies access to certain properties. The problem might manifest as one of the <a href="#knownexcept">Known Exceptions</a> reproduced below (see <a href="#knownexceptio">java.io.IOException</a> and <a href="#knownexceptsocket">Socket Exception Error</a>). </p>
205	205
206		<p>There are three ways to workaround the security exceptions:</p>
	206	<p>There are ways to workaround the security exceptions:</p>
207	207	<ol>
208		<li><p><b>Use the Java 6 runtime instead.</b> Java 6 is the target execution platform for the harness and is also the minimum Java version supported by the harness.</p></li>
209	208	<li><p><b>Set the <code>javatest.security.allowPropertiesAccess</code> system property to <code>"true"</code> at startup.</b> The harness security manager (JavaTestSecurityManager) is automatically installed at startup, and its default settings deny access to the System Properties object. You can manually allow access to harness properties as follows:<p>
210	209	<p><code>java -Djavatest.security.allowPropertiesAccess=true ...</code></p></li>
211	210	<li><p><b>Enable and disable property access programatically.</b> The following code temporarily allows properties access until after the code in the <code>try</code> block is executed. Beware of race conditions when using this code.</p>

+5

-5

src/com/sun/interview/Checklist.java less more

64	64	* Create an empty checklist.
65	65	*/
66	66	public Checklist() {
67		sections = new TreeMap();
	67	sections = new TreeMap<>();
68	68	}
69	69
70	70	/**

90	90	* added for the given section
91	91	*/
92	92	public String[] getSectionMessages(String sectionName) {
93		Vector v = (Vector) (sections.get(sectionName));
	93	Vector<String> v = sections.get(sectionName);
94	94	if (v == null)
95	95	return null;
96	96	String[] msgs = new String[v.size()];

103	103	* @param item The Item to be added
104	104	*/
105	105	public void add(Item item) {
106		Vector msgs = (Vector) (sections.get(item.sectionName));
	106	Vector<String> msgs = sections.get(item.sectionName);
107	107	if (msgs == null) {
108		msgs = new Vector();
	108	msgs = new Vector<>();
109	109	sections.put(item.sectionName, msgs);
110	110	}
111	111	msgs.add(item.text);

119	119	return sections.isEmpty();
120	120	}
121	121
122		private Map sections; // section name to vector of messages
	122	private Map<String, Vector<String>> sections; // section name to vector of messages
123	123	}

+7

-7

src/com/sun/interview/ChoiceArrayQuestion.java less more

104	104	if (choices == null)
105	105	throw new NullPointerException();
106	106
107		for (int i = 0; i < choices.length; i++) {
108		if (choices[i] == null)
	107	for (String choice : choices) {
	108	if (choice == null)
109	109	throw new NullPointerException();
110	110	}
111	111

346	346	* the tag as the key.
347	347	* @param data The map from which to load the value for this question.
348	348	*/
349		protected void load(Map data) {
350		Object o = data.get(tag);
351		if (o != null && o instanceof String)
352		setValue((String)o);
	349	protected void load(Map<String, String> data) {
	350	String o = data.get(tag);
	351	if (o != null)
	352	setValue(o);
353	353	}
354	354
355	355	/**

357	357	* the tag as the key.
358	358	* @param data The map in which to save the value for this question.
359	359	*/
360		protected void save(Map data) {
	360	protected void save(Map<String, String> data) {
361	361	data.put(tag, getStringValue());
362	362	}
363	363

+12

-13

src/com/sun/interview/ChoiceQuestion.java less more

137	137	interview.updatePath(this);
138	138	interview.setEdited(true);
139	139	} else {
140		for (int i = 0; i < choices.length; i++) {
141		if (value.equals(choices[i])) {
142		value = choices[i];
	140	for (String choice : choices) {
	141	if (value.equals(choice)) {
	142	value = choice;
143	143	return;
144	144	}
145	145	}

303	303	}
304	304	else {
305	305	// try and canonicalize newValue to one of the specified choices
306		for (int i = 0; i < choices.length; i++) {
307		if (newValue.equals(choices[i])) {
308		newValue = choices[i];
	306	for (String choice : choices) {
	307	if (newValue.equals(choice)) {
	308	newValue = choice;
309	309	break;
310	310	}
311	311	}

320	320
321	321	public boolean isValueValid() {
322	322	// value is valid if it matches one of the specified choices
323		for (int i = 0; i < choices.length; i++) {
324		if (value == null ? choices[i] == null : value.equals(choices[i]))
	323	for (String choice : choices) {
	324	if (value == null ? choice == null : value.equals(choice))
325	325	return true;
326	326	}
327	327	return false;

344	344	* the tag as the key.
345	345	* @param data The map from which to load the value for this question.
346	346	*/
347		protected void load(Map data) {
348		Object o = data.get(tag);
349		if (o instanceof String)
350		setValue((String)o);
	347	protected void load(Map<String, String> data) {
	348	String o = data.get(tag);
	349	setValue(o);
351	350	}
352	351
353	352	/**

355	354	* the tag as the key.
356	355	* @param data The map in which to save the value for this question.
357	356	*/
358		protected void save(Map data) {
	357	protected void save(Map<String, String> data) {
359	358	if (value != null)
360	359	data.put(tag, value);
361	360	}

+4

-4

src/com/sun/interview/FileListQuestion.java less more

125	125	*/
126	126	@Override
127	127	public void setValue(String paths) {
128		setValue(paths == null ? (File[])null : split(paths));
	128	setValue(paths == null ? null : split(paths));
129	129	}
130	130
131	131	/**

314	314	* the tag as the key.
315	315	* @param data The map from which to load the value for this question.
316	316	*/
317		protected void load(Map data) {
	317	protected void load(Map<String, String> data) {
318	318	Object o = data.get(tag);
319	319	if (o instanceof File[])
320	320	setValue((File[])o);

339	339
340	340	char sep = (s.indexOf('\n') == -1 ? ' ' : '\n');
341	341
342		ArrayList v = new ArrayList();
	342	ArrayList<File> v = new ArrayList<>();
343	343	int start = -1;
344	344	for (int i = 0; i < s.length(); i++) {
345	345	if (s.charAt(i) == sep) {

366	366	* the tag as the key.
367	367	* @param data The map in which to save the value for this question.
368	368	*/
369		protected void save(Map data) {
	369	protected void save(Map<String, String> data) {
370	370	if (value != null)
371	371	data.put(tag, join(value));
372	372	}

+5

-5

src/com/sun/interview/FileQuestion.java less more

66	66	*/
67	67	public void setSuggestions(File[] newSuggestions) {
68	68	if (newSuggestions != null) {
69		for (int i = 0; i < newSuggestions.length; i++) {
70		if (newSuggestions[i] == null)
	69	for (File newSuggestion : newSuggestions) {
	70	if (newSuggestion == null)
71	71	throw new IllegalArgumentException();
72	72	}
73	73	}

130	130	* @see #getValue
131	131	*/
132	132	public void setValue(String path) {
133		setValue(path == null ? (File)null : new File(path));
	133	setValue(path == null ? null : new File(path));
134	134	}
135	135
136	136	/**

260	260	* the tag as the key.
261	261	* @param data The map from which to load the value for this question.
262	262	*/
263		protected void load(Map data) {
	263	protected void load(Map<String, String> data) {
264	264	Object o = data.get(tag);
265	265	if (o instanceof File)
266	266	setValue((File)o);

273	273	* the tag as the key.
274	274	* @param data The map in which to save the value for this question.
275	275	*/
276		protected void save(Map data) {
	276	protected void save(Map<String, String> data) {
277	277	if (value != null)
278	278	data.put(tag, value.toString());
279	279	}

+5

-7

src/com/sun/interview/FloatQuestion.java less more

351	351	* the tag as the key.
352	352	* @param data The map from which to load the value for this question.
353	353	*/
354		protected void load(Map data) {
355		Object o = data.get(tag);
	354	protected void load(Map<String, String> data) {
	355	String o = data.get(tag);
356	356	if (o == null)
357	357	clear();
358		else if (o instanceof Float)
359		setValue(((Float)o).floatValue());
360		else if (o instanceof String) {
	358	else {
361	359	//get locate to parse string with
362	360	Locale l = Interview.readLocale(data);
363	361	try {
364		setValue((String) o, l);
	362	setValue(o, l);
365	363	}
366	364	catch (Interview.Fault e) {
367	365	throw new Error(e);

374	372	* the tag as the key.
375	373	* @param data The map in which to save the value for this question.
376	374	*/
377		protected void save(Map data) {
	375	protected void save(Map<String, String> data) {
378	376	data.put(tag, getStringValue());
379	377	}
380	378

+2

-1

src/com/sun/interview/Help.java less more

32	32	import java.net.URL;
33	33	import java.text.MessageFormat;
34	34	import java.util.HashMap;
	35	import java.util.Map;
35	36	import java.util.ResourceBundle;
36	37
37	38	/**

96	97
97	98	HelpSet hs = getHelpSet(i);
98	99	if (hs != null) {
99		HashMap m = hs.getLocalMap();
	100	Map<String, URL> m = hs.getLocalMap();
100	101	if (m != null) {
101	102	helpId = HelpID.create(key, hs);
102	103	//System.err.println("Q: FOUND int:" + i.getTag() + " key:" + key + " helpId:" + helpId);

+2

-2

src/com/sun/interview/HelpSetFactory.java less more

46	46	*
47	47	* @throws com.sun.interview.Interview.Fault if something went wrong
48	48	*/
49		public Object createHelpSetObject(String name, Class c) throws Interview.Fault;
	49	public Object createHelpSetObject(String name, Class<?> c) throws Interview.Fault;
50	50
51	51	/**
52	52	* Creates an instance of HelpSet.

77	77	static class Default implements HelpSetFactory {
78	78	private static final Object EMPTY = new Object();
79	79
80		public Object createHelpSetObject(String name, Class c) throws Fault {
	80	public Object createHelpSetObject(String name, Class<?> c) throws Fault {
81	81	return EMPTY;
82	82	}
83	83

+9

-14

src/com/sun/interview/InetAddressQuestion.java less more

336	336	* the tag as the key.
337	337	* @param data The map from which to load the value for this question.
338	338	*/
339		protected void load(Map data) {
340		Object o = data.get(tag);
341		if (o instanceof InetAddress) {
342		setValue((InetAddress) o);
343		}
344		else if (o instanceof String) {
345		try {
346		setValue((String) o);
347		}
348		catch (Interview.Fault e) {
349		// never thrown. but just in case...
350		throw new Error(e);
351		}
	339	protected void load(Map<String, String> data) {
	340	String o = data.get(tag);
	341	try {
	342	setValue(o);
	343	}
	344	catch (Interview.Fault e) {
	345	// never thrown. but just in case...
	346	throw new Error(e);
352	347	}
353	348	}
354	349

357	352	* the tag as the key.
358	353	* @param data The map in which to save the value for this question.
359	354	*/
360		protected void save(Map data) {
	355	protected void save(Map<String, String> data) {
361	356	String s = getStringValue();
362	357	if (s != null)
363	358	data.put(tag, s);

+5

-7

src/com/sun/interview/IntQuestion.java less more

326	326	* the tag as the key.
327	327	* @param data The map from which to load the value for this question.
328	328	*/
329		protected void load(Map data) {
330		Object o = data.get(tag);
	329	protected void load(Map<String, String> data) {
	330	String o = data.get(tag);
331	331	if (o == null)
332	332	clear();
333		else if (o instanceof Integer)
334		setValue(((Integer)o).intValue());
335		else if (o instanceof String) {
	333	else {
336	334	//get locate to parse string with
337	335	Locale l = Interview.readLocale(data);
338	336	try {
339		setValue((String) o, l);
	337	setValue(o, l);
340	338	}
341	339	catch (Interview.Fault e) {
342	340	throw new Error(e); // should not happen

349	347	* the tag as the key.
350	348	* @param data The map in which to save the value for this question.
351	349	*/
352		protected void save(Map data) {
	350	protected void save(Map<String, String> data) {
353	351	data.put(tag, getStringValue());
354	352	}
355	353

+131

-160

src/com/sun/interview/Interview.java less more

279	279	{
280	280	// name is not null
281	281	if (!name.equals(bundleName)) {
282		Class c = getClass();
	282	Class<?> c = getClass();
283	283	final ClassLoader cl = c.getClassLoader();
284	284	final String rn;
285	285	if (name.startsWith("/"))

428	428	*/
429	429	private static HelpSetFactory createHelpFactory() {
430	430	try {
431		Class factoryClass = Class.forName("com.sun.interview.JavaHelpFactory");
	431	Class<?> factoryClass = Class.forName("com.sun.interview.JavaHelpFactory");
432	432	return (HelpSetFactory) factoryClass.newInstance();
433	433	} catch (ClassNotFoundException e) {
434	434	return HelpSetFactory.DEFAULT;

525	525	return this;
526	526
527	527	for (int i = 0; i < children.size(); i++) {
528		Interview c = (Interview) (children.elementAt(i));
	528	Interview c = children.elementAt(i);
529	529	Interview iv = c.getInterview0(t);
530	530	if (iv != null)
531	531	return iv;

534	534	return null;
535	535	}
536	536
537		Set getInterviews() {
538		Set s = new HashSet();
	537	Set<Interview> getInterviews() {
	538	Set<Interview> s = new HashSet<>();
539	539	getInterviews0(s);
540	540	return s;
541	541	}
542	542
543		private void getInterviews0(Set s) {
	543	private void getInterviews0(Set<Interview> s) {
544	544	s.add(this);
545	545	for (int i = 0; i < children.size(); i++) {
546		Interview child = (Interview) (children.elementAt(i));
	546	Interview child = children.elementAt(i);
547	547	child.getInterviews0(s);
548	548	}
549	549	}

943	943	* @see #getPathToCurrent
944	944	*/
945	945	public Question[] getPath() {
946		Vector v = new Vector();
	946	Vector<Question> v = new Vector<>();
947	947	iteratePath0(v, true, true, true);
948	948	Question[] p = new Question[v.size()];
949	949	v.copyInto(p);

958	958	* @see #getPath
959	959	*/
960	960	public Question[] getPathToCurrent() {
961		Vector v = new Vector();
	961	Vector<Question> v = new Vector<>();
962	962	iteratePath0(v, true, false, true);
963	963	Question[] p = new Question[v.size()];
964	964	v.copyInto(p);

999	999	* @return an Iterator for the questions on the current path
1000	1000	* @see #iteratePathToCurrent
1001	1001	*/
1002		public Iterator iteratePath(boolean flattenNestedInterviews) {
1003		Vector v = new Vector();
	1002	public Iterator<Question> iteratePath(boolean flattenNestedInterviews) {
	1003	Vector<Question> v = new Vector<>();
1004	1004	iteratePath0(v, flattenNestedInterviews, true, true);
1005	1005	return v.iterator();
1006	1006	}

1016	1016	* up to and including the current question
1017	1017	* @see #iteratePath
1018	1018	*/
1019		public Iterator iteratePathToCurrent(boolean flattenNestedInterviews) {
1020		Vector v = new Vector();
	1019	public Iterator<Question> iteratePathToCurrent(boolean flattenNestedInterviews) {
	1020	Vector<Question> v = new Vector<>();
1021	1021	iteratePath0(v, flattenNestedInterviews, false, true);
1022	1022	return v.iterator();
1023	1023	}
1024	1024
1025	1025
1026		private void iteratePath0(List l, boolean flattenNestedInterviews, boolean all, boolean addFinal) {
	1026	private void iteratePath0(List<Question> l, boolean flattenNestedInterviews, boolean all, boolean addFinal) {
1027	1027	ensurePathInitialized();
1028	1028
1029	1029	int n = (all ? path.size() : currIndex + 1);

1102	1102	* recursively, in all child interviews.
1103	1103	* @return a set of all questions in this and every child interview.
1104	1104	*/
1105		public Set getQuestions() {
1106		Set s = new HashSet();
	1105	public Set<Question> getQuestions() {
	1106	Set<Question> s = new HashSet<>();
1107	1107	getQuestions0(s);
1108	1108	return s;
1109	1109	}
1110	1110
1111		private void getQuestions0(Set s) {
	1111	private void getQuestions0(Set<Question> s) {
1112	1112	s.addAll(allQuestions.values());
1113	1113
1114	1114	for (int i = 0; i < children.size(); i++) {
1115		Interview child = (Interview) (children.elementAt(i));
	1115	Interview child = children.elementAt(i);
1116	1116	child.getQuestions0(s);
1117	1117	}
1118	1118	}

1122	1122	* recursively, in all child interviews.
1123	1123	* @return a map containing all questions in this and every child interview.
1124	1124	*/
1125		public Map getAllQuestions() {
1126		Map m = new LinkedHashMap();
	1125	public Map<String, Question> getAllQuestions() {
	1126	Map<String, Question> m = new LinkedHashMap<>();
1127	1127	getAllQuestions0(m);
1128	1128	return m;
1129	1129	}
1130	1130
1131		private void getAllQuestions0(Map m) {
	1131	private void getAllQuestions0(Map<String, Question> m) {
1132	1132	m.putAll(allQuestions);
1133	1133
1134	1134	for (int i = 0; i < children.size(); i++) {
1135		Interview child = (Interview) (children.elementAt(i));
	1135	Interview child = children.elementAt(i);
1136	1136	child.getAllQuestions0(m);
1137	1137	}
1138	1138	}

1144	1144	* items, and false otherwise.
1145	1145	*/
1146	1146	public boolean isChecklistEmpty() {
1147		for (Iterator iter = iteratePath(true); iter.hasNext(); ) {
1148		Question q = (Question) (iter.next());
	1147	for (Iterator<Question> iter = iteratePath(true); iter.hasNext(); ) {
	1148	Question q = iter.next();
1149	1149	Checklist.Item[] items = q.getChecklistItems();
1150	1150	if (items != null && items.length > 0)
1151	1151	return false;

1163	1163	*/
1164	1164	public Checklist createChecklist() {
1165	1165	Checklist c = new Checklist();
1166		for (Iterator iter = iteratePath(true); iter.hasNext(); ) {
1167		Question q = (Question) (iter.next());
	1166	for (Iterator<Question> iter = iteratePath(true); iter.hasNext(); ) {
	1167	Question q = iter.next();
1168	1168	Checklist.Item[] items = q.getChecklistItems();
1169	1169	if (items != null) {
1170		for (int i = 0; i < items.length; i++)
1171		c.add(items[i]);
	1170	for (Checklist.Item item : items) c.add(item);
1172	1171	}
1173	1172	}
1174	1173	return c;

1232	1231	throw new NullPointerException();
1233	1232
1234	1233	if (allMarkers == null)
1235		allMarkers = new HashMap();
1236
1237		Set markersForName = (Set) (allMarkers.get(name));
	1234	allMarkers = new HashMap<>();
	1235
	1236	Set<Question> markersForName = allMarkers.get(name);
1238	1237	if (markersForName == null) {
1239		markersForName = new HashSet();
	1238	markersForName = new HashSet<>();
1240	1239	allMarkers.put(name, markersForName);
1241	1240	}
1242	1241

1261	1260	if (allMarkers == null)
1262	1261	return;
1263	1262
1264		Set markersForName = (Set) (allMarkers.get(name));
	1263	Set<Question> markersForName = allMarkers.get(name);
1265	1264	if (markersForName == null)
1266	1265	return;
1267	1266

1287	1286	if (allMarkers == null)
1288	1287	return false;
1289	1288
1290		Set markersForName = (Set) (allMarkers.get(name));
	1289	Set<Question> markersForName = allMarkers.get(name);
1291	1290	if (markersForName == null)
1292	1291	return false;
1293	1292

1334	1333	if (allMarkers == null) // no markers at all
1335	1334	return;
1336	1335
1337		Set markersForName = (Set) (allMarkers.get(name));
	1336	Set<Question> markersForName = allMarkers.get(name);
1338	1337	if (markersForName == null) // no markers for this name
1339	1338	return;
1340	1339
1341	1340	updateEnabled = false;
1342	1341	Question oldCurrentQuestion = getCurrentQuestion();
1343	1342
1344		for (Iterator iter = markersForName.iterator(); iter.hasNext(); ) {
1345		Question q = (Question) (iter.next());
	1343	for (Question q : markersForName) {
1346	1344	q.clear();
1347	1345	}
1348	1346

1354	1352	notifyCurrentQuestionChanged(newCurrentQuestion);
1355	1353	}
1356	1354
1357		private void loadMarkers(Map data) {
1358		String s = (String) (data.get(MARKERS));
	1355	private void loadMarkers(Map<String, String> data) {
	1356	String s = data.get(MARKERS);
1359	1357	int count = 0;
1360	1358	if (s != null) {
1361	1359	try {

1369	1367	allMarkers = null;
1370	1368
1371	1369	for (int i = 0; i < count; i++) {
1372		String name = (String) (data.get(MARKERS_PREF + i + ".name"));
1373		String tags = (String) (data.get(MARKERS_PREF + i));
	1370	String name = data.get(MARKERS_PREF + i + ".name");
	1371	String tags = data.get(MARKERS_PREF + i);
1374	1372	if (tags != null)
1375	1373	loadMarkers(name, tags);
1376	1374	}

1404	1402	}
1405	1403	}
1406	1404
1407		private void saveMarkers(Map data) {
	1405	private void saveMarkers(Map<String, String> data) {
1408	1406	if (allMarkers == null)
1409	1407	return;
1410	1408
1411	1409	int i = 0;
1412		for (Iterator iter = allMarkers.entrySet().iterator(); iter.hasNext(); ) {
1413		Map.Entry e = (Map.Entry) (iter.next());
1414		String name = (String) (e.getKey());
1415		Set markersForName = (Set) (e.getValue());
	1410	for (Map.Entry<String, Set<Question>> e : allMarkers.entrySet()) {
	1411	String name = e.getKey();
	1412	Set<Question> markersForName = e.getValue();
1416	1413	if (name != null)
1417	1414	data.put(MARKERS_PREF + i + ".name", name);
1418	1415	StringBuffer sb = new StringBuffer();
1419		for (Iterator qIter = markersForName.iterator(); qIter.hasNext(); ) {
1420		Question q = (Question) (qIter.next());
	1416	for (Question q : markersForName) {
1421	1417	if (sb.length() > 0)
1422	1418	sb.append('\n');
1423	1419	sb.append(q.getTag());

1455	1451	*/
1456	1452	public void clear() {
1457	1453	updateEnabled = false;
1458		for (Iterator iter = allQuestions.values().iterator(); iter.hasNext(); ) {
1459		Question q = (Question) (iter.next());
	1454	for (Question q : allQuestions.values()) {
1460	1455	q.clear();
1461	1456	}
1462	1457
1463	1458	for (int i = 0; i < children.size(); i++) {
1464		Interview child = (Interview)children.elementAt(i);
	1459	Interview child = children.elementAt(i);
1465	1460	child.clear();
1466	1461	}
1467	1462	if (parent == null) {

1480	1475	* @param data The archive map from which the state should be loaded.
1481	1476	* @throws Interview.Fault if the checksum is found to be incorrect.
1482	1477	*/
1483		public void load(Map data) throws Fault {
	1478	public void load(Map<String, String> data) throws Fault {
1484	1479	load(data, true);
1485	1480	}
1486	1481

1494	1489	* @param checkChecksum If true, the checksum in the data will be checked.
1495	1490	* @throws Interview.Fault if the checksum is found to be incorrect.
1496	1491	*/
1497		public void load(Map data, boolean checkChecksum) throws Fault {
	1492	public void load(Map<String, String> data, boolean checkChecksum) throws Fault {
1498	1493	if (checkChecksum && !isChecksumValid(data, true))
1499	1494	throw new Fault(i18n, "interview.checksumError");
1500	1495
1501	1496	if (parent == null) {
1502		String iTag = (String)(data.get(INTERVIEW));
	1497	String iTag = data.get(INTERVIEW);
1503	1498	if (iTag != null && !iTag.equals(getClass().getName()))
1504	1499	throw new Fault(i18n, "interview.classMismatch");
1505	1500

1511	1506
1512	1507	// clear all the answers in this interview before loading an
1513	1508	// responses from the archive
1514		for (Iterator iter = allQuestions.values().iterator(); iter.hasNext(); ) {
1515		Question q = (Question) (iter.next());
	1509	for (Question q : allQuestions.values()) {
1516	1510	q.clear();
1517	1511	}
1518	1512
1519		for (Iterator iter = allQuestions.values().iterator(); iter.hasNext(); ) {
1520		Question q = (Question) (iter.next());
	1513	for (Question q : allQuestions.values()) {
1521	1514	q.load(data);
1522	1515	}
1523	1516
1524	1517	for (int i = 0; i < children.size(); i++) {
1525		Interview child = (Interview)children.elementAt(i);
	1518	Interview child = children.elementAt(i);
1526	1519	child.load(data, false);
1527	1520	}
1528	1521
1529	1522	if (parent == null) {
1530		String qTag = (String)(data.get(QUESTION));
	1523	String qTag = data.get(QUESTION);
1531	1524	Question q = (qTag == null ? null : lookup(qTag));
1532	1525	reset(q == null ? firstQuestion : q);
1533	1526	}

1548	1541	* @deprecated As of version 4.4.1, checksums are no longer
1549	1542	* calculated or checked. True is always returned.
1550	1543	*/
1551		public static boolean isChecksumValid(Map data, boolean okIfOmitted) {
	1544	public static boolean isChecksumValid(Map<String, String> data, boolean okIfOmitted) {
1552	1545	return true;
1553	1546	}
1554	1547

1559	1552	* its state, according to its tag.
1560	1553	* @param data The archive in which the values should be saved.
1561	1554	*/
1562		public void save(Map data) {
	1555	public void save(Map<String, String> data) {
1563	1556	// only in the root interview
1564	1557	if (parent == null) {
1565	1558	data.put(INTERVIEW, getClass().getName());

1567	1560	writeLocale(data);
1568	1561
1569	1562	if (extraValues != null && extraValues.size() > 0) {
1570		Set keys = getPropertyKeys();
1571		Iterator it = keys.iterator();
1572		while (it.hasNext()) {
1573		Object key = it.next();
	1563	Set<String> keys = getPropertyKeys();
	1564	for (String key : keys) {
1574	1565	data.put(EXTERNAL_PREF + key, extraValues.get(key));
1575	1566	} // while
1576	1567	}
1577	1568
1578	1569	if (templateValues != null && templateValues.size() > 0) {
1579		Set keys = templateValues.keySet();
1580		Iterator it = keys.iterator();
1581		while (it.hasNext()) {
1582		String key = (String)it.next();
	1570	Set<String> keys = templateValues.keySet();
	1571	for (String key : keys) {
1583	1572	data.put(TEMPLATE_PREF + key, retrieveTemplateProperty(key));
1584	1573	} // while
1585	1574	}
1586	1575
1587	1576	}
1588
1589		for (Iterator iter = allQuestions.values().iterator(); iter.hasNext(); ) {
1590		Question q = (Question) (iter.next());
	1577	for (Question q : allQuestions.values()) {
1591	1578	try {
1592	1579	q.save(data);
1593	1580	}

1597	1584	}
1598	1585	}
1599	1586
1600		for (int i = 0; i < children.size(); i++) {
1601		Interview child = (Interview)children.elementAt(i);
	1587	for (Interview child : children) {
1602	1588	child.save(data);
1603	1589	}
1604	1590

1616	1602	* @see #LOCALE
1617	1603	* @see #readLocale(Map)
1618	1604	*/
1619		protected static void writeLocale(Map data) {
	1605	protected static void writeLocale(Map<String, String> data) {
1620	1606	data.put(LOCALE, Locale.getDefault().toString());
1621	1607	}
1622	1608

1629	1615	* @see #LOCALE
1630	1616	* @see #writeLocale(Map)
1631	1617	*/
1632		protected static Locale readLocale(Map data) {
	1618	protected static Locale readLocale(Map<?, ?> data) {
1633	1619	Locale result = null;
1634	1620	Object o = data.get(LOCALE);
1635	1621	if (o != null) {

1746	1732	* @see #EXPORT_IGNORE_RUNTIME_EXCEPTIONS
1747	1733	* @see #EXPORT_IGNORE_NO_EXCEPTIONS
1748	1734	*/
1749		public void export(Map data) {
1750		ArrayList<Question> path = new ArrayList();
	1735	public void export(Map<String, String> data) {
	1736	ArrayList<Question> path = new ArrayList<>();
1751	1737
1752	1738	// new 4.3 semantics allow the path to contain InterviewQuestions, which
1753	1739	// in turn allows sub-interviews to export data.

1764	1750	export0(data, hiddenPath, true);
1765	1751	}
1766	1752
1767		private void export0(Map data, ArrayList<Question> path, boolean processHidden) {
1768		for (int i = 0; i < path.size(); i++) {
	1753	private void export0(Map<String, String> data, ArrayList<Question> paths, boolean processHidden) {
	1754	for (Question path : paths) {
1769	1755	try {
1770		if (path.get(i) instanceof InterviewQuestion) {
	1756	if (path instanceof InterviewQuestion) {
1771	1757	if (!processHidden)
1772		((InterviewQuestion)path.get(i)).getTargetInterview().export(data);
	1758	((InterviewQuestion) path).getTargetInterview().export(data);
1773	1759	else
1774	1760	continue;
	1761	} else {
	1762	path.export(data);
1775	1763	}
1776		else {
1777		path.get(i).export(data);
	1764	} catch (RuntimeException e) {
	1765	switch (exportIgnoreExceptionPolicy) {
	1766	case EXPORT_IGNORE_ALL_EXCEPTIONS:
	1767	case EXPORT_IGNORE_RUNTIME_EXCEPTIONS:
	1768	break;
	1769	case EXPORT_IGNORE_NO_EXCEPTIONS:
	1770	throw e;
1778	1771	}
1779		}
1780		catch (RuntimeException e) {
	1772	} catch (Error e) {
1781	1773	switch (exportIgnoreExceptionPolicy) {
1782		case EXPORT_IGNORE_ALL_EXCEPTIONS:
1783		case EXPORT_IGNORE_RUNTIME_EXCEPTIONS:
1784		break;
1785		case EXPORT_IGNORE_NO_EXCEPTIONS:
1786		throw e;
1787		}
1788		}
1789		catch (Error e) {
1790		switch (exportIgnoreExceptionPolicy) {
1791		case EXPORT_IGNORE_ALL_EXCEPTIONS:
1792		break;
1793		case EXPORT_IGNORE_RUNTIME_EXCEPTIONS:
1794		case EXPORT_IGNORE_NO_EXCEPTIONS:
1795		throw e;
	1774	case EXPORT_IGNORE_ALL_EXCEPTIONS:
	1775	break;
	1776	case EXPORT_IGNORE_RUNTIME_EXCEPTIONS:
	1777	case EXPORT_IGNORE_NO_EXCEPTIONS:
	1778	throw e;
1796	1779	}
1797	1780	}
1798	1781	}

1901	1884	if (o == null)
1902	1885	throw new NullPointerException();
1903	1886
1904		for (int i = 0; i < observers.length; i++) {
1905		if (observers[i] == o) {
	1887	for (Observer observer : observers) {
	1888	if (observer == o) {
1906	1889	return true;
1907	1890	}
1908	1891	}

1916	1899	}
1917	1900
1918	1901	private void notifyPathUpdated() {
1919		for (int i = 0; i < observers.length; i++)
1920		observers[i].pathUpdated();
	1902	for (Observer observer : observers) observer.pathUpdated();
1921	1903	}
1922	1904
1923	1905	private Observer[] observers = new Observer[0];

1951	1933
1952	1934	// update the tags for the questions in the interview
1953	1935	// and rebuild the tag map
1954		Map newAllQuestions = new LinkedHashMap();
1955		for (Iterator iter = allQuestions.values().iterator(); iter.hasNext(); ) {
1956		Question q = (Question) (iter.next());
	1936	Map<String, Question> newAllQuestions = new LinkedHashMap<>();
	1937	for (Question q : allQuestions.values()) {
1957	1938	q.updateTag();
1958	1939	newAllQuestions.put(q.getTag(), q);
1959	1940	}
1960	1941	allQuestions = newAllQuestions;
1961	1942
1962	1943	// recursively update children
1963		for (Iterator iter = children.iterator(); iter.hasNext(); ) {
1964		Interview i = (Interview) (iter.next());
	1944	for (Interview i : children) {
1965	1945	i.updateTags();
1966	1946	}
1967	1947	}

1974	1954
1975	1955	void add(Question question) {
1976	1956	String qTag = question.getTag();
1977		Question prev = (Question) allQuestions.put(qTag, question);
	1957	Question prev = allQuestions.put(qTag, question);
1978	1958	if (prev != null)
1979	1959	throw new IllegalArgumentException("duplicate questions for tag: " + qTag);
1980	1960	}

2088	2068	if (extraValues == null)
2089	2069	return null;
2090	2070	else
2091		return (String)(extraValues.remove(key));
	2071	return extraValues.remove(key);
2092	2072	}
2093	2073
2094	2074	if (extraValues == null)
2095		extraValues = new HashMap();
2096
2097		return (String)(extraValues.put(key, value));
	2075	extraValues = new HashMap<>();
	2076
	2077	return extraValues.put(key, value);
2098	2078	}
2099	2079	}
2100	2080

2109	2089	return getParent().storeTemplateProperty(key, value);
2110	2090	else {
2111	2091	ensureTemValuesInitialized();
2112		return (String)(templateValues.put(key, value));
	2092	return templateValues.put(key, value);
2113	2093	}
2114	2094	}
2115	2095

2117	2097	* Clear a previous template properties and store the new into the configuration.
2118	2098	* @param props The properties to store.
2119	2099	*/
2120		public void storeTemplateProperties(Properties props) {
	2100	public void storeTemplateProperties(Map<String, String> props) {
2121	2101	if (getParent() != null)
2122	2102	getParent().storeTemplateProperties(props);
2123	2103	else {
2124	2104	ensureTemValuesInitialized();
2125	2105	templateValues.clear();
2126		templateValues.putAll((Map) props);
	2106	templateValues.putAll(props);
2127	2107	}
2128	2108	}
2129	2109

2143	2123	if (extraValues == null)
2144	2124	return null;
2145	2125
2146		return (String)(extraValues.get(key));
	2126	return extraValues.get(key);
2147	2127	}
2148	2128	}
2149	2129

2158	2138	return getParent().retrieveTemplateProperty(key);
2159	2139	else {
2160	2140	ensureTemValuesInitialized();
2161		return (String)(templateValues.get(key));
2162		}
2163		}
2164
2165		public Set retrieveTemplateKeys() {
	2141	return templateValues.get(key);
	2142	}
	2143	}
	2144
	2145	public Set<String> retrieveTemplateKeys() {
2166	2146	if (getParent() != null)
2167	2147	return getParent().retrieveTemplateKeys();
2168	2148	else {

2181	2161	* @see #storeProperty
2182	2162	* @see #retrieveProperty
2183	2163	*/
2184		public Set getPropertyKeys() {
	2164	public Set<String> getPropertyKeys() {
2185	2165	if (getParent() != null)
2186	2166	return parent.getPropertyKeys();
2187	2167	else {

2200	2180	*/
2201	2181	public Map<String,String> getExternalProperties() {
2202	2182	if (extraValues != null)
2203		return (Map)extraValues.clone();
	2183	return new HashMap<>(extraValues);
2204	2184	else
2205	2185	return null;
2206	2186	}

2209	2189	/**
2210	2190	* @see #load(Map)
2211	2191	*/
2212		private void loadExternalValues(Map data) {
	2192	private void loadExternalValues(Map<String, String> data) {
2213	2193
2214	2194	if (extraValues != null) {
2215	2195	extraValues.clear();
2216	2196	}
2217	2197
2218		Set keys = data.keySet();
2219		Iterator it = keys.iterator();
2220
2221		while (it.hasNext()) {
	2198	Set<String> keys = data.keySet();
	2199
	2200	for (String key : keys) {
2222	2201	// look for special external value keys
2223	2202	// should consider removing it from data, is it safe to alter
2224	2203	// that object?
2225		String key = (String)(it.next());
2226	2204	if (key.startsWith(EXTERNAL_PREF)) {
2227	2205	if (extraValues == null)
2228		extraValues = new HashMap();
2229
2230		String val = (String)(data.get(key));
	2206	extraValues = new HashMap<>();
	2207
	2208	String val = data.get(key);
2231	2209
2232	2210	// store it, minus the special prefix
2233	2211	extraValues.put(key.substring(EXTERNAL_PREF.length()), val);

2235	2213	} // while
2236	2214	}
2237	2215
2238		private void loadTemplateValues(Map data) {
	2216	private void loadTemplateValues(Map<String, String> data) {
2239	2217
2240	2218	if (templateValues != null) {
2241	2219	templateValues.clear();
2242	2220	}
2243	2221
2244		Set keys = data.keySet();
2245		Iterator it = keys.iterator();
2246
2247		while (it.hasNext()) {
2248		String key = (String)(it.next());
	2222	Set<String> keys = data.keySet();
	2223	for (String key : keys) {
2249	2224	if (key.startsWith(TEMPLATE_PREF)) {
2250	2225	ensureTemValuesInitialized();
2251		String val = (String)(data.get(key));
	2226	String val = data.get(key);
2252	2227	// store it, minus the special prefix
2253	2228	templateValues.put(key.substring(TEMPLATE_PREF.length()), val);
2254	2229	}

2257	2232
2258	2233	public void propagateTemplateForAll() {
2259	2234	ensureTemValuesInitialized();
2260		for (Iterator iter = getAllQuestions().values().iterator(); iter.hasNext(); ) {
2261		Question q = (Question) (iter.next());
	2235	for (Question q : getAllQuestions().values()) {
2262	2236	q.load(templateValues);
2263	2237	}
2264	2238	}

2267	2241
2268	2242	private void ensureTemValuesInitialized() {
2269	2243	if (templateValues == null) {
2270		templateValues = new HashMap();
	2244	templateValues = new HashMap<>();
2271	2245	}
2272	2246	}
2273	2247
2274	2248	private void ensurePathInitialized() {
2275	2249	if (path == null) {
2276	2250	path = new Path();
2277		hiddenPath = new ArrayList();
	2251	hiddenPath = new ArrayList<>();
2278	2252
2279	2253	if (parent == null)
2280	2254	rawPath = new Path();

2288	2262
2289	2263
2290	2264	private Question lookup(String tag) {
2291		Question q = (Question)(allQuestions.get(tag));
	2265	Question q = allQuestions.get(tag);
2292	2266	// if q is null, search children till we find it
2293	2267	for (int i = 0; i < children.size() && q == null; i++) {
2294		Interview child = (Interview)children.elementAt(i);
	2268	Interview child = children.elementAt(i);
2295	2269	q = child.lookup(tag);
2296	2270	}
2297	2271

2375	2349	}
2376	2350
2377	2351	private void verifyPredictPath(){
2378		for (Object o : getInterviews()){
2379		if (o instanceof Interview){
2380		Interview i = (Interview) o;
2381		if (i.path != null && i.currIndex >= i.path.size()){
2382		i.currIndex = i.path.size()-1;
2383		}
	2352	for (Interview i : getInterviews()) {
	2353	if (i.path != null && i.currIndex >= i.path.size()) {
	2354	i.currIndex = i.path.size() - 1;
2384	2355	}
2385	2356	}
2386	2357	}

2472	2443	i2.caller = iq;
2473	2444	if (i2.path == null) {
2474	2445	i2.path = new Path();
2475		i2.hiddenPath = new ArrayList();
	2446	i2.hiddenPath = new ArrayList<>();
2476	2447	}
2477	2448	else {
2478	2449	i2.path.clear();

2673	2644	/**
2674	2645	* Any child interviews.
2675	2646	*/
2676		private Vector children = new Vector();
	2647	private Vector<Interview> children = new Vector<>();
2677	2648
2678	2649	/**
2679	2650	* An index of the questions in this interview.
2680	2651	*/
2681		private Map allQuestions = new LinkedHashMap();
	2652	private Map<String, Question> allQuestions = new LinkedHashMap<>();
2682	2653
2683	2654	/**
2684	2655	* The default image for questions in the interview.

2701	2672	private boolean updateEnabled;
2702	2673	private boolean edited;
2703	2674
2704		private Map allMarkers;
2705		private HashMap<String,String> extraValues; // used in top-level interview only
2706		private HashMap<String,String> templateValues;
	2675	private Map<String, Set<Question>> allMarkers;
	2676	private Map<String, String> extraValues; // used in top-level interview only
	2677	private Map<String, String> templateValues;
2707	2678
2708	2679	private int semantics = SEMANTIC_PRE_32;
2709	2680

+2

-2

src/com/sun/interview/InterviewQuestion.java less more

107	107	* there is no value, and so no action is performed.
108	108	* @param data The map from which to load the state for this question.
109	109	*/
110		protected void load(Map data) {
	110	protected void load(Map<String, String> data) {
111	111	// no need to super.load(data)
112	112	}
113	113

117	117	* there is no value, and so no action is performed.
118	118	* @param data The map from which to load the state for this question.
119	119	*/
120		protected void save(Map data) {
	120	protected void save(Map<String, String> data) {
121	121	// no need to super.save(data)
122	122	}
123	123

+30

-32

src/com/sun/interview/InterviewSet.java less more

107	107	if (dependency == null)
108	108	throw new NullPointerException();
109	109
110		Set allDeps = getAllDependencies(dependency);
	110	Set<Interview> allDeps = getAllDependencies(dependency);
111	111	if (allDeps != null && allDeps.contains(child))
112	112	throw new CycleFault(child, dependency);
113	113
114		Set deps = getDependencies(child, true);
	114	Set<Interview> deps = getDependencies(child, true);
115	115	deps.add(dependency);
116	116
117	117	sortedCalls = null;

130	130	if (dependency == null)
131	131	throw new NullPointerException();
132	132
133		Set deps = getDependencies(child, false);
	133	Set<Interview> deps = getDependencies(child, false);
134	134
135	135	if (deps != null)
136	136	deps.remove(dependency);

141	141	sortedCalls = null;
142	142	}
143	143
144		private Set getDependencies(Interview child, boolean create) {
145		Set deps = (Set) (dependencies.get(child));
	144	private Set<Interview> getDependencies(Interview child, boolean create) {
	145	Set<Interview> deps = dependencies.get(child);
146	146
147	147	if (deps == null && create) {
148		deps = new TreeSet(new ChildComparator());
	148	deps = new TreeSet<Interview>(new ChildComparator());
149	149	dependencies.put(child, deps);
150	150	}
151	151
152	152	return deps;
153	153	}
154	154
155		private Set getAllDependencies(Interview child) {
156		Set s = new HashSet();
	155	private Set<Interview> getAllDependencies(Interview child) {
	156	Set<Interview> s = new HashSet<>();
157	157	getAllDependencies(child, s);
158	158	return s;
159	159	}
160	160
161		private void getAllDependencies(Interview child, Set s) {
	161	private void getAllDependencies(Interview child, Set<Interview> s) {
162	162	if (s.contains(child))
163	163	return;
164	164
165		Set deps = getDependencies(child, false);
	165	Set<Interview> deps = getDependencies(child, false);
166	166	if (deps != null) {
167		for (Iterator iter = deps.iterator(); iter.hasNext(); ) {
168		Interview i = (Interview) (iter.next());
	167	for (Iterator<Interview> iter = deps.iterator(); iter.hasNext(); ) {
	168	Interview i = iter.next();
169	169	getAllDependencies(i, s);
170	170	s.add(i);
171	171	}

173	173	}
174	174
175	175	private Interview[] sortChildren() {
176		List list = new ArrayList();
177		Set cycleSet = new HashSet();
178
179		for (Iterator iter = children.iterator(); iter.hasNext(); ) {
180		Interview child = (Interview) (iter.next());
	176	List<Interview> list = new ArrayList<>();
	177	Set<Interview> cycleSet = new HashSet<>();
	178
	179	for (Interview child : children) {
181	180	if (!list.contains(child))
182	181	addToList(list, child, cycleSet);
183	182	}
184	183
185		for (Iterator iter = list.iterator(); iter.hasNext(); ) {
186		Interview i = (Interview) (iter.next());
	184	for (Interview i : list) {
187	185	System.err.println(i.getTag() + " " + i);
188	186	}
189	187
190		return (Interview[]) (list.toArray(new Interview[list.size()]));
191		}
192
193		private void addToList(List list, Interview child, Set cycleSet) {
	188	return list.toArray(new Interview[list.size()]);
	189	}
	190
	191	private void addToList(List<Interview> list, Interview child, Set<Interview> cycleSet) {
194	192	// assert !cycleSet.contains(child);
195	193	if (cycleSet.contains(child))
196	194	throw new IllegalArgumentException();
197	195
198	196	cycleSet.add(child);
199	197
200		Set deps = (Set) (dependencies.get(child));
	198	Set<Interview> deps = dependencies.get(child);
201	199	if (deps != null) {
202		for (Iterator iter = deps.iterator(); iter.hasNext(); ) {
203		Interview dep = (Interview) (iter.next());
	200	for (Iterator<Interview> iter = deps.iterator(); iter.hasNext(); ) {
	201	Interview dep = iter.next();
204	202	addToList(list, dep, cycleSet);
205	203	}
206	204	}

234	232
235	233	private FinalQuestion qEnd = new FinalQuestion(this);
236	234
237		private List children = new ArrayList();
238		private Map dependencies = new HashMap();
	235	private List<Interview> children = new ArrayList<>();
	236	private Map<Interview, Set<Interview>> dependencies = new HashMap<>();
239	237	private Question sortedCalls;
240	238
241		private class ChildComparator implements Comparator
	239	private class ChildComparator implements Comparator<Interview>
242	240	{
243		public int compare(Object o1, Object o2) {
	241	public int compare(Interview o1, Interview o2) {
244	242	if (!children.contains(o1) \|\| !children.contains(o2))
245	243	throw new IllegalArgumentException();
246	244
247	245	if (o1 == o2)
248	246	return 0;
249	247
250		for (Iterator iter = children.iterator(); iter.hasNext(); ) {
251		Object o = iter.next();
	248	for (Iterator<Interview> iter = children.iterator(); iter.hasNext(); ) {
	249	Interview o = iter.next();
252	250	if (o == o1)
253	251	return -1;
254	252	if (o == o2)

+4

-4

src/com/sun/interview/JavaHelpFactory.java less more

47	47	public JavaHelpFactory() {
48	48	}
49	49
50		public Object createHelpSetObject(String name, Class c) throws Interview.Fault {
	50	public Object createHelpSetObject(String name, Class<?> c) throws Interview.Fault {
51	51	ClassLoader cl = c.getClassLoader();
52	52	String hsn;
53	53	String pref = "";

86	86	public Object createHelpID(Object hsObject, String target) {
87	87	if (hsObject != null) {
88	88	HelpSet hs = (HelpSet) hsObject;
89		HashMap m = hs.getCombinedMap();
	89	HashMap<String, URL> m = hs.getCombinedMap();
90	90	if (m != null && !m.isEmpty()) {
91	91	return HelpID.create(target, hs);
92	92	}

102	102	if (oldHelpSet == null) {
103	103	// no previously registered helpset
104	104	// so add in any helpsets for child interviews
105		for (Iterator iter = interview.getInterviews().iterator(); iter.hasNext(); ) {
106		Interview i = (Interview) (iter.next());
	105	for (Iterator<Interview> iter = interview.getInterviews().iterator(); iter.hasNext(); ) {
	106	Interview i = iter.next();
107	107	HelpSet ihs = (HelpSet)i.getHelpSet();
108	108	if (ihs != null)
109	109	newHelpSet.add(ihs);

+17

-17

src/com/sun/interview/ListQuestion.java less more

124	124	public String getDefaultSummary() {
125	125	if (defaultSummary == null) {
126	126	// recycle any default summaries that are no longer required
127		Vector bodies = question.bodies;
	127	Vector<Body> bodies = question.bodies;
128	128	for (int i = 0; i < bodies.size(); i++) {
129		Body b = (Body) (bodies.elementAt(i));
	129	Body b = (bodies.elementAt(i));
130	130	if (b.defaultSummary != null
131	131	&& b.getSummary() != null
132	132	&& !b.defaultSummary.equals(b.getSummary())) {

141	141	// check s is not the same as any current default summary;
142	142	// if it is, reset it to null
143	143	for (int i = 0; i < bodies.size(); i++) {
144		Body b = (Body) (bodies.elementAt(i));
	144	Body b = (bodies.elementAt(i));
145	145	if (s.equals(b.defaultSummary)) {
146	146	s = null;
147	147	break;

188	188	}
189	189	else {
190	190	end = new EndQuestion(interview, tag, this);
191		bodies = new Vector();
	191	bodies = new Vector<>();
192	192	}
193	193	}
194	194

234	234	*/
235	235	public Body getSelectedBody() {
236	236	if (value >= 0 && value < bodies.size())
237		return (Body) (bodies.elementAt(value));
	237	return bodies.elementAt(value);
238	238	else
239	239	return null;
240	240	}

393	393	return end.getDefaultTextArgs();
394	394	}
395	395
396		protected void load(Map data) {
	396	protected void load(Map<String, String> data) {
397	397	bodies.setSize(0);
398		String c = (String) (data.get(tag + ".count"));
	398	String c = data.get(tag + ".count");
399	399	if (c != null && c.length() > 0) {
400	400	try {
401	401	int n = Integer.parseInt(c);

408	408	}
409	409	}
410	410
411		String v = (String) (data.get(tag + ".curr"));
	411	String v = data.get(tag + ".curr");
412	412	if (v == null \|\| v.length() == 0)
413	413	value = 0;
414	414	else {

421	421	}
422	422	}
423	423
424		protected void save(Map data) {
	424	protected void save(Map<String, String> data) {
425	425	data.put(tag + ".count", String.valueOf(bodies.size()));
426	426	data.put(tag + ".curr", String.valueOf(value));
427	427	}

454	454	* valid body
455	455	*/
456	456	public Body getBody(int index) {
457		return (Body) (bodies.elementAt(index));
	457	return bodies.elementAt(index);
458	458	}
459	459
460	460	/**

509	509	public int getIncompleteBodyCount() {
510	510	int count = 0;
511	511	for (int i = 0; i < bodies.size(); i++) {
512		Body b = (Body) (bodies.elementAt(i));
	512	Body b = bodies.elementAt(i);
513	513	if (!b.isInterviewFinishable())
514	514	count++;
515	515	}

518	518
519	519
520	520	private final EndQuestion end;
521		private final Vector bodies;
	521	private final Vector<Body> bodies;
522	522	private int value;
523	523
524	524	private static final ResourceBundle i18n = Interview.i18n;

532	532	public Question getNext() {
533	533	boolean allBodiesFinishable = true;
534	534	for (int i = 0; i < head.getBodyCount(); i++) {
535		Body b = (Body) (head.getBody(i));
	535	Body b = head.getBody(i);
536	536	if (!b.isInterviewFinishable()) {
537	537	allBodiesFinishable = false;
538	538	break;

604	604	head.clear();
605	605	}
606	606
607		protected void load(Map data) {
608		}
609
610		protected void save(Map data) {
	607	protected void load(Map<String, String> data) {
	608	}
	609
	610	protected void save(Map<String, String> data) {
611	611	}
612	612
613	613	public Body[] getBodies() {

+2

-2

src/com/sun/interview/NullQuestion.java less more

149	149	* the tag as the key.
150	150	* @param data ignored
151	151	*/
152		protected void load(Map data) {
	152	protected void load(Map<String, String> data) {
153	153	}
154	154
155	155	/**

157	157	* the tag as the key. Since there is no value, this method is a no-op.
158	158	* @param data ignored
159	159	*/
160		protected void save(Map data) {
	160	protected void save(Map<String, String> data) {
161	161	}
162	162
163	163	public static final int LEVEL_NONE = -1;

+12

-12

src/com/sun/interview/Properties2.java less more

47	47	* capabilities.
48	48	*/
49	49
50		public class Properties2 extends Hashtable {
	50	public class Properties2 extends Hashtable<String, Object> {
51	51	/**
52	52	* A property list that contains default values for any keys not
53	53	* found in this property list.

70	70	}
71	71
72	72	public void load(java.util.Properties source) {
73		Enumeration e = source.propertyNames();
	73	Enumeration<?> e = source.propertyNames();
74	74	while(e.hasMoreElements()) {
75	75	Object next = e.nextElement();
76	76	put( ((String)next), source.get(next) );

202	202	prnt.write('#');
203	203	prnt.println(new Date());
204	204
205		for (Enumeration e = keys() ; e.hasMoreElements() ;) {
206		String key = (String)e.nextElement();
	205	for (Enumeration<String> e = keys() ; e.hasMoreElements() ;) {
	206	String key = e.nextElement();
207	207	prnt.print(key);
208	208	prnt.write('=');
209	209

284	284	* @see java.util.Enumeration
285	285	* @see com.sun.interview.Properties2#defaults
286	286	*/
287		public Enumeration propertyNames() {
288		Hashtable h = new Hashtable();
	287	public Enumeration<String> propertyNames() {
	288	Hashtable<String, Object> h = new Hashtable<>();
289	289	enumerate(h);
290	290	return h.keys();
291	291	}

304	304	*/
305	305	public void list(PrintWriter out) {
306	306	out.println("-- listing properties --");
307		Hashtable h = new Hashtable();
	307	Hashtable<String, Object> h = new Hashtable<>();
308	308	enumerate(h);
309		for (Enumeration e = h.keys() ; e.hasMoreElements() ;) {
310		String key = (String)e.nextElement();
	309	for (Enumeration<String> e = h.keys() ; e.hasMoreElements() ;) {
	310	String key = e.nextElement();
311	311	String val = (String)h.get(key);
312	312	if (val.length() > 40) {
313	313	val = val.substring(0, 37) + "...";

320	320	* Enumerates all key/value pairs in the specified hastable.
321	321	* @param h the hashtable
322	322	*/
323		private synchronized void enumerate(Hashtable h) {
	323	private synchronized void enumerate(Hashtable<String, Object> h) {
324	324	if (defaults != null) {
325	325	defaults.enumerate(h);
326	326	}
327		for (Enumeration e = keys() ; e.hasMoreElements() ;) {
328		String key = (String)e.nextElement();
	327	for (Enumeration<String> e = keys() ; e.hasMoreElements() ;) {
	328	String key = e.nextElement();
329	329	h.put(key, get(key));
330	330	}
331	331	}

+42

-55

src/com/sun/interview/PropertiesQuestion.java less more

29	29	import java.io.IOException;
30	30	import java.io.StringReader;
31	31	import java.io.StringWriter;
32		import java.util.ArrayList;
33		import java.util.Enumeration;
34		import java.util.HashMap;
35		import java.util.Iterator;
36		import java.util.Map;
37		import java.util.MissingResourceException;
38		import java.util.Properties;
39		import java.util.ResourceBundle;
40		import java.util.Set;
	32	import java.util.*;
41	33
42	34	import com.sun.interview.Interview.Fault;
43	35
44	36	// todo:
45		import java.util.Collections;
	37
46	38	// how to sort values
47	39	// how to sort groups for display
48	40	// table headers - default, with set methods

142	134	if (!localize \|\| b == null) // will use literal keys
143	135	presentationKeys = null;
144	136	else {
145		presentationKeys = new HashMap();
	137	presentationKeys = new HashMap<>();
146	138	for (int i = 0; i < keys.length; i++) {
147	139	String c = keys[i];
148	140	String rn = tag + "." + c;

163	155	* @return The set of keys (internal non-i18n value)
164	156	* @see #setKeys
165	157	*/
166		public Enumeration getKeys() {
	158	public Enumeration<?> getKeys() {
167	159	if (value != null)
168	160	return value.keys();
169	161	else

223	215	if (value != null) {
224	216	String sep = System.getProperty("line.separator");
225	217
226		Enumeration names = value.propertyNames();
227		ArrayList list = Collections.list(names);
228		Collections.sort(list);
229		for (Object o : list) {
230		String key = (String)o;
	218	SortedSet<String> names = new TreeSet<>(value.stringPropertyNames());
	219	for (String key : names) {
231	220	result.append(key);
232	221	result.append("=");
233	222	result.append(value.getProperty(key));

306	295	* the tag as the key.
307	296	* @param data The map from which to load the value for this question.
308	297	*/
309		protected void load(Map data) {
310		Object o = data.get(tag);
311		if (o != null && o instanceof String) {
312		setValue(load((String)o));
	298	protected void load(Map<String, String> data) {
	299	String o = data.get(tag);
	300	if (o != null) {
	301	setValue(load(o));
313	302	}
314	303	}
315	304

327	316	// repopulate a J2SE properties object
328	317	Properties p = new Properties();
329	318
330		Enumeration e = p2.propertyNames();
	319	Enumeration<?> e = p2.propertyNames();
331	320	while(e.hasMoreElements()) {
332	321	Object next = e.nextElement();
333		p.put( ((String)next), p2.get(next) );
	322	p.put( next, p2.get(next) );
334	323	} // while
335	324
336	325	return p;

341	330	* the tag as the key.
342	331	* @param data The map in which to save the value for this question.
343	332	*/
344		protected void save(Map data) {
	333	protected void save(Map<String, String> data) {
345	334	if (value == null)
346	335	return;
347	336

418	407	* in index one. Null means there are no invalid keys.
419	408	*/
420	409	public String[][] getInvalidKeys() {
421		Enumeration names = value.propertyNames();
422		ArrayList badKeys = new ArrayList();
423		ArrayList reasons = new ArrayList();
	410	Enumeration<?> names = value.propertyNames();
	411	List<String> badKeys = new ArrayList<>();
	412	List<String> reasons = new ArrayList<>();
424	413
425	414	while (names.hasMoreElements()) {
426	415	String curr = (String)(names.nextElement());

442	431	if (badKeys.size() > 0) {
443	432	String[][] ret = new String[badKeys.size()][2];
444	433	for (int i = 0; i < badKeys.size(); i++) {
445		ret[i][0] = (String)(badKeys.get(i));
446		ret[i][1] = (String)(reasons.get(i));
	434	ret[i][0] = badKeys.get(i);
	435	ret[i][1] = reasons.get(i);
447	436	} // for
448	437
449	438	return ret;

558	547	*/
559	548	public void createGroup(String name) {
560	549	if (keyGroups == null)
561		keyGroups = new HashMap();
	550	keyGroups = new HashMap<>();
562	551
563	552	Object o = keyGroups.get(name);
564	553	if (o != null)
565	554	throw new IllegalStateException("Group " + name + " already exists.");
566	555
567		ArrayList al = new ArrayList();
	556	ArrayList<String> al = new ArrayList<>();
568	557	keyGroups.put(name, al);
569	558	}
570	559

591	580	throw new IllegalArgumentException("No such group: " + group);
592	581
593	582	// find existing group or create
594		ArrayList l = ((ArrayList)(keyGroups.get(group)));
	583	ArrayList<String> l = keyGroups.get(group);
595	584	if (l == null)
596	585	throw new IllegalArgumentException("No such group: " + group);
597	586
598	587	// remove key from all groups
599		Iterator vals = keyGroups.values().iterator();
	588	Iterator<ArrayList<String>> vals = keyGroups.values().iterator();
600	589	while (vals.hasNext()) {
601		ArrayList al = ((ArrayList)(vals.next()));
	590	ArrayList<String> al = vals.next();
602	591	for (int i = 0; i < al.size(); i++)
603	592	if (al.get(i).equals(key))
604	593	al.remove(i);

632	621	if (keyGroups == null)
633	622	return null;
634	623
635		ArrayList result = new ArrayList();
636		Set keys = keyGroups.keySet();
	624	ArrayList<String> result = new ArrayList<>();
	625	Set<String> keys = keyGroups.keySet();
637	626	if (keys != null) {
638		Iterator it = keys.iterator();
	627	Iterator<String> it = keys.iterator();
639	628	while(it.hasNext()) {
640		Object key = it.next();
641		ArrayList al = ((ArrayList)keyGroups.get(key));
	629	String key = it.next();
	630	ArrayList<String> al = keyGroups.get(key);
642	631	if (al == null \|\| al.size() == 0)
643	632	continue; // empty group
644	633

650	639	return null;
651	640	else {
652	641	String[] ret = new String[result.size()];
653		ret = (String[])(result.toArray(ret));
	642	ret = result.toArray(ret);
654	643	return ret;
655	644	}
656	645	}

670	659	if (group == null)
671	660	return getUngrouped();
672	661
673		ArrayList al = ((ArrayList)keyGroups.get(group));
	662	ArrayList<String> al = keyGroups.get(group);
674	663
675	664	if (al == null \|\| al.size() == 0)
676	665	return null;
677	666	else {
678		Iterator it = al.iterator();
	667	Iterator<String> it = al.iterator();
679	668	String[][] data = new String[al.size()][2];
680	669	for(int i = 0; it.hasNext(); i++) {
681		data[i][0] = (String)(it.next());
	670	data[i][0] = it.next();
682	671	data[i][1] = (String)(value.get(data[i][0]));
683	672	} // for
684	673

697	686	return null;
698	687
699	688	if (keyGroups != null) {
700		Set keys = keyGroups.keySet();
	689	Set<String> keys = keyGroups.keySet();
701	690	if (keys != null) {
702	691	String[] gps = getGroups();
703	692	Properties copy = (Properties)(value.clone());

712	701	}
713	702
714	703	if (copy.size() > 0) {
715		Enumeration en = copy.propertyNames();
	704	Set<String> en = copy.stringPropertyNames();
716	705	String[][] ret = new String[copy.size()][2];
717	706	int i = 0;
718
719		while (en.hasMoreElements()) {
720		String key = (String)(en.nextElement());
	707	for (String key : en) {
721	708	ret[i][0] = key;
722	709	ret[i][1] = copy.getProperty(key);
723	710	i++;

731	718	}
732	719	// no groups, return the entire value set
733	720	String[][] ret = new String[value.size()][2];
734		Enumeration en = value.propertyNames();
	721	Enumeration<?> en = value.propertyNames();
735	722	int i = 0;
736	723
737	724	while (en.hasMoreElements()) {

802	789	*/
803	790	public void setConstraints(String key, ValueConstraints c) {
804	791	if (constraints == null)
805		constraints = new HashMap();
	792	constraints = new HashMap<>();
806	793
807	794	if (value == null \|\| value.getProperty(key) == null)
808	795	throw new IllegalArgumentException("No such key: " + key);

858	845	/**
859	846	* Returns the localized key values to display
860	847	*/
861		public HashMap getPresentationKeys(){
	848	public Map<String, String> getPresentationKeys(){
862	849	return presentationKeys;
863	850	}
864	851

871	858	if (constraints == null)
872	859	return null;
873	860	else
874		return ((ValueConstraints)(constraints.get(key)));
	861	return constraints.get(key);
875	862	}
876	863
877	864	/**

879	866	* set of property keys. Null indicates that no i18n presentation values
880	867	* are provided.
881	868	*/
882		private HashMap presentationKeys;
	869	private Map<String, String> presentationKeys;
883	870
884	871	/**
885	872	* Indexed like everything else, by property key, the value is a
886	873	* ValueConstraint.
887	874	*/
888		private HashMap constraints;
	875	private Map<String, ValueConstraints> constraints;
889	876
890	877	/**
891	878	* The current (default or latest) response to this question.

901	888	* Record of key groupings. Key is the group name string, the value is
902	889	* a ArrayList.
903	890	*/
904		private HashMap keyGroups;
	891	private Map<String, ArrayList<String>> keyGroups;
905	892
906	893	// these are now represented in ValueConstraints
907	894	//private HashSet readOnlyKeys;

+5

-4

src/com/sun/interview/Question.java less more

27	27
28	28	import java.net.URL;
29	29	import java.text.MessageFormat;
	30	import java.util.HashMap;
30	31	import java.util.Map;
31	32
32	33	/**

400	401	* using the tag as the key.
401	402	* @param data The map from which to load the value for this question.
402	403	*/
403		protected abstract void load(Map data);
	404	protected abstract void load(Map<String, String> data);
404	405
405	406	/**
406	407	* Save any state for this question in a dictionary,
407	408	* using the tag as the key.
408	409	* @param data The map in which to save the value for this question.
409	410	*/
410		protected abstract void save(Map data);
	411	protected abstract void save(Map<String, String> data);
411	412
412	413	/**
413	414	* Export any appropriate values to the dictionary, as part

420	421	* @see Interview#getPath
421	422	* @see #isEnabled
422	423	*/
423		protected void export(Map data) {
	424	protected void export(Map<String, String> data) {
424	425	}
425	426
426	427	/**

429	430	* the question value.
430	431	*/
431	432	public void reload() {
432		Map map = new java.util.HashMap();
	433	Map<String, String> map = new HashMap<>();
433	434	save(map);
434	435	clear();
435	436	load(map);

+6

-9

src/com/sun/interview/StringListQuestion.java less more

140	140	}
141	141
142	142	public void setValue(String s) {
143		setValue(s == null ? ((String[]) null) : split(s));
	143	setValue(s == null ? null : split(s));
144	144	}
145	145
146	146	/**

182	182	* the tag as the key.
183	183	* @param data The map from which to load the value for this question.
184	184	*/
185		protected void load(Map data) {
186		Object o = data.get(tag);
187		if (o instanceof String[])
188		setValue((String[]) o);
189		else if (o instanceof String)
190		setValue((String) o);
	185	protected void load(Map<String, String> data) {
	186	String o = data.get(tag);
	187	setValue(o);
191	188	}
192	189
193	190	/**

195	192	* the tag as the key.
196	193	* @param data The map in which to save the value for this question.
197	194	*/
198		protected void save(Map data) {
	195	protected void save(Map<String, String> data) {
199	196	if (value != null)
200	197	data.put(tag, getStringValue());
201	198	}

247	244
248	245	final char sep = '\n';
249	246
250		Vector v = new Vector();
	247	Vector<String> v = new Vector<>();
251	248	int start = -1;
252	249	for (int i = 0; i < s.length(); i++) {
253	250	if (s.charAt(i) == sep) {

+3

-5

src/com/sun/interview/StringQuestion.java less more

180	180	* the tag as the key.
181	181	* @param data The map from which to load the value for this question.
182	182	*/
183		protected void load(Map data) {
184		Object o = data.get(tag);
185		if (o instanceof String)
186		setValue((String)o);
	183	protected void load(Map<String, String> data) {
	184	setValue(data.get(tag));
187	185	}
188	186
189	187	/**

191	189	* the tag as the key.
192	190	* @param data The map in which to save the value for this question.
193	191	*/
194		protected void save(Map data) {
	192	protected void save(Map<String, String> data) {
195	193	if (value != null)
196	194	data.put(tag, value);
197	195	}

+4

-4

src/com/sun/interview/TreeQuestion.java less more

310	310	* the tag as the key.
311	311	* @param data The map from which to load the value for this question.
312	312	*/
313		protected void load(Map data) {
314		String paths = (String) (data.get(tag));
	313	protected void load(Map<String, String> data) {
	314	String paths = data.get(tag);
315	315	setValue(paths);
316	316	}
317	317

320	320	* the tag as the key.
321	321	* @param data The map in which to save the value for this question.
322	322	*/
323		protected void save(Map data) {
	323	protected void save(Map<String, String> data) {
324	324	data.put(tag, join(value));
325	325	}
326	326

328	328	if (s == null)
329	329	return empty;
330	330
331		Vector v = new Vector();
	331	Vector<String> v = new Vector<>();
332	332	int start = -1;
333	333	for (int i = 0; i < s.length(); i++) {
334	334	if (white(s.charAt(i))) {

+10

-14

src/com/sun/interview/WizEdit.java less more

36	36	import java.io.IOException;
37	37	import java.io.PrintStream;
38	38	import java.text.MessageFormat;
39		import java.util.Hashtable;
40		import java.util.Properties;
41		import java.util.ResourceBundle;
42		import java.util.Vector;
	39	import java.util.*;
43	40
44	41	/**
45	42	* An API (with a basic front-end application) for batch editing an

130	127	*/
131	128	public static void main(String[] args) {
132	129	try {
133		Vector v = new Vector();
	130	Vector<String> v = new Vector<>();
134	131	File interviewFile = null;
135	132	File outFileName = null;
136	133

154	151
155	152	try {
156	153	InputStream in = new BufferedInputStream(new FileInputStream(interviewFile));
157		Properties p = new Properties();
158		p.load(in);
159		String interviewClassName = (String)p.get("INTERVIEW");
	154	Map<String, String> stringProps = com.sun.javatest.util.Properties.load(in);
	155	String interviewClassName = stringProps.get("INTERVIEW");
160	156	if (interviewClassName == null)
161	157	throw new Fault(i18n, "edit.noInterview");
162		Class ic = Class.forName(interviewClassName);
	158	Class<?> ic = Class.forName(interviewClassName);
163	159	interview = (Interview)(ic.newInstance());
164		interview.load(p, false);
	160	interview.load(stringProps, false);
165	161	}
166	162	catch (FileNotFoundException e) {
167	163	throw new Fault(i18n, "edit.cantFindFile", interviewFile);

179	175	try {
180	176	OutputStream out = new BufferedOutputStream(new FileOutputStream(outFileName));
181	177	Properties p = new Properties();
182		interview.save(p);
	178	interview.save(com.sun.javatest.util.Properties.convertToStringProps(p));
183	179	p.store(out, "Interview: " + interview.getTitle());
184	180	}
185	181	catch (IOException e) {

279	275	if (searchText.length() == 0)
280	276	throw new Fault(i18n, "edit.badCmd", cmd);
281	277
282		Hashtable answers = new Hashtable();
	278	Map<String, String> answers = new Hashtable<>();
283	279	interview.save(answers);
284	280
285	281	Question[] path = interview.getPath();
286	282	for (int i = 0; i < path.length; i++) {
287	283	Question q = path[i];
288	284	try {
289		String answer = (String)(answers.get(q.getTag()));
	285	String answer = answers.get(q.getTag());
290	286	if (answer == null)
291	287	continue;
292	288	// // currently hardwired: considerCase: false; word match: false

300	296	q.setValue(newAnswer);
301	297
302	298	if (verbose) {
303		Hashtable h = new Hashtable();
	299	Map<String, String> h = new Hashtable<>();
304	300	q.save(h);
305	301	out.println("Question: " + q.getSummary());
306	302	out.println("changed from: " + answer);

+22

-26

src/com/sun/interview/WizPrint.java less more

25	25	*/
26	26	package com.sun.interview;
27	27
	28	import com.sun.javatest.util.Properties;
	29
28	30	import java.io.*;
29	31	import java.nio.charset.StandardCharsets;
30	32	import java.text.MessageFormat;
31		import java.util.Map;
32		import java.util.Iterator;
33		import java.util.Properties;
34		import java.util.ResourceBundle;
35		import java.util.Vector;
	33	import java.util.*;
36	34
37	35	/**
38	36	* An API (with a basic front-end application) for generating HTML printouts

170	168	throw new BadArgs(i18n, "wp.badArg", args[i]);
171	169	}
172	170
173		Map interviewData = null;
	171	Map<String, String> interviewData = null;
174	172
175	173	if (interviewFile != null) {
176	174	try {
177	175	InputStream in = new BufferedInputStream(new FileInputStream(interviewFile));
178		Properties p = new Properties();
179		p.load(in);
180		interviewClassName = (String)p.get("INTERVIEW");
181		interviewData = p;
	176	interviewData = Properties.load(in);
	177	interviewClassName = interviewData.get("INTERVIEW");
182	178	}
183	179	catch (FileNotFoundException e) {
184	180	throw new Fault(i18n, "wp.cantFindFile", interviewFile);

203	199	throw new BadArgs(i18n, "wp.noOutput");
204	200	}
205	201
206		Class ic = Class.forName(interviewClassName, true, ClassLoader.getSystemClassLoader());
	202	Class<?> ic = Class.forName(interviewClassName, true, ClassLoader.getSystemClassLoader());
207	203	Interview interview = (Interview)(ic.newInstance());
208	204	Question[] questions;
209	205

216	212	else {
217	213	// enumerate questions, sort on tag
218	214	SortedVector v = new SortedVector();
219		for (Iterator iter = interview.getQuestions().iterator(); iter.hasNext(); ) {
220		Question q = (Question) (iter.next());
	215	for (Iterator<Question> iter = interview.getQuestions().iterator(); iter.hasNext(); ) {
	216	Question q = iter.next();
221	217	v.insert(q);
222	218	}
223	219	questions = new Question[v.size()];

996	992	private static class SortedVector
997	993	{
998	994	public SortedVector() {
999		v = new Vector();
	995	v = new Vector<Question>();
1000	996	}
1001	997
1002	998	public SortedVector(int initialSize) {
1003		v = new Vector(initialSize);
	999	v = new Vector<>(initialSize);
1004	1000	}
1005	1001
1006	1002

1008	1004	return v.size();
1009	1005	}
1010	1006
1011		public Object elementAt(int index) {
	1007	public Question elementAt(int index) {
1012	1008	return v.elementAt(index);
1013	1009	}
1014	1010
1015		public void insert(Object o) {
	1011	public void insert(Question o) {
1016	1012	v.insertElementAt(o, findSortIndex(o));
1017	1013	}
1018	1014
1019		public void insert(Object o, boolean ignoreDuplicates) {
	1015	public void insert(Question o, boolean ignoreDuplicates) {
1020	1016	int i = findSortIndex(o);
1021	1017	if (ignoreDuplicates && (i < v.size()) && (compare(o, v.elementAt(i)) == 0))
1022	1018	return;

1024	1020	v.insertElementAt(o, i);
1025	1021	}
1026	1022
1027		public void copyInto(Object[] target) {
	1023	public void copyInto(Question[] target) {
1028	1024	v.copyInto(target);
1029	1025	}
1030	1026
1031		protected int compare(Object o1, Object o2) {
1032		String p1 = ((Question)o1).getTag();
1033		String p2 = ((Question)o2).getTag();
	1027	protected int compare(Question o1, Question o2) {
	1028	String p1 = o1.getTag();
	1029	String p2 = o2.getTag();
1034	1030
1035	1031	if (p1 == null && p2 == null)
1036	1032	return 0;

1044	1040	return p1.compareTo(p2);
1045	1041	}
1046	1042
1047		private int findSortIndex(Object o) {
	1043	private int findSortIndex(Question o) {
1048	1044	int lower = 0;
1049	1045	int upper = v.size() - 1;
1050	1046	int mid = 0;

1054	1050	}
1055	1051
1056	1052	int cmp = 0;
1057		Object last = v.elementAt(upper);
	1053	Question last = v.elementAt(upper);
1058	1054	cmp = compare(o, last);
1059	1055	if (cmp > 0)
1060	1056	return upper + 1;
1061	1057
1062	1058	while (lower <= upper) {
1063	1059	mid = lower + ((upper - lower) / 2);
1064		Object entry = v.elementAt(mid);
	1060	Question entry = v.elementAt(mid);
1065	1061	cmp = compare(o, entry);
1066	1062
1067	1063	if (cmp == 0) {

1078	1074	return (cmp < 0) ? mid : mid + 1;
1079	1075	}
1080	1076
1081		private Vector v;
	1077	private Vector<Question> v;
1082	1078	}
1083	1079
1084	1080	}

+2

-1

src/com/sun/interview/YesNoQuestion.java less more

25	25	*/
26	26	package com.sun.interview;
27	27
	28	import java.util.Objects;
28	29	import java.util.ResourceBundle;
29	30
30	31	/**

73	74
74	75	setChoices(choices, displayChoices);
75	76
76		if (defaultValue != getDefaultValue()) {
	77	if ( !Objects.equals(defaultValue, getDefaultValue()) ) {
77	78	setDefaultValue(defaultValue);
78	79	setValue(defaultValue);
79	80	}

+2

-2

src/com/sun/interview/wizard/ChoiceArrayQuestionRenderer.java less more

133	133	}
134	134
135	135	protected class TestTableModel extends AbstractTableModel {
136		public Class getColumnClass(int c) {
	136	public Class<?> getColumnClass(int c) {
137	137	return (c == 0 ? Boolean.class : String.class);
138	138	}
139	139

146	146	}
147	147
148	148	public Object getValueAt(int r, int c) {
149		return (c == 0 ? (Object) (new Boolean(values[r])) : displayChoices[r]);
	149	return c == 0 ? new Boolean(values[r]) : displayChoices[r];
150	150	}
151	151
152	152	public void setValueAt(Object o, int r, int c) {

+1

-1

src/com/sun/interview/wizard/ChoiceQuestionRenderer.java less more

184	184
185	185	protected class TestTableModel extends AbstractTableModel {
186	186
187		public Class getColumnClass(int c) {
	187	public Class<?> getColumnClass(int c) {
188	188	return String.class;
189	189	}
190	190

+6

-6

src/com/sun/interview/wizard/EditableList.java less more

64	64	setName(uiKey);
65	65	setFocusable(false);
66	66
67		listModel = new DefaultListModel(); // need to force the type of model
	67	listModel = new DefaultListModel<>(); // need to force the type of model
68	68	if (items != null) {
69	69	for (int i = 0; i < items.length; i++)
70	70	listModel.addElement(items[i]);
71	71	}
72		list = new JList(listModel);
	72	list = new JList<>(listModel);
73	73	list.setName(uiKey);
74	74	list.setToolTipText(i18n.getString(uiKey + ".tip"));
75	75	list.getAccessibleContext().setAccessibleName(list.getName());

119	119	* @param c the component type of the array to be returned
120	120	* @return an array containing the items currently in the list
121	121	*/
122		public Object[] getItems(Class c) {
	122	public Object[] getItems(Class<?> c) {
123	123	Object[] items = (Object[]) (Array.newInstance(c, listModel.size()));
124	124	listModel.copyInto(items);
125	125	return items;

280	280
281	281	protected class Renderer
282	282	extends DefaultListCellRenderer {
283		public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
	283	public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
284	284	return super.getListCellRendererComponent(list,
285	285	getDisplayValue(value),
286	286	index,

364	364	protected boolean duplicatesAllowed;
365	365	protected Listener listener = createListener();
366	366	protected Renderer renderer = createRenderer();
367		protected DefaultListModel listModel;
368		protected JList list;
	367	protected DefaultListModel<Object> listModel;
	368	protected JList<Object> list;
369	369	protected JButton addBtn;
370	370	protected JButton removeBtn;
371	371	protected JButton upBtn;

+2

-2

src/com/sun/interview/wizard/I18NResourceBundle.java less more

54	54	* @param c the class for which to obtain the resource bundle
55	55	* @return the appropriate resource bundle for the class
56	56	*/
57		public static I18NResourceBundle getBundleForClass(Class c) {
	57	public static I18NResourceBundle getBundleForClass(Class<?> c) {
58	58	String cn = c.getName();
59	59	int dot = cn.lastIndexOf('.');
60	60	String rn = (dot == -1 ? "i18n" : cn.substring(0, dot) + ".i18n");

165	165	* Load the actual resource bundle, if it has not yet been loaded,
166	166	* then hand the request off to that bundle.
167	167	*/
168		public Enumeration getKeys() {
	168	public Enumeration<String> getKeys() {
169	169	if (delegate == null)
170	170	delegate = ResourceBundle.getBundle(name, Locale.getDefault(), classLoader);
171	171	return delegate.getKeys();

+4

-4

src/com/sun/interview/wizard/InetAddressQuestionRenderer.java less more

303	303	c.weightx = 1;
304	304	msgPanel.add(errorField, c);
305	305
306		listModel = new DefaultListModel();
307		list = new JList(listModel);
	306	listModel = new DefaultListModel<>();
	307	list = new JList<>(listModel);
308	308	list.setVisibleRowCount(3);
309	309	list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
310	310	list.addListSelectionListener(this);

386	386	protected int type;
387	387	protected JTextField nameField;
388	388	protected JTextField errorField;
389		protected DefaultListModel listModel;
390		protected JList list;
	389	protected DefaultListModel<String> listModel;
	390	protected JList<String> list;
391	391	protected JButton okBtn;
392	392
393	393	protected static final String LOOKUP = "lookup";

+24

-25

src/com/sun/interview/wizard/PathPanel.java less more

113	113
114	114	public boolean getScrollableTracksViewportHeight() {
115	115	if (getParent() instanceof JViewport) {
116		return (((JViewport)getParent()).getHeight() > getPreferredSize().height);
	116	return getParent().getHeight() > getPreferredSize().height;
117	117	}
118	118	return false;
119	119	}

167	167	setFocusable(false);
168	168	setLayout(new BorderLayout());
169	169	pathList = new PathList();
170		list = new JList(pathList);
	170	list = new JList<>(pathList);
171	171	setInfo(list, "path.list", true);
172	172	list.setCellRenderer(pathList);
173	173	KeyStroke enterKey = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0);

230	230	private QuestionPanel questionPanel;
231	231	private Interview interview;
232	232	private PathList pathList;
233		private JList list;
	233	private JList<Object> list;
234	234	private String moreText;
235	235
236	236	// client parameters

243	243	private static final int DOTS_PER_INCH = Toolkit.getDefaultToolkit().getScreenResolution();
244	244
245	245	private class PathList
246		extends AbstractListModel
	246	extends AbstractListModel<Object>
247	247	implements ActionListener, AncestorListener,
248		ListCellRenderer, ListSelectionListener,
	248	ListCellRenderer<Object>, ListSelectionListener,
249	249	MouseListener,
250	250	Interview.Observer
251	251	{

281	281	//----- state support for menus -----------------------------
282	282
283	283	boolean isQuestionVisible(Question q) {
284		for (int i = 0; i < currEntries.length; i++) {
285		Object e = currEntries[i];
286		if (e instanceof Question && ((Question) e) == q)
	284	for (Object e : currEntries) {
	285	if (e instanceof Question && e == q)
287	286	return true;
288		else if (e instanceof List && ((List) e).contains(q))
	287	else if (e instanceof List && ((List<?>) e).contains(q))
289	288	return false;
290	289	}
291	290	return false;

306	305	else if (qe == q)
307	306	return autoOpened;
308	307	}
309		else if (e instanceof List && ((List) e).contains(q))
	308	else if (e instanceof List && ((List<?>) e).contains(q))
310	309	return false;
311	310	}
312	311	return false;

349	348	if (currEntries[i] == o) {
350	349	Object m = currEntries[i - 1];
351	350	if (m instanceof Question)
352		autoOpenSet.add(m);
	351	autoOpenSet.add((Question) m);
353	352	update();
354	353	}
355	354	}

408	407	}
409	408	};
410	409
411		public Component getListCellRendererComponent(JList list, Object o, int index, boolean isSelected, boolean cellHasFocus) {
	410	public Component getListCellRendererComponent(JList<?> list, Object o, int index, boolean isSelected, boolean cellHasFocus) {
412	411	if (o instanceof Question) {
413	412	Question q = (Question)o;
414	413	Font f;

479	478	}
480	479	else if (o instanceof String) {
481	480	// prototype value or more...
482		sample.setText(" " + (String)o);
	481	sample.setText(" " + o);
483	482	sample.setFont(list.getFont().deriveFont(Font.ITALIC));
484	483	sample.setForeground(list.getForeground());
485	484	sample.setIcon(markersEnabled ? noMarkerIcon : null);

508	507	// invoked by keyboard "enter"
509	508	public void actionPerformed(ActionEvent e) {
510	509	//System.err.println("PP.actionPerformed");
511		JList list = (JList)(e.getSource());
	510	JList<?> list = (JList<?>)(e.getSource());
512	511	Object o = list.getSelectedValue();
513	512	if (o != null && o instanceof Question) {
514	513	Question q = (Question)o;

532	531
533	532	// invoked by mouse selection (or by list.setSelectedXXX ??)
534	533	public void valueChanged(ListSelectionEvent e) {
535		JList list = (JList) (e.getSource());
	534	JList<?> list = (JList<?>) (e.getSource());
536	535	Object o = list.getSelectedValue();
537	536	if (o == null)
538	537	return;

554	553	}
555	554	}
556	555	else if (o instanceof List) {
557		List l = (List) o;
	556	List<?> l = (List<?>) o;
558	557	if (l.contains(interview.getCurrentQuestion()))
559	558	return;
560	559

606	605	}
607	606
608	607	private boolean isOverSelection(MouseEvent e) {
609		JList l = (JList) (e.getComponent());
	608	JList<?> l = (JList<?>) (e.getComponent());
610	609	Rectangle r = l.getCellBounds(currIndex, currIndex);
611	610	return (r.contains(e.getX(), e.getY()));
612	611	}

659	658	currQuestion = q;
660	659	for (int i = 0; i < currEntries.length; i++) {
661	660	Object o = currEntries[i];
662		if (o == q \|\| (o instanceof List && ((List) o).contains(q))) {
	661	if (o == q \|\| (o instanceof List && ((List<?>) o).contains(q))) {
663	662	currIndex = i;
664	663	break;
665	664	}

754	753	for (int i = 0; i < currEntries.length; i++) {
755	754	Object o = currEntries[i];
756	755	if (o == currQuestion
757		\|\| (o instanceof List && ((List) o).contains(currQuestion))) {
	756	\|\| (o instanceof List && ((List<?>) o).contains(currQuestion))) {
758	757	currIndex = i;
759	758	break;
760	759	}

775	774	if ( (!markersEnabled \|\| !markersFilterEnabled) && !needMore)
776	775	return path;
777	776
778		Vector v = new Vector();
	777	Vector<Object> v = new Vector<>();
779	778	Question lastMarker = null;
780	779	for (int i = 0; i < path.length; i++) {
781	780	Question q = path[i];

792	791	v.add(q);
793	792	}
794	793	else {
795		List l;
	794	List<Question> l;
796	795	Object o = v.lastElement();
797	796	if (o == null \|\| o instanceof Question) {
798		l = new Vector();
	797	l = new Vector<>();
799	798	v.add(l);
800	799	}
801	800	else
802		l = (List) o;
	801	l = (List<Question>) o;
803	802	l.add(q);
804	803	}
805	804	}
806	805
807	806	// auto-expand the final section if it doesn't end in FinalQuestion
808	807	if (!(last instanceof FinalQuestion) && v.lastElement() instanceof List) {
809		List l = (List) (v.lastElement());
	808	List<?> l = (List<?>) (v.lastElement());
810	809	v.setSize(v.size() - 1);
811	810	v.addAll(l);
812	811	}

837	836	private boolean[] currMarks;
838	837
839	838	// autoOpenSet gives which non-markered questions should be displayed
840		private Set autoOpenSet = new HashSet();
	839	private Set<Question> autoOpenSet = new HashSet<>();
841	840
842	841	private Icon markerIcon = new MarkerIcon(true);
843	842	private Icon noMarkerIcon = new MarkerIcon(false);

+9

-12

src/com/sun/interview/wizard/PropertiesQuestionRenderer.java less more

31	31	import java.awt.KeyboardFocusManager;
32	32	import java.awt.event.ActionEvent;
33	33	import java.awt.event.ActionListener;
34		import java.util.ArrayList;
35		import java.util.HashMap;
	34	import java.util.*;
36	35
37	36	import javax.accessibility.AccessibleContext;
38	37

53	52	import com.sun.interview.Question;
54	53	import com.sun.javatest.tool.UIFactory;
55	54
56		import java.util.Iterator;
57		import java.util.Set;
58	55	import javax.swing.CellEditor;
59	56	import javax.swing.event.AncestorEvent;
60	57	import javax.swing.event.AncestorListener;

65	62	public JComponent getQuestionRendererComponent(Question qq, ActionListener listener) {
66	63	question = (PropertiesQuestion)qq;
67	64
68		tables = new HashMap();
	65	tables = new HashMap<>();
69	66
70	67	panel = new JPanel();
71	68	panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));

93	90
94	91	valueSaver = new Runnable() {
95	92	public void run() {
96		Set keys = tables.keySet();
97		Iterator iter = keys.iterator();
	93	Set<String> keys = tables.keySet();
	94	Iterator<String> iter = keys.iterator();
98	95	while(iter.hasNext()) {
99		JTable table = (JTable)tables.get((String)iter.next());
	96	JTable table = tables.get(iter.next());
100	97	CellEditor editor = table.getCellEditor();
101	98	if(editor != null) {
102	99	editor.stopCellEditing();

290	287	String[][] d = q.getGroup(group);
291	288
292	289	if (d != null) {
293		ArrayList rm = null;
	290	ArrayList<String> rm = null;
294	291	for (int i = 0; i < d.length; i++) {
295	292	if (!q.isEntryVisible(d[i][0])) {
296	293	if (rm == null)
297		rm = new ArrayList();
	294	rm = new ArrayList<>();
298	295	else { }
299	296	rm.add(d[i][0]);
300	297	}

323	320
324	321	for (int i = 0; i < d.length; i++){
325	322	if (q.getPresentationKeys() != null && q.getPresentationKeys().get(d[i][0]) != null){
326		d[i][0] = (String) q.getPresentationKeys().get(d[i][0]);
	323	d[i][0] = q.getPresentationKeys().get(d[i][0]);
327	324	}
328	325	}
329	326

366	363	}
367	364
368	365	protected Runnable valueSaver;
369		protected HashMap tables;
	366	protected Map<String, JTable> tables;
370	367	protected RenderingUtilities.PropCellRenderer renderer;
371	368	protected PropertiesQuestion question;
372	369	protected JPanel panel;

+10

-10

src/com/sun/interview/wizard/QuestionPanel.java less more

155	155	// viewport height becomes less than getPreferredSize().height, but may be enough for components
156	156	// without any scrolling
157	157	if(getParent() instanceof JViewport)
158		return (((JViewport)getParent()).getHeight() > getPreferredSize().height);
	158	return getParent().getHeight() > getPreferredSize().height;
159	159	else
160	160	return false;
161	161	}

212	212	}
213	213
214	214	private void initRenderers() {
215		renderers = new HashMap();
	215	renderers = new HashMap<>();
216	216	renderers.put(ChoiceQuestion.class, new ChoiceQuestionRenderer());
217	217	renderers.put(ChoiceArrayQuestion.class, new ChoiceArrayQuestionRenderer());
218	218	renderers.put(FileQuestion.class, new FileQuestionRenderer());

227	227	renderers.put(StringListQuestion.class, new StringListQuestionRenderer());
228	228	renderers.put(TreeQuestion.class, new TreeQuestionRenderer());
229	229	renderers.put(YesNoQuestion.class, new YesNoQuestionRenderer());
230		setCustomRenderers(new HashMap());
	230	setCustomRenderers(new HashMap<Class<? extends Question>, QuestionRenderer>());
231	231	}
232	232
233	233	/**

551	551	return result;
552	552	}
553	553
554		private QuestionRenderer getRenderer(Question q, Map rendMap) {
555		for (Class c = q.getClass(); c != null; c = c.getSuperclass()) {
556		QuestionRenderer r = (QuestionRenderer) (rendMap.get(c));
	554	private QuestionRenderer getRenderer(Question q, Map<Class<? extends Question>, QuestionRenderer> rendMap) {
	555	for (Class<?> c = q.getClass(); c != null; c = c.getSuperclass()) {
	556	QuestionRenderer r = rendMap.get(c);
557	557	if (r != null)
558	558	return r;
559	559	}

567	567
568	568	for (int i = 0; i < p.getComponentCount(); i++) {
569	569	Component c = (p.getComponent(i));
570		if ((c instanceof JComponent) && ((JComponent)c).hasFocus()
	570	if ((c instanceof JComponent && c.hasFocus())
571	571	\|\| (c instanceof JPanel && anyChildHasFocus((JPanel)c)))
572	572	return true;
573	573	}

585	585	private JTextField valueMessageField;
586	586	private JPanel propsPanel;
587	587	private JTextField tagField;
588		private Map renderers;
589		private Map customRenderers;
	588	private Map<Class<? extends Question>, QuestionRenderer> renderers;
	589	private Map<Class<? extends Question>, QuestionRenderer> customRenderers;
590	590	private Listener listener = new Listener();
591	591
592	592	private static final I18NResourceBundle i18n = I18NResourceBundle.getDefaultBundle();

642	642	private static final int PROPS_PANEL_INSETS_TOP = 0;
643	643	private static final int PROPS_PANEL_INSETS_BOTTOM = 10;
644	644
645		public void setCustomRenderers(Map customRenderers) {
	645	public void setCustomRenderers(Map<Class<? extends Question>, QuestionRenderer> customRenderers) {
646	646	this.customRenderers = customRenderers;
647	647	}
648	648

+11

-11

src/com/sun/interview/wizard/RenderingUtilities.java less more

74	74	private PropertiesQuestion q;
75	75
76	76	public PCE(PropertiesQuestion q) {
77		cbCE = new PropCellEditor(new JComboBox(), q);
	77	cbCE = new PropCellEditor(new JComboBox<Object>(), q);
78	78	tfCE = new RestrainedCellEditor(new JTextField(), q);
79	79	this.q = q;
80	80	}

217	217	* for editing.
218	218	*/
219	219	public static class PropCellEditor extends DefaultCellEditor {
220		protected PropCellEditor(JComboBox box) {
	220	protected PropCellEditor(JComboBox<Object> box) {
221	221	super(box);
222	222	}
223	223
224		PropCellEditor(JComboBox box, PropertiesQuestion q) {
	224	PropCellEditor(JComboBox<Object> box, PropertiesQuestion q) {
225	225	this(box);
226	226	question = q;
227	227	}

230	230	* For use when this renderer is being used outside the context of
231	231	* an interview and question.
232	232	*/
233		PropCellEditor(JComboBox box, ValueConstraints rules) {
	233	PropCellEditor(JComboBox<Object> box, ValueConstraints rules) {
234	234	this(box);
235	235	this.rules = rules;
236	236	}

281	281
282	282	}
283	283
284		final JComboBox cb = ((JComboBox)getComponent());
	284	final JComboBox<Object> cb = (JComboBox<Object>)getComponent();
285	285	cb.setEditable(true);
286	286	cb.removeAllItems();
287	287	cb.addItem(value);

375	375	}
376	376	}
377	377
378		private void setConstraints(JComboBox cb, ValueConstraints rules) {
	378	private void setConstraints(JComboBox<Object> cb, ValueConstraints rules) {
379	379	if (rules instanceof IntConstraints) {
380	380	// attach input filter
381	381	// add suggestions

437	437	else {}
438	438	}
439	439	else { // generic constraints
440		ValueConstraints vRules = (ValueConstraints)rules;
	440	ValueConstraints vRules = rules;
441	441	}
442	442	}
443	443

447	447	* adds a blank choice (unset). Assume the current value in the
448	448	* combo box is the one at index zero.
449	449	*/
450		private void configureSet(JComboBox cb, String[] possible,
	450	private void configureSet(JComboBox<Object> cb, String[] possible,
451	451	boolean ignoreCase, boolean isUnsetAllowed) {
452	452	// wishlist: i18n
453	453	// values which are independent of locale

516	516	}
517	517	}
518	518	else{
519		jComboBox = new JComboBox();
	519	jComboBox = new JComboBox<>();
520	520	jComboBox.addItem(value);
521	521	jComboBox.setEditable(true);
522		if ( q.isValueValid((String)(q.getKeyPropertyName((String)table.getValueAt(row, 0)))) != null ) {
	522	if ( q.isValueValid(q.getKeyPropertyName((String)table.getValueAt(row, 0))) != null ) {
523	523	jComboBox.setBorder(new LineBorder(Color.RED, 2));
524	524	}
525	525	return jComboBox;

542	542	PropertiesQuestion q;
543	543	JCheckBox jCheckBox;
544	544	YesNoBox yesNoBox;
545		JComboBox jComboBox;
	545	JComboBox<Object> jComboBox;
546	546	} // non-editing cell
547	547
548	548	static class YesNoBox extends JPanel{

+7

-6

src/com/sun/interview/wizard/SearchDialog.java less more

35	35	import java.awt.event.ActionEvent;
36	36	import java.awt.event.ActionListener;
37	37	import java.util.Hashtable;
	38	import java.util.Map;
38	39	import javax.accessibility.AccessibleContext;
39	40	import javax.swing.BorderFactory;
40	41	import javax.swing.DefaultListCellRenderer;

182	183	setVisible(true);
183	184	else {
184	185	// just get this once for the query
185		Hashtable answers = new Hashtable();
	186	Map<String, String> answers = new Hashtable<>();
186	187	interview.save(answers);
187	188	Question[] path = interview.getPath();
188	189	Question curr = interview.getCurrentQuestion();

190	191	if (path[i] == curr) {
191	192	for (int j = 0; j < path.length; j++) {
192	193	Question q = path[(i + 1 + j)%path.length];
193		String answer = (String)(answers.get(q.getTag()));
	194	String answer = answers.get(q.getTag());
194	195	if (matches(q, answer, caseChk.isSelected(), wordChk.isSelected())) {
195	196	try {
196	197	interview.setCurrentQuestion(q);

261	262	return b;
262	263	}
263	264
264		private JComboBox createChoice(final String uiKey, final String[] choiceKeys) {
	265	private JComboBox<String> createChoice(final String uiKey, final String[] choiceKeys) {
265	266	// create a cache of the presentation string, for use when
266	267	// rendering, but otherwise, let the JComboBox work in terms of the
267	268	// choiceKeys

269	270	for (int i = 0; i < choices.length; i++)
270	271	choices[i] = i18n.getString(uiKey + "." + choiceKeys[i] + ".chc");
271	272
272		JComboBox choice = new JComboBox(choiceKeys);
	273	JComboBox<String> choice = new JComboBox<>(choiceKeys);
273	274	choice.setName(uiKey);
274	275	AccessibleContext ac = choice.getAccessibleContext();
275	276	ac.setAccessibleName(i18n.getString(uiKey + ".tip"));
276	277
277	278	choice.setRenderer(new DefaultListCellRenderer() {
278		public Component getListCellRendererComponent(JList list, Object o, int index, boolean isSelected, boolean cellHasFocus) {
	279	public Component getListCellRendererComponent(JList<?> list, Object o, int index, boolean isSelected, boolean cellHasFocus) {
279	280	Object c = o;
280	281	for (int i = 0; i < choiceKeys.length; i++) {
281	282	if (choiceKeys[i] == o) {

327	328	private HelpBroker helpBroker;
328	329	private String helpPrefix;
329	330	private JTextField textField;
330		private JComboBox whereChoice;
	331	private JComboBox<String> whereChoice;
331	332	private JCheckBox caseChk;
332	333	private JCheckBox wordChk;
333	334

+2

-2

src/com/sun/interview/wizard/TypeInPanel.java less more

80	80	add(field, c);
81	81	}
82	82	else {
83		choice = new JComboBox();
	83	choice = new JComboBox<>();
84	84	choice.setName(uiKey + ".chc");
85	85	choice.setEditable(true);
86	86	choice.setSelectedItem(q.getStringValue());

152	152	}
153	153
154	154	protected JTextField field;
155		protected JComboBox choice;
	155	protected JComboBox<String> choice;
156	156
157	157	private static final I18NResourceBundle i18n = I18NResourceBundle.getDefaultBundle();
158	158	}

+1

-1

src/com/sun/interview/wizard/WizPane.java less more

495	495	ac.setAccessibleDescription(i18n.getString(uiKey + ".desc"));
496	496	}
497	497
498		public void setCustomRenderers(Map customRenderers) {
	498	public void setCustomRenderers(Map<Class<? extends Question>, QuestionRenderer> customRenderers) {
499	499	questionPanel.setCustomRenderers(customRenderers);
500	500	}
501	501

+15

-18

src/com/sun/interview/wizard/Wizard.java less more

41	41	import java.lang.reflect.Method;
42	42	import java.net.URL;
43	43	import java.nio.charset.StandardCharsets;
	44	import java.util.Map;
44	45	import java.util.Properties;
45	46	import javax.swing.BorderFactory;
46	47	import javax.swing.Box;

112	113	try {
113	114	UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
114	115
115		Class ic = (Class.forName(args[0], true, ClassLoader.getSystemClassLoader()));
	116	Class<?> ic = Class.forName(args[0], true, ClassLoader.getSystemClassLoader());
116	117	Interview i = (Interview)(ic.newInstance());
117	118	Wizard w = new Wizard(i);
118	119	w.showInFrame(true);

151	152	* @see #setFile
152	153	*/
153	154	public void open(File f) throws Interview.Fault, IOException {
154		InputStream in = new BufferedInputStream(new FileInputStream(f));
155		try {
156		Properties p = new Properties();
157		p.load(in);
158		interview.load(p);
	155	try (InputStream in = new BufferedInputStream(new FileInputStream(f))) {
	156
	157	Map<String, String> stringProps = com.sun.javatest.util.Properties.load(in);
	158	interview.load(stringProps);
159	159	interview.setEdited(false);
160		initialInfoVisible = p.getProperty("INFO", "true").equals("true");
161		}
162		finally {
163		in.close();
	160	String info = stringProps.get("INFO");
	161	if (info == null) {
	162	info = "true";
	163	}
	164	initialInfoVisible = info.equals("true");
164	165	}
165	166	}
166	167

171	172	* @see Interview#save
172	173	*/
173	174	public void save(File f) throws IOException {
174		OutputStream out = new BufferedOutputStream(new FileOutputStream(f));
175		try {
	175	try (OutputStream out = new BufferedOutputStream(new FileOutputStream(f))) {
176	176	Properties p = new Properties();
177	177	if (infoPanel != null)
178	178	p.put("INFO", String.valueOf(infoPanel.isShowing()));
179		interview.save(p);
	179	interview.save(com.sun.javatest.util.Properties.convertToStringProps(p));
180	180	interview.setEdited(false);
181	181	p.save(out, "Wizard data file: " + interview.getTitle());
182		}
183		finally {
184		out.close();
185	182	}
186	183	}
187	184

469	466	if (exporters != null) {
470	467	// replace the default "export log" item with a full export submenu
471	468	for (int i = 0; i < fileMenu.getItemCount(); i++) {
472		JMenuItem mi = (JMenuItem)(fileMenu.getItem(i));
	469	JMenuItem mi = fileMenu.getItem(i);
473	470	if (mi != null && mi.getActionCommand().equals("performExportLog")) {
474	471	fileMenu.remove(i);
475	472	JMenu exportMenu = new ExportMenu(exporters);

548	545	*/
549	546	private void perform(String s) {
550	547	try {
551		Method m = Wizard.class.getDeclaredMethod(s, new Class[] { });
	548	Method m = Wizard.class.getDeclaredMethod(s, new Class<?>[] { });
552	549	m.invoke(Wizard.this, new Object[] { });
553	550	}
554	551	catch (IllegalAccessException ex) {

+3

-3

src/com/sun/interview/wizard/selectiontree/SelectionTree.java less more

580	580	SelectionTreeNode lastNode = firstNode;
581	581
582	582	while (lastNode.getChildCount() > 0) {
583		lastNode = (SelectionTreeNode) lastNode.getChildAt(lastNode.getChildCount() - 1);
	583	lastNode = lastNode.getChildAt(lastNode.getChildCount() - 1);
584	584	}
585	585
586	586	if (!isRootVisible()) {

711	711	}
712	712
713	713	public String[] getSelection() {
714		Vector v = new Vector();
	714	Vector<String> v = new Vector<>();
715	715	getSelection((SelectionTreeNode) getModel().getRoot(), v);
716	716
717	717	String[] paths = new String[v.size()];

719	719	return paths;
720	720	}
721	721
722		private void getSelection(SelectionTreeNode node, Vector v) {
	722	private void getSelection(SelectionTreeNode node, Vector<String> v) {
723	723	switch (node.getSelectionType()) {
724	724	case UNSELECTED:
725	725	break;

+2

-2

src/com/sun/interview/wizard/selectiontree/SelectionTreeNode.java less more

99	99	prevNode = node;
100	100	int childCount;
101	101	while ((childCount = prevNode.getChildCount()) > 0) {
102		prevNode = (SelectionTreeNode) prevNode.getChildAt(childCount - 1);
	102	prevNode = prevNode.getChildAt(childCount - 1);
103	103	}
104	104	children.add(node);
105	105	}

292	292	}
293	293	} else {
294	294	depth++;
295		result = getPathToRoot((SelectionTreeNode) aNode.getParent(), depth);
	295	result = getPathToRoot(aNode.getParent(), depth);
296	296	result[result.length - depth] = aNode;
297	297	}
298	298

+2

-2

src/com/sun/javatest/BasicParameters.java less more

667	667	private TestEnvironment cachedRelevantTestFilterEnv;
668	668
669	669	public synchronized TestFilter[] getFilters() {
670		Vector v = new Vector();
	670	Vector<TestFilter> v = new Vector<>();
671	671
672	672	TestFilter excludeFilter = getExcludeListFilter();
673	673	if (excludeFilter != null)

799	799	return true;
800	800	}
801	801
802		private static boolean equal(Vector v, TestFilter[] f) {
	802	private static boolean equal(Vector<TestFilter> v, TestFilter[] f) {
803	803	if (f == null \|\| v.size() != f.length)
804	804	return false;
805	805	for (int i = 0; i < v.size(); i++) {

+6

-6

src/com/sun/javatest/CompositeFilter.java less more

195	195	public int hashCode() {
196	196	int hash = 3;
197	197	hash = 61 * hash + (this.filters != null ?
198		new HashSet(Arrays.asList(this.filters)).hashCode() : 0);
	198	new HashSet<>(Arrays.asList(this.filters)).hashCode() : 0);
199	199	return hash;
200	200	}
201	201

224	224	* @return true of the two arrays of filters are equivalent.
225	225	*/
226	226	public static boolean equals(TestFilter[] array1, TestFilter[] array2) {
227		List list1 = Arrays.asList(array1);
228		List list2 = Arrays.asList(array2);
229
230		HashSet set1 = new HashSet(list1);
231		HashSet set2 = new HashSet(list2);
	227	List<TestFilter> list1 = Arrays.asList(array1);
	228	List<TestFilter> list2 = Arrays.asList(array2);
	229
	230	HashSet<TestFilter> set1 = new HashSet<>(list1);
	231	HashSet<TestFilter> set2 = new HashSet<>(list2);
232	232
233	233	return set1.equals(set2);
234	234	}

+6

-7

src/com/sun/javatest/DefaultTestRunner.java less more

41	41	*/
42	42	public class DefaultTestRunner extends TestRunner
43	43	{
44		public synchronized boolean runTests(Iterator testIter)
	44	public synchronized boolean runTests(Iterator<TestDescription> testIter)
45	45	throws InterruptedException
46	46	{
47	47	this.testIter = testIter;
48	48
49	49	Thread[] threads = new Thread[getConcurrency()];
50		activeThreads = new HashSet();
	50	activeThreads = new HashSet<>();
51	51	allPassed = true;
52	52
53	53	try {

100	100	stopping = true; // stop workers from starting any new tests
101	101
102	102	// interrupt the worker threads
103		for (Iterator iter = activeThreads.iterator() ; iter.hasNext(); ) {
104		Thread t = (Thread) (iter.next());
	103	for (Thread t : activeThreads) {
105	104	t.interrupt();
106	105	}
107	106

140	139	return null;
141	140
142	141	if (testIter.hasNext())
143		return (TestDescription) (testIter.next());
	142	return (testIter.next());
144	143	else {
145	144	stopping = true;
146	145	return null;

253	252	private static final Integer THROWABLE = new Integer(2);
254	253
255	254
256		private Iterator testIter;
257		private Set activeThreads;
	255	private Iterator<TestDescription> testIter;
	256	private Set<Thread> activeThreads;
258	257	private boolean allPassed;
259	258	private boolean stopping;
260	259

+4

-8

src/com/sun/javatest/EditJTI.java less more

453	453
454	454	String interviewClassName = (String) (p.get("INTERVIEW"));
455	455	try {
456		Class interviewClass = loader.loadClass(interviewClassName);
457
458		interview = (InterviewParameters)(interviewClass.newInstance());
	456	Class<InterviewParameters> interviewClass = (Class<InterviewParameters>) loader.loadClass(interviewClassName);
	457
	458	interview = interviewClass.newInstance();
459	459	}
460	460	catch (ClassCastException e) {
461	461	throw new Fault(i18n, "editJTI.invalidInterview", inFile);

592	592	in = new BufferedInputStream(new FileInputStream(file));
593	593	}
594	594	catch (FileNotFoundException e) {
595		throw new Fault(i18n, "editJTI.cantFindImport", file);
596		}
597		catch (IOException e) {
598		throw new Fault(i18n, "editJTI.cantOpenImport",
599		new Object[] { file, e });
	595	throw new Fault(i18n, "editJTI.cantFindImport", new Object[] { file, e });
600	596	}
601	597
602	598	Properties p;

+5

-13

src/com/sun/javatest/EditLinks.java less more

177	177	* @param file The name of a file to be ignored when editing.
178	178	*/
179	179	public void ignore(String file) {
180		ignores.add(file);
	180	ignores.add(new File(file));
181	181	}
182	182
183	183	/**

286	286	int size = (int)(from.length());
287	287	byte data[] = new byte[size];
288	288
289		InputStream in = new BufferedInputStream(new FileInputStream(from));
290		try {
	289	try (InputStream in = new BufferedInputStream(new FileInputStream(from))) {
291	290	for (int total = 0; total < data.length; ) {
292	291	total += in.read(data, total, data.length - total);
293	292	}
294	293	}
295		finally {
296		in.close();
297		}
298
299		OutputStream out = new BufferedOutputStream(new FileOutputStream(to));
300		try {
	294
	295	try (OutputStream out = new BufferedOutputStream(new FileOutputStream(to))) {
301	296	out.write(data, 0, data.length);
302		}
303		finally {
304		out.close();
305	297	}
306	298	}
307	299

535	527	private File[] inFiles = new File[0];
536	528	private File outFile;
537	529	private String[][] edits = new String[0][];
538		private Set ignores = new HashSet();
	530	private Set<File> ignores = new HashSet<>();
539	531
540	532	private int c;
541	533	private int line;

+33

-51

src/com/sun/javatest/ExcludeList.java less more

27	27
28	28	import java.io.*;
29	29	import java.nio.charset.StandardCharsets;
30		import java.util.Arrays;
31		import java.util.HashMap;
32		import java.util.Iterator;
33		import java.util.Map;
34		import java.util.SortedSet;
35		import java.util.TreeSet;
36		import java.util.Vector;
	30	import java.util.*;
37	31
38	32	import com.sun.javatest.util.DynamicArray;
39	33	import com.sun.javatest.util.I18NResourceBundle;

98	92	{
99	93	setStrictModeEnabled(strict);
100	94	if (f != null) {
101		BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(f), StandardCharsets.UTF_8));
102		try {
	95	try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(f), StandardCharsets.UTF_8))) {
103	96	Parser p = new Parser(in);
104	97	Entry e;
105	98	while ((e = p.readEntry()) != null)
106	99	addEntry(e);
107	100
108	101	title = p.getTitle();
109		}
110		finally {
111		in.close();
112	102	}
113	103	}
114	104	}

142	132	throws FileNotFoundException, IOException, Fault
143	133	{
144	134	setStrictModeEnabled(strict);
145		for (int i = 0; i < files.length; i++) {
146		ExcludeList et = new ExcludeList(files[i], strict);
	135	for (File file : files) {
	136	ExcludeList et = new ExcludeList(file, strict);
147	137	merge(et);
148	138	}
149	139	}

375	365	}
376	366	else {
377	367	Entry[] entries = (Entry[])o;
378		for (int i = 0; i < entries.length; i++) {
379		Entry e = entries[i];
	368	for (Entry e : entries) {
380	369	if (isInList(e.testCase, testCase))
381	370	return e;
382	371	}

393	382	*/
394	383	public void merge(ExcludeList other) {
395	384	synchronized (table) {
396		for (Iterator iter = other.getIterator(false); iter.hasNext(); ) {
	385	for (Iterator<?> iter = other.getIterator(false); iter.hasNext(); ) {
397	386	Entry otherEntry = (Entry) (iter.next());
398	387	Key key = new Key(otherEntry.relativeURL);
399	388	Object o = table.get(key);

421	410	String[] bugIdStrings = otherEntry.bugIdStrings;
422	411	String[] platforms = otherEntry.platforms;
423	412	String synopsis = otherEntry.synopsis;
424		Entry[] curr = (Entry[])o;
425		for (int i = 0; i < curr.length; i++) {
426		bugIdStrings = mergeBugIds(bugIdStrings, curr[i].bugIdStrings);
427		platforms = mergePlatforms(platforms, curr[i].platforms);
428		synopsis = mergeSynopsis(synopsis, curr[i].synopsis);
	413	for (Entry entry : (Entry[])o) {
	414	bugIdStrings = mergeBugIds(bugIdStrings, entry.bugIdStrings);
	415	platforms = mergePlatforms(platforms, entry.platforms);
	416	synopsis = mergeSynopsis(synopsis, entry.synopsis);
429	417	}
430	418	table.put(key, new Entry(otherEntry.relativeURL, null,
431	419	bugIdStrings, platforms, synopsis));

435	423	// an entry with another set of test cases.
436	424	// For now, concatenate the arrays.
437	425	// RFE: Replace Entry[] with Set and merge the sets.
438		table.put(key, (Entry[]) DynamicArray.append((Entry[]) o, otherEntry));
	426	table.put(key, DynamicArray.append((Entry[]) o, otherEntry));
439	427	}
440	428	}
441	429	}

450	438	}
451	439
452	440	static String[] merge(String[] a, String[] b) {
453		SortedSet s = new TreeSet();
	441	SortedSet<String> s = new TreeSet<>();
454	442	s.addAll(Arrays.asList(a));
455	443	s.addAll(Arrays.asList(b));
456		return (String[]) (s.toArray(new String[s.size()]));
	444	return s.toArray(new String[s.size()]);
457	445	}
458	446
459	447	static String mergeSynopsis(String a, String b) {

486	474	table.remove(key);
487	475	}
488	476	else {
489		Entry[] o2 = (Entry[])DynamicArray.remove((Entry[])o, e);
	477	Entry[] o2 = DynamicArray.remove((Entry[])o, e);
490	478	if (o2 == o)
491	479	// not found
492	480	return;

517	505	public int size() {
518	506	// ouch, this is now expensive to compute
519	507	int n = 0;
520		for (Iterator i = table.values().iterator(); i.hasNext(); ) {
521		Object o = i.next();
	508	for (Object o : table.values()) {
522	509	if (o instanceof Entry[])
523		n += ((Entry[])o).length;
	510	n += ((Entry[]) o).length;
524	511	else
525	512	n++;
526	513	}

539	526	* and @link(Entry)[], depending on the <code>group</code>
540	527	* parameter.
541	528	*/
542		public Iterator getIterator(boolean group) {
	529	public Iterator<?> getIterator(boolean group) {
543	530	if (group)
544	531	return table.values().iterator();
545	532	else {
546	533	// flatten the enumeration into a vector, then
547	534	// enumerate that
548		Vector v = new Vector(table.size());
549		for (Iterator iter = table.values().iterator(); iter.hasNext(); ) {
550		Object o = iter.next();
	535	Vector<Object> v = new Vector<>(table.size());
	536	for (Object o : table.values()) {
551	537	if (o instanceof Entry)
552	538	v.addElement(o);
553	539	else {
554		Entry[] entries = (Entry[])o;
555		for (int i = 0; i < entries.length; i++)
556		v.addElement(entries[i]);
	540	for (Entry entry : (Entry[]) o) v.addElement(entry);
557	541	}
558	542	}
559	543	return v.iterator();

590	574	int maxURLWidth = 0;
591	575	int maxBugIdWidth = 0;
592	576	int maxPlatformWidth = 0;
593		SortedSet entries = new TreeSet();
594		for (Iterator iter = getIterator(false); iter.hasNext(); ) {
	577	SortedSet<Entry> entries = new TreeSet<>();
	578	for (Iterator<?> iter = getIterator(false); iter.hasNext(); ) {
595	579	Entry entry = (Entry) (iter.next());
596	580	entries.add(entry);
597	581	if (entry.testCase == null)

611	595	out.write("### title " + title);
612	596	out.newLine();
613	597	}
614		for (Iterator iter = entries.iterator(); iter.hasNext(); ) {
615		Entry e = (Entry) (iter.next());
	598	for (Entry e : entries) {
616	599	if (e.testCase == null)
617	600	write(out, e.relativeURL, maxURLWidth + 2);
618	601	else

712	695	return hash;
713	696	}
714	697
715		private Map table = new HashMap();
	698	private Map<Key, Object> table = new HashMap<>();
716	699	private String title;
717	700	private boolean strict;
718	701

780	763	// skip white space, then read and sort a list of comma-separated
781	764	// numbers with no embedded white-space
782	765	skipWhite();
783		TreeSet s = new TreeSet();
	766	TreeSet<String> s = new TreeSet<>();
784	767	StringBuffer sb = new StringBuffer();
785	768	for ( ; !isEndOfLine(ch) && !isWhitespace(ch); ch = in.read()) {
786	769	if (ch == ',') {

799	782	if (s.size() == 0)
800	783	s.add("0"); // backwards compatibility
801	784
802		return (String[]) (s.toArray(new String[s.size()]));
	785	return s.toArray(new String[s.size()]);
803	786	}
804	787
805	788	private String[] readPlatforms() throws IOException {

809	792	// share the result amongst all equivalent entries.
810	793	skipWhite();
811	794	String s = readWord();
812		String[] platforms = (String[])platformCache.get(s);
	795	String[] platforms = platformCache.get(s);
813	796	if (platforms == null) {
814	797	// split string into sorted comma separated pieces
815	798	int n = 0;

817	800	if (s.charAt(i) == ',')
818	801	n++;
819	802	}
820		TreeSet ts = new TreeSet();
	803	Set<String> ts = new TreeSet<>();
821	804	int start = 0;
822	805	int end = s.indexOf(',');
823	806	while (end != -1) {

826	809	end = s.indexOf(',', start);
827	810	}
828	811	ts.add(s.substring(start));
829		platforms = (String[]) (ts.toArray(new String[ts.size()]));
	812	platforms = ts.toArray(new String[ts.size()]);
830	813	platformCache.put(s, platforms);
831	814	}
832	815	return platforms;

880	863
881	864	private Reader in; // source stream being read
882	865	private int ch; // current character
883		private Map platformCache = new HashMap();
	866	private Map<String, String[]> platformCache = new HashMap<>();
884	867	// cache of results for readPlatforms
885	868	private String title;
886	869	};

952	935	/**
953	936	* An entry in the exclude list.
954	937	*/
955		public static final class Entry implements Comparable {
	938	public static final class Entry implements Comparable<Entry> {
956	939	/**
957	940	* Create an ExcludeList entry.
958	941	* @param u The URL for the test, specified relative to the test suite root.

1010	993	synopsis = s;
1011	994	}
1012	995
1013		public int compareTo(Object o) {
1014		Entry e = (Entry) o;
	996	public int compareTo(Entry e) {
1015	997	int n = relativeURL.compareTo(e.relativeURL);
1016	998	if (n == 0) {
1017	999	if (testCase == null && e.testCase == null)

1057	1039	if (testCase == null)
1058	1040	return null;
1059	1041
1060		Vector v = new Vector();
	1042	Vector<String> v = new Vector<String>();
1061	1043	int start = -1;
1062	1044	for (int i = 0; i < testCase.length(); i++) {
1063	1045	if (testCase.charAt(i) == ',') {

+2

-2

src/com/sun/javatest/FileParameters.java less more

308	308	envError = i18n.getString("fp.envNotFound", envName);
309	309	return;
310	310	}
311		for (Iterator i = env.elements().iterator(); i.hasNext(); ) {
312		TestEnvironment.Element entry = (TestEnvironment.Element) (i.next());
	311	for (Iterator<TestEnvironment.Element> i = env.elements().iterator(); i.hasNext(); ) {
	312	TestEnvironment.Element entry = i.next();
313	313	if (entry.value.indexOf("VALUE_NOT_DEFINED") >= 0) {
314	314	String eText =
315	315	( (entry.definedInEnv == null ? "" : "env." + entry.definedInEnv + ".") +

+11

-14

src/com/sun/javatest/Harness.java less more

27	27
28	28	import java.io.File;
29	29	import java.io.IOException;
30		import java.util.Iterator;
31		import java.util.ArrayList;
	30	import java.util.*;
32	31
33	32	import com.sun.javatest.TestResultTable.TreeIterator;
34	33	import com.sun.javatest.httpd.HttpdServer;

37	36	import com.sun.javatest.util.DynamicArray;
38	37	import com.sun.javatest.util.I18NResourceBundle;
39	38	import com.sun.javatest.util.ReadAheadIterator;
40		import java.util.HashMap;
41		import java.util.Set;
42	39
43	40	/**
44	41	* The object responsible for coordinating the execution of a test run.

722	719	notifier.addObserver(testURLCollector);
723	720	testsStartTime = System.currentTimeMillis();
724	721	try {
725		ok = r.runTests(new Iterator() {
	722	ok = r.runTests(new Iterator<TestDescription>() {
726	723	public boolean hasNext() {
727	724	return (stopping ? false : raTestIter.hasNext());
728	725	}
729		public Object next() {
730		TestResult tr = (TestResult) (raTestIter.next());
	726	public TestDescription next() {
	727	TestResult tr = raTestIter.next();
731	728	try {
732	729	return tr.getDescription();
733	730	}

797	794	return ok;
798	795	}
799	796
800		public ReadAheadIterator getTestsIterator(TreeIterator iter) throws Fault {
	797	public ReadAheadIterator<TestResult> getTestsIterator(TreeIterator iter) throws Fault {
801	798	if (iter == null) {
802	799	iter = createTreeIterator();
803	800	}
804		return new ReadAheadIterator(iter, readAheadMode, DEFAULT_READ_AHEAD);
	801	return new ReadAheadIterator<TestResult>(iter, readAheadMode, DEFAULT_READ_AHEAD);
805	802	}
806	803
807	804	private TreeIterator createTreeIterator() throws Fault {

835	832	}
836	833
837	834	private static ArrayList<String> listFilterNames(final TestFilter[] filters) {
838		ArrayList<String> result = new ArrayList();
	835	ArrayList<String> result = new ArrayList<>();
839	836
840	837	if (filters == null \|\| filters.length == 0)
841	838	return result; // i.e. empty

947	944	private ExcludeList excludeList;
948	945	private TestResultTable.TreeIterator testIter;
949	946	private int readAheadMode = ReadAheadIterator.FULL;
950		private ReadAheadIterator raTestIter;
	947	private ReadAheadIterator<TestResult> raTestIter;
951	948	private int numTestsDone;
952	949	private TestEnvironment env;
953	950	private TestResultTable resultTable;

971	968	void addObserver(Observer o) {
972	969	if (o == null)
973	970	throw new NullPointerException();
974		observers = (Observer[])DynamicArray.append(observers, o);
	971	observers = DynamicArray.append(observers, o);
975	972	}
976	973
977	974	void removeObserver(Observer o) {
978		observers = (Observer[])DynamicArray.remove(observers, o);
	975	observers = DynamicArray.remove(observers, o);
979	976	}
980	977
981	978	public void startingTestRun(Parameters params) {

1106	1103	TestURLCollector() {
1107	1104	}
1108	1105
1109		final ArrayList testURLs = new ArrayList();
	1106	final List<String> testURLs = new ArrayList<>();
1110	1107
1111	1108	public void startingTestRun(Parameters p) { }
1112	1109

+6

-6

src/com/sun/javatest/HarnessHttpHandler.java less more

220	220
221	221	String[] pa = new String[0];
222	222
223		for (Iterator i = env.elements().iterator(); i.hasNext(); ) {
224		TestEnvironment.Element elem = (TestEnvironment.Element) (i.next());
	223	for (Iterator<TestEnvironment.Element> i = env.elements().iterator(); i.hasNext(); ) {
	224	TestEnvironment.Element elem = i.next();
225	225	// this is stunningly inefficient and should be fixed
226	226	pa = PropertyArray.put(pa, elem.getKey(), elem.getValue());
227	227	}

309	309	TestFilter[] filters = params.getFilters();
310	310	String[] tests = params.getTests();
311	311
312		Iterator it = null;
	312	Iterator<TestResult> it = null;
313	313	if (tests == null \|\| tests.length == 0)
314	314	it = trt.getIterator(filters);
315	315	else
316	316	it = trt.getIterator(params.getTests(), filters);
317	317
318	318	while (it.hasNext()) {
319		TestResult tr = (TestResult)(it.next());
	319	TestResult tr = it.next();
320	320	out.println(tr.getTestName());
321	321	out.println(tr.getStatus().toString());
322	322	} // while

543	543	buf.append("</tr>");
544	544	out.println(buf.toString());
545	545
546		for (Iterator keys = env.keys().iterator(); keys.hasNext(); ) {
547		String key = (String) (keys.next());
	546	for (Iterator<String> keys = env.keys().iterator(); keys.hasNext(); ) {
	547	String key = keys.next();
548	548	out.println("<tr>");
549	549	buf.setLength(0);
550	550	buf.append("<td>");

+25

-43

src/com/sun/javatest/InterviewParameters.java less more

34	34	import java.io.IOException;
35	35	import java.io.InputStream;
36	36	import java.io.OutputStream;
37		import java.util.Map;
38		import java.util.Properties;
39		import java.util.ResourceBundle;
40		import java.util.Vector;
	37	import java.util.*;
41	38
42	39	import com.sun.interview.ErrorQuestion;
43	40	import com.sun.interview.FinalQuestion;

47	44	import com.sun.javatest.tool.FileHistory;
48	45	import com.sun.javatest.util.BackupPolicy;
49	46	import com.sun.javatest.util.I18NResourceBundle;
50		import com.sun.javatest.util.SortedProperties;
	47	import com.sun.javatest.util.Properties;
51	48
52	49	/**
53	50	* Configuration parameters provided via an interview.

744	741	private TestEnvironment cachedRelevantTestFilterEnv;
745	742
746	743	public synchronized TestFilter[] getFilters() {
747		Vector v = new Vector();
	744	Vector<TestFilter> v = new Vector<>();
748	745
749	746	TestFilter excludeFilter = getExcludeListFilter();
750	747	if (excludeFilter != null) {

801	798	return true;
802	799	}
803	800
804		private static boolean equal(Vector v, TestFilter[] f) {
	801	private static boolean equal(Vector<TestFilter> v, TestFilter[] f) {
805	802	if (f == null \|\| v.size() != f.length)
806	803	return false;
807	804	for (int i = 0; i < v.size(); i++) {

987	984	// note: the additional Fault types were introduced in JT 3.2.1
988	985
989	986	// read the .jti data
990		Properties data = new Properties();
991
992		InputStream in = new BufferedInputStream(new FileInputStream(file));
993		try {
994		data.load(in);
	987	Map<String, String> data;
	988
	989	try (InputStream in = new BufferedInputStream(new FileInputStream(file))) {
	990	data = Properties.load(in);
995	991	}
996	992	catch (RuntimeException e) {
997	993	// can get IllegalArgumentException if the file is corrupt
998	994	throw new JTIFault(i18n, "ip.errorReadingFile", new Object[] { file, e });
999	995	}
1000		finally {
1001		in.close();
1002		}
1003	996
1004	997	// if the test suite has not been given, set it from the .jti data
1005	998	if (testSuite == null) {
1006		String s = (String) (data.get(TESTSUITE));
	999	String s = data.get(TESTSUITE);
1007	1000	if (s == null)
1008	1001	throw new Fault(i18n, "ip.noTestSuiteInFile", file);
1009	1002

1023	1016	// if the work directory has not been given,
1024	1017	// set it from the .jti data if given
1025	1018	if (workDir == null) {
1026		String s = (String) (data.get(WORKDIR));
	1019	String s = data.get(WORKDIR);
1027	1020	if (s != null) {
1028	1021	try {
1029	1022	workDir = WorkDirectory.open(new File(s), testSuite);

1145	1138	testSuite = TestSuite.open(testSuitePath);
1146	1139	}
1147	1140	catch (FileNotFoundException e) {
1148		throw new Fault(i18n, "ip.cantFindTestSuite", testSuitePath);
1149		}
1150		catch (IOException e) {
1151		throw new Fault(i18n, "ip.cantOpenTestSuite", new Object[] { testSuitePath, e });
	1141	throw new Fault(i18n, "ip.cantFindTestSuite", new Object[] { testSuitePath, e });
1152	1142	}
1153	1143	catch (TestSuite.Fault e) {
1154	1144	throw new Fault(i18n, "ip.cantOpenTestSuite", new Object[] { testSuitePath, e.getMessage() });

1171	1161	workDir = WorkDirectory.open(workDirPath, testSuite);
1172	1162	}
1173	1163	catch (FileNotFoundException e) {
1174		throw new Fault(i18n, "ip.cantFindWorkDir", workDirPath);
1175		}
1176		catch (IOException e) {
1177		throw new Fault(i18n, "ip.cantOpenWorkDir", new Object[] { workDirPath, e });
	1164	throw new Fault(i18n, "ip.cantFindWorkDir", new Object[] { workDirPath, e });
1178	1165	}
1179	1166	catch (WorkDirectory.Fault e) {
1180	1167	throw new Fault(i18n, "ip.cantOpenWorkDir", new Object[] { workDirPath, e.getMessage() });

1275	1262	* @return true if there was an update from template
1276	1263	*/
1277	1264	public boolean load(File file) throws FileNotFoundException, IOException, Fault {
1278		InputStream in = new BufferedInputStream(new FileInputStream(file));
1279		try {
1280		Properties data = new Properties();
1281		data.load(in);
	1265	try (InputStream in = new BufferedInputStream(new FileInputStream(file))) {
	1266	Map<String, String> data = Properties.load(in);
1282	1267	return load(data, file);
1283		}
1284		finally {
1285		in.close();
1286	1268	}
1287	1269	}
1288	1270

1294	1276	* @throws Interview.Fault if there is a problem loading the interview
1295	1277	* @return true if there was an update from template
1296	1278	*/
1297		public boolean load(Map data, File file) throws Fault {
	1279	public boolean load(Map<String, String> data, File file) throws Fault {
1298	1280	load(data);
1299	1281
1300	1282	// restore template state
1301		String tm = (String) data.get(IS_TEMPLATE);
	1283	String tm = data.get(IS_TEMPLATE);
1302	1284	setTemplate(tm != null && tm.equalsIgnoreCase(TRUE));
1303	1285
1304	1286	setEdited(false);

1316	1298	return prop.checkForUpdate();
1317	1299	}
1318	1300
1319		public void load(Map data, boolean checkChecksum) throws Fault {
	1301	public void load(Map<String, String> data, boolean checkChecksum) throws Fault {
1320	1302	super.load(data, checkChecksum);
1321	1303
1322		String me = (String) data.get(MARKERS_ENABLED);
	1304	String me = data.get(MARKERS_ENABLED);
1323	1305	setMarkersEnabled(me != null && me.equalsIgnoreCase(TRUE));
1324	1306
1325		String mf = (String) data.get(MARKERS_FILTER);
	1307	String mf = data.get(MARKERS_FILTER);
1326	1308	setMarkersFilterEnabled(mf != null && mf.equalsIgnoreCase(TRUE));
1327	1309
1328		String tm = (String) data.get(IS_TEMPLATE);
	1310	String tm = data.get(IS_TEMPLATE);
1329	1311	setTemplate(tm != null && tm.equalsIgnoreCase(TRUE));
1330	1312
1331	1313	String tu = null;
1332	1314	//if (isTemplate()) {
1333		tu = (String) data.get(TEMPLATE_PATH);
	1315	tu = data.get(TEMPLATE_PATH);
1334	1316	//} else {
1335	1317	//tu = (String) data.get(TEMPLATE_PREF + TEMPLATE_PATH);
1336	1318	//}

1568	1550	public void saveAs(File file, boolean saveTestSuite, boolean saveWorkDir, boolean isTemplate)
1569	1551	throws IOException, Fault
1570	1552	{
1571		Properties data = new SortedProperties();
	1553	SortedMap<String, String> data = new TreeMap<>();
1572	1554	setTemplate(isTemplate); // dubious, why do we need to do this?
1573	1555
1574	1556	if (saveTestSuite) {

1599	1581	out = backupPolicy.backupAndOpenStream(file);
1600	1582
1601	1583	try {
1602		data.store(out, "JT Harness Configuration Interview");
	1584	Properties.store(data, out, "JT Harness Configuration Interview");
1603	1585	}
1604	1586	finally {
1605	1587	out.close();

1627	1609	saveAs(file, saveTestSuite, saveWorkDir, false);
1628	1610	}
1629	1611
1630		public void save(Map data) {
	1612	public void save(Map<String, String> data) {
1631	1613	if (markersEnabled)
1632	1614	data.put(MARKERS_ENABLED, TRUE);
1633	1615

1637	1619	if (isTemplate()) {
1638	1620	data.put(IS_TEMPLATE, TRUE);
1639	1621
1640		storeTemplateProperties(new Properties());
	1622	storeTemplateProperties(new HashMap<String, String>());
1641	1623	}
1642	1624	else {
1643	1625	WorkDirectory wd = getWorkDirectory();

+95

-96

src/com/sun/javatest/InterviewPropagator.java less more

32	32	import com.sun.javatest.report.HTMLWriterEx;
33	33	import com.sun.javatest.util.I18NResourceBundle;
34	34	import com.sun.javatest.tool.CustomPropagationController.EventType;
	35	import com.sun.javatest.util.Properties;
35	36
36	37	import java.io.BufferedInputStream;
37	38	import java.io.BufferedReader;

52	53	import java.util.Iterator;
53	54	import java.util.LinkedHashMap;
54	55	import java.util.Map;
55		import java.util.Properties;
56	56	import java.util.Set;
57	57
58	58	public class InterviewPropagator {

79	79	InputStream in = null;
80	80	PrintStream psConflicts = null;
81	81	PrintStream psUpdates = null;
82		boolean needToSave1=false, needToSave2=false;
83
84		Properties templateData = new Properties();
	82	boolean needToSave1 = false, needToSave2 = false;
	83
	84	Map<String, String> templateData = new HashMap<>();
85	85
86	86	try {
87	87	File template = new File(interview.getTemplatePath());
88	88	in = new BufferedInputStream(new FileInputStream(template));
89		templateData.load(in);
	89	templateData = Properties.load(in);
90	90
91	91	fireEvent(EventType.TemplateLoaded, templateData);
92	92	} catch (FileNotFoundException ex) {
93		notifyError(i18n.getString("tmpltProp.tmpFileError", new String[] {interview.getTemplatePath()}));
	93	notifyError(i18n.getString("tmpltProp.tmpFileError", new String[]{interview.getTemplatePath()}));
94	94	logException(ex);
95	95	} catch (IOException ex) {
96		notifyError(i18n.getString("tmpltProp.tmpFileError", new String[] {interview.getTemplatePath()}));
	96	notifyError(i18n.getString("tmpltProp.tmpFileError", new String[]{interview.getTemplatePath()}));
97	97	logException(ex);
98	98	}
99	99

101	101
102	102	pm = new PropogateMap();
103	103
104		HashMap actual = new HashMap();
	104	Map<String, String> actual = new HashMap<>();
105	105	interview.save(actual);
106	106
107	107	// process custom changes such as property rename

112	112	needToSave2 = processNotUpdatableKeys(templateData, interview);
113	113
114	114	// don't optimize this expression! both of methods must be invoked
115		if(needToSave1 \|\| needToSave2) {
	115	if (needToSave1 \|\| needToSave2) {
116	116	// save to file!
117	117	saveInterview();
118	118	}
119	119
120		Map allQuestionMap = interview.getAllQuestions();
	120	Map<String, Question> allQuestionMap = interview.getAllQuestions();
121	121	// autoupdate partial questions
122	122	if (processPartialQuestions(templateData, allQuestionMap, actual)) {
123	123	// update it

156	156	logException(ex);
157	157	}
158	158	}
159		if(needToSave1 \|\| needToSave2 \|\| pm.hasConflicts() \|\| pm.hasUpdates())
	159	if (needToSave1 \|\| needToSave2 \|\| pm.hasConflicts() \|\| pm.hasUpdates())
160	160	fireEvent(EventType.Finish, null);
161	161	}
162	162	cleanup();
163	163	return wasUpdated;
164	164	}
165	165
166		private void fireEvent(EventType eventType, Properties templateData) {
	166	private void fireEvent(EventType eventType, Map<String, String> templateData) {
167	167	interview.getPropagationController().notify(eventType, interview, templateData);
168	168	}
169	169
170		private boolean processNotUpdatableKeys(Properties templateData, InterviewParameters interview) {
	170	private boolean processNotUpdatableKeys(Map<String, String> templateData, InterviewParameters interview) {
171	171	boolean wasUpdate = false;
172		for (Object key : templateData.keySet()) {
173		String templateKey = (String) key;
174		if(!isSystemIgnorableTemplateProperty(templateKey) && !this.interview.isUpdatableKey(templateKey)) {
175		String newTV = templateData.getProperty(templateKey);
	172	for (String templateKey : templateData.keySet()) {
	173	if (!isSystemIgnorableTemplateProperty(templateKey) && !this.interview.isUpdatableKey(templateKey)) {
	174	String newTV = templateData.get(templateKey);
176	175	String oldTV = interview.retrieveTemplateProperty(templateKey);
177	176	if (oldTV != null &&
178	177	!oldTV.equals(newTV)) {
179	178	wasUpdate = true;
180		interview.storeTemplateProperty(templateKey, newTV);
	179	interview.storeTemplateProperty(templateKey, newTV);
181	180	}
182	181	}
183	182	}
184	183	return wasUpdate;
185	184	}
186	185
187		private boolean processPartialQuestions(Properties templateData, Map allQuestionMap, Map actual) throws IOException {
188		Iterator keys = templateData.keySet().iterator();
	186	private boolean processPartialQuestions(Map<String, String> templateData, Map<String, Question> allQuestionMap, Map<String, String> actual) throws IOException {
	187	Iterator<String> keys = templateData.keySet().iterator();
189	188	boolean updated = false;
190	189	while (keys.hasNext()) {
191		String questionKey = (String)keys.next();
	190	String questionKey = keys.next();
192	191	if (!interview.isUpdatableKey(questionKey)) {
193	192	continue;
194	193	}
195	194	if (isPropertyQuestion(questionKey, allQuestionMap)) {
196	195	// create template map
197		String templateValue = templateData.getProperty(questionKey);
	196	String templateValue = templateData.get(questionKey);
198	197	Properties2 templateProps = InterviewPropagator.stringToProperties2(templateValue);
199	198	// create actual map
200		String actualValue = (String) actual.get(questionKey);
	199	String actualValue = actual.get(questionKey);
201	200	Properties2 actualProps = InterviewPropagator.stringToProperties2(actualValue);
202	201	String oldTVal = interview.retrieveTemplateProperty(questionKey);
203	202	Properties2 oldTemplateProps = null;

206	205	}
207	206
208	207
209		Iterator itt = templateProps.keySet().iterator();
	208	Iterator<String> itt = templateProps.keySet().iterator();
210	209	boolean currentQuestionUpdated = false;
211	210	Properties2 oldValuesMap = new Properties2();
212	211	while (itt.hasNext()) {
213		String subKey = (String)itt.next();
	212	String subKey = itt.next();
214	213	if (interview.isAutoUpdatableKey(questionKey, subKey) \|\|
215	214	!actualProps.containsKey(subKey)) {
216	215	String templateSubValue = templateProps.getProperty(subKey);

245	244	pq.setValue(sw.toString());
246	245	interview.setEdited(true);
247	246	updated = true;
248		Object [] data = new Object[] {sw.toString(), swOld.toString(), swOld.toString(),
249		getQuestionText(questionKey, allQuestionMap)};
	247	String[] data = new String[]{sw.toString(), swOld.toString(), swOld.toString(),
	248	getQuestionText(questionKey, allQuestionMap)};
250	249	pm.partialUpdateMap.put(questionKey, data);
251	250	}
252	251	}

254	253	return updated;
255	254	}
256	255
257		private void processQuestionFromSet(Properties templateData, Map allQ, Set keySet, Map actual) {
258		Iterator keys = keySet.iterator();
259		while (keys.hasNext()) {
260		String questionKey = (String)keys.next();
261		if (! isIgnorableTemplateProperty(questionKey)) {
262		Object templateV = templateData.getProperty(questionKey);
263		Object oldTemplateV = interview.retrieveTemplateProperty(questionKey);
264		Object configurationV = actual.get(questionKey);
	256	private void processQuestionFromSet(Map<String, String> templateData, Map<String, Question> allQ, Set<String> keySet, Map<String, String> actual) {
	257	for (String questionKey : keySet) {
	258	if (!isIgnorableTemplateProperty(questionKey)) {
	259	String templateV = templateData.get(questionKey);
	260	String oldTemplateV = interview.retrieveTemplateProperty(questionKey);
	261	String configurationV = actual.get(questionKey);
265	262	pm.add(questionKey, templateV, oldTemplateV, configurationV,
266	263	getQuestionText(questionKey, allQ),
267	264	isPropertyQuestion(questionKey, allQ));

295	292
296	293
297	294	private boolean isFromTemplate() {
298		return ! interview.isTemplate() && interview.getTemplatePath() != null;
	295	return !interview.isTemplate() && interview.getTemplatePath() != null;
299	296	}
300	297
301	298	private String getQuestionText(String key, Map<String, Question> allQ) {

311	308
312	309	/**
313	310	* Gets current PropogateMap
	311	*
314	312	* @return InterviewPropagator.PropogateMap with actual data
315	313	*/
316	314	public InterviewPropagator.PropogateMap getPropagateMap() {

324	322	public void acceptAll() {
325	323	InterviewPropagator.PropogateMap pm = getPropagateMap();
326	324	if (pm.hasConflicts()) {
327		Map map = pm.conflictMap;
	325	Map<String, String[]> map = pm.conflictMap;
328	326	acceptTemplateDatafromMap(map);
329	327	try {
330	328	interview.save();

342	340	public void rejectAll() {
343	341	InterviewPropagator.PropogateMap pm = getPropagateMap();
344	342	if (pm.hasConflicts()) {
345		Map map = pm.conflictMap;
	343	Map<String, String[]> map = pm.conflictMap;
346	344	acceptTemplateDatafromMap(map, true);
347	345	try {
348	346	interview.save();

355	353	}
356	354
357	355	// autoupdatable values
358		private void updateAll() {
	356	private void updateAll() {
359	357	InterviewPropagator.PropogateMap pm = getPropagateMap();
360	358	if (pm.hasUpdates()) {
361		Map map = pm.updateMap;
	359	Map<String, String[]> map = pm.updateMap;
362	360	acceptTemplateDatafromMap(map);
363	361	saveInterview();
364	362	}

375	373	}
376	374	}
377	375
378		private void acceptTemplateDatafromMap(final Map map) {
	376	private void acceptTemplateDatafromMap(final Map<String, String[]> map) {
379	377	acceptTemplateDatafromMap(map, false);
380	378	}
381	379
382	380
383		private void acceptTemplateDatafromMap(final Map map, boolean templateOnly) {
384		Iterator it = map.keySet().iterator();
385		while (it.hasNext()) {
386		String key = (String) it.next();
387		Object[] vals = (Object[]) map.get(key);
	381	private void acceptTemplateDatafromMap(final Map<String, String[]> map, boolean templateOnly) {
	382	for (String key : map.keySet()) {
	383	String[] vals = map.get(key);
388	384	interview.storeTemplateProperty(key, vals[NEW_TEMPLATE].toString());
389	385	}
390	386	if (!templateOnly) {
391		Map actual = new HashMap();
	387	Map<String, String> actual = new HashMap<>();
392	388	interview.save(actual);
393		it = map.keySet().iterator();
394		while (it.hasNext()) {
395		String key = (String) it.next();
396		Object[] vals = (Object[]) map.get(key);
	389	for (String key : map.keySet()) {
	390	String[] vals = map.get(key);
397	391	actual.put(key, vals[NEW_TEMPLATE]);
398	392	}
399	393	try {

435	429
436	430	/**
437	431	* Converts string representation of property question to Properties2 object
	432	*
438	433	* @param str - string representation of property question
439	434	* @return corresponding Properties2 object
440	435	* @throws IOException

450	445	/**
451	446	* Properties2 object to its string representation.
452	447	* Used for property question processing
	448	*
453	449	* @param pr - Properties2 object
454	450	* @return corresponding string representation
455	451	*/
456		public static String properties2ToString(Properties2 pr) {
	452	public static String properties2ToString(Properties2 pr) {
457	453	StringWriter sw = new StringWriter();
458	454	pr.save(sw, null);
459	455	return sw.toString();

461	457
462	458	/**
463	459	* Returns is the specified question is properties question
464		* @param key - question key
	460	*
	461	* @param key - question key
465	462	* @param interview - InterviewParameters object
466	463	* @return true if the specified question is properties question, otherwise false
467	464	*/

471	468
472	469	/**
473	470	* Returns is the specified question is properties question
474		* @param key - question key
	471	*
	472	* @param key - question key
475	473	* @param allQ - question map
476	474	* @return true if the specified question is properties question, otherwise false
477	475	*/

484	482	}
485	483
486	484
487
488	485	/**
489	486	* Propagation data model.
490	487	*/
491	488	public class PropogateMap {
492	489
493		void add(String key, Object templV, Object oldTemplV, Object confV, String questionText, boolean isPropQ) {
	490	void add(String key, String templV, String oldTemplV, String confV, String questionText, boolean isPropQ) {
494	491
495	492	if (isPropQ) {
496	493	propQs.add(key);

504	501	}
505	502
506	503
507		private void add(Map aMap, String key, Object templV, Object oldTemplV, Object confV, String questionText, boolean isPropQ, Map updateMap) {
508
509
510		if (templV != null ) {
511		Object [] data = new Object[] {templV, oldTemplV, confV, questionText};
512		Object [] comp_data = data;
	504	private void add(Map<String, String[]> aMap, String key, String templV, String oldTemplV, String confV, String questionText, boolean isPropQ, Map<String, String[]> updateMap) {
	505
	506
	507	if (templV != null) {
	508	String[] data = {templV, oldTemplV, confV, questionText};
	509	String[] comp_data = data;
513	510	boolean added = false;
514	511	boolean isUpdate = false;
515	512	if (isPropQ) {

520	517
521	518	// is it "new template value" ?
522	519	if (comp_data[OLD_TEMPLATE] == null && !comp_data[NEW_TEMPLATE].equals(comp_data[CONFIGURATION])) {
523		comp_data[OLD_TEMPLATE] = notAvailable ;
	520	comp_data[OLD_TEMPLATE] = notAvailable;
524	521	if (comp_data[CONFIGURATION] == null) comp_data[CONFIGURATION] = notAvailable;
525		updateMap.put(key, data );
	522	updateMap.put(key, data);
526	523	isUpdate = added = true;
527	524
528		// is it "simple template update with no conflicts" ?
	525	// is it "simple template update with no conflicts" ?
529	526	} else if (comp_data[OLD_TEMPLATE] != null && comp_data[CONFIGURATION] != null) {
530	527	if (!comp_data[NEW_TEMPLATE].equals(comp_data[CONFIGURATION]) &&
531	528	comp_data[OLD_TEMPLATE].equals(comp_data[CONFIGURATION])) {
532		updateMap.put(key, data );
	529	updateMap.put(key, data);
533	530	isUpdate = added = true;
534	531	} else if (!comp_data[NEW_TEMPLATE].equals(comp_data[CONFIGURATION]) &&
535	532	!comp_data[NEW_TEMPLATE].equals(comp_data[OLD_TEMPLATE])) {
536	533	// cases 1 and 3, notify and ask user
537		aMap.put(key, data);
	534	aMap.put(key, data);
538	535	added = true;
539	536	} else if (!comp_data[NEW_TEMPLATE].equals(comp_data[CONFIGURATION]) &&
540	537	comp_data[NEW_TEMPLATE].equals(comp_data[OLD_TEMPLATE])) {

542	539	//
543	540	} else if (!comp_data[NEW_TEMPLATE].equals(comp_data[OLD_TEMPLATE])) {
544	541	// case 2 notify and show user
545		aMap.put(key, data );
	542	aMap.put(key, data);
546	543	added = true;
547	544	}
548	545	}

579	576	}
580	577
581	578	void makeUpdatesReport(PrintStream sw) {
582		LinkedHashMap allUpdate = new LinkedHashMap(updateMap);
	579	LinkedHashMap<String, String[]> allUpdate = new LinkedHashMap<>(updateMap);
583	580	allUpdate.putAll(partialUpdateMap);
584	581	makeReport(sw, allUpdate, true);
585	582	}
586	583
587		private void makeReport(PrintStream sw, Map m, boolean hideOldTemplate) {
588		Iterator it = m.keySet().iterator();
589		if (! it.hasNext()) {
	584	private void makeReport(PrintStream sw, Map<String, String[]> m, boolean hideOldTemplate) {
	585	Iterator<String> it = m.keySet().iterator();
	586	if (!it.hasNext()) {
590	587	return;
591	588	}
592	589	try {

633	630	writer.endTag(HTMLWriterEx.TR);
634	631
635	632	while (it.hasNext()) {
636		String key = (String) it.next();
637		Object [] data = (Object []) m.get(key);
	633	String key = it.next();
	634	String[] data = m.get(key);
638	635	writer.startTag(HTMLWriterEx.TR);
639	636	writer.startTag(HTMLWriterEx.TD);
640	637	writer.writeAttr("class", "pname");
641		writer.writeAttr("colspan", hideOldTemplate? 2:3);
	638	writer.writeAttr("colspan", hideOldTemplate ? 2 : 3);
642	639	writer.startTag(HTMLWriterEx.HR);
643		writer.write((String)data[QUESTION_TEXT]);
	640	writer.write(data[QUESTION_TEXT]);
644	641	writer.endTag(HTMLWriterEx.TD);
645	642	writer.endTag(HTMLWriterEx.TR);
646	643
647	644	String[] s;
648		if(!propQs.contains(key)) {
	645	if (!propQs.contains(key)) {
649	646	s = new String[data.length];
650		for(int i = 0; i < data.length; i++)
651		s[i] = (String)data[i];
	647	for (int i = 0; i < data.length; i++)
	648	s[i] = data[i];
652	649	} else
653	650	s = convertPQ(data);
654	651
655	652	writer.startTag(HTMLWriterEx.TR);
656	653
657		for(int i = CONFIGURATION; i >= NEW_TEMPLATE; i--) {
658
659		if (i != OLD_TEMPLATE \|\| ! hideOldTemplate) {
	654	for (int i = CONFIGURATION; i >= NEW_TEMPLATE; i--) {
	655
	656	if (i != OLD_TEMPLATE \|\| !hideOldTemplate) {
660	657	writer.startTag(HTMLWriterEx.TD);
661	658	writer.writeAttr("class", "val");
662	659	writer.writeAttr("valign", "top");

672	669	writer.endTag(HTMLWriterEx.BODY);
673	670	writer.endTag(HTMLWriterEx.HTML);
674	671	writer.close();
675		} catch (IOException ex){
	672	} catch (IOException ex) {
676	673	ex.printStackTrace();
677	674	}
678	675	// no finally block to close stream because it wasn't created here
679	676	return;
680	677	}
681	678
682		private String [] convertPQ(Object[] data) {
683
684		try{
	679	private String[] convertPQ(Object[] data) {
	680
	681	try {
685	682
686	683	Properties2 oldT = InterviewPropagator.stringToProperties2((String) data[OLD_TEMPLATE]);
687	684	Properties2 newT = InterviewPropagator.stringToProperties2((String) data[NEW_TEMPLATE]);

689	686
690	687	HTMLWriterEx[] writers = new HTMLWriterEx[3];
691	688	StringWriter[] stringWriters = new StringWriter[writers.length];
692		for(int i = 0; i < writers.length; i++) {
	689	for (int i = 0; i < writers.length; i++) {
693	690	stringWriters[i] = new StringWriter();
694	691	writers[i] = new HTMLWriterEx(stringWriters[i], i18n);
695	692	writers[i].startTag(HTMLWriterEx.TABLE);

719	716	}
720	717
721	718	String[] result = new String[writers.length];
722		for(int i = 0; i < writers.length; i++) {
	719	for (int i = 0; i < writers.length; i++) {
723	720	writers[i].endTag(HTMLWriterEx.TABLE);
724	721	writers[i].flush();
725	722	result[i] = stringWriters[i].toString();

729	726	} catch (IOException ex) {
730	727	logException(ex);
731	728	}
732		return new String[] {"", "", ""};
	729	return new String[]{"", "", ""};
733	730	}
734	731
735	732	private String getCSS() {

744	741	r = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
745	742
746	743	String line;
747		while( (line = r.readLine()) != null )
	744	while ((line = r.readLine()) != null)
748	745	sb.append(line);
749	746	return sb.toString();
750	747	} catch (IOException ex) {

792	789	}
793	790
794	791
795		private HashSet propQs = new HashSet();
796		private LinkedHashMap conflictMap = new LinkedHashMap();
797		private LinkedHashMap updateMap = new LinkedHashMap();
798		private LinkedHashMap partialUpdateMap = new LinkedHashMap();
	792	private Set<String> propQs = new HashSet<>();
	793	private Map<String, String[]> conflictMap = new LinkedHashMap<>();
	794	private Map<String, String[]> updateMap = new LinkedHashMap<>();
	795	private Map<String, String[]> partialUpdateMap = new LinkedHashMap<>();
799	796	private File conflictReport;
800	797	private File updateReport;
801	798

805	802
806	803	public interface ViewManager {
807	804	void showView(InterviewPropagator prop, InterviewParameters interview);
	805
808	806	void logException(Throwable th, InterviewParameters interview);
	807
809	808	void notifyError(String message, InterviewParameters interview);
810	809	}
811	810

834	833	private static TestRefresher refresher;
835	834	private InterviewParameters interview;
836	835	private PropogateMap pm;
837		private String [] ignorableProps ;
838		private String [] ignorablePrefs ;
	836	private String[] ignorableProps;
	837	private String[] ignorablePrefs;
839	838	}
840	839
841	840

+2

-2

src/com/sun/javatest/JavaTestSecurityManager.java less more

153	153
154	154	// These methods are added for forward-compatibility with JDK1.1
155	155	public void checkAwtEventQueueAccess() { }
156		public void checkMemberAccess(Class clazz, int which) { }
	156	public void checkMemberAccess(Class<?> clazz, int which) { }
157	157	public void checkMulticast(InetAddress maddr) { }
158	158	public void checkMulticast(InetAddress maddr, byte ttl) { }
159	159	public void checkPrintJobAccess() { }

202	202	}
203	203	}
204	204	else if (perm instanceof PropertyPermission) {
205		if (((PropertyPermission)(perm)).getActions().equals("read,write"))
	205	if (perm.getActions().equals("read,write"))
206	206	checkPropertiesAccess();
207	207	}
208	208	}

+23

-23

src/com/sun/javatest/Keywords.java less more

104	104	* @return A Keywords object for the specified type and text.
105	105	* @throws Keywords.Fault if there are errors in the arguments.
106	106	*/
107		public static Keywords create(String type, String text, Set validKeywords) throws Fault {
108		Set lowerCaseValidKeywords = toLowerCase(validKeywords);
	107	public static Keywords create(String type, String text, Set<String> validKeywords) throws Fault {
	108	Set<String> lowerCaseValidKeywords = toLowerCase(validKeywords);
109	109	if (text == null) {
110	110	text = "";
111	111	}

188	188	* @return true if the the specified set of words are compatible
189	189	* with this keywords object.
190	190	*/
191		public abstract boolean accepts(Set s);
192
193		private static Set toLowerCase(Set words) {
	191	public abstract boolean accepts(Set<String> s);
	192
	193	private static Set<String> toLowerCase(Set<String> words) {
194	194	if (words == null)
195	195	return null;
196	196
197	197	boolean allLowerCase = true;
198		for (Iterator iter = words.iterator(); iter.hasNext() && allLowerCase; ) {
199		String word = (String) (iter.next());
	198	for (Iterator<String> iter = words.iterator(); iter.hasNext() && allLowerCase; ) {
	199	String word = iter.next();
200	200	allLowerCase &= word.equals(word.toLowerCase());
201	201	}
202	202
203	203	if (allLowerCase)
204	204	return words;
205	205
206		Set s = new HashSet();
207		for (Iterator iter = words.iterator(); iter.hasNext(); ) {
208		String word = (String) (iter.next());
	206	Set<String> s = new HashSet<>();
	207	for (Iterator<String> iter = words.iterator(); iter.hasNext(); ) {
	208	String word = iter.next();
209	209	s.add(word.toLowerCase());
210	210	}
211	211

230	230	//------------------------------------------------------------------------------
231	231
232	232	abstract class SetKeywords extends Keywords {
233		HashSet<String> keys;
	233	Set<String> keys;
234	234	String allKwds = ""; // string to be used by toString()
235	235
236		SetKeywords(String[] kwds, Set validKeywords) throws Keywords.Fault {
	236	SetKeywords(String[] kwds, Set<String> validKeywords) throws Keywords.Fault {
237	237	if (kwds.length == 0) {
238	238	throw new Keywords.Fault(i18n, "kw.noKeywords");
239	239	}

277	277
278	278	}
279	279	class AllKeywords extends SetKeywords {
280		AllKeywords(String[] keys, Set validKeywords) throws Keywords.Fault {
	280	AllKeywords(String[] keys, Set<String> validKeywords) throws Keywords.Fault {
281	281	super(keys, validKeywords);
282	282	}
283	283

288	288	* @return
289	289	*/
290	290	@Override
291		public boolean accepts(Set s) {
	291	public boolean accepts(Set<String> s) {
292	292	return s.containsAll(keys);
293	293	}
294	294

300	300
301	301
302	302	class AnyKeywords extends SetKeywords {
303		AnyKeywords(String[] keys, Set validKeywords) throws Keywords.Fault {
	303	AnyKeywords(String[] keys, Set<String> validKeywords) throws Keywords.Fault {
304	304	super(keys, validKeywords);
305	305	}
306	306

309	309	* @return false, if none of the keywords is in the set
310	310	*/
311	311	@Override
312		public boolean accepts(Set s) {
	312	public boolean accepts(Set<String> s) {
313	313	for (String kwd :keys) {
314	314	if (s.contains(kwd)) {
315	315	return true;

327	327	//------------------------------------------------------------------------------
328	328
329	329	class ExprParser {
330		ExprParser(String text, Set validKeywords) {
	330	ExprParser(String text, Set<String> validKeywords) {
331	331	this.text = text;
332	332	this.validKeywords = validKeywords;
333	333	nextToken();

436	436	protected static boolean allowNumericKeywords =
437	437	Boolean.getBoolean("javatest.allowNumericKeywords");
438	438	private String text;
439		private Set validKeywords;
	439	private Set<String> validKeywords;
440	440	private int index;
441	441	private int token;
442	442	private String idValue;

515	515	super(left, right);
516	516	}
517	517
518		public boolean accepts(Set s) {
	518	public boolean accepts(Set<String> s) {
519	519	return (left.accepts(s) && right.accepts(s));
520	520	}
521	521

539	539	this.expr = expr;
540	540	}
541	541
542		public boolean accepts(Set s) {
	542	public boolean accepts(Set<String> s) {
543	543	return !expr.accepts(s);
544	544	}
545	545

582	582	super(left, right);
583	583	}
584	584
585		public boolean accepts(Set s) {
	585	public boolean accepts(Set<String> s) {
586	586	return (left.accepts(s) \|\| right.accepts(s));
587	587	}
588	588

606	606	this.expr = expr;
607	607	}
608	608
609		public boolean accepts(Set s) {
	609	public boolean accepts(Set<String> s) {
610	610	return expr.accepts(s);
611	611	}
612	612

649	649	this.key = key;
650	650	}
651	651
652		public boolean accepts(Set s) {
	652	public boolean accepts(Set<String> s) {
653	653	return (s.contains(key));
654	654	}
655	655

+11

-17

src/com/sun/javatest/KnownFailuresList.java less more

29	29
30	30	import java.io.*;
31	31	import java.nio.charset.StandardCharsets;
32		import java.util.HashMap;
33		import java.util.Map;
	32	import java.util.*;
34	33
35	34	import com.sun.javatest.util.I18NResourceBundle;
36
37		import java.util.ArrayList;
38		import java.util.Iterator;
39		import java.util.TreeSet;
40	35
41	36	/**
42	37	* Support class to read and process a list of tests and test cases which are

280	275	else {
281	276	// flatten the enumeration into a vector, then
282	277	// enumerate that
283		ArrayList<Entry> v = new ArrayList(table.size());
284		for (Iterator<Entry> iter = table.values().iterator(); iter.hasNext(); ) {
	278	List<Entry> v = new ArrayList<>(table.size());
	279	for (Iterator<Object> iter = table.values().iterator(); iter.hasNext(); ) {
285	280	Object o = iter.next();
286	281	if (o instanceof Entry)
287	282	v.add((Entry)o);

306	301	*/
307	302	public void merge(KnownFailuresList other) {
308	303	synchronized (table) {
309		for (Iterator iter = other.getIterator(false); iter.hasNext(); ) {
310		Entry otherEntry = (Entry) (iter.next());
	304	for (Iterator<Entry> iter = other.getIterator(false); iter.hasNext(); ) {
	305	Entry otherEntry = iter.next();
311	306	Key key = new Key(otherEntry.relativeURL);
312	307	Object o = table.get(key);
313	308	if (o == null) {

345	340	// an entry with another set of test cases.
346	341	// For now, concatenate the arrays.
347	342	// RFE: Replace Entry[] with Set and merge the sets.
348		table.put(key, (Entry[]) DynamicArray.append((Entry[]) o, otherEntry));
	343	table.put(key, DynamicArray.append((Entry[]) o, otherEntry));
349	344	}
350	345	}
351	346	}

582	577	// skip white space, then read and sort a list of comma-separated
583	578	// numbers with no embedded white-space
584	579	skipWhite();
585		TreeSet s = new TreeSet();
	580	Set<String> s = new TreeSet<>();
586	581	StringBuilder sb = new StringBuilder();
587	582	for ( ; !isEndOfLine(ch) && !isWhitespace(ch); ch = in.read()) {
588	583	if (ch == ',') {

601	596	if (s.isEmpty())
602	597	s.add("0"); // backwards compatibility
603	598
604		return (String[]) (s.toArray(new String[s.size()]));
	599	return s.toArray(new String[s.size()]);
605	600	}
606	601
607	602	private String readRest() throws IOException {

711	706	/**
712	707	* An entry in the exclude list.
713	708	*/
714		public static final class Entry implements Comparable {
	709	public static final class Entry implements Comparable<Entry> {
715	710	/**
716	711	* Create an ExcludeList entry.
717	712	* @param u The URL for the test, specified relative to the test suite root.

736	731	notes = s;
737	732	}
738	733
739		public int compareTo(Object o) {
740		Entry e = (Entry) o;
	734	public int compareTo(Entry e) {
741	735	int n = relativeURL.compareTo(e.relativeURL);
742	736	if (n == 0) {
743	737	if (testCase == null && e.testCase == null)

797	791	if (testCase == null)
798	792	return null;
799	793
800		ArrayList v = new ArrayList();
	794	List<String> v = new ArrayList<>();
801	795	int start = -1;
802	796	for (int i = 0; i < testCase.length(); i++) {
803	797	if (testCase.charAt(i) == ',') {

+3

-2

src/com/sun/javatest/LastRunFilter.java less more

28	28	import java.io.IOException;
29	29	import java.io.File;
30	30	import java.util.ArrayList;
	31	import java.util.List;
31	32
32	33	import com.sun.javatest.util.I18NResourceBundle;
33	34

111	112	if (fileTestURLs == null) {
112	113	fileTestURLs = new File[testURLs.size()];
113	114	for (int i = 0; i < fileTestURLs.length; i++) {
114		fileTestURLs[i] = new File((String)testURLs.get(i));
	115	fileTestURLs[i] = new File(testURLs.get(i));
115	116	}
116	117	}
117	118	return fileTestURLs;

170	171
171	172	private WorkDirectory workdir;
172	173	private long lastStart;
173		private ArrayList testURLs = new ArrayList();
	174	private List<String> testURLs = new ArrayList<>();
174	175	private File[] fileTestURLs = null; // testURLs as file array
175	176	private static I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(LastRunFilter.class);
176	177	}

+11

-23

src/com/sun/javatest/LastRunInfo.java less more

28	28	import java.io.FileInputStream;
29	29	import java.io.FileOutputStream;
30	30	import java.io.IOException;
31		import java.util.Date;
32		import java.util.ArrayList;
33		import java.util.Iterator;
34		import java.util.Properties;
	31	import java.util.*;
35	32
36	33	/**
37	34	* Information about the last or current test run. This is an interface onto

44	41	private LastRunInfo(WorkDirectory wd) throws IOException {
45	42	this();
46	43
47		FileInputStream in = null;
48	44	Properties p;
49		try {
50		in = new FileInputStream(wd.getSystemFile(FILENAME));
	45	try (FileInputStream in = new FileInputStream(wd.getSystemFile(FILENAME))) {
51	46	p = new Properties();
52	47	p.load(in);
53		} finally {
54		try { if (in != null) in.close(); } catch (IOException e) {}
55	48	}
56	49
57	50	String val = p.getProperty(START);

133	126	* Get the URLs of the tests that were executed in the last test run.
134	127	* @return String array of testURLs executed.
135	128	*/
136		public ArrayList getTestURLs() {
	129	public List<String> getTestURLs() {
137	130	return testURLs;
138	131	}
139	132

142	135	* @param list
143	136	* @return A single string with all the items in the list joined.
144	137	*/
145		private static String join(ArrayList list) {
	138	private static String join(List<String> list) {
146	139	if (list == null) {
147	140	return "";
148	141	}
149	142	StringBuffer sb = new StringBuffer();
150		for (Iterator it = list.iterator(); it.hasNext();) {
151		sb.append((String)it.next());
	143	for (Iterator<String> it = list.iterator(); it.hasNext();) {
	144	sb.append(it.next());
152	145	sb.append(SEP);
153	146	}
154	147

163	156	* @param joined - string to split
164	157	* @return array list, never null.
165	158	*/
166		private static ArrayList split(String joined) {
167		ArrayList list = new ArrayList();
	159	private static List<String> split(String joined) {
	160	List<String> list = new ArrayList<>();
168	161	if (joined == null \|\| joined.trim().length() == 0) {
169	162	return list;
170	163	}

207	200	* created, opened, written into or deleted.
208	201	*/
209	202	public static void writeInfo(WorkDirectory workdir, long start, long stop,
210		String config, ArrayList testURLs)
	203	String config, List<String> testURLs)
211	204	throws IOException {
212	205	Properties p = new Properties();
213	206	p.setProperty(CONFIG, config);

215	208	p.setProperty(FINISH, Long.toString(stop));
216	209	p.setProperty(TEST_URLS, join(testURLs));
217	210
218		FileOutputStream out = null;
219		try {
220		out = new FileOutputStream(workdir.getSystemFile(FILENAME));
	211	try (FileOutputStream out = new FileOutputStream(workdir.getSystemFile(FILENAME))) {
221	212
222	213	// this is a date file, does not need i18n
223	214	p.store(out, "Last test run info");
224		}
225		finally {
226		try { if (out != null) out.close(); } catch (IOException e) {}
227	215	}
228	216	}
229	217
230	218	private String configName;
231	219	private long startTime;
232	220	private long finishTime;
233		private ArrayList testURLs;
	221	private List<String> testURLs;
234	222
235	223	// file in the work dir
236	224	private static final String FILENAME = "lastRun.txt";

+2

-2

src/com/sun/javatest/ObservableTestFilter.java less more

51	51	* @param o The observer to be registered. Should never be null.
52	52	*/
53	53	public void addObserver(Observer o) {
54		observers = (Observer[])DynamicArray.append(observers, o);
	54	observers = DynamicArray.append(observers, o);
55	55	}
56	56
57	57	/**

60	60	* @param o The filter to be un-registered.
61	61	*/
62	62	public void removeObserver(Observer o) {
63		observers = (Observer[])DynamicArray.remove(observers, o);
	63	observers = DynamicArray.remove(observers, o);
64	64	}
65	65
66	66	/**

+2

-6

src/com/sun/javatest/ProductInfo.java less more

36	36	import java.net.URLDecoder;
37	37	import java.text.DateFormat;
38	38	import java.text.ParseException;
39		import java.util.ArrayList;
40		import java.util.Date;
41		import java.util.Locale;
42		import java.util.Properties;
43		import java.util.StringTokenizer;
	39	import java.util.*;
44	40
45	41
46	42	/**

92	88	*/
93	89	private static int[] parseVersion(String v) {
94	90	int[] arr = {0,0,0,0,0,0,0,0,0,0};
95		ArrayList list = new ArrayList();
	91	List<String> list = new ArrayList<>();
96	92	StringTokenizer st = new StringTokenizer(v, ".");
97	93	while (st.hasMoreTokens()) {
98	94	list.add(st.nextToken());

+7

-7

src/com/sun/javatest/ResourceLoader.java less more

44	44
45	45	public class ResourceLoader {
46	46
47		public static Enumeration getResources(String name, Class ownClass) throws IOException {
	47	public static Enumeration<URL> getResources(String name, Class<?> ownClass) throws IOException {
48	48	URL extResource = getExtResource(name, null);
49	49	if (extResource != null) {
50		Vector r = new Vector();
	50	Vector<URL> r = new Vector<>();
51	51	r.add(extResource);
52	52	return r.elements();
53	53	}
54	54	return ownClass.getClassLoader().getResources(name);
55	55	}
56	56
57		public static InputStream getResourceAsStream(final String name, final Class ownClass) {
	57	public static InputStream getResourceAsStream(final String name, final Class<?> ownClass) {
58	58	URL url = getExtResource(name, ownClass);
59	59	try {
60	60	if (url != null) {

74	74	}
75	75	}
76	76
77		public static File getResourceFile(String name, Class ownClass) {
	77	public static File getResourceFile(String name, Class<?> ownClass) {
78	78	File f = getExtResourceFile(name, ownClass);
79	79	if (f != null) {
80	80	return f;

100	100	return url;
101	101	}
102	102
103		private static URL getExtResource(String name, Class ownClass) {
	103	private static URL getExtResource(String name, Class<?> ownClass) {
104	104	URL ret = null;
105	105	File rf = getExtResourceFile(name, ownClass);
106	106	if (rf != null) {

113	113	return ret;
114	114	}
115	115
116		private static File getExtResourceFile(String name, Class ownClass) {
	116	private static File getExtResourceFile(String name, Class<?> ownClass) {
117	117	if (ext != null) {
118	118	String relName;
119	119	if (ownClass == null) {

132	132
133	133
134	134	// get from java.lang.Class with minimal changes
135		private static String resolveName(String name, Class baseClass) {
	135	private static String resolveName(String name, Class<?> baseClass) {
136	136	if (name == null \|\| baseClass == null) {
137	137	return name;
138	138	}

+5

-7

src/com/sun/javatest/ResourceTable.java less more

25	25	*/
26	26	package com.sun.javatest;
27	27
28		import java.util.Arrays;
29		import java.util.HashMap;
30		import java.util.TreeSet;
	28	import java.util.*;
31	29
32	30	/**
33	31	* A table providing simple named locks for arbitrary resources.

38	36	* Create a resource table.
39	37	*/
40	38	public ResourceTable() {
41		table = new HashMap();
	39	table = new HashMap<>();
42	40	}
43	41
44	42	/**

46	44	* @param initialSize a hint as to the initial capacity to make the table
47	45	*/
48	46	public ResourceTable(int initialSize) {
49		table = new HashMap(initialSize);
	47	table = new HashMap<>(initialSize);
50	48	}
51	49
52	50	/**

65	63	if (resourceNames.length > 1) {
66	64	// sort and remove duplicates
67	65	// canonicalize acquisition order to prevent deadlocks
68		TreeSet ts = new TreeSet();
	66	Set<String> ts = new TreeSet<>();
69	67	ts.addAll(Arrays.asList(resourceNames));
70	68	String[] s = new String[ts.size()];
71	69	ts.toArray(s);

116	114	notifyAll();
117	115	}
118	116
119		private HashMap table;
	117	private Map<String, Thread> table;
120	118	}

+5

-26

src/com/sun/javatest/Script.java less more

718	718	if (!cdf.exists())
719	719	cdf.mkdirs();
720	720
721		Vector v = new Vector(0, srcs.length);
	721	Vector<String> v = new Vector<>(0, srcs.length);
722	722
723	723	for (int i = 0; i < srcs.length; i++) {
724	724	String src = srcs[i];

732	732	// if none found, set setPrefix to empty string
733	733	// if error, report the error, ignore pkgPrefix, and set file to
734	734	// be unconditionally compiled.
735		BufferedReader r = null;
736		try {
737		r = new BufferedReader(new FileReader(src));
	735	try (BufferedReader r = new BufferedReader(new FileReader(src))) {
738	736	StreamTokenizer tr = new StreamTokenizer(r);
739	737	tr.ordinaryChar('/');
740	738	tr.slashStarComments(true);

763	761	v.addElement(src);
764	762	continue;
765	763	}
766		finally {
767		if (r != null) {
768		try {
769		r.close();
770		}
771		catch (IOException ignore) {
772		}
773		}
774		}
775	764
776	765
777	766	File srcFile = new File(src);

1006	995	section.getMessageWriter().println(i18n.getString("script.command",
1007	996	new Object[] {className, StringArray.join(args) }));
1008	997
1009		PrintWriter out1 = null;
1010		PrintWriter out2 = null;
1011		try {
1012		out1 = section.createOutput(cmdOut1Name);
1013		out2 = section.createOutput(cmdOut2Name);
	998	try (PrintWriter out1 = section.createOutput(cmdOut1Name);
	999	PrintWriter out2 = section.createOutput(cmdOut2Name)) {
1014	1000
1015	1001	s = invokeClass(className, args, out1, out2);
1016
1017		out1.close();
1018		out2.close();
1019		}
1020		finally {
1021		if (out2 != null) out2.close();
1022		if (out1 != null) out1.close();
1023	1002	}
1024	1003
1025	1004	section.setStatus(s);

1060	1039	// says in the environment file:
1061	1040	Command testCommand;
1062	1041	try {
1063		Class c = (loader == null ? Class.forName(className) : loader.loadClass(className));
	1042	Class<?> c = (loader == null ? Class.forName(className) : loader.loadClass(className));
1064	1043	testCommand = (Command)(c.newInstance());
1065	1044	}
1066	1045	catch (ClassCastException e) {

+2

-2

src/com/sun/javatest/TRT_HttpHandler.java less more

140	140	}
141	141	else {
142	142	*/
143		Iterator it = trt.getIterator();
	143	Iterator<TestResult> it = trt.getIterator();
144	144	while (it.hasNext()) {
145		TestResult tr = (TestResult)(it.next());
	145	TestResult tr = it.next();
146	146	String url;
147	147	try {
148	148	url = tr.getDescription().getRootRelativeURL();

+16

-23

src/com/sun/javatest/TRT_Iterator.java less more

25	25	*/
26	26	package com.sun.javatest;
27	27
28		import java.util.ArrayList;
29		import java.util.Enumeration;
30		import java.util.HashMap;
31		import java.util.Iterator;
32		import java.util.LinkedList;
33		import java.util.NoSuchElementException;
34		import java.util.Stack;
	28	import java.util.*;
35	29
36	30	import com.sun.javatest.tool.Preferences;
37	31	import com.sun.javatest.util.Debug;
38	32	import com.sun.javatest.util.I18NResourceBundle;
39		import java.util.Set;
40	33
41	34
42	35	/**

61	54	* construction code and does not create a usable object.
62	55	*/
63	56	protected TRT_Iterator() {
64		outQueue = new LinkedList();
	57	outQueue = new LinkedList<>();
65	58	resultStats = new int[Status.NUM_STATES];
66	59	nodeIndex = -1;
67	60	currFrame = null;

133	126	this.filters = filters;
134	127
135	128	if (trs != null && trs.length != 0) {
136		ArrayList names = new ArrayList();
	129	ArrayList<String> names = new ArrayList<>();
137	130
138	131	// prime the outqueue with the given tests
139	132	for (int i = 0; i < trs.length; i++) {

176	169	}
177	170
178	171	@Override
179		public Object nextElement() {
	172	public TestResult nextElement() {
180	173	TestResult val = null;
181	174	synchronized (outQueueLock) {
182	175	if (hasMoreElements()) {

203	196	}
204	197
205	198	@Override
206		public Object next() {
	199	public TestResult next() {
207	200	return nextElement();
208	201	}
209	202

246	239	// only create new objects if they don't exist
247	240	// users can turn on and off this feature if they want
248	241	if (filteredTRs == null) {
249		filteredTRs = new HashMap(10); // not likely to have > 10 filters
	242	filteredTRs = new HashMap<>(10); // not likely to have > 10 filters
250	243	}
251	244
252	245	if (fo == null) {

289	282	else {
290	283	// create shallow copy
291	284	// keys are TRs, values are TestFilters.
292		HashMap<TestFilter, ArrayList<TestDescription>> out = new HashMap(filteredTRs.size());
	285	HashMap<TestFilter, ArrayList<TestDescription>> out = new HashMap<>(filteredTRs.size());
293	286
294	287	synchronized (rejLock) {
295		Set keys = filteredTRs.keySet();
	288	Set<TestFilter> keys = filteredTRs.keySet();
296	289	// each key is a TestFilter
297	290	Iterator<TestFilter> it = keys.iterator();
298	291	while (it.hasNext()) {
299	292	// could cast this to TestFilter, but why?
300	293	TestFilter thisKey = it.next();
301		ArrayList<TestDescription> al = (ArrayList<TestDescription>) filteredTRs.get(thisKey).clone();
	294	ArrayList<TestDescription> al = new ArrayList<>(filteredTRs.get(thisKey));
302	295	out.put(thisKey, al);
303	296	} // outer while
304	297	} // sync

341	334	@Override
342	335	public String[] getInitialURLs() {
343	336	String[] list = null;
344		ArrayList urls = new ArrayList();
	337	List<String> urls = new ArrayList<>();
345	338
346	339	// can we correctly show the effective urls from here? what about TCs?
347	340	if (nodes != null) {

428	421	// XXX special cases here...
429	422
430	423	// it would be nicer if we could just cast to TRT.TreeNode
431		PseudoFrame frame = (PseudoFrame)(stack.elementAt(j));
	424	PseudoFrame frame = stack.elementAt(j);
432	425	TRT_TreeNode tn = (TRT_TreeNode)(frame.getNode());
433	426	int pos = tn.getNodeIndex(dir, false);
434	427	int currIndex = frame.getCurrentIndex();

712	705	private boolean nextNode() {
713	706	// stacks only valid in the context of a single node
714	707	// we create a new one when we move to a new initial node
715		stack = new Stack();
	708	stack = new Stack<>();
716	709
717	710	// invalidate the current frame
718	711	// NOTE: a null currFrame will terminate the iteration in findNext()

759	752	*/
760	753	private PseudoFrame pop() {
761	754	if (!stack.empty())
762		return (PseudoFrame)(stack.pop());
	755	return stack.pop();
763	756	else
764	757	return null;
765	758	}

958	951	boolean recordRejectTR = p.getPreference("exec.recordNotrunReasons", "false").equals("true");
959	952
960	953	// ------ state information ------
961		private Stack stack;
	954	private Stack<PseudoFrame> stack;
962	955	private PseudoFrame currFrame;
963	956
964	957	private boolean finished = false;

1015	1008	@Override
1016	1009	public void rejected(TestDescription d, TestFilter rejector) {
1017	1010	synchronized (rejLock) {
1018		ArrayList vec = filteredTRs.get(rejector);
	1011	ArrayList<TestDescription> vec = filteredTRs.get(rejector);
1019	1012	if (vec == null) {
1020		vec = new ArrayList();
	1013	vec = new ArrayList<>();
1021	1014	filteredTRs.put(rejector, vec);
1022	1015	}
1023	1016

+14

-19

src/com/sun/javatest/TRT_TreeNode.java less more

27	27	package com.sun.javatest;
28	28
29	29	import java.io.File;
30		import java.util.ArrayList;
31		import java.util.Hashtable;
32		import java.util.HashMap;
	30	import java.util.*;
33	31
34	32	import com.sun.javatest.util.Debug;
35	33	import com.sun.javatest.util.DynamicArray;
36	34	import com.sun.javatest.util.I18NResourceBundle;
37	35
38	36	import com.sun.javatest.TestResultTable.TreeNode;
39		import java.util.Iterator;
40	37
41	38	/**
42	39	* This is the implementation of a tree node structure for TestResultTable.

50	47	* Add an observer to watch this node for changes.
51	48	*/
52	49	public synchronized void addObserver(TestResultTable.TreeNodeObserver obs) {
53		TestResultTable.TreeNodeObserver[] observers =
54		(TestResultTable.TreeNodeObserver[])observerTable.get(this);
	50	TestResultTable.TreeNodeObserver[] observers = observerTable.get(this);
55	51
56	52	if (observers == null) observers = new TestResultTable.TreeNodeObserver[0];
57		observers = (TestResultTable.TreeNodeObserver[])(DynamicArray.append(observers, obs));
	53	observers = DynamicArray.append(observers, obs);
58	54	observerTable.put(this, observers);
59	55	}
60	56

62	58	* Remove an observer that was previously added.
63	59	*/
64	60	public synchronized void removeObserver(TestResultTable.TreeNodeObserver obs) {
65		TestResultTable.TreeNodeObserver[] observers =
66		(TestResultTable.TreeNodeObserver[])observerTable.get(this);
	61	TestResultTable.TreeNodeObserver[] observers = observerTable.get(this);
67	62	if (observers == null)
68	63	return;
69	64
70		observers = (TestResultTable.TreeNodeObserver[])(DynamicArray.remove(observers, obs));
	65	observers = DynamicArray.remove(observers, obs);
71	66	if (observers == null)
72	67	observerTable.remove(this);
73	68	else

711	706	// anymore
712	707	if (newTd == null) // create an "emergency" one
713	708	newTd = new TestDescription(table.getTestFinder().getRoot(),
714		new File(filename), new HashMap());
	709	new File(filename), new HashMap<String, String>());
715	710
716	711	newTr = TestResult.notRun(newTd);
717	712

1420	1415
1421	1416	// if no conflicts were found, append it
1422	1417	if (node.filesToScan == null \|\| i >= node.filesToScan.length)
1423		node.filesToScan = (String[])DynamicArray.append(node.filesToScan, file);
	1418	node.filesToScan = DynamicArray.append(node.filesToScan, file);
1424	1419	else {
1425	1420	// name collision, ignore
1426	1421	// actually, with scan suppression, this may be normal

1758	1753	// these methods assume that the parent of the action is "this"
1759	1754
1760	1755	private void notifyInsBranch(TRT_TreeNode newNode, int index) {
1761		TestResultTable.TreeNodeObserver[] observers = (TestResultTable.TreeNodeObserver[])(observerTable.get(this));
	1756	TestResultTable.TreeNodeObserver[] observers = observerTable.get(this);
1762	1757
1763	1758	if (observers != null)
1764	1759	for (int i = 0; i < observers.length; i ++)

1766	1761	}
1767	1762
1768	1763	private void notifyInsResult(TestResult test, int index) {
1769		TestResultTable.TreeNodeObserver[] observers = (TestResultTable.TreeNodeObserver[])(observerTable.get(this));
	1764	TestResultTable.TreeNodeObserver[] observers = observerTable.get(this);
1770	1765
1771	1766	if (observers != null)
1772	1767	for (int i = 0; i < observers.length; i ++)

1774	1769	}
1775	1770
1776	1771	private void notifyReplacedResult(TestResult oldTest, TestResult newTest, int index) {
1777		TestResultTable.TreeNodeObserver[] observers = (TestResultTable.TreeNodeObserver[])(observerTable.get(this));
	1772	TestResultTable.TreeNodeObserver[] observers = observerTable.get(this);
1778	1773
1779	1774	if (observers != null)
1780	1775	for (int i = 0; i < observers.length; i ++)

1782	1777	}
1783	1778
1784	1779	private void notifyRemovedBranch(int index) {
1785		TestResultTable.TreeNodeObserver[] observers = (TestResultTable.TreeNodeObserver[])(observerTable.get(this));
	1780	TestResultTable.TreeNodeObserver[] observers = observerTable.get(this);
1786	1781
1787	1782	if (observers != null)
1788	1783	for (int i = 0; i < observers.length; i ++)

1790	1785	}
1791	1786
1792	1787	private void notifyRemovedResult(TestResult test, int index) {
1793		TestResultTable.TreeNodeObserver[] observers = (TestResultTable.TreeNodeObserver[])(observerTable.get(this));
	1788	TestResultTable.TreeNodeObserver[] observers = observerTable.get(this);
1794	1789
1795	1790	if (observers != null)
1796	1791	for (int i = 0; i < observers.length; i ++)

1798	1793	}
1799	1794
1800	1795	private void notifyCounterChange() {
1801		TestResultTable.TreeNodeObserver[] observers = (TestResultTable.TreeNodeObserver[])(observerTable.get(this));
	1796	TestResultTable.TreeNodeObserver[] observers = observerTable.get(this);
1802	1797	if (observers != null)
1803	1798	for (int i = 0; i < observers.length; i ++) {
1804	1799	observers[i].countersInvalidated(this);

1823	1818	private long lastScanDate;
1824	1819
1825	1820	// no per-instance array of observers, use a static Hashtable of arrays
1826		private static Hashtable observerTable = new Hashtable(16);
	1821	private static Map<TRT_TreeNode, TestResultTable.TreeNodeObserver[]> observerTable = new Hashtable<>(16);
1827	1822
1828	1823	/**
1829	1824	* List of files that makeup the on-disk contents of this node.

+1

-11

src/com/sun/javatest/TemplateUtilities.java less more

70	70	File dataFile = wd.getSystemFile(TEMPLATE_FILE);
71	71	Properties p = new Properties();
72	72
73		FileInputStream in = null;
74		try {
75		in = new FileInputStream(dataFile);
	73	try (FileInputStream in = new FileInputStream(dataFile)) {
76	74	p.load(in);
77	75	}
78	76	catch (FileNotFoundException e) {

82	80	}
83	81	catch (IOException e) {
84	82	// should log the error
85		}
86		finally {
87		try {
88		if (in != null)
89		in.close();
90		}
91		catch (IOException e) {
92		}
93	83	}
94	84
95	85	if (p != null)

+15

-17

src/com/sun/javatest/TestDescription.java less more

59	59	* filename and does not begin with the root filename.
60	60	*
61	61	*/
62		public TestDescription(File root, File file, Map params)
	62	public TestDescription(File root, File file, Map<?, ?> params)
63	63	throws IllegalArgumentException {
64	64
65	65	synchronized (this.getClass()) {

89	89	rootRelativeFile = fp;
90	90	rootRelativePath = rootRelativeFile.replace(File.separatorChar, '/');
91	91
92		Vector v = new Vector(0, params.size() * 2);
93		for (Iterator i = params.keySet().iterator(); i.hasNext(); ) {
94		String key = (String) (i.next());
95		String value = (String)(params.get(key));
96		insert(v, key, value);
	92	Vector<String> v = new Vector<>(0, params.size() * 2);
	93	for (Map.Entry<?, ?> entry : params.entrySet()) {
	94	insert(v, (String) entry.getKey(), (String) entry.getValue());
97	95	}
98	96	fields = new String[v.size()];
99	97	v.copyInto(fields);

108	106	char sep = file.charAt(root.length());
109	107	rootRelativePath = file.substring(root.length() + 1).replace(sep, '/');
110	108
111		Vector v = new Vector(0, params.length);
	109	Vector<String> v = new Vector<>(0, params.length);
112	110	for (int i = 0; i < params.length; i += 2) {
113	111	String key = params[i];
114	112	if (!(key.startsWith("$") \|\| key.equals("testsuite") \|\| key.equals("file"))) {

238	236	* They are returned in canonical form (lower-case).
239	237	* @return the set of keywords
240	238	*/
241		public Set getKeywordTable() {
	239	public Set<String> getKeywordTable() {
242	240	String[] keys = StringArray.split(getParameter("keywords"));
243		Set s = new TreeSet();
	241	Set<String> s = new TreeSet<>();
244	242	for (int i = 0; i < keys.length; i++) {
245	243	String k = keys[i].toLowerCase();
246	244	s.add(k);

454	452	* this test description.
455	453	* @return an iterator for the names of the parameters
456	454	*/
457		public Iterator getParameterKeys() {
458		return new Iterator() {
	455	public Iterator<String> getParameterKeys() {
	456	return new Iterator<String>() {
459	457	int pos = 0;
460	458
461	459	public boolean hasNext() {

467	465	}
468	466	}
469	467
470		public Object next() {
	468	public String next() {
471	469	if(fields == null \|\| fields.length == 0 \|\|
472	470	pos == fields.length) {
473	471	return null;

533	531	* WARNING: If this description has been read in from a .jtr file, the rootDir
534	532	* may be inappropriate for this system.
535	533	*/
536		void save(Map p) {
	534	void save(Map<String, String> p) {
537	535	saveField(p, "$root", rootDir);
538	536	saveField(p, "$file", getFile().getPath());
539	537	for (int i = 0; i < fields.length; i+=2) {

541	539	}
542	540	}
543	541
544		private void saveField(Map p, String key, String value) {
	542	private void saveField(Map<String, String> p, String key, String value) {
545	543	if (value != null)
546	544	p.put(key, value);
547	545	}

563	561	return new TestDescription(r, f, params);
564	562	}
565	563
566		private static void insert(Vector v, String key, String value) {
	564	private static void insert(Vector<String> v, String key, String value) {
567	565	int lower = 0;
568	566	int upper = v.size() - 2;
569	567	int mid = 0;

574	572	return;
575	573	}
576	574
577		String last = (String)v.elementAt(upper);
	575	String last = v.elementAt(upper);
578	576	int cmp = key.compareTo(last);
579	577	if (cmp > 0) {
580	578	v.addElement(key);

585	583	while (lower <= upper) {
586	584	// in next line, take care to ensure that mid is always even
587	585	mid = lower + ((upper - lower) / 4) * 2;
588		String e = (String)(v.elementAt(mid));
	586	String e = v.elementAt(mid);
589	587	cmp = key.compareTo(e);
590	588	if (cmp < 0) {
591	589	upper = mid - 2;

+28

-29

src/com/sun/javatest/TestEnvContext.java less more

66	66	* @throws TestEnvContext.Fault if an error is found while reading the files
67	67	*/
68	68	public TestEnvContext(File[] files) throws Fault {
69		Vector n = new Vector();
70		Vector p = new Vector();
	69	Vector<String> n = new Vector<>();
	70	Vector<Map<String, String>> p = new Vector<>();
71	71	try {
72	72	if (files != null) {
73	73	for (int i = 0; i < files.length; i++) {

92	92	* that will be used to identify the source of the properties in any
93	93	* environments that are created
94	94	*/
95		public TestEnvContext(Map[] tables, String[] tableNames) {
96		Vector n = new Vector();
97		Vector p = new Vector();
	95	public TestEnvContext(Map<String, String>[] tables, String[] tableNames) {
	96	Vector<String> n = new Vector<>();
	97	Vector<Map<String, String>> p = new Vector<>();
98	98	for (int i = 0; i < tables.length; i++) {
99	99	add(p, n, tables[i], tableNames[i]);
100	100	}

111	111	* @param tableName The name that will be used to identify the source
112	112	* of the properties in any environments that are created.
113	113	*/
114		public TestEnvContext(Map table, String tableName) {
115		Vector n = new Vector();
116		Vector p = new Vector();
	114	public TestEnvContext(Map<String, String> table, String tableName) {
	115	Vector<String> n = new Vector<>();
	116	Vector<Map<String, String>> p = new Vector<>();
117	117	add(p, n, table, tableName);
118	118	propTables = new Map[p.size()];
119	119	p.copyInto(propTables);

176	176	return envMenuNames;
177	177	}
178	178
179		private Map load(File f) throws Fault {
	179	private Map<String, String> load(File f) throws Fault {
180	180	if (f == null)
181	181	return null;
182	182
183	183	try {
184		Properties p = new Properties();
185		Reader in = new BufferedReader(new InputStreamReader(new FileInputStream(f), StandardCharsets.UTF_8));
186		p.load(in);
	184	InputStream in = new BufferedInputStream(new FileInputStream(f));
	185	Map<String, String> p = Properties.load(in);
187	186	in.close();
188	187
189	188	/*

226	225	*/
227	226	}
228	227
229		private void add(Vector pv, Vector nv, Map p, String n) {
	228	private void add(Vector<Map<String, String>> pv, Vector<String> nv, Map<String, String> p, String n) {
230	229	if (p != null) {
231	230	pv.addElement(p);
232	231	nv.addElement(n);

235	234
236	235	private void updateEnvTable() {
237	236	// the tables given to the constructor ...
238		Map[] tables = propTables;
	237	Map<String, String>[] tables = propTables;
239	238	String[] tableNames = propTableNames;
240	239
241	240	// defaults given to TestEnvironment
242		Map[] defaultTables = TestEnvironment.defaultPropTables;
	241	Map<String, String>[] defaultTables = TestEnvironment.defaultPropTables;
243	242	String[] defaultTableNames = TestEnvironment.defaultPropTableNames;
244	243
245	244	// if there are defaults, merge them with the TestEnvContext tables
246	245	// for the purposes of determining the EnvTable
247	246	if (defaultTables != null && defaultTables.length > 0) {
248		tables = (Map[]) (DynamicArray.join(defaultTables, tables));
249		tableNames = (String[]) (DynamicArray.join(defaultTableNames, tableNames));
250		}
251
252		Vector allVec = new Vector();
253		Vector menuExcludeVec = new Vector();
	247	tables = DynamicArray.join(defaultTables, tables);
	248	tableNames = DynamicArray.join(defaultTableNames, tableNames);
	249	}
	250
	251	Vector<String> allVec = new Vector<>();
	252	Vector<String> menuExcludeVec = new Vector<>();
254	253
255	254	// scan all the property tables, looking for entries
256	255	final String ENV_DOT = "env.";

269	268	if (debug)
270	269	System.err.println("Checking " + tableNames[i] + " for environments...");
271	270
272		Map table = tables[i];
273		for (Iterator ii = table.keySet().iterator(); ii.hasNext(); ) {
274		String prop = (String) (ii.next());
	271	Map<String, String> table = tables[i];
	272	for (Iterator<String> ii = table.keySet().iterator(); ii.hasNext(); ) {
	273	String prop = (ii.next());
275	274	String name = null;
276	275
277	276	if (debug)

285	284	}
286	285	else if (prop.endsWith(DOT_MENU)) {
287	286	name = prop.substring(ENV_DOT.length(), prop.length() - DOT_MENU.length());
288		String value = (String) (table.get(prop));
	287	String value = (table.get(prop));
289	288	if ("false".equals(value))
290	289	sortedInsert(menuExcludeVec, name);
291	290	}

321	320
322	321	envNames = new String[allVec.size()];
323	322	allVec.copyInto(envNames);
324		Vector menuVec = (Vector)allVec.clone();
	323	Vector<String> menuVec = new Vector<String>(allVec);
325	324	for (int i = 0; i < menuExcludeVec.size(); i++)
326	325	menuVec.removeElement(menuExcludeVec.elementAt(i));
327	326	envMenuNames = new String[menuVec.size()];
328	327	menuVec.copyInto(envMenuNames);
329	328	}
330	329
331		private void sortedInsert(Vector v, String s) {
	330	private void sortedInsert(Vector<String> v, String s) {
332	331	for (int i = 0; i < v.size(); i++) {
333		int c = s.compareTo((String)(v.elementAt(i)));
	332	int c = s.compareTo(v.elementAt(i));
334	333	if (c > 0) {
335	334	v.insertElementAt(s, i);
336	335	return;

341	340	v.addElement(s);
342	341	}
343	342
344		private Map[] propTables;
	343	private Map<String, String>[] propTables;
345	344	private String[] propTableNames;
346	345	private String[] envNames;
347	346	private String[] envMenuNames;

+49

-34

src/com/sun/javatest/TestEnvironment.java less more

35	35
36	36	import com.sun.javatest.util.DynamicArray;
37	37	import com.sun.javatest.util.I18NResourceBundle;
	38	import com.sun.javatest.util.Properties;
38	39	import com.sun.javatest.util.StringArray;
39	40
40	41	/**

74	75
75	76	/**
76	77	* Add a default set of properties to be included when environments are
77		* created.
	78	* created. Properties are passed in as a {@code Map<String, String>} instance.
78	79	* @param name a name for this collection or properties, so that the
79	80	* source of the properties can be identified when browing an environment
80	81	* @param propTable a table of properties to be included when environments

82	83	* @see #clearDefaultPropTables
83	84	* @throws NullPointerException if either name or propTable is null.
84	85	*/
85		public static synchronized void addDefaultPropTable(String name, Map propTable) {
	86	public static synchronized void addDefaultPropTable(String name, Map<String, String> propTable) {
86	87	if (name == null \|\| propTable == null)
87	88	throw new NullPointerException();
88	89
89	90	//System.err.println("TEC: add default propTable " + name);
90		defaultPropTableNames = (String[]) (DynamicArray.append(defaultPropTableNames, name));
91		defaultPropTables = (Map[]) (DynamicArray.append(defaultPropTables, propTable));
	91	defaultPropTableNames = DynamicArray.append(defaultPropTableNames, name);
	92	defaultPropTables = DynamicArray.append(defaultPropTables, propTable);
	93	}
	94
	95	/**
	96	* Add a default set of properties to be included when environments are
	97	* created. Properties are passed in as a {@code java.util.Properties} instance.
	98	* @param name a name for this collection or properties, so that the
	99	* source of the properties can be identified when browing an environment
	100	* @param propTable a table of properties to be included when environments
	101	* are created
	102	* @see #clearDefaultPropTables
	103	* @throws NullPointerException if either name or propTable is null.
	104	*/
	105	public static synchronized void addDefaultPropTable(String name, java.util.Properties propTable) {
	106	addDefaultPropTable(name, Properties.convertToStringProps(propTable));
92	107	}
93	108
94	109	/**

101	116	}
102	117
103	118	static String[] defaultPropTableNames = { };
104		static Map[] defaultPropTables = { };
	119	static Map<String, String>[] defaultPropTables = new Map[0];
105	120
106	121	/**
107	122	* Construct an environment for a named group of properties.

114	129	* @throws TestEnvironment.Fault if there is an error in the table
115	130	*
116	131	*/
117		public TestEnvironment(String name, Map propTable, String propTableName)
	132	public TestEnvironment(String name, Map<String, String> propTable, String propTableName)
118	133	throws Fault {
119	134	this(name, (new Map[] {propTable}), (new String[] {propTableName}));
120	135	}

137	152	{
138	153	this.name = name;
139	154	if (defaultPropTables != null && defaultPropTables.length > 0) {
140		propTables = (Map[]) (DynamicArray.join(defaultPropTables, propTables));
141		propTableNames = (String[]) (DynamicArray.join(defaultPropTableNames, propTableNames));
	155	propTables = DynamicArray.join(defaultPropTables, propTables);
	156	propTableNames = DynamicArray.join(defaultPropTableNames, propTableNames);
142	157	}
143	158
144	159	// First, figure out the inheritance chain
145		Vector v = new Vector();
	160	Vector<String> v = new Vector<>();
146	161	for (String n = name, inherit = null; n != null && n.length() > 0; n = inherit, inherit = null) {
147	162	if (v.contains(n))
148	163	throw new Fault(i18n, "env.loop", name);

162	177	for (int inheritIndex = 0; inheritIndex < inherits.length; inheritIndex++) {
163	178	String prefix = "env." + inherits[inheritIndex] + ".";
164	179	for (int propIndex = propTables.length - 1; propIndex >= 0; propIndex--) {
165		Map propTable = propTables[propIndex];
166		for (Iterator i = propTable.keySet().iterator(); i.hasNext(); ) {
167		String prop = (String) (i.next());
	180	Map<String, String> propTable = propTables[propIndex];
	181	for (Iterator<String> i = propTable.keySet().iterator(); i.hasNext(); ) {
	182	String prop = (i.next());
168	183	if (prop.startsWith(prefix)) {
169	184	String key = prop.substring(prefix.length());
170	185	if (!table.containsKey(key)) {
171	186	Element elem = new Element(key,
172		(String)(propTable.get(prop)),
	187	(propTable.get(prop)),
173	188	inherits[inheritIndex],
174	189	propTableNames[propIndex]);
175	190	table.put(key, elem);

181	196
182	197	// finally, add in any top-level names (not beginning with env.)
183	198	for (int propIndex = propTables.length - 1; propIndex >= 0; propIndex--) {
184		Map propTable = propTables[propIndex];
185		for (Iterator i = propTable.keySet().iterator(); i.hasNext(); ) {
186		String key = (String) (i.next());
	199	Map<String, String> propTable = propTables[propIndex];
	200	for (Iterator<String> i = propTable.keySet().iterator(); i.hasNext(); ) {
	201	String key = (i.next());
187	202	if (!key.startsWith("env.")) {
188	203	if (!table.containsKey(key)) {
189	204	Element elem = new Element(key,
190		(String)(propTable.get(key)),
	205	(propTable.get(key)),
191	206	null,
192	207	propTableNames[propIndex]);
193	208	table.put(key, elem);

223	238	return null;
224	239	}
225	240
226		return ((Element)table.get("description")).getValue();
	241	return table.get("description").getValue();
227	242	}
228	243
229	244	/**

290	305	*
291	306	* @return all external global properties.
292	307	*/
293		public HashMap getExtraValues() {
	308	public Map<String, String[]> getExtraValues() {
294	309	return extras;
295	310	}
296	311

306	321	return lookup(key, null);
307	322	}
308	323
309		private String[] lookup(String key, Vector activeKeys) throws Fault {
310		String[] v = (String[])extras.get(key);
	324	private String[] lookup(String key, Vector<String> activeKeys) throws Fault {
	325	String[] v = extras.get(key);
311	326	if (v != null)
312	327	return v;
313	328
314	329
315		Element elem = (Element)table.get(key);
	330	Element elem = table.get(key);
316	331	if (elem != null) {
317	332	cache.put(key, elem);
318	333	if (activeKeys == null)
319		activeKeys = new Vector();
	334	activeKeys = new Vector<>();
320	335	else if (activeKeys.contains(key))
321	336	throw new Fault(i18n, "env.recursive",
322	337	new Object[] {key, elem.getDefinedInFile()});

360	375	return resolve(s, null);
361	376	}
362	377
363		private String[] resolve(String s, Vector activeKeys) throws Fault {
364		Vector v = new Vector();
	378	private String[] resolve(String s, Vector<String> activeKeys) throws Fault {
	379	Vector<String> v = new Vector<>();
365	380	StringBuffer current = new StringBuffer(64);
366	381	char term = 0;
367	382

542	557	* VALUE_NOT_DEFINED.
543	558	*/
544	559	public boolean hasUndefinedValues() {
545		for (Iterator i = elements().iterator(); i.hasNext(); ) {
546		TestEnvironment.Element entry = (TestEnvironment.Element) (i.next());
	560	for (Iterator<Element> i = elements().iterator(); i.hasNext(); ) {
	561	Element entry = i.next();
547	562	if (entry.value.indexOf("VALUE_NOT_DEFINED") >= 0)
548	563	return true;
549	564	}

609	624	* include the `env.<em>environment-name</em>.' prefix of the corresponding
610	625	* property names.
611	626	*/
612		public Set keys() {
	627	public Set<String> keys() {
613	628	return table.keySet();
614	629	}
615	630

621	636	* referenced.
622	637	* @see #resetElementsUsed
623	638	*/
624		public Collection elementsUsed() {
	639	public Collection<Element> elementsUsed() {
625	640	return cache.values();
626	641	}
627	642

639	654	* @return An enumeration that yields the various elements, explicit or inherited,
640	655	* that are available in this environment.
641	656	*/
642		public Collection elements() {
	657	public Collection<Element> elements() {
643	658	return table.values();
644	659	}
645	660

648	663	name = o.name;
649	664	inherits = o.inherits;
650	665	table = o.table;
651		extras = (HashMap)(o.extras.clone());
	666	extras = new HashMap<>(o.extras);
652	667	}
653	668
654	669	/**

701	716
702	717	private String name;
703	718	private String[] inherits;
704		private HashMap table = new HashMap();
705		private HashMap extras = new HashMap();
706		private HashMap cache = new HashMap();
	719	private Map<String, Element> table = new HashMap<>();
	720	private Map<String, String[]> extras = new HashMap<>();
	721	private Map<String, Element> cache = new HashMap<>();
707	722
708	723	private static final String[] EMPTY_STRING_ARRAY = {};
709	724	private static I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(TestEnvironment.class);

+32

-27

src/com/sun/javatest/TestFinder.java less more

245	245	* @see #foundFile(File)
246	246	* @since 3.2
247	247	*/
248		public void setComparator(Comparator c) {
	248	public void setComparator(Comparator<String> c) {
249	249	comp = c;
250	250
251	251	}

257	257	* @see #setComparator
258	258	* @since 3.2
259	259	*/
260		public Comparator getComparator() {
	260	public Comparator<String> getComparator() {
261	261	return comp;
262	262	}
263	263

266	266	* their own. The default is a US Locale Collator.
267	267	* @return The comparator which would be used if a custom one was not provided.
268	268	*/
269		protected Comparator getDefaultComparator() {
	269	protected static Comparator<String> getDefaultComparator() {
270	270	// this is the default
271		Collator c = Collator.getInstance(Locale.US);
	271	final Collator c = Collator.getInstance(Locale.US);
272	272	c.setStrength(Collator.PRIMARY);
273		return c;
	273	return new Comparator<String>() {
	274	@Override
	275	public int compare(String s1, String s2) {
	276	return c.compare(s1, s2);
	277	}
	278	};
274	279	}
275	280
276	281	//--------------------------------------------------------------------------

457	462	* @param name The name of the entry that has been read
458	463	* @param value The value of the entry that has been read
459	464	*/
460		protected void processEntry(Map entries, String name, String value) {
	465	protected void processEntry(Map<String, String> entries, String name, String value) {
461	466	// uniquefy the keys as they go into the entries table
462	467	name = name.intern();
463	468
464	469	if (name.equalsIgnoreCase("keywords")) {
465	470	// canonicalize keywords in their own special table
466		String keywordCacheValue = (String)keywordCache.get(value);
	471	String keywordCacheValue = keywordCache.get(value);
467	472	if (keywordCacheValue == null) {
468	473	String lv = value.toLowerCase();
469	474	String[] lvs = StringArray.split(lv);

480	485	}
481	486
482	487	// cache for canonicalized lists of keywords
483		private Map keywordCache = new HashMap();
	488	private Map<String, String> keywordCache = new HashMap<>();
484	489
485	490	/**
486	491	* "normalize" the test description entries read from a file.

489	494	* @param entries A set of tag values read from a test description in a file
490	495	* @return A normalized set of entries
491	496	*/
492		protected Map normalize(Map entries) {
	497	protected Map<String, String> normalize(Map<String, String> entries) {
493	498	return entries;
494	499	}
495	500

502	507	* @param file The file being read
503	508	* @param line The line number within the file (used for error messages)
504	509	*/
505		protected void foundTestDescription(Map entries, File file, int line) {
	510	protected void foundTestDescription(Map<String, String> entries, File file, int line) {
506	511	entries = normalize(entries);
507	512
508	513	if (debug) {
509	514	System.err.println("Found TestDescription");
510	515
511	516	System.err.println("--------values----------------------------");
512		for (Iterator i = entries.keySet().iterator() ; i.hasNext() ;) {
	517	for (Iterator<String> i = entries.keySet().iterator() ; i.hasNext() ;) {
513	518	Object key = i.next();
514	519	System.err.println(">> " + key + ": " + entries.get(key) );
515	520	}
516	521	System.err.println("------------------------------------------");
517	522	}
518	523
519		String id = (String)(entries.get("id"));
	524	String id = entries.get("id");
520	525	if (id == null)
521	526	id = "";
522	527
523	528	// make sure test has unique id within file
524		Integer prevLine = (Integer)testsInFile.get(id);
	529	Integer prevLine = testsInFile.get(id);
525	530	if (prevLine != null) {
526	531	int i = 1;
527	532	String newId;

568	573	}
569	574
570	575	if (tests == null)
571		tests = new Vector();
	576	tests = new Vector<>();
572	577
573	578	int target = 0;
574	579

585	590
586	591	while (left < right) {
587	592	center = ((right+left)/2);
588		int cmp = comp.compare(name, ((TestDescription)(tests.get(center))).getName());
	593	int cmp = comp.compare(name, tests.get(center).getName());
589	594	if (cmp < 0)
590	595	right = center;
591	596	else if (cmp >= 0)
592	597	left = center+1;
593	598	} // while
594	599
595		if (comp.compare(name, ((TestDescription)(tests.get(left))).getName()) > 0)
	600	if (comp.compare(name, tests.get(left).getName()) > 0)
596	601	target = left+1;
597	602	else
598	603	target = left;

640	645	*/
641	646	protected void foundFile(File newFile) {
642	647	if (files == null)
643		files = new Vector();
	648	files = new Vector<>();
644	649
645	650	int target = 0;
646	651

657	662
658	663	while (left < right) {
659	664	center = ((right+left)/2);
660		int cmp = comp.compare(path, ((File)(files.get(center))).getPath());
	665	int cmp = comp.compare(path, files.get(center).getPath());
661	666	if (cmp < 0)
662	667	right = center;
663	668	else if (cmp >= 0)
664	669	left = center+1;
665	670	} // while
666	671
667		if (comp.compare(path, ((File)(files.get(left))).getPath()) > 0)
	672	if (comp.compare(path, files.get(left).getPath()) > 0)
668	673	target = left+1;
669	674	else
670	675	target = left;

726	731	*/
727	732	protected TestEnvironment env;
728	733	private ErrorHandler errHandler;
729		private Comparator comp = getDefaultComparator();
730
731		private Vector files;
732		private Vector tests;
733
734		private Map testsInFile = new HashMap();
735
736		private Vector errorMessages = new Vector();
	734	private Comparator<String> comp = getDefaultComparator();
	735
	736	private Vector<File> files;
	737	private Vector<TestDescription> tests;
	738
	739	private Map<String, Integer> testsInFile = new HashMap<>();
	740
	741	private Vector<String> errorMessages = new Vector<>();
737	742
738	743	/**
739	744	* A boolean to enable trace output while debugging test finders.

+12

-11

src/com/sun/javatest/TestFinderQueue.java less more

27	27
28	28	import java.io.File;
29	29	import java.util.Hashtable;
	30	import java.util.Map;
30	31	import java.util.Vector;
31	32
32	33	import com.sun.javatest.util.DynamicArray;

184	185
185	186	// build up the fifo of tests to be used by readNextFile
186	187
187		tests = new Fifo();
	188	tests = new Fifo<>();
188	189	currInitialFile = null;
189	190
190	191	for (int pass = 0; pass < 2; pass++) {

231	232	*/
232	233	public void repeat(TestDescription[] tds) {
233	234	if (tests == null)
234		tests = new Fifo(); // for now
	235	tests = new Fifo<>(); // for now
235	236	for (int i = 0; i < tds.length; i++) {
236	237	TestDescription td = tds[i];
237	238	testDescsFound.insert(td);

256	257
257	258	// read files until there is a test description available or there
258	259	// are no more files.
259		while ((td = (TestDescription)(testDescsFound.remove())) == null) {
	260	while ((td = testDescsFound.remove()) == null) {
260	261	boolean ok = readNextFile();
261	262	if (!ok)
262	263	return null;

505	506	// are there any more tests that have not been read?
506	507	// check until we find one (just one).
507	508	while (filesToRead.isEmpty() && !tests.isEmpty()) {
508		currInitialFile = (File)tests.remove();
	509	currInitialFile = tests.remove();
509	510	foundFile(currInitialFile);
510	511	}
511	512

519	520	}
520	521
521	522
522		File f = (File)(filesToRead.lastElement());
	523	File f = filesToRead.lastElement();
523	524	filesToRead.setSize(filesToRead.size() - 1);
524	525	filesRemainingCount = filesToRead.size() + tests.size();
525	526

626	627
627	628	private static class Notifier implements Observer {
628	629	public synchronized void addObserver(Observer o) {
629		observers = (Observer[])DynamicArray.append(observers, o);
	630	observers = DynamicArray.append(observers, o);
630	631	}
631	632
632	633	public synchronized void removeObserver(Observer o) {
633		observers = (Observer[])DynamicArray.remove(observers, o);
	634	observers = DynamicArray.remove(observers, o);
634	635	}
635	636
636	637	public synchronized void found(File file) {

685	686
686	687
687	688	private TestFinder testFinder;
688		private Fifo tests;
	689	private Fifo<File> tests;
689	690	private TestFilter[] filters;
690	691	private String selectedId;
691	692	private File rootDir;

693	694	private int testsFoundCountBeforeCurrInitialFile;
694	695	private boolean zeroTestsOK;
695	696
696		private Vector filesToRead = new Vector(32, 8);
	697	private Vector<File> filesToRead = new Vector<>(32, 8);
697	698	private int fileInsertPosn;
698		private Fifo testDescsFound = new Fifo();
	699	private Fifo<TestDescription> testDescsFound = new Fifo<>();
699	700	private int filesRemainingCount;
700	701	private int filesDoneCount;
701	702	private int testsDoneCount;
702	703	private int testsFoundCount;
703	704	private int errorCount;
704	705
705		private Hashtable filesFound = new Hashtable();
	706	private Map<String, File> filesFound = new Hashtable<>();
706	707
707	708	private byte readAheadMode;
708	709	private Thread readAheadWorker;

+40

-51

src/com/sun/javatest/TestResult.java less more

31	31	import java.text.DateFormat;
32	32	import java.text.ParseException;
33	33	import java.text.SimpleDateFormat;
34		import java.util.Date;
35		import java.util.Enumeration;
36		import java.util.Hashtable;
37		import java.util.Iterator;
38		import java.util.LinkedList;
39		import java.util.Locale;
40		import java.util.Map;
41		import java.util.Vector;
42
43		import com.sun.javatest.util.BackupPolicy;
44		import com.sun.javatest.util.I18NResourceBundle;
	34	import java.util.*;
	35
	36	import com.sun.javatest.util.*;
45	37	import com.sun.javatest.util.Properties;
46		import com.sun.javatest.util.PropertyArray;
47		import com.sun.javatest.util.StringArray;
48		import com.sun.javatest.util.DynamicArray;
49	38
50	39	/**
51	40	* The TestResult object encapsulates the results from a test.

298	287	checkMutable();
299	288
300	289	OutputBuffer b = new WritableOutputBuffer(name);
301		buffers = (OutputBuffer[])(DynamicArray.append(buffers, b));
	290	buffers = DynamicArray.append(buffers, b);
302	291
303	292	notifyCreatedOutput(this, name);
304	293

367	356
368	357	// ---------- PACKAGE PRIVATE ----------
369	358
370		Section(String title) {
	359	public Section(String title) {
371	360	if (title == null)
372	361	throw new NullPointerException();
373	362	if (title.indexOf(' ') != -1)

408	397
409	398	while ((line = in.readLine()).startsWith(JTR_V2_SECTSTREAM)) {
410	399	OutputBuffer b = new FixedOutputBuffer(line, in);
411		buffers = (OutputBuffer[])(DynamicArray.append(buffers, b));
	400	buffers = DynamicArray.append(buffers, b);
412	401	}
413	402
414	403	// if not in the message section, line should have the section result

532	521	if (name.equals(MESSAGE_OUTPUT_NAME))
533	522	name = MESSAGE_OUTPUT_NAME;
534	523	OutputBuffer b = new FixedOutputBuffer(name, data);
535		buffers = (OutputBuffer[])(DynamicArray.append(buffers, b));
	524	buffers = DynamicArray.append(buffers, b);
536	525	}
537	526
538	527	/**

938	927	}
939	928
940	929	Section section = new Section(name);
941		sections = (Section[])(DynamicArray.append(sections, section));
	930	sections = DynamicArray.append(sections, section);
942	931	notifyCreatedSection(section);
943	932	// avoid creating output (which will cause observer messages)
944	933	// before the createdSection has been notified

960	949	throw new IllegalStateException(
961	950	"This TestResult is no longer mutable!");
962	951	}
963		for (Iterator i = environment.elementsUsed().iterator(); i.hasNext(); ) {
964		TestEnvironment.Element elem = (TestEnvironment.Element) (i.next());
	952	for (Iterator<TestEnvironment.Element> i = environment.elementsUsed().iterator(); i.hasNext(); ) {
	953	TestEnvironment.Element elem = i.next();
965	954	// this is stunningly inefficient and should be fixed
966	955	env = PropertyArray.put(env, elem.getKey(), elem.getValue());
967	956	}

1311	1300	* Get the keys of the properties that this object has stored.
1312	1301	* @return the keys of the properties that this object has stored
1313	1302	*/
1314		public synchronized Enumeration getPropertyNames() {
	1303	public synchronized Enumeration<String> getPropertyNames() {
1315	1304	return PropertyArray.enumerate(props);
1316	1305	}
1317	1306

1342	1331	* recreating data from the results file.
1343	1332	* @see #setEnvironment
1344	1333	*/
1345		public synchronized Map getEnvironment() throws Fault {
	1334	public synchronized Map<String, String> getEnvironment() throws Fault {
1346	1335	if (env == null) {
1347	1336	// reconstitute environment
1348	1337	// this may result in a Fault, which is okay

1648	1637	out.write(JTR_V2_TESTDESC);
1649	1638	out.write(lineSeparator);
1650	1639
1651		Properties tdProps = new Properties();
	1640	Map<String, String> tdProps = new HashMap<>();
1652	1641	desc.save(tdProps);
1653	1642	PropertyArray.save(PropertyArray.getArray(tdProps), out);
1654	1643	out.write(lineSeparator);

1716	1705	*/
1717	1706	public synchronized void addObserver(Observer obs) {
1718	1707	if (isMutable()) {
1719		Observer[] observers = (Observer[])observersTable.get(this);
	1708	Observer[] observers = observersTable.get(this);
1720	1709
1721	1710	if (observers == null) observers = new Observer[0];
1722	1711
1723		observers = (Observer[])(DynamicArray.append(observers, obs));
	1712	observers = DynamicArray.append(observers, obs);
1724	1713	observersTable.put(this, observers);
1725	1714	}
1726	1715	}

1730	1719	* @param obs the observer to be removed
1731	1720	*/
1732	1721	public synchronized void removeObserver(Observer obs) {
1733		Observer[] observers = (Observer[])observersTable.get(this);
	1722	Observer[] observers = observersTable.get(this);
1734	1723	if (observers == null)
1735	1724	return;
1736	1725
1737		observers = (Observer[])(DynamicArray.remove(observers, obs));
	1726	observers = DynamicArray.remove(observers, obs);
1738	1727	if (observers == null)
1739	1728	observersTable.remove(this);
1740	1729	else

1879	1868	this.endTime = endTime;
1880	1869	}
1881	1870
1882		void shareStatus(Hashtable[] tables) {
	1871	void shareStatus(Map<String, Status>[] tables) {
1883	1872	execStatus = shareStatus(tables, execStatus);
1884	1873	}
1885	1874

1900	1889	return null;
1901	1890	}
1902	1891
1903		Vector tagV = new Vector(sections.length * 2);
	1892	Vector<String> tagV = new Vector<>(sections.length * 2);
1904	1893
1905	1894	for (int i = 0; i < sections.length; i++) {
1906	1895	String[] names = sections[i].getOutputNames();

1992	1981
1993	1982	private static long computeChecksum(TestDescription td) {
1994	1983	long cs = 0;
1995		for (Iterator i = td.getParameterKeys(); i.hasNext(); ) {
	1984	for (Iterator<String> i = td.getParameterKeys(); i.hasNext(); ) {
1996	1985	// don't rely on enumeration in a particular order
1997	1986	// so simply add the checksum products together
1998		String key = (String) (i.next());
	1987	String key = (i.next());
1999	1988	cs += computeChecksum(key) * computeChecksum(td.getParameter(key));
2000	1989	}
2001	1990	return cs;

2131	2120	pairs = null;
2132	2121
2133	2122	if (desc == null) {
2134		File path = new File((String)(PropertyArray.get(props, "testsuite")));
	2123	File path = new File(PropertyArray.get(props, "testsuite"));
2135	2124	if (!path.isDirectory())
2136	2125	path = new File(path.getParent());
2137	2126	File file = new File(PropertyArray.get(props, "file"));

2150	2139	Section blk = processOldSection(line, in);
2151	2140
2152	2141	if (blk != null) {
2153		sections = (Section[])(DynamicArray.append(sections, blk));
	2142	sections = DynamicArray.append(sections, blk);
2154	2143	}
2155	2144	}
2156	2145	else if (line.startsWith(JTR_V1_TSTRESULT)) {

2412	2401	}
2413	2402	}
2414	2403
2415		private static Status shareStatus(Hashtable[] tables, Status s) {
	2404	private static Status shareStatus(Map<String, Status>[] tables, Status s) {
2416	2405	int type = s.getType();
2417	2406	String reason = s.getReason();
2418		Status result = (Status)tables[type].get(reason);
	2407	Status result = tables[type].get(reason);
2419	2408	if (result == null) {
2420	2409	tables[type].put(reason, s);
2421	2410	result = s;

2432	2421	* @param section The section that was created.
2433	2422	*/
2434	2423	private synchronized void notifyCreatedSection(Section section) {
2435		Observer[] observers = (Observer[])(observersTable.get(this));
	2424	Observer[] observers = observersTable.get(this);
2436	2425	if (observers != null)
2437	2426	for (int i = 0; i < observers.length; i++)
2438	2427	observers[i].createdSection(this, section);

2444	2433	* @param section The section that was completed.
2445	2434	*/
2446	2435	private synchronized void notifyCompletedSection(Section section) {
2447		Observer[] observers = (Observer[])(observersTable.get(this));
	2436	Observer[] observers = observersTable.get(this);
2448	2437	if (observers != null)
2449	2438	for (int i = 0; i < observers.length; i++)
2450	2439	observers[i].completedSection(this, section);

2457	2446	* @param outputName The name of the output.
2458	2447	*/
2459	2448	private synchronized void notifyCreatedOutput(Section section, String outputName) {
2460		Observer[] observers = (Observer[])(observersTable.get(this));
	2449	Observer[] observers = observersTable.get(this);
2461	2450	if (observers != null)
2462	2451	for (int i = 0; i < observers.length; i++)
2463	2452	observers[i].createdOutput(this, section, outputName);

2470	2459	* @param outputName The name of the output.
2471	2460	*/
2472	2461	private synchronized void notifyCompletedOutput(Section section, String outputName) {
2473		Observer[] observers = (Observer[])(observersTable.get(this));
	2462	Observer[] observers = observersTable.get(this);
2474	2463	if (observers != null)
2475	2464	for (int i = 0; i < observers.length; i++)
2476	2465	observers[i].completedOutput(this, section, outputName);

2484	2473	* @param text The text that was added (appended).
2485	2474	*/
2486	2475	private synchronized void notifyUpdatedOutput(Section section, String outputName, int start, int end, String text) {
2487		Observer[] observers = (Observer[])(observersTable.get(this));
	2476	Observer[] observers = observersTable.get(this);
2488	2477	if (observers != null)
2489	2478	for (int i = 0; i < observers.length; i++)
2490	2479	observers[i].updatedOutput(this, section, outputName, start, end, text);

2498	2487	*/
2499	2488	private synchronized void notifyUpdatedOutput(Section section, String outputName, int start, int end,
2500	2489	char[] buf, int offset, int len) {
2501		Observer[] observers = (Observer[])(observersTable.get(this));
	2490	Observer[] observers = observersTable.get(this);
2502	2491	if (observers != null) {
2503	2492	// only create string if there are really observers who want to see it
2504	2493	String text = new String(buf, offset, len);

2514	2503	* @param value The new value for the property.
2515	2504	*/
2516	2505	private synchronized void notifyUpdatedProperty(String key, String value) {
2517		Observer[] observers = (Observer[])(observersTable.get(this));
	2506	Observer[] observers = observersTable.get(this);
2518	2507	if (observers != null)
2519	2508	for (int i = 0; i < observers.length; i++)
2520	2509	observers[i].updatedProperty(this, key, value);

2528	2517	// is no need to keep any observers registered after we finish here
2529	2518	// so get the observers one last time, and at the same time
2530	2519	// remove them from the table
2531		Observer[] observers = (Observer[])(observersTable.remove(this));
	2520	Observer[] observers = observersTable.remove(this);
2532	2521	if (observers != null) {
2533	2522	for (int i = 0; i < observers.length; i++)
2534	2523	observers[i].completed(this);

2566	2555	synchronized (shrinkList) {
2567	2556	// if this object is in the list; remove it;
2568	2557	// if there are dead weak refs, remove them
2569		for (Iterator iter = shrinkList.iterator(); iter.hasNext(); ) {
2570		WeakReference wref = (WeakReference) (iter.next());
	2558	for (Iterator<WeakReference<TestResult>> iter = shrinkList.iterator(); iter.hasNext(); ) {
	2559	WeakReference<TestResult> wref = iter.next();
2571	2560	Object o = wref.get();
2572	2561	if (o == null \|\| o == this)
2573	2562	iter.remove();
2574	2563	}
2575	2564	while (shrinkList.size() >= maxShrinkListSize) {
2576		WeakReference wref = (WeakReference) (shrinkList.removeFirst());
2577		TestResult tr = (TestResult) (wref.get());
	2565	WeakReference<TestResult> wref = shrinkList.removeFirst();
	2566	TestResult tr = wref.get();
2578	2567	if (tr != null)
2579	2568	tr.shrink();
2580	2569	}
2581		shrinkList.addLast(new WeakReference(this));
	2570	shrinkList.addLast(new WeakReference<>(this));
2582	2571	}
2583	2572	}
2584	2573

2622	2611	// because so few test results will typically be observed (e.g. at most one)
2623	2612	// we don't use a per-instance array of observers, but instead associate any
2624	2613	// such arrays here.
2625		private static Hashtable observersTable = new Hashtable(16);
	2614	private static Map<TestResult, Observer[]> observersTable = new Hashtable<>(16);
2626	2615
2627	2616	/**
2628	2617	* The name of the default output that all Sections are equipped with.

2751	2740	private static final int DEFAULT_MAX_SHRINK_LIST_SIZE = 128;
2752	2741	private static final int maxShrinkListSize =
2753	2742	Integer.getInteger("javatest.numCachedResults", DEFAULT_MAX_SHRINK_LIST_SIZE).intValue();
2754		private static LinkedList shrinkList = new LinkedList();
	2743	private static LinkedList<WeakReference<TestResult>> shrinkList = new LinkedList<>();
2755	2744
2756	2745	private static final int DEFAULT_MAX_OUTPUT_SIZE = 100000;
2757	2746	private static final int commonOutputSize =

+26

-26

src/com/sun/javatest/TestResultCache.java less more

58	58	* Called when tests have been read from the cache file.
59	59	* @param tests the tests that have been read
60	60	*/
61		void update(Map tests);
	61	void update(Map<String, TestResult> tests);
62	62
63	63	/**
64	64	* Called periodically while waiting to access the cache.

117	117	this.workDir = workDir;
118	118	this.observer = observer;
119	119
120		weakWorkDir = new WeakReference(workDir);
121		weakObserver = new WeakReference(observer);
	120	weakWorkDir = new WeakReference<>(workDir);
	121	weakObserver = new WeakReference<>(observer);
122	122
123	123	cacheFile = workDir.getSystemFile(V2_FILENAME);
124	124	lockFile = workDir.getSystemFile(V2_LOCKNAME);

308	308	}
309	309
310	310	private void doWork() throws IOException {
311		Map tests = null;
	311	Map<String, TestResult> tests = null;
312	312	boolean rebuildCache = false;
313	313
314	314	getLock();

481	481	//
482	482	// Read a set of tests from the *.jtr files in the work directory
483	483
484		private Map readJTRFiles() {
	484	private Map<String, TestResult> readJTRFiles() {
485	485	final long start = System.currentTimeMillis();
486		Map tests = new TreeMap();
	486	Map<String, TestResult> tests = new TreeMap<>();
487	487	readJTRFiles(workDir.getRoot(), tests);
488	488
489	489	// these lines are all for logging benchmark info

511	511	return tests;
512	512	}
513	513
514		private void readJTRFiles(File dir, Map tests) {
	514	private void readJTRFiles(File dir, Map<String, TestResult> tests) {
515	515	File[] entries = dir.listFiles();
516	516	if (entries != null) {
517	517	// monitor shutdownRequested and give up if set true;

543	543	}
544	544	}
545	545
546		private TestResult reload(Map tests, TestResult tr) {
	546	private TestResult reload(Map<String, TestResult> tests, TestResult tr) {
547	547	File jtr = workDir.getFile(tr.getWorkRelativePath());
548	548	try {
549	549	return new TestResult(jtr);

572	572	//
573	573	// Read the cache
574	574
575		private Map readCache()
	575	private Map<String, TestResult> readCache()
576	576	throws IOException, IllegalArgumentException
577	577	{
578	578	final long start = System.currentTimeMillis();

594	594	// read full cache
595	595	lastSerial = fileSerial;
596	596	totalEntryCount = 0;
597		Map tests = readCacheEntries();
	597	Map<String, TestResult> tests = readCacheEntries();
598	598	uniqueInitialEntryCount = tests.size();
599	599
600	600	if (DEBUG_WORK)

626	626	else if (raf.length() > lastFileSize) {
627	627	// just read updates from file
628	628	raf.seek(lastFileSize);
629		Map tests = readCacheEntries();
	629	Map<String, TestResult> tests = readCacheEntries();
630	630
631	631	if (DEBUG_WORK)
632	632	Debug.println("TRC.readCache read update (" + tests.size() + " tests)");

641	641	}
642	642	}
643	643
644		private Map readCacheEntries()
	644	private Map<String, TestResult> readCacheEntries()
645	645	throws IOException, IllegalArgumentException
646	646	{
647		Map tests = new TreeMap();
	647	Map<String, TestResult> tests = new TreeMap<>();
648	648	while (raf.getFilePointer() < raf.length()) {
649	649	String name = raf.readUTF();
650	650	int status = raf.readInt();

666	666	//
667	667	// Write the cache
668	668
669		private void writeCache(Map tests) throws IOException {
	669	private void writeCache(Map<String, TestResult> tests) throws IOException {
670	670	if (tests == null)
671	671	throw new IllegalStateException();
672	672

675	675	// it till its empty, even though some tests may even have been added
676	676	// after the worker woke up
677	677	TestResult tr;
678		while ((tr = (TestResult) (testsToWrite.remove())) != null) {
	678	while ((tr = testsToWrite.remove()) != null) {
679	679	// check if test is in the set we've just read
680	680	String name = tr.getTestName();
681		TestResult tr2 = (TestResult) (tests.get(name));
	681	TestResult tr2 = tests.get(name);
682	682	// if the cache file contains a conflicting entry,
683	683	// reload the test from the .jtr file; otherwise, add it to the cache
684	684	if (tr2 != null && !tr2.getStatus().equals(tr.getStatus()))

693	693	lastSerial = (int) ((now >> 16) + (now & 0xffff));
694	694	raf.writeInt(lastSerial);
695	695
696		for (Iterator iter = tests.values().iterator(); iter.hasNext(); ) {
697		tr = (TestResult) (iter.next());
	696	for (Iterator<TestResult> iter = tests.values().iterator(); iter.hasNext(); ) {
	697	tr = iter.next();
698	698	writeCacheEntry(tr);
699	699	}
700	700

706	706	uniqueInitialEntryCount = totalEntryCount = tests.size();
707	707	}
708	708
709		private void updateCache(Map tests) throws IOException {
	709	private void updateCache(Map<String, TestResult> tests) throws IOException {
710	710	// testsToWrite is a thread-safe fifo, so it is safe to keep reading
711	711	// it till its empty, even though some tests may even have been added
712	712	// after the worker woke up
713	713	int debugCount = 0;
714	714	raf.seek(lastFileSize);
715	715	TestResult tr;
716		while ((tr = (TestResult) (testsToWrite.remove())) != null) {
	716	while ((tr = testsToWrite.remove()) != null) {
717	717	if (tests != null) {
718	718	// check if test is in the set we've just read
719	719	String name = tr.getTestName();
720		TestResult tr2 = (TestResult) (tests.get(name));
	720	TestResult tr2 = tests.get(name);
721	721	if (tr2 != null) {
722	722	// cache also contains an entry for this test:
723	723	// reload from .jtr file in case of conflict

850	850	// These weak references get revived when the worker thread has work to do.
851	851	private void reviveWeakReferences() {
852	852	if (workDir == null)
853		workDir = (WorkDirectory) weakWorkDir.get();
	853	workDir = weakWorkDir.get();
854	854
855	855	if (observer == null)
856		observer = (Observer) weakObserver.get();
	856	observer = weakObserver.get();
857	857	}
858	858
859	859	//-------------------------------------------------------------------------------------
860	860
861	861	// general instance data
862	862	private Observer observer;
863		private WeakReference weakObserver;
	863	private WeakReference<Observer> weakObserver;
864	864	private WorkDirectory workDir;
865		private WeakReference weakWorkDir;
	865	private WeakReference<WorkDirectory> weakWorkDir;
866	866	private File cacheFile;
867	867	private File lockFile;
868	868	private Thread worker;

882	882	private boolean compressRequested;
883	883	private boolean flushRequested;
884	884	private boolean shutdownRequested;
885		private Fifo testsToWrite = new Fifo();
	885	private Fifo<TestResult> testsToWrite = new Fifo<>();
886	886
887	887	private static final String V1_FILENAME = "ResultCache.jtw";
888	888	private static final String V1_LOCKNAME = V1_FILENAME + ".lck";

+44

-57

src/com/sun/javatest/TestResultTable.java less more

28	28	import java.io.File;
29	29	import java.io.IOException;
30	30	import java.text.Collator;
31		import java.util.ArrayList;
32		import java.util.Arrays;
33		import java.util.Comparator;
34		import java.util.Enumeration;
35		import java.util.HashMap;
36		import java.util.HashSet;
37		import java.util.Hashtable;
38		import java.util.Iterator;
39		import java.util.LinkedList;
40		import java.util.Locale;
41		import java.util.Map;
42		import java.util.NoSuchElementException;
43		import java.util.Vector;
	31	import java.util.*;
44	32	import java.util.concurrent.locks.ReentrantLock;
45	33
46	34	import com.sun.javatest.finder.TestFinderDecorator;

265	253	* Create a table ready to be occupied.
266	254	*/
267	255	public TestResultTable() {
268		statusTables = new Hashtable[Status.NUM_STATES];
	256	statusTables = new Map[Status.NUM_STATES];
269	257	for (int i = 0; i < statusTables.length; i++)
270		statusTables[i] = new Hashtable();
	258	statusTables[i] = new Hashtable<>();
271	259
272	260	root = new TRT_TreeNode(this, null);
273	261

585	573	// no tree yet
586	574	if (root == null) return null;
587	575
588		return findTest((TRT_TreeNode)root, jtrPath, jtrPath);
	576	return findTest(root, jtrPath, jtrPath);
589	577	}
590	578
591	579	/**

639	627	if (target == null)
640	628	return null;
641	629
642		ArrayList path = new ArrayList();
	630	ArrayList<TreeNode> path = new ArrayList<>();
643	631	TreeNode loc = target.getParent();
644	632	while (loc != null) {
645	633	path.add(0, loc);

675	663	if (target == null)
676	664	return null;
677	665
678		ArrayList path = new ArrayList();
	666	ArrayList<TreeNode> path = new ArrayList<>();
679	667	TreeNode loc = target;
680	668	while (loc != null) {
681	669	path.add(0, loc);

714	702	* @see #getIterator()
715	703	* @since 3.0
716	704	*/
717		public Enumeration elements() {
	705	public Enumeration<TestResult> elements() {
718	706	return getIterator();
719	707	}
720	708

744	732	* @since 3.0
745	733	* @see #getIterator()
746	734	*/
747		public Enumeration elements(TestFilter[] filters) {
	735	public Enumeration<TestResult> elements(TestFilter[] filters) {
748	736	return getIterator(filters);
749	737	}
750	738

770	758	* @see #getIterator()
771	759	* @since 3.0
772	760	*/
773		public static Enumeration elements(TreeNode node) {
	761	public static Enumeration<TestResult> elements(TreeNode node) {
774	762	return getIterator(node);
775	763	}
776	764

807	795	* @see #getIterator()
808	796	* @since 3.0
809	797	*/
810		public static Enumeration elements(TreeNode node, TestFilter filter) {
	798	public static Enumeration<TestResult> elements(TreeNode node, TestFilter filter) {
811	799	return getIterator(node, filter);
812	800	}
813	801

840	828	* @see #getIterator()
841	829	* @since 3.0
842	830	*/
843		public static Enumeration elements(TreeNode node, TestFilter[] filters) {
	831	public static Enumeration<TestResult> elements(TreeNode node, TestFilter[] filters) {
844	832	return getIterator(node, filters);
845	833	}
846	834

861	849	* @see #getIterator()
862	850	* @since 3.0
863	851	*/
864		public Enumeration elements(String url, TestFilter[] filters) {
	852	public Enumeration<TestResult> elements(String url, TestFilter[] filters) {
865	853	if (url == null)
866	854	return NullEnum.getInstance();
867	855	else {

909	897	* @see #getIterator()
910	898	* @since 3.0
911	899	*/
912		public Enumeration elements(File[] tests, TestFilter[] filters) throws Fault {
	900	public Enumeration<TestResult> elements(File[] tests, TestFilter[] filters) throws Fault {
913	901	return getIterator(tests, filters);
914	902	}
915	903

953	941	}
954	942	else if (objs instanceof TreeNode[]) {
955	943	// don't add duplicates
956		if (!initNodes.contains((TreeNode) objs[0]))
	944	if (!initNodes.contains(objs[0]))
957	945	initNodes.add((TreeNode) objs[0]);
958	946	}
959	947	else if (objs instanceof TestResult[]) {

996	984	* @see #getIterator()
997	985	* @since 3.0
998	986	*/
999		public Enumeration elements(String[] urls, TestFilter[] filters) {
	987	public Enumeration<TestResult> elements(String[] urls, TestFilter[] filters) {
1000	988	return getIterator(urls, filters);
1001	989	}
1002	990

1169	1157	public synchronized void addObserver(Observer o) {
1170	1158	if (o == null)
1171	1159	throw new NullPointerException();
1172		observers = (Observer[])DynamicArray.append(observers, o);
	1160	observers = DynamicArray.append(observers, o);
1173	1161	}
1174	1162
1175	1163	/**

1179	1167	* @param o The observer to remove.
1180	1168	*/
1181	1169	public synchronized void removeObserver(Observer o) {
1182		observers = (Observer[])DynamicArray.remove(observers, o);
	1170	observers = DynamicArray.remove(observers, o);
1183	1171	}
1184	1172
1185	1173	/**

1188	1176	* @param obs The observer to attach. Must never be null.
1189	1177	*/
1190	1178	public void addObserver(TreeObserver obs) {
1191		treeObservers = (TreeObserver[])DynamicArray.append(treeObservers, obs);
	1179	treeObservers = DynamicArray.append(treeObservers, obs);
1192	1180	}
1193	1181
1194	1182	/**

1199	1187	*/
1200	1188	public void removeObserver(TreeObserver obs) {
1201	1189	if (treeObservers != null)
1202		treeObservers = (TreeObserver[])(DynamicArray.remove(treeObservers, obs));
	1190	treeObservers = DynamicArray.remove(treeObservers, obs);
1203	1191	}
1204	1192
1205	1193	/**

1471	1459	}
1472	1460
1473	1461	private static class SortingComparator implements Comparator<DisassembledUrl> {
1474		Comparator<Object> c;
1475
1476		public SortingComparator(Comparator c) {
	1462	Comparator<String> c;
	1463
	1464	public SortingComparator(Comparator<String> c) {
1477	1465	this.c = c;
1478	1466	}
1479	1467

1507	1495	if (in == null \|\| in.length <= 1)
1508	1496	return in;
1509	1497
1510		Comparator c = finder.getComparator();
	1498	Comparator<String> c = finder.getComparator();
1511	1499
1512	1500	if (c == null) {
1513	1501	// show warning message?
1514		c = Collator.getInstance(Locale.US);
1515		((Collator)c).setStrength(Collator.PRIMARY);
	1502	c = TestFinder.getDefaultComparator();
1516	1503	}
1517	1504
1518	1505	DisassembledUrl[] elements = new DisassembledUrl[in.length];

1530	1517	return result;
1531	1518	}
1532	1519
1533		private int compareStringArrays(Comparator c, String[] s1, String[] s2) {
	1520	private int compareStringArrays(Comparator<String> c, String[] s1, String[] s2) {
1534	1521	// loop until names become unequal
1535	1522	for (int i = 0; i < s1.length; i++) {
1536	1523	if (i >= s2.length)

1626	1613	return result;
1627	1614	}
1628	1615
1629		private synchronized void updateFromCache(Map m) {
	1616	private synchronized void updateFromCache(Map<String, TestResult> m) {
1630	1617	updateInProgress = true;
1631	1618
1632	1619	// this method could use further optimization to take advantage

1636	1623	if (rtc.getRequests() != null) {
1637	1624	for (TestDescription td : rtc.getRequests()) {
1638	1625	String testRes = TestResult.getWorkRelativePath(td.getRootRelativeURL());
1639		TestResult tr = (TestResult)m.get(testRes);
	1626	TestResult tr = m.get(testRes);
1640	1627	if (tr != null) {
1641	1628	tr.setTestDescription(td);
1642	1629	update(tr, suppressFinderScan);

1693	1680	// in the test suite.
1694	1681	TestResult oldTR = node.addChild(tr, suppressScan, !cacheInitialized);
1695	1682	//tr.setParent(node); // now done in TRT_TreeNode.addChild()
1696		rec = (TRT_TreeNode[])DynamicArray.append(rec, node);
	1683	rec = DynamicArray.append(rec, node);
1697	1684
1698	1685	// index will be -1 if the node insertion was rejected
1699	1686	// perhaps upgrade the code so that addChild() throws and

1774	1761	tn.setName(getDirName(nextDir));
1775	1762	node.addChild(tn, suppressScan);
1776	1763
1777		rec = (TRT_TreeNode[])DynamicArray.append(rec, tn);
	1764	rec = DynamicArray.append(rec, tn);
1778	1765	notifyNewBranch(rec, tn, node.getIndex(tn, suppressScan));
1779	1766
1780	1767	return insert(tn, newPath, tr, rec, suppressScan);
1781	1768	}
1782	1769	else { // no work, just recurse
1783		rec = (TRT_TreeNode[])DynamicArray.append(rec, node);
	1770	rec = DynamicArray.append(rec, node);
1784	1771	return insert(next, newPath, tr, rec, suppressScan);
1785	1772	}
1786	1773

2029	2016	// if url is exec/index.html#ExecSucc
2030	2017	// that should match a test with exactly that name
2031	2018	String jtrPath = TestResult.getWorkRelativePath(url);
2032		TestResult tr = findTest((TRT_TreeNode)where, jtrPath, jtrPath);
	2019	TestResult tr = findTest(where, jtrPath, jtrPath);
2033	2020	return tr; // may be null
2034	2021	}
2035	2022

2094	2081	return null;
2095	2082
2096	2083	// try to partial match a test
2097		Vector v = new Vector();
	2084	Vector<TestResult> v = new Vector<>();
2098	2085	try {
2099	2086	for (int i = 0; i < trs.length; i++) {
2100	2087	if (trs[i].getDescription().getRootRelativeURL().startsWith(url))

2187	2174	public TestResult getCachedResult(TestDescription td) {
2188	2175	if (cachedResults != null) {
2189	2176	String url = TestResult.getWorkRelativePath(td.getRootRelativeURL());
2190		TestResult res = (TestResult)cachedResults.get(url);
	2177	TestResult res = cachedResults.get(url);
2191	2178	if (res != null) {
2192	2179	res.setTestDescription(td);
2193	2180	}

2208	2195
2209	2196	public synchronized void addToUpdateFromCache(TestDescription td) {
2210	2197	if (needUpdateFromCache == null) {
2211		needUpdateFromCache = new HashSet();
	2198	needUpdateFromCache = new HashSet<>();
2212	2199	}
2213	2200	needUpdateFromCache.add(td);
2214	2201	}

2239	2226	/*OLD
2240	2227	private static final String formatVersion = "JavaTest/Results/2.0";
2241	2228	*/
2242		private Hashtable[] statusTables;
	2229	private Map<String, Status>[] statusTables;
2243	2230	// tables indexed by status.type mapping status.reason
2244	2231	// to a unique status object
2245	2232	private WorkDirectory workDir;

2261	2248	private volatile boolean updateInProgress;
2262	2249	private volatile boolean cacheInitialized = false;
2263	2250
2264		private Vector testsInUpdate = new Vector();
	2251	private List<TestResult> testsInUpdate = new Vector<>();
2265	2252
2266	2253	/*
2267	2254	* Effectively a count of the number of instances of TRTs that have been created.

2446	2433	return hasMoreElements();
2447	2434	}
2448	2435
2449		public Object next() {
	2436	public TestResult next() {
2450	2437	return nextElement();
2451	2438	}
2452	2439

2464	2451	return false;
2465	2452	}
2466	2453
2467		public Object nextElement() {
	2454	public TestResult nextElement() {
2468	2455	throw new NoSuchElementException(i18n.getString("trt.noElements"));
2469	2456	}
2470	2457

2482	2469	* tree. This is a read-only interface, so <code>remove()</code> is not
2483	2470	* supported.
2484	2471	*/
2485		public interface TreeIterator extends Enumeration, Iterator {
	2472	public interface TreeIterator extends Enumeration<TestResult>, Iterator<TestResult> {
2486	2473	// --- Enumerator interface ---
2487	2474	public abstract boolean hasMoreElements();
2488		public abstract Object nextElement();
	2475	public abstract TestResult nextElement();
2489	2476
2490	2477	// --- Iterator interface ---
2491	2478	public abstract boolean hasNext();
2492		public abstract Object next();
	2479	public abstract TestResult next();
2493	2480
2494	2481	/**
2495	2482	* Do not call this method.

2592	2579	class Updater implements TestResultCache.Observer
2593	2580	{
2594	2581	//-----methods from TestResultCache.Observer-----
2595		public void update(Map tests) {
	2582	public void update(Map<String, TestResult> tests) {
2596	2583	updateFromCache(tests);
2597	2584	}
2598	2585

2821	2808	void addNode(TreeNode tn) {
2822	2809	if (tr != null) throw new JavaTestError(i18n, "trt.invalidPath");
2823	2810
2824		nodes = (TreeNode[])DynamicArray.append(nodes, tn);
	2811	nodes = DynamicArray.append(nodes, tn);
2825	2812	}
2826	2813
2827	2814	/*

2878	2865	TreeNode node = tr.getParent();
2879	2866
2880	2867	while (node != null) {
2881		nodes = (TreeNode[])DynamicArray.insert(nodes, node, 0);
	2868	nodes = DynamicArray.insert(nodes, node, 0);
2882	2869	node = node.getParent();
2883	2870	}
2884	2871

+1

-1

src/com/sun/javatest/TestRunner.java less more

199	199	* @return true if and only if all the tests executed successfully and passed
200	200	* @throws InterruptedException if the test run was interrupted
201	201	*/
202		protected abstract boolean runTests(Iterator testIter) throws InterruptedException;
	202	protected abstract boolean runTests(Iterator<TestDescription> testIter) throws InterruptedException;
203	203
204	204	/**
205	205	* This method must be called as each test is started, to notify any

+55

-62

src/com/sun/javatest/TestSuite.java less more

58	58	import com.sun.javatest.util.BackupPolicy;
59	59	import com.sun.javatest.util.I18NResourceBundle;
60	60	import com.sun.javatest.util.StringArray;
	61
61	62	import java.lang.reflect.Method;
62	63	import java.lang.reflect.Modifier;
63	64

214	215
215	216	File f = new File(canonRootDir, TESTSUITE_JTT);
216	217	if (isReadableFile(f)) {
217		try {
218		Properties p = new Properties();
219		InputStream in = new BufferedInputStream(new FileInputStream(f));
220		p.load(in);
221		in.close();
	218	try (InputStream in = new BufferedInputStream(new FileInputStream(f))) {
	219	Map<String, String> p = com.sun.javatest.util.Properties.load(in);
222	220	return open(canonRoot, p);
223	221	}
224	222	catch (IOException e) {

231	229	File parentDir = canonRootDir.getParentFile();
232	230	File parent_jtt = (parentDir == null ? null : new File(parentDir, TESTSUITE_JTT));
233	231	if (isReadableFile(ts_html) && (parent_jtt == null \|\| !parent_jtt.exists()))
234		return open(canonRoot, new HashMap());
	232	return open(canonRoot, new HashMap<String, String>());
235	233	else
236	234	throw new NotTestSuiteFault(i18n, "ts.notTestSuiteFile", canonRoot);
237	235	}

244	242	* @return A TestSuite object for the test suite in question.
245	243	* @throws TestSuite.Fault if any problems occur while opening the test suite
246	244	*/
247		private static TestSuite open(File root, Map tsInfo) throws Fault {
	245	private static TestSuite open(File root, Map<String, String> tsInfo) throws Fault {
248	246	synchronized (dirMap) {
249	247	TestSuite ts;
250	248
251	249	// if this test suite has already been opened, return that
252		WeakReference ref = (WeakReference)(dirMap.get(root));
	250	WeakReference<TestSuite> ref = dirMap.get(root);
253	251	if (ref != null) {
254		ts = (TestSuite)(ref.get());
	252	ts = ref.get();
255	253	if (ts != null) {
256	254	return ts;
257	255	}

261	259	ts = open0(root, tsInfo);
262	260
263	261	// save reference in case opened again
264		dirMap.put(root, new WeakReference(ts));
	262	dirMap.put(root, new WeakReference<>(ts));
265	263	return ts;
266	264	}
267	265	}
268	266
269		private static TestSuite open0(File root, Map tsInfo) throws Fault {
270		String[] classPath = StringArray.split((String) (tsInfo.get("classpath")));
	267	private static TestSuite open0(File root, Map<String, String> tsInfo) throws Fault {
	268	String[] classPath = StringArray.split(tsInfo.get("classpath"));
271	269
272	270	ClassLoader cl;
273	271	if (classPath.length == 0)

295	293	}
296	294	}
297	295
298		String[] tsClassAndArgs = StringArray.split((String) (tsInfo.get("testsuite")));
	296	String[] tsClassAndArgs = StringArray.split(tsInfo.get("testsuite"));
299	297
300	298	TestSuite testSuite;
301	299	if (tsClassAndArgs.length == 0)

304	302	String className = tsClassAndArgs[0];
305	303
306	304	try {
307		Class c = loadClass(className, cl);
308		Class[] tsArgTypes = {File.class, Map.class, ClassLoader.class};
	305	Class<?> c = loadClass(className, cl);
	306	Class<?>[] tsArgTypes = {File.class, Map.class, ClassLoader.class};
309	307	Object[] tsArgs = {root, tsInfo, cl};
310	308	testSuite = (TestSuite)(newInstance(c, tsArgTypes, tsArgs));
311	309	}

363	361	* typically using a class path defined in the test suite properties file.
364	362	* @throws TestSuite.Fault if a problem occurs while creating this test suite.
365	363	*/
366		public TestSuite(File root, Map tsInfo, ClassLoader cl) throws Fault {
	364	public TestSuite(File root, Map<String, String> tsInfo, ClassLoader cl) throws Fault {
367	365	this.root = root;
368	366	this.tsInfo = tsInfo;
369	367	this.loader = cl;
370	368
371		String kw = (tsInfo == null ? null : (String) (tsInfo.get("keywords")));
	369	String kw = (tsInfo == null ? null : tsInfo.get("keywords"));
372	370	keywords = (kw == null ? null : StringArray.split(kw));
373	371	}
374	372

438	436	* @return the directory that contains the tests
439	437	*/
440	438	public File getTestsDir() {
441		String t = (String) (tsInfo == null ? null : tsInfo.get("tests"));
	439	String t = (tsInfo == null ? null : tsInfo.get("tests"));
442	440	if (t == null \|\| t.length() == 0) {
443	441	File rootDir = getRootDir();
444	442	File testsDir = new File(rootDir, "tests");

549	547	File testsDir = getTestsDir();
550	548
551	549	// no BTF file; look for a finder=class args... entry
552		String[] finderCmd = StringArray.split((String) (tsInfo.get("finder")));
	550	String[] finderCmd = StringArray.split((tsInfo.get("finder")));
553	551	String finderClassName;
554	552	String[] finderArgs = new String[0];
555	553

571	569	}
572	570
573	571	// first, try looking for testsuite.jtd
574		String jtd = (String) (tsInfo.get("testsuite.jtd"));
	572	String jtd = tsInfo.get("testsuite.jtd");
575	573	File jtdFile = (jtd == null ? new File(testsDir, "testsuite.jtd") : new File(root, jtd));
576	574	if (jtdFile.exists()) {
577	575	try {

589	587	}
590	588
591	589	try {
592		Class c = loadClass(finderClassName);
	590	Class<?> c = loadClass(finderClassName);
593	591	TestFinder tf = (TestFinder) (newInstance(c));
594	592	// called old deprecated entry till we know no-one cares
595	593	//tf.init(finderArgs, testsRoot, null, null, tsInfo/pass in env?/);

629	627	TestFinder tf = null;
630	628
631	629	if (finderClassName != null) {
632		Class c = loadClass(finderClassName);
	630	Class<?> c = loadClass(finderClassName);
633	631	tf = (TestFinder) (newInstance(c));
634	632	}
635	633

695	693	if (scriptClass == null) {
696	694	String[] script = envLookup(scriptEnv, "script");
697	695	if (script.length == 0)
698		script = StringArray.split((String) tsInfo.get("script"));
	696	script = StringArray.split(tsInfo.get("script"));
699	697	if (script.length > 0) {
700	698	scriptClass = loadClass(script[0]);
701	699	if (!Script.class.isAssignableFrom(scriptClass)) {

709	707	// for backwards compatibility,
710	708	// see if KeywordScript is a reasonable default
711	709	boolean keywordScriptOK = false;
712		for (Iterator i = scriptEnv.keys().iterator(); i.hasNext() && !keywordScriptOK; ) {
713		String key = (String)(i.next());
	710	for (Iterator<String> i = scriptEnv.keys().iterator(); i.hasNext() && !keywordScriptOK; ) {
	711	String key = i.next();
714	712	keywordScriptOK = key.startsWith("script.");
715	713	}
716	714	if (keywordScriptOK) {

756	754	public InterviewParameters createInterview()
757	755	throws Fault
758	756	{
759		String[] classNameAndArgs = StringArray.split((String) (tsInfo.get("interview")));
	757	String[] classNameAndArgs = StringArray.split((tsInfo.get("interview")));
760	758	if (classNameAndArgs == null \|\| classNameAndArgs.length == 0) {
761	759	try {
762	760	return new LegacyParameters(this);

773	771	System.arraycopy(classNameAndArgs, 1, args, 0, args.length);
774	772
775	773	try {
776		Class c = loadClass(className);
	774	Class<?> c = loadClass(className);
777	775	InterviewParameters p = (InterviewParameters) (newInstance(c));
778	776	p.init(args);
779	777	p.setTestSuite(this);

796	794	* @return A configuration interview to collect the configuration data for a test run.
797	795	* @throws TestSuite.Fault if a problem occurs while creating the interview
798	796	*/
799		public InterviewParameters loadInterviewFromTemplate(Properties templateInfo, InterviewParameters newInterview)
	797	public InterviewParameters loadInterviewFromTemplate(Map<String, String> templateInfo, InterviewParameters newInterview)
800	798	throws Fault
801	799	{
802	800	newInterview.storeTemplateProperties(templateInfo);

815	813	InterviewParameters ip)
816	814	throws Fault, IOException
817	815	{
818		InputStream in = null;
819		try {
820		in = new BufferedInputStream(new FileInputStream(template));
821		Properties data = new Properties();
822		data.load(in);
823		String tm = (String) data.get(InterviewParameters.IS_TEMPLATE);
	816	try (InputStream in = new BufferedInputStream(new FileInputStream(template))) {
	817	Map<String, String> stringProps = com.sun.javatest.util.Properties.load(in);
	818	String tm = stringProps.get(InterviewParameters.IS_TEMPLATE);
824	819	if (InterviewParameters.TRUE.equals(tm)) {
825		data.put(InterviewParameters.TEMPLATE_PATH,
	820	stringProps.put(InterviewParameters.TEMPLATE_PATH,
826	821	template.getAbsolutePath());
827	822	ip.setTemplatePath(template.getAbsolutePath());
828		return loadInterviewFromTemplate(data, ip);
	823	return loadInterviewFromTemplate(stringProps, ip);
829	824	} else {
830	825	// XXX should probably return ip
831	826	// or throw Fault
832	827	return null;
833	828	}
834		} finally {
835		if (in != null) in.close();
836	829	}
837	830	}
838	831

845	838	* @see #getName
846	839	*/
847	840	public String getID() {
848		return (tsInfo == null ? null : (String) (tsInfo.get("id")));
	841	return (tsInfo == null ? null : tsInfo.get("id"));
849	842	}
850	843
851	844	/**

857	850	* @see #getID
858	851	*/
859	852	public String getName() {
860		return (tsInfo == null ? null : (String) (tsInfo.get("name")));
	853	return (tsInfo == null ? null : tsInfo.get("name"));
861	854	}
862	855
863	856	/**

870	863	public int getEstimatedTestCount() {
871	864	try {
872	865	if (tsInfo != null) {
873		String s = (String) (tsInfo.get("testCount"));
	866	String s = tsInfo.get("testCount");
874	867	if (s != null)
875	868	return Integer.parseInt(s);
876	869	}

889	882	* @return the name of the default exclude list, or null if none specified.
890	883	*/
891	884	public File getInitialExcludeList() {
892		String s = (tsInfo == null ? null : (String) (tsInfo.get("initial.jtx")));
	885	String s = (tsInfo == null ? null : tsInfo.get("initial.jtx"));
893	886	if (s == null)
894	887	return null;
895	888

920	913	*/
921	914	public URL getLatestExcludeList() {
922	915	try {
923		String s = (tsInfo == null ? null : (String) (tsInfo.get("latest.jtx")));
	916	String s = (tsInfo == null ? null : tsInfo.get("latest.jtx"));
924	917	return (s == null ? null : new URL(s));
925	918	}
926	919	catch (MalformedURLException e) {

958	951	public String[] getAdditionalDocNames() {
959	952	return (tsInfo == null
960	953	? null
961		: StringArray.split((String) (tsInfo.get("additionalDocs"))));
	954	: StringArray.split((tsInfo.get("additionalDocs"))));
962	955	}
963	956
964	957	/**

1013	1006	*/
1014	1007	public URL getLogo() {
1015	1008	try {
1016		String s = (tsInfo == null ? null : (String) (tsInfo.get("logo")));
	1009	String s = (tsInfo == null ? null : tsInfo.get("logo"));
1017	1010	return (s == null ? null : new URL(getRootDir().toURL(), s));
1018	1011	}
1019	1012	catch (MalformedURLException e) {

1040	1033	* @throws TestSuite.Fault if any errors arise while trying to instantiate
1041	1034	* the class.
1042	1035	*/
1043		protected static Object newInstance(Class c) throws Fault {
	1036	protected static Object newInstance(Class<?> c) throws Fault {
1044	1037	try {
1045	1038	return c.newInstance();
1046	1039	}

1066	1059	* @throws TestSuite.Fault if any errors arise while trying to instantiate
1067	1060	* the class.
1068	1061	*/
1069		protected static Object newInstance(Class c, Class[] argTypes, Object[] args)
	1062	protected static Object newInstance(Class<?> c, Class<?>[] argTypes, Object[] args)
1070	1063	throws Fault
1071	1064	{
1072	1065	try {

1090	1083	catch (NoSuchMethodException e) {
1091	1084	// don't recurse past the use of a single arg constructor
1092	1085	if (argTypes.length > 1 && Boolean.getBoolean(FIND_LEGACY_CONSTRUCTOR)) {
1093		return newInstance(c, new Class[] {File.class}, new Object[] {args[0]});
	1086	return newInstance(c, new Class<?>[] {File.class}, new Object[] {args[0]});
1094	1087	}
1095	1088
1096	1089	throw new Fault(i18n, "ts.cantFindConstructor",

1104	1097	* @return the class that was loaded
1105	1098	* @throws TestSuite.Fault if there was a problem loading the specified class
1106	1099	*/
1107		public Class loadClass(String className) throws Fault {
	1100	public Class<?> loadClass(String className) throws Fault {
1108	1101	return loadClass(className, loader);
1109	1102	}
1110	1103

1116	1109	* @return the class that was loaded
1117	1110	* @throws TestSuite.Fault if there was a problem loading the specified class
1118	1111	*/
1119		protected static Class loadClass(String className, ClassLoader cl) throws Fault {
	1112	protected static Class<?> loadClass(String className, ClassLoader cl) throws Fault {
1120	1113	try {
1121	1114	if (cl == null)
1122	1115	return Class.forName(className);

1172	1165	*/
1173	1166	boolean isLegacy = false;
1174	1167	try {
1175		Method m = sr.getClass().getMethod("getServiceDescriptorFileName", new Class[0]);
	1168	Method m = sr.getClass().getMethod("getServiceDescriptorFileName", new Class<?>[0]);
1176	1169	if (Modifier.isAbstract(m.getModifiers())) {
1177	1170	isLegacy = true;
1178	1171	}

1196	1189	return serviceReader;
1197	1190	}
1198	1191
1199		String servInfo = (String)tsInfo.get("serviceReader");
	1192	String servInfo = tsInfo.get("serviceReader");
1200	1193	if (servInfo != null) {
1201	1194	String[] args = servInfo.split(" ");
1202	1195	try {
1203		Class c = loadClass(args[0]);
	1196	Class<?> c = loadClass(args[0]);
1204	1197	serviceReader = (ServiceReader) (newInstance(c));
1205	1198	if (args.length > 1) {
1206	1199	// problem with java1.5, which has no Arrays.copyOfRange();

1230	1223	* Get a map containing the test suite data in the .jtt file.
1231	1224	* @return a map containing the test suite data in the .jtt file
1232	1225	*/
1233		protected Map getTestSuiteInfo() {
	1226	protected Map<String, String> getTestSuiteInfo() {
1234	1227	return tsInfo;
1235	1228	}
1236	1229

1243	1236	if (tsInfo == null)
1244	1237	return null;
1245	1238	else
1246		return (String) (tsInfo.get(name));
	1239	return (tsInfo.get(name));
1247	1240	}
1248	1241
1249	1242	/**

1298	1291	f = new ObservedFile(wd.getLogFileName());
1299	1292
1300	1293	if(observedFiles == null) {
1301		observedFiles = new HashMap();
	1294	observedFiles = new HashMap<>();
1302	1295	}
1303	1296	if (!observedFiles.containsKey(f.getAbsolutePath())) {
1304	1297	observedFiles.put(f.getAbsolutePath(), f);

1455	1448	handlersMap.put(wd.getLogFileName(), wdlh);
1456	1449	}
1457	1450
1458		addHandler((WorkDirLogHandler)handlersMap.get(wd.getLogFileName()));
	1451	addHandler(handlersMap.get(wd.getLogFileName()));
1459	1452	}
1460	1453	setLevel(Level.ALL);
1461	1454	}

1486	1479	private static final String FIND_LEGACY_CONSTRUCTOR = "com.sun.javatest.ts.findLegacyCtor";
1487	1480
1488	1481	private File root;
1489		private Map tsInfo;
	1482	private Map<String, String> tsInfo;
1490	1483	private ClassLoader loader;
1491	1484	private TestFinder finder;
1492	1485
1493	1486	// the following are used by the default impl of createScript
1494		private Class scriptClass;
	1487	private Class<?> scriptClass;
1495	1488	private String[] scriptArgs;
1496	1489
1497	1490	private String[] keywords;

1499	1492	private ServiceReader serviceReader;
1500	1493	private ServiceManager serviceManager;
1501	1494
1502		private static HashMap dirMap = new HashMap(2);
	1495	private static Map<File, WeakReference<TestSuite>> dirMap = new HashMap<>(2);
1503	1496
1504	1497	private static I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(TestSuite.class);
1505	1498	private static String notificationLogName = i18n.getString("notification.logname");
1506	1499
1507		static HashMap handlersMap = new HashMap();
	1500	static Map<String, WorkDirLogHandler> handlersMap = new HashMap<>();
1508	1501	private static Vector<GeneralPurposeLogger> gpls;
1509		private static HashMap observedFiles;
	1502	private static Map<String, File> observedFiles;
1510	1503
1511	1504	private final NotificationLogger notifLogger = new NotificationLogger(null);
1512	1505

+31

-39

src/com/sun/javatest/WorkDirectory.java less more

286	286	throws BadDirectoryFault, WorkDirectoryExistsFault, InitializationFault {
287	287	File canonDir;
288	288	File jtData;
289		ArrayList undoList = new ArrayList();
	289	ArrayList<File> undoList = new ArrayList<>();
290	290
291	291	try {
292	292	if (dir.exists()) {

347	347	return logFileName;
348	348	}
349	349
350		private static boolean mkdirs(File dir, ArrayList undoList) {
	350	private static boolean mkdirs(File dir, ArrayList<File> undoList) {
351	351	File parent = dir.getParentFile();
352	352	if (parent != null && !parent.exists()) {
353	353	if (!mkdirs(parent, undoList))

363	363	return false;
364	364	}
365	365
366		private static void undo(ArrayList undoList) {
	366	private static void undo(ArrayList<File> undoList) {
367	367	for (int i = undoList.size() - 1; i >= 0; i--) {
368		File f = (File) (undoList.get(i));
	368	File f = undoList.get(i);
369	369	delete(f);
370	370	}
371	371	}

433	433	File templateData = new File(canonDir, JTDATA + File.separator + "template.data");
434	434	if (templateData.exists()) {
435	435	Properties p = new Properties();
436		FileInputStream fis = null;
437		try {
438		fis = new FileInputStream(templateData.getAbsolutePath());
	436	try (FileInputStream fis = new FileInputStream(templateData.getAbsolutePath())) {
439	437	p.load(fis);
440	438	} catch (IOException e) {
441	439	e.printStackTrace();
442	440	}
443		finally {
444		try { if (fis != null) fis.close(); } catch (IOException e) {}
445		}
446	441
447	442	String templateFile = p.getProperty("file");
448	443	if (!new File(templateFile).exists()) {
449	444
450	445	try {
451	446	// try to calculate relocation
452		String oldWDpath = loadWdInfo(jtData).getProperty(PREV_WD_PATH);
	447	String oldWDpath = loadWdInfo(jtData).get(PREV_WD_PATH);
453	448	String[] begins = getDiffInPaths(dir.getPath(), oldWDpath);
454	449	if (begins != null) {
455	450	if (templateFile.startsWith(begins[1])) {

555	550
556	551	synchronized (dirMap) {
557	552	// sync-ed to make dirMap data consistent
558		WeakReference ref = (WeakReference)(dirMap.get(canonDir));
559		wd = (ref == null ? null : (WorkDirectory) (ref.get()));
	553	WeakReference<WorkDirectory> ref = dirMap.get(canonDir);
	554	wd = (ref == null ? null : ref.get());
560	555
561	556	if (wd != null)
562	557	return wd;
563	558
564		Properties tsInfo;
	559	Map<String, String> tsInfo;
565	560	TestSuite ts;
566	561
567	562	try {
568	563	tsInfo = loadTestSuiteInfo(jtData);
569		String root = tsInfo.getProperty(TESTSUITE_ROOT);
	564	String root = tsInfo.get(TESTSUITE_ROOT);
570	565	if (root == null)
571	566	throw new BadDirectoryFault(i18n, "wd.noTestSuiteRoot", canonDir);
572	567

576	571
577	572	ts = TestSuite.open(tsr);
578	573
579		String wdID = (tsInfo == null ? null : (String) (tsInfo.get(TESTSUITE_ID)));
	574	String wdID = (tsInfo == null ? null : tsInfo.get(TESTSUITE_ID));
580	575	String tsID = ts.getID();
581	576	if (!(wdID == null ? "" : wdID).equals(tsID == null ? "" : tsID))
582	577	throw new MismatchFault(i18n, "wd.mismatchID", canonDir);

637	632
638	633	WorkDirectory wd = null;
639	634	synchronized (dirMap) {
640		WeakReference ref = (WeakReference)(dirMap.get(canonDir));
	635	WeakReference<WorkDirectory> ref = dirMap.get(canonDir);
641	636	if (ref != null)
642		wd = (WorkDirectory)(ref.get());
	637	wd = ref.get();
643	638
644	639	if (wd == null) {
645		Properties tsInfo;
	640	Map<String, String> tsInfo;
646	641	try {
647	642	tsInfo = loadTestSuiteInfo(jtData);
648	643	} catch (IOException e) {
649	644	tsInfo = null;
650	645	}
651	646
652		String wdID = (tsInfo == null ? null : (String) (tsInfo.get(TESTSUITE_ID)));
	647	String wdID = (tsInfo == null ? null : tsInfo.get(TESTSUITE_ID));
653	648	String tsID = testSuite.getID();
654	649	if (!(wdID == null ? "" : wdID).equals(tsID == null ? "" : tsID))
655	650	throw new MismatchFault(i18n, "wd.mismatchID", canonDir);

672	667	* Create a WorkDirectory object for a given directory and testsuite.
673	668	* The directory is assumed to be valid (exists(), isDirectory(), canRead() etc)
674	669	*/
675		private WorkDirectory(File root, TestSuite testSuite, Map tsInfo) {
	670	private WorkDirectory(File root, TestSuite testSuite, Map<String, String> tsInfo) {
676	671	if (root == null \|\| testSuite == null)
677	672	throw new NullPointerException();
678	673	this.root = root;

695	690	// -- possibly conditionally (don't need to write it in case of normal open)
696	691
697	692	if (tsInfo != null) {
698		String testC = (String) (tsInfo.get(TESTSUITE_TESTCOUNT));
	693	String testC = (tsInfo.get(TESTSUITE_TESTCOUNT));
699	694	int tc;
700	695	if (testC == null)
701	696	tc = -1;

721	716
722	717	private void doWDinfo(File jtData, TestSuite testSuite) {
723	718	try {
724		oldWDpath = loadWdInfo(jtData).getProperty(PREV_WD_PATH);
	719	oldWDpath = loadWdInfo(jtData).get(PREV_WD_PATH);
725	720	} catch (IOException ex) {
726	721	oldWDpath = null;
727	722	}

948	943	public synchronized void putTestAnnotation(String testName, String key, String value) {
949	944	loadAnnotations();
950	945
951		HashMap<String,String> map = null;
	946	Map<String,String> map = null;
952	947	if (annotationMap == null)
953		annotationMap = new TreeMap<String,HashMap<String,String>>();
	948	annotationMap = new TreeMap<String, Map<String,String>>();
954	949	else
955	950	map = annotationMap.get(testName);
956	951

1071	1066
1072	1067	DataInputStream reader = new DataInputStream(new BufferedInputStream(fis));
1073	1068
1074		annotationMap = new TreeMap<String,HashMap<String,String>>();
	1069	annotationMap = new TreeMap<String, Map<String,String>>();
1075	1070
1076	1071	try {
1077	1072	while(reader.available() > 0) {

1080	1075	String s2 = reader.readUTF();
1081	1076	String s3 = reader.readUTF();
1082	1077
1083		HashMap map = annotationMap.get(s1);
	1078	Map<String,String> map = annotationMap.get(s1);
1084	1079	if (map == null) {
1085	1080	map = new HashMap<String,String>();
1086	1081	annotationMap.put(s1, map);

1127	1122	DataOutputStream writer = new DataOutputStream(new BufferedOutputStream(fos));
1128	1123	// writes a triplet
1129	1124	for (String s: annotationMap.keySet()) {
1130		HashMap<String,String> map = annotationMap.get(s);
	1125	Map<String,String> map = annotationMap.get(s);
1131	1126	try {
1132	1127	for (String key: map.keySet()) {
1133	1128	writer.writeUTF(s); // 1

1188	1183	return result;
1189	1184	}
1190	1185
1191		private static Properties loadTestSuiteInfo(File jtData) throws FileNotFoundException, IOException {
	1186	private static Map<String, String> loadTestSuiteInfo(File jtData) throws FileNotFoundException, IOException {
1192	1187	return loadInfo(jtData, TESTSUITE);
1193	1188	}
1194	1189
1195		private static Properties loadWdInfo(File jtData) throws FileNotFoundException, IOException {
	1190	private static Map<String, String> loadWdInfo(File jtData) throws FileNotFoundException, IOException {
1196	1191	return loadInfo(jtData, WD_INFO);
1197	1192	}
1198	1193
1199		private static Properties loadInfo(File jtData, String name) throws FileNotFoundException, IOException {
1200		File f = new File(jtData, name);
1201		InputStream in = new BufferedInputStream(new FileInputStream(f));
1202		Properties p = new Properties();
1203		p.load(in);
1204		in.close();
1205		return p;
	1194	private static Map<String, String> loadInfo(File jtData, String name) throws FileNotFoundException, IOException {
	1195	try (InputStream in = new BufferedInputStream(new FileInputStream(new File(jtData, name)))) {
	1196	return com.sun.javatest.util.Properties.load(in);
	1197	}
1206	1198	}
1207	1199
1208	1200

1254	1246	private String oldWDpath;
1255	1247	private int testCount = -1;
1256	1248	private TestResultTable testResultTable;
1257		private TreeMap<String,HashMap<String,String>> annotationMap;
	1249	private Map<String, Map<String,String>> annotationMap;
1258	1250	private File jtData;
1259	1251	private String logFileName;
1260	1252	private LogFile logFile;
1261		private static HashMap dirMap = new HashMap(2); // must be manually synchronized
	1253	private static HashMap<File, WeakReference<WorkDirectory>> dirMap = new HashMap<>(2); // must be manually synchronized
1262	1254	public static final String JTDATA = "jtData";
1263	1255	private static final String TESTSUITE = "testsuite";
1264	1256	private static final String WD_INFO = "wdinfo";

+8

-8

src/com/sun/javatest/agent/ActiveAgentPool.java less more

0	0	/*
1	1	* $Id$
2	2	*
3		* Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
	3	* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
4	4	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5	5	*
6	6	* This code is free software; you can redistribute it and/or modify it

323	323	return v.contains(e);
324	324	}
325	325
326		synchronized Enumeration elements() {
327		return ((Vector)(v.clone())).elements();
	326	synchronized Enumeration<Connection> elements() {
	327	return ((Vector<Connection>)(v.clone())).elements();
328	328	}
329	329
330	330	synchronized void add(final Entry e) {

353	353	synchronized Entry next() {
354	354	Entry e = null;
355	355	if (v.size() > 0) {
356		e = (Entry)(v.elementAt(0));
	356	e = v.elementAt(0);
357	357	v.removeElementAt(0);
358	358	notifyRemovedFromPool(e);
359	359	}

374	374	}
375	375
376	376	synchronized void addObserver(Observer o) {
377		observers = (Observer[])(DynamicArray.append(observers, o));
	377	observers = DynamicArray.append(observers, o);
378	378	}
379	379
380	380
381	381	synchronized void deleteObserver(Observer o) {
382		observers = (Observer[])(DynamicArray.remove(observers, o));
	382	observers = DynamicArray.remove(observers, o);
383	383	}
384	384
385	385	private synchronized void notifyAddedToPool(Entry e) {

394	394	}
395	395	}
396	396
397		private Vector v = new Vector();
	397	private Vector<Entry> v = new Vector<>();
398	398	private Observer[] observers = new Observer[0];
399	399	}
400	400

589	589	/**
590	590	* Get an enumeration of the entries currently in the active agent pool.
591	591	*/
592		Enumeration elements() {
	592	Enumeration<Connection> elements() {
593	593	return entries.elements();
594	594	}
595	595

+20

-20

src/com/sun/javatest/agent/Agent.java less more

0	0	/*
1	1	* $Id$
2	2	*
3		* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
	3	* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
4	4	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5	5	*
6	6	* This code is free software; you can redistribute it and/or modify it

202	202	else {
203	203	traceOut.println("set map:");
204	204	map.setTracing(tracing, traceOut);
205		for (Enumeration e = map.enumerate(); e.hasMoreElements(); ) {
206		String[] entry = (String[])(e.nextElement());
	205	for (Enumeration<String[]> e = map.enumerate(); e.hasMoreElements(); ) {
	206	String[] entry = e.nextElement();
207	207	traceOut.println("map-from: " + entry[0]);
208	208	traceOut.println("map-to: " + entry[1]);
209	209	}

334	334
335	335	// interrupt any threads that are running
336	336	for (int i = 0; i < threads.size(); i++) {
337		Thread t = (Thread)(threads.elementAt(i));
	337	Thread t = threads.elementAt(i);
338	338	if (tracing)
339	339	traceOut.println("INTERRUPTING THREAD " + t.getName());
340	340	t.interrupt();

346	346
347	347	// close any tasks that are running
348	348	for (int i = 0; i < tasks.size(); i++) {
349		Task t = (Task)(tasks.elementAt(i));
	349	Task t = tasks.elementAt(i);
350	350	if (tracing) {
351	351	Connection c = t.connection; // maybe null; if it is, task is already closing
352	352	traceOut.println("CLOSING TASK " + (c == null ? "[unknown]" : c.getName()));

450	450
451	451	private class Notifier {
452	452	public synchronized void addObserver(Observer o) {
453		observers = (Observer[])(DynamicArray.append(observers, o));
	453	observers = DynamicArray.append(observers, o);
454	454	}
455	455
456	456	public synchronized void removeObserver(Agent.Observer o) {
457		observers = (Observer[])(DynamicArray.remove(observers, o));
	457	observers = DynamicArray.remove(observers, o);
458	458	}
459	459
460	460	public synchronized void started() {

541	541	private boolean closing;
542	542	private Thread mainThread;
543	543	private int maxThreads;
544		private Vector threads = new Vector();
545		private Vector tasks = new Vector();
	544	private Vector<Thread> threads = new Vector<>();
	545	private Vector<Task> tasks = new Vector<>();
546	546	private Notifier notifier = new Notifier();
547	547	private Object currSystemStreamOwner = null;
548	548	private PrintStream saveOut;

596	596
597	597	static final String productName = "JT Harness Agent";
598	598	static final String productVersion = "JTA_5.0";
599		static final String productCopyright = "Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.";
	599	static final String productCopyright = "Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.";
600	600
601	601
602	602	/**

780	780	PrintWriter testRef = new PrintWriter(new AgentWriter(REF, this));
781	781
782	782	try {
783		Class c;
	783	Class<?> c;
784	784	ClassLoader cl = null;
785	785	if (remoteClasses) {
786	786	cl = getAgentClassLoader(sharedClassLoader);

833	833	}
834	834	}
835	835
836		private Status executeTest(Class c, String[] args,
	836	private Status executeTest(Class<?> c, String[] args,
837	837	PrintWriter testLog, PrintWriter testRef)
838	838	throws IOException, ClassNotFoundException, IllegalAccessException, InstantiationException {
839	839	notifier.execTest(connection, tag, c.getName(), args);

841	841	return t.run(args, testLog, testRef);
842	842	}
843	843
844		private Status executeCommand(Class c, String[] args,
	844	private Status executeCommand(Class<?> c, String[] args,
845	845	PrintWriter testLog, PrintWriter testRef,
846	846	ClassLoader cl)
847	847	throws IOException, ClassNotFoundException, IllegalAccessException, InstantiationException {

935	935
936	936	}
937	937
938		private Status executeMain(Class c, String[] args,
	938	private Status executeMain(Class<?> c, String[] args,
939	939	PrintWriter testLog, PrintWriter testRef)
940	940	throws IOException, ClassNotFoundException, IllegalAccessException {
941	941	notifier.execMain(connection, tag, c.getName(), args);

944	944	PrintStream err = Deprecated.createPrintStream(new WriterStream(testLog));
945	945	try {
946	946	setSystemStreams(this, out, err);
947		Method main = c.getDeclaredMethod("main", new Class[] {String[].class});
	947	Method main = c.getDeclaredMethod("main", new Class<?>[] {String[].class});
948	948	main.invoke(null, new Object[] {args});
949	949	return Status.passed("OK");
950	950	} catch (NoSuchMethodException e) {

1106	1106
1107	1107	private ClassLoader getAgentClassLoader(boolean useSharedClassLoader)
1108	1108	throws InstantiationException, IllegalAccessException {
1109		Class classLoaderClass;
	1109	Class<? extends ClassLoader> classLoaderClass;
1110	1110	try {
1111	1111	String s = getClass().getName();
1112	1112	String pkg = s.substring(0, s.lastIndexOf('.'));
1113		classLoaderClass = Class.forName(pkg + ".AgentClassLoader2");
	1113	classLoaderClass = (Class<? extends ClassLoader>) Class.forName(pkg + ".AgentClassLoader2");
1114	1114	} catch (Throwable t) {
1115	1115	classLoaderClass = AgentClassLoader.class;
1116	1116	}
1117	1117
1118		Class[] argTypes = {Task.class};
	1118	Class<?>[] argTypes = {Task.class};
1119	1119	if (useSharedClassLoader && factoryMethod == null) {
1120	1120	try {
1121	1121	factoryMethod = classLoaderClass.getDeclaredMethod("getInstance", argTypes);

1138	1138	if (useSharedClassLoader && factoryMethod != null) {
1139	1139	return (ClassLoader) factoryMethod.invoke(null, args);
1140	1140	} else {
1141		return (ClassLoader) (classLoaderConstructor.newInstance(args));
	1141	return classLoaderConstructor.newInstance(args);
1142	1142	}
1143	1143	} catch (InvocationTargetException e) {
1144	1144	Throwable t = e.getTargetException();

1161	1161	private Integer timeoutValue;
1162	1162	}
1163	1163
1164		private static Constructor classLoaderConstructor;
	1164	private static Constructor<? extends ClassLoader> classLoaderConstructor;
1165	1165	private static Method factoryMethod = null;
1166	1166	}
1167	1167

+2

-2

src/com/sun/javatest/agent/AgentApplet.java less more

127	127
128	128	ModeOptions smo = null;
129	129	try {
130		Class serial = Class.forName("com.sun.javatest.agent.SerialPortModeOptions");
	130	Class<?> serial = Class.forName("com.sun.javatest.agent.SerialPortModeOptions");
131	131	smo = (ModeOptions)serial.newInstance();
132	132	} catch (Exception e) {
133	133	System.err.println("There is no support for serial port");

162	162
163	163	if (observerClassName != null) {
164	164	try {
165		Class observerClass = Class.forName(observerClassName);
	165	Class<?> observerClass = Class.forName(observerClassName);
166	166	Agent.Observer observer = (Agent.Observer)(observerClass.newInstance());
167	167	ap.addObserver(observer);
168	168	}

+2

-2

src/com/sun/javatest/agent/AgentClassLoader.java less more

33	33	this.parent = parent;
34	34	}
35	35
36		public synchronized Class loadClass(String className, boolean resolve) throws ClassNotFoundException {
	36	public synchronized Class<?> loadClass(String className, boolean resolve) throws ClassNotFoundException {
37	37
38	38	// check the cache first
39		Class c = findLoadedClass(className);
	39	Class<?> c = findLoadedClass(className);
40	40
41	41	// not found in the cache?
42	42	if (c == null) {

+3

-3

src/com/sun/javatest/agent/AgentClassLoader2.java less more

97	97	return instance;
98	98	}
99	99
100		public Class loadClassLocal(String name) throws ClassNotFoundException {
101		Class target = null;
	100	public Class<?> loadClassLocal(String name) throws ClassNotFoundException {
	101	Class<?> target = null;
102	102	System.out.println("FORCE REMOTE " + name);
103	103	try {
104	104	target = findClass(name);

117	117
118	118
119	119	@Override
120		public Class findClass(String className) throws ClassNotFoundException {
	120	public Class<?> findClass(String className) throws ClassNotFoundException {
121	121	if (className != null) {
122	122	int i = className.lastIndexOf('.');
123	123	if (i > 0) {

+3

-3

src/com/sun/javatest/agent/AgentFrame.java less more

93	93	ModeOptions smo = null;
94	94
95	95	try {
96		Class serial = Class.forName("com.sun.javatest.agent.SerialPortModeOptions");
	96	Class<?> serial = Class.forName("com.sun.javatest.agent.SerialPortModeOptions");
97	97	smo = (ModeOptions)serial.newInstance();
98	98	} catch (Exception e) {
99	99	System.err.println("There is no support for serial port");

207	207
208	208	if (observerClassName != null) {
209	209	try {
210		Class observerClass = Class.forName(observerClassName);
	210	Class<?> observerClass = Class.forName(observerClassName);
211	211	Agent.Observer observer = (Agent.Observer)(observerClass.newInstance());
212	212	sf.panel.addObserver(observer);
213	213	}

260	260	sp.start();
261	261
262	262	try {
263		Method invokeLater = EventQueue.class.getMethod("invokeLater", new Class[] { Runnable.class });
	263	Method invokeLater = EventQueue.class.getMethod("invokeLater", new Class<?>[] { Runnable.class });
264	264	invokeLater.invoke(null, new Object[] { new Runnable() {
265	265	public void run() {
266	266	sf.showCentered();

+10

-10

src/com/sun/javatest/agent/AgentMain.java less more

0	0	/*
1	1	* $Id$
2	2	*
3		* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
	3	* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
4	4	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5	5	*
6	6	* This code is free software; you can redistribute it and/or modify it

373	373	switch (mode) {
374	374	case ACTIVE:
375	375	try {
376		Class c = Class.forName(pkg + ".ActiveConnectionFactory");
377		Constructor m = c.getConstructor(new Class[] {String.class, int.class});
	376	Class<?> c = Class.forName(pkg + ".ActiveConnectionFactory");
	377	Constructor<?> m = c.getConstructor(new Class<?>[] {String.class, int.class});
378	378	Object[] args = { activeHost, new Integer(activePort) };
379	379	return (ConnectionFactory)(m.newInstance(args));
380	380	}

390	390
391	391	case PASSIVE:
392	392	try {
393		Class c = Class.forName(pkg + ".PassiveConnectionFactory");
394		Constructor m = c.getConstructor(new Class[] {int.class, int.class});
	393	Class<?> c = Class.forName(pkg + ".PassiveConnectionFactory");
	394	Constructor<?> m = c.getConstructor(new Class<?>[] {int.class, int.class});
395	395	Object[] args = { new Integer(passivePort), new Integer(concurrency + 1) };
396	396	return (ConnectionFactory)(m.newInstance(args));
397	397	}

411	411
412	412	case SERIAL:
413	413	try {
414		Class c = Class.forName(pkg + ".SerialPortConnectionFactory");
415		Constructor m = c.getConstructor(new Class[] {String.class, String.class, int.class});
	414	Class<?> c = Class.forName(pkg + ".SerialPortConnectionFactory");
	415	Constructor<?> m = c.getConstructor(new Class<?>[] {String.class, String.class, int.class});
416	416	Object[] args = {serialPort, Agent.productName, new Integer(10*1000)};
417	417	return (ConnectionFactory)(m.newInstance(args));
418	418	}

459	459
460	460	if (observerClassName != null) {
461	461	try {
462		Class observerClass = Class.forName(observerClassName);
	462	Class<?> observerClass = Class.forName(observerClassName);
463	463	Agent.Observer observer = (Agent.Observer)(observerClass.newInstance());
464	464	agent.addObserver(observer);
465	465	}

620	620	public void completed(Agent agent, Connection c) {
621	621	}
622	622
623		private Class connectExceptionClass;
624		private Class unknownHostExceptionClass;
	623	private Class<?> connectExceptionClass;
	624	private Class<?> unknownHostExceptionClass;
625	625	}
626	626	}

+10

-10

src/com/sun/javatest/agent/AgentManager.java less more

0	0	/*
1	1	* $Id$
2	2	*
3		* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
	3	* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
4	4	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5	5	*
6	6	* This code is free software; you can redistribute it and/or modify it

106	106	* @see #removeObserver
107	107	*/
108	108	public synchronized void addObserver(Observer o) {
109		observers = (Observer[])(DynamicArray.append(observers, o));
	109	observers = DynamicArray.append(observers, o);
110	110	}
111	111
112	112	/**

114	114	* @param o The observer to be removed.
115	115	*/
116	116	public synchronized void removeObserver(Observer o) {
117		observers = (Observer[])(DynamicArray.remove(observers, o));
	117	observers = DynamicArray.remove(observers, o);
118	118	}
119	119
120	120	private synchronized void notifyStarted(Connection connection,

535	535	ref.flush();
536	536
537	537	// might be better not to flush these ...
538		for (Enumeration e = zips.keys(); e.hasMoreElements(); ) {
539		File f = (File)(e.nextElement());
540		ZipFile z = (ZipFile)(zips.get(f));
	538	for (Enumeration<File> e = zips.keys(); e.hasMoreElements(); ) {
	539	File f = (e.nextElement());
	540	ZipFile z = zips.get(f);
541	541	zips.remove(f);
542	542	z.close();
543	543	}

603	603	private byte[] readFromJar(String name, File jarFile) {
604	604	//System.err.println("readFromJar: " + name + " " + jarFile);
605	605	try {
606		ZipFile z = (ZipFile)zips.get(jarFile);
	606	ZipFile z = zips.get(jarFile);
607	607	if (z == null) {
608	608	z = new ZipFile(jarFile);
609	609	zips.put(jarFile, z);

640	640
641	641	private File[] split(String s) {
642	642	char pathCh = File.pathSeparatorChar;
643		Vector v = new Vector();
	643	Vector<File> v = new Vector<>();
644	644	int start = 0;
645	645	for (int i = s.indexOf(pathCh); i != -1; i = s.indexOf(pathCh, start)) {
646	646	add(s.substring(start, i), v);

653	653	return path;
654	654	}
655	655
656		private void add(String s, Vector v) {
	656	private void add(String s, Vector<File> v) {
657	657	if (s.length() != 0)
658	658	v.addElement(new File(s));
659	659	}

665	665	private File[] classPath;
666	666	private boolean sharedCl;
667	667	private int timeout = 0;
668		private Hashtable zips = new Hashtable();
	668	private Hashtable<File, ZipFile> zips = new Hashtable<>();
669	669	}
670	670
671	671	}

+4

-4

src/com/sun/javatest/agent/AgentMonitorBatchCommandManager.java less more

55	55
56	56	//----------------------------------------------------------------------------
57	57
58		public boolean parseCommand(String cmd, ListIterator argIter, CommandContext ctx)
	58	public boolean parseCommand(String cmd, ListIterator<String> argIter, CommandContext ctx)
59	59	throws Command.Fault
60	60	{
61	61	if (cmd.equalsIgnoreCase(AgentPoolPortCommand.getName())) {

85	85	return "agentPoolPort";
86	86	}
87	87
88		AgentPoolPortCommand(ListIterator argIter) throws Fault {
	88	AgentPoolPortCommand(ListIterator<String> argIter) throws Fault {
89	89	super(getName());
90	90
91	91	if (!argIter.hasNext())

115	115	return "agentPoolTimeout";
116	116	}
117	117
118		AgentPoolTimeoutCommand(ListIterator argIter) throws Fault {
	118	AgentPoolTimeoutCommand(ListIterator<String> argIter) throws Fault {
119	119	super(getName());
120	120
121	121	if (!argIter.hasNext())

145	145	return "startAgentPool";
146	146	}
147	147
148		StartAgentPoolCommand(ListIterator argIter) throws Fault {
	148	StartAgentPoolCommand(ListIterator<String> argIter) throws Fault {
149	149	super(getName());
150	150
151	151	while (argIter.hasNext()) {

+1

-1

src/com/sun/javatest/agent/AgentMonitorCommandManager.java less more

41	41
42	42
43	43	@Override
44		public boolean parseCommand(String cmd, ListIterator argIter, CommandContext ctx)
	44	public boolean parseCommand(String cmd, ListIterator<String> argIter, CommandContext ctx)
45	45	throws Command.Fault
46	46	{
47	47

+18

-18

src/com/sun/javatest/agent/AgentMonitorTool.java less more

0	0	/*
1	1	* $Id$
2	2	*
3		* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
	3	* Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
4	4	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5	5	*
6	6	* This code is free software; you can redistribute it and/or modify it

98	98	return menuBar;
99	99	}
100	100
101		public void save(Map m) {
	101	public void save(Map<String, String> m) {
102	102	int port = agentPoolSubpanel.getPort();
103	103	if (port != Integer.MIN_VALUE)
104	104	m.put("port", String.valueOf(port));

114	114	* @return An AgentMonitorTool restored from the data in the map.
115	115	*/
116	116	@Override
117		protected void restore(Map m) {
118		String l = (String) (m.get("listening"));
	117	protected void restore(Map<String, String> m) {
	118	String l = m.get("listening");
119	119	try {
120		String p = (String) (m.get("port"));
	120	String p = m.get("port");
121	121	if (p != null && p.length() != 0)
122	122	agentPoolSubpanel.setPort(Integer.parseInt(p));
123	123
124		String t = (String) (m.get("timeout"));
	124	String t = m.get("timeout");
125	125	if (t != null && t.length() != 0)
126	126	agentPoolSubpanel.setTimeout(Integer.parseInt(t));
127	127

177	177	add(timeoutField, fc);
178	178	timeoutLabel.setLabelFor(timeoutField);
179	179
180		listData = new DefaultListModel();
	180	listData = new DefaultListModel<>();
181	181	list = uif.createList("tool.pool", listData);
182	182	list.setPrototypeCellValue("abcdefghiklmnopqrstuvwxyz");
183	183	list.setVisibleRowCount(3);

191	191	// Ensure any existing entries in the pool are displayed
192	192	// Note there is a slight synchronization window between the call of
193	193	// elements and that of addObserver.
194		for (Enumeration e = activeAgentPool.elements(); e.hasMoreElements(); ) {
195		Connection conn = (Connection)(e.nextElement());
	194	for (Enumeration<Connection> e = activeAgentPool.elements(); e.hasMoreElements(); ) {
	195	Connection conn = e.nextElement();
196	196	listData.addElement(conn.getName());
197	197	}
198	198

338	338	private JTextField portField;
339	339	private JLabel timeoutLabel;
340	340	private JTextField timeoutField;
341		private JList list;
342		private DefaultListModel listData;
	341	private JList<String> list;
	342	private DefaultListModel<String> listData;
343	343	}
344	344
345	345	private class CurrentAgentsSubpanel extends JPanel

351	351	setLayout(new GridBagLayout());
352	352	uif.setToolTip(this, "tool.curr");
353	353
354		listData = new DefaultListModel();
	354	listData = new DefaultListModel<>();
355	355	list = uif.createList("tool.list.curr", listData);
356	356	list.setVisibleRowCount(5);
357	357
358	358	list.setCellRenderer(new DefaultListCellRenderer() {
359		public Component getListCellRendererComponent(JList list, Object o, int index, boolean isSelected, boolean cellHasFocus) {
360		String name = ((Entry)o).toString();
	359	public Component getListCellRendererComponent(JList<?> list, Object o, int index, boolean isSelected, boolean cellHasFocus) {
	360	String name = o.toString();
361	361	return super.getListCellRendererComponent(list, name, index, isSelected, cellHasFocus);
362	362	}
363	363	});

420	420	}
421	421
422	422	public synchronized void valueChanged(ListSelectionEvent ev) {
423		Entry e = (Entry)(list.getSelectedValue());
	423	Entry e = list.getSelectedValue();
424	424	if (e == null) {
425	425	addressField.setText("");
426	426	tagField.setText("");

469	469	}
470	470	else {
471	471	for (int i = 0; i < listData.size(); i++) {
472		Entry e = (Entry)(listData.elementAt(i));
	472	Entry e = listData.elementAt(i);
473	473	if (e.connection == c) {
474	474	listData.removeElement(e);
475	475	break;

503	503	boolean localizeArgs;
504	504	}
505	505
506		private JList list;
507		private DefaultListModel listData;
	506	private JList<Entry> list;
	507	private DefaultListModel<Entry> listData;
508	508	private Entry selectedEntry;
509	509	private JLabel addressLabel;
510	510	private JTextField addressField;

+1

-1

src/com/sun/javatest/agent/AgentMonitorToolManager.java less more

61	61
62	62	//----------------------------------------------------------------------------
63	63
64		public Tool restoreTool(Map m) {
	64	public Tool restoreTool(Map<String, String> m) {
65	65	AgentMonitorTool t = getTool();
66	66	t.restore(m);
67	67	return t;

+7

-7

src/com/sun/javatest/agent/AgentPanel.java less more

0	0	/*
1	1	* $Id$
2	2	*
3		* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
	3	* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
4	4	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5	5	*
6	6	* This code is free software; you can redistribute it and/or modify it

625	625	versionLabel.setFont(new Font("SansSerif", Font.BOLD, 24));
626	626	infoPanel.add(versionLabel, c);
627	627
628		Label copyLabel1 = new Label("Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.");
	628	Label copyLabel1 = new Label("Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.");
629	629	infoPanel.add(copyLabel1, c);
630	630
631	631	Label copyLabel2 = new Label("Use is subject to license terms.");

689	689	public synchronized void addTask(TaskState task) {
690	690	if (tasks.size() >= maxTasks) {
691	691	for (int i = 0; i < tasks.size(); i++) {
692		String s = (String) getItem(i);
	692	String s = getItem(i);
693	693	// skip over active tasks that will be updated later
694	694	if (s.startsWith("CONN") \|\| s.startsWith("EXEC"))
695	695	continue;

705	705
706	706	public synchronized TaskState getTask(Connection c) {
707	707	for (int i = 0; i < tasks.size(); i++) {
708		TaskState ts = (TaskState)(tasks.elementAt(i));
	708	TaskState ts = tasks.elementAt(i);
709	709	if (ts.connection == c)
710	710	return ts;
711	711	}

713	713	}
714	714
715	715	public synchronized TaskState getSelectedTask() {
716		return (TaskState)(tasks.elementAt(super.getSelectedIndex()));
	716	return tasks.elementAt(super.getSelectedIndex());
717	717	}
718	718
719	719	public synchronized void removeAll() {

757	757	}
758	758
759	759	private int maxTasks = 10;
760		private Vector tasks = new Vector();
	760	private Vector<TaskState> tasks = new Vector<>();
761	761	}
762	762
763	763

972	972	}
973	973
974	974
975		private Vector tasks = new Vector();
	975	private Vector<TaskState> tasks = new Vector<>();
976	976
977	977	private int[] statusCounts = new int[Status.NUM_STATES];
978	978	private int exceptionsCount;

+14

-14

src/com/sun/javatest/agent/Folder.java less more

0	0	/*
1	1	* $Id$
2	2	*
3		* Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
	3	* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
4	4	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5	5	*
6	6	* This code is free software; you can redistribute it and/or modify it

142	142
143	143	public void showTab(String name, boolean visible) {
144	144	for (int i = 0; i < entries.size(); i++) {
145		Entry e = (Entry)entries.elementAt(i);
	145	Entry e = entries.elementAt(i);
146	146	if (e.name.equals(name)) {
147	147	if (e.visibleTab != visible) {
148	148	e.visibleTab = visible;

156	156	public String getNextVisibleTab() {
157	157	int currentIndex = Math.max(0, getCurrentIndex());
158	158	for (int i = currentIndex + 1; i < entries.size(); i++) {
159		Entry e = (Entry)entries.elementAt(i);
	159	Entry e = entries.elementAt(i);
160	160	if (e.visibleTab)
161	161	return e.name;
162	162	}

166	166	public String getPrevVisibleTab() {
167	167	int currentIndex = getCurrentIndex();
168	168	for (int i = currentIndex - 1; i >= 0; i--) {
169		Entry e = (Entry)entries.elementAt(i);
	169	Entry e = entries.elementAt(i);
170	170	if (e.visibleTab)
171	171	return e.name;
172	172	}

175	175
176	176	public Component current() {
177	177	for (int i = 0; i < entries.size(); i++) {
178		Entry e = (Entry)entries.elementAt(i);
	178	Entry e = entries.elementAt(i);
179	179	if (e.comp.isVisible())
180	180	return e.comp;
181	181	}

184	184
185	185	public void show(Component comp) {
186	186	for (int i = 0; i < entries.size(); i++) {
187		Entry e = (Entry)entries.elementAt(i);
	187	Entry e = entries.elementAt(i);
188	188	if (e.comp == comp) {
189	189	show(e);
190	190	return;

194	194
195	195	public void show(String name) {
196	196	for (int i = 0; i < entries.size(); i++) {
197		Entry e = (Entry)entries.elementAt(i);
	197	Entry e = entries.elementAt(i);
198	198	if (e.name.equals(name)) {
199	199	show(e);
200	200	return;

214	214	int tabHeight = fm.getHeight() + tabpad;
215	215	Entry selected = null;
216	216	for (int i = 0; i < entries.size(); i++) {
217		Entry e = (Entry)entries.elementAt(i);
	217	Entry e = entries.elementAt(i);
218	218	if (e.comp.isVisible()) {
219	219	selected = e;
220	220	break;

233	233	int x = border + hgap;
234	234	int baseLine = tabHeight + vgap;
235	235	for (int i = 0; i < entries.size(); i++) {
236		Entry e = (Entry)entries.elementAt(i);
	236	Entry e = entries.elementAt(i);
237	237	int tabH = (e.visibleTab \|\| e.comp.isVisible() ? tabHeight : tabHeight / 3);
238	238	int w = fm.stringWidth(e.name);
239	239	Polygon tab = new Polygon();

281	281	FontMetrics fm = getFontMetrics(getFont());
282	282	int w = border + 2 * hgap + tabSpace;
283	283	for (int i = 0; i < entries.size(); i++) {
284		Entry e = (Entry)entries.elementAt(i);
	284	Entry e = entries.elementAt(i);
285	285	w += slant + (fm == null ? 0 : fm.stringWidth(e.name)) + slant + tabSpace;
286	286	}
287	287	return w;

308	308
309	309	private int getCurrentIndex() {
310	310	for (int i = 0; i < entries.size(); i++) {
311		Entry e = (Entry)entries.elementAt(i);
	311	Entry e = entries.elementAt(i);
312	312	if (e.comp.isVisible())
313	313	return i;
314	314	}

317	317
318	318	private Entry getCurrentEntry() {
319	319	int i = getCurrentIndex();
320		return (i == -1 ? null : (Entry)(entries.elementAt(i)) );
	320	return (i == -1 ? null : entries.elementAt(i));
321	321	}
322	322
323	323	void mousePressed(int mouseX, int mouseY) {

325	325	if (vgap < mouseY && mouseY < border + fm.getHeight() + vgap) {
326	326	int x = border + hgap;
327	327	for (int i = 0; i < entries.size(); i++) {
328		Entry e = (Entry)entries.elementAt(i);
	328	Entry e = entries.elementAt(i);
329	329	int w = fm.stringWidth(e.name);
330	330	x += slant + w + slant + tabSpace;
331	331	if (mouseX < x) {

338	338
339	339
340	340	private ItemListener itemListener;
341		private Vector entries = new Vector();
	341	private Vector<Entry> entries = new Vector<>();
342	342	private int border;
343	343	private int slant;
344	344	private int tabSpace;

+7

-7

src/com/sun/javatest/agent/Map.java less more

0	0	/*
1	1	* $Id$
2	2	*
3		* Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
	3	* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
4	4	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5	5	*
6	6	* This code is free software; you can redistribute it and/or modify it

60	60	*/
61	61	public static Map readFile(String name) throws IOException {
62	62	try {
63		Class c = Class.forName("java.io.FileReader"); // optional API in Jersonal Java
64		Constructor m = c.getConstructor(new Class[] {String.class});
	63	Class<?> c = Class.forName("java.io.FileReader"); // optional API in Jersonal Java
	64	Constructor<?> m = c.getConstructor(new Class<?>[] {String.class});
65	65	Reader r = (Reader)(m.newInstance(new Object[] {name}));
66	66	return new Map(r);
67	67	}

132	132	(r instanceof BufferedReader ? (BufferedReader)r : new BufferedReader(r))
133	133	;
134	134	// data arrives in rows, but we want it in columns
135		Vector from = new Vector();
136		Vector to = new Vector();
	135	Vector<String> from = new Vector<>();
	136	Vector<String> to = new Vector<>();
137	137	String line;
138	138	while ((line = in.readLine()) != null) {
139	139	line = line.trim();

202	202	* Enumerate the entries of the map.
203	203	* @return an enumeration of the translation entries within the map
204	204	*/
205		public Enumeration enumerate() {
206		Vector v = new Vector(fromValues.length);
	205	public Enumeration<String[]> enumerate() {
	206	Vector<String[]> v = new Vector<>(fromValues.length);
207	207	for (int i = 0; i < fromValues.length; i++) {
208	208	v.addElement(new String[] {fromValues[i], toValues[i]});
209	209	}

+3

-3

src/com/sun/javatest/agent/SerialPortModeOptions.java less more

45	45	super("serial port");
46	46
47	47	try {
48		Class c = Class.forName(Proxy.class.getName() + "Impl");
	48	Class<?> c = Class.forName(Proxy.class.getName() + "Impl");
49	49	proxy = (Proxy)(c.newInstance());
50	50	}
51	51	catch (Throwable ignore) {

110	110	class ProxyImpl implements Proxy {
111	111	public String[] getPortNames() {
112	112	try {
113		Vector v = new Vector();
114		for (Enumeration e = CommPortIdentifier.getPortIdentifiers(); e.hasMoreElements(); ) {
	113	Vector<String> v = new Vector<>();
	114	for (Enumeration<?> e = CommPortIdentifier.getPortIdentifiers(); e.hasMoreElements(); ) {
115	115	CommPortIdentifier p = (CommPortIdentifier)(e.nextElement());
116	116	if (p.getPortType() == CommPortIdentifier.PORT_SERIAL)
117	117	v.addElement(p.getName());

+10

-4

src/com/sun/javatest/agent/SocketConnection.java less more

0	0	/*
1	1	* $Id$
2	2	*
3		* Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
	3	* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
4	4	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5	5	*
6	6	* This code is free software; you can redistribute it and/or modify it

30	30	import java.io.OutputStream;
31	31	import java.io.IOException;
32	32	import java.net.InetAddress;
	33	import java.net.InetSocketAddress;
33	34	import java.net.Socket;
34	35	import java.util.Hashtable;
35	36

183	184	}
184	185
185	186	private static String getHostName(InetAddress addr) {
186		String s = (String) (addressCache.get(addr));
	187	String s = addressCache.get(addr);
187	188	if (s == null) {
188	189	s = addr.getHostName();
189	190	addressCache.put(addr, s);

222	223	prev = jtSm.setAllowPropertiesAccess(true);
223	224	}
224	225	try {
225		ServerSocket serverSocket = new ServerSocket(port, backlog);
	226	ServerSocket serverSocket = new ServerSocket();
	227	// Ensure SO_REUSEADDR is false. (It is only needed if we're
	228	// using a fixed port.) The default setting for SO_REUSEADDR
	229	// is platform-specific, and Solaris has it on by default.
	230	serverSocket.setReuseAddress(false);
	231	serverSocket.bind(new InetSocketAddress(port), backlog);
226	232	return serverSocket;
227	233	} finally {
228	234	if (jtSm != null) {

237	243	private boolean closed;
238	244	private Thread waitThread;
239	245	private static Timer timer = new Timer();
240		private static Hashtable addressCache = new Hashtable();
	246	private static Hashtable<InetAddress, String> addressCache = new Hashtable<>();
241	247	}

+1

-6

src/com/sun/javatest/agent/help/default/agent/startAgent.html less more

26	26	-->
27	27
28	28	<!-- %W% %E% -->
29		<html>
	29	<html lang="en">
30	30	<head>
31	31	<META NAME="hIndent" CONTENT="1">
32	32	<LINK REL="stylesheet" TYPE="text/css" HREF="../jthelp.css" TITLE="Style">
33	33	<title>Starting a JT Harness Agent</title>
34		<style type="text/css">
35		<!--
36		.style1 {font-size: 9}
37		-->
38		</style>
39	34	</head>
40	35	<body>
41	36	<a name="startAgent"><!-- index:starting a JT Harness agent --><!-- index:JT Harness agent; starting --></a>

+10

-10

src/com/sun/javatest/agent/help/default/map.xml less more

54	54	<mapID target="agent.window.csh" url="agent/window.html" />
55	55	<mapID target="chapter" url="../images/chapter.gif" />
56	56	<mapID target="closedbook" url="../images/closedbook.gif" />
57		<mapID target="glossary.ActiveAgent" url="/Users/alekseyof/javatest_os/jtharness/src/com/sun/javatest/agent/help/default/glossary/activeAgent.html" />
58		<mapID target="glossary.Agent" url="/Users/alekseyof/javatest_os/jtharness/src/com/sun/javatest/agent/help/default/glossary/agent.html" />
59		<mapID target="glossary.AgentMonitor" url="/Users/alekseyof/javatest_os/jtharness/src/com/sun/javatest/agent/help/default/glossary/agentMonitor.html" />
60		<mapID target="glossary.AgentPool" url="/Users/alekseyof/javatest_os/jtharness/src/com/sun/javatest/agent/help/default/glossary/agentPool.html" />
61		<mapID target="glossary.Parameters" url="/Users/alekseyof/javatest_os/jtharness/src/com/sun/javatest/agent/help/default/glossary/parameters.html" />
62		<mapID target="glossary.PassiveAgent" url="/Users/alekseyof/javatest_os/jtharness/src/com/sun/javatest/agent/help/default/glossary/passiveAgent.html" />
63		<mapID target="glossary.SerialAgent" url="/Users/alekseyof/javatest_os/jtharness/src/com/sun/javatest/agent/help/default/glossary/serialAgent.html" />
64		<mapID target="glossary.TestManager" url="/Users/alekseyof/javatest_os/jtharness/src/com/sun/javatest/agent/help/default/glossary/testManager.html" />
65		<mapID target="glossary.TestSuite" url="/Users/alekseyof/javatest_os/jtharness/src/com/sun/javatest/agent/help/default/glossary/testSuite.html" />
66		<mapID target="glossary.WorkDirectory" url="/Users/alekseyof/javatest_os/jtharness/src/com/sun/javatest/agent/help/default/glossary/workDirectory.html" />
	57	<mapID target="glossary.ActiveAgent" url="glossary/activeAgent.html" />
	58	<mapID target="glossary.Agent" url="glossary/agent.html" />
	59	<mapID target="glossary.AgentMonitor" url="glossary/agentMonitor.html" />
	60	<mapID target="glossary.AgentPool" url="glossary/agentPool.html" />
	61	<mapID target="glossary.Parameters" url="glossary/parameters.html" />
	62	<mapID target="glossary.PassiveAgent" url="glossary/passiveAgent.html" />
	63	<mapID target="glossary.SerialAgent" url="glossary/serialAgent.html" />
	64	<mapID target="glossary.TestManager" url="glossary/testManager.html" />
	65	<mapID target="glossary.TestSuite" url="glossary/testSuite.html" />
	66	<mapID target="glossary.WorkDirectory" url="glossary/workDirectory.html" />
67	67	<mapID target="index.agentAdditionalOptionsAdditionalOptionsAutostart" url="agent/additionalOptions.html#additionalOptions.autostart" />
68	68	<mapID target="index.agentAdditionalOptionsAdditionalOptionsBoth" url="agent/additionalOptions.html#additionalOptions.both" />
69	69	<mapID target="index.agentAdditionalOptionsAdditionalOptionsConcurrencyValue" url="agent/additionalOptions.html#additionalOptions.concurrencyValue" />

+27

-28

src/com/sun/javatest/audit/Audit.java less more

0	0	/*
1	1	* $Id$
2	2	*
3		* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
	3	* Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
4	4	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5	5	*
6	6	* This code is free software; you can redistribute it and/or modify it

105	105	*/
106	106	public Audit(TestFinderQueue tfq, ExcludeList excludeList, WorkDirectory workDir)
107	107	{
108		Vector badChecksumTestsV = new Vector();
109		Vector badTestDescriptionsV = new Vector();
110		Vector badTestCaseTestsV = new Vector();
111		Vector badTestsV = new Vector();
	108	Vector<TestResult> badChecksumTestsV = new Vector<>();
	109	Vector<TestResult> badTestDescriptionsV = new Vector<>();
	110	Vector<TestResult> badTestCaseTestsV = new Vector<>();
	111	Vector<TestDescription> badTestsV = new Vector<>();
112	112
113	113	workDir.getTestResultTable().waitUntilReady();
114	114

130	130	if (!checkTestCases(tr, excludeList))
131	131	badTestCaseTestsV.addElement(tr);
132	132
133		Map trEnv = tr.getEnvironment();
134		for (Iterator i = trEnv.entrySet().iterator(); i.hasNext(); ) {
135		Map.Entry e = (Map.Entry) (i.next());
136		String key = (String) (e.getKey());
137		String value = (String) (e.getValue());
138		Vector allValuesForKey = (Vector)(envTable.get(key));
	133	Map<String, String> trEnv = tr.getEnvironment();
	134	for (Map.Entry<String, String> e : trEnv.entrySet() ) {
	135	String key = e.getKey();
	136	String value = e.getValue();
	137	Vector<String> allValuesForKey = envTable.get(key);
139	138	if (allValuesForKey == null) {
140		allValuesForKey = new Vector();
	139	allValuesForKey = new Vector<>();
141	140	envTable.put(key, allValuesForKey);
142	141	}
143	142	if (!allValuesForKey.contains(value))

166	165	}
167	166	}
168	167
169		for (Enumeration e = envTable.keys(); e.hasMoreElements(); ) {
170		String key = (String)(e.nextElement());
171		Vector allValuesForKey = (Vector)(envTable.get(key));
	168	for (Enumeration<String> e = envTable.keys(); e.hasMoreElements(); ) {
	169	String key = e.nextElement();
	170	Vector<String> allValuesForKey = envTable.get(key);
172	171	envCounts[allValuesForKey.size() == 1 ? 0 : 1]++;
173	172	}
174	173

251	250	* The keys to the table are strings; the values are vectors of strings
252	251	* containing the various values for that key.
253	252	*/
254		public Hashtable getEnvTable() {
	253	public Hashtable<String, Vector<String>> getEnvTable() {
255	254	return envTable;
256	255	}
257	256

491	490	out.println();
492	491	out.print(i18n.getString("adt.envList.title"));
493	492
494		SortedSet ss = new TreeSet();
495		for (Enumeration e = envTable.keys(); e.hasMoreElements(); ) {
496		String key = (String)(e.nextElement());
	493	SortedSet<String> ss = new TreeSet<>();
	494	for (Enumeration<String> e = envTable.keys(); e.hasMoreElements(); ) {
	495	String key = (e.nextElement());
497	496	ss.add(key);
498	497	}
499	498
500		for (Iterator iter = ss.iterator(); iter.hasNext(); ) {
501		String key = (String) (iter.next());
502		Vector allValuesForKey = (Vector)(envTable.get(key));
	499	for (Iterator<String> iter = ss.iterator(); iter.hasNext(); ) {
	500	String key = (iter.next());
	501	Vector<String> allValuesForKey = envTable.get(key);
503	502	if (allValuesForKey.size() == 1) {
504	503	if (showAll)
505	504	out.println(i18n.getString("adt.envKeyValue",

632	631	//if (!a.rootRelativeFile.equals(b.rootRelativeFile))
633	632	// return false;
634	633
635		Iterator eA = a.getParameterKeys();
636		Iterator eB = b.getParameterKeys();
	634	Iterator<String> eA = a.getParameterKeys();
	635	Iterator<String> eB = b.getParameterKeys();
637	636	while (eA.hasNext() && eB.hasNext()) {
638		String keyA = (String)eA.next();
639		String keyB = (String)eB.next();
	637	String keyA = eA.next();
	638	String keyB = eB.next();
640	639	if (!keyA.equals(keyB)) {
641	640	//System.err.println("mismatch " + a.getRootRelativePath() + " a:" + keyA + " b:" + keyB);
642	641	return false;

691	690	// Create an array of possible date formats to parse dates in .jtr files.
692	691	// Most likely is Unix C time in English; the array will be reordered in use
693	692	// by moving the recently used entries to the front of the array.
694		Vector v = new Vector();
	693	Vector<DateFormat> v = new Vector<>();
695	694
696	695	// generic Java default
697	696	// 10-Sep-99 3:25:11 PM

732	731	private Date latestStart;
733	732	private DateFormat[] dateFormats;
734	733
735		private Hashtable envTable = new Hashtable();
	734	private Hashtable<String, Vector<String>> envTable = new Hashtable<>();
736	735	private PrintStream out;
737	736	private static I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(Audit.class);
738	737	}

+3

-3

src/com/sun/javatest/audit/AuditCommandManager.java less more

52	52
53	53	//----------------------------------------------------------------------------
54	54
55		public boolean parseCommand(String cmd, ListIterator argIter, CommandContext ctx)
	55	public boolean parseCommand(String cmd, ListIterator<String> argIter, CommandContext ctx)
56	56	throws Command.Fault
57	57	{
58	58	if (cmd.equalsIgnoreCase(AuditCommand.getName())) {

78	78	return "audit";
79	79	}
80	80
81		AuditCommand(ListIterator argIter) throws Fault {
	81	AuditCommand(ListIterator<String> argIter) throws Fault {
82	82	super(getName());
83	83
84	84	while (argIter.hasNext()) {

121	121	return "showAudit";
122	122	}
123	123
124		ShowAuditCommand(ListIterator argIter) {
	124	ShowAuditCommand(ListIterator<String> argIter) {
125	125	super(getName());
126	126	}
127	127

+5

-5

src/com/sun/javatest/audit/AuditTool.java less more

88	88	return (wd == null ? null : new WorkDirectory[] { wd });
89	89	}
90	90
91		public void save(Map m) {
	91	public void save(Map<String, String> m) {
92	92	if (interviewParams == null)
93	93	return;
94	94

108	108	}
109	109
110	110	@Override
111		protected void restore(Map m) {
112		String tsp = (String) (m.get("testSuite"));
113		String wdp = (String) (m.get("workDir"));
114		String cfp = (String) (m.get("config"));
	111	protected void restore(Map<String, String> m) {
	112	String tsp = m.get("testSuite");
	113	String wdp = m.get("workDir");
	114	String cfp = m.get("config");
115	115
116	116	if (tsp == null && wdp == null && cfp == null)
117	117	return;

+1

-1

src/com/sun/javatest/audit/AuditToolManager.java less more

72	72	return t;
73	73	}
74	74
75		public Tool restoreTool(Map m) {
	75	public Tool restoreTool(Map<String, String> m) {
76	76	AuditTool t = getTool();
77	77	t.restore(m);
78	78	return t;

+4

-4

src/com/sun/javatest/audit/ListPane.java less more

0	0	/*
1	1	* $Id$
2	2	*
3		* Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
	3	* Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
4	4	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5	5	*
6	6	* This code is free software; you can redistribute it and/or modify it

60	60	}
61	61	}
62	62
63		private class ListModel extends AbstractListModel {
	63	private class ListModel extends AbstractListModel<Object> {
64	64	public Object getElementAt(int index) {
65	65	return data[index];
66	66	}

78	78	}
79	79
80	80	private class Renderer extends DefaultListCellRenderer {
81		public Component getListCellRendererComponent(JList list, Object o, int index, boolean isSelected, boolean cellHasFocus) {
	81	public Component getListCellRendererComponent(JList<?> list, Object o, int index, boolean isSelected, boolean cellHasFocus) {
82	82	String name;
83	83	if (o instanceof TestResult) {
84	84	TestResult tr = (TestResult) o;

94	94	}
95	95	}
96	96
97		protected JList list;
	97	protected JList<Object> list;
98	98	private ListModel model;
99	99	}

+10

-10

src/com/sun/javatest/audit/OptionsDialog.java less more

0	0	/*
1	1	* $Id$
2	2	*
3		* Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
	3	* Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
4	4	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5	5	*
6	6	* This code is free software; you can redistribute it and/or modify it

191	191	private void updateTestSuiteChoices() {
192	192	// get the paths of currently loaded test suites
193	193	// could move this to TestSuite, and use the dirMap cache
194		SortedSet s = new TreeSet();
	194	SortedSet<String> s = new TreeSet<>();
195	195	Desktop d = tool.getDesktop();
196	196	Tool[] tools = d.getTools();
197	197	if (tools != null) {

236	236
237	237	// get the paths of currently loaded work directories
238	238	// could move this to WorkDirectory and use the dirMap cache
239		SortedSet s = new TreeSet();
	239	SortedSet<String> s = new TreeSet<>();
240	240	Desktop d = tool.getDesktop();
241	241	Tool[] tools = d.getTools();
242	242	if (tools != null) {

290	290	}
291	291
292	292	private void updateConfigFileChoices() {
293		SortedSet s = new TreeSet();
	293	SortedSet<String> s = new TreeSet<>();
294	294	String wdp = (String) (wdField.getSelectedItem());
295	295	try {
296	296	WorkDirectory wd = WorkDirectory.open(new File(wdp));

305	305	setItems(cfField, s);
306	306	}
307	307
308		private void setItems(JComboBox field, SortedSet s) {
	308	private void setItems(JComboBox<String> field, SortedSet<String> s) {
309	309	// first, remove unwanted entries from field
310	310	for (int i = field.getItemCount() - 1; i >= 0; i-- ) {
311		String item = (String) (field.getItemAt(i));
	311	String item = field.getItemAt(i);
312	312	if (s.contains(item)) {
313	313	// this item is required, so remove it from the
314	314	// set to be added later

320	320	}
321	321
322	322	// those items remaining in s need to be added to the field
323		for (Iterator iter = s.iterator(); iter.hasNext(); )
	323	for (Iterator<String> iter = s.iterator(); iter.hasNext(); )
324	324	field.addItem(iter.next());
325	325	}
326	326

328	328	private ActionListener okListener;
329	329	private JPanel body;
330	330
331		private JComboBox tsField;
	331	private JComboBox<String> tsField;
332	332	private JButton tsBtn;
333	333	private TestSuiteChooser testSuiteChooser;
334	334
335		private JComboBox wdField;
	335	private JComboBox<String> wdField;
336	336	private JButton wdBtn;
337	337	private WorkDirChooser workDirChooser;
338	338
339		private JComboBox cfField;
	339	private JComboBox<String> cfField;
340	340	private JButton cfBtn;
341	341	private JFileChooser configFileChooser;
342	342

+1

-1

src/com/sun/javatest/batch/BatchManager.java less more

59	59	return new HelpTree.Node(i18n, "cmgr.help." + name);
60	60	}
61	61
62		public boolean parseCommand(String cmd, ListIterator argIter, CommandContext ctx)
	62	public boolean parseCommand(String cmd, ListIterator<String> argIter, CommandContext ctx)
63	63	throws Command.Fault
64	64	{
65	65	if (isMatch(cmd, BatchCommand.getName())) {

+13

-13

src/com/sun/javatest/batch/ObserverCommand.java less more

0	0	/*
1	1	* $Id$
2	2	*
3		* Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
	3	* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
4	4	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5	5	*
6	6	* This code is free software; you can redistribute it and/or modify it

52	52	return new HelpTree.Node(i18n, "cmgr.help.observer", opts);
53	53	}
54	54
55		ObserverCommand(ListIterator argIter) throws Fault {
	55	ObserverCommand(ListIterator<String> argIter) throws Fault {
56	56	super(getName());
57	57
58		Vector v = null;
	58	Vector<String> v = null;
59	59
60	60	while (argIter.hasNext()) {
61	61	String arg = nextArg(argIter);

72	72	break;
73	73	else {
74	74	if (v == null)
75		v = new Vector();
	75	v = new Vector<>();
76	76	v.add(arg);
77	77	}
78	78	}

91	91
92	92	public void run(CommandContext ctx) throws Fault {
93	93	try {
94		Class oc = loadClass(className);
	94	Class<?> oc = loadClass(className);
95	95
96	96	Harness.Observer o = null;
97	97	if (classArgs == null \|\| classArgs.length == 0) {
98	98	o = tryConstructor(oc,
99		new Class[] { },
	99	new Class<?>[] { },
100	100	new Object[] { });
101	101	}
102	102	else if (classArgs.length == 1) {
103	103	o = tryConstructor(oc,
104		new Class[] { String.class },
	104	new Class<?>[] { String.class },
105	105	new Object[] { classArgs[0] });
106	106	}
107	107
108	108	if (o == null)
109	109	o = tryConstructor(oc,
110		new Class[] { String[].class },
	110	new Class<?>[] { String[].class },
111	111	new Object[] { classArgs });
112	112
113	113	if (o == null)

129	129	}
130	130	}
131	131
132		private Harness.Observer tryConstructor(Class obsClass, Class[] argTypes, Object[] args)
	132	private Harness.Observer tryConstructor(Class<?> obsClass, Class<?>[] argTypes, Object[] args)
133	133	throws IllegalAccessException, InstantiationException, InvocationTargetException
134	134	{
135	135	try {
136		Constructor c = obsClass.getConstructor(argTypes);
	136	Constructor<?> c = obsClass.getConstructor(argTypes);
137	137	return (Harness.Observer) (c.newInstance(args));
138	138	}
139	139	catch (NoSuchMethodException e) {

143	143
144	144	private void setClassPath(String s) throws Fault {
145	145	char pathCh = File.pathSeparatorChar;
146		Vector v = new Vector();
	146	Vector<URL> v = new Vector<>();
147	147	int start = 0;
148	148	for (int i = s.indexOf(pathCh); i != -1; i = s.indexOf(pathCh, start)) {
149	149	addClassPathEntry(s.substring(start, i), v);

159	159	classLoader = new URLClassLoader(path);
160	160	}
161	161
162		private Class loadClass(String name) throws ClassNotFoundException {
	162	private Class<?> loadClass(String name) throws ClassNotFoundException {
163	163	return (classLoader == null ? Class.forName(name) : classLoader.loadClass(name));
164	164	}
165	165
166		private void addClassPathEntry(String s, Vector v) throws Fault {
	166	private void addClassPathEntry(String s, Vector<URL> v) throws Fault {
167	167	try {
168	168	if (s.length() > 0)
169	169	v.add(new File(s).toURL());

+2

-1

src/com/sun/javatest/batch/RunTestsCommand.java less more

29	29	import java.text.DateFormat;
30	30	import java.util.Date;
31	31	import java.util.Iterator;
	32	import java.util.ListIterator;
32	33
33	34	import com.sun.javatest.Harness;
34	35	import com.sun.javatest.Parameters;

67	68	super(getName());
68	69	}
69	70
70		RunTestsCommand(Iterator argIter) {
	71	RunTestsCommand(ListIterator<String> argIter) {
71	72	super(getName());
72	73	}
73	74

+0

-549

~~src/com/sun/javatest/cof/COF1_0.xsd~~ less more

0		<?xml version="1.0" encoding="UTF-8" ?>
1
2		<xsd:schema
3		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
4		version="1.0.0">
5
6		<xsd:annotation>
7		<xsd:documentation>
8		Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
9		DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
10
11		This code is free software; you can redistribute it and/or modify it
12		under the terms of the GNU General Public License version 2 only, as
13		published by the Free Software Foundation. Oracle designates this
14		particular file as subject to the "Classpath" exception as provided
15		by Oracle in the LICENSE file that accompanied this code.
16
17		This code is distributed in the hope that it will be useful, but WITHOUT
18		ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
19		FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
20		version 2 for more details (a copy is included in the LICENSE file that
21		accompanied this code).
22
23		You should have received a copy of the GNU General Public License version
24		2 along with this work; if not, write to the Free Software Foundation,
25		Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
26
27		Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
28		or visit www.oracle.com if you need additional information or have any
29		questions.
30		</xsd:documentation>
31		</xsd:annotation>
32
33		<xsd:simpleType name="IDWithColon">
34		<xsd:annotation>
35		<xsd:documentation>
36		IDs are colon free strings followed by a colon followed by digits.
37		The digits are there to disambiguate entries that are repeated.
38		Repeats can occur for test results, for instance, when a test is
39		run more than once.
40		</xsd:documentation>
41		</xsd:annotation>
42		<xsd:restriction base="xsd:string">
43		<xsd:pattern value="[\w\.\[\]\{\},_-]+:[0-9]+"/>
44		</xsd:restriction>
45		</xsd:simpleType>
46
47		<xsd:simpleType name="Machine">
48		<xsd:annotation>
49		<xsd:documentation>
50		Machines are identified by name and date. The name must be qualified.
51		Only lower case is accepted in the COF.
52		Host name space specifiers are defined in http://www.ietf.org/rfc/rfc2141.txt . This
53		schema checks for the existence of two or more domains in the name space specifier.
54		</xsd:documentation>
55		</xsd:annotation>
56		<xsd:restriction base="xsd:string">
57		<xsd:pattern value="([a-z0-9][a-z0-9\-][a-z0-9]\.){2,}([a-z][a-z0-9\-][a-z0-9])"/>
58		</xsd:restriction>
59		</xsd:simpleType>
60
61		<xsd:simpleType name="KeyWord">
62		<xsd:annotation>
63		<xsd:documentation>
64		Keywords are very rough descriptions of test content.
65		</xsd:documentation>
66		</xsd:annotation>
67		<xsd:restriction base="xsd:string">
68		<xsd:enumeration value="DTF"/>
69		<xsd:enumeration value="JPI"/>
70		<xsd:enumeration value="JAWS"/>
71		<xsd:enumeration value="JSS"/>
72		<xsd:enumeration value="demo"/>
73		<xsd:enumeration value="manual"/>
74		</xsd:restriction>
75		</xsd:simpleType>
76
77		<xsd:complexType name="KeyWords" abstract="false">
78		<xsd:sequence>
79		<xsd:element name="keyword" type="KeyWord" minOccurs="1" maxOccurs="unbounded"/>
80		</xsd:sequence>
81		</xsd:complexType>
82
83		<xsd:simpleType name="Bits">
84		<xsd:restriction base="xsd:int">
85		<xsd:enumeration value="32"/>
86		<xsd:enumeration value="64"/>
87		</xsd:restriction>
88		</xsd:simpleType>
89
90		<xsd:simpleType name="DisplayDepth">
91		<xsd:annotation>
92		<xsd:documentation>
93		Display depth is recorded as part of a software configuration.
94		</xsd:documentation>
95		</xsd:annotation>
96		<xsd:restriction base="xsd:int">
97		<xsd:enumeration value="8"/>
98		<xsd:enumeration value="12"/>
99		<xsd:enumeration value="15"/>
100		<xsd:enumeration value="16"/>
101		<xsd:enumeration value="24"/>
102		<xsd:enumeration value="32"/>
103		</xsd:restriction>
104		</xsd:simpleType>
105
106		<xsd:complexType name="OS">
107		<xsd:annotation>
108		<xsd:documentation>
109		Operating system.
110		</xsd:documentation>
111		<xsd:documentation>
112		Name should be one of windows, redhat_linux, turbo_linux,
113		suse_linux, caldera_linux, mandrake_linux, solaris, palmos,
114		psos, symbianos, or vxworks.
115		These names are derived from BugTraq names.
116		</xsd:documentation>
117		<xsd:documentation>
118		Versions are derived from BugTraq names. Allowable version
119		strings for Windows are 2000, 95, 98, ce, me, nt_4.0,
120		pocketpc2000, pocketpc2002, and xp.
121		Allowable version strings for Solaris are 2.6, 2.7, 8, and 9.
122		Linux versioning is sane in comparison with that of Solaris
123		and Windows. Redhat versions are 5.1, 5.2, 6.0, 6.1, 6.2,
124		7.0, 7.1, and 7.2.
125		</xsd:documentation>
126		</xsd:annotation>
127		<xsd:sequence>
128		<xsd:element name="name">
129		<xsd:simpleType>
130		<xsd:restriction base="xsd:string">
131		<xsd:enumeration value="caldera_linux"/>
132		<xsd:enumeration value="mandrake_linux"/>
133		<xsd:enumeration value="palmos"/>
134		<xsd:enumeration value="psos"/>
135		<xsd:enumeration value="redhat_linux"/>
136		<xsd:enumeration value="solaris"/>
137		<xsd:enumeration value="suse_linux"/>
138		<xsd:enumeration value="symbianos"/>
139		<xsd:enumeration value="turbo_linux"/>
140		<xsd:enumeration value="windows"/>
141		<xsd:enumeration value="vxworks"/>
142		</xsd:restriction>
143		</xsd:simpleType>
144		</xsd:element>
145		<xsd:element name="version" type="xsd:string"/>
146		</xsd:sequence>
147		</xsd:complexType>
148
149		<xsd:complexType name="TestAttribute">
150		<xsd:annotation>
151		<xsd:documentation>
152		Test attributes encode test-specific settings that we might want recorded.
153		The motivation for inclusion in the COF is the desire to record locale as
154		set by a test, time zone as set by a test, and the use of the Java command
155		line switches like -client, -server, -d32, or -d64. It is expected that
156		the absence of any use of -client or -server will be reflected by an absence
157		of a TestAttribute element whose name is "client" or "server", respectively.
158		Tests that use both flags should create an element for each setting.
159		Similar considerations govern use of "d32" and "d64".
160		</xsd:documentation>
161		<xsd:documentation>
162		Locale values should be in the usual Java format of strings separated by
163		underscores. For instance, ja, ja_JP, and ja_JP_custom are all valid.
164		Locale values should be in the usual Java format of strings separated
165		by underscores. For instance, ja, ja_JP, and ja_JP_custom are all valid.
166		The first string is a valid ISO Language Code and the second is a valid
167		ISO Country Code. The list of language and country codes are at
168		http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt and
169		http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html ,
170		respectively. The third string in the concatenation is for variants
171		and can contain underscores.
172		</xsd:documentation>
173		<xsd:documentation>
174		Time zone values document the time zone used for a particular test or
175		test case. Time zones should be in the format used by Java. For instance, the
176		string for Pacific Standard Time is "America/Los Angeles". The list of
177		supported time zones is obtained by invoking java.util.TimeZone.getAvailableIDs.
178		Do not use a deprecated three-letter time zone ID.
179		</xsd:documentation>
180		<xsd:documentation>
181		In general, a Java command line flag argument that it is agreed will get tracked as
182		an attribute, say -foo,will get tracked by a test attribute <name>foo</name>
183		without a corresponding value element. A Java command line argument pair
184		"-foo bar" will get tracked by a test attribute <name>foo</name><value>bar</value>.
185		</xsd:documentation>
186		</xsd:annotation>
187		<xsd:sequence>
188		<xsd:element name="name" type="xsd:string" minOccurs="1" maxOccurs="unbounded"/>
189		<xsd:element name="value" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
190		</xsd:sequence>
191		</xsd:complexType>
192
193		<xsd:complexType name="TestAttributes">
194		<xsd:sequence>
195		<xsd:element name="attribute" type="TestAttribute" minOccurs="1" maxOccurs="unbounded"/>
196		</xsd:sequence>
197		</xsd:complexType>
198
199		<xsd:complexType name="Status">
200		<xsd:annotation>
201		<xsd:documentation>
202		Status can be one of pass, fail, vm_fail, error, did_not_run, or ambiguous.
203		Fail is for test failures that the test or test case anticipates. A vm_fail
204		status indicates that a VM failure caused the failure. An example of this is
205		a HotSpot abort. An error status can be used to cover all failures not
206		explained as a test or vm failure. Examples are seg faults in the VM or
207		a harness failure.
208		</xsd:documentation>
209		<xsd:documentation>
210		Status did_not_run is an odd one. It's there because test execution may
211		conditional on the successful completion of a setup step, itself a test.
212		</xsd:documentation>
213		<xsd:documentation>
214		The setting ambiguous is the least self-explanatory of the status codes.
215		I18n tests are run in locales that they do not support. These tests fail,
216		but there failure has no meaning that should get reported back to product
217		development.
218		</xsd:documentation>
219		<xsd:documentation>
220		Expected elements contain text that refers to an expected value. This
221		can be anything. A header, value, body, ..... If the tag log appears,
222		it may be understood that a URL of a log file will appear as the PCDATA
223		for this tag. If present, that URL uses either http or file protocol. If
224		http protocol, the server name will be fully qualified. If file protocol,
225		the full path beginning with /net will be expected. Microsoft file mapping or
226		Unix automounts should not be used.
227		</xsd:documentation>
228		<xsd:documentation>
229		Actual elements contain text that refers to an actual value. This
230		can be anything. A header, value, body, ..... If the tag log appears,
231		it may be understood that a URL of a log file will appear as the PCDATA
232		for this tag. If present, that URL uses either http or file protocol. If
233		http protocol, the server name will be fully qualified. If file protocol,
234		the full path beginning with /net will be expected. Microsoft file mapping or
235		Unix automounts should not be used.
236		</xsd:documentation>
237		</xsd:annotation>
238		<xsd:sequence minOccurs="0" maxOccurs="1">
239		<xsd:element name="expected" type="xsd:string" minOccurs="0" maxOccurs="1"/>
240		<xsd:element name="actual" type="xsd:string" minOccurs="0" maxOccurs="1"/>
241		</xsd:sequence>
242		<xsd:attribute name="value" use="required">
243		<xsd:simpleType>
244		<xsd:restriction base="xsd:string">
245		<xsd:enumeration value="pass"/>
246		<xsd:enumeration value="fail"/>
247		<xsd:enumeration value="ambiguous"/>
248		<xsd:enumeration value="error"/>
249		<xsd:enumeration value="vm_fail"/>
250		<xsd:enumeration value="did_not_run"/>
251		</xsd:restriction>
252		</xsd:simpleType>
253		</xsd:attribute>
254		</xsd:complexType>
255
256		<xsd:complexType name="TestCase" abstract="false">
257		<xsd:annotation>
258		<xsd:documentation>
259		Testcase elements define the test cases of a test that are
260		exercised in the course of a run. The id
261		for a test takes the form test_case_name:unique_id. The information
262		will be gathered using the test_coverage.xml file associated with the test case,
263		if present. The unique_id is unique within the xml file. The unique_id portion
264		is present because test run might contain repetitions.
265		Testcases are often tests run with different command line arguments or
266		environments. Often, the different test cases in a test are in reality
267		different methods inside that test's source code.
268		</xsd:documentation>
269		<xsd:documentation>
270		The starttime and endtime fields use an XML format. Times are in UTC (like
271		those that java.util.Date works with). An acceptable dateTime
272		format is yyyy-mm-ddThh:mm:ss.ff. DateTime format is specified in
273		section 5.4 of ISO 8601.
274		</xsd:documentation>
275		</xsd:annotation>
276		<xsd:sequence>
277		<xsd:element name="name" type="xsd:string"/>
278		<xsd:element name="status" type="Status" minOccurs="0" maxOccurs="1"/>
279		<xsd:element name="starttime" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
280		<xsd:element name="endtime" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
281		<xsd:element name="attributes" type="TestAttributes" minOccurs="0" maxOccurs="1"/>
282		<xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/>
283		</xsd:sequence>
284		<xsd:attribute name="id" type="IDWithColon" use="required"/>
285		</xsd:complexType>
286
287		<xsd:complexType name="TestCases" abstract="false">
288		<xsd:sequence>
289		<xsd:element name="testcase" type="TestCase" minOccurs="1" maxOccurs="unbounded"/>
290		</xsd:sequence>
291		</xsd:complexType>
292
293		<xsd:complexType name="Test" abstract="false">
294		<xsd:annotation>
295		<xsd:documentation>
296		Test elements define all the tests exercised by the test suite. The id
297		for a test takes the form test_name:unique_id. The information
298		will be gathered using the test_coverage.xml file associated with the test,
299		if present. The unique_id is unique within the xml file. The unique_id portion
300		is present because test run might contain repetitions.
301		</xsd:documentation>
302		<xsd:documentation>
303		Status is required if there are zero test cases.
304		Starttime is required if there are zero test cases.
305		Endtime is required if there are zero test cases.
306		The starttime and endtime fields use an XML format. Times are in UTC (like
307		those that java.util.Date works with). An acceptable dateTime
308		format is yyyy-mm-ddThh:mm:ss.ff. DateTime format is specified in
309		section 5.4 of ISO 8601.
310		</xsd:documentation>
311		</xsd:annotation>
312		<xsd:sequence>
313		<xsd:element name="name" type="xsd:string"/>
314		<xsd:element name="appuse" type="IDWithColon" minOccurs="0" maxOccurs="unbounded"/>
315		<xsd:element name="status" type="Status" minOccurs="0" maxOccurs="1"/>
316		<xsd:element name="testcases" type="TestCases" minOccurs="0" maxOccurs="1"/>
317		<xsd:element name="starttime" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
318		<xsd:element name="endtime" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
319		<xsd:element name="keywords" type="KeyWords" minOccurs="0" maxOccurs="1"/>
320		<xsd:element name="attributes" type="TestAttributes" minOccurs="0" maxOccurs="1"/>
321		<xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/>
322		</xsd:sequence>
323		<xsd:attribute name="id" type="IDWithColon" use="required"/>
324		</xsd:complexType>
325
326		<xsd:complexType name="Tests" abstract="false">
327		<xsd:sequence>
328		<xsd:element name="test" type="Test" minOccurs="1" maxOccurs="unbounded"/>
329		</xsd:sequence>
330		</xsd:complexType>
331
332		<xsd:complexType name="TestSuite" abstract="false">
333		<xsd:annotation>
334		<xsd:documentation>
335		Test suite elements contain the test suite name. The name must be the same
336		as one defined in the test_coverage.xml file, if that file is defined.
337		The id element for a suite takes the form test_suite:unique_id. The information
338		will be gathered using the test_coverage.xml file associated with the test
339		suite, if present. The unique_id is unique within the xml file. The
340		unique_id portion is present because test run might contain repetitions.
341		</xsd:documentation>
342		<xsd:documentation>
343		The version field uses an XML format. Times are in UTC (like
344		those that java.util.Date works with). An acceptable dateTime
345		format is yyyy-mm-ddThh:mm:ss.ff. DateTime format is specified in
346		section 5.4 of ISO 8601.
347		</xsd:documentation>
348		<xsd:documentation>
349		The starttime and endtime fields use an XML format. Times are in UTC (like
350		those that java.util.Date works with). An acceptable dateTime
351		format is yyyy-mm-ddThh:mm:ss.ff. DateTime format is specified in
352		section 5.4 of ISO 8601.
353		</xsd:documentation>
354		</xsd:annotation>
355		<xsd:sequence>
356		<xsd:element name="name" type="xsd:string"/>
357		<xsd:element name="version" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
358		<xsd:element name="starttime" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
359		<xsd:element name="endtime" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
360		<xsd:element name="tests" type="Tests" minOccurs="1" maxOccurs="unbounded"/>
361		</xsd:sequence>
362		<xsd:attribute name="id" type="IDWithColon" use="required"/>
363		</xsd:complexType>
364
365		<xsd:complexType name="TestSuites" abstract="false">
366		<xsd:sequence>
367		<xsd:element name="testsuite" type="TestSuite" minOccurs="1" maxOccurs="unbounded"/>
368		</xsd:sequence>
369		</xsd:complexType>
370
371		<xsd:complexType name="Environment">
372		<xsd:annotation>
373		<xsd:documentation>
374		Software configurations are a way to document the software environment used
375		for testing.
376		</xsd:documentation>
377		<xsd:documentation>
378		Machines are identified by name, not Internet address. The name must be
379		fully qualified. Hardware configuration is obtained with a combination of
380		name and date.
381		</xsd:documentation>
382		<xsd:documentation>
383		Locale documents the default locale for the test run. Locale values should be
384		in the usual Java format of strings separated by underscores. For instance, ja,
385		ja_JP, and ja_JP_custom are all valid. The first string is a valid ISO
386		Language Code and the second is a valid ISO Country Code. The list of
387		language and country codes are at
388		http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt and
389		http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html ,
390		respectively. The third string in the concatenation is for variants
391		and can contain underscores.
392		</xsd:documentation>
393		<xsd:documentation>
394		System-locale is that used by the OS to configure OS applications. On Windows
395		systems, system-locale is attached to the OS and cannot be changed.
396		User-locale is that used by the Java API. It is the setting reported out by
397		java.util.Locale.getDefault().
398		</xsd:documentation>
399		<xsd:documentation>
400		Time zone elements document the default time zone for the test run.
401		Time zones should be in the format used by Java. For instance, the
402		string for Pacific Standard Time is "America/Los Angeles". The list of
403		supported time zones is obtained by invoking java.util.TimeZone.getAvailableIDs.
404		Do not use a deprecated three-letter time zone ID.
405		</xsd:documentation>
406		<xsd:documentation>
407		JDK elements use the property java.runtime.version.
408		</xsd:documentation>
409		</xsd:annotation>
410		<xsd:sequence>
411		<xsd:element name="machine" type="Machine"/>
412		<xsd:element name="os" type="OS"/>
413		<xsd:element name="jdk" type="xsd:string" minOccurs="0" maxOccurs="1"/>
414		<xsd:element name="system-locale" type="xsd:string" minOccurs="0" maxOccurs="1"/>
415		<xsd:element name="user-locale" type="xsd:string" minOccurs="0" maxOccurs="1"/>
416		<xsd:element name="timezone" type="xsd:string" minOccurs="0" maxOccurs="1"/>
417		<xsd:element name="bits" type="Bits" minOccurs="0" maxOccurs="1"/>
418		<xsd:element name="displaydepth" type="DisplayDepth" minOccurs="0" maxOccurs="1"/>
419		<xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/>
420		<xsd:element name="sw" type="SWEntity" minOccurs="0" maxOccurs="unbounded"/>
421		</xsd:sequence>
422		<xsd:attribute name="id" type="IDWithColon" use="required"/>
423		</xsd:complexType>
424
425		<xsd:complexType name="Environments">
426		<xsd:sequence>
427		<xsd:element name="environment" type="Environment" minOccurs="1" maxOccurs="unbounded"/>
428		</xsd:sequence>
429		</xsd:complexType>
430
431		<xsd:complexType name="SWEntity">
432		<xsd:annotation>
433		<xsd:documentation>
434		Software is tracked in the hardware/software database that backs up
435		the COF XML. The elements in the SW type map to fields in the software
436		table of that database.
437		Type is enumerated. See below.
438		Name is a product name with no version string. For example, "Tomcat".
439		Version is a product version. For instance, "8i".
440		</xsd:documentation>
441		</xsd:annotation>
442		<xsd:sequence>
443		<xsd:element name="type">
444		<xsd:simpleType>
445		<xsd:restriction base="xsd:string">
446		<xsd:enumeration value="appserver"/>
447		<xsd:enumeration value="browser"/>
448		<xsd:enumeration value="database"/>
449		<xsd:enumeration value="editor"/>
450		<xsd:enumeration value="java"/>
451		<xsd:enumeration value="webserver"/>
452		</xsd:restriction>
453		</xsd:simpleType>
454		</xsd:element>
455		<xsd:element name="name" type="xsd:string"/>
456		<xsd:element name="version" type="xsd:string" minOccurs="0" maxOccurs="1"/>
457		<xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/>
458		</xsd:sequence>
459		<xsd:attribute name="id" type="IDWithColon" use="required"/>
460		</xsd:complexType>
461
462		<xsd:complexType name="SWEntities" abstract="false">
463		<xsd:sequence>
464		<xsd:element name="swentity" type="SWEntity" minOccurs="1" maxOccurs="unbounded"/>
465		</xsd:sequence>
466		</xsd:complexType>
467
468		<xsd:complexType name="Application" abstract="false">
469		<xsd:attribute name="id" type="IDWithColon" use="required"/>
470		<xsd:attribute name="environmentid" type="IDWithColon" use="required"/>
471		<xsd:attribute name="swentityid" type="IDWithColon" use="required"/>
472		</xsd:complexType>
473
474		<xsd:complexType name="Applications" abstract="false">
475		<xsd:sequence>
476		<xsd:element name="application" type="Application" minOccurs="1" maxOccurs="unbounded"/>
477		</xsd:sequence>
478		</xsd:complexType>
479
480		<xsd:complexType name="Report" abstract="false">
481		<xsd:annotation>
482		<xsd:documentation>
483		The version is the common XML output version. The first version will be 1.0.
484		The date fields use an XML format. Times are in UTC (like
485		those that java.util.Date works with). An acceptable dateTime
486		format is yyyy-mm-ddThh:mm:ss.ff. DateTime format is specified in
487		section 5.4 of ISO 8601.
488		</xsd:documentation>
489		</xsd:annotation>
490		<xsd:sequence>
491		<xsd:element name="date" type="xsd:dateTime"/>
492		<xsd:element name="version" type="xsd:string"/>
493		<xsd:element name="environments" type="Environments"/>
494		<xsd:element name="swentities" type="SWEntities" minOccurs="0" maxOccurs="1"/>
495		<xsd:element name="applications" type="Applications" minOccurs="0" maxOccurs="unbounded"/>
496		<xsd:element name="operator" type="xsd:string" minOccurs="0" maxOccurs="1"/>
497		<xsd:element name="harness" type="xsd:string" minOccurs="0" maxOccurs="1"/>
498		<xsd:element name="testsuites" type="TestSuites" minOccurs="1" maxOccurs="unbounded"/>
499		<xsd:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
500		</xsd:sequence>
501		</xsd:complexType>
502
503		<xsd:element name="report" type="Report">
504		<xsd:key name="EnvironmentKey">
505		<xsd:selector xpath="report/environments/environment"/>
506		<xsd:field xpath="@id"/>
507		</xsd:key>
508		<xsd:keyref name="RefToEnvironment" refer="EnvironmentKey">
509		<xsd:selector xpath="report/applications/application"/>
510		<xsd:field xpath="@environmentid"/>
511		</xsd:keyref>
512
513		<xsd:key name="SWEntityKey">
514		<xsd:selector xpath="report/swentities/swentity"/>
515		<xsd:field xpath="@id"/>
516		</xsd:key>
517		<xsd:keyref name="RefToSWEntity" refer="SWEntityKey">
518		<xsd:selector xpath="report/applications/application"/>
519		<xsd:field xpath="@swentityid"/>
520		</xsd:keyref>
521
522		<xsd:key name="ApplicationKey">
523		<xsd:selector xpath="report/applications/application"/>
524		<xsd:field xpath="@id"/>
525		</xsd:key>
526		<xsd:keyref name="RefToApplication" refer="ApplicationKey">
527		<xsd:selector xpath="report/testsuites/testsuite/tests/test/appuse"/>
528		<xsd:field xpath="@id"/>
529		</xsd:keyref>
530
531		<xsd:unique name="UniqueTestSuiteID">
532		<xsd:selector xpath="report/testsuites/testsuite"/>
533		<xsd:field xpath="@id"/>
534		</xsd:unique>
535
536		<xsd:unique name="UniqueTestID">
537		<xsd:selector xpath="report/testsuites/testsuite/tests/test"/>
538		<xsd:field xpath="@id"/>
539		</xsd:unique>
540
541		<xsd:unique name="UniqueTestCaseID">
542		<xsd:selector xpath="report/testsuites/testsuite/tests/test/testcases/testcase"/>
543		<xsd:field xpath="@id"/>
544		</xsd:unique>
545
546		</xsd:element>
547
548		</xsd:schema>

+0

-780

~~src/com/sun/javatest/cof/COF2_0_2.xsd~~ less more

0		<?xml version="1.0" encoding="UTF-8"?>
1
2		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
3		xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
4		elementFormDefault="unqualified" attributeFormDefault="unqualified"
5		jxb:version="2.0" version="2.0.2">
6
7		<xsd:annotation>
8		<xsd:documentation>
9		Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
10		DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
11
12		This code is free software; you can redistribute it and/or modify it
13		under the terms of the GNU General Public License version 2 only, as
14		published by the Free Software Foundation. Oracle designates this
15		particular file as subject to the "Classpath" exception as provided
16		by Oracle in the LICENSE file that accompanied this code.
17
18		This code is distributed in the hope that it will be useful, but WITHOUT
19		ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
20		FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
21		version 2 for more details (a copy is included in the LICENSE file that
22		accompanied this code).
23
24		You should have received a copy of the GNU General Public License version
25		2 along with this work; if not, write to the Free Software Foundation,
26		Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
27
28		Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
29		or visit www.oracle.com if you need additional information or have any
30		questions.
31		</xsd:documentation>
32		</xsd:annotation>
33
34		<xsd:annotation>
35		<xsd:documentation>
36		Customize Date binding
37		</xsd:documentation>
38		<xsd:appinfo>
39		<jxb:globalBindings>
40		<jxb:javaType name="java.util.Date" xmlType="xsd:dateTime" />
41		</jxb:globalBindings>
42		</xsd:appinfo>
43		</xsd:annotation>
44		<xsd:annotation>
45		<xsd:appinfo>
46		<jxb:schemaBindings>
47		<jxb:nameXmlTransform>
48		<jxb:typeName prefix="COF"/>
49		</jxb:nameXmlTransform>
50		</jxb:schemaBindings>
51		</xsd:appinfo>
52		</xsd:annotation>
53		<xsd:simpleType name="IDWithColon">
54		<xsd:annotation>
55		<xsd:documentation>
56		IDs are colon free strings followed by a colon followed by
57		digits. The digits are there to disambiguate entries that are
58		repeated. Repeats can occur for test results, for instance, when
59		a test is run more than once.
60		</xsd:documentation>
61		</xsd:annotation>
62		<xsd:restriction base="xsd:string">
63		<xsd:pattern value="[\w\.\[\]\{\},_\-]+:[0-9]+" />
64		</xsd:restriction>
65		</xsd:simpleType>
66
67		<xsd:simpleType name="Machine">
68		<xsd:annotation>
69		<xsd:documentation>
70		Machines are identified by name and date. The name must be
71		qualified. Only lower case is accepted in the COF. Host name
72		space specifiers are defined in
73		http://www.ietf.org/rfc/rfc2141.txt . This schema checks for the
74		existence of two or more domains in the name space specifier.
75		</xsd:documentation>
76		</xsd:annotation>
77		<xsd:restriction base="xsd:string">
78		<xsd:pattern
79		value="([a-z0-9][a-z0-9\-][a-z0-9]\.){2,}([a-z][a-z0-9\-][a-z0-9])" />
80		</xsd:restriction>
81		</xsd:simpleType>
82
83		<xsd:simpleType name="Bits">
84		<xsd:restriction base="xsd:int">
85		<xsd:enumeration value="32" />
86		<xsd:enumeration value="64" />
87		</xsd:restriction>
88		</xsd:simpleType>
89
90		<xsd:simpleType name="DisplayDepth">
91		<xsd:annotation>
92		<xsd:documentation>
93		Display depth is recorded as part of a software configuration.
94		</xsd:documentation>
95		</xsd:annotation>
96		<xsd:restriction base="xsd:int">
97		<xsd:enumeration value="8" />
98		<xsd:enumeration value="12" />
99		<xsd:enumeration value="15" />
100		<xsd:enumeration value="16" />
101		<xsd:enumeration value="24" />
102		<xsd:enumeration value="32" />
103		</xsd:restriction>
104		</xsd:simpleType>
105
106		<xsd:complexType name="OS">
107		<xsd:annotation>
108		<xsd:documentation>Operating system.</xsd:documentation>
109		<xsd:documentation>
110		OS name elements use the property os.name. OS version elements
111		use the property os.version. OS arch elements use the property
112		os.arch.
113		</xsd:documentation>
114		</xsd:annotation>
115		<xsd:sequence>
116		<xsd:element name="name" type="xsd:string" form="qualified" />
117		<xsd:element name="version" type="xsd:string" form="qualified" />
118		<xsd:element name="arch" type="xsd:string" form="qualified" />
119		</xsd:sequence>
120		</xsd:complexType>
121
122		<xsd:complexType name="SuiteAttribute">
123		<xsd:annotation>
124		<xsd:documentation>
125		The suite attribute work_group can be assigned the name of a
126		business component assigned the job of running this test suite.
127		The value assigned to this overrides that assigned to the test
128		run annotation named work_group.
129		</xsd:documentation>
130		<xsd:documentation>
131		To make databases of test results more uniform, all other suite
132		attribute name/value pairs will be discarded by the QARE system.
133		</xsd:documentation>
134		</xsd:annotation>
135		<xsd:sequence>
136		<xsd:element name="name" type="xsd:string" minOccurs="1"
137		maxOccurs="unbounded" form="qualified" />
138		<xsd:element name="value" type="xsd:string" minOccurs="0"
139		maxOccurs="unbounded" form="qualified" />
140		</xsd:sequence>
141		</xsd:complexType>
142
143		<xsd:complexType name="SuiteAttributes">
144		<xsd:sequence>
145		<xsd:element name="attribute" type="cof:SuiteAttribute"
146		minOccurs="1" maxOccurs="unbounded" form="qualified" />
147		</xsd:sequence>
148		</xsd:complexType>
149
150		<xsd:complexType name="TestAttribute">
151		<xsd:annotation>
152		<xsd:documentation>
153		Test attributes encode test-specific settings that we might want
154		recorded. The motivation for inclusion in the COF is the desire
155		to record locale as set by a test, time zone as set by a test,
156		and the use of the Java command line switches like -client,
157		-server, -d32, or -d64. It is expected that the absence of any
158		use of -client or -server will be reflected by an absence of a
159		TestAttribute element whose name is "client" or "server",
160		respectively.
161		</xsd:documentation>
162		<xsd:documentation>
163		Locale values should be in the usual Java format of strings
164		separated by underscores. For instance, ja, ja_JP, and
165		ja_JP_custom are all valid. Locale values should be in the usual
166		Java format of strings separated by underscores. For instance,
167		ja, ja_JP, and ja_JP_custom are all valid. The first string is a
168		valid ISO Language Code and the second is a valid ISO Country
169		Code. The list of language and country codes are at
170		http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt and
171		http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html ,
172		respectively. The third string in the concatenation is for
173		variants and can contain underscores.
174		</xsd:documentation>
175		<xsd:documentation>
176		Time zone values document the time zone used for a particular
177		test or test case. Time zones should be in the format used by
178		Java. For instance, the string for Pacific Standard Time is
179		"America/Los Angeles". The list of supported time zones is
180		obtained by invoking java.util.TimeZone.getAvailableIDs. Do not
181		use a deprecated three-letter time zone ID.
182		</xsd:documentation>
183		<xsd:documentation>
184		In general, a Java command line flag argument that it is agreed
185		will get tracked as an attribute, say -foo,will get tracked by a
186		test attribute
187		<name>foo</name>
188		without a corresponding value element. A Java command line
189		argument pair "-foo bar" will get tracked by a test attribute
190		<name>foo</name>
191		<value>bar</value>
192		.
193		</xsd:documentation>
194		</xsd:annotation>
195		<xsd:sequence>
196		<xsd:element name="name" type="xsd:string" minOccurs="1"
197		maxOccurs="unbounded" form="qualified" />
198		<xsd:element name="value" type="xsd:string" minOccurs="0"
199		maxOccurs="unbounded" form="qualified" />
200		</xsd:sequence>
201		</xsd:complexType>
202
203		<xsd:complexType name="TestAttributes">
204		<xsd:sequence>
205		<xsd:element name="attribute" type="cof:TestAttribute"
206		minOccurs="1" maxOccurs="unbounded" form="qualified" />
207		</xsd:sequence>
208		</xsd:complexType>
209
210		<xsd:complexType name="Status">
211		<xsd:annotation>
212		<xsd:documentation>
213		Status can be one of pass, fail, vm_fail, error, did_not_run, or
214		ambiguous. Fail is for test failures that the test or test case
215		anticipates. A vm_fail status indicates that a VM failure caused
216		the failure. An example of this is a HotSpot abort. An error
217		status can be used to cover all failures not explained as a test
218		or vm failure. Examples are seg faults in the VM or a harness
219		failure.
220		</xsd:documentation>
221		<xsd:documentation>
222		Status did_not_run is an odd one. It's there because test
223		execution may conditional on the successful completion of a
224		setup step, itself a test.
225		</xsd:documentation>
226		<xsd:documentation>
227		The setting ambiguous is the least self-explanatory of the
228		status codes. I18n tests are run in locales that they do not
229		support. These tests fail, but there failure has no meaning that
230		should get reported back to product development.
231		</xsd:documentation>
232		<xsd:documentation>
233		Expected elements contain text that refers to an expected value.
234		This can be anything. A header, value, body, ..... If the tag
235		log appears, it may be understood that a URL of a log file will
236		appear as the PCDATA for this tag. If present, that URL uses
237		either http or file protocol. If http protocol, the server name
238		will be fully qualified. If file protocol, the full path
239		beginning with /net will be expected. Microsoft file mapping or
240		Unix automounts should not be used.
241		</xsd:documentation>
242		<xsd:documentation>
243		Actual elements contain text that refers to an actual value.
244		This can be anything. A header, value, body, ..... If the tag
245		log appears, it may be understood that a URL of a log file will
246		appear as the PCDATA for this tag. If present, that URL uses
247		either http or file protocol. If http protocol, the server name
248		will be fully qualified. If file protocol, the full path
249		beginning with /net will be expected. Microsoft file mapping or
250		Unix automounts should not be used.
251		</xsd:documentation>
252		</xsd:annotation>
253		<xsd:sequence minOccurs="0" maxOccurs="1">
254		<xsd:element name="expected" type="xsd:string" minOccurs="0"
255		maxOccurs="1" form="qualified" />
256		<xsd:element name="actual" type="xsd:string" minOccurs="0"
257		maxOccurs="1" form="qualified" />
258		</xsd:sequence>
259		<xsd:attribute name="value" use="required">
260		<xsd:simpleType>
261		<xsd:restriction base="xsd:string">
262		<xsd:enumeration value="pass" />
263		<xsd:enumeration value="fail" />
264		<xsd:enumeration value="ambiguous" />
265		<xsd:enumeration value="error" />
266		<xsd:enumeration value="vm_fail" />
267		<xsd:enumeration value="did_not_run" />
268		</xsd:restriction>
269		</xsd:simpleType>
270		</xsd:attribute>
271		</xsd:complexType>
272
273		<xsd:complexType name="TestCase" abstract="false">
274		<xsd:annotation>
275		<xsd:documentation>
276		Testcase elements define the test cases of a test that are
277		exercised in the course of a run. The id for a test takes the
278		form test_case_name:unique_id. The information will be gathered
279		using the test_coverage.xml file associated with the test case,
280		if present. The unique_id is unique within the xml file. The
281		unique_id portion is present because test run might contain
282		repetitions. Testcases are often tests run with different
283		command line arguments or environments. Often, the different
284		test cases in a test are in reality different methods inside
285		that test's source code.
286		</xsd:documentation>
287		<xsd:documentation>
288		The starttime and endtime fields use an XML format. Times are in
289		UTC (like those that java.util.Date works with). An acceptable
290		dateTime format is yyyy-mm-ddThh:mm:ss.ff. DateTime format is
291		specified in section 5.4 of ISO 8601.
292		</xsd:documentation>
293		<xsd:documentation>
294		The analysis setting is meant to allow remote groups to waive or
295		accept the pass/fail status of the test using E-mail.
296		</xsd:documentation>
297		</xsd:annotation>
298		<xsd:sequence>
299		<xsd:element name="name" type="xsd:string" form="qualified" />
300		<xsd:element name="status" type="cof:Status" minOccurs="0"
301		maxOccurs="1" form="qualified" />
302		<xsd:element name="starttime" type="xsd:dateTime" minOccurs="0"
303		maxOccurs="1" form="qualified" />
304		<xsd:element name="endtime" type="xsd:dateTime" minOccurs="0"
305		maxOccurs="1" form="qualified" />
306		<xsd:element name="attributes" type="cof:TestAttributes"
307		minOccurs="0" maxOccurs="1" form="qualified" />
308		<xsd:element name="description" type="xsd:string" minOccurs="0"
309		maxOccurs="1" form="qualified" />
310		</xsd:sequence>
311		<xsd:attribute name="id" type="cof:IDWithColon" use="required" />
312		<xsd:attribute name="analysis" use="optional" default="accept">
313		<xsd:simpleType>
314		<xsd:restriction base="xsd:string">
315		<xsd:enumeration value="accept" />
316		<xsd:enumeration value="waive" />
317		</xsd:restriction>
318		</xsd:simpleType>
319		</xsd:attribute>
320		</xsd:complexType>
321
322		<xsd:complexType name="TestCases" abstract="false">
323		<xsd:sequence>
324		<xsd:element name="testcase" type="cof:TestCase" minOccurs="1"
325		maxOccurs="unbounded" form="qualified" />
326		</xsd:sequence>
327		</xsd:complexType>
328
329		<xsd:complexType name="Test" abstract="false">
330		<xsd:annotation>
331		<xsd:documentation>
332		Test elements define all the tests exercised by the test suite.
333		The id for a test takes the form test_name:unique_id. The
334		information will be gathered using the test_coverage.xml file
335		associated with the test. The unique_id is unique within the xml
336		file. The unique_id portion is present because test run might
337		contain repetitions.
338		</xsd:documentation>
339		<xsd:documentation>
340		Status is required if there are zero test cases. Starttime is
341		required if there are zero test cases. Endtime is required if
342		there are zero test cases. The starttime and endtime fields use
343		an XML format. Times are in UTC (like those that java.util.Date
344		works with). An acceptable dateTime format is
345		yyyy-mm-ddThh:mm:ss.ff. DateTime format is specified in section
346		5.4 of ISO 8601.
347		</xsd:documentation>
348		<xsd:documentation>
349		The analysis setting is meant to allow remote groups to waive or
350		accept the pass/fail status of the test using E-mail. For
351		testcases, the analysis setting provides a default value to
352		apply to the analysis the setting for all testcase results for
353		this test.
354		</xsd:documentation>
355		</xsd:annotation>
356		<xsd:sequence>
357		<xsd:element name="name" type="xsd:string" form="qualified" />
358		<xsd:element name="appuse" type="cof:IDWithColon" minOccurs="0"
359		maxOccurs="unbounded" form="qualified" />
360		<xsd:element name="status" type="cof:Status" minOccurs="0"
361		maxOccurs="1" form="qualified" />
362		<xsd:element name="testcases" type="cof:TestCases" minOccurs="0"
363		maxOccurs="1" form="qualified" />
364		<xsd:element name="starttime" type="xsd:dateTime" minOccurs="0"
365		maxOccurs="1" form="qualified" />
366		<xsd:element name="endtime" type="xsd:dateTime" minOccurs="0"
367		maxOccurs="1" form="qualified" />
368		<xsd:element name="attributes" type="cof:TestAttributes"
369		minOccurs="0" maxOccurs="1" form="qualified" />
370		<xsd:element name="description" type="xsd:string" minOccurs="0"
371		maxOccurs="1" form="qualified" />
372		</xsd:sequence>
373		<xsd:attribute name="id" type="cof:IDWithColon" use="required" />
374		<xsd:attribute name="analysis" use="optional" default="accept">
375		<xsd:simpleType>
376		<xsd:restriction base="xsd:string">
377		<xsd:enumeration value="accept" />
378		<xsd:enumeration value="waive" />
379		</xsd:restriction>
380		</xsd:simpleType>
381		</xsd:attribute>
382		</xsd:complexType>
383
384		<xsd:complexType name="Tests" abstract="false">
385		<xsd:sequence>
386		<xsd:element name="test" type="cof:Test" minOccurs="1"
387		maxOccurs="unbounded" form="qualified" />
388		</xsd:sequence>
389		</xsd:complexType>
390
391		<xsd:complexType name="TestSuite" abstract="false">
392		<xsd:annotation>
393		<xsd:documentation>
394		Test suite elements contain the test suite name. The name must
395		be the same as one defined in the test_coverage.xml file, if
396		that file is defined. The id element for a suite takes the form
397		test_suite:unique_id. The information will be gathered using the
398		test_coverage.xml file associated with the test suite. The
399		unique_id is unique within the xml file. The unique_id portion
400		is present because test run might contain repetitions.
401		</xsd:documentation>
402		<xsd:documentation>
403		The version field uses an XML format. Times are in UTC (like
404		those that java.util.Date works with). An acceptable dateTime
405		format is yyyy-mm-ddThh:mm:ss.ff. DateTime format is specified
406		in section 5.4 of ISO 8601.
407		</xsd:documentation>
408		<xsd:documentation>
409		The starttime and endtime fields use an XML format. Times are in
410		UTC (like those that java.util.Date works with). An acceptable
411		dateTime format is yyyy-mm-ddThh:mm:ss.ff. DateTime format is
412		specified in section 5.4 of ISO 8601.
413		</xsd:documentation>
414		<xsd:documentation>
415		The analysis setting provides a default value to apply to the
416		analysis the setting for all the test and testcase results for
417		this suite.
418		</xsd:documentation>
419		</xsd:annotation>
420		<xsd:sequence>
421		<xsd:element name="name" type="xsd:string" form="qualified" />
422		<xsd:element name="version" type="xsd:dateTime" minOccurs="0"
423		maxOccurs="1" form="qualified" />
424		<xsd:element name="starttime" type="xsd:dateTime" minOccurs="0"
425		maxOccurs="1" form="qualified" />
426		<xsd:element name="endtime" type="xsd:dateTime" minOccurs="0"
427		maxOccurs="1" form="qualified" />
428		<xsd:element name="attributes" type="cof:SuiteAttributes"
429		minOccurs="0" maxOccurs="1" form="qualified" />
430		<xsd:element name="tests" type="cof:Tests" minOccurs="1"
431		maxOccurs="unbounded" form="qualified" />
432		</xsd:sequence>
433		<xsd:attribute name="id" type="cof:IDWithColon" use="required" />
434		<xsd:attribute name="analysis" use="optional" default="accept">
435		<xsd:simpleType>
436		<xsd:restriction base="xsd:string">
437		<xsd:enumeration value="accept" />
438		<xsd:enumeration value="waive" />
439		</xsd:restriction>
440		</xsd:simpleType>
441		</xsd:attribute>
442		</xsd:complexType>
443
444		<xsd:complexType name="TestSuites" abstract="false">
445		<xsd:sequence>
446		<xsd:element name="testsuite" type="cof:TestSuite" minOccurs="1"
447		maxOccurs="unbounded" form="qualified" />
448		</xsd:sequence>
449		</xsd:complexType>
450
451		<xsd:complexType name="Environment">
452		<xsd:annotation>
453		<xsd:documentation>
454		Software configurations are a way to document the software
455		environment used for testing.
456		</xsd:documentation>
457		<xsd:documentation>
458		Machines are identified by name, not Internet address. The name
459		must be fully qualified. Hardware configuration is obtained with
460		a combination of name and date.
461		</xsd:documentation>
462		<xsd:documentation>
463		Locale documents the default locale for the test run. Locale
464		values should be in the usual Java format of strings separated
465		by underscores. For instance, ja, ja_JP, and ja_JP_custom are
466		all valid. The first string is a valid ISO Language Code and the
467		second is a valid ISO Country Code. The list of language and
468		country codes are at
469		http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt and
470		http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html ,
471		respectively. The third string in the concatenation is for
472		variants and can contain underscores.
473		</xsd:documentation>
474		<xsd:documentation>
475		System-locale is that used by the OS to configure OS
476		applications. On Windows systems, system-locale is attached to
477		the OS and cannot be changed. User-locale is that used by the
478		Java API. It is the setting reported out by
479		java.util.Locale.getDefault().
480		</xsd:documentation>
481		<xsd:documentation>
482		Time zone elements document the default time zone for the test
483		run. Time zones should be in the format used by Java. For
484		instance, the string for Pacific Standard Time is "America/Los
485		Angeles". The list of supported time zones is obtained by
486		invoking java.util.TimeZone.getAvailableIDs. Do not use a
487		deprecated three-letter time zone ID.
488		</xsd:documentation>
489		<xsd:documentation>
490		The value assigned encoding is the return value from the Java
491		(new InputStreamReader(System.in)).getEncoding()
492		</xsd:documentation>
493		<xsd:documentation>
494		JDK elements use the property java.runtime.version.
495		</xsd:documentation>
496		</xsd:annotation>
497		<xsd:sequence>
498		<xsd:element name="machine" type="cof:Machine" form="qualified" />
499		<xsd:element name="os" type="cof:OS" form="qualified" />
500		<xsd:element name="jdk" type="xsd:string" minOccurs="0"
501		maxOccurs="1" form="qualified" />
502		<xsd:element name="system-locale" type="xsd:string" minOccurs="0"
503		maxOccurs="1" form="qualified" />
504		<xsd:element name="user-locale" type="xsd:string" minOccurs="0"
505		maxOccurs="1" form="qualified" />
506		<xsd:element name="encoding" type="xsd:string" minOccurs="0"
507		maxOccurs="1" form="qualified" />
508		<xsd:element name="timezone" type="xsd:string" minOccurs="0"
509		maxOccurs="1" form="qualified" />
510		<xsd:element name="bits" type="cof:Bits" minOccurs="0"
511		maxOccurs="1" form="qualified" />
512		<xsd:element name="displaydepth" type="cof:DisplayDepth"
513		minOccurs="0" maxOccurs="1" form="qualified" />
514		<xsd:element name="description" type="xsd:string" minOccurs="0"
515		maxOccurs="1" form="qualified" />
516		<xsd:element name="sw" type="cof:SWEntity" minOccurs="0"
517		maxOccurs="unbounded" form="qualified" />
518		</xsd:sequence>
519		<xsd:attribute name="id" type="cof:IDWithColon" use="required" />
520		</xsd:complexType>
521
522		<xsd:complexType name="Environments">
523		<xsd:sequence>
524		<xsd:element name="environment" type="cof:Environment"
525		minOccurs="1" maxOccurs="unbounded" form="qualified" />
526		</xsd:sequence>
527		</xsd:complexType>
528
529		<xsd:complexType name="SWEntity">
530		<xsd:annotation>
531		<xsd:documentation>
532		Software is tracked in the hardware/software database that backs
533		up the COF XML. The elements in the SW type map to fields in the
534		software table of that database. Type is enumerated. See below.
535		Name is a product name with no version string. For example,
536		"Tomcat". Version is a product version. For instance, "8i".
537		</xsd:documentation>
538		</xsd:annotation>
539		<xsd:sequence>
540		<xsd:element name="name" type="xsd:string" form="qualified" />
541		<xsd:element name="type" form="qualified">
542		<xsd:simpleType>
543		<xsd:restriction base="xsd:string">
544		<xsd:enumeration value="appserver" />
545		<xsd:enumeration value="browser" />
546		<xsd:enumeration value="database" />
547		<xsd:enumeration value="editor" />
548		<xsd:enumeration value="java" />
549		<xsd:enumeration value="webserver" />
550		</xsd:restriction>
551		</xsd:simpleType>
552		</xsd:element>
553		<xsd:element name="version" type="xsd:string" minOccurs="0"
554		maxOccurs="1" form="qualified" />
555		<xsd:element name="description" type="xsd:string" minOccurs="0"
556		maxOccurs="1" form="qualified" />
557		</xsd:sequence>
558		<xsd:attribute name="id" type="cof:IDWithColon" use="required" />
559		</xsd:complexType>
560
561		<xsd:complexType name="SWEntities" abstract="false">
562		<xsd:sequence>
563		<xsd:element name="swentity" type="cof:SWEntity" minOccurs="1"
564		maxOccurs="unbounded" form="qualified" />
565		</xsd:sequence>
566		</xsd:complexType>
567
568		<xsd:complexType name="Application" abstract="false">
569		<xsd:attribute name="id" type="cof:IDWithColon" use="required" />
570		<xsd:attribute name="environmentid" type="cof:IDWithColon"
571		use="required" />
572		<xsd:attribute name="swentityid" type="cof:IDWithColon"
573		use="required" />
574		</xsd:complexType>
575
576		<xsd:complexType name="Applications" abstract="false">
577		<xsd:sequence>
578		<xsd:element name="application" type="cof:Application"
579		minOccurs="1" maxOccurs="unbounded" form="qualified" />
580		</xsd:sequence>
581		</xsd:complexType>
582
583		<xsd:complexType name="ReportAnnotation">
584		<xsd:annotation>
585		<xsd:documentation>
586		Report annotations are name/value pairs that provide information
587		about a test run. They are often test-harness specific or
588		contain information that is added by users after the test run is
589		complete.
590		</xsd:documentation>
591		<xsd:documentation>
592		Some attributes are used by the QARE test database system. One
593		of these is the name of the product under test. The name of the
594		annotation for this is "product". This is typically the name of
595		a major release of the software or hardware you are shipping.
596		</xsd:documentation>
597		<xsd:documentation>
598		Some attributes are used by the QARE test database system. One
599		of these is the name of the version or build of the product
600		under test. The name of the annotation for this is "version".
601		</xsd:documentation>
602		<xsd:documentation>
603		Some attributes are used by the QARE test database system. One
604		of these is the name of your working group. The name of the
605		annotation for this is "work_group". This is the name of the
606		business component responsible for analyzing and tracking the
607		test results from this test run. Note that if a component is
608		specified as a suite attribute that the suite attribute will
609		overrule the assignment made in this annotation.
610		</xsd:documentation>
611		<xsd:documentation>
612		Some attributes are used by the QARE test database system. Test
613		run modes are adjectives whose value might be "BAT", "PIT",
614		"JCov", or "Bundle". The name of the annotation for this is
615		"testrun_mode".
616		</xsd:documentation>
617		<xsd:documentation>
618		Some attributes are used by the QARE test database system. Test
619		cycles are described by an adjective whose value might be
620		"Nightly" or "Weekly". The name of the annotation for this is
621		"testrun_cycle".
622		</xsd:documentation>
623		<xsd:documentation>
624		Some attributes are used by the QARE test database system. Test
625		run type is another test run adjective. It might take one of the
626		values "Quicklook", "Fulllook", or "Smoke". The name of the
627		annotation for this is "testrun_type".
628		</xsd:documentation>
629		<xsd:documentation>
630		Some attributes are used by the QARE test database system. The
631		most important of these has an annotation name of archive. The
632		value of archive is where test failures are copied to for
633		storage. If you are a QARE user, the value should be a full path
634		that is accessible to the QARE application server. For Sun QARE
635		users, this means that mapped file systems are not usable. If
636		you are using this product in a Windows shop, then it is the
637		testing department's job to keep the drive letters used by your
638		tests up to date and consistent.
639		</xsd:documentation>
640		<xsd:documentation>
641		Some attributes are used by the QARE test database system. The
642		annotation named "task_scheduler" is used to identify the
643		scheduler used to start and stop jobs. The only scheduler
644		recognized is DTF.
645		</xsd:documentation>
646		<xsd:documentation>
647		Some attributes are used by the QARE test database system. The
648		annotation named "default_machine" is used to identify a primary
649		machine for labelling purposes. This is important for
650		multi-machine tests. It is common for one of the machines to
651		hold the software that is actually being tested and for the
652		other machines to be mere clients.
653		</xsd:documentation>
654		<xsd:documentation>
655		Some attributes are used by the QARE test database system. One
656		of these is the name of your testing group. The name of the
657		annotation for this is "test_group". An example of such a group
658		is "J2SE QA".
659		</xsd:documentation>
660		</xsd:annotation>
661		<xsd:sequence>
662		<xsd:element name="name" type="xsd:string" minOccurs="1"
663		maxOccurs="unbounded" form="qualified" />
664		<xsd:element name="value" type="xsd:string" minOccurs="1"
665		maxOccurs="unbounded" form="qualified" />
666		</xsd:sequence>
667		</xsd:complexType>
668
669		<xsd:complexType name="ReportAnnotations" abstract="false">
670		<xsd:sequence>
671		<xsd:element name="annotation" type="cof:ReportAnnotation"
672		minOccurs="0" maxOccurs="unbounded" form="qualified" />
673		</xsd:sequence>
674		</xsd:complexType>
675
676		<xsd:complexType name="Report" abstract="false">
677		<xsd:annotation>
678		<xsd:documentation>
679		The version is the common XML output version. The current
680		version is 2.0.0. The date fields use an XML format. Times are
681		in UTC (like those that java.util.Date works with). An
682		acceptable dateTime format is yyyy-mm-ddThh24:mm:ss.ff. DateTime
683		format is specified in section 5.4 of ISO 8601.
684		</xsd:documentation>
685		<xsd:documentation>
686		The analysis setting is meant to allow remote groups to waive or
687		accept the entire test run. It provides an override, not a
688		default, for the analysis settings of the suite, test, and
689		testcase results that are part of the test run. The intent here
690		is to record test runs that were set up incorrectly.
691		</xsd:documentation>
692		</xsd:annotation>
693		<xsd:sequence>
694		<xsd:element name="date" type="xsd:dateTime" form="qualified" />
695		<xsd:element name="version" type="xsd:string" form="qualified" />
696
697		<xsd:element name="environments" type="cof:Environments"
698		form="qualified"><!--
699		<xsd:annotation>
700		<xsd:appinfo>
701		<jxb:property>
702		<jxb:baseType name="java.util.List"></jxb:baseType>
703		</jxb:property>
704		</xsd:appinfo>
705		</xsd:annotation>
706		--></xsd:element>
707		<xsd:element name="swentities" type="cof:SWEntities" minOccurs="0"
708		maxOccurs="1" form="qualified" />
709		<xsd:element name="applications" type="cof:Applications"
710		minOccurs="0" maxOccurs="unbounded" form="qualified" />
711		<xsd:element name="operator" type="xsd:string" minOccurs="0"
712		maxOccurs="1" form="qualified" />
713		<xsd:element name="harness" type="xsd:string" minOccurs="0"
714		maxOccurs="1" form="qualified" />
715		<xsd:element name="testsuites" type="cof:TestSuites" minOccurs="1"
716		maxOccurs="1" form="qualified" />
717		<xsd:element name="annotations" type="cof:ReportAnnotations"
718		minOccurs="1" maxOccurs="1" form="qualified" />
719		<xsd:any minOccurs="0" maxOccurs="unbounded"
720		processContents="skip" />
721		</xsd:sequence>
722		<xsd:attribute name="analysis" use="optional" default="accept">
723		<xsd:simpleType>
724		<xsd:restriction base="xsd:string">
725		<xsd:enumeration value="accept" />
726		<xsd:enumeration value="waive" />
727		</xsd:restriction>
728		</xsd:simpleType>
729		</xsd:attribute>
730		</xsd:complexType>
731
732		<xsd:element name="report" type="cof:Report">
733		<xsd:key name="EnvironmentKey">
734		<xsd:selector xpath="report/environments/environment" />
735		<xsd:field xpath="@id" />
736		</xsd:key>
737		<xsd:keyref name="RefToEnvironment" refer="cof:EnvironmentKey">
738		<xsd:selector xpath="report/applications/application" />
739		<xsd:field xpath="@environmentid" />
740		</xsd:keyref>
741
742		<xsd:key name="SWEntityKey">
743		<xsd:selector xpath="report/swentities/swentity" />
744		<xsd:field xpath="@id" />
745		</xsd:key>
746		<xsd:keyref name="RefToSWEntity" refer="cof:SWEntityKey">
747		<xsd:selector xpath="report/applications/application" />
748		<xsd:field xpath="@swentityid" />
749		</xsd:keyref>
750
751		<xsd:key name="ApplicationKey">
752		<xsd:selector xpath="report/applications/application" />
753		<xsd:field xpath="@id" />
754		</xsd:key>
755		<xsd:keyref name="RefToApplication" refer="cof:ApplicationKey">
756		<xsd:selector
757		xpath="report/testsuites/testsuite/tests/test/appuse" />
758		<xsd:field xpath="@id" />
759		</xsd:keyref>
760
761		<xsd:unique name="UniqueTestSuiteID">
762		<xsd:selector xpath="report/testsuites/testsuite" />
763		<xsd:field xpath="@id" />
764		</xsd:unique>
765
766		<xsd:unique name="UniqueTestID">
767		<xsd:selector xpath="report/testsuites/testsuite/tests/test" />
768		<xsd:field xpath="@id" />
769		</xsd:unique>
770
771		<xsd:unique name="UniqueTestCaseID">
772		<xsd:selector
773		xpath="report/testsuites/testsuite/tests/test/testcases/testcase" />
774		<xsd:field xpath="@id" />
775		</xsd:unique>
776
777		</xsd:element>
778
779		</xsd:schema>

+0

-99

~~src/com/sun/javatest/cof/COFApplication.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.util.LinkedHashMap;
29
30		public class COFApplication extends COFItem {
31		static LinkedHashMap xmlAttributes;
32		static LinkedHashMap xmlElements;
33		static String xmlTagName;
34		static {
35		xmlTagName = "application";
36		xmlAttributes = new LinkedHashMap();
37		xmlAttributes.put("id", "id");
38		xmlAttributes.put("environmentid", "environmentid");
39		xmlAttributes.put("swentityid", "swentityid");
40		}
41
42		protected String id = "app:0";
43
44		protected String environmentid="env:0";
45
46		protected String swentityid = "swentity:0";
47
48		/**
49		* Gets the value of the id property.
50		*
51		* @return possible object is {@link String }
52		*
53		*/
54		public String getId() {
55		return id;
56		}
57
58		LinkedHashMap getItemAttributes() {
59		return xmlAttributes;
60		}
61
62		LinkedHashMap getItemElements() {
63		return xmlElements;
64		}
65
66		String getItemTagName() {
67		return xmlTagName;
68		}
69
70		public void setId(String value) {
71		this.id = value;
72		}
73
74		public String getEnvironmentid() {
75		return environmentid;
76		}
77
78		public void setEnvironmentid(String environmentid) {
79		this.environmentid = environmentid;
80		}
81
82		public String getSwentityid() {
83		return swentityid;
84		}
85
86		public void setSwentityid(String swentityid) {
87		this.swentityid = swentityid;
88		}
89
90		/**
91		* Sets the value of the name property.
92		*
93		* @param value
94		* allowed object is {@link String }
95		*
96		*/
97
98		}

+0

-69

~~src/com/sun/javatest/cof/COFApplications.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.util.ArrayList;
29		import java.util.LinkedHashMap;
30		import java.util.List;
31
32
33		public class COFApplications extends COFItem {
34
35		static LinkedHashMap xmlAttributes;
36
37		static LinkedHashMap xmlElements;
38
39		static String xmlTagName;
40
41		static {
42		xmlElements = new LinkedHashMap();
43		xmlElements.put("application", "application");
44		xmlTagName = "applications";
45		}
46
47		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
48		protected List application;
49
50		LinkedHashMap getItemAttributes() {
51		return xmlAttributes;
52		}
53
54		LinkedHashMap getItemElements() {
55		return xmlElements;
56		}
57		String getItemTagName() {
58		return xmlTagName;
59		}
60
61		public List getApplication() {
62		if (application == null) {
63		application = new ArrayList();
64		}
65		return this.application;
66		}
67
68		}

+0

-129

~~src/com/sun/javatest/cof/COFData.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import com.sun.javatest.InterviewParameters;
29		import java.io.BufferedInputStream;
30		import java.io.File;
31		import java.io.FileInputStream;
32		import java.io.IOException;
33		import java.io.InputStream;
34		import java.util.HashMap;
35		import java.util.Map;
36		import java.util.Properties;
37		import java.util.Vector;
38
39		public class COFData
40		{
41		public COFData() {
42		}
43
44		COFData(Vector data) throws IOException {
45		for (int i = 0; i < data.size(); i++) {
46		Object o = data.elementAt(i);
47		if (o == null)
48		throw new NullPointerException();
49		else if (o instanceof String) {
50		String s = (String) o;
51		int eq = s.indexOf("=");
52		if (eq < 1)
53		throw new IllegalArgumentException(s);
54		String name = s.substring(0, eq);
55		String value = s.substring(eq + 1);
56		put(name, value);
57		}
58		else if (o instanceof File) {
59		File f = (File) o;
60		InputStream in = new BufferedInputStream(new FileInputStream(f));
61		Properties p = new Properties();
62		try {
63		p.load(in);
64		}
65		finally {
66		in.close();
67		}
68		putAll(p);
69		}
70		else
71		throw new IllegalArgumentException(o.toString());
72		}
73		}
74
75		public String get(String name) {
76		return (String) (data.get(name));
77		}
78
79		public String get(String name, String defaultValue) {
80		String value = (String) (data.get(name));
81		return (value == null ? defaultValue : value);
82		}
83
84		public void put(String name, String value) {
85		data.put(name, value);
86		}
87
88		public void putAll(Map map) {
89		data.putAll(map);
90		}
91
92		private Map data = new HashMap();
93
94		private CustomFilter filter = new CustomFilterAdapter();
95
96		void setCustomFilter(String filterClassName) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
97		Class c = Class.forName(filterClassName, true, ClassLoader.getSystemClassLoader());
98		filter = (CustomFilter) c.newInstance();
99		}
100
101		CustomFilter getCustomFilter() {
102		return filter;
103		}
104
105		private MTL mtl;
106
107		MTL getMtl() {
108		return mtl;
109		}
110
111		void setMtl(MTL mtl) {
112		this.mtl = mtl;
113		}
114
115		public void setInterviewParameters(InterviewParameters ip) {
116		this.ip = ip;
117		}
118
119		public InterviewParameters getInterviewParameters() {
120		return ip;
121		}
122
123		public boolean isInterviewParametersAvailable() {
124		return ip != null;
125		}
126
127		private InterviewParameters ip;
128		}

+0

-604

~~src/com/sun/javatest/cof/COFEnvironment.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.io.InputStreamReader;
29		import java.io.RandomAccessFile;
30		import java.net.InetAddress;
31		import java.net.UnknownHostException;
32		import java.util.ArrayList;
33		import java.util.LinkedHashMap;
34		import java.util.List;
35		import java.util.StringTokenizer;
36		import java.util.TimeZone;
37
38		import com.sun.javatest.util.I18NResourceBundle;
39
40		/* temp /public/ temp */class COFEnvironment extends COFItem {
41		static String[] propOrder = { "machine", "os", "jdk", "systemLocale",
42		"userLocale", "encoding", "timezone", "bits", "displaydepth",
43		"description", "sw" };
44
45		static String[] propTags = { "machine", "os", "jdk", "system-locale",
46		"user-locale", "encoding", "timezone", "bits", "displaydepth",
47		"description", "sw" };
48
49		static LinkedHashMap xmlAttributes;
50
51		static LinkedHashMap xmlElements;
52
53		static String xmlTagName;
54		private static I18NResourceBundle i18n = I18NResourceBundle
55		.getBundleForClass(Main.class);
56
57		static {
58		xmlElements = new LinkedHashMap();
59		for (int i = 0; i < propOrder.length; i++) {
60		xmlElements.put(propOrder[i], propTags[i]);
61		}
62		xmlAttributes = new LinkedHashMap();
63		xmlAttributes.put("id", "id");
64		xmlTagName = "environment";
65		}
66
67		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
68		protected Integer bits;
69
70		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
71		protected String description;
72
73		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
74		protected Integer displaydepth;
75
76		private String domainName;
77
78		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
79		protected String encoding;
80
81		private String hostName;
82
83		// @XmlAttribute(required = true)
84		protected String id = "env:0";
85
86		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
87		protected String jdk;
88
89		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
90		protected String machine;
91
92		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
93		protected COFOS os;
94
95		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
96		protected List/<SWEntity>/sw;
97
98		// @XmlElement(name = "system-locale", namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
99		protected String systemLocale;
100
101		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
102		protected String timezone;
103
104		// @XmlElement(name = "system-locale", namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
105		protected String userLocale;
106		protected COFData data;
107
108		COFEnvironment(COFData data) {
109		this.data = data;
110
111		initDefaultHostInfo();
112		initDefaultOSInfo();
113
114		hostName = data.get("environment.host", hostName);
115		domainName = data.get("environment.domain", domainName);
116		setMachine(data.get("environment.machine", hostName + "." + domainName));
117		os.setName(data.get("environment.os.name", os.getName()));
118		os.setVersion(data.get("environment.os.version", os.getVersion()));
119		os.setArch(data.get("environment.os.arch", os.getArch()));
120		setJdk(data.get("environment.jdk", jdk));
121		setUserLocale(data.get("environment.user-locale", java.util.Locale.getDefault().toString()));
122		setSystemLocale(data.get("environment.system-locale", data
123		.get("LOCALE")));
124		setEncoding(data.get("environment.encoding", (new InputStreamReader(
125		System.in)).getEncoding()));
126		setTimezone(data.get("environment.timezone", TimeZone.getDefault()
127		.getID()));
128		setBits(data.get("environment.bits", null) == null ? null
129		: new Integer(data.get("environment.bits")));
130		setDisplaydepth(data.get("environment.displaydepth", null) == null ? null
131		: new Integer(data.get("environment.displaydepth")));
132		setDescription(data.get("environment.description"));
133		}
134
135		public COFEnvironment(COFData data, String id) {
136		this(data);
137		this.id = id;
138		}
139
140		/**
141		* Gets the value of the bits property.
142		*
143		* @return
144		* possible object is
145		* {@link Integer }
146		*
147		*/
148		public Integer getBits() {
149		return bits;
150		}
151
152		private String getCalderaLinuxVersionInfo() {
153		String res = "N/A";
154
155		RandomAccessFile raf = null;
156		try {
157		raf = new RandomAccessFile("/etc/issue", "r");
158		String line;
159		while ((line = raf.readLine()) != null) {
160		StringTokenizer st = new StringTokenizer(line, " ");
161		if (st.countTokens() >= 2) {
162		if (st.nextToken().toUpperCase().equals("VERSION")) {
163		res = st.nextToken();
164		break;
165		}
166		}
167		}
168		} catch (Exception e) {
169		// System.err.println("Something might be wrong with Caldera");
170		// cat.warn("The version number of Caldera cannot be retrieved");
171		} finally {
172		if (raf != null) {
173		try {
174		raf.close();
175		} catch (Exception e) {
176		}
177		}
178		}
179
180		return res;
181		}
182
183		/**
184		* Gets the value of the description property.
185		*
186		* @return
187		* possible object is
188		* {@link String }
189		*
190		*/
191		public String getDescription() {
192		return description;
193		}
194
195		/**
196		* Gets the value of the displaydepth property.
197		*
198		* @return
199		* possible object is
200		* {@link Integer }
201		*
202		*/
203		public Integer getDisplaydepth() {
204		return displaydepth;
205		}
206
207		/**
208		* Gets the value of the encoding property.
209		*
210		* @return
211		* possible object is
212		* {@link String }
213		*
214		*/
215		public String getEncoding() {
216		return encoding;
217		}
218
219		private String getGenericLinuxVersionInfo(String fileName) {
220		String res = "N/A";
221
222		RandomAccessFile raf = null;
223		try {
224		raf = new RandomAccessFile(fileName, "r");
225		StringTokenizer st = new StringTokenizer(raf.readLine(), " ");
226		while (st.hasMoreElements()) {
227		String ele = st.nextToken();
228		if (Character.isDigit(ele.charAt(0))) {
229		res = ele;
230		break;
231		}
232		}
233		} catch (Exception e) {
234		// System.err.println("Something might be wrong with Linux");
235		} finally {
236		if (raf != null) {
237		try {
238		raf.close();
239		} catch (Exception e) {
240		}
241		}
242		}
243
244		return res;
245		}
246
247		/**
248		* Gets the value of the id property.
249		*
250		* @return
251		* possible object is
252		* {@link String }
253		*
254		*/
255		public String getId() {
256		return id;
257		}
258
259		LinkedHashMap getItemAttributes() {
260		return xmlAttributes;
261		}
262
263		LinkedHashMap getItemElements() {
264		return xmlElements;
265		}
266
267		String getItemTagName() {
268		return xmlTagName;
269		}
270
271		/**
272		* Gets the value of the jdk property.
273		*
274		* @return
275		* possible object is
276		* {@link String }
277		*
278		*/
279		public String getJdk() {
280		return jdk;
281		}
282
283		/**
284		* Gets the value of the machine property.
285		*
286		* @return
287		* possible object is
288		* {@link String }
289		*
290		*/
291		public String getMachine() {
292		return machine;
293		}
294
295		/**
296		* Gets the value of the os property.
297		*
298		* @return
299		* possible object is
300		* {@link OS }
301		*
302		*/
303		public COFOS getOs() {
304		return os;
305		}
306
307		String[] getPropOrder() {
308		return propOrder;
309		}
310
311		/**
312		* Gets the value of the sw property.
313		*
314		* <p>
315		* This accessor method returns a reference to the live list,
316		* not a snapshot. Therefore any modification you make to the
317		* returned list will be present inside the JAXB object.
318		* This is why there is not a <CODE>set</CODE> method for the sw property.
319		*
320		* <p>
321		* For example, to add a new item, do as follows:
322		* <pre>
323		* getSw().add(newItem);
324		* </pre>
325		*
326		*
327		* <p>
328		* Objects of the following type(s) are allowed in the list
329		* {@link SWEntity }
330		*
331		*
332		*/
333		public List/<SWEntity>/getSw() {
334		if (sw == null) {
335		sw = new ArrayList/<SWEntity>/();
336		}
337		return this.sw;
338		}
339
340		/**
341		* Gets the value of the systemLocale property.
342		*
343		* @return
344		* possible object is
345		* {@link String }
346		*
347		*/
348		public String getSystemLocale() {
349		return systemLocale;
350		}
351
352		String getTagName() {
353		return itemTagName;
354		}
355
356		String[] getTags() {
357		return propTags;
358		}
359
360		/**
361		* Gets the value of the timezone property.
362		*
363		* @return
364		* possible object is
365		* {@link String }
366		*
367		*/
368		public String getTimezone() {
369		return timezone;
370		}
371
372		/**
373		* Gets the value of the userLocale property.
374		*
375		* @return
376		* possible object is
377		* {@link String }
378		*
379		*/
380		public String getUserLocale() {
381		return userLocale;
382		}
383
384		private void initDefaultHostInfo() {
385		domainName = "unknown";
386
387		try {
388		hostName = InetAddress.getLocalHost().getHostName();
389		} catch (UnknownHostException e) {
390		hostName = "unknown";
391		}
392		}
393
394		private void initDefaultOSInfo() {
395		os = new COFOS();
396		os.setName(System.getProperty("os.name"));
397		os.setVersion(System.getProperty("os.version"));
398		os.setArch(System.getProperty("os.arch"));
399
400		// standardize results
401		/* if (osName.equals("sunos") \|\| osName.equals("solaris")) {
402		osName = "solaris";
403		if (osVersion.equals("5.6"))
404		osVersion = "2.6";
405		else if (osVersion.equals("5.7"))
406		osVersion = "2.7";
407		else if (osVersion.equals("5.8"))
408		osVersion = "8";
409		else if (osVersion.equals("5.9"))
410		osVersion = "9";
411		} else if (osName.startsWith("windows")) {
412		osName = "windows";
413		if (osName.indexOf("95") != -1)
414		osVersion = "95";
415		else if (osName.indexOf("98") != -1)
416		osVersion = "98";
417		else if (osName.indexOf("2000") != -1)
418		osVersion = "2000";
419		else if (osName.indexOf("me") != -1)
420		osVersion = "me";
421		else if (osName.indexOf("nt") != -1)
422		osVersion = "nt_4.0";
423		else if (osName.indexOf("xp") != -1)
424		osVersion = "xp";
425		} else if (osName.equals("linux")) {
426		if ((new File("/etc/turbolinux-release")).exists()) {
427		osName = "turbo_linux";
428		osVersion = getGenericLinuxVersionInfo("/etc/turbolinux-release");
429		} else if ((new File("/etc/SuSE-release")).exists()) {
430		osName = "suse_linux";
431		osVersion = getGenericLinuxVersionInfo("/etc/SuSE-release");
432		} else if ((new File("/etc/mandrake-release")).exists()) {
433		osName = "mandrake_linux";
434		osVersion = getGenericLinuxVersionInfo("/etc/mandrake-release");
435		} else if ((new File("/etc/redhat-release")).exists()) {
436		osName = "redhat_linux";
437		osVersion = getGenericLinuxVersionInfo("/etc/redhat-release");
438		} else if ((new File("/etc/lst.cnf")).exists()) {
439		osName = "caldera_linux";
440		osVersion = getCalderaLinuxVersionInfo();
441		} else {
442		osName = "unknown_linux";
443		osVersion = "N/A";
444		}
445		}
446		*/}
447
448		/**
449		* Sets the value of the bits property.
450		*
451		* @param value
452		* allowed object is
453		* {@link Integer }
454		*
455		*/
456		public void setBits(Integer value) {
457		this.bits = value;
458		}
459
460		/**
461		* Sets the value of the description property.
462		*
463		* @param value
464		* allowed object is
465		* {@link String }
466		*
467		*/
468		public void setDescription(String value) {
469		this.description = value;
470		}
471
472		/**
473		* Sets the value of the displaydepth property.
474		*
475		* @param value
476		* allowed object is
477		* {@link Integer }
478		*
479		*/
480		public void setDisplaydepth(Integer value) {
481		this.displaydepth = value;
482		}
483
484		/**
485		* Sets the value of the encoding property.
486		*
487		* @param value
488		* allowed object is
489		* {@link String }
490		*
491		*/
492		public void setEncoding(String value) {
493		this.encoding = value;
494		}
495
496		/**
497		* Sets the value of the id property.
498		*
499		* @param value
500		* allowed object is
501		* {@link String }
502		*
503		*/
504		public void setId(String value) {
505		this.id = value;
506		}
507
508		/**
509		* Sets the value of the jdk property.
510		*
511		* @param value
512		* allowed object is
513		* {@link String }
514		*
515		*/
516		public void setJdk(String value) {
517		this.jdk = value;
518		}
519
520		/**
521		* Sets the value of the machine property.
522		*
523		* @param value
524		* allowed object is
525		* {@link String }
526		*
527		*/
528		public void setMachine(String value) {
529		if (value.endsWith(".unknown"))
530		try {
531		machine = InetAddress.getLocalHost().getCanonicalHostName();
532		if (machine.indexOf(".") == -1) {
533		if ("false".equals(data.get("showWarnings"))) {
534		System.err.println(i18n.getString("environment.badMachineName", machine));
535		} else {
536		String warningMessage = data.get("warning", "");
537		data.put("warning", warningMessage + i18n.getString("environment.badMachineName") + "\n");
538		}
539		}
540		return;
541		} catch (UnknownHostException e) {
542		if ("false".equals(data.get("showWarnings"))) {
543		System.err.println(i18n.getString("environment.cantGetLocalhostName", e.getMessage()));
544		value = value.substring(0, value.indexOf(".unknown")-1);
545		System.err.println(i18n.getString("environment.badMachineName", value));
546		} else {
547		String warningMessage = data.get("warning", "");
548		value = value.substring(0, value.indexOf(".unknown")-1);
549		data.put("warning", warningMessage + i18n.getString("environment.cantGetLocalhostName", e.getMessage()) + "\n" + i18n.getString("environment.badMachineName", value) + "\n");
550		}
551		}
552		this.machine = value;
553		}
554
555		/**
556		* Sets the value of the os property.
557		*
558		* @param value
559		* allowed object is
560		* {@link OS }
561		*
562		*/
563		public void setOs(COFOS value) {
564		this.os = value;
565		}
566
567		/**
568		* Sets the value of the systemLocale property.
569		*
570		* @param value
571		* allowed object is
572		* {@link String }
573		*
574		*/
575		public void setSystemLocale(String value) {
576		this.systemLocale = value;
577		}
578
579		/**
580		* Sets the value of the timezone property.
581		*
582		* @param value
583		* allowed object is
584		* {@link String }
585		*
586		*/
587		public void setTimezone(String value) {
588		this.timezone = value;
589		}
590
591		/**
592		* Sets the value of the userLocale property.
593		*
594		* @param value
595		* allowed object is
596		* {@link String }
597		*
598		*/
599		public void setUserLocale(String value) {
600		this.userLocale = value;
601		}
602
603		}

+0

-124

~~src/com/sun/javatest/cof/COFEnvironments.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.io.IOException;
29		import java.util.ArrayList;
30		import java.util.LinkedHashMap;
31		import java.util.List;
32
33		import com.sun.javatest.util.XMLWriter;
34
35
36		/**
37		* <p>Java class for Environments complex type.
38		*
39		* <p>The following schema fragment specifies the expected content contained within this class.
40		*
41		* <pre>
42		* <complexType name="Environments">
43		* <complexContent>
44		* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
45		* <sequence>
46		* <element name="environment" type="{http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema}Environment" maxOccurs="unbounded"/>
47		* </sequence>
48		* </restriction>
49		* </complexContent>
50		* </complexType>
51		* </pre>
52		*
53		*
54		*/
55		public class COFEnvironments extends COFItem {
56
57		static LinkedHashMap xmlAttributes;
58
59		static LinkedHashMap xmlElements;
60
61		static String xmlTagName;
62
63		static {
64		xmlElements = new LinkedHashMap();
65		xmlElements.put("environment", "environment");
66		xmlTagName = "environments";
67		}
68
69		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
70		protected List/<Environment>/ environment;
71
72		/**
73		* Gets the value of the environment property.
74		*
75		* <p>
76		* This accessor method returns a reference to the live list,
77		* not a snapshot. Therefore any modification you make to the
78		* returned list will be present inside the JAXB object.
79		* This is why there is not a <CODE>set</CODE> method for the environment property.
80		*
81		* <p>
82		* For example, to add a new item, do as follows:
83		* <pre>
84		* getEnvironment().add(newItem);
85		* </pre>
86		*
87		*
88		* <p>
89		* Objects of the following type(s) are allowed in the list
90		* {@link Environment }
91		*
92		*
93		*/
94		public List/<Environment>/ getEnvironment() {
95		if (environment == null) {
96		environment = new ArrayList/<Environment>/();
97		}
98		return this.environment;
99		}
100
101		LinkedHashMap getItemAttributes() {
102		return xmlAttributes;
103		}
104
105		LinkedHashMap getItemElements() {
106		return xmlElements;
107		}
108
109
110		String getItemTagName() {
111		return xmlTagName;
112		}
113
114
115		/* (non-Javadoc)
116		* @see com.sun.javatest.cof.COFItem#write(com.sun.javatest.util.XMLWriter)
117		*/
118		void write(XMLWriter out) throws IOException {
119		out.newLine();
120		super.write(out);
121		}
122
123		}

+0

-182

~~src/com/sun/javatest/cof/COFItem.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.beans.BeanInfo;
29		import java.beans.IntrospectionException;
30		import java.beans.Introspector;
31		import java.beans.PropertyDescriptor;
32		import java.io.IOException;
33		import java.lang.reflect.InvocationTargetException;
34		import java.lang.reflect.Method;
35		import java.util.Arrays;
36		import java.util.Collection;
37		import java.util.Comparator;
38		import java.util.Date;
39		import java.util.Iterator;
40		import java.util.LinkedHashMap;
41
42		import com.sun.javatest.util.XMLWriter;
43
44		abstract class COFItem
45		{
46		BeanInfo bi = null;
47		LinkedHashMap itemAttributes = getItemAttributes();
48		LinkedHashMap itemElements = getItemElements();
49		String itemTagName = getItemTagName();
50		PropertyDescriptor [] pds = null;
51
52		private String[] getAttributeProperties() {
53		return itemAttributes == null? null: (String []) itemAttributes.keySet().toArray(new String[itemAttributes.size()]);
54		}
55		LinkedHashMap getItemAttributes(){
56		return null;
57		}
58		LinkedHashMap getItemElements() {
59		return null;
60		};
61
62		String getItemTagName(){
63		return null;
64		}
65
66		Object getProperty(String name) {
67		if (bi == null) {
68		try {
69		bi = Introspector.getBeanInfo(this.getClass());
70		pds = bi.getPropertyDescriptors();
71		Arrays.sort(pds, new Comparator() {
72		public int compare(Object o1, Object o2) {
73		PropertyDescriptor pd1 = (PropertyDescriptor) o1;
74		PropertyDescriptor pd2 = (PropertyDescriptor) o2;
75		return pd1.getName().compareTo(pd2.getName());
76		}
77		});
78		} catch (IntrospectionException e) {
79		// TODO Auto-generated catch block
80		e.printStackTrace();
81		}
82		}
83
84		if (pds == null) return null;
85
86		Object result = null;
87		int propIndex = Arrays.binarySearch(pds, name, new Comparator() {
88		public int compare(Object o1, Object o2) {
89		PropertyDescriptor pd = (PropertyDescriptor) o1;
90		String propName = (String) o2;
91		return pd.getName().compareTo(propName);
92		}
93
94		});
95
96		if (propIndex < 0 \|\| propIndex >= pds.length) { // no such property
97		// System.out.println("passing "+ name);
98		return null;
99		}
100
101		try {
102
103		Method readMethod = pds[propIndex].getReadMethod();
104		if (readMethod == null) {
105		System.err.println("Error occured for property '" + name + "' - no read method defined. Please contact developers.");
106		return null;
107		}
108		/* null casted to Object[] for suppresing "non-varargs call" warning */
109		result = readMethod.invoke(this,(Object[]) null);
110		} catch (IllegalArgumentException e) {
111		// TODO Auto-generated catch block
112		e.printStackTrace();
113		} catch (IllegalAccessException e) {
114		// TODO Auto-generated catch block
115		e.printStackTrace();
116		} catch (InvocationTargetException e) {
117		// TODO Auto-generated catch block
118		e.printStackTrace();
119		}
120		return result;
121		}
122
123		private String[] getPropOrder() {
124		return itemElements == null? null: (String []) itemElements.keySet().toArray(new String[itemElements.size()]);
125		}
126		void write(XMLWriter out) throws IOException {
127
128		if (itemTagName == null)
129		return;
130		out.startTag(itemTagName);
131		if (itemAttributes != null) {
132		String[] attrOrder = getAttributeProperties();
133		for (int i = 0; i < attrOrder.length; i++) {
134		out.writeAttr(itemAttributes.get(attrOrder[i]).toString(),
135		(String) getProperty(attrOrder[i]));
136		}
137		}
138		if (itemElements != null) {
139		String[] propOrder = getPropOrder();
140		for (int i = 0; i < propOrder.length; i++) {
141		Object propValue = getProperty(propOrder[i]);
142		if (propValue instanceof COFItem) {
143		COFItem item = (COFItem) propValue;
144		item.write(out);
145		continue;
146		} else if (propValue instanceof Collection) {
147		writeCollection(out, propOrder[i]);
148		continue;
149		}
150		if (propValue == null)
151		continue;
152		out.startTag(itemElements.get(propOrder[i]).toString());
153		write(out, propValue);
154		out.endTag(itemElements.get(propOrder[i]).toString());
155		}
156		}
157		out.endTag(itemTagName);
158		}
159		protected void write(XMLWriter out, Object o) throws IOException {
160		if (o instanceof String) {
161		out.write((String)o);
162		} else if (o instanceof Date) {
163		out.writeDate((Date)o);
164		} else out.write(o.toString());
165		}
166		void writeCollection(XMLWriter out, String propName) throws IOException {
167		Collection col = (Collection) getProperty(propName);
168		for (Iterator iter = col.iterator(); iter.hasNext();) {
169		Object value = iter.next();
170		if (value instanceof COFItem) {
171		((COFItem)value).write(out);
172		} else {
173		out.startTag(itemElements.get(propName).toString());
174		write(out,value);
175		out.endTag(itemElements.get(propName).toString());
176		}
177		}
178
179		}
180
181		}

+0

-178

~~src/com/sun/javatest/cof/COFOS.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.util.LinkedHashMap;
29
30
31		/**
32		*
33		* OS name elements use the property os.name. OS version elements
34		* use the property os.version. OS arch elements use the property
35		* os.arch.
36		*
37		*
38		* <p>Java class for OS complex type.
39		*
40		* <p>The following schema fragment specifies the expected content contained within this class.
41		*
42		* <pre>
43		* <complexType name="OS">
44		* <complexContent>
45		* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
46		* <sequence>
47		* <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
48		* <element name="version" type="{http://www.w3.org/2001/XMLSchema}string"/>
49		* <element name="arch" type="{http://www.w3.org/2001/XMLSchema}string"/>
50		* </sequence>
51		* </restriction>
52		* </complexContent>
53		* </complexType>
54		* </pre>
55		*
56		*
57		*/
58		public class COFOS extends COFItem{
59
60		static final String [] propOrder = {
61		"name",
62		"version",
63		"arch"
64		};
65		static final String [] tags = {
66		"name",
67		"version",
68		"arch"
69		};
70		static LinkedHashMap xmlAttributes;
71
72		static LinkedHashMap xmlElements;
73
74		static String xmlTagName;
75
76		static {
77		xmlElements = new LinkedHashMap();
78		for (int i = 0;i<propOrder.length;i++) {
79		xmlElements.put(propOrder[i], tags[i]);
80		}
81		xmlTagName = "os";
82		}
83
84		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
85		protected String arch;
86
87		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
88		protected String name;
89
90		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
91		protected String version;
92
93		/**
94		* Gets the value of the arch property.
95		*
96		* @return
97		* possible object is
98		* {@link String }
99		*
100		*/
101		public String getArch() {
102		return arch;
103		}
104
105		LinkedHashMap getItemAttributes() {
106		return xmlAttributes;
107		}
108		LinkedHashMap getItemElements() {
109		return xmlElements;
110		}
111
112		String getItemTagName() {
113		return xmlTagName;
114		}
115
116		/**
117		* Gets the value of the name property.
118		*
119		* @return
120		* possible object is
121		* {@link String }
122		*
123		*/
124		public String getName() {
125		return name;
126		}
127
128		/**
129		* Gets the value of the version property.
130		*
131		* @return
132		* possible object is
133		* {@link String }
134		*
135		*/
136		public String getVersion() {
137		return version;
138		}
139
140		/**
141		* Sets the value of the arch property.
142		*
143		* @param value
144		* allowed object is
145		* {@link String }
146		*
147		*/
148		public void setArch(String value) {
149		this.arch = value;
150		}
151
152		/**
153		* Sets the value of the name property.
154		*
155		* @param value
156		* allowed object is
157		* {@link String }
158		*
159		*/
160		public void setName(String value) {
161		this.name = value;
162		}
163
164		/**
165		* Sets the value of the version property.
166		*
167		* @param value
168		* allowed object is
169		* {@link String }
170		*
171		*/
172		public void setVersion(String value) {
173		this.version = value;
174		}
175
176
177		}

+0

-160

~~src/com/sun/javatest/cof/COFReportAnnotation.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.util.ArrayList;
29		import java.util.LinkedHashMap;
30		import java.util.List;
31		/*import javax.xml.bind.annotation.XmlAccessType;
32		import javax.xml.bind.annotation.XmlAccessorType;
33		import javax.xml.bind.annotation.XmlElement;
34		import javax.xml.bind.annotation.XmlType;
35		*/
36
37		/**
38		*
39		* Some attributes are used by the QARE test database system. One
40		* of these is the name of your testing group. The name of the
41		* annotation for this is "test_group". An example of such a group
42		* is "J2SE QA".
43		*
44		*
45		* <p>Java class for ReportAnnotation complex type.
46		*
47		* <p>The following schema fragment specifies the expected content contained within this class.
48		*
49		* <pre>
50		* <complexType name="ReportAnnotation">
51		* <complexContent>
52		* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
53		* <sequence>
54		* <element name="name" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
55		* <element name="value" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
56		* </sequence>
57		* </restriction>
58		* </complexContent>
59		* </complexType>
60		* </pre>
61		*
62		*
63		*/
64		/*@XmlAccessorType(XmlAccessType.FIELD)
65		@XmlType(name = "ReportAnnotation", propOrder = {
66		"name",
67		"value"
68		})*/
69		public class COFReportAnnotation extends COFItem{
70
71		static LinkedHashMap xmlAttributes;
72		static LinkedHashMap xmlElements;
73
74		static String xmlTagName;
75
76		static {
77		xmlElements = new LinkedHashMap();
78		xmlElements.put("name", "name");
79		xmlElements.put("value","value");
80		xmlTagName = "annotation";
81		}
82		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
83		// protected List/<String>/ name;
84		protected List/<String>/ name;
85
86		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
87		protected List/<String>/ value;
88
89		LinkedHashMap getItemAttributes() {
90		return xmlAttributes;
91		}
92
93		LinkedHashMap getItemElements() {
94		return xmlElements;
95		}
96
97		String getItemTagName() {
98		return xmlTagName;
99		}
100
101		/**
102		* Gets the value of the name property.
103		*
104		* <p>
105		* This accessor method returns a reference to the live list,
106		* not a snapshot. Therefore any modification you make to the
107		* returned list will be present inside the JAXB object.
108		* This is why there is not a <CODE>set</CODE> method for the name property.
109		*
110		* <p>
111		* For example, to add a new item, do as follows:
112		* <pre>
113		* getName().add(newItem);
114		* </pre>
115		*
116		*
117		* <p>
118		* Objects of the following type(s) are allowed in the list
119		* {@link String }
120		*
121		*
122		*/
123		public List/<String>/ getName() {
124		if (name == null) {
125		name = new ArrayList/<String>/();
126		}
127		return this.name;
128		}
129
130		/**
131		* Gets the value of the value property.
132		*
133		* <p>
134		* This accessor method returns a reference to the live list,
135		* not a snapshot. Therefore any modification you make to the
136		* returned list will be present inside the JAXB object.
137		* This is why there is not a <CODE>set</CODE> method for the value property.
138		*
139		* <p>
140		* For example, to add a new item, do as follows:
141		* <pre>
142		* getValue().add(newItem);
143		* </pre>
144		*
145		*
146		* <p>
147		* Objects of the following type(s) are allowed in the list
148		* {@link String }
149		*
150		*
151		*/
152		public List/<String>/ getValue() {
153		if (value == null) {
154		value = new ArrayList/<String>/();
155		}
156		return this.value;
157		}
158
159		}

+0

-112

~~src/com/sun/javatest/cof/COFReportAnnotations.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.util.ArrayList;
29		import java.util.LinkedHashMap;
30		import java.util.List;
31
32
33		/**
34		* <p>Java class for ReportAnnotations complex type.
35		*
36		* <p>The following schema fragment specifies the expected content contained within this class.
37		*
38		* <pre>
39		* <complexType name="ReportAnnotations">
40		* <complexContent>
41		* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
42		* <sequence>
43		* <element name="annotation" type="{http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema}ReportAnnotation" maxOccurs="unbounded" minOccurs="0"/>
44		* </sequence>
45		* </restriction>
46		* </complexContent>
47		* </complexType>
48		* </pre>
49		*/
50		/*@XmlAccessorType(XmlAccessType.FIELD)
51		@XmlType(name = "ReportAnnotations", propOrder = {
52		"annotation"
53		})*/
54		public class COFReportAnnotations extends COFItem{
55
56		static LinkedHashMap xmlAttributes;
57		static LinkedHashMap xmlElements;
58
59		static String xmlTagName;
60
61		static {
62		xmlElements = new LinkedHashMap();
63		xmlElements.put("annotation","annotation");
64		xmlTagName = "annotations";
65		}
66
67		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
68		protected List/<COFReportAnnotation>/ annotation;
69
70		/**
71		* Gets the value of the annotation property.
72		*
73		* <p>
74		* This accessor method returns a reference to the live list,
75		* not a snapshot. Therefore any modification you make to the
76		* returned list will be present inside the JAXB object.
77		* This is why there is not a <CODE>set</CODE> method for the annotation property.
78		*
79		* <p>
80		* For example, to add a new item, do as follows:
81		* <pre>
82		* getAnnotation().add(newItem);
83		* </pre>
84		*
85		*
86		* <p>
87		* Objects of the following type(s) are allowed in the list
88		* {@link COFReportAnnotation }
89		*
90		*
91		*/
92		public List/<COFReportAnnotation>/ getAnnotation() {
93		if (annotation == null) {
94		annotation = new ArrayList/<COFReportAnnotation>/();
95		}
96		return this.annotation;
97		}
98
99		LinkedHashMap getItemAttributes() {
100		return xmlAttributes;
101		}
102
103		LinkedHashMap getItemElements() {
104		return xmlElements;
105		}
106
107		String getItemTagName() {
108		return xmlTagName;
109		}
110
111		}

+0

-112

~~src/com/sun/javatest/cof/COFSWEntities.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.util.ArrayList;
29		import java.util.LinkedHashMap;
30		import java.util.List;
31
32
33		/**
34		* <p>Java class for COFSWEntities complex type.
35		*
36		* <p>The following schema fragment specifies the expected content contained within this class.
37		*
38		* <pre>
39		* <complexType name="SWEntities">
40		* <complexContent>
41		* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
42		* <sequence>
43		* <element name="swentity" type="{http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema}SWEntity" maxOccurs="unbounded"/>
44		* </sequence>
45		* </restriction>
46		* </complexContent>
47		* </complexType>
48		* </pre>
49		*/
50		/*@XmlAccessorType(XmlAccessType.FIELD)
51		@XmlType(name = "SWEntities", propOrder = {
52		"swentity"
53		})*/
54		public class COFSWEntities extends COFItem {
55
56		static LinkedHashMap xmlAttributes;
57
58		static LinkedHashMap xmlElements;
59
60		static String xmlTagName;
61
62		static {
63		xmlElements = new LinkedHashMap();
64		xmlElements.put("swentity", "swentity");
65		xmlTagName = "swentities";
66		}
67
68		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
69		protected List/<SWEntity>/ swentity;
70
71		LinkedHashMap getItemAttributes() {
72		return xmlAttributes;
73		}
74
75		LinkedHashMap getItemElements() {
76		return xmlElements;
77		}
78		String getItemTagName() {
79		return xmlTagName;
80		}
81
82		/**
83		* Gets the value of the swentity property.
84		*
85		* <p>
86		* This accessor method returns a reference to the live list,
87		* not a snapshot. Therefore any modification you make to the
88		* returned list will be present inside the JAXB object.
89		* This is why there is not a <CODE>set</CODE> method for the swentity property.
90		*
91		* <p>
92		* For example, to add a new item, do as follows:
93		* <pre>
94		* getSwentity().add(newItem);
95		* </pre>
96		*
97		*
98		* <p>
99		* Objects of the following type(s) are allowed in the list
100		* {@link COFSWEntity }
101		*
102		*
103		*/
104		public List/<SWEntity>/ getSwentity() {
105		if (swentity == null) {
106		swentity = new ArrayList/<SWEntity>/();
107		}
108		return this.swentity;
109		}
110
111		}

+0

-248

~~src/com/sun/javatest/cof/COFSWEntity.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.util.LinkedHashMap;
29
30		/*import javax.xml.bind.annotation.XmlAccessType;
31		import javax.xml.bind.annotation.XmlAccessorType;
32		import javax.xml.bind.annotation.XmlAttribute;
33		import javax.xml.bind.annotation.XmlElement;
34		import javax.xml.bind.annotation.XmlType;
35		*/
36
37		/**
38		*
39		* Software is tracked in the hardware/software database that backs
40		* up the COF XML. The elements in the SW type map to fields in the
41		* software table of that database. Type is enumerated. See below.
42		* Name is a product name with no version string. For example,
43		* "Tomcat". Version is a product version. For instance, "8i".
44		*
45		*
46		* <p>Java class for SWEntity complex type.
47		*
48		* <p>The following schema fragment specifies the expected content contained within this class.
49		*
50		* <pre>
51		* <complexType name="SWEntity">
52		* <complexContent>
53		* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
54		* <sequence>
55		* <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
56		* <element name="type">
57		* <simpleType>
58		* <restriction base="{http://www.w3.org/2001/XMLSchema}string">
59		* <enumeration value="appserver"/>
60		* <enumeration value="browser"/>
61		* <enumeration value="database"/>
62		* <enumeration value="editor"/>
63		* <enumeration value="java"/>
64		* <enumeration value="webserver"/>
65		* </restriction>
66		* </simpleType>
67		* </element>
68		* <element name="version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
69		* <element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
70		* </sequence>
71		* <attribute name="id" use="required" type="{http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema}IDWithColon" />
72		* </restriction>
73		* </complexContent>
74		* </complexType>
75		* </pre>
76		*
77		*
78		*/
79		/*@XmlAccessorType(XmlAccessType.FIELD)
80		@XmlType(name = "SWEntity", propOrder = {
81		"name",
82		"type",
83		"version",
84		"description"
85		})*/
86		public class COFSWEntity extends COFItem{
87
88		static LinkedHashMap xmlAttributes;
89		static LinkedHashMap xmlElements;
90		static String xmlTagName;
91		static {
92		xmlTagName = "swentity";
93		xmlElements = new LinkedHashMap();
94		xmlElements.put("name","name");
95		xmlElements.put("type","type");
96		xmlElements.put("version","version");
97		xmlElements.put("description","description");
98		xmlAttributes = new LinkedHashMap();
99		xmlAttributes.put("id","id");
100		}
101		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
102		protected String description;
103
104		// @XmlAttribute(required = true)
105		protected String id="swentity:0";
106
107		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
108		protected String name;
109
110		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
111		protected String type;
112
113		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
114		protected String version;
115
116		/**
117		* Gets the value of the description property.
118		*
119		* @return
120		* possible object is
121		* {@link String }
122		*
123		*/
124		public String getDescription() {
125		return description;
126		}
127
128		/**
129		* Gets the value of the id property.
130		*
131		* @return
132		* possible object is
133		* {@link String }
134		*
135		*/
136		public String getId() {
137		return id;
138		}
139
140		LinkedHashMap getItemAttributes() {
141		return xmlAttributes;
142		}
143
144		LinkedHashMap getItemElements() {
145		return xmlElements;
146		}
147
148		String getItemTagName() {
149		return xmlTagName;
150		}
151
152		/**
153		* Gets the value of the name property.
154		*
155		* @return
156		* possible object is
157		* {@link String }
158		*
159		*/
160		public String getName() {
161		return name;
162		}
163
164		/**
165		* Gets the value of the type property.
166		*
167		* @return
168		* possible object is
169		* {@link String }
170		*
171		*/
172		public String getType() {
173		return type;
174		}
175
176		/**
177		* Gets the value of the version property.
178		*
179		* @return
180		* possible object is
181		* {@link String }
182		*
183		*/
184		public String getVersion() {
185		return version;
186		}
187
188		/**
189		* Sets the value of the description property.
190		*
191		* @param value
192		* allowed object is
193		* {@link String }
194		*
195		*/
196		public void setDescription(String value) {
197		this.description = value;
198		}
199
200		/**
201		* Sets the value of the id property.
202		*
203		* @param value
204		* allowed object is
205		* {@link String }
206		*
207		*/
208		public void setId(String value) {
209		this.id = value;
210		}
211
212		/**
213		* Sets the value of the name property.
214		*
215		* @param value
216		* allowed object is
217		* {@link String }
218		*
219		*/
220		public void setName(String value) {
221		this.name = value;
222		}
223
224		/**
225		* Sets the value of the type property.
226		*
227		* @param value
228		* allowed object is
229		* {@link String }
230		*
231		*/
232		public void setType(String value) {
233		this.type = value;
234		}
235		/**
236		* Sets the value of the version property.
237		*
238		* @param value
239		* allowed object is
240		* {@link String }
241		*
242		*/
243		public void setVersion(String value) {
244		this.version = value;
245		}
246
247		}

+0

-189

~~src/com/sun/javatest/cof/COFStatus.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.util.LinkedHashMap;
29
30		/*import javax.xml.bind.annotation.XmlAccessType;
31		import javax.xml.bind.annotation.XmlAccessorType;
32		import javax.xml.bind.annotation.XmlAttribute;
33		import javax.xml.bind.annotation.XmlElement;
34		import javax.xml.bind.annotation.XmlType;*/
35
36
37		/**
38		*
39		* Actual elements contain text that refers to an actual value.
40		* This can be anything. A header, value, body, ..... If the tag
41		* log appears, it may be understood that a URL of a log file will
42		* appear as the PCDATA for this tag. If present, that URL uses
43		* either http or file protocol. If http protocol, the server name
44		* will be fully qualified. If file protocol, the full path
45		* beginning with /net will be expected. Microsoft file mapping or
46		* Unix automounts should not be used.
47		* <p>Java class for Status complex type.
48		*
49		* <p>The following schema fragment specifies the expected content contained within this class.
50		*
51		* <pre>
52		* <complexType name="Status">
53		* <complexContent>
54		* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
55		* <sequence minOccurs="0">
56		* <element name="expected" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
57		* <element name="actual" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
58		* </sequence>
59		* <attribute name="value" use="required">
60		* <simpleType>
61		* <restriction base="{http://www.w3.org/2001/XMLSchema}string">
62		* <enumeration value="pass"/>
63		* <enumeration value="fail"/>
64		* <enumeration value="ambiguous"/>
65		* <enumeration value="error"/>
66		* <enumeration value="vm_fail"/>
67		* <enumeration value="did_not_run"/>
68		* </restriction>
69		* </simpleType>
70		* </attribute>
71		* </restriction>
72		* </complexContent>
73		* </complexType>
74		* </pre>
75		*/
76		/*@XmlAccessorType(XmlAccessType.FIELD)
77		@XmlType(name = "Status", propOrder = {
78		"expected",
79		"actual"
80		})*/
81		public class COFStatus extends COFItem{
82
83		static LinkedHashMap xmlAttributes;
84		static LinkedHashMap xmlElements;
85		static String xmlTagName;
86
87		static {
88		xmlElements = new LinkedHashMap();
89		xmlAttributes = new LinkedHashMap();
90		xmlElements.put("expected","expected");
91		xmlElements.put("actual","actual");
92		xmlAttributes.put("value","value");
93		xmlTagName = "status";
94		}
95
96		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
97		protected String actual;
98
99		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
100		protected String expected;
101
102		// @XmlAttribute(required = true)
103		protected String value;
104
105		/**
106		* Gets the value of the actual property.
107		*
108		* @return
109		* possible object is
110		* {@link String }
111		*
112		*/
113		public String getActual() {
114		return actual;
115		}
116
117		/**
118		* Gets the value of the expected property.
119		*
120		* @return
121		* possible object is
122		* {@link String }
123		*
124		*/
125		public String getExpected() {
126		return expected;
127		}
128		LinkedHashMap getItemAttributes() {
129		return xmlAttributes;
130		}
131
132		LinkedHashMap getItemElements() {
133		return xmlElements;
134		}
135
136		String getItemTagName() {
137		return xmlTagName;
138		}
139
140		/**
141		* Gets the value of the value property.
142		*
143		* @return
144		* possible object is
145		* {@link String }
146		*
147		*/
148		public String getValue() {
149		return value;
150		}
151
152		/**
153		* Sets the value of the actual property.
154		*
155		* @param value
156		* allowed object is
157		* {@link String }
158		*
159		*/
160		public void setActual(String value) {
161		this.actual = value;
162		}
163
164		/**
165		* Sets the value of the expected property.
166		*
167		* @param value
168		* allowed object is
169		* {@link String }
170		*
171		*/
172		public void setExpected(String value) {
173		this.expected = value;
174		}
175
176		/**
177		* Sets the value of the value property.
178		*
179		* @param value
180		* allowed object is
181		* {@link String }
182		*
183		*/
184		public void setValue(String value) {
185		this.value = value;
186		}
187
188		}

+0

-631

~~src/com/sun/javatest/cof/COFTest.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.io.BufferedReader;
29		import java.io.File;
30		import java.io.IOException;
31		import java.io.StringReader;
32		import java.text.DateFormat;
33		import java.text.ParseException;
34		import java.text.SimpleDateFormat;
35		import java.util.ArrayList;
36		import java.util.Date;
37		import java.util.LinkedHashMap;
38		import java.util.List;
39		import java.util.Vector;
40		import java.util.regex.Matcher;
41		import java.util.regex.Pattern;
42
43		import com.sun.javatest.Status;
44		import com.sun.javatest.TestResult;
45		import com.sun.javatest.TestResult.ReloadFault;
46		import com.sun.javatest.TestResult.ResultFileNotFoundFault;
47		import java.util.Iterator;
48
49		/*import javax.xml.bind.annotation.XmlAccessType;
50		import javax.xml.bind.annotation.XmlAccessorType;
51		import javax.xml.bind.annotation.XmlAttribute;
52		import javax.xml.bind.annotation.XmlElement;
53		import javax.xml.bind.annotation.XmlType;
54		import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
55		*/
56		/**
57		*
58		* The analysis setting is meant to allow remote groups to waive or
59		* accept the pass/fail status of the test using E-mail. For
60		* testcases, the analysis setting provides a default value to
61		* apply to the analysis the setting for all testcase results for
62		* this test.
63		*
64		*
65		* <p>Java class for Test complex type.
66		*
67		* <p>The following schema fragment specifies the expected content contained within this class.
68		*
69		* <pre>
70		* <complexType name="Test">
71		* <complexContent>
72		* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
73		* <sequence>
74		* <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
75		* <element name="appuse" type="{http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema}IDWithColon" maxOccurs="unbounded" minOccurs="0"/>
76		* <element name="status" type="{http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema}Status" minOccurs="0"/>
77		* <element name="testcases" type="{http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema}TestCases" minOccurs="0"/>
78		* <element name="starttime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
79		* <element name="endtime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
80		* <element name="attributes" type="{http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema}TestAttributes" minOccurs="0"/>
81		* <element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
82		* </sequence>
83		* <attribute name="analysis" default="accept">
84		* <simpleType>
85		* <restriction base="{http://www.w3.org/2001/XMLSchema}string">
86		* <enumeration value="accept"/>
87		* <enumeration value="waive"/>
88		* </restriction>
89		* </simpleType>
90		* </attribute>
91		* <attribute name="id" use="required" type="{http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema}IDWithColon" />
92		* </restriction>
93		* </complexContent>
94		* </complexType>
95		* </pre>
96		*/
97		/*@XmlAccessorType(XmlAccessType.FIELD)
98		@XmlType(name = "Test", propOrder = {
99		"name",
100		"appuse",
101		"status",
102		"testcases",
103		"starttime",
104		"endtime",
105		"attributes",
106		"description"
107		})*/
108		public class COFTest extends COFItem {
109
110		private static final Date badDate = new Date(0);
111		private static final String[] cofStatus = new String[Status.NUM_STATES];
112		static long count = 0;
113		private static DateFormat[] dateFormats;
114		protected final static Pattern idPattern = Pattern.compile(".*[^\\w\\.\\[\\]\$\$\\{\\},_\\-]([\\w\\.\\[\\]\$\$\\{\\},_\\-]+)");
115		static boolean noTestCases = false;
116		protected final static Pattern testCasePattern = Pattern //.compile("^(\\S+): (Passed\\.\|Failed\\.\|Error\\.\|Not\\ run\\.)(.*)");
117		.compile("^(.): (Passed\\.\|Failed\\.\|Error\\.\|Not\\ run\\.)(.)");
118		static LinkedHashMap xmlAttributes;
119		static LinkedHashMap xmlElements;
120		static String xmlTagName;
121
122		static {
123		xmlElements = new LinkedHashMap();
124		xmlAttributes = new LinkedHashMap();
125		xmlElements.put("name", "name");
126		xmlElements.put("appuse", "appuse");
127		xmlElements.put("status", "status");
128		xmlElements.put("testcases", "testcases");
129		xmlElements.put("starttime", "starttime");
130		xmlElements.put("endtime", "endtime");
131		xmlElements.put("attributes", "attributes");
132		xmlElements.put("description", "description");
133		// xmlAttributes.put("analysis", "analysis");
134		xmlAttributes.put("id", "id");
135		xmlTagName = "test";
136
137		initDateFormats();
138		}
139
140		static {
141		cofStatus[Status.PASSED] = "pass";
142		cofStatus[Status.FAILED] = "fail";
143		cofStatus[Status.ERROR] = "error";
144		cofStatus[Status.NOT_RUN] = "did_not_run";
145		}
146		// @XmlAttribute
147		protected String analysis;
148		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
149		protected List/<String>/ appuse;
150		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
151		protected COFTestAttributes attributes;
152		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
153		protected String description;
154		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", type = String.class)
155		// @XmlJavaTypeAdapter(Adapter1 .class)
156		protected Date endtime;
157		// @XmlAttribute(required = true)
158		protected String id;
159		final long idNum = count++;
160		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
161		protected String name;
162		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", type = String.class)
163		// @XmlJavaTypeAdapter(Adapter1 .class)
164		protected Date starttime;
165		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
166		protected COFStatus status;
167		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
168		protected COFTestCases testcases;
169		private COFData cofData;
170
171		COFTest(TestResult tr, COFData data) {
172		cofData = data;
173		status = new COFStatus();
174		status.setValue(cofStatus[tr.getStatus().getType()]);
175		status.setActual(tr.getStatus().getReason());
176		fillTestCases(tr);
177		//if (tr.getStatus().isError() \|\| tr.getStatus().isFailed()) {
178		checkLostTestCases(tr);
179		//}
180		setName(tr.getTestName());
181		if (!tr.getStatus().isNotRun()) {
182		setStarttime(parseDate(tr, TestResult.START));
183		setEndtime(parseDate(tr, TestResult.END));
184		}
185		attributes = new COFTestAttributes();
186		attributes.getAttribute().add(
187		new COFTestAttribute("logfile", tr.getWorkRelativePath()));
188		if (data.isInterviewParametersAvailable()) {
189		try {
190		if (!data.getInterviewParameters().getExcludeListFilter().accepts(tr.getDescription())) {
191		attributes.getAttribute().add(new COFTestAttribute("isOnExcludeList", "true"));
192		}
193		} catch(Exception e) {
194		}
195		}
196		String jo = cofData.get("jvmopt", null);
197		if (jo != null) {
198		attributes.getAttribute().add(new COFTestAttribute("javaopt", jo));
199		}
200
201		}
202
203		protected void fillTestCases(TestResult tr) {
204		if (noTestCases) {
205		return;
206		}
207		testcases = new COFTestCases();
208		int sCount = tr.getSectionCount();
209		if (sCount == 0 && tr.getStatus().getType() != Status.NOT_RUN) {
210		try {
211		tr = new TestResult(new File(cofData.get("workdir") + File.separator + tr.getWorkRelativePath()));
212		sCount = tr.getSectionCount();
213		} catch (ResultFileNotFoundFault e) {
214		// warning is out from somewhere else, but again
215		System.err.println(e.getMessage());
216		} catch (ReloadFault e) {
217		System.err.println(tr.getFile());
218		}
219		}
220		for (int i = 0; i < sCount; i++) {
221		try {
222		String sectionOut = tr.getSection(i).getOutput("out1");
223		if (sectionOut == null) {
224		continue;
225		}
226		BufferedReader reader = new BufferedReader(new StringReader(
227		sectionOut));
228		String s = reader.readLine();
229		while (s != null) {
230		Matcher m = testCasePattern.matcher(s);
231		if (m.matches()) {
232		COFTestCase tc = new COFTestCase();
233		COFStatus cStatus = new COFStatus();
234		String tcName = fixIncorrectTestCaseName(m.group(1));
235		if (tcName == null) {
236		s = reader.readLine();
237		continue;
238		}
239		tc.setName(tcName);
240		cStatus.setValue(cofStatus[Status.parse(m.group(2)).getType()]);
241		cStatus.setActual(m.group(3));
242		tc.setStatus(cStatus);
243		testcases.getTestcase().add(tc);
244		}
245		s = reader.readLine();
246		}
247		} catch (ReloadFault e) {
248		// TODO Auto-generated catch block
249		e.printStackTrace();
250		} catch (IOException e) {
251		// TODO Auto-generated catch block
252		e.printStackTrace();
253		}
254		}
255		}
256
257		private void checkLostTestCases(TestResult tr) {
258		MTL mtl = cofData.getMtl();
259
260		if (mtl == null) {
261		// mtl is not specified
262		return;
263		}
264
265		List /<COFTestCase>/ jtrCases = testcases.getTestcase();
266		List /<String>/ mtlTestCases = mtl.getTestCases(tr.getTestName());
267		if (mtlTestCases != null && mtlTestCases.size() > 0) {
268		// for (COFTestCase jtrCase : jtrCases) {
269		Iterator it = jtrCases.iterator();
270		while (it.hasNext()) {
271		COFTestCase jtrCase = (COFTestCase) it.next();
272		mtlTestCases.remove(jtrCase.name);
273		}
274		if (mtlTestCases.size() > 0) {
275		//for (String testCaseName : mtlTestCases) {
276		it = mtlTestCases.iterator();
277		while(it.hasNext()) {
278		String testCaseName = (String) it.next();
279		COFTestCase nTc = new COFTestCase();
280		COFStatus nStatus = new COFStatus();
281		nTc.setName(testCaseName);
282		String strS = cofStatus[tr.getStatus().getType()];
283		nStatus.setValue(strS);
284		//System.out.println("+ " + tr.getTestName() + " " + tcName + " " + strS );
285		testcases.getTestcase().add(testCaseName);
286		}
287		}
288		}
289		}
290
291		/**
292		* Gets the value of the analysis property.
293		*
294		* @return
295		* possible object is
296		* {@link String }
297		*
298		*/
299		public String getAnalysis() {
300		if (analysis == null) {
301		return "accept";
302		} else {
303		return analysis;
304		}
305		}
306
307		/**
308		* Gets the value of the appuse property.
309		*
310		* <p>
311		* This accessor method returns a reference to the live list,
312		* not a snapshot. Therefore any modification you make to the
313		* returned list will be present inside the JAXB object.
314		* This is why there is not a <CODE>set</CODE> method for the appuse property.
315		*
316		* <p>
317		* For example, to add a new item, do as follows:
318		* <pre>
319		* getAppuse().add(newItem);
320		* </pre>
321		*
322		*
323		* <p>
324		* Objects of the following type(s) are allowed in the list
325		* {@link String }
326		*
327		*
328		*/
329		public List/<String>/ getAppuse() {
330		if (appuse == null) {
331		appuse = new ArrayList/<String>/();
332		}
333		return this.appuse;
334		}
335
336		/**
337		* Gets the value of the attributes property.
338		*
339		* @return
340		* possible object is
341		* {@link COFTestAttributes }
342		*
343		*/
344		public COFTestAttributes getAttributes() {
345		return attributes;
346		}
347
348		/**
349		* Gets the value of the description property.
350		*
351		* @return
352		* possible object is
353		* {@link String }
354		*
355		*/
356		public String getDescription() {
357		return description;
358		}
359
360		/**
361		* Gets the value of the endtime property.
362		*
363		* @return
364		* possible object is
365		* {@link String }
366		*
367		*/
368		public Date getEndtime() {
369		return endtime;
370		}
371
372		/**
373		* Gets the value of the id property.
374		*
375		* @return
376		* possible object is
377		* {@link String }
378		*
379		*/
380		public String getId() {
381		if (id != null) {
382		return id;
383		}
384		if (name == null) {
385		throw new IllegalStateException("Name was not set.");
386		}
387		Matcher m = idPattern.matcher(name);
388		if (m.matches()) {
389		id = m.group(1) + ":" + idNum;
390		} else {
391		id = "test:" + idNum;
392		}
393		return id;
394		}
395
396		LinkedHashMap getItemAttributes() {
397		return xmlAttributes;
398		}
399
400		LinkedHashMap getItemElements() {
401		return xmlElements;
402		}
403
404		String getItemTagName() {
405		return xmlTagName;
406		}
407
408		/**
409		* Gets the value of the name property.
410		*
411		* @return
412		* possible object is
413		* {@link String }
414		*
415		*/
416		public String getName() {
417		return name;
418		}
419
420		/**
421		* Gets the value of the starttime property.
422		*
423		* @return
424		* possible object is
425		* {@link String }
426		*
427		*/
428		public Date getStarttime() {
429		return starttime;
430		}
431
432		/**
433		* Gets the value of the status property.
434		*
435		* @return
436		* possible object is
437		* {@link COFStatus }
438		*
439		*/
440		public COFStatus getStatus() {
441		return status;
442		}
443
444		/**
445		* Gets the value of the testcases property.
446		*
447		* @return
448		* possible object is
449		* {@link COFTestCases }
450		*
451		*/
452		public COFTestCases getTestcases() {
453		return testcases;
454		}
455
456		/**
457		* Sets the value of the id property.
458		*
459		* @param value
460		* allowed object is
461		* {@link String }
462		*
463		*/
464		// public void setId(String value) {
465		// this.id = value;
466		// }
467		private static void initDateFormats() {
468		Vector v = new Vector();
469
470		// generic Java default
471		// 10-Sep-99 3:25:11 PM
472		v.addElement(DateFormat.getDateTimeInstance());
473
474		// standard IETF date syntax
475		// Fri, 10 September 1999 03:25:12 PDT
476		v.addElement(new SimpleDateFormat("EEE, dd MMMM yyyy HH:mm:ss zzz"));
477
478		// Unix C time
479		// Fri Sep 10 14:41:37 PDT 1999
480		v.addElement(new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy"));
481
482		// XML time
483		// 1999-09-10T03:25:12.123 (ISO 8601, sect 5.4)
484		v.addElement(new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss.SSS"));
485
486		// allow user-specified format
487		String s = System.getProperty("javatest.date.format");
488		if (s != null) {
489		v.addElement(new SimpleDateFormat(s));
490		}
491
492		dateFormats = new DateFormat[v.size()];
493		v.copyInto(dateFormats);
494		}
495
496		private static Date parseDate(String s) {
497		for (int i = 0; i < dateFormats.length; i++) {
498		try {
499		Date d = dateFormats[i].parse(s);
500		// successfully parsed the date; shuffle the format to the front
501		// to speed up future parses, assuming dates will likely be similar
502		if (i > 0) {
503		DateFormat tmp = dateFormats[i];
504		System.arraycopy(dateFormats, 0, dateFormats, 1, i);
505		dateFormats[0] = tmp;
506		}
507		return d;
508		} catch (ParseException e) {
509		//System.err.println("pattern: " + ((SimpleDateFormat)dateFormats[i]).toPattern());
510		//System.err.println(" value: " + s);
511		//System.err.println("example: " + dateFormats[i].format(new Date()));
512		}
513		}
514
515		return badDate;
516		}
517
518		private static Date parseDate(TestResult tr, String key) {
519		try {
520		String s = tr.getProperty(key);
521		if (s != null && s.length() > 0) {
522		return parseDate(s);
523		}
524		} catch (TestResult.Fault e) {
525		System.err.println(e);
526		}
527		// default, if no entry in test result, or if error reloading test result
528		return badDate;
529		}
530
531		/**
532		* Sets the value of the analysis property.
533		*
534		* @param value
535		* allowed object is
536		* {@link String }
537		*
538		*/
539		public void setAnalysis(String value) {
540		this.analysis = value;
541		}
542
543		/**
544		* Sets the value of the attributes property.
545		*
546		* @param value
547		* allowed object is
548		* {@link COFTestAttributes }
549		*
550		*/
551		public void setAttributes(COFTestAttributes value) {
552		this.attributes = value;
553		}
554
555		/**
556		* Sets the value of the description property.
557		*
558		* @param value
559		* allowed object is
560		* {@link String }
561		*
562		*/
563		public void setDescription(String value) {
564		this.description = value;
565		}
566
567		/**
568		* Sets the value of the endtime property.
569		*
570		* @param value
571		* allowed object is
572		* {@link String }
573		*
574		*/
575		public void setEndtime(Date value) {
576		this.endtime = value;
577		}
578
579		/**
580		* Sets the value of the name property.
581		*
582		* @param value
583		* allowed object is
584		* {@link String }
585		*
586		*/
587		public void setName(String value) {
588		this.name = value;
589		}
590
591		/**
592		* Sets the value of the starttime property.
593		*
594		* @param value
595		* allowed object is
596		* {@link String }
597		*
598		*/
599		public void setStarttime(Date value) {
600		this.starttime = value;
601		}
602
603		/**
604		* Sets the value of the status property.
605		*
606		* @param value
607		* allowed object is
608		* {@link COFStatus }
609		*
610		*/
611		public void setStatus(COFStatus value) {
612		this.status = value;
613		}
614
615		/**
616		* Sets the value of the testcases property.
617		*
618		* @param value
619		* allowed object is
620		* {@link COFTestCases }
621		*
622		*/
623		public void setTestcases(COFTestCases value) {
624		this.testcases = value;
625		}
626
627		private String fixIncorrectTestCaseName(String tcn) {
628		return cofData.getCustomFilter().transformTestCaseName(tcn);
629		}
630		}

+0

-181

~~src/com/sun/javatest/cof/COFTestAttribute.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.util.ArrayList;
29		import java.util.LinkedHashMap;
30		import java.util.List;
31		/*import javax.xml.bind.annotation.XmlAccessType;
32		import javax.xml.bind.annotation.XmlAccessorType;
33		import javax.xml.bind.annotation.XmlElement;
34		import javax.xml.bind.annotation.XmlType;
35		*/
36
37		/**
38		*
39		* In general, a Java command line flag argument that it is agreed
40		* will get tracked as an attribute, say -foo,will get tracked by a
41		* test attribute
42		*
43		* <pre>
44		* <?xml version="1.0" encoding="UTF-8"?><name xmlns:cof="http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema" xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xsd="http://www.w3.org/2001/XMLSchema">foo</name>
45		* </pre>
46		*
47		* without a corresponding value element. A Java command line
48		* argument pair "-foo bar" will get tracked by a test attribute
49		*
50		* <pre>
51		* <?xml version="1.0" encoding="UTF-8"?><name xmlns:cof="http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema" xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xsd="http://www.w3.org/2001/XMLSchema">foo</name>
52		* </pre>
53		*
54		* <pre>
55		* <?xml version="1.0" encoding="UTF-8"?><value xmlns:cof="http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema" xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xsd="http://www.w3.org/2001/XMLSchema">bar</value>
56		* </pre>
57		*
58		* .
59		*
60		*
61		* <p>Java class for TestAttribute complex type.
62		*
63		* <p>The following schema fragment specifies the expected content contained within this class.
64		*
65		* <pre>
66		* <complexType name="TestAttribute">
67		* <complexContent>
68		* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
69		* <sequence>
70		* <element name="name" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
71		* <element name="value" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
72		* </sequence>
73		* </restriction>
74		* </complexContent>
75		* </complexType>
76		* </pre>
77		*
78		*
79		*/
80		/*@XmlAccessorType(XmlAccessType.FIELD)
81		@XmlType(name = "TestAttribute", propOrder = {
82		"name",
83		"value"
84		})*/
85		public class COFTestAttribute extends COFItem{
86
87		static LinkedHashMap xmlAttributes;
88		static LinkedHashMap xmlElements;
89
90		static String xmlTagName;
91
92		static {
93		xmlElements = new LinkedHashMap();
94		xmlElements.put("name","name");
95		xmlElements.put("value","value");
96		xmlTagName = "attribute";
97		}
98
99		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
100		protected List/<String>/ name;
101
102		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
103		protected List/<String>/ value;
104
105		public COFTestAttribute(String name, String value) {
106		this.getName().add(name);
107		this.getValue().add(value);
108		}
109
110		LinkedHashMap getItemAttributes() {
111		return xmlAttributes;
112		}
113
114		LinkedHashMap getItemElements() {
115		return xmlElements;
116		}
117
118		String getItemTagName() {
119		return xmlTagName;
120		}
121
122		/**
123		* Gets the value of the name property.
124		*
125		* <p>
126		* This accessor method returns a reference to the live list,
127		* not a snapshot. Therefore any modification you make to the
128		* returned list will be present inside the JAXB object.
129		* This is why there is not a <CODE>set</CODE> method for the name property.
130		*
131		* <p>
132		* For example, to add a new item, do as follows:
133		* <pre>
134		* getName().add(newItem);
135		* </pre>
136		*
137		*
138		* <p>
139		* Objects of the following type(s) are allowed in the list
140		* {@link String }
141		*
142		*
143		*/
144		public List/<String>/ getName() {
145		if (name == null) {
146		name = new ArrayList/<String>/();
147		}
148		return this.name;
149		}
150
151		/**
152		* Gets the value of the value property.
153		*
154		* <p>
155		* This accessor method returns a reference to the live list,
156		* not a snapshot. Therefore any modification you make to the
157		* returned list will be present inside the JAXB object.
158		* This is why there is not a <CODE>set</CODE> method for the value property.
159		*
160		* <p>
161		* For example, to add a new item, do as follows:
162		* <pre>
163		* getValue().add(newItem);
164		* </pre>
165		*
166		*
167		* <p>
168		* Objects of the following type(s) are allowed in the list
169		* {@link String }
170		*
171		*
172		*/
173		public List/<String>/ getValue() {
174		if (value == null) {
175		value = new ArrayList/<String>/();
176		}
177		return this.value;
178		}
179
180		}

+0

-116

~~src/com/sun/javatest/cof/COFTestAttributes.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.util.ArrayList;
29		import java.util.LinkedHashMap;
30		import java.util.List;
31		/*import javax.xml.bind.annotation.XmlAccessType;
32		import javax.xml.bind.annotation.XmlAccessorType;
33		import javax.xml.bind.annotation.XmlElement;
34		import javax.xml.bind.annotation.XmlType;
35		*/
36
37		/**
38		* <p>Java class for TestAttributes complex type.
39		*
40		* <p>The following schema fragment specifies the expected content contained within this class.
41		*
42		* <pre>
43		* <complexType name="TestAttributes">
44		* <complexContent>
45		* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
46		* <sequence>
47		* <element name="attribute" type="{http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema}TestAttribute" maxOccurs="unbounded"/>
48		* </sequence>
49		* </restriction>
50		* </complexContent>
51		* </complexType>
52		* </pre>
53		*
54		*
55		*/
56		/*@XmlAccessorType(XmlAccessType.FIELD)
57		@XmlType(name = "TestAttributes", propOrder = {
58		"attribute"
59		})*/
60		public class COFTestAttributes extends COFItem{
61
62		static LinkedHashMap xmlAttributes;
63
64		static LinkedHashMap xmlElements;
65		static String xmlTagName;
66
67		static {
68		xmlTagName = "attributes";
69		xmlElements = new LinkedHashMap();
70		xmlElements.put("attribute","attribute");
71		}
72
73		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
74		protected List/<COFTestAttribute>/ attribute;
75
76		/**
77		* Gets the value of the attribute property.
78		*
79		* <p>
80		* This accessor method returns a reference to the live list,
81		* not a snapshot. Therefore any modification you make to the
82		* returned list will be present inside the JAXB object.
83		* This is why there is not a <CODE>set</CODE> method for the attribute property.
84		*
85		* <p>
86		* For example, to add a new item, do as follows:
87		* <pre>
88		* getAttribute().add(newItem);
89		* </pre>
90		*
91		*
92		* <p>
93		* Objects of the following type(s) are allowed in the list
94		* {@link COFTestAttribute }
95		*
96		*
97		*/
98		public List/<COFTestAttribute>/ getAttribute() {
99		if (attribute == null) {
100		attribute = new ArrayList/<COFTestAttribute>/();
101		}
102		return this.attribute;
103		}
104
105		LinkedHashMap getItemAttributes() {
106		return xmlAttributes;
107		}
108
109		LinkedHashMap getItemElements() {
110		return xmlElements;
111		}
112		String getItemTagName() {
113		return xmlTagName;
114		}
115		}

+0

-344

~~src/com/sun/javatest/cof/COFTestCase.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.io.IOException;
29		import java.util.Date;
30		import java.util.LinkedHashMap;
31
32		import com.sun.javatest.util.XMLWriter;
33
34		/*import javax.xml.bind.annotation.XmlAccessType;
35		import javax.xml.bind.annotation.XmlAccessorType;
36		import javax.xml.bind.annotation.XmlAttribute;
37		import javax.xml.bind.annotation.XmlElement;
38		import javax.xml.bind.annotation.XmlType;
39		import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
40		*/
41
42		/**
43		*
44		* The analysis setting is meant to allow remote groups to waive or
45		* accept the pass/fail status of the test using E-mail.
46		*
47		*
48		* <p>Java class for TestCase complex type.
49		*
50		* <p>The following schema fragment specifies the expected content contained within this class.
51		*
52		* <pre>
53		* <complexType name="TestCase">
54		* <complexContent>
55		* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
56		* <sequence>
57		* <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
58		* <element name="status" type="{http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema}Status" minOccurs="0"/>
59		* <element name="starttime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
60		* <element name="endtime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
61		* <element name="attributes" type="{http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema}TestAttributes" minOccurs="0"/>
62		* <element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
63		* </sequence>
64		* <attribute name="analysis" default="accept">
65		* <simpleType>
66		* <restriction base="{http://www.w3.org/2001/XMLSchema}string">
67		* <enumeration value="accept"/>
68		* <enumeration value="waive"/>
69		* </restriction>
70		* </simpleType>
71		* </attribute>
72		* <attribute name="id" use="required" type="{http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema}IDWithColon" />
73		* </restriction>
74		* </complexContent>
75		* </complexType>
76		* </pre>
77		*
78		*
79		*/
80		/*@XmlAccessorType(XmlAccessType.FIELD)
81		@XmlType(name = "TestCase", propOrder = {
82		"name",
83		"status",
84		"starttime",
85		"endtime",
86		"attributes",
87		"description"
88		})*/
89		public class COFTestCase extends COFItem {
90		static long count = 0;
91
92		static LinkedHashMap xmlAttributes;
93
94		static LinkedHashMap xmlElements;
95
96		static String xmlTagName;
97
98		static {
99		xmlTagName = "testcase";
100		xmlElements = new LinkedHashMap();
101		xmlElements.put("name", "name");
102		xmlElements.put("status", "status");
103		xmlElements.put("starttime", "starttime");
104		xmlElements.put("endtime", "endtime");
105		xmlElements.put("attributes", "attributes");
106		xmlElements.put("description", "description");
107		xmlAttributes = new LinkedHashMap();
108		xmlAttributes.put("id", "id");
109		// xmlAttributes.put("analysis", "analysis");
110		}
111
112		// @XmlAttribute
113		protected String analysis;
114
115		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
116		protected COFTestAttributes attributes;
117
118		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
119		protected String description;
120
121		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", type = String.class)
122		// @XmlJavaTypeAdapter(Adapter1 .class)
123		protected Date endtime;
124
125		// @XmlAttribute(required = true)
126		protected String id;
127
128		final long idNum = count++;
129
130		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
131		protected String name;
132
133		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", type = String.class)
134		// @XmlJavaTypeAdapter(Adapter1 .class)
135		protected Date starttime;
136
137		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
138		protected COFStatus status;
139
140		/**
141		* Gets the value of the analysis property.
142		*
143		* @return
144		* possible object is
145		* {@link String }
146		*
147		*/
148		public String getAnalysis() {
149		if (analysis == null) {
150		return "accept";
151		} else {
152		return analysis;
153		}
154		}
155
156		/**
157		* Gets the value of the attributes property.
158		*
159		* @return
160		* possible object is
161		* {@link COFTestAttributes }
162		*
163		*/
164		public COFTestAttributes getAttributes() {
165		return attributes;
166		}
167
168		/**
169		* Gets the value of the description property.
170		*
171		* @return
172		* possible object is
173		* {@link String }
174		*
175		*/
176		public String getDescription() {
177		return description;
178		}
179
180		/**
181		* Gets the value of the endtime property.
182		*
183		* @return
184		* possible object is
185		* {@link String }
186		*
187		*/
188		public Date getEndtime() {
189		return endtime;
190		}
191
192		/**
193		* Gets the value of the id property.
194		*
195		* @return
196		* possible object is
197		* {@link String }
198		*
199		*/
200		public String getId() {
201		return name + ":" + idNum;
202		}
203
204		LinkedHashMap getItemAttributes() {
205		return xmlAttributes;
206		}
207
208		LinkedHashMap getItemElements() {
209		return xmlElements;
210		}
211
212		String getItemTagName() {
213		return xmlTagName;
214		}
215
216		/**
217		* Gets the value of the name property.
218		*
219		* @return
220		* possible object is
221		* {@link String }
222		*
223		*/
224		public String getName() {
225		return name;
226		}
227
228		/**
229		* Gets the value of the starttime property.
230		*
231		* @return
232		* possible object is
233		* {@link String }
234		*
235		*/
236		public Date getStarttime() {
237		return starttime;
238		}
239
240		/**
241		* Gets the value of the status property.
242		*
243		* @return
244		* possible object is
245		* {@link COFStatus }
246		*
247		*/
248		public COFStatus getStatus() {
249		return status;
250		}
251
252		/**
253		* Sets the value of the analysis property.
254		*
255		* @param value
256		* allowed object is
257		* {@link String }
258		*
259		*/
260		public void setAnalysis(String value) {
261		this.analysis = value;
262		}
263
264		/**
265		* Sets the value of the attributes property.
266		*
267		* @param value
268		* allowed object is
269		* {@link COFTestAttributes }
270		*
271		*/
272		public void setAttributes(COFTestAttributes value) {
273		this.attributes = value;
274		}
275
276		/**
277		* Sets the value of the description property.
278		*
279		* @param value
280		* allowed object is
281		* {@link String }
282		*
283		*/
284		public void setDescription(String value) {
285		this.description = value;
286		}
287
288		/**
289		* Sets the value of the endtime property.
290		*
291		* @param value
292		* allowed object is
293		* {@link String }
294		*
295		*/
296		public void setEndtime(Date value) {
297		this.endtime = value;
298		}
299
300		/**
301		* Sets the value of the name property.
302		*
303		* @param value
304		* allowed object is
305		* {@link String }
306		*
307		*/
308		public void setName(String value) {
309		this.name = value;
310		}
311
312		/**
313		* Sets the value of the starttime property.
314		*
315		* @param value
316		* allowed object is
317		* {@link String }
318		*
319		*/
320		public void setStarttime(Date value) {
321		this.starttime = value;
322		}
323
324		/**
325		* Sets the value of the status property.
326		*
327		* @param value
328		* allowed object is
329		* {@link COFStatus }
330		*
331		*/
332		public void setStatus(COFStatus value) {
333		this.status = value;
334		}
335
336		/* (non-Javadoc)
337		* @see com.sun.javatest.cof.COFItem#write(com.sun.javatest.util.XMLWriter)
338		*/
339		void write(XMLWriter out) throws IOException {
340		out.newLine();
341		super.write(out);
342		}
343		}

+0

-133

~~src/com/sun/javatest/cof/COFTestCases.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.io.IOException;
29		import java.util.ArrayList;
30		import java.util.LinkedHashMap;
31		import java.util.List;
32
33		import com.sun.javatest.util.XMLWriter;
34		/*import javax.xml.bind.annotation.XmlAccessType;
35		import javax.xml.bind.annotation.XmlAccessorType;
36		import javax.xml.bind.annotation.XmlElement;
37		import javax.xml.bind.annotation.XmlType;
38		*/
39
40		/**
41		* <p>Java class for TestCases complex type.
42		*
43		* <p>The following schema fragment specifies the expected content contained within this class.
44		*
45		* <pre>
46		* <complexType name="TestCases">
47		* <complexContent>
48		* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
49		* <sequence>
50		* <element name="testcase" type="{http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema}TestCase" maxOccurs="unbounded"/>
51		* </sequence>
52		* </restriction>
53		* </complexContent>
54		* </complexType>
55		* </pre>
56		*
57		*
58		*/
59		/*@XmlAccessorType(XmlAccessType.FIELD)
60		@XmlType(name = "TestCases", propOrder = {
61		"testcase"
62		})*/
63		public class COFTestCases extends COFItem{
64
65		static LinkedHashMap xmlAttributes;
66
67		static LinkedHashMap xmlElements;
68
69		static String xmlTagName;
70
71		static {
72		xmlTagName = "testcases";
73		xmlElements = new LinkedHashMap();
74		xmlElements.put("testcase", "testcase");
75		}
76
77		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
78		protected List/<COFTestCase>/ testcase;
79
80		LinkedHashMap getItemAttributes() {
81		return xmlAttributes;
82		}
83
84		LinkedHashMap getItemElements() {
85		return xmlElements;
86		}
87
88
89		String getItemTagName() {
90		return xmlTagName;
91		}
92
93		/**
94		* Gets the value of the testcase property.
95		*
96		* <p>
97		* This accessor method returns a reference to the live list,
98		* not a snapshot. Therefore any modification you make to the
99		* returned list will be present inside the JAXB object.
100		* This is why there is not a <CODE>set</CODE> method for the testcase property.
101		*
102		* <p>
103		* For example, to add a new item, do as follows:
104		* <pre>
105		* getTestcase().add(newItem);
106		* </pre>
107		*
108		*
109		* <p>
110		* Objects of the following type(s) are allowed in the list
111		* {@link COFTestCase }
112		*
113		*
114		*/
115		public List/<COFTestCase>/ getTestcase() {
116		if (testcase == null) {
117		testcase = new ArrayList/<COFTestCase>/();
118		}
119		return this.testcase;
120		}
121
122		/* (non-Javadoc)
123		* @see com.sun.javatest.cof.COFItem#write(com.sun.javatest.util.XMLWriter)
124		*/
125		void write(XMLWriter out) throws IOException {
126		if (getTestcase().size() != 0) {
127		out.newLine();
128		super.write(out);
129		}
130		}
131
132		}

+0

-194

~~src/com/sun/javatest/cof/COFTestSuite.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.io.File;
29		import java.io.IOException;
30		import java.util.Iterator;
31		import java.util.regex.Pattern;
32
33		import com.sun.javatest.Status;
34		import com.sun.javatest.TestResult;
35		import com.sun.javatest.TestResultTable;
36		import com.sun.javatest.TestSuite;
37		import com.sun.javatest.WorkDirectory;
38		import com.sun.javatest.util.I18NResourceBundle;
39		import com.sun.javatest.util.XMLWriter;
40		import java.util.Collection;
41		import java.util.HashMap;
42
43		class COFTestSuite extends COFItem {
44
45		private static final String[] cofStatus = new String[Status.NUM_STATES];
46
47		private static I18NResourceBundle i18n = I18NResourceBundle
48		.getBundleForClass(COFTestSuite.class);
49
50		static {
51		cofStatus[Status.PASSED] = "pass";
52		cofStatus[Status.FAILED] = "fail";
53		cofStatus[Status.ERROR] = "error";
54		cofStatus[Status.NOT_RUN] = "did_not_run";
55		}
56
57		private COFData cofData;
58
59		private boolean legacyMode = false; // modern workdir or not
60
61		private String name;
62
63		protected Pattern testCasePattern = Pattern
64		.compile("^(\\S+): (Passed\\.\|Failed\\.\|Error\\.\|Not\\ run\\.)(.*)");
65
66
67		private TestResultTable trt;
68
69		COFTestSuite(File dir) {
70		trt = new TestResultTable();
71		scan(dir);
72		legacyMode = true;
73		}
74
75		COFTestSuite(File dir, COFData cd) {
76		cofData = cd;
77		trt = new TestResultTable();
78		name = cofData.get("testsuites.testsuite.name");
79		scan(dir);
80		legacyMode = true;
81		}
82
83		COFTestSuite(TestResultTable trt) {
84		this.trt = trt;
85		}
86
87		COFTestSuite(WorkDirectory wd) {
88		this(wd, null);
89		}
90
91		COFTestSuite(WorkDirectory wd, COFData cd) {
92		cofData = cd;
93		TestSuite ts = wd.getTestSuite();
94		name = ts.getID();
95		trt = wd.getTestResultTable();
96		}
97
98		COFTestSuite() {
99		}
100
101		void scan(File dir) {
102		String[] entries = dir.list();
103		if (entries != null) {
104		for (int i = 0; i < entries.length; i++) {
105		File f = new File(dir, entries[i]);
106		if (f.isDirectory())
107		scan(f);
108		else if (TestResult.isResultFile(f)) {
109		try {
110		TestResult tr = new TestResult(f);
111		trt.update(tr);
112		} catch (TestResult.Fault e) {
113		// ignore errors for now
114		// an error handler might report errors to stderr
115		System.err.println(i18n.getString("ts.badTest",
116		new Object[] { f, e.getMessage() }));
117		}
118		}
119		}
120		}
121		}
122
123		void write(XMLWriter out) throws IOException {
124
125		out.startTag("testsuite");
126		out.writeAttr("id", "unknownTestSuite:0");
127
128		// name
129		out.startTag("name");
130		out.write(name == null ? "unknown" : name);
131		out.endTag("name");
132		// version (optional)
133		// tests
134		out.startTag("tests");
135
136		// might need to wait for workdir to fully load
137		if (!legacyMode)
138		trt.waitUntilReady();
139		for (Iterator iter = trt.getIterator(); iter.hasNext();) {
140		TestResult tr = (TestResult) (iter.next());
141		out.newLine();
142		new COFTest(tr, cofData).write(out);
143		}
144		out.endTag("tests");
145		out.endTag("testsuite");
146		}
147
148		public COFEnvironment[] getCOFEnvironments(COFData data) {
149		if (!legacyMode) {
150		trt.waitUntilReady();
151		}
152		HashMap map = new HashMap();
153		String id = cofData.get("environment.id", "env:0").split(":")[0] + ":";
154		int id_n = 0;
155		for (Iterator iter = trt.getIterator(); iter.hasNext();) {
156		TestResult tr = (TestResult) (iter.next());
157		try {
158		String os = tr.getProperty(TestResult.JAVATEST_OS);
159		if (!map.containsKey(os) && os != null) {
160		try {
161		String[] split;
162		split = os.split("[()]");
163		String arch = split[split.length - 1];
164		split = split[0].split(" ", 2);
165		String name = split[0];
166		String version = split[1].trim();
167		data.put("environment.os.arch", arch);
168		data.put("environment.os.name", name);
169		data.put("environment.os.version", version);
170
171		COFEnvironment e = new COFEnvironment(data, id + id_n++);
172		map.put(os, e);
173		} catch (Throwable t) {
174		}
175		}
176		} catch (TestResult.Fault ex) {
177		}
178		}
179		Collection values = map.values();
180		COFEnvironment[] evs;
181		if (values.isEmpty()) {
182		evs = new COFEnvironment[] {new COFEnvironment(data, "env:0")};
183		} else {
184		evs = new COFEnvironment[values.size()];
185		Iterator e = values.iterator();
186		int i = 0;
187		while (e.hasNext()) {
188		evs[i++] = (COFEnvironment) e.next();
189		}
190		}
191		return evs;
192		}
193		}

+0

-126

~~src/com/sun/javatest/cof/COFTestSuites.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.io.IOException;
29		import java.util.ArrayList;
30		import java.util.LinkedHashMap;
31		import java.util.List;
32
33		import com.sun.javatest.util.XMLWriter;
34
35
36		/**
37		* <p>Java class for TestSuites complex type.
38		*
39		* <p>The following schema fragment specifies the expected content contained within this class.
40		*
41		* <pre>
42		* <complexType name="TestSuites">
43		* <complexContent>
44		* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
45		* <sequence>
46		* <element name="testsuite" type="{http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema}TestSuite" maxOccurs="unbounded"/>
47		* </sequence>
48		* </restriction>
49		* </complexContent>
50		* </complexType>
51		* </pre>
52		*
53		*
54		*/
55		/*@XmlAccessorType(XmlAccessType.FIELD)
56		@XmlType(name = "TestSuites", propOrder = {
57		"testsuite"
58		})*/
59		public class COFTestSuites extends COFItem{
60
61		static LinkedHashMap xmlAttributes;
62
63		static LinkedHashMap xmlElements;
64
65		static String xmlTagName;
66
67		static {
68		xmlElements = new LinkedHashMap();
69		xmlElements.put("testsuite", "testsuite");
70		xmlTagName = "testsuites";
71		}
72
73		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
74		protected List/<COFTestSuite>/ testsuite;
75
76		LinkedHashMap getItemAttributes() {
77		return xmlAttributes;
78		}
79
80		LinkedHashMap getItemElements() {
81		return xmlElements;
82		}
83
84		String getItemTagName() {
85		return xmlTagName;
86		}
87
88		/**
89		* Gets the value of the testsuite property.
90		*
91		* <p>
92		* This accessor method returns a reference to the live list,
93		* not a snapshot. Therefore any modification you make to the
94		* returned list will be present inside the JAXB object.
95		* This is why there is not a <CODE>set</CODE> method for the testsuite property.
96		*
97		* <p>
98		* For example, to add a new item, do as follows:
99		* <pre>
100		* getTestsuite().add(newItem);
101		* </pre>
102		*
103		*
104		* <p>
105		* Objects of the following type(s) are allowed in the list
106		* {@link COFTestSuite }
107		*
108		*
109		*/
110		public List/<COFTestSuite>/ getTestsuite() {
111		if (testsuite == null) {
112		testsuite = new ArrayList/<COFTestSuite>/();
113		}
114		return this.testsuite;
115		}
116
117		/* (non-Javadoc)
118		* @see com.sun.javatest.cof.COFItem#write(com.sun.javatest.util.XMLWriter)
119		*/
120		void write(XMLWriter out) throws IOException {
121		out.newLine();
122		super.write(out);
123		out.newLine();
124		}
125		}

+0

-43

~~src/com/sun/javatest/cof/CustomFilter.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26
27		package com.sun.javatest.cof;
28
29		/**
30		* Custom filter and transformer for processed test results
31		*/
32		public interface CustomFilter {
33
34		/**
35		* Transforms and/or filters out detected test case names.
36		* @param testCaseName
37		* @return transformed test case name or null if this test case
38		* should be filtered out
39		*/
40		String transformTestCaseName(String testCaseName);
41
42		}

+0

-63

~~src/com/sun/javatest/cof/CustomFilterAdapter.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26
27		package com.sun.javatest.cof;
28
29		public class CustomFilterAdapter implements CustomFilter {
30
31		public String transformTestCaseName(String tcn) {
32		// Try to
33		if (isJavaIdentifier(tcn)) {
34		return tcn;
35		}
36
37		// The following algorithm is not very effective
38		// but simple. It executes very rarely,
39		// i.e. about 5 times of 3600 testcases
40		for (int i = 1; i < tcn.length(); i++) {
41		String p = tcn.substring(i);
42		if (isJavaIdentifier(p)) {
43		return p;
44		}
45		}
46		return null;
47		}
48
49		// See JLS 3 / 3.8
50		private boolean isJavaIdentifier(String jid) {
51		for (int i = 0; i < jid.length(); i++) {
52		char c = jid.charAt(i);
53		if ( i == 0 && !Character.isJavaIdentifierStart(c)) {
54		return false;
55		}
56		if ( i > 0 && !Character.isJavaIdentifierPart(c) && c != '.') {
57		return false;
58		}
59		}
60		return true;
61		}
62		}

+0

-56

~~src/com/sun/javatest/cof/ID.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.util.HashMap;
29		import java.util.Map;
30
31		class ID
32		{
33		static class Factory {
34		ID create(String base) {
35		Integer last = (Integer) (map.get(base));
36		int index = (last == null ? 0 : last.intValue() + 1);
37		map.put(base, new Integer(index));
38		return new ID(base, index);
39		}
40
41		Map map = new HashMap();
42		};
43
44		private ID(String base, int index) {
45		this.base = base;
46		this.index = index;
47		}
48
49		public String toString() {
50		return (base + ":" + index);
51		}
52
53		private String base;
54		private int index;
55		}

+0

-86

~~src/com/sun/javatest/cof/MTL.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.io.*;
29		import java.nio.charset.StandardCharsets;
30		import java.util.ArrayList;
31		import java.util.HashMap;
32		import java.util.List;
33		import java.util.StringTokenizer;
34
35		/**
36		* Reads and stores master test list content
37		*/
38		public class MTL {
39
40		private final File mtl;
41		private HashMap<String, ArrayList<String>> table;
42
43		MTL(File mtlFile) {
44		mtl = mtlFile;
45		}
46
47		private void init() {
48		if (table == null) {
49		table = new HashMap<String, ArrayList<String>>();
50		BufferedReader r = null;
51		try {
52		r = new BufferedReader(new InputStreamReader(new FileInputStream(mtl), StandardCharsets.UTF_8));
53		String line;
54		while ((line = r.readLine()) != null) {
55		StringTokenizer st = new StringTokenizer(line);
56		ArrayList<String> cases = new ArrayList<String>();
57		String testName = null;
58		if (st.hasMoreTokens()) {
59		testName = st.nextToken();
60		}
61		while (st.hasMoreTokens()) {
62		cases.add(st.nextToken());
63		}
64		if (testName != null) {
65		table.put(testName, cases);
66		}
67		}
68		} catch (IOException ex) {
69		throw new IllegalArgumentException(ex);
70		} finally {
71		try {
72		if (r != null)
73		r.close();
74		} catch (IOException ex) {
75		ex.printStackTrace();
76		}
77		}
78		}
79		}
80
81		List<String> getTestCases(String name) {
82		init();
83		return table.get(name);
84		}
85		}

+0

-466

~~src/com/sun/javatest/cof/Main.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import com.sun.javatest.InterviewParameters;
29
30		import java.io.*;
31		import java.nio.channels.FileChannel;
32		import java.nio.charset.StandardCharsets;
33		import java.util.Vector;
34
35		import com.sun.javatest.TestSuite;
36		import com.sun.javatest.WorkDirectory;
37		import com.sun.javatest.util.I18NResourceBundle;
38		import com.sun.javatest.util.XMLWriter;
39
40		public class Main {
41		/**
42		* Thrown when a bad command line argument is encountered.
43		*/
44		public static class BadArgs extends Exception {
45		/**
46		* Serialization support
47		*/
48		private static final long serialVersionUID = 4638654313770205243L;
49
50		/**
51		* Create a BadArgs exception.
52		* @param i18n A resource bundle in which to find the detail message.
53		* @param key The key for the detail message.
54		*/
55		BadArgs(I18NResourceBundle i18n, String key) {
56		super(i18n.getString(key));
57		}
58
59		/**
60		* Create a BadArgs exception.
61		* @param i18n A resource bundle in which to find the detail message.
62		* @param key The key for the detail message.
63		* @param arg An argument to be formatted with the detail message by
64		* {@link java.text.MessageFormat#format}
65		*/
66		BadArgs(I18NResourceBundle i18n, String key, Object arg) {
67		super(i18n.getString(key, arg));
68		}
69
70		/**
71		* Create a BadArgs exception.
72		* @param i18n A resource bundle in which to find the detail message.
73		* @param key The key for the detail message.
74		* @param args An array of arguments to be formatted with the detail message by
75		* {@link java.text.MessageFormat#format}
76		*/
77		BadArgs(I18NResourceBundle i18n, String key, Object[] args) {
78		super(i18n.getString(key, args));
79		}
80		}
81
82		/**
83		* This exception is used to report problems that occur while the program is running.
84		*/
85		public static class Fault extends Exception {
86		/**
87		* Serialization support
88		*/
89		private static final long serialVersionUID = -4066018402688615825L;
90
91		/**
92		* Create a Fault.
93		* @param i18n A resource bundle in which to find the detail message.
94		* @param s The key for the detail message.
95		*/
96		Fault(I18NResourceBundle i18n, String s) {
97		super(i18n.getString(s));
98		}
99
100		/**
101		* Create a Fault.
102		* @param i18n A resource bundle in which to find the detail message.
103		* @param s The key for the detail message.
104		* @param o An argument to be formatted with the detail message by
105		* {@link java.text.MessageFormat#format}
106		*/
107		Fault(I18NResourceBundle i18n, String s, Object o) {
108		super(i18n.getString(s, o));
109		}
110
111		/**
112		* Create a Fault.
113		* @param i18n A resource bundle in which to find the detail message.
114		* @param s The key for the detail message.
115		* @param o An array of arguments to be formatted with the detail message by
116		* {@link java.text.MessageFormat#format}
117		*/
118		Fault(I18NResourceBundle i18n, String s, Object[] o) {
119		super(i18n.getString(s, o));
120		}
121
122		Fault(Exception t) {
123		super(t.getMessage(), t);
124		}
125		}
126
127		private static final String COF_SCHEMA = "COF2_0_2.xsd";
128
129		private static I18NResourceBundle i18n = I18NResourceBundle
130		.getBundleForClass(Main.class);
131
132		private static File suiteCopy;
133
134		private static void exit(int exitCode) {
135		System.exit(exitCode);
136		throw new Error();
137		}
138
139		public static void main(String[] args) {
140
141		PrintWriter out = new PrintWriter(System.err);
142
143		try {
144		Main m = new Main();
145		m.run(args, out);
146		out.flush();
147		exit(0);
148		} catch (BadArgs e) {
149		out.println(e.getMessage());
150		//showCommandLineHelp(out);
151		out.flush();
152		exit(1);
153		} catch (Fault e) {
154		out.println(e.getMessage());
155		out.flush();
156		exit(2);
157		}
158		}
159
160		private static TestSuite openTestSuite(File path) throws Fault {
161		try {
162		return TestSuite.open(path);
163		} catch (FileNotFoundException e) {
164		// should not happen, because of prior dir.exists() check
165		throw new Fault(i18n, "main.cantFindTestSuite", path);
166		} catch (TestSuite.Fault f) {
167		throw new Fault(i18n, "main.cantOpenTestSuite", new Object[] {
168		path, f });
169		}
170		}
171
172		private static WorkDirectory openWorkDirectory(File wdPath, File tsPath)
173		throws Fault {
174		try {
175		WorkDirectory wd;
176		if (tsPath == null)
177		wd = WorkDirectory.open(wdPath);
178		else {
179		// with non default suite WorkDirectory.open overwrites
180		// original suite.
181		// so copy before open
182		File original = new File(wdPath.getPath()+"/jtData/testsuite");
183		suiteCopy = File.createTempFile("cof",".tmp");
184		copyFile(original, suiteCopy);
185		wd = WorkDirectory.open(wdPath, openTestSuite(tsPath));
186		}
187		return wd;
188		} catch (FileNotFoundException e) {
189		// should not happen, because of prior dir.exists() check
190		throw new Fault(i18n, "main.cantFindWorkDir", wdPath);
191		} catch (WorkDirectory.Fault f) {
192		throw new Fault(i18n, "main.cantOpenWorkDir", new Object[] {
193		wdPath, f });
194		} catch (IOException e) {
195		throw new RuntimeException(e);
196		}
197		}
198
199		private static void showCommandLineHelp(PrintWriter out) {
200		String progName = System.getProperty("program", "java " + Main.class
201		.getName());
202
203		out.println(i18n.getString("main.cmdLine.proto", progName));
204		out.println();
205		out.println(i18n.getString("main.cmdLine.optHead"));
206		out.println(i18n.getString("main.cmdLine.file"));
207		out.println(i18n.getString("main.cmdLine.help"));
208		out.println(i18n.getString("main.cmdLine.out"));
209		out.println(i18n.getString("main.cmdLine.ts"));
210		out.println(i18n.getString("main.cmdLine.xsd"));
211		out.println(i18n.getString("main.cmdLine.no-testcases"));
212		out.println(i18n.getString("main.cmdLine.mtl"));
213		out.println(i18n.getString("main.cmdLine.filter"));
214		out.println(i18n.getString("main.cmdLine.data"));
215		out.println();
216		out.println(i18n.getString("main.cmdLine.filesHead"));
217		out.println(i18n.getString("main.cmdLine.dir"));
218		out.println();
219		out.println(i18n.getString("main.copyright.txt"));
220		}
221
222
223		public static void setGenerateTestCases(boolean enable) {
224		COFTest.noTestCases = !enable;
225		if (!enable)
226		COFTest.xmlElements.remove("testcases");
227		else
228		COFTest.xmlElements.put("testcases", "testcases");
229		}
230
231		void run(String[] args, PrintWriter log) throws BadArgs, Fault {
232		boolean helpFlag = false;
233		xsdFlag = false;
234		String jtiPath = null;
235		File outputFile = null;
236		File mtlFile = null;
237
238		String filterClass = null;
239
240		if (args.length == 0)
241		helpFlag = true;
242		else {
243		for (int i = 0; i < args.length; i++) {
244		if (args[i].equals("-o") && (i + 1 < args.length)) {
245		outputFile = new File(args[++i]);
246		} else if (args[i].equalsIgnoreCase("-jti") && (i + 1 < args.length)) {
247		jtiPath = args[++i];
248		if (tsPath != null) {
249		tsPath = null;
250		log.println("main.tswithjti");
251		}
252		} else if (args[i].equals("-f") && (i + 1 < args.length)) {
253		data.add(new File(args[++i]));
254		} else if (args[i].equalsIgnoreCase("-help") \|\| args[i]
255		.equalsIgnoreCase("-usage")
256		\|\| args[i].equalsIgnoreCase("/?")) {
257		helpFlag = true;
258		} else if (args[i].equalsIgnoreCase("-no-testcases")) {
259		COFTest.noTestCases = true;
260		COFTest.xmlElements.remove("testcases");
261		} else if (args[i].equalsIgnoreCase("-xsd")) {
262		xsdFlag = true;
263		} else if (args[i].equalsIgnoreCase("-mtl") && (i + 1 < args.length)) {
264		mtlFile = new File(args[++i]);
265		} else if (args[i].equalsIgnoreCase("-ts") && (i + 1 < args.length)) {
266		if (jtiPath != null) {
267		tsPath = new File(args[++i]);
268		} else {
269		i++;
270		}
271		} else if (args[i].equalsIgnoreCase("-filter") && (i + 1 < args.length)) {
272		filterClass = args[++i];
273		} else if (args[i].startsWith("-")) {
274		throw new BadArgs(i18n, "main.badOpt", args[i]);
275		} else if (args[i].indexOf("=") != -1) {
276		data.add(args[i]);
277		} else if (i == args.length - 1) {
278		// currently, only accept one directory;
279		// we could accept more and turn them into
280		// separate testsuites in the report, but
281		// would have trouble identifying environments
282		// for them
283		if (jtiPath == null) {
284		dir = new File(args[i]);
285		}
286		} else
287		throw new BadArgs(i18n, "main.badArg", args[i]);
288		}
289		}
290
291		if (helpFlag) {
292		showCommandLineHelp(log);
293		if (dir == null && outputFile == null)
294		return;
295		}
296
297		if (outputFile == null)
298		throw new BadArgs(i18n, "main.noOutputFile");
299
300		if (jtiPath == null) {
301		if (dir == null)
302		throw new BadArgs(i18n, "main.noResults");
303
304		if (!dir.exists())
305		throw new BadArgs(i18n, "main.cantFindResults");
306		}
307
308		COFData cofData;
309		try {
310		cofData = new COFData(data);
311		if (mtlFile != null) {
312		cofData.setMtl(new MTL(mtlFile));
313		}
314		} catch (IllegalArgumentException e) {
315		throw new Fault(i18n, "main.badOpt", e.toString());
316		} catch (IOException e) {
317		throw new Fault(i18n, "main.cantReadFile", e);
318		}
319
320		if (filterClass != null) {
321		try {
322		cofData.setCustomFilter(filterClass);
323		} catch (Exception ex) {
324		// InstantiationException
325		// ClassNotFoundException
326		// IllegalAccessException
327		// - just print an error and use default
328		ex.printStackTrace();
329		}
330		}
331
332		if (jtiPath != null) {
333		File jtiFile = new File(jtiPath);
334		if (!InterviewParameters.isInterviewFile(jtiFile)) {
335		throw new Fault(i18n, "jti.isNotInterview");
336		}
337		if (!jtiFile.exists()) {
338		throw new Fault(i18n, "jti.notExists");
339		}
340		if (!jtiFile.canRead()) {
341		throw new Fault(i18n, "jti.cantRead");
342		}
343
344		try {
345		ip = InterviewParameters.open(jtiFile);
346		cofData.setInterviewParameters(ip);
347		} catch (Exception ex) {
348		throw new Fault(ex);
349		}
350		}
351
352		Report report = fillReport(cofData);
353		writeReport(report, outputFile);
354		}
355
356		public void writeReport(Report r, File outputFile) throws Fault {
357		// creating report
358		try {
359		XMLWriter out = new XMLWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputFile), StandardCharsets.UTF_8)));
360		r.write(out);
361		out.close();
362		} catch (IOException e) {
363		throw new Fault(i18n, "main.cantWriteFile", new Object[]{
364		outputFile, e});
365		}
366
367		if (xsdFlag) {
368		File xsdFile = new File(outputFile.getAbsoluteFile().getParent(),
369		COF_SCHEMA);
370		try {
371		InputStream in = new BufferedInputStream(getClass().getResourceAsStream(COF_SCHEMA));
372		OutputStream out = new BufferedOutputStream(
373		new FileOutputStream(xsdFile));
374		byte[] buf = new byte[4096];
375		int n;
376		while ((n = in.read(buf, 0, buf.length)) != -1) {
377		out.write(buf, 0, n);
378		}
379		in.close();
380		out.close();
381		} catch (IOException e) {
382		throw new Fault(i18n, "main.cantWriteFile", new Object[]{
383		xsdFile, e});
384		}
385		}
386		if (suiteCopy != null) {
387		File original = new File(dir.getPath() + "/jtData/testsuite");
388		copyFile(suiteCopy, original);
389		suiteCopy.delete();
390		}
391		}
392
393		public Report fillReport(COFData cofData) throws Fault {
394		COFTestSuite cof_ts;
395
396		if (ip != null) {
397		WorkDirectory wd = ip.getWorkDirectory();
398		cofData.put("workdir", wd.getPath());
399		cof_ts = new COFTestSuite(wd, cofData);
400		} else {
401		if (WorkDirectory.isWorkDirectory(dir)) {
402		cofData.put("workdir", dir.getAbsolutePath());
403		cof_ts = new COFTestSuite(openWorkDirectory(dir, tsPath), cofData);
404		} else {
405		cof_ts = new COFTestSuite(dir, cofData);
406		}
407		}
408
409		COFEnvironment[] cof_envs = cof_ts.getCOFEnvironments(cofData); // returns at least one default Environment
410
411		Report r = new Report(cof_envs, cof_ts);
412		r.setHarness(cofData.get("report.harness"));
413
414		COFSWEntities entities = new COFSWEntities();
415		COFSWEntity entity = new COFSWEntity();
416		entity.setId(cofData.get("swentity.id", "sw:0"));
417		entity.setName(cofData.get("swentity.name", "JDK"));
418		entity.setType(cofData.get("swentity.type", "java"));
419		entity.setVersion(cofData.get("swentity.version"));
420		entity.setDescription(cofData.get("swentity.description"));
421		entities.getSwentity().add(entity);
422		r.setSwentities(entities);
423
424		COFApplications apps= new COFApplications();
425		COFApplication app = new COFApplication();
426		app.setEnvironmentid(cof_envs[0].getId());
427		app.setSwentityid(entity.getId());
428		apps.getApplication().add(app);
429		r.setApplications(apps);
430		return r;
431		}
432
433		public static void copyFile(File in, File out) {
434		try {
435		FileChannel sourceChannel = new FileInputStream(in).getChannel();
436		FileChannel destinationChannel = new FileOutputStream(out).getChannel();
437		sourceChannel.transferTo(0, sourceChannel.size(), destinationChannel);
438		sourceChannel.close();
439		destinationChannel.close();
440		} catch (FileNotFoundException e) {
441		System.out.println(e.getLocalizedMessage());
442		} catch (IOException e) {
443		System.out.println(e.getLocalizedMessage());
444		}
445		}
446
447		public void setXsdFlag(boolean xsd) {
448		this.xsdFlag = xsd;
449		}
450
451		public boolean getXsdFlag() {
452		return xsdFlag;
453		}
454
455		public void setInterviewParameters(InterviewParameters ip) {
456		this.ip = ip;
457		}
458
459		File dir = null;
460		File tsPath = null;
461		Vector data = new Vector();
462		InterviewParameters ip = null;
463		private boolean xsdFlag = false;
464
465		}

+0

-432

~~src/com/sun/javatest/cof/Report.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.cof;
27
28		import java.util.ArrayList;
29		import java.util.Date;
30		import java.util.LinkedHashMap;
31		import java.util.List;
32
33		public class Report extends COFItem {
34		static final String COF_SCHEMA = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema";
35
36		static final String COF_SCHEMA_LOCATION = "http://hestia.sfbay.sun.com/projects/COF/2003/2_0_2/Schema/COF2_0_2.xsd";
37
38		static final String VERSION = "2.0.2";
39
40		static final LinkedHashMap xmlAttributes;
41
42		static final LinkedHashMap xmlElements;
43
44		static String xmlTagName;
45
46		private static final String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
47
48		static {
49		xmlElements = new LinkedHashMap();
50		xmlAttributes = new LinkedHashMap();
51		xmlElements.put("date", "date");
52		xmlElements.put("version", "version");
53		xmlElements.put("environments", "environments");
54		xmlElements.put("swentities", "swentities");
55		xmlElements.put("applications", "applications");
56		xmlElements.put("operator", "operator");
57		xmlElements.put("harness", "harness");
58		xmlElements.put("testsuites", "testsuites");
59		xmlElements.put("annotations", "annotations");
60		xmlAttributes.put("xsiNS", "xmlns:xsi");
61		xmlAttributes.put("cofNS", "xmlns:cof");
62		xmlAttributes.put("targetNS", "xmlns");
63		xmlAttributes.put("schemaLocation", "xsi:schemaLocation");
64		xmlTagName = "report";
65
66		}
67
68		// @XmlAttribute
69		protected String analysis;
70
71		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
72		protected COFReportAnnotations annotations;
73
74		// @XmlAnyElement
75		protected List/<Element>/any;
76
77		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
78		protected COFApplications applications;
79
80		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true, type = String.class)
81		protected Date date;
82
83		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
84		protected COFEnvironments environments;
85
86		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
87		protected String harness;
88
89		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
90		protected String operator;
91
92		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
93		protected COFSWEntities swentities;
94
95		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
96		protected COFTestSuites testsuites;
97
98		// @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
99		protected String version;
100
101		Report() {
102		setDate(new Date());
103		setVersion(VERSION);
104		setAnnotations(new COFReportAnnotations());
105		}
106
107		Report(COFEnvironment env, COFTestSuite ts) {
108		this();
109		getEnvironments().getEnvironment().add(env);
110		getTestsuites().getTestsuite().add(ts);
111		}
112
113		Report(COFEnvironment[] envs, COFTestSuite ts) {
114		this();
115		for (int i = 0; i < envs.length; i++) {
116		getEnvironments().getEnvironment().add(envs[i]);
117		}
118		getTestsuites().getTestsuite().add(ts);
119		}
120
121		void addEnvironment(COFEnvironment env) {
122		getEnvironments().getEnvironment().add(env);
123		}
124
125		void addTestSuite(COFTestSuite ts) {
126		getTestsuites().getTestsuite().add(ts);
127		}
128
129		/**
130		* Gets the value of the analysis property.
131		*
132		* @return
133		* possible object is
134		* {@link String }
135		*
136		*/
137		public String getAnalysis() {
138		if (analysis == null) {
139		return "accept";
140		} else {
141		return analysis;
142		}
143		}
144
145		/**
146		* Gets the value of the annotations property.
147		*
148		* @return
149		* possible object is
150		* {@link COFReportAnnotations }
151		*
152		*/
153		public COFReportAnnotations getAnnotations() {
154		return annotations;
155		}
156
157		/**
158		* Gets the value of the any property.
159		*
160		* <p>
161		* This accessor method returns a reference to the live list,
162		* not a snapshot. Therefore any modification you make to the
163		* returned list will be present inside the JAXB object.
164		* This is why there is not a <CODE>set</CODE> method for the any property.
165		*
166		* <p>
167		* For example, to add a new item, do as follows:
168		* <pre>
169		* getAny().add(newItem);
170		* </pre>
171		*
172		*
173		* <p>
174		* Objects of the following type(s) are allowed in the list
175		* {@link Element }
176		*
177		*
178		*/
179		public List/<Element>/getAny() {
180		if (any == null) {
181		any = new ArrayList/<Element>/();
182		}
183		return this.any;
184		}
185
186		/**
187		* Gets the value of the applications property.
188		*/
189		public COFApplications getApplications() {
190		return applications;
191		}
192
193		/**
194		* @return Returns the cofNS.
195		*/
196		public String getCofNS() {
197		return COF_SCHEMA;
198		}
199
200		/**
201		* Gets the value of the date property.
202		*
203		* @return
204		* possible object is
205		* {@link String }
206		*
207		*/
208		public Date getDate() {
209		return date;
210		}
211
212		/**
213		* Gets the value of the environments property.
214		*
215		* @return
216		* possible object is
217		* {@link Environments }
218		*
219		*/
220		public COFEnvironments getEnvironments() {
221		if (environments == null)
222		environments = new COFEnvironments();
223		return environments;
224		}
225
226		/**
227		* Gets the value of the harness property.
228		*
229		* @return
230		* possible object is
231		* {@link String }
232		*
233		*/
234		public String getHarness() {
235		return harness;
236		}
237
238		LinkedHashMap getItemAttributes() {
239		return xmlAttributes;
240		}
241
242		LinkedHashMap getItemElements() {
243		return xmlElements;
244		}
245
246		String getItemTagName() {
247		return xmlTagName;
248		}
249
250		/**
251		* Gets the value of the operator property.
252		*
253		* @return
254		* possible object is
255		* {@link String }
256		*
257		*/
258		public String getOperator() {
259		return operator;
260		}
261
262		/**
263		* @return Returns the schemaLocation.
264		*/
265		public String getSchemaLocation() {
266		return COF_SCHEMA + " " + COF_SCHEMA_LOCATION;
267		}
268
269		/**
270		* Gets the value of the swentities property.
271		*
272		* @return
273		* possible object is
274		* {@link COFSWEntities }
275		*
276		*/
277		public COFSWEntities getSwentities() {
278		return swentities;
279		}
280
281		/**
282		* @return Returns the targetNS.
283		*/
284		public String getTargetNS() {
285		return COF_SCHEMA;
286		}
287
288		/**
289		* Gets the value of the testsuites property.
290		*
291		* @return
292		* possible object is
293		* {@link TestSuites }
294		*
295		*/
296		public COFTestSuites getTestsuites() {
297		if (testsuites == null)
298		testsuites = new COFTestSuites();
299		return testsuites;
300		}
301
302		/**
303		* Gets the value of the version property.
304		*
305		* @return
306		* possible object is
307		* {@link String }
308		*
309		*/
310		public String getVersion() {
311		return version;
312		}
313
314		/**
315		* @return Returns the xsiNS.
316		*/
317		public String getXsiNS() {
318		return XSI_NS;
319		}
320
321		/**
322		* Sets the value of the analysis property.
323		*
324		* @param value
325		* allowed object is
326		* {@link String }
327		*
328		*/
329		public void setAnalysis(String value) {
330		this.analysis = value;
331		}
332
333		/**
334		* Sets the value of the annotations property.
335		*
336		* @param value
337		* allowed object is
338		* {@link COFReportAnnotations }
339		*
340		*/
341		public void setAnnotations(COFReportAnnotations value) {
342		this.annotations = value;
343		}
344
345		/**
346		* Sets the value of the date property.
347		*
348		* @param value
349		* allowed object is
350		* {@link String }
351		*
352		*/
353		public void setDate(Date value) {
354		this.date = value;
355		}
356
357		/**
358		* Sets the value of the environments property.
359		*
360		* @param value
361		* allowed object is
362		* {@link Environments }
363		*
364		*/
365		public void setEnvironments(COFEnvironments value) {
366		this.environments = value;
367		}
368
369		/**
370		* Sets the value of the harness property.
371		*
372		* @param value
373		* allowed object is
374		* {@link String }
375		*
376		*/
377		public void setHarness(String value) {
378		this.harness = value;
379		}
380
381		/**
382		* Sets the value of the operator property.
383		*
384		* @param value
385		* allowed object is
386		* {@link String }
387		*
388		*/
389		public void setOperator(String value) {
390		this.operator = value;
391		}
392
393		/**
394		* Sets the value of the swentities property.
395		*
396		* @param value
397		* allowed object is
398		* {@link COFSWEntities }
399		*
400		*/
401		public void setSwentities(COFSWEntities value) {
402		this.swentities = value;
403		}
404
405		public void setApplications(COFApplications value) {
406		this.applications = value;
407		}
408		/**
409		* Sets the value of the testsuites property.
410		*
411		* @param value
412		* allowed object is
413		* {@link TestSuites }
414		*
415		*/
416		public void setTestsuites(COFTestSuites value) {
417		this.testsuites = value;
418		}
419
420		/**
421		* Sets the value of the version property.
422		*
423		* @param value
424		* allowed object is
425		* {@link String }
426		*
427		*/
428		public void setVersion(String value) {
429		this.version = value;
430		}
431		}

+0

-59

~~src/com/sun/javatest/cof/i18n.properties~~ less more

0		#
1		# $Id$
2		#
3		#
4		# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
5		# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
6		#
7		# This code is free software; you can redistribute it and/or modify it
8		# under the terms of the GNU General Public License version 2 only, as
9		# published by the Free Software Foundation. Oracle designates this
10		# particular file as subject to the "Classpath" exception as provided
11		# by Oracle in the LICENSE file that accompanied this code.
12		#
13		# This code is distributed in the hope that it will be useful, but WITHOUT
14		# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
15		# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16		# version 2 for more details (a copy is included in the LICENSE file that
17		# accompanied this code).
18		#
19		# You should have received a copy of the GNU General Public License version
20		# 2 along with this work; if not, write to the Free Software Foundation,
21		# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
22		#
23		# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
24		# or visit www.oracle.com if you need additional information or have any
25		# questions.
26		#
27
28		main.badArg=Bad argument: ''{0}''
29		main.badOpt=Bad option: ''{0}''
30		main.cantFindResults=Cannot find specified results directory ({0})
31		main.cantFindTestSuite=Cannot find specified test suite ({0})
32		main.cantFindWorkDir=Cannot find specified work directory ({0})
33		main.cantOpenTestSuite=Cannot open specified test suite ({0}) --\n{1}
34		main.cantOpenWorkDir=Cannot open specified work directory ({0}) --\n{1}
35		main.cantReadFile=Cannot read file --\n{0}
36		main.cantWriteFile=Cannot write file ({0}) --\n{1}
37		main.cmdLine.dir=\ dir Directory containing results to include in report
38		main.cmdLine.file =\ -f file Specify values to be used in the report
39		main.cmdLine.help =\ -help, -usage Show this message.
40		main.cmdLine.out =\ -o file The name of the output file
41		main.cmdLine.ts =\ -ts Explicitly specify test suite, to override default in work directory
42		main.cmdLine.xsd =\ -xsd Write out the schema file as well as the report
43		main.cmdLine.no-testcases=\ -no-testcases Don't include testcases information into report
44		main.cmdLine.mtl =\ -mtl file Specify JCK's master test list file
45		main.cmdLine.filter =\ -filter classname Specify a class name implementing custom filter
46		main.cmdLine.data =\ name=value Specify a value to be used in the report
47		main.cmdLine.filesHead=Files
48		main.cmdLine.optHead=Options
49		main.cmdLine.proto=Usage\n {0} options... dir
50		main.copyright.txt=Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
51		main.noOutputFile=No output file specified
52		main.noResults=No results specified to put in report
53		environment.badMachineName=Warning: Machine cononical name doesn''t contain domain name: {0} . Generated report will not be valid against schema.\nUse -f switch to specify file containing correct "environment.machine" property.
54		environment.cantGetLocalhostName=WARNING: Can''t get canonical name of localhost: {0}\nUsing defaults
55		ts.badTest={0}: {1}
56		jti.isNotInterview=Specified file is not interview
57		jti.notExists=Specified jti file does not exist
58		jti.cantRead=Can't read jti file - permission denied⏎

+1

-1

src/com/sun/javatest/exec/BP_BranchSubpanel.java less more

108	108	}
109	109
110	110	TT_BasicNode spot = root;
111		ArrayList<TT_TreeNode> list = new ArrayList(path.length + 1);
	111	ArrayList<TT_TreeNode> list = new ArrayList<>(path.length + 1);
112	112	list.add(root);
113	113	for (int i = 1; i < path.length; i++) {
114	114	try {

+16

-16

src/com/sun/javatest/exec/BP_FilteredOutSubpanel.java less more

202	202	synchronized (cache) {
203	203	synchronized(BP_FilteredOutSubpanel.this) {
204	204	// resync with this node cache
205		Vector[] newData = cache.addObserver(cacheWatcher, true);
	205	Vector<TestResult>[] newData = cache.addObserver(cacheWatcher, true);
206	206
207	207	// add tests into the list model - this doesn't make the data
208	208	// live though

293	293	"br.list.enter"));
294	294
295	295	String[] actions = { };
296		popupTable = uif.createPopupMenu("br", actions, (ActionListener)tableListener);
	296	popupTable = uif.createPopupMenu("br", actions, tableListener);
297	297
298	298	actions = new String[] { "action.cpnamelist", "action.cpnamestr" };
299		popupTable.add(uif.createMenu("br.cp", actions, (ActionListener)tableListener));
	299	popupTable.add(uif.createMenu("br.cp", actions, tableListener));
300	300
301	301	// this is necessary to make sure that the split pane can resize
302	302	// this panel. without setting the min., the panel seems to take

373	373	}
374	374	else if (column == 1) {
375	375	synchronized (liveData) {
376		Object tst = (liveData.get(row));
	376	TestResult tst = liveData.get(row);
377	377	Object r = null;
378	378
379	379	if (cache != null && r == null) {
380		r = cache.getRejectReason((TestResult)tst);
	380	r = cache.getRejectReason(tst);
381	381	}
382	382
383	383	if (r == null)

400	400	/**
401	401	* @param suppressNotify Actively request that no update be scheduled.
402	402	*/
403		void addTest(Object tr, boolean suppressNotify) {
	403	void addTest(TestResult tr, boolean suppressNotify) {
404	404	synchronized (vLock) {
405	405	// make sure this item is not already in the list
406	406	if (!inQueue.contains(tr)) {

420	420	* Remove the given test from the list.
421	421	* Ignored if the test is not in the list.
422	422	*/
423		void removeTest(Object tr) {
	423	void removeTest(TestResult tr) {
424	424	synchronized (vLock) {
425	425	rmQueue.addElement(tr);
426	426

453	453	// the event thread
454	454	synchronized (pendingEvents) {
455	455	for (int i = 0; i < pendingEvents.size(); i++) {
456		TableNotifier tn = (TableNotifier)(pendingEvents.get(i));
	456	TableNotifier tn = pendingEvents.get(i);
457	457	tn.cancel();
458	458	} // for
459	459	}
460	460
461		inQueue = new Vector();
462		rmQueue = new Vector();
463		liveData = new LinkedList();
	461	inQueue = new Vector<>();
	462	rmQueue = new Vector<>();
	463	liveData = new LinkedList<>();
464	464
465	465	isUpdateScheduled = false;
466	466	}

558	558	return;
559	559
560	560	while (rmQueue.size() > 0) {
561		TestResult target = (TestResult)(rmQueue.remove(0));
	561	TestResult target = rmQueue.remove(0);
562	562	int targetIndex = liveData.indexOf(target);
563	563	if (targetIndex != -1) {
564	564	synchronized (liveData) {

659	659
660	660	// must sync. on vLock anytime you access inQueue or liveData
661	661	private final Object vLock = new Object(); // lock for inQueue & rmQueue
662		private Vector inQueue; // queue of items to be added to live data
663		private Vector rmQueue; // queue of items to be removed from live data
664		private LinkedList liveData; // to allow manual synchronization
665		Vector pendingEvents = new Vector();
	662	private Vector<TestResult> inQueue; // queue of items to be added to live data
	663	private Vector<TestResult> rmQueue; // queue of items to be removed from live data
	664	private LinkedList<TestResult> liveData; // to allow manual synchronization
	665	Vector<TableNotifier> pendingEvents = new Vector<>();
666	666
667	667	volatile boolean isUpdateScheduled; // are updates waiting in inQueue or rmQueue
668	668

+31

-31

src/com/sun/javatest/exec/BP_TestListSubpanel.java less more

443	443	} else if (column == 1) {
444	444	synchronized (liveData) {
445	445	if ((liveData.get(row)) instanceof TestResult)
446		return (getSelectedProperty((TestResult) (liveData.get(row))));
	446	return getSelectedProperty(liveData.get(row));
447	447	else
448	448	// should not happen
449	449	return uif.getI18NString("br.list.notAvailable.txt");

463	463	* @param suppressNotify
464	464	* Actively request that no update be scheduled.
465	465	*/
466		void addTest(Object tr, boolean suppressNotify) {
	466	void addTest(TestResult tr, boolean suppressNotify) {
467	467	synchronized (vLock) {
468	468	// make sure this item is not already in the list
469	469	if (!inQueue.contains(tr) && !liveData.contains(tr))

488	488	* @param mode
489	489	* Indicates ascending (0) or descending (1) sorting
490	490	*/
491		void sortTests(LinkedList v, int column, boolean mode) {
	491	void sortTests(LinkedList<TestResult> v, int column, boolean mode) {
492	492	synchronized (vLock) {
493	493	inQueue = sort(v, mode);
494	494

502	502	* Remove the given test from the list. Ignored if the test is not in
503	503	* the list.
504	504	*/
505		void removeTest(Object tr) {
	505	void removeTest(TestResult tr) {
506	506	synchronized (vLock) {
507	507	rmQueue.addElement(tr);
508	508	// try not to saturate the GUI event thread

530	530	private String getSelectedProperty(TestResult tst) {
531	531	try {
532	532	if (show.equals("title"))
533		return ((TestResult) tst).getDescription().getTitle();
	533	return tst.getDescription().getTitle();
534	534	else if (show.equals("keywords")) {
535		String[] s = ((TestResult) tst).getDescription().getKeywords();
	535	String[] s = tst.getDescription().getKeywords();
536	536	if (s.length == 0)
537	537	return (uif.getI18NString("br.list.noKeywords.txt"));
538	538	else {

544	544	return (sb.toString());
545	545	}
546	546	} else if (show.equals(TestResult.EXEC_STATUS)) {
547		String tmpStr = ((TestResult) tst).getStatus().getReason();
	547	String tmpStr = tst.getStatus().getReason();
548	548	return tmpStr == null \|\| tmpStr.equals("") ?
549	549	uif.getI18NString("br.list.notAvailable.txt") : tmpStr;
550	550	}
551		return ((TestResult) tst).getProperty(show) == null ? uif.getI18NString("br.list.notAvailable.txt")
552		: ((TestResult) tst).getProperty(show);
	551	return tst.getProperty(show) == null ? uif.getI18NString("br.list.notAvailable.txt")
	552	: tst.getProperty(show);
553	553	} catch (TestResult.Fault f) {
554	554	}
555	555	return (""); // should not be here

563	563	// the event thread
564	564	synchronized (pendingEvents) {
565	565	for (int i = 0; i < pendingEvents.size(); i++) {
566		TableNotifier tn = (TableNotifier) (pendingEvents.get(i));
	566	TableNotifier tn = pendingEvents.get(i);
567	567	tn.cancel();
568	568	} // for
569	569	}
570	570
571		inQueue = new Vector();
572		rmQueue = new Vector();
573		liveData = new LinkedList();
	571	inQueue = new Vector<>();
	572	rmQueue = new Vector<>();
	573	liveData = new LinkedList<>();
574	574
575	575	isUpdateScheduled = false;
576	576	}
577	577
578		private Vector sort(LinkedList v, boolean mode) {
	578	private Vector<TestResult> sort(LinkedList<TestResult> v, boolean mode) {
579	579
580	580	o = new Object[v.size()];
581	581

584	584	else if (SORTING_COLUMN == 1) {
585	585	for (int i = 0; i < v.size(); i++) {
586	586	if (v.get(i) instanceof TestResult)
587		o[i] = getSelectedProperty((TestResult) v.get(i));
	587	o[i] = getSelectedProperty(v.get(i));
588	588	else
589	589	o[i] = ""; // should not happen
590	590	}

611	611	aaa[i] = rows[rows.length - i - 1].index;
612	612	}
613	613
614		Vector temp = new Vector(v.size());
	614	Vector<TestResult> temp = new Vector<>(v.size());
615	615
616	616	for (int i = 0; i < v.size(); i++)
617	617	temp.addElement(v.get(aaa[i]));

619	619	return temp;
620	620	}
621	621
622		private class Sorter implements Comparable {
	622	private class Sorter implements Comparable<Sorter> {
623	623	public int index;
624	624
625		public int compareTo(Object other) {
626		Sorter otherRow = (Sorter) other;
	625	public int compareTo(Sorter otherRow) {
	626
627	627	if (o[index] instanceof TestResult) {
628		return ((Comparable) ((TestResult) o[index]).getTestName()).
	628	return (((TestResult) o[index]).getTestName()).
629	629	compareTo(((TestResult) o[otherRow.index]).getTestName());
630	630	} else if (o[index] instanceof String) {
631		return ((Comparable) o[index]).compareTo(o[otherRow.index]);
	631	return ((String) o[index]).compareTo((String)o[otherRow.index]);
632	632	} else {
633	633	return index - otherRow.index; // should not happen
634	634	}

680	680	}
681	681
682	682	for (int i = 0; i < BATCH_SIZE; i++) {
683		Object o = inQueue.remove(0);
	683	TestResult o = inQueue.remove(0);
684	684
685	685	liveData.add(o);
686	686	}

734	734	return;
735	735
736	736	while (rmQueue.size() > 0) {
737		TestResult target = (TestResult) (rmQueue.remove(0));
	737	TestResult target = rmQueue.remove(0);
738	738	int targetIndex = liveData.indexOf(target);
739	739	if (targetIndex != -1) {
740	740	synchronized (liveData) {

835	835	private final Object vLock = new Object(); // lock for inQueue &
836	836	// rmQueue
837	837
838		private Vector inQueue; // queue of items to be added to live data
839
840		private Vector rmQueue; // queue of items to be removed from live data
841
842		private LinkedList liveData; // to allow manual synchronization
843
844		Vector pendingEvents = new Vector();
	838	private Vector<TestResult> inQueue; // queue of items to be added to live data
	839
	840	private Vector<TestResult> rmQueue; // queue of items to be removed from live data
	841
	842	private LinkedList<TestResult> liveData; // to allow manual synchronization
	843
	844	Vector<TableNotifier> pendingEvents = new Vector<>();
845	845
846	846	volatile boolean isUpdateScheduled; // are updates waiting in inQueue or
847	847	// rmQueue

1356	1356
1357	1357	private String show = TestResult.EXEC_STATUS;
1358	1358
1359		private Vector[] newData;
	1359	private Vector<TestResult>[] newData;
1360	1360
1361	1361	private boolean updateRequired;
1362	1362	}

+25

-25

src/com/sun/javatest/exec/BasicCustomTestFilter.java less more

100	100	init(null);
101	101	}
102	102
103		BasicCustomTestFilter(Map map, ExecModel e, UIFactory uif) {
	103	BasicCustomTestFilter(Map<String, String> map, ExecModel e, UIFactory uif) {
104	104	super(map, e);
105	105	this.uif = uif;
106	106	init(map);

123	123	// must be notified of changes
124	124	@Override
125	125	public void addObserver(Observer o) {
126		obs = (Observer[]) DynamicArray.append(obs, o);
	126	obs = DynamicArray.append(obs, o);
127	127	}
128	128
129	129	@Override
130	130	public void removeObserver(Observer o) {
131		obs = (Observer[]) DynamicArray.remove(obs, o);
	131	obs = DynamicArray.remove(obs, o);
132	132	}
133	133
134	134	@Override

148	148	}
149	149
150	150	@Override
151		boolean load(Map map) {
	151	boolean load(Map<String, String> map) {
152	152	boolean result = super.load(map);
153	153	activeSettings = new SettingsSnapshot(map);
154	154	putSettings(activeSettings);

160	160	}
161	161
162	162	@Override
163		boolean save(Map map) {
	163	boolean save(Map<String, String> map) {
164	164	boolean result = super.save(map);
165	165	activeSettings.save(map);
166	166

273	273	}
274	274
275	275	// ----- PRIVATE -----
276		private void init(Map map) {
	276	private void init(Map<String, String> map) {
277	277	if (NAME == null) {
278	278	NAME = uif.getI18NString("basicTf.name");
279	279	}

327	327	if (nowSettings.keywordsEnabled) {
328	328	try {
329	329	String[] validKeywords = ts.getKeywords();
330		HashSet validKeywordsSet;
	330	HashSet<String> validKeywordsSet;
331	331	if (validKeywords == null) {
332	332	validKeywordsSet = null;
333	333	} else {
334		validKeywordsSet = new HashSet(Arrays.asList(validKeywords));
	334	validKeywordsSet = new HashSet<>(Arrays.asList(validKeywords));
335	335	}
336	336
337	337	Keywords kw = Keywords.create(kwModeToType(nowSettings.keyChoice),

727	727	c.weightx = 2;
728	728	c.weighty = 2;
729	729	c.fill = GridBagConstraints.BOTH;
730		jtxFiles = new DefaultListModel();
	730	jtxFiles = new DefaultListModel<String>();
731	731	jtxFileList = uif.createList("basicTf.exclude.file", jtxFiles);
732	732	jtxFileList.setEnabled(jtxCheckBox.isSelected());
733	733	uif.setAccessibleInfo(jtxFileList, "basicTf.exclude.file");

882	882	private ButtonGroup keyBtnGrp;
883	883	private JRadioButton keyAllBtn;
884	884	private JRadioButton keyMatchBtn;
885		private JComboBox keywordsChoice;
	885	private JComboBox<String> keywordsChoice;
886	886	private JTextField keywordsField;
887	887	private static final String ALL_OF = "allOf";
888	888	private static final String ANY_OF = "anyOf";

906	906
907	907	// jtx info fields
908	908	private JTextField jtxMode;
909		private JList jtxFileList;
910		private DefaultListModel jtxFiles;
	909	private JList<?> jtxFileList;
	910	private DefaultListModel<String> jtxFiles;
911	911	private static String NAME, REASON, DESCRIPTION;
912	912
913	913	/**

995	995	keyString = "";
996	996	}
997	997
998		SettingsSnapshot(Map m) {
	998	SettingsSnapshot(Map<String, String> m) {
999	999	this();
1000	1000	load(m);
1001	1001	}

1050	1050	return true;
1051	1051	} // equals()
1052	1052
1053		void save(Map map) {
	1053	void save(Map<String, String> map) {
1054	1054	map.put(MAP_URL_ENABLE, booleanToInt(urlsEnabled));
1055	1055	map.put(MAP_KEY_ENABLE, booleanToInt(keywordsEnabled));
1056	1056	map.put(MAP_STATUS_ENABLE, booleanToInt(statusEnabled));

1067	1067	map.put(MAP_KEY_STRING, keyString);
1068	1068	}
1069	1069
1070		void load(Map map) {
1071		urlsEnabled = intToBoolean((String) (map.get(MAP_URL_ENABLE)));
1072		keywordsEnabled = intToBoolean((String) (map.get(MAP_KEY_ENABLE)));
1073		statusEnabled = intToBoolean((String) (map.get(MAP_STATUS_ENABLE)));
1074		jtxEnabled = intToBoolean((String) (map.get(MAP_JTX_ENABLE)));
1075		tsfEnabled = intToBoolean((String) (map.get(MAP_TSF_ENABLE)));
	1070	void load(Map<String, String> map) {
	1071	urlsEnabled = intToBoolean((map.get(MAP_URL_ENABLE)));
	1072	keywordsEnabled = intToBoolean((map.get(MAP_KEY_ENABLE)));
	1073	statusEnabled = intToBoolean((map.get(MAP_STATUS_ENABLE)));
	1074	jtxEnabled = intToBoolean((map.get(MAP_JTX_ENABLE)));
	1075	tsfEnabled = intToBoolean((map.get(MAP_TSF_ENABLE)));
1076	1076
1077	1077	for (int i = 0; i < Status.NUM_STATES; i++) {
1078		statusFields[i] = intToBoolean((String) (map.get(MAP_STATUS_PREFIX + i)));
	1078	statusFields[i] = intToBoolean((map.get(MAP_STATUS_PREFIX + i)));
1079	1079	} // for
1080	1080
1081		initialUrls = StringArray.split((String) (map.get(MAP_URLS)));
1082
1083		keyChoice = (String) (map.get(MAP_KEY_CHOICE));
1084		keyString = (String) (map.get(MAP_KEY_STRING));
	1081	initialUrls = StringArray.split((map.get(MAP_URLS)));
	1082
	1083	keyChoice = map.get(MAP_KEY_CHOICE);
	1084	keyString = map.get(MAP_KEY_STRING);
1085	1085
1086	1086	validate();
1087	1087	}

+4

-4

src/com/sun/javatest/exec/BasicSession.java less more

298	298	return filterNames;
299	299	}
300	300
301		public void save(Map map) {
	301	public void save(Map<String, String> map) {
302	302	if (wd != null)
303	303	map.put("workDir", wd.getPath());
304	304	// save name of interview file

306	306	map.put("config", config.getFile().getPath());
307	307	}
308	308
309		public void restore(Map map) throws Fault {
	309	public void restore(Map<String, String> map) throws Fault {
310	310	if (map == null)
311	311	return;
312	312
313		String wdPath = (String)map.get("workDir");
	313	String wdPath = map.get("workDir");
314	314	if (wdPath == null) {
315	315	return;
316	316	}

326	326	throw new Fault(e);
327	327	}
328	328
329		String ipPath = (String)map.get("config");
	329	String ipPath = map.get("config");
330	330	if (ipPath == null) {
331	331	return;
332	332	}

+4

-4

src/com/sun/javatest/exec/BasicSessionControl.java less more

169	169	return Arrays.asList(getToolBarActions());
170	170	}
171	171
172		public void save(Map m) {
	172	public void save(Map<String, String> m) {
173	173	if (testSuite != null && testSuite.getRoot() != null)
174	174	m.put("testSuite", testSuite.getRoot().getPath());
175	175

177	177	session.save(m);
178	178	}
179	179
180		public void restore(Map m) {
	180	public void restore(Map<String, String> m) {
181	181	try {
182	182	session.restore(m);
183	183	} catch (Fault e) {

222	222	InterviewParameters ip = (InterviewParameters)p;
223	223	InterviewParameters clone = ip.getWorkDirectory().getTestSuite().createInterview();
224	224	clone.setWorkDirectory(ip.getWorkDirectory());
225		HashMap data = new HashMap();
	225	HashMap<String, String> data = new HashMap<>();
226	226	ip.save(data);
227	227	clone.load(data, false);
228	228	return clone;

1294	1294	update(timeoutFactor, c.getTimeoutFactorParameters(), MutableTimeoutFactorParameters.class);
1295	1295	}
1296	1296
1297		private void update(JMenuItem mi, Object o, Class c) {
	1297	private void update(JMenuItem mi, Object o, Class<?> c) {
1298	1298	mi.setVisible(o != null && c.isAssignableFrom(o.getClass()));
1299	1299	}
1300	1300

+1

-1

src/com/sun/javatest/exec/CE_EnvironmentPane.java less more

272	272	private EditableFileList envFilesField;
273	273	private JFileChooser envFilesChooser;
274	274	private JLabel envNameLabel;
275		private JComboBox envNameField;
	275	private JComboBox<String> envNameField;
276	276
277	277	}

+3

-1

src/com/sun/javatest/exec/CE_FullView.java less more

30	30	import java.awt.GridBagLayout;
31	31	import java.awt.event.ActionEvent;
32	32	import java.awt.event.ActionListener;
	33	import java.util.Map;
33	34	import javax.swing.JButton;
34	35	import javax.swing.JLabel;
35	36	import javax.swing.JMenu;

42	43	import com.sun.interview.Help;
43	44	import com.sun.interview.Interview;
44	45	import com.sun.interview.Question;
	46	import com.sun.interview.wizard.QuestionRenderer;
45	47	import com.sun.interview.wizard.WizPane;
46	48	import com.sun.javatest.InterviewParameters;
47	49	import com.sun.javatest.tool.UIFactory;

118	120	add(wizPane, BorderLayout.CENTER);
119	121	}
120	122
121		protected void setCustomRenderers(java.util.Map customRenderers) {
	123	protected void setCustomRenderers(Map<Class<? extends Question>, QuestionRenderer> customRenderers) {
122	124	wizPane.setCustomRenderers(customRenderers);
123	125	}
124	126

+5

-5

src/com/sun/javatest/exec/CE_KeywordsPane.java less more

93	93	try {
94	94	TestSuite ts = config.getTestSuite();
95	95	String[] validKeywords = ts.getKeywords();
96		HashSet validKeywordsSet;
	96	HashSet<String> validKeywordsSet;
97	97	if (validKeywords == null)
98	98	validKeywordsSet = null;
99	99	else
100		validKeywordsSet = new HashSet(Arrays.asList(validKeywords));
	100	validKeywordsSet = new HashSet<String>(Arrays.asList(validKeywords));
101	101
102	102	String kc = (String) (keywordsChoice.getSelectedItem());
103	103	String type;

285	285	private class KeywordChooser extends JDialog {
286	286
287	287	private JScrollPane sp;
288		private JList lst;
	288	private JList<String> lst;
289	289	private JButton ok, cancel;
290	290
291	291	KeywordChooser(Dialog parent, String [] keywords, Listener listener ) {

307	307	GridBagConstraints gbc;
308	308
309	309	sp = new JScrollPane();
310		lst = new JList(keywords);
	310	lst = new JList<>(keywords);
311	311
312	312	ok = uif.createButton("keywordChooser.insert", new ActionListener() {
313	313	public void actionPerformed(ActionEvent e) {

397	397	private KeywordsParameters keywordsParameters;
398	398	private MutableKeywordsParameters mutableKeywordsParameters;
399	399	private JCheckBox selectCheck;
400		private JComboBox keywordsChoice;
	400	private JComboBox<String> keywordsChoice;
401	401	private JTextField keywordsField;
402	402	private JButton keywordBtn;
403	403	private JPopupMenu keywordPopup;

+1

-1

src/com/sun/javatest/exec/CE_StdView.java less more

91	91
92	92
93	93	void showTab(int id) {
94		Class c;
	94	Class<?> c;
95	95	switch (id) {
96	96	case TESTS_PANE:
97	97	c = CE_TestsPane.class;

+2

-1

src/com/sun/javatest/exec/CE_TemplateDialog.java less more

33	33	import java.io.File;
34	34	import java.io.IOException;
35	35	import java.util.HashMap;
	36	import java.util.Map;
36	37	import javax.swing.BorderFactory;
37	38	import javax.swing.Box;
38	39	import javax.swing.JButton;

209	210	try {
210	211	c = config.getTestSuite().createInterview();
211	212	createdNew = true;
212		HashMap data = new HashMap();
	213	Map<String, String> data = new HashMap<>();
213	214	config.save(data);
214	215	c.load(data, false);
215	216	}

+4

-4

src/com/sun/javatest/exec/CE_TestsPane.java less more

190	190	TestResultTable trt = wd.getTestResultTable();
191	191
192	192	File file = chooser.getSelectedFile();
193		ArrayList<String> paths = new ArrayList();
194		ArrayList<String> badPaths = new ArrayList();
195		Set seen = new HashSet();
	193	ArrayList<String> paths = new ArrayList<>();
	194	ArrayList<String> badPaths = new ArrayList<>();
	195	Set<String> seen = new HashSet<>();
196	196	FileReader fr = null;
197	197	BufferedReader in = null;
198	198	try {

252	252	}
253	253	}
254	254
255		testsField.setSelection((String[]) (paths.toArray(new String[paths.size()])));
	255	testsField.setSelection(paths.toArray(new String[paths.size()]));
256	256	}
257	257
258	258	private TestsParameters testsParameters;

+3

-18

src/com/sun/javatest/exec/ChecklistBrowser.java less more

221	221	}
222	222	}
223	223
224		Writer fw = null;
225		Writer out = null;
226		try {
227		fw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8));
228		out = new BufferedWriter(fw);
229		TextPane pane = (TextPane)body.getMediaPane(body.TEXT);
	224	try (Writer fw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8));
	225	Writer out = new BufferedWriter(fw)) {
	226	TextPane pane = (TextPane) body.getMediaPane(body.TEXT);
230	227	out.write(pane.getText());
231		out.close();
232	228	}
233	229	catch (IOException e) {
234	230	if (!file.canWrite())

238	234	else
239	235	uif.showError("cb.save.error", new Object[] { file, e } );
240	236	}
241		finally {
242		// attempt to close buffered writer first
243		// followed by the underlying writer for leak prevention
244		if (out != null){
245		try { out.close(); } catch (IOException e) { }
246		}
247
248		if (fw != null){
249		try { fw.close(); } catch (IOException e) { }
250		}
251		} // finally
252	237	}
253	238
254	239	private void doPrintSetup() {

+4

-4

src/com/sun/javatest/exec/ConfigurableTestFilter.java less more

79	79	* @throws IllegalStateException If the instance name is not present in the map or
80	80	* the exec model argument is null.
81	81	*/
82		protected ConfigurableTestFilter(Map map, ExecModel e) {
	82	protected ConfigurableTestFilter(Map<String, String> map, ExecModel e) {
83	83	if (e == null)
84	84	throw new IllegalArgumentException(i18n.getString("ctf.nullExec"));
85	85

133	133	* false if the operation failed.
134	134	* @throws IllegalStateException If the instance name is not present in the map.
135	135	*/
136		boolean load(Map map) {
137		instanceName = (String)(map.get(INSTANCE_KEY));
	136	boolean load(Map<String, String> map) {
	137	instanceName = map.get(INSTANCE_KEY);
138	138
139	139	if (instanceName == null)
140	140	throw new IllegalStateException(i18n.getString("ctf.mapNoName"));

149	149	* @param map The map to save to.
150	150	* @return True if saving was successful, false if the operation failed.
151	151	*/
152		boolean save(Map map) {
	152	boolean save(Map<String, String> map) {
153	153	map.put(INSTANCE_KEY, instanceName);
154	154
155	155	return true;

+4

-4

src/com/sun/javatest/exec/ContextManager.java less more

292	292	if (parentTool != null) {
293	293	TestResultTable trt = parentTool.getActiveTestResultTable();
294	294
295		Map pathMap = new HashMap();
	295	Map<String, String> pathMap = new HashMap<>();
296	296	parentTool.saveTreeState(pathMap);
297	297
298	298	if (trt != null)

596	596	testSuite = ts;
597	597	}
598	598
599		public Map getCustomRenderersMap() {
	599	public Map<Class<? extends Question>, QuestionRenderer> getCustomRenderersMap() {
600	600	return customRenderers;
601	601	}
602	602

610	610	protected void registerCustomQuestionRenderer(Class<? extends Question> question,
611	611	QuestionRenderer renderer) {
612	612	if (customRenderers == null) {
613		customRenderers = new HashMap();
	613	customRenderers = new HashMap<>();
614	614	}
615	615	customRenderers.put(question, renderer);
616	616	}

746	746	protected InterviewParameters currentConfig = null;
747	747	protected InterviewParameters currentTemplate = null;
748	748	private ExecTool parentTool;
749		private Map customRenderers;
	749	private Map<Class<? extends Question>, QuestionRenderer> customRenderers;
750	750
751	751	private volatile boolean pendingRefresh = false;
752	752

+2

-2

src/com/sun/javatest/exec/ET_Control.java less more

46	46	/**
47	47	* Saves current state to the map
48	48	*/
49		public void save(Map m);
	49	public void save(Map<String, String> m);
50	50
51	51	/**
52	52	* Restores saved state from the map
53	53	*/
54		public void restore(Map m);
	54	public void restore(Map<String, String> m);
55	55
56	56	/**
57	57	* Returts menu to be added to the menu mar

+2

-2

src/com/sun/javatest/exec/ET_DefaultHelpControl.java less more

62	62	/**
63	63	* Does nothing
64	64	*/
65		public void save(Map m) {
	65	public void save(Map<String, String> m) {
66	66	}
67	67
68	68	/**
69	69	* Does nothing
70	70	*/
71		public void restore(Map m) {
	71	public void restore(Map<String, String> m) {
72	72	}
73	73
74	74	/**

+2

-2

src/com/sun/javatest/exec/ET_DefaultViewControl.java less more

99	99	}
100	100	}
101	101
102		public void save(Map m) {
	102	public void save(Map<String, String> m) {
103	103	// nothing to save
104	104	}
105	105
106		public void restore(Map m) {
	106	public void restore(Map<String, String> m) {
107	107	// nothing to restore
108	108	}
109	109

+31

-41

src/com/sun/javatest/exec/ET_FilterHandler.java less more

62	62	*/
63	63	public class ET_FilterHandler implements ET_FilterControl, Session.Observer {
64	64	ET_FilterHandler(JComponent parent, ExecModel model, Harness h, UIFactory uif,
65		Map map) {
	65	Map<String, String> map) {
66	66	this(parent, model, uif);
67	67	setHarness(h);
68	68	restore(map);

73	73	this.model = model;
74	74	this.parentComponent = parent;
75	75
76		allFilters = new Vector();
	76	allFilters = new Vector<>();
77	77
78	78	}
79	79

159	159	return fHandler;
160	160	}
161	161
162		private TestFilter getDefaultFilter(Map map) {
	162	private TestFilter getDefaultFilter(Map<String, String> map) {
163	163	if (map != null) {
164		String pref = (String)(map.get(ExecTool.ACTIVE_FILTER));
	164	String pref = (map.get(ExecTool.ACTIVE_FILTER));
165	165
166	166	// try to use filter indicated in preference
167	167	for (int i = 0; i < allFilters.size(); i++) {
168	168	if (allFilters.elementAt(i).getClass().getName().equals(pref))
169		return (TestFilter)allFilters.elementAt(i);
	169	return allFilters.elementAt(i);
170	170	} // for
171	171	}
172	172

245	245	/**
246	246	* Save internal state.
247	247	*/
248		public void save(Map m) {
	248	public void save(Map<String, String> m) {
249	249	// -------- saved to given map (desktop) -------
250	250	Preferences prefs = Preferences.access();
251	251	TestFilter aFilter = fHandler.getActiveFilter();

264	264
265	265	ConstrainedPreferenceMap cpm = new ConstrainedPreferenceMap(prefs);
266	266	// using meta_ prefix for info not written by the filter itself
267		PrefixMap pm = new PrefixMap(cpm, FILTER_PREFIX + prefIndex);
	267	PrefixMap<String> pm = new PrefixMap<>(cpm, FILTER_PREFIX + prefIndex);
268	268
269	269	// it's really a special case to have a pref. entry which does not
270	270	// have a tsId associated

280	280
281	281	prefs.save();
282	282	}
283		public void restore(Map m) {
	283	public void restore(Map<String, String> m) {
284	284	this.map = m;
285	285	fHandler.setFilter(getDefaultFilter(m));
286	286	}

323	323	if (prefIndex >= 0) {
324	324	// load previous settings
325	325	ConstrainedPreferenceMap cpm = new ConstrainedPreferenceMap(prefs);
326		PrefixMap pm = new PrefixMap(cpm, FILTER_PREFIX + prefIndex);
	326	PrefixMap<String> pm = new PrefixMap<>(cpm, FILTER_PREFIX + prefIndex);
327	327
328	328	if (bctf == null) { // init
329	329	bctf = new BasicCustomTestFilter(pm, model, uif);

440	440	private ExecModel model;
441	441	private UIFactory uif;
442	442	private JComponent parentComponent;
443		private Map map; // saved desktop map to restore from
	443	private Map<String, String> map; // saved desktop map to restore from
444	444
445	445	// filters
446	446	private LastRunFilter ltrFilter; // last test run

448	448	private BasicCustomTestFilter bctf; // "custom" filter
449	449	private AllTestsFilter allFilter;
450	450	private TestFilter certFilter; // "certification" filter
451		protected Vector allFilters;
	451	protected Vector<TestFilter> allFilters;
452	452
453	453	// custom filter info
454	454	private TestSuite lastTs;

471	471	* This class is completely private and only implements what we
472	472	* want to use here.
473	473	*/
474		private static class ConstrainedPreferenceMap implements Map {
	474	private static class ConstrainedPreferenceMap implements Map<String, String> {
475	475	ConstrainedPreferenceMap(Preferences p) {
476	476	prefs = p;
477	477	}

488	488	throw new UnsupportedOperationException();
489	489	}
490	490
491		public Set entrySet() {
492		throw new UnsupportedOperationException();
493		}
494
495		public Object get(Object key) {
	491	public Set<Map.Entry<String, String>> entrySet() {
	492	throw new UnsupportedOperationException();
	493	}
	494
	495	public String get(Object key) {
496	496	if (!(key instanceof String))
497	497	throw new IllegalArgumentException("key must be a string");
498	498

503	503	throw new UnsupportedOperationException();
504	504	}
505	505
506		public Set keySet() {
507		throw new UnsupportedOperationException();
508		}
509
510		public Object put(Object key, Object value) {
511		if (!(key instanceof String) \|\|
512		!(value instanceof String))
513		throw new IllegalArgumentException("both args must be strings");
514
515		prefs.setPreference((String)key, (String)value);
516
	506	public Set<String> keySet() {
	507	throw new UnsupportedOperationException();
	508	}
	509
	510	public String put(String key, String value) {
	511	prefs.setPreference(key, value);
517	512	return null;
518	513	}
519	514
520		public void putAll(Map t) {
521		throw new UnsupportedOperationException();
522		}
523
524		public Object remove(Object key) {
	515	public void putAll(Map<? extends String, ? extends String> t) {
	516	throw new UnsupportedOperationException();
	517	}
	518
	519	public String remove(Object key) {
525	520	throw new UnsupportedOperationException();
526	521	}
527	522

529	524	throw new UnsupportedOperationException();
530	525	}
531	526
532		public Collection values() {
533		throw new UnsupportedOperationException();
534		}
535
536		// custom methods
537		public void put(String key, String value) {
538		prefs.setPreference(key, value);
	527	public Collection<String> values() {
	528	throw new UnsupportedOperationException();
539	529	}
540	530
541	531	public String get(String key) {
542		return (String)(prefs.getPreference(key));
	532	return prefs.getPreference(key);
543	533	}
544	534
545	535	private Preferences prefs;

+2

-2

src/com/sun/javatest/exec/ET_TestTreeControl.java less more

45	45	public void initialize();
46	46	public JComponent getViewComponent();
47	47
48		void saveTreeState(Map m);
49		void restoreTreeState(Map m);
	48	void saveTreeState(Map<String, String> m);
	49	void restoreTreeState(Map<String, String> m);
50	50
51	51	}

+5

-7

src/com/sun/javatest/exec/EnvironmentBrowser.java less more

208	208	}
209	209	};
210	210
211		private class EnvEntryComparator implements Comparator {
	211	private class EnvEntryComparator implements Comparator<TestEnvironment.Element> {
212	212	EnvEntryComparator(int sortMode, String[] inherits) {
213	213	this.sortMode = sortMode;
214	214	this.inherits = inherits;
215	215	}
216	216
217		public int compare(Object o1, Object o2) {
218		TestEnvironment.Element e1 = (TestEnvironment.Element)o1;
219		TestEnvironment.Element e2 = (TestEnvironment.Element)o2;
	217	public int compare(TestEnvironment.Element e1, TestEnvironment.Element e2) {
220	218	// the following should be a switch statement, but JDK
221	219	// 1.1.7 can't compile it: doesn't recognize KEY etc as
222	220	// constants.

275	273	if (currEnv == null)
276	274	elems = null;
277	275	else {
278		Collection e = currEnv.elements();
279		elems = (TestEnvironment.Element[]) (e.toArray(new TestEnvironment.Element[e.size()]));
	276	Collection<TestEnvironment.Element> e = currEnv.elements();
	277	elems = e.toArray(new TestEnvironment.Element[e.size()]);
280	278	Arrays.sort(elems, new EnvEntryComparator(KEY, currEnv.getInherits()));
281	279	}
282	280	int newRowCount = getRowCount();

322	320	return headings[columnIndex];
323	321	}
324	322
325		public Class getColumnClass(int columnIndex) {
	323	public Class<?> getColumnClass(int columnIndex) {
326	324	return String.class;
327	325	}
328	326

+6

-6

src/com/sun/javatest/exec/ExcludeListBrowser.java less more

289	289	// The following operation is slow and should arguably be
290	290	// done by a worker thread, perhaps using the nested List class as
291	291	// a Runnable.
292		SortedSet sortedEntries = new TreeSet(new Comparator() {
293		public int compare(Object o1, Object o2) {
294		String s1 = entryToString((ExcludeList.Entry)o1);
295		String s2 = entryToString((ExcludeList.Entry)o2);
	292	SortedSet<ExcludeList.Entry> sortedEntries = new TreeSet<>(new Comparator<ExcludeList.Entry>() {
	293	public int compare(ExcludeList.Entry o1, ExcludeList.Entry o2) {
	294	String s1 = entryToString(o1);
	295	String s2 = entryToString(o2);
296	296	return s1.compareTo(s2);
297	297	}
298	298	});
299	299
300	300	if (list != null) {
301		for (Iterator iter = list.getIterator(false); iter.hasNext(); ) {
	301	for (Iterator<?> iter = list.getIterator(false); iter.hasNext(); ) {
302	302	ExcludeList.Entry ee = (ExcludeList.Entry) (iter.next());
303	303	sortedEntries.add(ee);
304	304	}

316	316	// model never changes, so ignore listener
317	317	}
318	318
319		public Class getColumnClass(int columnIndex) {
	319	public Class<?> getColumnClass(int columnIndex) {
320	320	// for now, all are strings
321	321	return String.class;
322	322	}

+6

-7

src/com/sun/javatest/exec/ExecTool.java less more

71	71	final List<ET_Control> controls = new ArrayList<ET_Control>();
72	72
73	73	JMenuBar menuBar = null;
74		HashMap map = new HashMap();
75	74	private boolean shouldPauseTree;
76	75	private PageFormat pageFormat;
77	76
78	77	public ExecTool(ExecToolManager mgr, TestSuite ts) throws Session.Fault {
79		super((ToolManager)mgr, "exec", "browse.window.csh");
	78	super(mgr, "exec", "browse.window.csh");
80	79	this.testSuite = ts;
81	80	String testSuiteName = testSuite.getName();
82	81	if (testSuiteName != null)

222	221	v.add(null);
223	222	}
224	223	}
225		Action[] toolBarActions = (Action[])v.toArray(new Action[v.size()]);
	224	Action[] toolBarActions = v.toArray(new Action[v.size()]);
226	225
227	226	Preferences p = Preferences.access();
228	227

295	294	}
296	295
297	296	@Override
298		protected void save(Map m) {
	297	protected void save(Map<String, String> m) {
299	298	for (ET_Control c:controls) {
300	299	c.save(m);
301	300	}
302	301	}
303	302
304	303	@Override
305		protected void restore(Map m) {
	304	protected void restore(Map<String, String> m) {
306	305	for (ET_Control c:controls) {
307	306	c.restore(m);
308	307	}

626	625	}
627	626	}
628	627
629		void saveTreeState(Map m) {
	628	void saveTreeState(Map<String, String> m) {
630	629	testTreePanel.saveTreeState(m);
631	630	}
632	631
633		void restoreTreeState(Map m) {
	632	void restoreTreeState(Map<String, String> m) {
634	633	testTreePanel.restoreTreeState(m);
635	634	}
636	635

+10

-10

src/com/sun/javatest/exec/ExecToolManager.java less more

301	301	if (conManager != null && conManager.getFeatureManager().isEnabled(
302	302	FeatureManager.SINGLE_TEST_MANAGER)) {
303	303	Tool[] tools = d.getTools();
304		ArrayList list = new ArrayList();
	304	ArrayList<Tool> list = new ArrayList<>();
305	305	for (int i = 0; i < tools.length; i++) {
306	306	if (tools[i] instanceof ExecTool) {
307	307	ExecTool tool = (ExecTool) tools[i];

346	346	}
347	347
348	348	@Override
349		protected void save(Map m) {
	349	protected void save(Map<String, String> m) {
350	350	}
351	351
352	352	@Override
353		protected void restore(Map m) {
	353	protected void restore(Map<String, String> m) {
354	354	}
355	355
356	356	}

395	395	}
396	396	}
397	397
398		public Tool restoreTool(Map m) throws Fault {
	398	public Tool restoreTool(Map<String, String> m) throws Fault {
399	399	try {
400	400	//
401		String tsp = (String) (m.get("testSuite"));
	401	String tsp = m.get("testSuite");
402	402	TestSuite ts = TestSuite.open(new File(tsp));
403	403	ExecTool et = new ExecTool(this, ts);
404	404	et.restore(m);

429	429	}
430	430	}
431	431
432		private static InterviewParameters getInterview(Map m) throws Interview.Fault {
433		String tsp = (String) (m.get("testSuite"));
434		String wdp = (String) (m.get("workDir"));
435		String cfp = (String) (m.get("config"));
	432	private static InterviewParameters getInterview(Map<String, String> m) throws Interview.Fault {
	433	String tsp = (m.get("testSuite"));
	434	String wdp = (m.get("workDir"));
	435	String cfp = (m.get("config"));
436	436	if (isEmpty(tsp) && isEmpty(wdp) && isEmpty(cfp))
437	437	return null;
438	438

527	527	}
528	528
529	529	void showError(String key) {
530		showError(key, (String[]) null);
	530	showError(key, null);
531	531	}
532	532
533	533	void showError(String key, Object arg) {

+10

-10

src/com/sun/javatest/exec/FileSystemTableModel.java less more

41	41	static protected String[] cNames = {"File Name", "Name", "Description"};
42	42
43	43	// Types of the columns.
44		static protected Class[] cTypes = { String.class,
	44	static protected Class<?>[] cTypes = { String.class,
45	45	String.class, String.class};
46	46
47	47	private FileTableFilter filter = null;
48	48
49	49	private FileTableNode root;
50		private ArrayList data;
51		private LinkedHashMap fileData;
	50	private ArrayList<FileTableNode> data;
	51	private LinkedHashMap<String, String[]> fileData;
52	52	private boolean allowTraversDirs;
53	53	private File defTemplateDir;
54	54

81	81	return cNames[column];
82	82	}
83	83
84		public Class getColumnClass(int column) {
	84	public Class<?> getColumnClass(int column) {
85	85	return cTypes[column];
86	86	}
87	87

100	100
101	101	private void init(final File file) {
102	102	root = new FileTableNode(file, 'r');
103		data = new ArrayList();
	103	data = new ArrayList<>();
104	104
105	105	// if(allowTraversDirs) {
106	106	// data.add(new FileTableNode(root.getFile(), 'u'));

135	135
136	136	public Object getValueAt(int rowIndex, int columnIndex) {
137	137	if (rowIndex < 0 \|\| rowIndex >= data.size() ) return null;
138		FileTableNode f = (FileTableNode) data.get(rowIndex);
	138	FileTableNode f = data.get(rowIndex);
139	139	File file = f.getFile();
140	140	if (file == null) return null;
141	141	if (columnIndex == 0) return f;//file.getName();

147	147
148	148	public File getNode(int rowIndex) {
149	149	if (rowIndex < 0 \|\| rowIndex >= data.size() ) return null;
150		return ((FileTableNode) data.get(rowIndex)).getFile();
	150	return (data.get(rowIndex)).getFile();
151	151	}
152	152
153	153

165	165
166	166	private String[] getInfo(File file) {
167	167
168		if (fileData == null) fileData = new LinkedHashMap() {
169		protected boolean removeEldestEntry(Map.Entry eldest) {
	168	if (fileData == null) fileData = new LinkedHashMap<String, String[]>() {
	169	protected boolean removeEldestEntry(Map.Entry<String, String[]> eldest) {
170	170	return size() > 500;
171	171	}
172	172	};
173	173	String key = file.getAbsolutePath();
174		String[] value = (String[]) fileData.get(key);
	174	String[] value = fileData.get(key);
175	175	if (value != null) {
176	176	return value;
177	177	}

+13

-13

src/com/sun/javatest/exec/FilterConfig.java less more

101	101	return;
102	102
103	103	// record this filter officially
104		filters = (TestFilter[])DynamicArray.append(filters, f);
	104	filters = DynamicArray.append(filters, f);
105	105
106	106	// register as change observer if possible
107	107	if (f instanceof ObservableTestFilter) {

134	134	return;
135	135
136	136	// remove this filter officially
137		filters = (TestFilter[])DynamicArray.remove(filters, f);
	137	filters = DynamicArray.remove(filters, f);
138	138
139	139	if (f instanceof ObservableTestFilter)
140	140	((ObservableTestFilter)f).removeObserver(listener);

201	201
202	202	synchronized FilterSelectionHandler createFilterSelectionHandler() {
203	203	FilterSelectionHandler fsh = new FilterSelectionHandler(this, uif);
204		handlers = (FilterSelectionHandler[])DynamicArray.append(handlers, fsh);
	204	handlers = DynamicArray.append(handlers, fsh);
205	205
206	206	return fsh;
207	207	}

213	213	if (obs == null)
214	214	obs = new Observer[0];
215	215
216		obs = (Observer[])DynamicArray.append(obs, o);
	216	obs = DynamicArray.append(obs, o);
217	217	}
218	218
219	219	public synchronized void removeObserver(Observer o) {
220		obs = (Observer[])DynamicArray.remove(obs, o);
	220	obs = DynamicArray.remove(obs, o);
221	221	}
222	222
223	223	/**

402	402	leftList.setSelectedIndex(index);
403	403
404	404	// update right panel
405		selectedFilter = (TestFilter)(listModel.elementAt(index));
	405	selectedFilter = listModel.elementAt(index);
406	406	if (selectedFilter instanceof ConfigurableTestFilter) {
407	407	if (mode == -1 \|\| mode == UNEDITABLE) {
408	408	nameCards.show(namePanel, NAMING_ACTIVE);

416	416	ConfigurableTestFilter ctf = (ConfigurableTestFilter)selectedFilter;
417	417	namingName.setText(ctf.getName());
418	418
419		String cardKey = (String)(configPanelHash.get(ctf));
	419	String cardKey = configPanelHash.get(ctf);
420	420	configCards.show(configPanel, cardKey);
421	421	}
422	422	else if (selectedFilter instanceof TestFilter) {

503	503	selectIndex(0); // the default
504	504	}
505	505
506		private ListModel createListModel() {
507		listModel = new DefaultListModel();
	506	private ListModel<TestFilter> createListModel() {
	507	listModel = new DefaultListModel<>();
508	508
509	509	for (int i = 0; i < filters.length; i++)
510	510	listModel.addElement(filters[i]);

687	687	private JPanel createConfigPanel() {
688	688	configCards = new CardLayout();
689	689	configPanel = new JPanel(configCards);
690		configPanelHash = new Hashtable();
	690	configPanelHash = new Hashtable<>();
691	691
692	692	// insert panels?
693	693	configPanel.add(CONFIG_EMPTY, EMPTY_CONFIG);

809	809	}
810	810
811	811	private JSplitPane split;
812		private JList leftList;
813		private DefaultListModel listModel;
	812	private JList<TestFilter> leftList;
	813	private DefaultListModel<TestFilter> listModel;
814	814	private int lastSelected = -1;
815	815	private TestFilter selectedFilter;
816	816

842	842	// config panel
843	843	private CardLayout configCards;
844	844	private JPanel configPanel;
845		private Hashtable configPanelHash;
	845	private Hashtable<ConfigurableTestFilter, String> configPanelHash;
846	846	private int configCounter; // to make a unique string
847	847
848	848	private JComponent EMPTY_CONFIG;

+3

-3

src/com/sun/javatest/exec/FilterSelectionHandler.java less more

89	89	if (obs == null)
90	90	obs = new Observer[0];
91	91
92		obs = (Observer[])DynamicArray.append(obs, o);
	92	obs = DynamicArray.append(obs, o);
93	93	}
94	94
95	95	public void removeObserver(Observer o) {
96		obs = (Observer[])DynamicArray.remove(obs, o);
	96	obs = DynamicArray.remove(obs, o);
97	97	}
98	98
99	99	/**

349	349	private UIFactory uif;
350	350
351	351	private TestFilter activeFilter;
352		private JComboBox selectBox;
	352	private JComboBox<TestFilter> selectBox;
353	353	private JButton configButton;
354	354	private JMenu editMenu;
355	355	private ButtonGroup menuGroup;

+17

-16

src/com/sun/javatest/exec/InterviewEditor.java less more

64	64
65	65	import com.sun.interview.Interview;
66	66	import com.sun.interview.Question;
	67	import com.sun.interview.wizard.QuestionRenderer;
67	68	import com.sun.javatest.InterviewParameters;
68	69	import com.sun.javatest.TestSuite;
69	70	import com.sun.javatest.WorkDirectory;

749	750	return false;
750	751	}
751	752
752		Map aQuestions = a.getAllQuestions();
753		Map bQuestions = b.getAllQuestions();
754
755		Set keys = new TreeSet();
	753	Map<String, Question> aQuestions = a.getAllQuestions();
	754	Map<String, Question> bQuestions = b.getAllQuestions();
	755
	756	Set<String> keys = new TreeSet<>();
756	757	keys.addAll(aQuestions.keySet());
757	758	keys.addAll(bQuestions.keySet());
758	759
759		for (Iterator iter = keys.iterator(); iter.hasNext(); ) {
760		String key = (String) (iter.next());
761		Question aq = (Question) aQuestions.get(key);
762		Question bq = (Question) bQuestions.get(key);
	760	for (Iterator<String> iter = keys.iterator(); iter.hasNext(); ) {
	761	String key = (iter.next());
	762	Question aq = aQuestions.get(key);
	763	Question bq = bQuestions.get(key);
763	764	if (aq == null \|\| bq == null) {
764	765	return false;
765	766	}

787	788	}
788	789	}
789	790	// Checking external values
790		Set aKeys = a.getPropertyKeys();
791		Set bKeys = b.getPropertyKeys();
	791	Set<String> aKeys = a.getPropertyKeys();
	792	Set<String> bKeys = b.getPropertyKeys();
792	793
793	794	if (aKeys == null \|\| bKeys == null) {
794	795	return aKeys == bKeys;

798	799	return false;
799	800	}
800	801
801		for (Iterator iter = aKeys.iterator(); iter.hasNext(); ) {
802		String key = (String)iter.next();
	802	for (Iterator<String> iter = aKeys.iterator(); iter.hasNext(); ) {
	803	String key = iter.next();
803	804	if (!bKeys.contains(key)) {
804	805	return false;
805	806	}

935	936	JMenu fileMenu = uif.createMenu("ce.file", fileMenuItems, listener);
936	937
937	938	FileHistory h = FileHistory.getFileHistory(viewConfig.getWorkDirectory(), getHistoryFileName());
938		FileHistory.Listener l = new FileHistory.Listener(h, 0, (ActionListener)listener);
	939	FileHistory.Listener l = new FileHistory.Listener(h, 0, listener);
939	940	recentConfigMenu = uif.createMenu("ce.history");
940	941	recentConfigMenu.setEnabled(h.getLatestEntry() != null);
941	942	recentConfigMenu.addMenuListener(l);

1192	1193	throws Interview.Fault
1193	1194	{
1194	1195	//System.err.println("CE.copy from " + (from==mainConfig?"main":from==viewConfig?"view":from.toString()) + " to " + (to==mainConfig?"main":to==viewConfig?"view":to.toString()));
1195		HashMap data = new HashMap();
	1196	Map<String, String> data = new HashMap<>();
1196	1197	from.save(data);
1197	1198	to.load(data, false);
1198	1199	to.setTemplate(from.isTemplate());

1557	1558	private Listener listener;
1558	1559	//private TemplatesUI templatesUI;
1559	1560
1560		private Map customRenderersMap;
	1561	private Map<Class<? extends Question>, QuestionRenderer> customRenderersMap;
1561	1562	private ActionListener closeListener;
1562	1563	//private ExecModel model;
1563	1564	private final List<Observer> observers = new ArrayList<Observer>();

1587	1588	static final String VIEW_PREF = "exec.config.view";
1588	1589
1589	1590
1590		public void setCustomRenderers(Map renderersMap) {
	1591	public void setCustomRenderers(Map<Class<? extends Question>, QuestionRenderer> renderersMap) {
1591	1592	customRenderersMap = renderersMap;
1592	1593	if (fullView != null) {
1593	1594	fullView.setCustomRenderers(customRenderersMap);

+3

-3

src/com/sun/javatest/exec/JavaTestMenuManager.java less more

66	66	if (bank == null)
67	67	return null;
68	68	else {
69		ArrayList al = bank[position];
	69	ArrayList<JMenuItem> al = bank[position];
70	70	if (al.size() == 0)
71	71	return null;
72	72	else {

98	98	if (bank == null) {
99	99	bank = new ArrayList[NUM_POSITIONS];
100	100	for (int i = 0; i < NUM_POSITIONS; i++)
101		bank[i] = new ArrayList();
	101	bank[i] = new ArrayList<>();
102	102	}
103	103
104	104	bank[position].add(item);

128	128	public static final int TOOLS_OTHER = 17;
129	129
130	130	private static final int NUM_POSITIONS = 18;
131		private ArrayList[] bank;
	131	private ArrayList<JMenuItem>[] bank;
132	132	}

+5

-5

src/com/sun/javatest/exec/JavaTestToolBar.java less more

145	145	state.put(USER_TOOLBAR_PREF + getId(), Boolean.toString(visible));
146	146	}
147	147
148		void save(Map map) {
	148	void save(Map<String, Object> map) {
149	149	map.putAll(state);
150	150	}
151	151
152	152	/**
153	153	* Accepts Map with parameters from ExecTool
154	154	**/
155		void load(Map map) {
156		for (Object okey : map.keySet()) {
157		String key = (String)okey;
	155	void load(Map<String, Object> map) {
	156	for (String okey : map.keySet()) {
	157	String key = okey;
158	158	String tbKey = USER_TOOLBAR_PREF + getId();
159	159	if (key.contains(tbKey)) {
160	160	state.put(okey, map.get(okey));

231	231	private boolean inMenu = false;
232	232	private ResourceBundle theBundle;
233	233	private String id;
234		private Map state = new HashMap();
	234	private Map<String, Object> state = new HashMap<>();
235	235	}

+4

-4

src/com/sun/javatest/exec/LogViewer.java less more

975	975
976	976
977	977	private class CustomRenderer extends JComponent
978		implements ListCellRenderer {
	978	implements ListCellRenderer<Object> {
979	979	public Component getListCellRendererComponent(
980		JList list, Object value, int index, boolean isSelected,
	980	JList<?> list, Object value, int index, boolean isSelected,
981	981	boolean cellHasFocus) {
982	982	if (!(value instanceof JSeparator) && !(value instanceof JCheckBox)) {
983	983	DefaultListCellRenderer defRend = new DefaultListCellRenderer();

1134	1134	}
1135	1135
1136	1136	public void actionPerformed(ActionEvent e) {
1137		JComboBox cb = (JComboBox) e.getSource();
	1137	JComboBox<?> cb = (JComboBox<?>) e.getSource();
1138	1138	Object o = cb.getSelectedItem();
1139	1139	if (o instanceof FilterComboboxItem) {
1140	1140	FilterComboboxItem fc = (FilterComboboxItem) o;

1299	1299	LoggerFactory.getLocalizedLevelName(Level.FINE) } ;
1300	1300
1301	1301	private DefaultMutableTreeNode treeRoot;
1302		private JComboBox filterCombo;
	1302	private JComboBox<?> filterCombo;
1303	1303	private JTree filterTree ;
1304	1304
1305	1305	private boolean noWindow = false;

+1

-1

src/com/sun/javatest/exec/MessageStrip.java less more

335	335	private JButton selectButt;
336	336	private JButton magButt;
337	337
338		private JComboBox selector;
	338	private JComboBox<Monitor> selector;
339	339	private JPopupMenu popMenu;
340	340	private ActionListener actionListener = new SelectionListener();
341	341	private ActionListener zoomListener;

+3

-3

src/com/sun/javatest/exec/MonitorState.java less more

81	81	}
82	82
83	83	void addObserver(Observer o) {
84		obs = (Observer[])DynamicArray.append(obs, o);
	84	obs = DynamicArray.append(obs, o);
85	85	}
86	86
87	87	void removeObserver(Observer o) {
88		obs = (Observer[])DynamicArray.remove(obs, o);
	88	obs = DynamicArray.remove(obs, o);
89	89	}
90	90
91	91	/**

324	324	private Observer[] obs = new Observer[0];
325	325	private volatile int[] stats;
326	326
327		private ArrayList<TestResult> runningTests = new ArrayList(5);
	327	private ArrayList<TestResult> runningTests = new ArrayList<>(5);
328	328	private final Object vLock = new Object();
329	329
330	330	/**

+9

-8

src/com/sun/javatest/exec/MultiFormatPane.java less more

40	40	import java.util.HashMap;
41	41	import java.util.Iterator;
42	42	import javax.imageio.ImageIO;
	43	import javax.imageio.ImageReader;
43	44	import javax.imageio.stream.ImageInputStream;
44	45	import javax.sound.midi.InvalidMidiDataException;
45	46	import javax.sound.midi.MidiFileFormat;

80	81	listener = new Listener();
81	82	initGUI();
82	83
83		modesToPanes = new HashMap();
	84	modesToPanes = new HashMap<>();
84	85
85	86	addMediaPane(TEXT, textPane);
86	87	addMediaPane(AUDIO, musicPane);

102	103	}
103	104
104	105	public MediaPane getMediaPane(int mode) {
105		return (MediaPane)modesToPanes.get(mode);
	106	return modesToPanes.get(mode);
106	107	}
107	108
108	109	public void clear() {

557	558	private JTextField noteField;
558	559	private NavigationPane navPane;
559	560
560		private HashMap modesToPanes;
	561	private HashMap<Integer, MediaPane> modesToPanes;
561	562	}
562	563
563	564

657	658	String ext = filename.substring(filename.lastIndexOf('.') + 1);
658	659	ext = ext.toLowerCase();
659	660
660		return (String)extensionsToMIME.get(ext);
	661	return extensionsToMIME.get(ext);
661	662	}
662	663
663	664	public void showTextArea() {

717	718	private RTFEditorKit rtfKit;
718	719
719	720
720		private static HashMap extensionsToMIME;
	721	private static HashMap<String, String> extensionsToMIME;
721	722	static {
722		extensionsToMIME = new HashMap();
	723	extensionsToMIME = new HashMap<>();
723	724	extensionsToMIME.put("html", "text/html");
724	725	extensionsToMIME.put("htm", "text/html");
725	726	extensionsToMIME.put("htmls", "text/html");

958	959	public static boolean isImageResource(URL url) {
959	960	String file = url.getFile();
960	961	String ext = file.substring(file.lastIndexOf('.')+1);
961		Iterator iter = ImageIO.getImageReadersBySuffix(ext);
	962	Iterator<ImageReader> iter = ImageIO.getImageReadersBySuffix(ext);
962	963	return iter.hasNext();
963	964	}
964	965
965	966	public static boolean isImageFormatSupported(URL url) {
966	967	try {
967	968	ImageInputStream iis = ImageIO.createImageInputStream(new File(url.getFile()));
968		Iterator iter = ImageIO.getImageReaders(iis);
	969	Iterator<ImageReader> iter = ImageIO.getImageReaders(iis);
969	970	if(!iter.hasNext())
970	971	return false;
971	972	} catch (IOException exc) {

+3

-3

src/com/sun/javatest/exec/MultiSelectPanel.java less more

90	90	setLayout(new GridBagLayout());
91	91	setMinimumSize(new Dimension(150, 100));
92	92
93		listModel = new DefaultListModel();
	93	listModel = new DefaultListModel<>();
94	94	nodeList = uif.createList("ms.nlist", listModel);
95	95	GridBagConstraints gbc = new GridBagConstraints();
96	96	gbc.weightx= 1.0;

166	166
167	167	private TestTreeModel ttm;
168	168	private TreePanelModel tpm;
169		private JList nodeList;
170		private DefaultListModel listModel;
	169	private JList<?> nodeList;
	170	private DefaultListModel<Object> listModel;
171	171	private Object[] nodes;
172	172
173	173	private UIFactory uif;

+9

-9

src/com/sun/javatest/exec/NavigationPane.java less more

209	209	}
210	210
211	211
212		private DefaultComboBoxModel createModel() {
	212	private DefaultComboBoxModel<URL> createModel() {
213	213	if (model == null)
214		model = new DefaultComboBoxModel();
	214	model = new DefaultComboBoxModel<>();
215	215	return model;
216	216	}
217	217

248	248	if (index == 0)
249	249	return null;
250	250
251		return (URL) (entries.elementAt(--index));
	251	return entries.elementAt(--index);
252	252	}
253	253
254	254	boolean hasNext() {

259	259	if (index == entries.size() - 1)
260	260	return null;
261	261
262		return (URL) (entries.elementAt(++index));
	262	return entries.elementAt(++index);
263	263	}
264	264
265	265	void add(URL u) {

284	284	index = -1;
285	285	}
286	286
287		private Vector entries = new Vector();
	287	private Vector<URL> entries = new Vector<>();
288	288	private int index;
289	289	}
290	290

303	303	sf = new StringFitter(getFontMetrics(getFont()));
304	304	}
305	305
306		public Component getListCellRendererComponent(JList list, Object o, int index, boolean isSelected, boolean cellHasFocus) {
	306	public Component getListCellRendererComponent(JList<?> list, Object o, int index, boolean isSelected, boolean cellHasFocus) {
307	307	String name = null;
308	308	if (o instanceof URL) {
309	309	URL url = (URL) o;

366	366	private JButton backBtn;
367	367	private JButton forwardBtn;
368	368
369		private JComboBox selectBox;
370
371		private DefaultComboBoxModel model;
	369	private JComboBox<URL> selectBox;
	370
	371	private DefaultComboBoxModel<URL> model;
372	372	private Listener listener = new Listener();
373	373	private JToolBar toolBar;
374	374

+51

-56

src/com/sun/javatest/exec/NewReportDialog.java less more

111	111	* The dialog is done. Notify the observer to keep a snapshot of
112	112	* current state.
113	113	*/
114		public void update(Map l);
	114	public void update(Map<String, String> l);
115	115
116	116	// starting
117	117	public void writingReport();

140	140
141	141	// ---------------------------------------------------------------------------
142	142
143		void setLastState(Map h) {
144		String rd = (String) (h.get(REPORT_DIR));
145		String filter = (String) (h.get(FILTER));
	143	void setLastState(Map<String, String> h) {
	144	String rd = (h.get(REPORT_DIR));
	145	String filter = (h.get(FILTER));
146	146
147	147	if (dirField == null)
148	148	initGUI();

156	156	updateCofCheckboxStates();
157	157	}
158	158
159		Map getLastState() {
160		String rd = (String) (dirField.getText());
	159	Map<String, String> getLastState() {
	160	String rd = dirField.getText();
161	161	String filter = filterHandler.getActiveFilter().getName();
162		Map lastState = new HashMap();
	162	Map<String, String> lastState = new HashMap<>();
163	163
164	164	if (rd != null && rd.length() > 0)
165	165	lastState.put(REPORT_DIR, rd);

171	171	}
172	172
173	173	void addObserver(Observer o) {
174		obs = (Observer[])DynamicArray.append(obs, o);
	174	obs = DynamicArray.append(obs, o);
175	175	}
176	176
177	177	void removeObserver(Observer o) {
178		obs = (Observer[])DynamicArray.remove(obs, o);
	178	obs = DynamicArray.remove(obs, o);
179	179	}
180	180
181	181	// Notify the observers that a change has been made.
182		private void notifyUpdate(Map s) {
	182	private void notifyUpdate(Map<String, String> s) {
183	183	for (Observer o : obs) {
184	184	o.update(s);
185	185	}

298	298	tabs.setTabPlacement(SwingConstants.TOP);
299	299	tabs.setBorder(BorderFactory.createEmptyBorder());
300	300
301		listModel = new DefaultListModel();
	301	listModel = new DefaultListModel<>();
302	302
303	303	// populate list and card panel
304	304	final CardLayout cards = new CardLayout();

380	380	if (itemCount > 9) itemCount = 9;
381	381	for (int i = 1; i <= itemCount; ++i) {
382	382	list.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(i + '0', InputEvent.ALT_DOWN_MASK), ACTION_MAP_KEY);
383		JCheckBox box = ((JCheckBox)listModel.getElementAt(i - 1));
	383	JCheckBox box = listModel.getElementAt(i - 1);
384	384	box.setMnemonic(i + '0');
385	385	box.setText(Character.toString((char)('0' + i)) + " " + box.getText());
386	386	}
387	387
388	388	if (listModel.size() == 10){
389	389	list.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke('0', InputEvent.ALT_DOWN_MASK), ACTION_MAP_KEY);
390		JCheckBox box = ((JCheckBox)listModel.getElementAt(9));
	390	JCheckBox box = listModel.getElementAt(9);
391	391	box.setMnemonic('0');
392	392	box.setText("0 " + box.getText());
393	393	}

780	780	return 0;
781	781	}
782	782
783		customBoxes = new HashMap();
	783	customBoxes = new HashMap<>();
784	784
785	785	for (int i = 0; i < customReports.length; i++) {
786	786	JCheckBox cb = new JCheckBox(customReports[i].getName());

815	815	*/
816	816	private boolean hasSelectedCheckBox() {
817	817	for (int i = 0; i < listModel.getSize(); i++) {
818		if (((JCheckBox)listModel.getElementAt(i)).isSelected()) {
	818	if (listModel.getElementAt(i).isSelected()) {
819	819	return true;
820	820	}
821	821	}

845	845	}
846	846	else {
847	847	String[] names = Report.getHtmlReportFilenames();
848		ArrayList possible = new ArrayList();
	848	ArrayList<File> possible = new ArrayList<>();
849	849
850	850	for (int i = 0; i < names.length; i++) {
851	851	File rpt = new File(reportDir, names[i]);

862	862	long newestTime = 0;
863	863
864	864	for (int i = 0; i < possible.size(); i++) {
865		File file = (File)(possible.get(i));
	865	File file = possible.get(i);
866	866	if (file.lastModified() > newestTime) {
867	867	newestF = file;
868	868	newestTime = file.lastModified();

898	898
899	899	private ArrayList<CustomReport> getActiveCustomReports() {
900	900
901		ArrayList customReps = new ArrayList();
	901	ArrayList<CustomReport> customReps = new ArrayList<>();
902	902	if (customBoxes != null && customBoxes.size() > 0) {
903		Iterator it = customBoxes.keySet().iterator();
	903	Iterator<JCheckBox> it = customBoxes.keySet().iterator();
904	904	while (it.hasNext()) {
905		JCheckBox box = (JCheckBox)(it.next());
	905	JCheckBox box = (it.next());
906	906	if (box.isSelected()) {
907	907	customReps.add(customBoxes.get(box));
908	908	}

921	921
922	922	if (!cbHtml.isSelected()) {
923	923	for (int i = 0; i < htmlGroup.size(); i++)
924		((JCheckBox)(htmlGroup.get(i))).setEnabled(false);
	924	htmlGroup.get(i).setEnabled(false);
925	925	}
926	926	else {
927	927	for (int i = 0; i < htmlGroup.size(); i++)
928		((JCheckBox)(htmlGroup.get(i))).setEnabled(true);
	928	htmlGroup.get(i).setEnabled(true);
929	929	for (int i = 0; i < configGroup.size(); i++)
930		((JCheckBox)(configGroup.get(i))).setEnabled(cbConfig.isSelected());
	930	configGroup.get(i).setEnabled(cbConfig.isSelected());
931	931	}
932	932	}
933	933

1078	1078	}
1079	1079	}
1080	1080	else if (src == okBtn) {
1081		String s = (String) dirField.getText();
	1081	String s = dirField.getText();
1082	1082
1083	1083	// check null input
1084	1084	if (s == null \|\| s.length() == 0) {

1095	1095	}
1096	1096
1097	1097	// validate custom reports
1098		Iterator it = getActiveCustomReports().iterator();
	1098	Iterator<CustomReport> it = getActiveCustomReports().iterator();
1099	1099	while (it.hasNext()) {
1100		CustomReport cr = (CustomReport) it.next();
	1100	CustomReport cr = it.next();
1101	1101	String error = cr.validateOptions();
1102	1102	if (error != null) {
1103	1103	for (int i = 0; i < listModel.getSize(); i++ ) {
1104		JCheckBox cb = (JCheckBox)listModel.elementAt(i);
	1104	JCheckBox cb = listModel.elementAt(i);
1105	1105	if (cb.getName().equals(cr.getReportId())) {
1106	1106	list.setSelectedIndex(i);
1107	1107	}

1366	1366	* @param p parent Panel
1367	1367	* @param cardLayout The CardLayout for options
1368	1368	*/
1369		SelectListener(JList lst, JPanel p, CardLayout cardLayout ) {
	1369	SelectListener(JList<?> lst, JPanel p, CardLayout cardLayout ) {
1370	1370	list = lst;
1371	1371	listModel = list.getModel();
1372	1372	lastSelected = listModel.getElementAt(0);

1408	1408	tab.setEnabled(box.isSelected());
1409	1409	}
1410	1410	if (customBoxes != null) {
1411		CustomReport rep = (CustomReport) customBoxes.get(box);
	1411	CustomReport rep = customBoxes.get(box);
1412	1412	if (rep != null && rep.getOptionPanes() != null) {
1413	1413	for (int i = 0; i < rep.getOptionPanes().length; i++) {
1414	1414	rep.getOptionPanes()[i].setEnabled(box.isSelected());

1429	1429	else if (box == cbCof)
1430	1430	infoArea.setText(uif.getI18NString("nrd.info.cof.txt"));
1431	1431	else if (customBoxes != null) {
1432		CustomReport rep = (CustomReport) customBoxes.get(box);
	1432	CustomReport rep = customBoxes.get(box);
1433	1433	if (rep != null)
1434	1434	infoArea.setText(rep.getDescription());
1435	1435	}

1476	1476	}
1477	1477
1478	1478	Object lastSelected;
1479		JList list;
1480		ListModel listModel;
	1479	JList<?> list;
	1480	ListModel<?> listModel;
1481	1481	JPanel panel;
1482	1482	CardLayout cards;
1483	1483	JButton okBtn = null; // should be disable iff all check boxes are off

1500	1500	*/
1501	1501	public void propertyChange(PropertyChangeEvent evt) {
1502	1502	if ("enabled".equals(evt.getPropertyName())) {
1503		boolean oldV = ((Boolean) evt.getOldValue()).booleanValue();
1504		boolean newV = ((Boolean) evt.getNewValue()).booleanValue();
	1503	boolean oldV = (Boolean) evt.getOldValue();
	1504	boolean newV = (Boolean) evt.getNewValue();
1505	1505	if (oldV && !newV) {
1506	1506	// disable
1507		Iterator chIt = collectChildren(theContainer, new ArrayList()).iterator();
1508		enabledComp = new HashSet();
1509		while (chIt.hasNext()) {
1510		Component c = (Component) chIt.next();
	1507	enabledComp = new HashSet<>();
	1508	for (Component c: collectChildren(theContainer, new ArrayList<Component>())) {
1511	1509	if (c.isEnabled()) {
1512	1510	enabledComp.add(c);
1513	1511	c.setEnabled(false);
1514	1512	}
1515	1513	}
1516
1517	1514	} else if (!oldV && newV && enabledComp != null) {
1518	1515	// enable
1519		Iterator chIt = collectChildren(theContainer, new ArrayList()).iterator();
1520		while (chIt.hasNext()) {
1521		Component c = (Component) chIt.next();
	1516	for (Component c: collectChildren(theContainer, new ArrayList<Component>())) {
1522	1517	if (enabledComp.contains(c)) {
1523	1518	c.setEnabled(true);
1524	1519	}

1530	1525	/**
1531	1526	* Recursively gathers all children components
1532	1527	*/
1533		private Collection collectChildren(Container comp, Collection c) {
	1528	private Collection<Component> collectChildren(Container comp, Collection<Component> c) {
1534	1529	Component [] ch = comp.getComponents();
1535	1530	for(int i = 0; i < ch.length; i++) {
1536	1531	c.add(ch[i]);

1542	1537	}
1543	1538
1544	1539	private Container theContainer;
1545		private HashSet enabledComp;
1546		}
1547
1548		private class CheckBoxListCellRenderer implements ListCellRenderer {
	1540	private HashSet<Component> enabledComp;
	1541	}
	1542
	1543	private class CheckBoxListCellRenderer implements ListCellRenderer<JComponent> {
1549	1544	public Component getListCellRendererComponent(
1550		JList list,
1551		Object value,
	1545	JList<? extends JComponent> list,
	1546	JComponent value,
1552	1547	int index,
1553	1548	boolean isSelected,
1554	1549	boolean cellHasFocus) {
1555	1550	// assert: value is a JCheckBox
1556		JComponent comp = (JComponent)value;
	1551	JComponent comp = value;
1557	1552	if (isSelected) {
1558	1553	comp.setOpaque(true);
1559	1554	comp.setBackground(list.getSelectionBackground());

1573	1568
1574	1569	private ReportDirChooser reportDirChooser;
1575	1570
1576		private DefaultListModel listModel;
1577		private JList list;
	1571	private DefaultListModel<JCheckBox> listModel;
	1572	private JList<? extends JComponent> list;
1578	1573	private JTextArea infoArea;
1579	1574	private CustomReport[] customReports;
1580		private HashMap customBoxes;
	1575	private HashMap<JCheckBox, CustomReport> customBoxes;
1581	1576
1582	1577	private JComponent[] panes;
1583	1578	private JCheckBox cbHtml;

1610	1605	private JCheckBox cbBak;
1611	1606	private JTextField numBak;
1612	1607
1613		private ArrayList htmlGroup = new ArrayList();
1614		private ArrayList configGroup = new ArrayList();
1615		private ArrayList kflGroup = new ArrayList();
	1608	private ArrayList<JCheckBox> htmlGroup = new ArrayList<>();
	1609	private ArrayList<JCheckBox> configGroup = new ArrayList<>();
	1610	private ArrayList<JCheckBox> kflGroup = new ArrayList<>();
1616	1611
1617	1612	private File reportDir;
1618	1613	private JButton browseBtn;

+16

-16

src/com/sun/javatest/exec/PrefsPane.java less more

80	80	}
81	81
82	82	@Override
83		public void load(Map m) {
	83	public void load(Map<String, String> m) {
84	84	super.load(m);
85		String p = (String) (m.get(ExecTool.TOOLBAR_PREF));
	85	String p = m.get(ExecTool.TOOLBAR_PREF);
86	86	toolBarChk.setSelected(p == null \|\| p.equals("true"));
87		p = (String) (m.get(ExecTool.FILTER_WARN_PREF));
	87	p = m.get(ExecTool.FILTER_WARN_PREF);
88	88	filterWarnChk.setSelected(p == null \|\| p.equals("true"));
89		p = (String) (m.get(TP_OutputSubpanel.LINE_WRAP_PREF));
	89	p = m.get(TP_OutputSubpanel.LINE_WRAP_PREF);
90	90	// selected by default
91	91	wrapResChk.setSelected((p == null ? true : p.equals("true")));
92	92	}
93	93
94	94	@Override
95		public void save(Map m) {
	95	public void save(Map<String, String> m) {
96	96	super.save(m);
97	97	m.put(ExecTool.TOOLBAR_PREF, String.valueOf(toolBarChk.isSelected()));
98	98	m.put(ExecTool.FILTER_WARN_PREF, String.valueOf(filterWarnChk.isSelected()));

175	175	}
176	176
177	177	@Override
178		public void load(Map m) {
179		String mp = (String) (m.get(InterviewEditor.MORE_INFO_PREF));
	178	public void load(Map<String, String> m) {
	179	String mp = m.get(InterviewEditor.MORE_INFO_PREF);
180	180	moreInfoChk.setSelected(mp == null \|\| mp.equals("true"));
181	181	}
182	182
183	183	@Override
184		public void save(Map m) {
	184	public void save(Map<String, String> m) {
185	185	m.put(InterviewEditor.MORE_INFO_PREF, String.valueOf(moreInfoChk.isSelected()));
186	186	}
187	187

236	236	}
237	237
238	238	@Override
239		public void load(Map m) {
240		String mp = (String) (m.get(ReportManager.BUGRPT_URL_PREF));
	239	public void load(Map<String, String> m) {
	240	String mp = m.get(ReportManager.BUGRPT_URL_PREF);
241	241	bugUrlTf.setText(mp);
242	242	}
243	243
244	244	@Override
245		public void save(Map m) {
	245	public void save(Map<String, String> m) {
246	246	m.put(ReportManager.BUGRPT_URL_PREF, bugUrlTf.getText());
247	247	}
248	248

306	306	}
307	307
308	308	@Override
309		public void load(Map m) {
310		String mp = (String) (m.get("javatest.executionOrder"));
	309	public void load(Map<String, String> m) {
	310	String mp = m.get("javatest.executionOrder");
311	311	if (mp == null) {
312	312	mp = "default";
313	313	}

322	322	defaultRadio.setSelected(true);
323	323	}
324	324
325		mp = (String) (m.get(ExecTool.TESTS2RUN_PREF));
	325	mp = m.get(ExecTool.TESTS2RUN_PREF);
326	326	tests2RunChk.setSelected((mp == null ? false : mp.equals("true")));
327		mp = (String) (m.get("javatest.sortExecution"));
	327	mp = m.get("javatest.sortExecution");
328	328	testSortingChk.setSelected((mp == null ? false : mp.equals("false")));
329	329	}
330	330
331	331	@Override
332		public void save(Map m) {
	332	public void save(Map<String, String> m) {
333	333	m.put(ExecTool.TESTS2RUN_PREF, String.valueOf(tests2RunChk.isSelected()));
334	334	m.put("javatest.sortExecution", Boolean.toString(!testSortingChk.isSelected()));
335	335

+3

-4

src/com/sun/javatest/exec/ProgressMonitor.java less more

474	474	}
475	475
476	476	private void initRunningCard() {
477		testListData = new DefaultListModel();
478		final JList list = uif.createList("pm.runlist", testListData);
	477	testListData = new DefaultListModel<>();
	478	final JList<?> list = uif.createList("pm.runlist", testListData);
479	479	list.setBorder(BorderFactory.createEtchedBorder());
480	480	list.setCellRenderer(RenderingUtilities.createTestListRenderer());
481	481	list.addMouseListener(new MouseAdapter() {

513	513	private JComponent runningCard;
514	514
515	515	private JTextField fileField;
516		private DefaultListModel testListData;
517		private JList testList;
	516	private DefaultListModel<TestResult> testListData;
518	517	private String rootDir;
519	518	}
520	519

+17

-24

src/com/sun/javatest/exec/QuickStartWizard.java less more

46	46	import java.io.InputStream;
47	47	import java.io.FileInputStream;
48	48	import java.net.URL;
49		import java.util.Properties;
50		import java.util.Set;
51		import java.util.TreeSet;
52		import java.util.Vector;
	49	import java.util.*;
53	50	import javax.swing.BorderFactory;
54	51	import javax.swing.ButtonGroup;
55	52	import javax.swing.Icon;

269	266	private void doBack() {
270	267	int n = history.size();
271	268	if (n > 0) {
272		Pane p = (Pane) (history.remove(n - 1));
	269	Pane p = history.remove(n - 1);
273	270	setPane(p);
274	271	}
275	272	}

333	330	// indicates using jtm or jti templates
334	331	private boolean jtmTemplate = true;
335	332
336		private Properties configData;
	333	private Map<String, String> configData;
337	334	private File configFile;
338	335	private Properties jtmData;
339	336	private File jtmFile;

364	361	private JButton doneBtn;
365	362	private Listener listener = new Listener();
366	363	private KeyStroke enterKey = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0);
367		private Vector history = new Vector();
	364	private Vector<Pane> history = new Vector<>();
368	365	private boolean allowConfigLoadOutsideDefault;
369	366	private File defaultConfigSavePath;
370	367	private boolean allowConfigSaveOutsideDefault;

535	532
536	533	private JLabel label;
537	534	private JTextField field;
538		private JComboBox combo;
	535	private JComboBox<String> combo;
539	536	private JComponent currPathComp;
540	537	private JButton button;
541	538	private DocumentListener listener;

714	711
715	712	Pane getNext() {
716	713
717		return (task == NEW \|\| task == BROWSE ? (Pane) testSuitePane
718		: task == RESUME ? (Pane) openWorkDirPane
	714	return (task == NEW \|\| task == BROWSE ? testSuitePane
	715	: task == RESUME ? openWorkDirPane
719	716	: null);
720	717	}
721	718

841	838	}
842	839	}
843	840
844		return (task == NEW ? (Pane) newWorkDirPane : (Pane) endPane);
	841	return (task == NEW ? newWorkDirPane : endPane);
845	842	}
846	843
847	844
848	845
849	846	if (configData != null) {
850		String configDataInterview = (String) (configData.get("INTERVIEW"));
	847	String configDataInterview = configData.get("INTERVIEW");
851	848
852	849	if (configDataInterview != null
853	850	&& !config.getClass().getName().equals(configDataInterview)) {

864	861	}
865	862	}
866	863
867		return (config == null ? null : task == NEW ? (Pane) newWorkDirPane : (Pane) endPane);
	864	return (config == null ? null : task == NEW ? newWorkDirPane : endPane);
868	865
869	866	}
870	867

889	886	}
890	887
891	888	try {
892		InputStream in = new BufferedInputStream(new FileInputStream(f));
893
894		try {
	889
	890	try (InputStream in = new BufferedInputStream(new FileInputStream(f))) {
895	891	data.clear();
896	892	data.load(in);
897	893	file = f;

900	896	// can get IllegalArgumentException if the file is corrupt
901	897	uif.showError("qsw.cfg.cantReadFile", e);
902	898	return null;
903		}
904		finally {
905		in.close();
906	899	}
907	900	}
908	901	catch (IOException e) {

949	942	// - installation directory and its parent
950	943	// - current directory
951	944
952		Set s = new TreeSet();
	945	Set<String> s = new TreeSet<>();
953	946	if (configData != null) {
954		String configTestSuite = (String) (configData.get("TESTSUITE"));
	947	String configTestSuite = configData.get("TESTSUITE");
955	948	if (configTestSuite != null)
956	949	s.add(configTestSuite);
957	950	}

966	959	s.add(installParentDir.getPath());
967	960
968	961	if (s.size() > 0)
969		testSuitePanel.setSuggestions((String[]) (s.toArray(new String[s.size()])));
	962	testSuitePanel.setSuggestions( s.toArray(new String[s.size()]));
970	963	}
971	964
972	965	void updateNextButton() {

1039	1032	}
1040	1033
1041	1034
1042		return (task == NEW \|\| task == BROWSE ? (Pane) configPane
1043		: task == RESUME ? (Pane) openWorkDirPane
	1035	return (task == NEW \|\| task == BROWSE ? configPane
	1036	: task == RESUME ? openWorkDirPane
1044	1037	: null);
1045	1038
1046	1039	// return (config == null ? null : task == NEW ? (Pane) newWorkDirPane : (Pane) endPane);

+11

-11

src/com/sun/javatest/exec/RenderingUtilities.java less more

40	40	import com.sun.javatest.util.I18NResourceBundle;
41	41
42	42	class RenderingUtilities {
43		static ListCellRenderer createTestListRenderer() {
	43	static ListCellRenderer<Object> createTestListRenderer() {
44	44	return new TestCellRenderer(i18n);
45	45	}
46	46
47		static ListCellRenderer createTRTNodeRenderer() {
	47	static ListCellRenderer<Object> createTRTNodeRenderer() {
48	48	return new TestCellRenderer(i18n);
49	49	}
50	50
51		static ListCellRenderer createFilterListRenderer() {
	51	static ListCellRenderer<TestFilter> createFilterListRenderer() {
52	52	return new FilterCellRenderer(i18n);
53	53	}
54	54

62	62	/**
63	63	* Render a list of tests (TestResult objects).
64	64	*/
65		static class TestCellRenderer extends JLabel implements ListCellRenderer {
	65	static class TestCellRenderer extends JLabel implements ListCellRenderer<Object> {
66	66	public TestCellRenderer(I18NResourceBundle i18n) {
67	67	setOpaque(false);
68	68	this.i18n = i18n;
69	69	}
70	70
71		public Component getListCellRendererComponent(JList list,
	71	public Component getListCellRendererComponent(JList<?> list,
72	72	Object value, int index, boolean isSelected, boolean cellHasFocus) {
73	73	if (value == null) // very strange...
74	74	return this;

106	106	return this;
107	107	}
108	108
109		private void setBasicAttribs(boolean isSelected, JList list) {
	109	private void setBasicAttribs(boolean isSelected, JList<?> list) {
110	110	// Hopefully safe to share...will help with saving space
111	111	// This border is to provide space between the text and the
112	112	// side of the widget, helping readability.

132	132	* Render a list of test filters with their descriptive name.
133	133	* @see com.sun.javatest.TestFilter#getName()
134	134	*/
135		static class FilterCellRenderer extends JLabel implements ListCellRenderer {
	135	static class FilterCellRenderer extends JLabel implements ListCellRenderer<TestFilter> {
136	136	public FilterCellRenderer(I18NResourceBundle i18n) {
137	137	setOpaque(false);
138	138	this.i18n = i18n;
139	139	}
140	140
141		public Component getListCellRendererComponent(JList list,
142		Object value, int index, boolean isSelected, boolean cellHasFocus) {
	141	public Component getListCellRendererComponent(JList<? extends TestFilter> list,
	142	TestFilter value, int index, boolean isSelected, boolean cellHasFocus) {
143	143
144	144	String name = null;
145	145
146		TestFilter filter = (TestFilter)value;
	146	TestFilter filter = value;
147	147	name = filter.getName();
148	148
149	149	//setToolTipText(filter.getDescription());

158	158	return this;
159	159	}
160	160
161		private void setColors(boolean isSelected, JList list) {
	161	private void setColors(boolean isSelected, JList<?> list) {
162	162	if (isSelected) {
163	163	setOpaque(true);
164	164	setForeground(list.getSelectionForeground());

+9

-9

src/com/sun/javatest/exec/ReportHandler.java less more

118	118	getReportBrowser(), model);
119	119
120	120	newReportD.addObserver(new NewReportDialog.Observer() {
121		public void update(Map l) {
	121	public void update(Map<String, String> l) {
122	122	lastState = l;
123	123	String lastReportDir =
124		(String) (lastState.get(NewReportDialog.REPORT_DIR));
	124	lastState.get(NewReportDialog.REPORT_DIR);
125	125
126	126	if (lastReportDir != null)
127	127	history.add(new File(lastReportDir));

210	210	}
211	211	}
212	212
213		public void save(Map parentMap) {
	213	public void save(Map<String, String> parentMap) {
214	214	if (lastState != null && lastState.size() > 0) {
215		PrefixMap pm = new PrefixMap(parentMap, REPORT_PREFIX);
	215	PrefixMap<String> pm = new PrefixMap<>(parentMap, REPORT_PREFIX);
216	216	pm.putAll(lastState);
217	217	}
218	218	}
219	219
220		public void restore(Map parentMap) {
	220	public void restore(Map<String, String> parentMap) {
221	221	if (parentMap == null)
222	222	return;
223	223
224	224	try {
225		PrefixMap pm = new PrefixMap(parentMap, REPORT_PREFIX);
	225	PrefixMap<String> pm = new PrefixMap<>(parentMap, REPORT_PREFIX);
226	226	if (pm == null) return;
227	227
228	228	Object[] keys = pm.keySet().toArray();
229	229	if (lastState == null)
230		lastState = new HashMap();
	230	lastState = new HashMap<>();
231	231
232	232	for (int i = 0; i < keys.length; i++) {
233	233	String key = (String) keys[i];
234		String value = (String) pm.get(keys[i]);
	234	String value = pm.get(keys[i]);
235	235
236	236	if (value != null)
237	237	lastState.put(key, value);

327	327	private FileHistory.Listener reportHistoryListener;
328	328	private FileHistory history;
329	329	private File lastOpenPath;
330		private Map lastState;
	330	private Map<String, String> lastState;
331	331	private ExecModel model;
332	332	private NewReportDialog newReportD;
333	333	private ReportBrowser reportBrowser;

+6

-6

src/com/sun/javatest/exec/RunTestsHandler.java less more

170	170	return Arrays.asList(getToolBarActions());
171	171	}
172	172
173		public void save(Map m) {
174		}
175		public void restore(Map m) {
	173	public void save(Map<String, String> m) {
	174	}
	175	public void restore(Map<String, String> m) {
176	176	}
177	177
178	178	public synchronized void dispose() {

280	280	new Object[] {params.getEnv().getName()});
281	281	p.setLayout(new BorderLayout());
282	282	p.add(msg, BorderLayout.NORTH);
283		DefaultListModel model = new DefaultListModel();
	283	DefaultListModel<String> model = new DefaultListModel<>();
284	284	for (int i = paths.length; i > 0; i--)
285	285	model.add(model.getSize(), paths[model.getSize()]);
286	286
287		JList list = uif.createList("rh.confirmList", model);
	287	JList<?> list = uif.createList("rh.confirmList", model);
288	288	p.add(uif.createScrollPane(list,
289	289	ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
290	290	ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED), BorderLayout.CENTER);

370	370	* @since 4.2.1
371	371	*/
372	372	static String[] reprocessTests2Run(final String[] requested, final String[] iTests) {
373		ArrayList<String> result = new ArrayList();
	373	ArrayList<String> result = new ArrayList<>();
374	374	outer:
375	375	for (int i = 0; i < requested.length; i++) {
376	376	String curr = requested[i];

+2

-2

src/com/sun/javatest/exec/Session.java less more

148	148	* @param map
149	149	* @throws com.sun.javatest.exec.Session.Fault
150	150	*/
151		public void save(Map map);
	151	public void save(Map<String, String> map);
152	152
153	153
154	154	/**

163	163	* @param map
164	164	* @throws com.sun.javatest.exec.Session.Fault
165	165	*/
166		public void restore(Map map) throws Fault;
	166	public void restore(Map<String, String> map) throws Fault;
167	167
168	168	/**
169	169	* Disposes configuration. Critical when heavy objects were used.

+2

-2

src/com/sun/javatest/exec/TP_DescSubpanel.java less more

53	53	return;
54	54	}
55	55
56		for (Iterator iter = td.getParameterKeys(); iter.hasNext(); ) {
57		String key = (String)(iter.next());
	56	for (Iterator<String> iter = td.getParameterKeys(); iter.hasNext(); ) {
	57	String key = (iter.next());
58	58	String val = td.getParameter(key);
59	59	updateEntry(key, val);
60	60	}

+8

-8

src/com/sun/javatest/exec/TP_OutputSubpanel.java less more

93	93	private void initGUI() {
94	94	setLayout(new BorderLayout());
95	95
96		tocEntries = new DefaultListModel();
	96	tocEntries = new DefaultListModel<>();
97	97	toc = uif.createList("test.out.toc", tocEntries);
98	98	toc.setCellRenderer(new TOCRenderer());
99	99	toc.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);

548	548	return null;
549	549
550	550	for (int i = 0; i < tocEntries.size(); i++) {
551		TOCEntry entry = (TOCEntry) (tocEntries.get(i));
	551	TOCEntry entry = tocEntries.get(i);
552	552	if (entry.getSection() == section) {
553	553	// found match, select this entry
554	554	return entry;

643	643
644	644	private JEditorPane htmlArea;
645	645
646		private DefaultListModel tocEntries;
	646	private DefaultListModel<TOCEntry> tocEntries;
647	647	private Listener listener = new Listener();
648	648	private TRObserver observer = new TRObserver();
649	649

663	663	int index = toc.getSelectedIndex();
664	664	if (index != -1) {
665	665	for (int i = index + 1; i < tocEntries.size(); i++) {
666		TOCEntry entry = (TOCEntry) (tocEntries.get(i));
	666	TOCEntry entry = tocEntries.get(i);
667	667	String entryOutputName = entry.getOutputName();
668	668	if (entryOutputName == null)
669	669	// name not found, reached next section entry

681	681	int sectIndex = Integer.parseInt(desc);
682	682	TestResult.Section s = subpanelTest.getSection(sectIndex);
683	683	for (int i = 0; i < tocEntries.size(); i++) {
684		TOCEntry entry = (TOCEntry) (tocEntries.get(i));
	684	TOCEntry entry = tocEntries.get(i);
685	685	if (entry.getSection() == s) {
686	686	// found match, select this entry
687	687	toc.setSelectedIndex(i);

699	699	}
700	700
701	701	public void valueChanged(ListSelectionEvent e) {
702		JList l = (JList) (e.getSource());
703		TOCEntry entry = (TOCEntry) (l.getSelectedValue());
	702	JList<TOCEntry> l = (JList<TOCEntry>) (e.getSource());
	703	TOCEntry entry = (l.getSelectedValue());
704	704	if (entry == null)
705	705	return;
706	706	titleField.setText(entry.getTitle());

876	876	}
877	877
878	878	private class TOCRenderer extends DefaultListCellRenderer {
879		public Component getListCellRendererComponent(JList list,
	879	public Component getListCellRendererComponent(JList<?> list,
880	880	Object value,
881	881	int index,
882	882	boolean isSelected,

+13

-14

src/com/sun/javatest/exec/TP_PropertySubpanel.java less more

89	89	table.reset();
90	90	}
91	91
92		protected void updateEntries(Map map) {
93		for (Iterator i = map.entrySet().iterator(); i.hasNext(); ) {
94		Map.Entry e = (Map.Entry) (i.next());
95		String key = (String) (e.getKey());
96		String val = (String) (e.getValue());
	92	protected void updateEntries(Map<String, String> map) {
	93	for (Map.Entry<String, String> e : map.entrySet()) {
	94	String key = (e.getKey());
	95	String val = (e.getValue());
97	96	if (val != null && !val.trim().isEmpty()) {
98	97	table.updateEntry(key, val);
99	98	}

115	114	addComponentListener(this);
116	115	setLayout(null);
117	116	setBackground(Color.white);
118		entries = new TreeMap();
	117	entries = new TreeMap<>();
119	118
120	119	// space to go around text
121	120	Border bsp = BorderFactory.createEmptyBorder(2, 4, 2, 4); // top, left, bottom, right

143	142
144	143	void updateEntry(String key, String value) {
145	144	//System.err.println("TP_PS.Table: updateEntry " + key + "=" + value);
146		Entry e = (Entry) (entries.get(key));
	145	Entry e = entries.get(key);
147	146	if (e == null) {
148	147	e = new Entry(key, value);
149	148	entries.put(key, e);

240	239
241	240	int y = (inScrollPane ? 0 : h);
242	241
243		for (Iterator iter = entries.values().iterator(); iter.hasNext(); ) {
244		Entry e = (Entry) (iter.next());
	242	for (Iterator<Entry> iter = entries.values().iterator(); iter.hasNext(); ) {
	243	Entry e = (iter.next());
245	244	// need to take insets into account for value, since we are dealing
246	245	// with the elemental view inside the valueField
247	246	Insets vi = e.valueText.getInsets();

258	257	public Dimension getMinimumSize() {
259	258	//System.err.println("TP_PS.Table: minimumLayoutSize");
260	259	int h = (inScrollPane ? 0 : nameLabel.getPreferredSize().height);
261		for (Iterator iter = entries.values().iterator(); iter.hasNext(); ) {
262		Entry e = (Entry) (iter.next());
	260	for (Iterator<Entry> iter = entries.values().iterator(); iter.hasNext(); ) {
	261	Entry e = (iter.next());
263	262	h += e.valueText.getMinimumSize().height;
264	263	}
265	264	return new Dimension(maxNameStringWidth + 400, h);

268	267	public Dimension getPreferredSize() {
269	268	//System.err.println("TP_PS.Table: preferredLayoutSize");
270	269	int h = (inScrollPane ? 0 : nameLabel.getPreferredSize().height);
271		for (Iterator iter = entries.values().iterator(); iter.hasNext(); ) {
272		Entry e = (Entry) (iter.next());
	270	for (Iterator<Entry> iter = entries.values().iterator(); iter.hasNext(); ) {
	271	Entry e = (iter.next());
273	272	h += e.valueText.getPreferredSize().height;
274	273	}
275	274	return new Dimension(maxNameStringWidth + 400, h);

354	353	}
355	354	}
356	355
357		private SortedMap entries;
	356	private SortedMap<String, Entry> entries;
358	357	private int maxNameStringWidth = 100;
359	358	private JTextField nameLabel;
360	359	private JTextField valueLabel;

+2

-2

src/com/sun/javatest/exec/TP_ResultsSubpanel.java less more

58	58	}
59	59
60	60	private void updateEntries() {
61		for (Enumeration e = subpanelTest.getPropertyNames(); e.hasMoreElements(); ) {
	61	for (Enumeration<String> e = subpanelTest.getPropertyNames(); e.hasMoreElements(); ) {
62	62	try {
63		String key = (String)(e.nextElement());
	63	String key = (e.nextElement());
64	64	String val = subpanelTest.getProperty(key);
65	65	updateEntry(key, val);
66	66	}

+14

-14

src/com/sun/javatest/exec/TT_BasicNode.java less more

44	44	*/
45	45	public class TT_BasicNode extends TT_TreeNode {
46	46
47		TT_BasicNode(TT_BasicNode parent, TRT_TreeNode tn, Comparator comp) {
	47	TT_BasicNode(TT_BasicNode parent, TRT_TreeNode tn, Comparator<String> comp) {
48	48	this.comp = comp;
49	49	this.parent = parent;
50	50	this.tn = tn;
51	51	}
52	52	// ------- interface methods --------
53		public Enumeration children() {
54		updateNode();
55
56		ArrayList<TreeNode> copy = null;
	53	public Enumeration<TT_TreeNode> children() {
	54	updateNode();
	55
	56	ArrayList<TT_TreeNode> copy = null;
57	57	synchronized (children) {
58	58	// shallow copy child list?
59		copy = (ArrayList<TreeNode>) children.clone();
60		}
61
62		final Iterator it = copy.iterator();
63		return new Enumeration() {
	59	copy = new ArrayList<>(children);
	60	}
	61
	62	final Iterator<TT_TreeNode> it = copy.iterator();
	63	return new Enumeration<TT_TreeNode>() {
64	64
65	65	public boolean hasMoreElements() {
66	66	return it.hasNext();
67	67	}
68	68
69		public Object nextElement() {
	69	public TT_TreeNode nextElement() {
70	70	return it.next();
71	71	}
72	72	};

266	266	}
267	267	}
268	268
269		TreeModelEvent addTest(final TT_TestNode tn, Comparator sortComparator) {
	269	TreeModelEvent addTest(final TT_TestNode tn, Comparator<String> sortComparator) {
270	270	if (updateNode()) {
271	271	//Debug.println("Ignoring add of " + tn.getDisplayName());
272	272	return null;

301	301	private int recursiveIns(final int lPos, final int rPos,
302	302	final TT_TreeNode tn,
303	303	final String dispName,
304		final Comparator sortComparator) {
	304	final Comparator<String> sortComparator) {
305	305	synchronized (children) { // should already be locked!
306	306	int diff = rPos-lPos;
307	307	int pos = (diff/2) + lPos;

454	454
455	455	private final ArrayList<TT_TreeNode> children = new ArrayList<TT_TreeNode>();
456	456	private TRT_TreeNode tn;
457		private Comparator comp;
	457	private Comparator<String> comp;
458	458	private final AtomicBoolean isUpdated = new AtomicBoolean(false);
459	459	private boolean debug = Debug.getBoolean(TT_BasicNode.class);
460	460	}

+11

-11

src/com/sun/javatest/exec/TT_NodeCache.java less more

64	64	// all the states plus filtered out
65	65	testLists = new Vector[Status.NUM_STATES + 1];
66	66	for (int i = 0; i < Status.NUM_STATES + 1; i++) {
67		testLists[i] = new Vector();
	67	testLists[i] = new Vector<>();
68	68	}
69	69	}
70	70

517	517	}
518	518
519	519	TestFilter getRejectReason(TestResult tr) {
520		return (TestFilter) (rejectReasons.get(tr));
	520	return rejectReasons.get(tr);
521	521	}
522	522
523	523	/**

531	531	* @return A copy of the Vectors that contain the current list of tests. Null if
532	532	* <tt>needSnapshot</tt> is false.
533	533	*/
534		synchronized Vector[] addObserver(TT_NodeCacheObserver obs, boolean needSnapshot) {
	534	synchronized Vector<TestResult>[] addObserver(TT_NodeCacheObserver obs, boolean needSnapshot) {
535	535	// snapshot the current data
536	536	// must be done before adding the observer to ensure correct data
537	537	// delivery to client
538	538
539		Vector[] cp = null;
	539	Vector<TestResult>[] cp = null;
540	540	if (needSnapshot) {
541	541	cp = new Vector[testLists.length];
542	542	for (int i = 0; i < testLists.length; i++) {
543		cp[i] = (Vector) (testLists[i].clone());
	543	cp[i] = (Vector<TestResult>) (testLists[i].clone());
544	544	}
545	545	}
546	546
547	547	if (obs != null) {
548		observers = (TT_NodeCacheObserver[]) DynamicArray.append(observers, obs);
	548	observers = DynamicArray.append(observers, obs);
549	549	}
550	550
551	551	return cp;

556	556	// THEN itself (the GUI component) for proper locking sequence, since the
557	557	// highest contention is for this cache object.
558	558	synchronized void removeObserver(TT_NodeCacheObserver obs) {
559		observers = (TT_NodeCacheObserver[]) DynamicArray.remove(observers, obs);
	559	observers = DynamicArray.remove(observers, obs);
560	560	}
561	561
562	562	// ------------- PRIVATE -----------------

576	576	continue;
577	577	}
578	578
579		TestResult tr = (TestResult) it.next();
	579	TestResult tr = it.next();
580	580	TestDescription td = tr.getDescription();
581	581	TestFilter rejector = null;
582	582	boolean wouldAccept = false;

722	722	/**
723	723	* Determine the index of a particular test in a vector.
724	724	*/
725		private int searchList(TestResult target, Vector list) {
	725	private int searchList(TestResult target, Vector<?> list) {
726	726	int possible = list.indexOf(target);
727	727	return possible;
728	728	}

790	790	private TestFilter filter;
791	791	private int[] stats = new int[Status.NUM_STATES];
792	792	private int localRejectCount;
793		private Hashtable rejectReasons = new Hashtable();
	793	private Hashtable<TestResult, TestFilter> rejectReasons = new Hashtable<>();
794	794	private final FilterObserver fObs = new FilterObserver();
795	795	private TT_NodeCacheObserver[] observers = new TT_NodeCacheObserver[0];
796		private Vector[] testLists; // could use unsynchronized data structure
	796	private Vector<TestResult>[] testLists; // could use unsynchronized data structure
797	797	private volatile int state;
798	798	private volatile boolean valid = true;
799	799	private static final int NOT_COMPUTED = 0;

+1

-1

src/com/sun/javatest/exec/TT_TestNode.java less more

41	41	this.parent = parent;
42	42	}
43	43	// ------- interface methods --------
44		public Enumeration children() {
	44	public Enumeration<?> children() {
45	45	throw new UnsupportedOperationException("Not supported.");
46	46	}
47	47

+1

-1

src/com/sun/javatest/exec/TT_TreeNode.java less more

65	65	if (parent == null)
66	66	return new TT_TreeNode[] {this};
67	67
68		LinkedList<TT_TreeNode> l = new LinkedList();
	68	LinkedList<TT_TreeNode> l = new LinkedList<>();
69	69	l.add(this);
70	70
71	71	TT_TreeNode spot = parent;

+5

-5

src/com/sun/javatest/exec/TestPanel.java less more

169	169	// check if there are any environment entries recorded
170	170	boolean hasEnv;
171	171	try {
172		Map map = currTest.getEnvironment();
	172	Map<String, String> map = currTest.getEnvironment();
173	173	hasEnv = (map != null && map.size() > 0);
174	174	}
175	175	catch (TestResult.Fault f) {

243	243	envPanel = new TP_EnvSubpanel(uif);
244	244	outputPanel = new TP_OutputSubpanel(uif);
245	245
246		Vector<TP_Subpanel> vpanels = new Vector();
	246	Vector<TP_Subpanel> vpanels = new Vector<>();
247	247	vpanels.add(descPanel);
248	248
249	249	FeatureManager fm = contextManager.getFeatureManager();

266	266	if (contextManager != null ) {
267	267	CustomTestResultViewer[] cv = contextManager.getCustomResultViewers();
268	268	if (cv != null) {
269		customViewTable = new HashMap();
	269	customViewTable = new HashMap<>();
270	270	panels = new TP_Subpanel[stdPanels.length + cv.length];
271	271	System.arraycopy(stdPanels, 0, panels, 0, stdPanels.length);
272	272	for (int i=0; i < cv.length; i++) {

292	292	if (c instanceof TP_Subpanel) {
293	293	updatePanel(currTest, (TP_Subpanel) c);
294	294	} if (c instanceof CustomTestResultViewer) {
295		updatePanel(currTest, (TP_CustomSubpanel) customViewTable.get(c));
	295	updatePanel(currTest, customViewTable.get(c));
296	296	}
297	297	}
298	298	});

369	369	private TP_EnvSubpanel envPanel;
370	370	private TP_OutputSubpanel outputPanel;
371	371	private JTextField statusField;
372		private HashMap customViewTable;
	372	private HashMap<CustomTestResultViewer, TP_Subpanel> customViewTable;
373	373
374	374	//
375	375	private Harness harness;

+5

-5

src/com/sun/javatest/exec/TestTree.java less more

129	129	return;
130	130
131	131	if (currModel instanceof TestTreeModel) {
132		final TreePath[] paths = ((TestTreeModel)currModel).urlsToPaths(selectedUrls);
	132	final TreePath[] paths = currModel.urlsToPaths(selectedUrls);
133	133
134	134	if (!EventQueue.isDispatchThread()) {
135	135	EventQueue.invokeLater(new Runnable() {

170	170	return null;
171	171
172	172	TreePath[] paths = new TreePath[0];
173		Enumeration e = getDescendantToggledPaths(new TreePath(currModel.getRoot()));
	173	Enumeration<TreePath> e = getDescendantToggledPaths(new TreePath(currModel.getRoot()));
174	174
175	175	while (e != null && e.hasMoreElements()) {
176		TreePath tp = (TreePath)(e.nextElement());
	176	TreePath tp = (e.nextElement());
177	177	if (!isVisible(tp)) // if we can't see it, we don't care
178	178	continue;
179	179	if (!isExpanded(tp)) // if it's not expanded, we don't need it
180	180	continue;
181	181
182		paths = (TreePath[])DynamicArray.append(paths, tp);
	182	paths = DynamicArray.append(paths, tp);
183	183	} // while
184	184
185	185	return paths;

196	196	return;
197	197
198	198	if (currModel instanceof TestTreeModel) {
199		final TreePath[] paths = ((TestTreeModel)currModel).urlsToPaths(openUrls);
	199	final TreePath[] paths = currModel.urlsToPaths(openUrls);
200	200
201	201	if (!EventQueue.isDispatchThread() \|\| queue) {
202	202	EventQueue.invokeLater(new Runnable() {

+30

-30

src/com/sun/javatest/exec/TestTreeModel.java less more

73	73	this.filterHandler = filterHandler;
74	74	this.uif = uif;
75	75
76		cache = new Hashtable();
77		cacheQueue = new LinkedList();
78		suspendedQueue = new LinkedList();
	76	cache = new Hashtable<>();
	77	cacheQueue = new LinkedList<>();
	78	suspendedQueue = new LinkedList<>();
79	79
80	80	cacheWorker = new CacheWorker();
81	81	cacheWorker.setPriority(Thread.MIN_PRIORITY + 1);

117	117
118	118	// TreeModel methods
119	119	public void addTreeModelListener(TreeModelListener l) {
120		treeModelListeners = (TreeModelListener[]) DynamicArray.append(treeModelListeners, l);
	120	treeModelListeners = DynamicArray.append(treeModelListeners, l);
121	121	}
122	122
123	123	public Object getChild(Object parent, int index) {

174	174	}
175	175
176	176	public void removeTreeModelListener(TreeModelListener l) {
177		treeModelListeners = (TreeModelListener[]) DynamicArray.remove(treeModelListeners, l);
	177	treeModelListeners = DynamicArray.remove(treeModelListeners, l);
178	178	}
179	179
180	180	public void valueForPathChanged(TreePath path, Object newValue) {

265	265	TT_NodeCache ni = null;
266	266
267	267	synchronized (htLock) {
268		ni = (TT_NodeCache) (cache.get(transPath[i].getTableNode()));
	268	ni = cache.get(transPath[i].getTableNode());
269	269	//ni = getNodeInfo(transPath[i].getTableNode(), false);
270	270	} // sync
271	271

463	463	}
464	464
465	465	for (int i = 0; i < treeModelListeners.length; i++) {
466		((TreeModelListener) treeModelListeners[i]).treeNodesRemoved(tme);
	466	treeModelListeners[i].treeNodesRemoved(tme);
467	467	}
468	468	}
469	469

489	489	if (tme == null) return;
490	490
491	491	for (int i = 0; i < treeModelListeners.length; i++) {
492		((TreeModelListener) treeModelListeners[i]).treeNodesInserted(tme);
	492	treeModelListeners[i].treeNodesInserted(tme);
493	493	}
494	494
495	495	}

498	498	if (path == null \|\| path.length() == 0 \|\| root == null) {
499	499	return null;
500	500	}
501		ArrayList<TT_TreeNode> al = new ArrayList();
	501	ArrayList<TT_TreeNode> al = new ArrayList<>();
502	502	al.add(root);
503	503	TT_BasicNode spot = root;
504	504

583	583	TT_TreeNode[] transTarget = new TT_TreeNode[1];
584	584	if (target instanceof TestResult &&
585	585	transPath[transPath.length - 1] instanceof TT_BasicNode) {
586		TT_TestNode mtn = ((TT_BasicNode) (transPath[transPath.length - 1])).findByName((TestResult) target);
	586	TT_TestNode mtn = transPath[transPath.length - 1].findByName((TestResult) target);
587	587	if (mtn != null) {
588	588	transTarget[0] = mtn;
589	589	} else {
590	590	return null; // no matching test
591	591	}
592	592	} else {
593		TT_TreeNode mtn = ((TT_BasicNode) (transPath[transPath.length - 1])).findByName(
	593	TT_TreeNode mtn = transPath[transPath.length - 1].findByName(
594	594	((TestResultTable.TreeNode) target).getName());
595	595	if (mtn != null) {
596	596	transTarget[0] = mtn;

649	649	}
650	650
651	651	TreePath[] urlsToPaths(String[] urls) {
652		ArrayList<TreePath> result = new ArrayList();
	652	ArrayList<TreePath> result = new ArrayList<>();
653	653
654	654	for (int i = 0; i < urls.length; i++) {
655	655	TreePath thisOne = urlToPath(urls[i]);

816	816	(trt.getTestFinder() == null ? null : trt.getTestFinder().getComparator()));
817	817
818	818	// prime relevant nodes with root and first level
819		relevantNodes = Collections.synchronizedSet(new HashSet());
820		relevantTests = Collections.synchronizedSet(new HashSet());
	819	relevantNodes = Collections.synchronizedSet(new HashSet<TT_TreeNode>());
	820	relevantTests = Collections.synchronizedSet(new HashSet<TestResult>());
821	821
822	822	addRelevantNode((TT_TreeNode) getRoot());
823	823	TT_BasicNode tn = ((TT_BasicNode) getRoot());

996	996	*/
997	997	void invalidateNodeInfo() {
998	998	synchronized (htLock) {
999		Enumeration e = cache.keys();
	999	Enumeration<TestResultTable.TreeNode> e = cache.keys();
1000	1000	while (e.hasMoreElements()) {
1001	1001	(cache.get(e.nextElement())).invalidate();
1002	1002	} // while
1003	1003
1004		cache = new Hashtable();
1005		cacheQueue = new LinkedList();
1006		suspendedQueue = new LinkedList();
	1004	cache = new Hashtable<>();
	1005	cacheQueue = new LinkedList<>();
	1006	suspendedQueue = new LinkedList<>();
1007	1007	}
1008	1008
1009	1009	// reprocess any needed nodes
1010		Iterator it = relevantNodes.iterator();
	1010	Iterator<TT_TreeNode> it = relevantNodes.iterator();
1011	1011	while (it.hasNext()) {
1012		TT_TreeNode tn = (TT_TreeNode) it.next();
	1012	TT_TreeNode tn = it.next();
1013	1013	if (tn instanceof TT_BasicNode) {
1014	1014	getNodeInfo(((TT_BasicNode) tn).getTableNode(), false);
1015	1015	}

1100	1100	private Parameters params;
1101	1101	private FilterSelectionHandler filterHandler;
1102	1102	private TestFilter lastFilter;
1103		private Comparator sortComparator;
	1103	private Comparator<String> sortComparator;
1104	1104	private TreeModelListener[] treeModelListeners = new TreeModelListener[0];
1105	1105	private boolean statsForwarded;
1106	1106	private boolean disposed;

1313	1313	TT_NodeCache selection = null;
1314	1314
1315	1315	if (suspendedQueue.size() > 0) {
1316		selection = (TT_NodeCache) (suspendedQueue.removeLast());
	1316	selection = suspendedQueue.removeLast();
1317	1317	} else if (cacheQueue.size() > 0) {
1318		selection = (TT_NodeCache) (cacheQueue.removeLast());
	1318	selection = cacheQueue.removeLast();
1319	1319	}
1320	1320	if (selection != null &&
1321	1321	selection.getNode().isRoot() && // trying to avoid root

1336	1336	// basically equivalent
1337	1337	TT_NodeCache selected = null;
1338	1338	int depth = -1;
1339		LinkedList theList = cacheQueue;
	1339	LinkedList<TT_NodeCache> theList = cacheQueue;
1340	1340	boolean notDone = true;
1341	1341	int count = 0;
1342	1342

1350	1350	}
1351	1351
1352	1352	while (notDone) {
1353		TT_NodeCache possible = (TT_NodeCache) (theList.get(count));
	1353	TT_NodeCache possible = (theList.get(count));
1354	1354	int thisDepth = TestResultTable.getObjectPath(possible.getNode()).length;
1355	1355
1356	1356	if (thisDepth > depth) {

1395	1395
1396	1396	// switch event format if the node is the root
1397	1397	if (node.isRoot() && getRoot() != null) {
1398		e = new TreeModelEvent(this, new Object[]{getRoot()}, (int[]) null, (Object[]) null);
	1398	e = new TreeModelEvent(this, new Object[]{getRoot()}, null, null);
1399	1399	} else {
1400	1400	// full path to the node, inclusive
1401	1401	//TestResultTable.TreeNode[] fp = TestResultTable.getObjectPath(node);

1483	1483	}
1484	1484
1485	1485	for (int i = 0; i < l.length; i++) {
1486		((TreeModelListener) l[i]).treeNodesChanged(e);
	1486	l[i].treeNodesChanged(e);
1487	1487	}
1488	1488	break;
1489	1489	case STRUCT:
1490	1490	for (int i = 0; i < l.length; i++) {
1491		((TreeModelListener) l[i]).treeStructureChanged(e);
	1491	l[i].treeStructureChanged(e);
1492	1492	}
1493	1493	break;
1494	1494	case INS:
1495	1495	for (int i = 0; i < l.length; i++) {
1496		((TreeModelListener) l[i]).treeNodesInserted(e);
	1496	l[i].treeNodesInserted(e);
1497	1497	}
1498	1498	break;
1499	1499	case DEL:
1500	1500	for (int i = 0; i < l.length; i++) {
1501		((TreeModelListener) l[i]).treeNodesRemoved(e);
	1501	l[i].treeNodesRemoved(e);
1502	1502	}
1503	1503	break;
1504	1504	default:

+57

-57

src/com/sun/javatest/exec/TestTreePanel.java less more

0	0	/*
1	1	* $Id$
2	2	*
3		* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
	3	* Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
4	4	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5	5	*
6	6	* This code is free software; you can redistribute it and/or modify it

106	106	*/
107	107	public TestTreePanel(UIFactory uif, Harness h, ExecModel em,
108	108	FilterSelectionHandler fh, JComponent parent,
109		Map map) {
	109	Map<String, String> map) {
110	110	this(parent, em, uif);
111	111	setHarness(h);
112	112	this.filterHandler = fh;

211	211	// time, so we need to make sure to make use of the preferences
212	212	if (params == null && stateMap != null) {
213	213	// trying to retrieve previous state
214		String tmp = (String) (stateMap.get(OPEN_PATHS_PREF));
	214	String tmp = stateMap.get(OPEN_PATHS_PREF);
215	215	if (tmp != null) {
216	216	paths = StringArray.split(tmp);
217	217	}

287	287
288	288	private TreePath[] getTreePaths(String[] paths) {
289	289	if (paths != null) {
290		ArrayList<TreePath> translatedPaths = new ArrayList(paths.length);
	290	ArrayList<TreePath> translatedPaths = new ArrayList<>(paths.length);
291	291
292	292	for (int i = 0; i < paths.length; i++) {
293	293	// the paths need to be reconditioned because the JTree will not

310	310
311	311
312	312	@Override
313		public void saveTreeState(Map m) {
	313	public void saveTreeState(Map<String, String> m) {
314	314	String[] paths = getOpenPaths();
315	315	m.put(OPEN_PATHS_PREF, StringArray.join(paths));
316	316	}
317	317
318	318	@Override
319		public void restoreTreeState(Map m) {
	319	public void restoreTreeState(Map<String, String> m) {
320	320	if (m != null) {
321		String tmp = (String) (m.get(OPEN_PATHS_PREF));
	321	String tmp = m.get(OPEN_PATHS_PREF);
322	322	if (tree != null && tmp != null && tmp.length() > 0) {
323	323	tree.restorePaths(StringArray.split(tmp), true);
324	324	}

326	326	}
327	327
328	328	@Override
329		public void save(Map m) {
	329	public void save(Map<String, String> m) {
330	330	// save the open paths
331	331	Preferences.access();
332	332	saveTreeState(m);
333	333	}
334	334
335	335	@Override
336		public void restore(Map m) {
	336	public void restore(Map<String, String> m) {
337	337	stateMap = m;
338	338	restoreTreeState(stateMap);
339	339	}

348	348	}
349	349
350	350	TreePath[] paths = tree.snapshotOpenPaths();
351		Vector urls = new Vector();
	351	Vector<String> urls = new Vector<>();
352	352
353	353	if (paths != null) {
354	354	for (int i = 0; i < paths.length; i++) {

440	440	//createNodeListString(createNodeList(what)));
441	441
442	442	String[] paths = createNodeList(what);
443		DefaultListModel model = new DefaultListModel();
	443	DefaultListModel<String> model = new DefaultListModel<>();
444	444	for (int i = paths.length; i > 0; i--) {
445	445	model.add(model.getSize(), paths[model.getSize()]);
446	446	}

696	696	// createNodeListString(createNodeList(what)));
697	697
698	698	String[] paths = createNodeList(what);
699		DefaultListModel model = new DefaultListModel();
	699	DefaultListModel<String> model = new DefaultListModel<>();
700	700	for (int i = paths.length; i > 0; i--) {
701	701	model.add(model.getSize(), paths[model.getSize()]);
702	702	}

713	713	Object item = what[i].getLastPathComponent();
714	714	if (item instanceof TT_TestNode) {
715	715	ackTargets[i] = ((TT_TestNode) item).getLongPath();
716		ackNodes = (TT_TreeNode[])DynamicArray.append(ackNodes, (TT_TestNode)item, TT_TreeNode.class);
	716	ackNodes = DynamicArray.append(ackNodes, (TT_TestNode)item, TT_TreeNode.class);
717	717	} else if (item instanceof TT_BasicNode) {
718		ackNodes = (TT_TreeNode[])DynamicArray.append(ackNodes, (TT_BasicNode)item, TT_TreeNode.class);
	718	ackNodes = DynamicArray.append(ackNodes, (TT_BasicNode)item, TT_TreeNode.class);
719	719	TT_BasicNode tn = (TT_BasicNode) item;
720	720	if (tn.isRoot()) {
721	721	ackTargets = new String[1];

760	760	ack = true;
761	761
762	762	if (tn instanceof TT_BasicNode) {
763		ackNodes = new TT_TreeNode[] {((TT_BasicNode) tn)};
	763	ackNodes = new TT_TreeNode[] {tn};
764	764	}
765	765	} // else
766	766

798	798	try {
799	799	// this may take a long while...
800	800	if (finalTargets[i] instanceof String) {
801		changes = trt.refreshIfNeeded((String) finalTargets[i]);
	801	changes = trt.refreshIfNeeded(finalTargets[i]);
802	802	}
803	803	} // try
804	804	catch (TestResultTable.Fault f) {

818	818	for (int i = 0; i < finalNodes.length; i++) {
819	819	try {
820	820	if (finalNodes[i] instanceof TT_TestNode)
821		changes = trt.refreshIfNeeded(((TT_TestNode)finalNodes[i]).getLongPath());
	821	changes = trt.refreshIfNeeded(finalNodes[i].getLongPath());
822	822	else {
823	823	changes = trt.refreshIfNeeded(((TT_BasicNode)finalNodes[i]).getTableNode());
824	824	if (changes) trt.prune(((TT_BasicNode)finalNodes[i]).getTableNode());

1123	1123	switch (cms[i].getMenuApplication()) {
1124	1124	case JavaTestContextMenu.TESTS_AND_FOLDERS:
1125	1125	if (mixedMenus == null) {
1126		mixedMenus = new ArrayList();
	1126	mixedMenus = new ArrayList<>();
1127	1127	}
1128	1128	mixedMenus.add(cms[i]);
1129	1129	break;
1130	1130	case JavaTestContextMenu.TESTS_ONLY:
1131	1131	if (testMenus == null) {
1132		testMenus = new ArrayList();
	1132	testMenus = new ArrayList<>();
1133	1133	}
1134	1134	testMenus.add(cms[i]);
1135	1135	break;
1136	1136	case JavaTestContextMenu.FOLDERS_ONLY:
1137	1137	if (folderMenus == null) {
1138		folderMenus = new ArrayList();
	1138	folderMenus = new ArrayList<>();
1139	1139	}
1140	1140	folderMenus.add(cms[i]);
1141	1141	break;
1142	1142	case JavaTestContextMenu.CUSTOM:
1143	1143	if (customMenus == null) {
1144		customMenus = new ArrayList();
	1144	customMenus = new ArrayList<>();
1145	1145	}
1146	1146	customMenus.add(cms[i]);
1147	1147	break;

1263	1263	TestResult tr = ((TT_TestNode) item).getTestResult();
1264	1264	if (testMenus != null) {
1265	1265	for (int i = 0; i < testMenus.size(); i++) {
1266		((JavaTestContextMenu) (testMenus.get(i))).getMenu().setEnabled(true);
1267		((JavaTestContextMenu) (testMenus.get(i))).updateState(tr);
	1266	testMenus.get(i).getMenu().setEnabled(true);
	1267	testMenus.get(i).updateState(tr);
1268	1268	} // for
1269	1269	}
1270	1270	if (customMenus != null) {
1271	1271	for (int i = 0; i < customMenus.size(); i++) {
1272		((JavaTestContextMenu) (customMenus.get(i))).updateState(tr);
	1272	customMenus.get(i).updateState(tr);
1273	1273	} // for
1274	1274	}
1275	1275	if (mixedMenus != null) {
1276	1276	for (int i = 0; i < mixedMenus.size(); i++) {
1277		((JavaTestContextMenu) (mixedMenus.get(i))).getMenu().setEnabled(true);
1278		((JavaTestContextMenu) (mixedMenus.get(i))).updateState(tr);
	1277	mixedMenus.get(i).getMenu().setEnabled(true);
	1278	mixedMenus.get(i).updateState(tr);
1279	1279	} // for
1280	1280	}
1281	1281	if (folderMenus != null) {
1282	1282	for (int i = 0; i < folderMenus.size(); i++) {
1283		((JavaTestContextMenu) (folderMenus.get(i))).getMenu().setEnabled(false);
	1283	folderMenus.get(i).getMenu().setEnabled(false);
1284	1284	} // for
1285	1285	}
1286	1286	} else if (item instanceof TT_BasicNode) {

1290	1290
1291	1291	if (testMenus != null) {
1292	1292	for (int i = 0; i < testMenus.size(); i++) {
1293		((JavaTestContextMenu) (testMenus.get(i))).getMenu().setEnabled(false);
	1293	testMenus.get(i).getMenu().setEnabled(false);
1294	1294	} // for
1295	1295	}
1296	1296	if (customMenus != null) {
1297	1297	for (int i = 0; i < customMenus.size(); i++) {
1298		((JavaTestContextMenu) (customMenus.get(i))).updateState(url);
	1298	customMenus.get(i).updateState(url);
1299	1299	} // for
1300	1300	}
1301	1301	if (mixedMenus != null) {
1302	1302	for (int i = 0; i < mixedMenus.size(); i++) {
1303		((JavaTestContextMenu) (mixedMenus.get(i))).getMenu().setEnabled(true);
1304		((JavaTestContextMenu) (mixedMenus.get(i))).updateState(url);
	1303	mixedMenus.get(i).getMenu().setEnabled(true);
	1304	mixedMenus.get(i).updateState(url);
1305	1305	} // for
1306	1306	}
1307	1307	if (folderMenus != null) {
1308	1308	for (int i = 0; i < folderMenus.size(); i++) {
1309		((JavaTestContextMenu) (folderMenus.get(i))).getMenu().setEnabled(true);
1310		((JavaTestContextMenu) (folderMenus.get(i))).updateState(url);
	1309	folderMenus.get(i).getMenu().setEnabled(true);
	1310	folderMenus.get(i).updateState(url);
1311	1311	} // for
1312	1312	}
1313	1313	} else { // should not happen!
1314	1314	if (testMenus != null) {
1315	1315	for (int i = 0; i < testMenus.size(); i++) {
1316		((JavaTestContextMenu) (testMenus.get(i))).getMenu().setEnabled(false);
	1316	testMenus.get(i).getMenu().setEnabled(false);
1317	1317	} // for
1318	1318	}
1319	1319	if (customMenus != null) {
1320	1320	for (int i = 0; i < customMenus.size(); i++) {
1321		((JavaTestContextMenu) (customMenus.get(i))).getMenu().setEnabled(false);
	1321	customMenus.get(i).getMenu().setEnabled(false);
1322	1322	} // for
1323	1323	}
1324	1324	if (mixedMenus != null) {
1325	1325	for (int i = 0; i < mixedMenus.size(); i++) {
1326		((JavaTestContextMenu) (mixedMenus.get(i))).getMenu().setEnabled(false);
	1326	mixedMenus.get(i).getMenu().setEnabled(false);
1327	1327	} // for
1328	1328	}
1329	1329	if (folderMenus != null) {
1330	1330	for (int i = 0; i < folderMenus.size(); i++) {
1331		((JavaTestContextMenu) (folderMenus.get(i))).getMenu().setEnabled(false);
	1331	folderMenus.get(i).getMenu().setEnabled(false);
1332	1332	} // for
1333	1333	}
1334	1334

1336	1336	throw new JavaTestError("Unknown node type from JTree!");
1337	1337	}
1338	1338	} else { // multiple nodes selected
1339		ArrayList tests = new ArrayList();
1340		ArrayList folders = new ArrayList();
	1339	ArrayList<TestResult> tests = new ArrayList<>();
	1340	ArrayList<String> folders = new ArrayList<>();
1341	1341
1342	1342	for (int i = 0; i < paths.length; i++) {
1343	1343	Object item = paths[i];

1359	1359
1360	1360	TestResult[] t = null;
1361	1361	if (tests.size() > 0) {
1362		t = (TestResult[])tests.toArray(new TestResult[tests.size()]);
	1362	t = tests.toArray(new TestResult[tests.size()]);
1363	1363	}
1364	1364
1365	1365	String[] f = null;
1366	1366	if (folders.size() > 0) {
1367		f = (String[])folders.toArray(new String[folders.size()]);
	1367	f = folders.toArray(new String[folders.size()]);
1368	1368	// currently enable/disabled state is only determined by the menu's
1369	1369	// ability to deal with multi selection
1370	1370	}
1371	1371
1372	1372	if (testMenus != null) {
1373	1373	for (int i = 0; i < testMenus.size(); i++) {
1374		JavaTestContextMenu m = (JavaTestContextMenu) (testMenus.get(i));
	1374	JavaTestContextMenu m = testMenus.get(i);
1375	1375	m.getMenu().setEnabled(m.isMultiSelectAllowed());
1376	1376	m.updateState(f, t);
1377	1377	} // for
1378	1378	}
1379	1379	if (customMenus != null) {
1380	1380	for (int i = 0; i < customMenus.size(); i++) {
1381		JavaTestContextMenu m = (JavaTestContextMenu) (customMenus.get(i));
	1381	JavaTestContextMenu m = customMenus.get(i);
1382	1382	m.getMenu().setEnabled(m.isMultiSelectAllowed());
1383	1383	m.updateState(f, t);
1384	1384	} // for
1385	1385	}
1386	1386	if (mixedMenus != null) {
1387	1387	for (int i = 0; i < mixedMenus.size(); i++) {
1388		JavaTestContextMenu m = (JavaTestContextMenu) (mixedMenus.get(i));
	1388	JavaTestContextMenu m = mixedMenus.get(i);
1389	1389	m.getMenu().setEnabled(m.isMultiSelectAllowed());
1390	1390	m.updateState(f, t);
1391	1391	} // for
1392	1392	}
1393	1393	if (folderMenus != null) {
1394	1394	for (int i = 0; i < folderMenus.size(); i++) {
1395		JavaTestContextMenu m = (JavaTestContextMenu) (folderMenus.get(i));
	1395	JavaTestContextMenu m = folderMenus.get(i);
1396	1396	m.getMenu().setEnabled(m.isMultiSelectAllowed());
1397	1397	m.updateState(f, t);
1398	1398	} // for

1582	1582	* @param prefix i18n bundle prefix
1583	1583	* @param args Arguments for the user message string, which is prefix.txt.
1584	1584	*/
1585		private int showConfirmListDialog(String prefix, Object[] args, ListModel model) {
	1585	private int showConfirmListDialog(String prefix, Object[] args, ListModel<?> model) {
1586	1586	// resources needed:
1587	1587	// prefix.title
1588	1588	JPanel p = uif.createPanel("ttp.confirmPanel", false);

1590	1590	p.setLayout(new BorderLayout());
1591	1591	p.add(msg, BorderLayout.NORTH);
1592	1592
1593		JList list = uif.createList("treep.nodeList", model);
	1593	JList<?> list = uif.createList("treep.nodeList", model);
1594	1594	p.add(uif.createScrollPane(list,
1595	1595	ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
1596	1596	ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED), BorderLayout.CENTER);

1614	1614	private ExecModel execModel;
1615	1615	private JComponent parent;
1616	1616	private Thread bgThread; // in case disposal is required
1617		private Map stateMap; // startup state, read-only
	1617	private Map<String, String> stateMap; // startup state, read-only
1618	1618	private volatile boolean disposed;
1619	1619	private PanelModel pm;
1620	1620	private TestTree tree;

1628	1628	private JMenuItem purgeMI;
1629	1629	private JMenuItem runMI;
1630	1630	private String activeTest;
1631		private ArrayList testMenus, folderMenus, mixedMenus, customMenus;
	1631	private ArrayList<JavaTestContextMenu> testMenus, folderMenus, mixedMenus, customMenus;
1632	1632	private TestTreeModel treeModel;
1633	1633	private Deck deck;
1634	1634	private JPanel deckPanel;

1947	1947	private class PanelModel implements TreePanelModel, Harness.Observer, TestResultTable.Observer {
1948	1948
1949	1949	PanelModel() {
1950		runningTests = new Hashtable();
1951		activeNodes = new Hashtable();
	1950	runningTests = new Hashtable<>();
	1951	activeNodes = new Hashtable<>();
1952	1952	}
1953	1953
1954	1954	public void pauseWork() {

2107	2107	Object[] nodes = tp.getPath();
2108	2108
2109	2109	for (int i = 0; i < nodes.length; i++) {
2110		Object hit = activeNodes.get(nodes[i]);
	2110	Integer hit = activeNodes.get(nodes[i]);
2111	2111	if (hit == null) // not currently an active node
2112	2112	{
2113	2113	activeNodes.put(nodes[i], ONE);
2114	2114	} else {
2115	2115	activeNodes.put(nodes[i],
2116		new Integer(1 + (((Integer) hit).intValue())));
	2116	new Integer(1 + hit));
2117	2117	}
2118	2118	}
2119	2119	}

2142	2142
2143	2143	if (nodes != null) {
2144	2144	for (int i = 0; i < nodes.length; i++) {
2145		Object hit = activeNodes.get(nodes[i]);
	2145	Integer hit = activeNodes.get(nodes[i]);
2146	2146	if (hit == null) {
2147	2147	// should only really happen when test run finished, not
2148	2148	// during the run

2151	2151	if (hit == ONE) {
2152	2152	activeNodes.remove(nodes[i]);
2153	2153	} else {
2154		int currHits = ((Integer) hit).intValue();
	2154	int currHits = hit.intValue();
2155	2155	activeNodes.put(nodes[i],
2156	2156	(currHits == 2 ? ONE : new Integer(--currHits)));
2157	2157	}

2207	2207	// ignore
2208	2208	}
2209	2209	private Hashtable<String,TestResult> runningTests;
2210		private Hashtable activeNodes;
2211		private Integer ONE = new Integer(1);
	2210	private Hashtable<Object, Integer> activeNodes;
	2211	private Integer ONE = Integer.valueOf(1);
2212	2212	}
2213	2213	}

+5

-5

src/com/sun/javatest/exec/ToolBarManager.java less more

82	82	* no tool bar for this key.
83	83	**/
84	84	public JavaTestToolBar getToolBar(String toolBarID) {
85		return (JavaTestToolBar) store.get(toolBarID);
	85	return store.get(toolBarID);
86	86	}
87	87
88	88	/**

91	91	**/
92	92	public JavaTestToolBar[] getToolBars() {
93	93	JavaTestToolBar[] ret = new JavaTestToolBar[0];
94		ret = (JavaTestToolBar[]) store.values().toArray(ret);
	94	ret = store.values().toArray(ret);
95	95	return ret;
96	96	}
97	97

103	103	**/
104	104	boolean removeToolBar(String toolBarID) {
105	105	if (store.containsKey(toolBarID)) {
106		final JavaTestToolBar tb = (JavaTestToolBar) store.get(toolBarID);
	106	final JavaTestToolBar tb = store.get(toolBarID);
107	107
108	108	if (panel != null)
109	109	SwingUtilities.invokeLater(new Runnable() {

137	137	* Saves visible state.
138	138	* Invoked from ExecTool's save
139	139	**/
140		void save(Map m) {
	140	void save(Map<String, Object> m) {
141	141	if (m != null) {
142	142	for (JavaTestToolBar tb : store.values()) {
143	143	tb.save(m);

145	145	}
146	146	}
147	147
148		void load(Map m) {
	148	void load(Map<String, Object> m) {
149	149	if (m != null) {
150	150	for (JavaTestToolBar tb : store.values()) {
151	151	tb.load(m);

+2

-2

src/com/sun/javatest/exec/ToolBarPanel.java less more

86	86	synchronized (target.getTreeLock()) {
87	87	int realW = target.getSize().width;
88	88	int commponentsPerRow = 0;
89		ArrayList hs = new ArrayList();
	89	ArrayList<Integer> hs = new ArrayList<>();
90	90	if (realW == 0) {
91	91	return super.preferredLayoutSize(target);
92	92	}

139	139	// fill in separators between rows
140	140	separators = new int[hs.size()];
141	141	for (int i = 0; i < hs.size(); i++) {
142		separators[i] = ((Integer)hs.get(i)).intValue();
	142	separators[i] = hs.get(i).intValue();
143	143	}
144	144	return dim;
145	145	}

+4

-4

src/com/sun/javatest/exec/template/TemplateSession.java less more

97	97	}
98	98
99	99	@Override
100		public void save(Map map) {
	100	public void save(Map<String, String> map) {
101	101	if (templ.getFile() != null) {
102	102	map.put("template", templ.getFile().getPath());
103	103	}

106	106
107	107
108	108	@Override
109		public void restore(Map map) throws Fault {
	109	public void restore(Map<String, String> map) throws Fault {
110	110	super.restore(map);
111	111	restoreTemplate(map);
112	112	}
113	113
114		protected void restoreTemplate(Map map) {
115		String templPath = (String) map.get("template");
	114	protected void restoreTemplate(Map<String, String> map) {
	115	String templPath = map.get("template");
116	116	if (templPath != null) {
117	117	try {
118	118	if (!new File(templPath).exists() && getWorkDirectory() != null) {

+4

-4

src/com/sun/javatest/finder/BinaryTestFinder.java less more

210	210	// simulate files to be scanned for child nodes
211	211	TestTree.Node[] children = node.children;
212	212	if (children != null) {
213		for (int i = 0; i < children.length; i++) {
214		File f = (relPath.length() == 0 ? new File(children[i].name) :
215		new File(relPath, children[i].name));
	213	for (TestTree.Node child : children) {
	214	File f = (relPath.length() == 0 ? new File(child.name) :
	215	new File(relPath, child.name));
216	216	foundFile(f);
217	217	}
218	218	}

467	467	TestDescription get(File root, File file, int index) throws IOException {
468	468	bais.reset();
469	469	bais.skip(index);
470		Map m = new HashMap();
	470	Map<String, String> m = new HashMap<>();
471	471	DataInputStream in = new DataInputStream(bais);
472	472	int n = readInt(in);
473	473	for (int i = 0; i < n; i++) {

+31

-55

src/com/sun/javatest/finder/BinaryTestWriter.java less more

31	31	import java.io.FileOutputStream;
32	32	import java.io.IOException;
33	33	import java.io.PrintStream;
34		import java.util.Arrays;
35		import java.util.Comparator;
36		import java.util.HashMap;
37		import java.util.HashSet;
38		import java.util.Iterator;
39		import java.util.Map;
40		import java.util.Set;
41		import java.util.TreeMap;
42		import java.util.Vector;
	34	import java.util.*;
43	35	import java.util.zip.ZipEntry;
44	36	import java.util.zip.ZipOutputStream;
45	37

245	237	if (log != null)
246	238	log.println("Writing " + outFile);
247	239
248		FileOutputStream fos = new FileOutputStream(outFile);
249		ZipOutputStream zos = null;
250		try {
251		zos = new ZipOutputStream(new BufferedOutputStream(fos));
	240	try (FileOutputStream fos = new FileOutputStream(outFile);
	241	ZipOutputStream zos = new ZipOutputStream(new BufferedOutputStream(fos))) {
252	242	zos.setMethod(ZipOutputStream.DEFLATED);
253	243	zos.setLevel(9);
254	244	ZipEntry stringZipEntry = stringTable.write(zos);
255	245	ZipEntry testTableZipEntry = testTable.write(zos);
256	246	ZipEntry testTreeZipEntry = testTree.write(zos);
257		zos.close();
258	247
259	248	// report statistics
260	249	if (log != null) {

269	258	}
270	259	else {
271	260	return 0;
272		}
273		}
274		finally {
275		// attempt to close zip writer first
276		// followed by the underlying writer for leak prevention
277		if (zos != null){
278		try { zos.close(); } catch (IOException e) { }
279		}
280
281		if (fos != null){
282		try { fos.close(); } catch (IOException e) { }
283	261	}
284	262	}
285	263	}

299	277	throw new NullPointerException();
300	278
301	279	try {
302		Class c = Class.forName(finder);
	280	Class<?> c = Class.forName(finder);
303	281	testFinder = (TestFinder) (c.newInstance());
304	282	testFinder.init(args, ts, null);
305	283	}

362	340	throw new IllegalArgumentException();
363	341
364	342	File rootDir = finder.getRootDir();
365		Set allFiles = new HashSet();
	343	Set<File> allFiles = new HashSet<>();
366	344
367	345	TestTree.Node r = null;
368	346	for (int i = 0; i < files.length; i++) {

391	369	/**
392	370	* Read the tests from a file in test suite
393	371	*/
394		private TestTree.Node read0(TestFinder finder, File file, TestTree testTree, Set allFiles)
	372	private TestTree.Node read0(TestFinder finder, File file, TestTree testTree, Set<File> allFiles)
395	373	{
396	374	// keep track of which files we have read, and ignore duplicates
397	375	if (allFiles.contains(file))

407	385	return null;
408	386
409	387	Arrays.sort(files);
410		Arrays.sort(tests, new Comparator() {
411		public int compare(Object o1, Object o2) {
412		TestDescription td1 = (TestDescription) o1;
413		TestDescription td2 = (TestDescription) o2;
	388	Arrays.sort(tests, new Comparator<TestDescription>() {
	389	public int compare(TestDescription td1, TestDescription td2) {
414	390	return td1.getRootRelativeURL().compareTo(td2.getRootRelativeURL());
415	391	}
416	392	});
417	393
418		Vector v = new Vector();
	394	Vector<TestTree.Node> v = new Vector<>();
419	395	for (int i = 0; i < files.length; i++) {
420	396	TestTree.Node n = read0(finder, files[i], testTree, allFiles);
421	397	if (n != null)

472	448	* increase its use count.
473	449	*/
474	450	void add(String s) {
475		Entry e = (Entry) (map.get(s));
	451	Entry e = map.get(s);
476	452	if (e == null) {
477	453	e = new Entry();
478	454	map.put(s, e);

484	460	* Add all the strings used in a test description to the table.
485	461	*/
486	462	void add(TestDescription test) {
487		for (Iterator i = test.getParameterKeys(); i.hasNext(); ) {
488		String key = (String) (i.next());
	463	for (Iterator<String> i = test.getParameterKeys(); i.hasNext(); ) {
	464	String key = (i.next());
489	465	String param = test.getParameter(key);
490	466	add(key);
491	467	add(param);

511	487	* Get the index of a string in the table.
512	488	*/
513	489	int getIndex(String s) {
514		Entry e = (Entry) (map.get(s));
	490	Entry e = map.get(s);
515	491	if (e == null)
516	492	throw new IllegalArgumentException();
517	493	return e.index;

536	512	* Write the contents of the table to a stream
537	513	*/
538	514	void write(DataOutputStream o) throws IOException {
539		Vector v = new Vector(map.size());
	515	Vector<String> v = new Vector<>(map.size());
540	516	v.addElement("");
541	517	int nextIndex = 1;
542		for (Iterator iter = map.entrySet().iterator(); iter.hasNext(); ) {
543		Map.Entry e = (Map.Entry) (iter.next());
544		String key = (String) (e.getKey());
545		Entry entry = (Entry) (e.getValue());
	518	for (Iterator<Map.Entry<String, Entry>> iter = map.entrySet().iterator(); iter.hasNext(); ) {
	519	Map.Entry<String, Entry> e = iter.next();
	520	String key = e.getKey();
	521	Entry entry = e.getValue();
546	522	if (entry.isFrequent()) {
547	523	entry.index = nextIndex++;
548	524	v.addElement(key);

551	527
552	528	writeInt(o, v.size());
553	529	for (int i = 0; i < v.size(); i++)
554		o.writeUTF((String) (v.elementAt(i)));
	530	o.writeUTF(v.elementAt(i));
555	531
556	532	writtenSize = nextIndex;
557	533	}

565	541	* string, zero will be written, followed by the value of the string itself.
566	542	*/
567	543	void writeRef(String s, DataOutputStream o) throws IOException {
568		Entry e = (Entry) (map.get(s));
	544	Entry e = map.get(s);
569	545	if (e == null)
570	546	throw new IllegalArgumentException();
571	547

577	553	}
578	554	}
579	555
580		private TreeMap map = new TreeMap();
	556	private Map<String, Entry> map = new TreeMap<>();
581	557	private int writtenSize;
582	558
583	559	/**

644	620	* written stream.
645	621	*/
646	622	int getIndex(TestDescription td) {
647		Entry e = (Entry) (testMap.get(td));
	623	Entry e = testMap.get(td);
648	624	if (e == null)
649	625	throw new IllegalArgumentException();
650	626	return e.index;

676	652	void write(DataOutputStream o) throws IOException {
677	653	writeInt(o, tests.size());
678	654	for (int i = 0; i < tests.size(); i++) {
679		TestDescription td = (TestDescription) (tests.elementAt(i));
680		Entry e = (Entry) (testMap.get(td));
	655	TestDescription td = tests.elementAt(i);
	656	Entry e = testMap.get(td);
681	657	e.index = o.size();
682	658	write(td, o);
683	659	}

690	666	private void write(TestDescription td, DataOutputStream o) throws IOException {
691	667	// should consider using load/save here
692	668	writeInt(o, td.getParameterCount());
693		for (Iterator i = td.getParameterKeys(); i.hasNext(); ) {
694		String key = (String) (i.next());
	669	for (Iterator<String> i = td.getParameterKeys(); i.hasNext(); ) {
	670	String key = (i.next());
695	671	String value = td.getParameter(key);
696	672	stringTable.writeRef(key, o);
697	673	stringTable.writeRef(value, o);
698	674	}
699	675	}
700	676
701		private HashMap testMap = new HashMap();
702		private Vector tests = new Vector();
	677	private Map<TestDescription, Entry> testMap = new HashMap<>();
	678	private Vector<TestDescription> tests = new Vector<>();
703	679	private StringTable stringTable;
704	680
705	681	/**

823	799	if (!other.name.equals(name))
824	800	throw new IllegalArgumentException(name + ":" + other.name);
825	801
826		TreeMap mergedChildrenMap = new TreeMap();
	802	TreeMap<String, Node> mergedChildrenMap = new TreeMap<>();
827	803	for (int i = 0; i < children.length; i++) {
828	804	Node child = children[i];
829	805	mergedChildrenMap.put(child.name, child);
830	806	}
831	807	for (int i = 0; i < other.children.length; i++) {
832	808	Node otherChild = other.children[i];
833		Node c = (Node) (mergedChildrenMap.get(otherChild.name));
	809	Node c = mergedChildrenMap.get(otherChild.name);
834	810	mergedChildrenMap.put(otherChild.name,
835	811	(c == null ? otherChild : otherChild.merge(c)));
836	812	}
837	813	Node[] mergedChildren =
838		(Node[]) (mergedChildrenMap.values().toArray(new Node[mergedChildrenMap.size()]));
	814	mergedChildrenMap.values().toArray(new Node[mergedChildrenMap.size()]);
839	815
840	816	TestDescription[] mergedTests;
841	817	if (tests.length + other.tests.length == 0)

+9

-21

src/com/sun/javatest/finder/ChameleonTestFinder.java less more

27	27
28	28	import java.io.*;
29	29	import java.nio.charset.StandardCharsets;
30		import java.util.Comparator;
31		import java.util.Hashtable;
32		import java.util.SortedSet;
33		import java.util.TreeSet;
	30	import java.util.*;
34	31
35	32	import com.sun.javatest.TestDescription;
36	33	import com.sun.javatest.TestEnvironment;

147	144	*/
148	145	public void readEntries(File file) throws Fault {
149	146	//System.err.println("reading " + file);
150		SortedSet s = new TreeSet(new Comparator() {
151		public int compare(Object o1, Object o2) {
152		int n = ((Entry)o1).compareTo((Entry)o2);
	147	SortedSet<Entry> s = new TreeSet<>(new Comparator<Entry>() {
	148	public int compare(Entry o1, Entry o2) {
	149	int n = o1.compareTo(o2);
153	150	// this gives us the reverse of the order we want, so ...
154	151	return -n;
155	152	}
156	153	});
157	154
158		BufferedReader in = null;
159		try {
160		in = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
	155	try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8))) {
161	156	String line;
162	157	int lineNum = 0;
163	158	while ((line = in.readLine()) != null) {

187	182	throw new Fault(i18n, "cham.ioError",
188	183	new Object[] {file, e});
189	184	}
190		finally {
191		// attempt to close buffered writer first
192		// followed by the underlying writer for leak prevention
193		if (in != null){
194		try { in.close(); } catch (IOException e) { }
195		}
196		}
197	185
198	186	entryFile = file;
199		entries = (Entry[]) (s.toArray(new Entry[s.size()]));
	187	entries = s.toArray(new Entry[s.size()]);
200	188
201	189	//for (int i = 0; i < entries.length; i++)
202	190	// System.err.println(entries[i].prefix + " " + entries[i].suffix);

289	277	currEntry = null;
290	278	}
291	279
292		private Object newInstance(Class c) throws Fault {
	280	private Object newInstance(Class<?> c) throws Fault {
293	281	try {
294	282	return c.newInstance();
295	283	}

303	291	}
304	292	}
305	293
306		private Class loadClass(String className) throws Fault {
	294	private Class<?> loadClass(String className) throws Fault {
307	295	try {
308	296	if (loader == null)
309	297	return Class.forName(className);

329	317	private boolean ignoreCase;
330	318	private Entry currEntry;
331	319	private ClassLoader loader;
332		private Hashtable excludeList = new Hashtable();
	320	private Map<String, String> excludeList = new HashMap<>();
333	321
334	322	private static final String[] excludeNames = {
335	323	"SCCS", "deleted_files"

+27

-27

src/com/sun/javatest/finder/ExpandTestFinder.java less more

82	82	return super.decodeArg(args, i);
83	83	} // decodeArg()
84	84
85		private Map initTable(String[] entries) {
86		Map map = new HashMap();
	85	private Map<String, String> initTable(String[] entries) {
	86	Map<String, String> map = new HashMap<>();
87	87	for (int i = 0; i < entries.length; i++)
88	88	map.put(entries[i].toLowerCase(), entries[i]);
89	89	return map;
90	90	} // initTable()
91	91
92		private Map addTableItem(Map entries, String name, String value) {
	92	private Map<String, String> addTableItem(Map<String, String> entries, String name, String value) {
93	93	entries.put(name, value);
94	94	return entries;
95	95	} // addTableItem()
96	96
97	97	private boolean verify;
98		private Map validEntries;
99		private Map validKeywords;
	98	private Map<String, String> validEntries;
	99	private Map<String, String> validKeywords;
100	100
101	101	private static final String TESTSUITE_HTML = "testsuite.html";
102	102	// end of code for JCKTagTestFinder emulation

106	106	public void init(String [] args, File testSuiteRoot, TestEnvironment env) throws Fault {
107	107	// grab all environment variables open for expansion
108	108	if (expandVars == null) {
109		expandVars = new HashMap(3);
110		expandVarLen = new HashMap(3);
111
112		for (Iterator i = env.keys().iterator(); i.hasNext(); ) {
	109	expandVars = new HashMap<>(3);
	110	expandVarLen = new HashMap<>(3);
	111
	112	for (Iterator<String> i = env.keys().iterator(); i.hasNext(); ) {
113	113	try {
114		String n = (String) (i.next());
	114	String n = (i.next());
115	115
116	116	if (! n.startsWith("expand."))
117	117	continue;

126	126	String stem = fqvName.substring(0, pos);
127	127
128	128	// checking lengths of co-joined variables
129		Integer len = (Integer) expandVarLen.get(stem);
	129	Integer len = expandVarLen.get(stem);
130	130	if (len == null) {
131	131	// add to hashtable of valid stems
132	132	expandVarLen.put(stem, new Integer(v.length));

165	165	super.init(args, testSuiteRoot, env);
166	166	} // init()
167	167
168		protected void foundTestDescription(Map entries, File file, int line) {
	168	protected void foundTestDescription(Map<String, String> entries, File file, int line) {
169	169	// cross-product and loop call up
170		String origId = (String) entries.get("id");
	170	String origId = entries.get("id");
171	171	if (origId == null)
172	172	origId = "";
173		Map loopVars = new HashMap(3);
	173	Map<String, Integer> loopVars = new HashMap<>(3);
174	174	foundTestDescription_1(entries, file, line, loopVars, origId);
175	175	} // foundTestDescription()
176	176
177		private void foundTestDescription_1(Map entries, File file, int line, Map loopVars, String id) {
178		for (Iterator iter = entries.keySet().iterator(); iter.hasNext(); ) {
179		String name = (String) (iter.next());
180		String value = (String) entries.get(name);
	177	private void foundTestDescription_1(Map<String, String> entries, File file, int line, Map<String, Integer> loopVars, String id) {
	178	for (Iterator<String> iter = entries.keySet().iterator(); iter.hasNext(); ) {
	179	String name = iter.next();
	180	String value = entries.get(name);
181	181	// System.out.println("------ NAME: " + name + " VALUE: " + value);
182	182
183	183	if (name.equals("title") \|\| name.equals("test") \|\| name.equals("id"))

217	217	continue;
218	218
219	219	String [] valueList;
220		if ((valueList = (String []) expandVars.get(varName)) == null) {
	220	if ((valueList = expandVars.get(varName)) == null) {
221	221	//String [] msgs = {"unable to find `expand' definition in environment",
222	222	//words[i]};
223	223	//error(msgs);

225	225	}
226	226
227	227	String saveId = id;
228		Integer idx = (Integer) loopVars.get(stem);
	228	Integer idx = loopVars.get(stem);
229	229	if (idx != null){
230	230	int j = idx.intValue();
231	231	words[i] = valueList[j];

245	245	boolean loopy = !(qualifier.equals(""));
246	246	if (loopy) loopVars.put(stem, new Integer(j));
247	247	// clone needed here because we over-wrote words[i]
248		foundTestDescription_1((Map)(((HashMap)entries).clone()), file, line,
	248	foundTestDescription_1(new HashMap<>(entries), file, line,
249	249	loopVars, id);
250	250	if (loopy) loopVars.remove(stem);
251	251

257	257	}
258	258	// clone may not be necessary, check for TestDescription upgrades
259	259	// super.foundTestDescription(entries, file, line);
260		super.foundTestDescription((Map)(((HashMap)entries).clone()), file, line);
	260	super.foundTestDescription(new HashMap<>(entries), file, line);
261	261	} // foundTestDescription_1()
262	262
263		protected void processEntry(Map entries, String name, String value) {
	263	protected void processEntry(Map<String, String> entries, String name, String value) {
264	264	// System.out.println("NAME: " + name + " VALUE: " + value);
265	265	if (name.equals("expand")) {
266	266	if (testStems != null) {
267	267	error(i18n, "expand.multipleTags");
268	268	}
269		testStems = new HashMap(3);
	269	testStems = new HashMap<>(3);
270	270	String [] stems = StringArray.split(value);
271	271	for (int i = 0 ; i < stems.length; i++)
272	272	testStems.put(stems[i], TRUE);

310	310	//----------member variables------------------------------------------------
311	311
312	312	private static final String TRUE = "true";
313		private Map testStems = null;
314		private Map expandVars;
315		private Map expandVarLen;
	313	private Map<String, String> testStems = null;
	314	private Map<String, String[]> expandVars;
	315	private Map<String, Integer> expandVarLen;
316	316
317	317	private String[] stdValidEntries = {
318	318	// required

+14

-12

src/com/sun/javatest/finder/HTMLTestFinder.java less more

27	27
28	28	import java.io.*;
29	29	import java.nio.charset.StandardCharsets;
	30	import java.util.HashMap;
30	31	import java.util.Hashtable;
	32	import java.util.Map;
31	33	import java.util.Vector;
32	34
33	35	import com.sun.javatest.TestFinder;

48	50	// init the tables used when scanning directories
49	51	// if necessary, the tables could be dynamically updated by the
50	52	// init args; this is not currently supported
51		excludeList = new Hashtable(excludeNames.length);
	53	excludeList = new Hashtable<>(excludeNames.length);
52	54	for (int i = 0; i < excludeNames.length; i++)
53	55	excludeList.put(excludeNames[i], excludeNames[i]);
54	56
55		extensionTable = new Hashtable(extensions.length);
	57	extensionTable = new Hashtable<>(extensions.length);
56	58	for (int i = 0; i < extensions.length; i++)
57	59	extensionTable.put(extensions[i], extensions[i]);
58	60	}

343	345	String value = scanValue();
344	346	skipSpace();
345	347	if (att.equals("class") && "TestDescription".equals(value)) {
346		params = new Hashtable();
	348	params = new Hashtable<>();
347	349	endTestDescriptionTag = "table";
348	350	} else if (att.equals("id"))
349	351	id = value;

357	359	skipTag();
358	360	if (params != null) {
359	361	endTableRow();
360		tableRow = new Vector();
	362	tableRow = new Vector<>();
361	363	}
362	364	}
363	365

366	368	// ensure any outstanding <td> is closed
367	369	endTableData();
368	370	if (tableRow.size() == 2)
369		processEntry(params, (String)tableRow.elementAt(0), (String)tableRow.elementAt(1));
	371	processEntry(params, tableRow.elementAt(0), tableRow.elementAt(1));
370	372	tableRow = null;
371	373	}
372	374	}

402	404	String value = scanValue();
403	405	skipSpace();
404	406	if (att.equals("class") && "TestDescription".equals(value)) {
405		params = new Hashtable();
	407	params = new Hashtable<>();
406	408	endTestDescriptionTag = "dl";
407	409	} else if (att.equals("id"))
408	410	id = value;

504	506	if (att.equals("name")) {
505	507	lastName = value;
506	508	Integer here = new Integer(line);
507		Integer prev = (Integer)namesInFile.put(value, here);
	509	Integer prev = namesInFile.put(value, here);
508	510	if (prev != null) {
509	511	error(i18n, "html.multipleName",
510	512	new Object[] {value, context, here, prev});

583	585
584	586	//----------member variables------------------------------------------------
585	587
586		private Hashtable namesInFile = new Hashtable();
587		private Hashtable excludeList;
	588	private Map<String, Integer> namesInFile = new HashMap<>();
	589	private Map<String, String> excludeList;
588	590	private static final String[] excludeNames = {"SCCS", "deleted_files"};
589		private Hashtable extensionTable;
	591	private Map<String, String> extensionTable;
590	592	private static final String[] extensions = {".html", ".htm"};
591	593
592	594	/**

613	615	private StringBuffer text;
614	616
615	617	private String endTestDescriptionTag;
616		private Hashtable params;
	618	private Hashtable<String, String> params;
617	619	private String defTerm; // collects test description parameter name
618		private Vector tableRow; // collects test description info from <TR><TD>....</TD>....etc...</TR>
	620	private Vector<String> tableRow; // collects test description info from <TR><TD>....</TD>....etc...</TR>
619	621	private String lastName;
620	622
621	623	private static I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(HTMLTestFinder.class);

+1

-1

src/com/sun/javatest/finder/ReverseTestFinder.java less more

75	75	TestEnvironment env) throws Fault {
76	76	String delegateClassName = args[0];
77	77	try {
78		Class delegateClass = Class.forName(delegateClassName, true, ClassLoader.getSystemClassLoader());
	78	Class<?> delegateClass = Class.forName(delegateClassName, true, ClassLoader.getSystemClassLoader());
79	79	delegate = (TestFinder)(delegateClass.newInstance());
80	80	args = shift(args, 1);
81	81	delegate.init(args, testSuiteRoot, env);

+3

-3

src/com/sun/javatest/finder/ShowTests.java less more

222	222	TestFinder testFinder;
223	223
224	224	try {
225		Class c = Class.forName(finder);
	225	Class<?> c = Class.forName(finder);
226	226	testFinder = (TestFinder) (c.newInstance());
227	227	testFinder.init(args, ts, null);
228	228	}

257	257	TestDescription td = tests[i];
258	258	out.println(" " + td.getRootRelativeURL());
259	259	if (fullTests) {
260		for (Iterator iter = td.getParameterKeys(); iter.hasNext(); ) {
261		String key = (String) (iter.next());
	260	for (Iterator<String> iter = td.getParameterKeys(); iter.hasNext(); ) {
	261	String key = (iter.next());
262	262	String value = td.getParameter(key);
263	263	out.print(" ");
264	264	out.print(key);

+10

-10

src/com/sun/javatest/finder/TagTestFinder.java less more

154	154	* A class to read files of a particular extension.
155	155	* The class must be a subtype of CommentStream
156	156	*/
157		public void addExtension(String extn, Class commentStreamClass) {
	157	public void addExtension(String extn, Class<? extends CommentStream> commentStreamClass) {
158	158	if (!extn.startsWith("."))
159	159	throw new IllegalArgumentException("extension must begin with `.'");
160	160	if (!CommentStream.class.isAssignableFrom(commentStreamClass))

168	168	* @param extn The extension in question
169	169	* @return the class previously registered with addExtension
170	170	*/
171		public Class getClassForExtension(String extn) {
172		return (Class)extensionTable.get(extn);
	171	public Class<? extends CommentStream> getClassForExtension(String extn) {
	172	return extensionTable.get(extn);
173	173	}
174	174
175	175	/**

250	250	if (dot == -1)
251	251	return;
252	252	String extn = name.substring(dot);
253		Class csc = (Class)(extensionTable.get(extn));
	253	Class<? extends CommentStream> csc = extensionTable.get(extn);
254	254	if (csc == null) {
255	255	error(i18n, "tag.noParser", new Object[] {file, extn});
256	256	return;
257	257	}
258	258	CommentStream cs = null;
259	259	try {
260		cs = (CommentStream)(csc.newInstance());
	260	cs = csc.newInstance();
261	261	}
262	262	catch (InstantiationException e) {
263	263	error(i18n, "tag.cantCreateClass", new Object[] {csc.getName(), extn});

275	275
276	276	String comment;
277	277	while ((comment = cs.readComment()) != null) {
278		Map tagValues = parseComment(comment, file);
	278	Map<String, String> tagValues = parseComment(comment, file);
279	279	if (tagValues.isEmpty())
280	280	continue;
281	281

319	319	* @param currFile The name of the file currently being read.
320	320	* @return A map containing the name-value pairs read from the comment.
321	321	*/
322		protected Map parseComment(String comment, File currFile) {
323		Map tagValues = new HashMap();
	322	protected Map<String, String> parseComment(String comment, File currFile) {
	323	Map<String, String> tagValues = new HashMap<>();
324	324	int tagStart = 0;
325	325	int tagEnd = 0;
326	326

398	398	//----------member variables------------------------------------------------
399	399
400	400	private File currFile;
401		private HashMap excludeList = new HashMap();
402		private HashMap extensionTable = new HashMap();
	401	private Map<String, String> excludeList = new HashMap<>();
	402	private Map<String, Class<? extends CommentStream>> extensionTable = new HashMap<>();
403	403	private boolean fastScan = false;
404	404	private String initialTag = "test";
405	405

+2

-2

src/com/sun/javatest/finder/TestFinderDecorator.java less more

93	93	return currentTestFinder.getFiles();
94	94	}
95	95
96		public Comparator getComparator() {
	96	public Comparator<String> getComparator() {
97	97	return currentTestFinder.getComparator();
98	98	}
99	99
100		public void setComparator(Comparator c) {
	100	public void setComparator(Comparator<String> c) {
101	101	currentTestFinder.setComparator(c);
102	102	}
103	103

+17

-16

src/com/sun/javatest/help/default/admin/keywordsTabTE.html less more

53	53
54	54
55	55	<ol start="3">
56		<li><p>Use the Expression,
	56	<li>Use the Expression,
57	57	Insert Operator, and Insert Keyword buttons to build an expression in the
58		text field by using any logical combination of the following actions:</p></li>
59
60		<ul>
61		<li><p>Click the Expression button to display a list of expressions that
62		can be constructed. From the list, choose the type of expression that
63		you are building.</p></li>
64		<li><p>Click the Insert Keyword button to display the list of keywords provided
65		by the test suite for use in filtering tests (this is only available
66		if the test suite has information). From the list, choose the keywords
67		used in the expression.</p></li>
68		<li><p>Click the Insert Operator button to display a list of operators that
69		you can use to construct boolean expressions in the text field. From
70		the list, choose the operator used in the expression.<br><br>See Keyword Expressions for descriptions and examples of keyword expressions
71		that can be constructed.</p></li>
72		</ul>
	58	text field by using any logical combination of the following actions:
	59	<ul>
	60	<li><p>Click the Expression button to display a list of expressions that
	61	can be constructed. From the list, choose the type of expression that
	62	you are building.</p></li>
	63	<li><p>Click the Insert Keyword button to display the list of keywords provided
	64	by the test suite for use in filtering tests (this is only available
	65	if the test suite has information). From the list, choose the keywords
	66	used in the expression.</p></li>
	67	<li><p>Click the Insert Operator button to display a list of operators that
	68	you can use to construct boolean expressions in the text field. From
	69	the list, choose the operator used in the expression.<br><br>See Keyword Expressions for descriptions and examples of keyword expressions
	70	that can be constructed.</p></li>
	71	</ul>
	72	</li>
73	73	</ol>
	74
74	75	<ol start="4">
75	76	<li><p>Change additional template settings or click the Done button to save the changes
76	77	in the template.</p></li>

+25

-23

src/com/sun/javatest/help/default/admin/setMarkersTE.html less more

52	52	bar.</li>
53	53	<li> Click a question in the Template Editor.</li>
54	54	<li>Set a bookmark for the highlighted question by performing one of the following
55		actions:</li>
	55	actions:
56	56	<ul>
57		<li>Click to the left of the highlighted question text.</li>
58		<li>Choose Bookmarks <b>></b> Mark Current Question in the menu bar.</li>
59		<li>Right click the highlighted question and choose the Mark Current Question
60		menu item in the pop-up menu.</li>
61		</ul>
	57	<li>Click to the left of the highlighted question text.</li>
	58	<li>Choose Bookmarks <b>></b> Mark Current Question in the menu bar.</li>
	59	<li>Right click the highlighted question and choose the Mark Current Question
	60	menu item in the pop-up menu.</li>
	61	</ul>
	62	</li>
62	63	</ol>
63	64
64	65	<h2 class="proc">Display Questions With Bookmarks</h2>

67	68	<ul>
68	69	<li>Click the Bookmarks <b>></b> Show Only Bookmarked Questions checkbox
69	70	in the menu bar.<br><br>The Template Editor displays bookmarked questions in the following
70		manner:</li>
	71	manner:
71	72	<ul>
72		<li>The first question in the interview is displayed.</li>
73		<li>Questions with bookmarks are displayed.</li>
74		<li>If the interview is complete (all questions have valid answers) the final
75		question is displayed.</li>
76		<li>If the interview is incomplete (one or more questions have invalid or
77		incomplete answers), the questions from the last marked question to the
78		first question with an invalid or incomplete answer are displayed.</li>
79		<li>Sequences of questions not described by a previous category are grouped
80		and represented by three dashes (---) in the list of questions. These groups
81		can be opened to display the complete sequence of questions.</li>
82		</ul>
	73	<li>The first question in the interview is displayed.</li>
	74	<li>Questions with bookmarks are displayed.</li>
	75	<li>If the interview is complete (all questions have valid answers) the final
	76	question is displayed.</li>
	77	<li>If the interview is incomplete (one or more questions have invalid or
	78	incomplete answers), the questions from the last marked question to the
	79	first question with an invalid or incomplete answer are displayed.</li>
	80	<li>Sequences of questions not described by a previous category are grouped
	81	and represented by three dashes (---) in the list of questions. These groups
	82	can be opened to display the complete sequence of questions.</li>
	83	</ul>
	84	</li>
83	85
84	86	</ul>
85	87

88	90	<p>Groups of hidden questions without bookmarks
89	91	are represented by three dashes (---) in the list of questions. </p>
90	92
91		<p><!--CopyOff--><img src="../../images/hg_proc.gif" alt="This is the start of a procedure" longdesc="SetMarkersTE.html"><!--CopyOn-->
92		<ol>To open a group
93		of hidden questions, perform the following steps:</p>
	93	<p><!--CopyOff--><img src="../../images/hg_proc.gif" alt="This is the start of a procedure" longdesc="SetMarkersTE.html"><!--CopyOn-->To
	94	open a group of hidden questions, perform the following steps:</p>
	95	<ol>
94	96	<li>Click the --- section in the list.</li>
95	97	<li>Click the Bookmarks <b>></b> Open --- Group menu item from
96	98	the menu bar or right click the highlighted --- section and choose Open --- Group

126	128	Current Question from the pop-up menu.</li>
127	129	</ol>
128	130	<h2 class="proc">Remove All Bookmarks</h2>
129		<!--CopyOff--><p><img src="../../images/hg_proc.gif" alt="This is the start of a procedure" longdesc="SetMarkersTE.html"><!--CopyOn-->To
	131	<p><!--CopyOff--><img src="../../images/hg_proc.gif" alt="This is the start of a procedure" longdesc="SetMarkersTE.html"><!--CopyOn-->To
130	132	remove the bookmarks from the template, perform the following step:</p>
131	133
132	134	<ul>

135	137	</ul>
136	138
137	139	<h2 class="proc">Remove a Bookmark From a Question</h2>
138		<!--CopyOff--><p><img src="../../images/hg_proc.gif" alt="This is the start of a procedure" longdesc="SetMarkersTE.html"><!--CopyOn-->To remove the bookmarks from a question in the template, perform the
	140	<p><!--CopyOff--><img src="../../images/hg_proc.gif" alt="This is the start of a procedure" longdesc="SetMarkersTE.html"><!--CopyOn-->To remove the bookmarks from a question in the template, perform the
139	141	following steps:</p>
140	142	<ol>
141	143	<li>Click the question in the question list.</li>

+1

-1

src/com/sun/javatest/help/default/admin/templateDialog.html less more

43	43	to create and edit templates that can be used to run tests on multiple test systems
44	44	or test platform. </p>
45	45	<p class="Note">
46		<!--CopyOff--><IMG SRC="../../images/hg_note.gif" ALT="The following text is a Note" longdesc="createTemplate.html"></br>
	46	<!--CopyOff--><IMG SRC="../../images/hg_note.gif" ALT="The following text is a Note" longdesc="createTemplate.html">
47	47	<!--CopyOn-->
48	48	Your test suite might not enable creating
49	49	or editing templates. The menu items and features described here <b><u>will not appear in your user interface</u></b> if your test suite does not support templates. </p>

+8

-7

src/com/sun/javatest/help/default/admin/testsTabTE.html less more

63	63	<li>Use the test tree or a test list to specify the tests that are run.<br><br>See
64	64	the following topics for detailed information about using the test tree or
65	65	load list to
66		specify tests:</li>
	66	specify tests:
67	67	<ul>
68		<li><a href="#testTree">Specifying Tests in the Test Tree</a> </li>
69		<li><a href="#testList">Loading a Test List </a></li>
70		</ul>
	68	<li><a href="#testTree">Specifying Tests in the Test Tree</a> </li>
	69	<li><a href="#testList">Loading a Test List </a></li>
	70	</ul>
	71	</li>
71	72	</ol>
72	73
73	74	<ol start="5">

153	154	or similar utilities to identify lines that specify the tests with failed
154	155	or error results.</p>
155	156	<p>Example lines from <code>summary.txt</code>: </p>
156
157		<ol><li><code>
	157	<p><code>
158	158	BigNum/compareTest.html Failed. exit code 1<br>
159	159	BigNum/equalsTest.html Failed. exit code 1<br>
160	160	BigNum/longConstrTest.html Failed. exit code 1<br>

169	169	lists/LinkedList/removeTest.html Failed. exit code 1<br>
170	170	lists/SortedList/equalsTest.html Failed. exit code 1<br>
171	171	lists/SortedList/insertTest.html Failed. exit code 1<br>
172		lists/SortedList/removeTest.html Failed. exit code 1</code></li></ol>
	172	lists/SortedList/removeTest.html Failed. exit code 1</code>
	173	</li> </ol>
173	174
174	175
175	176	<ol start="2">

+1

-1

src/com/sun/javatest/help/default/browse/messagesTab.html less more

147	147	stream to provide standard error information from the test section. Many
148	148	tests only use the log stream and include tracing as well as standard error
149	149	information when writing to the log output.</li>
150		</ul></p>
	150	</ul>
151	151	<p>
152	152	The contents of each output section varies from test suite to test suite. Refer
153	153	to your test suite documentation for detailed descriptions of the test section

+1

-1

src/com/sun/javatest/help/default/browse/statusTabs.html less more

45	45	<li type="disc"><p>By default the list has two columns, Name and Title. Click a heading to sort the list.
46	46	<li type="disc"><p>To display alternate information in the second column, right-click on the column heading and make a selection from the Description or Runtime context menus.<br>
47	47
48		<center><img src="../../images/statusAltInfo.gif" alt="Additional test information" longdesc="Additional test information for can be displayed in the second column"></center></p>
	48	<center><img src="../../images/statusAltInfo.gif" alt="Additional test information" longdesc="Additional test information for can be displayed in the second column"></center>
49	49
50	50	<li><p>Double click the test name or press Enter to display the test in the test tree and to view its unfiltered test information. See <a href="testInfo.html">Displaying Test Information</a> for additional information.</p></li>
51	51	</ul>

+0

-1

src/com/sun/javatest/help/default/browse/viewFilters.html less more

84	84	<li>unchecked the Save Desktop State on Exit option in the Preferences dialog box<li>provided test suite or work
85	85	directory information on the command line when starting the harness
86	86	<li>used the <code>-newDesktop</code> on the command line when starting the harness</ul>
87		</p>
88	87	<p><a href="../ui/appearancePrefs.html#appearancePrefs.shutdown">See Shutdown Options.</a> </p>
89	88	<hr>
90	89

+1

-1

src/com/sun/javatest/help/default/command/escapeShell.html less more

40	40	<CODE>java -cp</CODE> [<EM>jt-dir</EM><CODE>/lib/</CODE>]
41	41	<CODE>javatest.jar com.sun.javatest.EditJTI <br>
42	42	-o</CODE> <EM>my-newconfig</EM><CODE>.jti test.serialport.midPort=/dev/term/a
43		test.connection.httpsCert="\"CN=&lt:Somebody>, OU=<People>, O=<Organisation>, L=<Location>, ST=<State>,
	43	test.connection.httpsCert="\"CN=<Somebody>, OU=<People>, O=<Organisation>, L=<Location>, ST=<State>,
44	44	C=US\""</CODE><EM>myoriginal</EM><CODE>.jti</CODE></P>
45	45
46	46	<hr>

+1

-1

src/com/sun/javatest/help/default/command/intro.html less more

41	41	</ul>
42	42	<p>The test harness has two interfaces, a command-line interface (CLI), and a graphical user interface (GUI).</p>
43	43	<ul>
44		<li>The command-line interface provides scriptable test harness functionality for configuring and executing tests and creating reports. Information about using the command-line interface can be found in the following topics:</P>
	44	<li>The command-line interface provides scriptable test harness functionality for configuring and executing tests and creating reports. Information about using the command-line interface can be found in the following topics:
45	45	<UL>
46	46	<LI><A href="commandLine.html">Command-Line Summary</A></LI>
47	47	<LI><A href="setupCommands.html">Set-up Commands</A></LI>

+2

-2

src/com/sun/javatest/help/default/command/troubleshooting.html less more

144	144	<p>
145	145	Users can workaround this problem by explicitly changing the codepage to one compatible with the Unicode characters for the Cyrillic locale. For the Russian locale example:
146	146	<br>
147		<code>> chcp 1251</code>
	147	<code> chcp 1251</code>
148	148	<br>
149	149	Or users can force the JVM to use the default codepage for the terminal:
150	150	<br>
151		<code>java -Dfile.encoding=cp866 -jar ...
	151	<code>java -Dfile.encoding=cp866 -jar ... </code>
152	152	</p>
153	153
154	154	<p>

+2

-2

src/com/sun/javatest/help/default/concepts/troubleshooting.html less more

110	110	</ol>
111	111	<ol start="8">
112	112
113		<li><p>Search the configuration file for the specific characters or character strings that must be changed. </p></li>
	113	<li><p>Search the configuration file for the specific characters or character strings that must be changed. </p>
114	114
115	115	<p>See <a href="../confEdit/searchConfiguration.html">Searching a Configuration</a> for
116	116	a detailed description of how the current configuration can be searched for
117		a character or string of characters.</p>
	117	a character or string of characters.</p></li>
118	118	</ol>
119	119	<ol start="9">
120	120	<li><p>Click the Done button to save your changes to the configuration file</p></li>

+5

-5

src/com/sun/javatest/help/default/mergeReports/mergeReports.html less more

67	67	</li>
68	68	<li><p>Click the Next button.</p>
69	69	<p>
70		The harness displays the Report Options panel.
71		<center><img src="../../images/JT41mergeReport2.gif" alt="Merge Report wizard panel 2" longdesc="mergeReports.html"></center></p>
	70	The harness displays the Report Options panel.</p>
	71	<center><img src="../../images/JT41mergeReport2.gif" alt="Merge Report wizard panel 2" longdesc="mergeReports.html"></center>
72	72	</li>
73	73	<li><p>In the Report Options panel, specify how conflicts
74	74	between merged reports are handled.</p></li>

96	96	Conflict dialog box for each conflict that is detected.</p>
97	97
98	98	<center><img src="../../images/JT4reportConverterConflict.gif" alt="Resolve conflict dialog box" longdesc="mergeReports.html"></center>
99		</p></blockquote></li>
	99	</blockquote></li>
100	100	</ol>
101	101	<ul>
102	102	<li><p>If you only click the Resolve using most recent checkbox and click the

105	105	<li><p>If you select a report in the list, the tool enables the Resolve remaining
106	106	conflicts using selected report checkbox. If you only click the Resolve
107	107	remaining conflicts using selected report checkbox and click the Resolve
108		button, the tool resolves all conflicts in the generated tests.
109		<center><img src="../../images/JT4reportConverterConflict2.gif" alt="Report Converter conflict dialog box" longdesc="mergeReports.html"></center></p></li>
	108	button, the tool resolves all conflicts in the generated tests.</p>
	109	<center><img src="../../images/JT4reportConverterConflict2.gif" alt="Report Converter conflict dialog box" longdesc="mergeReports.html"></center></li>
110	110	</ul>
111	111
112	112

+4

-3

src/com/sun/javatest/help/default/report/newReports.html less more

26	26	-->
27	27
28	28
29		<html>
	29	<html lang="en">
30	30	<head>
31	31	<title>
32	32	Creating Reports

102	102	<p>Check "Backup Options settings" to enable the report backup option, and specify the number of backups preserved.</p>
103	103
104	104	<p>When "Backup old reports" is enabled, the harness saves the previous reports by appending a tilde and a sequential number to the existing directory names (such as <code>html~1~</code>). This effectively moves them out of the way, making way for the new report(s). The links inside the backup <code>index.html</code> file are rewritten to refer to the correct (renamed) subdirectory name. For example, a report directory with one backup would look like: </p>
105		<table>
	105	<table summary="example of a report directory with ine backup">
	106	<tr><th>directory:</th></tr>
106	107	<tr><td>
107	108	<pre>
108	109	html/

233	234	<li><p>From the configuration editor, select Configure > Edit Configuration.</p></li>
234	235	<li><p>Under Parameters, select "Specify a Known Failures List?" and choose Yes.
235	236	Once Yes is chosen the parameter "Specify Known Failures List Files" is active. </p></li>
236		<li><p>Choose one or more KFL files, as described in the configuration editor's <a href="../../../moreInfo/default/KnownFailuresListInterview/customFiles.html">KnownFailuresListInterview</a>.</p> The files you choose are stored in your user preferences and are considered the defaults.
	237	<li><p>Choose one or more KFL files, as described in the configuration editor's <a href="../confEdit/kfl.html">KnownFailuresListInterview</a>.</p> The files you choose are stored in your user preferences and are considered the defaults.
237	238	</ol>
238	239	<p>If you have specified KFL files in the configuration editor it's preferable to modify the list using the configuration editor. If you want to modify the list of KFL files from the command line, See <a href="../../default/command/knownFailureAnalysis.html">Specifying Known Failures Lists with kfl</a> in the <em>Command Line Interface User's Guide</em>.
239	240

+11

-10

src/com/sun/javatest/help/default/report/reportBrowser.html less more

19	19	You should have received a copy of the GNU General Public License version
20	20	2 along with this work; if not, write to the Free Software Foundation,
21	21	Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
22
	22
23	23	Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
24	24	or visit www.oracle.com if you need additional information or have any
25	25	questions.

44	44	<!--CopyOff--><p><img src="../../images/hg_proc.gif" alt="This is the start of a procedure" longdesc="reportBrowser.html">
45	45	To display reports in the report browser:</p><!--CopyOn-->
46	46	<ol>
47		<li><p>Choose Report <b>></b> Open Report from the menu bar.</p></li>
	47	<li><p>Choose Report <b>></b> Open Report from the menu bar.</p>
48	48
49	49	<blockquote>
50	50	<p>The harness opens a file chooser dialog box for you

54	54	<img src="../../images/JT4reportViewer.gif" alt="First page of the report viewer" longdesc="reportBrowser.html">
55	55	</p></center>
56	56	</blockquote>
	57	</li>
57	58	</ol>
58	59
59	60	<ol start="2">
60		<li><p>Choose the report format from the directory listing.</p></li>
	61	<li><p>Choose the report format from the directory listing.</p>
61	62
62	63	<ul>
63	64	<li> <p>If you choose the HTML format version of the reports, a second directory
64	65	listing is displayed. On the toolbar, you can use the report browser's back button (<) to return to the initial report page. You can also click the file name showing on the toolbar to open a dropdown of recently visited files and directories.</p>
65		<p><center>
	66	<center>
66	67	<img src="../../images/JT4reportViewer2.gif" alt="html page of the report viewer" longdesc="reportBrowser.html">
67		</center></p></li>
	68	</center></li>
68	69	<li>
69	70	<p>If you choose the text format version of the report, the browser
70	71	displays a <code>summary.txt</code> hyperlink to the summary page. The summary
71	72	page provides a text list of tests that were run and their test result status. </p>
72		<p><center>
	73	<center>
73	74	<img src="../../images/JT4reportViewerText.gif" alt="text page of the report viewer" longdesc="reportBrowser.html">
74		</center></p>
	75	</center>
75	76	</li>
76	77	<li> <p>If you choose the XML format version of the report, the browser
77	78	displays a <code>report.xml</code> hyperlink to the XML report page. The
78	79	XML Report page provides a report of the configuration values used to run
79	80	the tests, the tests that were run, and their test result status. </p>
80	81	<p>This output is for automated processing purposes. It is not designed for human readability.</p>
81		<p><center>
	82	<center>
82	83	<img src="../../images/JT4reportViewerXML.gif" alt="text page of the report viewer" longdesc="reportBrowser.html">
83		</center></p>
	84	</center>
84	85	</li>
85
86	86	</ul>
	87	</li>
87	88	</ol>
88	89
89	90	<ol start="3">

+1

-1

src/com/sun/javatest/help/default/run/monitoring.html less more

108	108	<li><p>Folder view - When you click a folder icon in the test tree, the harness displays a Summary tab, a Documentation tab, five status tabs, and a status field containing information from the work directory about a folder and its descendants. See <a href="../browse/folderInfo.html">Displaying Folder Information</A> for detailed information about browsing folder information.</p></li>
109	109	<li><p>Test view - When you click a test icon in the test tree or double click its name in the Folder view, the harness displays six tabbed panes that contain detailed information about the test. See <a href="../browse/testInfo.html">Displaying Test Information</A> for detailed information about browsing test information.</p></li>
110	110	</ul>
111		</td></p>
	111	</td>
112	112	</tr>
113	113	</table>
114	114

+0

-2

src/com/sun/javatest/help/default/run/svcViewer.html less more

39	39	<p><img src="../../images/log_svcmonitor_small.gif" alt="view services" longdesc="monitoring services and logs"></p>
40	40	<p>See <a href="../ui/logViewer.html">Log Viewer</a> for a detailed description of the Log Viewer.</p>
41	41
42		<ul></ul>
43
44	42	<hr>
45	43
46	44	<p><a href="../copyright.html">Copyright</a> © 2010, Oracle and/or its affiliates. All rights reserved.</p>

+6

-5

src/com/sun/javatest/help/default/ui/colorPrefs.html less more

58	58	<li>Type an integer value in the corresponding text box, or use the spinners to the right of the field to increase or decrease the value.</li>
59	59	</ul>
60	60	Repeat this process for H, S, and B, then click OK.</li>
61		<li>To set the Red, Green, and Blue values, click the RGB tab.</li>
62		<ul>
63		<li>Pick a value using the horizontal slider.</li>
64		<li>Type an integer value in the corresponding text box, or use the spinners to the right of the field to increase or decrease the value.</li>
65		</ul>
	61	<li>To set the Red, Green, and Blue values, click the RGB tab.
	62	<ul>
	63	<li>Pick a value using the horizontal slider.</li>
	64	<li>Type an integer value in the corresponding text box, or use the spinners to the right of the field to increase or decrease the value.</li>
	65	</ul>
	66	</li>
66	67	</ul>
67	68
68	69

+3

-5

src/com/sun/javatest/help/default/ui/testManager.html less more

49	49	<ul>
50	50	<li>Tool Bar: Check Displayed to see the toolbar. If you enable or disable this option you must restart JavaTest to see the change.<center><img src="../../images/uiToolbar.gif" alt="standard UI toolbar" longdesc="standard UI toolbar"></center></li>
51	51	<li>View Filters: Enables a warning message that is displayed if the <a href="../browse/viewFilters.html">All Tests filter</a> is selected for a test run.</li>
52		<a name="testExecOrder"> <!-- index:execution order --><!-- index:order --></a>
53		<li>Test Execution: </li>
54		<ul><li>Execution from tree popup includes configuration Test to Run setting: </li>
55		<li>Disable sort of Tests to Run when specified from input file: This allows you to set the test execution order. Traditionally tests are run in the order they appear in the main test tree. This order is generally determined by the test suite architect. By selecting this option, the order execution will follow that in the input file for the Tests to Run section in the configuration. That is, the tests will be executed in the order they appear in that file, rather than being sorted and then executed. The default state of this checkbox is unchecked. See </li></ul>
	52	<li><a name="testExecOrder"> <!-- index:execution order --><!-- index:order --></a>Test Execution:
	53	<ul><li>Execution from tree popup includes configuration Test to Run setting: </li>
	54	<li>Disable sort of Tests to Run when specified from input file: This allows you to set the test execution order. Traditionally tests are run in the order they appear in the main test tree. This order is generally determined by the test suite architect. By selecting this option, the order execution will follow that in the input file for the Tests to Run section in the configuration. That is, the tests will be executed in the order they appear in that file, rather than being sorted and then executed. The default state of this checkbox is unchecked. See </li></ul>
56	55	<li>Test Run Messages: Wrap Test Output in the <a href="../../default/browse/messagesTab.html#messagesTab">Test Run Messages Pane</a>.</li>
57
58	56	</ul>
59	57
60	58

+2

-2

src/com/sun/javatest/httpd/JThttpProvider.java less more

127	127
128	128	void addRegistredURL(String url) {
129	129	if (url != null) {
130		regURLs = (String[])DynamicArray.append(regURLs, url);
	130	regURLs = DynamicArray.append(regURLs, url);
131	131	if (debug) System.out.println("PROV-registered URL (" + url + ") in " + this);
132	132	}
133	133	}

135	135	void removeRegisteredURL(String url) {
136	136	for (int i = 0; i < regURLs.length; i++) {
137	137	if (regURLs[i].equals(url)) {
138		regURLs = (String[])DynamicArray.remove(regURLs, i);
	138	regURLs = DynamicArray.remove(regURLs, i);
139	139	break;
140	140	}
141	141	} // for

+2

-2

src/com/sun/javatest/httpd/PageGenerator.java less more

120	120	/**
121	121	* Prints the contents of any dictionary in a two column table.
122	122	*/
123		public static void writeDictionary(PrintWriter out, Dictionary dict,
	123	public static void writeDictionary(PrintWriter out, Dictionary<String, String> dict,
124	124	String keyHeader, String valHeader) {
125	125	// XXX should include HTML filtering of strings
126	126

147	147	buf.append("</tr>");
148	148	}
149	149	else {
150		Enumeration keys = dict.keys();
	150	Enumeration<?> keys = dict.keys();
151	151	while (keys.hasMoreElements()) {
152	152	Object key = keys.nextElement();
153	153	out.println("<tr>");

+10

-10

src/com/sun/javatest/httpd/ProviderRegistry.java less more

28	28	import java.util.Enumeration;
29	29	import java.util.Hashtable;
30	30	import java.io.PrintWriter;
	31	import java.util.Iterator;
	32	import java.util.Map;
31	33
32	34	import com.sun.javatest.util.DynamicArray;
33	35	import com.sun.javatest.util.I18NResourceBundle;

259	261
260	262	boolean result;
261	263	String file = url[0];
262		url = (String[])DynamicArray.remove(url, 0);
	264	url = DynamicArray.remove(url, 0);
263	265
264	266	if (debug) System.out.println(" PR-Partial insert of " + file);
265	267

302	304	}
303	305
304	306	String file = url[0];
305		url = (String[])DynamicArray.remove(url, 0);
	307	url = DynamicArray.remove(url, 0);
306	308
307	309	if (debug) System.out.println(" PR-(del)Partial remove of " + file);
308	310

366	368	currC = url.charAt(pos);
367	369	switch (currC) {
368	370	case '/': if (pos > start+1)
369		result = (String[])DynamicArray.append(result, url.substring(start, pos));
	371	result = DynamicArray.append(result, url.substring(start, pos));
370	372	start = pos + 1;
371	373	pos++;
372	374	break;

379	381	}
380	382
381	383	if (!done && pos >= urlLen && (pos - start) >= 1)
382		result = (String[])DynamicArray.append(result, url.substring(start, pos));
	384	result = DynamicArray.append(result, url.substring(start, pos));
383	385
384	386	if (debug)
385	387	System.out.println("PR-Dissolved url " + url + " into " + result.length + " files.");

390	392	/**
391	393	* Maps the url to a HandlerEntry
392	394	*/
393		protected Hashtable url2prov = new Hashtable();
	395	protected Map<String, Object> url2prov = new Hashtable<>();
394	396
395	397	private static I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(ProviderRegistry.class);
396	398	protected static boolean debug = Boolean.getBoolean("debug." + ProviderRegistry.class.getName());

429	431	}
430	432
431	433	protected static class IndexHandler extends JThttpProvider {
432		IndexHandler(Hashtable ht) {
	434	IndexHandler(Map<String, Object> ht) {
433	435	urlMap = ht;
434	436	}
435	437

466	468	HandlerEntry entry;
467	469
468	470	// XXX should use set of unique entries
469		Enumeration enum_ = urlMap.elements();
470		while(enum_.hasMoreElements()) {
471		Object next = enum_.nextElement();
	471	for (Object next: urlMap.values()) {
472	472	if (next instanceof HandlerEntry) {
473	473	entry = (HandlerEntry)next;
474	474

487	487	out.println();
488	488	}
489	489
490		private Hashtable urlMap;
	490	private Map<String, Object> urlMap;
491	491	}
492	492	}
493	493

+0

-1

src/com/sun/javatest/httpd/RequestHandler.java less more

162	162	out.println("</body></html>");
163	163	}
164	164
165		private static Hashtable urlMap;
166	165
167	166	private Socket soc;
168	167	private PrintWriter out;

+3

-2

src/com/sun/javatest/httpd/RootRegistry.java less more

27	27
28	28	import java.util.Hashtable;
29	29	import java.io.PrintWriter;
	30	import java.util.Map;
30	31
31	32	import com.sun.javatest.util.I18NResourceBundle;
32	33

77	78	* @return The object's handler, or null if none if registered.
78	79	*/
79	80	public static JThttpProvider getObjectHandler(Object what) {
80		return (JThttpProvider)(obj2prov.get(what));
	81	return obj2prov.get(what);
81	82	}
82	83
83	84	public static void associateObject(Object what, JThttpProvider prov) {

104	105	* Good for associating a first-class JT Harness object with a provider.
105	106	* For example, map a TestResultTable instance to it's HTTP handler.
106	107	*/
107		protected static final Hashtable obj2prov = new Hashtable();
	108	protected static final Map<Object, JThttpProvider> obj2prov = new Hashtable<>();
108	109	private static final I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(RootRegistry.class);
109	110
110	111	static {

+1

-1

src/com/sun/javatest/httpd/httpURL.java less more

148	148	* Set the key-value pairs encoded in this URL.
149	149	* Not implemented yet.
150	150	*/
151		public void setProperties(Dictionary props) {
	151	public void setProperties(Dictionary<String, String> props) {
152	152	}
153	153
154	154	/**

+2

-2

src/com/sun/javatest/interview/EnvironmentInterview.java less more

258	258	// verify all entries defined
259	259	cachedEnvError = null;
260	260	cachedEnvErrorArgs = null;
261		for (Iterator i = cachedEnv.elements().iterator();
	261	for (Iterator<TestEnvironment.Element> i = cachedEnv.elements().iterator();
262	262	i.hasNext() && cachedEnvError == null; ) {
263		TestEnvironment.Element entry = (TestEnvironment.Element) (i.next());
	263	TestEnvironment.Element entry = (i.next());
264	264	if (entry.getValue().indexOf("VALUE_NOT_DEFINED") >= 0) {
265	265	cachedEnv = null;
266	266	String eText =

+2

-2

src/com/sun/javatest/interview/ExcludeListInterview.java less more

323	323	return super.getChoices();
324	324	}
325	325
326		public void save(Map data) {
	326	public void save(Map<String, String> data) {
327	327	ensureInitialized();
328	328	super.save(data);
329	329	}

363	363	ensureInitializedForTestSuite();
364	364
365	365	String defaultValue = CUSTOM;
366		Vector v = new Vector(4);
	366	Vector<String> v = new Vector<>(4);
367	367
368	368	v.add(null); // always
369	369

+10

-8

src/com/sun/javatest/interview/KeywordsInterview.java less more

28	28	import java.util.Arrays;
29	29	import java.util.HashSet;
30	30	import java.util.Map;
	31	import java.util.Set;
	32
31	33	import com.sun.interview.FinalQuestion;
32	34	import com.sun.interview.Interview;
33	35	import com.sun.interview.Question;

196	198	super.setValue(modeValue);
197	199	}
198	200
199		public void load(Map data) {
200		Object m = data.get(tag + ".mode");
201		Object v = data.get(tag + ".value");
	201	public void load(Map<String, String> data) {
	202	String m = data.get(tag + ".mode");
	203	String v = data.get(tag + ".value");
202	204	//System.err.println("KI.load: m=" + m + " v=" + v);
203	205	if (m == null)
204	206	super.load(data); // support existing interview files
205	207	else if (m instanceof String && (v == null \|\| v instanceof String)) {
206		String ms = (String) m;
207		String vs = (String) v;
	208	String ms = m;
	209	String vs = v;
208	210	if (ms.equals("allOf"))
209	211	setValue(ALL_OF, vs);
210	212	else if (ms.equals("anyOf"))

214	216	}
215	217	}
216	218
217		public void save(Map data) {
	219	public void save(Map<String, String> data) {
218	220	super.save(data); // for backwards compatibility
219	221	String modeText = (mode == ANY_OF ? "anyOf" : mode == ALL_OF ? "allOf" : "expr");
220	222	data.put(tag + ".mode", modeText);

268	270	}
269	271
270	272	String[] validKeywords = ts.getKeywords();
271		HashSet validKeywordsSet;
	273	Set<String> validKeywordsSet;
272	274	if (validKeywords == null)
273	275	validKeywordsSet = null;
274	276	else
275		validKeywordsSet = new HashSet(Arrays.asList(validKeywords));
	277	validKeywordsSet = new HashSet<>(Arrays.asList(validKeywords));
276	278
277	279	int mode = qKeywords.getMode();
278	280	String modeName = (mode == ANY_OF ? Keywords.ANY_OF

+5

-5

src/com/sun/javatest/interview/SimpleInterviewParameters.java less more

69	69	}
70	70
71	71	public TestEnvironment getEnv() {
72		HashMap envProps = new HashMap();
	72	Map<String, String> envProps = new HashMap<>();
73	73	export(envProps);
74	74	try {
75	75	String name = qName.getValue();

106	106	return qEnvEnd;
107	107	}
108	108
109		public void export(Map data) {
	109	public void export(Map<String, String> data) {
110	110	data.put("script.mode", "precompile");
111	111	data.put("command.compile.java", System.getProperty("command.compile.java"));
112	112	}

121	121	return qName;
122	122	}
123	123
124		public void export(Map data) {
	124	public void export(Map<String, String> data) {
125	125	data.put("script.mode", "developer");
126	126	data.put("command.compile.java", System.getProperty("command.compile.java"));
127	127	}

152	152	return qCmdType;
153	153	}
154	154
155		public void export(Map data) {
	155	public void export(Map<String, String> data) {
156	156	data.put("description", String.valueOf(value));
157	157	}
158	158	};

181	181	}
182	182
183	183	@Override
184		public void export(Map data) {
	184	public void export(Map<String, String> data) {
185	185	String cmd;
186	186	if (value != null && value.equals(OTHER_VM)) {
187	187	cmd = getOtherVMExecuteCommand();

+7

-9

src/com/sun/javatest/interview/TestsInterview.java less more

27	27
28	28	import java.io.*;
29	29	import java.nio.charset.StandardCharsets;
30		import java.util.ArrayList;
31		import java.util.Arrays;
32		import java.util.TreeSet;
	30	import java.util.*;
33	31
34	32	import com.sun.interview.ChoiceQuestion;
35	33	import com.sun.interview.ErrorQuestion;

153	151	return null;
154	152	}
155	153
156		TreeSet ts = new TreeSet(Arrays.asList(v));
157		return (String[]) (ts.toArray(new String[ts.size()]));
	154	TreeSet<String> ts = new TreeSet<>(Arrays.asList(v));
	155	return ts.toArray(new String[ts.size()]);
158	156
159	157	}
160	158

211	209
212	210	@Override
213	211	public void setValue(String newValue) {
214		if (newValue != value) {
	212	if ( !Objects.equals(newValue, value) ) {
215	213	cachedTestsError = null;
216	214	cachedTestsErrorArgs = null;
217	215	cachedTestsValue = null;

278	276	};
279	277
280	278	protected String[] getTests(File file) {
281		ArrayList<String> paths = new ArrayList();
	279	ArrayList<String> paths = new ArrayList<>();
282	280	try {
283	281	BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
284	282	String line;

303	301	return null ;
304	302	}
305	303
306		return (String[]) (paths.toArray(new String[paths.size()]));
	304	return paths.toArray(new String[paths.size()]);
307	305	}
308	306
309	307	private Question qCantFindFileError = new ErrorQuestion(this, "cantFindFile") {

486	484	return;
487	485	}
488	486	else {
489		ArrayList v = new ArrayList();
	487	ArrayList<String> v = new ArrayList<>();
490	488	StringBuilder sb = new StringBuilder();
491	489	for (int i = 0; i < tests.length; i++) {
492	490	String test = tests[i];

+2

-2

src/com/sun/javatest/junit/JUnitAnnotationMultiTest.java less more

81	81	protected void setup(String executeClass) {
82	82
83	83	try {
84		Class junitTestCaseClass = getClassLoader().loadClass(executeClass);
	84	Class<?> junitTestCaseClass = getClassLoader().loadClass(executeClass);
85	85	testCaseClass = junitTestCaseClass;
86	86
87	87

94	94	t.printStackTrace(log);
95	95	}
96	96
97		protected Class testCaseClass;
	97	protected Class<?> testCaseClass;
98	98	}

+2

-2

src/com/sun/javatest/junit/JUnitAnnotationTestFinder.java less more

151	151	* @param file The file to scan
152	152	*/
153	153	protected void scanFile(File file) {
154		testMethods = new ArrayList(); // new every time we visit a new class
155		tdValues = new HashMap();
	154	testMethods = new ArrayList<>(); // new every time we visit a new class
	155	tdValues = new HashMap<>();
156	156
157	157	String name = file.getName();
158	158	int dot = name.indexOf('.');

+6

-6

src/com/sun/javatest/junit/JUnitBareMultiTest.java less more

62	62	if (tests == null) {
63	63	return Status.failed("No test cases found in test.");
64	64	}
65		Iterator iterator = ((Set)tests.entrySet()).iterator();
	65	Iterator<Map.Entry<String, Method>> iterator = tests.entrySet().iterator();
66	66	while (iterator.hasNext()) {
67		Method method = (Method)((Map.Entry)iterator.next()).getValue();
	67	Method method = iterator.next().getValue();
68	68	Status status = null;
69	69	try {
70	70	status = invokeTestCase(method);

94	94	protected void setup(String executeClass) {
95	95	TestCase test;
96	96	try {
97		Class tc = getClassLoader().loadClass(executeClass);
	97	Class<?> tc = getClassLoader().loadClass(executeClass);
98	98	String name = tc.getName();
99	99	String constructor = tc.getConstructors()[0].toGenericString();
100	100	test = (constructor.indexOf("java.lang.String") > -1)?

143	143	if(m == null \|\| excludeTestCases.contains(m.getName())){
144	144	continue;
145	145	}
146		Class[] paramTypes = m.getParameterTypes();
147		Class returnType = m.getReturnType();
	146	Class<?>[] paramTypes = m.getParameterTypes();
	147	Class<?> returnType = m.getReturnType();
148	148	String name = m.getName();
149	149	if ((paramTypes.length == 0) &&
150	150	Void.TYPE.isAssignableFrom(returnType) && name.startsWith("test") ) {

160	160	protected SortedMap <String, Method> tests;
161	161
162	162	protected String testCases[] = null;
163		protected Vector excludeTestCases = new Vector();
	163	protected Vector<String> excludeTestCases = new Vector<>();
164	164	}

+1

-1

src/com/sun/javatest/junit/JUnitBaseInterview.java less more

52	52
53	53	public TestEnvironment getEnv() {
54	54	try {
55		return new TestEnvironment("junitenv", new HashMap(), "junit");
	55	return new TestEnvironment("junitenv", new HashMap<String, String>(), "junit");
56	56	}
57	57	catch (TestEnvironment.Fault f) {
58	58	f.printStackTrace();

+3

-3

src/com/sun/javatest/junit/JUnitSuperTestFinder.java less more

153	153	* @param file The file to scan
154	154	*/
155	155	protected void scanFile(File file) {
156		testMethods = new ArrayList(); // new every time we visit a new class
157		tdValues = new HashMap();
	156	testMethods = new ArrayList<>(); // new every time we visit a new class
	157	tdValues = new HashMap<>();
158	158
159	159	String name = file.getName();
160	160	if (verbose)

331	331
332	332	//----------member variables------------------------------------------------
333	333
334		protected ArrayList<String> requiredSuperclass = new ArrayList();
	334	protected ArrayList<String> requiredSuperclass = new ArrayList<>();
335	335	protected String initialTag = "test";
336	336	protected final MethodFinderVisitor mfv = new MethodFinderVisitor();
337	337	protected static final I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(JUnitSuperTestFinder.class);

+8

-7

src/com/sun/javatest/junit/JUnitTestFinder.java less more

32	32	import java.io.File;
33	33	import java.util.ArrayList;
34	34	import java.util.HashMap;
	35	import java.util.List;
35	36	import java.util.Map;
36	37
37	38	/**

119	120	* A class to read files of a particular extension.
120	121	* The class must be a subtype of CommentStream
121	122	*/
122		public void addExtension(String extn, Class commentStreamClass) {
	123	public void addExtension(String extn, Class<?> commentStreamClass) {
123	124	if (!extn.startsWith("."))
124	125	throw new IllegalArgumentException("extension must begin with `.'");
125	126	if (commentStreamClass != null && !CommentStream.class.isAssignableFrom(commentStreamClass))

133	134	* @param extn The extension in question
134	135	* @return the class previously registered with addExtension
135	136	*/
136		public Class getClassForExtension(String extn) {
137		return (Class)extensionTable.get(extn);
	137	public Class<?> getClassForExtension(String extn) {
	138	return extensionTable.get(extn);
138	139	}
139	140
140	141	/**

145	146	}
146	147
147	148	protected boolean verbose = false;
148		protected Map tdValues = new HashMap();
	149	protected Map<String, String> tdValues = new HashMap<>();
149	150	protected boolean scanClasses = false;
150	151	protected File currFile;
151		protected HashMap excludeList = new HashMap();
152		protected HashMap extensionTable = new HashMap();
153		protected ArrayList<String> testMethods;
	152	protected Map<String, String> excludeList = new HashMap<>();
	153	protected Map<String, Class<?>> extensionTable = new HashMap<>();
	154	protected List<String> testMethods;
154	155	protected static final String[] excludeNames = {
155	156	"SCCS", "deleted_files", ".svn"
156	157	};

+3

-3

src/com/sun/javatest/junit/JUnitTestRunner.java less more

49	49	// by the corresponding TestSuite class.
50	50	}
51	51
52		protected boolean runTests(Iterator testIter) throws InterruptedException {
	52	protected boolean runTests(Iterator<TestDescription> testIter) throws InterruptedException {
53	53	WorkDirectory wd = getWorkDirectory();
54	54	TestDescription td = null;
55	55	//for (TestDescription td: testIter) {
56	56	for (; testIter.hasNext() ;) {
57		td = (TestDescription)(testIter.next());
	57	td = testIter.next();
58	58	TestResult tr = new TestResult(td);
59	59	TestResult.Section outSection = tr.createSection("Main");
60	60

84	84	this.loader = loader;
85	85
86	86	try {
87		Class c = loader.loadClass("com.sun.javatest.junit.JUnitMultiTest");
	87	Class<?> c = loader.loadClass("com.sun.javatest.junit.JUnitMultiTest");
88	88	} catch (ClassNotFoundException e) {
89	89	e.printStackTrace();
90	90	}

+2

-2

src/com/sun/javatest/junit/JUnitTestSuite.java less more

36	36	* Basic implementation of a test suite for JUnit tests.
37	37	*/
38	38	public class JUnitTestSuite extends TestSuite {
39		public JUnitTestSuite(File root, Map props, ClassLoader loader) throws TestSuite.Fault {
	39	public JUnitTestSuite(File root, Map<String, String> props, ClassLoader loader) throws TestSuite.Fault {
40	40	super(root, props, loader);
41	41	try {
42	42	if (getTestsDir() != null)

55	55	// will need to add options to test suite to be passed to runner
56	56	// for ex. - to run setup/teardown, etc...
57	57	try {
58		Class c = loadClass("com.sun.javatest.junit.JUnitTestRunner");
	58	Class<?> c = loadClass("com.sun.javatest.junit.JUnitTestRunner");
59	59	JUnitTestRunner tr = (JUnitTestRunner)(c.newInstance());
60	60	tr.setClassLoader(getClassLoader());
61	61	return tr;

+1

-1

src/com/sun/javatest/lib/ExecStdTestSameJVMCmd.java less more

104	104
105	105	Status status = null;
106	106	try {
107		Class c;
	107	Class<?> c;
108	108	if (loader == null)
109	109	c = Class.forName(className);
110	110	else

+9

-9

src/com/sun/javatest/lib/JavaCompileCommand.java less more

181	181	else
182	182	loader = new PathClassLoader(classpath);
183	183
184		Class compilerClass;
	184	Class<?> compilerClass;
185	185	if (compilerClassName != null) {
186	186	compilerClass = getClass(loader, compilerClassName);
187	187	if (compilerClass == null)

200	200
201	201	Object[] compileMethodArgs;
202	202	Method compileMethod = getMethod(compilerClass, "compile", // JDK1.4+
203		new Class[] { String[].class, PrintWriter.class });
	203	new Class<?>[] { String[].class, PrintWriter.class });
204	204	if (compileMethod != null)
205	205	compileMethodArgs = new Object[] { args, ref };
206	206	else {
207	207	compileMethod = getMethod(compilerClass, "compile", // JDK1.1-3
208		new Class[] { String[].class });
	208	new Class<?>[] { String[].class });
209	209	if (compileMethod != null)
210	210	compileMethodArgs = new Object[] { args };
211	211	else

217	217	compiler = null;
218	218	else {
219	219	Object[] constrArgs;
220		Constructor constr = getConstructor(compilerClass, // JDK1.1-2
221		new Class[] { OutputStream.class, String.class });
	220	Constructor<?> constr = getConstructor(compilerClass, // JDK1.1-2
	221	new Class<?>[] { OutputStream.class, String.class });
222	222	if (constr != null)
223	223	constrArgs = new Object[] { new WriterStream(ref), compilerName };
224	224	else {
225		constr = getConstructor(compilerClass, new Class[0]); // JDK1.3
	225	constr = getConstructor(compilerClass, new Class<?>[0]); // JDK1.3
226	226	if (constr != null)
227	227	constrArgs = new Object[0];
228	228	else

264	264	}
265	265	}
266	266
267		private Class getClass(ClassLoader loader, String name) {
	267	private Class<?> getClass(ClassLoader loader, String name) {
268	268	try {
269	269	return (loader == null ? Class.forName(name) : loader.loadClass(name));
270	270	}

273	273	}
274	274	}
275	275
276		private Constructor getConstructor(Class c, Class[] argTypes) {
	276	private Constructor<?> getConstructor(Class<?> c, Class<?>[] argTypes) {
277	277	try {
278	278	return c.getConstructor(argTypes);
279	279	}

287	287	}
288	288	}
289	289
290		private Method getMethod(Class c, String name, Class[] argTypes) {
	290	private Method getMethod(Class<?> c, String name, Class<?>[] argTypes) {
291	291	try {
292	292	return c.getMethod(name, argTypes);
293	293	}

+9

-9

src/com/sun/javatest/lib/KeywordScript.java less more

63	63	} // for
64	64
65	65	String prefix = "script.";
66		Set testKeys = td.getKeywordTable();
67		Vector choices = new Vector(); // the set of choices
68		Vector matches = new Vector(); // the set of matches
	66	Set<String> testKeys = td.getKeywordTable();
	67	Vector<String> choices = new Vector<>(); // the set of choices
	68	Vector<String> matches = new Vector<>(); // the set of matches
69	69	int wordsMatchingInMatches = 0;// the number of words matching
70	70
71	71	findMatch:
72		for (Iterator iter = env.keys().iterator(); iter.hasNext(); ) {
73		String key = (String) (iter.next());
	72	for (Iterator<String> iter = env.keys().iterator(); iter.hasNext(); ) {
	73	String key = (iter.next());
74	74
75	75	// if the key does not begin with the `script.' prefix, ignore key
76	76	if (!key.startsWith(prefix))

110	110	if (debug)
111	111	trOut.println("new best match, " + keys.length + " keys");
112	112
113		matches = new Vector();
	113	matches = new Vector<>();
114	114	wordsMatchingInMatches = keys.length;
115	115	}
116	116

135	135	trOut.println(s);
136	136	trOut.println("The keyword combinations for scripts in this environment are: ");
137	137	for (int i = 0; i < choices.size(); i++) {
138		trOut.println((String)choices.elementAt(i));
	138	trOut.println(choices.elementAt(i));
139	139	} // for
140	140
141	141	setStatus(Status.error(s));

152	152	return;
153	153	} // else if
154	154
155		String bestScript = (String)matches.elementAt(0);
	155	String bestScript = matches.elementAt(0);
156	156	//trOut.report.println("BEST " + bestScript);
157	157
158	158	try {

176	176	printStrArr(trOut, msgs);
177	177
178	178	try {
179		Class c = Class.forName(command[0]);
	179	Class<?> c = Class.forName(command[0]);
180	180
181	181	Script script = (Script)c.newInstance();
182	182	String[] scriptArgs = new String[command.length - 1];

+5

-5

src/com/sun/javatest/lib/ProcessCommand.java less more

83	83	*/
84	84	public void setStatusForExit(int exitCode, Status status) {
85	85	if (statusTable == null) {
86		statusTable = new Hashtable();
	86	statusTable = new Hashtable<>();
87	87	if (defaultStatus == null)
88	88	defaultStatus = Status.error("unrecognized exit code");
89	89	}

103	103	*/
104	104	public void setDefaultStatus(Status status) {
105	105	if (statusTable == null)
106		statusTable = new Hashtable();
	106	statusTable = new Hashtable<>();
107	107	defaultStatus = status;
108	108	}
109	109

279	279	if (inheritEnv) {
280	280	// copy env from system
281	281	// then apply cmdEnv
282		ArrayList<String> out = new ArrayList();
	282	ArrayList<String> out = new ArrayList<>();
283	283	Map<String,String> sysenv = System.getenv();
284	284	Set<String> keys = sysenv.keySet();
285	285	for (String key : keys) {

400	400	if (logStatus != null)
401	401	return logStatus;
402	402	else if (statusTable != null) {
403		Status s = (Status)(statusTable.get(new Integer(exitCode)));
	403	Status s = statusTable.get(Integer.valueOf(exitCode));
404	404	return (s == null ? defaultStatus.augment("exit code: " + exitCode) : s);
405	405	}
406	406	else if (exitCode == 0)

504	504	Boolean.getBoolean("javatest.processCommand.useFailedOnException");
505	505
506	506	private static int serial;
507		private Hashtable statusTable;
	507	private Map<Integer, Status> statusTable;
508	508	private Status defaultStatus;
509	509	private File execDir;
510	510	private boolean inheritEnv =

+15

-15

src/com/sun/javatest/lib/TestCases.java less more

30	30	import java.lang.reflect.Method;
31	31	import java.util.Enumeration;
32	32	import java.util.Hashtable;
	33	import java.util.Map;
33	34	import java.util.Vector;
34	35	import com.sun.javatest.Status;
35	36	import com.sun.javatest.Test;

136	137	* select and exclude calls that have been made, if any.
137	138	* @return An enumeration of the test cases.
138	139	*/
139		public Enumeration enumerate() {
140		Vector v = new Vector();
	140	public Enumeration<Method> enumerate() {
	141	Vector<Method> v = new Vector<>();
141	142	if (selectedCases.isEmpty()) {
142	143	Method[] methods = testClass.getMethods();
143	144	for (int i = 0; i < methods.length; i++) {
144	145	Method m = methods[i];
145	146	if (excludedCases.get(m.getName()) == null) {
146		Class[] paramTypes = m.getParameterTypes();
147		Class returnType = m.getReturnType();
	147	Class<?>[] paramTypes = m.getParameterTypes();
	148	Class<?> returnType = m.getReturnType();
148	149	if ((paramTypes.length == 0) && Status.class.isAssignableFrom(returnType))
149	150	v.addElement(m);
150	151	}
151	152	}
152	153	}
153	154	else {
154		for (Enumeration e = selectedCases.elements(); e.hasMoreElements(); ) {
155		Method m = (Method)(e.nextElement());
	155	for (Method m : selectedCases.values()) {
156	156	if (excludedCases.get(m.getName()) == null)
157	157	v.addElement(m);
158		}
	158	}
159	159	}
160	160	return v.elements();
161	161	}

175	175	// see if test object provides Status invokeTestCase(Method m)
176	176	Method invoker;
177	177	try {
178		invoker = testClass.getMethod("invokeTestCase", new Class[] {Method.class});
	178	invoker = testClass.getMethod("invokeTestCase", new Class<?>[] {Method.class});
179	179	if (!Status.class.isAssignableFrom(invoker.getReturnType()))
180	180	invoker = null;
181	181	}

184	184	}
185	185
186	186	MultiStatus ms = new MultiStatus(log);
187		for (Enumeration e = enumerate(); e.hasMoreElements(); ) {
188		Method m = (Method)(e.nextElement());
	187	for (Enumeration<Method> e = enumerate(); e.hasMoreElements(); ) {
	188	Method m = (e.nextElement());
189	189	Status s;
190	190	try {
191	191	if (invoker != null)

250	250	}
251	251
252	252	private String[] split(String s) {
253		Vector v = new Vector();
	253	Vector<String> v = new Vector<>();
254	254	int start = 0;
255	255	for (int i = s.indexOf(','); i != -1; i = s.indexOf(',', start)) {
256	256	v.addElement(s.substring(start, i));

264	264	}
265	265
266	266	private Object test;
267		private Class testClass;
268		private Hashtable selectedCases = new Hashtable();
269		private Hashtable excludedCases = new Hashtable();
	267	private Class<?> testClass;
	268	private Map<String, Method> selectedCases = new Hashtable<>();
	269	private Map<String, Method> excludedCases = new Hashtable<>();
270	270	private PrintWriter log;
271	271
272	272	private static final Object[] noArgs = { };
273		private static final Class[] noArgTypes = { };
	273	private static final Class<?>[] noArgTypes = { };
274	274	}

+1

-1

src/com/sun/javatest/logging/LogModel.java less more

426	426
427	427
428	428	private class MessageCache extends LinkedHashMap<LiteLogRecord, String> {
429		protected boolean removeEldestEntry(Map.Entry eldest) {
	429	protected boolean removeEldestEntry(Map.Entry<LiteLogRecord, String> eldest) {
430	430	return size() > PAGE_SIZE*2;
431	431	}
432	432	}

+8

-8

src/com/sun/javatest/mrep/BrowserPane.java less more

435	435	selectBox.setSelectedItem(s);
436	436	}
437	437
438		private DefaultComboBoxModel createModel() {
	438	private DefaultComboBoxModel<URL> createModel() {
439	439	if (model == null)
440		model = new DefaultComboBoxModel();
	440	model = new DefaultComboBoxModel<>();
441	441	return model;
442	442	}
443	443

450	450	private JButton backBtn;
451	451	private JButton forwardBtn;
452	452
453		private JComboBox selectBox;
	453	private JComboBox<URL> selectBox;
454	454	private JPanel head;
455	455	private JPanel body;
456	456	private JTextField noteField;

461	461
462	462	private History history;
463	463
464		private DefaultComboBoxModel model;
	464	private DefaultComboBoxModel<URL> model;
465	465	private Listener listener = new Listener();
466	466	private JToolBar toolBar;
467	467	private UIFactory uif;

485	485	if (index == 0)
486	486	return null;
487	487
488		return (URL) (entries.elementAt(--index));
	488	return entries.elementAt(--index);
489	489	}
490	490
491	491	boolean hasNext() {

496	496	if (index == entries.size() - 1)
497	497	return null;
498	498
499		return (URL) (entries.elementAt(++index));
	499	return entries.elementAt(++index);
500	500	}
501	501
502	502	void add(URL u) {

521	521	index = -1;
522	522	}
523	523
524		private Vector entries = new Vector();
	524	private Vector<URL> entries = new Vector<>();
525	525	private int index;
526	526	}
527	527

561	561	//------------------------------------------------------------------------------------
562	562
563	563	private class Renderer extends DefaultListCellRenderer {
564		public Component getListCellRendererComponent(JList list, Object o, int index, boolean isSelected, boolean cellHasFocus) {
	564	public Component getListCellRendererComponent(JList<?> list, Object o, int index, boolean isSelected, boolean cellHasFocus) {
565	565	String name = null;
566	566	if (o instanceof URL) {
567	567	URL url = (URL) o;

+3

-3

src/com/sun/javatest/mrep/ConflictResolutionDialog.java less more

64	64	private JButton resolveButton;
65	65	private JButton cancelButton;
66	66
67		private DefaultListModel listModel;
68		private JList list;
	67	private DefaultListModel<String> listModel;
	68	private JList<?> list;
69	69
70	70	private int selectedIndex;
71	71	private boolean bPreferredReport;

105	105	chooseTextPanel.add(chooseText);
106	106
107	107	// Build list box
108		listModel=new DefaultListModel();
	108	listModel=new DefaultListModel<>();
109	109	for (int i=0; i< reportsList.length; i++) {
110	110	listModel.addElement(reportsList[i]);
111	111	}

+12

-20

src/com/sun/javatest/mrep/FilesPane.java less more

170	170	return false;
171	171	}
172	172
173		List mergedList = new ArrayList();
	173	List<String> mergedList = new ArrayList<>();
174	174	for (int i = 0; i < merged.length; i++) {
175	175	merged[i] = merged[i].trim();
176	176	if ( !"".equals(merged[i])) {

208	208	boolean error = false; // block "next" button if any error occurred (should be false to unblock)
209	209	ArrayList<String> used = new ArrayList<String>();
210	210	for (int i = 0; i < merged.size(); i++) {
211		JTextField tField = (JTextField) merged.get(i);
	211	JTextField tField = merged.get(i);
212	212	String s = tField.getText().trim();
213	213	tField.setBackground(UIFactory.getDefaultInputColor());
214	214	if (!"".equals(s)) { // do nothing, if value is empty

224	224	} else {
225	225	error = true;
226	226	tField.setBackground(UIFactory.getInvalidInputColor());
227		((JTextField)merged.get(used.indexOf(s))).setBackground(UIFactory.getInvalidInputColor());
	227	(merged.get(used.indexOf(s))).setBackground(UIFactory.getInvalidInputColor());
228	228	}
229	229	}
230	230	}

242	242	setName("tool.merged");
243	243	setLayout(new GridBagLayout());
244	244
245		merged = new ArrayList();
246		this.mergedBtns = new ArrayList();
	245	merged = new ArrayList<>();
	246	this.mergedBtns = new ArrayList<>();
247	247
248	248	addMore = uif.createButton("files.addmore", new ActionListener() {
249	249	public void actionPerformed(ActionEvent e) {

287	287	Object src = e.getSource();
288	288	for (int i = 0; i < mergedBtns.size(); i++) {
289	289	if (src == mergedBtns.get(i)) {
290		chooseXmlReportFile((JTextField) merged
	290	chooseXmlReportFile( merged
291	291	.get(i));
292	292	}
293	293	}

308	308	this.updateUI();
309	309	}
310	310
311		private java.util.List mergedBtns;
	311	private java.util.List<JButton> mergedBtns;
312	312	private JButton addMore;
313	313
314	314	}

378	378	String formatVersion = "formatVersion=\"v1\"";
379	379
380	380	if (!f.getName().endsWith(".xml")) return false;
381		BufferedReader r = null;
382		try {
383		r = new BufferedReader(new InputStreamReader(new FileInputStream(f), StandardCharsets.UTF_8));
	381	try (BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(f), StandardCharsets.UTF_8))) {
384	382	boolean hasSchema, hasVersion = false;
385	383
386	384	// line 1

395	393	return (hasSchema && hasVersion);
396	394	} catch (IOException ex) {
397	395	return false;
398		} finally {
399		try {
400		if (r != null) r.close();
401		} catch (IOException ex) {
402		// nothing...
403		}
404	396	}
405	397	}
406	398

441	433	String[] getXmlFiles() {
442	434	int l=0;
443	435	for (int i = 0; i < merged.size(); i++) {
444		String s = ((JTextField)merged.get(i)).getText().trim();
	436	String s = merged.get(i).getText().trim();
445	437	if (!"".equals(s)) l++;
446	438	}
447	439
448	440	String[] result = new String[l];
449	441	l = 0;
450	442	for (int i = 0; i < merged.size(); i++) {
451		String s = ((JTextField)merged.get(i)).getText().trim();
	443	String s = merged.get(i).getText().trim();
452	444	if (!"".equals(s)) {
453		result[l++] = ((JTextField)merged.get(i)).getText().trim();
	445	result[l++] = s;
454	446	}
455	447	}
456	448	return result;
457	449	}
458	450
459		private List merged;
	451	private List<JTextField> merged;
460	452	static final String OK = "OK";
461	453
462	454	private class Listener extends ComponentAdapter implements ActionListener, FocusListener, KeyListener {

+15

-15

src/com/sun/javatest/mrep/Merger.java less more

44	44	/**
45	45	* @param in array of files with XML reports
46	46	* @param out file to put results
47		* @param confilctResolver ConflictResolver to resolve conflicts during merge
	47	* @param conflictResolver ConflictResolver to resolve conflicts during merge
48	48	*/
49		public boolean merge(File[] in, File out, ConflictResolver confilctResolver) throws SAXException,
	49	public boolean merge(File[] in, File out, ConflictResolver conflictResolver) throws SAXException,
50	50	ParserConfigurationException, IOException{
51	51	// Maps with statistics
52		Map[] inputs = new Map[in.length];
	52	Map<?, ?>[] inputs = new Map<?, ?>[in.length];
53	53	// read statistics
54	54	for (int i = 0; i < in.length; i++) {
55	55	XMLReportReader reader = new XMLReportReader();
56		Map map = reader.readIDs(in[i]);
	56	Map<?, ?> map = reader.readIDs(in[i]);
57	57	inputs[i] = map;
58	58	}
59	59
60	60	// shift word workgroups id renaming
61	61	int allCnt = 0;
62	62	// rename id's and find conflicts
63		Set all = new HashSet();
64		List confilcts = new ArrayList();
	63	Set<String> all = new HashSet<>();
	64	List<String> conflicts = new ArrayList<>();
65	65	for (int i = 0; i < in.length; i++) {
66	66	int workdirsInFile = 0;
67		Iterator it = inputs[i].keySet().iterator();
68		Map newMap = new HashMap();
	67	Iterator<?> it = inputs[i].keySet().iterator();
	68	Map<Object, Object> newMap = new HashMap<>();
69	69	while (it.hasNext()) {
70	70	Object o = it.next();
71	71	// this is workdir ID

78	78	// this is test result url
79	79	if (o instanceof String) {
80	80	String url = (String) o;
81		if (all.contains(url) && !confilcts.contains(url)) {
82		confilcts.add(url);
	81	if (all.contains(url) && !conflicts.contains(url)) {
	82	conflicts.add(url);
83	83	}
84	84	all.add(url);
85	85	TestResultDescr td = (TestResultDescr)inputs[i].get(o);

93	93	}
94	94
95	95	// resolve each conflict
96		for (int c = 0; c < confilcts.size(); c++) {
97		String url = (String)confilcts.get(c);
98		ArrayList tds = new ArrayList();
	96	for (int c = 0; c < conflicts.size(); c++) {
	97	String url = conflicts.get(c);
	98	List<TestResultDescr> tds = new ArrayList<>();
99	99	for(int i = 0; i < in.length; i++) {
100	100	TestResultDescr td = (TestResultDescr) inputs[i].get(url);
101	101	if (td != null) {

103	103	tds.add(td);
104	104	}
105	105	}
106		TestResultDescr[] tda = (TestResultDescr[])tds.toArray(new TestResultDescr[0]);
107		int res = confilctResolver.resolve(url, tda);
	106	TestResultDescr[] tda = tds.toArray(new TestResultDescr[0]);
	107	int res = conflictResolver.resolve(url, tda);
108	108	if (res < 0) {
109	109	// cancel
110	110	return false;

+34

-41

src/com/sun/javatest/mrep/OptionsPane.java less more

44	44	import java.awt.event.MouseEvent;
45	45	import java.beans.PropertyChangeEvent;
46	46	import java.beans.PropertyChangeListener;
47		import java.util.ArrayList;
48		import java.util.Collection;
49		import java.util.HashMap;
50		import java.util.HashSet;
51		import java.util.Iterator;
52		import java.util.List;
	47	import java.util.*;
53	48
54	49	import javax.swing.BorderFactory;
55	50	import javax.swing.DefaultListModel;

99	94	}
100	95
101	96	CustomReport[] getCustomSelected() {
102		return (CustomReport[])getActiveCustomReports().
103		toArray(new CustomReport[0]);
	97	return getActiveCustomReports().toArray(new CustomReport[0]);
104	98	}
105	99	protected void initGUI() {
106	100	setName("opts");

146	140	BorderFactory.createEmptyBorder(12,12,12,12)));
147	141
148	142
149		listModel = new DefaultListModel();
	143	listModel = new DefaultListModel<>();
150	144
151	145	// populate list and card panel
152	146	final CardLayout cards = new CardLayout();

181	175
182	176
183	177	if (customBoxes != null && list != null) {
184		CustomReport val = (CustomReport)(customBoxes.get(list.getSelectedValue()));
	178	CustomReport val = customBoxes.get(list.getSelectedValue());
185	179	if (val != null)
186	180	descriptionArea.setText(val.getDescription());
187	181	}

246	240	private int getCustomReports(JPanel p) {
247	241	int result = 0;
248	242	Tool[] tools = desktop.getTools();
249		List customReportsList = new ArrayList();
	243	List<CustomReport> customReportsList = new ArrayList<>();
250	244	for (int i = 0; i < tools.length; i++) {
251	245	if (tools[i] instanceof ExecTool) {
252	246	// should not be using report types from ExecTool

266	260	}
267	261	} // for
268	262
269		customReports = (CustomReport[]) customReportsList
	263	customReports = customReportsList
270	264	.toArray(new CustomReport[0]);
271	265	if (customReports == null \|\| customReports.length == 0) {
272	266	customReports = null;
273	267	return 0;
274	268	}
275	269
276		customBoxes = new HashMap();
	270	customBoxes = new HashMap<>();
277	271
278	272	for (int i = 0; i < customReports.length; i++) {
279	273	JCheckBox cb = new JCheckBox(customReports[i].getName());

300	294	return result;
301	295	}
302	296
303		private ArrayList getActiveCustomReports() {
304
305		ArrayList customReps = new ArrayList();
	297	private ArrayList<CustomReport> getActiveCustomReports() {
	298
	299	ArrayList<CustomReport> customReps = new ArrayList<>();
306	300	if (customBoxes != null && customBoxes.size() > 0) {
307		Iterator it = customBoxes.keySet().iterator();
	301	Iterator<JCheckBox> it = customBoxes.keySet().iterator();
308	302	while (it.hasNext()) {
309		JCheckBox box = (JCheckBox)(it.next());
	303	JCheckBox box = it.next();
310	304	if (box.isSelected()) {
311	305	customReps.add(customBoxes.get(box));
312	306	}

327	321	* @param p parent Panel
328	322	* @param cardLayout The CardLayout for options
329	323	*/
330		SelectListener(JList lst, JPanel p, CardLayout cardLayout) {
	324	SelectListener(JList<JCheckBox> lst, JPanel p, CardLayout cardLayout) {
331	325	list = lst;
332	326	listModel = list.getModel();
333	327	lastSelected = listModel.getElementAt(0);

349	343
350	344	public void valueChanged(ListSelectionEvent e) {
351	345	int index = list.getSelectedIndex();
352		JCheckBox box = (JCheckBox) (listModel.getElementAt(index));
	346	JCheckBox box = (listModel.getElementAt(index));
353	347
354	348	if (lastSelected != box) {
355	349	cards.show(panel, box.getName());

370	364	}
371	365
372	366	if (customBoxes != null) {
373		CustomReport rep = (CustomReport) customBoxes.get(box);
	367	CustomReport rep = customBoxes.get(box);
374	368	if(rep != null) {
375	369	if (rep.getOptionPanes() != null) {
376	370	for (int i = 0; i < rep.getOptionPanes().length; i++) {

384	378	}
385	379
386	380	private void process(final int index) {
387		JCheckBox box = (JCheckBox) (listModel.getElementAt(index));
	381	JCheckBox box = (listModel.getElementAt(index));
388	382
389	383	if (lastSelected == box) {
390	384	box.doClick();

401	395	}
402	396
403	397	Object lastSelected;
404		JList list;
405		ListModel listModel;
	398	JList<JCheckBox> list;
	399	ListModel<JCheckBox> listModel;
406	400	JPanel panel;
407	401	CardLayout cards;
408	402	double emptyCBW = new JCheckBox("").getPreferredSize().getWidth() + 2;

429	423	boolean newV = ((Boolean) evt.getNewValue()).booleanValue();
430	424	if (oldV && !newV) {
431	425	// disable
432		Iterator chIt = collectChildren(theContainer,
433		new ArrayList()).iterator();
434		enabledComp = new HashSet();
	426	Iterator<Component> chIt = collectChildren(theContainer,
	427	new ArrayList<Component>()).iterator();
	428	enabledComp = new HashSet<>();
435	429	while (chIt.hasNext()) {
436		Component c = (Component) chIt.next();
	430	Component c = chIt.next();
437	431	if (c.isEnabled()) {
438	432	enabledComp.add(c);
439	433	c.setEnabled(false);

442	436
443	437	} else if (!oldV && newV && enabledComp != null) {
444	438	// enable
445		Iterator chIt = collectChildren(theContainer,
446		new ArrayList()).iterator();
	439	Iterator<Component> chIt = collectChildren(theContainer,
	440	new ArrayList<Component>()).iterator();
447	441	while (chIt.hasNext()) {
448		Component c = (Component) chIt.next();
	442	Component c = chIt.next();
449	443	if (enabledComp.contains(c)) {
450	444	c.setEnabled(true);
451	445	}

457	451	/**
458	452	* Recursively gathers all children components
459	453	*/
460		private Collection collectChildren(Container comp, Collection c) {
	454	private Collection<Component> collectChildren(Container comp, Collection<Component> c) {
461	455	Component[] ch = comp.getComponents();
462	456	for (int i = 0; i < ch.length; i++) {
463	457	c.add(ch[i]);

470	464
471	465	private Container theContainer;
472	466
473		private HashSet enabledComp;
474		}
475
476		private class CheckBoxListCellRenderer implements ListCellRenderer {
477		public Component getListCellRendererComponent(JList list, Object value,
	467	private Set<Component> enabledComp;
	468	}
	469
	470	private class CheckBoxListCellRenderer implements ListCellRenderer<JCheckBox> {
	471	public Component getListCellRendererComponent(JList<? extends JCheckBox> list, JCheckBox comp,
478	472	int index, boolean isSelected, boolean cellHasFocus) {
479	473	// assert: value is a JCheckBox
480		JComponent comp = (JComponent) value;
481	474	if (isSelected) {
482	475	comp.setOpaque(true);
483	476	comp.setBackground(UIFactory.Colors.TEXT_HIGHLIGHT_COLOR.getValue());

494	487	return new JButton[] { backBtn, okBtn, cancelBtn, helpBtn };
495	488	}
496	489
497		private DefaultListModel listModel;
498		private JList list;
	490	private DefaultListModel<JCheckBox> listModel;
	491	private JList<JCheckBox> list;
499	492	private CustomReport[] customReports;
500	493	private JTextArea descriptionArea;
501		private HashMap customBoxes;
	494	private Map<JCheckBox, CustomReport> customBoxes;
502	495	private JCheckBox cbXml;
503	496	private JButton backBtn;
504	497	private JButton okBtn;

+1

-1

src/com/sun/javatest/mrep/ReportDirChooser.java less more

50	50	// be safely loaded, before the JFileChooser starts running its background
51	51	// thread, exposing a JVM bug in class loading.
52	52	static {
53		Class reportClass = Report.class;
	53	Class<?> reportClass = Report.class;
54	54	}
55	55
56	56	/**

+4

-4

src/com/sun/javatest/mrep/ReportTool.java less more

94	94	}
95	95
96	96	@Override
97		protected void restore(Map map) {
98		}
99
100		protected void save(Map m) {
	97	protected void restore(Map<String, String> map) {
	98	}
	99
	100	protected void save(Map<String, String> m) {
101	101	}
102	102
103	103	private void initGUI(){

+1

-1

src/com/sun/javatest/mrep/ReportToolManager.java less more

62	62	return new Action[] { a };
63	63	}
64	64
65		public Tool restoreTool(Map m) {
	65	public Tool restoreTool(Map<String, String> m) {
66	66	ReportTool t = getTool();
67	67	t.restore(m);
68	68	return t;

+4

-4

src/com/sun/javatest/mrep/XMLReportReader.java less more

62	62	private static final String JAXP_SCHEMA_SOURCE =
63	63	"http://java.sun.com/xml/jaxp/properties/schemaSource";
64	64
65		Map readIDs(File file) throws SAXException, IOException, ParserConfigurationException {
	65	Map<Object, Object> readIDs(File file) throws SAXException, IOException, ParserConfigurationException {
66	66	XMLReader reader = XMLReportReader.createXMLReader(true);
67	67	IDHandler handler = new IDHandler();
68	68	reader.setContentHandler(handler);

106	106
107	107
108	108	private static class IDHandler extends DefaultHandler {
109		private Map map = new HashMap();
	109	private Map<Object, Object> map = new HashMap<>();
110	110
111	111	private long time = 0;
112	112

124	124	map.put(id, id);
125	125	}
126	126	if (qualifiedName.equals(Scheme.REPORT)) {
127		String dateStr = (String) attributes
	127	String dateStr = attributes
128	128	.getValue(Scheme.REPORT_GENTIME);
129	129	try {
130	130	time = XMLReportWriter.ISO8601toDate(dateStr).getTime();

134	134	}
135	135	}
136	136
137		public Map getMap() {
	137	public Map<Object, Object> getMap() {
138	138	return map;
139	139	}
140	140	}

+5

-5

src/com/sun/javatest/mrep/XMLReportWriter.java less more

123	123	ser.startElement("", "", Scheme.REPORT, atts);
124	124	}
125	125
126		public void write(File[] file, Map[] map) throws SAXException,
	126	public void write(File[] file, Map<?, ?>[] map) throws SAXException,
127	127	ParserConfigurationException, IOException {
128	128	try {
129	129	ser.startDocument();

170	170
171	171	// id -> new_id mapping
172	172	// url -> new_TestDescr mapping
173		private Map map;
174
175		public CopyHandler(ContentHandler ser, boolean isWorkDir, Map map) {
	173	private Map<?, ?> map;
	174
	175	public CopyHandler(ContentHandler ser, boolean isWorkDir, Map<?, ?> map) {
176	176	this.ser = ser;
177	177	if (ser instanceof LexicalHandler) {
178	178	lh = (LexicalHandler) ser;

192	192	AttributesImpl newAttrs = new AttributesImpl();
193	193	for (int i = 0; i < attrs.getLength(); i++) {
194	194	if (attrs.getQName(i).equals(Scheme.WD_ID)) {
195		String id = String.valueOf((Integer) map.get(Integer
	195	String id = String.valueOf(map.get(Integer
196	196	.valueOf(attrs.getValue(i))));
197	197	newAttrs.addAttribute(attrs.getURI(i), attrs
198	198	.getLocalName(i), attrs.getQName(i), attrs

+0

-102

~~src/com/sun/javatest/report/COFReport.java~~ less more

0		/*
1		* $Id$
2		*
3		* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
4		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5		*
6		* This code is free software; you can redistribute it and/or modify it
7		* under the terms of the GNU General Public License version 2 only, as
8		* published by the Free Software Foundation. Oracle designates this
9		* particular file as subject to the "Classpath" exception as provided
10		* by Oracle in the LICENSE file that accompanied this code.
11		*
12		* This code is distributed in the hope that it will be useful, but WITHOUT
13		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15		* version 2 for more details (a copy is included in the LICENSE file that
16		* accompanied this code).
17		*
18		* You should have received a copy of the GNU General Public License version
19		* 2 along with this work; if not, write to the Free Software Foundation,
20		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21		*
22		* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23		* or visit www.oracle.com if you need additional information or have any
24		* questions.
25		*/
26		package com.sun.javatest.report;
27
28		import com.sun.javatest.cof.COFData;
29		import com.sun.javatest.cof.Main;
30		import com.sun.javatest.cof.Main.Fault;
31		import com.sun.javatest.util.I18NResourceBundle;
32		import java.io.File;
33		import java.io.IOException;
34		import java.util.Collections;
35		import java.util.List;
36		import java.util.logging.Level;
37		import java.util.logging.Logger;
38
39		public class COFReport implements ReportFormat {
40
41		@Override
42		public ReportLink write(ReportSettings s, File dir) throws IOException {
43		COFData data = new COFData();
44		data.setInterviewParameters(s.getInterview());
45
46		File outputFile = new File(dir.getAbsolutePath() + File.separator + FNAME);
47
48		if (!s.isCOFTestCasesEnabled()) {
49		Main.setGenerateTestCases(s.isCOFTestCasesEnabled());
50		}
51
52		Main cofMain = new Main();
53		cofMain.setInterviewParameters(s.getInterview());
54		try {
55		com.sun.javatest.cof.Report report = cofMain.fillReport(data);
56		cofMain.writeReport(report, outputFile);
57		} catch (Fault ex) {
58		Logger.getLogger(COFReport.class.getName()).log(Level.SEVERE, null, ex);
59		}
60
61		String warning = data.get("warning");
62		if (warning != null) {
63		// System.out.println(warning);
64		}
65
66		return new ReportLink(i18n.getString("index.coftype.txt"),
67		getBaseDirName(), i18n.getString("index.desc.cof"), outputFile);
68		}
69
70		@Override
71		public String getReportID() {
72		return ID;
73		}
74
75		@Override
76		public String getBaseDirName() {
77		return ID;
78		}
79
80		@Override
81		public boolean acceptSettings(ReportSettings s) {
82		return s.isCOFEnabled();
83		}
84
85		@Override
86		public List<ReportFormat> getSubReports() {
87		return Collections.<ReportFormat>emptyList();
88		}
89
90		@Override
91		public String getTypeName() {
92		return ID;
93		}
94
95		private final String FNAME = "cof.xml";
96
97		private static I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(COFReport.class);
98
99		private static final String ID = "cof";
100
101		}

+14

-19

src/com/sun/javatest/report/ConfigSection.java less more

28	28	import java.io.File;
29	29	import java.io.IOException;
30	30	import java.text.NumberFormat;
31		import java.util.Comparator;
32		import java.util.Iterator;
33		import java.util.SortedSet;
34		import java.util.TreeSet;
	31	import java.util.*;
35	32
36	33	import com.sun.interview.WizPrint;
37	34	import com.sun.javatest.ExcludeList;

382	379	out.endTag(HTMLWriterEx.H2);
383	380	}
384	381
385		SortedSet envTable = new TreeSet(new StringArrayComparator());
386
387		for (Iterator i = env.elements().iterator(); i.hasNext(); ) {
388		TestEnvironment.Element envElem = (TestEnvironment.Element) (i.next());
	382	Set<String[]> envTable = new TreeSet<>(new StringArrayComparator());
	383
	384	for (Iterator<TestEnvironment.Element> i = env.elements().iterator(); i.hasNext(); ) {
	385	TestEnvironment.Element envElem = (i.next());
389	386	String[] envTableRow = {envElem.getKey(), envElem.getValue()};
390	387	envTable.add(envTableRow);
391	388	}
392	389
393	390	out.startTag(HTMLWriterEx.TABLE);
394	391	out.writeAttr(HTMLWriterEx.BORDER, 1);
395		for (Iterator i = envTable.iterator(); i.hasNext(); ) {
396		String[] envEntry = (String[]) (i.next());
	392	for (Iterator<String[]> i = envTable.iterator(); i.hasNext(); ) {
	393	String[] envEntry = (i.next());
397	394	out.startTag(HTMLWriterEx.TR);
398	395
399	396	for (int j = 0; j < envEntry.length; j++ ) {

418	415	out.writeI18N("config.excl.none");
419	416	}
420	417	else {
421		SortedSet sortedEntries = new TreeSet(new ExcludeListEntryComparator());
422		for (Iterator iter = excludeList.getIterator(false); iter.hasNext(); )
423		sortedEntries.add(iter.next());
	418	SortedSet<ExcludeList.Entry> sortedEntries = new TreeSet<>(new ExcludeListEntryComparator());
	419	for (Iterator<?> iter = excludeList.getIterator(false); iter.hasNext(); )
	420	sortedEntries.add((ExcludeList.Entry)iter.next());
424	421
425	422	out.startTag(HTMLWriterEx.TABLE);
426	423	out.writeAttr(HTMLWriterEx.BORDER, 1);

442	439	out.endTag(HTMLWriterEx.TH);
443	440	out.endTag(HTMLWriterEx.TR);
444	441
445		for (Iterator iter = sortedEntries.iterator(); iter.hasNext(); ) {
446		ExcludeList.Entry e = (ExcludeList.Entry) (iter.next());
	442	for (Iterator<ExcludeList.Entry> iter = sortedEntries.iterator(); iter.hasNext(); ) {
	443	ExcludeList.Entry e = (iter.next());
447	444	out.startTag(HTMLWriterEx.TR);
448	445	writeTD(out, e.getRelativeURL());
449	446	writeTD(out, e.getTestCases());

478	475	out.endTag(HTMLWriterEx.TD);
479	476	}
480	477
481		private static class ExcludeListEntryComparator implements Comparator
	478	private static class ExcludeListEntryComparator implements Comparator<ExcludeList.Entry>
482	479	{
483		public int compare(Object o1, Object o2) {
484		ExcludeList.Entry e1 = (ExcludeList.Entry) o1;
485		ExcludeList.Entry e2 = (ExcludeList.Entry) o2;
	480	public int compare(ExcludeList.Entry e1, ExcludeList.Entry e2) {
486	481	int x = compare(e1.getRelativeURL(), e2.getRelativeURL());
487	482	if (x == 0)
488	483	x = compare(e1.getTestCases(), e2.getTestCases());

+2

-9

src/com/sun/javatest/report/CustomReport.java less more

78	78	} else {
79	79	// make it!
80	80	env.tmpXmlReportFile = File.createTempFile("jtrep", "tmp");
81		FileOutputStream fos = new FileOutputStream(env.tmpXmlReportFile);
82		try {
83		Writer fw = new BufferedWriter(new OutputStreamWriter(fos, XMLReportMaker.XML_CHARSET));
	81	try (FileOutputStream fos = new FileOutputStream(env.tmpXmlReportFile);
	82	Writer fw = new BufferedWriter(new OutputStreamWriter(fos, XMLReportMaker.XML_CHARSET))) {
84	83	XMLReport xr = new XMLReport();
85	84	xr.write(fw, env);
86		fw.close();
87		}
88		finally {
89		if (fos != null){
90		try { fos.close(); } catch (IOException e) { }
91		}
92	85	}
93	86	xmlSrc = env.tmpXmlReportFile;
94	87	}

+3

-3

src/com/sun/javatest/report/CustomReportFormat.java less more

132	132	if (customReports == null \|\| customReports.length == 0) {
133	133	return NO_REPORTS;
134	134	}
135		return (List<CustomReport>) Arrays.asList(customReports);
	135	return Arrays.asList(customReports);
136	136	}
137	137
138	138
139	139	private CustomReport theCustomReport;
140		private ArrayList<ReportFormat> subreports = new ArrayList<ReportFormat>();
141		private static final List<CustomReport> NO_REPORTS = (List<CustomReport>) Collections.EMPTY_LIST;
	140	private ArrayList<ReportFormat> subreports = new ArrayList<>();
	141	private static final List<CustomReport> NO_REPORTS = Collections.emptyList();
142	142
143	143
144	144	}

+6

-5

src/com/sun/javatest/report/HTMLReport.java less more

26	26	package com.sun.javatest.report;
27	27
28	28	import com.sun.javatest.Status;
	29	import com.sun.javatest.TestResult;
29	30	import com.sun.javatest.util.I18NResourceBundle;
30	31	import java.io.BufferedWriter;
31	32	import java.io.File;

51	52	setResults(s.getSortedResults());
52	53
53	54
54		ArrayList mainSecs = new ArrayList(3);
55		ArrayList auxSecs = new ArrayList(3);
	55	List<HTMLSection> mainSecs = new ArrayList<>(3);
	56	List<HTMLSection> auxSecs = new ArrayList<>(3);
56	57
57	58	// optional section
58	59	ConfigSection cs = new ConfigSection(this, s, dir, i18n);

240	241	return new BufferedWriter(osw);
241	242	}
242	243
243		public void setResults(TreeSet[] results) {
	244	public void setResults(TreeSet<TestResult>[] results) {
244	245	this.results = results;
245	246	}
246	247
247		TreeSet[] getResults() {
	248	TreeSet<TestResult>[] getResults() {
248	249	return results;
249	250	}
250	251

297	298
298	299	private static I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(HTMLReport.class);
299	300
300		private TreeSet[] results;
	301	private TreeSet<TestResult>[] results;
301	302	private KflSorter kflSorter;
302	303
303	304	// The name of the root file for a set of report files.

+5

-3

src/com/sun/javatest/report/KflPlainText.java less more

31	31	import java.io.*;
32	32	import java.nio.charset.StandardCharsets;
33	33	import java.util.HashSet;
	34	import java.util.Set;
	35	import java.util.SortedSet;
34	36	import java.util.TreeSet;
35	37
36	38

65	67	}
66	68	}
67	69
68		private void writeTestSet(String f, String id, TreeSet<KflSorter.TestDiff> tests) {
	70	private void writeTestSet(String f, String id, SortedSet<KflSorter.TestDiff> tests) {
69	71	// add file validation
70	72	try {
71	73	Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, f)), StandardCharsets.UTF_8));

115	117	return;
116	118	}
117	119
118		HashSet<String> hs = new HashSet();
	120	Set<String> hs = new HashSet<>();
119	121
120	122	for (int i = 0; i < e.length; i++) {
121	123	String[] bugs = e[i].getBugIdStrings();

147	149	writer.write("\n");
148	150	}
149	151
150		private void writeTestCaseSet(String f, String id, TreeSet<KflSorter.TestDiff> tests) {
	152	private void writeTestCaseSet(String f, String id, SortedSet<KflSorter.TestDiff> tests) {
151	153	writeTestSet(f, id, tests);
152	154	}
153	155

+2

-1

src/com/sun/javatest/report/KflSection.java less more

28	28	import java.io.*;
29	29	import java.nio.charset.StandardCharsets;
30	30	import java.util.HashSet;
	31	import java.util.Set;
31	32	import java.util.SortedSet;
32	33
33	34	import com.sun.javatest.KnownFailuresList;

365	366	}
366	367
367	368	String urlPrefix = Preferences.access().getPreference(ReportManager.BUGRPT_URL_PREF, null);
368		HashSet<String> hs = new HashSet();
	369	Set<String> hs = new HashSet<>();
369	370
370	371	for (int i = 0; i < e.length; i++) {
371	372	String[] bugs = e[i].getBugIdStrings();

+38

-42

src/com/sun/javatest/report/KflSorter.java less more

33	33	import java.io.BufferedReader;
34	34	import java.io.IOException;
35	35	import java.io.StringReader;
36		import java.util.Iterator;
37		import java.util.LinkedHashMap;
38		import java.util.Map;
39		import java.util.TreeSet;
	36	import java.util.*;
40	37	import java.util.regex.Matcher;
41	38	import java.util.regex.Pattern;
42	39

67	64	KflSorter(KnownFailuresList kfl, TestResultTable trt, boolean testcases) {
68	65	this.kfl = kfl;
69	66	this.trt = trt;
70		missing = new TreeSet();
71		newFailures = new TreeSet();
72		otherErrors = new TreeSet();
73		fail2notrun = new TreeSet();
74		fail2error = new TreeSet();
75		fail2pass = new TreeSet();
76		fail2fail = new TreeSet();
77
78		tc_missing = new TreeSet();
79		tc_fail2pass = new TreeSet();
80		tc_fail2error = new TreeSet();
81		tc_fail2notrun = new TreeSet();
82		tc_newFailures = new TreeSet();
	67	missing = new TreeSet<>();
	68	newFailures = new TreeSet<>();
	69	otherErrors = new TreeSet<>();
	70	fail2notrun = new TreeSet<>();
	71	fail2error = new TreeSet<>();
	72	fail2pass = new TreeSet<>();
	73	fail2fail = new TreeSet<>();
	74
	75	tc_missing = new TreeSet<>();
	76	tc_fail2pass = new TreeSet<>();
	77	tc_fail2error = new TreeSet<>();
	78	tc_fail2notrun = new TreeSet<>();
	79	tc_newFailures = new TreeSet<>();
83	80
84	81	enableTestCases = testcases;
85	82	}

113	110	* @return Number of comparison errors encountered.
114	111	*/
115	112	synchronized int run(TestResultTable.TreeIterator iter) {
116		TreeSet[] lists = new TreeSet[Status.NUM_STATES];
	113	TreeSet<TestResult>[] lists = new TreeSet[Status.NUM_STATES];
117	114	int totalFound = 0;
118	115
119	116	for (; iter.hasNext();) {
120		TestResult tr = (TestResult) (iter.next());
	117	TestResult tr = iter.next();
121	118	Status s = tr.getStatus();
122		TreeSet list = lists[s == null ? Status.NOT_RUN : s.getType()];
	119	TreeSet<TestResult> list = lists[s == null ? Status.NOT_RUN : s.getType()];
123	120	list.add(tr);
124	121	totalFound++;
125	122	}

134	131	* @param tests
135	132	* @return Number of comparison problems encountered.
136	133	*/
137		synchronized int run(TreeSet[] tests) {
	134	synchronized int run(TreeSet<?>[] tests) {
138	135	Iterator<KnownFailuresList.Entry> it = kfl.getIterator(false);
139	136	int probs = 0;
140	137	int tcprobs = 0;

405	402	*/
406	403	private int addAllTestCases(final KnownFailuresList.Entry entry,
407	404	final String url, final TestResult tr,
408		Transitions t, TreeSet set) {
	405	Transitions t, Set<TestDiff> set) {
409	406	// could check enableTestCases flag before processing
410	407	// add all test cases from this entry
411	408	int problems = 0;

424	421
425	422	private int addListedTestCases(final KnownFailuresList.Entry entry,
426	423	final String url, final TestResult tr,
427		Transitions t, TreeSet set) {
	424	Transitions t, TreeSet<?> set) {
428	425	int problems = 0;
429	426
430	427	String[] tcs = entry.getTestCaseList();

484	481	*/
485	482	private int addStatusTestCases(
486	483	final String url, final TestResult tr, int status,
487		Transitions t, Map<String, Status> trtcs, TreeSet set) {
	484	Transitions t, Map<String, Status> trtcs, Set<TestDiff> set) {
488	485	// could check enableTestCases flag before processing
489	486	int problems = 0;
490	487

534	531	return false;
535	532	}
536	533
537		synchronized TreeSet<TestDiff> getSet(Transitions id) {
	534	synchronized SortedSet<TestDiff> getSet(Transitions id) {
538	535	switch (id) {
539	536	case FAIL2PASS: return fail2pass;
540	537	case FAIL2MISSING: return missing;

563	560
564	561
565	562	private static Map<String, Status> getTestCases(final TestResult tr) {
566		Map result = new LinkedHashMap();
	563	Map<String, Status> result = new LinkedHashMap<>();
567	564
568	565	if (tr.isShrunk() && tr.isReloadable())
569	566	tr.getSectionTitles();

621	618	* based on the KFL. Using this class allows the analysis to be done once
622	619	* then queried again and again for different purposes.
623	620	*/
624		public static class TestDiff implements Comparable {
	621	public static class TestDiff implements Comparable<TestDiff> {
625	622	public TestDiff(String url, TestResult tr, Transitions type) {
626	623	this.tr = tr;
627	624	this.url = url;

702	699	}
703	700
704	701	@Override
705		public int compareTo(Object o) {
706		TestDiff e = (TestDiff) o;
	702	public int compareTo(TestDiff e) {
707	703	int n = getName().compareTo(e.getName());
708	704	/* if (n == 0) {
709	705	if (testCase == null && e.testCase == null)

734	730	// public void passToFail(TestResult tr);
735	731	// public void failToPass(TestResult tr);
736	732	// }
737		protected TreeSet<TestDiff> fail2pass;
738		protected TreeSet<TestDiff> fail2error;
739		protected TreeSet<TestDiff> fail2notrun;
740		protected TreeSet<TestDiff> missing;
741		protected TreeSet<TestDiff> newFailures;
742		protected TreeSet<TestDiff> otherErrors;
743		protected TreeSet<TestDiff> fail2fail;
744
745		protected TreeSet<TestDiff> tc_missing;
746		protected TreeSet<TestDiff> tc_fail2pass;
747		protected TreeSet<TestDiff> tc_fail2error;
748		protected TreeSet<TestDiff> tc_fail2notrun;
749		protected TreeSet<TestDiff> tc_newFailures;
	733	protected SortedSet<TestDiff> fail2pass;
	734	protected SortedSet<TestDiff> fail2error;
	735	protected SortedSet<TestDiff> fail2notrun;
	736	protected SortedSet<TestDiff> missing;
	737	protected SortedSet<TestDiff> newFailures;
	738	protected SortedSet<TestDiff> otherErrors;
	739	protected SortedSet<TestDiff> fail2fail;
	740
	741	protected SortedSet<TestDiff> tc_missing;
	742	protected SortedSet<TestDiff> tc_fail2pass;
	743	protected SortedSet<TestDiff> tc_fail2error;
	744	protected SortedSet<TestDiff> tc_fail2notrun;
	745	protected SortedSet<TestDiff> tc_newFailures;
750	746
751	747	protected KnownFailuresList kfl;
752	748	//protected TestCaseList tcl;

+4

-4

src/com/sun/javatest/report/PlainTextReport.java less more

55	55
56	56	File[] initFiles = s.getInitialFiles();
57	57
58		SortedSet tests = new TreeSet(new TestResultsByFileComparator());
	58	SortedSet<TestResult> tests = new TreeSet<>(new TestResultsByFileComparator());
59	59	int width = 0;
60	60
61		Iterator iter = null;
	61	Iterator<TestResult> iter = null;
62	62	try {
63	63	if (initFiles == null) {
64	64	iter = resultTable.getIterator(new TestFilter[] {s.filter});

72	72	} // catch
73	73
74	74	for (; iter.hasNext(); ) {
75		TestResult tr = (TestResult) (iter.next());
	75	TestResult tr = iter.next();
76	76	// build a list of TestResults, sorted by test name
77	77	width = Math.max(width, tr.getTestName().length());
78	78	tests.add(tr);

80	80
81	81	TextWriter out = new TextWriter(openWriter(dir, files[SMRY_TXT]));
82	82	for (iter = tests.iterator(); iter.hasNext(); ) {
83		TestResult tr = (TestResult) (iter.next());
	83	TestResult tr = iter.next();
84	84	String u = tr.getTestName();
85	85	out.print(u);
86	86	for (int sp = u.length(); sp < width; sp++)

+13

-34

src/com/sun/javatest/report/Report.java less more

350	350	this.index = index;
351	351	}
352	352
353		public Vector getLinks() {
354		Vector links = new Vector();
	353	public Vector<String> getLinks() {
	354	Vector<String> links = new Vector<>();
355	355	StringBuilder content = new StringBuilder();
356		BufferedReader r = null;
357		try {
358		r = new BufferedReader(new InputStreamReader(new FileInputStream(index), StandardCharsets.UTF_8));
	356	try (BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(index), StandardCharsets.UTF_8))) {
359	357	String line;
360	358	while( (line = r.readLine()) != null ) {
361	359	content.append(line);
362	360	content.append("\n");
363	361	}
364	362	} catch (IOException e) {}
365		finally {
366		try { if (r != null) r.close(); } catch (IOException e) {}
367		}
368	363
369	364	int i = 0;
370	365	while (i < (content.length() - 1) ) {

412	407	*/
413	408	private void updateIndexLinks(File index, int backupNumb) {
414	409	StringBuilder sb = new StringBuilder();
415		BufferedReader r = null;
416		try {
417		r = new BufferedReader(new InputStreamReader(new FileInputStream(index), StandardCharsets.UTF_8));
	410	try (BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(index), StandardCharsets.UTF_8))) {
418	411	String line;
419	412	while( (line = r.readLine()) != null ) {
420	413	sb.append(line);
421	414	sb.append("\n");
422	415	}
423	416	} catch (IOException e) {}
424		finally {
425		try { if (r != null) r.close(); } catch (IOException e) {}
426		}
427	417
428	418	String oldId = backupNumb == 1 ? "" : "~" + (backupNumb - 1) + "~";
429	419	String newId = "~" + backupNumb + "~";
430	420
431	421	File reportDir = index.getParentFile();
432	422	File[] files = reportDir.listFiles();
433		ArrayList subdirs = new ArrayList();
	423	List<File> subdirs = new ArrayList<>();
434	424	for(int i = 0; i < files.length; i ++) {
435	425	if(files[i].isDirectory() &&
436	426	files[i].getName().lastIndexOf(newId) != -1) {

439	429	}
440	430
441	431	LinkFinder finder = new LinkFinder(index);
442		Vector links = finder.getLinks();
	432	Vector<String> links = finder.getLinks();
443	433	for(int i = 0; i < links.size(); i++) {
444		String link = (String)links.get(i);
	434	String link = links.get(i);
445	435	for(int j = 0; j < subdirs.size(); j++) {
446		String newName = ((File)subdirs.get(j)).getName();
	436	String newName = subdirs.get(j).getName();
447	437	String oldName = newName.replaceAll(newId, oldId);
448	438	if(link.lastIndexOf(oldName) != -1) {
449	439	StringBuilder newLink = new StringBuilder(link);

456	446	}
457	447	}
458	448
459		Writer writer = null;
460		try {
461		writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(index), StandardCharsets.UTF_8));
	449	try (Writer writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(index), StandardCharsets.UTF_8))) {
462	450	writer.write(sb.toString());
463	451	writer.flush();
464		writer.close();
465	452	}
466	453	catch (IOException ex) {}
467		finally {
468		try { if (writer != null) writer.close(); } catch (IOException e) {}
469		}
470	454	}
471	455
472	456

500	484	}
501	485
502	486	private void fillIndexFile(File index, ReportSettings s, List<ReportLink> links) {
503		Writer writer = null;
504		try {
505		writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(index), StandardCharsets.UTF_8));
	487	try (Writer writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(index), StandardCharsets.UTF_8))) {
506	488	HTMLWriterEx out = new HTMLWriterEx(writer);
507	489	out.setI18NResourceBundle(i18n);
508	490

541	523
542	524	} catch (IOException e) {
543	525	//return;
544		}
545		finally {
546		try { if (writer != null) writer.close(); } catch (IOException e) {}
547	526	}
548	527	}
549	528

597	576	private void notifyStartGenListeners(ReportSettings s, String reportID) {
598	577	if(startGenListeners != null) {
599	578	for(int i = 0; i < startGenListeners.size(); i ++) {
600		StartGenListener sgl = (StartGenListener)startGenListeners.get(i);
	579	StartGenListener sgl = startGenListeners.get(i);
601	580	sgl.startReportGeneration(s, reportID);
602	581	}
603	582	}

624	603
625	604	public void addStartGenListener(StartGenListener l) {
626	605	if(startGenListeners == null) {
627		startGenListeners = new ArrayList();
	606	startGenListeners = new ArrayList<>();
628	607	}
629	608
630	609	startGenListeners.add(l);

648	627	public static final String MARKER_FILE_NAME = "reportdir.dat";
649	628	public static final String INDEX_FILE_NAME = "index.html";
650	629
651		private ArrayList startGenListeners;
	630	private List<StartGenListener> startGenListeners;
652	631	}

+3

-3

src/com/sun/javatest/report/ReportManager.java less more

62	62	return new HelpTree.Node(i18n, "rm.help." + name);
63	63	}
64	64
65		public boolean parseCommand(String cmd, ListIterator argIter, CommandContext ctx)
	65	public boolean parseCommand(String cmd, ListIterator<String> argIter, CommandContext ctx)
66	66	throws Command.Fault
67	67	{
68	68	if (isMatch(cmd, ReportCommand.getName())) {

100	100	return "report";
101	101	}
102	102
103		ReportCommand(ListIterator argIter) throws Fault {
	103	ReportCommand(ListIterator<String> argIter) throws Fault {
104	104	super(getName());
105	105
106	106	if (!argIter.hasNext())

124	124	return "writeReport";
125	125	}
126	126
127		WriteReportCommand(Iterator argIter) throws Fault {
	127	WriteReportCommand(Iterator<String> argIter) throws Fault {
128	128	super(getName());
129	129
130	130	while (argIter.hasNext()) {

+12

-14

src/com/sun/javatest/report/ReportSettings.java less more

447	447	*
448	448	* @return Map for data exchange
449	449	*/
450		public Map getExchangeData() {
	450	public Map<?, ?> getExchangeData() {
451	451	if (exchangeData == null) {
452		exchangeData = new HashMap();
	452	exchangeData = new HashMap<>();
453	453	}
454	454	return exchangeData;
455	455	}

462	462	File[] initFiles = getInitialFiles();
463	463	sortedResults = new TreeSet[Status.NUM_STATES];
464	464	for (int i = 0; i < sortedResults.length; i++) {
465		sortedResults[i] = new TreeSet(new TestResultsByNameComparator());
466		}
467		Iterator iter;
	465	sortedResults[i] = new TreeSet<>(new TestResultsByNameComparator());
	466	}
	467	Iterator<TestResult> iter;
468	468	try {
469	469	TestFilter[] fs = null;
470	470	// Note: settings.filter should not really be null, modernized clients

479	479	throw new JavaTestError(ReportSettings.i18n.getString("result.testResult.err"));
480	480	}
481	481	for (; iter.hasNext();) {
482		TestResult tr = (TestResult) (iter.next());
	482	TestResult tr = (iter.next());
483	483	Status s = tr.getStatus();
484		TreeSet list = sortedResults[s == null ? Status.NOT_RUN : s.getType()];
	484	TreeSet<TestResult> list = sortedResults[s == null ? Status.NOT_RUN : s.getType()];
485	485	list.add(tr);
486	486	}
487	487	}
488	488
489		private static class TestResultsByNameComparator implements Comparator {
	489	private static class TestResultsByNameComparator implements Comparator<TestResult> {
490	490
491	491	@Override
492		public int compare(Object o1, Object o2) {
493		TestResult tr1 = (TestResult) o1;
494		TestResult tr2 = (TestResult) o2;
	492	public int compare(TestResult tr1, TestResult tr2) {
495	493	return tr1.getTestName().compareTo(tr2.getTestName());
496	494	}
497	495	}

514	512	return kflSorter;
515	513	}
516	514
517		TreeSet[] getSortedResults() {
	515	TreeSet<TestResult>[] getSortedResults() {
518	516	return sortedResults;
519	517	}
520	518

526	524	return customReports;
527	525	}
528	526
529		private TreeSet[] sortedResults;
	527	private TreeSet<TestResult>[] sortedResults;
530	528	private KflSorter kflSorter;
531	529	File xmlReportFile = null;
532	530	File tmpXmlReportFile = null;
533	531	private File[] mif = new File[0];
534		private HashMap exchangeData;
	532	private HashMap<?, ?> exchangeData;
535	533	private InterviewParameters ip;
536	534
537	535	private List<CustomReport> customReports = Collections.emptyList();

+11

-11

src/com/sun/javatest/report/ResultSection.java less more

42	42	*/
43	43	class ResultSection extends HTMLSection {
44	44	ResultSection(HTMLReport parent, ReportSettings settings, File dir, I18NResourceBundle i18n,
45		TreeSet[] sortedResults) {
	45	TreeSet<TestResult>[] sortedResults) {
46	46	super(i18n.getString("result.title"), settings, dir, parent);
47	47	this.i18n = i18n;
48	48

57	57	initFiles = settings.getInitialFiles();
58	58	lists = sortedResults;
59	59
60		for (TreeSet s: sortedResults)
	60	for (TreeSet<TestResult> s: sortedResults)
61	61	totalFound += s.size();
62	62	/*
63	63	lists = new TreeSet[Status.NUM_STATES];

115	115
116	116	for (int i = 0; i < lists.length; i++ ) {
117	117	String reportFile = HTMLReport.files[fileCodes[i]];
118		TreeSet l = lists[i];
	118	TreeSet<TestResult> l = lists[i];
119	119
120	120	int n = l.size();
121	121	if (n > 0) {

186	186
187	187	if (hasGroupedReport(i)) {
188	188	// re-sort it
189		TreeSet newS = new TreeSet(new TestResultsByStatusAndTitleComparator());
	189	TreeSet<TestResult> newS = new TreeSet<>(new TestResultsByStatusAndTitleComparator());
190	190	newS.addAll(lists[i]);
191	191	lists[i] = newS;
192	192

199	199
200	200	ReportWriter out = openAuxFile(fileCodes[i], headings[i], i18n);
201	201	try {
202		TreeSet list = lists[i];
	202	TreeSet<TestResult> list = lists[i];
203	203	if (list.size() > 0) {
204	204	boolean inList = false;
205	205
206		for (Iterator iter = list.iterator(); iter.hasNext(); ) {
207		TestResult e = (TestResult) (iter.next());
	206	for (Iterator<TestResult> iter = list.iterator(); iter.hasNext(); ) {
	207	TestResult e = (iter.next());
208	208	String title;
209	209	try {
210	210	TestDescription e_td = e.getDescription();

246	246	ReportWriter out = openAuxFile(groupedFileCodes[i], headings[i], i18n);
247	247	out.write(i18n.getString("result.groupByStatus"));
248	248	try {
249		TreeSet list = lists[i];
	249	TreeSet<TestResult> list = lists[i];
250	250	if (list.size() > 0) {
251	251	boolean inList = false;
252	252	String currentHead = null;
253		for (Iterator iter = list.iterator(); iter.hasNext(); ) {
254		TestResult e = (TestResult) (iter.next());
	253	for (Iterator<TestResult> iter = list.iterator(); iter.hasNext(); ) {
	254	TestResult e = (iter.next());
255	255	String title;
256	256	try {
257	257	TestDescription e_td = e.getDescription();

307	307	private TestResultTable resultTable;
308	308	private File[] initFiles;
309	309
310		TreeSet[] lists;
	310	TreeSet<TestResult>[] lists;
311	311	private int totalFound;
312	312
313	313	private final int[] fileCodes = {

+10

-10

src/com/sun/javatest/report/StatisticsSection.java less more

56	56	initFiles = settings.getInitialFiles();
57	57
58	58	resultTable = settings.getInterview().getWorkDirectory().getTestResultTable();
59		Iterator iter = null;
	59	Iterator<TestResult> iter = null;
60	60	try {
61	61	iter = (initFiles == null) ?
62	62	resultTable.getIterator(new TestFilter[] {settings.filter}) :

68	68	} // catch
69	69
70	70	for (; iter.hasNext(); ) {
71		TestResult tr = (TestResult) (iter.next());
	71	TestResult tr = iter.next();
72	72
73	73	try {
74	74	Status s = tr.getStatus();

78	78	Arrays.sort(keys);
79	79	String sortedKeys = StringArray.join(keys);
80	80
81		int[] v = (int[])(keywordTable.get(sortedKeys));
	81	int[] v = keywordTable.get(sortedKeys);
82	82	if (v == null) {
83	83	v = new int[Status.NUM_STATES];
84	84	keywordTable.put(sortedKeys, v);

140	140	head[c] = i18n.getString("stats.total");
141	141	}
142	142
143		Vector v = new Vector();
144		for (Iterator iter = keywordTable.entrySet().iterator(); iter.hasNext(); ) {
145		Map.Entry e = (Map.Entry) (iter.next());
146		String k = (String) (e.getKey());
147		int[] kv = (int[]) (e.getValue());
	143	Vector<String[]> v = new Vector<>();
	144	for (Iterator<Map.Entry<String, int[]>> iter = keywordTable.entrySet().iterator(); iter.hasNext(); ) {
	145	Map.Entry<String, int[]> e = (iter.next());
	146	String k = (e.getKey());
	147	int[] kv = (e.getValue());
148	148	String[] newEntry = new String[ncols];
149	149	int c = 0, total = 0;
150	150	newEntry[c++] = k;

158	158	sortedInsert:
159	159	{
160	160	for (int i = 0; i < v.size(); i++) {
161		String[] entry = (String[])v.elementAt(i);
	161	String[] entry = v.elementAt(i);
162	162	if (k.compareTo(entry[0]) < 0) {
163	163	v.insertElementAt(newEntry, i);
164	164	break sortedInsert;

229	229
230	230	private TestResultTable resultTable;
231	231	private File[] initFiles;
232		private Map keywordTable = new HashMap();
	232	private Map<String, int[]> keywordTable = new HashMap<>();
233	233	private int[] statusTotals = new int[Status.NUM_STATES];
234	234	private final I18NResourceBundle i18n;
235	235

+2

-4

src/com/sun/javatest/report/StringArrayComparator.java less more

27	27
28	28	import java.util.Comparator;
29	29
30		class StringArrayComparator implements Comparator {
31		public int compare(Object o1, Object o2) {
32		String[] a = (String[])o1;
33		String[] b = (String[])o2;
	30	class StringArrayComparator implements Comparator<String[]> {
	31	public int compare(String[] a, String[] b) {
34	32	for (int i = 0; i < Math.min(a.length, b.length); i++) {
35	33	int c = compare(a[i], b[i]);
36	34	if (c != 0)

+2

-4

src/com/sun/javatest/report/TestResultsByFileComparator.java less more

30	30	import com.sun.javatest.TestDescription;
31	31	import com.sun.javatest.TestResult;
32	32
33		class TestResultsByFileComparator implements Comparator {
34		public int compare(Object o1, Object o2) {
35		TestResult a = (TestResult)o1;
36		TestResult b = (TestResult)o2;
	33	class TestResultsByFileComparator implements Comparator<TestResult> {
	34	public int compare(TestResult a, TestResult b) {
37	35
38	36	// The simplest way to compare two URLs would be to compare their
39	37	// external forms, but generating them generates garbage at a

+2

-4

src/com/sun/javatest/report/TestResultsByStatusAndTitleComparator.java less more

30	30	import com.sun.javatest.Status;
31	31	import com.sun.javatest.TestResult;
32	32
33		class TestResultsByStatusAndTitleComparator implements Comparator {
34		public int compare(Object o1, Object o2) {
35		TestResult tr1 = (TestResult)o1;
36		TestResult tr2 = (TestResult)o2;
	33	class TestResultsByStatusAndTitleComparator implements Comparator<TestResult> {
	34	public int compare(TestResult tr1, TestResult tr2) {
37	35	Status s1 = tr1.getStatus();
38	36	Status s2 = tr2.getStatus();
39	37	if (s1.getType() != s2.getType())

+2

-4

src/com/sun/javatest/report/TestResultsByTitleComparator.java less more

29	29
30	30	import com.sun.javatest.TestResult;
31	31
32		class TestResultsByTitleComparator implements Comparator {
33		public int compare(Object o1, Object o2) {
34		TestResult tr1 = (TestResult)o1;
35		TestResult tr2 = (TestResult)o2;
	32	class TestResultsByTitleComparator implements Comparator<TestResult> {
	33	public int compare(TestResult tr1, TestResult tr2) {
36	34
37	35	return compare(tr1.getTestName(), tr2.getTestName());
38	36	}

+14

-14

src/com/sun/javatest/report/XMLReport.java less more

143	143	maker.sTestResults();
144	144
145	145	File[] initFiles = sett.getInitialFiles();
146		Iterator iter = null;
	146	Iterator<TestResult> iter = null;
147	147	TestResultTable resultTable = sett.getInterview().getWorkDirectory().getTestResultTable();
148	148
149	149	try {

153	153	iter = resultTable.getIterator(initFiles, new TestFilter[] {sett.getTestFilter()});
154	154	}
155	155	for (; iter.hasNext(); ) {
156		TestResult tr = (TestResult) (iter.next());
	156	TestResult tr = (iter.next());
157	157	writeResult(maker, tr);
158	158	}
159	159	maker.eTestResults();

202	202	String time = testResult.getProperty(TestResult.END);
203	203
204	204	maker.sResultProps(time);
205		Enumeration en = testResult.getPropertyNames();
	205	Enumeration<String> en = testResult.getPropertyNames();
206	206	while (en.hasMoreElements()) {
207		String key = (String) en.nextElement();
208		String val = (String) testResult.getProperty(key);
	207	String key = en.nextElement();
	208	String val = testResult.getProperty(key);
209	209	if (!TestResult.END.equals(key)) {
210	210	maker.makeProperty(key, val);
211	211	}

215	215
216	216	private void writeEnvironment(final XMLReportMaker maker, final TestResult testResult) throws SAXException {
217	217
218		Iterator keysIt;
	218	Iterator<String> keysIt;
219	219	try {
220		Map m = testResult.getEnvironment();
	220	Map<String, String> m = testResult.getEnvironment();
221	221	keysIt = m.keySet().iterator();
222	222	maker.sTestEnvironment();
223	223	while (keysIt.hasNext()) {
224		String key = (String) keysIt.next();
225		String val = (String) m.get(key);
	224	String key = keysIt.next();
	225	String val = m.get(key);
226	226	maker.makeProperty(key, val);
227	227	}
228	228	maker.eTestEnvironment();

235	235	maker.sDescriptionData();
236	236
237	237	TestDescription td = testResult.getDescription();
238		Iterator keysIt = td.getParameterKeys();
	238	Iterator<String> keysIt = td.getParameterKeys();
239	239
240	240	maker.makeProperty("$root", td.getRootDir());
241	241	maker.makeProperty("$file", td.getFile().getPath());
242	242
243	243	while (keysIt.hasNext()) {
244		String key = (String) keysIt.next();
	244	String key = keysIt.next();
245	245	// dump keywords separately
246	246	if (!"keywords".equals(key)) {
247		String val = (String) td.getParameter(key);
	247	String val = td.getParameter(key);
248	248	maker.makeProperty(key, val);
249	249	}
250	250	}

295	295	maker.sEnvironment(name, descr);
296	296	TestEnvironment env = sett.getInterview().getEnv();
297	297	if (env != null) {
298		for (Iterator i = env.elements().iterator(); i.hasNext(); ) {
299		TestEnvironment.Element envElem = (TestEnvironment.Element) (i.next());
	298	for (Iterator<TestEnvironment.Element> i = env.elements().iterator(); i.hasNext(); ) {
	299	TestEnvironment.Element envElem = (i.next());
300	300	maker.makeProperty(envElem.getKey(), envElem.getValue());
301	301	}
302	302	}

+2

-2

src/com/sun/javatest/services/AntService.java less more

91	91	throw new MalformedParamsException
92	92	("Path to ANT binary doesn't specified", p);
93	93	}
94		List<String> command = new LinkedList();
	94	List<String> command = new LinkedList<>();
95	95	command.add(antBin);
96	96
97	97	String workDir = p.remove(ANT_WORKDIR);

100	100	params.setWorkDirectory(new File(workDir));
101	101	}
102	102
103		Map<String, String> env = new TreeMap();
	103	Map<String, String> env = new TreeMap<>();
104	104	for (String name : p.keySet()) {
105	105	if (name.startsWith(ANT_ENV)) {
106	106	env.put(name.substring(ANT_ENV.length()), p.remove(name));

+1

-1

src/com/sun/javatest/services/PropertyServiceReader.java less more

198	198	}
199	199
200	200	public Set<TestPath> readTestServiceMap() {
201		Set<TestPath> result = new HashSet();
	201	Set<TestPath> result = new HashSet<>();
202	202
203	203	if (props == null) {
204	204	return result;

+21

-21

src/com/sun/javatest/services/ServiceManager.java less more

196	196	* values are {@link com.sun.javatest.services.Service} objects.
197	197	*/
198	198	public Map<String, Service> getAllServices() {
199		return new HashMap(services);
	199	return new HashMap<>(services);
200	200	}
201	201
202	202	/**

205	205	* @return IDs for currently used services.
206	206	*/
207	207	public Set<String> getActiveServices() {
208		return new TreeSet(activeServices);
	208	return new TreeSet<>(activeServices);
209	209	}
210	210
211	211	public void startService(String sID) {

287	287
288	288	public void startingTestRun(Parameters params) {
289	289	if (mode == StartMode.UP_FRONT) {
290		Set<String> active = new TreeSet();
	290	Set<String> active = new TreeSet<>();
291	291	try {
292		Iterator iter = harness.getTestsIterator(null);
	292	Iterator<TestResult> iter = harness.getTestsIterator(null);
293	293	active = selectActiveServices(iter);
294	294	} catch (Harness.Fault f) {
295	295	commonLog.log(Level.SEVERE, f.getMessage());

366	366	this.mode = mode;
367	367	}
368	368
369		private Set<String> selectActiveServices(Iterator iter) {
370		Set<String> active = new TreeSet();
371		Set<TestPath> copy = new HashSet(testServiceMap);
	369	private Set<String> selectActiveServices(Iterator<TestResult> iter) {
	370	Set<String> active = new TreeSet<>();
	371	Set<TestPath> copy = new HashSet<>(testServiceMap);
372	372	TestResult tr;
373	373	TestDescription td;
374	374	while (!copy.isEmpty() && active.size() < services.size() &&
375		(tr = (TestResult)iter.next()) != null ) {
	375	(tr = iter.next()) != null ) {
376	376	try {
377	377	td = tr.getDescription();
378		HashSet<TestPath> toRemove = new HashSet();
	378	HashSet<TestPath> toRemove = new HashSet<>();
379	379	for (TestPath p : copy) {
380	380	if (p.matches(td)) {
381	381	for (String sId : p.getServices()) {

391	391	}
392	392
393	393	private synchronized void stopServices() {
394		Set<String> toRemove = new TreeSet();
	394	Set<String> toRemove = new TreeSet<>();
395	395	for (String s : activeServices) {
396	396	if (stopService0(s)) {
397	397	toRemove.add(s);

408	408	}
409	409
410	410	private class WritingThread extends Thread {
411		private Map<String, Writer> outs = new HashMap();
412		private Map<String, Writer> errs = new HashMap();
413
414		private Map<String, InputStreamReader> sOuts = new HashMap();
415		private Map<String, InputStreamReader> sErrs = new HashMap();
	411	private Map<String, Writer> outs = new HashMap<>();
	412	private Map<String, Writer> errs = new HashMap<>();
	413
	414	private Map<String, InputStreamReader> sOuts = new HashMap<>();
	415	private Map<String, InputStreamReader> sErrs = new HashMap<>();
416	416
417	417	public WritingThread() {
418	418	setDaemon(true);

473	473
474	474	public synchronized void setOutputWriter(String sID, Writer out) {
475	475	if (outs == null) {
476		outs = new HashMap();
	476	outs = new HashMap<>();
477	477	}
478	478	outs.put(sID, out);
479	479	}
480	480
481	481	public synchronized void setErrorWriter(String sID, Writer err) {
482	482	if (errs == null) {
483		errs = new HashMap();
	483	errs = new HashMap<>();
484	484	}
485	485	errs.put(sID, err);
486	486	}

518	518
519	519	char[] buf = new char[1000];
520	520
521		List<String> toRemove = new LinkedList();
	521	List<String> toRemove = new LinkedList<>();
522	522
523	523	String[] idCopy;
524	524	synchronized (this) {

559	559
560	560	private class WatchDog extends Thread {
561	561	private boolean stop;
562		private Set<Observer> observers = new HashSet();
	562	private Set<Observer> observers = new HashSet<>();
563	563	private int pause;
564	564	private Set<String> active;
565	565	private Object sync;

664	664	}
665	665
666	666	@Override
667		public boolean parseCommand(String cmd, ListIterator argIter, CommandContext ctx) throws Command.Fault {
	667	public boolean parseCommand(String cmd, ListIterator<String> argIter, CommandContext ctx) throws Command.Fault {
668	668	if (isMatch(cmd, ServiceStartCommand.getName())) {
669	669	if (!argIter.hasNext()) {
670	670	return false;
671	671	}
672		String val = (String)argIter.next();
	672	String val = argIter.next();
673	673	for (StartMode m : StartMode.values()) {
674	674	if (m.getKey().equalsIgnoreCase(val)) {
675	675	mode = m;

+16

-16

src/com/sun/javatest/services/ServiceProperties.java less more

41	41
42	42	private Properties externalProps;
43	43
44		private HashMap<String, String> lastResolution;
	44	private Map<String, String> lastResolution;
45	45
46	46	private Map<String, Set<String>> varMap;
47	47

58	58	this.common = common;
59	59
60	60	externalProps = new Properties();
61		varMap = new HashMap();
62		varProps = new HashMap();
63		constProps = new HashMap();
	61	varMap = new HashMap<>();
	62	varProps = new HashMap<>();
	63	constProps = new HashMap<>();
64	64	}
65	65
66	66	/**

153	153	*/
154	154	public Map<String, String> resolveProperties() {
155	155	if (lastResolution != null) {
156		return (Map)lastResolution.clone();
157		}
158
159		HashMap<String, String> result = new HashMap();
	156	return new HashMap<>(lastResolution);
	157	}
	158
	159	Map<String, String> result = new HashMap<>();
160	160	result.putAll(constProps);
161	161
162		Map<String, String> justResolved = new HashMap();
	162	Map<String, String> justResolved = new HashMap<>();
163	163	justResolved.putAll(constProps);
164	164
165	165	if (common != null) {

176	176	result.putAll(justResolved);
177	177	}
178	178
179		lastResolution = new HashMap(result);
	179	lastResolution = new HashMap<>(result);
180	180
181	181	return result;
182	182	}

184	184	private Map<String, String> resolveVars(Map<String, ParametrizeValue> varProps,
185	185	Map<String, String> resolved) {
186	186
187		Map<String, String> result = new HashMap();
	187	Map<String, String> result = new HashMap<>();
188	188
189	189	for (String key : resolved.keySet()) {
190	190	if (varMap.containsKey(key)) {

205	205	}
206	206
207	207	private Map<String, ParametrizeValue> copyVarProps() {
208		Map<String, ParametrizeValue> copy = new HashMap();
	208	Map<String, ParametrizeValue> copy = new HashMap<>();
209	209	for (String key : varProps.keySet()) {
210	210	copy.put(key, varProps.get(key).copy());
211	211	}

222	222	value = new ParametrizeValue();
223	223	Term t = new Term();
224	224	t.setValue(key, true);
225		List<Term> l = new LinkedList();
	225	List<Term> l = new LinkedList<>();
226	226	l.add(t);
227	227	value.setValue(l);
228	228	}

251	251	varMap.get(paramName).add(key);
252	252	}
253	253	else {
254		HashSet<String> usages = new HashSet();
	254	Set<String> usages = new HashSet<>();
255	255	usages.add(key);
256	256	varMap.put(paramName, usages);
257	257	}

262	262	varMap.get(key).add(key);
263	263	}
264	264	else {
265		HashSet<String> usages = new HashSet();
	265	Set<String> usages = new HashSet<>();
266	266	usages.add(key);
267	267	varMap.put(key, usages);
268	268	}

303	303	private int varNumb;
304	304
305	305	public ParametrizeValue() {
306		terms = new LinkedList();
	306	terms = new LinkedList<>();
307	307	varNumb = 0;
308	308	}
309	309

+3

-3

src/com/sun/javatest/services/XMLServiceReader.java less more

139	139	}
140	140
141	141	public Set<TestPath> readTestServiceMap() {
142		Set<TestPath> result = new HashSet();
	142	Set<TestPath> result = new HashSet<>();
143	143
144	144	if (doc == null) {
145	145	return result;

217	217	}
218	218
219	219	private Map<String, Service> readServices(Document doc, ServiceProperties common) {
220		Map<String, Service> result = new TreeMap();
	220	Map<String, Service> result = new TreeMap<>();
221	221
222	222	if (doc == null) {
223	223	return result;

227	227	Node child = root.getFirstChild();
228	228	while (child != null) {
229	229	if(child instanceof Element &&
230		((Element)child).getNodeName().equals("service")) {
	230	child.getNodeName().equals("service")) {
231	231	try {
232	232	Element elem = (Element) child;
233	233

+1

-1

src/com/sun/javatest/servlets/ExcludeBrowser.java less more

81	81	out.println("Exclude list is empty.");
82	82	else {
83	83	out.println("<table border=1>");
84		for (Iterator iter = excludeList.getIterator(false); iter.hasNext(); ) {
	84	for (Iterator<?> iter = excludeList.getIterator(false); iter.hasNext(); ) {
85	85	ExcludeList.Entry entry = (ExcludeList.Entry) (iter.next());
86	86	String[] bugIds = entry.getBugIdStrings();
87	87	StringBuffer bugIdText = new StringBuffer();

+9

-9

src/com/sun/javatest/servlets/ResultBrowser.java less more

116	116	try {
117	117	TestDescription td = tr.getDescription();
118	118	out.println("<table>");
119		for (Iterator iter = td.getParameterKeys(); iter.hasNext(); ) {
120		String key = (String) (iter.next());
	119	for (Iterator<String> iter = td.getParameterKeys(); iter.hasNext(); ) {
	120	String key = (iter.next());
121	121	String value = td.getParameter(key);
122	122	if (key.equals("$root") \|\| key.equals("$file") \|\| key.equals("testsuite") \|\| key.equals("file"))
123	123	out.println("<tr><td align=top>" + key + "<td><a href=\"" + value + "\">" + filter(value, false) + "</a>");

150	150	out.println("<h2><a name=tr>Test Result properties</a></h2>");
151	151	try {
152	152	out.println("<table>");
153		for (Enumeration e = tr.getPropertyNames(); e.hasMoreElements(); ) {
154		String key = (String)(e.nextElement());
	153	for (Enumeration<String> e = tr.getPropertyNames(); e.hasMoreElements(); ) {
	154	String key = (e.nextElement());
155	155	out.println("<tr><td>" + key + "<td>" + filter(tr.getProperty(key), true));
156	156	}
157	157	}

166	166	// test environment
167	167	out.println("<h2><a name=env>Test Environment</a></h2>");
168	168	try {
169		Map env = tr.getEnvironment();
	169	Map<String, String> env = tr.getEnvironment();
170	170	if (env.size() == 0) {
171	171	out.println("<tr><td>No environment details found");
172	172	}
173	173	else {
174	174	out.println("<table>");
175		for (Iterator i = env.entrySet().iterator(); i.hasNext(); ) {
176		Map.Entry e = (Map.Entry) (i.next());
177		String key = (String) (e.getKey());
178		String value = (String) (e.getValue());
	175	for (Iterator<Map.Entry<String, String>> i = env.entrySet().iterator(); i.hasNext(); ) {
	176	Map.Entry<String, String> e = (i.next());
	177	String key = (e.getKey());
	178	String value = (e.getValue());
179	179	out.println("<tr><td>" + key + "<td>" + filter(value, true));
180	180	}
181	181	out.println("</table>");

+1

-1

src/com/sun/javatest/tool/ColorPrefsPane.java less more

116	116	return i18n.getString("colorprefs.name");
117	117	}
118	118
119		public void save(Map m) {
	119	public void save(Map<String, String> m) {
120	120	super.save(m);
121	121	Component[] components = inputColors.getComponents();
122	122	for(Component c: components) {

+6

-6

src/com/sun/javatest/tool/Command.java less more

101	101	* The name will be saved as the first entry as the argument array.
102	102	*/
103	103	protected Command(String name) {
104		args = new Vector();
	104	args = new Vector<>();
105	105	args.add(name);
106	106	}
107	107

118	118	* @param argIter the iterator from which to get the next argument
119	119	* @return the next argument from the iterator
120	120	*/
121		protected String nextArg(Iterator argIter) {
122		String s = (String) argIter.next();
	121	protected String nextArg(Iterator<String> argIter) {
	122	String s = argIter.next();
123	123	addArg(s);
124	124	return s;
125	125	}

129	129	* entry from the argument array.
130	130	* @param argIter the iterator from which teh argument was obtained
131	131	*/
132		protected void putbackArg(ListIterator argIter) {
	132	protected void putbackArg(ListIterator<String> argIter) {
133	133	argIter.previous();
134	134	args.remove(args.size() - 1);
135	135	}

156	156	for (int i = 0; i < args.size(); i++) {
157	157	if (sb.length() > 0)
158	158	sb.append(' ');
159		String arg = (String) (args.elementAt(i));
	159	String arg = args.elementAt(i);
160	160	boolean hasSpace = (arg.indexOf(' ') != -1);
161	161	boolean hasQuote = (arg.indexOf('"') != -1);
162	162	boolean hasEscape = (arg.indexOf('\\') != -1);

279	279	}
280	280	}
281	281
282		private Vector args;
	282	private Vector<String> args;
283	283	}

+15

-22

src/com/sun/javatest/tool/CommandContext.java less more

33	33	import java.io.IOException;
34	34	import java.io.PrintWriter;
35	35	import java.util.HashMap;
36		import java.util.Properties;
37	36	import java.util.Vector;
38	37
39	38	import com.sun.javatest.Harness;

43	42	import com.sun.javatest.TestSuite;
44	43	import com.sun.javatest.WorkDirectory;
45	44
46		import com.sun.javatest.util.DynamicArray;
47		import com.sun.javatest.util.HelpTree;
48		import com.sun.javatest.util.I18NResourceBundle;
	45	import com.sun.javatest.util.*;
	46
49	47	import java.util.Map;
50	48
51	49	/**

163	161	boolean foundAction = false;
164	162
165	163	for (int i = 0; i < commands.size(); i++) {
166		Command cmd = (Command) (commands.elementAt(i));
	164	Command cmd = commands.elementAt(i);
167	165	foundAction \|= cmd.isActionCommand();
168	166
169	167	// can't cache this ... may change while we execute commands

195	193	* @see #getHarnessObservers
196	194	*/
197	195	public void addHarnessObserver(Harness.Observer o) {
198		harnessObservers = (Harness.Observer[]) (DynamicArray.append(harnessObservers, o));
	196	harnessObservers = DynamicArray.append(harnessObservers, o);
199	197	}
200	198
201	199	/**

530	528	/**
531	529	* restore filter setting if -ts -preferred were specified
532	530	*/
533		void setDesktopData(Map desktopData) {
	531	void setDesktopData(Map<String, String> desktopData) {
534	532	this.desktopData = desktopData;
535	533	}
536	534
537		Map getDesktopData() {
	535	Map<String, String> getDesktopData() {
538	536	return desktopData;
539	537	}
540	538

607	605	\|\| WorkDirectory.isEmptyDirectory(workDirectoryPath))) {
608	606
609	607	// first, determine where the test suite is
610		Properties configData;
	608	Map<String, String> configData;
611	609	File tsPath;
612	610
613	611	// get test suite path if we don't have it

615	613	if (configFilePath == null)
616	614	throw new Fault(i18n, "cc.noTestSuite");
617	615
618		configData = new Properties();
619	616
620	617	try {
621		InputStream in = new BufferedInputStream(new FileInputStream(configFilePath));
622		try {
623		configData.load(in);
	618	try (InputStream in = new BufferedInputStream(new FileInputStream(configFilePath))) {
	619	configData = Properties.load(in);
624	620	}
625	621	catch (RuntimeException e) {
626	622	// can get IllegalArgumentException if the file is corrupt
627	623	throw new Fault(i18n, "cc.cantReadConfig", new Object[] { configFilePath, e });
628		}
629		finally {
630		in.close();
631	624	}
632	625	}
633	626	catch (FileNotFoundException e) {

638	631	new Object[] { configFilePath, e });
639	632	}
640	633
641		String tsp = (String) (configData.get("TESTSUITE"));
	634	String tsp = configData.get("TESTSUITE");
642	635	if (tsp == null)
643	636	throw new Fault(i18n, "cc.noTestSuiteInConfigFile", configFilePath);
644	637

793	786	public boolean isDesktopRequired() {
794	787	int mode = Command.DEFAULT_DTMODE;
795	788	for (int i = 0; i < commands.size(); i++) {
796		Command cmd = (Command) (commands.elementAt(i));
	789	Command cmd = commands.elementAt(i);
797	790	mode = Math.max(mode, cmd.getDesktopMode());
798	791	}
799	792	return (mode == Command.DESKTOP_NOT_REQUIRED_DTMODE ? false : true);

905	898	if (verboseQuiet)
906	899	return false;
907	900
908		Boolean b = (Boolean) (verboseOptionValues.get(name.toLowerCase()));
	901	Boolean b = verboseOptionValues.get(name.toLowerCase());
909	902	return (b == null ? defaultValue : b.booleanValue());
910	903	}
911	904

1054	1047	//-------------------------------------------------------------------------
1055	1048
1056	1049
1057		private Vector commands = new Vector();
	1050	private Vector<Command> commands = new Vector<>();
1058	1051
1059	1052	//private TestSuite testSuite;
1060	1053	//private WorkDirectory workDir;
1061	1054	private File testSuitePath;
1062	1055	private File workDirectoryPath;
1063	1056	private String defaultWorkDirPath;
1064		private Map desktopData;
	1057	private Map<String, String> desktopData;
1065	1058	private boolean autoCreateWorkDirectory;
1066	1059	private File configFilePath;
1067	1060

1073	1066	private PrintWriter out;
1074	1067	private int[] cumulativeTestStats = new int[Status.NUM_STATES];
1075	1068
1076		private HashMap verboseOptionValues = new HashMap(); // HashMap<String, Boolean>
	1069	private Map<String, Boolean> verboseOptionValues = new HashMap<>();
1077	1070	private boolean verboseMax;
1078	1071	private boolean verboseQuiet;
1079	1072	private boolean verboseDate = true;

+1

-1

src/com/sun/javatest/tool/CommandManager.java less more

56	56	* @throws Command.Fault if the command is recognized by this command manager
57	57	* but could not be successfully parsed or otherwise handled.
58	58	*/
59		public abstract boolean parseCommand(String cmd, ListIterator argIter, CommandContext ctx)
	59	public abstract boolean parseCommand(String cmd, ListIterator<String> argIter, CommandContext ctx)
60	60	throws Command.Fault;
61	61
62	62	/**

+13

-13

src/com/sun/javatest/tool/CommandParser.java less more

126	126	}
127	127
128	128	// scan args, converting them to commands
129		for (ListIterator iter = getIterator(trim(args)); iter.hasNext(); ) {
130		String arg = (String) (iter.next());
	129	for (ListIterator<String> iter = getIterator(trim(args)); iter.hasNext(); ) {
	130	String arg = iter.next();
131	131	decodeArg(arg, iter, ctx);
132	132	}
133	133	}
134	134
135		private void decodeArg(String arg, ListIterator argIter, CommandContext ctx)
	135	private void decodeArg(String arg, ListIterator<String> argIter, CommandContext ctx)
136	136	throws CommandParser.Fault
137	137	{
138	138	// special case for Windows-like help option

151	151	String cmd = arg.substring(1);
152	152	if (cmd.equals("read")) {
153	153	if (argIter.hasNext()) {
154		String arg2 = ((String) (argIter.next()));
	154	String arg2 = argIter.next();
155	155	// consider supporting URLs here
156	156	File f = new File(arg2);
157	157	read(f, ctx);

246	246
247	247	nextLine:
248	248	while ((line = p.readLine()) != null) {
249		ListIterator iter = getIterator(line);
250		String cmd = ((String) (iter.next()));
	249	ListIterator<String> iter = getIterator(line);
	250	String cmd = iter.next();
251	251
252	252	if (cmd.equals("read")) {
253	253	if (iter.hasNext()) {
254		String arg = ((String) (iter.next()));
	254	String arg = iter.next();
255	255	// consider supporting URLs here
256	256	File f = new File(arg);
257	257	if (!f.isAbsolute())

293	293	return trimArgs;
294	294	}
295	295
296		private static ListIterator getIterator(final String[] args) {
297		return (new ListIterator() {
298		public void add(Object o) {
	296	private static ListIterator<String> getIterator(final String[] args) {
	297	return (new ListIterator<String>() {
	298	public void add(String o) {
299	299	throw new UnsupportedOperationException();
300	300	}
301	301

307	307	return (index > 0);
308	308	}
309	309
310		public Object next() {
	310	public String next() {
311	311	return (index < args.length ? args[index++] : null);
312	312	}
313	313

315	315	return index;
316	316	}
317	317
318		public Object previous() {
	318	public String previous() {
319	319	return (index > 0 ? args[--index] : null);
320	320	}
321	321

327	327	throw new UnsupportedOperationException();
328	328	}
329	329
330		public void set(Object obj) {
	330	public void set(String obj) {
331	331	throw new UnsupportedOperationException();
332	332	}
333	333

+54

-80

src/com/sun/javatest/tool/ConfigManager.java less more

92	92	}
93	93
94	94	HelpTree.Node getHelp(I18NResourceBundle i18n, String prefix, Object[] childData) {
95		Vector v = new Vector();
	95	Vector<HelpTree.Node> v = new Vector<>();
96	96	for (int i = 0; i < childData.length; i++) {
97	97	Object data = childData[i];
98	98	if (data instanceof HelpTree.Node)
99		v.add(data);
	99	v.add((HelpTree.Node)data);
100	100	else if (data instanceof String)
101	101	v.add(new HelpTree.Node(i18n, prefix + "." + data));
102	102	else if (data instanceof String[]) {

112	112	return new HelpTree.Node(i18n, prefix, childNodes);
113	113	}
114	114
115		public boolean parseCommand(String cmd, ListIterator argIter, CommandContext ctx)
	115	public boolean parseCommand(String cmd, ListIterator<String> argIter, CommandContext ctx)
116	116	throws Command.Fault
117	117	{
118	118	if (isMatch(cmd, ConcurrencyCommand.getName())) {

210	210	return new OpenCommand(file);
211	211	}
212	212
213		private static Map commandFactory;
214	213	private static I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(ConfigManager.class);
215	214
216	215	//--------------------------------------------------------------------------

221	220	return "concurrency";
222	221	}
223	222
224		ConcurrencyCommand(ListIterator argIter) throws Fault {
	223	ConcurrencyCommand(ListIterator<String> argIter) throws Fault {
225	224	super(getName());
226	225
227	226	if (!argIter.hasNext())

270	269	return "config";
271	270	}
272	271
273		ConfigCommand(ListIterator argIter) throws Fault {
	272	ConfigCommand(ListIterator<String> argIter) throws Fault {
274	273	super(getName());
275	274
276	275	if (!argIter.hasNext())

335	334	return "writeConfig";
336	335	}
337	336
338		WriteConfigCommand(ListIterator argIter) throws Fault {
	337	WriteConfigCommand(ListIterator<String> argIter) throws Fault {
339	338	super(getName());
340	339
341	340	if (!argIter.hasNext())

380	379	return "env";
381	380	}
382	381
383		EnvCommand(ListIterator argIter) throws Fault {
	382	EnvCommand(ListIterator<String> argIter) throws Fault {
384	383	super(getName());
385	384
386	385	if (!argIter.hasNext())

411	410	return new String[] { "envfile", "envfiles" };
412	411	}
413	412
414		EnvFilesCommand(ListIterator argIter) throws Fault {
	413	EnvFilesCommand(ListIterator<String> argIter) throws Fault {
415	414	super(getNames()[0]);
416	415
417		Vector v = new Vector();
	416	Vector<File> v = new Vector<>();
418	417
419	418	while (argIter.hasNext()) {
420	419	String arg = nextArg(argIter);

455	454	return "excludeList";
456	455	}
457	456
458		ExcludeListCommand(ListIterator argIter) throws Fault {
	457	ExcludeListCommand(ListIterator<String> argIter) throws Fault {
459	458	super(getName());
460	459
461	460	// in time, we should support -none, -default, -latest etc
462		Vector v = new Vector();
	461	Vector<File> v = new Vector<>();
463	462
464	463	while (argIter.hasNext()) {
465	464	String arg = nextArg(argIter);

500	499	return "kfl";
501	500	}
502	501
503		KflCommand(ListIterator argIter) throws Fault {
	502	KflCommand(ListIterator<String> argIter) throws Fault {
504	503	super(getName());
505	504
506	505	// in time, we should support -none, -default, -latest etc
507		Vector v = new Vector();
	506	Vector<File> v = new Vector<>();
508	507
509	508	while (argIter.hasNext()) {
510	509	String arg = nextArg(argIter);

551	550	cmdForFile = getCommandForFile(file);
552	551	}
553	552
554		OpenCommand(ListIterator argIter) throws Fault {
	553	OpenCommand(ListIterator<String> argIter) throws Fault {
555	554	super(getName());
556	555
557	556	if (!argIter.hasNext())

606	605	return "keywords";
607	606	}
608	607
609		KeywordsCommand(ListIterator argIter) throws Fault {
	608	KeywordsCommand(ListIterator<String> argIter) throws Fault {
610	609	super(getName());
611	610
612	611	// could support -all -any

735	734	return new HelpTree.Node(i18n, "cnfg.params", opts);
736	735	}
737	736
738		ParamsCommand(ListIterator argIter) throws Fault {
	737	ParamsCommand(ListIterator<String> argIter) throws Fault {
739	738	super(getName());
740	739
741		Vector v = new Vector();
	740	Vector<String> v = new Vector<>();
742	741	while (argIter.hasNext())
743	742	v.add(nextArg(argIter));
744	743	String[] args = new String[v.size()];

769	768	return "priorStatus";
770	769	}
771	770
772		PriorStatusCommand(ListIterator argIter) throws Fault {
	771	PriorStatusCommand(ListIterator<String> argIter) throws Fault {
773	772	super(getName());
774	773
775	774	if (!argIter.hasNext())

820	819	if (s == null)
821	820	return null;
822	821
823		Vector v = new Vector();
	822	Vector<String> v = new Vector<>();
824	823	int start = -1;
825	824	for (int i = 0; i < s.length(); i++) {
826	825	if (Character.isLetterOrDigit(s.charAt(i))) {

854	853	return "set";
855	854	}
856	855
857		SetCommand(ListIterator argIter) throws Fault {
	856	SetCommand(ListIterator<String> argIter) throws Fault {
858	857	super(getName());
859	858
860	859	if (!argIter.hasNext())

878	877	InterviewParameters p = getConfig(ctx);
879	878	Question[] path = p.getPath();
880	879	if (file != null) {
881		Map values = loadFile(file);
	880	Map<String, String> values = loadFile(file);
882	881	for (int i = 0; i < path.length; i++) {
883	882	Question q = path[i];
884		String v = (String) (values.get(q.getTag()));
	883	String v = (values.get(q.getTag()));
885	884	if (v != null) {
886	885	setValue(q, v);
887	886	path = p.getPath();

966	965	return (sb.toString());
967	966	}
968	967
969		private Map loadFile(File file) throws Fault {
970		FileInputStream fis = null;
971		InputStream in = null;
972		try {
973		fis = new FileInputStream(file);
974		in = new BufferedInputStream(fis);
975		Properties props = new Properties();
976		props.load(in);
977		in.close();
978		return props;
	968	private Map<String, String> loadFile(File file) throws Fault {
	969	try (FileInputStream fis = new FileInputStream(file);
	970	InputStream in = new BufferedInputStream(fis)) {
	971	return com.sun.javatest.util.Properties.load(in);
979	972	}
980	973	catch (FileNotFoundException e) {
981	974	throw new Fault(i18n, "cnfg.set.cantFindFile", file);

983	976	catch (IOException e) {
984	977	throw new Fault(i18n, "cnfg.set.cantReadFile",
985	978	new Object[] { file, e.getMessage() });
986		}
987		finally {
988		if (in != null){
989		try { in.close(); } catch (IOException e) { }
990		}
991
992		if (fis != null){
993		try { fis.close(); } catch (IOException e) { }
994		}
995	979	}
996	980	}
997	981

1011	995	return "setX";
1012	996	}
1013	997
1014		SetXCommand(ListIterator argIter) throws Fault {
	998	SetXCommand(ListIterator<String> argIter) throws Fault {
1015	999	super(getName());
1016	1000
1017	1001	if (!argIter.hasNext())

1034	1018	public void run(CommandContext ctx) throws Fault {
1035	1019	InterviewParameters p = getConfig(ctx);
1036	1020	if (file != null) {
1037		Map values = loadFile(file);
1038		Set keys = values.keySet();
1039		Iterator it = keys.iterator();
	1021	Map<String, String> values = loadFile(file);
	1022	Set<String> keys = values.keySet();
	1023	Iterator<String> it = keys.iterator();
1040	1024	String name = null;
1041	1025	for (int i = 0; it.hasNext(); i++) {
1042		name = (String)(it.next());
	1026	name = it.next();
1043	1027	/* could do it this way to reject unknown props
1044	1028	String v = p.retrieveProperty(name);
1045	1029	if (v != null) {
1046	1030	p.storeProperty(name, (String)(values.get(name)));
1047	1031	}
1048	1032	*/
1049		p.storeProperty(name, (String)(values.get(name)));
	1033	p.storeProperty(name, (values.get(name)));
1050	1034	}
1051	1035	}
1052	1036	else {

1054	1038	}
1055	1039	}
1056	1040
1057		private Map loadFile(File file) throws Fault {
1058		FileInputStream fis = null;
1059		try {
1060		fis = new FileInputStream(file);
1061		InputStream in = new BufferedInputStream(fis);
1062		Properties props = new Properties();
1063		props.load(in);
1064		in.close();
1065		return props;
	1041	private Map<String, String> loadFile(File file) throws Fault {
	1042	try (FileInputStream fis = new FileInputStream(file);
	1043	InputStream in = new BufferedInputStream(fis)) {
	1044	return com.sun.javatest.util.Properties.load(in);
1066	1045	}
1067	1046	catch (FileNotFoundException e) {
1068	1047	throw new Fault(i18n, "cnfg.set.cantFindFile", file);

1071	1050	throw new Fault(i18n, "cnfg.set.cantReadFile",
1072	1051	new Object[] { file, e.getMessage() });
1073	1052	}
1074		finally {
1075		if (fis != null){
1076		try { fis.close(); } catch (IOException e) { }
1077		}
1078		}
1079	1053	}
1080	1054
1081	1055	private File file;

1091	1065	return "tests";
1092	1066	}
1093	1067
1094		TestsCommand(ListIterator argIter) throws Fault {
	1068	TestsCommand(ListIterator<String> argIter) throws Fault {
1095	1069	super(getName());
1096	1070
1097		Vector v = new Vector();
	1071	Vector<String> v = new Vector<>();
1098	1072
1099	1073	while (argIter.hasNext()) {
1100	1074	// could possibly support @file or similar syntax here for a list of tests

1137	1111	return new String[] { "testsuite", "ts" };
1138	1112	}
1139	1113
1140		TestSuiteCommand(ListIterator argIter) throws Fault {
	1114	TestSuiteCommand(ListIterator<String> argIter) throws Fault {
1141	1115	super(getNames()[0]);
1142	1116
1143	1117	while (argIter.hasNext()) {

1278	1252	// seem to be another good place in the current architecture.
1279	1253	// although perhaps it would be good to defer this processing to a
1280	1254	// little later in the command processing?
1281		Properties p = Desktop.getPreviousDesktop(null);
1282		String s = p.getProperty("tool.count");
	1255	Map<String, String> p = Desktop.getPreviousDesktop(null);
	1256	String s = p.get("tool.count");
1283	1257	if (s != null) {
1284	1258	int count = Integer.parseInt(s);
1285	1259	for (int i = 0; i < count; i++) {
1286		s = p.getProperty("tool." + i + ".class");
	1260	s = p.get("tool." + i + ".class");
1287	1261	if ("com.sun.javatest.exec.ExecTool".equals(s)) {
1288		s = p.getProperty("tool." + i + ".testSuite");
	1262	s = p.get("tool." + i + ".testSuite");
1289	1263
1290	1264	// this tool instance does not have a test suite
1291	1265	if (s == null)

1309	1283	}
1310	1284
1311	1285	if (s1.equals(s2)) {
1312		s = p.getProperty("tool." + i + ".workDir");
	1286	s = p.get("tool." + i + ".workDir");
1313	1287	if (s != null &&
1314	1288	WorkDirectory.isUsableWorkDirectory(
1315	1289	new File(s))) {

1319	1293	// we found WD,
1320	1294	// try to restore filter now
1321	1295
1322		s = p.getProperty("tool." + i + ".filter");
1323		Map data = collectSpecificData("tool." + i + ".", p);
	1296	s = p.get("tool." + i + ".filter");
	1297	Map<String, String> data = collectSpecificData("tool." + i + ".", p);
1324	1298
1325	1299	if (s != null) {
1326	1300	ctx.setDesktopData(data);

1347	1321	private File path;
1348	1322	private boolean preferFlag;
1349	1323
1350		private Map collectSpecificData(String prefix, Properties p) {
1351		Set<Entry<Object, Object>> s = p.entrySet();
1352		Iterator<Entry<Object, Object>> it = s.iterator();
1353		HashMap res = new HashMap();
	1324	private Map<String, String> collectSpecificData(String prefix, Map<String, String> p) {
	1325	Set<Entry<String, String>> s = p.entrySet();
	1326	Iterator<Entry<String, String>> it = s.iterator();
	1327	Map<String, String> res = new HashMap<>();
1354	1328	while (it.hasNext()) {
1355		Entry en = it.next();
	1329	Entry<String, String> en = it.next();
1356	1330	if (en.getKey().toString().startsWith(prefix)) {
1357		String key = (String) en.getKey();
	1331	String key = en.getKey();
1358	1332	key = key.substring(prefix.length());
1359	1333	if ("-workDir-config-class-mgr-".contains(key)) {
1360	1334	//if ("-class-mgr-".contains(key)) {

1375	1349	return "timeoutfactor";
1376	1350	}
1377	1351
1378		TimeoutFactorCommand(ListIterator argIter) throws Fault {
	1352	TimeoutFactorCommand(ListIterator<String> argIter) throws Fault {
1379	1353	super(getName());
1380	1354
1381	1355	if (!argIter.hasNext())

1423	1397	return new String[] { "workdirectory", "workdir", "wd" };
1424	1398	}
1425	1399
1426		WorkDirectoryCommand(ListIterator argIter) throws Fault {
	1400	WorkDirectoryCommand(ListIterator<String> argIter) throws Fault {
1427	1401	super(getNames()[0]);
1428	1402
1429	1403	while (argIter.hasNext()) {

+3

-2

src/com/sun/javatest/tool/CustomPropagationController.java less more

28	28	import com.sun.javatest.InterviewParameters;
29	29	import com.sun.javatest.InterviewPropagator;
30	30
	31	import java.util.Map;
31	32	import java.util.Properties;
32	33
33	34	/**

41	42	* @param interview - current InterviewParameters.
42	43	* @param templateData - loaded actual template's values. Can be null
43	44	*/
44		public void notify(EventType evt, InterviewParameters interview, Properties templateData) {}
	45	public void notify(EventType evt, InterviewParameters interview, Map<String, String> templateData) {}
45	46
46	47	/**
47	48	* Returns the question's text. This text is used in the template propagation dialog only

62	63	* @param interview
63	64	* @return true if the interview was changed
64	65	*/
65		public boolean preprocessData(Properties templateData, InterviewParameters interview) {
	66	public boolean preprocessData(Map<String, String> templateData, InterviewParameters interview) {
66	67	return false;
67	68	}
68	69

+22

-22

src/com/sun/javatest/tool/DeskView.java less more

467	467	}
468	468
469	469	private void copyMenuListeners(JMenu src, JMenu dst) {
470		MenuListener[] ll = (MenuListener[]) (src.getListeners(MenuListener.class));
	470	MenuListener[] ll = src.getListeners(MenuListener.class);
471	471	for (int i = 0; i < ll.length; i++)
472	472	dst.addMenuListener(ll[i]);
473	473	}

521	521	* @param m The map object to which to write the state of the desktop
522	522	* @see #restoreDesktop
523	523	*/
524		protected abstract void saveDesktop(Map m);
	524	protected abstract void saveDesktop(Map<String, String> m);
525	525
526	526	/**
527	527	* Save the state of the current tools on the desktop to a map object.
528	528	* @param m The map object to which to write the state of the desktop
529	529	* @see #restoreDesktop
530	530	*/
531		protected void saveTools(Map m) {
	531	protected void saveTools(Map<String, String> m) {
532	532	Tool[] tools = getTools();
533	533	m.put("tool.count", String.valueOf(tools.length));
534	534	for (int i = 0; i < tools.length; i++)
535		saveTool(new PrefixMap(m, "tool." + String.valueOf(i)), tools[i]);
	535	saveTool(new PrefixMap<>(m, "tool." + String.valueOf(i)), tools[i]);
536	536	}
537	537
538	538	/**

541	541	* @param t the tool to be saved
542	542	* @see #restoreTool
543	543	*/
544		protected void saveTool(Map m, Tool t) {
	544	protected void saveTool(Map<String, String> m, Tool t) {
545	545	m.put("mgr", t.getManager().getClass().getName());
546	546	m.put("class", t.getClass().getName());
547	547	m.put("selected", String.valueOf(t == getSelectedTool()));

553	553	* @param m The map object from which to restore the state of the desktop
554	554	* @see #saveDesktop
555	555	*/
556		protected abstract void restoreDesktop(Map m);
	556	protected abstract void restoreDesktop(Map<String, String> m);
557	557
558	558	/**
559	559	* Restore the state of the saved tools from a map object.
560	560	* @param m The map object from which to restore the state of the saved tools
561	561	* @see #saveTools
562	562	*/
563		protected void restoreTools(Map m) {
	563	protected void restoreTools(Map<String, String> m) {
564	564	try {
565		String c = (String) (m.get("tool.count"));
	565	String c = m.get("tool.count");
566	566	if (c != null) {
567	567	int count = Integer.parseInt(c);
568	568	for (int i = 0; i < count; i++) {
569	569	try {
570	570	String prefix = "tool." + i;
571		Map toolMap = new PrefixMap(m, prefix);
	571	Map<String, String> toolMap = new PrefixMap<>(m, prefix);
572	572	restoreTool(toolMap, prefix);
573	573	}
574	574	catch (ToolManager.Fault e) {

605	605	* @throws IllegalAccessException if the tool's restore method does not have public access
606	606	* @throws InvocationTargetException if the tool's restore method threw an exception
607	607	*/
608		protected Tool restoreTool(Map m, String name) throws Fault, ToolManager.Fault
	608	protected Tool restoreTool(Map<String, String> m, String name) throws Fault, ToolManager.Fault
609	609	{
610		String mgrClassName = (String) (m.get("mgr"));
	610	String mgrClassName = m.get("mgr");
611	611	if (mgrClassName == null) {
612	612	// backwards compatibility with 3.1
613		String toolClassName = (String) (m.get("class"));
	613	String toolClassName = m.get("class");
614	614	if (toolClassName != null && toolClassName.endsWith("Tool")) {
615	615	String n = toolClassName.substring(0, toolClassName.length()) + "Manager";
616	616	try {

647	647	* @param m the map in which the information is to be recorded
648	648	* @see #restoreBounds
649	649	*/
650		protected static void saveBounds(Component c, Map m) {
	650	protected static void saveBounds(Component c, Map<String, String> m) {
651	651	Rectangle r = c.getBounds();
652	652	m.put("x", String.valueOf(r.x));
653	653	m.put("y", String.valueOf(r.y));

663	663	* @param m the map in which the information is to be recorded
664	664	* @see #saveBounds
665	665	*/
666		protected static void restoreBounds(Component c, Map m) {
	666	protected static void restoreBounds(Component c, Map<String, String> m) {
667	667	try {
668		String xs = (String) (m.get("x"));
669		String ys = (String) (m.get("y"));
670		String ws = (String) (m.get("w"));
671		String hs = (String) (m.get("h"));
	668	String xs = (m.get("x"));
	669	String ys = (m.get("y"));
	670	String ws = (m.get("w"));
	671	String hs = (m.get("h"));
672	672	if (xs != null && ys != null && ws != null && hs != null) {
673	673	Rectangle restored = new Rectangle(Integer.parseInt(xs),
674	674	Integer.parseInt(ys),

706	706
707	707	// keep a private list of all the outstanding frames, so that
708	708	// when the collection becomes empty, we can lower the ExitCount.
709		private static Collection allFrames = new Vector();
	709	private static Collection<JFrame> allFrames = new Vector<>();
710	710
711	711	// counter for unique name generation
712	712	private static int frameIndex;

790	790
791	791	} // for
792	792
793		List fileHistory = desktop.getFileHistory();
	793	List<Desktop.FileHistoryEntry> fileHistory = desktop.getFileHistory();
794	794	// if (!fileHistory.isEmpty()) {
795	795	JMenu hm = uif.createMenu("dt.file.recentwd");
796	796	if (!fileHistory.isEmpty()) {
797	797	int n = 0;
798	798
799		for (Iterator i = fileHistory.iterator(); i.hasNext(); ) {
800		Desktop.FileHistoryEntry h = (Desktop.FileHistoryEntry) (i.next());
	799	for (Iterator<Desktop.FileHistoryEntry> i = fileHistory.iterator(); i.hasNext(); ) {
	800	Desktop.FileHistoryEntry h = (i.next());
801	801	if (!h.file.exists())
802	802	continue;
803	803	String s = uif.getI18NString("dt.file.historyX.mit",

+43

-69

src/com/sun/javatest/tool/Desktop.java less more

45	45	import java.lang.reflect.InvocationTargetException;
46	46	import java.lang.reflect.Method;
47	47	import java.net.URL;
48		import java.util.ArrayList;
49		import java.util.Arrays;
50		import java.util.HashMap;
51		import java.util.HashSet;
52		import java.util.Iterator;
53		import java.util.LinkedList;
54		import java.util.List;
55		import java.util.Properties;
56		import java.util.Set;
57		import java.util.Vector;
	48	import java.util.*;
58	49	import javax.swing.BorderFactory;
59	50	import javax.swing.Icon;
60	51	import javax.swing.JButton;

77	68	import com.sun.javatest.tool.jthelp.HelpBroker;
78	69	import com.sun.javatest.tool.jthelp.HelpSet;
79	70	import com.sun.javatest.tool.jthelp.JTHelpBroker;
80		import com.sun.javatest.util.BackupPolicy;
	71	import com.sun.javatest.util.*;
81	72	import com.sun.javatest.report.HTMLWriterEx;
82		import com.sun.javatest.util.I18NResourceBundle;
83		import com.sun.javatest.util.LogFile;
84		import com.sun.javatest.util.SortedProperties;
	73	import com.sun.javatest.util.Properties;
	74
85	75	import java.awt.print.Printable;
86	76	import java.awt.print.PrinterJob;
87	77	import javax.print.Doc;

176	166	break;
177	167	case CommandContext.METAL_LAF:
178	168	try {
179		Class nimbusClass = Class.forName("javax.swing.plaf.metal.MetalLookAndFeel");
	169	Class<?> nimbusClass = Class.forName("javax.swing.plaf.metal.MetalLookAndFeel");
180	170	UIManager.setLookAndFeel((LookAndFeel) nimbusClass.newInstance());
181	171	} catch (Throwable e) {
182	172	}
183	173	break;
184	174	case CommandContext.NIMBUS_LAF:
185	175	try {
186		Class nimbusClass = Class.forName("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
	176	Class<?> nimbusClass = Class.forName("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
187	177	UIManager.setLookAndFeel((LookAndFeel) nimbusClass.newInstance());
188	178	} catch (Throwable e) {
189	179	}

408	398	// this is to avoid a class dependency to exec package, which is
409	399	// normally not allowed in this package
410	400	Method m = mgr.getClass().getMethod("startTool",
411		new Class[] { InterviewParameters.class} );
	401	new Class<?>[] { InterviewParameters.class} );
412	402
413	403	return (Tool) m.invoke(mgr, new Object[] { ip });
414	404	}

458	448	* @param c the class of the desired tool manager.
459	449	* @return a tool manager of the desired type, or null if none found
460	450	*/
461		public ToolManager getToolManager(Class c) {
	451	public ToolManager getToolManager(Class<?> c) {
462	452	for (int i = 0; i < toolManagers.length; i++) {
463	453	ToolManager m = toolManagers[i];
464	454	if (c.isInstance(m))

510	500	*/
511	501	public void addToFileHistory(File f, FileOpener fo) {
512	502	// if it is already in the history, remove it
513		for (Iterator i = fileHistory.iterator(); i.hasNext(); ) {
514		FileHistoryEntry h = (FileHistoryEntry) (i.next());
	503	for (Iterator<FileHistoryEntry> i = fileHistory.iterator(); i.hasNext(); ) {
	504	FileHistoryEntry h = i.next();
515	505	if (h.fileOpener == fo && h.file.equals(f)) {
516	506	i.remove();
517	507	break;

531	521	* @return a list of the current entries on the file history associated with this desktop
532	522	* @see #addToFileHistory
533	523	*/
534		List getFileHistory()
	524	List<FileHistoryEntry> getFileHistory()
535	525	{
536	526	return fileHistory;
537	527	}

656	646	return false;
657	647	}
658	648
659		Vector v = new Vector();
	649	Vector<String> v = new Vector<>();
660	650
661	651	Tool[] tools = getTools();
662	652	for (int ti = 0; ti < tools.length; ti++) {

831	821	if (f == null)
832	822	return;
833	823
834		Properties p = new SortedProperties();
	824	SortedMap<String, String> p = new TreeMap<>();
835	825
836	826	int s = getStyle();
837	827	if (s < NUM_STYLES) {

846	836
847	837	p.put("file.count", String.valueOf(fileHistory.size()));
848	838	int n = 0;
849		for (Iterator i = fileHistory.iterator(); i.hasNext(); ) {
850		FileHistoryEntry h = (FileHistoryEntry) (i.next());
	839	for (Iterator<FileHistoryEntry> i = fileHistory.iterator(); i.hasNext(); ) {
	840	FileHistoryEntry h = i.next();
851	841	p.put("fileHistory." + n + ".type", h.fileOpener.getFileType());
852	842	p.put("fileHistory." + n + ".path", h.file.getPath());
853	843	n++;

857	847	File dir = f.getParentFile();
858	848	if (dir != null && !dir.exists())
859	849	dir.mkdirs();
860		FileOutputStream fos = null;
861		try {
862		fos = new FileOutputStream(f);
863		OutputStream out = new BufferedOutputStream(fos);
864		p.store(out, "JT Harness Desktop");
865		out.close();
866		}
867		finally {
868		if (fos != null){
869		try { fos.close(); } catch (IOException e) { }
870		}
871		} // finally
	850	try (FileOutputStream fos = new FileOutputStream(f);
	851	OutputStream out = new BufferedOutputStream(fos)) {
	852	Properties.store(p, out, "JT Harness Desktop");
	853	}
872	854	}
873	855	catch (IOException e) {
874	856	System.err.println(uif.getI18NString("dt.cantWriteDt.txt", e.getMessage()));

896	878	* @param file the file from which to load the data
897	879	*/
898	880	public void restore(final File file) {
899		Properties p = getPreviousDesktop(file);
	881	Map<String, String> p = getPreviousDesktop(file);
900	882	restore0(p);
901	883	}
902	884

904	886	restoreHistory(getPreviousDesktop(getDesktopFile()));
905	887	}
906	888
907		private void restore0(final Properties p) {
	889	private void restore0(final Map<String, String> p) {
908	890	//System.err.println("DT: restore " + file);
909	891	if (!EventQueue.isDispatchThread()) {
910	892	invokeOnEventThread(new Runnable() {

976	958
977	959	}
978	960
979		private void restoreHistory(Properties p) {
980		HashMap allOpeners = new HashMap();
	961	private void restoreHistory(Map<String, String> p) {
	962	HashMap<String, FileOpener> allOpeners = new HashMap<>();
981	963	for (int i = 0; i < toolManagers.length; i++) {
982	964	ToolManager m = toolManagers[i];
983	965	FileOpener[] mgrOpeners = m.getFileOpeners();

991	973
992	974	try {
993	975	fileHistory.clear();
994		String c = (String) (p.get("file.count"));
	976	String c = p.get("file.count");
995	977	if (c != null) {
996	978	int count = Integer.parseInt(c);
997	979	for (int i = 0; i < count; i++) {
998	980	try {
999		String ft = (String) (p.get("fileHistory." + i + ".type"));
1000		FileOpener fo = (FileOpener) (allOpeners.get(ft));
	981	String ft = p.get("fileHistory." + i + ".type");
	982	FileOpener fo = allOpeners.get(ft);
1001	983	if (fo != null) {
1002		String path = (String) (p.get("fileHistory." + i + ".path"));
	984	String path = p.get("fileHistory." + i + ".path");
1003	985	if (path != null && path.length() > 0)
1004	986	fileHistory.add(new FileHistoryEntry(fo, new File(path)));
1005	987	}

1018	1000	}
1019	1001	}
1020	1002
1021		static Properties getPreviousDesktop(File file) {
	1003	static Map<String, String> getPreviousDesktop(File file) {
1022	1004	if (file == null)
1023	1005	file = getDesktopFile();
1024	1006
1025		Properties p = new Properties();
	1007	Map<String, String> stringPropsMap = new HashMap<>();
1026	1008
1027	1009	if (file != null && file.exists()) {
1028		FileInputStream fis = null;
1029		try {
1030		fis = new FileInputStream(file);
1031		InputStream in = new BufferedInputStream(fis);
1032		p.load(in);
1033		in.close();
	1010	try (FileInputStream fis = new FileInputStream(file);
	1011	InputStream in = new BufferedInputStream(fis)) {
	1012	stringPropsMap = Properties.load(in);
1034	1013	}
1035	1014	catch (IOException e) {
1036	1015	// I18N
1037	1016	System.err.println("Error reading desktop file: " + e);
1038	1017	}
1039		finally {
1040		if (fis != null){
1041		try { fis.close(); } catch (IOException e) { }
1042		}
1043		}
1044		}
1045
1046		return p;
	1018	}
	1019
	1020	return stringPropsMap;
1047	1021	}
1048	1022
1049	1023	/**

1056	1030	if(colorPane == null)
1057	1031	colorPane = new ColorPrefsPane(uif);
1058	1032
1059		Vector v = new Vector();
	1033	Vector<PreferencesPane> v = new Vector<>();
1060	1034	v.addElement(prefsPane);
1061	1035	v.addElement(colorPane);
1062	1036	for (int i = 0; i < toolManagers.length; i++) {

1085	1059	* Null if none.
1086	1060	*/
1087	1061	private PreferencesPane[] getCustomPreferences() {
1088		ArrayList al = new ArrayList();
1089
1090		HashSet customPrefsClasses = new HashSet();
	1062	List<PreferencesPane> al = new ArrayList<>();
	1063
	1064	Set<String> customPrefsClasses = new HashSet<>();
1091	1065
1092	1066	Tool[] tools = getTools();
1093	1067	for (int i = 0; i < tools.length; i++) {

1463	1437
1464	1438	try {
1465	1439	ManagerLoader ml = new ManagerLoader(ToolManager.class, System.err);
1466		ml.setManagerConstructorArgs(new Class[] { Desktop.class }, new Object[] { this });
1467		Set s = ml.loadManagers(TOOLMGRLIST);
1468		toolManagers = (ToolManager[]) (s.toArray(new ToolManager[s.size()]));
	1440	ml.setManagerConstructorArgs(new Class<?>[] { Desktop.class }, new Object[] { this });
	1441	Set<?> s = ml.loadManagers(TOOLMGRLIST);
	1442	toolManagers = s.toArray(new ToolManager[s.size()]);
1469	1443	}
1470	1444	catch (IOException e) {
1471	1445	throw new JavaTestError(uif.getI18NResourceBundle(),

1633	1607	private PrintRequestAttributeSet printAttrs;
1634	1608	private boolean restoreOnStart;
1635	1609
1636		private LinkedList fileHistory = new LinkedList();
	1610	private LinkedList<FileHistoryEntry> fileHistory = new LinkedList<>();
1637	1611	private static final int FILE_HISTORY_MAX_SIZE = 10;
1638	1612
1639	1613	private static Preferences preferences = Preferences.access();

+3

-3

src/com/sun/javatest/tool/DesktopManager.java less more

67	67
68	68	//----------------------------------------------------------------------------
69	69
70		public boolean parseCommand(String cmd, ListIterator argIter, CommandContext ctx)
	70	public boolean parseCommand(String cmd, ListIterator<String> argIter, CommandContext ctx)
71	71	throws Command.Fault
72	72	{
73	73	if (cmd.equalsIgnoreCase("newDesktop") \|\| cmd.equalsIgnoreCase("cleanDesktop")) {

110	110
111	111	private static class SetLafCommand extends Command {
112	112
113		private SetLafCommand(ListIterator argIter, CommandContext ctx) throws Fault {
	113	private SetLafCommand(ListIterator<String> argIter, CommandContext ctx) throws Fault {
114	114	super("laf");
115	115
116	116	if (!argIter.hasNext()) {

119	119
120	120	int laf;
121	121
122		String lafName = (String) argIter.next();
	122	String lafName = argIter.next();
123	123	if ("nimbus".equalsIgnoreCase(lafName)) {
124	124	laf = CommandContext.NIMBUS_LAF;
125	125	} else if ("metal".equalsIgnoreCase(lafName)) {

+13

-21

src/com/sun/javatest/tool/DesktopPrefsPane.java less more

32	32	import java.awt.event.ActionListener;
33	33	import java.util.Enumeration;
34	34	import java.util.Map;
	35	import javax.swing.*;
35	36	import javax.swing.plaf.basic.BasicComboBoxRenderer;
36		import javax.swing.Box;
37		import javax.swing.ButtonGroup;
38		import javax.swing.ButtonModel;
39		import javax.swing.JCheckBox;
40		import javax.swing.JComboBox;
41		import javax.swing.JLabel;
42		import javax.swing.JList;
43		import javax.swing.JPanel;
44		import javax.swing.JRadioButton;
45	37
46	38	/**
47	39	* Preferences for the desktop itself.

74	66	}
75	67
76	68	@Override
77		public void load(Map m) {
78		String styleName = (String) (m.get(Desktop.STYLE_PREF));
	69	public void load(Map<String, String> m) {
	70	String styleName = m.get(Desktop.STYLE_PREF);
79	71	if (styleName == null)
80	72	styleName = Desktop.styleNames[desktop.getStyle()];
81	73
82		for (Enumeration e = styleGrp.getElements(); e.hasMoreElements(); ) {
	74	for (Enumeration<AbstractButton> e = styleGrp.getElements(); e.hasMoreElements(); ) {
83	75	JRadioButton rb = (JRadioButton)e.nextElement();
84	76	if (rb.getActionCommand().equals(styleName)) {
85	77	rb.setSelected(true);

87	79	}
88	80	}
89	81	// tooltips
90		String tipState = (String) (m.get(Desktop.TTIP_PREF));
	82	String tipState = m.get(Desktop.TTIP_PREF);
91	83	ttipsCheck.setSelected(tipState == null \|\| tipState.equalsIgnoreCase("true"));
92	84
93	85	boolean complete = false; // used for delay and duration code
94	86
95		String tipDelay = (String) (m.get(Desktop.TTIP_DELAY));
	87	String tipDelay = m.get(Desktop.TTIP_DELAY);
96	88	try {
97	89	int delay = Integer.parseInt(tipDelay);
98	90

103	95	}
104	96	else {
105	97	for (int i = 1; i < ttDelay.getItemCount(); i++) {
106		if ( ((Integer)(ttDelay.getItemAt(i))).intValue() == delay ) {
	98	if ( ttDelay.getItemAt(i).intValue() == delay ) {
107	99	ttDelay.setSelectedIndex(i);
108	100	i = ttDelay.getItemCount(); // stop loop
109	101	complete = true;

124	116	ttDelay.setSelectedIndex(1);
125	117
126	118	complete = false;
127		String tipDuration = (String) (m.get(Desktop.TTIP_DURATION));
	119	String tipDuration = m.get(Desktop.TTIP_DURATION);
128	120	try {
129	121	int duration = Integer.parseInt(tipDuration);
130	122	if (duration == Desktop.TTIP_DURATION_FOREVER) {

155	147	syncTooltipPrefs();
156	148
157	149	// save on exit
158		String saveState = (String) (m.get(Desktop.SAVE_ON_EXIT_PREF));
	150	String saveState = m.get(Desktop.SAVE_ON_EXIT_PREF);
159	151	saveCheck.setSelected(saveState == null \|\| "true".equalsIgnoreCase(saveState)); // true (null) by default
160		String restoreState = (String) (m.get(Desktop.RESTORE_ON_START_PREF)); // false by default
	152	String restoreState = m.get(Desktop.RESTORE_ON_START_PREF); // false by default
161	153	restoreCheck.setSelected(restoreState == null \|\| "true".equalsIgnoreCase(restoreState));
162	154	}
163	155
164	156	@Override
165		public void save(Map m) {
	157	public void save(Map<String, String> m) {
166	158	ButtonModel bm = styleGrp.getSelection();
167	159	if (bm != null) {
168	160	String styleName = bm.getActionCommand();

352	344	private UIFactory uif;
353	345	private ButtonGroup styleGrp;
354	346	private JCheckBox ttipsCheck;
355		private JComboBox ttDelay;
356		private JComboBox ttDuration;
	347	private JComboBox<Integer> ttDelay;
	348	private JComboBox<Integer> ttDuration;
357	349	private JCheckBox saveCheck;
358	350	private JCheckBox restoreCheck;
359	351

+6

-5

src/com/sun/javatest/tool/EditableList.java less more

32	32	import java.awt.event.ActionListener;
33	33	import java.awt.event.MouseEvent;
34	34	import java.awt.event.MouseListener;
	35	import java.io.File;
35	36	import java.lang.reflect.Array;
36	37	import javax.accessibility.Accessible;
37	38	import javax.accessibility.AccessibleContext;

78	79	public EditableList(UIFactory uif, String uiKey) {
79	80	this.uif = uif;
80	81	setLayout(new BorderLayout());
81		listModel = new DefaultListModel(); // need to force the type of model
	82	listModel = new DefaultListModel<>(); // need to force the type of model
82	83	listModel.addListDataListener(listener);
83	84	list = uif.createList(uiKey, listModel);
84	85	list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);

156	157	* @return an array containing the items currently in the list
157	158	* @see #setItems
158	159	*/
159		public Object[] getItems(Class c) {
	160	public Object[] getItems(Class<?> c) {
160	161	Object[] items = (Object[]) (Array.newInstance(c, listModel.size()));
161	162	listModel.copyInto(items);
162	163	return items;

334	335
335	336	private class Renderer
336	337	extends DefaultListCellRenderer {
337		public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
	338	public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
338	339	return super.getListCellRendererComponent(list,
339	340	getDisplayValue(value),
340	341	index,

452	453	/**
453	454	* The list model that contains the elements of the list.
454	455	*/
455		protected DefaultListModel listModel;
456		private JList list;
	456	protected DefaultListModel<Object> listModel;
	457	private JList<Object> list;
457	458	private JButton addBtn;
458	459	private JButton removeBtn;
459	460	private JButton upBtn;

+7

-6

src/com/sun/javatest/tool/EnvironmentManager.java less more

34	34	import com.sun.javatest.TestEnvironment;
35	35	import com.sun.javatest.util.HelpTree;
36	36	import com.sun.javatest.util.I18NResourceBundle;
	37	import com.sun.javatest.util.Properties;
37	38
38	39	/**
39	40	* A command manager to handle the command line options for adding

54	55
55	56	// set basic defaults
56	57	String[] stdSysProps = {"user.dir", "user.home"};
57		Map m = new HashMap();
	58	Map<String, String> m = new HashMap<>();
58	59	for (int i = 0; i < stdSysProps.length; i++) {
59	60	String name = stdSysProps[i];
60	61	m.put(name, System.getProperty(name));

68	69	return new HelpTree.Node(i18n, "env", opts);
69	70	}
70	71
71		public boolean parseCommand(String cmd, ListIterator argIter, CommandContext ctx)
	72	public boolean parseCommand(String cmd, ListIterator<String> argIter, CommandContext ctx)
72	73	throws Command.Fault
73	74	{
74	75	if (cmd.equalsIgnoreCase("EsysProps")) {

99	100	}
100	101
101	102	public void run(CommandContext ctx) throws Fault {
102		Map m = new HashMap(1); // would be nice to have a singleton map
	103	Map<String, String> m = new HashMap<>(1); // would be nice to have a singleton map
103	104	m.put(name, value);
104	105	TestEnvironment.addDefaultPropTable(i18n.getString("env.def.cmdLine"), m);
105	106	}

117	118
118	119	public void run(CommandContext ctx) throws Fault {
119	120	try {
120		Map sysProps;
	121	Map<String, String> sysProps;
121	122	SecurityManager sc = System.getSecurityManager();
122	123	if (sc instanceof JavaTestSecurityManager) {
123	124	// open up the properties access permission to get system props.
124	125	boolean prev = ((JavaTestSecurityManager) sc).setAllowPropertiesAccess(true);
125	126	try {
126		sysProps = System.getProperties();
	127	sysProps = Properties.convertToStringProps( System.getProperties() );
127	128	}
128	129	finally {
129	130	((JavaTestSecurityManager) sc).setAllowPropertiesAccess(prev);

132	133	else {
133	134	// if not JTSecurityManager, try to get properties anyway
134	135	// and handle the exception if we can't get them
135		sysProps = System.getProperties();
	136	sysProps = Properties.convertToStringProps( System.getProperties() );
136	137	}
137	138	TestEnvironment.addDefaultPropTable(i18n.getString("env.def.sysProps"), sysProps);
138	139	}

+19

-23

src/com/sun/javatest/tool/FileHistory.java less more

30	30	import java.io.*;
31	31	import java.lang.ref.WeakReference;
32	32	import java.nio.charset.StandardCharsets;
33		import java.util.Date;
34		import java.util.HashMap;
35		import java.util.Iterator;
36		import java.util.Vector;
37		import java.util.WeakHashMap;
	33	import java.util.*;
38	34	import javax.swing.JMenu;
39	35	import javax.swing.JMenuItem;
40	36	import javax.swing.event.MenuEvent;

61	57	*/
62	58	public static FileHistory getFileHistory(WorkDirectory wd, String name) {
63	59	if (cache == null)
64		cache = new WeakHashMap(8);
	60	cache = new WeakHashMap<>(8);
65	61
66	62	// first, get a map for all files in this wd
67		HashMap map = (HashMap) (cache.get(wd));
	63	Map<String, FileHistory> map = cache.get(wd);
68	64	if (map == null) {
69		map = new HashMap(8);
	65	map = new HashMap<>(8);
70	66	cache.put(wd, map);
71	67	}
72	68
73	69	// then, get the FileHistory for the specified file
74		FileHistory h = (FileHistory) (map.get(name));
	70	FileHistory h = map.get(name);
75	71	if (h == null) {
76	72	h = new FileHistory(wd, name);
77	73	map.put(name, h);

90	86	*/
91	87	public static FileHistory getFileHistory(File wdFile, String name) {
92	88	if (cache == null)
93		cache = new WeakHashMap(8);
	89	cache = new WeakHashMap<>(8);
94	90
95	91	if (!WorkDirectory.isWorkDirectory(wdFile))
96	92	return null;
97	93
98	94	// let's find in the cache work dir corresponding to the path
99		Iterator it = cache.keySet().iterator();
	95	Iterator<WorkDirectory> it = cache.keySet().iterator();
100	96	WorkDirectory wd = null;
101	97	while (it.hasNext()) {
102		WorkDirectory tempWD = ((WorkDirectory)it.next());
	98	WorkDirectory tempWD = it.next();
103	99	if (tempWD.getRoot().equals(wdFile)) {
104	100	wd = tempWD;
105	101	break;

142	138	// collecting up to count entries. Non-existent entries are
143	139	// skipped but not deleted because they might be for other
144	140	// platforms.
145		Vector v = new Vector();
	141	Vector<File> v = new Vector<>();
146	142	for (int i = 0; i < entries.size() && v.size() < count; i++) {
147		File f = (File) (entries.elementAt(i));
	143	File f = entries.elementAt(i);
148	144	if (f.exists())
149	145	v.add(f);
150	146	}

168	164	// skipped but not deleted because they might be for other
169	165	// platforms.
170	166	for (int i = 0; i < entries.size(); i++) {
171		File f = (File) (entries.elementAt(i));
	167	File f = entries.elementAt(i);
172	168	if (f.exists())
173	169	return f;
174	170	}

180	176	ensureEntriesUpToDate();
181	177
182	178	for (int i = 0; i < entries.size(); i++) {
183		File f = (File) (entries.elementAt(i));
	179	File f = entries.elementAt(i);
184	180	if (f.exists()) {
185	181	return f;
186	182	} else {

200	196
201	197
202	198	private FileHistory(WorkDirectory workDir, String name) {
203		workDirRef = new WeakReference(workDir); // just used for logging errors
	199	workDirRef = new WeakReference<>(workDir); // just used for logging errors
204	200	this.name = name;
205	201	historyFile = workDir.getSystemFile(name);
206	202	}

212	208
213	209	private void readEntries() {
214	210	if (entries == null)
215		entries = new Vector();
	211	entries = new Vector<>();
216	212	else
217	213	entries.clear();
218	214

229	225	br.close();
230	226	}
231	227	catch (IOException e) {
232		WorkDirectory workDir = (WorkDirectory) (workDirRef.get());
	228	WorkDirectory workDir = workDirRef.get();
233	229	workDir.log(i18n, "fh.cantRead", new Object[] { name, e } );
234	230	}
235	231

251	247	bw.close();
252	248	}
253	249	catch (IOException e) {
254		WorkDirectory workDir = (WorkDirectory) (workDirRef.get());
	250	WorkDirectory workDir = workDirRef.get();
255	251	workDir.log(i18n, "fh.cantWrite", new Object[] { name, e } );
256	252	}
257	253

398	394	private ActionListener clientListener;
399	395	}
400	396
401		private WeakReference workDirRef;
	397	private WeakReference<WorkDirectory> workDirRef;
402	398	private String name;
403	399	private File historyFile;
404	400	private long historyFileLastModified;
405		private Vector entries;
	401	private Vector<File> entries;
406	402
407	403	/**
408	404	* The name of the client property used to access the File that identifies

411	407	*/
412	408	public static final String FILE = "file";
413	409
414		private static WeakHashMap cache;
	410	private static WeakHashMap<WorkDirectory, Map<String, FileHistory>> cache;
415	411	private static final String FILE_HISTORY = "fileHistory";
416	412	private static I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(FileHistory.class);
417	413

+6

-14

src/com/sun/javatest/tool/FocusMonitor.java less more

25	25	*/
26	26	package com.sun.javatest.tool;
27	27
28		import java.awt.Color;
29		import java.awt.Component;
30		import java.awt.Container;
31		import java.awt.FocusTraversalPolicy;
32		import java.awt.Frame;
33		import java.awt.GridBagConstraints;
34		import java.awt.GridBagLayout;
35		import java.awt.KeyboardFocusManager;
36		import java.awt.Window;
	28	import java.awt.*;
37	29	import java.awt.event.ActionEvent;
38	30	import java.awt.event.WindowAdapter;
39	31	import java.awt.event.WindowEvent;

397	389	if (c == null)
398	390	return null;
399	391
400		Set s = c.getFocusTraversalKeys(mode);
	392	Set<AWTKeyStroke> s = c.getFocusTraversalKeys(mode);
401	393	StringBuffer sb = new StringBuffer();
402		for (Iterator iter = s.iterator(); iter.hasNext(); ) {
	394	for (Iterator<AWTKeyStroke> iter = s.iterator(); iter.hasNext(); ) {
403	395	if (sb.length() > 0)
404	396	sb.append(", ");
405	397	sb.append(iter.next());

562	554
563	555	void write(Writer out) throws IOException {
564	556	for (int i = 0; i <entries.size(); i++) {
565		Entry e = (Entry) (entries.elementAt(i));
	557	Entry e = entries.elementAt(i);
566	558	e.write(out);
567	559	}
568	560	}

570	562	public void setEnabled(boolean enabled) {
571	563	super.setEnabled(enabled);
572	564	for (int i = 0; i <entries.size(); i++) {
573		Entry e = (Entry) (entries.elementAt(i));
	565	Entry e = entries.elementAt(i);
574	566	e.setParentEnabled(enabled);
575	567	}
576	568	}

588	580	entries.add(entry);
589	581	}
590	582
591		private Vector entries = new Vector();
	583	private Vector<Entry> entries = new Vector<>();
592	584	private Entry name;
593	585	private Entry path;
594	586	private Entry type;

+2

-2

src/com/sun/javatest/tool/HelpExternalLink.java less more

71	71	// rundll32 allows to open a file in appropriate default application
72	72	Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
73	73	} else if (os.startsWith("Mac OS")) {
74		Class fileMgr = Class.forName("com.apple.eio.FileManager");
	74	Class<?> fileMgr = Class.forName("com.apple.eio.FileManager");
75	75	Method openURL = fileMgr.getDeclaredMethod("openURL",
76		new Class[]{String.class});
	76	new Class<?>[]{String.class});
77	77	openURL.invoke(null, new Object[]{url});
78	78	} else {
79	79	String[] commands = {

+8

-12

src/com/sun/javatest/tool/HelpManager.java less more

34	34	import java.io.PrintWriter;
35	35	import java.net.URL;
36	36	import java.text.DateFormat;
37		import java.util.Arrays;
38		import java.util.Iterator;
39		import java.util.ListIterator;
40		import java.util.TreeMap;
	37	import java.util.*;
41	38
42	39	import com.sun.javatest.Harness;
43	40	import com.sun.javatest.ProductInfo;

47	44	import com.sun.javatest.util.HelpTree;
48	45	import com.sun.javatest.util.I18NResourceBundle;
49	46	import com.sun.javatest.util.WrapWriter;
50		import java.util.ArrayList;
51	47
52	48	/**
53	49	* A manager for command line help.

95	91	* and false otherwise
96	92	*/
97	93	@Override
98		public boolean parseCommand(String cmd, ListIterator argIter, CommandContext ctx) {
	94	public boolean parseCommand(String cmd, ListIterator<String> argIter, CommandContext ctx) {
99	95	if (cmd.equalsIgnoreCase("help")
100	96	\|\| cmd.equalsIgnoreCase("usage")
101	97	\|\| cmd.equalsIgnoreCase("?")) {
102		ArrayList v = new ArrayList();
	98	List<String> v = new ArrayList<>();
103	99	while (argIter.hasNext()) {
104		v.add(((String) (argIter.next())).toLowerCase());
	100	v.add(argIter.next().toLowerCase());
105	101	}
106	102	commandLineHelpFlag = true;
107		commandLineHelpQuery = (String[]) (v.toArray(new String[v.size()]));
	103	commandLineHelpQuery = v.toArray(new String[v.size()]);
108	104	return true;
109	105	}
110	106

173	169	}
174	170
175	171	// sort the command manager help nodes according to their name
176		TreeMap tm = new TreeMap();
	172	TreeMap<String, HelpTree.Node> tm = new TreeMap<>();
177	173	for (int i = 0; i < commandManagers.length; i++) {
178	174	HelpTree.Node n = commandManagers[i].getHelp();
179	175	tm.put(n.getName(), n);
180	176	}
181	177
182		for (Iterator iter = tm.values().iterator(); iter.hasNext(); ) {
183		commandHelpTree.addNode((HelpTree.Node) (iter.next()));
	178	for (Iterator<HelpTree.Node> iter = tm.values().iterator(); iter.hasNext(); ) {
	179	commandHelpTree.addNode((iter.next()));
184	180	}
185	181
186	182	// now add file types

+15

-22

src/com/sun/javatest/tool/HelpMenu.java less more

30	30	import java.awt.event.ActionEvent;
31	31	import java.awt.event.ActionListener;
32	32	import java.text.DateFormat;
33		import java.util.ArrayList;
34		import java.util.Arrays;
35		import java.util.Comparator;
36		import java.util.Date;
37		import java.util.Iterator;
38		import java.util.Set;
39		import java.util.TreeSet;
40		import java.util.WeakHashMap;
	33	import java.util.*;
41	34
42	35	import javax.swing.JButton;
43	36	import javax.swing.JComponent;

90	83	}
91	84
92	85	// first, collect the set of active test suites
93		Set loadedTestSuites = new TreeSet(new Comparator() {
	86	Set<TestSuite> loadedTestSuites = new TreeSet<>(new Comparator<TestSuite>() {
94	87	@Override
95		public int compare(Object o1, Object o2) {
96		TestSuite ts1 = (TestSuite) o1;
97		TestSuite ts2 = (TestSuite) o2;
	88	public int compare(TestSuite o1, TestSuite o2) {
	89	TestSuite ts1 = o1;
	90	TestSuite ts2 = o2;
98	91	return ts1.getName().compareTo(ts2.getName());
99	92	}
100	93	});

124	117	// for the active test suites, add any available help sets to the menu
125	118	// e.g. those specified in the testsuite.jtt
126	119	int count = 0;
127		for (Iterator iter = loadedTestSuites.iterator(); iter.hasNext(); ) {
128		TestSuite ts = (TestSuite) (iter.next());
	120	for (Iterator<TestSuite> iter = loadedTestSuites.iterator(); iter.hasNext(); ) {
	121	TestSuite ts = (iter.next());
129	122	JMenuItem[] menuItems = getMenuItems(ts, count);
130	123	if (menuItems != null && menuItems.length > 0) {
131	124	for (int i = 0; i < menuItems.length; i++) {

201	194	* for each of the fields holding the "about" text
202	195	*/
203	196	private void showAbout(String title, String s, String contKey, String fieldKey) {
204		ArrayList v = new ArrayList();
	197	List<String> v = new ArrayList<>();
205	198	int start = 0;
206	199	int end = 0;
207	200

212	205	v.add(s.substring(start));
213	206
214	207	//JTextField[] tfs = new JTextField[v.size()];
215		ArrayList<JComponent> tfs = new ArrayList();
	208	ArrayList<JComponent> tfs = new ArrayList<>();
216	209	for (int i = 0; i < v.size(); i++) {
217		JTextField tf = new JTextField((String)v.get(i));
	210	JTextField tf = new JTextField(v.get(i));
218	211	tf.setBorder(null);
219	212	tf.setHorizontalAlignment(JTextField.CENTER);
220	213	tf.setOpaque(false);

264	257	}
265	258
266	259	private HelpBroker getHelpBroker(HelpSet hs) {
267		HelpBroker hb = (HelpBroker) (helpBrokerTable.get(hs));
	260	HelpBroker hb = helpBrokerTable.get(hs);
268	261	if (hb == null) {
269	262	//hb = hs.createHelpBroker(); // pres. attributes work with this on JH 2.0_02
270	263	hb = new JTHelpBroker();

274	267	}
275	268
276	269	private JMenuItem[] getMenuItems(TestSuite ts, int count) {
277		HelpSet[] docs = (HelpSet[]) (docTable.get(ts));
	270	HelpSet[] docs = docTable.get(ts);
278	271	if (docs == null) {
279	272	try {
280	273	docs = Help.getAdditionalDocs(ts);

293	286	return null;
294	287	}
295	288
296		ArrayList<JMenuItem> v = new ArrayList();
	289	ArrayList<JMenuItem> v = new ArrayList<>();
297	290	for (int i = 0; i < docs.length; i++) {
298	291	final HelpSet doc = docs[i];
299	292

327	320
328	321	private Listener listener;
329	322
330		private static WeakHashMap docTable = new WeakHashMap(); // gives HelpSet[] for TestSuite
331		private static WeakHashMap helpBrokerTable = new WeakHashMap(); // gives HelpBroker for HelpSet
	323	private static Map<TestSuite, HelpSet[]> docTable = new WeakHashMap<>(); // gives HelpSet[] for TestSuite
	324	private static Map<HelpSet, HelpBroker> helpBrokerTable = new WeakHashMap<>(); // gives HelpBroker for HelpSet
332	325
333	326	private static final String HELP = "help";
334	327	private static final String ABOUT_JAVA = "aboutJava";

+1

-1

src/com/sun/javatest/tool/HttpManager.java less more

55	55
56	56	//----------------------------------------------------------------------------
57	57
58		public boolean parseCommand(String cmd, ListIterator argIter, CommandContext ctx)
	58	public boolean parseCommand(String cmd, ListIterator<String> argIter, CommandContext ctx)
59	59	throws Command.Fault
60	60	{
61	61	if (isMatch(cmd, HttpCommand.getName())) {

+2

-2

src/com/sun/javatest/tool/LogManager.java less more

50	50	return new HelpTree.Node(i18n, "logm.help." + name);
51	51	}
52	52
53		public boolean parseCommand(String cmd, ListIterator argIter, CommandContext ctx)
	53	public boolean parseCommand(String cmd, ListIterator<String> argIter, CommandContext ctx)
54	54	throws Command.Fault
55	55	{
56	56	if (isPrefixMatch(cmd, VerboseCommand.getName())) {

78	78	return "log";
79	79	}
80	80
81		LogCommand(ListIterator argIter) throws Fault {
	81	LogCommand(ListIterator<String> argIter) throws Fault {
82	82	super(getName());
83	83
84	84	if (!argIter.hasNext())

+19

-19

src/com/sun/javatest/tool/MDIDeskView.java less more

118	118
119	119	public Tool[] getTools() {
120	120	Tool[] tools = new Tool[internalFrames.size()];
121		return (Tool[]) internalFrames.keySet().toArray(tools);
	121	return internalFrames.keySet().toArray(tools);
122	122	}
123	123
124	124	public void addTool(Tool t) {

185	185
186	186	public void removeTool(Tool t) {
187	187	//System.err.println("MDI: remove " + t);
188		JInternalFrame f = (JInternalFrame) (internalFrames.get(t));
	188	JInternalFrame f = internalFrames.get(t);
189	189	if (f != null) {
190	190	desktopPane.remove(f);
191	191	internalFrames.remove(t);

210	210	}
211	211
212	212	public void setSelectedTool(Tool t) {
213		JInternalFrame f = (JInternalFrame) (internalFrames.get(t));
	213	JInternalFrame f = internalFrames.get(t);
214	214	if (f != null) {
215	215	try {
216	216	f.setIcon(false);

276	276	// seem to have no effect, so after 2 calls we seem to have stable results.
277	277	f.pack();
278	278	Dimension size = f.getSize();
279		JInternalFrame tf = (JInternalFrame) (internalFrames.get(tool));
	279	JInternalFrame tf = internalFrames.get(tool);
280	280	Rectangle tb = tf.getBounds();
281	281	f.setLocation(Math.max(0, tb.x + (tb.width - size.width) / 2),
282	282	Math.max(0, tb.y + (tb.height - size.height ) / 2) );

307	307	}
308	308	}
309	309
310		protected void saveDesktop(Map m) {
311		saveBounds(mainFrame, new PrefixMap(m, "dt"));
	310	protected void saveDesktop(Map<String, String> m) {
	311	saveBounds(mainFrame, new PrefixMap<>(m, "dt"));
312	312	saveTools(m);
313	313	}
314	314
315		protected void restoreDesktop(Map m) {
316		restoreBounds(mainFrame, new PrefixMap(m, "dt"));
	315	protected void restoreDesktop(Map<String, String> m) {
	316	restoreBounds(mainFrame, new PrefixMap<>(m, "dt"));
317	317	restoreTools(m);
318	318	}
319	319
320		protected void saveTool(Map m, Tool t) {
	320	protected void saveTool(Map<String, String> m, Tool t) {
321	321	super.saveTool(m, t);
322		JInternalFrame f = (JInternalFrame) (internalFrames.get(t));
323		saveBounds(f, new PrefixMap(m, "dt"));
324		}
325
326		protected Tool restoreTool(Map m, String name) throws Fault, ToolManager.Fault
	322	JInternalFrame f = internalFrames.get(t);
	323	saveBounds(f, new PrefixMap<>(m, "dt"));
	324	}
	325
	326	protected Tool restoreTool(Map<String, String> m, String name) throws Fault, ToolManager.Fault
327	327	{
328	328	Tool t = super.restoreTool(m, name);
329		JInternalFrame f = (JInternalFrame) (internalFrames.get(t));
330		restoreBounds(f, new PrefixMap(m, "dt"));
	329	JInternalFrame f = internalFrames.get(t);
	330	restoreBounds(f, new PrefixMap<>(m, "dt"));
331	331	f.setVisible(true);
332	332	return t;
333	333	}

390	390	}
391	391
392	392	private JInternalFrame[] getVisibleInternalFrames() {
393		Vector v = new Vector();
	393	Vector<Component> v = new Vector<>();
394	394	for (int i = 0; i < desktopPane.getComponentCount(); i++) {
395	395	Component c = desktopPane.getComponent(i);
396	396	if (c instanceof JInternalFrame && c.isVisible())

402	402	}
403	403
404	404	private JFrame mainFrame;
405		private HashMap internalFrames = new HashMap(17);
	405	private Map<Tool, JInternalFrame> internalFrames = new HashMap<>(17);
406	406	private JDesktopPane desktopPane;
407	407	private Listener listener = new Listener();
408	408

561	561	}
562	562
563	563	public void titleChanged(Tool src, String newValue) {
564		JInternalFrame f = (JInternalFrame) (internalFrames.get(src));
	564	JInternalFrame f = internalFrames.get(src);
565	565	f.setTitle(newValue);
566	566	//System.err.println("Tool title changed: " + newValue);
567	567	}

+4

-3

src/com/sun/javatest/tool/Main.java less more

30	30	import java.io.IOException;
31	31	import java.io.PrintWriter;
32	32	import java.text.MessageFormat;
	33	import java.util.Map;
33	34	import java.util.Set;
34	35
35	36	import com.sun.javatest.Harness;

264	265	serviceManager = new ServiceManager.ServiceCommandManager();
265	266	try {
266	267	ManagerLoader ml = new ManagerLoader(CommandManager.class, System.err);
267		Set mgrs = ml.loadManagers(CMDMGRLIST);
	268	Set<Object> mgrs = ml.loadManagers(CMDMGRLIST);
268	269	mgrs.add(desktopManager);
269	270	mgrs.add(helpManager);
270	271	mgrs.add(serviceManager);
271		commandManagers = (CommandManager[]) mgrs.toArray(new CommandManager[mgrs.size()]);
	272	commandManagers = mgrs.toArray(new CommandManager[mgrs.size()]);
272	273	helpManager.setCommandManagers(commandManagers);
273	274	}
274	275	catch (IOException e) {

444	445	}
445	446	desktop.restoreHistory();
446	447	Tool tool = desktop.addDefaultTool(ip);
447		java.util.Map data = ctx.getDesktopData();
	448	Map<String, String> data = ctx.getDesktopData();
448	449	if (data != null) {
449	450	tool.restore(data);
450	451	}

+14

-14

src/com/sun/javatest/tool/ManagerLoader.java less more

46	46
47	47	class ManagerLoader
48	48	{
49		ManagerLoader(Class managerClass, PrintStream log) {
	49	ManagerLoader(Class<?> managerClass, PrintStream log) {
50	50	setManagerClass(managerClass);
51	51	setLog(log);
52	52	}
53	53
54		void setManagerClass(Class managerClass) {
	54	void setManagerClass(Class<?> managerClass) {
55	55	this.managerClass = managerClass;
56	56	}
57	57
58		void setManagerConstructorArgs(Class[] argTypes, Object[] args) {
	58	void setManagerConstructorArgs(Class<?>[] argTypes, Object[] args) {
59	59	constrArgTypes = argTypes;
60	60	constrArgs = args;
61	61	}

64	64	this.log = log;
65	65	}
66	66
67		Set loadManagers(String resourceName)
	67	Set<Object> loadManagers(String resourceName)
68	68	throws IOException
69	69	{
70	70
71		Enumeration e = ResourceLoader.getResources(resourceName, getClass());
72		Set mgrs = new HashSet();
	71	Enumeration<URL> e = ResourceLoader.getResources(resourceName, getClass());
	72	Set<Object> mgrs = new HashSet<>();
73	73	URLClassLoader altLoader = null;
74	74
75	75	while (e.hasMoreElements()) {
76		URL entry = (URL)(e.nextElement());
	76	URL entry = e.nextElement();
77	77	try {
78	78	BufferedReader in = new BufferedReader(new InputStreamReader(entry.openStream()));
79	79	String line;

155	155	}
156	156
157	157	try {
158		Class c = Class.forName(className, true, cl);
	158	Class<?> c = Class.forName(className, true, cl);
159	159	Object mgr = newInstance(c);
160	160	if (managerClass.isInstance(mgr)) {
161	161	return mgr;

171	171	return null;
172	172	}
173	173
174		private Object newInstance(Class c)
	174	private Object newInstance(Class<?> c)
175	175	throws IllegalAccessException, InstantiationException, NoSuchMethodException
176	176	{
177	177	if (constrArgTypes == null \|\| constrArgTypes.length == 0) {

179	179	}
180	180
181	181	try {
182		Constructor constr = c.getConstructor(constrArgTypes);
	182	Constructor<?> constr = c.getConstructor(constrArgTypes);
183	183	return constr.newInstance(constrArgs);
184	184	}
185	185	catch (InvocationTargetException e) {

209	209	URL u = ResourceLoader.getExtUrl(new File(s));
210	210
211	211	if (u != null) {
212		urls = (URL[]) (DynamicArray.append(urls, u));
	212	urls = DynamicArray.append(urls, u);
213	213	someCPok = true;
214	214	}
215	215	} // for

239	239	log.println(i18n.getString(key, args));
240	240	}
241	241
242		private Class managerClass;
243		private Constructor constr;
244		private Class[] constrArgTypes;
	242	private Class<?> managerClass;
	243	private Constructor<?> constr;
	244	private Class<?>[] constrArgTypes;
245	245	private Object[] constrArgs;
246	246	private PrintStream log;
247	247

+18

-19

src/com/sun/javatest/tool/Preferences.java less more

27	27
28	28	import com.sun.javatest.util.DynamicArray;
29	29	import com.sun.javatest.util.I18NResourceBundle;
30		import com.sun.javatest.util.SortedProperties;
	30	import com.sun.javatest.util.Properties;
	31
31	32	import java.io.BufferedInputStream;
32	33	import java.io.BufferedOutputStream;
33	34	import java.io.File;

37	38	import java.io.IOException;
38	39	import java.io.InputStream;
39	40	import java.io.OutputStream;
40		import java.util.Enumeration;
41	41	import java.util.Hashtable;
42		import java.util.Properties;
	42	import java.util.Map;
	43	import java.util.TreeMap;
43	44
44	45	/**
45	46	* A class which provides a collection of user preferences,

97	98	private Preferences(File file) {
98	99	prefsFile = file;
99	100	isUpToDate = true;
100		Properties p = new SortedProperties();
	101	props = new TreeMap<String, String>();
101	102
102	103	try {
103	104	if (prefsFile != null) {
104	105	InputStream in = new BufferedInputStream(new FileInputStream(prefsFile));
105		p.load(in);
	106	props = Properties.loadSorted(in);
106	107	in.close();
107		fileModifiedTime = prefsFile.lastModified();
	108	fileModifiedTime = prefsFile.lastModified();
108	109	}
109	110	}
110	111	catch (FileNotFoundException ignore) {

112	113	catch (IOException ignore) {
113	114	// ??
114	115	}
115		props = p;
116	116	}
117	117
118	118	/**

128	128	if (!parentDir.exists())
129	129	parentDir.mkdirs();
130	130	OutputStream out = new BufferedOutputStream(new FileOutputStream(prefsFile));
131		props.store(out, "JT Harness Preferences");
	131	Properties.store(props, out, "JT Harness Preferences");
132	132	out.close();
133	133	isUpToDate = true;
134	134	fileModifiedTime = prefsFile.lastModified();

159	159	* @see #setPreference
160	160	*/
161	161	public String getPreference(String name, String defaultValue) {
162		String v = (String) (props.get(name));
	162	String v = props.get(name);
163	163	if (v == null)
164	164	v = defaultValue;
165	165	return v;

176	176	isUpToDate = false;
177	177	props.put(name, newValue);
178	178	// notify observers
179		for (Enumeration e = observers.keys(); e.hasMoreElements(); ) {
180		String prefix = (String)(e.nextElement());
	179	for (String prefix: observers.keySet()) {
181	180	if (name.startsWith(prefix)) {
182		Observer[] obs = (Observer[])observers.get(prefix);
	181	Observer[] obs = observers.get(prefix);
183	182	for (int i = 0; i < obs.length; i++) {
184	183	obs[i].updated(name, newValue);
185	184	}

199	198	public void addObserver(String prefix, Observer o) {
200	199	// very crude observer storage for now; results in o(n) per preference
201	200	// cost when updating preferences
202		Observer[] obs = (Observer[])observers.get(prefix);
	201	Observer[] obs = observers.get(prefix);
203	202	if (obs == null)
204	203	obs = new Observer[] { o };
205	204	else
206		obs = (Observer[])DynamicArray.append(obs, o);
	205	obs = DynamicArray.append(obs, o);
207	206	observers.put(prefix, obs);
208	207	}
209	208

234	233	* @see #addObserver
235	234	*/
236	235	public void removeObserver(String prefix, Observer o) {
237		Observer[] obs = (Observer[])observers.get(prefix);
	236	Observer[] obs = observers.get(prefix);
238	237	if (obs != null) {
239		obs = (Observer[])DynamicArray.remove(obs, o);
	238	obs = DynamicArray.remove(obs, o);
240	239	observers.put(prefix, obs);
241	240	}
242	241	}

261	260	* Access method for props to be used by PreferencesPane
262	261	* @return props
263	262	*/
264		Properties getProperties() {
	263	Map<String, String> getProperties() {
265	264	return props;
266	265	}
267	266
268	267	private File prefsFile;
269		private Properties props;
270		private Hashtable observers = new Hashtable();
	268	private Map<String, String> props;
	269	private Map<String, Observer[]> observers = new Hashtable<>();
271	270	private boolean isUpToDate;
272	271	private long fileModifiedTime;
273	272

+13

-13

src/com/sun/javatest/tool/PreferencesPane.java less more

112	112	* @param m the map from which to load the user preferences into the
113	113	* GUI components
114	114	*/
115		public void load(Map m) {
	115	public void load(Map<String, String> m) {
116	116	PreferencesPane[] p = getChildPanes();
117	117	if (p != null) {
118	118	for (int i = 0; i < p.length; i++)

126	126	* @param m the map to which to save the user preferences from the
127	127	* GUI components
128	128	*/
129		public void save(Map m) {
	129	public void save(Map<String, String> m) {
130	130	PreferencesPane[] p = getChildPanes();
131	131	if (p != null) {
132	132	for (int i = 0; i < p.length; i++)

447	447	}
448	448
449	449	private void setPreferences(PreferencesPane[] panes) {
450		Map m = new Map() {
	450	Map<String, String> m = new Map<String, String>() {
451	451
452	452	public void clear() {
453	453	throw new UnsupportedOperationException();

461	461	return props.containsValue(value);
462	462	}
463	463
464		public Set entrySet() {
	464	public Set<Map.Entry<String, String>> entrySet() {
465	465	return props.entrySet();
466	466	}
467	467

469	469	return props.equals(o);
470	470	}
471	471
472		public Object get(Object key) {
	472	public String get(Object key) {
473	473	return props.get(key);
474	474	}
475	475

481	481	return props.isEmpty();
482	482	}
483	483
484		public Set keySet() {
	484	public Set<String> keySet() {
485	485	return props.keySet();
486	486	}
487	487
488		public Object put(Object key, Object value) {
489		Object oldValue = props.get(key);
	488	public String put(String key, String value) {
	489	String oldValue = props.get(key);
490	490	if (oldValue == null \|\| !oldValue.equals(value)) {
491		preferences.setPreference((String) key, (String) value);
	491	preferences.setPreference(key, value);
492	492	}
493	493	return oldValue;
494	494	}
495	495
496		public void putAll(Map m) {
	496	public void putAll(Map<? extends String, ? extends String> m) {
497	497	throw new UnsupportedOperationException();
498	498	}
499	499
500		public Object remove(Object key) {
	500	public String remove(Object key) {
501	501	throw new UnsupportedOperationException();
502	502	}
503	503

505	505	return props.size();
506	506	}
507	507
508		public Collection values() {
	508	public Collection<String> values() {
509	509	return props.values();
510	510	}
511	511	};

568	568
569	569	private JFrame owner;
570	570	private Preferences preferences;
571		private Properties props;
	571	private Map<String, String> props;
572	572
573	573	private HelpBroker helpBroker;
574	574	private PreferencesPane[] panes;

+13

-13

src/com/sun/javatest/tool/SDIDeskView.java less more

169	169	public void windowClosed(WindowEvent e) {
170	170	JFrame f = (JFrame) (e.getSource());
171	171	//removeToolMenuItemsFromFrameMenuBar(f);
172		frames = (JFrame[]) (DynamicArray.remove(frames, f));
	172	frames = DynamicArray.remove(frames, f);
173	173
174	174	if (f.getContentPane() instanceof Tool) {
175	175	Tool t = (Tool) (f.getContentPane());

193	193	//f.setLocation(screenSize.width/2 - size.width/2, screenSize.height/2 - size.height/2);
194	194	f.setVisible(visible);
195	195
196		frames = (JFrame[]) (DynamicArray.append(frames, f));
	196	frames = DynamicArray.append(frames, f);
197	197
198	198	t.setDeskView(this);
199	199

205	205	public void removeTool(Tool t) {
206	206	//System.err.println("SDI: remove " + t);
207	207	JFrame f = getFrameForTool(t);
208		frames = (JFrame[]) (DynamicArray.remove(frames, f)); // remove it from list of frames
	208	frames = DynamicArray.remove(frames, f); // remove it from list of frames
209	209	f.setVisible(false); // hide it before we start disassembling it
210	210
211	211	removeToolMenuItemsFromFrameMenuBar(f, t);

281	281	return d;
282	282	}
283	283
284		protected void saveDesktop(Map m) {
285		saveBounds(console, new PrefixMap(m, "dt.console"));
	284	protected void saveDesktop(Map<String, String> m) {
	285	saveBounds(console, new PrefixMap<>(m, "dt.console"));
286	286	saveTools(m);
287	287	}
288	288
289		protected void restoreDesktop(Map m) {
290		restoreBounds(console, new PrefixMap(m, "dt.console"));
	289	protected void restoreDesktop(Map<String, String> m) {
	290	restoreBounds(console, new PrefixMap<>(m, "dt.console"));
291	291	restoreTools(m);
292	292	}
293	293
294		protected void saveTool(Map m, Tool t) {
	294	protected void saveTool(Map<String, String> m, Tool t) {
295	295	super.saveTool(m, t);
296		saveBounds(getFrameForTool(t), new PrefixMap(m, "dt"));
297		}
298
299		protected Tool restoreTool(Map m, String name) throws Fault, ToolManager.Fault
	296	saveBounds(getFrameForTool(t), new PrefixMap<>(m, "dt"));
	297	}
	298
	299	protected Tool restoreTool(Map<String, String> m, String name) throws Fault, ToolManager.Fault
300	300	{
301	301	Tool t = super.restoreTool(m, name);
302		restoreBounds(getFrameForTool(t), new PrefixMap(m, "dt"));
	302	restoreBounds(getFrameForTool(t), new PrefixMap<>(m, "dt"));
303	303	return t;
304	304	}
305	305

+11

-11

src/com/sun/javatest/tool/TabDeskView.java less more

82	82
83	83	// perhaps would be nice to have getTools(Comparator) and have it return a sorted
84	84	// array of tools
85		Arrays.sort(tools, new Comparator() {
86		public int compare(Object o1, Object o2) {
87		Long l1 = new Long(((Tool)o1).getCreationTime());
88		Long l2 = new Long(((Tool)o2).getCreationTime());
	85	Arrays.sort(tools, new Comparator<Tool>() {
	86	public int compare(Tool o1, Tool o2) {
	87	Long l1 = new Long(o1.getCreationTime());
	88	Long l2 = new Long(o2.getCreationTime());
89	89	return (l1.compareTo(l2));
90	90	}
91	91	});

192	192	KeyboardFocusManager fm = KeyboardFocusManager.getCurrentKeyboardFocusManager();
193	193	Component fo = fm.getPermanentFocusOwner();
194	194	if (fo == null \|\| !fo.isShowing()) {
195		Container target = (contents.getTabCount() > 0 ? (Container) contents : (Container) mainFrame);
	195	Container target = contents.getTabCount() > 0 ? contents : mainFrame;
196	196	Container fcr = (target.isFocusCycleRoot() ? target : target.getFocusCycleRootAncestor());
197	197	FocusTraversalPolicy ftp = fcr.getFocusTraversalPolicy();
198	198	Component c = (target.isFocusable() ? target : ftp.getComponentAfter(fcr, target));

327	327	return d;
328	328	}
329	329
330		protected void saveDesktop(Map m) {
331		saveBounds(mainFrame, new PrefixMap(m, "dt"));
	330	protected void saveDesktop(Map<String, String> m) {
	331	saveBounds(mainFrame, new PrefixMap<>(m, "dt"));
332	332	saveTools(m);
333	333	int sel = contents.getSelectedIndex();
334	334	if (sel >= 0)
335	335	m.put("dt.selected", String.valueOf(sel));
336	336	}
337	337
338		protected void restoreDesktop(Map m) {
339		restoreBounds(mainFrame, new PrefixMap(m, "dt"));
	338	protected void restoreDesktop(Map<String, String> m) {
	339	restoreBounds(mainFrame, new PrefixMap<>(m, "dt"));
340	340	if (getDesktop().getRestoreOnStart()) {
341	341	restoreTools(m);
342	342
343	343	try {
344		String s = (String) (m.get("dt.selected"));
	344	String s = m.get("dt.selected");
345	345	if (s != null) {
346	346	int sel = Integer.parseInt(s);
347	347	if (0 <= sel && sel < contents.getTabCount()) {

380	380	}
381	381
382	382	private String getUniqueTabTitle(String base, Component ignoreable) {
383		Set s = new HashSet();
	383	Set<String> s = new HashSet<>();
384	384	for (int i = 0; i < contents.getTabCount(); i++) {
385	385	if (contents.getComponentAt(i) != ignoreable)
386	386	s.add(contents.getTitleAt(i));

+13

-13

src/com/sun/javatest/tool/Tool.java less more

82	82	* @see #removeObserver
83	83	*/
84	84	synchronized public void addObserver(Observer o) {
85		observers = (Observer[])DynamicArray.append(observers, o);
	85	observers = DynamicArray.append(observers, o);
86	86	}
87	87
88	88	/**

92	92	* @see #addObserver
93	93	*/
94	94	synchronized public void removeObserver(Observer o) {
95		observers = (Observer[])DynamicArray.remove(observers, o);
	95	observers = DynamicArray.remove(observers, o);
96	96	}
97	97
98	98	//--------------------------------------------------------------------------

309	309	* @param m the map in which to store the significant state
310	310	* of the tool
311	311	*/
312		protected abstract void save(Map m);
	312	protected abstract void save(Map<String, String> m);
313	313
314	314
315	315	/**

318	318	* @param m the map in which to store the significant state
319	319	* of the tool
320	320	*/
321		protected abstract void restore(Map m);
	321	protected abstract void restore(Map<String, String> m);
322	322
323	323
324	324	/**

387	387	if (toolDialogs == null)
388	388	return new ToolDialog[0];
389	389
390		ArrayList l = new ArrayList();
391		for (Iterator iter = toolDialogs.iterator(); iter.hasNext(); ) {
392		WeakReference r = (WeakReference) (iter.next());
393		ToolDialog td = (ToolDialog) (r.get());
	390	ArrayList<ToolDialog> l = new ArrayList<>();
	391	for (Iterator<WeakReference<ToolDialog>> iter = toolDialogs.iterator(); iter.hasNext(); ) {
	392	WeakReference<ToolDialog> r = iter.next();
	393	ToolDialog td = r.get();
394	394	if (td == null)
395	395	iter.remove();
396	396	else
397	397	l.add(td);
398	398	}
399	399
400		return (ToolDialog[]) (l.toArray(new ToolDialog[l.size()]));
	400	return l.toArray(new ToolDialog[l.size()]);
401	401	}
402	402
403	403	/**

409	409	throw new NullPointerException();
410	410
411	411	if (toolDialogs == null)
412		toolDialogs = new ArrayList();
413
414		toolDialogs.add(new WeakReference(td));
	412	toolDialogs = new ArrayList<>();
	413
	414	toolDialogs.add(new WeakReference<>(td));
415	415	}
416	416
417	417	void setDeskView(DeskView view) {

431	431	private String shortTitle;
432	432	private String helpID;
433	433	private long creationTime;
434		private List toolDialogs;
	434	private List<WeakReference<ToolDialog>> toolDialogs;
435	435	private DeskView deskView;
436	436	private Observer[] observers = new Observer[0];
437	437	private static int toolIndex;

+7

-7

src/com/sun/javatest/tool/ToolAction.java less more

162	162	}
163	163	else {
164	164	if (misc == null)
165		misc = new HashMap();
	165	misc = new HashMap<>();
166	166	oldVal = misc.get(key);
167	167	if (equal(newVal, oldVal))
168	168	return;

188	188	}
189	189
190	190	public synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
191		listeners = (WeakReference[]) DynamicArray.append(listeners, new WeakReference(listener));
	191	listeners = DynamicArray.append(listeners, new WeakReference<>(listener));
192	192	}
193	193
194	194	public synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
195		WeakReference[] l = listeners;
	195	WeakReference<PropertyChangeListener>[] l = listeners;
196	196	int size = l.length;
197	197	for (int i = size - 1; i >= 0; i--) {
198	198	if (l[i].get() == listener)

207	207
208	208	private void firePropertyChangeEvent(String name, Object oldVal, Object newVal) {
209	209	PropertyChangeEvent ev = null; // lazy create event if needed
210		WeakReference[] l = listeners;
	210	WeakReference<PropertyChangeListener>[] l = listeners;
211	211	if (l.length > 0) {
212	212	for (int i = l.length - 1; i >= 0; i--) {
213		PropertyChangeListener pcl = (PropertyChangeListener) (l[i].get());
	213	PropertyChangeListener pcl = (l[i].get());
214	214	if (pcl != null) {
215	215	if (ev == null)
216	216	ev = new PropertyChangeEvent(this, name, oldVal, newVal);

235	235	private String desc;
236	236	private Integer mnemonic;
237	237	private Icon icon;
238		private Map misc;
	238	private Map<String, Object> misc;
239	239	private boolean enabled = true;
240	240
241		private WeakReference[] listeners = new WeakReference[0];
	241	private WeakReference<PropertyChangeListener>[] listeners = new WeakReference[0];
242	242	}

+1

-1

src/com/sun/javatest/tool/ToolDialog.java less more

250	250	if (dialog instanceof Window) {
251	251	return dialog;
252	252	}
253		return (Frame) (SwingUtilities.getAncestorOfClass(Frame.class, dialog));
	253	return SwingUtilities.getAncestorOfClass(Frame.class, dialog);
254	254	}
255	255
256	256	/**

+1

-1

src/com/sun/javatest/tool/ToolManager.java less more

196	196	* @return the tool that was started
197	197	* @throws ToolManager.Fault if there is a problem restoring the tool
198	198	*/
199		public abstract Tool restoreTool(Map m) throws Fault;
	199	public abstract Tool restoreTool(Map<String, String> m) throws Fault;
200	200
201	201	//----------------------------------------------------------------------------
202	202

+22

-22

src/com/sun/javatest/tool/UIFactory.java less more

411	411	* @param c the class used to determine the i18n properties
412	412	* @param helpBroker the help broker to be used when creating help buttons
413	413	*/
414		public UIFactory(Class c, HelpBroker helpBroker) {
	414	public UIFactory(Class<?> c, HelpBroker helpBroker) {
415	415	this(c, null, helpBroker);
416	416	}
417	417

436	436	* @param p the parent component to be used for any dialogs that are created
437	437	* @param helpBroker the help broker to be used when creating help buttons
438	438	*/
439		public UIFactory(Class c, Component p, HelpBroker helpBroker) {
	439	public UIFactory(Class<?> c, Component p, HelpBroker helpBroker) {
440	440	this.helpBroker = helpBroker;
441	441	clientClass = c;
442	442	parent = p;

1160	1160	* @return the choice item that was created
1161	1161	* @see #createLiteralChoice
1162	1162	*/
1163		public JComboBox createChoice(final String uiKey, final String[] choiceKeys) {
	1163	public JComboBox<String> createChoice(final String uiKey, final String[] choiceKeys) {
1164	1164	return createChoice(uiKey, choiceKeys, false);
1165	1165	}
1166	1166

1178	1178	* @return a choice box with the attributes indicated by the parameters
1179	1179	* @see #createChoice(String,String[])
1180	1180	*/
1181		public JComboBox createChoice(final String uiKey, final String[] choiceKeys, boolean editable) {
	1181	public JComboBox<String> createChoice(final String uiKey, final String[] choiceKeys, boolean editable) {
1182	1182	// create a cache of the presentation string, for use when
1183	1183	// rendering, but otherwise, let the JComboBox work in terms of the
1184	1184	// choiceKeys

1186	1186	for (int i = 0; i < choices.length; i++)
1187	1187	choices[i] = getI18NString(uiKey + "." + choiceKeys[i] + ".chc");
1188	1188
1189		JComboBox choice = new JComboBox(choiceKeys);
	1189	JComboBox<String> choice = new JComboBox<>(choiceKeys);
1190	1190	choice.setName(uiKey);
1191	1191	setToolTip(choice, uiKey);
1192	1192	setAccessibleName(choice, uiKey);

1205	1205	}
1206	1206
1207	1207	choice.setRenderer(new DefaultListCellRenderer() {
1208		public Component getListCellRendererComponent(JList list, Object o, int index,
	1208	public Component getListCellRendererComponent(JList<?> list, Object o, int index,
1209	1209	boolean isSelected, boolean cellHasFocus) {
1210	1210	Object c = o;
1211	1211	for (int i = 0; i < choiceKeys.length; i++) {

1231	1231	* @param uiKey the base name of the resources to be used for the menu
1232	1232	* @return the choice component that was created
1233	1233	*/
1234		public JComboBox createChoice(String uiKey) {
	1234	public <E> JComboBox<E> createChoice(String uiKey) {
1235	1235	return createChoice(uiKey, false);
1236	1236	}
1237	1237

1244	1244	* @return the choice component that was created
1245	1245	* @see #createChoice(String)
1246	1246	*/
1247		public JComboBox createChoice(String uiKey, boolean editable) {
1248		return createChoice(uiKey, editable, (JLabel) null);
	1247	public <E> JComboBox<E> createChoice(String uiKey, boolean editable) {
	1248	return createChoice(uiKey, editable, null);
1249	1249	}
1250	1250
1251	1251	/**

1257	1257	* @see #createChoice(String)
1258	1258	* @see javax.swing.JLabel#setLabelFor
1259	1259	*/
1260		public JComboBox createChoice(String uiKey, JLabel label) {
	1260	public <E> JComboBox<E> createChoice(String uiKey, JLabel label) {
1261	1261	return createChoice(uiKey, false, label);
1262	1262	}
1263	1263

1274	1274	* @see #createChoice(String)
1275	1275	* @see javax.swing.JLabel#setLabelFor
1276	1276	*/
1277		public JComboBox createChoice(String uiKey, boolean editable, JLabel label) {
1278		JComboBox choice = new JComboBox();
	1277	public <E> JComboBox<E> createChoice(String uiKey, boolean editable, JLabel label) {
	1278	JComboBox<E> choice = new JComboBox<>();
1279	1279	choice.setName(uiKey);
1280	1280	setToolTip(choice, uiKey);
1281	1281

1318	1318	* @return the choice item that was created
1319	1319	* @see #createChoice
1320	1320	*/
1321		public JComboBox createLiteralChoice(String uiKey, Object[] choices) {
1322		JComboBox choice = new JComboBox(choices);
	1321	public <E> JComboBox<E> createLiteralChoice(String uiKey, E[] choices) {
	1322	JComboBox<E> choice = new JComboBox<>(choices);
1323	1323	choice.setName(uiKey);
1324	1324	setToolTip(choice, uiKey);
1325	1325	return choice;

1457	1457	* @param uiKey the base name of the resource to be used (currently ignored)
1458	1458	* @return the list that was created
1459	1459	*/
1460		public JList createList(String uiKey) {
1461		JList list = new JList();
	1460	public <E> JList<E> createList(String uiKey) {
	1461	JList<E> list = new JList<>();
1462	1462	list.setName(uiKey);
1463	1463	setAccessibleInfo(list, uiKey);
1464	1464	return list;

1477	1477	* @param model the data model for this list
1478	1478	* @return the list that was created
1479	1479	*/
1480		public JList createList(String uiKey, ListModel model) {
1481		JList list = new JList(model);
	1480	public <E> JList<E> createList(String uiKey, ListModel<E> model) {
	1481	JList<E> list = new JList<>(model);
1482	1482	list.setName(uiKey);
1483	1483	setAccessibleInfo(list, uiKey);
1484	1484	return list;

3551	3551	}
3552	3552	};
3553	3553
3554		private Class clientClass;
	3554	private Class<?> clientClass;
3555	3555	private Component parent;
3556	3556	private I18NResourceBundle i18n;
3557	3557	private HelpBroker helpBroker;

3570	3570	*/
3571	3571	public static class UIFactoryExt extends UIFactory {
3572	3572	private I18NResourceBundle i18n_alt;
3573		private Class altClass;
3574
3575		public UIFactoryExt(UIFactory uif, Class altClass) {
	3573	private Class<?> altClass;
	3574
	3575	public UIFactoryExt(UIFactory uif, Class<?> altClass) {
3576	3576	super(uif.clientClass, uif.parent, uif.helpBroker);
3577	3577	i18n_alt = I18NResourceBundle.getBundleForClass(altClass);
3578	3578	this.altClass = altClass;

+8

-9

src/com/sun/javatest/tool/VerboseCommand.java less more

64	64
65	65	private static void ensureAllOptionsInitialized() {
66	66	if (allOptions == null) {
67		allOptions = new TreeMap();
	67	allOptions = new TreeMap<>();
68	68	allOptions.put(MAX, new HelpTree.Node(i18n, "verb.max"));
69	69	allOptions.put(QUIET, new HelpTree.Node(i18n, "verb.quiet"));
70	70	}
71	71	}
72		private static Map allOptions;
	72	private static Map<String, HelpTree.Node> allOptions;
73	73
74	74	//--------------------------------------------------------------------------
75	75

121	121	}
122	122
123	123	public void run(CommandContext ctx) throws Fault {
124		for (Iterator iter = optionValues.entrySet().iterator(); iter.hasNext(); ) {
125		Map.Entry e = (Map.Entry) (iter.next());
126		String name = (String) (e.getKey());
127		boolean value = ((Boolean) (e.getValue())).booleanValue();
	124	for (Map.Entry<String, Boolean> e : optionValues.entrySet()) {
	125	String name = (e.getKey());
	126	boolean value = e.getValue().booleanValue();
128	127	if (name.equalsIgnoreCase(MAX))
129	128	ctx.setVerboseMax(value);
130	129	else if (name.equalsIgnoreCase(QUIET))

141	140
142	141	HelpTree.Node[] nodes = new HelpTree.Node[allOptions.size()];
143	142	int i = 0;
144		for (Iterator iter = allOptions.values().iterator(); iter.hasNext(); )
145		nodes[i++] = (HelpTree.Node) (iter.next());
	143	for (Iterator<HelpTree.Node> iter = allOptions.values().iterator(); iter.hasNext(); )
	144	nodes[i++] = iter.next();
146	145
147	146	return new HelpTree.Node(i18n, "verb", nodes);
148	147	}

151	150	return CMD;
152	151	}
153	152
154		private HashMap optionValues = new HashMap(); // HashMap<name,boolean>
	153	private Map<String, Boolean> optionValues = new HashMap<>();
155	154
156	155	private static final String CMD = "verbose";
157	156	private static I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(VerboseCommand.class);

+8

-8

src/com/sun/javatest/tool/WorkDirChooser.java less more

265	265	private SelectedWorkDirApprover swda;
266	266
267	267	private Dimension size;
268		private LinkedHashMap fileData;
269		private LinkedHashMap wdData;
	268	private Map<String, String[]> fileData;
	269	private Map<String, Boolean> wdData;
270	270
271	271	public String getName(File f) {
272	272	String retValue;

284	284
285	285
286	286	private boolean isWorkDir(File dir) {
287		if (wdData == null) wdData = new LinkedHashMap() {
288		protected boolean removeEldestEntry(Map.Entry eldest) {
	287	if (wdData == null) wdData = new LinkedHashMap<String, Boolean>() {
	288	protected boolean removeEldestEntry(Map.Entry<String, Boolean> eldest) {
289	289	return size() > 500;
290	290	}
291	291	};

296	296	}
297	297
298	298	String key = dir.getAbsolutePath();
299		Boolean value = (Boolean) wdData.get(key);
	299	Boolean value = wdData.get(key);
300	300	if (value != null) {
301	301	return value.booleanValue();
302	302	}

307	307
308	308	private String[] getInfo(File file) {
309	309
310		if (fileData == null) fileData = new LinkedHashMap() {
311		protected boolean removeEldestEntry(Map.Entry eldest) {
	310	if (fileData == null) fileData = new LinkedHashMap<String, String[]>() {
	311	protected boolean removeEldestEntry(Map.Entry<String, String[]> eldest) {
312	312	return size() > 500;
313	313	}
314	314	};
315	315	String key = file.getAbsolutePath();
316		String[] value = (String[]) fileData.get(key);
	316	String[] value = fileData.get(key);
317	317	if (value != null) {
318	318	return value;
319	319	}

+2

-1

src/com/sun/javatest/tool/jthelp/HelpSet.java less more

34	34	import java.net.URLConnection;
35	35	import java.util.ArrayList;
36	36	import java.util.HashMap;
	37	import java.util.Map;
37	38
38	39	public class HelpSet {
39	40

154	155	return result;
155	156	}
156	157
157		public HashMap<String, URL> getLocalMap() {
	158	public Map<String, URL> getLocalMap() {
158	159	return localMap;
159	160	}
160	161

+3

-3

src/com/sun/javatest/tool/jthelp/JTHelpBroker.java less more

128	128	File helpVersion = new File(destDir, HELP_VERSION_NAME);
129	129
130	130	JarFile jar = new JarFile(jarFile);
131		Enumeration enumEntries = jar.entries();
	131	Enumeration<JarEntry> enumEntries = jar.entries();
132	132
133	133	int total = 0;
134	134	while (enumEntries.hasMoreElements()) {
135		JarEntry file = (JarEntry) enumEntries.nextElement();
	135	JarEntry file = enumEntries.nextElement();
136	136	if (isHelpFile(file)) {
137	137	total++;
138	138	}

149	149	enumEntries = jar.entries();
150	150
151	151	while (enumEntries.hasMoreElements()) {
152		JarEntry file = (JarEntry) enumEntries.nextElement();
	152	JarEntry file = enumEntries.nextElement();
153	153	File f = new java.io.File(destDir + java.io.File.separator + file.getName());
154	154	if (isHelpFile(file)) {
155	155	f.getParentFile().mkdirs();

+2

-2

src/com/sun/javatest/tool/jthelp/JTHelpProgressBar.java less more

35	35	public class JTHelpProgressBar extends Component implements PropertyChangeListener {
36	36
37	37	private JProgressBar progressBar;
38		private SwingWorker task;
	38	private SwingWorker<Void, Void> task;
39	39	private JDialog frame;
40	40	private JPanel сontentPane;
41	41	private UIFactory uif;
42	42
43	43
44		public JTHelpProgressBar(SwingWorker progressTask) {
	44	public JTHelpProgressBar(SwingWorker<Void, Void> progressTask) {
45	45	uif = new UIFactory(this, null);
46	46
47	47	task = progressTask;

+3

-3

src/com/sun/javatest/tool/selectiontree/SelectionTree.java less more

582	582	SelectionTreeNode lastNode = firstNode;
583	583
584	584	while (lastNode.getChildCount() > 0) {
585		lastNode = (SelectionTreeNode) lastNode.getChildAt(lastNode.getChildCount() - 1);
	585	lastNode = lastNode.getChildAt(lastNode.getChildCount() - 1);
586	586	}
587	587
588	588	if (!isRootVisible()) {

713	713	}
714	714
715	715	public String[] getSelection() {
716		Vector v = new Vector();
	716	Vector<String> v = new Vector<>();
717	717	getSelection((SelectionTreeNode) getModel().getRoot(), v);
718	718
719	719	String[] paths = new String[v.size()];

721	721	return paths;
722	722	}
723	723
724		private void getSelection(SelectionTreeNode node, Vector v) {
	724	private void getSelection(SelectionTreeNode node, Vector<String> v) {
725	725	switch (node.getSelectionType()) {
726	726	case UNSELECTED:
727	727	break;

+2

-2

src/com/sun/javatest/tool/selectiontree/SelectionTreeNode.java less more

100	100	prevNode = node;
101	101	int childCount;
102	102	while ((childCount = prevNode.getChildCount()) > 0) {
103		prevNode = (SelectionTreeNode) prevNode.getChildAt(childCount - 1);
	103	prevNode = prevNode.getChildAt(childCount - 1);
104	104	}
105	105	children.add(node);
106	106	}

293	293	}
294	294	} else {
295	295	depth++;
296		result = getPathToRoot((SelectionTreeNode) aNode.getParent(), depth);
	296	result = getPathToRoot(aNode.getParent(), depth);
297	297	result[result.length - depth] = aNode;
298	298	}
299	299

+2

-2

src/com/sun/javatest/util/BackupPolicy.java less more

83	83	String prefix = file.getName() + "~";
84	84	String suffix = "~";
85	85	int maxBackupIndex = 0;
86		Vector backups = new Vector();
	86	Vector<Integer> backups = new Vector<>();
87	87	nextFile:
88	88	if (dirFiles != null) {
89	89	for (int i = 0; i < dirFiles.length; i++) {

115	115	// delete old backups
116	116	int numBackupsToKeep = getNumBackupsToKeep(file);
117	117	for (int i = 0; i < backups.size(); i++) {
118		int index = ((Integer)(backups.elementAt(i))).intValue();
	118	int index = (backups.elementAt(i)).intValue();
119	119	if (index <= (maxBackupIndex-numBackupsToKeep)) {
120	120	File backupToGo = new File(file.getPath() + "~" + index + "~");
121	121	// let SecurityExceptions out, but otherwise ignore failures

+6

-5

src/com/sun/javatest/util/BackupUtil.java less more

27	27
28	28	import java.io.File;
29	29	import java.util.HashSet;
	30	import java.util.Set;
30	31	import java.util.Vector;
31	32	import java.io.FileFilter;
32	33	import java.io.IOException;

65	66	String prefix = file.getName() + "~";
66	67	String suffix = "~";
67	68	int maxBackupIndex = 0;
68		Vector backups = new Vector();
	69	Vector<Integer> backups = new Vector<>();
69	70
70	71	boolean renamed;
71	72	java.util.Arrays.sort(list);

99	100
100	101	int maxIndex = 0;
101	102	for(int j = 0; j < backups.size(); j++) {
102		int index = ((Integer)backups.get(j)).intValue();
	103	int index = backups.get(j).intValue();
103	104	maxIndex = index > maxIndex ? index : maxIndex;
104	105	if(index > maxBackups) {
105	106	File oldBackup = new File(filename + "~" + backups.get(j) + "~");

132	133	String prefix = file.getName() + "~";
133	134	String suffix = "~";
134	135	int maxBackupIndex = 0;
135		Vector backups = new Vector();
	136	Vector<Integer> backups = new Vector<>();
136	137
137	138	java.util.Arrays.sort(list);
138	139	for (int i = list.length - 1; i >= 0; i--) {

166	167	// backups.addElement(new Integer(1));
167	168
168	169	for(int j = 0; j < backups.size(); j++) {
169		int index = ((Integer)backups.get(j)).intValue();
	170	int index = backups.get(j).intValue();
170	171	if(index > maxBackups) {
171	172	File oldBackup = new File(filename + "~" + backups.get(j) + "~");
172	173	deleteDir(oldBackup);

191	192	return;
192	193	}
193	194
194		HashSet layers = new HashSet();
	195	Set<Integer> layers = new HashSet<>();
195	196	String suffix = "~";
196	197	for(int i = 0; i < files.length; i++) {
197	198	if(files[i].isDirectory()) {

+7

-7

src/com/sun/javatest/util/Debug.java less more

131	131	* a return value of zero.
132	132	* @return the debugging setting for the specified class
133	133	*/
134		public static boolean getBoolean(Class c) {
	134	public static boolean getBoolean(Class<?> c) {
135	135	init(false);
136	136
137	137	if (!masterSwitch)

155	155	* of just the classname.
156	156	* @return the debugging setting for the specified class
157	157	*/
158		public static boolean getBoolean(Class c, String suffix) {
	158	public static boolean getBoolean(Class<?> c, String suffix) {
159	159	init(false);
160	160
161	161	if (!masterSwitch)

199	199	* @return the debugging setting for the given class, or 0 if no class
200	200	* was specified
201	201	*/
202		public static int getInt(Class c) {
	202	public static int getInt(Class<?> c) {
203	203	init(false);
204	204
205	205	if (!masterSwitch \|\| c == null)

223	223	* null will result in a lookup of just the classname.
224	224	* @return the debugging setting for the class
225	225	*/
226		public static int getInt(Class c, String suffix) {
	226	public static int getInt(Class<?> c, String suffix) {
227	227	init(false);
228	228
229	229	if (!masterSwitch \|\| c == null)

316	316	return;
317	317	}
318	318
319		Enumeration keys = props.propertyNames();
	319	Enumeration<?> keys = props.propertyNames();
320	320
321	321	dProps = new Properties();
322	322	wildProps = new WildcardProperties();

347	347	*
348	348	* @param c Must not be null.
349	349	*/
350		private static String getName(Class c) {
	350	private static String getName(Class<?> c) {
351	351	// null checking skipped
352	352
353	353	String name = c.getName();

454	454	String lowerKey = key.toLowerCase();
455	455	String target = trimTarget(lowerKey);
456	456
457		Enumeration keys = propertyNames();
	457	Enumeration<?> keys = propertyNames();
458	458	while (keys.hasMoreElements()) {
459	459	String k = (String)(keys.nextElement());
460	460	String lowerK = k.toLowerCase();

+7

-11

src/com/sun/javatest/util/DirectoryClassLoader.java less more

32	32	import java.io.IOException;
33	33	import java.net.URL;
34	34	import java.util.Hashtable;
	35	import java.util.Map;
35	36
36	37	/**
37	38	* This class loader loads classes from files a specified directory.

71	72	* @return the class that was loaded
72	73	* @throws ClassNotFoundException if the class was not found.
73	74	*/
74		protected Class loadClass(String name, boolean resolve)
	75	protected Class<?> loadClass(String name, boolean resolve)
75	76	throws ClassNotFoundException {
76	77
77	78	// check the cache first
78		Class cl = (Class)classes.get(name);
	79	Class<?> cl = classes.get(name);
79	80
80	81	// not found in the cache?
81	82	if (cl == null) {

171	172
172	173	//----------internal methods------------------------------------------------
173	174
174		private synchronized Class locateClass(String name)
	175	private synchronized Class<?> locateClass(String name)
175	176	throws ClassNotFoundException {
176	177	//This check is currently necessary; we just
177	178	// check the cache at the one call site, but that was not
178	179	// synchronized, so there is a very small remote chance another
179	180	// caller has just loaded this class.
180		Class cl = (Class)classes.get(name);
	181	Class<?> cl = classes.get(name);
181	182	if (cl != null)
182	183	return cl;
183	184

186	187	File file = new File(loadDir, cname);
187	188
188	189	try {
189		InputStream in = new FileInputStream(file);
190	190	byte[] data;
191		try {
	191	try (InputStream in = new FileInputStream(file)) {
192	192	int len = in.available();
193	193	data = new byte[len];
194	194	for (int total = 0; total < data.length; ) {
195	195	total += in.read(data, total, data.length - total);
196	196	}
197	197	}
198		finally {
199		if (in != null)
200		in.close();
201		}
202	198	// the next line may throw LinkageError, which we let
203	199	// escape to the caller
204	200	cl = defineClass(name, data, 0, data.length);

221	217	//----------Data members----------------------------------------------------
222	218
223	219	private File loadDir;
224		private Hashtable classes = new Hashtable();
	220	private Map<String, Class<?>> classes = new Hashtable<>();
225	221	}

+23

-23

src/com/sun/javatest/util/DynamicArray.java less more

47	47	* @throws IllegalArgumentException If newObj is null.
48	48	* @throws ArrayStoreException If there is a type mismatch between oldArr and newObj.
49	49	*/
50		public static Object[] append(Object[] oldArr, Object newObj) {
51		Object[] newArr;
	50	public static <T> T[] append(T[] oldArr, T newObj) {
	51	T[] newArr;
52	52
53	53	if (oldArr == null) {
54	54	if (newObj != null) {
55		newArr = (Object[])(Array.newInstance(newObj.getClass(), 1));
	55	newArr = (T[])(Array.newInstance(newObj.getClass(), 1));
56	56	newArr[0] = newObj;
57	57	}
58	58	else {

60	60	}
61	61	}
62	62	else {
63		newArr = (Object[])(Array.newInstance(getArrayClass(oldArr), oldArr.length+1));
	63	newArr = (T[])(Array.newInstance(getArrayClass(oldArr), oldArr.length+1));
64	64	System.arraycopy(oldArr, 0, newArr, 0, oldArr.length);
65	65	newArr[newArr.length-1] = newObj;
66	66	}

79	79	* @throws IllegalArgumentException If newObj is null.
80	80	* @throws ArrayStoreException If there is a type mismatch between oldArr and newObj.
81	81	*/
82		public static Object[] append(Object[] oldArr, Object newObj, Class arrayClass) {
83		Object[] localArr;
	82	public static <T> T[] append(T[] oldArr, T newObj, Class<? extends T> arrayClass) {
	83	T[] localArr;
84	84
85	85	if (oldArr == null && arrayClass != null)
86		localArr = (Object[])(Array.newInstance(arrayClass, 0));
	86	localArr = (T[])(Array.newInstance(arrayClass, 0));
87	87	else
88	88	localArr = oldArr;
89	89

99	99	* the first array, containing the elements of the first array, followed
100	100	* by the elements of the second array.
101	101	*/
102		public static Object[] join(Object[] array1, Object[] array2) {
	102	public static <T> T[] join(T[] array1, T[] array2) {
103	103	if (array1 == null)
104	104	return array2;
105	105
106	106	if (array2 == null)
107	107	return array1;
108	108
109		Class type = array1.getClass().getComponentType();
	109	Class<?> type = array1.getClass().getComponentType();
110	110	int size = array1.length + array2.length;
111		Object[] newArray = (Object[]) Array.newInstance(type, size);
	111	T[] newArray = (T[]) Array.newInstance(type, size);
112	112	System.arraycopy(array1, 0, newArray, 0, array1.length);
113	113	System.arraycopy(array2, 0, newArray, array1.length, array2.length);
114	114	return newArray;

126	126	* operation.
127	127	* @return A new array with the object inserted into it at the specified location.
128	128	*/
129		public static Object[] insert(Object[] oldArr, Object newObj, int location) {
130		Object[] newArr;
	129	public static <T> T[] insert(T[] oldArr, T newObj, int location) {
	130	T[] newArr;
131	131
132	132	if (oldArr == null) {
133	133	if (newObj != null) {
134		newArr = (Object[])(Array.newInstance(newObj.getClass(), 1));
	134	newArr = (T[])(Array.newInstance(newObj.getClass(), 1));
135	135	newArr[0] = newObj;
136	136	}
137	137	else {

142	142	if (location > oldArr.length)
143	143	throw new IllegalArgumentException("Index location too large (" + location +
144	144	").");
145		newArr = (Object[])(Array.newInstance(getArrayClass(oldArr), oldArr.length+1));
	145	newArr = (T[])(Array.newInstance(getArrayClass(oldArr), oldArr.length+1));
146	146
147	147	if (location == 0) {
148	148	newArr[0] = newObj;

176	176	* @exception ArrayStoreException May occur if all the objects in the
177	177	* array do not match.
178	178	*/
179		public static Object[] remove(Object[] oldArr, int index) {
180		Object[] newArr;
	179	public static <T> T[] remove(T[] oldArr, int index) {
	180	T[] newArr;
181	181
182	182	if (oldArr == null)
183	183	throw new IllegalArgumentException("Cannot remove from null array.");

187	187	}
188	188	else if (index == 0) {
189	189	// chop the head
190		newArr = (Object[])(Array.newInstance(getArrayClass(oldArr), oldArr.length-1));
	190	newArr = (T[])(Array.newInstance(getArrayClass(oldArr), oldArr.length-1));
191	191	System.arraycopy(oldArr, 1, newArr, 0, oldArr.length-1);
192	192	}
193	193	else if (index == oldArr.length-1) {
194	194	// chop the tail
195		newArr = (Object[])(Array.newInstance(getArrayClass(oldArr), oldArr.length-1));
	195	newArr = (T[])(Array.newInstance(getArrayClass(oldArr), oldArr.length-1));
196	196	System.arraycopy(oldArr, 0, newArr, 0, oldArr.length-1);
197	197	}
198	198	else {
199	199	// chop the middle
200		newArr = (Object[])(Array.newInstance(getArrayClass(oldArr), oldArr.length-1));
	200	newArr = (T[])(Array.newInstance(getArrayClass(oldArr), oldArr.length-1));
201	201	System.arraycopy(oldArr, 0, newArr, 0, index);
202	202	System.arraycopy(oldArr, index+1, newArr, index,
203	203	oldArr.length-index-1);

215	215	* @param victim The object to remove from the array. May be null.
216	216	* @return Zero length array if the last element is removed.
217	217	*/
218		public static Object[] remove(Object[] oldArr, Object victim) {
219		Object[] newArr;
	218	public static <T> T[] remove(T[] oldArr, T victim) {
	219	T[] newArr;
220	220
221	221	if (oldArr == null) {
222	222	newArr = oldArr;

241	241	* @param target The reference to search for; can be null.
242	242	* @return The array index of the target.
243	243	*/
244		public static int find(Object[] arr, Object target) {
	244	public static <T> int find(T[] arr, T target) {
245	245	int index = -1;
246	246
247	247	for(int i = 0; i < arr.length; i++) {

260	260	* @param arr The array to examine.
261	261	* @return The class of objects that the given array can hold.
262	262	*/
263		protected static Class getArrayClass(Object[] arr) {
	263	protected static Class<?> getArrayClass(Object[] arr) {
264	264	if(arr != null) {
265	265	return arr.getClass().getComponentType();
266	266	} else {

+7

-7

src/com/sun/javatest/util/Fifo.java less more

30	30	* A simple variable length first-in first-out queue.
31	31	*/
32	32
33		public class Fifo
	33	public class Fifo<E>
34	34	{
35	35	/**
36	36	* Create a buffer with a default initial size.

47	47	*/
48	48	public Fifo(int initialSlots) {
49	49	bufSize = initialSlots;
50		buf = new Object[bufSize];
	50	buf = (E[]) new Object[bufSize];
51	51	insertSlot = 0;
52	52	removeSlot = 0;
53	53	entries = 0;

77	77	*
78	78	* @param obj The object to be inserted. It must not be null.
79	79	*/
80		public synchronized void insert(Object obj) {
	80	public synchronized void insert(E obj) {
81	81	if (obj == null)
82	82	throw new NullPointerException();
83	83
84	84	if (entries == bufSize) {
85	85	int newBufSize = 2 * bufSize;
86		Object[] newBuf = new Object[newBufSize];
	86	E[] newBuf = (E[]) new Object[newBufSize];
87	87	int saveEntries = entries;
88	88	for (int i = 0; entries > 0; i++) {
89	89	newBuf[i] = remove();

106	106	* @return The next object in line to be removed, if one is available,
107	107	* or null if none are available.
108	108	*/
109		public synchronized Object remove() {
	109	public synchronized E remove() {
110	110	if (entries == 0)
111	111	return null;
112	112
113		Object o = buf[removeSlot];
	113	E o = buf[removeSlot];
114	114	buf[removeSlot] = null;
115	115	removeSlot = (removeSlot + 1) % bufSize;
116	116	entries--;

134	134
135	135	private final static int defaultInitialSlots = 16;
136	136
137		private Object[] buf; // The circular array to hold the entries
	137	private E[] buf; // The circular array to hold the entries
138	138	private int bufSize; // The size of the array: buf.length
139	139	private int insertSlot; // The next slot to store an entry
140	140	private int removeSlot; // The next slot from which to remove an entry

+3

-3

src/com/sun/javatest/util/FileInfoCache.java less more

36	36	private final int SIZE = 500;
37	37
38	38	// we can't use generics in util package but this is actually Map<String, Boolean>
39		private Map map = Collections.synchronizedMap( new LinkedHashMap() {
40		protected boolean removeEldestEntry(Map.Entry eldest) {
	39	private Map<String, Boolean> map = Collections.synchronizedMap( new LinkedHashMap<String, Boolean>() {
	40	protected boolean removeEldestEntry(Map.Entry<String, Boolean> eldest) {
41	41	return size() > SIZE;
42	42	}
43	43	});

47	47	}
48	48
49	49	public Boolean get(File f) {
50		return (Boolean) map.get(f.getAbsolutePath());
	50	return map.get(f.getAbsolutePath());
51	51	}
52	52
53	53	public void clear() {

+13

-13

src/com/sun/javatest/util/HelpTree.java less more

167	167	this(node, null);
168	168	}
169	169
170		private Selection(Map map) {
	170	private Selection(Map<Node, Selection> map) {
171	171	this(null, map);
172	172	}
173	173
174		private Selection(Node node, Map map) {
	174	private Selection(Node node, Map<Node, Selection> map) {
175	175	this.node = node;
176	176	this.map = map;
177	177	}
178	178
179	179	private Node node;
180		private Map map;
	180	private Map<Node, Selection> map;
181	181	}
182	182
183	183	/**

200	200	* @param node the node to be added to the tree
201	201	*/
202	202	public void addNode(Node node) {
203		nodes = (Node[]) DynamicArray.append(nodes, node);
	203	nodes = DynamicArray.append(nodes, node);
204	204	}
205	205
206	206	/**

285	285	}
286	286
287	287	private Selection find(String[] words, int mode) {
288		Map map = null;
	288	Map<Node, Selection> map = null;
289	289
290	290	for (int i = 0; i < nodes.length; i++) {
291	291	Node node = nodes[i];
292	292	Selection s = find(node, words, mode);
293	293	if (s != null) {
294	294	if (map == null)
295		map = new TreeMap(nodeComparator);
	295	map = new TreeMap<>(nodeComparator);
296	296	map.put(node, s);
297	297	}
298	298	}

315	315	if (node.children == null)
316	316	return null;
317	317
318		Map map = null;
	318	Map<Node, Selection> map = null;
319	319
320	320	for (int i = 0; i < node.children.length; i++) {
321	321	Node child = node.children[i];
322	322	Selection s = find(child, words, mode);
323	323	if (s != null) {
324	324	if (map == null)
325		map = new TreeMap(nodeComparator);
	325	map = new TreeMap<>(nodeComparator);
326	326	map.put(child, s);
327	327	}
328	328	}

412	412	return nodeComparator;
413	413	}
414	414
415		private void write(WrapWriter out, Map m) throws IOException {
	415	private void write(WrapWriter out, Map<Node, Selection> m) throws IOException {
416	416	int margin = out.getLeftMargin();
417		for (Iterator iter = m.entrySet().iterator(); iter.hasNext(); ) {
418		Map.Entry e = (Map.Entry) (iter.next());
419		Node node = (Node) (e.getKey());
420		Selection s = (Selection) (e.getValue());
	417	for (Iterator<Map.Entry<Node, Selection>> iter = m.entrySet().iterator(); iter.hasNext(); ) {
	418	Map.Entry<Node, Selection> e = iter.next();
	419	Node node = (e.getKey());
	420	Selection s = (e.getValue());
421	421	if (s.map == null)
422	422	write(out, node);
423	423	else {

+2

-2

src/com/sun/javatest/util/I18NResourceBundle.java less more

48	48	* @param c the class for which to obtain the resource bundle
49	49	* @return the appropriate resource bundle for the class
50	50	*/
51		public static I18NResourceBundle getBundleForClass(Class c) {
	51	public static I18NResourceBundle getBundleForClass(Class<?> c) {
52	52	String cn = c.getName();
53	53	int dot = cn.lastIndexOf('.');
54	54	String rn = (dot == -1 ? "i18n" : cn.substring(0, dot) + ".i18n");

169	169	* Load the actual resource bundle, if it has not yet been loaded,
170	170	* then hand the request off to that bundle.
171	171	*/
172		public Enumeration getKeys() {
	172	public Enumeration<String> getKeys() {
173	173	if (delegate == null) {
174	174	delegate = AccessController.doPrivileged(
175	175	new PrivilegedAction<ResourceBundle>() {

+2

-2

src/com/sun/javatest/util/LineParser.java less more

106	106	private LineParser(File file, Reader in) {
107	107	this.file = file;
108	108	this.in = in;
109		currLine = new Vector();
	109	currLine = new Vector<>();
110	110	lineNumber = 1;
111	111	ch = ' ';
112	112	}

276	276	private int ch;
277	277	private int lineNumber;
278	278	private StringBuffer currWord;
279		private Vector currLine;
	279	private Vector<String> currLine;
280	280
281	281	private static final I18NResourceBundle i18n =
282	282	I18NResourceBundle.getBundleForClass(LineParser.class);

+6

-4

src/com/sun/javatest/util/MainAppletContext.java less more

29	29	import java.applet.Applet;
30	30	import java.util.Hashtable;
31	31	import java.util.Enumeration;
	32	import java.util.Map;
	33	import java.util.Set;
32	34
33	35	/**
34	36	* This class provides a means whereby tools can temporarily give access

42	44
43	45	private static AppletContext context = null;
44	46
45		private static Hashtable applets = new Hashtable();
	47	private static Map<String, Applet> applets = new Hashtable<>();
46	48
47	49	private static Applet agentApplet = null;
48	50

83	85	* @return the applet that has been registered with the given name
84	86	*/
85	87	public static synchronized Applet getApplet(String name) {
86		return (Applet) applets.get(name);
	88	return applets.get(name);
87	89	}
88	90
89	91	/**
90	92	* Get an enumeration of all the names that have been used to register applets.
91	93	* @return an enumeration of all the names that have been used to register applets
92	94	*/
93		public static synchronized Enumeration getAppletNames() {
94		return applets.keys();
	95	public static synchronized Set<String> getAppletNames() {
	96	return applets.keySet();
95	97	}
96	98
97	99	/**

+4

-4

src/com/sun/javatest/util/OrderedTwoWayTable.java less more

37	37	*/
38	38	public class OrderedTwoWayTable {
39	39	public OrderedTwoWayTable() {
40		keys = new Vector();
41		values = new Vector();
	40	keys = new Vector<>();
	41	values = new Vector<>();
42	42	}
43	43
44	44	/**

120	120	* @param target the object to search for
121	121	* @return the index of the target in the vector, or -1 if not found
122	122	*/
123		protected int findIndex(Vector data, Object target) {
	123	protected int findIndex(Vector<?> data, Object target) {
124	124	for (int i = 0; i < data.size(); i++)
125	125	if (data.elementAt(i) == target)
126	126	return i;

128	128	return -1;
129	129	}
130	130
131		private Vector keys, values;
	131	private Vector<Object> keys, values;
132	132	}
133	133
134	134

+15

-14

src/com/sun/javatest/util/PathClassLoader.java less more

30	30	import java.io.InputStream;
31	31	import java.io.IOException;
32	32	import java.util.Hashtable;
	33	import java.util.Map;
33	34	import java.util.Vector;
34	35	import java.util.zip.ZipEntry;
35	36	import java.util.zip.ZipFile;

90	91	* @return the class that was loaded
91	92	* @throws ClassNotFoundException if the class was not found.
92	93	*/
93		protected Class loadClass(String name, boolean resolve)
94		throws ClassNotFoundException {
95
96		Class cl = (Class)classes.get(name);
	94	protected Class<?> loadClass(String name, boolean resolve)
	95	throws ClassNotFoundException {
	96
	97	Class<?> cl = classes.get(name);
97	98
98	99	if (cl == null) {
99	100	try {

111	112	}
112	113
113	114
114		private synchronized Class locateClass(String name)
	115	private synchronized Class<?> locateClass(String name)
115	116	throws ClassNotFoundException {
116	117	//System.err.println("locateClass: " + name);
117		Class c = (Class)classes.get(name);
	118	Class<?> c = classes.get(name);
118	119	if (c != null)
119	120	return c;
120	121

133	134	throw new ClassNotFoundException(name);
134	135	}
135	136
136		private Class locateClassInDir(String name, File dir)
	137	private Class<?> locateClassInDir(String name, File dir)
137	138	throws ClassNotFoundException {
138	139	//System.err.println("locateClassInDir: " + name + " " + dir);
139	140	String cname = name.replace('.', '/') + ".class";

147	148	}
148	149	}
149	150
150		private Class locateClassInJar(String name, File jarFile)
	151	private Class<?> locateClassInJar(String name, File jarFile)
151	152	throws ClassNotFoundException {
152	153	//System.err.println("locateClassInJar: " + name + " " + jarFile);
153	154	String cname = name.replace('.', '/') + ".class";
154	155	try {
155		ZipFile z = (ZipFile)zips.get(jarFile);
	156	ZipFile z = zips.get(jarFile);
156	157	if (z == null) {
157	158	z = new ZipFile(jarFile);
158	159	zips.put(jarFile, z);

168	169	}
169	170	}
170	171
171		private Class readClass(String name, InputStream in, int size) throws IOException {
	172	private Class<?> readClass(String name, InputStream in, int size) throws IOException {
172	173	byte[] data = new byte[size];
173	174	try {
174	175	for (int total = 0; total < size; ) {

183	184
184	185	private File[] split(String s) {
185	186	char pathCh = File.pathSeparatorChar;
186		Vector v = new Vector();
	187	Vector<File> v = new Vector<>();
187	188	int start = 0;
188	189	for (int i = s.indexOf(pathCh); i != -1; i = s.indexOf(pathCh, start)) {
189	190	add(s.substring(start, i), v);

196	197	return path;
197	198	}
198	199
199		private void add(String s, Vector v) {
	200	private void add(String s, Vector<File> v) {
200	201	if (s.length() != 0)
201	202	v.addElement(new File(s));
202	203	}
203	204
204	205	private File[] path;
205		private Hashtable classes = new Hashtable();
206		private Hashtable zips = new Hashtable();
	206	private Map<String, Class<?>> classes = new Hashtable<>();
	207	private Map<File, ZipFile> zips = new Hashtable<>();
207	208	}

+33

-33

src/com/sun/javatest/util/PrefixMap.java less more

37	37	* A map whose entries are stored in a parent map by prefixing
38	38	* the key names with a specific string.
39	39	*/
40		public class PrefixMap implements Map
	40	public class PrefixMap<V> implements Map<String, V>
41	41	{
42	42	/**
43	43	* Create a map whose entries are stored in a parent map

46	46	* @param prefix the prefix with which to prefix the entries in the
47	47	* parent map
48	48	*/
49		public PrefixMap(Map map, String prefix) {
	49	public PrefixMap(Map<String, V> map, String prefix) {
50	50	this.map = map;
51	51	this.prefix = prefix + ".";
52	52	}
53	53
54	54	public void clear() {
55		for (Iterator i = map.keySet().iterator(); i.hasNext(); ) {
56		String key = (String) (i.next());
	55	for (Iterator<String> i = map.keySet().iterator(); i.hasNext(); ) {
	56	String key = i.next();
57	57	if (key.startsWith(prefix))
58	58	i.remove();
59	59	}

79	79	}
80	80
81	81	public boolean containsValue(Object value) {
82		for (Iterator i = map.entrySet().iterator(); i.hasNext(); ) {
83		Map.Entry e = (Map.Entry) (i.next());
84		String key = (String) (e.getKey());
	82	for (Iterator<Map.Entry<String, V>> i = map.entrySet().iterator(); i.hasNext(); ) {
	83	Map.Entry<String, V> e = i.next();
	84	String key = e.getKey();
85	85	if (key.startsWith(prefix) && e.getValue().equals(value))
86	86	return true;
87	87	}
88	88	return false;
89	89	}
90	90
91		public Set entrySet() {
92		Map m = new HashMap();
93		for (Iterator i = map.entrySet().iterator(); i.hasNext(); ) {
94		Map.Entry e = (Map.Entry) (i.next());
95		String key = (String) (e.getKey());
	91	public Set<Map.Entry<String, V>> entrySet() {
	92	Map<String, V> m = new HashMap<String, V>();
	93	for (Iterator<Map.Entry<String, V>> i = map.entrySet().iterator(); i.hasNext(); ) {
	94	Map.Entry<String, V> e = i.next();
	95	String key = e.getKey();
96	96	if (key.startsWith(prefix))
97	97	m.put(key.substring(prefix.length()), e.getValue());
98	98	}
99	99	return m.entrySet();
100	100	}
101	101
102		public Object get(Object key) {
	102	public V get(Object key) {
103	103	return map.get(prefix + key);
104	104	}
105	105

108	108	}
109	109
110	110	public boolean isEmpty() {
111		for (Iterator i = map.keySet().iterator(); i.hasNext(); ) {
112		String key = (String) (i.next());
	111	for (Iterator<String> i = map.keySet().iterator(); i.hasNext(); ) {
	112	String key = i.next();
113	113	if (key.startsWith(prefix))
114	114	return false;
115	115	}
116	116	return true;
117	117	}
118	118
119		public Set keySet() {
120		Set s = new HashSet();
121		for (Iterator i = map.keySet().iterator(); i.hasNext(); ) {
122		String key = (String) (i.next());
	119	public Set<String> keySet() {
	120	Set<String> s = new HashSet<>();
	121	for (Iterator<String> i = map.keySet().iterator(); i.hasNext(); ) {
	122	String key = i.next();
123	123	if (key.startsWith(prefix))
124	124	s.add(key.substring(prefix.length()));
125	125	}
126	126	return s;
127	127	}
128	128
129		public Object put(Object key, Object value) {
	129	public V put(String key, V value) {
130	130	return map.put(prefix + key, value);
131	131	}
132	132
133		public void putAll(Map t) {
134		for (Iterator i = t.entrySet().iterator(); i.hasNext(); ) {
135		Map.Entry e = (Map.Entry) (i.next());
136		String key = (String) (e.getKey());
	133	public void putAll(Map<? extends String, ? extends V> t) {
	134	for (Iterator<? extends Entry<? extends String, ? extends V>> i = t.entrySet().iterator(); i.hasNext(); ) {
	135	Map.Entry<? extends String, ? extends V> e = i.next();
	136	String key = e.getKey();
137	137	put(key, e.getValue());
138	138	}
139	139	}
140	140
141		public Object remove(Object key) {
	141	public V remove(Object key) {
142	142	return map.remove(prefix + key);
143	143	}
144	144
145	145	public int size() {
146	146	int n = 0;
147		for (Iterator i = map.keySet().iterator(); i.hasNext(); ) {
148		String key = (String) (i.next());
	147	for (Iterator<String> i = map.keySet().iterator(); i.hasNext(); ) {
	148	String key = (i.next());
149	149	if (key.startsWith(prefix))
150	150	n++;
151	151	}
152	152	return n;
153	153	}
154	154
155		public Collection values() {
156		Collection c = new Vector();
157		for (Iterator i = map.entrySet().iterator(); i.hasNext(); ) {
158		Map.Entry e = (Map.Entry) (i.next());
159		String key = (String) (e.getKey());
	155	public Collection<V> values() {
	156	Collection<V> c = new Vector<>();
	157	for (Iterator<Map.Entry<String, V>> i = map.entrySet().iterator(); i.hasNext(); ) {
	158	Map.Entry<String, V> e = i.next();
	159	String key = e.getKey();
160	160	if (key.startsWith(prefix))
161	161	c.add(e.getValue());
162	162	}
163	163	return c;
164	164	}
165	165
166		private Map map;
	166	private Map<String, V> map;
167	167	private String prefix;
168	168	}

+71

-31

src/com/sun/javatest/util/Properties.java less more

28	28	// Modified from JDK java.util.Properties to use Reader/Writer as well as
29	29	// InputStream/OutputStream
30	30
31		import java.io.BufferedWriter;
32		import java.io.IOException;
33		//import java.io.InputStream;
34		//import java.io.InputStreamReader;
35		//import java.io.OutputStream;
36		//import java.io.OutputStreamWriter;
37		//import java.io.PrintStream;
38		import java.io.PrintWriter;
39		import java.io.Reader;
40		import java.io.Writer;
41		import java.util.Date;
42		import java.util.Enumeration;
43		import java.util.Hashtable;
44		import java.util.Vector;
	31	import java.io.*;
	32	import java.util.*;
45	33
46	34	/**
47	35	* The <code>Properties</code> class represents a persistent set of

58	46	* InputStream/OutputStream, to fix locale/codepage problems.
59	47	*/
60	48	public
61		class Properties extends Hashtable {
	49	class Properties extends Hashtable<String, String> {
62	50	/**
63	51	* A property list that contains default values for any keys not
64	52	* found in this property list.

84	72	*/
85	73	public Properties(Properties defaults) {
86	74	this.defaults = defaults;
	75	}
	76
	77	/**
	78	* Utility method that writes the given map of strings to the given output stream with provided comments
	79	* using {@code java.util.Properties.store(java.io.OutputStream, String)} method.
	80	*/
	81	public static void store(Map<String, String> stringProps, OutputStream out, String comments) throws IOException {
	82	java.util.Properties properties = new java.util.Properties();
	83	properties.putAll(stringProps);
	84	properties.store(out, comments);
	85	}
	86
	87	/**
	88	* Reads a property list from the given input stream
	89	* using {@code java.util.Properties.load(java.io.InputStream inStream)} method
	90	* and stores properties into a {@code Map<String, String>} that is returned.
	91	*/
	92	public static Map<String, String> load(InputStream inputStream) throws IOException {
	93	return populate(new HashMap<String, String>(), inputStream);
	94	}
	95
	96	/**
	97	* Reads a property list from the given input stream
	98	* using {@code java.util.Properties.load(java.io.InputStream inStream)} method
	99	* and stores string properties into a {@code SortedMap<String, String>} that is returned.
	100	*/
	101	public static SortedMap<String, String> loadSorted(InputStream inputStream) throws IOException {
	102	return populate(new TreeMap<String, String>(), inputStream);
	103	}
	104
	105	/**
	106	* Populated a map of strings using {@code java.util.Properties.load(java.io.InputStream)} method
	107	*/
	108	private static <M extends Map<String, String>> M populate(M stringProps, InputStream inputStream) throws IOException {
	109	java.util.Properties p = new java.util.Properties();
	110	p.load(inputStream);
	111	return extractStringPropsTo(stringProps, p);
	112	}
	113
	114	/**
	115	* Converts the given properties to {@code Map<String, String>} instance
	116	* picking only string properties from the given {@code java.util.Properties} instance.
	117	*/
	118	public static Map<String, String> convertToStringProps(java.util.Properties properties) {
	119	return extractStringPropsTo(new HashMap<String, String>(), properties);
	120	}
	121
	122	private static <M extends Map<String, String>> M extractStringPropsTo(M stringProps, java.util.Properties p) {
	123	for (String name : p.stringPropertyNames()) {
	124	stringProps.put(name, p.getProperty(name));
	125	}
	126	return stringProps;
87	127	}
88	128
89	129	// /**

108	148	* input stream.
109	149	*/
110	150	public synchronized void load(Reader in) throws IOException {
111		Vector v = load0(in, false);
	151	Vector<String> v = load0(in, false);
112	152	for (int i = 0; i < v.size(); i+=2) {
113	153	put(v.elementAt(i), v.elementAt(i + 1));
114	154	}
115	155	}
116	156
117	157
118		static Vector load0(Reader in, boolean breakOnEmptyLine) throws IOException {
	158	static Vector<String> load0(Reader in, boolean breakOnEmptyLine) throws IOException {
119	159
120	160	// This could be used if we switch to JDK 1.6, where Properties support I/O
121	161	// through Reader and Writer

144	184	//
145	185	//
146	186
147		Vector v = new Vector();
	187	Vector<String> v = new Vector<>();
148	188	int ch = 0;
149	189
150	190	//// eat any preceding whitespace

330	370	out[outLen++] = aChar;
331	371	}
332	372	} else {
333		out[outLen++] = (char)aChar;
	373	out[outLen++] = aChar;
334	374	}
335	375	}
336	376	return new String (out, 0, outLen);

376	416	prnt.write('#');
377	417	prnt.println(new Date());
378	418
379		for (Enumeration e = keys() ; e.hasMoreElements() ;) {
380		String key = (String)e.nextElement();
381		String val = (String)get(key);
	419	for (Enumeration<String> e = keys() ; e.hasMoreElements() ;) {
	420	String key = e.nextElement();
	421	String val = get(key);
382	422	key = saveConvert(key, true, false);
383	423	/* No need to escape embedded and trailing spaces for value, hence
384	424	* pass false to flag.

495	535	* @see com.sun.javatest.util.Properties#defaults
496	536	* @since JDK1.0
497	537	*/
498		public Enumeration propertyNames() {
499		Hashtable h = new Hashtable();
	538	public Enumeration<String> propertyNames() {
	539	Hashtable<String, String> h = new Hashtable<>();
500	540	enumerate(h);
501	541	return h.keys();
502	542	}

526	566	*/
527	567	public void list(PrintWriter out) {
528	568	out.println("-- listing properties --");
529		Hashtable h = new Hashtable();
	569	Hashtable<String, String> h = new Hashtable<>();
530	570	enumerate(h);
531		for (Enumeration e = h.keys() ; e.hasMoreElements() ;) {
532		String key = (String)e.nextElement();
533		String val = (String)h.get(key);
	571	for (Enumeration<String> e = h.keys() ; e.hasMoreElements() ;) {
	572	String key = e.nextElement();
	573	String val = h.get(key);
534	574	if (val.length() > 40) {
535	575	val = val.substring(0, 37) + "...";
536	576	}

542	582	* Enumerates all key/value pairs in the specified hastable.
543	583	* @param h the hashtable
544	584	*/
545		private synchronized void enumerate(Hashtable h) {
	585	private synchronized void enumerate(Map<String, String> h) {
546	586	if (defaults != null) {
547	587	defaults.enumerate(h);
548	588	}
549		for (Enumeration e = keys() ; e.hasMoreElements() ;) {
550		String key = (String)e.nextElement();
	589	for (Enumeration<String> e = keys() ; e.hasMoreElements() ;) {
	590	String key = e.nextElement();
551	591	h.put(key, get(key));
552	592	}
553	593	}

+32

-37

src/com/sun/javatest/util/PropertyArray.java less more

26	26	package com.sun.javatest.util;
27	27
28	28	import java.io.BufferedWriter;
29		import java.util.Enumeration;
30		import java.util.Vector;
	29	import java.util.*;
31	30	import java.io.IOException;
32	31	import java.io.Reader;
33	32	import java.io.Writer;

100	99	* Create a immutable PropertyArray object from a standard Properties object.
101	100	* @param props the object from which to initialize the array
102	101	*/
103		public PropertyArray(Properties props) {
	102	public PropertyArray(Map<String, String> props) {
104	103	dataA = getArray(props);
105	104
106	105	locked = true;

132	131	* @return an array containing the names of the properties in even-numbered
133	132	* entries, and the corresponding values in the adjacent odd-numbered entries
134	133	*/
135		public static String[] getArray(Properties props) {
136		Enumeration values = props.elements();
137		Enumeration keys = props.keys();
138		Vector data = new Vector(props.size(),2);
139
140		for (; keys.hasMoreElements() ;) {
141		insert(data, (String)(keys.nextElement()),
142		(String)(values.nextElement()));
	134	public static String[] getArray(Map<String, String> props) {
	135	Vector<String> data = new Vector<>(props.size(),2);
	136	for (Map.Entry<String, String> entry : props.entrySet()) {
	137	insert(data, entry.getKey(), entry.getValue());
143	138	}
144	139
145	140	String[] arr = new String[data.size()];

158	153	* supplied.
159	154	*/
160	155	public static String[] put(String[] data, String key, String value) {
161		Vector vec;
	156	Vector<String> vec;
162	157	String[] arr;
163	158	String old = null;
164	159

231	226	* @return an array that does not contain the named property
232	227	*/
233	228	public static String[] remove(String[] data, String key) {
234		Vector vec = copyOutOf(data);
	229	Vector<String> vec = copyOutOf(data);
235	230	int lower = 0;
236	231	int upper = vec.size() - 2;
237	232	int mid = 0;

243	238	}
244	239
245	240	// goes at the end
246		String last = (String)vec.elementAt(upper);
	241	String last = vec.elementAt(upper);
247	242	int cmp = key.compareTo(last);
248	243	if (cmp > 0) {
249	244	return data;

252	247	while (lower <= upper) {
253	248	// in next line, take care to ensure that mid is always even
254	249	mid = lower + ((upper - lower) / 4) * 2;
255		String e = (String)(vec.elementAt(mid));
	250	String e = (vec.elementAt(mid));
256	251	cmp = key.compareTo(e);
257	252	if (cmp < 0) {
258	253	upper = mid - 2;

263	258	else {
264	259	// strings equal, zap key and value
265	260	vec.removeElementAt(mid);
266		old = (String)(vec.elementAt(mid));
	261	old = vec.elementAt(mid);
267	262	vec.removeElementAt(mid);
268	263	break;
269	264	}

275	270	}
276	271
277	272	/**
278		* Get a standard Properties object from an array of properties.
	273	* Get a standard Map object from an array of properties.
279	274	* @param data an array of sequential name value properties
280		* @return a Properties object containing data from the array
281		*/
282		public static Properties getProperties(String[] data) {
283		Properties props = new Properties();
	275	* @return a Map object containing data from the array
	276	*/
	277	public static Map<String, String> getProperties(String[] data) {
	278	Map<String, String> props = new HashMap<>();
284	279
285	280	if (data != null && data.length > 0) {
286	281	for (int i = 0; i < data.length; i+=2) {

361	356	*/
362	357	public static String[] load(Reader in) throws IOException {
363	358
364		Vector v = Properties.load0(in, true);
365		Vector sorted = new Vector(v.size());
	359	Vector<String> v = Properties.load0(in, true);
	360	Vector<String> sorted = new Vector<>(v.size());
366	361	for (int i = 0; i < v.size(); i+=2) {
367		insert(sorted, (String)v.elementAt(i), (String)v.elementAt(i + 1));
	362	insert(sorted, v.elementAt(i), v.elementAt(i + 1));
368	363	}
369	364
370	365	String[] data = new String[sorted.size()];

377	372	* @param props an array of sequential name value properties
378	373	* @return an enumeration of the properties in the array
379	374	*/
380		public static Enumeration enumerate(final String[] props) {
381		return new Enumeration() {
	375	public static Enumeration<String> enumerate(final String[] props) {
	376	return new Enumeration<String>() {
382	377	int pos = 0;
383	378
384	379	public boolean hasMoreElements() {
385	380	return (props != null && pos < props.length);
386	381	}
387	382
388		public Object nextElement() {
	383	public String nextElement() {
389	384	if (props == null \|\| pos >= props.length) {
390	385	return null;
391	386	}

404	399	* Get the data in this PropertyArray as a standard Properties object.
405	400	* @return a Properties object containing the same data as this PropertyArray
406	401	*/
407		public Properties getProperties() {
	402	public Map<String, String> getProperties() {
408	403	return getProperties(dataA);
409	404	}
410	405

470	465	"A key or value was null. Null keys and values are illegal");
471	466	}
472	467
473		Vector vec = copyOutOf(dataA);
	468	Vector<String> vec = copyOutOf(dataA);
474	469	old = insert(vec, key, value);
475	470	dataA = new String[vec.size()];
476	471	vec.copyInto(dataA);

503	498	*
504	499	* @param vec Vector to add data to. Must not be null!
505	500	*/
506		private static String insert(Vector vec, String key, String value) {
	501	private static String insert(Vector<String> vec, String key, String value) {
507	502	int lower = 0;
508	503	int upper = vec.size() - 2;
509	504	int mid = 0;

517	512	}
518	513
519	514	// goes at the end
520		String last = (String)vec.elementAt(upper);
	515	String last = vec.elementAt(upper);
521	516	int cmp = key.compareTo(last);
522	517	if (cmp > 0) {
523	518	vec.addElement(key);

528	523	while (lower <= upper) {
529	524	// in next line, take care to ensure that mid is always even
530	525	mid = lower + ((upper - lower) / 4) * 2;
531		String e = (String)(vec.elementAt(mid));
	526	String e = vec.elementAt(mid);
532	527	cmp = key.compareTo(e);
533	528	if (cmp < 0) {
534	529	upper = mid - 2;

539	534	else {
540	535	// strings equal
541	536	vec.removeElementAt(mid);
542		old = (String)(vec.elementAt(mid));
	537	old = vec.elementAt(mid);
543	538	vec.removeElementAt(mid);
544	539	break;
545	540	}

556	551	return old;
557	552	}
558	553
559		private static Vector copyOutOf(String[] data) {
560		Vector vec = null;
	554	private static Vector<String> copyOutOf(String[] data) {
	555	Vector<String> vec = null;
561	556
562	557	if (data == null) {
563		vec = new Vector(0,2);
	558	vec = new Vector<>(0,2);
564	559	}
565	560	else {
566		vec = new Vector(data.length,2);
	561	vec = new Vector<>(data.length,2);
567	562
568	563	for (int i = 0; i < data.length; i++) {
569	564	vec.addElement(data[i]);

+9

-8

src/com/sun/javatest/util/ReadAheadIterator.java less more

25	25	*/
26	26	package com.sun.javatest.util;
27	27
	28
28	29	import java.util.Iterator;
29	30
30	31	/**

32	33	* performance reasons or to help find out the number of items returned by an
33	34	* iterator before accessing them.
34	35	*/
35		public class ReadAheadIterator implements Iterator
	36	public class ReadAheadIterator<T> implements Iterator<T>
36	37	{
37	38	/**
38	39	* A constant indicating that no read ahead is required.

60	61	* @see #LIMITED
61	62	* @see #FULL
62	63	*/
63		public ReadAheadIterator(Iterator source, int mode) {
	64	public ReadAheadIterator(Iterator<T> source, int mode) {
64	65	this(source, mode, DEFAULT_LIMITED_READAHEAD);
65	66	}
66	67

75	76	* @see #LIMITED
76	77	* @see #FULL
77	78	*/
78		public ReadAheadIterator(Iterator source, int mode, int amount) {
	79	public ReadAheadIterator(Iterator<T> source, int mode, int amount) {
79	80	this.source = source;
80	81	setMode(mode, amount);
81	82	}

172	173	\|\| (worker == null ? source.hasNext() : sourceHasNext));
173	174	}
174	175
175		public synchronized Object next() {
	176	public synchronized T next() {
176	177	// see if there are items in the read ahead queue
177		Object result = queue.remove();
	178	T result = queue.remove();
178	179
179	180	if (result == null) {
180	181	// queue is empty: check whether to read source directly, or rely on the worker thread

255	256	// sourceHasNext is true, which means there is another item
256	257	// to be read, so read it, and also check whether there is
257	258	// another item after that
258		Object srcNext = source.next();
	259	T srcNext = source.next();
259	260	boolean srcHasNext = source.hasNext();
260	261
261	262	// get the lock to update the queue and sourceHasNext;

295	296	/**
296	297	* The queue to hold the items that have been read from the underlying source iterator.
297	298	*/
298		private final Fifo queue = new Fifo();
	299	private final Fifo<T> queue = new Fifo<>();
299	300
300	301	/**
301	302	* The underlying source iterator. If the worker thread is running, it alone

303	304	* along with everything else.
304	305	* @see #worker
305	306	*/
306		private final Iterator source;
	307	private final Iterator<T> source;
307	308
308	309	/**
309	310	* A value indicating whether the underlying source iterator has more values to be read.

+5

-5

src/com/sun/javatest/util/SortedProperties.java less more

38	38	public class SortedProperties extends Properties
39	39	{
40	40	// override Keys() to return a sorted set
41		public Enumeration keys() {
42		Set s = new TreeSet(); // ordered
43		for (Enumeration e = super.keys(); e.hasMoreElements(); ) {
	41	public Enumeration<Object> keys() {
	42	Set<Object> s = new TreeSet<>(); // ordered
	43	for (Enumeration<?> e = super.keys(); e.hasMoreElements(); ) {
44	44	s.add(e.nextElement());
45	45	}
46	46
47		final Iterator iter = s.iterator();
48		return new Enumeration() {
	47	final Iterator<?> iter = s.iterator();
	48	return new Enumeration<Object>() {
49	49	public boolean hasMoreElements() {
50	50	return iter.hasNext();
51	51	}

+2

-2

src/com/sun/javatest/util/StringArray.java less more

47	47	if (s == null)
48	48	return empty;
49	49
50		Vector v = new Vector();
	50	Vector<String> v = new Vector<>();
51	51	int start = -1;
52	52	for (int i = 0; i < s.length(); i++) {
53	53	if (white(s.charAt(i))) {

129	129	if (list == null \|\| list.length() == 0)
130	130	return null;
131	131
132		Vector v = new Vector();
	132	Vector<String> v = new Vector<>();
133	133	int pos = 0;
134	134	while (true) {
135	135	int nextD = list.indexOf(delim, pos);

+6

-6

src/com/sun/javatest/util/SysEnv.java less more

85	85	if (values == null)
86	86	initValues();
87	87
88		return (String) (values.get(name));
	88	return values.get(name);
89	89	}
90	90
91	91	/**

93	93	* execution context.
94	94	* @return a map containing all the known environment variables.
95	95	*/
96		public static Map getAll() {
97		return getAll(new HashMap());
	96	public static Map<String, String> getAll() {
	97	return getAll(new HashMap<String, String>());
98	98	}
99	99
100	100	/**

104	104	* environment variables in the current execution context.
105	105	* @return the argument map.
106	106	*/
107		public static Map getAll(Map m) {
	107	public static Map<String, String> getAll(Map<String, String> m) {
108	108	if (values == null)
109	109	initValues();
110	110

113	113	}
114	114
115	115	private static void initValues() {
116		values = new HashMap();
	116	values = new HashMap<>();
117	117
118	118	if (command == null)
119	119	command = getDefaultCommand();

170	170	}
171	171
172	172	private static String command;
173		private static Map values;
	173	private static Map<String, String> values;
174	174	private static I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(SysEnv.class);
175	175	}

+3

-3

src/com/sun/javatest/util/Timer.java less more

113	113	//System.out.println("timeout set for " + obj + " at " + (new Date(absCallbackTime)));
114	114	Entry e = new Entry(obj, absCallbackTime);
115	115	for (int i = 0; i < entries.size(); i++) {
116		Entry ee = (Entry)(entries.elementAt(i));
	116	Entry ee = entries.elementAt(i);
117	117	if (e.expiration < ee.expiration) {
118	118	entries.insertElementAt(e, i);
119	119	return e;

159	159	wait();
160	160	} else {
161	161	long now = System.currentTimeMillis();
162		Entry e = (Entry)(entries.elementAt(0));
	162	Entry e = entries.elementAt(0);
163	163	if (e.expiration <= now) {
164	164	// time to call back e.obj; do so and remove it from list
165	165	entries.removeElementAt(0);

213	213
214	214	//-----member variables-------------------------------------------------------
215	215
216		private Vector entries = new Vector();
	216	private Vector<Entry> entries = new Vector<>();
217	217	private boolean acceptingRequests = true;
218	218	}

+10

-10

src/com/sun/jct/utils/glossarygen/Main.java less more

206	206	public void addFiles(File baseDir, String[] paths) {
207	207	if (paths == null)
208	208	return;
209		List/<File>/ files = new ArrayList/<File>/();
	209	List<File> files = new ArrayList<File>();
210	210	if (inFiles != null)
211	211	files.addAll(Arrays.asList(inFiles));
212	212	for (int i = 0; i < paths.length; i++)
213	213	files.add(new File(baseDir, paths[i]));
214		inFiles = (File[]) files.toArray(new File[files.size()]);
	214	inFiles = files.toArray(new File[files.size()]);
215	215	}
216	216
217	217	private void run() throws BadArgs, IOException {

230	230	if (mapOutFile != null && mapDir == null)
231	231	mapDir = mapOutFile.getParentFile();
232	232
233		glossary = new TreeMap();
	233	glossary = new TreeMap<>();
234	234
235	235	read(inFiles);
236	236

272	272
273	273	char currLetter = 0;
274	274
275		for (Iterator iter = glossary.values().iterator(); iter.hasNext(); ) {
276		Entry e = (Entry) (iter.next());
	275	for (Iterator<Entry> iter = glossary.values().iterator(); iter.hasNext(); ) {
	276	Entry e = (iter.next());
277	277	if (!e.matches(keyword))
278	278	continue;
279	279

372	372	private File mapDir;
373	373	private File xmlOutFile;
374	374	private String keyword;
375		private Map glossary;
	375	private Map<String, Entry> glossary;
376	376
377	377	}
378	378

552	552	String link = file.getName();
553	553	if (link.endsWith(".html"))
554	554	link = link.substring(0, link.length() - 5);
555		out.write("\n<!-- file: " + file + " -->\n<a name=\"" + link + "\">");
	555	out.write("\n<!-- file: " + file + " -->\n<a name=\"" + link + "\"></a>");
556	556	}
557	557	else {
558	558	copyMode = NO_COPY;

805	805	// hIndent = Integer.parseInt(content);
806	806	// }
807	807	if (name.equalsIgnoreCase("glossaryKeywords")) {
808		keywords = new HashSet(Arrays.asList(split(content)));
	808	keywords = new HashSet<>(Arrays.asList(split(content)));
809	809	}
810	810	}
811	811

982	982	}
983	983
984	984	private static String[] split(String s) {
985		Vector v = new Vector();
	985	Vector<String> v = new Vector<>();
986	986	int start = -1;
987	987	for (int i = 0; i < s.length(); i++) {
988	988	char c = s.charAt(i);

1006	1006	private File file;
1007	1007	private String head1;
1008	1008	private String text;
1009		private Set keywords;
	1009	private Set<String> keywords;
1010	1010
1011	1011	private Reader in;
1012	1012	private Writer out;

+17

-19

src/com/sun/jct/utils/indexgen/Main.java less more

201	201	public void addFiles(String[] paths) {
202	202	if (paths == null)
203	203	return;
204		List/<File>/ files = new ArrayList/<File>/();
	204	List<File> files = new ArrayList<File>();
205	205	if (inFiles != null)
206	206	files.addAll(Arrays.asList(inFiles));
207	207	for (int i = 0; i < paths.length; i++)
208	208	files.add(new File(paths[i]));
209		inFiles = (File[]) files.toArray(new File[files.size()]);
	209	inFiles = files.toArray(new File[files.size()]);
210	210	}
211	211
212	212	private void run() throws BadArgs, IOException {

520	520
521	521	char currLetter = 0;
522	522
523		for (Iterator iter = root.iterator(); iter.hasNext(); ) {
524		Node node = (Node) (iter.next());
	523	for (Iterator<Node> iter = root.iterator(); iter.hasNext(); ) {
	524	Node node = (iter.next());
525	525	String name = node.getName();
526	526	char initial = Character.toUpperCase(name.charAt(0));
527	527	if (Character.isLetter(initial) && initial != currLetter) {

596	596	}
597	597
598	598	if (node.getChildCount() > 0) {
599		for (Iterator iter = node.iterator(); iter.hasNext(); ) {
600		Node child = (Node) (iter.next());
	599	for (Iterator<Node> iter = node.iterator(); iter.hasNext(); ) {
	600	Node child = (iter.next());
601	601	write(xmlOut, mapOut, htmlOut, child, depth + 1);
602	602	}
603	603

607	607	}
608	608
609	609	private static String[] split(String s, char sep) {
610		Vector v = new Vector();
	610	Vector<String> v = new Vector<>();
611	611	int start = -1;
612	612	for (int i = 0; i < s.length(); i++) {
613	613	char c = s.charAt(i);

628	628	}
629	629
630	630	private static File[] splitPath(String s) {
631		Vector v = new Vector();
	631	Vector<File> v = new Vector<>();
632	632	int start = -1;
633	633	for (int i = 0; i < s.length(); i++) {
634	634	char c = s.charAt(i);

731	731	private String currName;
732	732	private Node root;
733	733
734		private static Iterator nullIterator = new Iterator() {
	734	private static Iterator<Node> nullIterator = new Iterator<Node>() {
735	735	public boolean hasNext() {
736	736	return false;
737	737	}
738		public Object next() {
	738	public Node next() {
739	739	return null;
740	740	}
741	741	public void remove() {
742	742	}
743	743	};
744	744
745		private Comparator indexComparator = new Comparator() {
746		public int compare(Object o1, Object o2) {
747		Node n1 = (Node) o1;
748		Node n2 = (Node) o2;
	745	private Comparator<Node> indexComparator = new Comparator<Node>() {
	746	public int compare(Node n1, Node n2) {
749	747	return n1.getName().compareToIgnoreCase(n2.getName());
750	748	}
751	749

777	775
778	776	Node getChild(String name) {
779	777	if (children != null) {
780		for (Iterator iter = children.iterator(); iter.hasNext(); ) {
781		Node child = (Node) (iter.next());
	778	for (Iterator<Node> iter = children.iterator(); iter.hasNext(); ) {
	779	Node child = iter.next();
782	780	if (child.name.equals(name))
783	781	return child;
784	782	}

798	796	return (children == null ? 0 : children.size());
799	797	}
800	798
801		Iterator iterator() {
	799	Iterator<Node> iterator() {
802	800	return (children == null ? nullIterator : children.iterator());
803	801	}
804	802
805	803	private void add(Node child) {
806	804	if (children == null)
807		children = new TreeSet(indexComparator);
	805	children = new TreeSet<Node>(indexComparator);
808	806	children.add(child);
809	807	}
810	808
811	809	private String name;
812		private Set children;
	810	private Set<Node> children;
813	811	private String info;
814	812	}
815	813

+15

-15

src/com/sun/jct/utils/mapmerge/Main.java less more

124	124
125	125	public static class Ant extends MatchingTask {
126	126	private Main m = new Main();
127		private List/<FileSet>/ fileSets = new ArrayList/<FileSet>/();
	127	private List<FileSet> fileSets = new ArrayList<FileSet>();
128	128
129	129	public void setOutFile(File file) {
130	130	m.outFile = file;

135	135	}
136	136
137	137	public void execute() {
138		for (Iterator iter = fileSets.iterator(); iter.hasNext(); ) {
139		FileSet fs = (FileSet) iter.next();
	138	for (Iterator<FileSet> iter = fileSets.iterator(); iter.hasNext(); ) {
	139	FileSet fs = iter.next();
140	140	FileScanner s = fs.getDirectoryScanner(getProject());
141	141	m.addFiles(s.getBasedir(), s.getIncludedFiles());
142	142	}

153	153	public void addFiles(File baseDir, String[] paths) {
154	154	if (paths == null)
155	155	return;
156		List/<File>/ files = new ArrayList/<File>/();
	156	List<File> files = new ArrayList<File>();
157	157	if (inFiles != null)
158	158	files.addAll(Arrays.asList(inFiles));
159	159	for (int i = 0; i < paths.length; i++)
160	160	files.add(new File(baseDir, paths[i]));
161		inFiles = (File[]) files.toArray(new File[files.size()]);
	161	inFiles = files.toArray(new File[files.size()]);
162	162	}
163	163
164	164	private void run() throws BadArgs, IOException

170	170	if (outFile == null)
171	171	throw new BadArgs("no output file specified");
172	172
173		map = new TreeMap();
	173	map = new TreeMap<>();
174	174
175	175	for (int i = 0; i < inFiles.length; i++)
176	176	read(inFiles[i]);

183	183	out.println("<map version=\"1.0\">");
184	184
185	185	int maxLen = 0;
186		for (Iterator iter = map.entrySet().iterator(); iter.hasNext(); ) {
187		Map.Entry e = (Map.Entry) (iter.next());
188		String target = (String) (e.getKey());
189		String url = (String) (e.getValue());
	186	for (Iterator<Map.Entry<String, String>> iter = map.entrySet().iterator(); iter.hasNext(); ) {
	187	Map.Entry<String, String> e = iter.next();
	188	String target = e.getKey();
	189	String url = e.getValue();
190	190	maxLen = Math.max(maxLen, target.length());
191	191	}
192	192
193		for (Iterator iter = map.entrySet().iterator(); iter.hasNext(); ) {
194		Map.Entry e = (Map.Entry) (iter.next());
195		String target = (String) (e.getKey());
196		String url = (String) (e.getValue());
	193	for (Iterator<Map.Entry<String, String>> iter = map.entrySet().iterator(); iter.hasNext(); ) {
	194	Map.Entry<String, String> e = iter.next();
	195	String target = e.getKey();
	196	String url = e.getValue();
197	197	out.print(" <mapID target=\"" + target + "\" ");
198	198	for (int i = target.length(); i < maxLen; i++)
199	199	out.print(' ');

411	411
412	412	private File[] inFiles;
413	413	private File outFile;
414		private Map map;
	414	private Map<String, String> map;
415	415
416	416	private Reader in;
417	417	private int c;