From: Ole Streicher <olebole@debian.org>
Date: Fri, 17 Feb 2017 16:47:06 +0100
Subject: Remove edu.jhu.htm reference

The license statement for the HTM package is:

 The software and information contained herein are proprietary to The
 Johns Hopkins University, Copyright 1999.  This software is furnished
 pursuant to a written license agreement and may be used, copied,
 transmitted, and stored only in accordance with the terms of such
 license and with the inclusion of the above copyright notice.  This
 software and information or any other copies thereof may not be
 provided or otherwise made available to any other person.

(see src/edu/jhu/htm/app/echoDomain.java from the source
http://www.skyserver.org/htm/src/java/htmSrc.jar)

This license is not conform to the Debian Free Software Guidelines,
therefore the HTM package cannot be used in Debian. This patch (which
itself is licensed LGPL-2.1 as starjava-topcat itself) removes the
references to this package. This will however not decrease
functionality, since with Healpix a more modern variant of
all-sky-pixellization is included in Topcat, and HTM was anyway only
of historic and debugging interest.
---
 src/docs/sun253.xml                                  | 9 ++-------
 src/main/uk/ac/starlink/topcat/join/MatchWindow.java | 8 --------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/docs/sun253.xml b/src/docs/sun253.xml
index 3513dae..fb4f36b 100644
--- a/src/docs/sun253.xml
+++ b/src/docs/sun253.xml
@@ -18587,13 +18587,8 @@ of a metric on that space to count as a match.
     </p></dd>
 
 <dt>HTM</dt>
-<dd><p>Performs sky matching in just the same way as the <label>Sky</label>
-    option above, but using a different algorithm (pixelisation of the
-    celestial sphere is performed using the Hierarchical Triangular Mesh
-    rather than the HEALPix scheme).  The results in both cases 
-    should be identical, but HTM is much slower.  Hence, this option
-    is only useful for debugging.  It may be withdrawn in future releases.
-    </p></dd>
+<dd><p><em>This option is not available in the Debian version.</em>
+</p></dd>
 
 </dl>
 </p>
diff --git a/src/main/uk/ac/starlink/topcat/join/MatchWindow.java b/src/main/uk/ac/starlink/topcat/join/MatchWindow.java
index 4731c3d..be31d2d 100644
--- a/src/main/uk/ac/starlink/topcat/join/MatchWindow.java
+++ b/src/main/uk/ac/starlink/topcat/join/MatchWindow.java
@@ -35,7 +35,6 @@ import uk.ac.starlink.table.join.EllipseSkyMatchEngine;
 import uk.ac.starlink.table.join.ErrorCartesianMatchEngine;
 import uk.ac.starlink.table.join.ErrorSkyMatchEngine;
 import uk.ac.starlink.table.join.EqualsMatchEngine;
-import uk.ac.starlink.table.join.HtmSkyPixellator;
 import uk.ac.starlink.table.join.IsotropicCartesianMatchEngine;
 import uk.ac.starlink.table.join.MatchEngine;
 import uk.ac.starlink.table.join.ProgressIndicator;
@@ -458,12 +457,6 @@ public class MatchWindow extends AuxWindow implements ItemListener {
                 new AnisotropicCartesianMatchEngine( someLengths2 ),
             }
         );
-        MatchEngine htmEngine = new FixedSkyMatchEngine( new HtmSkyPixellator(),
-                                                         someAngle ) {
-            public String toString() {
-                return "HTM";
-            }
-        };
         return new MatchEngine[] {
             new FixedSkyMatchEngine( new CdsHealpixSkyPixellator(), someAngle ),
             new ErrorSkyMatchEngine( new CdsHealpixSkyPixellator(), someAngle ),
@@ -485,7 +478,6 @@ public class MatchWindow extends AuxWindow implements ItemListener {
             new AnisotropicCartesianMatchEngine( someLengths4 ),
             skyPlus1Engine,
             skyPlus2Engine,
-            htmEngine,
         };
     }