Skip to content
This repository was archived by the owner on Jan 30, 2019. It is now read-only.

Commit 05db868

Browse files
author
brinkley
committed
demos updated
svn path=/trunk/; revision=22
1 parent d87b78e commit 05db868

File tree

29 files changed

+61
-72
lines changed

29 files changed

+61
-72
lines changed

‎jhMaster/JavaHelp/demos/GNUmakefile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
.PHONY: validate
4747

4848
SUBDIRS = hs apidoc object jhdemo idedemo searchdemo merge newmerge browser newbrowser lib bin
49-
JAVACFLAGS=-target 1.1
5049

5150
DTDPATH = ../doc/public-spec/dtd
5251
ifeq ($(XMLHOME),)
@@ -62,15 +61,15 @@ all: validate
6261
@for dir in $(SUBDIRS) ; do \
6362
echo "" ; \
6463
cd $$dir ; \
65-
$(MAKE) "JAVACFLAGS=$(JAVACFLAGS)" $@ ; \
64+
$(MAKE) $@ ; \
6665
cd .. ; \
6766
done
6867

6968
clean:
7069
@for dir in $(SUBDIRS) ; do \
7170
echo "" ; \
7271
cd $$dir ; \
73-
$(MAKE) "JAVACFLAGS=$(JAVACFLAGS)" $@ ; \
72+
$(MAKE) $@ ; \
7473
cd .. ; \
7574
done
7675

@@ -82,7 +81,7 @@ validate: jaxp_jars Validator.class $(XML_FILES) $(HS_FILES) $(JHM_FILES)
8281

8382
%.class: %.java
8483
export CLASSPATH; CLASSPATH=$(CLASSPATH):parser.jar ; \
85-
javac $(JAVACFLAGS) $<
84+
javac $<
8685

8786
jaxp_jars: $(JAXP_FILES)
8887
cp -f $(JAXP_FILES) ./

‎jhMaster/JavaHelp/demos/apidoc/GNUmakefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ JDKHOME=/java/re/j2se/1.3.1/archive/fcs/solsparc
4949
endif
5050

5151
CLASSPATH=.:../../javahelp/lib/jhall.jar:$(JDKHOME)/lib/tools.jar
52-
JAVACFLAGS=-target 1.1
5352

5453
# doclet classes
5554
DCLASSDIR= dclasses
@@ -168,7 +167,7 @@ clean:
168167

169168
$(DCLASSDIR)/$(DOCDIR)/%.class: $(DOCDIR)/%.java
170169
export CLASSPATH; CLASSPATH=$(CLASSPATH) ; \
171-
javac $(JAVACFLAGS) -d $(DCLASSDIR) $<
170+
javac -d $(DCLASSDIR) $<
172171

173172
$(DCLASSDIR)/$(DOCDIR)/resources/%.properties: $(DOCDIR)/resources/%.properties
174173
cp $< $@

‎jhMaster/JavaHelp/demos/apidoc/sunw/demo/doclet/HtmlWriter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ public static String getText(String key, String a1, String a2, String a3) {
669669
args[0] = a1;
670670
args[1] = a2;
671671
args[2] = a3;
672-
return MessageFormat.format(message, args);
672+
return MessageFormat.format(message, (java.lang.Object[]) args);
673673
} catch (MissingResourceException e) {
674674
throw new Error("Fatal: Resource for javadoc is broken. There is no " + key + " key in resource.");
675675
}

‎jhMaster/JavaHelp/demos/apidoc/sunw/demo/doclet/IndexWriter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,14 @@ void makeIndex() {
183183
out.println("<?xml version='1.0' encoding='ISO-8859-1' standalone='yes' ?>");
184184
out.println("<index version=\"1.0\">");
185185

186-
Enumeration enum=table.keys();
186+
Enumeration enum1=table.keys();
187187

188188
String[] keys=new String[table.size()];
189189

190190
int c=0;
191191

192-
while (enum.hasMoreElements()) {
193-
keys[c++]=(String)enum.nextElement();
192+
while (enum1.hasMoreElements()) {
193+
keys[c++]=(String)enum1.nextElement();
194194
}
195195

196196

‎jhMaster/JavaHelp/demos/browser/GNUmakefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ IDEIMAGES_JAR = ../idedemo/images.jar
5555

5656
CLASSPATH =classes:../../javahelp/lib/jhall.jar
5757
CLASSDIR=classes
58-
JAVACFLAGS=-target 1.1
5958

6059
BROWSERDIR=sunw/demo/browser
6160

@@ -96,7 +95,7 @@ clean:
9695

9796
$(CLASSDIR)/%.class: %.java
9897
export CLASSPATH; CLASSPATH=$(CLASSPATH) ; \
99-
javac $(JAVACFLAGS) -d $(CLASSDIR) $<
98+
javac -d $(CLASSDIR) $<
10099

101100
$(CLASSDIR)/%.properties: %.properties
102101
cp $< $@

‎jhMaster/JavaHelp/demos/hs/GNUmakefile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@
4646

4747
SUBDIRS = holidays i18n idehelp merge animals invertebrates pictures vertebrates newmerge
4848

49-
JAVACFLAGS=-target 1.1
50-
5149
all clean:
5250
@for dir in $(SUBDIRS) ; do \
5351
echo "" ; \

‎jhMaster/JavaHelp/demos/hs/animals/Animals.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version='1.0' encoding='ISO-8859-1' ?>
22
<!DOCTYPE helpset
3-
PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 1.0//EN"
4-
"http://java.sun.com/products/javahelp/helpset_1_0.dtd">
3+
PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 2.0//EN"
4+
"http://java.sun.com/products/javahelp/helpset_2_0.dtd">
55

6-
<helpset version="1.0">
6+
<helpset version="2.0">
77

88
<!-- title -->
99
<title>Animal Categories</title>

‎jhMaster/JavaHelp/demos/hs/animals/AnimalsTOC.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<!DOCTYPE toc
4444
PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN"
4545
"http://java.sun.com/products/javahelp/toc_2_0.dtd">
46-
<toc version="2.0"categoryclosedimage="chapter" topicimage="topic" >
46+
<toc version="2.0" categoryclosedimage="chapter" topicimage="topic" >
4747
<tocitem text="Animal Categories">
4848
<tocitem text="Vertebrates" target="vertebrates"/>
4949
<tocitem text="Invertebrates" target="invertebrates" />

‎jhMaster/JavaHelp/demos/hs/holidays/HolidayHistory.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version='1.0' encoding='ISO-8859-1' ?>
22
<!DOCTYPE helpset
33
PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 2.0//EN"
4-
"../dtd/helpset_2_0.dtd">
4+
"http://java.sun.com/products/javahelp/helpset_2_0.dtd">
55

66
<?MyFavoriteApplication this is data for my favorite application ?>
77

8-
<helpset version="1.0">
8+
<helpset version="2.0">
99

1010
<!-- title -->
1111
<title>History of the Holidays</title>

‎jhMaster/JavaHelp/demos/hs/holidays/HolidayHistoryTop.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version='1.0' encoding='ISO-8859-1' ?>
22
<!DOCTYPE helpset
3-
PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 1.0//EN"
4-
"http://java.sun.com/products/javahelp/helpset_1_0.dtd">
3+
PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 2.0//EN"
4+
"http://java.sun.com/products/javahelp/helpset_2_0.dtd">
55

6-
<helpset version="1.0">
6+
<helpset version="2.0">
77

88
<!-- title -->
99
<title>History of the Holidays</title>

0 commit comments

Comments
 (0)