From: Ole Streicher <olebole@debian.org>
Date: Thu, 23 May 2024 13:41:56 +0200
Subject: Disable HAPI interface
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

HAPI is the  Heliophysics Data Application Programmer’s Interface,
a time series download and streaming format specification.
See http://hapi-server.org/

In Debian, we still don't have the hapi module included; so it
is disabled here.
---
 build.xml                                                 | 4 ++++
 src/main/uk/ac/starlink/topcat/ControlWindow.java         | 1 -
 src/main/uk/ac/starlink/topcat/LoadWindow.java            | 1 -
 src/main/uk/ac/starlink/topcat/ResourceIcon.java          | 3 ---
 src/main/uk/ac/starlink/topcat/TableLoadDialogWindow.java | 4 +---
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 112fc1d..ef8ae5b 100644
--- a/build.xml
+++ b/build.xml
@@ -478,6 +478,10 @@
       <exclude name="uk/ac/starlink/topcat/interop/SelectivePlasticListModel.java"/>
       <exclude name="uk/ac/starlink/topcat/interop/TopcatTransmitter.java"/>
       <exclude name="uk/ac/starlink/topcat/interop/PlasticImageActivity.java"/>
+      <exclude name="uk/ac/starlink/topcat/TopcatHapiTableLoadDialog.java"/>
+      <exclude name="uk/ac/starlink/topcat/activate/ViewImageActivationType.java"/>
+      <exclude name="uk/ac/starlink/topcat/activate/RegionViewImageActivationType.java"/>
+      <exclude name="uk/ac/starlink/topcat/activate/GenericViewImageActivationType.java"/>
    </javac>
 
     <!-- Copy extra files that should live with packages classes
diff --git a/src/main/uk/ac/starlink/topcat/ControlWindow.java b/src/main/uk/ac/starlink/topcat/ControlWindow.java
index d03d0fa..28a92a2 100644
--- a/src/main/uk/ac/starlink/topcat/ControlWindow.java
+++ b/src/main/uk/ac/starlink/topcat/ControlWindow.java
@@ -711,7 +711,6 @@ public class ControlWindow extends AuxWindow
                 tldClasses.add( TopcatSsapTableLoadDialog.class );
                 tldClasses.add( TopcatTapTableLoadDialog.class );
                 tldClasses.add( VizierTableLoadDialog.class );
-                tldClasses.add( TopcatHapiTableLoadDialog.class );
                 tldClasses.add( GavoTableLoadDialog.class );
                 tldClasses.add( BaSTITableLoadDialog.class );
                 LoadWindow loadWin = getLoadWindow();
diff --git a/src/main/uk/ac/starlink/topcat/LoadWindow.java b/src/main/uk/ac/starlink/topcat/LoadWindow.java
index a4529c9..bbe502f 100644
--- a/src/main/uk/ac/starlink/topcat/LoadWindow.java
+++ b/src/main/uk/ac/starlink/topcat/LoadWindow.java
@@ -75,7 +75,6 @@ public class LoadWindow extends AuxWindow {
         TopcatTapTableLoadDialog.class.getName(),
         Ri1RegistryTableLoadDialog.class.getName(),
         VizierTableLoadDialog.class.getName(),
-        TopcatHapiTableLoadDialog.class.getName(),
         GavoTableLoadDialog.class.getName(),
         BaSTITableLoadDialog.class.getName(),
     };
diff --git a/src/main/uk/ac/starlink/topcat/ResourceIcon.java b/src/main/uk/ac/starlink/topcat/ResourceIcon.java
index a66d5de..e305966 100644
--- a/src/main/uk/ac/starlink/topcat/ResourceIcon.java
+++ b/src/main/uk/ac/starlink/topcat/ResourceIcon.java
@@ -33,7 +33,6 @@ import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JPanel;
 import javax.swing.plaf.metal.MetalCheckBoxIcon;
-import uk.ac.starlink.hapi.HapiTableLoadDialog;
 import uk.ac.starlink.table.gui.FileChooserTableLoadDialog;
 import uk.ac.starlink.table.gui.FilestoreTableLoadDialog;
 import uk.ac.starlink.table.gui.SQLTableLoadDialog;
@@ -693,8 +692,6 @@ public class ResourceIcon implements Icon {
                          new SsapTableLoadDialog().getIcon() );
         putMap( nameMap, "TAP_DIALOG",
                          new TapTableLoadDialog().getIcon() );
-        putMap( nameMap, "HAPI",
-                         new HapiTableLoadDialog().getIcon() );
         putMap( nameMap, "REGISTRY_DIALOG",
                          new Ri1RegistryTableLoadDialog().getIcon() );
         putMap( nameMap, "HELP_TOC",
diff --git a/src/main/uk/ac/starlink/topcat/TableLoadDialogWindow.java b/src/main/uk/ac/starlink/topcat/TableLoadDialogWindow.java
index 7ab26e1..ea53bda 100644
--- a/src/main/uk/ac/starlink/topcat/TableLoadDialogWindow.java
+++ b/src/main/uk/ac/starlink/topcat/TableLoadDialogWindow.java
@@ -6,7 +6,6 @@ import javax.swing.Action;
 import javax.swing.Box;
 import javax.swing.JButton;
 import javax.swing.JMenu;
-import uk.ac.starlink.hapi.HapiTableLoadDialog;
 import uk.ac.starlink.table.StarTableFactory;
 import uk.ac.starlink.table.gui.TableLoadClient;
 import uk.ac.starlink.table.gui.TableLoadDialog;
@@ -133,7 +132,6 @@ public class TableLoadDialogWindow extends AuxWindow {
      *           if true, it will stay posted
      */
     private static boolean isPinnedDflt( TableLoadDialog tld ) {
-        return tld instanceof TapTableLoadDialog
-            || tld instanceof HapiTableLoadDialog;
+        return tld instanceof TapTableLoadDialog;
     }
 }