Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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. … 36 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. … 37 more files in changeset.
JAL-3878 Add action and task for annotation services

  1. … 6 more files in changeset.
JAL-3991 JAVA_COMPILE_VERSION put into build_properties. Check for possible JVM mismatch in jalview.bin.LaunchUtils. STDERR warning from jalview.bin.Launcher. Console and optional popup warning in jalview.bin.Jalview.

  1. … 6 more files in changeset.
JAL-3978 New tasks to build archive 'old' dir with appropriate getdown resources, JVL file and digest

  1. … 20 more files in changeset.
JAL-3878 Move array index search to ArrayUtils

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

  1. … 42 more files in changeset.
JAL-3438 spotless for 2.11.2.0

    • -22
    • +24
    ./dialogrunner/DialogRunnerI.java
  1. … 650 more files in changeset.
JAL-3103 Remove BrowserLauncher2 and use Desktop.browse(url) with wrapper methods

  1. … 11 more files in changeset.
JAL-3103 Put jalview.jar first in getdown for .properties files. Remove now-not-needed exception handling from jalview code for openURL. Change Default browser input to JComboBox populated by BrowserLauncher2

  1. … 11 more files in changeset.
JAL-3103 Switched to (a wrapper around) BrowserLauncher2

  1. … 6 more files in changeset.
Looks good. I've bumped the version to 1.8.3-1.2.12 and recompiled jars.

Looks good. I've bumped the version to 1.8.3-1.2.12 and recompiled jars.

JAL-3438 - all src and test run through spotless..

    • -22
    • +24
    ./dialogrunner/DialogRunnerI.java
  1. … 656 more files in changeset.
JAL-3691 patch toUpper/toLower to use Locale.ROOT for 2.11.2 src
JAL-3691 patch toUpper/toLower to use Locale.ROOT for 2.11.2 src
JAL-3691 patch toUpper/toLower to use Locale.ROOT for 2.11.2 src

  1. … 6 more files in changeset.
JAL-3878 Add universal id generator to MathUtils.

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

  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!
Merge branch 'develop' into update/JAL-3949_abstracted_logging_for_jalviewjs_and_sanity

  1. … 1 more file in changeset.
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. … 115 more files in changeset.
JAL-3949 added autoscrolling to java console, toggle with a click. fixed a null logger problem. removed the weird log4j info about the web module

  1. … 7 more files in changeset.