splat: avoid nom.tam.fits.HeaderCard(String) constructor

The FitsConstants.createHeaderCard(String) method works on all known versions of nom.tam.fits; the HeaderCard(String) constructor does not exist in recent versions.
Starlink · Nov 10, 2017 · c5066e7 · c5066e7
1 parent b4f6631
commit c5066e7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/splat/src/main/uk/ac/starlink/splat/data/FITSSpecDataImpl.java b/splat/src/main/uk/ac/starlink/splat/data/FITSSpecDataImpl.java
@@ -202,7 +202,7 @@ public String getProperty( String key )
             // All FITS keywords are uppercase.
             String scard = getFitsHeaders().findKey( key.toUpperCase() );
             if ( scard != null ) {
-                HeaderCard card = new HeaderCard( scard );
+                HeaderCard card = HeaderCard.create( scard );
                 if ( card != null ) {
                     return card.getValue();
                 }
@@ -371,7 +371,7 @@ protected void openForRead( String fileName )
                 scard = getFitsHeaders().findKey( "UNITS" );
             }
             if ( scard != null ) {
-                HeaderCard card = new HeaderCard( scard );
+                HeaderCard card = HeaderCard.create( scard );
                 if ( card != null ) {
                     setDataUnits( card.getValue() );
                 }
@@ -382,7 +382,7 @@ protected void openForRead( String fileName )
                 scard = getFitsHeaders().findKey( "OBJECT" );
             }
             if ( scard != null ) {
-                HeaderCard card = new HeaderCard( scard );
+                HeaderCard card = HeaderCard.create( scard );
                 if ( card != null ) {
                     setDataLabel( card.getValue() );
                 }
@@ -590,7 +590,7 @@ protected void saveAst( Header header )
                 while ( ok ) {
                     buffer = chan.nextCard();
                     if ( buffer != null && ! "".equals( buffer ) ) {
-                        iter.add( new HeaderCard( buffer ) );
+                        iter.add( HeaderCard.create( buffer ) );
                     }
                     else {
                         ok = false;
@@ -606,7 +606,7 @@ protected void saveAst( Header header )
                 while ( ok ) {
                     buffer = chan.nextCard();
                     if ( buffer != null && ! "".equals( buffer ) ) {
-                        card = new HeaderCard( buffer );
+                        card = HeaderCard.create( buffer );
                         key = card.getKey();
 
                         // Removes existing card and position either

diff --git a/splat/src/main/uk/ac/starlink/splat/data/MEMSpecDataImpl.java b/splat/src/main/uk/ac/starlink/splat/data/MEMSpecDataImpl.java
@@ -189,7 +189,7 @@ public String getProperty( String prop )
         if ( getFitsHeaders() != null ) {
             String scard = getFitsHeaders().findKey( prop );
             if ( scard != null ) {
-                HeaderCard card = new HeaderCard( scard );
+                HeaderCard card = HeaderCard.create( scard );
                 if ( card != null ) {
                     return card.getValue();
                 }

diff --git a/splat/src/main/uk/ac/starlink/splat/data/NDFSpecDataImpl.java b/splat/src/main/uk/ac/starlink/splat/data/NDFSpecDataImpl.java
@@ -187,7 +187,7 @@ public String getProperty( String key )
             if ( headers != null ) {
                 String scard = headers.findKey( key );
                 if ( scard != null ) {
-                    HeaderCard card = new HeaderCard( scard );
+                    HeaderCard card = HeaderCard.create( scard );
                     if ( card != null ) {
                         return card.getValue();
                     }
@@ -212,7 +212,7 @@ public Header getFitsHeaders()
                 Cursor iter = header.iterator();
                 HeaderCard card;
                 for ( int i = 0; i < size; i++ ) {
-                    card = new HeaderCard( theNDF.getFitsHeader( i ) );
+                    card = HeaderCard.create( theNDF.getFitsHeader( i ) );
                     if ( card.isKeyValuePair() ) {
                         iter.add( card.getKey(), card );
                     }