X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FCache.java;h=370a2433c3d8b8bcd8683b89e500bf0581a9da5e;hb=53fe06e7ae7a8c00ec902413391cea15362bdbf2;hp=aa9c0305e73112aa5182110dbd5e92d6303b13d2;hpb=aebe4cc0bfa4c9780bb6010fbd86cfb84fe3d2dd;p=jalview.git diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java index aa9c030..370a243 100755 --- a/src/jalview/bin/Cache.java +++ b/src/jalview/bin/Cache.java @@ -42,25 +42,14 @@ import java.util.Locale; import java.util.Properties; import java.util.StringTokenizer; import java.util.TreeSet; -import java.util.regex.Pattern; import javax.swing.LookAndFeel; import javax.swing.UIManager; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.apache.log4j.SimpleLayout; -import org.apache.log4j.builders.appender.ConsoleAppenderBuilder; -import org.apache.logging.log4j.core.config.Configurator; -import org.apache.logging.log4j.core.config.builder.api.AppenderComponentBuilder; -import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder; -import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory; -import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration; - import jalview.datamodel.PDBEntry; import jalview.gui.Preferences; import jalview.gui.UserDefinedColours; +import jalview.log.JLoggerLog4j; import jalview.schemes.ColourSchemeLoader; import jalview.schemes.ColourSchemes; import jalview.schemes.UserColourScheme; @@ -181,6 +170,8 @@ import jalview.ws.sifts.SiftsSettings; *
  • FOLLOW_SELECTIONS (true) Controls whether a new alignment view should * respond to selections made in other alignments containing the same sequences. *
  • + *
  • SHOW_JWS2_SERVICES (true) when set to false, jalview will not + * auto-discover JABAWS services
  • *
  • JWS2HOSTURLS comma-separated list of URLs to try for JABAWS services
  • *
  • SHOW_WSDISCOVERY_ERRORS (true) Controls if the web service URL discovery * warning dialog box is displayed.
  • @@ -208,7 +199,13 @@ import jalview.ws.sifts.SiftsSettings; *
  • CHIMERA_PATH specify full path to Chimera program (if non-standard)
  • *
  • ID_ORG_HOSTURL location of jalview service providing identifiers.org urls *
  • - * + *
  • NONEWS - when set disables Jalview News from automatically appearing
  • + *
  • NOHTMLTEMPLATES - when set, the + * https://github.com/jalview/exporter-templates/tree/master/biojs repository is + * not downloaded automatically
  • + *
  • NOIDENTIFIERSSERVICE - when set, jalview won't automatically download + * available URL linkouts via www.jalview.org/services/identifiers
  • + *
  • * * Deprecated settings: *