From: Ole Streicher Date: Thu, 5 Jan 2017 13:11:20 +0100 Subject: Remove plastic support Plastic is very outdated now, and should not be used anymore. This enables to remove a number of dependencies. --- build.xml | 19 ++++- src/docs/sun253.xml | 99 ++++++----------------- src/main/uk/ac/starlink/topcat/ControlWindow.java | 6 -- src/main/uk/ac/starlink/topcat/Driver.java | 15 +--- 4 files changed, 42 insertions(+), 97 deletions(-) diff --git a/build.xml b/build.xml index 38c2a8e..3401311 100644 --- a/build.xml +++ b/build.xml @@ -436,7 +436,13 @@ - + + + + + + + @@ -1201,10 +1207,15 @@ - - + + - + + + + + + .

Note: -For information on SAMP or PLASTIC, which are protocols developed +For information on SAMP, which is a protocol developed within the Virtual Observatory context, but are not necessarily concerned with remote data access, see .

@@ -2990,7 +2990,7 @@ messaging protocols:
  • SAMP (Simple Applications Messaging Protocol)
  • PLASTIC - (PLatform for AStronomical InterConnection
    • + (PLatform for AStronomical InterConnection, not available in the Debian version) An example of the kind of thing which can be done might be:
      @@ -3026,9 +3026,8 @@ and others. the same way. SAMP is an evolution of PLASTIC with a number of technical improvements, and PLASTIC has been deprecated in favour of SAMP since around 2009. -PLASTIC is therefore of mainly historical interest, -though TOPCAT can still run in PLASTIC mode on request, -if you need it to communicate with older tools that can only speak PLASTIC. +PLASTIC is therefore of mainly historical interest and not implemented +in the Debian version.

      The communication architecture of the two protocols is basically the same: @@ -3040,18 +3039,6 @@ it will connect to it automatically. If no SAMP hub is running, TOPCAT will set one up during application startup.

      -

      TOPCAT can work in either SAMP or PLASTIC mode, but not both at once. -It determines which mode to use at startup: -if the -samp or -plastic flag is supplied -on the command line the corresponding mode will be used; -otherwise it will try to use SAMP. -It is easy to tell which mode is being used by looking at the -Control Window; -in SAMP mode the SAMP panel displaying connection -and message status is visible at the bottom of the right hand panel -(there are a few other changes to the GUI as well). -

      -

      This communication has two aspects to it: on the one hand TOPCAT can send messages to other applications which causes them to do things, and on the other hand TOPCAT can receive and act on @@ -3062,7 +3049,7 @@ The messages are described separately in the subsections below. There are also sections on the, somewhat different, ways to control and monitor messaging operatiion -for the cases of SAMP and PLASTIC. +for the case of SAMP.

      Note that the new activation action @@ -3130,9 +3117,8 @@ by other SAMP applications. PLASTIC control -

      Note: the PLASTIC protocol has been deprecated in favour -of SAMP since about 2009, and this functionality, though still present, -is of mostly historical interest. +

      Note: the PLASTIC protocol is not implemented in the Debian version +of TOPCAT

      You can view and control operations relating to the PLASTIC hub @@ -3191,9 +3177,8 @@ It contains the following options: Messages Transmitted

      This section describes the messages which TOPCAT can transmit to other -tools which understand the SAMP or PLASTIC protocol, and how to cause them -to be sent. Approximately the same behaviour results for either -SAMP or PLASTIC, except as noted. +tools which understand the SAMP protocol, and how to cause them +to be sent.

      In most cases you can choose two ways to transmit a message @@ -3223,7 +3208,7 @@ which claim to support the relevant message.

      Below is a list of places you can cause TOPCAT to transmit messages. -The SAMP MTypes and PLASTIC message IDs +The SAMP MTypes message IDs are listed along with the descriptions; unless you are a tool developer you can probably ignore these. @@ -3244,10 +3229,6 @@ unless you are a tool developer you can probably ignore these.

      SAMP MTypes: table.load.votable or table.load.fits -

      -

      PLASTIC Message IDs: - ivo://votech.org/votable/load or - ivo://votech.org/votable/loadFromURL

      Transmit Subset
      @@ -3265,7 +3246,7 @@ unless you are a tool developer you can probably ignore these. (1) the table has been loaded from the same URL/filename by the other tool(s) or (2) the other tool(s) have acquired the table because it has - already been broadcast using SAMP/PLASTIC. + already been broadcast using SAMP.

      Also, whenever a new subset is created, for instance by entering an algebraic expression or tracing out a region on a plot @@ -3275,8 +3256,6 @@ unless you are a tool developer you can probably ignore these. the table's subset list.

      SAMP MType: table.select.rowList -

      -

      PLASTIC Message ID: ivo://votech.org/votable/showObjects

      Transmit Row
      @@ -3313,8 +3292,6 @@ unless you are a tool developer you can probably ignore these. and this can be sent to image applications from its Interop menu.

      SAMP MType: image.load.fits -

      -

      PLASTIC Message ID: ivo://votech.org/fits/image/loadFromURL

      Transmit Spectrum
      @@ -3331,7 +3308,6 @@ unless you are a tool developer you can probably ignore these. present in most of the Virtual Observatory windows allows you to send lists of VO registry resource identifiers to other applications which can make use of them. - Note this only works in SAMP mode, not for PLASTIC.

      SAMP MTypes: voresource.loadlist.cone, voresource.loadlist.siap, @@ -3346,8 +3322,8 @@ unless you are a tool developer you can probably ignore these. Messages Received

      This section describes the messages which TOPCAT will respond to -when it receives them from other applications via the SAMP/PLASTIC hub. -The SAMP MTypes and PLASTIC message IDs are listed along with the descriptions; +when it receives them from other applications via the SAMP hub. +The SAMP MTypes are listed along with the descriptions; unless you are a tool developer you can probably ignore these.

      @@ -3362,10 +3338,6 @@ unless you are a tool developer you can probably ignore these. table.load.cdf or table.load.stil

      -

      PLASTIC Message ID: - ivo://votech.org/votable/load or - ivo://votech.org/votable/loadFromURL -

      Note the non-standard MType table.load.stil is supported for loading tables with SAMP. This is like the other table.load.* MTypes, but any table format supported @@ -3395,8 +3367,6 @@ unless you are a tool developer you can probably ignore these. treated may be made available in future versions.

      SAMP MType: table.select.rowList -

      -

      PLASTIC Message ID: ivo://votech.org/votable/showObjects

      Highlight Row
      @@ -3409,8 +3379,6 @@ unless you are a tool developer you can probably ignore these. in the Activation Window.

      SAMP MType: table.highlight.row -

      -

      PLASTIC Message ID: ivo://votech.org/votable/highlightObject

      Load Resource Identifiers
      @@ -3463,15 +3431,6 @@ For SAMP these are:
    1. samp.hub.event.subscriptions
    2. samp.app.ping
      3. -and for PLASTIC: -
        -
      • ivo://votech.org/test/echo
        • -
      • ivo://votech.org/info/getName
        • -
      • ivo://votech.org/info/getIconURL
        • -
      • ivo://votech.org/hub/event/ApplicationRegistered
        • -
      • ivo://votech.org/hub/event/ApplicationUnregistered
        • -
      • ivo://votech.org/hub/event/HubStopping
        • -

      @@ -3665,29 +3624,23 @@ The meaning of the flags is as follows:
      -samp

      Forces TOPCAT to use SAMP for tool interoperability - (see ). SAMP rather than PLASTIC is the - default, so this flag has no effect. -

      - -
      -plastic
      -

      Forces TOPCAT to use PLASTIC instead of SAMP for tool - interoperability (see ). + (see ). SAMP is always used, so this flag has no effect.

      -[no]hub

      The -hub flag causes TOPCAT to run an internal - SAMP or PLASTIC hub (SAMP by default), if no hub is already + SAMP hub, if no hub is already running, and the -nohub flag prevents this from happening. The default behaviour, when neither of these flags is given, is to start a hub automatically for - SAMP but not for PLASTIC. The hub will terminate when TOPCAT does, + SAMP. The hub will terminate when TOPCAT does, or can be shut down manually with the (&IMG.NO_HUB;) menu item. See .

      -exthub
      -

      Causes TOPCAT to attempt to run an external SAMP or PLASTIC hub, +

      Causes TOPCAT to attempt to run an external SAMP hub, if no hub is already running. The hub will show up in its own window, and can be stopped by closing the window. The hub will continue to run @@ -3698,8 +3651,8 @@ The meaning of the flags is as follows:

      -noserv
      -

      Prevents TOPCAT from running any services. Currently the services - which it may run are SAMP or PLASTIC (see above). +

      Prevents TOPCAT from running any services. Currently the service + which it may run is SAMP (see above).

      -checkvers
      @@ -5093,7 +5046,7 @@ of the current status of SAMP communications. For a discussion of the whats and whys of SAMP, see . Note that if not running in SAMP mode -(e.g. if in PLASTIC or no-server mode) this panel will not appear. +(e.g. if in no-server mode) this panel will not appear. SAMP mode is the default under normal circumstances.

      @@ -5163,7 +5116,7 @@ functions. They are grouped as follows:
      &IMG.BROADCAST; Broadcast Table

      Broadcasts the current to any - applications registered using the SAMP or PLASTIC protocol. + applications registered using the SAMP protocol. See .

      @@ -5359,7 +5312,7 @@ and those common to other windows (described in ).
      &IMG.SEND; Send Table to ...

      Sends the currently selected table to a selected listening application - using SAMP or PLASTIC. Select the desired recipient application from the + using SAMP. Select the desired recipient application from the submenu.

      &IMG.LOG; View Log
      @@ -5527,7 +5480,7 @@ the menu.

      The menu contains options relevant to -SAMP (or possibly PLASTIC) tool interoperability; +SAMP tool interoperability; see :

      @@ -6270,7 +6223,7 @@ can be edited by double-clicking on them in the normal way.

      &IMG.BROADCAST; Broadcast Subset
      -

      Causes the selected subset to be broadcast using SAMP or PLASTIC to other +

      Causes the selected subset to be broadcast using SAMP to other listening applications. Any other listening application which is displaying the same table is then invited to highlight the selection of rows corresonding to the selected subset. @@ -16967,9 +16920,9 @@ or manually as described in . displayed image for external viewing or analysis. As well as options to export as GIF, JPEG, EPS and FITS, there is also the option to transmit the FITS image to one or -all applications listening using the SAMP or PLASTIC tool interoperability +all applications listening using the SAMP tool interoperability protocol which will receive images. -In this way you can transmit the image directly to SAMP/PLASTIC-aware +In this way you can transmit the image directly to SAMP-aware image manipulation tools such as GAIA or Aladin. See for more information about tool interoperability.

      diff --git a/src/main/uk/ac/starlink/topcat/ControlWindow.java b/src/main/uk/ac/starlink/topcat/ControlWindow.java index d16c4d0..c7fd35b 100644 --- a/src/main/uk/ac/starlink/topcat/ControlWindow.java +++ b/src/main/uk/ac/starlink/topcat/ControlWindow.java @@ -84,7 +84,6 @@ import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.TableColumnModel; import org.astrogrid.samp.client.DefaultClientProfile; -import uk.ac.starlink.plastic.PlasticUtils; import uk.ac.starlink.table.DescribedValue; import uk.ac.starlink.table.RowRunner; import uk.ac.starlink.table.StarTable; @@ -104,7 +103,6 @@ import uk.ac.starlink.table.storage.MonitorStoragePolicy; import uk.ac.starlink.topcat.activate.ActivationWindow; import uk.ac.starlink.topcat.contrib.basti.BaSTITableLoadDialog; import uk.ac.starlink.topcat.contrib.gavo.GavoTableLoadDialog; -import uk.ac.starlink.topcat.interop.PlasticCommunicator; import uk.ac.starlink.topcat.interop.SampCommunicator; import uk.ac.starlink.topcat.interop.TopcatCommunicator; import uk.ac.starlink.topcat.interop.Transmitter; @@ -1538,10 +1536,6 @@ public class ControlWindow extends AuxWindow logger_.info( "Run with no interop" ); return null; } - else if ( "plastic".equals( interopType_ ) ) { - logger_.info( "Run in PLASTIC mode by request" ); - return new PlasticCommunicator( control ); - } else { final String msg; if ( "samp".equals( interopType_ ) ) { diff --git a/src/main/uk/ac/starlink/topcat/Driver.java b/src/main/uk/ac/starlink/topcat/Driver.java index cb1b9e7..f423200 100644 --- a/src/main/uk/ac/starlink/topcat/Driver.java +++ b/src/main/uk/ac/starlink/topcat/Driver.java @@ -20,8 +20,6 @@ import org.astrogrid.samp.client.DefaultClientProfile; import org.astrogrid.samp.client.SampException; import org.astrogrid.samp.httpd.UtilServer; import uk.ac.starlink.fits.FitsConstants; -import uk.ac.starlink.plastic.PlasticHub; -import uk.ac.starlink.plastic.PlasticUtils; import uk.ac.starlink.table.DefaultValueInfo; import uk.ac.starlink.table.DescribedValue; import uk.ac.starlink.table.ValueInfo; @@ -228,7 +226,7 @@ public class Driver { pre + " [-help] [-version]" + pad + " [-stilts |-jsamp ]" + pad + " [-verbose] [-debug] [-demo] [-running] [-memory|-disk]" - + pad + " [-[no]hub|-exthub|-noserv] [-samp|-plastic]" + + pad + " [-[no]hub|-exthub|-noserv] [-samp]" + pad + " [[-f ] table ...]"; /* Standalone execution (e.g. System.exit() may be called). */ @@ -318,15 +316,6 @@ public class Driver { interopServe = true; ControlWindow.interopType_ = "samp"; } - else if ( arg.equals( "-plastic" ) ) { - it.remove(); - interopServe = true; - ControlWindow.interopType_ = "plastic"; - } - else if ( arg.equals( "-noplastic" ) ) { // deprecated - it.remove(); - interopServe = false; - } else if ( arg.startsWith( "-noserv" ) ) { it.remove(); interopServe = false; @@ -653,8 +642,6 @@ public class Driver { .append( p2 + "-disk use disk backing store for " + "large tables" ) .append( p2 + "-samp use SAMP for tool interoperability" ) - .append( p2 + "-plastic use PLASTIC for " - + "tool interoperability" ) .append( p2 + "-[no]hub [don't] run internal " + "SAMP/PLASTIC hub" ) .append( p2 + "-exthub run external SAMP/PLASTIC hub" )