diff -Nru starjava-connect-0.1+2016.05.03/build.xml starjava-connect-0.1+2019.07.12/build.xml
--- starjava-connect-0.1+2016.05.03/build.xml	2016-05-03 09:40:27.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/build.xml	2019-07-12 13:01:01.000000000 +0000
@@ -88,7 +88,7 @@
   <property name="debug" value="true"/>
   <property name="deprecation" value="false"/>
   <property name="optimize" value="true"/>
-  <property name="source.version" value="1.4"/>
+  <property name="source.version" value="1.6"/>
 
   <!-- Extra task options, if any -->
   <property name="chmod.fail" value="false"/>
@@ -325,16 +325,6 @@
   <property name="tests-libpath" refid="tests-libpath.id"/>
 
   <!--
-   !    ===============
-   !    Extension tasks
-   !    ===============
-   !    Add any local or extension ANT tasks that are required. Local
-   !    tasks should be moved into the ANT package if used outside of this
-   !    package. 
-   !-->
-  <taskdef resource="axis-tasks.properties" classpathref="classpath"/>
-
-  <!--
    !    =========================================
    !    Check availability of direct dependencies
    !    =========================================
@@ -407,6 +397,7 @@
            deprecation="${deprecation}"
            source="${source.version}"
            optimize="${optimize}">
+      <compilerarg value="-Xlint:all,-path,-serial"/>
 
       <classpath refid="classpath"/>
 
@@ -460,12 +451,15 @@
     </jar>
 
     <!-- Sign all jar files -->
+    <antcall target="signjars"/>
+  </target>
+     
+  <target name="signjars" if="sign.jars">
     <signjar jar="${dist.lib.pkg}/${name}.jar"
              alias="${webstart.alias}"
              keystore="${webstart.keystore}"
              keypass="${webstart.keypass}"
              storepass="${webstart.storepass}"/>
-
   </target>
 
   <!--
@@ -496,7 +490,7 @@
        </security>
 
        <resources>
-         <j2se version="1.5+"/>
+         <j2se version="1.6+"/>
 
          <!-- Define the main library jar file -->
          <jar href="${name}/${name}.jar"/>
@@ -899,6 +893,7 @@
              defaultexcludes="yes"
              source="${source.version}"
              classpathref="classpath">
+      <arg value="-Xdoclint:all,-missing"/>
 
       <!-- Get a list of directories that name all the potential
        !   java packages -->
diff -Nru starjava-connect-0.1+2016.05.03/debian/changelog starjava-connect-0.1+2019.07.12/debian/changelog
--- starjava-connect-0.1+2016.05.03/debian/changelog	2018-11-17 20:30:44.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/debian/changelog	2019-08-01 14:15:18.000000000 +0000
@@ -1,3 +1,12 @@
+starjava-connect (0.1+2019.07.12-1) unstable; urgency=low
+
+  * New upstream version 0.1+2019.07.12. Rediff patches
+  * Push Standards-Version to 4.4.0. No changes required
+  * Push compat to 12. Remove d/compat
+  * Add gitlab-ci for salsa
+
+ -- Ole Streicher <olebole@debian.org>  Thu, 01 Aug 2019 16:15:18 +0200
+
 starjava-connect (0.1+2016.05.03-2) unstable; urgency=low
 
   * Update VCS fields to use salsa.d.o
diff -Nru starjava-connect-0.1+2016.05.03/debian/compat starjava-connect-0.1+2019.07.12/debian/compat
--- starjava-connect-0.1+2016.05.03/debian/compat	2018-11-17 20:30:20.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru starjava-connect-0.1+2016.05.03/debian/control starjava-connect-0.1+2019.07.12/debian/control
--- starjava-connect-0.1+2016.05.03/debian/control	2018-11-17 20:30:25.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/debian/control	2019-08-01 14:14:45.000000000 +0000
@@ -3,13 +3,13 @@
 Uploaders: Ole Streicher <olebole@debian.org>
 Section: java
 Priority: optional
