Branch: refs/heads/master
Home: https://github.com/Starlink/starjava
Commit: d4f190fecf6d721039def3174871071f30b74b02
https://github.com/Starlink/starjava/commit/d4f190fecf6d721039def3174871071f30b74b02
Author: Mark Taylor <[log in to unmask]>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M topcat/src/docs/sun253.xml
M topcat/src/main/uk/ac/starlink/topcat/ControlWindow.java
M topcat/src/main/uk/ac/starlink/topcat/LoadWindow.java
Log Message:
-----------
topcat: fix regression bug (auth failure) in JDBC load dialogue
When I added the TAP load dialogue to the ControlWindow toolbar
just before release of TOPCAT v4.2 (4289ffb4), I inadvertently
introduced a bug which meant that the SQL load dialogue doesn't
work any more - authentication fails. I haven't tracked down
exactly why this happens, but it's related to the fact that
the LoadWindow was being instantiated during ControlWindow
construction (before that change it was not done until the user
hit the Load button).
Modified ControlWindow so that LoadWindow is not constructed
until it's needed, which fixes that bug. It's possible there
were other unnoticed negative consequences of the earlier change;
this update may fix those too.
Both the problem and the fix are fairly inelegant, because application
startup in topcat (implemented in the very old classes Driver,
ControlWindow, LoadWindow) is messy and badly designed.
Added a note in ControlWindow to this effect.
Commit: 9f90f5ce95d6660b093b5313350b3fce26aec5b5
https://github.com/Starlink/starjava/commit/9f90f5ce95d6660b093b5313350b3fce26aec5b5
Author: Mark Taylor <[log in to unmask]>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M task/src/main/uk/ac/starlink/task/MultiTaskInvoker.java
M ttools/src/main/uk/ac/starlink/ttools/Stilts.java
M ttools/src/main/uk/ac/starlink/ttools/build/FilterDoc.java
M ttools/src/main/uk/ac/starlink/ttools/build/JyStilts.java
M ttools/src/main/uk/ac/starlink/ttools/build/ModeDoc.java
M ttools/src/main/uk/ac/starlink/ttools/build/PurposeWriter.java
M ttools/src/main/uk/ac/starlink/ttools/cea/CeaWriter.java
M ttools/src/main/uk/ac/starlink/ttools/filter/StepFactory.java
M ttools/src/main/uk/ac/starlink/ttools/server/FormServlet.java
M ttools/src/main/uk/ac/starlink/ttools/server/TaskServlet.java
M ttools/src/main/uk/ac/starlink/ttools/task/FilterParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/LineInvoker.java
M ttools/src/main/uk/ac/starlink/ttools/task/OutputModeParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/StiltsServer.java
M util/src/main/uk/ac/starlink/util/ObjectFactory.java
Log Message:
-----------
util: add generics to ObjectFactory
ObjectFactory is naturally parameterised by the type of the objects
it is creating.
Commit: a99a4659fb23d4b26c4d4017bc48b26df82ca9e5
https://github.com/Starlink/starjava/commit/a99a4659fb23d4b26c4d4017bc48b26df82ca9e5
Author: Mark Taylor <[log in to unmask]>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M task/build.xml
M task/src/main/uk/ac/starlink/task/InvokeUtils.java
M task/src/main/uk/ac/starlink/task/LineEnvironment.java
M task/src/main/uk/ac/starlink/task/MultiTaskInvoker.java
M task/src/main/uk/ac/starlink/task/SingleTaskInvoker.java
M task/src/main/uk/ac/starlink/task/TerminalEnvironment.java
M task/src/main/uk/ac/starlink/task/TerminalInvoker.java
M task/src/testcases/uk/ac/starlink/task/ArithmeticTest.java
M task/src/testcases/uk/ac/starlink/task/MapEnvironment.java
Log Message:
-----------
task: use generics properly to avoid unchecked warnings
Parameterise access to collections classes.
Commit: d5103f196227e5039e4c07ee000753f989411658
https://github.com/Starlink/starjava/commit/d5103f196227e5039e4c07ee000753f989411658
Author: Mark Taylor <[log in to unmask]>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M ndtools/src/main/uk/ac/starlink/ndtools/ExistingNdxParameter.java
M ndtools/src/main/uk/ac/starlink/ndtools/NewNdxParameter.java
M ndtools/src/main/uk/ac/starlink/ndtools/ShapeParameter.java
M ndtools/src/main/uk/ac/starlink/ndtools/TypeParameter.java
M task/src/main/uk/ac/starlink/task/BooleanParameter.java
M task/src/main/uk/ac/starlink/task/ChoiceParameter.java
M task/src/main/uk/ac/starlink/task/DoubleParameter.java
M task/src/main/uk/ac/starlink/task/InputStreamParameter.java
M task/src/main/uk/ac/starlink/task/IntegerParameter.java
M task/src/main/uk/ac/starlink/task/LineEnvironment.java
A task/src/main/uk/ac/starlink/task/LongParameter.java
M task/src/main/uk/ac/starlink/task/ObjectFactoryParameter.java
M task/src/main/uk/ac/starlink/task/OutputStreamParameter.java
M task/src/main/uk/ac/starlink/task/Parameter.java
A task/src/main/uk/ac/starlink/task/StringParameter.java
M task/src/main/uk/ac/starlink/task/URLParameter.java
M task/src/testcases/uk/ac/starlink/task/ArithmeticTest.java
M ttools/src/docs/sun256.xml
M ttools/src/main/uk/ac/starlink/ttools/cone/ConeErrorPolicyParameter.java
M ttools/src/main/uk/ac/starlink/ttools/cone/ConeSearchConer.java
M ttools/src/main/uk/ac/starlink/ttools/cone/JdbcConer.java
M ttools/src/main/uk/ac/starlink/ttools/cone/SkyConeMatch2.java
M ttools/src/main/uk/ac/starlink/ttools/cone/TilingParameter.java
M ttools/src/main/uk/ac/starlink/ttools/join/JoinTypeParameter.java
M ttools/src/main/uk/ac/starlink/ttools/join/Match1TypeParameter.java
M ttools/src/main/uk/ac/starlink/ttools/join/MatchEngineParameter.java
M ttools/src/main/uk/ac/starlink/ttools/join/MatchMapper.java
M ttools/src/main/uk/ac/starlink/ttools/join/ProgressIndicatorParameter.java
M ttools/src/main/uk/ac/starlink/ttools/mode/CubeMode.java
M ttools/src/main/uk/ac/starlink/ttools/mode/ExtAppMode.java
M ttools/src/main/uk/ac/starlink/ttools/mode/JdbcMode.java
M ttools/src/main/uk/ac/starlink/ttools/mode/MocMode.java
M ttools/src/main/uk/ac/starlink/ttools/mode/PlasticMode.java
M ttools/src/main/uk/ac/starlink/ttools/mode/SampMode.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/config/ConfigKey.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/task/ConfigParameter.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/task/DataStoreParameter.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/task/InsetsParameter.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/task/Plot2Task.java
M ttools/src/main/uk/ac/starlink/ttools/plottask/BarStyleFactory.java
M ttools/src/main/uk/ac/starlink/ttools/plottask/ColorParameter.java
M ttools/src/main/uk/ac/starlink/ttools/plottask/DashParameter.java
M ttools/src/main/uk/ac/starlink/ttools/plottask/FontParameter.java
M ttools/src/main/uk/ac/starlink/ttools/plottask/HistogramPlotStateFactory.java
M ttools/src/main/uk/ac/starlink/ttools/plottask/NamedObjectParameter.java
M ttools/src/main/uk/ac/starlink/ttools/plottask/PaintMode.java
M ttools/src/main/uk/ac/starlink/ttools/plottask/PaintModeParameter.java
M ttools/src/main/uk/ac/starlink/ttools/plottask/PlotStateFactory.java
M ttools/src/main/uk/ac/starlink/ttools/plottask/PlotTask.java
M ttools/src/main/uk/ac/starlink/ttools/plottask/StyleParameter.java
M ttools/src/main/uk/ac/starlink/ttools/server/ServletEnvironment.java
M ttools/src/main/uk/ac/starlink/ttools/task/AbstractInputTableParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/Calc.java
M ttools/src/main/uk/ac/starlink/ttools/task/CatMapper.java
M ttools/src/main/uk/ac/starlink/ttools/task/CdsUploadSkyMatch.java
M ttools/src/main/uk/ac/starlink/ttools/task/ConnectionParameter.java
R ttools/src/main/uk/ac/starlink/ttools/task/DefaultMultiParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/FilterParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/HomogeneousTablesInput.java
M ttools/src/main/uk/ac/starlink/ttools/task/InputFormatParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/InputTableParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/InputTablesParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/JoinFixActionParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/MapEnvironment.java
M ttools/src/main/uk/ac/starlink/ttools/task/OutputFormatParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/OutputModeParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/OutputTableParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/PixSample.java
M ttools/src/main/uk/ac/starlink/ttools/task/RegQuery.java
M ttools/src/main/uk/ac/starlink/ttools/task/SkyCoordParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/SqlClient.java
M ttools/src/main/uk/ac/starlink/ttools/task/SqlUpdate.java
M ttools/src/main/uk/ac/starlink/ttools/task/StiltsServer.java
A ttools/src/main/uk/ac/starlink/ttools/task/StringMultiParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/TableConsumerParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/TableFactoryParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/TableLoop.java
M ttools/src/main/uk/ac/starlink/ttools/task/TapLint.java
M ttools/src/main/uk/ac/starlink/ttools/task/TapMapper.java
M ttools/src/main/uk/ac/starlink/ttools/task/TapResume.java
M ttools/src/main/uk/ac/starlink/ttools/task/VotCopy.java
M ttools/src/main/uk/ac/starlink/ttools/task/VotLint.java
M ttools/src/main/uk/ac/starlink/ttools/task/WordsParameter.java
M ttools/src/main/uk/ac/starlink/ttools/task/XmlEncodingParameter.java
Log Message:
-----------
task: redefine Parameter with generics
The Parameter class is now, ahem, parameterised with a type <T> giving
the class of the values it obtains. This is generally sensible,
and allows various automations based on the parameter type which were
not possible before. Runtime pluggability can be much improved:
string values can now as a matter of course (but optionally)
be classnames of classes with the right superclass and no-arg
constructors. It also allows an Environment to accept
typed values as an alternative to string values.
At the same time, rework the way the Parameter class was written.
It was pretty nasty, making subclassing error-prone and unpleasant.
Now you usually just have to implement an abstract method
stringToObject.
Parameter is now an abstract superclass, with StringParameter replacing
it if the value you want is a String.
Since the TASK API has changed, code in TTOOLS and (the moribund)
NDTOOLS packages also needs to be changed. NDTOOLS builds and
should be OK, but I haven't tested it. There ought not to be
user-visible changes to TTOOLS, and the unit tests are fairly
extensive, but quite a bit of code has changed so nasty surprises
are possible. In particular null parameter values are handled
slightly differently, so watch out for new NullPointerExceptions.
Compare: https://github.com/Starlink/starjava/compare/0ba441bc676c...d5103f196227
|
