Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
JAL-4036 moved a comment block

    • -26
    • +26
    ./uniprot/UniProtFTSRestClient.java
JAL-4036 Changes made from code review CR-JAL-265

  1. … 1 more file in changeset.
I've now put in a warn with the e.getMessage(), but I've left in a debug with the full stacktrace. This catch block is a little odd in that it's used as programmatic flow for non 200 HTTP responses...

I've now put in a warn with the e.getMessage(), but I've left in a debug with the full stacktrace.
This catch block is a little odd in that it's used as programmatic flow for non 200 HTTP responses. I notice that the new API server is sending back a 400 for bad input (including for non-existent query fields and wrong types for non-string query fields), which is invoking the warning triangle which puts the HTTP error message into the tooltip so this block is now getting more use!

The reason for wanting a full stacktrace in debug mode is that both the API and the changed client are new, so any errors in the next few months will be more quickly diagnosed if we can allow the user to easily obtain a stacktrace of the exception.

after trying it out I think the old behaviour is better, unless 1) there's a really clear message in the UI explaining that now the field has changed, the search needs to be executed again 2) a con...

after trying it out I think the old behaviour is better, unless 1) there's a really clear message in the UI explaining that now the field has changed, the search needs to be executed again 2) a convenient [search] button is shown so one doesn't have to click into the query field and press enter to trigger the search again.

should be Console.warn

should be Console.warn

Need to add logic that either 1) modifies config if an existing value of UNIPROT_DOMAIN is found that is legacy.uniprot.org or 2) uses UNIPROT_2022_DOMAIN as a config value so old versions of Jalvi...

Need to add logic that either 1) modifies config if an existing value of UNIPROT_DOMAIN is found that is legacy.uniprot.org or 2) uses UNIPROT_2022_DOMAIN as a config value so old versions of Jalview still work (up until legacy.uniprot.org goes away).

JAL-4036 Add getDbName to the GFTSPanelI and add an index code message to the index dropdown tooltip as appropriate

    • -11
    • +5
    ./threedbeacons/TDBeaconsFTSPanel.java
  1. … 4 more files in changeset.
shouldn't this be a warn ?

shouldn't this be a warn ?

this comment block should really be after the imports ?

this comment block should really be after the imports ?

makes sense. I do wonder if there needs to be some indication that any results currently shown are stale, however ?

makes sense. I do wonder if there needs to be some indication that any results currently shown are stale, however ?

JAL-4036: Jalview 2.11.2.2 and earlier no longer compatible with Uniprot REST API
JAL-4036: Jalview 2.11.2.2 and earlier no longer compatible with Uniprot REST API
JAL-4036 New configuration, target and pagination process for 2022-07 new Uniprot API

    • -24
    • +207
    ./uniprot/UniProtFTSRestClient.java
  1. … 1 more file in changeset.
JAL-4036 use the legacy endpoint (and report the FTS query when debug/trace enabled)

    • -11
    • +16
    ./uniprot/UniProtFTSRestClient.java
JAL-3855 update EBI Alphafold barcoded URL generation to v2.cif/json URLs

  1. … 1 more file in changeset.
JAL-1953 2.11.2 with Archeopteryx! Minimal patches and Merge branch 'kjvdh/features/PhylogenyViewer' into merge/2_11_2/PhylogenyViewer also restored last kjvdh build of forester to j8 and j11lib directories Conflicts: .classpath j8lib/forester.jar resources/lang/Messages.properties src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java src/jalview/fts/core/GFTSPanel.java src/jalview/fts/service/pdb/PDBFTSPanel.java src/jalview/gui/AlignFrame.java src/jalview/gui/DasSourceBrowser.java src/jalview/gui/Desktop.java src/jalview/gui/PopupMenu.java src/jalview/gui/SplashScreen.java src/jalview/gui/StructureViewerBase.java src/jalview/io/BioJsHTMLOutput.java src/jalview/io/FileLoader.java src/jalview/io/HtmlSvgOutput.java src/jalview/project/Jalview2XML.java src/jalview/schemabinding/version2/JalviewModelSequence.java src/jalview/util/DBRefUtils.java src/jalview/viewmodel/AlignmentViewport.java src/jalview/ws/DBRefFetcher.java src/jalview/ws/DasSequenceFeatureFetcher.java src/jalview/ws/jws2/Jws2Discoverer.java utils/jalviewjs/buildxml/build.xml

  1. … 38 more files in changeset.
Merge branch 'kjvdh/features/PhylogenyViewer_tabbedsupport' into merge/2_11_2/kjvdh/features/PhylogenyViewer_tabbedsupport Update from Release 2.11.2 develop branch JAL-1953 Conflicts: .classpath .project resources/lang/Messages.properties src/jalview/bin/Jalview.java src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java src/jalview/fts/core/GFTSPanel.java src/jalview/fts/service/pdb/PDBFTSPanel.java src/jalview/gui/AlignFrame.java src/jalview/gui/CalculationChooser.java src/jalview/gui/DasSourceBrowser.java src/jalview/gui/Desktop.java src/jalview/gui/PopupMenu.java src/jalview/gui/SplashScreen.java src/jalview/gui/StructureViewerBase.java src/jalview/gui/TreePanel.java src/jalview/gui/WebserviceInfo.java src/jalview/io/BioJsHTMLOutput.java src/jalview/io/FileLoader.java src/jalview/io/HtmlSvgOutput.java src/jalview/io/NewickFile.java src/jalview/math/Matrix.java src/jalview/math/MatrixI.java src/jalview/util/MappingUtils.java src/jalview/ws/DBRefFetcher.java src/jalview/ws/DasSequenceFeatureFetcher.java src/jalview/ws/jws2/Jws2Discoverer.java utils/eclipse/org.eclipse.jdt.core.jalview.prefs utils/eclipse/org.eclipse.jdt.ui.prefs

  1. … 38 more files in changeset.