-Build-Depends: ant, debhelper (>= 11), dh-exec, javahelper
+Build-Depends: ant, debhelper-compat (= 12), dh-exec, javahelper
 Build-Depends-Indep: ant-optional,
                      default-jdk,
                      default-jdk-doc,
                      junit,
                      starlink-util-java
-Standards-Version: 4.2.1
+Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/debian-astro-team/starjava-connect
 Vcs-Git: https://salsa.debian.org/debian-astro-team/starjava-connect.git
 Homepage: https://github.com/Starlink/starjava/tree/master/connect
diff -Nru starjava-connect-0.1+2016.05.03/debian/gitlab-ci.yml starjava-connect-0.1+2019.07.12/debian/gitlab-ci.yml
--- starjava-connect-0.1+2016.05.03/debian/gitlab-ci.yml	1970-01-01 00:00:00.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/debian/gitlab-ci.yml	2019-08-01 14:15:01.000000000 +0000
@@ -0,0 +1,8 @@
+
+include: 
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+variables:
+ RELEASE: 'unstable'
+ 
\ No newline at end of file
diff -Nru starjava-connect-0.1+2016.05.03/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch starjava-connect-0.1+2019.07.12/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch
--- starjava-connect-0.1+2016.05.03/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch	2018-11-17 20:28:19.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch	2019-08-01 14:14:02.000000000 +0000
@@ -21,11 +21,11 @@
 
  * Don't sign the jarfile
 ---
- build.xml | 55 ++++++++++++++++++++++++-------------------------------
- 1 file changed, 24 insertions(+), 31 deletions(-)
+ build.xml | 57 ++++++++++++++++++++++++---------------------------------
+ 1 file changed, 24 insertions(+), 33 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index 01d512a..1fabddf 100644
+index b5fbdac..80458a1 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -32,12 +32,6 @@
@@ -115,15 +115,7 @@
    </path>
  
    <!-- Turn this path into a string which is passed to the tests -->
-@@ -332,7 +327,6 @@
-    !    tasks should be moved into the ANT package if used outside of this
-    !    package. 
-    !-->
--  <taskdef resource="axis-tasks.properties" classpathref="classpath"/>
- 
-   <!--
-    !    =========================================
-@@ -405,7 +399,8 @@
+@@ -395,7 +390,8 @@
             destdir="${build.classes}"
             debug="${debug}"
             deprecation="${deprecation}"
@@ -131,9 +123,9 @@
 +           encoding="cp1252"
 +           includeantruntime="false"
             optimize="${optimize}">
+       <compilerarg value="-Xlint:all,-path,-serial"/>
  
-       <classpath refid="classpath"/>
-@@ -451,6 +446,10 @@
+@@ -442,6 +438,10 @@
            description="-> creates the package jar file(s)">
  
      <mkdir dir="${dist.lib.pkg}"/>
@@ -144,30 +136,33 @@
      <jar destfile="${dist.lib.pkg}/${name}.jar"
           basedir="${build.classes}">
        <manifest>
-@@ -459,13 +458,6 @@
+@@ -450,16 +450,6 @@
        </manifest>
      </jar>
  
 -    <!-- Sign all jar files -->
+-    <antcall target="signjars"/>
+-  </target>
+-     
+-  <target name="signjars" if="sign.jars">
 -    <signjar jar="${dist.lib.pkg}/${name}.jar"
 -             alias="${webstart.alias}"
 -             keystore="${webstart.keystore}"
 -             keypass="${webstart.keypass}"
 -             storepass="${webstart.storepass}"/>
--
    </target>
  
    <!--
-@@ -897,7 +889,7 @@
+@@ -891,7 +881,7 @@
               windowtitle="${Name} API"
               doctitle="${Name}"
               defaultexcludes="yes"
 -             source="${source.version}"
 +             encoding="cp1252"
               classpathref="classpath">
+       <arg value="-Xdoclint:all,-missing"/>
  
-       <!-- Get a list of directories that name all the potential
-@@ -978,7 +970,8 @@
+@@ -973,7 +963,8 @@
      <javac srcdir="${tests.dir}"
             destdir="${build.tests}"
             debug="${debug}"
