Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 (4289ffb), 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.
- Loading branch information
Showing
3 changed files
with
57 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -284,7 +284,6 @@ public Action getDialogAction( Class tldClazz ) { | |
} | ||
} | ||
} | ||
assert false; | ||
return null; | ||
} | ||
|
||
|