JAL-3746 apply copyright to source

    • -0
    • +20
    ./alphafold/AlphafoldRestClient.java
    • -0
    • +20
    ./threedbeacons/TDBeaconsFTSPanel.java
    • -0
    • +20
    ./threedbeacons/TDBeaconsFTSRestClient.java
  1. … 41 more files in changeset.
JAL-3438 spotless for 2.11.2.0

    • -19
    • +37
    ./threedbeacons/TDB_FTSData.java
    • -6
    • +6
    ./threedbeacons/TDBeaconsFTSPanel.java
    • -19
    • +26
    ./threedbeacons/TDBeaconsFTSRestClient.java
  1. … 656 more files in changeset.
JAL-3438 - all src and test run through spotless..

    • -19
    • +37
    ./threedbeacons/TDB_FTSData.java
    • -6
    • +6
    ./threedbeacons/TDBeaconsFTSPanel.java
    • -19
    • +26
    ./threedbeacons/TDBeaconsFTSRestClient.java
  1. … 663 more files in changeset.
That looks good. I was almost going to do something similar (I was thinking jalview.log.Log, but jalview.bin.Console is just as good) so happy with this!

That looks good. I was almost going to do something similar (I was thinking jalview.log.Log, but jalview.bin.Console is just as good) so happy with this!

Added those in. I'm still converting to String with getCanonicalName in the getLogger(Class ...) method because, e.g. JLogger jlogger1 = JLogger.getLogger(Jalview.class); JLogger jlogger2 = JLogger...

Added those in. I'm still converting to String with getCanonicalName in the getLogger(Class ...) method because, e.g.
JLogger jlogger1 = JLogger.getLogger(Jalview.class);
JLogger jlogger2 = JLogger.getLogger("jalview.bin.Jalview");
should really return an existing logger in the registry if it exists, and the String name is the registry key.

I was thinking that JLogger did this comparison anyway, but I've followed it through and it didn't. So I've added if (loglevel.compareTo(this.level) < 0) { return false; } to JLogger.println so t...

I was thinking that JLogger did this comparison anyway, but I've followed it through and it didn't. So I've added

if (loglevel.compareTo(this.level) < 0) { return false; }

to JLogger.println so that a comparison is made between the (enums) of JLogger.level and the message LogLevel, and if it's not going to be logged then it doesn't call the actual logger at all (in this case Log4j, so the log4j object is never even touched [even with logger.isDebugEnabled() because the answer should be no]).
This now applies to all log calls.
The check whether Cache.log != null is equivalent to Cache.log.loggerExists() which already happens within JLoggerLog4j.
There is admittedly the wrapper of the JLogger getting brought to forefront of memory, but that's presumably smaller than the old Cache.log which was a Log4j.Logger object.

JAL-3949 - refactor logging from jalview.bin.Cache to jalview.bin.Console

Conflicts:

src/jalview/bin/Jalview.java

    • -2
    • +2
    ./threedbeacons/TDBeaconsFTSPanel.java
  1. … 97 more files in changeset.
AWESOME JOB !!!! one tiny niggle I had was that Cache.debug/Cache.error doesn't read nicely, so I've abstracted the logging stuff even farther to a new jalview.bin.Console class: see https://source...

AWESOME JOB !!!! one tiny niggle I had was that Cache.debug/Cache.error doesn't read nicely, so I've abstracted the logging stuff even farther to a new jalview.bin.Console class: see https://source.jalview.org/crucible/changelog/~br=update%402fJAL-3949_jalview_bin_Console_to_cure_sanity_even_more/jalview/

the reason for conditionals is that Java won't perform the string append operation if logLevel>debug. It saves a minor amount of processing time which is important for code that is executed lots.

the reason for conditionals is that Java won't perform the string append operation if logLevel>debug. It saves a minor amount of processing time which is important for code that is executed lots.

You could have .getLogger(Class ..) rather than having to call getCanonicalName ?

You could have .getLogger(Class ..) rather than having to call getCanonicalName ?

JAL-3949 An attempt at converting to Log4j 2 -- no output achieved!
JAL-3949 An attempt at converting to Log4j 2 -- no output achieved!
JAL-3949 Complete new abstracted logging framework in jalview.log. Updated log calls for this. Removal of jalview.javascript.log4j. Improvements to the Java Console (controllable autoscrolling).

    • -1
    • +1
    ./threedbeacons/TDBeaconsFTSPanel.java
  1. … 118 more files in changeset.