From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 13 Nov 2017 16:39:02 +0000 (+0000)
Subject: Merge branch 'develop' into features/JAL-1793VCF
X-Git-Tag: Release_2_11_0~137
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c68e41c5f6d66c05ded22a514e5b0fa5775627b6;p=jalview.git

Merge branch 'develop' into features/JAL-1793VCF

Conflicts:
	.classpath
	build.xml
	resources/lang/Messages.properties
---

c68e41c5f6d66c05ded22a514e5b0fa5775627b6
diff --cc .classpath
index 441ba60,d704f10..c85feaf
--- a/.classpath
+++ b/.classpath
@@@ -66,8 -68,6 +66,8 @@@
  	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
  	<classpathentry kind="lib" path="lib/biojava-core-4.1.0.jar"/>
  	<classpathentry kind="lib" path="lib/biojava-ontology-4.1.0.jar"/>
- 	<classpathentry kind="lib" path="lib/groovy-all-2.4.6-indy.jar"/>
 +	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 +	<classpathentry kind="lib" path="lib/htsjdk-2.12.0.jar"/>
+ 	<classpathentry kind="lib" path="lib/groovy-all-2.4.12-indy.jar"/>
  	<classpathentry kind="output" path="classes"/>
  </classpath>
diff --cc build.xml
index 436148a,4931cfb..43d6a0c
--- a/build.xml
+++ b/build.xml
@@@ -451,10 -451,10 +451,9 @@@
  
      <jnlpf toFile="${jnlpFile}" />
      <!-- add the add-modules j2se attribute for java 9 -->
-     <replace file="${jnlpFile}" value="j2se version=&quot;1.8+&quot; initial-heap-size=&quot;${inih}&quot; max-heap-size=&quot;${maxh}&quot; java-vm-args=&quot;--add-modules=java.se.ee&quot;">
 -    <replace file="${jnlpFile}" value="j2se version=&quot;1.7+&quot; initial-heap-size=&quot;${inih}&quot; max-heap-size=&quot;${maxh}&quot; java-vm-args=&quot;--add-modules=java.se.ee --illegal-access=warn&quot;">
 -          <replacetoken>j2se version="1.7+"</replacetoken>
 -           
 -        </replace>
++    <replace file="${jnlpFile}" value="j2se version=&quot;1.9+&quot; initial-heap-size=&quot;${inih}&quot; max-heap-size=&quot;${maxh}&quot; java-vm-args=&quot;--add-modules=java.se.ee --illegal-access=warn&quot;">
 +          <replacetoken>j2se version="1.8+"</replacetoken>
-            
-         </replace>
++    </replace>
    </target>
  
    <target name="-dofakejnlpfileassoc" depends="-generatejnlpf" if="nojnlpfileassocs">
diff --cc resources/lang/Messages.properties
index 75c002a,94f7eff..39ec4f1
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@@ -1324,29 -1319,6 +1324,32 @@@ label.select_hidden_colour = Select hid
  label.overview = Overview
  label.reset_to_defaults = Reset to defaults
  label.oview_calc = Recalculating overview...
 +label.feature_details = Feature details
 +label.matchCondition_contains = Contains
 +label.matchCondition_notcontains = Does not contain
 +label.matchCondition_matches = Matches
 +label.matchCondition_notmatches = Does not match
 +label.matchCondition_eq = =
 +label.matchCondition_ne = not =
 +label.matchCondition_lt = <
 +label.matchCondition_le = <=
 +label.matchCondition_gt = >
 +label.matchCondition_ge = >=
 +label.numeric_required = The value should be numeric
 +label.no_attributes = No attributes known
 +label.no_numeric_attributes = No numeric attributes known
 +label.filters = Filters
 +label.match_condition = Match condition
 +label.join_conditions = Join conditions with
 +label.feature_to_filter = Feature to filter
 +label.colour_by_value = Colour by value
 +label.colour_by_text = Colour by text
 +label.score = Score
 +label.attribute = Attribute
 +label.colour_by_label = Colour by label
 +label.variable_colour = Variable colour
 +label.select_new_colour = Select new colour
 +label.no_feature_attributes = No feature attributes found
+ option.enable_disable_autosearch = When ticked, search is performed automatically.
+ option.autosearch = Autosearch
 -label.retrieve_ids = Retrieve IDs
++label.retrieve_ids = Retrieve IDs