Skip to content

Commit b8b24c5

Browse files
mbtaylormbtaylor
committed
updates for J2SE1.5
1 parent feb2b65 commit b8b24c5

File tree

67 files changed

+119
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+119
-121
lines changed

‎array/build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<property name="star.archive.dir" value="${basedir}"/>
6666

6767
<!-- URL and package-list for linking against full Java docs -->
68-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
68+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
6969
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
7070

7171
<!-- The environment CLASSPATH is ignored by Ant tasks. -->
@@ -479,7 +479,7 @@
479479
<all_permissions/>
480480
</security>
481481
<resources>
482-
<j2se version="1.4+"/>
482+
<j2se version="1.5+"/>
483483
<jar href="array/array.jar"/>
484484
<!--<extension name="FITS" href="fits.jnlp"/> FITS depends on this too!-->
485485
<extension name="HDS" href="hds.jnlp"/>

‎astgui/build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<property name="star.archive.dir" value="${basedir}"/>
6868

6969
<!-- URL and package-list for linking against full Java docs -->
70-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
70+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
7171
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
7272

7373
<!--
@@ -442,7 +442,7 @@
442442
<all_permissions/>
443443
</security>
444444
<resources>
445-
<j2se version="1.4+"/>
445+
<j2se version="1.5+"/>
446446
<jar href="astgui/astgui.jar"/>
447447
<extension name="JNIAST" href="jniast.jnlp"/>
448448
</resources>

‎astrogrid/build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<property name="star.archive.dir" value="${basedir}"/>
6868

6969
<!-- URL and package-list for linking against full Java docs -->
70-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
70+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
7171
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
7272

7373
<!--
@@ -474,7 +474,7 @@
474474
</security>
475475

476476
<resources>
477-
<j2se version="1.4+"/>
477+
<j2se version="1.5+"/>
478478

479479
<!-- Define the main library jar file -->
480480
<jar href="${name}/${name}.jar"/>

