Merge branch 'task/JAL-3225_Integration_Gradle_building_into_Eclipse' into bug/JAL...
authorJim Procter <jprocter@issues.jalview.org>
Wed, 24 Apr 2019 19:29:32 +0000 (20:29 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 24 Apr 2019 19:51:50 +0000 (20:51 +0100)
28 files changed:
.classpath
.gitignore
.project
.settings/org.eclipse.buildship.core.prefs [new file with mode: 0644]
.settings/org.eclipse.jdt.core.jalview.prefs [new file with mode: 0644]
.settings/org.eclipse.jdt.core.prefs
.settings/org.eclipse.jdt.groovy.core.prefs [new file with mode: 0644]
.settings/org.eclipse.jdt.ui.prefs
build-j11.xml [deleted file]
build.gradle
doc/building.html
getdown/src/getdown/.project-MOVED [moved from getdown/src/getdown/.project with 100% similarity]
getdown/src/getdown/ant/.project-MOVED [moved from getdown/src/getdown/ant/.project with 100% similarity]
getdown/src/getdown/core/.project-MOVED [moved from getdown/src/getdown/core/.project with 100% similarity]
getdown/src/getdown/launcher/.project-MOVED [moved from getdown/src/getdown/launcher/.project with 100% similarity]
gradle.properties
j11lib/Jmol-14.6.4_2016.10.26-no_netscape.jar [moved from j11lib/Jmol-14.6.4_2016.10.26.jar with 67% similarity]
j11lib/groovy-2.5.6.jar [new file with mode: 0644]
j11lib/groovy-all-2.4.12-indy.jar [deleted file]
j11lib/groovy-console-2.5.6.jar [new file with mode: 0644]
j11lib/javax.xml.rpc-api-1.1.2.jar [new file with mode: 0644]
j11lib/jaxrpc.jar [deleted file]
j11mod/javax.xml.rpc-api-1.1.2.jar [new file with mode: 0644]
lib/Jmol-14.6.4_2016.10.26-no_netscape.jar [moved from lib/Jmol-14.6.4_2016.10.26.jar with 67% similarity]
lib/groovy-2.5.6.jar [new file with mode: 0644]
lib/groovy-all-2.4.12-indy.jar [deleted file]
lib/groovy-console-2.5.6.jar [new file with mode: 0644]
src/jalview/bin/Jalview.java

index fb1078a..ac6ed96 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="src" path="utils"/>
-       <classpathentry kind="src" path="test"/>
-       <classpathentry kind="lib" path="lib/axis.jar" sourcepath="D:/axis-1_2RC2-src/axis-1_2RC2"/>
-       <classpathentry kind="lib" path="lib/commons-discovery.jar"/>
-       <classpathentry kind="lib" path="lib/jaxrpc.jar"/>
-       <classpathentry kind="lib" path="lib/jhall.jar"/>
-       <classpathentry kind="lib" path="lib/regex.jar"/>
-       <classpathentry kind="lib" path="lib/xercesImpl.jar"/>
-       <classpathentry kind="lib" path="lib/JGoogleAnalytics_0.3.jar" sourcepath="/JGoogleAnalytics/src/main/java"/>
-       <classpathentry kind="lib" path="lib/vamsas-client.jar"/>
-       <classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
-       <classpathentry kind="lib" path="lib/apache-mime4j-0.6.jar" sourcepath="G:/InstallsDir/Sources for Development/apache-mime4j-0.6-src.zip"/>
-       <classpathentry kind="lib" path="lib/httpclient-4.0.3.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/D:/InstallsDir/Sources for Development/httpconnect/httpcomponents-client-4.0.3/javadoc/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry kind="lib" path="lib/httpcore-4.0.1.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/D:/InstallsDir/Sources for Development/httpconnect/httpcomponents-client-4.0.3/javadoc/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry kind="lib" path="lib/httpmime-4.0.3.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/D:/InstallsDir/Sources for Development/httpconnect/httpcomponents-client-4.0.3/javadoc/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry kind="lib" path="lib/miglayout-4.0-swing.jar"/>
-       <classpathentry kind="lib" path="lib/jswingreader-0.3.jar" sourcepath="/jswingreader"/>
-       <classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
-       <classpathentry kind="lib" path="lib/jabaws-min-client-2.2.0.jar" sourcepath="/clustengine"/>
-       <classpathentry kind="lib" path="lib/json_simple-1.1.jar" sourcepath="/Users/jimp/Downloads/json_simple-1.1-all.zip"/>
-       <classpathentry kind="lib" path="lib/slf4j-api-1.7.7.jar"/>
-       <classpathentry kind="lib" path="lib/jsoup-1.8.1.jar"/>
-       <classpathentry kind="lib" path="lib/log4j-to-slf4j-2.0-rc2.jar"/>
-       <classpathentry kind="lib" path="lib/slf4j-log4j12-1.7.7.jar"/>
-       <classpathentry kind="lib" path="lib/VARNAv3-93.jar"/>
-       <classpathentry kind="lib" path="lib/jfreesvg-2.1.jar"/>
-       <classpathentry kind="lib" path="lib/quaqua-filechooser-only-8.0.jar"/>
-       <classpathentry kind="lib" path="lib/VAqua5-patch.jar"/>
-       <classpathentry kind="lib" path="utils/classgraph-4.1.6.jar"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Plugin.jar"/>
-       <classpathentry kind="lib" path="lib/jersey-client-1.19.jar"/>
-       <classpathentry kind="lib" path="lib/jersey-core-1.19.jar"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin.jar"/>
-       <classpathentry kind="lib" path="lib/jetty-server-9.2.10.v20150310.jar"/>
-       <classpathentry kind="lib" path="lib/jetty-util-9.2.10.v20150310.jar"/>
-       <classpathentry kind="lib" path="lib/jetty-http-9.2.10.v20150310.jar"/>
-       <classpathentry kind="lib" path="lib/jetty-io-9.2.10.v20150310.jar"/>
-       <classpathentry kind="lib" path="lib/java-json.jar"/>
-       <classpathentry kind="lib" path="lib/Jmol-14.6.4_2016.10.26.jar"/>
-       <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/htsjdk-2.12.0.jar"/>
-       <classpathentry kind="lib" path="lib/groovy-all-2.4.12-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/intervalstore-v1.0.jar"/>
-       <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
-       <classpathentry kind="output" path="classes"/>
+       <classpathentry kind="src" output="bin/main" path="src">
+               <attributes>
+                       <attribute name="gradle_scope" value="main"/>
+                       <attribute name="gradle_used_by_scope" value=""/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="src" output="bin/main" path="resources">
+               <attributes>
+                       <attribute name="gradle_scope" value="main"/>
+                       <attribute name="gradle_used_by_scope" value=""/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="src" output="bin/test" path="test">
+               <attributes>
+                       <attribute name="test" value="true"/>
+                       <attribute name="gradle_scope" value="test"/>
+                       <attribute name="gradle_used_by_scope" value=""/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/">
+               <attributes>
+                       <attribute name="module" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+       <classpathentry kind="lib" path="j11lib/jsoup-1.8.1.jar"/>
+       <classpathentry kind="lib" path="j11lib/jswingreader-0.3.jar"/>
+       <classpathentry kind="lib" path="j11lib/mail-MODULE.jar"/>
+       <classpathentry kind="lib" path="j11lib/javax.servlet-api-MODULE.jar"/>
+       <classpathentry kind="lib" path="j11lib/httpclient-4.0.3.jar"/>
+       <classpathentry kind="lib" path="j11lib/regex.jar"/>
+       <classpathentry kind="lib" path="j11lib/policy.jar"/>
+       <classpathentry kind="lib" path="j11lib/jaxb-api-java9.jar"/>
+       <classpathentry kind="lib" path="j11lib/JGoogleAnalytics_0.3.jar"/>
+       <classpathentry kind="lib" path="j11lib/jetty-http-9.2.10.v20150310.jar"/>
+       <classpathentry kind="lib" path="j11lib/javax.activation-MODULE.jar"/>
+       <classpathentry kind="lib" path="j11lib/getdown-launcher.jar"/>
+       <classpathentry kind="lib" path="j11lib/commons-logging-1.1.1.jar"/>
+       <classpathentry kind="lib" path="j11lib/slf4j-log4j12-1.7.7.jar"/>
+       <classpathentry kind="lib" path="j11lib/miglayout-4.0-swing.jar"/>
+       <classpathentry kind="lib" path="j11lib/txw2.jar"/>
+       <classpathentry kind="lib" path="j11lib/quaqua-filechooser-only-8.0.jar"/>
+       <classpathentry kind="lib" path="j11lib/VARNAv3-93.jar"/>
+       <classpathentry kind="lib" path="j11lib/groovy-2.5.6.jar"/>
+       <classpathentry kind="lib" path="j11lib/jersey-client-1.19.jar"/>
+       <classpathentry kind="lib" path="j11lib/jaxb-runtime.jar"/>
+       <classpathentry kind="lib" path="j11lib/commons-discovery.jar"/>
+       <classpathentry kind="lib" path="j11lib/slf4j-api-1.7.7.jar"/>
+       <classpathentry kind="lib" path="j11lib/VAqua5-patch.jar"/>
+       <classpathentry kind="lib" path="j11lib/jaxws-api.jar"/>
+       <classpathentry kind="lib" path="j11lib/javax.xml.soap-api.jar"/>
+       <classpathentry kind="lib" path="j11lib/libquaqua-8.0.jnilib.jar"/>
+       <classpathentry kind="lib" path="j11lib/istack-commons-runtime.jar"/>
+       <classpathentry kind="lib" path="j11lib/jersey-json-1.19.jar"/>
+       <classpathentry kind="lib" path="j11lib/stax-ex.jar"/>
+       <classpathentry kind="lib" path="j11lib/httpmime-4.0.3.jar"/>
+       <classpathentry kind="lib" path="j11lib/biojava-core-4.1.0.jar"/>
+       <classpathentry kind="lib" path="j11lib/libquaqua64-8.0.jnilib.jar"/>
+       <classpathentry kind="lib" path="j11lib/jabaws-min-client-2.2.0.jar"/>
+       <classpathentry kind="lib" path="j11lib/jetty-io-9.2.10.v20150310.jar"/>
+       <classpathentry kind="lib" path="j11lib/intervalstore-v1.0.jar"/>
+       <classpathentry kind="lib" path="j11lib/htsjdk-2.12.0.jar"/>
+       <classpathentry kind="lib" path="j11lib/groovy-console-2.5.6.jar"/>
+       <classpathentry kind="lib" path="j11lib/javax.ws.rs-api-2.1.1.jar"/>
+       <classpathentry kind="lib" path="j11lib/commons-codec-1.3.jar"/>
+       <classpathentry kind="lib" path="j11lib/jaxws-rt-java9.jar"/>
+       <classpathentry kind="lib" path="j11lib/vamsas-client.jar"/>
+       <classpathentry kind="lib" path="j11lib/saaj-impl.jar"/>
+       <classpathentry kind="lib" path="j11lib/jetty-server-9.2.10.v20150310.jar"/>
+       <classpathentry kind="lib" path="j11lib/jetty-util-9.2.10.v20150310.jar"/>
+       <classpathentry kind="lib" path="j11lib/xercesImpl.jar"/>
+       <classpathentry kind="lib" path="j11lib/Jmol-14.6.4_2016.10.26-no_netscape.jar"/>
+       <classpathentry kind="lib" path="j11lib/FastInfoset.jar"/>
+       <classpathentry kind="lib" path="j11lib/commons-compress-1.18.jar"/>
+       <classpathentry kind="lib" path="j11lib/biojava-ontology-4.1.0.jar"/>
+       <classpathentry kind="lib" path="j11lib/log4j-to-slf4j-2.0-rc2.jar"/>
+       <classpathentry kind="lib" path="j11lib/jersey-core-1.19.jar"/>
+       <classpathentry kind="lib" path="j11lib/wsdl4j-MODULE.jar"/>
+       <classpathentry kind="lib" path="j11lib/httpcore-4.0.1.jar"/>
+       <classpathentry kind="lib" path="j11lib/jhall.jar"/>
+       <classpathentry kind="lib" path="j11lib/stax2-api-MODULE.jar"/>
+       <classpathentry kind="lib" path="j11lib/gmbal-api-only-MODULE.jar"/>
+       <classpathentry kind="lib" path="j11lib/javax.jws-api-1.1.jar"/>
+       <classpathentry kind="lib" path="j11lib/axis.jar"/>
+       <classpathentry kind="lib" path="j11lib/javax.xml.rpc-api-1.1.2.jar"/>
+       <classpathentry kind="lib" path="j11lib/javax.annotation-api-MODULE.jar"/>
+       <classpathentry kind="lib" path="j11lib/java-json.jar"/>
+       <classpathentry kind="lib" path="j11lib/mimepull.jar"/>
+       <classpathentry kind="lib" path="j11lib/jfreesvg-2.1.jar"/>
+       <classpathentry kind="lib" path="j11lib/streambuffer.jar"/>
+       <classpathentry kind="lib" path="j11lib/apache-mime4j-0.6.jar"/>
+       <classpathentry kind="lib" path="j11lib/json_simple-1.1.jar"/>
+       <classpathentry kind="lib" path="utils/proguard_5.3.3.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/junit-4.12.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/wsdl4j.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/axis-ant.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/classgraph-4.1.6.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/testnglibs/testng-sources.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/testnglibs/jcommander.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/testnglibs/snakeyaml.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/testnglibs/junit-4.12.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/testnglibs/bsh-2.0b4.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/testnglibs/testng.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/testnglibs/guava-collections-r03.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/testnglibs/guava-base-r03.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/jhindexer.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/ant-contrib-1.0b3.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/hamcrest-core-1.3.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/roxes-ant-tasks-1.2-2004-01-30.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="utils/jhall.jar">
+               <attributes>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="output" path="bin/main"/>
 </classpath>
index a6ca5a7..11dcde1 100644 (file)
@@ -7,7 +7,6 @@
 /test-reports
 /test-output
 .externalToolBuilders/*
-.settings/*
 /.DS_Store
 .DS_Store
 /.com.apple.timemachine.supported
@@ -20,10 +19,9 @@ TESTNG
 /.gradle
 /build
 /utils/HelpLinksChecker.out
-/.settings
 /getdown/website
 /getdown/full_app
 /getdown/files
-/.classpath
 /utils/install4j/jalview-installers-*.install4j
 *.swp
+/bin
index d0dfc7e..d4d0c20 100644 (file)
--- a/.project
+++ b/.project
@@ -1,37 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>Jalview Release 2.7</name>
+       <name>Jalview with gradle build</name>
        <comment></comment>
-       <projects>
-       </projects>
+       <projects/>
+       <natures>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
+               <nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+       </natures>
        <buildSpec>
                <buildCommand>
                        <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.wst.common.project.facet.core.builder</name>
-                       <arguments>
-                       </arguments>
+                       <arguments/>
                </buildCommand>
                <buildCommand>
-                       <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-                       <triggers>full,incremental,</triggers>
-                       <arguments>
-                               <dictionary>
-                                       <key>LaunchConfigHandle</key>
-                                       <value>&lt;project&gt;/.externalToolBuilders/Jalview Release indices [Builder].launch</value>
-                               </dictionary>
-                       </arguments>
+                       <name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+                       <arguments/>
                </buildCommand>
        </buildSpec>
-       <natures>
-               <nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
-               <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-               <nature>de.tud.st.ispace.builder.ISpaceNature</nature>
-               <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
-       </natures>
+       <linkedResources/>
+       <filteredResources/>
 </projectDescription>
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
new file mode 100644 (file)
index 0000000..e889521
--- /dev/null
@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1
diff --git a/.settings/org.eclipse.jdt.core.jalview.prefs b/.settings/org.eclipse.jdt.core.jalview.prefs
new file mode 100644 (file)
index 0000000..54b3d1a
--- /dev/null
@@ -0,0 +1,297 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=52
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
+org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=false
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=4
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=8
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=76
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=2
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+bentest=pomegranate
index 5908bb2..babbc21 100644 (file)
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=52
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+#
+#Wed Apr 24 15:04:24 BST 2019
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=4
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.indentation.size=8
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
 org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.continuation_indentation=4
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
 org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=8
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
 org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
 org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.tabulation.size=2
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
 org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+bentest=pomegranate
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+eclipse.preferences.version=1
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=52
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.comment.format_block_comments=false
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
 org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=76
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
 org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=2
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.lineSplit=76
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
diff --git a/.settings/org.eclipse.jdt.groovy.core.prefs b/.settings/org.eclipse.jdt.groovy.core.prefs
new file mode 100644 (file)
index 0000000..74af1ba
--- /dev/null
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+groovy.compiler.level=25
index 958613b..41487fe 100644 (file)
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_Jalview
-formatter_settings_version=12
+formatter_settings_version=16
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=jalview;java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/build-j11.xml b/build-j11.xml
deleted file mode 100755 (executable)
index 9f2761b..0000000
+++ /dev/null
@@ -1,1077 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
- * 
- * This file is part of Jalview.
- * 
- * Jalview is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *  
- * Jalview is distributed in the hope that it will be useful, but 
- * WITHOUT ANY WARRANTY; without even the implied warranty 
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
- * PURPOSE.  See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
- * The Jalview Authors are detailed in the 'AUTHORS' file.
--->
-<project name="jalviewX" default="usage" basedir="."
- xmlns:if="ant:if"
-    xmlns:unless="ant:unless">
-  <taskdef classpath="${clover.jar}" resource="cloverlib.xml" if:set="clover.jar"/>
-  <clover-env if:set="clover.jar"/>
-
-  <target name="help" depends="usage" />
-  <target name="usage" depends="init">
-    <echo message="~~~Jalview Ant build.xml Usage~~~~" />
-    <echo message="Targets include:" />
-    <echo message="usage - default target, displays this message" />
-    <echo message="buildindices - generates JavaHelpSearch from the help files" />
-    <echo message="build - compiles all necessary files for Application" />
-    <echo message="makedist - compiles and places all necessary jar files into directory dist" />
-    <echo message="makefulldist - signs all jar files and builds jnlp file for full distribution" />
-    <echo message="              this needs a keystore and key."/>
-    <echo message="              Add -Dtimestamp to timestamp signed jars"/>
-    <echo message="              -Djalview.keyalg and -Djalview.keydig are SHA1/SHA1withRSA"/>
-    <echo message="              See docs/building.html for more information." />
-    <echo message="compileApplet - compiles all necessary files for Applet" />
-    <echo message="makeApplet - compiles, then packages and obfuscates the Applet" />
-    <echo message="testng - run jalview's tests via testNG. Default group is '${testng-groups}'" />
-    <echo message="      you can specify particular test groups as a list via -Dtestng-groups=" />
-    <echo message="See docs/building.html and the comments in build file for other targets." />
-    <echo message="note: compile and makeApplet optionally compile/obfuscate applet against a different Java version by specifying -Djava118.home=PathtoJDK/lib which is the lib directory in the JDK install that contains rt.jar " />
-    <echo message="Useful -D flags: -Ddonotobfuscate will prevent applet obfuscation" />
-    <echo message="Useful -D flags: -Dclover.jar to specify path to openclover for testng coverage report" />
-    <echo message="Useful -D flags: -Ddeprecation=true to add -Xlint:deprecation to the java compiler" />
-  </target>
-
-
-  <!-- utils is a class path to additional utilities needed for
-    building docs, jars and webstart stuff -->
-  <!--
-        Userdefined build property defaults
-
-        wsdl.server list (plus namespace mapping info ???)  - also want
-                ... to make this a dynamically generatable property
-        WebStart Location
-        Build location - provide a temporary root for speed
-        jarsigner keystore and info
-        Jakarta and axis classpath ?
-        Default argument for starting Jalview (if it exists).
-
--->
-
-  <target name="init">
-    <path id="axis.classpath">
-      <!-->
-      <fileset dir="/usr/local/axis/lib">
-        <include name="**/*.jar" />
-      </fileset>
-      <fileset dir="/usr/local/jakarta-tomcat-5/webapps/axis/WEB-INF/lib">
-        <include name="**/*.jar"/>
-        <include name="*.jar"/>
-      </fileset> -->
-      </path>
-
-    <!-- Jalview Version String displayed by application on startup and used to check for updates -->
-    <property name="JALVIEW_VERSION" value="DEVELOPMENT" />
-
-    <property name="INSTALLATION" value="Source" />
-
-    <!-- 2.4 (VAMSAS)" -->
-    <!-- Include debugging information in javac true or false -->
-    <property name="javac.debug" value="true" />
-
-    <!-- JarSigner Key Store for Webstart Distribution -->
-    <property name="jalview.keystore" value="./keys/.keystore" />
-    <!-- Keystore Password -->
-    <property name="jalview.keystore.pass" value="alignmentisfun" />
-    <!-- Key Name -->
-    <property name="jalview.key" value="jalview" />
-    <!-- Key Password -->
-    <property name="jalview.key.pass" value="alignmentisfun" />
-    <!-- time stamp server URL -->
-    <property name="jalview.tsaurl" value="" />
-    <!-- locally valid proxy for signing with external time server -->
-    <property name="proxyPort" value="80"/>
-    <property name="proxyHost" value="sqid"/>
-    <!-- key sign/digest algorithms -->
-    <property name="jalview.keyalg" value="SHA1withRSA" description="key algorithm for signing"/>
-    <property name="jalview.keydig" value="SHA1" description="algorithm for jar digest"/>
-
-    <!-- default TestNG groups to run -->
-    <property name="testng-groups" value="Functional" />
-    <!-- Java 9 JVM args -->
-    <condition property="java9">
-      <equals arg1="${ant.java.version}" arg2="9"/>
-    </condition>
-    <!-- Java 10 JVM args -->
-    <condition property="java10">
-      <equals arg1="${ant.java.version}" arg2="10"/>
-    </condition>
-    <!-- Java 11 JVM args -->
-    <condition property="java11">
-      <equals arg1="${ant.java.version}" arg2="11"/>
-    </condition>
-    <echo message="ant.java.version is ${ant.java.version}"/>
-
-    <!-- Don't change anything below here unless you know what you are doing! -->
-    <!-- Url path for WebStart in JNLP file -->
-    <property name="WebStartLocation" value="http://www.jalview.org/webstart" />
-    <!-- Webstart Image - looked for in resources/images -->
-    <property name="WebStartImage" value="JalviewLogo_big.png" />
-    <!-- J2SE version needed for webstart launch -->
-    <!-- Anne's version needs 1.7 - should rebuild VARNA to java 1.6 for release -->
-    <property name="j2sev" value="1.7+" />
-    <!-- Java Compilation settings - source and target javac version -->
-    <property name="javac.source" value="11" if:set="java11" />
-    <property name="javac.target" value="11" if:set="java11" />
-    <property name="javac.source" value="1.8" unless:set="java11" />
-    <property name="javac.target" value="1.8" unless:set="java11" />
-    <echo message="javac.source is ${javac.source}"/>
-    <echo message="javac.target is ${javac.target}"/>
-
-    <!-- Permissions for running Java applets and applications. -->
-    <!-- Defaults are those suitable for deploying jalview webstart www.jalview.org -->
-    <property name="application.codebase" value="*.jalview.org" />
-    <!-- and allowing the applet to be deployed from any URL -->
-    <!-- note - if you want to make sure LiveConnect works without any warnings, please rebuild and sign your applet jar with your own domain included in the codebase/allowable-codebase properties -->
-    <property name="applet.codebase" value="*.jalview.org *.dundee.ac.uk *" />
-    <property name="applet.caller-codebase" value="${applet.codebase}" />
-
-    <!-- build directory configuration -->
-    <property name="libDir" value="lib" />
-    <property name="j11libDir" value="j11lib" />
-    <property name="resourceDir" value="resources" />
-    <property name="helpDir" value="help" />
-    <property name="docDir" value="doc" />
-    <property name="sourceDir" value="src" />
-    <property name="schemaDir" value="schemas" />
-    <property name="outputDir" value="classes" unless:set="clover.jar"/>
-    <property name="outputDir" value="cloverclasses" if:set="clover.jar"/>
-    <property name="packageDir" value="dist" />
-    <property name="outputJar" value="jalview.jar" />
-    <!-- Jalview Applet JMol Jar Dependency -->
-    <property name="jmolJar" value="JmolApplet-14.6.4_2016.10.26.jar" />
-    <property name="varnaJar" value="VARNAv3-93.jar" />
-    <property name="jsoup" value="jsoup-1.8.1.jar" />
-    <property name="jsonSimple" value="json_simple-1.1.jar" />
-    <property name="javaJson" value="java-json.jar" />
-    <property name="jalviewLiteJar" value="jalviewApplet.jar" />
-    <property name="reportDir" value="test-reports" />
-    <property name="testDir" value="test" />
-    <property name="testOutputDir" value="tests" />
-    <!-- switch to indicate if we should obfuscate jalviewLite -->
-    <!-- <property name="donotobfuscate" value="true"/> -->
-    <!-- switch to exclude associations from generated jnlp files -->
-    <!-- <property name="nojnlpfileassocs" value="true"/> -->
-
-    <!-- Jalview Web Service Clients - see the comments in 'buildextclients' for details -->
-    <property name="wsdl.File" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/jpred?wsdl" />
-    <property name="wsdl.Files" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/vamsas?wsdlFiles" />
-    <property name="wsdl.MsaWS" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/MuscleWS?wsdl" />
-    <property name="wsdl.MsaWS2" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/ClustalWS?wsdl" />
-    <property name="WSInterf" value="MsaWS" />
-    <property name="wsdl.Namespace" value="vamsas" />
-    <property name="wsdl.ClientNS" value="ext.vamsas" />
-    <!-- the class path for building the application -->
-    <path id="build.classpath">
-      <fileset dir="utils">
-        <include name="*.jar" />
-        <include name="**/*.jar" />
-      </fileset>
-      <fileset dir="${j11libDir}">
-        <include name="*.jar" />
-        <include name="**/*.jar" />
-      </fileset>
-      <fileset dir="${libDir}">
-        <include name="*.jar" />
-        <include name="**/*.jar" />
-      </fileset>
-      <fileset dir="${java.home}/lib">
-        <include name="plugin.jar" />
-      </fileset>
-      <fileset dir="appletlib">
-        <!-- the JmolApplet includes the JmolApplet console and the application javac seems to always try and build all packages 
-                               -->
-        <include name="${jmolJar}" />
-        <include name="${varnaJar}" />
-      </fileset>
-      <pathelement location="${clover.jar}" if:set="clover.jar"/>
-    </path>
-    <path id="test.classpath">
-      <pathelement path="${outputDir}" />
-      <path refid="build.classpath" />
-    </path>
-    <property name="source.dist.name" value="${basedir}/jalview-src.tar.gz" />
-    <!-- The Location of the java 1.1.8 jdk -->
-    <property name="java118.home" value="${java.home}" />
-    <!-- jre for 1.4 version -->
-    <property name="applet.jre.tools" value="${java118.home}/lib/rt.jar" />
-
-    <!-- the classpath for building the 1.1 applet -->
-    <path id="jalviewlite.deps">
-      <fileset dir="${java118.home}">
-        <include name="lib/rt.jar" />
-      </fileset>
-      <fileset dir="${java.home}/lib">
-        <include name="plugin.jar" />
-      </fileset>
-      <pathelement location="appletlib/${jmolJar}" />
-      <pathelement location="lib/${varnaJar}" />
-      <pathelement location="appletlib/${jsoup}" />
-      <pathelement location="appletlib/${jsonSimple}" />
-      <pathelement location="appletlib/${javaJson}" />
-
-    </path>
-    <!-- default location for outputting javadoc -->
-    <property name="javadocDir" value="${packageDir}/javadoc" />
-  </target>
-
-
-  <taskdef classpath="utils/roxes-ant-tasks-1.2-2004-01-30.jar" resource="com/roxes/tools/ant/taskdefs.properties" />
-  <target name="buildPropertiesFile" depends="init">
-    <tstamp prefix="build">
-      <format property="date" pattern="dd MMMM yyyy" />
-    </tstamp>
-    <exec executable="/usr/bin/git" outputproperty="git.commit" failifexecutionfails="false">
-      <arg value="rev-parse" />
-      <arg value="--short" />
-      <arg value="HEAD" />
-    </exec>
-    <exec executable="/usr/bin/git" outputproperty="git.branch" failifexecutionfails="false">
-      <arg value="rev-parse" />
-      <arg value="--abbrev-ref" />
-      <arg value="HEAD" />
-    </exec>
-    <properties file="${outputDir}/.build_properties">
-      <header>
-          ---Jalview Build Details---
-        </header>
-      <property name="VERSION" value="${JALVIEW_VERSION}" />
-      <property name="INSTALLATION" value="${INSTALLATION} git-commit:${git.commit} [${git.branch}]" />
-      <property name="BUILD_DATE" value="${build.date}" />
-    </properties>
-  </target>
-
-
-  <target name="clean" depends="init">
-    <!-- not efficient yet. -->
-    <delete dir="${outputDir}" includes="*,**/*" />
-  </target>
-
-  <target name="distclean" depends="init, clean">
-
-    <echo message="REMOVING ALL BACKUP/AUTOSAVES!" />
-    <delete>
-      <fileset dir=".">
-        <include name="${outputJar}" />
-        <include name="#*#" />
-        <include name="#*.*#" />
-        <include name="**/#*#" />
-        <include name="**/#*.*#" />
-        <include name="*~" />
-        <include name="*.*~" />
-        <include name="**/*~" />
-        <include name="**/*.*~" />
-      </fileset>
-    </delete>
-  </target>
-
-  <target name="prepare" depends="init">
-    <mkdir dir="${outputDir}" />
-    <copy todir="${outputDir}">
-      <fileset dir=".">
-        <include name="${docDir}/**/*.*" />
-        <include name="${helpDir}/**/*.*" />
-        <include name="${libDir}/*.jar" />
-      </fileset>
-      <fileset dir="${resourceDir}">
-        <include name="**/*.*" />
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="build" depends="prepare">
-    <!-- not efficient yet. -->
-    <!-- Echo the build.classpath
-    <pathconvert property="echoClasspath" refid="build.classpath" />
-    <echo message="build.classpath is '${echoClasspath}'" />
-    -->
-    <echo message="javac.target is '${javac.target}'" />
-    <echo message="adding -Xlint:deprecation to javac" if:set="deprecation"/>
-    <javac includeantruntime="false" source="${javac.source}" target="${javac.target}" srcdir="${sourceDir}" destdir="${outputDir}" debug="${javac.debug}" classpathref="build.classpath">
-      <compilerarg value="-Xlint:deprecation" if:set="deprecation" />
-      <exclude name="jalview/*applet*" />
-      <exclude name="jalview/appletgui/**" />
-      <exclude name="com/stevesoft/**" />
-    </javac>
-  </target>
-
-
-  <target name="testclean" depends="init">
-    <delete dir="${testOutputDir}" includes="*,**/*" />
-  </target>
-
-  <target name="prepareTests" depends="init,testclean">
-    <mkdir dir="${testOutputDir}" />
-  </target>
-
-  <target name="buildTests" depends="build,buildindices,prepareTests">
-    <javac source="${javac.source}" target="${javac.target}" srcdir="${testDir}" destdir="${testOutputDir}" debug="${javac.debug}" classpathref="test.classpath" includeantruntime="false">
-    </javac>
-  </target>
-
-  <taskdef resource="testngtasks" classpath="utils/testnglibs/testng.jar" />
-
-  <target name="testng" depends="buildTests">
-    <loadfile property="j11modules" srcFile="modules">
-      <filterchain>
-        <striplinebreaks/>
-      </filterchain>
-    </loadfile>
-    <echo message="j11libDir is '${j11libDir}'" />
-    <echo message="j11modules is '${j11modules}'" />
-    <testng outputDir="${reportDir}" haltOnFailure="false" groups="${testng-groups}" mode="testng"
-      verbose="2">
-      <classpath>
-        <pathelement location="${testOutputDir}" />
-        <pathelement location="${clover.jar}" if:set="clover.jar"/>
-        <path refid="test.classpath" />
-      </classpath>
-      <!--
-      <jvmarg value="DASH_DASH_module-path=${j11libDir}:${java.home}/jmods" if:set="java11"/>
-      -->
-      <jvmarg value="--module-path=${j11libDir}" if:set="java11"/>
-      <jvmarg value="--add-modules=${j11modules}" if:set="java11"/>
-      <jvmarg value="--add-modules=java.se.ee" if:set="java9"/>
-      <jvmarg value="--illegal-access=warn" if:set="java9"/>
-      <classfileset dir="${testOutputDir}" includes="**/*.class" />
-    </testng>
-  </target>
-
-  <target name="testngclass" depends="buildTests">
-    <condition property="propsSpecified">
-      <isset property="class.name" />
-    </condition>
-    <fail unless="propsSpecified" message="class.name property not specified."/>
-    <echo message="testng-groups is '${testng-groups}'" />
-    <loadfile property="j11modules" srcFile="modules"/>
-    <testng outputDir="${reportDir}" haltOnFailure="false" groups="${testng-groups}" mode="testng" verbose="2">
-      <classpath>
-        <pathelement location="${testOutputDir}" />
-        <pathelement location="${clover.jar}" if:set="clover.jar"/>
-        <path refid="test.classpath" />
-      </classpath>
-      <jvmarg value="--module-path=${j11libDir}:${java.home}/jmods" if:set="java11"/>
-      <jvmarg value="--add-modules=${j11modules}" if:set="java11"/>
-      <jvmarg value="--add-modules=java.se.ee" if:set="java9"/>
-      <jvmarg value="--illegal-access=warn" if:set="java9"/>
-      <classfileset dir="${testOutputDir}" includes="${class.name}" />
-    </testng>
-  </target>
-
-  <target name="buildindices" depends="init, prepare" unless="help.uptodate">
-    <replace value="${JALVIEW_VERSION}">
-      <replacetoken><![CDATA[$$Version-Rel$$]]></replacetoken>
-      <fileset dir="${outputDir}/${helpDir}">
-        <include name="help.jhm" />
-      </fileset>
-    </replace>
-
-    <java classname="com.sun.java.help.search.Indexer" classpathref="build.classpath" fork="true" dir="${outputDir}/${helpDir}">
-      <arg line="html" />
-    </java>
-  </target>
-
-  <target name="preparejnlp" depends="makedist">
-    <copy todir="${packageDir}">
-      <fileset dir="${resourceDir}/images">
-        <include name="${WebStartImage}" />
-      </fileset>
-    </copy>
-
-    <taskdef classpathref="build.classpath" resource="com/roxes/tools/ant/taskdefs.properties" />
-
-    <!-- create a dummy jar which will eventually contain the jnlp template -->
-    <jar destfile="${packageDir}/jalview_jnlp_vm.jar" index="true">
-      <fileset dir="${packageDir}">
-        <include name="jalview.jar" />
-      </fileset>
-    </jar>
-
-    <mkdir dir="${packageDir}/JNLP-INF" />
-    <antcall target="writejnlpf">
-      <param name="jnlpFile" value="${packageDir}/JNLP-INF/APPLICATION-TEMPLATE.JNLP" />
-      <param name="inih" value="*" />
-      <param name="maxh" value="*" />
-    </antcall>
-
-    <jar destfile="${packageDir}/jalview_jnlp_vm.jar" index="true">
-      <fileset dir="${packageDir}">
-        <include name="JNLP-INF/APPLICATION-TEMPLATE.JNLP" />
-      </fileset>
-    </jar>
-
-    <antcall target="writejnlpf">
-      <param name="jnlpFile" value="${packageDir}/jalview_256M.jnlp" />
-      <param name="inih" value="10M" />
-      <param name="maxh" value="256M" />
-    </antcall>
-    <antcall target="writejnlpf">
-      <param name="jnlpFile" value="${packageDir}/jalview.jnlp" />
-      <param name="inih" value="800M" />
-      <param name="maxh" value="1024M" />
-    </antcall>
-
-    <antcall target="writejnlpf">
-      <param name="jnlpFile" value="${packageDir}/jalview_1G.jnlp" />
-      <param name="inih" value="128M" />
-      <param name="maxh" value="512M" />
-    </antcall>
-
-    <antcall target="writejnlpf">
-      <param name="jnlpFile" value="${packageDir}/jalview_2G.jnlp" />
-      <param name="inih" value="800M" />
-      <param name="maxh" value="1024M" />
-    </antcall>
-
-    <!-- finally, need to postprocess to add in associations at end of 'information' element 
-                       
-                       <xslt in="${packageDir}/jalview_noa_1G.jnlp" out="${packageDir}/jalview_1G.jnlp">
-               
-               </xslt>
-                       
-                       
-                       -->
-    <!--
-                               <association mime-type="application-x/ext-file" extensions="fa"/>
-        <association mime-type="application-x/ext-file" extensions="fasta"/>
-        <association mime-type="application-x/ext-file" extensions="mfa"/>
-        <association mime-type="application-x/ext-file" extensions="fastq"/>
-        <association mime-type="application-x/ext-file" extensions="blc"/>
-        <association mime-type="application-x/ext-file" extensions="msf"/>
-        <association mime-type="application-x/ext-file" extensions="pfam"/>
-        <association mime-type="application-x/ext-file" extensions="aln"/>
-        <association mime-type="application-x/ext-file" extensions="pir"/>
-        <association mime-type="application-x/ext-file" extensions="amsa"/>
-        <association mime-type="application-x/ext-file" extensions="stk"/>
-        <association mime-type="application-x/ext-file" extensions="jar"/>-->
-  </target>
-
-  <target name="-jarsignwithtsa" depends="makedist,preparejnlp" if="timestamp" unless="nosign">
-    <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false" sigalg="${jalview.keyalg}" digestalg="${jalview.keydig}"
-      tsaproxyhost="${proxyHost}" tsaproxyport="${proxyPort}" tsaurl="${jalview.tsaurl}">
-      <fileset dir="${packageDir}">
-        <include name="*.jar" />
-      </fileset>
-    </signjar>
-  </target>
-  <target name="-jarsignnotsa" depends="makedist,preparejnlp" if:blank="timestamp" unless="nosign">
-    <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false" sigalg="${jalview.keyalg}" digestalg="${jalview.keydig}">
-      <fileset dir="${packageDir}">
-        <include name="*.jar" />
-      </fileset>
-    </signjar>
-  </target>
-
-  <target name="makefulldist" depends="makedist,preparejnlp,-jarsignwithtsa,-jarsignnotsa">
-    <!-- and sign the jars -->
-    <!-- the default keystore details might need to be edited here -->
-  </target>
-
-  <target name="runenv" depends="init">
-    <path id="run.classpath">
-      <pathelement location="${outputDir}" />
-      <fileset dir="${outputDir}">
-        <include name="${libDir}/*.jar" />
-      </fileset>
-    </path>
-    <pathconvert targetos="unix" refid="run.classpath" property="run.classpath" />
-
-    <echo>java -classpath ${run.classpath} jalview.bin.Jalview
-      </echo>
-  </target>
-
-  <target name="-generatejnlpf">
-    <presetdef name="jnlpf">
-      <jnlp codebase="${WebStartLocation}">
-        <information>
-          <title>Jalview</title>
-          <vendor>The Barton Group</vendor>
-          <homepage href="http://www.jalview.org" />
-          <description>Jalview Multiple Alignment Editor</description>
-          <description kind="short">Jalview</description>
-          <icon href="${WebStartImage}" />
-          <offline_allowed />
-        </information>
-        <resources>
-          <j2se version="1.8+" />
-          <jar main="true" href="jalview.jar"/>
-          <fileset dir="${packageDir}">
-            <exclude name="jalview.jar" />
-            <include name="*.jar" />
-            <include name="*_*.jar" />
-            <exclude name="*quaqua*.jar" />
-          </fileset>
-          <property name="jalview.version" value="${JALVIEW_VERSION}" />
-        </resources>
-        <resources os="Mac OS X">
-          <fileset dir="${packageDir}">
-                <include name="quaqua-filechooser-only-8.0.jar"/>
-            <include name="*quaqua64*.jnilib.jar" />
-          </fileset>
-        </resources>
-
-        <application_desc main_class="jalview.bin.Jalview">
-        </application_desc>
-        <security>
-          <all_permissions />
-        </security>
-      </jnlp>
-    </presetdef>
-
-    <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 --illegal-access=warn&quot;">
-          <replacetoken>j2se version="1.8+"</replacetoken>
-    </replace>
-  </target>
-
-  <target name="-dofakejnlpfileassoc" depends="-generatejnlpf" if="nojnlpfileassocs">
-    <echo message="Not adding JNLP File Associations" />
-  </target>
-
-  <target name="-dojnlpfileassoc" depends="-generatejnlpf" unless="nojnlpfileassocs">
-    <replace file="${jnlpFile}">
-      <replacetoken>
-        <![CDATA[</information>]]></replacetoken>
-      <replacevalue>
-        <![CDATA[
-          <association mime-type="application-x/ext-file" extensions="fa" />
-        <association mime-type="application-x/ext-file" extensions="fasta" />
-        <association mime-type="application-x/ext-file" extensions="mfa" />
-        <association mime-type="application-x/ext-file" extensions="fastq" />
-        <association mime-type="application-x/ext-file" extensions="blc" />
-        <association mime-type="application-x/ext-file" extensions="msf" />
-        <association mime-type="application-x/ext-file" extensions="pfam" />
-        <association mime-type="application-x/ext-file" extensions="aln"/>
-        <association mime-type="application-x/ext-file" extensions="pir"/>
-        <association mime-type="application-x/ext-file" extensions="amsa"/>
-        <association mime-type="application-x/ext-file" extensions="stk"/>
-        <association mime-type="application-x/ext-file" extensions="jvp"/>
-      </information>]]></replacevalue>
-  </replace>
-  <echo message="Added file associations to JNLP file" />
-</target>
-<target name="writejnlpf" depends="-dojnlpfileassoc,-dofakejnlpfileassoc">
-</target>
-
-<target name="buildextclients" depends="init">
-  <input message="Building external client source from WSDLs - Do you really want to do this ? (Yy/Nn)" validargs="Y,y,n,N" defaultvalue="N" addproperty="doextbuild.response" />
-  <condition property="dontextbuild">
-    <equals arg1="n" arg2="${doextbuild.response}" />
-  </condition>
-  <condition property="dontextbuild">
-    <equals arg1="N" arg2="${doextbuild.response}" />
-  </condition>
-  <fail if="dontextbuild">
-        Build External Client Code process aborted by user. Jalview source is unchanged.
-      </fail>
-  <!-- Currently, this doesn't happen automatically.
-     1. Run WSDL2Java as below, which generates an ext.vamsas +
-     vamsas.<datapackages> fileset.
-     2. refactor ext.vamsas.SpecificserviceWS* to
-     ext.vamsas.ServiceclassWS* that implements the ServiceclassWSI interface.
-     3. Update the jalview.ws.*WServices classes to reflect the
-     interface type, and all locations of this wsdl type that Jalview
-     might be using.
-
--->
-  <path id="axisbuild">
-    <path refid="build.classpath" />
-  </path>
-  <taskdef resource="axis-tasks.properties" classpathref="axisbuild" />
-  <move todir="./bak">
-    <fileset dir="${sourceDir}" id="client">
-      <include name="${wsdl.ClientNS}/*.*" />
-    </fileset>
-  </move>
-
-  <axis-wsdl2java output="${sourceDir}" verbose="true" url="${wsdl.MsaWS2}" serverside="false" deployscope="Request" debug="false" helpergen="true" all="true">
-    <mappingSet>
-      <mapping namespace="${wsdl.Namespace}" package="${wsdl.ClientNS}" />
-      <mapping namespace="http://dataTypes.vamsas" package="${wsdl.ClientNS}" />
-    </mappingSet>
-  </axis-wsdl2java>
-</target>
-
-<target name="makedist" depends="build, buildPropertiesFile, linkcheck, buildindices">
-  <fail if="clover.jar">
-    Ignoring request to build jalview distribution with clover-instrumented classes
-  </fail>
-  <!-- make the package jar if not already existing -->
-  <mkdir dir="${packageDir}" />
-  <!-- clean dir if it already existed -->
-  <delete>
-    <fileset dir="${packageDir}">
-      <include name="*.jar" />
-    </fileset>
-  </delete>
-  <jar destfile="${packageDir}/${outputJar}" index="true">
-    <manifest>
-      <attribute name="Main-Class" value="jalview.bin.Jalview" />
-      <attribute name="Permissions" value="all-permissions" />
-      <attribute name="Application-Name" value="Jalview Desktop" />
-      <attribute name="Codebase" value="${application.codebase}" />
-    </manifest>
-    <fileset dir="${outputDir}/">
-      <exclude name="cache*/**" />
-      <exclude name="*.jar" />
-      <exclude name="*.jar.*" />
-      <exclude name="**/*.jar" />
-      <exclude name="**/*.jar.*" />
-    </fileset>
-  </jar>
-
-  <copy toDir="${packageDir}" flatten="true">
-    <fileset dir="${outputDir}">
-      <include name="*.jar" />
-      <include name="**/*.jar" />
-    </fileset>
-  </copy>
-</target>
-
-
-<!-- jalopy code reformatter -->
-<target name="sourcescrub" depends="init,build">
-  <jalopy destdir="jsrc" classpathref="run.classpath" convention="jalview-jalopy.xml">
-    <fileset dir="${sourceDir}">
-      <include name="*.java" />
-      <include name="**/*.java" />
-      <include name="**/**/*.java" />
-    </fileset>
-  </jalopy>
-</target>
-
-
-
-<!-- Compile, package and obfuscate Jalview Applet -->
-<target name="makeApplet" depends="obfuscate" description="assemble the final jalviewLite applet jar with or without obfuscation" />
-
-<target name="compileApplet" depends="init,clean">
-  <mkdir dir="${outputDir}" />
-  <javac source="${javac.source}" target="${javac.target}" srcdir="${sourceDir}" destdir="${outputDir}" debug="${javac.debug}" classpathref="jalviewlite.deps" includes="jalview/appletgui/**" excludes="ext/**,gui/**,jbgui/**,MCview/**,org/**,vamsas/**,jalview/ext/rbvi/**,jalview/ext/paradise/**,jalview/ext/ensembl/**,jalview/ext/so/**" />
-</target>
-
-<target name="packageApplet" depends="compileApplet, buildPropertiesFile">
-  <copy file="${resourceDir}/images/link.gif" toFile="${outputDir}/images/link.gif" />
-  <copy todir="${outputDir}/lang">
-    <fileset dir="${resourceDir}/lang">
-      <include name="**.*" />
-    </fileset>
-  </copy>
-  <jar destfile="in.jar" index="true">
-    <manifest>
-      <attribute name="Main-Class" value="jalview.bin.JalviewLite" />
-      <attribute name="Application-Name" value="JalviewLite" />
-      <attribute name="Codebase" value="${applet.codebase}" />
-    </manifest>
-    <fileset dir="${outputDir}">
-      <include name="com/**" />
-      <include name="MCview/**" />
-      <include name="jalview/**" />
-      <include name=".build_properties" />
-      <include name="images/link.gif" />
-      <include name="lang/**" />
-    </fileset>
-  </jar>
-</target>
-<target name="obfuscate" depends="-obfuscatefake,-obfuscatereally">
-</target>
-<target name="-obfuscatefake" depends="packageApplet" if="donotobfuscate">
-  <copy file="in.jar" tofile="${jalviewLiteJar}" overwrite="true" />
-  <delete file="in.jar" />
-</target>
-<target name="-obfuscatereally" unless="donotobfuscate">
-
-  <path id="obfuscateDeps.path">
-    <pathelement location="${applet.jre.tools}" />
-    <pathelement location="appletlib/${jmolJar}" />
-    <pathelement location="lib/${varnaJar}" />
-    <pathelement location="appletlib/${jsoup}" />
-    <pathelement location="appletlib/${jsonSimple}" />
-    <pathelement location="appletlib/${javaJson}" />
-    <fileset dir="${java.home}/lib">
-      <include name="plugin.jar" />
-    </fileset>
-  </path>
-  <taskdef resource="proguard/ant/task.properties" classpath="utils/proguard_5.3.3.jar" />
-
-  <proguard verbose="true" >
-    <injar file="in.jar" />
-    <outjar file="${jalviewLiteJar}" />
-    <libraryjar refid="obfuscateDeps.path" />
-    <dontwarn />
-    <keep access="public" type="class" name="jalview.bin.JalviewLite">
-      <field access="public" />
-      <method access="public" />
-      <constructor access="public" />
-    </keep>
-    <keep access="public" type="class" name="jalview.appletgui.AlignFrame">
-      <field access="public" />
-      <method access="public" />
-      <constructor access="public" />
-    </keep>
-
-    <keep name="jalview.json.binding**">
-      <constructor/>
-      <method name="*"/>
-    </keep>
-
-    <keep access="public" type="class" name="MCview.PDBfile">
-      <field access="public" />
-      <method access="public" />
-      <constructor access="public" />
-    </keep>
-
-    <keep access="public" type="class" name="jalview.ws.jws1.Annotate3D">
-      <field access="public" />
-      <method access="public" />
-      <constructor access="public" />
-    </keep>
-
-    <keep access="public" type="class" name="jalview.ext.jmol.JmolParser">
-      <field access="public" />
-      <method access="public" />
-      <constructor access="public" />
-    </keep>
-
-
-    <!--      -libraryjars "${obfuscateDeps}"
-      -injars      in.jar
-      -outjars     jalviewApplet.jar
-      -keep public class jalview.bin.JalviewLite
-       { public * ; } -->
-  </proguard>
-  <delete file="in.jar" />
-</target>
-
-<target name="jaxb-bindings" depends="init" description="Generates JAXB bindings for supported Jalview XML models (needs xjc on the path)">
-  <delete>
-    <fileset dir="${sourceDir}/jalview/xml/binding/jalview">
-      <include name="*.java" />
-    </fileset>
-  </delete>
-  <exec executable="xjc">
-    <arg value="${schemaDir}/jalview.xsd"/>
-    <arg value="-d"/>
-    <arg value="${sourceDir}"/>
-    <arg value="-p"/>
-    <arg value="jalview.xml.binding.jalview"/>
-  </exec>
-  <delete>
-    <fileset dir="${sourceDir}/jalview/xml/binding/embl">
-      <include name="*.java" />
-    </fileset>
-  </delete>
-
-  <exec executable="xjc">
-    <arg value="${schemaDir}/embl.xsd"/>
-    <arg value="-d"/>
-    <arg value="${sourceDir}"/>
-    <arg value="-b"/>
-    <arg value="${schemaDir}/embl_bindings.xml"/>
-    <arg value="-p"/>
-    <arg value="jalview.xml.binding.embl"/>
-  </exec>
-
-  <delete>
-    <fileset dir="${sourceDir}/jalview/xml/binding/uniprot">
-      <include name="*.java" />
-    </fileset>
-  </delete>
-
-  <exec executable="xjc">
-    <arg value="${schemaDir}/uniprot.xsd"/>
-    <arg value="-d"/>
-    <arg value="${sourceDir}"/>
-    <arg value="-p"/>
-    <arg value="jalview.xml.binding.uniprot"/>
-  </exec>
-</target>
-
-<target name="sourcedist" description="create jalview source distribution" depends="init">
-  <delete file="${source.dist.name}" />
-  <!-- temporary copy of source to update timestamps -->
-  <copy todir="_sourcedist">
-    <fileset dir=".">
-      <exclude name=".*" />
-      <exclude name="**/.*" />
-      <exclude name="*.class" />
-      <exclude name="**/*.class" />
-      <include name="LICENSE" />
-      <include name="README" />
-      <include name="build.xml" />
-      <include name="jalview-jalopy.xml" />
-      <include name="JalviewApplet.jpx" />
-      <include name="JalviewX.jpx" />
-      <include name="nbbuild.xml" />
-      <include name="nbproject/genfiles.properties" />
-      <include name="nbproject/project.properties" />
-      <include name="nbproject/project.xml" />
-      <include name="${sourceDir}/*.java" />
-      <include name="${sourceDir}/**/*.java" />
-      <include name="${sourceDir}/**/*.cdr" />
-      <include name="${libDir}/**/*" />
-      <include name="${resourceDir}/**/*" />
-      <include name="${helpDir}/**/*" />
-      <include name="appletlib/${jmolJar}" />
-      <include name="appletlib/${jsonSimple}" />
-      <include name="appletlib/${javaJson}" />
-      <exclude name="**/*locales" />
-      <exclude name="*locales/**" />
-      <exclude name="utils/InstallAnywhere/**Build.iap_xml" />
-      <exclude name="utils/InstallAnywhere/**Build*/**" />
-      <exclude name="utils/InstallAnywhere/**Build*/**" />
-      <exclude name="utils/InstallAnywhere/.build*.*/**" />
-      <exclude name="utils/InstallAnywhere/**locale*" />
-      <exclude name="utils/InstallAnywhere/**locale*/**" />
-      <exclude name="utils/InstallAnywhere/**locale*/**" />
-      <include name="${schemaDir}/**/*" />
-      <include name="utils/**/*" />
-      <include name="${docDir}/**/*" />
-      <include name="examples/**/*" />
-    </fileset>
-  </copy>
-
-  <tstamp prefix="build">
-    <format property="year" pattern="yyyy" />
-  </tstamp>
-  <!-- each replacetoken CDATA body must be on one line - 
-       otherwise the pattern doesn't match -->
-  <replace value="${JALVIEW_VERSION}">
-    <replacetoken><![CDATA[$$Version-Rel$$]]></replacetoken>
-    <fileset dir="_sourcedist">
-      <include name="**/*" />
-    </fileset>
-  </replace>
-  <replace dir="_sourcedist" value="${build.year}">
-    <replacetoken><![CDATA[$$Year-Rel$$]]></replacetoken>
-    <fileset dir="_sourcedist">
-      <include name="**/*" />
-    </fileset>
-  </replace>
-
-  <tar destfile="${source.dist.name}" compression="gzip">
-    <tarfileset dir="_sourcedist/" prefix="jalview" preserveLeadingSlashes="true">
-    </tarfileset>
-  </tar>
-
-  <delete dir="_sourcedist" />
-</target>
-<target name="prepubapplet_1" depends="makeApplet">
-  <copy todir="${packageDir}/examples">
-    <fileset dir="examples">
-      <include name="**/*" />
-      <include name="javascript/*" />
-      <include name="jmol/*" />
-    </fileset>
-    <fileset dir=".">
-      <include name="${jalviewLiteJar}" />
-    </fileset>
-    <fileset dir="appletlib">
-      <include name="**/*" />
-    </fileset>
-  </copy>
-  <jar update="true" index="true" jarfile="${packageDir}/examples/${jalviewLiteJar}" />
-  <jar update="true" index="true" jarfile="${packageDir}/examples/${javaJson}" />
-  <jar update="true" index="true" jarfile="${packageDir}/examples/${jsonSimple}" />
-  <jar update="true" index="true" jarfile="${packageDir}/examples/${jmolJar}">
-    <manifest>
-      <attribute name="Application-Name" value="Jmol (bundled with JalviewLite)" />
-      <!--          <attribute name="Permissions" value="sandbox" /> -->
-      <!--<attribute name="Trusted-Lib" value="true" /> -->
-      <attribute name="Codebase" value="${applet.codebase}" />
-      <attribute name="Caller-Allowable-Codebase" value="${applet.caller-codebase}" />
-    </manifest>
-  </jar>
-
-  <presetdef name="ap_applet.jar">
-    <!-- build a signed applet with 'all-permissions' - 
-                         Needs 'param name="permissions' value="all-permissions"' in applet tag
-                         JalviewLite+JmolApplet linked sequence/structure fails
-                         Mixed code warnings are raised
-                         -->
-    <jar update="true" index="true">
-      <manifest>
-        <attribute name="Application-Name" value="JalviewLite" />
-        <attribute name="Permissions" value="all-permissions" />
-        <attribute name="Codebase" value="${applet.codebase}" />
-        <attribute name="Caller-Allowable-Codebase" value="${applet.caller-codebase}" />
-        <attribute name="Application-Library-Allowable-Codebase" value="${applet.codebase}" />
-      </manifest>
-    </jar>
-  </presetdef>
-  <presetdef name="applet.jar">
-    <!-- build signed applet with sandbox permissions -
-                         Needs 'param name="permissions' value="sandbox"' in applet tag
-                        Preserves Pre-Java 1.7_u45 behavior once 'permissions' parameter added to applet tag 
-                       -->
-
-    <jar update="true" index="true">
-      <manifest>
-        <attribute name="Application-Name" value="JalviewLite" />
-        <attribute name="Permissions" value="sandbox" />
-        <attribute name="Codebase" value="${applet.codebase}" />
-        <attribute name="Caller-Allowable-Codebase" value="${applet.caller-codebase}" />
-        <attribute name="Application-Library-Allowable-Codebase" value="${applet.codebase}" />
-      </manifest>
-    </jar>
-  </presetdef>
-  <presetdef name="tl_applet.jar">
-    <!-- build signed applet with trusted library/trusted permissions -
-                               Needs 'param name="permissions' value="all-permissions"' in applet tag
-                              j1.7_45:
-                              No mixed code warnings raised 
-                              Jmol/JalviewLite sequence/structure example doesn't link structures
-                              Raises dialog asking user to allow page to control applet via LiveConnect javascript
-                              
-                             -->
-
-    <jar update="true" index="true">
-      <manifest>
-        <attribute name="Application-Name" value="JalviewLite" />
-        <attribute name="Permissions" value="all-permissions" />
-        <attribute name="Codebase" value="${applet.codebase}" />
-        <attribute name="Trusted-Only" value="true" />
-        <attribute name="Trusted-Library" value="true" />
-      </manifest>
-    </jar>
-  </presetdef>
-  <presetdef name="to_applet.jar">
-    <!-- not fully test variant (yet) -->
-    <jar update="true" index="true">
-      <manifest>
-        <attribute name="Application-Name" value="JalviewLite" />
-        <attribute name="Permissions" value="all-permissions" />
-        <attribute name="Codebase" value="${applet.codebase}" />
-        <attribute name="Trusted-Only" value="true" />
-      </manifest>
-    </jar>
-  </presetdef>
-  <!-- create differently privileged artefacts -->
-  <copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/u_${jalviewLiteJar}" />
-  <copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/u_${jmolJar}" overwrite="true" />
-  <copy file="${packageDir}/examples/${javaJson}" tofile="${packageDir}/examples/u_${javaJson}" overwrite="true" />
-  <copy file="${packageDir}/examples/${jsonSimple}" tofile="${packageDir}/examples/u_${jsonSimple}" overwrite="true" />
-  <copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/ap_${jalviewLiteJar}" />
-  <copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/ap_${jmolJar}" />
-  <copy file="${packageDir}/examples/${javaJson}" tofile="${packageDir}/examples/ap_${javaJson}" />
-  <copy file="${packageDir}/examples/${jsonSimple}" tofile="${packageDir}/examples/ap_${jsonSimple}" />
-  <ap_applet.jar jarfile="${packageDir}/examples/ap_${jalviewLiteJar}" />
-  <ap_applet.jar jarfile="${packageDir}/examples/ap_${jmolJar}" />
-  <ap_applet.jar jarfile="${packageDir}/examples/ap_${javaJson}" />
-  <ap_applet.jar jarfile="${packageDir}/examples/ap_${jsonSimple}" />
-  <copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/tl_${jalviewLiteJar}" />
-  <copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/tl_${jmolJar}" />
-  <copy file="${packageDir}/examples/${javaJson}" tofile="${packageDir}/examples/tl_${javaJson}" />
-  <copy file="${packageDir}/examples/${jsonSimple}" tofile="${packageDir}/examples/tl_${jsonSimple}" />
-  <tl_applet.jar jarfile="${packageDir}/examples/tl_${jalviewLiteJar}" />
-  <tl_applet.jar jarfile="${packageDir}/examples/tl_${jmolJar}" />
-  <tl_applet.jar jarfile="${packageDir}/examples/tl_${javaJson}" />
-  <tl_applet.jar jarfile="${packageDir}/examples/tl_${jsonSimple}" />
-  <copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/to_${jalviewLiteJar}" />
-  <copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/to_${jmolJar}" />
-  <copy file="${packageDir}/examples/${javaJson}" tofile="${packageDir}/examples/to_${javaJson}" />
-  <copy file="${packageDir}/examples/${jsonSimple}" tofile="${packageDir}/examples/to_${jsonSimple}" />
-  <to_applet.jar jarfile="${packageDir}/examples/to_${jalviewLiteJar}" />
-  <to_applet.jar jarfile="${packageDir}/examples/to_${jmolJar}" />
-  <to_applet.jar jarfile="${packageDir}/examples/to_${javaJson}" />
-  <to_applet.jar jarfile="${packageDir}/examples/to_${jsonSimple}" />
-  <!-- finally, create manifest for original jars -->
-  <applet.jar jarfile="${packageDir}/examples/${jalviewLiteJar}" />
-  <applet.jar jarfile="${packageDir}/examples/${jmolJar}" />
-  <applet.jar jarfile="${packageDir}/examples/${javaJson}" />
-  <applet.jar jarfile="${packageDir}/examples/${jsonSimple}" />
-
-  <!-- todo - write examples/downloads for alternate versions of the applet 
-    probably don't need to do this now since we don't have alternate versions anymore !-->
-</target>
-<target name="-signapplet" depends="prepubapplet_1">
-  <fileset id="signappletjarset" dir="${packageDir}/examples">
-    <exclude name="u_*.jar" />
-    <include name="${jalviewLiteJar}" />
-    <include name="${jmolJar}" />
-    <include name="${javaJson}" />
-    <include name="${jsonSimple}" />
-    <include name="to_${jalviewLiteJar}" />
-    <include name="to_${jmolJar}" />
-    <include name="to_${javaJson}" />
-    <include name="to_${jsonSimple}" />
-    <include name="tl_${jalviewLiteJar}" />
-    <include name="tl_${jmolJar}" />
-    <include name="tl_${javaJson}" />
-    <include name="tl_${jsonSimple}" />
-    <include name="ap_${jalviewLiteJar}" />
-    <include name="ap_${jmolJar}" />
-    <include name="ap_${javaJson}" />
-    <include name="ap_${jsonSimple}" />
-  </fileset>
-</target>
-<target name="-signappletnotsa" if:blank="timestamp" depends="-signapplet" unless="nosign">
-  <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false">
-    <fileset refid="signappletjarset" />
-  </signjar>
-</target>
-
-<target name="-signapplettsa" if="timestamp" depends="-signapplet" unless="nosign">
-  <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false" tsaproxyhost="${proxyHost}" tsaproxyport="${proxyPort}" tsaurl="${jalview.tsaurl}">
-    <fileset refid="signappletjarset" />
-  </signjar>
-</target>
-
-<target name="signApplet" description="internal target to sign applet" depends="-signappletnotsa,-signapplettsa" />
-<target name="pubapplet" description="Dummy target to keep legacy Jalview build system happy. We don't actually publish the applet anymore."/>
-
-<target name="_pubapplet" description="installs the jalviewLite applet and dependent jars into an applet examples directory built under ${outputDir}" depends="makeApplet, signApplet">
-
-  <!-- bizarre bug causes JmolApplet to always get signed, even if excluded from above. so copy explicitly -->
-  <copy file="appletlib/${jmolJar}" tofile="${packageDir}/examples/u_${jmolJar}" overwrite="true" />
-  <copy file="appletlib/${jsonSimple}" tofile="${packageDir}/examples/u_${jsonSimple}" overwrite="true" />
-  <copy file="appletlib/${javaJson}" tofile="${packageDir}/examples/u_${javaJson}" overwrite="true" />
-  <!-- finally, replace any launchApp servlet tags with a version specification -->
-  <replace value="http://www.jalview.org/services/launchApp?version=${JALVIEW_VERSION}&quot;">
-    <replacetoken>
-      <![CDATA[http://www.jalview.org/services/launchApp"]]>
-    </replacetoken>
-    <fileset dir="${packageDir}/examples">
-      <include name="**/*.html" />
-    </fileset>
-  </replace>
-  <replace value="http://www.jalview.org/services/launchApp?version=${JALVIEW_VERSION}'">
-    <replacetoken>
-      <![CDATA[http://www.jalview.org/services/launchApp']]>
-    </replacetoken>
-    <fileset dir="${packageDir}/examples">
-      <include name="**/*.html" />
-    </fileset>
-  </replace>
-
-</target>
-<target name="sourcedoc" description="Create jalview source documentation pages" depends="init">
-  <javadoc destdir="${javadocDir}">
-    <packageset dir="${sourceDir}" includes="jalview/*,MCView/*">
-    </packageset>
-  </javadoc>
-</target>
-<target name="linkcheck" depends="init,prepare">
-  <javac srcdir="utils" destdir="utils" includes="HelpLinksChecker.java"/>
-  <java fork="true" dir="${helpDir}" classpath="utils" classname="HelpLinksChecker" failonerror="true">
-    <arg file="${helpDir}"/>
-    <arg value="-nointernet"/>
-  </java>
-</target>
-</project>
index 577d616..3f444be 100644 (file)
@@ -11,6 +11,7 @@ buildscript {
 plugins {
   id 'java'
   id 'application'
+  id 'eclipse'
   id 'com.github.johnrengelman.shadow' version '4.0.3'
   id 'com.install4j.gradle' version '7.0.9'
 }
@@ -27,6 +28,7 @@ repositories {
 mainClassName = launcherClass
 def cloverInstrDir = file("$buildDir/$cloverSourcesInstrDir")
 def classes = "$jalviewDir/$classesDir"
+
 if (clover.equals("true")) {
   use_clover = true
   classes = "$buildDir/$cloverClassesDir"
@@ -41,6 +43,26 @@ def libDir
 def libDistDir
 def compile_source_compatibility
 def compile_target_compatibility
+
+ext {
+  // where the getdown channel will be built. 
+  // TODO: consider allowing this expression to  be overrriden by -P arg
+  getdownWebsiteDir = jalviewDir + '/' + getdown_website_dir + '/' + JAVA_VERSION + '/'
+  getdownAppDir = getdownWebsiteDir + '/' + getdown_app_dir
+  getdownJ11libDir = getdownWebsiteDir + '/' + getdown_j11lib_dir
+  getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir
+  getdownLauncher = jalviewDir + '/' + getdown_launcher
+  getdownFilesDir = jalviewDir + '/' + getdown_files_dir
+  getdownLib1 = jalviewDir + '/' + getdown_lib1
+  def getdownChannel = getdown_channel_name
+  if (getdown_channel_name.equals("COMMIT")) {
+    getdownChannel = getGitHash()
+  }
+  getdown_app_base = getdown_channel_base+"/"+getdownChannel+"/"+JAVA_VERSION+"/"
+  modules_compileClasspath = fileTree(dir: "$jalviewDir/$j11modDir", include: ["*.jar"])
+  modules_runtimeClasspath = modules_compileClasspath
+}
+
 def additional_compiler_args = []
 // these are getdown.txt properties defined dependent on the JAVA_VERSION 
 def getdown_alt_java_min_version
@@ -61,7 +83,7 @@ if (JAVA_VERSION.equals("1.8")) {
   getdown_alt_java_min_version = getdown_alt_java11_min_version
   getdown_alt_multi_java_location = getdown_alt_java11_txt_multi_java_location
   additional_compiler_args += [
-    '--module-path', file("$jalviewDir/$j11modDir").getAbsolutePath(),
+    '--module-path', ext.modules_compileClasspath.asPath,
     '--add-modules', j11modules
   ]
 } else {
@@ -88,7 +110,6 @@ sourceSets {
 
     runtimeClasspath = compileClasspath
   }
-  
   clover {
     java {
         srcDirs = [ cloverInstrDir ]
@@ -99,6 +120,8 @@ sourceSets {
       srcDirs = sourceSets.main.resources.srcDirs
     }
     compileClasspath = configurations.cloverRuntime + files( sourceSets.clover.java.outputDir )
+    compileClasspath += files(sourceSets.main.java.outputDir)
+    compileClasspath += sourceSets.main.compileClasspath
     compileClasspath += fileTree(dir: "$jalviewDir/$utilsDir", include: ["**/*.jar"])
     compileClasspath += fileTree(dir: "$jalviewDir/$libDir", include: ["*.jar"])
 
@@ -116,12 +139,13 @@ sourceSets {
     }
 
     compileClasspath = files( sourceSets.test.java.outputDir ) 
+
     if (use_clover) {
       compileClasspath += sourceSets.clover.compileClasspath
     } else {
-      compileClasspath += sourceSets.main.compileClasspath
       compileClasspath += files(sourceSets.main.java.outputDir)
     }
+    compileClasspath += sourceSets.main.compileClasspath
     compileClasspath += files( sourceSets.main.resources.srcDirs)
     compileClasspath += fileTree(dir: "$jalviewDir/$utilsDir", include: ["**/*.jar"])
     compileClasspath += fileTree(dir: "$jalviewDir/$libDir", include: ["*.jar"])
@@ -142,7 +166,140 @@ configurations {
     cloverRuntime
     cloverRuntime.extendsFrom cloverCompile
 }
+
+eclipse {
+  project {
+    name = "Jalview with gradle build"
+
+    natures 'org.eclipse.jdt.core.javanature',
+        'org.eclipse.jdt.groovy.core.groovyNature',
+        'org.eclipse.buildship.core.gradleprojectnature'
+
+    buildCommand 'org.eclipse.jdt.core.javabuilder'
+    buildCommand 'org.eclipse.buildship.core.gradleprojectbuilder'
+  }
+
+  classpath {
+    //defaultOutputDir = sourceSets.main.java.outputDir
+    def removeThese = []
+    configurations.each{ if (it.isCanBeResolved()) {
+        removeThese += it
+      }
+    }
+    containers 'org.eclipse.buildship.core.gradleclasspathcontainer'
+    
+    minusConfigurations += removeThese
+    plusConfigurations = [ ]
+    file {
+
+      whenMerged { cp ->
+        def removeTheseToo = []
+        HashMap<String, Boolean> addedSrcPath = new HashMap<>();
+        cp.entries.each { entry ->
+          if (entry.kind == 'src') {
+            if (addedSrcPath.getAt(entry.path) || !(entry.path == "src" || entry.path == "test" || entry.path == "resources")) {
+              removeTheseToo += entry
+            } else {
+              addedSrcPath.putAt(entry.path, true)
+            }
+          }
+        }
+        cp.entries.removeAll(removeTheseToo)
+      }
+      
+      withXml {
+        def node = it.asNode()
+        def srcTestAttributes
+        node.children().each{ cpe ->
+          def attributes = cpe.attributes()
+          if (attributes.get("kind") == "src" && attributes.get("path") == "test") {
+            srcTestAttributes = cpe.find { a -> a.name() == "attributes" }
+            return
+          }
+        }
+        def addTestAttribute = true
+        srcTestAttributes.each{a ->
+          if (a.name() == "attribute" && a.attributes().getAt("name") == "test") {
+            addTestAttribute = false
+          }
+        }
+        if (addTestAttribute) {
+          srcTestAttributes.append(new Node(null, "attribute", [name:"test", value:"true"]))
+        }
+        
+        node.appendNode('classpathentry', [kind:"output", path:"bin/main"])
+        HashMap<String, Boolean> addedLibPath = new HashMap<>();
+        def allPaths = sourceSets.test.compileClasspath + sourceSets.main.compileClasspath
+        sourceSets.main.compileClasspath.each{
+          //if ((it.isDirectory() || ! it.exists()) && ! (it.equals(sourceSets.main.java.outputDir))) {
+          //no longer want to add outputDir as eclipse is using its own output dir in bin/main
+          if (it.isDirectory() || ! it.exists()) {
+            // don't add dirs to classpath
+            //println("Not adding directory "+it)
+            return
+          }
+          def itPath = it.toString()
+          if (itPath.startsWith(jalviewDirAbsolutePath+"/")) {
+            itPath = itPath.substring(jalviewDirAbsolutePath.length()+1)
+          }
+          if (addedLibPath.get(itPath)) {
+            //println("Not adding duplicate entry "+itPath)
+          } else {
+            //println("Adding entry "+itPath)
+            node.appendNode('classpathentry', [kind:"lib", path:itPath])
+            addedLibPath.put(itPath, true)
+          }
+        }
+        sourceSets.test.compileClasspath.each{
+          //if ((it.isDirectory() || ! it.exists()) && ! (it.equals(sourceSets.main.java.outputDir))) {
+          //no longer want to add outputDir as eclipse is using its own output dir in bin/main
+          if (it.isDirectory() || ! it.exists()) {
+            // don't add dirs to classpath
+            //println("Not adding directory "+it)
+            return
+          }
+          def itPath = it.toString()
+          if (itPath.startsWith(jalviewDirAbsolutePath+"/")) {
+            itPath = itPath.substring(jalviewDirAbsolutePath.length()+1)
+          }
+          if (addedLibPath.get(itPath)) {
+            //println("Not adding duplicate entry "+itPath)
+          } else {
+            //println("Adding entry "+itPath)
+            node.appendNode('classpathentry', [kind:"lib", path:itPath])
+              .appendNode('attributes')
+                .appendNode('attribute', [name:"test", value:"true"])
+            addedLibPath.put(itPath, true)
+          }
+        }
+      }
+
+    }
+  }
+
+  jdt {
+    // for the IDE, use java 11 compatibility
+    sourceCompatibility = 11
+    targetCompatibility = 11
+    javaRuntimeName = "JavaSE-11"
+
+    file {
+      withProperties { props ->
+        def jalview_prefs = new Properties()
+               def ins = new FileInputStream(eclipse_extra_jdt_prefs_file)
+               jalview_prefs.load(ins)
+               ins.close()
+               jalview_prefs.forEach { t, v ->
+                       if (props.getAt(t) == null) {
+                               props.putAt(t, v)
+                       }
+               }
+      }
+    }
+  }
+
+}
+
 task cloverInstr() {
   // only instrument source, we build test classes as normal
     inputs.files files (sourceSets.main.allJava) // , fileTree(dir:"$jalviewDir/$testSourceDir", include: ["**/*.java"]))
@@ -163,6 +320,8 @@ task cloverInstr() {
 
  
 task cloverReport {
+       group = "Verification"
+       description = "Createst the Clover report"
     inputs.dir "${buildDir}/clover"
     outputs.dir "${reportsDir}/clover"
     onlyIf {
@@ -196,7 +355,6 @@ compileJava {
 }
 
 compileTestJava {
-
   if (use_clover) {
     dependsOn compileCloverJava
     classpath += configurations.cloverRuntime
@@ -330,6 +488,7 @@ test {
   if (use_clover) {
     dependsOn cloverInstr
   }
+
   print("Running tests " + (use_clover?"WITH":"WITHOUT") + " clover [clover="+use_clover+"]\n") 
   
   useTestNG() {
@@ -375,6 +534,7 @@ task compileLinkCheck(type: JavaCompile) {
   outputs.file("$jalviewDir/$utilsDir/BufferedLineReader.class")
 }
 
+def helplinkscheckeroutputfile = file("$jalviewDir/$utilsDir/HelpLinksChecker.out")
 task linkCheck(type: JavaExec) {
   dependsOn prepare, compileLinkCheck
   classpath = files("$jalviewDir/$utilsDir")
@@ -385,10 +545,11 @@ task linkCheck(type: JavaExec) {
   //args = [ "$classesDir/$helpDir", "-nointernet" ]
 
   doFirst {
-    standardOutput new FileOutputStream("$jalviewDir/$utilsDir/HelpLinksChecker.out")
+    helplinkscheckeroutputfile.createNewFile()
+    standardOutput new FileOutputStream(helplinkscheckeroutputfile, false)
   }
 
-  outputs.file("$jalviewDir/$utilsDir/HelpLinksChecker.out")
+  outputs.file(helplinkscheckeroutputfile)
 }
 
 task cleanPackageDir(type: Delete) {
@@ -435,6 +596,8 @@ task syncJars(type: Sync) {
 }
 
 task makeDist {
+  group = "build"
+  description = "Put all required libraries in dist"
   // order of "cleanPackageDir", "copyJars", "jar" important!
   jar.mustRunAfter cleanPackageDir
   syncJars.mustRunAfter cleanPackageDir
@@ -461,24 +624,9 @@ shadowJar {
   minimize()
 }
 
-ext {
-  // where the getdown channel will be built. 
-  // TODO: consider allowing this expression to  be overrriden by -P arg
-  getdownWebsiteDir = jalviewDir + '/' + getdown_website_dir + '/' + JAVA_VERSION + '/'
-  getdownAppDir = getdownWebsiteDir + '/' + getdown_app_dir
-  getdownJ11libDir = getdownWebsiteDir + '/' + getdown_j11lib_dir
-  getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir
-  getdownLauncher = jalviewDir + '/' + getdown_launcher
-  getdownFilesDir = jalviewDir + '/' + getdown_files_dir
-  getdownLib1 = jalviewDir + '/' + getdown_lib1
-  def getdownChannel = getdown_channel_name
-  if (getdown_channel_name.equals("COMMIT")) {
-    getdownChannel = getGitHash()
-  }
-  getdown_app_base = getdown_channel_base+"/"+getdownChannel+"/"+JAVA_VERSION+"/"
-}
-
 task getdownWebsite() {
+  group = "distribution"
+  description = "Create the getdown minimal app folder, and website folder for this version of jalview. Website folder also used for offline app installer"
   dependsOn makeDist
   def getdownWebsiteResourceFilenames = []
   def getdownTextString = ""
@@ -610,6 +758,8 @@ task getdownWebsite() {
 }
 
 task getdownDigest(type: JavaExec) {
+  group = "distribution"
+  description = "Digest the getdown website folder"
   dependsOn getdownWebsite
   classpath = files(jalviewDir + '/' + getdown_core)
   classpath file(jalviewDir + '/' + getdown_lib1)
@@ -619,6 +769,8 @@ task getdownDigest(type: JavaExec) {
 }
 
 task getdown() {
+  group = "distribution"
+  description = "Create the minimal and full getdown app folder for installers and website and create digest file"
   dependsOn getdownDigest
 }
 
@@ -666,6 +818,8 @@ task copyInstall4jTemplate(type: Copy) {
 }
 
 task installers(type: com.install4j.gradle.Install4jTask) {
+  group = "distribution"
+  description = "Create the install4j installers"
   dependsOn getdown
   dependsOn copyInstall4jTemplate
   projectFile = file(install4jConf)
index ecde4d8..f5e0b28 100755 (executable)
 </head>
 <body>
 <h1>Building Jalview from Source</h1>
-<P>
+<p/>
+
+<p>
+You will need the following:<br/>
+<ul>
+  <li> Obtain: git</li>
+  <li> Build/run: Java Development Kit (JDK). JDK11 is now the recommended platform for developing with Jalview.  You can obtain a pre-compiled JDK11 for many platforms from https://adoptopenjdk.net/</li>
+  <li> Build: Gradle 5.1 or later.  On linux you can obtain this with your package manager (e.g. <code>sudo yum install gradle</code> or <code>sudo apt install gradle</code> or on macOS with brew with <code>brew install gradle</code></li>
+</ul>
+With any luck, once you check out the Jalview source from git and set your JAVA_HOME and PATH correctly, you just need to change to the <code>jalview</code> directory and run <code>gradle getdown</code>.
+</p>
+
+<h2>Obtaining Jalview</h2>
+<p>This is easiest achieved with git:
+<pre>git clone http://www.jalview.org/git/jalview.git</pre>
+Then you can <code>cd jalview</code> to get into the top level jalview dir.
+
+
+<p>
+<h2>Minimal Jalview build</h2>
+<p>To run Jalview, you just need the jalview classes and the .jar libraries that Jalview depends on.</p>
+
+
+<!--
 <p>
 You will need the following (hopefully):<br>
 <ul>
@@ -92,6 +115,7 @@ dist. But first you need to make your own key:
                mechanism (e.g. Netbeans' executable Jar and dependent lib directory).
                The hand-crafted ant build.xml is (currently) the only officially
                supported method of building distributable versions of Jalview.</p>
+        -->
 <address>
 <a href="mailto:help@jalview.org">Jalview development team</a>
 </address>
index f8da717..a82d781 100644 (file)
@@ -1,7 +1,7 @@
 #org.gradle.java.home = /Users/bsoares/Java/installs/OpenJDK8U-jdk_x64_mac_hotspot_8u192b12/jdk8u192-b12/Contents/Home
 jalviewDir = .
 
-JAVA_VERSION = 1.8
+JAVA_VERSION = 11
 JALVIEW_VERSION = DEVELOPMENT
 INSTALLATION = Source
 jalview_keystore = keys/.keystore
@@ -97,3 +97,5 @@ install4jResourceDir = utils/install4j
 install4jTemplate = install4j_template.install4j
 install4jBuildDir = build/install4j
 install4jMediaTypes = windows,macosArchive,linuxRPM,linuxDeb
+
+eclipse_extra_jdt_prefs_file = .settings/org.eclipse.jdt.core.jalview.prefs
similarity index 67%
rename from j11lib/Jmol-14.6.4_2016.10.26.jar
rename to j11lib/Jmol-14.6.4_2016.10.26-no_netscape.jar
index 1016c3f..f214bb4 100644 (file)
Binary files a/j11lib/Jmol-14.6.4_2016.10.26.jar and b/j11lib/Jmol-14.6.4_2016.10.26-no_netscape.jar differ
diff --git a/j11lib/groovy-2.5.6.jar b/j11lib/groovy-2.5.6.jar
new file mode 100644 (file)
index 0000000..3a4edfa
Binary files /dev/null and b/j11lib/groovy-2.5.6.jar differ
diff --git a/j11lib/groovy-all-2.4.12-indy.jar b/j11lib/groovy-all-2.4.12-indy.jar
deleted file mode 100644 (file)
index bb246a3..0000000
Binary files a/j11lib/groovy-all-2.4.12-indy.jar and /dev/null differ
diff --git a/j11lib/groovy-console-2.5.6.jar b/j11lib/groovy-console-2.5.6.jar
new file mode 100644 (file)
index 0000000..e18e426
Binary files /dev/null and b/j11lib/groovy-console-2.5.6.jar differ
diff --git a/j11lib/javax.xml.rpc-api-1.1.2.jar b/j11lib/javax.xml.rpc-api-1.1.2.jar
new file mode 100644 (file)
index 0000000..61ac294
Binary files /dev/null and b/j11lib/javax.xml.rpc-api-1.1.2.jar differ
diff --git a/j11lib/jaxrpc.jar b/j11lib/jaxrpc.jar
deleted file mode 100755 (executable)
index ebd457b..0000000
Binary files a/j11lib/jaxrpc.jar and /dev/null differ
diff --git a/j11mod/javax.xml.rpc-api-1.1.2.jar b/j11mod/javax.xml.rpc-api-1.1.2.jar
new file mode 100644 (file)
index 0000000..61ac294
Binary files /dev/null and b/j11mod/javax.xml.rpc-api-1.1.2.jar differ
similarity index 67%
rename from lib/Jmol-14.6.4_2016.10.26.jar
rename to lib/Jmol-14.6.4_2016.10.26-no_netscape.jar
index 1016c3f..f214bb4 100644 (file)
Binary files a/lib/Jmol-14.6.4_2016.10.26.jar and b/lib/Jmol-14.6.4_2016.10.26-no_netscape.jar differ
diff --git a/lib/groovy-2.5.6.jar b/lib/groovy-2.5.6.jar
new file mode 100644 (file)
index 0000000..3a4edfa
Binary files /dev/null and b/lib/groovy-2.5.6.jar differ
diff --git a/lib/groovy-all-2.4.12-indy.jar b/lib/groovy-all-2.4.12-indy.jar
deleted file mode 100644 (file)
index bb246a3..0000000
Binary files a/lib/groovy-all-2.4.12-indy.jar and /dev/null differ
diff --git a/lib/groovy-console-2.5.6.jar b/lib/groovy-console-2.5.6.jar
new file mode 100644 (file)
index 0000000..e18e426
Binary files /dev/null and b/lib/groovy-console-2.5.6.jar differ
index 60cce46..ece610a 100755 (executable)
@@ -52,11 +52,6 @@ import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.security.AllPermission;
-import java.security.CodeSource;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Vector;
@@ -64,6 +59,8 @@ import java.util.Vector;
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
 
+import com.sun.xml.ws.policy.Policy;
+
 import groovy.lang.Binding;
 import groovy.util.GroovyScriptEngine;
 
@@ -96,6 +93,8 @@ public class Jalview
   static
   {
     // grab all the rights we can the JVM
+    Policy.createEmptyPolicy();
+    /*
     Policy.setPolicy(new Policy()
     {
       @Override
@@ -105,12 +104,13 @@ public class Jalview
         perms.add(new AllPermission());
         return (perms);
       }
-
+    
       @Override
       public void refresh()
       {
       }
     });
+    */
   }
 
   /**
@@ -975,7 +975,7 @@ public class Jalview
     }
     try
     {
-      Map<String, Object> vbinding = new HashMap<>();
+      Map<String, java.lang.Object> vbinding = new HashMap<>();
       vbinding.put("Jalview", this);
       if (af != null)
       {