From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 31 Oct 2018 16:30:24 +0000 (+0000)
Subject: Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into trialMerge
X-Git-Tag: Release_2_11_4_0~45^2~18^2~435^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=181cd6607ecd631aa5972582ff1d99c5bea75b23;p=jalview.git

Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into trialMerge

Conflicts:
	src/jalview/ext/ensembl/EnsemblRestClient.java
	swingjs/timestamp
---

181cd6607ecd631aa5972582ff1d99c5bea75b23
diff --cc src/jalview/ext/ensembl/EnsemblRestClient.java
index e3d695f,9e01cc4..97172fa
--- a/src/jalview/ext/ensembl/EnsemblRestClient.java
+++ b/src/jalview/ext/ensembl/EnsemblRestClient.java
@@@ -333,10 -331,10 +334,9 @@@ abstract class EnsemblRestClient extend
      boolean multipleIds = ids != null && ids.size() > 1;
      connection.setRequestMethod(
              multipleIds ? HttpMethod.POST : HttpMethod.GET);
-     connection.setRequestProperty("Content-Type",
-             getRequestMimeType(multipleIds));
+     connection.setRequestProperty("Content-Type", getRequestMimeType());
      connection.setRequestProperty("Accept", getResponseMimeType());
  
 -    connection.setUseCaches(false);
      connection.setDoInput(true);
      connection.setDoOutput(multipleIds);
  
diff --cc swingjs/timestamp
index 60a3ccd,d6f548b..854d7fa
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@@ -1,1 -1,1 +1,1 @@@
--20181030183630 
++20181030183630
diff --cc utils/eclipse/JalviewCodeStyle.xml
index 7b93801,7b93801..3150eca
--- a/utils/eclipse/JalviewCodeStyle.xml
+++ b/utils/eclipse/JalviewCodeStyle.xml
@@@ -108,7 -108,7 +108,7 @@@
  <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
  <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
  <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
--<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/>
++<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/>
  <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
  <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
  <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>