jalview

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
make AlignFrame the parent of FeatureEditor dialog, and have parent Component request focus after...
make AlignFrame the parent of FeatureEditor dialog, and have parent Component request focus after...
JAL-3975 forced re-focus to alignframe after Create Sequence Feature dialog.
JAL-3975 forced re-focus to alignframe after Create Sequence Feature dialog.
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-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
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.

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-3553: Create working getdown appbase and jvl file(s) for each old version of Jalview
JAL-3553: Create working getdown appbase and jvl file(s) for each old version of Jalview
I'm abandoning this review for now (see my comments on the issue). For what its worth since this is a string literal you should at least follow convention JALVIEW_LOGGER rather than a generic 'LOGG...

I'm abandoning this review for now (see my comments on the issue). For what its worth since this is a string literal you should at least follow convention JALVIEW_LOGGER rather than a generic 'LOGGER_NAME'. The code for routing logged content from other loggers should probably be a method on Cache... or even better, separate all this out into the jalview.util.Log4j class so Cache doesn't get polluted with log configuration cruft.

At the moment it is only used in jalview.bin.Cache, but it is used in separate places where appenders are added. Previous to this it was relying on the String name of the appender being correctly u...

At the moment it is only used in jalview.bin.Cache, but it is used in separate places where appenders are added. Previous to this it was relying on the String name of the appender being correctly used. However the Strings that were being used were not the same so it was broken (I don't know how that manifested itself, but it definitely would not have worked the way it used to!).
Feasibly a separate logger made in the future (e.g. API logger?) will want to add this Appender and will likely not be made in jalview.bin.Cache, so putting a constant String somewhere generically connected with Log4j seemed sensible. Correct it needs documenting!

Does this really need to be a string constant ? (I'm not convinced) needs documenting as the log4j internal name for the log if it really needs to be external.

Does this really need to be a string constant ? (I'm not convinced) needs documenting as the log4j internal name for the log if it really needs to be external.

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 'feature/JAL-1713_overviewInProject' into bug/JAL-3785autoOverviewTitle

    • -35
    • +15
    /src/jalview/gui/AlignFrame.java
    • -39
    • +77
    /src/jalview/gui/AlignmentPanel.java
    • -9
    • +13
    /src/jalview/project/Jalview2XML.java
JAL-3785 JAL- Merge branch 'bug/JAL-3785autoOverviewTitle' into 2_11_2_develop regenerated jaxb bindings for updated schemas on develop & feature branch Conflicts: src/jalview/gui/Preferences.java src/jalview/xml/binding/jalview/JalviewModel.java src/jalview/xml/binding/jalview/ObjectFactory.java src/jalview/xml/binding/jalview/package-info.java

    • -1
    • +49
    /src/jalview/project/Jalview2XML.java
    • -22
    • +22
    /src/jalview/xml/binding/embl/EntrySetType.java
    • -593
    • +593
    /src/jalview/xml/binding/embl/EntryType.java
    • -17
    • +17
    /src/jalview/xml/binding/embl/ROOT.java
  1. … 57 more files in changeset.
JAL-3186 remove ‘Variable Colour’ from the sequence feature settings popup menu

    • -75
    • +0
    /src/jalview/gui/FeatureSettings.java
Merge branch 'bug/JAL-3806_mappingCoversSequence_for2112' into develop Combines patches for JAL-3806 prior to redaction of shared CDS dataset sequences with patches for JAL-3673 Conflicts: src/jalview/datamodel/AlignedCodonFrame.java src/jalview/util/MappingUtils.java test/jalview/util/MappingUtilsTest.java

    • -38
    • +45
    /src/jalview/util/MappingUtils.java
    • -10
    • +0
    /test/jalview/util/MappingUtilsTest.java
JAL-3806 JAL-3725 update tests since CDS mappings now exclude the stop codon

    • -5
    • +5
    /test/jalview/io/EmblFlatFileTest.java
JAL-3806 require mapping extent covers both sequence’s dataset sequence to avoid spurious mappings from overlapping CDS

JAL-3949 upgraded log4j to 2.17.1 (no actual known vulnerabilities\!), though this doesn't fix the issue

    • binary
    /j11lib/log4j-1.2-api-2.17.1.jar
    • binary
    /j11lib/log4j-api-2.17.1.jar
    • binary
    /j11lib/log4j-core-2.17.1.jar
    • binary
    /j11lib/log4j-slf4j18-impl-2.17.0.jar
    • binary
    /j11lib/log4j-slf4j18-impl-2.17.1.jar
    • binary
    /j8lib/log4j-1.2-api-2.17.1.jar
    • binary
    /j8lib/log4j-api-2.17.1.jar
    • binary
    /j8lib/log4j-core-2.17.1.jar
    • binary
    /j8lib/log4j-slf4j18-impl-2.17.0.jar
    • binary
    /j8lib/log4j-slf4j18-impl-2.17.1.jar