Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
JAL-1988 JAL-3772 Quit confirmation dialog boxes with saving files check and wait

  1. … 5 more files in changeset.
JAL-3676 extra information about jalview_properties file being used in Java Console

Force Flat look and feel on macOS

JAL-4064 First attempt at building an M1 native Jalview DMG

  1. … 3 more files in changeset.
Merge branch 'task/JAL-3991_check_actual_JAVA_VERSION_against_build_properties_in_application_startup' into develop

  1. … 4 more files in changeset.
Merge branch 'improvement/JAL-1988+JAL-3416_Java8_macOS_APQHandlers_and_FlatLaF_option' into improvement/JAL-1988+JAL-3416_flatlaf_osx_apqhandler

JAL-3416 remove flat as default for linux

JAL-3416 Added some mac specific FlatLAF settings. Note this is not the default macOS LaF, this is only when -Dlaf=flat is set on a mac when running Jalview

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-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. … 4 more files in changeset.
JAL-3851 merged to develop 2022-03-22

  1. … 17 more files in changeset.
JAL-3978 Using getdowninstanceappdir and getdowninstanceappbase to avoid conflict with getAppbaseBuildProperties(). Added an if around fetching build_properties to avoid failing to fetch local file appbase.

  1. … 7 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-3746 apply copyright to source

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

  1. … 657 more files in changeset.
JAL-3103 Removed code and unused widgets for defaultBrowser

  1. … 2 more files in changeset.
JAL-3103 Remove BrowserLauncher2 and use Desktop.browse(url) with wrapper methods

  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..

  1. … 663 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-3959 add key retrieval urls that support CORS needed by JalviewJS

  1. … 3 more files in changeset.
JAL-3691 patch toUpper/toLower to use Locale.ROOT for 2.11.2 src

  1. … 6 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

  1. … 96 more files in changeset.