‎astrogrid/src/main/uk/ac/starlink/astrogrid/protocols/ivo/IvoURLConnection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public class IvoURLConnection extends URLConnection {
2424
* Constructor.
2525
*
2626
* @param aconn live connection to an ACR server
27-
* @param ivo:-type URL as used by ACR MySpace communication locating
28-
* the resource
27+
* @param url ivo:-type URL as used by ACR MySpace communication
28+
* locating the resource
2929
*/
3030
public IvoURLConnection( AcrConnection aconn, URL url ) {
3131
super( url );

‎axis/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
<all_permissions/>
216216
</security>
217217
<resources>
218-
<j2se version="1.4+"/>
218+
<j2se version="1.5+"/>
219219
<fileset dir="${dist.lib}" includes="**/*.jar **/*.zip"/>
220220
</resources>
221221
<component_desc/>

‎build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<property name="star.archive.dir" value="${basedir}"/>
6363

6464
<!-- URL and package-list for linking against full Java docs -->
65-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
65+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
6666
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
6767

6868
<!-- Webstart and jar signing properties. -->
@@ -383,7 +383,7 @@
383383
doctitle="${FullName}"
384384
protected="true"
385385
classpathref="classpath"
386-
source="1.4"
386+
source="1.5"
387387
maxmemory="512m">
388388

389389
<!-- Get all possible package names from the build/java

‎coco/build.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<property name="star.archive.dir" value="${basedir}"/>
7070

7171
<!-- URL and package-list for linking against full Java docs -->
72-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
72+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
7373
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
7474

7575
<!--
@@ -456,7 +456,7 @@
456456
<all_permissions/>
457457
</security>
458458
<resources>
459-
<j2se version="1.4+"/>
459+
<j2se version="1.5+"/>
460460
<jar href="${name}/${name}.jar"/>
461461
<extension name="PAL" href="pal.jnlp"/>
462462
</resources>
@@ -478,7 +478,7 @@
478478
<all_permissions/>
479479
</security>
480480
<resources>
481-
<j2se version="1.4+"/>
481+
<j2se version="1.5+"/>
482482
<jar href="${name}/${name}.jar"/>
483483
<extension name="PAL" href="pal.jnlp"/>
484484
</resources>

‎coco/src/main/uk/ac/starlink/coco/Coco.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void windowClosing( WindowEvent e ) {
5656
Container contentPane = getContentPane();
5757
contentPane.add( c );
5858
c.init();
59-
show();
59+
setVisible( true );
6060
c.start();
6161

6262
}

‎connect/build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<property name="star.archive.dir" value="${basedir}"/>
6868

6969
<!-- URL and package-list for linking against full Java docs -->
70-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
70+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
7171
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
7272

7373
<!--
@@ -499,7 +499,7 @@
499499
</security>
500500

501501
<resources>
502-
<j2se version="1.4+"/>
502+
<j2se version="1.5+"/>
503503

504504
<!-- Define the main library jar file -->
505505
<jar href="${name}/${name}.jar"/>

‎connect/src/main/uk/ac/starlink/connect/ConnectorAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public void actionPerformed( ActionEvent evt ) {
173173
final JDialog dialog = createDialog( parent );
174174

175175
if ( ! noAuth_ ) {
176-
dialog.show();
176+
dialog.setVisible( true );
177177
}
178178
else {
179179

@@ -184,7 +184,7 @@ public void actionPerformed( ActionEvent evt ) {
184184
* Is there a less weird way of doing this?? */
185185
SwingUtilities.invokeLater( new Runnable() {
186186
public void run() {
187-
dialog.show();
187+
dialog.setVisible( true );
188188
}
189189
} );
190190
SwingUtilities.invokeLater( new Runnable() {

‎datanode/build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<property name="star.archive.dir" value="${basedir}"/>
6868

6969
<!-- URL and package-list for linking against full Java docs -->
70-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
70+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
7171
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
7272

7373
<!--
@@ -597,7 +597,7 @@
597597
</security>
598598

599599
<resources>
600-
<j2se version="1.4+"/>
600+
<j2se version="1.5+"/>
601601

602602
<!-- Define the main library jar file -->
603603
<jar href="${name}/${name}.jar"/>

‎datanode/src/main/uk/ac/starlink/datanode/tree/TreeNodeChooser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ public DataNode chooseDataNode( Component parent, String buttonText,
417417
currentDialog.setTitle( title == null ? "Hierarchical browser"
418418
: title );
419419
chosenNode = null;
420-
currentDialog.show();
420+
currentDialog.setVisible( true );
421421
return chosenNode;
422422
}
423423

‎diva/build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<property name="star.archive.dir" value="${basedir}"/>
6868

6969
<!-- URL and package-list for linking against full Java docs -->
70-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
70+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
7171
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
7272

7373
<!--
@@ -432,7 +432,7 @@
432432
<all_permissions/>
433433
</security>
434434
<resources>
435-
<j2se version="1.4+"/>
435+
<j2se version="1.5+"/>
436436
<fileset dir="${dist.lib}" includes="**/*.jar **/*.zip"/>
437437
</resources>
438438
<component_desc/>

‎fits/build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<property name="star.archive.dir" value="${basedir}"/>
7373

7474
<!-- URL and package-list for linking against full Java docs -->
75-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
75+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
7676
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
7777

7878
<!-- Directory containing native libraries. -->
@@ -467,7 +467,7 @@
467467
<all_permissions/>
468468
</security>
469469
<resources>
470-
<j2se version="1.4+"/>
470+
<j2se version="1.5+"/>
471471
<jar href="fits/fits.jar"/>
472472
<extension name="TAMFITS" href="tamfits.jnlp"/>
473473
<extension name="ARRAY" href="array.jnlp"/>

‎frog/build.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<property name="star.archive.dir" value="${basedir}"/>
8080

8181
<!-- URL and package-list for linking against full Java docs -->
82-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
82+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
8383
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
8484

8585
<!--
@@ -553,7 +553,7 @@
553553
<all_permissions/>
554554
</security>
555555
<resources>
556-
<j2se version="1.4+"/>
556+
<j2se version="1.5+"/>
557557
<jar href="frog/frog.jar"/>
558558
<extension name="FROG-PARTS" href="${name}-parts.jnlp"/>
559559
<extension name="ASTGUI" href="astgui.jnlp"/>
@@ -583,7 +583,7 @@
583583
<all_permissions/>
584584
</security>
585585
<resources>
586-
<j2se version="1.4+"/>
586+
<j2se version="1.5+"/>
587587
<fileset dir="${dist.lib}" includes="**/*.jar **/*.zip"/>
588588
</resources>
589589
<component_desc/>

‎hds/build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<property name="star.lib.arch" value="${star.install}/lib/${os.arch}"/>
7676

7777
<!-- URL and package-list for linking against full Java docs -->
78-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
78+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
7979
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
8080

8181
<!--
@@ -425,7 +425,7 @@
425425
<all_permissions/>
426426
</security>
427427
<resources>
428-
<j2se version="1.4+"/>
428+
<j2se version="1.5+"/>
429429
<jar href="hds/hds.jar"/>
430430
<extension name="JNIHDS" href="jnihds.jnlp"/>
431431
</resources>

‎hdx/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@
463463
<all_permissions/>
464464
</security>
465465
<resources>
466-
<j2se version="1.4+"/>
466+
<j2se version="1.5+"/>
467467
<jar href="${name}/${name}.jar"/>
468468
<extension name="UTIL" href="util.jnlp"/>
469469
</resources>

‎help/build.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<property name="star.archive.dir" value="${basedir}"/>
6868

6969
<!-- URL and package-list for linking against full Java docs -->
70-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
70+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
7171
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
7272

7373
<!--
@@ -464,7 +464,7 @@
464464
</security>
465465

466466
<resources>
467-
<j2se version="1.4+"/>
467+
<j2se version="1.5+"/>
468468
<fileset dir="${dist.lib}" includes="**/*.jar **/*.zip"
469469
excludes="**/jhall.jar"/>
470470
<extension name="JAVAHELP" href="javahelp.jnlp"/>
@@ -492,7 +492,7 @@
492492
</security>
493493

494494
<resources>
495-
<j2se version="1.4+"/>
495+
<j2se version="1.5+"/>
496496
<fileset dir="${dist.lib}" includes="**/jhall.jar"/>
497497
</resources>
498498

‎jaiutil/build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<property name="star.archive.dir" value="${basedir}"/>
6868

6969
<!-- URL and package-list for linking against full Java docs -->
70-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
70+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
7171
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
7272

7373
<!--
@@ -462,7 +462,7 @@
462462
<all_permissions/>
463463
</security>
464464
<resources>
465-
<j2se version="1.4+"/>
465+
<j2se version="1.5+"/>
466466
<jar href="jaiutil/jaiutil.jar"/>
467467
<extension name="HDX" href="hdx.jnlp"/>
468468
<extension name="NDX" href="ndx.jnlp"/>

‎jetty/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
<all_permissions/>
214214
</security>
215215
<resources>
216-
<j2se version="1.4+"/>
216+
<j2se version="1.5+"/>
217217
<fileset dir="${dist.lib}" includes="**/*.jar **/*.zip"/>
218218
</resources>
219219
<component_desc/>

‎jniast/build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<property name="star.archive.dir" value="${basedir}"/>
6868

6969
<!-- URL and package-list for linking against full Java docs -->
70-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
70+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
7171
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
7272

7373
<!-- The environment CLASSPATH is ignored by Ant tasks. -->
@@ -982,7 +982,7 @@
982982
<all_permissions/>
983983
</security>
984984
<resources>
985-
<j2se version="1.4+"/>
985+
<j2se version="1.5+"/>
986986
<jar href="${name}/${name}.jar"/>
987987
<extension name="UTIL" href="util.jnlp"/>
988988
</resources>

‎jnihds/build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<property name="star.archive.dir" value="${basedir}"/>
6767

6868
<!-- URL and package-list for linking against full Java docs -->
69-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
69+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
7070
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
7171

7272
<!-- The environment CLASSPATH is ignored by Ant tasks. -->
@@ -630,7 +630,7 @@
630630
<all_permissions/>
631631
</security>
632632
<resources>
633-
<j2se version="1.4+"/>
633+
<j2se version="1.5+"/>
634634
<jar href="${name}/${name}.jar"/>
635635
<extension name="UTIL" href="util.jnlp"/>
636636
</resources>

‎jnikappa/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<property name="star.archive.dir" value="${basedir}"/>
6767

6868
<!-- URL and package-list for linking against full Java docs -->
69-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
69+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
7070
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
7171

7272
<!-- The environment CLASSPATH is ignored by Ant tasks. -->

‎jpcs/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<property name="star.archive.dir" value="${basedir}"/>
6767

6868
<!-- URL and package-list for linking against full Java docs -->
69-
<property name="javaapi.url" value="http://java.sun.com/j2se/1.4/docs/api/"/>
69+
<property name="javaapi.url" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
7070
<property name="javaapi.lis" value="${star.build.dir}/src/docs/javaapi/"/>
7171

7272
<!-- The environment CLASSPATH is ignored by Ant tasks. -->

‎jsamp/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
</security>
225225

226226
<resources>
227-
<j2se version="1.4+"/>
227+
<j2se version="1.5+"/>
228228
<fileset dir="${dist.lib}" includes="**/*.jar **/*.zip"/>
229229
</resources>
230230

0 commit comments

Comments
 (0)