From: Ben Soares <bsoares@dundee.ac.uk>
Date: Wed, 19 Feb 2020 14:22:53 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Develop-2_11_2_0-d20201215~103
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=92188151420994657fe0478402f58d6ffaddc9f5;hp=9b8c2737f49036cbaf13e70858f2388d159915d1;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
---

diff --git a/help/help/html/releases.html b/help/help/html/releases.html
index bb4b386..d7f3ee1 100755
--- a/help/help/html/releases.html
+++ b/help/help/html/releases.html
@@ -58,17 +58,21 @@ li:before {
     <tr>
       <td width="60" align="center" nowrap><strong><a
           name="Jalview.2.11.1">2.11.1</a><a name="Jalview.2.11.1.0">.0</a><br />
-          <em>16/2/2020</em></strong></td>
+          <em>25/2/2020</em></strong></td>
       <td align="left" valign="top">
         <ul>
           <li>
-            <!-- JAL-3376 -->Record &quot;fixed column&quot; values POS, ID, QUAL, FILTER from VCF as Feature Attributes
+            <!-- JAL-3376 -->Record &quot;fixed column&quot; values POS,
+            ID, QUAL, FILTER from VCF as Feature Attributes
           </li>
           <li>
-            <!-- JAL-3375 -->More robust VCF numeric data field validation
-            while parsing (e.g. AF* attributes)
+            <!-- JAL-3375 -->More robust VCF numeric data field
+            validation while parsing (e.g. AF* attributes)
+          </li>
+          <li>
+            <!-- JAL-3538 -->Font anti-aliasing in alignment views
+            enabled by default
           </li>
-          
           <li>
           <!-- JAL -->
           </li>
diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 61b0d1b..91af323 100644
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -208,7 +208,7 @@ public class AlignViewport extends AlignmentViewport
    */
   private void applyViewProperties()
   {
-    antiAlias = Cache.getDefault("ANTI_ALIAS", false);
+    antiAlias = Cache.getDefault("ANTI_ALIAS", true);
 
     viewStyle.setShowJVSuffix(Cache.getDefault("SHOW_JVSUFFIX", true));
     setShowAnnotation(Cache.getDefault("SHOW_ANNOTATIONS", true));
diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 9754e0d..0d7d1b4 100755
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -253,7 +253,7 @@ public class Preferences extends GPreferences
     fontStyleCB.setSelectedItem(
             Cache.getDefault("FONT_STYLE", Font.PLAIN + ""));
 
-    smoothFont.setSelected(Cache.getDefault("ANTI_ALIAS", false));
+    smoothFont.setSelected(Cache.getDefault("ANTI_ALIAS", true));
     scaleProteinToCdna
             .setSelected(Cache.getDefault(SCALE_PROTEIN_TO_CDNA, false));
 
@@ -401,7 +401,7 @@ public class Preferences extends GPreferences
     doReset.addActionListener(onReset);
 
     // filter to display only custom urls
-    final RowFilter<TableModel, Object> customUrlFilter = new RowFilter<TableModel, Object>()
+    final RowFilter<TableModel, Object> customUrlFilter = new RowFilter<>()
     {
       @Override
       public boolean include(