diff -Nru starjava-connect-0.1+2016.05.03/debian/patches/Make-starjava-connect-reproducible.patch starjava-connect-0.1+2019.07.12/debian/patches/Make-starjava-connect-reproducible.patch
--- starjava-connect-0.1+2016.05.03/debian/patches/Make-starjava-connect-reproducible.patch	2018-11-17 20:28:19.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/debian/patches/Make-starjava-connect-reproducible.patch	2019-08-01 14:14:02.000000000 +0000
@@ -7,12 +7,12 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/build.xml b/build.xml
-index 1fabddf..2c63aba 100644
+index 80458a1..7b03256 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -892,6 +892,7 @@
-              encoding="cp1252"
+@@ -885,6 +885,7 @@
               classpathref="classpath">
+       <arg value="-Xdoclint:all,-missing"/>
  
 +      <arg value="-notimestamp"/>
        <!-- Get a list of directories that name all the potential
diff -Nru starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/BranchComboBox.java starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/BranchComboBox.java
--- starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/BranchComboBox.java	2016-05-03 09:40:27.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/BranchComboBox.java	2019-07-12 13:01:01.000000000 +0000
@@ -31,6 +31,7 @@
  * @author   Mark Taylor (Starlink)
  * @since    18 Feb 2005
  */
+@SuppressWarnings({"rawtypes","unchecked"})
 public class BranchComboBox extends JComboBox {
 
     private BranchComboBoxModel model_;
@@ -217,9 +218,10 @@
         public void addBranch( Branch branch ) {
             int oldSize = getSize();
             final BranchHolder holder = new BranchHolder( branch );
-            List hlist = new ArrayList( Arrays.asList( holders_ ) );
+            List<BranchHolder> hlist =
+                new ArrayList<BranchHolder>( Arrays.asList( holders_ ) );
             hlist.add( holder );
-            holders_ = (BranchHolder[]) hlist.toArray( new BranchHolder[ 0 ] );
+            holders_ = hlist.toArray( new BranchHolder[ 0 ] );
             fireIntervalAdded( this,
                                Math.max( 0, oldSize - 1 ), getSize() - 1 );
 
@@ -377,13 +379,13 @@
          * @param  branch  new branch
          */
         void setBranch( Branch branch ) {
-            List ancestors = new ArrayList();
+            List<Branch> ancestors = new ArrayList<Branch>();
             for ( Branch ancestor = branch; ancestor != null;
                   ancestor = ancestor.getParent() ) {
                 ancestors.add( ancestor );
             }
             Collections.reverse( ancestors );
-            chain_ = (Branch[]) ancestors.toArray( new Branch[ 0 ] );
+            chain_ = ancestors.toArray( new Branch[ 0 ] );
         }
 
         /**
diff -Nru starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/Connection.java starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/Connection.java
--- starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/Connection.java	2016-05-03 09:40:27.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/Connection.java	2019-07-12 13:01:01.000000000 +0000
@@ -19,7 +19,7 @@
  */
 public abstract class Connection {
 
-    private final Map keys_;
+    private final Map<AuthKey,?> keys_;
     private final Connector connector_;
     private boolean tidy_;
     private LogoutThread shutdownHook_;
@@ -30,7 +30,7 @@
      * Constructs a connection with no information.
      */
     protected Connection() {
-        this( null, new HashMap() );
+        this( null, new HashMap<AuthKey,Object>() );
     }
 
     /**
@@ -38,13 +38,13 @@
      * it was created.
      *
      * @param   connector   Connector which generated this connection
-     * @param   keys   {@link AuthKey} -> value map giving the set of
-     *          authorization values used when opening this connection
+     * @param   keys   map giving the set of authorization values
+     *                 used when opening this connection
      */
-    protected Connection( Connector connector, Map keys ) {
+    protected Connection( Connector connector, Map<AuthKey,?> keys ) {
         connector_ = connector;
-        keys_ = keys == null ? new HashMap()
-                             : new HashMap( keys );
+        keys_ = keys == null ? new HashMap<AuthKey,Object>()
+                             : new HashMap<AuthKey,Object>( keys );
     }
 
     /**
@@ -56,7 +56,7 @@
      *           or null
      */
     public Object getAuthValue( AuthKey key ) {
-        return (String) keys_.get( key );
+        return keys_.get( key );
     }
 
     /**
@@ -73,11 +73,15 @@
      * Hopefully it will return true until {@link #logOut} has been called,
      * but it's possible that the connection may expire for some reason
      * before that.
+     *
+     * @return   true iff connection is up
      */
     public abstract boolean isConnected();
 
     /**
      * Closes this connection.
+     *
+     * @throws   IOException  if something went wrong
      */
     public abstract void logOut() throws IOException;
 
diff -Nru starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/ConnectorAction.java starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/ConnectorAction.java
--- starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/ConnectorAction.java	2016-05-03 09:40:27.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/ConnectorAction.java	2019-07-12 13:01:01.000000000 +0000
@@ -13,7 +13,6 @@
 import java.beans.PropertyChangeListener;
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.logging.Logger;
 import javax.swing.AbstractAction;
@@ -51,7 +50,7 @@
 
     private final Connector connector_;
     private final JPanel entryPanel_;
-    private final Map fieldMap_;
+    private final Map<AuthKey,JTextField> fieldMap_;
     private final Action okAction_;
     private final boolean noAuth_;
     private final static Logger logger_ =
@@ -88,7 +87,7 @@
         JPanel stack = new JPanel( layer );
         AuthKey[] keys = connector.getKeys();
         noAuth_ = keys.length == 0;
-        fieldMap_ = new HashMap();
+        fieldMap_ = new HashMap<AuthKey,JTextField>();
         JTextField firstField = null;
         JTextField firstEmpty = null;
         for ( int i = 0; i < keys.length; i++ ) {
@@ -99,7 +98,7 @@
             c.insets = new Insets( 2, 2, 0, 0 );
             c.gridy = i;
             c.gridx = 0;
-            c.anchor = c.WEST;
+            c.anchor = GridBagConstraints.WEST;
             JLabel label = new JLabel( key.getName() + ": " );
 
             /* Place a text entry field for this key. */
@@ -107,7 +106,7 @@
             stack.add( label );
             c.gridx = 1;
             c.weightx = 1.0;
-            c.fill = c.HORIZONTAL;
+            c.fill = GridBagConstraints.HORIZONTAL;
             JTextField field = key.isHidden() 
                              ? (JTextField) new JPasswordField( 20 )
                              : new JTextField( 20 );
@@ -296,9 +295,8 @@
 
         /* Prepare a map of authorization key -> value pairs to describe
          * the login attempt. */
-        Map valueMap = new HashMap();
-        for ( Iterator it = fieldMap_.keySet().iterator(); it.hasNext(); ) {
-            AuthKey key = (AuthKey) it.next();
+        Map<AuthKey,Object> valueMap = new HashMap<AuthKey,Object>();
+        for ( AuthKey key : fieldMap_.keySet() ) {
             Object value;
             if ( key.isHidden() ) {
                 JPasswordField field = (JPasswordField) fieldMap_.get( key );
@@ -306,7 +304,7 @@
                 value = pass == null || pass.length == 0 ? null : pass;
             }
             else {
-                JTextField field = (JTextField) fieldMap_.get( key );
+                JTextField field = fieldMap_.get( key );
                 String text = field.getText();
                 value = text == null || text.length() == 0 ? null : text;
             }
@@ -327,7 +325,7 @@
      *
      * @param  authorization key-value pairs
      */
-    private void attemptLogin( final Map authMap ) {
+    private void attemptLogin( final Map<AuthKey,?> authMap ) {
 
         /* Asynchronously attempt to make a connection using these values. */
         setEnabled( false );
@@ -364,8 +362,8 @@
     public void setEnabled( boolean enabled ) {
         super.setEnabled( enabled );
         okAction_.setEnabled( enabled );
-        for ( Iterator it = fieldMap_.keySet().iterator(); it.hasNext(); ) {
-            ((JTextField) fieldMap_.get( it.next() )).setEnabled( enabled );
+        for ( JTextField field : fieldMap_.values() ) {
+            field.setEnabled( enabled );
         }
     }
 
diff -Nru starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/Connector.java starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/Connector.java
--- starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/Connector.java	2016-05-03 09:40:27.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/Connector.java	2019-07-12 13:01:01.000000000 +0000
@@ -15,6 +15,8 @@
     /**
      * Returns the name of the type of facility to which this connector
      * can connect.
+     *
+     * @return  connector type
      */
     String getName();
 
@@ -46,12 +48,12 @@
      * or <tt>null</tt> (<tt>char[]</tt> may be used for hidden values for
      * security reasons).
      *
-     * @param    authValues   AuthKey->value map containing connection
+     * @param    authValues   AuthKey-&gt;value map containing connection
      *           information
      * @return   a live connection object
      * @throws   IOException  if there was some error, for instance
      *           authorization failure
      */
-    Connection logIn( Map authValues ) throws IOException;
+    Connection logIn( Map<AuthKey,?> authValues ) throws IOException;
 
 }
diff -Nru starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/ConnectorManager.java starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/ConnectorManager.java
--- starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/ConnectorManager.java	2016-05-03 09:40:27.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/ConnectorManager.java	2019-07-12 13:01:01.000000000 +0000
@@ -46,13 +46,12 @@
      */
     public static Connector[] getConnectors() {
         if ( connectors_ == null ) {
-            connectors_ = 
-                (Connector[]) Loader.getClassInstances( KNOWN_CONNECTORS, 
-                                                        CONNECTORS_PROPERTY,
-                                                        Connector.class )
-                                    .toArray( new Connector[ 0 ] );
+            connectors_ = Loader.getClassInstances( KNOWN_CONNECTORS, 
+                                                    CONNECTORS_PROPERTY,
+                                                    Connector.class )
+                                .toArray( new Connector[ 0 ] );
         }
-        return (Connector[]) connectors_.clone();
+        return connectors_.clone();
     }
 
     /**
@@ -75,7 +74,7 @@
                 connectorActions_[ i ] = new ConnectorAction( connectors[ i ] );
             }
         }
-        return (ConnectorAction[]) connectorActions_.clone();
+        return connectorActions_.clone();
     }
 
     /**
@@ -86,6 +85,7 @@
      * informed of any errors that occur and invited to retry.
      *
      * @param  parent component for the dialogue
+     * @param  connector   connector
      * @return  new connection, or null
      */
     public static Connection showConnectionDialog( Component parent, 
diff -Nru starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/FileBranch.java starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/FileBranch.java
--- starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/FileBranch.java	2016-05-03 09:40:27.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/FileBranch.java	2019-07-12 13:01:01.000000000 +0000
@@ -36,14 +36,14 @@
         if ( files == null ) {
             return new Node[ 0 ];
         }
-        List nodeList = new ArrayList( files.length );
+        List<Node> nodeList = new ArrayList<Node>( files.length );
         for ( int i = 0; i < files.length; i++ ) {
             File file = files[ i ];
             if ( ! hidingEnabled_ || ! fsv_.isHiddenFile( file ) ) {
                 nodeList.add( createNode( file ) );
             }
         }
-        return (Node[]) nodeList.toArray( new Node[ 0 ] );
+        return nodeList.toArray( new Node[ 0 ] );
     }
 
     public Node createNode( String location ) {
diff -Nru starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/FilestoreChooser.java starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/FilestoreChooser.java
--- starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/FilestoreChooser.java	2016-05-03 09:40:27.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/FilestoreChooser.java	2019-07-12 13:01:01.000000000 +0000
@@ -57,6 +57,7 @@
  * @author   Mark Taylor (Starlink)
  * @since    18 Feb 2005
  */
+@SuppressWarnings({"unchecked","rawtypes","deprecation"})
 public class FilestoreChooser extends JPanel {
 
     private final BranchComboBox branchSelector_;
@@ -75,7 +76,7 @@
     private Branch currentBranch_;
     private Branch prevBranch_;
     private ConnectorAction connectorAction_;
-    private List connectorActions_;
+    private List<ConnectorAction> connectorActions_;
     private static Logger logger_ = 
         Logger.getLogger( "uk.ac.starlink.connect" );
 
@@ -101,7 +102,7 @@
         add( main, BorderLayout.CENTER );
         Border gapBorder = BorderFactory.createEmptyBorder( 5, 5, 5, 5 );
         Border etchBorder = BorderFactory.createEtchedBorder();
-        List activeList = new ArrayList();
+        List<Component> activeList = new ArrayList<Component>();
 
         /* Construct and place a chooser for the current directory. */
         branchSelector_ = new BranchComboBox();
@@ -272,14 +273,13 @@
                     ConnectorAction connAct = (ConnectorAction) evt.getSource();
                     if ( branchSelector_.getConnectorAction() == connAct &&
                          evt.getPropertyName()
-                            .equals( connAct.CONNECTION_PROPERTY ) ) {
+                            .equals( ConnectorAction.CONNECTION_PROPERTY ) ) {
                         refreshList();
                     }
                 }
             }
         };
-        activeComponents_ = (Component[]) 
-                            activeList.toArray( new Component[ 0 ] );
+        activeComponents_ = activeList.toArray( new Component[ 0 ] );
     }
 
     /**
@@ -299,10 +299,11 @@
      *
      * @return  mutable list of {@link ConnectorAction} objects
      */
-    public synchronized List getConnectorActions() {
+    public synchronized List<ConnectorAction> getConnectorActions() {
         if ( connectorActions_ == null ) {
             connectorActions_ = 
-                new ArrayList( Arrays.asList( ConnectorManager
+                new ArrayList<ConnectorAction>
+                             ( Arrays.asList( ConnectorManager
                                              .getConnectorActions() ) );
         }
         return connectorActions_;
@@ -466,8 +467,8 @@
      * @return  array of selected nodes
      */
     public Node[] getSelectedNodes() {
-        return (Node[]) Arrays.asList( nodeList_.getSelectedValues() )
-                       .toArray( new Node[ 0 ] );
+        return Arrays.asList( nodeList_.getSelectedValues() )
+                     .toArray( new Node[ 0 ] );
     }
 
     /**
diff -Nru starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/Leaf.java starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/Leaf.java
--- starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/Leaf.java	2016-05-03 09:40:27.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/Leaf.java	2019-07-12 13:01:01.000000000 +0000
@@ -1,5 +1,6 @@
 package uk.ac.starlink.connect;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.OutputStream;
 import uk.ac.starlink.util.DataSource;
diff -Nru starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/NodeComparator.java starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/NodeComparator.java
--- starjava-connect-0.1+2016.05.03/src/main/uk/ac/starlink/connect/NodeComparator.java	2016-05-03 09:40:27.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/src/main/uk/ac/starlink/connect/NodeComparator.java	2019-07-12 13:01:01.000000000 +0000
@@ -6,21 +6,21 @@
 /**
  * Comparator for nodes.  It returns all Branch nodes first, followed
  * by all Leaf nodes.  Within each group, items are ordered alphabetically.
+ * This is a singleton class.
  *
  * @author   Mark Taylor (Starlink)
  * @since    25 Feb 2005
  */
-public class NodeComparator implements Comparator {
+public class NodeComparator implements Comparator<Node> {
 
     private Collator collator_;
 
     private static final NodeComparator INSTANCE = new NodeComparator();
 
     /**
-     * Returns an instance of this class.
+     * Private constructor prevents instantiation.
      */
-    public static NodeComparator getInstance() {
-        return INSTANCE;
+    private NodeComparator() {
     }
 
     /**
@@ -36,9 +36,7 @@
         return collator_;
     }
 
-    public int compare( Object o1, Object o2 ) {
-        Node i1 = (Node) o1;
-        Node i2 = (Node) o2;
+    public int compare( Node i1, Node i2 ) {
         if ( ( i1 instanceof Branch ) && ! ( i2 instanceof Branch ) ) {
             return -1;
         }
@@ -49,4 +47,13 @@
             return getCollator().compare( i1.getName(), i2.getName() );
         }
     }
+
+    /**
+     * Returns an instance of this class.
+     *
+     * @return  sole instance
+     */
+    public static NodeComparator getInstance() {
+        return INSTANCE;
+    }
 }