1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
From: Ole Streicher <olebole@debian.org>
Date: Mon, 14 Oct 2024 10:04:43 +0200
Subject: Remove HtmSkyPixellator reference
starjava.tjoin.HtmSkyPixellator is based on non-free code from the
Johns Hopkins University and was therefore removed from starlink-tjoin-java.
---
src/main/uk/ac/starlink/topcat/join/MatchWindow.java | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/src/main/uk/ac/starlink/topcat/join/MatchWindow.java b/src/main/uk/ac/starlink/topcat/join/MatchWindow.java
index 6b0d813..0a130d3 100644
--- a/src/main/uk/ac/starlink/topcat/join/MatchWindow.java
+++ b/src/main/uk/ac/starlink/topcat/join/MatchWindow.java
@@ -44,7 +44,6 @@ import uk.ac.starlink.table.join.ErrorSkyMatchEngine;
import uk.ac.starlink.table.join.ErrorSummation;
import uk.ac.starlink.table.join.EqualsMatchEngine;
import uk.ac.starlink.table.join.FixedSkyMatchEngine;
-import uk.ac.starlink.table.join.HtmSkyPixellator;
import uk.ac.starlink.table.join.HumanMatchEngine;
import uk.ac.starlink.table.join.IsotropicCartesianMatchEngine;
import uk.ac.starlink.table.join.MatchEngine;
@@ -698,12 +697,6 @@ public class MatchWindow extends AuxWindow implements StiltsReporter {
new AnisotropicCartesianMatchEngine( someLengths2 ),
}
);
- MatchEngine htmEngine = new FixedSkyMatchEngine( new HtmSkyPixellator(),
- someAngle ) {
- public String toString() {
- return "HTM";
- }
- };
/* The names here come from the stilts MatchEngineParameter,
* in particular its createEngine(name) method. */
@@ -751,8 +744,6 @@ public class MatchWindow extends AuxWindow implements StiltsReporter {
"sky+1derr" );
map.put( skyPlus2Engine,
"sky+2" );
- map.put( htmEngine,
- "sky" );
return Collections.unmodifiableMap( map );
}
|
