JAL-4090 JAL-1551 spotlessApply
authorJames Procter <j.procter@dundee.ac.uk>
Fri, 3 Nov 2023 07:29:04 +0000 (07:29 +0000)
committerJames Procter <j.procter@dundee.ac.uk>
Fri, 3 Nov 2023 07:29:04 +0000 (07:29 +0000)
213 files changed:
src/jalview/analysis/AlignSeq.java
src/jalview/analysis/AlignmentSorter.java
src/jalview/analysis/AlignmentUtils.java
src/jalview/analysis/AverageDistanceEngine.java
src/jalview/analysis/CrossRef.java
src/jalview/analysis/GeneticCodes.java
src/jalview/analysis/Rna.java
src/jalview/analysis/TreeEngine.java
src/jalview/analysis/TreeModel.java
src/jalview/analysis/scoremodels/ScoreModels.java
src/jalview/api/SequenceRenderer.java
src/jalview/api/structures/JalviewStructureDisplayI.java
src/jalview/appletgui/APopupMenu.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AlignmentPanel.java
src/jalview/appletgui/RedundancyPanel.java
src/jalview/appletgui/SeqCanvas.java
src/jalview/appletgui/SeqPanel.java
src/jalview/bin/Cache.java
src/jalview/bin/JalviewLite.java
src/jalview/bin/JalviewLiteURLRetrieve.java
src/jalview/commands/EditCommand.java
src/jalview/datamodel/AlignedCodonFrame.java
src/jalview/datamodel/Alignment.java
src/jalview/datamodel/ContactListImpl.java
src/jalview/datamodel/ContactMapHolder.java
src/jalview/datamodel/ContactMatrix.java
src/jalview/datamodel/ContactMatrixI.java
src/jalview/datamodel/DBRefSource.java
src/jalview/datamodel/FloatContactMatrix.java
src/jalview/datamodel/GroupSet.java
src/jalview/datamodel/SearchResultMatchI.java
src/jalview/datamodel/SearchResults.java
src/jalview/datamodel/SearchResultsI.java
src/jalview/datamodel/SeqDistanceContactMatrix.java
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/SequenceGroup.java
src/jalview/datamodel/SequenceI.java
src/jalview/datamodel/features/FeatureStore.java
src/jalview/datamodel/features/SequenceFeatures.java
src/jalview/ext/ensembl/EnsemblGene.java
src/jalview/ext/ensembl/EnsemblLookup.java
src/jalview/ext/ensembl/EnsemblMap.java
src/jalview/ext/ensembl/EnsemblRestClient.java
src/jalview/ext/ensembl/EnsemblSeqProxy.java
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/ext/jmol/JmolCommands.java
src/jalview/ext/jmol/JmolParser.java
src/jalview/ext/rbvi/chimera/ChimeraListener.java
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/fts/core/FTSDataColumnPreferences.java
src/jalview/fts/service/pdb/PDBFTSRestClient.java
src/jalview/fts/service/threedbeacons/TDB_FTSData.java
src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AnnotationColourChooser.java
src/jalview/gui/AnnotationColumnChooser.java
src/jalview/gui/AnnotationLabels.java
src/jalview/gui/AnnotationPanel.java
src/jalview/gui/AppVarna.java
src/jalview/gui/AppVarnaBinding.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/gui/ColourMenuHelper.java
src/jalview/gui/Console.java
src/jalview/gui/CrossRefAction.java
src/jalview/gui/FeatureEditor.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/FeatureTypeSettings.java
src/jalview/gui/IdCanvas.java
src/jalview/gui/IdwidthAdjuster.java
src/jalview/gui/PCAPanel.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/QuitHandler.java
src/jalview/gui/ScalePanel.java
src/jalview/gui/SeqCanvas.java
src/jalview/gui/SeqPanel.java
src/jalview/gui/StructureChooser.java
src/jalview/gui/StructureViewerBase.java
src/jalview/gui/TreeCanvas.java
src/jalview/gui/TreePanel.java
src/jalview/gui/VamsasApplication.java
src/jalview/gui/WsJobParameters.java
src/jalview/io/AnnotationFile.java
src/jalview/io/AppletFormatAdapter.java
src/jalview/io/BackupFilenameFilter.java
src/jalview/io/BioJsHTMLOutput.java
src/jalview/io/ClustalFile.java
src/jalview/io/FeaturesFile.java
src/jalview/io/FileFormat.java
src/jalview/io/FileFormats.java
src/jalview/io/HTMLOutput.java
src/jalview/io/HtmlSvgOutput.java
src/jalview/io/IdentifyFile.java
src/jalview/io/JPredFile.java
src/jalview/io/JSONFile.java
src/jalview/io/JalviewFileChooser.java
src/jalview/io/MSFfile.java
src/jalview/io/PfamFile.java
src/jalview/io/RnamlFile.java
src/jalview/io/SequenceAnnotationReport.java
src/jalview/io/StockholmFile.java
src/jalview/io/StructureFile.java
src/jalview/io/VamsasAppDatastore.java
src/jalview/io/WSWUBlastClient.java
src/jalview/io/exceptions/ImageOutputException.java
src/jalview/io/gff/ExonerateHelper.java
src/jalview/io/gff/Gff3Helper.java
src/jalview/io/gff/GffHelperBase.java
src/jalview/io/packed/ParsePackedSet.java
src/jalview/io/vamsas/Tree.java
src/jalview/io/vcf/VCFLoader.java
src/jalview/javascript/JSFunctionExec.java
src/jalview/javascript/JsSelectionSender.java
src/jalview/javascript/MouseOverStructureListener.java
src/jalview/jbgui/GDesktop.java
src/jalview/math/RotatableMatrix.java
src/jalview/project/Jalview2XML.java
src/jalview/renderer/AnnotationRenderer.java
src/jalview/renderer/ContactGeometry.java
src/jalview/renderer/ContactMapRenderer.java
src/jalview/schemes/ColourSchemeLoader.java
src/jalview/schemes/ColourSchemes.java
src/jalview/schemes/Consensus.java
src/jalview/schemes/CovariationColourScheme.java
src/jalview/schemes/FeatureColour.java
src/jalview/schemes/ResidueProperties.java
src/jalview/structure/StructureCommand.java
src/jalview/structure/StructureCommandI.java
src/jalview/structure/StructureCommandsBase.java
src/jalview/structure/StructureCommandsI.java
src/jalview/structure/StructureSelectionManager.java
src/jalview/structures/models/AAStructureBindingModel.java
src/jalview/urls/IdentifiersUrlProvider.java
src/jalview/util/ChannelProperties.java
src/jalview/util/ColorUtils.java
src/jalview/util/Format.java
src/jalview/util/GroupUrlLink.java
src/jalview/util/LaunchUtils.java
src/jalview/util/Log4j.java
src/jalview/util/Platform.java
src/jalview/util/UrlLink.java
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/viewmodel/ViewportRanges.java
src/jalview/workers/AlignCalcManager.java
src/jalview/ws/DBRefFetcher.java
src/jalview/ws/JobStateSummary.java
src/jalview/ws/datamodel/MappableContactMatrixI.java
src/jalview/ws/datamodel/alphafold/MappableContactMatrix.java
src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java
src/jalview/ws/dbsources/EbiFileRetrievedProxy.java
src/jalview/ws/dbsources/EmblXmlSource.java
src/jalview/ws/dbsources/Pdb.java
src/jalview/ws/ebi/EBIFetchClient.java
src/jalview/ws/jws1/SeqSearchWSThread.java
src/jalview/ws/jws2/AbstractJabaCalcWorker.java
src/jalview/ws/jws2/JabaWsServerQuery.java
src/jalview/ws/jws2/JabawsCalcWorker.java
src/jalview/ws/jws2/JabawsMsaInterfaceAlignCalcWorker.java
src/jalview/ws/jws2/Jws2Discoverer.java
src/jalview/ws/jws2/ParameterUtils.java
src/jalview/ws/jws2/jabaws2/Jws2Instance.java
src/jalview/ws/rest/RestClient.java
src/jalview/ws/sifts/SiftsClient.java
src/jalview/ws/utils/UrlDownloadClient.java
src/jalview/xml/binding/jalview/AlcodonFrame.java
src/jalview/xml/binding/jalview/Annotation.java
src/jalview/xml/binding/jalview/AnnotationColourScheme.java
src/jalview/xml/binding/jalview/AnnotationElement.java
src/jalview/xml/binding/jalview/DoubleMatrix.java
src/jalview/xml/binding/jalview/DoubleVector.java
src/jalview/xml/binding/jalview/Feature.java
src/jalview/xml/binding/jalview/FeatureMatcher.java
src/jalview/xml/binding/jalview/FeatureMatcherSet.java
src/jalview/xml/binding/jalview/FilterBy.java
src/jalview/xml/binding/jalview/JalviewModel.java
src/jalview/xml/binding/jalview/JalviewUserColours.java
src/jalview/xml/binding/jalview/MapListType.java
src/jalview/xml/binding/jalview/MapOnAMatrixType.java
src/jalview/xml/binding/jalview/Mapping.java
src/jalview/xml/binding/jalview/MatrixType.java
src/jalview/xml/binding/jalview/NoValueColour.java
src/jalview/xml/binding/jalview/ObjectFactory.java
src/jalview/xml/binding/jalview/PcaDataType.java
src/jalview/xml/binding/jalview/Pdbentry.java
src/jalview/xml/binding/jalview/Property.java
src/jalview/xml/binding/jalview/Sequence.java
src/jalview/xml/binding/jalview/SequenceSet.java
src/jalview/xml/binding/jalview/SequenceType.java
src/jalview/xml/binding/jalview/ThresholdType.java
src/jalview/xml/binding/jalview/VAMSAS.java
src/jalview/xml/binding/jalview/WebServiceParameterSet.java
src/jalview/xml/binding/jalview/package-info.java
test/jalview/analysis/TestAlignSeq.java
test/jalview/bin/CommandsTest.java
test/jalview/datamodel/AlignmentAnnotationTests.java
test/jalview/datamodel/PAEContactMatrixTest.java
test/jalview/datamodel/SearchResultsTest.java
test/jalview/datamodel/SequenceTest.java
test/jalview/fts/service/pdb/PDBFTSRestClientTest.java
test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java
test/jalview/gui/AlignViewportTest.java
test/jalview/gui/AlignmentPanelTest.java
test/jalview/gui/FeatureSettingsTest.java
test/jalview/gui/ScalePanelTest.java
test/jalview/gui/SeqPanelTest.java
test/jalview/gui/structurechooser/StructureChooserQuerySourceTest.java
test/jalview/io/RNAMLfileTest.java
test/jalview/io/SequenceAnnotationReportTest.java
test/jalview/io/cache/JvCacheableInputBoxTest.java
test/jalview/project/Jalview2xmlTests.java
test/jalview/renderer/ContactGeometryTest.java
test/jalview/ws/sifts/SiftsClientTest.java

index e1d5669..36d2482 100755 (executable)
@@ -891,7 +891,7 @@ public class AlignSeq
       }
 
       // ignore case differences
-      if (allowmismatch || (c1 == c2) || (Math.abs(c2-c1)==('a'-'A')))
+      if (allowmismatch || (c1 == c2) || (Math.abs(c2 - c1) == ('a' - 'A')))
       {
         // extend mapping interval
         if (lp1 + 1 != alignpos || lp2 + 1 != pdbpos)
@@ -983,7 +983,8 @@ public class AlignSeq
             bestm = msq;
           }
         }
-        // jalview.bin.Console.outPrintln("Best Score for " + (matches.size() + 1) + " :"
+        // jalview.bin.Console.outPrintln("Best Score for " + (matches.size() +
+        // 1) + " :"
         // + bestscore);
         matches.add(bestm);
         aligns.add(bestaseq);
index b037336..1801674 100755 (executable)
@@ -453,8 +453,8 @@ public class AlignmentSorter
 
       if (tmp.size() != nSeq)
       {
-        jalview.bin.Console.errPrintln("WARNING: tmp.size()=" + tmp.size() + " != nseq="
-                + nSeq
+        jalview.bin.Console.errPrintln("WARNING: tmp.size()=" + tmp.size()
+                + " != nseq=" + nSeq
                 + " in getOrderByTree - tree contains sequences not in alignment");
       }
     }
@@ -847,7 +847,8 @@ public class AlignmentSorter
         int featureCount = feats[i] == null ? 0
                 : ((SequenceFeature[]) feats[i]).length;
         scores[i] = featureCount;
-        // jalview.bin.Console.errPrintln("Sorting on Density: seq "+seqs[i].getName()+
+        // jalview.bin.Console.errPrintln("Sorting on Density: seq
+        // "+seqs[i].getName()+
         // " Feats: "+featureCount+" Score : "+scores[i]);
       }
       QuickSort.sortByDouble(scores, seqs, sortByFeatureAscending);
index f470dc6..be5133f 100644 (file)
@@ -547,7 +547,8 @@ public class AlignmentUtils
       if (translated == null || !(aaRes == translated.charAt(0)))
       {
         // debug
-        // jalview.bin.Console.outPrintln(("Mismatch at " + i + "/" + aaResidue + ": "
+        // jalview.bin.Console.outPrintln(("Mismatch at " + i + "/" + aaResidue
+        // + ": "
         // + codon + "(" + translated + ") != " + aaRes));
         return false;
       }
@@ -698,7 +699,8 @@ public class AlignmentUtils
          * unmapped position; treat like a gap
          */
         sourceGapMappedLength += ratio;
-        // jalview.bin.Console.errPrintln("Can't align: no codon mapping to residue "
+        // jalview.bin.Console.errPrintln("Can't align: no codon mapping to
+        // residue "
         // + sourceDsPos + "(" + sourceChar + ")");
         // return;
         continue;
@@ -883,7 +885,8 @@ public class AlignmentUtils
   {
     if (protein.isNucleotide() || !dna.isNucleotide())
     {
-      jalview.bin.Console.errPrintln("Wrong alignment type in alignProteinAsDna");
+      jalview.bin.Console
+              .errPrintln("Wrong alignment type in alignProteinAsDna");
       return 0;
     }
     List<SequenceI> unmappedProtein = new ArrayList<>();
@@ -908,7 +911,8 @@ public class AlignmentUtils
   {
     if (protein.isNucleotide() || !dna.isNucleotide())
     {
-      jalview.bin.Console.errPrintln("Wrong alignment type in alignProteinAsDna");
+      jalview.bin.Console
+              .errPrintln("Wrong alignment type in alignProteinAsDna");
       return 0;
     }
     // todo: implement this
@@ -1512,7 +1516,9 @@ public class AlignmentUtils
    * @param alignment
    *          the alignment to add them to
    * @param selectionGroup
-   *          current selection group - may be null, if provided then any added annotation will be trimmed to just those columns in the selection group
+   *          current selection group - may be null, if provided then any added
+   *          annotation will be trimmed to just those columns in the selection
+   *          group
    */
   public static void addReferenceAnnotations(
           Map<SequenceI, List<AlignmentAnnotation>> annotations,
@@ -1536,7 +1542,9 @@ public class AlignmentUtils
    * @param seq
    * @param ann
    * @param selectionGroup
-   *          current selection group - may be null, if provided then any added annotation will be trimmed to just those columns in the selection group
+   *          current selection group - may be null, if provided then any added
+   *          annotation will be trimmed to just those columns in the selection
+   *          group
    * @return annotation added to {@code seq and {@code alignment}
    */
   public static AlignmentAnnotation addReferenceAnnotationTo(
@@ -2770,8 +2778,8 @@ public class AlignmentUtils
                 fromRange[i + 1]);
         if (range == null)
         {
-          jalview.bin.Console.errPrintln("Error in mapping " + seqMap + " from "
-                  + fromSeq.getName());
+          jalview.bin.Console.errPrintln("Error in mapping " + seqMap
+                  + " from " + fromSeq.getName());
           return false;
         }
         int fromCol = fromSeq.findIndex(fromRange[i]);
index d81dd44..286d589 100644 (file)
@@ -55,8 +55,10 @@ public class AverageDistanceEngine extends TreeEngine
   /**
    * compute cosine distance matrix for a given contact matrix and create a
    * UPGMA tree
+   * 
    * @param cm
-   * @param cosineOrDifference false - dot product : true - L1
+   * @param cosineOrDifference
+   *          false - dot product : true - L1
    */
   public AverageDistanceEngine(AlignmentViewport av, AlignmentAnnotation aa,
           ContactMatrixI cm, boolean cosineOrDifference)
@@ -64,12 +66,11 @@ public class AverageDistanceEngine extends TreeEngine
     this.av = av;
     this.aa = aa;
     this.cm = cm;
-    mode = (cosineOrDifference) ? 1 :0; 
+    mode = (cosineOrDifference) ? 1 : 0;
     calculate(cm);
 
   }
 
-
   public void calculate(ContactMatrixI cm)
   {
     this.cm = cm;
@@ -103,7 +104,7 @@ public class AverageDistanceEngine extends TreeEngine
       // compute distance matrix element
       ContactListI ith = cm.getContactList(i);
       distances.setValue(i, i, 0);
-      if (ith==null)
+      if (ith == null)
       {
         continue;
       }
index 41582b4..187594f 100644 (file)
@@ -1029,7 +1029,8 @@ public class CrossRef
     }
     if (dataset.getSequences() == null)
     {
-      jalview.bin.Console.errPrintln("Empty dataset sequence set - NO VECTOR");
+      jalview.bin.Console
+              .errPrintln("Empty dataset sequence set - NO VECTOR");
       return false;
     }
     List<SequenceI> ds = dataset.getSequences();
index 4c826b2..c91cfa2 100644 (file)
@@ -140,7 +140,8 @@ public final class GeneticCodes
       InputStream is = getClass().getResourceAsStream(fileName);
       if (is == null)
       {
-        jalview.bin.Console.errPrintln("Resource file not found: " + fileName);
+        jalview.bin.Console
+                .errPrintln("Resource file not found: " + fileName);
         return;
       }
       BufferedReader dataIn = new BufferedReader(new InputStreamReader(is));
@@ -190,7 +191,8 @@ public final class GeneticCodes
       InputStream is = getClass().getResourceAsStream(fileName);
       if (is == null)
       {
-        jalview.bin.Console.errPrintln("Resource file not found: " + fileName);
+        jalview.bin.Console
+                .errPrintln("Resource file not found: " + fileName);
         return;
       }
       BufferedReader dataIn = new BufferedReader(new InputStreamReader(is));
index 911ee04..0157b91 100644 (file)
@@ -422,7 +422,8 @@ public class Rna
       final int close = basePair.getBP3();
 
       // jalview.bin.Console.outPrintln("open " + open + " close " + close);
-      // jalview.bin.Console.outPrintln("lastclose " + lastclose + " lastopen " + lastopen);
+      // jalview.bin.Console.outPrintln("lastclose " + lastclose + " lastopen "
+      // + lastopen);
 
       // we're moving from right to left based on closing pair
       /*
@@ -441,7 +442,8 @@ public class Rna
       {
         int popen = bps.get(j).getBP5();
 
-        // jalview.bin.Console.outPrintln("j " + j + " popen " + popen + " lastopen "
+        // jalview.bin.Console.outPrintln("j " + j + " popen " + popen + "
+        // lastopen "
         // +lastopen + " open " + open);
         if ((popen < lastopen) && (popen > open))
         {
index a7cbc25..fdc15e2 100644 (file)
@@ -214,7 +214,8 @@ public abstract class TreeEngine
   {
     // if (_lycount<_lylimit)
     // {
-    // jalview.bin.Console.errPrintln("Warning: depth of _recount greater than number of
+    // jalview.bin.Console.errPrintln("Warning: depth of _recount greater than
+    // number of
     // nodes.");
     // }
     if (nd == null)
index ce79a65..1068042 100644 (file)
@@ -353,8 +353,9 @@ public class TreeModel
 
     if ((nd.left() == null) && (nd.right() == null))
     {
-       // TODO FIX FOR COLUMN TREES
-      jalview.bin.Console.outPrintln("Leaf = " + ((SequenceI) nd.element()).getName());
+      // TODO FIX FOR COLUMN TREES
+      jalview.bin.Console
+              .outPrintln("Leaf = " + ((SequenceI) nd.element()).getName());
       jalview.bin.Console.outPrintln("Dist " + nd.dist);
       jalview.bin.Console.outPrintln("Boot " + nd.getBootstrap());
     }
@@ -481,7 +482,8 @@ public class TreeModel
     }
     else
     {
-      jalview.bin.Console.outPrintln(" name = " + ((SequenceI) nd.element()).getName());
+      jalview.bin.Console.outPrintln(
+              " name = " + ((SequenceI) nd.element()).getName());
     }
 
     jalview.bin.Console.outPrintln(
@@ -514,7 +516,8 @@ public class TreeModel
   {
     // if (_lycount<_lylimit)
     // {
-    // jalview.bin.Console.errPrintln("Warning: depth of _recount greater than number of
+    // jalview.bin.Console.errPrintln("Warning: depth of _recount greater than
+    // number of
     // nodes.");
     // }
     if (nd == null)
index d0f21bd..d9648ba 100644 (file)
@@ -143,7 +143,8 @@ public class ScoreModels
     ScoreModelI sm2 = models.get(sm.getName());
     if (sm2 != null)
     {
-      jalview.bin.Console.errPrintln("Warning: replacing score model " + sm2.getName());
+      jalview.bin.Console.errPrintln(
+              "Warning: replacing score model " + sm2.getName());
     }
     models.put(sm.getName(), sm);
   }
index d5d07ef..99a3687 100644 (file)
@@ -35,9 +35,12 @@ public interface SequenceRenderer
 
   /**
    * Configure the Graphics canvas and render options for the renderer
-   * @param g - the canvas to render to
-   * @param renderGaps - when true, gap characters will be included when rendered
-   *          
+   * 
+   * @param g
+   *          - the canvas to render to
+   * @param renderGaps
+   *          - when true, gap characters will be included when rendered
+   * 
    */
   void prepare(Graphics g, boolean renderGaps);
 
index 77f2b6d..5365683 100644 (file)
@@ -196,9 +196,11 @@ public interface JalviewStructureDisplayI
 
   /**
    * 
-   * @return heteroatoms in a form suitable for display and passing to command generator to display hetatms
+   * @return heteroatoms in a form suitable for display and passing to command
+   *         generator to display hetatms
    */
-  default List<String> getHetatms() {
+  default List<String> getHetatms()
+  {
     return Collections.EMPTY_LIST;
   }
 
index 413b0d4..300167f 100644 (file)
@@ -393,8 +393,8 @@ public class APopupMenu extends java.awt.PopupMenu
         urlLink = new UrlLink(link);
       } catch (Exception foo)
       {
-        jalview.bin.Console.errPrintln("Exception for URLLink '" + link + "': "
-                + foo.getMessage());
+        jalview.bin.Console.errPrintln("Exception for URLLink '" + link
+                + "': " + foo.getMessage());
         continue;
       }
 
index 4b858e1..f502952 100644 (file)
@@ -3061,7 +3061,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,
   {
     if (viewport.applet == null)
     {
-      jalview.bin.Console.outPrintln("Not running as applet - no browser available.");
+      jalview.bin.Console
+              .outPrintln("Not running as applet - no browser available.");
     }
     else
     {
@@ -3982,8 +3983,9 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,
     }
     if (viewer == null)
     {
-      jalview.bin.Console.errPrintln("Can't use this object as a structure viewer:"
-              + jmolviewer.getClass());
+      jalview.bin.Console
+              .errPrintln("Can't use this object as a structure viewer:"
+                      + jmolviewer.getClass());
       return null;
     }
     SequenceI[] seqs = null;
@@ -4142,8 +4144,9 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,
       }
       if (protocol == null)
       {
-        jalview.bin.Console.errPrintln("Couldn't work out protocol to open structure: "
-                + pdb.getId());
+        jalview.bin.Console
+                .errPrintln("Couldn't work out protocol to open structure: "
+                        + pdb.getId());
         return;
       }
     }
@@ -4154,8 +4157,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,
               .setMapping(seqs, chains, pdb.getFile(), protocol,
                       null) == null)
       {
-        jalview.bin.Console.errPrintln("Failed to map " + pdb.getFile() + " ("
-                + protocol + ") to any sequences");
+        jalview.bin.Console.errPrintln("Failed to map " + pdb.getFile()
+                + " (" + protocol + ") to any sequences");
       }
       return;
     }
@@ -4201,7 +4204,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,
           SequenceI[][] seqs, String[][] chains, String[] protocols)
   {
     // TODO Auto-generated method stub
-    jalview.bin.Console.errPrintln("Aligned Structure View: Not yet implemented.");
+    jalview.bin.Console
+            .errPrintln("Aligned Structure View: Not yet implemented.");
   }
 
   /**
index 71ddcef..9bf1a66 100644 (file)
@@ -693,7 +693,8 @@ public class AlignmentPanel extends Panel
 
       if ((hextent + x) > width)
       {
-        jalview.bin.Console.errPrintln("hextent was " + hextent + " and x was " + x);
+        jalview.bin.Console
+                .errPrintln("hextent was " + hextent + " and x was " + x);
 
         x = width - hextent;
       }
index a5b652f..bb668a8 100644 (file)
@@ -148,7 +148,8 @@ public class RedundancyPanel extends SliderPanel
 
     validate();
     sliderValueChanged();
-    // jalview.bin.Console.outPrintln("blob done "+ (System.currentTimeMillis()-start));
+    // jalview.bin.Console.outPrintln("blob done "+
+    // (System.currentTimeMillis()-start));
   }
 
   void sliderValueChanged()
index 735046e..e92d08e 100755 (executable)
@@ -646,7 +646,7 @@ public class SeqCanvas extends Panel implements ViewportListenerI
       {
         char s = nextSeq.getCharAt(cursorX);
 
-        sr.drawCursor(g,s, (cursorX - startRes) * avcharWidth,
+        sr.drawCursor(g, s, (cursorX - startRes) * avcharWidth,
                 offset + ((i - startSeq) * avcharHeight));
       }
     }
index c573612..0087a5f 100644 (file)
@@ -1817,9 +1817,11 @@ public class SeqPanel extends Panel implements MouseMotionListener,
       {
         if (av.getAlignment() == null)
         {
-          jalview.bin.Console.outPrintln("Selection message: alignviewport av SeqSetId="
-                  + av.getSequenceSetId() + " ViewId=" + av.getViewId()
-                  + " 's alignment is NULL! returning immediatly.");
+          jalview.bin.Console.outPrintln(
+                  "Selection message: alignviewport av SeqSetId="
+                          + av.getSequenceSetId() + " ViewId="
+                          + av.getViewId()
+                          + " 's alignment is NULL! returning immediatly.");
           return;
         }
         sgroup = seqsel.intersect(av.getAlignment(),
index 483b1fc..a64e869 100755 (executable)
@@ -1451,11 +1451,10 @@ public class Cache
                 if (customProxySet &&
                 // we have a username but no password for the scheme being
                 // requested
-                        (protocol.equalsIgnoreCase("http")
-                                && (httpUser != null
-                                        && httpUser.length() > 0
-                                        && (httpPassword == null
-                                                || httpPassword.length == 0)))
+                (protocol.equalsIgnoreCase("http")
+                        && (httpUser != null && httpUser.length() > 0
+                                && (httpPassword == null
+                                        || httpPassword.length == 0)))
                         || (protocol.equalsIgnoreCase("https")
                                 && (httpsUser != null
                                         && httpsUser.length() > 0
index e8be95f..b73fffc 100644 (file)
@@ -292,8 +292,9 @@ public class JalviewLite extends Applet
     {
       if (debug)
       {
-        jalview.bin.Console.errPrintln("Selecting region using separator string '"
-                + separator + "'");
+        jalview.bin.Console
+                .errPrintln("Selecting region using separator string '"
+                        + separator + "'");
       }
     }
     // deparse fields
@@ -396,8 +397,8 @@ public class JalviewLite extends Applet
             }
             if (debug)
             {
-              jalview.bin.Console.errPrintln("Range '" + cl + "' deparsed as [" + from
-                      + "," + to + "]");
+              jalview.bin.Console.errPrintln("Range '" + cl
+                      + "' deparsed as [" + from + "," + to + "]");
             }
           }
           else
@@ -457,8 +458,9 @@ public class JalviewLite extends Applet
           }
           else
           {
-            jalview.bin.Console.errPrintln("ERROR: Invalid Point selection '" + cl
-                    + "' deparsed as [" + r + "]");
+            jalview.bin.Console
+                    .errPrintln("ERROR: Invalid Point selection '" + cl
+                            + "' deparsed as [" + r + "]");
           }
         }
       }
@@ -956,8 +958,8 @@ public class JalviewLite extends Applet
               + ((af == null) ? "All frames"
                       : "Just views for "
                               + af.getAlignViewport().getSequenceSetId()));
-      jalview.bin.Console.errPrintln("There are now " + javascriptListeners.size()
-              + " listeners in total.");
+      jalview.bin.Console.errPrintln("There are now "
+              + javascriptListeners.size() + " listeners in total.");
     }
   }
 
@@ -1003,8 +1005,8 @@ public class JalviewLite extends Applet
               + ((af == null) ? "All frames"
                       : "Just views for "
                               + af.getAlignViewport().getSequenceSetId()));
-      jalview.bin.Console.errPrintln("There are now " + javascriptListeners.size()
-              + " listeners in total.");
+      jalview.bin.Console.errPrintln("There are now "
+              + javascriptListeners.size() + " listeners in total.");
     }
   }
 
@@ -1039,10 +1041,11 @@ public class JalviewLite extends Applet
             .addStructureViewerListener(mol);
     if (debug)
     {
-      jalview.bin.Console.errPrintln("Added a javascript structure viewer listener '"
-              + listener + "'");
-      jalview.bin.Console.errPrintln("There are now " + javascriptListeners.size()
-              + " listeners in total.");
+      jalview.bin.Console
+              .errPrintln("Added a javascript structure viewer listener '"
+                      + listener + "'");
+      jalview.bin.Console.errPrintln("There are now "
+              + javascriptListeners.size() + " listeners in total.");
     }
   }
 
@@ -1087,7 +1090,8 @@ public class JalviewLite extends Applet
         rprt = debug;
         if (debug)
         {
-          jalview.bin.Console.errPrintln("Removed listener '" + listener + "'");
+          jalview.bin.Console
+                  .errPrintln("Removed listener '" + listener + "'");
         }
       }
       else
@@ -1097,8 +1101,8 @@ public class JalviewLite extends Applet
     }
     if (rprt)
     {
-      jalview.bin.Console.errPrintln("There are now " + javascriptListeners.size()
-              + " listeners in total.");
+      jalview.bin.Console.errPrintln("There are now "
+              + javascriptListeners.size() + " listeners in total.");
     }
   }
 
@@ -1189,8 +1193,9 @@ public class JalviewLite extends Applet
           }
         } catch (NumberFormatException e)
         {
-          jalview.bin.Console.errPrintln("Ignoring invalid residue number string '"
-                  + pdbResNum + "'");
+          jalview.bin.Console
+                  .errPrintln("Ignoring invalid residue number string '"
+                          + pdbResNum + "'");
         }
 
       }
@@ -1220,9 +1225,10 @@ public class JalviewLite extends Applet
 
         } catch (Exception ex)
         {
-          jalview.bin.Console.errPrintln("Couldn't parse integer arguments (topRow='"
-                  + topRow + "' and leftHandColumn='" + leftHandColumn
-                  + "')");
+          jalview.bin.Console
+                  .errPrintln("Couldn't parse integer arguments (topRow='"
+                          + topRow + "' and leftHandColumn='"
+                          + leftHandColumn + "')");
           ex.printStackTrace();
         }
       }
@@ -1251,8 +1257,9 @@ public class JalviewLite extends Applet
 
         } catch (Exception ex)
         {
-          jalview.bin.Console.errPrintln("Couldn't parse integer arguments (topRow='"
-                  + topRow + "')");
+          jalview.bin.Console
+                  .errPrintln("Couldn't parse integer arguments (topRow='"
+                          + topRow + "')");
           ex.printStackTrace();
         }
 
@@ -1421,7 +1428,8 @@ public class JalviewLite extends Applet
       JSObject scriptObject = JSObject.getWindow(this);
       if (debug && scriptObject != null)
       {
-        jalview.bin.Console.errPrintln("Applet has Javascript callback support.");
+        jalview.bin.Console
+                .errPrintln("Applet has Javascript callback support.");
       }
 
     } catch (Exception ex)
@@ -1465,7 +1473,8 @@ public class JalviewLite extends Applet
         separator = sep;
         if (debug)
         {
-          jalview.bin.Console.errPrintln("Separator set to '" + separator + "'");
+          jalview.bin.Console
+                  .errPrintln("Separator set to '" + separator + "'");
         }
       }
       else
@@ -1573,7 +1582,8 @@ public class JalviewLite extends Applet
     {
       if (tries > 0)
       {
-        jalview.bin.Console.errPrintln("LiveConnect request thread going to sleep.");
+        jalview.bin.Console
+                .errPrintln("LiveConnect request thread going to sleep.");
       }
       try
       {
@@ -1584,7 +1594,8 @@ public class JalviewLite extends Applet
       ;
       if (tries++ > 0)
       {
-        jalview.bin.Console.errPrintln("LiveConnect request thread woken up.");
+        jalview.bin.Console
+                .errPrintln("LiveConnect request thread woken up.");
       }
       try
       {
@@ -1632,8 +1643,9 @@ public class JalviewLite extends Applet
                   "Calling oninit callback '" + initjscallback + "'.");
         } catch (Exception e)
         {
-          jalview.bin.Console.errPrintln("Exception when executing _oninit callback '"
-                  + initjscallback + "'.");
+          jalview.bin.Console
+                  .errPrintln("Exception when executing _oninit callback '"
+                          + initjscallback + "'.");
           e.printStackTrace();
         }
       }
@@ -1884,8 +1896,8 @@ public class JalviewLite extends Applet
       {
         if (debug)
         {
-          jalview.bin.Console.errPrintln("Prepended document base '" + documentBase
-                  + "' to make: '" + withDocBase + "'");
+          jalview.bin.Console.errPrintln("Prepended document base '"
+                  + documentBase + "' to make: '" + withDocBase + "'");
         }
         protocol = DataSourceType.URL;
         return withDocBase;
@@ -2475,7 +2487,8 @@ public class JalviewLite extends Applet
         return rtn;
       } catch (Exception ex)
       {
-        jalview.bin.Console.outPrintln("Exception checking resources: " + f + " " + ex);
+        jalview.bin.Console.outPrintln(
+                "Exception checking resources: " + f + " " + ex);
         return false;
       }
     }
@@ -2745,7 +2758,8 @@ public class JalviewLite extends Applet
     this.separator = separator;
     if (debug)
     {
-      jalview.bin.Console.errPrintln("Default Separator now: '" + separator + "'");
+      jalview.bin.Console
+              .errPrintln("Default Separator now: '" + separator + "'");
     }
   }
 
@@ -2901,8 +2915,8 @@ public class JalviewLite extends Applet
     Color col = ColorUtils.parseColourString(colprop);
     if (col == null)
     {
-      jalview.bin.Console.errPrintln("Couldn't parse '" + colprop + "' as a colour for "
-              + colparam);
+      jalview.bin.Console.errPrintln("Couldn't parse '" + colprop
+              + "' as a colour for " + colparam);
     }
     return (col == null) ? defcolour : col;
   }
index d38892a..4705f20 100644 (file)
@@ -64,8 +64,9 @@ public class JalviewLiteURLRetrieve extends Applet
     DataSourceType protocol = null;
     try
     {
-      jalview.bin.Console.outPrintln("Loading thread started with:\n>>file\n" + file
-              + ">>endfile");
+      jalview.bin.Console
+              .outPrintln("Loading thread started with:\n>>file\n" + file
+                      + ">>endfile");
       // This might throw a security exception in certain browsers
       // Netscape Communicator for instance.
       try
@@ -125,7 +126,8 @@ public class JalviewLiteURLRetrieve extends Applet
       }
       else
       {
-        jalview.bin.Console.outPrintln("User specified Format is " + format);
+        jalview.bin.Console
+                .outPrintln("User specified Format is " + format);
       }
       AlignmentI al = null;
       try
index c15bbf8..c46271f 100644 (file)
@@ -486,7 +486,8 @@ public class EditCommand implements CommandI
   //
   // for (int s = 0; s < command.seqs.length; s++)
   // {
-  // jalview.bin.Console.outPrintln("pos: "+command.position+" number: "+command.number);
+  // jalview.bin.Console.outPrintln("pos: "+command.position+" number:
+  // "+command.number);
   // command.seqs[s].insertCharAt(command.position, command.number,'A');
   // }
   //
@@ -1433,7 +1434,8 @@ public class EditCommand implements CommandI
           }
           else
           {
-            jalview.bin.Console.errPrintln("Can't undo edit action " + action);
+            jalview.bin.Console
+                    .errPrintln("Can't undo edit action " + action);
             // throw new IllegalStateException("Can't undo edit action " +
             // action);
           }
index cb74a66..3cca453 100644 (file)
@@ -707,7 +707,8 @@ public class AlignedCodonFrame
             ds.setSequenceFeatures(dna.getSequenceFeatures());
             // dnaSeqs[i] = ds;
             ssm.fromSeq = ds;
-            jalview.bin.Console.outPrintln("Realised mapped sequence " + ds.getName());
+            jalview.bin.Console
+                    .outPrintln("Realised mapped sequence " + ds.getName());
           }
         }
       }
index 375e6b4..73ccdc5 100755 (executable)
@@ -2057,7 +2057,7 @@ public class Alignment implements AlignmentI, AutoCloseable
     if (cm == null && _aa.sequenceRef != null)
     {
       cm = _aa.sequenceRef.getContactMatrixFor(_aa);
-      if (cm == null && _aa.sequenceRef.getDatasetSequence()!=null)
+      if (cm == null && _aa.sequenceRef.getDatasetSequence() != null)
       {
         // TODO fix up this logic and unify with getContactListFor
         cm = _aa.sequenceRef.getDatasetSequence().getContactMatrixFor(_aa);
@@ -2069,7 +2069,8 @@ public class Alignment implements AlignmentI, AutoCloseable
   @Override
   public ContactListI getContactListFor(AlignmentAnnotation _aa, int column)
   {
-    if (_aa.annotations==null || column>=_aa.annotations.length || column<0)
+    if (_aa.annotations == null || column >= _aa.annotations.length
+            || column < 0)
     {
       return null;
     }
index 7058ac7..7cd9dc9 100644 (file)
@@ -57,7 +57,7 @@ public class ContactListImpl implements ContactListI
     }
     if (to_column >= getContactHeight())
     {
-      to_column = getContactHeight()-1;
+      to_column = getContactHeight() - 1;
     }
     ContactRange cr = new ContactRange();
     cr.setFrom_column(from_column);
@@ -88,7 +88,7 @@ public class ContactListImpl implements ContactListI
         }
       }
     }
-    if (tot > 0 && to_column>from_column)
+    if (tot > 0 && to_column > from_column)
     {
       cr.setMean(tot / (1 + to_column - from_column));
     }
index 3a64917..45c0d18 100644 (file)
@@ -18,7 +18,8 @@ public class ContactMapHolder implements ContactMapHolderI
   {
     if (contactmaps != null && contactmaps.size() > 0)
     {
-      // defensive copy, and return non redundant set of ContactMatrixI instances
+      // defensive copy, and return non redundant set of ContactMatrixI
+      // instances
       return new HashSet<ContactMatrixI>(contactmaps.values());
     }
     return Collections.EMPTY_LIST;
index 2e12a91..b01dd6c 100644 (file)
@@ -6,7 +6,8 @@ import java.util.StringTokenizer;
 
 import jalview.bin.Console;
 
-public abstract class ContactMatrix extends GroupSetHolder implements ContactMatrixI
+public abstract class ContactMatrix extends GroupSetHolder
+        implements ContactMatrixI
 {
   /**
    * are contacts reflexive ?
@@ -112,9 +113,10 @@ public abstract class ContactMatrix extends GroupSetHolder implements ContactMat
       }
     });
   }
+
   private Float getFloatElementAt(int column, int p)
   {
-    
+
     List<Float> clist;
     Float cl = null;
     if (symmetric)
@@ -137,16 +139,18 @@ public abstract class ContactMatrix extends GroupSetHolder implements ContactMat
     }
     return cl;
   }
+
   @Override
   public double getElementAt(int column, int row)
   {
     Float cl = getFloatElementAt(column, row);
-    if (cl!=null)
+    if (cl != null)
     {
       return cl;
     }
-    throw(new RuntimeException("Out of Bounds "+column+","+row));
+    throw (new RuntimeException("Out of Bounds " + column + "," + row));
   }
+
   @Override
   public float getMin()
   {
@@ -170,25 +174,28 @@ public abstract class ContactMatrix extends GroupSetHolder implements ContactMat
   {
     return "Contact Matrix";
   }
+
   public static String contactToFloatString(ContactMatrixI cm)
   {
     StringBuilder sb = new StringBuilder();
     for (int c = 0; c < cm.getWidth(); c++)
     {
       ContactListI cl = cm.getContactList(c);
-      long lastsb=-1;
+      long lastsb = -1;
       if (cl != null)
       {
         for (int h = 0; h <= cl.getContactHeight(); h++)
         {
           if (sb.length() > 0)
           {
-            if (sb.length()-lastsb>320)
+            if (sb.length() - lastsb > 320)
             {
               // newline
               sb.append('\n');
-              lastsb=sb.length();
-            } else {
+              lastsb = sb.length();
+            }
+            else
+            {
               sb.append('\t');
             }
           }
@@ -203,7 +210,7 @@ public abstract class ContactMatrix extends GroupSetHolder implements ContactMat
           int rows)
   {
     float[][] vals = new float[cols][rows];
-    StringTokenizer tabsep = new StringTokenizer(values, "" + '\t'+'\n');
+    StringTokenizer tabsep = new StringTokenizer(values, "" + '\t' + '\n');
     int c = 0, r = 0;
     while (tabsep.hasMoreTokens())
     {
index 4261519..0d3bff6 100644 (file)
@@ -30,7 +30,9 @@ public interface ContactMatrixI
   String getType();
 
   int getWidth();
+
   int getHeight();
+
   public GroupSetI getGroupSet();
 
   /// proxy methods to simplify use of the interface
@@ -126,11 +128,12 @@ public interface ContactMatrixI
 
   void setGroupSet(GroupSet makeGroups);
 
-  default void randomlyReColourGroups() {
+  default void randomlyReColourGroups()
+  {
     if (hasGroupSet())
     {
       GroupSetI groups = getGroupSet();
-      for (BitSet group:groups.getGroups())
+      for (BitSet group : groups.getGroups())
       {
         groups.setColorForGroup(group, ColorUtils.getARandomColor());
       }
@@ -179,9 +182,10 @@ public interface ContactMatrixI
       }
     }
   }
-  
+
   /**
-   * look up the colour for a column in the associated contact matrix 
+   * look up the colour for a column in the associated contact matrix
+   * 
    * @return Color.white or assigned colour
    */
   default Color getGroupColorForPosition(int column)
@@ -189,7 +193,7 @@ public interface ContactMatrixI
     if (hasGroupSet())
     {
       GroupSetI groups = getGroupSet();
-      for (BitSet gp:groups.getGroups())
+      for (BitSet gp : groups.getGroups())
       {
         if (gp.get(column))
         {
@@ -202,14 +206,14 @@ public interface ContactMatrixI
 
   /**
    * direct access to column and row position of matrix
-   
-   * Implementations are allowed to throw
-   * RunTimeExceptions if _column/i are out of bounds
+   * 
+   * Implementations are allowed to throw RunTimeExceptions if _column/i are out
+   * of bounds
    * 
    * @param column
    * @param row
    * @return
    */
   double getElementAt(int column, int row);
-  
+
 }
index 3b1757b..cb85341 100755 (executable)
@@ -154,7 +154,7 @@ public class DBRefSource
 
   public static boolean isPrimaryCandidate(String ucversion)
   {
-    if (ucversion==null)
+    if (ucversion == null)
     {
       // Null/empty version is not a real reference ?
       return false;
index 5fb156f..0341cf2 100644 (file)
@@ -1,16 +1,15 @@
 package jalview.datamodel;
 
-public class FloatContactMatrix extends GroupSetHolder implements ContactMatrixI
+public class FloatContactMatrix extends GroupSetHolder
+        implements ContactMatrixI
 {
 
   int maxrow = 0, maxcol = 0;
 
-
   float[][] elements;
 
   float maxscore;
 
-
   public FloatContactMatrix(float[][] matrix)
   {
     maxcol = 0;
index db38e7b..6583fe3 100644 (file)
@@ -149,8 +149,9 @@ public class GroupSet implements GroupSetI
   {
     return makeGroups(matrix, autoCut, 0, autoCut);
   }
-  public static GroupSet makeGroups(ContactMatrixI matrix, boolean auto, float thresh,
-          boolean abs)
+
+  public static GroupSet makeGroups(ContactMatrixI matrix, boolean auto,
+          float thresh, boolean abs)
   {
     AverageDistanceEngine clusterer = new AverageDistanceEngine(null, null,
             matrix, true);
@@ -197,7 +198,7 @@ public class GroupSet implements GroupSetI
         nodegroups.add(clusterer.getTopNode());
       }
     }
-    
+
     List<BitSet> groups = new ArrayList<>();
     for (BinaryNode root : nodegroups)
     {
index dedb960..5d83c84 100644 (file)
@@ -61,9 +61,12 @@ public interface SearchResultMatchI
   /**
    *
    * @param seq
-   * @param from - first position to highlight
-   * @param to - last position to highlight (assumed higher than from)
-   * @return true iff from-to intersects or marks positions either side of start/end
+   * @param from
+   *          - first position to highlight
+   * @param to
+   *          - last position to highlight (assumed higher than from)
+   * @return true iff from-to intersects or marks positions either side of
+   *         start/end
    */
   boolean adjacent(SequenceI seq, int from, int to);
 }
\ No newline at end of file
index 546dd6f..9d357c8 100755 (executable)
@@ -41,7 +41,8 @@ public class SearchResults implements SearchResultsI
    * One match consists of a sequence reference, start and end positions.
    * Discontiguous ranges in a sequence require two or more Match objects.
    */
-  public class Match implements SearchResultMatchI, Comparable<SearchResultMatchI>
+  public class Match
+          implements SearchResultMatchI, Comparable<SearchResultMatchI>
   {
     final SequenceI sequence;
 
@@ -160,16 +161,19 @@ public class SearchResults implements SearchResultsI
     {
       return (sequence == seq && start <= from && end >= to);
     }
+
     @Override
     public boolean adjacent(SequenceI seq, int from, int to)
     {
-      return (sequence == seq && ((start <= from && end >= to) || (from<=(end+1) && to >=(end+1)) || (from<=(start-1) && to>=(start-1))));
+      return (sequence == seq && ((start <= from && end >= to)
+              || (from <= (end + 1) && to >= (end + 1))
+              || (from <= (start - 1) && to >= (start - 1))));
     }
 
     @Override
     public int compareTo(SearchResultMatchI o)
     {
-      if (start<o.getStart())
+      if (start < o.getStart())
       {
         return -1;
       }
@@ -185,14 +189,14 @@ public class SearchResults implements SearchResultsI
       {
         return +1;
       }
-      if (sequence!=o.getSequence())
+      if (sequence != o.getSequence())
       {
-        int hashc =sequence.hashCode(),oseq=o.getSequence().hashCode();
+        int hashc = sequence.hashCode(), oseq = o.getSequence().hashCode();
         return (hashc < oseq) ? -1 : 1;
       }
       return 0;
     }
-    
+
   }
 
   @Override
@@ -224,27 +228,28 @@ public class SearchResults implements SearchResultsI
       count = beforeCount + 1;
     }
   }
-  
 
   @Override
   public boolean appendResult(SequenceI sequence, int start, int end)
   {
 
     Match m = new Match(sequence, start, end);
-    
-    boolean appending=false;
-    
-    // we dynamically maintain an interval to add as we test each range in the list
-    
-    int cstart=start,cend=end;
-    List<SearchResultMatchI> toRemove=new ArrayList<>();
-    for (SearchResultMatchI thatm:matches)
+
+    boolean appending = false;
+
+    // we dynamically maintain an interval to add as we test each range in the
+    // list
+
+    int cstart = start, cend = end;
+    List<SearchResultMatchI> toRemove = new ArrayList<>();
+    for (SearchResultMatchI thatm : matches)
     {
-      if (thatm.getSequence()==sequence)
+      if (thatm.getSequence() == sequence)
       {
-        if (thatm.contains(sequence,cstart,cend))
+        if (thatm.contains(sequence, cstart, cend))
         {
-          // found a match containing the current range. nothing else to do except report if we operated on the list
+          // found a match containing the current range. nothing else to do
+          // except report if we operated on the list
           return appending;
         }
         if (thatm.adjacent(sequence, cstart, cend))
@@ -253,14 +258,16 @@ public class SearchResults implements SearchResultsI
           start = Math.min(m.start, thatm.getStart());
           end = Math.max(m.end, thatm.getEnd());
           // and check if we keep or remove the old one
-          if (thatm.getStart()!=start || thatm.getEnd()!=end)
-          { 
+          if (thatm.getStart() != start || thatm.getEnd() != end)
+          {
             toRemove.add(thatm);
             count--;
             cstart = start;
             cend = end;
-            appending=true;
-          } else {
+            appending = true;
+          }
+          else
+          {
             return false;
           }
         }
@@ -268,11 +275,12 @@ public class SearchResults implements SearchResultsI
     }
     matches.removeAll(toRemove);
     {
-      matches.add(new Match(sequence,cstart,cend));
+      matches.add(new Match(sequence, cstart, cend));
       count++;
     }
     return appending;
   }
+
   @Override
   public boolean involvesSequence(SequenceI sequence)
   {
@@ -350,7 +358,8 @@ public class SearchResults implements SearchResultsI
         else
         {
           // debug
-          // jalview.bin.Console.errPrintln("Outwith bounds!" + matchStart+">"+end +" or "
+          // jalview.bin.Console.errPrintln("Outwith bounds!" +
+          // matchStart+">"+end +" or "
           // + matchEnd+"<"+start);
         }
       }
index d682de1..ec6f5ee 100644 (file)
@@ -51,7 +51,6 @@ public interface SearchResultsI
    */
   void addResult(SequenceI seq, int[] positions);
 
-
   /**
    * Adds the given start/end region to this search result. If sequence already
    * has a search result and the range is adjacent to already highlighted
index b04ac13..3e0e796 100644 (file)
@@ -7,6 +7,7 @@ import java.util.List;
 
 import jalview.util.MapList;
 import jalview.ws.datamodel.alphafold.MappableContactMatrix;
+
 /**
  * Dummy contact matrix based on sequence distance
  * 
@@ -18,6 +19,7 @@ public class SeqDistanceContactMatrix
         implements ContactMatrixI
 {
   private static final String SEQUENCE_DISTANCE = "SEQUENCE_DISTANCE";
+
   private int width = 0;
 
   public SeqDistanceContactMatrix(int width)
@@ -113,11 +115,13 @@ public class SeqDistanceContactMatrix
   {
     return width;
   }
+
   @Override
   public double getElementAt(int _column, int i)
   {
     return Math.abs(_column - i);
   }
+
   @Override
   protected SeqDistanceContactMatrix newMappableContactMatrix(
           SequenceI newRefSeq, MapList newFromMapList)
index 7a5d5bc..cc21f35 100755 (executable)
@@ -353,7 +353,7 @@ public class Sequence extends ASequence implements SequenceI
           // only copy the given annotation
           AlignmentAnnotation newann = new AlignmentAnnotation(sqann[i]);
           ContactMatrixI cm = seq.getContactMatrixFor(sqann[i]);
-          if (cm!=null)
+          if (cm != null)
           {
             addContactListFor(newann, cm);
           }
@@ -1646,7 +1646,7 @@ public class Sequence extends ASequence implements SequenceI
         }
       }
       // all matrices should have been transferred. so we clear the local holder
-      _cmholder=null;
+      _cmholder = null;
     }
     return datasetSequence;
   }
@@ -1756,11 +1756,12 @@ public class Sequence extends ASequence implements SequenceI
     }
     // transfer from entry to sequence
     // if entry has a description and sequence doesn't, then transfer
-    if (entry.getDescription()!=null && (description==null || description.trim().length()==0))
+    if (entry.getDescription() != null
+            && (description == null || description.trim().length() == 0))
     {
       description = entry.getDescription();
     }
-    
+
     // transfer any new features from entry onto sequence
     if (entry.getSequenceFeatures() != null)
     {
@@ -2142,15 +2143,17 @@ public class Sequence extends ASequence implements SequenceI
 
   private ContactMapHolderI getContactMapHolder()
   {
-    if (datasetSequence!=null) {
-      return ((Sequence)datasetSequence).getContactMapHolder();
+    if (datasetSequence != null)
+    {
+      return ((Sequence) datasetSequence).getContactMapHolder();
     }
-    if (_cmholder==null)
+    if (_cmholder == null)
     {
-      _cmholder=new ContactMapHolder();
+      _cmholder = new ContactMapHolder();
     }
     return _cmholder;
   }
+
   @Override
   public Collection<ContactMatrixI> getContactMaps()
   {
@@ -2173,7 +2176,7 @@ public class Sequence extends ASequence implements SequenceI
   public AlignmentAnnotation addContactList(ContactMatrixI cm)
   {
     AlignmentAnnotation aa;
-    
+
     if (datasetSequence != null)
     {
       aa = datasetSequence.addContactList(cm);
@@ -2181,11 +2184,11 @@ public class Sequence extends ASequence implements SequenceI
       aa = new AlignmentAnnotation(aa);
       aa.restrict(start, end);
       aa.adjustForAlignment();
-      getContactMapHolder().addContactListFor(aa,cm);
+      getContactMapHolder().addContactListFor(aa, cm);
       addAlignmentAnnotation(aa);
       return aa;
     }
-    
+
     // construct new annotation for matrix on dataset sequence
     aa = getContactMapHolder().addContactList(cm);
 
index 9837104..7e53c46 100755 (executable)
@@ -303,8 +303,9 @@ public class SequenceGroup implements AnnotatedCollectionI
             newannot.restrict(startRes, endRes);
             newannot.setSequenceRef(seqs[ipos]);
             newannot.adjustForAlignment();
-            ContactMatrixI cm = seq.getContactMatrixFor(seq.getAnnotation()[a]);
-            if (cm!=null)
+            ContactMatrixI cm = seq
+                    .getContactMatrixFor(seq.getAnnotation()[a]);
+            if (cm != null)
             {
               seqs[ipos].addContactListFor(newannot, cm);
             }
@@ -644,7 +645,8 @@ public class SequenceGroup implements AnnotatedCollectionI
     } catch (java.lang.OutOfMemoryError err)
     {
       // TODO: catch OOM
-      jalview.bin.Console.outPrintln("Out of memory loading groups: " + err);
+      jalview.bin.Console
+              .outPrintln("Out of memory loading groups: " + err);
     }
     return upd;
   }
index 2e1daa3..d5114e0 100755 (executable)
@@ -415,7 +415,8 @@ public interface SequenceI extends ASequenceI, ContactMapHolderI
   /**
    * Derive a sequence (using this one's dataset or as the dataset)
    * 
-   * @return duplicate sequence and any annotation present with valid dataset sequence
+   * @return duplicate sequence and any annotation present with valid dataset
+   *         sequence
    */
   public SequenceI deriveSequence();
 
index c19d782..d8e6f82 100644 (file)
@@ -401,8 +401,8 @@ public class FeatureStore
       SequenceFeature sf = contactFeatureEnds.get(index);
       if (!sf.isContactFeature())
       {
-        jalview.bin.Console.errPrintln("Error! non-contact feature type " + sf.getType()
-                + " in contact features list");
+        jalview.bin.Console.errPrintln("Error! non-contact feature type "
+                + sf.getType() + " in contact features list");
         index++;
         continue;
       }
@@ -454,8 +454,8 @@ public class FeatureStore
       SequenceFeature sf = contactFeatureStarts.get(index);
       if (!sf.isContactFeature())
       {
-        jalview.bin.Console.errPrintln("Error! non-contact feature " + sf.toString()
-                + " in contact features list");
+        jalview.bin.Console.errPrintln("Error! non-contact feature "
+                + sf.toString() + " in contact features list");
         index++;
         continue;
       }
index ed4474e..6adb93e 100644 (file)
@@ -88,7 +88,8 @@ public class SequenceFeatures implements SequenceFeaturesI
     String type = sf.getType();
     if (type == null)
     {
-      jalview.bin.Console.errPrintln("Feature type may not be null: " + sf.toString());
+      jalview.bin.Console
+              .errPrintln("Feature type may not be null: " + sf.toString());
       return false;
     }
 
index 391fd6f..d44be1c 100644 (file)
@@ -226,7 +226,8 @@ public class EnsemblGene extends EnsemblSeqProxy
         return true;
       } catch (NumberFormatException e)
       {
-        jalview.bin.Console.errPrintln("Bad integers in description " + description);
+        jalview.bin.Console
+                .errPrintln("Bad integers in description " + description);
       }
     }
     return false;
index e188986..def9d25 100644 (file)
@@ -222,8 +222,8 @@ public class EnsemblLookup extends EnsemblRestClient
               ids, -1, MODE_MAP, null);
     } catch (IOException | ParseException e)
     {
-      jalview.bin.Console.errPrintln("Error parsing " + identifier + " lookup response "
-              + e.getMessage());
+      jalview.bin.Console.errPrintln("Error parsing " + identifier
+              + " lookup response " + e.getMessage());
       return null;
     }
   }
index 1fd9a23..e1f5182 100644 (file)
@@ -157,7 +157,8 @@ public class EnsemblMap extends EnsemblRestClient
       return (parseAssemblyMappingResponse(url));
     } catch (Throwable t)
     {
-      jalview.bin.Console.outPrintln("Error calling " + url + ": " + t.getMessage());
+      jalview.bin.Console
+              .outPrintln("Error calling " + url + ": " + t.getMessage());
       return null;
     }
   }
@@ -265,7 +266,8 @@ public class EnsemblMap extends EnsemblRestClient
       return null;
     } catch (Throwable t)
     {
-      jalview.bin.Console.outPrintln("Error calling " + url + ": " + t.getMessage());
+      jalview.bin.Console
+              .outPrintln("Error calling " + url + ": " + t.getMessage());
       return null;
     }
   }
index 540fc98..709136c 100644 (file)
@@ -313,7 +313,9 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
        * note: a GET request for an invalid id returns an error code e.g. 415
        * but POST request returns 200 and an empty Fasta response 
        */
-      jalview.bin.Console.errPrintln("Response code " + responseCode);// + " for " + url);
+      jalview.bin.Console.errPrintln("Response code " + responseCode);// + " for
+                                                                      // " +
+                                                                      // url);
       return null;
     }
 
@@ -394,7 +396,8 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
         }
       } catch (NumberFormatException | InterruptedException e)
       {
-        jalview.bin.Console.errPrintln("Error handling Retry-After: " + e.getMessage());
+        jalview.bin.Console.errPrintln(
+                "Error handling Retry-After: " + e.getMessage());
       }
     }
   }
@@ -566,7 +569,8 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
         }
       } catch (NumberFormatException e)
       {
-        jalview.bin.Console.errPrintln("Error in REST version: " + e.toString());
+        jalview.bin.Console
+                .errPrintln("Error in REST version: " + e.toString());
       }
 
       /*
index 949c52e..ff394e8 100644 (file)
@@ -270,7 +270,8 @@ public abstract class EnsemblSeqProxy extends EnsemblRestClient
               .getSequenceRecords(accId);
       if (protein == null || protein.getHeight() == 0)
       {
-        jalview.bin.Console.outPrintln("No protein product found for " + accId);
+        jalview.bin.Console
+                .outPrintln("No protein product found for " + accId);
         return;
       }
       SequenceI proteinSeq = protein.getSequenceAt(0);
@@ -382,7 +383,8 @@ public abstract class EnsemblSeqProxy extends EnsemblRestClient
       seq.addDBRef(xrefs.get(i));
     }
 
-    // jalview.bin.Console.outPrintln("primaries are " + seq.getPrimaryDBRefs().toString());
+    // jalview.bin.Console.outPrintln("primaries are " +
+    // seq.getPrimaryDBRefs().toString());
     /*
      * and add a reference to itself
      */
@@ -508,7 +510,8 @@ public abstract class EnsemblSeqProxy extends EnsemblRestClient
       result.add(sequence);
     } catch (ParseException | IOException e)
     {
-      jalview.bin.Console.errPrintln("Error processing JSON response: " + e.toString());
+      jalview.bin.Console.errPrintln(
+              "Error processing JSON response: " + e.toString());
       // ignore
     }
     // Platform.timeCheck("ENS seqproxy2", Platform.TIME_MARK);
@@ -659,8 +662,9 @@ public abstract class EnsemblSeqProxy extends EnsemblRestClient
 
     if (regions.isEmpty())
     {
-      jalview.bin.Console.outPrintln("Failed to identify target sequence for " + accId
-              + " from genomic features");
+      jalview.bin.Console
+              .outPrintln("Failed to identify target sequence for " + accId
+                      + " from genomic features");
       return null;
     }
 
@@ -829,7 +833,8 @@ public abstract class EnsemblSeqProxy extends EnsemblRestClient
 
     boolean result = transferFeatures(sfs, targetSequence, mapping,
             accessionId);
-    // jalview.bin.Console.outPrintln("transferFeatures (" + (sfs.size()) + " --> "
+    // jalview.bin.Console.outPrintln("transferFeatures (" + (sfs.size()) + "
+    // --> "
     // + targetSequence.getFeatures().getFeatureCount(true) + ") to "
     // + targetSequence.getName() + " took "
     // + (System.currentTimeMillis() - start) + "ms");
index f51252c..93a5633 100644 (file)
@@ -156,7 +156,7 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
     jmolHistory(false);
     if (lastCommand == null || !lastCommand.equals(cmd))
     {
-      jmolScript(cmd + "\n",command.isWaitNeeded());
+      jmolScript(cmd + "\n", command.isWaitNeeded());
     }
     jmolHistory(true);
     lastCommand = cmd;
@@ -186,19 +186,19 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
 
   // End StructureListener
   // //////////////////////////
-  
+
   ////////////////////////////
   // HETATM get
   //
-  
+
   @Override
-  public Map<String,String> getHetatmNames()
+  public Map<String, String> getHetatmNames()
   {
-    HashMap<String,String> hetlist=new HashMap();
-    for (int mc=0;mc<jmolViewer.ms.mc; mc++)
+    HashMap<String, String> hetlist = new HashMap();
+    for (int mc = 0; mc < jmolViewer.ms.mc; mc++)
     {
-      Map<String,String> hets = jmolViewer.ms.getHeteroList(mc);
-      if (hets!=null)
+      Map<String, String> hets = jmolViewer.ms.getHeteroList(mc);
+      if (hets != null)
       {
         hetlist.putAll(hets);
       }
@@ -207,7 +207,7 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
   }
   //
   ////////////////////////////
-  
+
   @Override
   public float[][] functionXY(String functionName, int x, int y)
   {
@@ -295,21 +295,24 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
         jmolScript(resetLastRes.toString());
         resetLastRes.setLength(0);
       }
-      StringBuilder highlightCommands=null;
+      StringBuilder highlightCommands = null;
       for (AtomSpec atom : atoms)
       {
-        StringBuilder thisAtom = highlightAtom(atom.getAtomIndex(), atom.getPdbResNum(),
-                atom.getChain(), atom.getPdbFile());
-        if (thisAtom!=null) {
-          if (highlightCommands==null)
+        StringBuilder thisAtom = highlightAtom(atom.getAtomIndex(),
+                atom.getPdbResNum(), atom.getChain(), atom.getPdbFile());
+        if (thisAtom != null)
+        {
+          if (highlightCommands == null)
+          {
+            highlightCommands = thisAtom;
+          }
+          else
           {
-            highlightCommands=thisAtom;                  
-          } else {
             highlightCommands.append(thisAtom);
           }
         }
       }
-      if (highlightCommands!=null)
+      if (highlightCommands != null)
       {
         jmolHistory(false);
         jmolScript(highlightCommands.toString());
@@ -343,8 +346,8 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
   }
 
   // jmol/ssm only
-  private StringBuilder highlightAtom(int atomIndex, int pdbResNum, String chain,
-          String pdbfile)
+  private StringBuilder highlightAtom(int atomIndex, int pdbResNum,
+          String chain, String pdbfile)
   {
     String modelId = getModelIdForFile(pdbfile);
     if (modelId.isEmpty())
@@ -510,8 +513,9 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
     lastMessage = strInfo;
     if (data != null)
     {
-      jalview.bin.Console.errPrintln("Ignoring additional hover info: " + data
-              + " (other info: '" + strInfo + "' pos " + atomIndex + ")");
+      jalview.bin.Console.errPrintln(
+              "Ignoring additional hover info: " + data + " (other info: '"
+                      + strInfo + "' pos " + atomIndex + ")");
     }
     mouseOverStructure(atomIndex, strInfo);
   }
@@ -531,7 +535,8 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
      */
     if (strData != null)
     {
-      jalview.bin.Console.errPrintln("Ignoring additional pick data string " + strData);
+      jalview.bin.Console.errPrintln(
+              "Ignoring additional pick data string " + strData);
     }
     int chainSeparator = strInfo.indexOf(":");
     int p = 0;
@@ -649,7 +654,8 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
       }
     } catch (Exception e)
     {
-      jalview.bin.Console.errPrintln("Squashed Jmol callback handler error:");
+      jalview.bin.Console
+              .errPrintln("Squashed Jmol callback handler error:");
       e.printStackTrace();
     }
   }
@@ -898,8 +904,9 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
   public void setCallbackFunction(String callbackType,
           String callbackFunction)
   {
-    jalview.bin.Console.errPrintln("Ignoring set-callback request to associate "
-            + callbackType + " with function " + callbackFunction);
+    jalview.bin.Console
+            .errPrintln("Ignoring set-callback request to associate "
+                    + callbackType + " with function " + callbackFunction);
 
   }
 
@@ -972,7 +979,8 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
           String buttonsToShow)
   {
 
-    jalview.bin.Console.errPrintln("Allocating Jmol Viewer: " + commandOptions);
+    jalview.bin.Console
+            .errPrintln("Allocating Jmol Viewer: " + commandOptions);
 
     if (commandOptions == null)
     {
@@ -990,8 +998,9 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
       console = createJmolConsole(consolePanel, buttonsToShow);
     } catch (Throwable e)
     {
-      jalview.bin.Console.errPrintln("Could not create Jmol application console. "
-              + e.getMessage());
+      jalview.bin.Console
+              .errPrintln("Could not create Jmol application console. "
+                      + e.getMessage());
       e.printStackTrace();
     }
     if (consolePanel != null)
index 1fb8761..7c024ba 100644 (file)
@@ -241,7 +241,8 @@ public class JmolCommands extends StructureCommandsBase
     /*
      * https://chemapps.stolaf.edu/jmol/docs/#writemodel
      */
-    StructureCommand sc = new StructureCommand("write STATE \"" + filepath + "\"");
+    StructureCommand sc = new StructureCommand(
+            "write STATE \"" + filepath + "\"");
     sc.setWaitNeeded(true);
     return sc;
   }
@@ -318,21 +319,22 @@ public class JmolCommands extends StructureCommandsBase
     return new StructureCommand(
             "load FILES \"" + Platform.escapeBackslashes(file) + "\"");
   }
+
   @Override
   public StructureCommandI restoreSession(String filePath)
   {
-    return new StructureCommand(
-            "restore STATE \"" + Platform.escapeBackslashes(filePath) + "\"");
+    return new StructureCommand("restore STATE \""
+            + Platform.escapeBackslashes(filePath) + "\"");
   }
 
   @Override
   public List<StructureCommandI> showHetatms(List<String> toShow)
   {
     // always clear the current hetero cpk display
-    
+
     StringBuilder sb = new StringBuilder();
     sb.append("select hetero; cpk off;");
-    
+
     if (toShow != null && !toShow.isEmpty())
     {
       // select what was requested
@@ -347,9 +349,10 @@ public class JmolCommands extends StructureCommandsBase
       // and show as
       sb.append("; cpk;");
     }
-    
+
     return Arrays.asList(new StructureCommand(sb.toString()));
   }
+
   /**
    * Obsolete method, only referenced from
    * jalview.javascript.MouseOverStructureListener
index 0ca2ba8..92c762b 100644 (file)
@@ -92,6 +92,7 @@ public class JmolParser extends StructureFile implements JmolStatusListener
   {
     super(fp, doXferSettings);
   }
+
   public JmolParser(FileParse fp) throws IOException
   {
     super(fp);
@@ -488,7 +489,8 @@ public class JmolParser extends StructureFile implements JmolStatusListener
   {
     int length = sq.getLength();
     boolean ssFound = false;
-    Annotation asecstr[] = new Annotation[length + (firstResNum-sq.getStart())];
+    Annotation asecstr[] = new Annotation[length
+            + (firstResNum - sq.getStart())];
     for (int p = 0; p < length; p++)
     {
       if (secstr[p] >= 'A' && secstr[p] <= 'z')
index af31b78..0c2a478 100644 (file)
@@ -131,7 +131,8 @@ public class ChimeraListener extends AbstractRequestHandler
       }
       else
       {
-        jalview.bin.Console.errPrintln("Unexpected chimeraNotification: " + message);
+        jalview.bin.Console
+                .errPrintln("Unexpected chimeraNotification: " + message);
       }
     }
   }
@@ -143,7 +144,8 @@ public class ChimeraListener extends AbstractRequestHandler
    */
   protected void processModelChanged(String message)
   {
-    // jalview.bin.Console.outPrintln(message + " (not implemented in Jalview)");
+    // jalview.bin.Console.outPrintln(message + " (not implemented in
+    // Jalview)");
   }
 
   /**
index a292e88..a82eecb 100644 (file)
@@ -627,8 +627,9 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel
       executeCommand(false, null, command);
     } catch (IOException e)
     {
-      jalview.bin.Console.errPrintln("Sending commands to Chimera via file failed with "
-              + e.getMessage());
+      jalview.bin.Console.errPrintln(
+              "Sending commands to Chimera via file failed with "
+                      + e.getMessage());
     }
   }
 
index 86b8c7d..bd4590c 100644 (file)
@@ -94,7 +94,8 @@ public class FTSDataColumnPreferences extends JScrollPane
     int x = 0;
     for (FTSDataColumnI field : allFTSDataColumns)
     {
-      // jalview.bin.Console.outPrintln("allFTSDataColumns==" + allFTSDataColumns);
+      // jalview.bin.Console.outPrintln("allFTSDataColumns==" +
+      // allFTSDataColumns);
       if (field.getName().equalsIgnoreCase("all"))
       {
         continue;
@@ -106,7 +107,8 @@ public class FTSDataColumnPreferences extends JScrollPane
         data[x++] = new Object[] { ftsRestClient
                 .getAllDefaultDisplayedFTSDataColumns().contains(field),
             field.getName(), field.getGroup() };
-        // jalview.bin.Console.outPrintln(" PUIS " + field.getName() + " ET AUSSI " +
+        // jalview.bin.Console.outPrintln(" PUIS " + field.getName() + " ET
+        // AUSSI " +
         // field.getGroup() + "X = " + x);
         break;
       case STRUCTURE_CHOOSER:
index 5619075..b4bb66e 100644 (file)
@@ -183,7 +183,8 @@ public class PDBFTSRestClient extends FTSRestClient
       Map<String, Object> jsonObj = null;
       String responseString = null;
 
-      jalview.bin.Console.outPrintln("query >>>>>>> " + pdbRestRequest.toString());
+      jalview.bin.Console
+              .outPrintln("query >>>>>>> " + pdbRestRequest.toString());
 
       if (!isMocked())
       {
index 4e1b2b0..45cf825 100644 (file)
@@ -154,11 +154,12 @@ public class TDB_FTSData implements FTSData
   {
     return (String) getField(Model_id);
   }
-  
+
   public String getConfidenceScoreType()
   {
     return (String) getField(Confidence_Score_Type);
   }
+
   public String getConfidenceScoreVersion()
   {
     return (String) getField(Confidence_Score_Version);
index c275bda..67ed7e6 100644 (file)
@@ -269,7 +269,8 @@ public class TDBeaconsFTSRestClient extends FTSRestClient
       String fieldData = (tdbJsonStructure.get(field.getCode()) == null)
               ? " "
               : tdbJsonStructure.get(field.getCode()).toString();
-      // jalview.bin.Console.outPrintln("Field : " + field + " Data : " + fieldData);
+      // jalview.bin.Console.outPrintln("Field : " + field + " Data : " +
+      // fieldData);
       if (field.isPrimaryKeyColumn())
       {
         primaryKey = fieldData;
@@ -293,7 +294,8 @@ public class TDBeaconsFTSRestClient extends FTSRestClient
         } catch (Exception e)
         {
           // e.printStackTrace();
-          jalview.bin.Console.outPrintln("offending value:" + fieldData + fieldData);
+          jalview.bin.Console
+                  .outPrintln("offending value:" + fieldData + fieldData);
         }
       }
     }
index 4f13a78..0745b85 100644 (file)
@@ -4864,7 +4864,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
                   }
                   mtch = idm.findAllIdMatches(pdbfn);
                 }
-                FileFormatI type=null;
+                FileFormatI type = null;
                 if (mtch != null)
                 {
                   try
@@ -4882,7 +4882,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
                 }
                 // File wasn't named like one of the sequences or wasn't a PDB
                 // file.
-                filesnotmatched.add(new Object[] { file, protocol, type});
+                filesnotmatched.add(new Object[] { file, protocol, type });
               }
             }
             int assocfiles = 0;
@@ -4936,7 +4936,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
                  */
                 for (Object[] o : filesmatched)
                 {
-                  filesnotmatched.add(new Object[] { o[0], o[1]});
+                  filesnotmatched.add(new Object[] { o[0], o[1] });
                 }
               }
             }
@@ -4960,7 +4960,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
               }
               for (Object[] fn : filesnotmatched)
               {
-                loadJalviewDataFile(fn[0], (DataSourceType) fn[1], (FileFormatI)fn[2], null);
+                loadJalviewDataFile(fn[0], (DataSourceType) fn[1],
+                        (FileFormatI) fn[2], null);
               }
 
             }
@@ -5854,7 +5855,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
       }
     }
     alignPanel.validateAnnotationDimensions(true);
-    // TODO this triggers relayout of annotation panel - otherwise annotation label height is different to panel height
+    // TODO this triggers relayout of annotation panel - otherwise annotation
+    // label height is different to panel height
     alignPanel.fontChanged();
     alignPanel.alignmentChanged();
   }
index fe6477e..d3f80ce 100644 (file)
@@ -298,8 +298,10 @@ public class AlignmentPanel extends GAlignmentPanel implements
   {
     return calculateIdWidth(-1, false, false);
   }
+
   /**
    * pre 2.11.3 Id width calculation - used when importing old projects only
+   * 
    * @return
    */
   public int getLegacyIdWidth()
@@ -328,26 +330,34 @@ public class AlignmentPanel extends GAlignmentPanel implements
   {
     return calculateIdWidth(maxwidth, true, false);
   }
+
   /**
    * Calculate the width of the alignment labels based on the displayed names
    * and any bounds on label width set in preferences.
    * 
    * @param maxwidth
    *          -1 or maximum width allowed for IdWidth
-   * @param includeAnnotations - when true includes width of any additional marks in annotation id panel 
-   * @param visibleOnly - when true, ignore label widths for hidden annotation rows 
+   * @param includeAnnotations
+   *          - when true includes width of any additional marks in annotation
+   *          id panel
+   * @param visibleOnly
+   *          - when true, ignore label widths for hidden annotation rows
    * @return Dimension giving the maximum width of the alignment label panel
    *         that should be used.
    */
   public Dimension calculateIdWidth(int maxwidth,
           boolean includeAnnotations, boolean visibleOnly)
   {
-    return calculateIdWidthOrLegacy(false, maxwidth, includeAnnotations, visibleOnly);
+    return calculateIdWidthOrLegacy(false, maxwidth, includeAnnotations,
+            visibleOnly);
   }
-  
+
   /**
    * legacy mode or post 2.11.3 ID width calculation
-   * @param legacy - uses annotation labels, not rendered label width (excludes additional decorators)
+   * 
+   * @param legacy
+   *          - uses annotation labels, not rendered label width (excludes
+   *          additional decorators)
    * @param maxwidth
    * @param includeAnnotations
    * @param visibleOnly
@@ -606,7 +616,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
     // this is called after loading new annotation onto alignment
     if (alignFrame.getHeight() == 0)
     {
-      jalview.bin.Console.error("adjustAnnotationHeight called with zero height alignment window");
+      jalview.bin.Console.error(
+              "adjustAnnotationHeight called with zero height alignment window");
     }
     validateAnnotationDimensions(true);
     addNotify();
@@ -1040,13 +1051,13 @@ public class AlignmentPanel extends GAlignmentPanel implements
     final int idWidth, idWidthForGui;
     // otherwise calculate it
     idWidth = getVisibleIdWidth(false);
-//    if (getIdPanel()!=null && getIdPanel().getWidth()>0)
-//    {
-//      // use the current IdPanel's width, if its set and non-zero
-//      idWidthForGui = getIdPanel().getWidth();
-//    } else {
-//      idWidthForGui=0;
-//    }
+    // if (getIdPanel()!=null && getIdPanel().getWidth()>0)
+    // {
+    // // use the current IdPanel's width, if its set and non-zero
+    // idWidthForGui = getIdPanel().getWidth();
+    // } else {
+    // idWidthForGui=0;
+    // }
     /*
      * Get the horizontal offset to where we draw the sequences.
      * This is idWidth if using a single Graphics context, else zero.
@@ -1096,7 +1107,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
     final int alignmentDrawnHeight = (endSeq - startSeq) * charHeight + 3;
 
     alignmentGraphics.setColor(Color.white);
-    alignmentGraphics.fillRect(0, 0, pageWidth, pageHeight+scaleHeight);
+    alignmentGraphics.fillRect(0, 0, pageWidth, pageHeight + scaleHeight);
 
     /*
      * draw the Scale at horizontal offset, then reset to top left (0, 0)
@@ -1114,9 +1125,9 @@ public class AlignmentPanel extends GAlignmentPanel implements
     IdCanvas idCanvas = getIdPanel().getIdCanvas();
     List<SequenceI> selection = av.getSelectionGroup() == null ? null
             : av.getSelectionGroup().getSequences(null);
-    
+
     idCanvas.drawIds((Graphics2D) idGraphics, av, startSeq, endSeq - 1,
-            selection, false,idWidth);
+            selection, false, idWidth);
 
     idGraphics.setFont(av.getFont());
     idGraphics.translate(0, -scaleHeight);
@@ -1263,7 +1274,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
     // see if rendering offscreen - check preferences and calc width accordingly
     if (!onscreen && Cache.getDefault("FIGURE_AUTOIDWIDTH", false))
     {
-      return calculateIdWidth(-1,true,true).width;
+      return calculateIdWidth(-1, true, true).width;
     }
     Integer idwidth = onscreen ? null
             : Cache.getIntegerProperty("FIGURE_FIXEDIDWIDTH");
index d898398..965770c 100644 (file)
@@ -73,9 +73,11 @@ public class AnnotationColourChooser extends AnnotationRowFilter
 
   public AnnotationColourChooser(AlignViewport av, final AlignmentPanel ap)
   {
-    this(av,ap,null);
+    this(av, ap, null);
   }
-  public AnnotationColourChooser(AlignViewport av, final AlignmentPanel ap,AnnotationColourGradient initSettings)
+
+  public AnnotationColourChooser(AlignViewport av, final AlignmentPanel ap,
+          AnnotationColourGradient initSettings)
   {
     super(av, ap);
     oldcs = av.getGlobalColourScheme();
@@ -110,15 +112,17 @@ public class AnnotationColourChooser extends AnnotationRowFilter
     setDefaultMinMax();
 
     adjusting = true;
-    if (oldcs instanceof AnnotationColourGradient && initSettings==null)
+    if (oldcs instanceof AnnotationColourGradient && initSettings == null)
     {
       // init from oldcs
       initialiseFrom((AnnotationColourGradient) oldcs);
-    } else {
+    }
+    else
+    {
       // use initial colour gradient - if any..
       initialiseFrom(initSettings);
     }
-    
+
     jbInit();
     adjusting = false;
 
@@ -126,12 +130,13 @@ public class AnnotationColourChooser extends AnnotationRowFilter
     frame.invalidate();
     frame.pack();
   }
+
   private void initialiseFrom(AnnotationColourGradient acg)
   {
-    if (acg!=null)
+    if (acg != null)
     {
       useOriginalColours.setSelected(
-            acg.isPredefinedColours() || acg.getBaseColour() != null);
+              acg.isPredefinedColours() || acg.getBaseColour() != null);
       if (!acg.isPredefinedColours() && acg.getBaseColour() == null)
       {
         minColour.setBackground(acg.getMinColour());
@@ -146,10 +151,11 @@ public class AnnotationColourChooser extends AnnotationRowFilter
 
     populateThresholdComboBox(threshold);
 
-    if (acg!=null)
+    if (acg != null)
     {
       String label = getAnnotationMenuLabel(acg.getAnnotation());
-      // TODO: workaround below shouldn't be necessary - there's a bug in getAnnotationMenuLabel!
+      // TODO: workaround below shouldn't be necessary - there's a bug in
+      // getAnnotationMenuLabel!
       if (acg.isSeqAssociated())
       {
         label = acg.getAnnotation().label;
@@ -375,8 +381,7 @@ public class AnnotationColourChooser extends AnnotationRowFilter
       return;
     }
 
-    int selIndex = annotations
-            .getSelectedIndex();
+    int selIndex = annotations.getSelectedIndex();
     int annIndex = annmap[selIndex];
     setCurrentAnnotation(
             av.getAlignment().getAlignmentAnnotation()[annIndex]);
@@ -475,26 +480,34 @@ public class AnnotationColourChooser extends AnnotationRowFilter
    * @param av
    * @param ap
    * @param alignmentAnnotation
-   * @param perseq - when true, enable per-sequence if alignment annotation is per sequence 
+   * @param perseq
+   *          - when true, enable per-sequence if alignment annotation is per
+   *          sequence
    */
   public static void displayFor(AlignViewport av, AlignmentPanel ap,
           AlignmentAnnotation alignmentAnnotation, boolean perSeq)
   {
     ColourSchemeI global = av.getGlobalColourScheme();
-    AnnotationColourGradient newCS = new AnnotationColourGradient(alignmentAnnotation, global, alignmentAnnotation.threshold!=null ? AnnotationColourGradient.ABOVE_THRESHOLD:AnnotationColourGradient.NO_THRESHOLD);
-    if (alignmentAnnotation.sequenceRef!=null)
+    AnnotationColourGradient newCS = new AnnotationColourGradient(
+            alignmentAnnotation, global,
+            alignmentAnnotation.threshold != null
+                    ? AnnotationColourGradient.ABOVE_THRESHOLD
+                    : AnnotationColourGradient.NO_THRESHOLD);
+    if (alignmentAnnotation.sequenceRef != null)
     {
       newCS.setSeqAssociated(perSeq);
     }
-    for (int i=0;i<alignmentAnnotation.annotations.length;i++)
+    for (int i = 0; i < alignmentAnnotation.annotations.length; i++)
     {
       Annotation ann = alignmentAnnotation.annotations[i];
-      if (ann!=null && ann.colour!=null && !ann.colour.equals(Color.white))
+      if (ann != null && ann.colour != null
+              && !ann.colour.equals(Color.white))
       {
         newCS.setPredefinedColours(true);
         break;
       }
     }
-    AnnotationColourChooser achooser = new AnnotationColourChooser(av,ap,newCS);
+    AnnotationColourChooser achooser = new AnnotationColourChooser(av, ap,
+            newCS);
   }
 }
index 0483aa6..f1f78fa 100644 (file)
@@ -96,9 +96,11 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
 
   public AnnotationColumnChooser(AlignViewport av, final AlignmentPanel ap)
   {
-    this(av,ap,null);
+    this(av, ap, null);
   }
-  public AnnotationColumnChooser(AlignViewport av, final AlignmentPanel ap, AlignmentAnnotation selectedAnnotation)
+
+  public AnnotationColumnChooser(AlignViewport av, final AlignmentPanel ap,
+          AlignmentAnnotation selectedAnnotation)
   {
     super(av, ap);
     frame = new JInternalFrame();
@@ -120,7 +122,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
     }
     setOldHiddenColumns(av.getAlignment().getHiddenColumns());
     adjusting = true;
-    
+
     setAnnotations(new JComboBox<>(getAnnotationItems(false)));
     populateThresholdComboBox(threshold);
     AnnotationColumnChooser lastChooser = av
@@ -139,14 +141,16 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
       percentThreshold
               .setSelected(lastChooser.percentThreshold.isSelected());
     }
-    if (selectedAnnotation!=null)
+    if (selectedAnnotation != null)
     {
-      try {
+      try
+      {
         setCurrentAnnotation(selectedAnnotation);
-        annotations.setSelectedItem(getAnnotationMenuLabel(selectedAnnotation));
+        annotations.setSelectedItem(
+                getAnnotationMenuLabel(selectedAnnotation));
       } catch (Exception x)
       {
-        Console.error("Couldn't select annotation in column chooser",x);
+        Console.error("Couldn't select annotation in column chooser", x);
       }
     }
 
@@ -869,6 +873,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
   public static void displayFor(AlignViewport av, AlignmentPanel ap,
           AlignmentAnnotation alignmentAnnotation)
   {
-    AnnotationColumnChooser colchooser = new AnnotationColumnChooser(av, ap, alignmentAnnotation);    
+    AnnotationColumnChooser colchooser = new AnnotationColumnChooser(av, ap,
+            alignmentAnnotation);
   }
 }
index 08a25ba..6b98944 100755 (executable)
@@ -1198,7 +1198,8 @@ public class AnnotationLabels extends JPanel
    * @param width
    *          Width for scaling labels
    */
-  public void drawComponent(Graphics g, boolean clip, int givenWidth, boolean forGUI)
+  public void drawComponent(Graphics g, boolean clip, int givenWidth,
+          boolean forGUI)
   {
     int width = givenWidth;
     IdwidthAdjuster iwa = null;
@@ -1210,8 +1211,8 @@ public class AnnotationLabels extends JPanel
       {
         Graphics2D g2d = (Graphics2D) g;
         Graphics dummy = g2d.create();
-        int newAnnotationIdWidth = drawLabels(dummy, clip, width, false, forGUI,
-                null, false);
+        int newAnnotationIdWidth = drawLabels(dummy, clip, width, false,
+                forGUI, null, false);
         dummy.dispose();
         Dimension d = ap.calculateDefaultAlignmentIdWidth();
         int alignmentIdWidth = d.width;
@@ -1245,8 +1246,10 @@ public class AnnotationLabels extends JPanel
     }
     else
     {
-      int newAnnotationIdWidth = drawLabels(g, clip, width, false, forGUI, null, false);
-      width = newAnnotationIdWidth<givenWidth ? givenWidth: Math.min(newAnnotationIdWidth, givenWidth);
+      int newAnnotationIdWidth = drawLabels(g, clip, width, false, forGUI,
+              null, false);
+      width = newAnnotationIdWidth < givenWidth ? givenWidth
+              : Math.min(newAnnotationIdWidth, givenWidth);
     }
     drawLabels(g, clip, width, true, forGUI, null, false);
   }
@@ -1258,21 +1261,28 @@ public class AnnotationLabels extends JPanel
    * fmetrics must be supplied.
    * 
    * @param g
-   *          Graphics2D instance (used for rendering and font scaling if no fmetrics supplied) 
+   *          Graphics2D instance (used for rendering and font scaling if no
+   *          fmetrics supplied)
    * @param clip
    *          - true indicates that only current visible area needs to be
    *          rendered
    * @param width
    *          Width for scaling labels
-   * @param actuallyDraw - when false, no graphics are rendered to g0
-   * @param forGUI - when false, GUI relevant marks like indicators for dragging annotation panel height are not rendered
+   * @param actuallyDraw
+   *          - when false, no graphics are rendered to g0
+   * @param forGUI
+   *          - when false, GUI relevant marks like indicators for dragging
+   *          annotation panel height are not rendered
    * @param fmetrics
    *          FontMetrics if Graphics object g is null
-   * @param includeHidden - when true returned width includes labels in hidden row width calculation 
+   * @param includeHidden
+   *          - when true returned width includes labels in hidden row width
+   *          calculation
    * @return the width of the annotation labels.
    */
   public int drawLabels(Graphics g0, boolean clip, int width,
-          boolean actuallyDraw, boolean forGUI, FontMetrics fmetrics, boolean includeHidden)
+          boolean actuallyDraw, boolean forGUI, FontMetrics fmetrics,
+          boolean includeHidden)
   {
     if (clip)
     {
@@ -1554,7 +1564,8 @@ public class AnnotationLabels extends JPanel
       }
     }
 
-    if (!resizePanel && dragEvent != null && aa != null && selectedRow>-1 && selectedRow<aa.length)
+    if (!resizePanel && dragEvent != null && aa != null && selectedRow > -1
+            && selectedRow < aa.length)
     {
       if (actuallyDraw && g != null)
       {
index 6c9cb6c..e1193c9 100755 (executable)
@@ -633,7 +633,8 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
     int yOffset = rowIndex[1];
     AlignmentAnnotation[] allAnnotation = av.getAlignment()
             .getAlignmentAnnotation();
-    if (allAnnotation==null || rowIndex[0]<0 || rowIndex[0]>=allAnnotation.length)
+    if (allAnnotation == null || rowIndex[0] < 0
+            || rowIndex[0] >= allAnnotation.length)
     {
       return false;
     }
@@ -1089,13 +1090,14 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
 
     if (forFromX != null && forToX != null)
     {
-      // FIXME will need two ContactGeometry objects when handling contact matrices with differing numbers of rows at each
+      // FIXME will need two ContactGeometry objects when handling contact
+      // matrices with differing numbers of rows at each
       // column
       ContactGeometry xcgeom = new ContactGeometry(forFromX,
               cma.graphHeight);
-      ContactGeometry.contactInterval lastXci = xcgeom
-              .mapFor(rowIndex[1]);
-      ContactGeometry.contactInterval cXci = xcgeom.mapFor(rowIndex[1] + deltaY);
+      ContactGeometry.contactInterval lastXci = xcgeom.mapFor(rowIndex[1]);
+      ContactGeometry.contactInterval cXci = xcgeom
+              .mapFor(rowIndex[1] + deltaY);
 
       // mark rectangular region formed by drag
       jalview.bin.Console.trace("Matrix Selection from last(" + fromXc
@@ -1121,7 +1123,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
           // }
           // else
           {
-            av.getColumnSelection().addElement(c-1);
+            av.getColumnSelection().addElement(c - 1);
           }
         }
       }
@@ -1233,7 +1235,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
       {
         row = i;
         res[0] = row;
-        res[1] = yPos-lheight;
+        res[1] = yPos - lheight;
         break;
       }
     }
@@ -1287,7 +1289,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
     // TODO abstract tooltip generator so different implementations can be built
     if (ann.graph == AlignmentAnnotation.CONTACT_MAP)
     {
-      if (rowAndOffset>=ann.graphHeight)
+      if (rowAndOffset >= ann.graphHeight)
       {
         return null;
       }
@@ -1298,9 +1300,10 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
         ContactGeometry.contactInterval ci = cgeom.mapFor(rowAndOffset);
         ContactRange cr = clist.getRangeFor(ci.cStart, ci.cEnd);
         StringBuilder tooltipb = new StringBuilder();
-        tooltipb.append("Contact from ")
-        .append(clist.getPosition()).append(", [").append(ci.cStart).append(" - ").append(ci.cEnd).append("]").append("<br/>Mean:");
-        Format.appendPercentage(tooltipb, (float)cr.getMean(),2);
+        tooltipb.append("Contact from ").append(clist.getPosition())
+                .append(", [").append(ci.cStart).append(" - ")
+                .append(ci.cEnd).append("]").append("<br/>Mean:");
+        Format.appendPercentage(tooltipb, (float) cr.getMean(), 2);
         tooltip = tooltipb.toString();
         int col = ann.sequenceRef.findPosition(column);
         int[][] highlightPos;
@@ -1638,7 +1641,8 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
               && (fadedImage == null || fadedImage.getWidth() != imgWidth
                       || fadedImage.getHeight() != image.getHeight()))
       {
-        // jalview.bin.Console.errPrintln("redraw faded image ("+(fadedImage==null ?
+        // jalview.bin.Console.errPrintln("redraw faded image
+        // ("+(fadedImage==null ?
         // "null image" : "") + " lastGood="+lastImageGood+")");
         fadedImage = new BufferedImage(imgWidth, image.getHeight(),
                 BufferedImage.TYPE_INT_RGB);
index eb2368d..f529316 100644 (file)
@@ -476,7 +476,8 @@ public class AppVarna extends JInternalFrame
       if (shift != null)
       {
         int i = shift.shift(newBase.getIndex());
-        // jalview.bin.Console.errPrintln("shifted "+(arg1.getIndex())+" to "+i);
+        // jalview.bin.Console.errPrintln("shifted "+(arg1.getIndex())+" to
+        // "+i);
         ssm.mouseOverVamsasSequence(seq, i, this);
       }
       else
index 8951df0..e5196cc 100644 (file)
@@ -574,7 +574,8 @@ public class AppVarnaBinding extends JalviewVarnaBinding
     } catch (ExceptionNAViewAlgorithm e)
     {
       // only throwable for draw mode = 3 NAView
-      jalview.bin.Console.errPrintln("Error drawing RNA: " + e.getMessage());
+      jalview.bin.Console
+              .errPrintln("Error drawing RNA: " + e.getMessage());
     }
   }
 }
index f13e151..2e91b3d 100644 (file)
@@ -343,8 +343,9 @@ public class ChimeraViewFrame extends StructureViewerBase
       boolean opened = jmb.openSession(chimeraSessionFile);
       if (!opened)
       {
-        jalview.bin.Console.errPrintln("An error occurred opening Chimera session file "
-                + chimeraSessionFile);
+        jalview.bin.Console.errPrintln(
+                "An error occurred opening Chimera session file "
+                        + chimeraSessionFile);
       }
     }
 
index 574ba28..feab446 100644 (file)
@@ -304,7 +304,8 @@ public class ColourMenuHelper
         }
       } catch (Exception ex)
       {
-        jalview.bin.Console.outPrintln("Error loading User ColourFile\n" + ex);
+        jalview.bin.Console
+                .outPrintln("Error loading User ColourFile\n" + ex);
       }
     }
 
index 921a418..41da01f 100644 (file)
@@ -217,7 +217,7 @@ public class Console extends WindowAdapter
     // logLevelCombo.addItem(LogLevel.ERROR);
     // logLevelCombo.addItem(LogLevel.OFF);
     // set startingLogLevel
-    
+
     if (jalview.bin.Console.getLogger() == null)
     {
       startingLogLevel = jalview.bin.Console.getCachedLogLevel();
@@ -776,7 +776,7 @@ public class Console extends WindowAdapter
       @Override
       public void run()
       {
-        displayPipe.append(input); 
+        displayPipe.append(input);
       }
     });
     // stderr.println("Time taken to Spawnappend:\t" + (System.nanoTime() -
index 6cb59c3..93a4006 100644 (file)
@@ -466,7 +466,8 @@ public class CrossRefAction implements Runnable
 
     if (copyAlignment.getHeight() <= 0)
     {
-      jalview.bin.Console.errPrintln("No Sequences generated for xRef type " + source);
+      jalview.bin.Console
+              .errPrintln("No Sequences generated for xRef type " + source);
       return null;
     }
 
index 606d843..880a1b2 100644 (file)
@@ -253,7 +253,7 @@ public class FeatureEditor
            */
           final String ft = features.get(featureIndex).getType();
           final String type = ft == null ? lastFeatureAdded : ft;
-          FeatureTypeSettings fcc = new FeatureTypeSettings(fr, type,true);
+          FeatureTypeSettings fcc = new FeatureTypeSettings(fr, type, true);
           fcc.setRequestFocusEnabled(true);
           fcc.requestFocus();
           fcc.addActionListener(new ActionListener()
index 57e5943..6d84574 100644 (file)
@@ -1919,7 +1919,8 @@ public class FeatureSettings extends JPanel
            */
           String ttl = MessageManager
                   .formatMessage("label.select_colour_for", type);
-          Object last=(Boolean)table.getValueAt(selectedRow, SHOW_COLUMN);
+          Object last = (Boolean) table.getValueAt(selectedRow,
+                  SHOW_COLUMN);
           table.setValueAt(Boolean.TRUE, selectedRow, SHOW_COLUMN);
           ColourChooserListener listener = new ColourChooserListener()
           {
@@ -1947,9 +1948,10 @@ public class FeatureSettings extends JPanel
           /*
            * variable colour and filters dialog
            */
-          boolean last=(Boolean)table.getValueAt(selectedRow, SHOW_COLUMN);
+          boolean last = (Boolean) table.getValueAt(selectedRow,
+                  SHOW_COLUMN);
           table.setValueAt(Boolean.TRUE, selectedRow, SHOW_COLUMN);
-          chooser = new FeatureTypeSettings(fr, type,last);
+          chooser = new FeatureTypeSettings(fr, type, last);
           if (!Platform.isJS())
           /**
            * Java only
@@ -2076,8 +2078,10 @@ public class FeatureSettings extends JPanel
       if (button == e.getSource())
       {
         boolean last = fr.getFeaturesDisplayed().isVisible(type);
-        ((FeatureTableModel) table.getModel()).setValueAt(Boolean.TRUE, rowSelected, SHOW_COLUMN);
-        FeatureTypeSettings chooser = new FeatureTypeSettings(fr, type,last);
+        ((FeatureTableModel) table.getModel()).setValueAt(Boolean.TRUE,
+                rowSelected, SHOW_COLUMN);
+        FeatureTypeSettings chooser = new FeatureTypeSettings(fr, type,
+                last);
         chooser.addActionListener(this);
         chooser.setRequestFocusEnabled(true);
         chooser.requestFocus();
@@ -2110,7 +2114,7 @@ public class FeatureSettings extends JPanel
         data[COLOUR_COLUMN] = currentColor;
         data[FILTER_COLUMN] = currentFilter;
         data[SHOW_COLUMN] = fr.getFeaturesDisplayed().isVisible(type);
-                
+
         fireEditingStopped();
         // SwingJS needs an explicit repaint() here,
         // rather than relying upon no validation having
@@ -2163,6 +2167,7 @@ public class FeatureSettings extends JPanel
     refreshDisplay();
   }
 }
+
 class FeatureIcon implements Icon
 {
   FeatureColourI gcol;
index 79f4c88..b3e6917 100644 (file)
@@ -211,9 +211,11 @@ public class FeatureTypeSettings extends JalviewDialog
    * 
    * @param frender
    * @param theType
-   * @param last - visibility of feature prior to adjustment
+   * @param last
+   *          - visibility of feature prior to adjustment
    */
-  public FeatureTypeSettings(FeatureRenderer frender, String theType, boolean last)
+  public FeatureTypeSettings(FeatureRenderer frender, String theType,
+          boolean last)
   {
     this.fr = frender;
     this.featureType = theType;
@@ -1035,7 +1037,8 @@ public class FeatureTypeSettings extends JalviewDialog
   {
     fr.setColour(featureType, originalColour);
     fr.setFeatureFilter(featureType, originalFilter);
-    if (!originalDisplay) { 
+    if (!originalDisplay)
+    {
       fr.getFeaturesDisplayed().setHidden(featureType);
     }
     refreshDisplay(true);
index dbffc72..3ee3316 100755 (executable)
@@ -256,7 +256,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI
     gg.fillRect(0, 0, getWidth(), imgHeight);
 
     drawIds(gg, av, av.getRanges().getStartSeq(),
-            av.getRanges().getEndSeq(), searchResults,true, getWidth());
+            av.getRanges().getEndSeq(), searchResults, true, getWidth());
 
     gg.dispose();
 
@@ -274,12 +274,16 @@ public class IdCanvas extends JPanel implements ViewportListenerI
    * @param startSeq
    * @param endSeq
    * @param selection
-   * @param forGUI when false rendering for print
-   * @param panelWidth width used to calculate righthand margin - usually idCanvas.getWidth()
+   * @param forGUI
+   *          when false rendering for print
+   * @param panelWidth
+   *          width used to calculate righthand margin - usually
+   *          idCanvas.getWidth()
    * 
    */
   void drawIds(Graphics2D g, AlignViewport alignViewport,
-          final int startSeq, final int endSeq, List<SequenceI> selection, boolean forGUI, int panelWidth)
+          final int startSeq, final int endSeq, List<SequenceI> selection,
+          boolean forGUI, int panelWidth)
   {
     Font font = alignViewport.getFont();
     if (alignViewport.isSeqNameItalics())
@@ -307,7 +311,8 @@ public class IdCanvas extends JPanel implements ViewportListenerI
 
     if (alignViewport.getWrapAlignment())
     {
-      drawIdsWrapped(g, alignViewport, startSeq, getHeight(), manuallyAdjusted ? panelWidth : -1,forGUI);
+      drawIdsWrapped(g, alignViewport, startSeq, getHeight(),
+              manuallyAdjusted ? panelWidth : -1, forGUI);
       return;
     }
 
@@ -390,6 +395,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI
 
   /**
    * render sequence IDs and annotation labels when wrapped - without GUI junk
+   * 
    * @param g
    * @param av2
    * @param i
@@ -398,7 +404,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI
   public void drawIdsWrappedNoGUI(Graphics2D g, AlignViewport av2, int i,
           int totalHeight)
   {
-    drawIdsWrapped(g, av2, totalHeight, totalHeight, i,false);
+    drawIdsWrapped(g, av2, totalHeight, totalHeight, i, false);
   }
 
   public void drawIdsWrapped(Graphics2D g, AlignViewport alignViewport,
@@ -419,7 +425,8 @@ public class IdCanvas extends JPanel implements ViewportListenerI
     if (alignViewport.isShowAnnotation())
     {
       // in wrapped mode, no alignPanel reference is available
-      // FIXME: make the renderer not create a new object in wrapped mode everytime!
+      // FIXME: make the renderer not create a new object in wrapped mode
+      // everytime!
       labels = new AnnotationLabels(alignViewport);
     }
 
@@ -457,8 +464,8 @@ public class IdCanvas extends JPanel implements ViewportListenerI
         g.translate(0, ypos + (alheight * charHeight));
         if (!isManuallyAdjusted())
         {
-          int getAnnotationsIdWidth = labels.drawLabels(g, false, -1, false,forGUI,
-                  null, false);
+          int getAnnotationsIdWidth = labels.drawLabels(g, false, -1, false,
+                  forGUI, null, false);
           thisIdWidth = idWidth < 0 ? getAnnotationsIdWidth : idWidth;
           if (thisIdWidth > getWidth)
           {
index f1c4c83..99a39d4 100755 (executable)
@@ -158,11 +158,11 @@ public class IdwidthAdjuster extends JPanel
     {
       return;
     }
-    
+
     // TODO JAL-4260 - work out how to trigger recomputation of wrapped pages !
     int curCol = viewport.getRanges().getStartRes()
             + viewport.getRanges().getViewportWidth();
-    
+
     viewport.setIdWidth(newWidth);
 
     ap.validateAnnotationDimensions(false);
@@ -172,7 +172,7 @@ public class IdwidthAdjuster extends JPanel
               curCol - viewport.getRanges().getViewportWidth());
     }
     ap.paintAlignment(true, false);
-    
+
     ap.getIdPanel().getIdCanvas().setManuallyAdjusted(true);
   }
 
index 211c370..576f3b2 100644 (file)
@@ -439,10 +439,13 @@ public class PCAPanel extends GPCAPanel
     };
     String pca = MessageManager.getString("label.pca");
     ImageExporter exporter = new ImageExporter(writer, null, type, pca);
-    try {
+    try
+    {
       exporter.doExport(null, this, width, height, pca);
-    } catch (ImageOutputException ioex) {
-      Console.error("Unexpected error whilst writing "+type.toString(),ioex);
+    } catch (ImageOutputException ioex)
+    {
+      Console.error("Unexpected error whilst writing " + type.toString(),
+              ioex);
     }
   }
 
index 109c140..8875288 100644 (file)
@@ -1736,8 +1736,7 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
           Map<SequenceI, List<AlignmentAnnotation>> candidates)
   {
     final AlignmentI alignment = this.ap.getAlignment();
-    AlignmentUtils.addReferenceAnnotations(candidates, alignment,
-            null);
+    AlignmentUtils.addReferenceAnnotations(candidates, alignment, null);
     refresh();
   }
 
@@ -2191,7 +2190,8 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
 
     String[] omitHidden = null;
 
-    jalview.bin.Console.outPrintln("PROMPT USER HERE"); // TODO: decide if a prompt happens
+    jalview.bin.Console.outPrintln("PROMPT USER HERE"); // TODO: decide if a
+                                                        // prompt happens
     // or we simply trust the user wants
     // wysiwig behaviour
 
index 6020135..a089396 100644 (file)
@@ -162,7 +162,8 @@ public class QuitHandler
       qd.showDialogOnTopAsync(
               new StringBuilder(
                       MessageManager.getString("label.quit_jalview"))
-                      .append("\n").append(messageString).toString(),
+                              .append("\n").append(messageString)
+                              .toString(),
               MessageManager.getString("action.quit"),
               JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null,
               new Object[]
index a186ce6..4a42861 100755 (executable)
@@ -262,7 +262,7 @@ public class ScalePanel extends JPanel
     }
     av.setSelectionGroup(sg);
     ap.paintAlignment(false, false);
-    PaintRefresher.Refresh(this,av.getSequenceSetId());
+    PaintRefresher.Refresh(this, av.getSequenceSetId());
     av.sendSelection();
   }
 
@@ -280,7 +280,7 @@ public class ScalePanel extends JPanel
     ap.getSeqPanel().stopScrolling();
 
     int res = ap.getSeqPanel().findAlignmentColumn(evt);
-    
+
     if (!stretchingGroup)
     {
       if (evt.isPopupTrigger()) // Windows: mouseReleased
@@ -333,12 +333,12 @@ public class ScalePanel extends JPanel
   @Override
   public void mouseDragged(MouseEvent evt)
   {
-    mouseDragging = true;  
+    mouseDragging = true;
     int res = ap.getSeqPanel().findAlignmentColumn(evt);
-    
+
     ColumnSelection cs = av.getColumnSelection();
-    
-    min = Math.min(res,min);
+
+    min = Math.min(res, min);
     max = Math.max(res, max);
 
     SequenceGroup sg = av.getSelectionGroup();
@@ -390,14 +390,16 @@ public class ScalePanel extends JPanel
     this.setToolTipText(null);
     reveal = null;
     final int res = ap.getSeqPanel().findAlignmentColumn(evt);
-    
+
     highlightAllStructPos(res);
-    if (!av.hasHiddenColumns()) {
+    if (!av.hasHiddenColumns())
+    {
       return;
     }
     reveal = av.getAlignment().getHiddenColumns()
-            .getRegionWithEdgeAtRes(av.getAlignment().getHiddenColumns().absoluteToVisibleColumn(res));
-    if (reveal==null)
+            .getRegionWithEdgeAtRes(av.getAlignment().getHiddenColumns()
+                    .absoluteToVisibleColumn(res));
+    if (reveal == null)
     {
       return;
     }
index e42acf3..d110e65 100755 (executable)
@@ -1495,14 +1495,14 @@ public class SeqCanvas extends JPanel implements ViewportListenerI
     // group
     if (sx >= 0 && sx < visWidth)
     {
-      g.drawLine(sx, oldY, sx, sy-1);
+      g.drawLine(sx, oldY, sx, sy - 1);
     }
 
     // if end position is visible, draw vertical line to right of
     // group
     if (sx + xwidth < visWidth)
     {
-      g.drawLine(sx + xwidth, oldY, sx + xwidth, sy-1);
+      g.drawLine(sx + xwidth, oldY, sx + xwidth, sy - 1);
     }
   }
 
index d39f937..2caea17 100644 (file)
@@ -348,8 +348,9 @@ public class SeqPanel extends JPanel
    */
   int findAlignmentColumn(MouseEvent evt)
   {
-    return findNearestColumn(evt,true);
+    return findNearestColumn(evt, true);
   }
+
   /**
    * Returns the aligned sequence position (base 0) at the mouse position, or
    * the closest visible one
@@ -364,9 +365,11 @@ public class SeqPanel extends JPanel
   {
     return findNearestColumn(evt, false);
   }
-  
+
   /**
-   * @param nearestColumn when false returns negative values for out of bound positions - -1 for scale left/right, <-1 if far to right
+   * @param nearestColumn
+   *          when false returns negative values for out of bound positions - -1
+   *          for scale left/right, <-1 if far to right
    * @return nearest absolute column to mouse pointer
    */
   private int findNearestColumn(MouseEvent evt, boolean nearestColumn)
@@ -394,9 +397,12 @@ public class SeqPanel extends JPanel
       if (x < 0)
       {
         // mouse is over left scale
-        if (!nearestColumn) {
+        if (!nearestColumn)
+        {
           return -1;
-        } else {
+        }
+        else
+        {
           x = 0;
         }
       }
@@ -408,11 +414,14 @@ public class SeqPanel extends JPanel
       }
       if (x >= cwidth * charWidth)
       {
-        if (!nearestColumn) {
+        if (!nearestColumn)
+        {
           // mouse is over right scale
           return -1;
-        } else {
-          x = cwidth*charWidth -1;
+        }
+        else
+        {
+          x = cwidth * charWidth - 1;
         }
       }
 
@@ -439,7 +448,6 @@ public class SeqPanel extends JPanel
       res = Math.min(res, av.getRanges().getEndRes());
 
     }
-    
 
     if (av.hasHiddenColumns())
     {
index 8135019..666ff74 100644 (file)
@@ -139,8 +139,10 @@ public class StructureChooser extends GStructureChooser
   List<SequenceI> seqsWithoutSourceDBRef = null;
 
   private boolean showChooserGUI = true;
+
   /**
-   * when true, queries to external services are supressed (no SIFTs, no PDBe, no 3D-Beacons, etc)
+   * when true, queries to external services are supressed (no SIFTs, no PDBe,
+   * no 3D-Beacons, etc)
    */
   private boolean dontQueryServices = false;
 
@@ -157,7 +159,7 @@ public class StructureChooser extends GStructureChooser
   {
     this(selectedSeqs, selectedSeq, ap, showGUI, false);
   }
-  
+
   public StructureChooser(SequenceI[] selectedSeqs, SequenceI selectedSeq,
           AlignmentPanel ap, boolean showGUI, boolean dontQueryServices)
   {
@@ -255,8 +257,11 @@ public class StructureChooser extends GStructureChooser
         }
 
       }).start();
-    } else {
-      Console.debug("Structure chooser not querying services to discover metadata.");
+    }
+    else
+    {
+      Console.debug(
+              "Structure chooser not querying services to discover metadata.");
     }
   }
 
@@ -1008,10 +1013,11 @@ public class StructureChooser extends GStructureChooser
               .getFTSDataFor(getResultTable(), selectedRow,
                       discoveredStructuresSet);
       String pageUrl = row.getModelViewUrl();
-      
+
       JPopupMenu popup = new JPopupMenu("3D Beacons");
       JMenuItem viewUrl = new JMenuItem("View model web page");
-      if (pageUrl == null || "".equals(pageUrl.trim())) {
+      if (pageUrl == null || "".equals(pageUrl.trim()))
+      {
         viewUrl.setEnabled(false);
         viewUrl.setText("No model page available.");
       }
@@ -1814,7 +1820,8 @@ public class StructureChooser extends GStructureChooser
       // headless = true;
       prompt = false;
       // suppress structure viewer's external service queries
-      sc = new StructureChooser(new SequenceI[] { seq }, seq, ap, false,true);
+      sc = new StructureChooser(new SequenceI[] { seq }, seq, ap, false,
+              true);
     }
     if (ssm == null)
     {
index 085be71..bd757e8 100644 (file)
@@ -90,8 +90,9 @@ public abstract class StructureViewerBase extends GStructureViewer
   }
 
   /**
-   * Singleton list of all (open) instances of structureViewerBase
-   * TODO: JAL-3362 - review and adopt the swingJS-safe singleton pattern so each structure viewer base instance is kept to its own JalviewJS parent
+   * Singleton list of all (open) instances of structureViewerBase TODO:
+   * JAL-3362 - review and adopt the swingJS-safe singleton pattern so each
+   * structure viewer base instance is kept to its own JalviewJS parent
    */
   private static List<JalviewStructureDisplayI> svbs = new ArrayList<>();
 
@@ -607,7 +608,8 @@ public abstract class StructureViewerBase extends GStructureViewer
       chainMenu.add(menuItem);
     }
   }
-  void setHetatmMenuItems(Map<String,String> hetatmNames)
+
+  void setHetatmMenuItems(Map<String, String> hetatmNames)
   {
     hetatmMenu.removeAll();
     if (hetatmNames == null || hetatmNames.isEmpty())
@@ -616,7 +618,7 @@ public abstract class StructureViewerBase extends GStructureViewer
       return;
     }
     hetatmMenu.setVisible(true);
-    allHetatmBeingSelected=false;
+    allHetatmBeingSelected = false;
     JMenuItem allMenuItem = new JMenuItem(
             MessageManager.getString("label.all"));
     JMenuItem noneMenuItem = new JMenuItem(
@@ -624,46 +626,52 @@ public abstract class StructureViewerBase extends GStructureViewer
     allMenuItem.addActionListener(new ActionListener()
     {
       @Override
-      public void actionPerformed(ActionEvent e) {
+      public void actionPerformed(ActionEvent e)
       {
-        allHetatmBeingSelected=true;
-        // Toggle state of everything - on
-        for (int i = 0; i < hetatmMenu.getItemCount(); i++)
         {
-          if (hetatmMenu.getItem(i) instanceof JCheckBoxMenuItem)
+          allHetatmBeingSelected = true;
+          // Toggle state of everything - on
+          for (int i = 0; i < hetatmMenu.getItemCount(); i++)
           {
-            ((JCheckBoxMenuItem) hetatmMenu.getItem(i)).setSelected(true);
+            if (hetatmMenu.getItem(i) instanceof JCheckBoxMenuItem)
+            {
+              ((JCheckBoxMenuItem) hetatmMenu.getItem(i)).setSelected(true);
+            }
           }
+          allHetatmBeingSelected = false;
+          showSelectedHetatms();
         }
-        allHetatmBeingSelected=false;
-        showSelectedHetatms();
       }
-      }});
+    });
 
     noneMenuItem.addActionListener(new ActionListener()
     {
       @Override
-      public void actionPerformed(ActionEvent e) {
+      public void actionPerformed(ActionEvent e)
       {
-        allHetatmBeingSelected=true;
-        // Toggle state of everything off
-        for (int i = 0; i < hetatmMenu.getItemCount(); i++)
         {
-          if (hetatmMenu.getItem(i) instanceof JCheckBoxMenuItem)
+          allHetatmBeingSelected = true;
+          // Toggle state of everything off
+          for (int i = 0; i < hetatmMenu.getItemCount(); i++)
           {
-            ((JCheckBoxMenuItem) hetatmMenu.getItem(i)).setSelected(false);
+            if (hetatmMenu.getItem(i) instanceof JCheckBoxMenuItem)
+            {
+              ((JCheckBoxMenuItem) hetatmMenu.getItem(i))
+                      .setSelected(false);
+            }
           }
+          allHetatmBeingSelected = false;
+          showSelectedHetatms();
         }
-        allHetatmBeingSelected=false;
-        showSelectedHetatms();
       }
-      }});
+    });
     hetatmMenu.add(noneMenuItem);
     hetatmMenu.add(allMenuItem);
 
     for (Map.Entry<String, String> chain : hetatmNames.entrySet())
     {
-      JCheckBoxMenuItem menuItem = new JCheckBoxMenuItem(chain.getKey(), false);
+      JCheckBoxMenuItem menuItem = new JCheckBoxMenuItem(chain.getKey(),
+              false);
       menuItem.setToolTipText(chain.getValue());
       menuItem.addItemListener(new ItemListener()
       {
@@ -671,7 +679,7 @@ public abstract class StructureViewerBase extends GStructureViewer
         public void itemStateChanged(ItemEvent evt)
         {
           if (!allHetatmBeingSelected)
-          { 
+          {
             // update viewer only when we were clicked, not programmatically
             // checked/unchecked
             showSelectedHetatms();
@@ -1237,6 +1245,7 @@ public abstract class StructureViewerBase extends GStructureViewer
     }
     getBinding().showChains(toshow);
   }
+
   /**
    * Display selected hetatms in viewer
    */
@@ -1256,6 +1265,7 @@ public abstract class StructureViewerBase extends GStructureViewer
     }
     getBinding().showHetatms(toshow);
   }
+
   /**
    * Tries to fetch a PDB file and save to a temporary local file. Returns the
    * saved file path if successful, or null if not.
@@ -1459,12 +1469,15 @@ public abstract class StructureViewerBase extends GStructureViewer
     // TODO: check for memory leaks where instance isn't finalised because jmb
     // holds a reference to the window
     // jmb = null;
-    
-    try {
+
+    try
+    {
       svbs.remove(this);
     } catch (Throwable t)
     {
-      Console.info("Unexpected exception when deregistering structure viewer",t);
+      Console.info(
+              "Unexpected exception when deregistering structure viewer",
+              t);
     }
     dispose();
   }
index 2d4bdc8..9180d52 100755 (executable)
@@ -145,7 +145,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     scrollPane = scroller;
     addMouseListener(this);
     addMouseMotionListener(this);
-    
+
     ToolTipManager.sharedInstance().registerComponent(this);
   }
 
@@ -182,6 +182,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     PaintRefresher.Refresh(tp, av.getSequenceSetId());
     repaint();
   }
+
   /**
    * DOCUMENT ME!
    * 
@@ -224,12 +225,12 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     longestName = "";
 
     AlignmentAnnotation aa = tp.getAssocAnnotation();
-    ContactMatrixI cm = (aa!=null) ? av.getContactMatrix(aa) : null;
-    if (cm!=null && cm.hasCutHeight())
+    ContactMatrixI cm = (aa != null) ? av.getContactMatrix(aa) : null;
+    if (cm != null && cm.hasCutHeight())
     {
-      threshold=(float) cm.getCutHeight();
+      threshold = (float) cm.getCutHeight();
     }
-    
+
     for (int i = 0; i < leaves.size(); i++)
     {
       BinaryNode lf = leaves.elementAt(i);
@@ -245,13 +246,17 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
         longestName = TreeCanvas.PLACEHOLDER
                 + ((Sequence) lf.element()).getName();
       }
-      if (tp.isColumnWise() && cm!=null)
+      if (tp.isColumnWise() && cm != null)
       {
         // get color from group colours, if they are set for the matrix
-        try {
+        try
+        {
           Color col = cm.getGroupColorForPosition(parseColumnNode(lf));
-          setColor(lf,col.brighter());
-        } catch (NumberFormatException ex) {};
+          setColor(lf, col.brighter());
+        } catch (NumberFormatException ex)
+        {
+        }
+        ;
       }
     }
 
@@ -791,8 +796,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
 
     if (top.count == 0)
     {
-      top.count = top.left().count
-              + top.right().count;
+      top.count = top.left().count + top.right().count;
     }
 
     float chunk = (float) (height - (offy)) / top.count;
@@ -881,7 +885,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
       Vector<BinaryNode> leaves = tree.findLeaves(highlightNode);
       if (tp.isColumnWise())
       {
-        markColumnsFor(getAssociatedPanels(), leaves, Color.red,false);
+        markColumnsFor(getAssociatedPanels(), leaves, Color.red, false);
       }
       else
       {
@@ -1058,7 +1062,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     for (int i = 0; i < groups.size(); i++)
     {
       Color col = ColorUtils.getARandomColor();
-      
+
       setColor(groups.get(i), col.brighter());
 
       Vector<BinaryNode> l = tree.findLeaves(groups.get(i));
@@ -1106,11 +1110,13 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
       }
     }
   }
+
   private int parseColumnNode(BinaryNode bn) throws NumberFormatException
   {
     return Integer.parseInt(
             bn.getName().substring(bn.getName().indexOf("c") + 1));
   }
+
   private boolean isColumnForNodeSelected(BinaryNode bn)
   {
     SequenceI rseq = tp.assocAnnotation.sequenceRef;
@@ -1130,16 +1136,17 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     ColumnSelection cs = av.getColumnSelection();
     HiddenColumns hc = av.getAlignment().getHiddenColumns();
     AlignmentAnnotation aa = tp.getAssocAnnotation();
-    int offp=-1;
+    int offp = -1;
     if (aa != null)
     {
       ContactMatrixI cm = av.getContactMatrix(aa);
-      // generally, we assume cm has 1:1 mapping to annotation row - probably wrong
+      // generally, we assume cm has 1:1 mapping to annotation row - probably
+      // wrong
       // but.. if
       if (cm instanceof MappableContactMatrixI)
       {
         int[] pos;
-          // use the mappable's mapping - always the case for PAE Matrices so good
+        // use the mappable's mapping - always the case for PAE Matrices so good
         // for 2.11.3
         MappableContactMatrixI mcm = (MappableContactMatrixI) cm;
         pos = mcm.getMappedPositionsFor(rseq, colm + 1);
@@ -1148,16 +1155,18 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
         {
           offp = rseq.findIndex(pos[0]);
         }
-      } else {
+      }
+      else
+      {
         offp = colm;
       }
     }
-    if (offp<=0)
+    if (offp <= 0)
     {
       return false;
     }
 
-    offp-=2;
+    offp -= 2;
     if (!av.hasHiddenColumns())
     {
       return cs.contains(offp);
@@ -1169,6 +1178,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     }
     return false;
   }
+
   private BitSet createColumnGroupFor(Vector<BinaryNode> l, Color col)
   {
     BitSet gp = new BitSet();
@@ -1226,17 +1236,16 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
       {
         continue;
       }
-      if (mcm!=null)
+      if (mcm != null)
       {
-        int[] seqpos = mcm.getMappedPositionsFor(
-                rseq, colm);
+        int[] seqpos = mcm.getMappedPositionsFor(rseq, colm);
         if (seqpos == null)
         {
           // no mapping for this column.
           continue;
         }
         // TODO: handle ranges...
-        offp = rseq.findIndex(seqpos[0])-1;
+        offp = rseq.findIndex(seqpos[0]) - 1;
       }
       else
       {
index 0a0c1b8..f708c48 100755 (executable)
@@ -181,7 +181,7 @@ public class TreePanel extends GTreePanel
 
     treeCanvas = new TreeCanvas(this, ap, scrollPane);
     scrollPane.setViewportView(treeCanvas);
-    
+
     if (columnWise)
     {
       bootstrapMenu.setVisible(false);
@@ -191,21 +191,20 @@ public class TreePanel extends GTreePanel
       sortAssocViews.setVisible(false);
     }
 
-
     addKeyListener(new KeyAdapter()
     {
       @Override
       public void keyPressed(KeyEvent e)
       {
         switch (e.getKeyCode())
-        { 
+        {
         case 27: // escape
           treeCanvas.clearSelectedLeaves();
           e.consume();
           break;
-          
+
         }
-        
+
       }
     });
     PaintRefresher.Register(this, ap.av.getSequenceSetId());
@@ -392,7 +391,7 @@ public class TreePanel extends GTreePanel
                 ? new NJTree(av, sm, similarityParams)
                 : new AverageDistanceTree(av, sm, similarityParams);
         tree = new TreeModel(njtree);
-        // don't display distances for columnwise trees        
+        // don't display distances for columnwise trees
       }
       showDistances(!columnWise);
       tree.reCount(tree.getTopNode());
@@ -759,11 +758,15 @@ public class TreePanel extends GTreePanel
     String tree = MessageManager.getString("label.tree");
     ImageExporter exporter = new ImageExporter(writer, null, imageFormat,
             tree);
-    try {
-    exporter.doExport(null, this, width, height,
-            tree.toLowerCase(Locale.ROOT));
-    } catch (ImageOutputException ioex) {
-      Console.error("Unexpected error whilst writing "+imageFormat.toString(),ioex);
+    try
+    {
+      exporter.doExport(null, this, width, height,
+              tree.toLowerCase(Locale.ROOT));
+    } catch (ImageOutputException ioex)
+    {
+      Console.error(
+              "Unexpected error whilst writing " + imageFormat.toString(),
+              ioex);
     }
   }
 
index 28f6c59..f9a4281 100644 (file)
@@ -803,7 +803,8 @@ public class VamsasApplication implements SelectionSource, VamsasSource
               // we only care about AlignmentSequence selections
               SelectionMessage sm = (SelectionMessage) message;
               sm.validate();
-              jalview.bin.Console.errPrintln("Received\n" + sm.getRawMessage());
+              jalview.bin.Console
+                      .errPrintln("Received\n" + sm.getRawMessage());
               Object[] jvobjs = sm.getVorbaIDs() == null ? null
                       : new Object[sm.getVorbaIDs().length];
               if (jvobjs == null)
index d8259f9..b80c23e 100644 (file)
@@ -642,8 +642,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
           }
           else
           {
-            jalview.bin.Console.errPrintln("Ignoring unknown service argument type "
-                    + myarg.getClass().getName());
+            jalview.bin.Console
+                    .errPrintln("Ignoring unknown service argument type "
+                            + myarg.getClass().getName());
           }
         }
       }
@@ -976,7 +977,8 @@ public class WsJobParameters extends JPanel implements ItemListener,
       disc.run();
     } catch (Exception e)
     {
-      jalview.bin.Console.errPrintln("Aborting. Problem discovering services.");
+      jalview.bin.Console
+              .errPrintln("Aborting. Problem discovering services.");
       e.printStackTrace();
       return;
     }
@@ -1034,11 +1036,13 @@ public class WsJobParameters extends JPanel implements ItemListener,
                   Option cpy = jalview.ws.jws2.ParameterUtils.copyOption(o);
                 } catch (Exception e)
                 {
-                  jalview.bin.Console.errPrintln("Failed to copy " + o.getName());
+                  jalview.bin.Console
+                          .errPrintln("Failed to copy " + o.getName());
                   e.printStackTrace();
                 } catch (Error e)
                 {
-                  jalview.bin.Console.errPrintln("Failed to copy " + o.getName());
+                  jalview.bin.Console
+                          .errPrintln("Failed to copy " + o.getName());
                   e.printStackTrace();
                 }
               }
@@ -1055,11 +1059,13 @@ public class WsJobParameters extends JPanel implements ItemListener,
                           .copyParameter(o);
                 } catch (Exception e)
                 {
-                  jalview.bin.Console.errPrintln("Failed to copy " + o.getName());
+                  jalview.bin.Console
+                          .errPrintln("Failed to copy " + o.getName());
                   e.printStackTrace();
                 } catch (Error e)
                 {
-                  jalview.bin.Console.errPrintln("Failed to copy " + o.getName());
+                  jalview.bin.Console
+                          .errPrintln("Failed to copy " + o.getName());
                   e.printStackTrace();
                 }
               }
@@ -1467,8 +1473,8 @@ public class WsJobParameters extends JPanel implements ItemListener,
           return;
         }
         curSetName = newname;
-        jalview.bin.Console.errPrintln("New name for user setting " + curSetName
-                + " (was " + setName.getSelectedItem() + ")");
+        jalview.bin.Console.errPrintln("New name for user setting "
+                + curSetName + " (was " + setName.getSelectedItem() + ")");
         if (curSetName.equals(setName.getSelectedItem()))
         {
           curSetName = null;
index 7e2539f..7e4ee16 100755 (executable)
@@ -317,7 +317,8 @@ public class AnnotationFile
               }
               else
               {
-                // jalview.bin.Console.errPrintln("Skipping NaN - not valid value.");
+                // jalview.bin.Console.errPrintln("Skipping NaN - not valid
+                // value.");
                 text.append(comma + 0f);// row.annotations[j].value);
               }
               comma = ",";
@@ -679,11 +680,12 @@ public class AnnotationFile
     } catch (Exception ex)
     {
       ex.printStackTrace();
-      jalview.bin.Console.outPrintln("Problem reading annotation file: " + ex);
+      jalview.bin.Console
+              .outPrintln("Problem reading annotation file: " + ex);
       if (nlinesread > 0)
       {
-        jalview.bin.Console.outPrintln("Last read line " + nlinesread + ": '" + lastread
-                + "' (first 80 chars) ...");
+        jalview.bin.Console.outPrintln("Last read line " + nlinesread
+                + ": '" + lastread + "' (first 80 chars) ...");
       }
       return false;
     }
@@ -1385,8 +1387,8 @@ public class AnnotationFile
       value = Float.valueOf(nextToken);
     } catch (NumberFormatException e)
     {
-      jalview.bin.Console.errPrintln("line " + nlinesread + ": Threshold '" + nextToken
-              + "' invalid, setting to zero");
+      jalview.bin.Console.errPrintln("line " + nlinesread + ": Threshold '"
+              + nextToken + "' invalid, setting to zero");
     }
     String label = st.hasMoreTokens() ? st.nextToken() : null;
     Color colour = null;
index 56e9fa1..8b7a4c2 100755 (executable)
@@ -215,8 +215,8 @@ public class AppletFormatAdapter
     } catch (Exception e)
     {
       e.printStackTrace();
-      jalview.bin.Console.errPrintln("Failed to read alignment using the '" + fileFormat
-              + "' reader.\n" + e);
+      jalview.bin.Console.errPrintln("Failed to read alignment using the '"
+              + fileFormat + "' reader.\n" + e);
 
       if (e.getMessage() != null
               && e.getMessage().startsWith(INVALID_CHARACTERS))
@@ -297,8 +297,8 @@ public class AppletFormatAdapter
     } catch (Exception e)
     {
       e.printStackTrace();
-      jalview.bin.Console.errPrintln("Failed to read alignment using the '" + format
-              + "' reader.\n" + e);
+      jalview.bin.Console.errPrintln("Failed to read alignment using the '"
+              + format + "' reader.\n" + e);
 
       if (e.getMessage() != null
               && e.getMessage().startsWith(INVALID_CHARACTERS))
@@ -424,8 +424,8 @@ public class AppletFormatAdapter
       String afileresp = afile.print(seqs, jvsuffix);
       if (afile.hasWarningMessage())
       {
-        jalview.bin.Console.errPrintln("Warning raised when writing as " + format
-                + " : " + afile.getWarningMessage());
+        jalview.bin.Console.errPrintln("Warning raised when writing as "
+                + format + " : " + afile.getWarningMessage());
       }
       return afileresp;
     } catch (Exception e)
@@ -502,8 +502,9 @@ public class AppletFormatAdapter
           memf += r.totalMemory() - r.freeMemory();
           if (al != null)
           {
-            jalview.bin.Console.outPrintln("Alignment contains " + al.getHeight()
-                    + " sequences and " + al.getWidth() + " columns.");
+            jalview.bin.Console.outPrintln("Alignment contains "
+                    + al.getHeight() + " sequences and " + al.getWidth()
+                    + " columns.");
             try
             {
               jalview.bin.Console.outPrintln(new AppletFormatAdapter()
@@ -519,7 +520,8 @@ public class AppletFormatAdapter
           {
             jalview.bin.Console.outPrintln("Couldn't read alignment");
           }
-          jalview.bin.Console.outPrintln("Read took " + (t1 / 1000.0) + " seconds.");
+          jalview.bin.Console
+                  .outPrintln("Read took " + (t1 / 1000.0) + " seconds.");
           jalview.bin.Console.outPrintln(
                   "Difference between free memory now and before is "
                           + (memf / (1024.0 * 1024.0) * 1.0) + " MB");
@@ -531,8 +533,8 @@ public class AppletFormatAdapter
       }
       else
       {
-        jalview.bin.Console.errPrintln("Ignoring argument '" + args[i] + "' (" + i
-                + "'th)- not a readable file.");
+        jalview.bin.Console.errPrintln("Ignoring argument '" + args[i]
+                + "' (" + i + "'th)- not a readable file.");
       }
       i++;
     }
@@ -559,8 +561,9 @@ public class AppletFormatAdapter
     DataSourceType protocol = null;
     if (debug)
     {
-      jalview.bin.Console.outPrintln("resolving datasource started with:\n>>file\n"
-              + file + ">>endfile");
+      jalview.bin.Console
+              .outPrintln("resolving datasource started with:\n>>file\n"
+                      + file + ">>endfile");
     }
 
     // This might throw a security exception in certain browsers
@@ -624,7 +627,8 @@ public class AppletFormatAdapter
     {
       if (debug)
       {
-        jalview.bin.Console.errPrintln("Exception when accessing content: " + e);
+        jalview.bin.Console
+                .errPrintln("Exception when accessing content: " + e);
       }
       fp = null;
     }
@@ -645,7 +649,8 @@ public class AppletFormatAdapter
         }
       } catch (Exception e)
       {
-        jalview.bin.Console.errPrintln("Failed to access content as paste!");
+        jalview.bin.Console
+                .errPrintln("Failed to access content as paste!");
         e.printStackTrace();
         fp = null;
       }
@@ -667,7 +672,8 @@ public class AppletFormatAdapter
         {
           if (debug)
           {
-            jalview.bin.Console.outPrintln("Format not identified. Inaccessible file.");
+            jalview.bin.Console.outPrintln(
+                    "Format not identified. Inaccessible file.");
           }
           return null;
         }
@@ -680,7 +686,8 @@ public class AppletFormatAdapter
         {
           if (debug)
           {
-            jalview.bin.Console.outPrintln("Protocol identified as " + protocol);
+            jalview.bin.Console
+                    .outPrintln("Protocol identified as " + protocol);
           }
           return protocol;
         }
@@ -698,7 +705,8 @@ public class AppletFormatAdapter
       {
         if (debug)
         {
-          jalview.bin.Console.errPrintln("File deemed not accessible via " + protocol);
+          jalview.bin.Console
+                  .errPrintln("File deemed not accessible via " + protocol);
           e.printStackTrace();
         }
       }
index 1a08363..8144051 100644 (file)
@@ -54,8 +54,8 @@ public class BackupFilenameFilter implements FilenameFilter
       }
     } catch (IOException e)
     {
-      jalview.bin.Console.outPrintln("IOException when checking file '" + filename
-              + "' is a backupfile");
+      jalview.bin.Console.outPrintln("IOException when checking file '"
+              + filename + "' is a backupfile");
     }
 
     BackupFilenameParts bffp = new BackupFilenameParts(filename, base,
index eef203f..13bfb8c 100644 (file)
@@ -138,8 +138,9 @@ public class BioJsHTMLOutput extends HTMLOutput
       {
         if (!biojsDirectory.mkdirs())
         {
-          jalview.bin.Console.outPrintln("Couldn't create local directory : "
-                  + BJS_TEMPLATES_LOCAL_DIRECTORY);
+          jalview.bin.Console
+                  .outPrintln("Couldn't create local directory : "
+                          + BJS_TEMPLATES_LOCAL_DIRECTORY);
           return;
         }
       }
@@ -264,8 +265,9 @@ public class BioJsHTMLOutput extends HTMLOutput
 
     } catch (OutOfMemoryError err)
     {
-      jalview.bin.Console.outPrintln("########################\n" + "OUT OF MEMORY "
-              + generatedFile + "\n" + "########################");
+      jalview.bin.Console
+              .outPrintln("########################\n" + "OUT OF MEMORY "
+                      + generatedFile + "\n" + "########################");
       new OOMWarning("Creating Image for " + generatedFile, err);
     } catch (Exception e)
     {
index a71e6e8..b6f36e8 100755 (executable)
@@ -168,8 +168,9 @@ public class ClustalFile extends AlignFile
         }
         else
         {
-          jalview.bin.Console.errPrintln("Clustal File Reader: Can't find sequence for "
-                  + headers.elementAt(i));
+          jalview.bin.Console.errPrintln(
+                  "Clustal File Reader: Can't find sequence for "
+                          + headers.elementAt(i));
         }
       }
       AlignmentAnnotation lastssa = null;
index a704f24..38e27f9 100755 (executable)
@@ -312,7 +312,8 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI
       // should report somewhere useful for UI if necessary
       warningMessage = ((warningMessage == null) ? "" : warningMessage)
               + "Parsing error at\n" + line;
-      jalview.bin.Console.outPrintln("Error parsing feature file: " + ex + "\n" + line);
+      jalview.bin.Console.outPrintln(
+              "Error parsing feature file: " + ex + "\n" + line);
       ex.printStackTrace(System.err);
       resetMatcher();
       return false;
@@ -354,8 +355,8 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI
       String[] tokens = line.split(TAB_REGEX);
       if (tokens.length != 2)
       {
-        jalview.bin.Console.errPrintln(String.format("Invalid token count %d for %d",
-                tokens.length, line));
+        jalview.bin.Console.errPrintln(String.format(
+                "Invalid token count %d for %d", tokens.length, line));
       }
       else
       {
@@ -415,7 +416,8 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI
         seq = alignment.getSequenceAt(idx);
       } catch (NumberFormatException ex)
       {
-        jalview.bin.Console.errPrintln("Invalid sequence index: " + seqIndex);
+        jalview.bin.Console
+                .errPrintln("Invalid sequence index: " + seqIndex);
       }
     }
 
@@ -1009,7 +1011,8 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI
   @Override
   public String print(SequenceI[] sqs, boolean jvsuffix)
   {
-    jalview.bin.Console.outPrintln("Use printGffFormat() or printJalviewFormat()");
+    jalview.bin.Console
+            .outPrintln("Use printGffFormat() or printJalviewFormat()");
     return null;
   }
 
@@ -1333,8 +1336,9 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI
      */
     if (gffColumns.length < 5)
     {
-      jalview.bin.Console.errPrintln("Ignoring GFF feature line with too few columns ("
-              + gffColumns.length + ")");
+      jalview.bin.Console
+              .errPrintln("Ignoring GFF feature line with too few columns ("
+                      + gffColumns.length + ")");
       return null;
     }
 
@@ -1364,7 +1368,8 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI
         }
       } catch (IOException e)
       {
-        jalview.bin.Console.errPrintln("GFF parsing failed with: " + e.getMessage());
+        jalview.bin.Console
+                .errPrintln("GFF parsing failed with: " + e.getMessage());
         return null;
       }
     }
index 91ce527..00f2e5c 100644 (file)
@@ -308,7 +308,7 @@ public enum FileFormat implements FileFormatI
       return new FeaturesFile();
     }
   },
-  FeatureSettings("Jalview Feature Settings File","fc",false,false)
+  FeatureSettings("Jalview Feature Settings File", "fc", false, false)
   {
     @Override
     public AlignmentFileReaderI getReader(FileParse source)
@@ -321,7 +321,7 @@ public enum FileFormat implements FileFormatI
     public AlignmentFileWriterI getWriter(AlignmentI al)
     {
       return null;
-    }    
+    }
   },
   ScoreMatrix("Substitution matrix", "", false, false)
   {
index 96489d0..18372db 100644 (file)
@@ -107,7 +107,8 @@ public class FileFormats
     String name = format.getName().toUpperCase(Locale.ROOT);
     if (formats.containsKey(name))
     {
-      jalview.bin.Console.errPrintln("Overwriting file format: " + format.getName());
+      jalview.bin.Console
+              .errPrintln("Overwriting file format: " + format.getName());
     }
     formats.put(name, format);
     if (isIdentifiable)
index 02d46e7..0b541e2 100644 (file)
@@ -308,7 +308,8 @@ public abstract class HTMLOutput implements Runnable
     exportHTML(outputFile, null);
   }
 
-  public void exportHTML(String outputFile, String renderer) throws ImageOutputException
+  public void exportHTML(String outputFile, String renderer)
+          throws ImageOutputException
   {
     setProgressMessage(MessageManager.formatMessage(
             "status.exporting_alignment_as_x_file", getDescription()));
index b5fdc2c..4ea3000 100644 (file)
@@ -249,8 +249,9 @@ public class HtmlSvgOutput extends HTMLOutput
       }
     } catch (OutOfMemoryError err)
     {
-      jalview.bin.Console.outPrintln("########################\n" + "OUT OF MEMORY "
-              + generatedFile + "\n" + "########################");
+      jalview.bin.Console
+              .outPrintln("########################\n" + "OUT OF MEMORY "
+                      + generatedFile + "\n" + "########################");
       new OOMWarning("Creating Image for " + generatedFile, err);
     } catch (Exception e)
     {
index 11d96a3..baee531 100755 (executable)
@@ -353,7 +353,8 @@ public class IdentifyFile
             reply = FileFormat.Rnaml;
             break;
           }
-          if (isXml && data.contains("<NS2:JALVIEWUSERCOLOURS SCHEMENAME=\"SEQUENCE FEATURES\" XMLNS:NS2=\"WWW.JALVIEW.ORG/COLOURS\">"))
+          if (isXml && data.contains(
+                  "<NS2:JALVIEWUSERCOLOURS SCHEMENAME=\"SEQUENCE FEATURES\" XMLNS:NS2=\"WWW.JALVIEW.ORG/COLOURS\">"))
           {
             reply = FileFormat.FeatureSettings;
             break;
index 9f8ac4e..582a6e3 100755 (executable)
@@ -377,10 +377,11 @@ public class JPredFile extends AlignFile
 
       for (int i = 0; i < jpred.seqs.size(); i++)
       {
-        jalview.bin.Console.outPrintln(((Sequence) jpred.seqs.elementAt(i)).getName()
-                + "\n"
-                + ((Sequence) jpred.seqs.elementAt(i)).getSequenceAsString()
-                + "\n");
+        jalview.bin.Console
+                .outPrintln(((Sequence) jpred.seqs.elementAt(i)).getName()
+                        + "\n" + ((Sequence) jpred.seqs.elementAt(i))
+                                .getSequenceAsString()
+                        + "\n");
       }
     } catch (java.io.IOException e)
     {
index 0b45ba6..ea37c83 100644 (file)
@@ -363,7 +363,8 @@ public class JSONFile extends AlignFile implements ComplexAlignFile
                   .setSecondaryStructure(annotation.secondaryStructure);
           String displayChar = annotation.displayCharacter == null ? null
                   : annotation.displayCharacter;
-          // jalview.bin.Console.outPrintln("--------------------->[" + displayChar + "]");
+          // jalview.bin.Console.outPrintln("--------------------->[" +
+          // displayChar + "]");
           annotationPojo.setDisplayCharacter(displayChar);
           if (annotation.colour != null)
           {
index 3f44596..588a2b8 100755 (executable)
@@ -197,8 +197,9 @@ public class JalviewFileChooser extends JFileChooser
     }
     else
     {
-      jalview.bin.Console.errPrintln("JalviewFileChooser arguments mismatch: "
-              + extensions + ", " + descs);
+      jalview.bin.Console
+              .errPrintln("JalviewFileChooser arguments mismatch: "
+                      + extensions + ", " + descs);
     }
   }
 
index 0a0520a..ed7049e 100755 (executable)
@@ -169,8 +169,9 @@ public class MSFfile extends AlignFile
       }
       else
       {
-        jalview.bin.Console.errPrintln("MSFFile Parser: Can't find sequence for "
-                + headers.get(i));
+        jalview.bin.Console
+                .errPrintln("MSFFile Parser: Can't find sequence for "
+                        + headers.get(i));
       }
     }
   }
@@ -200,7 +201,8 @@ public class MSFfile extends AlignFile
         }
       } catch (Exception e)
       {
-        jalview.bin.Console.errPrintln("Exception during MSF Checksum calculation");
+        jalview.bin.Console
+                .errPrintln("Exception during MSF Checksum calculation");
         e.printStackTrace();
       }
     }
index 57fae00..1e16348 100755 (executable)
@@ -137,8 +137,9 @@ public class PfamFile extends AlignFile
       }
       else
       {
-        jalview.bin.Console.errPrintln("PFAM File reader: Can't find sequence for "
-                + headers.get(i));
+        jalview.bin.Console
+                .errPrintln("PFAM File reader: Can't find sequence for "
+                        + headers.get(i));
       }
     }
   }
index f8c384d..aa2ab4b 100644 (file)
@@ -160,7 +160,7 @@ public class RnamlFile extends AlignFile
         }
       }
       sqs[i] = new Sequence(id, seq, begin, end);
-      if (seq.length()!=(end-begin+1))
+      if (seq.length() != (end - begin + 1))
       {
         sqs[i].setEnd(sqs[i].findPosition(sqs[i].getLength()));
       }
index 0a1172c..95d0bc6 100644 (file)
@@ -79,7 +79,7 @@ public class SequenceAnnotationReport
       {
         return 1;
       }
-      
+
       String s1 = ref1.getSource();
       String s2 = ref2.getSource();
       boolean s1Primary = DBRefSource.isPrimarySource(s1);
index d674485..72bf86a 100644 (file)
@@ -153,7 +153,8 @@ public class StockholmFile extends AlignFile
     String id = null;
     for (int i = 0; i < result.size(); i++)
     {
-      // DEBUG jalview.bin.Console.errPrintln("Processing i'th sequence in Stockholm file")
+      // DEBUG jalview.bin.Console.errPrintln("Processing i'th sequence in
+      // Stockholm file")
       RNA current = result.get(i);
 
       String seq = current.getSeq();
@@ -465,7 +466,8 @@ public class StockholmFile extends AlignFile
         String annType = r.stringMatched(1);
         String annContent = r.stringMatched(2);
 
-        // jalview.bin.Console.errPrintln("type:" + annType + " content: " + annContent);
+        // jalview.bin.Console.errPrintln("type:" + annType + " content: " +
+        // annContent);
 
         if (annType.equals("GF"))
         {
@@ -567,7 +569,8 @@ public class StockholmFile extends AlignFile
           else
           {
             // throw new IOException("Error parsing " + line);
-            jalview.bin.Console.errPrintln(">> missing annotation: " + line);
+            jalview.bin.Console
+                    .errPrintln(">> missing annotation: " + line);
           }
         }
         else if (annType.equals("GC"))
index df384a6..3fb62c5 100644 (file)
@@ -336,7 +336,8 @@ public abstract class StructureFile extends AlignFile
         processPdbFileWithAnnotate3d(rnaSequences);
       } catch (Exception x)
       {
-        jalview.bin.Console.errPrintln("Exceptions when dealing with RNA in pdb file");
+        jalview.bin.Console
+                .errPrintln("Exceptions when dealing with RNA in pdb file");
         x.printStackTrace();
 
       }
index 46b75c8..998166e 100644 (file)
@@ -492,7 +492,8 @@ public class VamsasAppDatastore
           }
           else
           {
-            jalview.bin.Console.outPrintln("alignment in document left unchanged.");
+            jalview.bin.Console
+                    .outPrintln("alignment in document left unchanged.");
           }
         }
         else
@@ -1115,7 +1116,8 @@ public class VamsasAppDatastore
       // METHODS)
       {
         // verify existing alignment sequence annotation is up to date
-        jalview.bin.Console.outPrintln("update dataset sequence annotation.");
+        jalview.bin.Console
+                .outPrintln("update dataset sequence annotation.");
       }
       else
       {
@@ -1184,7 +1186,8 @@ public class VamsasAppDatastore
       // METHODS)
       {
         // verify existing alignment sequence annotation is up to date
-        jalview.bin.Console.outPrintln("update alignment sequence annotation.");
+        jalview.bin.Console
+                .outPrintln("update alignment sequence annotation.");
       }
       else
       {
index c7c90f4..8170801 100755 (executable)
@@ -315,7 +315,8 @@ public class WSWUBlastClient
       {
         jobComplete = true;
         jobsRunning--;
-        jalview.bin.Console.errPrintln("WSWUBlastClient error:\n" + exp.toString());
+        jalview.bin.Console
+                .errPrintln("WSWUBlastClient error:\n" + exp.toString());
         exp.printStackTrace();
       }
     }
index bf06494..1567cfe 100644 (file)
@@ -1,7 +1,9 @@
 package jalview.io.exceptions;
 
 /**
- * wrapper for passing error messages and exceptions back to UI when image io goes wrong
+ * wrapper for passing error messages and exceptions back to UI when image io
+ * goes wrong
+ * 
  * @author jprocter
  *
  */
index 77b641a..f522ac4 100644 (file)
@@ -200,7 +200,8 @@ public class ExonerateHelper extends Gff2Helper
     }
     else if (!"+".equals(strand))
     {
-      jalview.bin.Console.errPrintln("Strand must be specified for alignment");
+      jalview.bin.Console
+              .errPrintln("Strand must be specified for alignment");
       return;
     }
 
@@ -239,7 +240,8 @@ public class ExonerateHelper extends Gff2Helper
     String[] tokens = region.split(" ");
     if (tokens.length != 3)
     {
-      jalview.bin.Console.errPrintln("Malformed Align descriptor: " + region);
+      jalview.bin.Console
+              .errPrintln("Malformed Align descriptor: " + region);
       return null;
     }
 
@@ -351,7 +353,8 @@ public class ExonerateHelper extends Gff2Helper
         return true;
       }
     }
-    jalview.bin.Console.errPrintln("Sorry, I don't handle exonerate model " + model);
+    jalview.bin.Console
+            .errPrintln("Sorry, I don't handle exonerate model " + model);
     return false;
   }
 
index 646900d..a9cc02a 100644 (file)
@@ -225,7 +225,8 @@ public class Gff3Helper extends GffHelperBase
         }
       } catch (NumberFormatException nfe)
       {
-        jalview.bin.Console.errPrintln("Invalid start or end in Target " + target);
+        jalview.bin.Console
+                .errPrintln("Invalid start or end in Target " + target);
       }
     }
 
index dccfd27..0097343 100644 (file)
@@ -114,8 +114,9 @@ public abstract class GffHelperBase implements GffHelperI
      */
     if (!trimMapping(from, to, fromRatio, toRatio))
     {
-      jalview.bin.Console.errPrintln("Ignoring mapping from " + Arrays.toString(from)
-              + " to " + Arrays.toString(to) + " as counts don't match!");
+      jalview.bin.Console.errPrintln(
+              "Ignoring mapping from " + Arrays.toString(from) + " to "
+                      + Arrays.toString(to) + " as counts don't match!");
       return null;
     }
 
@@ -444,7 +445,8 @@ public abstract class GffHelperBase implements GffHelperI
       return sf;
     } catch (NumberFormatException nfe)
     {
-      jalview.bin.Console.errPrintln("Invalid number in gff: " + nfe.getMessage());
+      jalview.bin.Console
+              .errPrintln("Invalid number in gff: " + nfe.getMessage());
       return null;
     }
   }
index 3ce774e..ef231e5 100644 (file)
@@ -246,8 +246,9 @@ public class ParsePackedSet
           fp = new FileParse(file, AppletFormatAdapter.checkProtocol(file));
         } catch (Exception e)
         {
-          jalview.bin.Console.errPrintln("Couldn't handle datasource of type " + jtype
-                  + " using URI " + file);
+          jalview.bin.Console
+                  .errPrintln("Couldn't handle datasource of type " + jtype
+                          + " using URI " + file);
           e.printStackTrace();
           return;
         }
@@ -287,7 +288,8 @@ public class ParsePackedSet
     {
       for (Object o : newdm)
       {
-        jalview.bin.Console.outPrintln("Will need to create an " + o.getClass());
+        jalview.bin.Console
+                .outPrintln("Will need to create an " + o.getClass());
       }
 
       // now test uniquify/deuniquify stuff
index a6dd8b6..5ea97fb 100644 (file)
@@ -415,11 +415,12 @@ public class Tree extends DatastoreItem
             }
             else
             {
-              jalview.bin.Console.errPrintln("WARNING: Unassociated treeNode "
-                      + tnode.element().toString() + " "
-                      + ((tnode.getName() != null)
-                              ? " label " + tnode.getName()
-                              : ""));
+              jalview.bin.Console
+                      .errPrintln("WARNING: Unassociated treeNode "
+                              + tnode.element().toString() + " "
+                              + ((tnode.getName() != null)
+                                      ? " label " + tnode.getName()
+                                      : ""));
             }
           }
         }
index c3fbea8..9179b79 100644 (file)
@@ -278,7 +278,8 @@ public class VCFLoader
       initialise(vcfFile);
     } catch (IOException e)
     {
-      jalview.bin.Console.errPrintln("Error opening VCF file: " + e.getMessage());
+      jalview.bin.Console
+              .errPrintln("Error opening VCF file: " + e.getMessage());
     }
 
     // map of species!chromosome!fromAssembly!toAssembly to {fromRange, toRange}
@@ -398,7 +399,8 @@ public class VCFLoader
       }
     } catch (Throwable e)
     {
-      jalview.bin.Console.errPrintln("Error processing VCF: " + e.getMessage());
+      jalview.bin.Console
+              .errPrintln("Error processing VCF: " + e.getMessage());
       e.printStackTrace();
       if (gui != null)
       {
index c174696..32f1972 100644 (file)
@@ -190,7 +190,8 @@ public class JSFunctionExec implements Runnable
               jsex[0] = jex;
               if (jvlite.debug)
               {
-                jalview.bin.Console.errPrintln("Falling back to javascript: url call");
+                jalview.bin.Console
+                        .errPrintln("Falling back to javascript: url call");
               }
               StringBuffer sb = new StringBuffer(
                       "javascript:" + _listener + "(");
index eda8741..7b30d3e 100644 (file)
@@ -106,7 +106,8 @@ public class JsSelectionSender extends JSFunctionExec
         ;
 
       }
-      jalview.bin.Console.errPrintln("Relaying selection to jsfunction:" + _listener);
+      jalview.bin.Console
+              .errPrintln("Relaying selection to jsfunction:" + _listener);
       executeJavascriptFunction(_listener,
               new Object[]
               { src, setid, jvlite.arrayToSeparatorList(seqs),
index f0b3132..e79106d 100644 (file)
@@ -156,8 +156,8 @@ public class MouseOverStructureListener extends JSFunctionExec
                     "" + (atom.getPdbResNum()), "" + atom.getAtomIndex() });
       } catch (Exception ex)
       {
-        jalview.bin.Console.errPrintln("Couldn't execute callback with " + _listenerfn
-                + " for atomSpec: " + atom);
+        jalview.bin.Console.errPrintln("Couldn't execute callback with "
+                + _listenerfn + " for atomSpec: " + atom);
         ex.printStackTrace();
       }
     }
@@ -260,9 +260,9 @@ public class MouseOverStructureListener extends JSFunctionExec
           executeJavascriptFunction(true, _listenerfn, st);
         } catch (Exception ex)
         {
-          jalview.bin.Console.errPrintln("Couldn't execute callback with " + _listenerfn
-                  + " using args { " + st[0] + ", " + st[1] + ", " + st[2]
-                  + "," + st[3] + "}"); // + ","+st[4]+"\n");
+          jalview.bin.Console.errPrintln("Couldn't execute callback with "
+                  + _listenerfn + " using args { " + st[0] + ", " + st[1]
+                  + ", " + st[2] + "," + st[3] + "}"); // + ","+st[4]+"\n");
           ex.printStackTrace();
 
         }
index 124c7c7..3d606e3 100755 (executable)
@@ -193,7 +193,8 @@ public class GDesktop extends JFrame
           inputURLMenuItem_actionPerformed(null);
         } catch (FileFormatException e1)
         {
-          jalview.bin.Console.errPrintln("Error loading from URL: " + e1.getMessage());
+          jalview.bin.Console
+                  .errPrintln("Error loading from URL: " + e1.getMessage());
         }
       }
     });
index ea67f48..8512705 100755 (executable)
@@ -137,7 +137,8 @@ public class RotatableMatrix
     Float floatValue = Float.valueOf(degrees);
     if (cachedRotations.get(axis).containsKey(floatValue))
     {
-      // jalview.bin.Console.outPrintln("getRotation from cache: " + (int) degrees);
+      // jalview.bin.Console.outPrintln("getRotation from cache: " + (int)
+      // degrees);
       return cachedRotations.get(axis).get(floatValue);
     }
 
index d5b3808..983b512 100644 (file)
@@ -287,13 +287,15 @@ public class Jalview2XML
    * entry names
    */
   private Map<RnaModel, String> rnaSessions = new HashMap<>();
-  
+
   /**
    * map from contact matrices to their XML ids
    */
-  private Map<ContactMatrixI,String> contactMatrices = new HashMap<>();
+  private Map<ContactMatrixI, String> contactMatrices = new HashMap<>();
+
   private Map<String, ContactMatrixI> contactMatrixRefs = new HashMap<>();
-  private List<jalview.xml.binding.jalview.MatrixType> xmlMatrices= new ArrayList<>();
+
+  private List<jalview.xml.binding.jalview.MatrixType> xmlMatrices = new ArrayList<>();
 
   /**
    * A helper method for safely using the value of an optional attribute that
@@ -391,12 +393,14 @@ public class Jalview2XML
   }
 
   /**
-   * base class for resolving forward references to an as-yet unmarshalled object referenced by already unmarshalled objects
+   * base class for resolving forward references to an as-yet unmarshalled
+   * object referenced by already unmarshalled objects
    * 
    * @author jprocter
    *
    */
-  abstract class forwardRef {
+  abstract class forwardRef
+  {
     String sref;
 
     String type;
@@ -413,6 +417,7 @@ public class Jalview2XML
     }
 
     public abstract boolean isResolvable();
+
     /**
      * @return true if the forward reference was fully resolved
      */
@@ -424,8 +429,10 @@ public class Jalview2XML
       return type + " reference to " + sref;
     }
   }
+
   /**
    * resolve forward references to sequences by their ID
+   * 
    * @author jprocter
    */
   abstract class SeqFref extends forwardRef
@@ -434,6 +441,7 @@ public class Jalview2XML
     {
       super(_sref, type);
     }
+
     public SequenceI getSrefSeq()
     {
       return seqRefIds.get(sref);
@@ -518,7 +526,7 @@ public class Jalview2XML
     };
     return fref;
   }
-  
+
   public forwardRef newMatrixFref(final String matRef,
           final jalview.util.MapList mapping, final AlignmentAnnotation jaa)
   {
@@ -1647,8 +1655,9 @@ public class Jalview2XML
       view.setShowFullId(av.getShowJVSuffix());
       view.setRightAlignIds(av.isRightAlignIds());
       view.setIdWidth(av.getIdWidth());
-      view.setIdWidthManuallyAdjusted(ap.getIdPanel().getIdCanvas().isManuallyAdjusted());
-      
+      view.setIdWidthManuallyAdjusted(
+              ap.getIdPanel().getIdCanvas().isManuallyAdjusted());
+
       view.setShowSequenceFeatures(av.isShowSequenceFeatures());
       view.setShowText(av.getShowText());
       view.setShowUnconserved(av.getShowUnconserved());
@@ -1820,20 +1829,19 @@ public class Jalview2XML
       // jms.addViewport(view);
       object.getViewport().add(view);
     }
-    
-    
+
     if (storeDS)
     {
       // store matrices referenced by any views or annotation in this dataset
-      if (xmlMatrices!=null && xmlMatrices.size()>0)
+      if (xmlMatrices != null && xmlMatrices.size() > 0)
       {
-        Console.debug("Adding "+xmlMatrices.size()+" matrices to dataset.");
+        Console.debug(
+                "Adding " + xmlMatrices.size() + " matrices to dataset.");
         vamsasSet.getMatrix().addAll(xmlMatrices);
         xmlMatrices.clear();
       }
     }
 
-    
     // object.setJalviewModelSequence(jms);
     // object.getVamsasModel().addSequenceSet(vamsasSet);
     object.getVamsasModel().getSequenceSet().add(vamsasSet);
@@ -2398,7 +2406,7 @@ public class Jalview2XML
                     .getContactMatrixFor(annotation);
             if (cm != null)
             {
-              storeMatrixFor(vamsasSet, an,annotation, cm);
+              storeMatrixFor(vamsasSet, an, annotation, cm);
             }
           }
         }
@@ -2505,11 +2513,12 @@ public class Jalview2XML
 
   }
 
-  private void storeMatrixFor(SequenceSet root, Annotation an, AlignmentAnnotation annotation, ContactMatrixI cm)
+  private void storeMatrixFor(SequenceSet root, Annotation an,
+          AlignmentAnnotation annotation, ContactMatrixI cm)
   {
     String cmId = contactMatrices.get(cm);
-    MatrixType xmlmat=null;
-    
+    MatrixType xmlmat = null;
+
     // first create an xml ref for the matrix data, if none exist
     if (cmId == null)
     {
@@ -2537,20 +2546,23 @@ public class Jalview2XML
       {
         xmlmat.setCutHeight(cm.getCutHeight());
       }
-      xmlmat.setId(cmId = "m"+contactMatrices.size()+System.currentTimeMillis());
-      Console.trace("Matrix data stored :"+cmId);
+      xmlmat.setId(cmId = "m" + contactMatrices.size()
+              + System.currentTimeMillis());
+      Console.trace("Matrix data stored :" + cmId);
       contactMatrices.put(cm, cmId);
       contactMatrixRefs.put(cmId, cm);
       xmlMatrices.add(xmlmat);
-    } else {
-      Console.trace("Existing Matrix stored :"+cmId);
+    }
+    else
+    {
+      Console.trace("Existing Matrix stored :" + cmId);
     }
 
     // now store mapping
 
     MapOnAMatrixType xmlmatmapping = new MapOnAMatrixType();
     xmlmatmapping.setMatrix(cmId);
-    
+
     // Pretty much all matrices currently managed in this way are
     // mappableContactMatrixI implementations - but check anyway
     if (cm instanceof MappableContactMatrixI)
@@ -3163,7 +3175,7 @@ public class Jalview2XML
       initSeqRefs();
     }
     AlignFrame af = null, _af = null;
-    List<AlignFrame> toRepaint=new ArrayList<AlignFrame>();
+    List<AlignFrame> toRepaint = new ArrayList<AlignFrame>();
     IdentityHashMap<AlignmentI, AlignmentI> importedDatasets = new IdentityHashMap<>();
     Map<String, AlignFrame> gatherToThisFrame = new HashMap<>();
     final String file = jprovider.getFilename();
@@ -3228,7 +3240,7 @@ public class Jalview2XML
       } while (jarentry != null);
       jin.close();
       resolveFrefedSequences();
-      for (AlignFrame alignFrame:toRepaint)
+      for (AlignFrame alignFrame : toRepaint)
       {
         alignFrame.repaint();
       }
@@ -3623,12 +3635,12 @@ public class Jalview2XML
 
     // ////////////////////////////////
     // LOAD MATRICES (IF ANY)
-    
-    if (vamsasSet.getMatrix()!=null && vamsasSet.getMatrix().size()>0)
+
+    if (vamsasSet.getMatrix() != null && vamsasSet.getMatrix().size() > 0)
     {
       importMatrixData(vamsasSet.getMatrix());
     }
-    
+
     // ////////////////////////////////
     // LOAD SEQUENCES
 
@@ -4164,7 +4176,7 @@ public class Jalview2XML
             for (MapOnAMatrixType xmlmat : annotation.getContactmatrix())
             {
               restoreMatrixFor(jaa.sequenceRef, jaa, xmlmat);
-            } 
+            }
           }
         }
 
@@ -4396,11 +4408,12 @@ public class Jalview2XML
 
   private void importMatrixData(List<MatrixType> xmlmatrices)
   {
-    for (MatrixType xmlmat:xmlmatrices)
+    for (MatrixType xmlmat : xmlmatrices)
     {
       if (!PAEContactMatrix.PAEMATRIX.equals(xmlmat.getType()))
       {
-        Console.error("Ignoring matrix '"+xmlmat.getId()+"' of type '"+xmlmat.getType());
+        Console.error("Ignoring matrix '" + xmlmat.getId() + "' of type '"
+                + xmlmat.getType());
         continue;
       }
 
@@ -4410,11 +4423,10 @@ public class Jalview2XML
         continue;
       }
 
-      float[][] elements = ContactMatrix
-              .fromFloatStringToContacts(xmlmat.getElements(),
-                      xmlmat.getCols().intValue(),
-                      xmlmat.getRows().intValue());
-      
+      float[][] elements = ContactMatrix.fromFloatStringToContacts(
+              xmlmat.getElements(), xmlmat.getCols().intValue(),
+              xmlmat.getRows().intValue());
+
       List<BitSet> newgroups = new ArrayList<BitSet>();
       if (xmlmat.getGroups().size() > 0)
       {
@@ -4423,30 +4435,28 @@ public class Jalview2XML
           newgroups.add(deStringifyBitset(sgroup));
         }
       }
-      String nwk = xmlmat.getNewick().size() > 0
-              ? xmlmat.getNewick().get(0)
+      String nwk = xmlmat.getNewick().size() > 0 ? xmlmat.getNewick().get(0)
               : null;
       if (xmlmat.getNewick().size() > 1)
       {
-        Console.log.info(
-                "Ignoring additional clusterings for contact matrix");
+        Console.log
+                .info("Ignoring additional clusterings for contact matrix");
       }
       String treeMethod = xmlmat.getTreeMethod();
-      double thresh = xmlmat.getCutHeight() != null
-              ? xmlmat.getCutHeight()
+      double thresh = xmlmat.getCutHeight() != null ? xmlmat.getCutHeight()
               : 0;
       GroupSet grpset = new GroupSet();
       grpset.restoreGroups(newgroups, treeMethod, nwk, thresh);
-      
+
       FloatContactMatrix newcm = new FloatContactMatrix(elements, grpset);
       contactMatrixRefs.put(xmlmat.getId(), newcm);
-      Console.trace("Restored base contact matrix "+xmlmat.getId());
+      Console.trace("Restored base contact matrix " + xmlmat.getId());
     }
   }
 
   private void restoreMatrixFor(SequenceI sequenceRef,
           AlignmentAnnotation jaa, MapOnAMatrixType xmlmatmapping)
-  {    
+  {
     // restore mapping data to matrix data
     jalview.util.MapList mapping = null;
     if (xmlmatmapping.getMapping() != null)
@@ -4473,7 +4483,7 @@ public class Jalview2XML
       mapping = new jalview.util.MapList(fr, fto,
               m.getMapFromUnit().intValue(), m.getMapToUnit().intValue());
     }
-    
+
     // locate matrix data in project XML and import
     ContactMatrixI cm = contactMatrixRefs.get(xmlmatmapping.getMatrix());
     if (cm == null)
@@ -5244,21 +5254,26 @@ public class Jalview2XML
     }
     af.setBounds(safeInt(view.getXpos()), safeInt(view.getYpos()),
             safeInt(view.getWidth()), safeInt(view.getHeight()));
-    
-    af.alignPanel.fontChanged(); // make sure font is updated *before* we set ID width
-    if (view.getIdWidth()==null)
+
+    af.alignPanel.fontChanged(); // make sure font is updated *before* we set ID
+                                 // width
+    if (view.getIdWidth() == null)
     {
-      if (!isVersionStringLaterThan("2.11.3", jm.getVersion())) {
+      if (!isVersionStringLaterThan("2.11.3", jm.getVersion()))
+      {
         // Pre 2.11.3 jalview projects do not store the id width
         // idWidth was also calculated in a different way.
         viewport.setIdWidth(af.alignPanel.getLegacyIdWidth());
         af.alignPanel.getIdPanel().getIdCanvas().setManuallyAdjusted(true);
       }
-    } else {
+    }
+    else
+    {
       viewport.setIdWidth(view.getIdWidth());
-      af.alignPanel.getIdPanel().getIdCanvas().setManuallyAdjusted(view.isIdWidthManuallyAdjusted());
+      af.alignPanel.getIdPanel().getIdCanvas()
+              .setManuallyAdjusted(view.isIdWidthManuallyAdjusted());
     }
-    
+
     // startSeq set in af.alignPanel.updateLayout below
     af.alignPanel.updateLayout();
     ColourSchemeI cs = null;
index 9438e9a..b5dac0d 100644 (file)
@@ -184,7 +184,8 @@ public class AnnotationRenderer
             : row_annotations[column - 1].secondaryStructure;
 
     boolean diffupstream = sCol == 0 || row_annotations[sCol - 1] == null
-            || dc != row_annotations[sCol - 1].secondaryStructure || !validEnd;
+            || dc != row_annotations[sCol - 1].secondaryStructure
+            || !validEnd;
     boolean diffdownstream = !validRes || !validEnd
             || row_annotations[column] == null
             || dc != row_annotations[column].secondaryStructure;
@@ -260,7 +261,8 @@ public class AnnotationRenderer
             : row_annotations[column - 1].displayCharacter;
 
     boolean diffupstream = sCol == 0 || row_annotations[sCol - 1] == null
-            || !dc.equals(row_annotations[sCol - 1].displayCharacter) || !validEnd;
+            || !dc.equals(row_annotations[sCol - 1].displayCharacter)
+            || !validEnd;
     boolean diffdownstream = !validRes || !validEnd
             || row_annotations[column] == null
             || !dc.equals(row_annotations[column].displayCharacter);
index a1443c8..60cf5bd 100644 (file)
@@ -45,13 +45,15 @@ public class ContactGeometry
    * number of contacts for each pixel_step - to last whole contact
    */
   final double contacts_step;
-  
+
   final int lastStep;
 
   /**
    * Bean used to map from a range of contacts to a range of pixels
+   * 
    * @param contacts
-   * @param graphHeight Number of pixels to map given range of contacts
+   * @param graphHeight
+   *          Number of pixels to map given range of contacts
    */
   public ContactGeometry(final ContactListI contacts, int graphHeight)
   {
@@ -73,8 +75,9 @@ public class ContactGeometry
       pixels_step = (int) Math
               .ceil(((double) graphHeight) / (double) contact_height);
     }
-    contacts_step = pixels_step*contacts_per_pixel;
-    lastStep = (int) Math.min((double)graphHeight, ((double)graphHeight)/((double)pixels_step));
+    contacts_step = pixels_step * contacts_per_pixel;
+    lastStep = (int) Math.min((double) graphHeight,
+            ((double) graphHeight) / ((double) pixels_step));
   }
 
   public class contactInterval
@@ -108,10 +111,12 @@ public class ContactGeometry
       return cStart == them.cStart && cEnd == them.cEnd && pEnd == them.pEnd
               && pStart == them.pStart;
     }
+
     @Override
     public String toString()
     {
-      return "Contacts ["+cStart+","+cEnd+"] : Pixels ["+pStart+","+pEnd+"]";
+      return "Contacts [" + cStart + "," + cEnd + "] : Pixels [" + pStart
+              + "," + pEnd + "]";
     }
   }
 
@@ -144,7 +149,7 @@ public class ContactGeometry
       {
         // TODO: turn into function on hiddenColumns and create test !!
         Iterator<int[]> viscont = hiddenColumns.getVisContigsIterator(
-                -1+mappedRange[p], -1+mappedRange[p + 1], false);
+                -1 + mappedRange[p], -1 + mappedRange[p + 1], false);
         containsHidden = !viscont.hasNext();
         if (!containsHidden)
         {
@@ -156,8 +161,8 @@ public class ContactGeometry
       }
       else
       {
-        rowsel = columnSelection.intersects(-1+mappedRange[p],
-                -1+mappedRange[p + 1]);
+        rowsel = columnSelection.intersects(-1 + mappedRange[p],
+                -1 + mappedRange[p + 1]);
       }
     }
     return rowsel;
index edf3ca2..0514d15 100644 (file)
@@ -35,10 +35,12 @@ public abstract class ContactMapRenderer implements AnnotationRowRendererI
      * shown when no data available from map
      */
     Color no_data;
+
     /**
      * shown for region not currently visible - should normally not see this
      */
     Color hidden;
+
     /**
      * linear shading scheme min/max
      */
@@ -51,12 +53,18 @@ public abstract class ContactMapRenderer implements AnnotationRowRendererI
 
     /**
      * 
-     * @param no_data - colour when no data available
-     * @param hidden - colour if this row is hidden
-     * @param maxColor - colour for maximum value of contact
-     * @param minColor - colour for minimum value of contact
-     * @param selMinColor - min colour if the contact has been selected
-     * @param selMaxColor - max colour if contact is selected
+     * @param no_data
+     *          - colour when no data available
+     * @param hidden
+     *          - colour if this row is hidden
+     * @param maxColor
+     *          - colour for maximum value of contact
+     * @param minColor
+     *          - colour for minimum value of contact
+     * @param selMinColor
+     *          - min colour if the contact has been selected
+     * @param selMaxColor
+     *          - max colour if contact is selected
      */
     public Shading(Color no_data, Color hidden, Color maxColor,
             Color minColor, Color selMinColor, Color selMaxColor)
@@ -89,7 +97,7 @@ public abstract class ContactMapRenderer implements AnnotationRowRendererI
         return new Shading(Color.pink, Color.red,
 
                 new Color(247, 252, 245), new Color(0, 68, 28),
-                new Color(28, 0, 68), new Color(245,247,252));
+                new Color(28, 0, 68), new Color(245, 247, 252));
       }
     };
   }
@@ -111,7 +119,7 @@ public abstract class ContactMapRenderer implements AnnotationRowRendererI
           HiddenColumns hiddenColumns, ColumnSelection columnSelection,
           AlignmentAnnotation _aa, Annotation[] aa_annotations, int sRes,
           int eRes, float min, float max, int y)
-  {    
+  {
     if (sRes > aa_annotations.length)
     {
       return;
@@ -122,13 +130,14 @@ public abstract class ContactMapRenderer implements AnnotationRowRendererI
 
     // uncomment below to render whole area of matrix as pink
     // g.setColor(shade.no_data);
-    // g.fillRect(x, topY-_aa.height, (eRes - sRes) * charWidth, _aa.graphHeight);
-    
+    // g.fillRect(x, topY-_aa.height, (eRes - sRes) * charWidth,
+    // _aa.graphHeight);
+
     boolean showGroups = _aa.isShowGroupsForContactMatrix();
     int column;
     int aaMax = aa_annotations.length - 1;
     ContactMatrixI cm = viewport.getContactMatrix(_aa);
-    if (cm==null)
+    if (cm == null)
     {
       return;
     }
@@ -230,11 +239,13 @@ public abstract class ContactMapRenderer implements AnnotationRowRendererI
         g.setColor(col);
         if (cgeom.pixels_step > 1)
         {
-          g.fillRect(x * charWidth, botY+ht, charWidth, cgeom.pixels_step);
+          g.fillRect(x * charWidth, botY + ht, charWidth,
+                  cgeom.pixels_step);
         }
         else
         {
-          g.drawLine(x * charWidth, botY+ht, (x + 1) * charWidth, botY+ht);
+          g.drawLine(x * charWidth, botY + ht, (x + 1) * charWidth,
+                  botY + ht);
         }
       }
       x++;
index f80669d..742e31d 100644 (file)
@@ -117,8 +117,8 @@ public class ColourSchemeLoader
     } catch (Exception ex)
     {
       // used to try to parse a V1 Castor generated colours file
-      jalview.bin.Console.errPrintln("Failed to read colour scheme from " + filePath
-              + " : " + ex.toString());
+      jalview.bin.Console.errPrintln("Failed to read colour scheme from "
+              + filePath + " : " + ex.toString());
     }
 
     return ucs;
index e2a8cb3..303d500 100644 (file)
@@ -77,8 +77,9 @@ public class ColourSchemes
                 cs.getSchemeClass().getDeclaredConstructor().newInstance());
       } catch (InstantiationException | IllegalAccessException e)
       {
-        jalview.bin.Console.errPrintln("Error instantiating colour scheme for "
-                + cs.toString() + " " + e.getMessage());
+        jalview.bin.Console
+                .errPrintln("Error instantiating colour scheme for "
+                        + cs.toString() + " " + e.getMessage());
         e.printStackTrace();
       } catch (ReflectiveOperationException roe)
       {
index fe71d31..8295699 100755 (executable)
@@ -46,7 +46,8 @@ public class Consensus
     this.mask = setNums(s);
 
     // for (int i=0; i < mask.length; i++) {
-    // jalview.bin.Console.outPrintln(mask[i] + " " + ResidueProperties.aa[mask[i]]);
+    // jalview.bin.Console.outPrintln(mask[i] + " " +
+    // ResidueProperties.aa[mask[i]]);
     // }
   }
 
@@ -75,7 +76,8 @@ public class Consensus
 
     if (tot > ((threshold * size) / 100))
     {
-      // jalview.bin.Console.outPrintln("True conserved "+tot+" from "+threshold+" out of
+      // jalview.bin.Console.outPrintln("True conserved "+tot+" from
+      // "+threshold+" out of
       // "+size+" : "+maskstr);
       return true;
     }
index 4884283..c91380e 100644 (file)
@@ -65,7 +65,8 @@ public class CovariationColourScheme extends ResidueColourScheme
 
     for (int x = 0; x < this.annotation._rnasecstr.length; x++)
     {
-      // jalview.bin.Console.outPrintln(this.annotation._rnasecstr[x] + " Begin" +
+      // jalview.bin.Console.outPrintln(this.annotation._rnasecstr[x] + " Begin"
+      // +
       // this.annotation._rnasecstr[x].getBegin());
       // jalview.bin.Console.outPrintln(this.annotation._rnasecstr[x].getFeatureGroup());
       // pairs.put(this.annotation._rnasecstr[x].getBegin(),
@@ -133,7 +134,8 @@ public class CovariationColourScheme extends ResidueColourScheme
       currentColour = helixcolorhash.get(currentHelix);
     }
 
-    // jalview.bin.Console.outPrintln(c + " " + j + " helix " + currentHelix + " " +
+    // jalview.bin.Console.outPrintln(c + " " + j + " helix " + currentHelix + "
+    // " +
     // currentColour);
     return currentColour;
   }
index 3d91b58..20b0796 100644 (file)
@@ -409,8 +409,9 @@ public class FeatureColour implements FeatureColourI
           featureColour.setThreshold(Float.valueOf(tval).floatValue());
         } catch (Exception e)
         {
-          jalview.bin.Console.errPrintln("Couldn't parse threshold value as a float: ("
-                  + tval + ")");
+          jalview.bin.Console
+                  .errPrintln("Couldn't parse threshold value as a float: ("
+                          + tval + ")");
         }
       }
       if (gcol.hasMoreTokens())
index f8b7856..e297ff6 100755 (executable)
@@ -2449,7 +2449,8 @@ public class ResidueProperties
           jalview.bin.Console.outPrintln(", ");
         }
       }
-      jalview.bin.Console.outPrintln("]" + (res.hasMoreElements() ? "," : ""));
+      jalview.bin.Console
+              .outPrintln("]" + (res.hasMoreElements() ? "," : ""));
     }
     jalview.bin.Console.outPrintln("};");
   }
index 6e4c4e1..98a060a 100644 (file)
@@ -29,7 +29,8 @@ public class StructureCommand implements StructureCommandI
 
   private List<String> parameters;
 
-  private boolean waitNeeded=false;
+  private boolean waitNeeded = false;
+
   public StructureCommand(String cmd, String... params)
   {
     command = cmd;
@@ -41,18 +42,18 @@ public class StructureCommand implements StructureCommandI
       }
     }
   }
-  
+
   public void setWaitNeeded(boolean wait)
   {
-    waitNeeded=wait;
+    waitNeeded = wait;
   }
-  
+
   @Override
   public boolean isWaitNeeded()
   {
     return waitNeeded;
   }
-  
+
   @Override
   public void addParameter(String param)
   {
index 03b15fb..1697d96 100644 (file)
@@ -32,5 +32,8 @@ public interface StructureCommandI
 
   boolean hasParameters();
 
-  default boolean isWaitNeeded() { return false; };
+  default boolean isWaitNeeded()
+  {
+    return false;
+  };
 }
index 9c2bc6b..ec6032d 100644 (file)
@@ -277,7 +277,7 @@ public abstract class StructureCommandsBase implements StructureCommandsI
   {
     return null;
   }
-  
+
   @Override
   public StructureCommandI restoreSession(String filePath)
   {
index 8ba94b0..fc8b828 100644 (file)
@@ -194,16 +194,16 @@ public interface StructureCommandsI
    * @return
    */
   StructureCommandI openSession(String filepath);
-  
+
   /**
-   * Returns command to restore a previously saved version of an existing structure viewer session file. 
-   * Default implementation calls 'openSession' 
+   * Returns command to restore a previously saved version of an existing
+   * structure viewer session file. Default implementation calls 'openSession'
+   * 
    * @param filePath
    * @return
    */
   StructureCommandI restoreSession(String filePath);
 
-
   /**
    * Returns a command to ask the viewer to close down
    * 
@@ -256,7 +256,8 @@ public interface StructureCommandsI
 
   List<StructureCommandI> centerViewOn(List<AtomSpecModel> residues);
 
-  default List<StructureCommandI> showHetatms(List<String> toShow) {
+  default List<StructureCommandI> showHetatms(List<String> toShow)
+  {
     return Collections.EMPTY_LIST;
   }
 }
index 2f1ddc0..ec3e0a0 100644 (file)
@@ -155,7 +155,8 @@ public class StructureSelectionManager
   {
     if (mappings.isEmpty())
     {
-      jalview.bin.Console.errPrintln("reportMapping: No PDB/Sequence mappings.");
+      jalview.bin.Console
+              .errPrintln("reportMapping: No PDB/Sequence mappings.");
     }
     else
     {
@@ -164,7 +165,8 @@ public class StructureSelectionManager
       int i = 0;
       for (StructureMapping sm : mappings)
       {
-        jalview.bin.Console.errPrintln("mapping " + i++ + " : " + sm.pdbfile);
+        jalview.bin.Console
+                .errPrintln("mapping " + i++ + " : " + sm.pdbfile);
       }
     }
   }
@@ -357,7 +359,6 @@ public class StructureSelectionManager
             pdbFile, sourceType, tft, paeFilename, true);
   }
 
-
   /**
    * create sequence structure mappings between each sequence and the given
    * pdbFile (retrieved via the given protocol). Either constructs a mapping
@@ -377,9 +378,15 @@ public class StructureSelectionManager
    *          - structure data resource
    * @param sourceType
    *          - how to resolve data from resource
-   * @param tft - specify how to interpret the temperature factor column in the atom data
-   * @param paeFilename - when not null, specifies a filename containing a matrix formatted in JSON using one of the known PAE formats
-   * @param doXferSettings - when true, transfer annotation to mapped sequences in sequenceArray 
+   * @param tft
+   *          - specify how to interpret the temperature factor column in the
+   *          atom data
+   * @param paeFilename
+   *          - when not null, specifies a filename containing a matrix
+   *          formatted in JSON using one of the known PAE formats
+   * @param doXferSettings
+   *          - when true, transfer annotation to mapped sequences in
+   *          sequenceArray
    * @return null or the structure data parsed as a pdb file
    */
   synchronized public StructureFile setMapping(boolean forStructureView,
@@ -413,9 +420,15 @@ public class StructureSelectionManager
    * @param IProgressIndicator
    *          reference to UI component that maintains a progress bar for the
    *          mapping operation
-   * @param tft - specify how to interpret the temperature factor column in the atom data
-   * @param paeFilename - when not null, specifies a filename containing a matrix formatted in JSON using one of the known PAE formats
-   * @param doXferSettings - when true, transfer annotation to mapped sequences in sequenceArray 
+   * @param tft
+   *          - specify how to interpret the temperature factor column in the
+   *          atom data
+   * @param paeFilename
+   *          - when not null, specifies a filename containing a matrix
+   *          formatted in JSON using one of the known PAE formats
+   * @param doXferSettings
+   *          - when true, transfer annotation to mapped sequences in
+   *          sequenceArray
    * @return null or the structure data parsed as a pdb file
    */
   synchronized public StructureFile computeMapping(boolean forStructureView,
index 9c8afdf..dc3cc1e 100644 (file)
@@ -885,7 +885,7 @@ public abstract class AAStructureBindingModel
       {
         for (int s : cs.getSelected())
         {
-            matched.set(s);
+          matched.set(s);
         }
       }
       else
@@ -1540,7 +1540,6 @@ public abstract class AAStructureBindingModel
     return f;
   }
 
-
   /**
    * Use restoreSession when you want to restore a previously saved sesssion to
    * the running viewer instance.
@@ -1550,7 +1549,8 @@ public abstract class AAStructureBindingModel
   public void restoreSession(String absolutePath)
   {
     String prefix = getViewerType().toString();
-    try {
+    try
+    {
 
       StructureCommandI cmd = commandGenerator.restoreSession(absolutePath);
       if (cmd != null)
@@ -2010,19 +2010,24 @@ public abstract class AAStructureBindingModel
 
   /**
    * list the ligands available for display/hiding in the current view
+   * 
    * @return HETATM CODE:Molecule name
    */
-  public Map<String, String> getHetatmNames() {
+  public Map<String, String> getHetatmNames()
+  {
     return Collections.EMPTY_MAP;
   }
+
   /**
    * Generates and executes a command to show the given hetatm types as CPK
    * 
-   * @param toShow - one or more of strings from getHetatmNames
+   * @param toShow
+   *          - one or more of strings from getHetatmNames
    */
   public void showHetatms(List<String> toShow)
   {
-    executeCommands(commandGenerator.showHetatms(toShow), false, "Adjusting hetatm visibility");
+    executeCommands(commandGenerator.showHetatms(toShow), false,
+            "Adjusting hetatm visibility");
   }
 
 }
index c298639..ba1b703 100644 (file)
@@ -132,8 +132,8 @@ public class IdentifiersUrlProvider extends UrlProviderImpl
     // BH 2018 -- added more valuable report
     if (errorMessage != null)
     {
-      jalview.bin.Console.errPrintln("IdentifiersUrlProvider: cannot read " + idFileName
-              + ": " + errorMessage);
+      jalview.bin.Console.errPrintln("IdentifiersUrlProvider: cannot read "
+              + idFileName + ": " + errorMessage);
     }
     return idData;
   }
index b0f25eb..c4c083f 100644 (file)
@@ -86,8 +86,8 @@ public class ChannelProperties
     if (channelPropsURL == null)
     {
       // complete failure of channel_properties, set all properties to defaults
-      jalview.bin.Console.errPrintln("Failed to find '/" + CHANNEL_PROPERTIES_FILENAME
-              + "' file at '"
+      jalview.bin.Console.errPrintln("Failed to find '/"
+              + CHANNEL_PROPERTIES_FILENAME + "' file at '"
               + (channelPropsURL == null ? "null"
                       : channelPropsURL.toString())
               + "'. Using class defaultProps.");
@@ -214,7 +214,8 @@ public class ChannelProperties
       }
       else
       {
-        jalview.bin.Console.errPrintln("Failed to get channel property '" + key + "'");
+        jalview.bin.Console
+                .errPrintln("Failed to get channel property '" + key + "'");
       }
     }
     return null;
index b728c9d..9ed98bd 100644 (file)
@@ -68,7 +68,7 @@ public class ColorUtils
     return color;
 
   }
-  
+
   /**
    * 
    * @return random color
@@ -80,6 +80,7 @@ public class ColorUtils
             (int) (Math.random() * 255), (int) (Math.random() * 255));
     return col;
   }
+
   /**
    * Convert to Tk colour code format
    * 
index df2c76c..df6d2bc 100755 (executable)
@@ -940,9 +940,9 @@ public class Format
   }
 
   /**
-   * Bespoke method to format a percentage (or any other) float value to the specified number of
-   * decimal places. Avoids use of general-purpose format parsers as a
-   * processing hotspot.
+   * Bespoke method to format a percentage (or any other) float value to the
+   * specified number of decimal places. Avoids use of general-purpose format
+   * parsers as a processing hotspot.
    * 
    * @param sb
    * @param value
index bd375bb..af0b308 100644 (file)
@@ -791,15 +791,16 @@ public class GroupUrlLink
     }
     else
     {
-      jalview.bin.Console.outPrintln("Created a url from " + ((int[]) url[0])[0]
-              + "out of " + idstring[0].length + " sequences.");
+      jalview.bin.Console
+              .outPrintln("Created a url from " + ((int[]) url[0])[0]
+                      + "out of " + idstring[0].length + " sequences.");
       jalview.bin.Console.outPrintln("Sequences that did not match:");
       for (int sq = 0; sq < idstring[0].length; sq++)
       {
         if (!((boolean[]) url[1])[sq])
         {
-          jalview.bin.Console.outPrintln("Seq " + sq + ": " + idstring[0][sq] + "\t: "
-                  + idstring[1][sq]);
+          jalview.bin.Console.outPrintln("Seq " + sq + ": "
+                  + idstring[0][sq] + "\t: " + idstring[1][sq]);
         }
       }
       jalview.bin.Console.outPrintln("Sequences that DID match:");
@@ -807,8 +808,8 @@ public class GroupUrlLink
       {
         if (((boolean[]) url[1])[sq])
         {
-          jalview.bin.Console.outPrintln("Seq " + sq + ": " + idstring[0][sq] + "\t: "
-                  + idstring[1][sq]);
+          jalview.bin.Console.outPrintln("Seq " + sq + ": "
+                  + idstring[0][sq] + "\t: " + idstring[1][sq]);
         }
       }
       jalview.bin.Console.outPrintln("The generated URL:");
@@ -853,8 +854,10 @@ public class GroupUrlLink
         jalview.bin.Console.outPrintln(
                 "Link " + i + " " + links[i] + " : " + ul.toString());
         jalview.bin.Console.outPrintln(" pref : " + ul.getUrl_prefix());
-        jalview.bin.Console.outPrintln(" IdReplace : " + ul.getIDRegexReplace());
-        jalview.bin.Console.outPrintln(" SeqReplace : " + ul.getSeqRegexReplace());
+        jalview.bin.Console
+                .outPrintln(" IdReplace : " + ul.getIDRegexReplace());
+        jalview.bin.Console
+                .outPrintln(" SeqReplace : " + ul.getSeqRegexReplace());
         jalview.bin.Console.outPrintln(" Suffixes : " + ul.getUrl_suffix());
 
         jalview.bin.Console.outPrintln(
@@ -883,8 +886,8 @@ public class GroupUrlLink
       }
       else
       {
-        jalview.bin.Console.errPrintln("Invalid URLLink : " + links[i] + " : "
-                + ul.getInvalidMessage());
+        jalview.bin.Console.errPrintln("Invalid URLLink : " + links[i]
+                + " : " + ul.getInvalidMessage());
       }
     }
   }
index e4f393c..4b443d3 100644 (file)
@@ -130,7 +130,8 @@ public class LaunchUtils
       return -4;
     } catch (NumberFormatException e)
     {
-      jalview.bin.Console.errPrintln("Could not parse JAVA_COMPILE_VERSION");
+      jalview.bin.Console
+              .errPrintln("Could not parse JAVA_COMPILE_VERSION");
       return -5;
     }
 
index de8f719..6517703 100644 (file)
@@ -96,7 +96,8 @@ public class Log4j
       init = true;
     } catch (Exception e)
     {
-      jalview.bin.Console.errPrintln("Problems initializing the log4j system\n");
+      jalview.bin.Console
+              .errPrintln("Problems initializing the log4j system\n");
       e.printStackTrace(System.err);
     }
   }
index 4ecf637..7998ec8 100644 (file)
@@ -325,8 +325,9 @@ public class Platform
         }
         if (msg != null)
         {
-          jalview.bin.Console.errPrintln("Platform: timer mark\t" + ((t - time) / 1000f)
-                  + "\t" + ((t - mark) / 1000f) + "\t" + msg);
+          jalview.bin.Console.errPrintln(
+                  "Platform: timer mark\t" + ((t - time) / 1000f) + "\t"
+                          + ((t - mark) / 1000f) + "\t" + msg);
         }
         mark = t;
       }
@@ -337,8 +338,9 @@ public class Platform
     case TIME_GET:
       if (msg != null)
       {
-        jalview.bin.Console.errPrintln("Platform: timer dur\t" + ((t - time) / 1000f)
-                + "\t" + ((duration) / 1000f) + "\t" + msg);
+        jalview.bin.Console
+                .errPrintln("Platform: timer dur\t" + ((t - time) / 1000f)
+                        + "\t" + ((duration) / 1000f) + "\t" + msg);
       }
       set = 0;
       break;
@@ -644,12 +646,13 @@ public class Platform
        * @j2sNative var a =
        *            decodeURI((document.location.href.replace("&","?").split("?j2s")[0]
        *            + "?").split("?")[1].split("#")[0]); a &&
-       *            (jalview.bin.Console.outPrintln("URL arguments detected were "+a)) &&
-       *            (J2S.thisApplet.__Info.urlargs = a.split(" "));
+       *            (jalview.bin.Console.outPrintln("URL arguments detected were
+       *            "+a)) && (J2S.thisApplet.__Info.urlargs = a.split(" "));
        *            (!J2S.thisApplet.__Info.args || J2S.thisApplet.__Info.args
        *            == "" || J2S.thisApplet.__Info.args == "??") &&
-       *            (J2S.thisApplet.__Info.args = a) && (jalview.bin.Console.outPrintln("URL
-       *            arguments were passed to J2S main."));
+       *            (J2S.thisApplet.__Info.args = a) &&
+       *            (jalview.bin.Console.outPrintln("URL arguments were passed
+       *            to J2S main."));
        */
     } catch (Throwable t)
     {
index 78d0b4c..8d3de7d 100644 (file)
@@ -322,8 +322,8 @@ public class UrlLink
             // debug
             for (int s = 0; s <= rg.numSubs(); s++)
             {
-              jalview.bin.Console.errPrintln("Sub " + s + " : " + rg.matchedFrom(s)
-                      + " : " + rg.matchedTo(s) + " : '"
+              jalview.bin.Console.errPrintln("Sub " + s + " : "
+                      + rg.matchedFrom(s) + " : " + rg.matchedTo(s) + " : '"
                       + rg.stringMatched(s) + "'");
             }
             // try to collate subgroup matches
index 42768a6..3e1bc63 100644 (file)
@@ -934,7 +934,8 @@ public abstract class AlignmentViewport
     }
     if (calculator.workingInvolvedWith(alignmentAnnotation))
     {
-      // jalview.bin.Console.errPrintln("grey out ("+alignmentAnnotation.label+")");
+      // jalview.bin.Console.errPrintln("grey out
+      // ("+alignmentAnnotation.label+")");
       return true;
     }
     return false;
@@ -2132,7 +2133,7 @@ public abstract class AlignmentViewport
 
         if (aa.graph > 0)
         {
-          aa.height += aa.graphHeight+20;
+          aa.height += aa.graphHeight + 20;
         }
 
         if (aa.height == 0)
@@ -2293,7 +2294,8 @@ public abstract class AlignmentViewport
   {
     if (this == av)
     {
-      jalview.bin.Console.errPrintln("Ignoring recursive setCodingComplement request");
+      jalview.bin.Console
+              .errPrintln("Ignoring recursive setCodingComplement request");
     }
     else
     {
index 33c4c26..04db165 100644 (file)
@@ -224,7 +224,8 @@ public class ViewportRanges extends ViewportProperties
    */
   public void setStartEndSeq(int start, int end)
   {
-    // jalview.bin.Console.outPrintln("ViewportRange setStartEndSeq " + start + " " + end);
+    // jalview.bin.Console.outPrintln("ViewportRange setStartEndSeq " + start +
+    // " " + end);
     int[] oldvalues = updateStartEndSeq(start, end);
     int oldstartseq = oldvalues[0];
     int oldendseq = oldvalues[1];
@@ -438,7 +439,8 @@ public class ViewportRanges extends ViewportProperties
     {
       vpstart = visHeight - h;
     }
-    // jalview.bin.Console.outPrintln("ViewportRanges setviewportStartAndHeight " + vpstart
+    // jalview.bin.Console.outPrintln("ViewportRanges setviewportStartAndHeight
+    // " + vpstart
     // + " " + start + " " + h + " " + getVisibleAlignmentHeight());
 
     setStartEndSeq(vpstart, vpstart + h - 1);
index 508a069..cdf8ea4 100644 (file)
@@ -145,7 +145,8 @@ public class AlignCalcManager implements AlignCalcManagerI
   {
     synchronized (inProgress)
     {
-      // jalview.bin.Console.errPrintln("Worker " + worker + " marked as complete.");
+      // jalview.bin.Console.errPrintln("Worker " + worker + " marked as
+      // complete.");
       inProgress.remove(worker);
       List<AlignCalcWorkerI> upd = updating.get(worker.getClass());
       if (upd != null)
@@ -201,7 +202,7 @@ public class AlignCalcManager implements AlignCalcManagerI
   @Override
   public boolean isWorking()
   {
-    boolean working=false;
+    boolean working = false;
     synchronized (inProgress)
     {
       // jalview.bin.Console.errPrintln("isWorking "+hashCode());
@@ -214,9 +215,10 @@ public class AlignCalcManager implements AlignCalcManagerI
       {
         for (List<AlignCalcWorkerI> workers : workersLists)
         {
-          if (workers!=null)
+          if (workers != null)
           {
-            synchronized (workers) {
+            synchronized (workers)
+            {
               working |= workers.size() > 0;
             }
           }
index 0ebd3c3..d108d4d 100644 (file)
@@ -302,7 +302,8 @@ public class DBRefFetcher implements Runnable
       }
     } catch (Exception e)
     {
-      jalview.bin.Console.errPrintln("Couldn't locate PICR service instance.\n");
+      jalview.bin.Console
+              .errPrintln("Couldn't locate PICR service instance.\n");
       e.printStackTrace();
     }
 
@@ -316,7 +317,8 @@ public class DBRefFetcher implements Runnable
     while (sdataset.size() > 0 && db < dbSources.length)
     {
       int maxqlen = 1; // default number of queries made at one time
-      jalview.bin.Console.outPrintln("Verifying against " + dbSources[db].getDbName());
+      jalview.bin.Console
+              .outPrintln("Verifying against " + dbSources[db].getDbName());
 
       // iterate through db for each remaining un-verified sequence
       SequenceI[] currSeqs = new SequenceI[sdataset.size()];
@@ -678,8 +680,8 @@ public class DBRefFetcher implements Runnable
           }
         }
 
-        jalview.bin.Console.outPrintln("Adding dbrefs to " + sequence.getName()
-                + " from " + dbSource + " sequence : "
+        jalview.bin.Console.outPrintln("Adding dbrefs to "
+                + sequence.getName() + " from " + dbSource + " sequence : "
                 + retrievedSeq.getName());
         sequence.transferAnnotation(retrievedSeq, mp);
 
index ff6f74f..f87b6f1 100644 (file)
@@ -153,7 +153,8 @@ public class JobStateSummary
         }
         // } catch (OutOfMemoryError e)
         // {
-        // jalview.bin.Console.errPrintln("Out of memory when displaying status. Squashing
+        // jalview.bin.Console.errPrintln("Out of memory when displaying status.
+        // Squashing
         // error.");
         // wsInfo.appendProgressText(j.jobnum,
         // "..\n(Out of memory when displaying status)\n");
index 3f294d0..ac9a245 100644 (file)
@@ -51,7 +51,7 @@ public interface MappableContactMatrixI extends ContactMatrixI
   MapList getMapFor(SequenceI sequenceRef);
 
   /**
-   * Locate a position in the mapped sequence for a single column in the matrix. 
+   * Locate a position in the mapped sequence for a single column in the matrix.
    * this to resolve positions corresponding to column clusters
    * 
    * @param localFrame
@@ -63,8 +63,9 @@ public interface MappableContactMatrixI extends ContactMatrixI
   int[] getMappedPositionsFor(SequenceI localFrame, int column);
 
   /**
-   * Locate a position in the mapped sequence for a contiguous range of columns in the matrix 
-   * use this to resolve positions corresponding to column clusters
+   * Locate a position in the mapped sequence for a contiguous range of columns
+   * in the matrix use this to resolve positions corresponding to column
+   * clusters
    * 
    * @param localFrame
    *          - sequence derivced from reference sequence
index 5f27a2c..c299a4d 100644 (file)
@@ -21,8 +21,8 @@ public abstract class MappableContactMatrix<T extends MappableContactMatrix<T>>
   /**
    * the matrix that is being mapped to
    */
-  protected ContactMatrixI mappedMatrix=null;
-  
+  protected ContactMatrixI mappedMatrix = null;
+
   public ContactListI getContactList(int column)
   {
     return mappedMatrix.getContactList(column);
@@ -53,7 +53,7 @@ public abstract class MappableContactMatrix<T extends MappableContactMatrix<T>>
   {
     return mappedMatrix;
   }
-  
+
   @Override
   public GroupSetI getGroupSet()
   {
@@ -65,7 +65,7 @@ public abstract class MappableContactMatrix<T extends MappableContactMatrix<T>>
   {
     mappedMatrix.setGroupSet(makeGroups);
   }
-  
+
   /**
    * the sequence and how it is mapped to the matrix
    */
@@ -254,9 +254,9 @@ public abstract class MappableContactMatrix<T extends MappableContactMatrix<T>>
               + "' is not mappable for the given localFrame sequence. ("
               + localFrame.getName() + ")");
     }
-    
+
     // now look up from-to matrix columns in toSeq frame
-    
+
     if (toSeq == null)
     {
       // no mapping - so we assume 1:1
@@ -266,33 +266,33 @@ public abstract class MappableContactMatrix<T extends MappableContactMatrix<T>>
     // first locate on reference sequence
 
     int[] mappedPositions = toSeq.locateInFrom(from, to);
-    if (mappedPositions==null)
+    if (mappedPositions == null)
     {
       return null;
     }
-    
+
     // and now map to localFrame
     // from-to columns on the associated sequence should be
     // i. restricted to positions in localFrame
-    // ii. 
-
-//    int s = -1, e = -1;
-//    for (int p = 0; p < mappedPositions.length; p++)
-//    {
-//      if (s == -1 && mappedPositions[p] >= localFrame.getStart())
-//      {
-//        s = p; // remember first position within local frame
-//      }
-//      if (e == -1 || mappedPositions[p] <= localFrame.getEnd())
-//      {
-//        // update end pointer
-//        e = p;
-//        // compute local map
-//        mappedPositions[p] = localFrame.findIndex(mappedPositions[p]);
-//      }
-//    }
-//    int[] _trimmed = new int[e - s + 1];
-//    return _trimmed;
+    // ii.
+
+    // int s = -1, e = -1;
+    // for (int p = 0; p < mappedPositions.length; p++)
+    // {
+    // if (s == -1 && mappedPositions[p] >= localFrame.getStart())
+    // {
+    // s = p; // remember first position within local frame
+    // }
+    // if (e == -1 || mappedPositions[p] <= localFrame.getEnd())
+    // {
+    // // update end pointer
+    // e = p;
+    // // compute local map
+    // mappedPositions[p] = localFrame.findIndex(mappedPositions[p]);
+    // }
+    // }
+    // int[] _trimmed = new int[e - s + 1];
+    // return _trimmed;
     return mappedPositions;
   }
 
@@ -475,15 +475,16 @@ public abstract class MappableContactMatrix<T extends MappableContactMatrix<T>>
   }
 
   /**
-   * get a specific element of the underlying contact matrix in its data-local coordinates
-   * rather than the mapped frame. Implementations are allowed to throw
-   * RunTimeExceptions if _column/i are out of bounds
+   * get a specific element of the underlying contact matrix in its data-local
+   * coordinates rather than the mapped frame. Implementations are allowed to
+   * throw RunTimeExceptions if _column/i are out of bounds
    * 
    * @param _column
    * @param i
    * @return
    */
-  public double getElementAt(int _column, int i) {
+  public double getElementAt(int _column, int i)
+  {
     return mappedMatrix.getElementAt(_column, i);
   }
 
index dcd2022..397a84b 100644 (file)
@@ -41,7 +41,6 @@ public class PAEContactMatrix extends
         MappableContactMatrix<PAEContactMatrix> implements ContactMatrixI
 {
 
-
   @SuppressWarnings("unchecked")
   public PAEContactMatrix(SequenceI _refSeq, Map<String, Object> pae_obj)
           throws FileFormatException
@@ -68,7 +67,7 @@ public class PAEContactMatrix extends
    */
   public PAEContactMatrix(SequenceI _refSeq, float[][] matrix)
   {
-    mappedMatrix=new FloatContactMatrix(matrix);
+    mappedMatrix = new FloatContactMatrix(matrix);
     setRefSeq(_refSeq);
   }
 
@@ -83,7 +82,7 @@ public class PAEContactMatrix extends
   public PAEContactMatrix(SequenceI newRefSeq, MapList newFromMapList,
           float[][] elements2, GroupSet grps2)
   {
-    this(newRefSeq, new FloatContactMatrix(elements2,grps2));
+    this(newRefSeq, new FloatContactMatrix(elements2, grps2));
     toSeq = newFromMapList;
   }
 
@@ -93,6 +92,7 @@ public class PAEContactMatrix extends
     mappedMatrix = floatContactMatrix;
     setRefSeq(_refSeq);
   }
+
   public PAEContactMatrix(SequenceI _refSeq, MapList newFromMapList,
           ContactMatrixI floatContactMatrix)
   {
@@ -100,7 +100,7 @@ public class PAEContactMatrix extends
     setRefSeq(_refSeq);
     toSeq = newFromMapList;
   }
-  
+
   @Override
   protected PAEContactMatrix newMappableContactMatrix(SequenceI newRefSeq,
           MapList newFromMapList)
@@ -155,7 +155,7 @@ public class PAEContactMatrix extends
       row++;
       col = 0;
     }
-    mappedMatrix=new FloatContactMatrix(elements);
+    mappedMatrix = new FloatContactMatrix(elements);
   }
 
   /**
@@ -172,8 +172,8 @@ public class PAEContactMatrix extends
     Iterator<Long> rows = ((List<Long>) pae_obj.get("residue1")).iterator();
     Iterator<Long> cols = ((List<Long>) pae_obj.get("residue2")).iterator();
     // two pass - to allocate the elements array
-    
-    int maxrow=-1,maxcol=-1;
+
+    int maxrow = -1, maxcol = -1;
     while (rows.hasNext())
     {
       int row = rows.next().intValue();
@@ -206,10 +206,10 @@ public class PAEContactMatrix extends
       {
         maxcol = col;
       }
-      elements[col - 1][row-1] = escore;
+      elements[col - 1][row - 1] = escore;
     }
 
-    mappedMatrix=new FloatContactMatrix(elements);
+    mappedMatrix = new FloatContactMatrix(elements);
   }
 
   @Override
@@ -238,7 +238,6 @@ public class PAEContactMatrix extends
     return PAEMATRIX;
   }
 
-
   public static void validateContactMatrixFile(String fileName)
           throws FileFormatException, IOException
   {
@@ -268,11 +267,13 @@ public class PAEContactMatrix extends
               "No data in PAE matrix read from '" + fileName + "'");
     }
   }
+
   @Override
   public boolean equals(Object obj)
   {
     return super.equals(obj);
   }
+
   @Override
   public int hashCode()
   {
index bef6976..7ea5ea8 100644 (file)
@@ -57,7 +57,8 @@ public abstract class EbiFileRetrievedProxy extends DbSourceProxyImpl
       }
     } catch (Exception e)
     {
-      jalview.bin.Console.errPrintln("Warning: problems reading temp file " + file);
+      jalview.bin.Console
+              .errPrintln("Warning: problems reading temp file " + file);
       return null;
     }
     return bf;
index a4d9633..92a0151 100644 (file)
@@ -287,7 +287,8 @@ public abstract class EmblXmlSource extends EbiFileRetrievedProxy
       System.err
               .println("Please report the following to help@jalview.org :");
       jalview.bin.Console.errPrintln("EMBL Record " + accession);
-      jalview.bin.Console.errPrintln("Resulted in exception: " + e.getMessage());
+      jalview.bin.Console
+              .errPrintln("Resulted in exception: " + e.getMessage());
       e.printStackTrace(System.err);
     }
 
index 68a7328..797726f 100644 (file)
@@ -138,7 +138,8 @@ public class Pdb extends EbiFileRetrievedProxy
 
     if (!isValidReference(id))
     {
-      jalview.bin.Console.errPrintln("Ignoring invalid pdb query: '" + id + "'");
+      jalview.bin.Console
+              .errPrintln("Ignoring invalid pdb query: '" + id + "'");
       stopQuery();
       return null;
     }
index 3eef460..8aca9a2 100644 (file)
@@ -136,8 +136,10 @@ public class EBIFetchClient
     String database = parseIds(ids, querystring);
     if (database == null)
     {
-      jalview.bin.Console.errPrintln("Invalid Query string : '" + ids + "'");
-      jalview.bin.Console.errPrintln("Should be of form 'dbname:q1;q2;q3;q4'");
+      jalview.bin.Console
+              .errPrintln("Invalid Query string : '" + ids + "'");
+      jalview.bin.Console
+              .errPrintln("Should be of form 'dbname:q1;q2;q3;q4'");
       return null;
     }
 
@@ -231,16 +233,17 @@ public class EBIFetchClient
               "Warning: response code " + responseCode + " for " + url);
     } catch (OutOfMemoryError er)
     {
-      jalview.bin.Console.outPrintln("OUT OF MEMORY DOWNLOADING QUERY FROM " + database
-              + ":\n" + ids);
+      jalview.bin.Console.outPrintln("OUT OF MEMORY DOWNLOADING QUERY FROM "
+              + database + ":\n" + ids);
       throw er;
     } catch (Exception ex)
     {
       if (!ex.getMessage().startsWith(
               "uk.ac.ebi.jdbfetch.exceptions.DbfNoEntryFoundException"))
       {
-        jalview.bin.Console.errPrintln("Unexpected exception when retrieving from "
-                + database + "\nQuery was : '" + ids + "'");
+        jalview.bin.Console
+                .errPrintln("Unexpected exception when retrieving from "
+                        + database + "\nQuery was : '" + ids + "'");
         ex.printStackTrace(System.err);
       }
     } finally
index 805f64c..dd734c8 100644 (file)
@@ -616,7 +616,8 @@ class SeqSearchWSThread extends JWS1Thread implements WSClientI
   {
     if (!newFrame)
     {
-      jalview.bin.Console.errPrintln("MERGE WITH OLD FRAME NOT IMPLEMENTED");
+      jalview.bin.Console
+              .errPrintln("MERGE WITH OLD FRAME NOT IMPLEMENTED");
       return;
     }
     // each subjob is an independent alignment for the moment
index 3b56a70..2da8dd3 100644 (file)
@@ -259,11 +259,13 @@ public abstract class AbstractJabaCalcWorker extends AlignCalcWorker
           {
             if (cancelJob(rslt))
             {
-              jalview.bin.Console.errPrintln("Cancelled AACon job: " + rslt);
+              jalview.bin.Console
+                      .errPrintln("Cancelled AACon job: " + rslt);
             }
             else
             {
-              jalview.bin.Console.errPrintln("FAILED TO CANCEL AACon job: " + rslt);
+              jalview.bin.Console
+                      .errPrintln("FAILED TO CANCEL AACon job: " + rslt);
             }
 
           } catch (Exception x)
@@ -445,7 +447,8 @@ public abstract class AbstractJabaCalcWorker extends AlignCalcWorker
       }
       else
       {
-        jalview.bin.Console.errPrintln("Job " + id + " couldn't be cancelled.");
+        jalview.bin.Console
+                .errPrintln("Job " + id + " couldn't be cancelled.");
       }
     } catch (Exception q)
     {
index e4d0669..84aa1a6 100644 (file)
@@ -132,13 +132,15 @@ public class JabaWsServerQuery implements Runnable
             svccategories = registry.getServiceCategories();
 
             // dan test
-            // jalview.bin.Console.outPrintln("registry.getServiceCategories: " +
+            // jalview.bin.Console.outPrintln("registry.getServiceCategories: "
+            // +
             // svccategories.toString());
 
           }
         } catch (Exception ex)
         {
-          jalview.bin.Console.errPrintln("Exception whilst trying to get at registry:");
+          jalview.bin.Console.errPrintln(
+                  "Exception whilst trying to get at registry:");
           ex.printStackTrace();
           // if that failed, then we are probably working with a JABAWS1 server.
           // in that case, look for each service endpoint
@@ -169,8 +171,9 @@ public class JabaWsServerQuery implements Runnable
               service = Jws2Client.connect(jwsserver, srv);
             } catch (Exception e)
             {
-              jalview.bin.Console.errPrintln("Jws2 Discoverer: Problem on " + jwsserver
-                      + " with service " + srv + ":\n" + e.getMessage());
+              jalview.bin.Console.errPrintln("Jws2 Discoverer: Problem on "
+                      + jwsserver + " with service " + srv + ":\n"
+                      + e.getMessage());
               if (!(e instanceof javax.xml.ws.WebServiceException))
               {
                 e.printStackTrace();
@@ -249,8 +252,8 @@ public class JabaWsServerQuery implements Runnable
         result = false;
       } catch (IOException e)
       {
-        jalview.bin.Console.errPrintln("Error connecting to server: " + server + ": "
-                + e.toString());
+        jalview.bin.Console.errPrintln("Error connecting to server: "
+                + server + ": " + e.toString());
         result = false;
       }
     }
index 47e82de..3d3e6cb 100644 (file)
@@ -142,9 +142,9 @@ public abstract class JabawsCalcWorker extends AbstractJabaCalcWorker
           List<AlignmentAnnotation> ourAnnot, String typeName,
           String calcId, SequenceI dseq, int base, Score scr)
   {
-    jalview.bin.Console.outPrintln("Creating annotation on dseq:" + dseq.getStart()
-            + " base is " + base + " and length=" + dseq.getLength()
-            + " == " + scr.getScores().size());
+    jalview.bin.Console.outPrintln("Creating annotation on dseq:"
+            + dseq.getStart() + " base is " + base + " and length="
+            + dseq.getLength() + " == " + scr.getScores().size());
     // AlignmentAnnotation annotation = new AlignmentAnnotation(
     // scr.getMethod(), typeName, new Annotation[]
     // {}, 0, -1, AlignmentAnnotation.LINE_GRAPH);
index 13d60de..53f447e 100644 (file)
@@ -156,9 +156,9 @@ public abstract class JabawsMsaInterfaceAlignCalcWorker
           List<AlignmentAnnotation> ourAnnot, String typeName,
           String calcId, SequenceI dseq, int base, Score scr)
   {
-    jalview.bin.Console.outPrintln("Creating annotation on dseq:" + dseq.getStart()
-            + " base is " + base + " and length=" + dseq.getLength()
-            + " == " + scr.getScores().size());
+    jalview.bin.Console.outPrintln("Creating annotation on dseq:"
+            + dseq.getStart() + " base is " + base + " and length="
+            + dseq.getLength() + " == " + scr.getScores().size());
     // AlignmentAnnotation annotation = new AlignmentAnnotation(
     // scr.getMethod(), typeName, new Annotation[]
     // {}, 0, -1, AlignmentAnnotation.LINE_GRAPH);
index ca36a51..2e4631f 100644 (file)
@@ -600,8 +600,10 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
               {
                 if (getDiscoverer().services != null)
                 {
-                  jalview.bin.Console.outPrintln("Changesupport: There are now "
-                          + getDiscoverer().services.size() + " services");
+                  jalview.bin.Console
+                          .outPrintln("Changesupport: There are now "
+                                  + getDiscoverer().services.size()
+                                  + " services");
                   int i = 1;
                   for (Jws2Instance instance : getDiscoverer().services)
                   {
index 0fb36ad..c54a86a 100644 (file)
@@ -79,7 +79,8 @@ public class ParameterUtils
       Option o = options.getArgumentByOptionName(oname);
       if (o == null)
       {
-        jalview.bin.Console.outPrintln("WARN ignoring unsuppoted parameter: " + oname);
+        jalview.bin.Console
+                .outPrintln("WARN ignoring unsuppoted parameter: " + oname);
         continue;
       }
       if (o instanceof Parameter)
index 9e49ce7..842e7e9 100644 (file)
@@ -114,8 +114,9 @@ public class Jws2Instance implements AutoCloseable
         }
       } catch (Exception ex)
       {
-        jalview.bin.Console.errPrintln("Exception when retrieving presets for service "
-                + serviceType + " at " + hosturl);
+        jalview.bin.Console
+                .errPrintln("Exception when retrieving presets for service "
+                        + serviceType + " at " + hosturl);
       }
     }
     return presets;
@@ -190,7 +191,8 @@ public class Jws2Instance implements AutoCloseable
                         : null));
       } catch (Exception ex)
       {
-        jalview.bin.Console.errPrintln("Unexpected exception creating JabaParamStore.");
+        jalview.bin.Console.errPrintln(
+                "Unexpected exception creating JabaParamStore.");
         ex.printStackTrace();
       }
 
index 450f1b4..2a39c57 100644 (file)
@@ -134,7 +134,8 @@ public class RestClient extends WSClient
   @Override
   public void cancelJob()
   {
-    jalview.bin.Console.errPrintln("Cannot cancel this job type: " + service);
+    jalview.bin.Console
+            .errPrintln("Cannot cancel this job type: " + service);
   }
 
   @Override
index 92cb7af..58e0b29 100644 (file)
@@ -227,7 +227,8 @@ public class SiftsClient implements SiftsClientI
     if (siftsFile.exists())
     {
       // The line below is required for unit testing... don't comment it out!!!
-      jalview.bin.Console.outPrintln(">>> SIFTS File already downloaded for " + pdbId);
+      jalview.bin.Console
+              .outPrintln(">>> SIFTS File already downloaded for " + pdbId);
 
       if (isFileOlderThanThreshold(siftsFile,
               SiftsSettings.getCacheThresholdInDays()))
@@ -330,7 +331,8 @@ public class SiftsClient implements SiftsClientI
       }
     }
 
-    // jalview.bin.Console.outPrintln(">> Download ftp url : " + siftsFileFTPURL);
+    // jalview.bin.Console.outPrintln(">> Download ftp url : " +
+    // siftsFileFTPURL);
     // long now = System.currentTimeMillis();
     URL url = new URL(siftsFileFTPURL);
     URLConnection conn = url.openConnection();
@@ -344,17 +346,19 @@ public class SiftsClient implements SiftsClientI
     }
     outputStream.close();
     inputStream.close();
-    // jalview.bin.Console.outPrintln(">>> File downloaded : " + downloadedSiftsFile
+    // jalview.bin.Console.outPrintln(">>> File downloaded : " +
+    // downloadedSiftsFile
     // + " took " + (System.currentTimeMillis() - now) + "ms");
     return downloadTo;
   }
 
   public static String getDownloadUrlFor(String siftFile)
   {
-    String durl = SIFTS_SPLIT_FTP_BASE_URL+siftFile.substring(1, 3)+"/"+siftFile;
-    Console.trace("SIFTS URL for "+siftFile+" is "+durl);
+    String durl = SIFTS_SPLIT_FTP_BASE_URL + siftFile.substring(1, 3) + "/"
+            + siftFile;
+    Console.trace("SIFTS URL for " + siftFile + " is " + durl);
     return durl;
-    
+
   }
 
   /**
@@ -459,8 +463,8 @@ public class SiftsClient implements SiftsClientI
       seq = seq.getDatasetSequence();
     }
     structId = (chain == null) ? pdbId : pdbId + "|" + chain;
-    jalview.bin.Console.outPrintln("Getting SIFTS mapping for " + structId + ": seq "
-            + seq.getName());
+    jalview.bin.Console.outPrintln("Getting SIFTS mapping for " + structId
+            + ": seq " + seq.getName());
 
     final StringBuilder mappingDetails = new StringBuilder(128);
     PrintStream ps = new PrintStream(System.out)
@@ -544,7 +548,8 @@ public class SiftsClient implements SiftsClientI
 
     if (mapping.isEmpty())
     {
-      throw new SiftsException("SIFTS mapping failed for "+entityId+" and "+seq.getName());
+      throw new SiftsException("SIFTS mapping failed for " + entityId
+              + " and " + seq.getName());
     }
     // also construct a mapping object between the seq-coord sys and the PDB
     // seq's coord sys
@@ -662,7 +667,8 @@ public class SiftsClient implements SiftsClientI
     int firstPDBResNum = UNASSIGNED;
     for (Segment segment : segments)
     {
-      // jalview.bin.Console.outPrintln("Mapping segments : " + segment.getSegId() + "\\"s
+      // jalview.bin.Console.outPrintln("Mapping segments : " +
+      // segment.getSegId() + "\\"s
       // + segStartEnd);
       List<Residue> residues = segment.getListResidue().getResidue();
       for (Residue residue : residues)
@@ -965,7 +971,8 @@ public class SiftsClient implements SiftsClientI
    */
   public Entity getEntityByMostOptimalMatchedId(String chainId)
   {
-    // jalview.bin.Console.outPrintln("---> advanced greedy entityId matching block
+    // jalview.bin.Console.outPrintln("---> advanced greedy entityId matching
+    // block
     // entered..");
     List<Entity> entities = siftsEntry.getEntity();
     SiftsEntitySortPojo[] sPojo = new SiftsEntitySortPojo[entities.size()];
@@ -1001,7 +1008,8 @@ public class SiftsClient implements SiftsClientI
       ++count;
     }
     Arrays.sort(sPojo, Collections.reverseOrder());
-    // jalview.bin.Console.outPrintln("highest matched entity : " + sPojo[0].entityId);
+    // jalview.bin.Console.outPrintln("highest matched entity : " +
+    // sPojo[0].entityId);
     // jalview.bin.Console.outPrintln("highest matched pid : " + sPojo[0].pid);
 
     if (sPojo[0].entityId != null)
index 8299b02..91d88c2 100644 (file)
@@ -90,8 +90,9 @@ public class UrlDownloadClient
         }
       } catch (IOException e)
       {
-        jalview.bin.Console.outPrintln("Exception while closing download channel: "
-                + e.getMessage());
+        jalview.bin.Console
+                .outPrintln("Exception while closing download channel: "
+                        + e.getMessage());
       }
       try
       {
@@ -101,8 +102,9 @@ public class UrlDownloadClient
         }
       } catch (IOException e)
       {
-        jalview.bin.Console.outPrintln("Exception while deleting download temp file: "
-                + e.getMessage());
+        jalview.bin.Console
+                .outPrintln("Exception while deleting download temp file: "
+                        + e.getMessage());
       }
     }
 
index c412c36..bb26303 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.math.BigInteger;
@@ -18,314 +17,288 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for anonymous complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element name="alcodon" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *           &amp;lt;complexType&amp;gt;
- *             &amp;lt;complexContent&amp;gt;
- *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                 &amp;lt;attribute name="pos1" type="{http://www.w3.org/2001/XMLSchema}integer" /&amp;gt;
- *                 &amp;lt;attribute name="pos2" type="{http://www.w3.org/2001/XMLSchema}integer" /&amp;gt;
- *                 &amp;lt;attribute name="pos3" type="{http://www.w3.org/2001/XMLSchema}integer" /&amp;gt;
- *               &amp;lt;/restriction&amp;gt;
- *             &amp;lt;/complexContent&amp;gt;
- *           &amp;lt;/complexType&amp;gt;
- *         &amp;lt;/element&amp;gt;
- *         &amp;lt;element name="alcodMap" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *           &amp;lt;complexType&amp;gt;
- *             &amp;lt;complexContent&amp;gt;
- *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                 &amp;lt;sequence&amp;gt;
- *                   &amp;lt;element ref="{www.vamsas.ac.uk/jalview/version2}Mapping"/&amp;gt;
- *                 &amp;lt;/sequence&amp;gt;
- *                 &amp;lt;attribute name="dnasq" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *               &amp;lt;/restriction&amp;gt;
- *             &amp;lt;/complexContent&amp;gt;
- *           &amp;lt;/complexType&amp;gt;
- *         &amp;lt;/element&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="alcodon" maxOccurs="unbounded"
+ * minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+ * name="pos1" type="{http://www.w3.org/2001/XMLSchema}integer" /&amp;gt;
+ * &amp;lt;attribute name="pos2"
+ * type="{http://www.w3.org/2001/XMLSchema}integer" /&amp;gt; &amp;lt;attribute
+ * name="pos3" type="{http://www.w3.org/2001/XMLSchema}integer" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+ * name="alcodMap" maxOccurs="unbounded" minOccurs="0"&amp;gt;
+ * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element
+ * ref="{www.vamsas.ac.uk/jalview/version2}Mapping"/&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="dnasq" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;/restriction&amp;gt;
+ * &amp;lt;/complexContent&amp;gt; &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "alcodon",
-    "alcodMap"
-})
+@XmlType(name = "", propOrder = { "alcodon", "alcodMap" })
 @XmlRootElement(name = "AlcodonFrame")
-public class AlcodonFrame {
+public class AlcodonFrame
+{
+
+  protected List<AlcodonFrame.Alcodon> alcodon;
+
+  protected List<AlcodonFrame.AlcodMap> alcodMap;
 
-    protected List<AlcodonFrame.Alcodon> alcodon;
-    protected List<AlcodonFrame.AlcodMap> alcodMap;
+  /**
+   * Gets the value of the alcodon property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the alcodon property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getAlcodon().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link AlcodonFrame.Alcodon }
+   * 
+   * 
+   */
+  public List<AlcodonFrame.Alcodon> getAlcodon()
+  {
+    if (alcodon == null)
+    {
+      alcodon = new ArrayList<AlcodonFrame.Alcodon>();
+    }
+    return this.alcodon;
+  }
+
+  /**
+   * Gets the value of the alcodMap property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the alcodMap property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getAlcodMap().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link AlcodonFrame.AlcodMap }
+   * 
+   * 
+   */
+  public List<AlcodonFrame.AlcodMap> getAlcodMap()
+  {
+    if (alcodMap == null)
+    {
+      alcodMap = new ArrayList<AlcodonFrame.AlcodMap>();
+    }
+    return this.alcodMap;
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+   * &amp;lt;sequence&amp;gt; &amp;lt;element
+   * ref="{www.vamsas.ac.uk/jalview/version2}Mapping"/&amp;gt;
+   * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="dnasq" use="required"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(name = "", propOrder = { "mapping" })
+  public static class AlcodMap
+  {
+
+    @XmlElement(name = "Mapping", required = true)
+    protected Mapping mapping;
+
+    @XmlAttribute(name = "dnasq", required = true)
+    protected String dnasq;
 
     /**
-     * Gets the value of the alcodon property.
      * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the alcodon property.
+     * a Mapping entry and an associated protein sequence
      * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getAlcodon().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link AlcodonFrame.Alcodon }
      * 
+     * @return possible object is {@link Mapping }
      * 
      */
-    public List<AlcodonFrame.Alcodon> getAlcodon() {
-        if (alcodon == null) {
-            alcodon = new ArrayList<AlcodonFrame.Alcodon>();
-        }
-        return this.alcodon;
+    public Mapping getMapping()
+    {
+      return mapping;
     }
 
     /**
-     * Gets the value of the alcodMap property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the alcodMap property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getAlcodMap().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link AlcodonFrame.AlcodMap }
+     * Sets the value of the mapping property.
      * 
+     * @param value
+     *          allowed object is {@link Mapping }
      * 
      */
-    public List<AlcodonFrame.AlcodMap> getAlcodMap() {
-        if (alcodMap == null) {
-            alcodMap = new ArrayList<AlcodonFrame.AlcodMap>();
-        }
-        return this.alcodMap;
+    public void setMapping(Mapping value)
+    {
+      this.mapping = value;
     }
 
-
     /**
-     * &lt;p&gt;Java class for anonymous complex type.
+     * Gets the value of the dnasq property.
      * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+     * @return possible object is {@link String }
      * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;sequence&amp;gt;
-     *         &amp;lt;element ref="{www.vamsas.ac.uk/jalview/version2}Mapping"/&amp;gt;
-     *       &amp;lt;/sequence&amp;gt;
-     *       &amp;lt;attribute name="dnasq" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
+     */
+    public String getDnasq()
+    {
+      return dnasq;
+    }
+
+    /**
+     * Sets the value of the dnasq property.
      * 
+     * @param value
+     *          allowed object is {@link String }
      * 
      */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "mapping"
-    })
-    public static class AlcodMap {
+    public void setDnasq(String value)
+    {
+      this.dnasq = value;
+    }
 
-        @XmlElement(name = "Mapping", required = true)
-        protected Mapping mapping;
-        @XmlAttribute(name = "dnasq", required = true)
-        protected String dnasq;
+  }
 
-        /**
-         * 
-         *                                                                             a Mapping entry and an associated protein
-         *                                                                             sequence
-         *                                                                     
-         * 
-         * @return
-         *     possible object is
-         *     {@link Mapping }
-         *     
-         */
-        public Mapping getMapping() {
-            return mapping;
-        }
+  /**
+   * 
+   * specifies a series of aligned codons from an associated DNA sequence
+   * alignment that when translated correspond to columns of a peptide
+   * alignment. Element may have either all pos1,2,3 attributes specified, or
+   * none at all (indicating a gapped column with no translated peptide).
+   * 
+   * 
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+   * name="pos1" type="{http://www.w3.org/2001/XMLSchema}integer" /&amp;gt;
+   * &amp;lt;attribute name="pos2"
+   * type="{http://www.w3.org/2001/XMLSchema}integer" /&amp;gt;
+   * &amp;lt;attribute name="pos3"
+   * type="{http://www.w3.org/2001/XMLSchema}integer" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(name = "")
+  public static class Alcodon
+  {
 
-        /**
-         * Sets the value of the mapping property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Mapping }
-         *     
-         */
-        public void setMapping(Mapping value) {
-            this.mapping = value;
-        }
+    @XmlAttribute(name = "pos1")
+    protected BigInteger pos1;
 
-        /**
-         * Gets the value of the dnasq property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDnasq() {
-            return dnasq;
-        }
+    @XmlAttribute(name = "pos2")
+    protected BigInteger pos2;
 
-        /**
-         * Sets the value of the dnasq property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDnasq(String value) {
-            this.dnasq = value;
-        }
+    @XmlAttribute(name = "pos3")
+    protected BigInteger pos3;
 
+    /**
+     * Gets the value of the pos1 property.
+     * 
+     * @return possible object is {@link BigInteger }
+     * 
+     */
+    public BigInteger getPos1()
+    {
+      return pos1;
     }
 
-
     /**
+     * Sets the value of the pos1 property.
      * 
-     *                                                                 specifies a series of aligned codons from an
-     *                                                                 associated DNA sequence alignment that when translated
-     *                                                                 correspond to columns of a peptide alignment.
-     *                                                                 Element may have
-     *                                                                 either all pos1,2,3 attributes specified, or none at all
-     *                                                                 (indicating a gapped column with no translated peptide).
-     *                                                         
+     * @param value
+     *          allowed object is {@link BigInteger }
      * 
-     * &lt;p&gt;Java class for anonymous complex type.
+     */
+    public void setPos1(BigInteger value)
+    {
+      this.pos1 = value;
+    }
+
+    /**
+     * Gets the value of the pos2 property.
      * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+     * @return possible object is {@link BigInteger }
      * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;attribute name="pos1" type="{http://www.w3.org/2001/XMLSchema}integer" /&amp;gt;
-     *       &amp;lt;attribute name="pos2" type="{http://www.w3.org/2001/XMLSchema}integer" /&amp;gt;
-     *       &amp;lt;attribute name="pos3" type="{http://www.w3.org/2001/XMLSchema}integer" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
+     */
+    public BigInteger getPos2()
+    {
+      return pos2;
+    }
+
+    /**
+     * Sets the value of the pos2 property.
      * 
+     * @param value
+     *          allowed object is {@link BigInteger }
      * 
      */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Alcodon {
-
-        @XmlAttribute(name = "pos1")
-        protected BigInteger pos1;
-        @XmlAttribute(name = "pos2")
-        protected BigInteger pos2;
-        @XmlAttribute(name = "pos3")
-        protected BigInteger pos3;
-
-        /**
-         * Gets the value of the pos1 property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigInteger }
-         *     
-         */
-        public BigInteger getPos1() {
-            return pos1;
-        }
-
-        /**
-         * Sets the value of the pos1 property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigInteger }
-         *     
-         */
-        public void setPos1(BigInteger value) {
-            this.pos1 = value;
-        }
-
-        /**
-         * Gets the value of the pos2 property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigInteger }
-         *     
-         */
-        public BigInteger getPos2() {
-            return pos2;
-        }
-
-        /**
-         * Sets the value of the pos2 property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigInteger }
-         *     
-         */
-        public void setPos2(BigInteger value) {
-            this.pos2 = value;
-        }
-
-        /**
-         * Gets the value of the pos3 property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigInteger }
-         *     
-         */
-        public BigInteger getPos3() {
-            return pos3;
-        }
+    public void setPos2(BigInteger value)
+    {
+      this.pos2 = value;
+    }
 
-        /**
-         * Sets the value of the pos3 property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigInteger }
-         *     
-         */
-        public void setPos3(BigInteger value) {
-            this.pos3 = value;
-        }
+    /**
+     * Gets the value of the pos3 property.
+     * 
+     * @return possible object is {@link BigInteger }
+     * 
+     */
+    public BigInteger getPos3()
+    {
+      return pos3;
+    }
 
+    /**
+     * Sets the value of the pos3 property.
+     * 
+     * @param value
+     *          allowed object is {@link BigInteger }
+     * 
+     */
+    public void setPos3(BigInteger value)
+    {
+      this.pos3 = value;
     }
 
+  }
+
 }
index 261e0ed..26e9124 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.util.ArrayList;
@@ -17,786 +16,794 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for anonymous complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element ref="{www.vamsas.ac.uk/jalview/version2}annotationElement" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="label" type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt;
- *         &amp;lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="thresholdLine" minOccurs="0"&amp;gt;
- *           &amp;lt;complexType&amp;gt;
- *             &amp;lt;complexContent&amp;gt;
- *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                 &amp;lt;attribute name="label" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                 &amp;lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
- *                 &amp;lt;attribute name="colour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *               &amp;lt;/restriction&amp;gt;
- *             &amp;lt;/complexContent&amp;gt;
- *           &amp;lt;/complexType&amp;gt;
- *         &amp;lt;/element&amp;gt;
- *         &amp;lt;element name="contactmatrix" type="{www.vamsas.ac.uk/jalview/version2}MapOnAMatrixType" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="property" type="{www.vamsas.ac.uk/jalview/version2}property" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *       &amp;lt;attribute name="graph" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *       &amp;lt;attribute name="graphType" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *       &amp;lt;attribute name="sequenceRef" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="groupRef" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="graphColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *       &amp;lt;attribute name="graphGroup" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *       &amp;lt;attribute name="graphHeight" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *       &amp;lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="scoreOnly" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *       &amp;lt;attribute name="score" type="{http://www.w3.org/2001/XMLSchema}double" /&amp;gt;
- *       &amp;lt;attribute name="visible" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *       &amp;lt;attribute name="centreColLabels" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *       &amp;lt;attribute name="scaleColLabels" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *       &amp;lt;attribute name="showAllColLabels" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *       &amp;lt;attribute name="autoCalculated" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *       &amp;lt;attribute name="belowAlignment" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
- *       &amp;lt;attribute name="calcId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element
+ * ref="{www.vamsas.ac.uk/jalview/version2}annotationElement"
+ * maxOccurs="unbounded" minOccurs="0"/&amp;gt; &amp;lt;element name="label"
+ * type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt; &amp;lt;element
+ * name="description" type="{http://www.w3.org/2001/XMLSchema}string"
+ * minOccurs="0"/&amp;gt; &amp;lt;element name="thresholdLine"
+ * minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+ * name="label" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}float"
+ * /&amp;gt; &amp;lt;attribute name="colour"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+ * name="contactmatrix"
+ * type="{www.vamsas.ac.uk/jalview/version2}MapOnAMatrixType"
+ * maxOccurs="unbounded" minOccurs="0"/&amp;gt; &amp;lt;element name="property"
+ * type="{www.vamsas.ac.uk/jalview/version2}property" maxOccurs="unbounded"
+ * minOccurs="0"/&amp;gt; &amp;lt;/sequence&amp;gt; &amp;lt;attribute
+ * name="graph" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * /&amp;gt; &amp;lt;attribute name="graphType"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="sequenceRef" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;attribute name="groupRef"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="graphColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="graphGroup"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="graphHeight" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string"
+ * /&amp;gt; &amp;lt;attribute name="scoreOnly"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+ * &amp;lt;attribute name="score"
+ * type="{http://www.w3.org/2001/XMLSchema}double" /&amp;gt; &amp;lt;attribute
+ * name="visible" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+ * &amp;lt;attribute name="centreColLabels"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="scaleColLabels" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * /&amp;gt; &amp;lt;attribute name="showAllColLabels"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="autoCalculated" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * default="false" /&amp;gt; &amp;lt;attribute name="belowAlignment"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+ * &amp;lt;attribute name="calcId"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "annotationElement",
-    "label",
-    "description",
-    "thresholdLine",
-    "contactmatrix",
-    "property"
-})
+@XmlType(
+  name = "",
+  propOrder =
+  { "annotationElement", "label", "description", "thresholdLine",
+      "contactmatrix", "property" })
 @XmlRootElement(name = "Annotation")
-public class Annotation {
-
-    protected List<AnnotationElement> annotationElement;
-    @XmlElement(required = true)
-    protected String label;
-    protected String description;
-    protected Annotation.ThresholdLine thresholdLine;
-    protected List<MapOnAMatrixType> contactmatrix;
-    protected List<Property> property;
-    @XmlAttribute(name = "graph", required = true)
-    protected boolean graph;
-    @XmlAttribute(name = "graphType")
-    protected Integer graphType;
-    @XmlAttribute(name = "sequenceRef")
-    protected String sequenceRef;
-    @XmlAttribute(name = "groupRef")
-    protected String groupRef;
-    @XmlAttribute(name = "graphColour")
-    protected Integer graphColour;
-    @XmlAttribute(name = "graphGroup")
-    protected Integer graphGroup;
-    @XmlAttribute(name = "graphHeight")
-    protected Integer graphHeight;
-    @XmlAttribute(name = "id")
-    protected String id;
-    @XmlAttribute(name = "scoreOnly")
-    protected Boolean scoreOnly;
-    @XmlAttribute(name = "score")
-    protected Double score;
-    @XmlAttribute(name = "visible")
-    protected Boolean visible;
-    @XmlAttribute(name = "centreColLabels")
-    protected Boolean centreColLabels;
-    @XmlAttribute(name = "scaleColLabels")
-    protected Boolean scaleColLabels;
-    @XmlAttribute(name = "showAllColLabels")
-    protected Boolean showAllColLabels;
-    @XmlAttribute(name = "autoCalculated")
-    protected Boolean autoCalculated;
-    @XmlAttribute(name = "belowAlignment")
-    protected Boolean belowAlignment;
-    @XmlAttribute(name = "calcId")
-    protected String calcId;
-
-    /**
-     * Gets the value of the annotationElement property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the annotationElement property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getAnnotationElement().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link AnnotationElement }
-     * 
-     * 
-     */
-    public List<AnnotationElement> getAnnotationElement() {
-        if (annotationElement == null) {
-            annotationElement = new ArrayList<AnnotationElement>();
-        }
-        return this.annotationElement;
-    }
-
-    /**
-     * Gets the value of the label property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLabel(String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the thresholdLine property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Annotation.ThresholdLine }
-     *     
-     */
-    public Annotation.ThresholdLine getThresholdLine() {
-        return thresholdLine;
-    }
-
-    /**
-     * Sets the value of the thresholdLine property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Annotation.ThresholdLine }
-     *     
-     */
-    public void setThresholdLine(Annotation.ThresholdLine value) {
-        this.thresholdLine = value;
-    }
-
-    /**
-     * Gets the value of the contactmatrix property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the contactmatrix property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getContactmatrix().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link MapOnAMatrixType }
-     * 
-     * 
-     */
-    public List<MapOnAMatrixType> getContactmatrix() {
-        if (contactmatrix == null) {
-            contactmatrix = new ArrayList<MapOnAMatrixType>();
-        }
-        return this.contactmatrix;
-    }
-
-    /**
-     * Gets the value of the property property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the property property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getProperty().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link Property }
-     * 
-     * 
-     */
-    public List<Property> getProperty() {
-        if (property == null) {
-            property = new ArrayList<Property>();
-        }
-        return this.property;
-    }
-
-    /**
-     * Gets the value of the graph property.
-     * 
-     */
-    public boolean isGraph() {
-        return graph;
-    }
-
-    /**
-     * Sets the value of the graph property.
-     * 
-     */
-    public void setGraph(boolean value) {
-        this.graph = value;
-    }
-
-    /**
-     * Gets the value of the graphType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getGraphType() {
-        return graphType;
-    }
-
-    /**
-     * Sets the value of the graphType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setGraphType(Integer value) {
-        this.graphType = value;
-    }
-
-    /**
-     * Gets the value of the sequenceRef property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSequenceRef() {
-        return sequenceRef;
-    }
-
-    /**
-     * Sets the value of the sequenceRef property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSequenceRef(String value) {
-        this.sequenceRef = value;
-    }
-
-    /**
-     * Gets the value of the groupRef property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGroupRef() {
-        return groupRef;
-    }
-
-    /**
-     * Sets the value of the groupRef property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGroupRef(String value) {
-        this.groupRef = value;
-    }
-
-    /**
-     * Gets the value of the graphColour property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getGraphColour() {
-        return graphColour;
-    }
-
-    /**
-     * Sets the value of the graphColour property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setGraphColour(Integer value) {
-        this.graphColour = value;
-    }
-
-    /**
-     * Gets the value of the graphGroup property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getGraphGroup() {
-        return graphGroup;
-    }
-
-    /**
-     * Sets the value of the graphGroup property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setGraphGroup(Integer value) {
-        this.graphGroup = value;
-    }
-
-    /**
-     * Gets the value of the graphHeight property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getGraphHeight() {
-        return graphHeight;
-    }
+public class Annotation
+{
 
-    /**
-     * Sets the value of the graphHeight property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setGraphHeight(Integer value) {
-        this.graphHeight = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
+  protected List<AnnotationElement> annotationElement;
 
-    /**
-     * Gets the value of the scoreOnly property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isScoreOnly() {
-        if (scoreOnly == null) {
-            return false;
-        } else {
-            return scoreOnly;
-        }
-    }
+  @XmlElement(required = true)
+  protected String label;
 
-    /**
-     * Sets the value of the scoreOnly property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setScoreOnly(Boolean value) {
-        this.scoreOnly = value;
-    }
+  protected String description;
 
-    /**
-     * Gets the value of the score property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Double }
-     *     
-     */
-    public Double getScore() {
-        return score;
-    }
+  protected Annotation.ThresholdLine thresholdLine;
+
+  protected List<MapOnAMatrixType> contactmatrix;
+
+  protected List<Property> property;
+
+  @XmlAttribute(name = "graph", required = true)
+  protected boolean graph;
+
+  @XmlAttribute(name = "graphType")
+  protected Integer graphType;
+
+  @XmlAttribute(name = "sequenceRef")
+  protected String sequenceRef;
+
+  @XmlAttribute(name = "groupRef")
+  protected String groupRef;
+
+  @XmlAttribute(name = "graphColour")
+  protected Integer graphColour;
+
+  @XmlAttribute(name = "graphGroup")
+  protected Integer graphGroup;
+
+  @XmlAttribute(name = "graphHeight")
+  protected Integer graphHeight;
+
+  @XmlAttribute(name = "id")
+  protected String id;
+
+  @XmlAttribute(name = "scoreOnly")
+  protected Boolean scoreOnly;
+
+  @XmlAttribute(name = "score")
+  protected Double score;
+
+  @XmlAttribute(name = "visible")
+  protected Boolean visible;
+
+  @XmlAttribute(name = "centreColLabels")
+  protected Boolean centreColLabels;
+
+  @XmlAttribute(name = "scaleColLabels")
+  protected Boolean scaleColLabels;
+
+  @XmlAttribute(name = "showAllColLabels")
+  protected Boolean showAllColLabels;
+
+  @XmlAttribute(name = "autoCalculated")
+  protected Boolean autoCalculated;
+
+  @XmlAttribute(name = "belowAlignment")
+  protected Boolean belowAlignment;
+
+  @XmlAttribute(name = "calcId")
+  protected String calcId;
+
+  /**
+   * Gets the value of the annotationElement property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the annotationElement property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getAnnotationElement().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link AnnotationElement }
+   * 
+   * 
+   */
+  public List<AnnotationElement> getAnnotationElement()
+  {
+    if (annotationElement == null)
+    {
+      annotationElement = new ArrayList<AnnotationElement>();
+    }
+    return this.annotationElement;
+  }
+
+  /**
+   * Gets the value of the label property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getLabel()
+  {
+    return label;
+  }
+
+  /**
+   * Sets the value of the label property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setLabel(String value)
+  {
+    this.label = value;
+  }
+
+  /**
+   * Gets the value of the description property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getDescription()
+  {
+    return description;
+  }
+
+  /**
+   * Sets the value of the description property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setDescription(String value)
+  {
+    this.description = value;
+  }
+
+  /**
+   * Gets the value of the thresholdLine property.
+   * 
+   * @return possible object is {@link Annotation.ThresholdLine }
+   * 
+   */
+  public Annotation.ThresholdLine getThresholdLine()
+  {
+    return thresholdLine;
+  }
+
+  /**
+   * Sets the value of the thresholdLine property.
+   * 
+   * @param value
+   *          allowed object is {@link Annotation.ThresholdLine }
+   * 
+   */
+  public void setThresholdLine(Annotation.ThresholdLine value)
+  {
+    this.thresholdLine = value;
+  }
+
+  /**
+   * Gets the value of the contactmatrix property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the contactmatrix property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getContactmatrix().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link MapOnAMatrixType }
+   * 
+   * 
+   */
+  public List<MapOnAMatrixType> getContactmatrix()
+  {
+    if (contactmatrix == null)
+    {
+      contactmatrix = new ArrayList<MapOnAMatrixType>();
+    }
+    return this.contactmatrix;
+  }
+
+  /**
+   * Gets the value of the property property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the property property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getProperty().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link Property }
+   * 
+   * 
+   */
+  public List<Property> getProperty()
+  {
+    if (property == null)
+    {
+      property = new ArrayList<Property>();
+    }
+    return this.property;
+  }
+
+  /**
+   * Gets the value of the graph property.
+   * 
+   */
+  public boolean isGraph()
+  {
+    return graph;
+  }
+
+  /**
+   * Sets the value of the graph property.
+   * 
+   */
+  public void setGraph(boolean value)
+  {
+    this.graph = value;
+  }
+
+  /**
+   * Gets the value of the graphType property.
+   * 
+   * @return possible object is {@link Integer }
+   * 
+   */
+  public Integer getGraphType()
+  {
+    return graphType;
+  }
+
+  /**
+   * Sets the value of the graphType property.
+   * 
+   * @param value
+   *          allowed object is {@link Integer }
+   * 
+   */
+  public void setGraphType(Integer value)
+  {
+    this.graphType = value;
+  }
+
+  /**
+   * Gets the value of the sequenceRef property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getSequenceRef()
+  {
+    return sequenceRef;
+  }
+
+  /**
+   * Sets the value of the sequenceRef property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setSequenceRef(String value)
+  {
+    this.sequenceRef = value;
+  }
+
+  /**
+   * Gets the value of the groupRef property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getGroupRef()
+  {
+    return groupRef;
+  }
+
+  /**
+   * Sets the value of the groupRef property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setGroupRef(String value)
+  {
+    this.groupRef = value;
+  }
+
+  /**
+   * Gets the value of the graphColour property.
+   * 
+   * @return possible object is {@link Integer }
+   * 
+   */
+  public Integer getGraphColour()
+  {
+    return graphColour;
+  }
+
+  /**
+   * Sets the value of the graphColour property.
+   * 
+   * @param value
+   *          allowed object is {@link Integer }
+   * 
+   */
+  public void setGraphColour(Integer value)
+  {
+    this.graphColour = value;
+  }
+
+  /**
+   * Gets the value of the graphGroup property.
+   * 
+   * @return possible object is {@link Integer }
+   * 
+   */
+  public Integer getGraphGroup()
+  {
+    return graphGroup;
+  }
+
+  /**
+   * Sets the value of the graphGroup property.
+   * 
+   * @param value
+   *          allowed object is {@link Integer }
+   * 
+   */
+  public void setGraphGroup(Integer value)
+  {
+    this.graphGroup = value;
+  }
+
+  /**
+   * Gets the value of the graphHeight property.
+   * 
+   * @return possible object is {@link Integer }
+   * 
+   */
+  public Integer getGraphHeight()
+  {
+    return graphHeight;
+  }
+
+  /**
+   * Sets the value of the graphHeight property.
+   * 
+   * @param value
+   *          allowed object is {@link Integer }
+   * 
+   */
+  public void setGraphHeight(Integer value)
+  {
+    this.graphHeight = value;
+  }
+
+  /**
+   * Gets the value of the id property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getId()
+  {
+    return id;
+  }
+
+  /**
+   * Sets the value of the id property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setId(String value)
+  {
+    this.id = value;
+  }
+
+  /**
+   * Gets the value of the scoreOnly property.
+   * 
+   * @return possible object is {@link Boolean }
+   * 
+   */
+  public boolean isScoreOnly()
+  {
+    if (scoreOnly == null)
+    {
+      return false;
+    }
+    else
+    {
+      return scoreOnly;
+    }
+  }
+
+  /**
+   * Sets the value of the scoreOnly property.
+   * 
+   * @param value
+   *          allowed object is {@link Boolean }
+   * 
+   */
+  public void setScoreOnly(Boolean value)
+  {
+    this.scoreOnly = value;
+  }
+
+  /**
+   * Gets the value of the score property.
+   * 
+   * @return possible object is {@link Double }
+   * 
+   */
+  public Double getScore()
+  {
+    return score;
+  }
+
+  /**
+   * Sets the value of the score property.
+   * 
+   * @param value
+   *          allowed object is {@link Double }
+   * 
+   */
+  public void setScore(Double value)
+  {
+    this.score = value;
+  }
+
+  /**
+   * Gets the value of the visible property.
+   * 
+   * @return possible object is {@link Boolean }
+   * 
+   */
+  public Boolean isVisible()
+  {
+    return visible;
+  }
+
+  /**
+   * Sets the value of the visible property.
+   * 
+   * @param value
+   *          allowed object is {@link Boolean }
+   * 
+   */
+  public void setVisible(Boolean value)
+  {
+    this.visible = value;
+  }
+
+  /**
+   * Gets the value of the centreColLabels property.
+   * 
+   * @return possible object is {@link Boolean }
+   * 
+   */
+  public Boolean isCentreColLabels()
+  {
+    return centreColLabels;
+  }
+
+  /**
+   * Sets the value of the centreColLabels property.
+   * 
+   * @param value
+   *          allowed object is {@link Boolean }
+   * 
+   */
+  public void setCentreColLabels(Boolean value)
+  {
+    this.centreColLabels = value;
+  }
+
+  /**
+   * Gets the value of the scaleColLabels property.
+   * 
+   * @return possible object is {@link Boolean }
+   * 
+   */
+  public Boolean isScaleColLabels()
+  {
+    return scaleColLabels;
+  }
+
+  /**
+   * Sets the value of the scaleColLabels property.
+   * 
+   * @param value
+   *          allowed object is {@link Boolean }
+   * 
+   */
+  public void setScaleColLabels(Boolean value)
+  {
+    this.scaleColLabels = value;
+  }
+
+  /**
+   * Gets the value of the showAllColLabels property.
+   * 
+   * @return possible object is {@link Boolean }
+   * 
+   */
+  public Boolean isShowAllColLabels()
+  {
+    return showAllColLabels;
+  }
+
+  /**
+   * Sets the value of the showAllColLabels property.
+   * 
+   * @param value
+   *          allowed object is {@link Boolean }
+   * 
+   */
+  public void setShowAllColLabels(Boolean value)
+  {
+    this.showAllColLabels = value;
+  }
+
+  /**
+   * Gets the value of the autoCalculated property.
+   * 
+   * @return possible object is {@link Boolean }
+   * 
+   */
+  public boolean isAutoCalculated()
+  {
+    if (autoCalculated == null)
+    {
+      return false;
+    }
+    else
+    {
+      return autoCalculated;
+    }
+  }
+
+  /**
+   * Sets the value of the autoCalculated property.
+   * 
+   * @param value
+   *          allowed object is {@link Boolean }
+   * 
+   */
+  public void setAutoCalculated(Boolean value)
+  {
+    this.autoCalculated = value;
+  }
+
+  /**
+   * Gets the value of the belowAlignment property.
+   * 
+   * @return possible object is {@link Boolean }
+   * 
+   */
+  public boolean isBelowAlignment()
+  {
+    if (belowAlignment == null)
+    {
+      return true;
+    }
+    else
+    {
+      return belowAlignment;
+    }
+  }
+
+  /**
+   * Sets the value of the belowAlignment property.
+   * 
+   * @param value
+   *          allowed object is {@link Boolean }
+   * 
+   */
+  public void setBelowAlignment(Boolean value)
+  {
+    this.belowAlignment = value;
+  }
+
+  /**
+   * Gets the value of the calcId property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getCalcId()
+  {
+    return calcId;
+  }
+
+  /**
+   * Sets the value of the calcId property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setCalcId(String value)
+  {
+    this.calcId = value;
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+   * name="label" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;attribute name="value"
+   * type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt; &amp;lt;attribute
+   * name="colour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(name = "")
+  public static class ThresholdLine
+  {
+
+    @XmlAttribute(name = "label")
+    protected String label;
 
-    /**
-     * Sets the value of the score property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Double }
-     *     
-     */
-    public void setScore(Double value) {
-        this.score = value;
-    }
+    @XmlAttribute(name = "value")
+    protected Float value;
 
-    /**
-     * Gets the value of the visible property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isVisible() {
-        return visible;
-    }
+    @XmlAttribute(name = "colour")
+    protected Integer colour;
 
     /**
-     * Sets the value of the visible property.
+     * Gets the value of the label property.
      * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setVisible(Boolean value) {
-        this.visible = value;
-    }
-
-    /**
-     * Gets the value of the centreColLabels property.
+     * @return possible object is {@link String }
      * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
      */
-    public Boolean isCentreColLabels() {
-        return centreColLabels;
+    public String getLabel()
+    {
+      return label;
     }
 
     /**
-     * Sets the value of the centreColLabels property.
+     * Sets the value of the label property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setCentreColLabels(Boolean value) {
-        this.centreColLabels = value;
-    }
-
-    /**
-     * Gets the value of the scaleColLabels property.
+     *          allowed object is {@link String }
      * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
      */
-    public Boolean isScaleColLabels() {
-        return scaleColLabels;
+    public void setLabel(String value)
+    {
+      this.label = value;
     }
 
     /**
-     * Sets the value of the scaleColLabels property.
+     * Gets the value of the value property.
      * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setScaleColLabels(Boolean value) {
-        this.scaleColLabels = value;
-    }
-
-    /**
-     * Gets the value of the showAllColLabels property.
+     * @return possible object is {@link Float }
      * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
      */
-    public Boolean isShowAllColLabels() {
-        return showAllColLabels;
+    public Float getValue()
+    {
+      return value;
     }
 
     /**
-     * Sets the value of the showAllColLabels property.
+     * Sets the value of the value property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setShowAllColLabels(Boolean value) {
-        this.showAllColLabels = value;
-    }
-
-    /**
-     * Gets the value of the autoCalculated property.
+     *          allowed object is {@link Float }
      * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
      */
-    public boolean isAutoCalculated() {
-        if (autoCalculated == null) {
-            return false;
-        } else {
-            return autoCalculated;
-        }
+    public void setValue(Float value)
+    {
+      this.value = value;
     }
 
     /**
-     * Sets the value of the autoCalculated property.
+     * Gets the value of the colour property.
      * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setAutoCalculated(Boolean value) {
-        this.autoCalculated = value;
-    }
-
-    /**
-     * Gets the value of the belowAlignment property.
+     * @return possible object is {@link Integer }
      * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
      */
-    public boolean isBelowAlignment() {
-        if (belowAlignment == null) {
-            return true;
-        } else {
-            return belowAlignment;
-        }
+    public Integer getColour()
+    {
+      return colour;
     }
 
     /**
-     * Sets the value of the belowAlignment property.
+     * Sets the value of the colour property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setBelowAlignment(Boolean value) {
-        this.belowAlignment = value;
-    }
-
-    /**
-     * Gets the value of the calcId property.
+     *          allowed object is {@link Integer }
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getCalcId() {
-        return calcId;
+    public void setColour(Integer value)
+    {
+      this.colour = value;
     }
 
-    /**
-     * Sets the value of the calcId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCalcId(String value) {
-        this.calcId = value;
-    }
-
-
-    /**
-     * &lt;p&gt;Java class for anonymous complex type.
-     * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-     * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;attribute name="label" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
-     *       &amp;lt;attribute name="colour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class ThresholdLine {
-
-        @XmlAttribute(name = "label")
-        protected String label;
-        @XmlAttribute(name = "value")
-        protected Float value;
-        @XmlAttribute(name = "colour")
-        protected Integer colour;
-
-        /**
-         * Gets the value of the label property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getLabel() {
-            return label;
-        }
-
-        /**
-         * Sets the value of the label property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setLabel(String value) {
-            this.label = value;
-        }
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Float }
-         *     
-         */
-        public Float getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Float }
-         *     
-         */
-        public void setValue(Float value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the colour property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getColour() {
-            return colour;
-        }
-
-        /**
-         * Sets the value of the colour property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setColour(Integer value) {
-            this.colour = value;
-        }
-
-    }
+  }
 
 }
index f7e974b..427c84d 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,242 +12,243 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for AnnotationColourScheme complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="AnnotationColourScheme"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;attribute name="aboveThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *       &amp;lt;attribute name="annotation" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="minColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *       &amp;lt;attribute name="maxColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *       &amp;lt;attribute name="colourScheme" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="threshold" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
- *       &amp;lt;attribute name="perSequence" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *       &amp;lt;attribute name="predefinedColours" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="AnnotationColourScheme"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+ * name="aboveThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="annotation"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="minColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="maxColour"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="colourScheme" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;attribute name="threshold"
+ * type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt; &amp;lt;attribute
+ * name="perSequence" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+ * &amp;lt;attribute name="predefinedColours"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "AnnotationColourScheme", namespace = "www.jalview.org")
-public class AnnotationColourScheme {
-
-    @XmlAttribute(name = "aboveThreshold")
-    protected Integer aboveThreshold;
-    @XmlAttribute(name = "annotation")
-    protected String annotation;
-    @XmlAttribute(name = "minColour")
-    protected Integer minColour;
-    @XmlAttribute(name = "maxColour")
-    protected Integer maxColour;
-    @XmlAttribute(name = "colourScheme")
-    protected String colourScheme;
-    @XmlAttribute(name = "threshold")
-    protected Float threshold;
-    @XmlAttribute(name = "perSequence")
-    protected Boolean perSequence;
-    @XmlAttribute(name = "predefinedColours")
-    protected Boolean predefinedColours;
-
-    /**
-     * Gets the value of the aboveThreshold property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getAboveThreshold() {
-        return aboveThreshold;
-    }
-
-    /**
-     * Sets the value of the aboveThreshold property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setAboveThreshold(Integer value) {
-        this.aboveThreshold = value;
-    }
-
-    /**
-     * Gets the value of the annotation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAnnotation() {
-        return annotation;
-    }
-
-    /**
-     * Sets the value of the annotation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAnnotation(String value) {
-        this.annotation = value;
-    }
-
-    /**
-     * Gets the value of the minColour property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getMinColour() {
-        return minColour;
-    }
-
-    /**
-     * Sets the value of the minColour property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setMinColour(Integer value) {
-        this.minColour = value;
-    }
-
-    /**
-     * Gets the value of the maxColour property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getMaxColour() {
-        return maxColour;
-    }
-
-    /**
-     * Sets the value of the maxColour property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setMaxColour(Integer value) {
-        this.maxColour = value;
-    }
-
-    /**
-     * Gets the value of the colourScheme property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getColourScheme() {
-        return colourScheme;
-    }
-
-    /**
-     * Sets the value of the colourScheme property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setColourScheme(String value) {
-        this.colourScheme = value;
-    }
-
-    /**
-     * Gets the value of the threshold property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Float }
-     *     
-     */
-    public Float getThreshold() {
-        return threshold;
-    }
-
-    /**
-     * Sets the value of the threshold property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Float }
-     *     
-     */
-    public void setThreshold(Float value) {
-        this.threshold = value;
-    }
-
-    /**
-     * Gets the value of the perSequence property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isPerSequence() {
-        return perSequence;
-    }
-
-    /**
-     * Sets the value of the perSequence property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setPerSequence(Boolean value) {
-        this.perSequence = value;
-    }
-
-    /**
-     * Gets the value of the predefinedColours property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isPredefinedColours() {
-        return predefinedColours;
-    }
-
-    /**
-     * Sets the value of the predefinedColours property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setPredefinedColours(Boolean value) {
-        this.predefinedColours = value;
-    }
+public class AnnotationColourScheme
+{
+
+  @XmlAttribute(name = "aboveThreshold")
+  protected Integer aboveThreshold;
+
+  @XmlAttribute(name = "annotation")
+  protected String annotation;
+
+  @XmlAttribute(name = "minColour")
+  protected Integer minColour;
+
+  @XmlAttribute(name = "maxColour")
+  protected Integer maxColour;
+
+  @XmlAttribute(name = "colourScheme")
+  protected String colourScheme;
+
+  @XmlAttribute(name = "threshold")
+  protected Float threshold;
+
+  @XmlAttribute(name = "perSequence")
+  protected Boolean perSequence;
+
+  @XmlAttribute(name = "predefinedColours")
+  protected Boolean predefinedColours;
+
+  /**
+   * Gets the value of the aboveThreshold property.
+   * 
+   * @return possible object is {@link Integer }
+   * 
+   */
+  public Integer getAboveThreshold()
+  {
+    return aboveThreshold;
+  }
+
+  /**
+   * Sets the value of the aboveThreshold property.
+   * 
+   * @param value
+   *          allowed object is {@link Integer }
+   * 
+   */
+  public void setAboveThreshold(Integer value)
+  {
+    this.aboveThreshold = value;
+  }
+
+  /**
+   * Gets the value of the annotation property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getAnnotation()
+  {
+    return annotation;
+  }
+
+  /**
+   * Sets the value of the annotation property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setAnnotation(String value)
+  {
+    this.annotation = value;
+  }
+
+  /**
+   * Gets the value of the minColour property.
+   * 
+   * @return possible object is {@link Integer }
+   * 
+   */
+  public Integer getMinColour()
+  {
+    return minColour;
+  }
+
+  /**
+   * Sets the value of the minColour property.
+   * 
+   * @param value
+   *          allowed object is {@link Integer }
+   * 
+   */
+  public void setMinColour(Integer value)
+  {
+    this.minColour = value;
+  }
+
+  /**
+   * Gets the value of the maxColour property.
+   * 
+   * @return possible object is {@link Integer }
+   * 
+   */
+  public Integer getMaxColour()
+  {
+    return maxColour;
+  }
+
+  /**
+   * Sets the value of the maxColour property.
+   * 
+   * @param value
+   *          allowed object is {@link Integer }
+   * 
+   */
+  public void setMaxColour(Integer value)
+  {
+    this.maxColour = value;
+  }
+
+  /**
+   * Gets the value of the colourScheme property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getColourScheme()
+  {
+    return colourScheme;
+  }
+
+  /**
+   * Sets the value of the colourScheme property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setColourScheme(String value)
+  {
+    this.colourScheme = value;
+  }
+
+  /**
+   * Gets the value of the threshold property.
+   * 
+   * @return possible object is {@link Float }
+   * 
+   */
+  public Float getThreshold()
+  {
+    return threshold;
+  }
+
+  /**
+   * Sets the value of the threshold property.
+   * 
+   * @param value
+   *          allowed object is {@link Float }
+   * 
+   */
+  public void setThreshold(Float value)
+  {
+    this.threshold = value;
+  }
+
+  /**
+   * Gets the value of the perSequence property.
+   * 
+   * @return possible object is {@link Boolean }
+   * 
+   */
+  public Boolean isPerSequence()
+  {
+    return perSequence;
+  }
+
+  /**
+   * Sets the value of the perSequence property.
+   * 
+   * @param value
+   *          allowed object is {@link Boolean }
+   * 
+   */
+  public void setPerSequence(Boolean value)
+  {
+    this.perSequence = value;
+  }
+
+  /**
+   * Gets the value of the predefinedColours property.
+   * 
+   * @return possible object is {@link Boolean }
+   * 
+   */
+  public Boolean isPredefinedColours()
+  {
+    return predefinedColours;
+  }
+
+  /**
+   * Sets the value of the predefinedColours property.
+   * 
+   * @param value
+   *          allowed object is {@link Boolean }
+   * 
+   */
+  public void setPredefinedColours(Boolean value)
+  {
+    this.predefinedColours = value;
+  }
 
 }
index a57101a..cd0dce9 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,190 +13,186 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for anonymous complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element name="displayCharacter" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="secondaryStructure" minOccurs="0"&amp;gt;
- *           &amp;lt;simpleType&amp;gt;
- *             &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&amp;gt;
- *               &amp;lt;length value="1"/&amp;gt;
- *             &amp;lt;/restriction&amp;gt;
- *           &amp;lt;/simpleType&amp;gt;
- *         &amp;lt;/element&amp;gt;
- *         &amp;lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}float" minOccurs="0"/&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *       &amp;lt;attribute name="position" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *       &amp;lt;attribute name="colour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="displayCharacter"
+ * type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&amp;gt;
+ * &amp;lt;element name="description"
+ * type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&amp;gt;
+ * &amp;lt;element name="secondaryStructure" minOccurs="0"&amp;gt;
+ * &amp;lt;simpleType&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}string"&amp;gt; &amp;lt;length
+ * value="1"/&amp;gt; &amp;lt;/restriction&amp;gt; &amp;lt;/simpleType&amp;gt;
+ * &amp;lt;/element&amp;gt; &amp;lt;element name="value"
+ * type="{http://www.w3.org/2001/XMLSchema}float" minOccurs="0"/&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="position" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="colour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "displayCharacter",
-    "description",
-    "secondaryStructure",
-    "value"
-})
+@XmlType(
+  name = "",
+  propOrder =
+  { "displayCharacter", "description", "secondaryStructure", "value" })
 @XmlRootElement(name = "annotationElement")
-public class AnnotationElement {
-
-    protected String displayCharacter;
-    protected String description;
-    protected String secondaryStructure;
-    protected Float value;
-    @XmlAttribute(name = "position", required = true)
-    protected int position;
-    @XmlAttribute(name = "colour")
-    protected Integer colour;
-
-    /**
-     * Gets the value of the displayCharacter property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDisplayCharacter() {
-        return displayCharacter;
-    }
-
-    /**
-     * Sets the value of the displayCharacter property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDisplayCharacter(String value) {
-        this.displayCharacter = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the secondaryStructure property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSecondaryStructure() {
-        return secondaryStructure;
-    }
-
-    /**
-     * Sets the value of the secondaryStructure property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSecondaryStructure(String value) {
-        this.secondaryStructure = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Float }
-     *     
-     */
-    public Float getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Float }
-     *     
-     */
-    public void setValue(Float value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the position property.
-     * 
-     */
-    public int getPosition() {
-        return position;
-    }
-
-    /**
-     * Sets the value of the position property.
-     * 
-     */
-    public void setPosition(int value) {
-        this.position = value;
-    }
-
-    /**
-     * Gets the value of the colour property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getColour() {
-        return colour;
-    }
-
-    /**
-     * Sets the value of the colour property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setColour(Integer value) {
-        this.colour = value;
-    }
+public class AnnotationElement
+{
+
+  protected String displayCharacter;
+
+  protected String description;
+
+  protected String secondaryStructure;
+
+  protected Float value;
+
+  @XmlAttribute(name = "position", required = true)
+  protected int position;
+
+  @XmlAttribute(name = "colour")
+  protected Integer colour;
+
+  /**
+   * Gets the value of the displayCharacter property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getDisplayCharacter()
+  {
+    return displayCharacter;
+  }
+
+  /**
+   * Sets the value of the displayCharacter property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setDisplayCharacter(String value)
+  {
+    this.displayCharacter = value;
+  }
+
+  /**
+   * Gets the value of the description property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getDescription()
+  {
+    return description;
+  }
+
+  /**
+   * Sets the value of the description property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setDescription(String value)
+  {
+    this.description = value;
+  }
+
+  /**
+   * Gets the value of the secondaryStructure property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getSecondaryStructure()
+  {
+    return secondaryStructure;
+  }
+
+  /**
+   * Sets the value of the secondaryStructure property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setSecondaryStructure(String value)
+  {
+    this.secondaryStructure = value;
+  }
+
+  /**
+   * Gets the value of the value property.
+   * 
+   * @return possible object is {@link Float }
+   * 
+   */
+  public Float getValue()
+  {
+    return value;
+  }
+
+  /**
+   * Sets the value of the value property.
+   * 
+   * @param value
+   *          allowed object is {@link Float }
+   * 
+   */
+  public void setValue(Float value)
+  {
+    this.value = value;
+  }
+
+  /**
+   * Gets the value of the position property.
+   * 
+   */
+  public int getPosition()
+  {
+    return position;
+  }
+
+  /**
+   * Sets the value of the position property.
+   * 
+   */
+  public void setPosition(int value)
+  {
+    this.position = value;
+  }
+
+  /**
+   * Gets the value of the colour property.
+   * 
+   * @return possible object is {@link Integer }
+   * 
+   */
+  public Integer getColour()
+  {
+    return colour;
+  }
+
+  /**
+   * Sets the value of the colour property.
+   * 
+   * @param value
+   *          allowed object is {@link Integer }
+   * 
+   */
+  public void setColour(Integer value)
+  {
+    this.colour = value;
+  }
 
 }
index 4ef5abc..b46439a 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.util.ArrayList;
@@ -16,171 +15,167 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for DoubleMatrix complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="DoubleMatrix"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element name="row" type="{www.jalview.org}DoubleVector" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="D" type="{www.jalview.org}DoubleVector" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="E" type="{www.jalview.org}DoubleVector" minOccurs="0"/&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *       &amp;lt;attribute name="rows" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *       &amp;lt;attribute name="columns" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="DoubleMatrix"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="row"
+ * type="{www.jalview.org}DoubleVector" maxOccurs="unbounded"
+ * minOccurs="0"/&amp;gt; &amp;lt;element name="D"
+ * type="{www.jalview.org}DoubleVector" minOccurs="0"/&amp;gt; &amp;lt;element
+ * name="E" type="{www.jalview.org}DoubleVector" minOccurs="0"/&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="rows"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="columns" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DoubleMatrix", namespace = "www.jalview.org", propOrder = {
-    "row",
-    "d",
-    "e"
-})
-public class DoubleMatrix {
-
-    protected List<DoubleVector> row;
-    @XmlElement(name = "D")
-    protected DoubleVector d;
-    @XmlElement(name = "E")
-    protected DoubleVector e;
-    @XmlAttribute(name = "rows")
-    protected Integer rows;
-    @XmlAttribute(name = "columns")
-    protected Integer columns;
-
-    /**
-     * Gets the value of the row property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the row property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getRow().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link DoubleVector }
-     * 
-     * 
-     */
-    public List<DoubleVector> getRow() {
-        if (row == null) {
-            row = new ArrayList<DoubleVector>();
-        }
-        return this.row;
-    }
-
-    /**
-     * Gets the value of the d property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DoubleVector }
-     *     
-     */
-    public DoubleVector getD() {
-        return d;
-    }
-
-    /**
-     * Sets the value of the d property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DoubleVector }
-     *     
-     */
-    public void setD(DoubleVector value) {
-        this.d = value;
-    }
-
-    /**
-     * Gets the value of the e property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DoubleVector }
-     *     
-     */
-    public DoubleVector getE() {
-        return e;
-    }
-
-    /**
-     * Sets the value of the e property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DoubleVector }
-     *     
-     */
-    public void setE(DoubleVector value) {
-        this.e = value;
-    }
-
-    /**
-     * Gets the value of the rows property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getRows() {
-        return rows;
-    }
-
-    /**
-     * Sets the value of the rows property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setRows(Integer value) {
-        this.rows = value;
-    }
-
-    /**
-     * Gets the value of the columns property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getColumns() {
-        return columns;
-    }
-
-    /**
-     * Sets the value of the columns property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setColumns(Integer value) {
-        this.columns = value;
+@XmlType(
+  name = "DoubleMatrix",
+  namespace = "www.jalview.org",
+  propOrder =
+  { "row", "d", "e" })
+public class DoubleMatrix
+{
+
+  protected List<DoubleVector> row;
+
+  @XmlElement(name = "D")
+  protected DoubleVector d;
+
+  @XmlElement(name = "E")
+  protected DoubleVector e;
+
+  @XmlAttribute(name = "rows")
+  protected Integer rows;
+
+  @XmlAttribute(name = "columns")
+  protected Integer columns;
+
+  /**
+   * Gets the value of the row property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the row property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getRow().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link DoubleVector }
+   * 
+   * 
+   */
+  public List<DoubleVector> getRow()
+  {
+    if (row == null)
+    {
+      row = new ArrayList<DoubleVector>();
     }
+    return this.row;
+  }
+
+  /**
+   * Gets the value of the d property.
+   * 
+   * @return possible object is {@link DoubleVector }
+   * 
+   */
+  public DoubleVector getD()
+  {
+    return d;
+  }
+
+  /**
+   * Sets the value of the d property.
+   * 
+   * @param value
+   *          allowed object is {@link DoubleVector }
+   * 
+   */
+  public void setD(DoubleVector value)
+  {
+    this.d = value;
+  }
+
+  /**
+   * Gets the value of the e property.
+   * 
+   * @return possible object is {@link DoubleVector }
+   * 
+   */
+  public DoubleVector getE()
+  {
+    return e;
+  }
+
+  /**
+   * Sets the value of the e property.
+   * 
+   * @param value
+   *          allowed object is {@link DoubleVector }
+   * 
+   */
+  public void setE(DoubleVector value)
+  {
+    this.e = value;
+  }
+
+  /**
+   * Gets the value of the rows property.
+   * 
+   * @return possible object is {@link Integer }
+   * 
+   */
+  public Integer getRows()
+  {
+    return rows;
+  }
+
+  /**
+   * Sets the value of the rows property.
+   * 
+   * @param value
+   *          allowed object is {@link Integer }
+   * 
+   */
+  public void setRows(Integer value)
+  {
+    this.rows = value;
+  }
+
+  /**
+   * Gets the value of the columns property.
+   * 
+   * @return possible object is {@link Integer }
+   * 
+   */
+  public Integer getColumns()
+  {
+    return columns;
+  }
+
+  /**
+   * Sets the value of the columns property.
+   * 
+   * @param value
+   *          allowed object is {@link Integer }
+   * 
+   */
+  public void setColumns(Integer value)
+  {
+    this.columns = value;
+  }
 
 }
index 19a0d24..ad1b19c 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.util.ArrayList;
@@ -15,62 +14,58 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for DoubleVector complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="DoubleVector"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element name="v" type="{http://www.w3.org/2001/XMLSchema}double" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="DoubleVector"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="v"
+ * type="{http://www.w3.org/2001/XMLSchema}double" maxOccurs="unbounded"
+ * minOccurs="0"/&amp;gt; &amp;lt;/sequence&amp;gt; &amp;lt;/restriction&amp;gt;
+ * &amp;lt;/complexContent&amp;gt; &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DoubleVector", namespace = "www.jalview.org", propOrder = {
-    "v"
-})
-public class DoubleVector {
+@XmlType(
+  name = "DoubleVector",
+  namespace = "www.jalview.org",
+  propOrder =
+  { "v" })
+public class DoubleVector
+{
 
-    @XmlElement(type = Double.class)
-    protected List<Double> v;
+  @XmlElement(type = Double.class)
+  protected List<Double> v;
 
-    /**
-     * Gets the value of the v property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the v property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getV().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link Double }
-     * 
-     * 
-     */
-    public List<Double> getV() {
-        if (v == null) {
-            v = new ArrayList<Double>();
-        }
-        return this.v;
+  /**
+   * Gets the value of the v property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the v property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getV().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link Double }
+   * 
+   * 
+   */
+  public List<Double> getV()
+  {
+    if (v == null)
+    {
+      v = new ArrayList<Double>();
     }
+    return this.v;
+  }
 
 }
index 97bedae..a8f2006 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.util.ArrayList;
@@ -15,349 +14,350 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for feature complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="feature"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element name="otherData" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *           &amp;lt;complexType&amp;gt;
- *             &amp;lt;complexContent&amp;gt;
- *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                 &amp;lt;attribute name="key" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                 &amp;lt;attribute name="key2" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                 &amp;lt;attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *               &amp;lt;/restriction&amp;gt;
- *             &amp;lt;/complexContent&amp;gt;
- *           &amp;lt;/complexType&amp;gt;
- *         &amp;lt;/element&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *       &amp;lt;attribute name="begin" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *       &amp;lt;attribute name="end" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *       &amp;lt;attribute name="type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="status" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="featureGroup" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="score" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="feature"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="otherData"
+ * maxOccurs="unbounded" minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+ * name="key" use="required" type="{http://www.w3.org/2001/XMLSchema}string"
+ * /&amp;gt; &amp;lt;attribute name="key2"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string"
+ * /&amp;gt; &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="begin" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="end" use="required" type="{http://www.w3.org/2001/XMLSchema}int"
+ * /&amp;gt; &amp;lt;attribute name="type" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="description" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;attribute name="status"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="featureGroup" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;attribute name="score" type="{http://www.w3.org/2001/XMLSchema}float"
+ * /&amp;gt; &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "feature", namespace = "www.jalview.org", propOrder = {
-    "otherData"
-})
-public class Feature {
-
-    protected List<Feature.OtherData> otherData;
-    @XmlAttribute(name = "begin", required = true)
-    protected int begin;
-    @XmlAttribute(name = "end", required = true)
-    protected int end;
-    @XmlAttribute(name = "type", required = true)
-    protected String type;
-    @XmlAttribute(name = "description")
-    protected String description;
-    @XmlAttribute(name = "status")
-    protected String status;
-    @XmlAttribute(name = "featureGroup")
-    protected String featureGroup;
-    @XmlAttribute(name = "score")
-    protected Float score;
-
-    /**
-     * Gets the value of the otherData property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the otherData property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getOtherData().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link Feature.OtherData }
-     * 
-     * 
-     */
-    public List<Feature.OtherData> getOtherData() {
-        if (otherData == null) {
-            otherData = new ArrayList<Feature.OtherData>();
-        }
-        return this.otherData;
+@XmlType(
+  name = "feature",
+  namespace = "www.jalview.org",
+  propOrder =
+  { "otherData" })
+public class Feature
+{
+
+  protected List<Feature.OtherData> otherData;
+
+  @XmlAttribute(name = "begin", required = true)
+  protected int begin;
+
+  @XmlAttribute(name = "end", required = true)
+  protected int end;
+
+  @XmlAttribute(name = "type", required = true)
+  protected String type;
+
+  @XmlAttribute(name = "description")
+  protected String description;
+
+  @XmlAttribute(name = "status")
+  protected String status;
+
+  @XmlAttribute(name = "featureGroup")
+  protected String featureGroup;
+
+  @XmlAttribute(name = "score")
+  protected Float score;
+
+  /**
+   * Gets the value of the otherData property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the otherData property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getOtherData().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link Feature.OtherData }
+   * 
+   * 
+   */
+  public List<Feature.OtherData> getOtherData()
+  {
+    if (otherData == null)
+    {
+      otherData = new ArrayList<Feature.OtherData>();
     }
+    return this.otherData;
+  }
+
+  /**
+   * Gets the value of the begin property.
+   * 
+   */
+  public int getBegin()
+  {
+    return begin;
+  }
+
+  /**
+   * Sets the value of the begin property.
+   * 
+   */
+  public void setBegin(int value)
+  {
+    this.begin = value;
+  }
+
+  /**
+   * Gets the value of the end property.
+   * 
+   */
+  public int getEnd()
+  {
+    return end;
+  }
+
+  /**
+   * Sets the value of the end property.
+   * 
+   */
+  public void setEnd(int value)
+  {
+    this.end = value;
+  }
+
+  /**
+   * Gets the value of the type property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getType()
+  {
+    return type;
+  }
+
+  /**
+   * Sets the value of the type property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setType(String value)
+  {
+    this.type = value;
+  }
+
+  /**
+   * Gets the value of the description property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getDescription()
+  {
+    return description;
+  }
+
+  /**
+   * Sets the value of the description property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setDescription(String value)
+  {
+    this.description = value;
+  }
+
+  /**
+   * Gets the value of the status property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getStatus()
+  {
+    return status;
+  }
+
+  /**
+   * Sets the value of the status property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setStatus(String value)
+  {
+    this.status = value;
+  }
+
+  /**
+   * Gets the value of the featureGroup property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getFeatureGroup()
+  {
+    return featureGroup;
+  }
+
+  /**
+   * Sets the value of the featureGroup property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setFeatureGroup(String value)
+  {
+    this.featureGroup = value;
+  }
+
+  /**
+   * Gets the value of the score property.
+   * 
+   * @return possible object is {@link Float }
+   * 
+   */
+  public Float getScore()
+  {
+    return score;
+  }
+
+  /**
+   * Sets the value of the score property.
+   * 
+   * @param value
+   *          allowed object is {@link Float }
+   * 
+   */
+  public void setScore(Float value)
+  {
+    this.score = value;
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+   * name="key" use="required" type="{http://www.w3.org/2001/XMLSchema}string"
+   * /&amp;gt; &amp;lt;attribute name="key2"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+   * name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string"
+   * /&amp;gt; &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(name = "")
+  public static class OtherData
+  {
+
+    @XmlAttribute(name = "key", required = true)
+    protected String key;
+
+    @XmlAttribute(name = "key2")
+    protected String key2;
+
+    @XmlAttribute(name = "value", required = true)
+    protected String value;
 
     /**
-     * Gets the value of the begin property.
+     * Gets the value of the key property.
      * 
-     */
-    public int getBegin() {
-        return begin;
-    }
-
-    /**
-     * Sets the value of the begin property.
-     * 
-     */
-    public void setBegin(int value) {
-        this.begin = value;
-    }
-
-    /**
-     * Gets the value of the end property.
-     * 
-     */
-    public int getEnd() {
-        return end;
-    }
-
-    /**
-     * Sets the value of the end property.
-     * 
-     */
-    public void setEnd(int value) {
-        this.end = value;
-    }
-
-    /**
-     * Gets the value of the type property.
+     * @return possible object is {@link String }
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getType() {
-        return type;
+    public String getKey()
+    {
+      return key;
     }
 
     /**
-     * Sets the value of the type property.
+     * Sets the value of the key property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the description property.
+     *          allowed object is {@link String }
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getDescription() {
-        return description;
+    public void setKey(String value)
+    {
+      this.key = value;
     }
 
     /**
-     * Sets the value of the description property.
+     * Gets the value of the key2 property.
      * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the status property.
+     * @return possible object is {@link String }
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getStatus() {
-        return status;
+    public String getKey2()
+    {
+      return key2;
     }
 
     /**
-     * Sets the value of the status property.
+     * Sets the value of the key2 property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStatus(String value) {
-        this.status = value;
-    }
-
-    /**
-     * Gets the value of the featureGroup property.
+     *          allowed object is {@link String }
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getFeatureGroup() {
-        return featureGroup;
+    public void setKey2(String value)
+    {
+      this.key2 = value;
     }
 
     /**
-     * Sets the value of the featureGroup property.
+     * Gets the value of the value property.
      * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFeatureGroup(String value) {
-        this.featureGroup = value;
-    }
-
-    /**
-     * Gets the value of the score property.
+     * @return possible object is {@link String }
      * 
-     * @return
-     *     possible object is
-     *     {@link Float }
-     *     
      */
-    public Float getScore() {
-        return score;
+    public String getValue()
+    {
+      return value;
     }
 
     /**
-     * Sets the value of the score property.
+     * Sets the value of the value property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link Float }
-     *     
-     */
-    public void setScore(Float value) {
-        this.score = value;
-    }
-
-
-    /**
-     * &lt;p&gt;Java class for anonymous complex type.
-     * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-     * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;attribute name="key" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="key2" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
-     * 
+     *          allowed object is {@link String }
      * 
      */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class OtherData {
-
-        @XmlAttribute(name = "key", required = true)
-        protected String key;
-        @XmlAttribute(name = "key2")
-        protected String key2;
-        @XmlAttribute(name = "value", required = true)
-        protected String value;
-
-        /**
-         * Gets the value of the key property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getKey() {
-            return key;
-        }
-
-        /**
-         * Sets the value of the key property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setKey(String value) {
-            this.key = value;
-        }
-
-        /**
-         * Gets the value of the key2 property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getKey2() {
-            return key2;
-        }
-
-        /**
-         * Sets the value of the key2 property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setKey2(String value) {
-            this.key2 = value;
-        }
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
+    public void setValue(String value)
+    {
+      this.value = value;
     }
 
+  }
+
 }
index 9913337..d9ff117 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.util.ArrayList;
@@ -16,145 +15,141 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for FeatureMatcher complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="FeatureMatcher"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element name="attributeName" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="2" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="condition" type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt;
- *         &amp;lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *       &amp;lt;attribute name="by" type="{www.jalview.org/colours}FilterBy" /&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="FeatureMatcher"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="attributeName"
+ * type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="2"
+ * minOccurs="0"/&amp;gt; &amp;lt;element name="condition"
+ * type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt; &amp;lt;element
+ * name="value" type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="by"
+ * type="{www.jalview.org/colours}FilterBy" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FeatureMatcher", namespace = "www.jalview.org/colours", propOrder = {
-    "attributeName",
-    "condition",
-    "value"
-})
-public class FeatureMatcher {
+@XmlType(
+  name = "FeatureMatcher",
+  namespace = "www.jalview.org/colours",
+  propOrder =
+  { "attributeName", "condition", "value" })
+public class FeatureMatcher
+{
 
-    @XmlElement(namespace = "")
-    protected List<String> attributeName;
-    @XmlElement(namespace = "", required = true)
-    protected String condition;
-    @XmlElement(namespace = "", required = true)
-    protected String value;
-    @XmlAttribute(name = "by")
-    protected FilterBy by;
+  @XmlElement(namespace = "")
+  protected List<String> attributeName;
 
-    /**
-     * Gets the value of the attributeName property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the attributeName property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getAttributeName().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getAttributeName() {
-        if (attributeName == null) {
-            attributeName = new ArrayList<String>();
-        }
-        return this.attributeName;
-    }
+  @XmlElement(namespace = "", required = true)
+  protected String condition;
 
-    /**
-     * Gets the value of the condition property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCondition() {
-        return condition;
-    }
+  @XmlElement(namespace = "", required = true)
+  protected String value;
 
-    /**
-     * Sets the value of the condition property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCondition(String value) {
-        this.condition = value;
-    }
+  @XmlAttribute(name = "by")
+  protected FilterBy by;
 
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
+  /**
+   * Gets the value of the attributeName property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the attributeName property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getAttributeName().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link String }
+   * 
+   * 
+   */
+  public List<String> getAttributeName()
+  {
+    if (attributeName == null)
+    {
+      attributeName = new ArrayList<String>();
     }
+    return this.attributeName;
+  }
 
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
+  /**
+   * Gets the value of the condition property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getCondition()
+  {
+    return condition;
+  }
 
-    /**
-     * Gets the value of the by property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FilterBy }
-     *     
-     */
-    public FilterBy getBy() {
-        return by;
-    }
+  /**
+   * Sets the value of the condition property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setCondition(String value)
+  {
+    this.condition = value;
+  }
 
-    /**
-     * Sets the value of the by property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FilterBy }
-     *     
-     */
-    public void setBy(FilterBy value) {
-        this.by = value;
-    }
+  /**
+   * Gets the value of the value property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getValue()
+  {
+    return value;
+  }
+
+  /**
+   * Sets the value of the value property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setValue(String value)
+  {
+    this.value = value;
+  }
+
+  /**
+   * Gets the value of the by property.
+   * 
+   * @return possible object is {@link FilterBy }
+   * 
+   */
+  public FilterBy getBy()
+  {
+    return by;
+  }
+
+  /**
+   * Sets the value of the by property.
+   * 
+   * @param value
+   *          allowed object is {@link FilterBy }
+   * 
+   */
+  public void setBy(FilterBy value)
+  {
+    this.by = value;
+  }
 
 }
index a51e7d5..cf81588 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.util.ArrayList;
@@ -16,177 +15,167 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * A feature match condition, which may be simple or compound
  * 
  * &lt;p&gt;Java class for FeatureMatcherSet complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="FeatureMatcherSet"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;choice&amp;gt;
- *         &amp;lt;element name="matchCondition" type="{www.jalview.org/colours}FeatureMatcher"/&amp;gt;
- *         &amp;lt;element name="compoundMatcher"&amp;gt;
- *           &amp;lt;complexType&amp;gt;
- *             &amp;lt;complexContent&amp;gt;
- *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                 &amp;lt;sequence&amp;gt;
- *                   &amp;lt;element name="matcherSet" type="{www.jalview.org/colours}FeatureMatcherSet" maxOccurs="2" minOccurs="2"/&amp;gt;
- *                 &amp;lt;/sequence&amp;gt;
- *                 &amp;lt;attribute name="and" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *               &amp;lt;/restriction&amp;gt;
- *             &amp;lt;/complexContent&amp;gt;
- *           &amp;lt;/complexType&amp;gt;
- *         &amp;lt;/element&amp;gt;
- *       &amp;lt;/choice&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="FeatureMatcherSet"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;choice&amp;gt; &amp;lt;element name="matchCondition"
+ * type="{www.jalview.org/colours}FeatureMatcher"/&amp;gt; &amp;lt;element
+ * name="compoundMatcher"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="matcherSet"
+ * type="{www.jalview.org/colours}FeatureMatcherSet" maxOccurs="2"
+ * minOccurs="2"/&amp;gt; &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="and"
+ * use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;/choice&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FeatureMatcherSet", namespace = "www.jalview.org/colours", propOrder = {
-    "matchCondition",
-    "compoundMatcher"
-})
-public class FeatureMatcherSet {
-
-    @XmlElement(namespace = "")
-    protected FeatureMatcher matchCondition;
-    @XmlElement(namespace = "")
-    protected FeatureMatcherSet.CompoundMatcher compoundMatcher;
+@XmlType(
+  name = "FeatureMatcherSet",
+  namespace = "www.jalview.org/colours",
+  propOrder =
+  { "matchCondition", "compoundMatcher" })
+public class FeatureMatcherSet
+{
+
+  @XmlElement(namespace = "")
+  protected FeatureMatcher matchCondition;
+
+  @XmlElement(namespace = "")
+  protected FeatureMatcherSet.CompoundMatcher compoundMatcher;
+
+  /**
+   * Gets the value of the matchCondition property.
+   * 
+   * @return possible object is {@link FeatureMatcher }
+   * 
+   */
+  public FeatureMatcher getMatchCondition()
+  {
+    return matchCondition;
+  }
+
+  /**
+   * Sets the value of the matchCondition property.
+   * 
+   * @param value
+   *          allowed object is {@link FeatureMatcher }
+   * 
+   */
+  public void setMatchCondition(FeatureMatcher value)
+  {
+    this.matchCondition = value;
+  }
+
+  /**
+   * Gets the value of the compoundMatcher property.
+   * 
+   * @return possible object is {@link FeatureMatcherSet.CompoundMatcher }
+   * 
+   */
+  public FeatureMatcherSet.CompoundMatcher getCompoundMatcher()
+  {
+    return compoundMatcher;
+  }
+
+  /**
+   * Sets the value of the compoundMatcher property.
+   * 
+   * @param value
+   *          allowed object is {@link FeatureMatcherSet.CompoundMatcher }
+   * 
+   */
+  public void setCompoundMatcher(FeatureMatcherSet.CompoundMatcher value)
+  {
+    this.compoundMatcher = value;
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+   * &amp;lt;sequence&amp;gt; &amp;lt;element name="matcherSet"
+   * type="{www.jalview.org/colours}FeatureMatcherSet" maxOccurs="2"
+   * minOccurs="2"/&amp;gt; &amp;lt;/sequence&amp;gt; &amp;lt;attribute
+   * name="and" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean"
+   * /&amp;gt; &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(name = "", propOrder = { "matcherSet" })
+  public static class CompoundMatcher
+  {
+
+    @XmlElement(namespace = "", required = true)
+    protected List<FeatureMatcherSet> matcherSet;
+
+    @XmlAttribute(name = "and", required = true)
+    protected boolean and;
 
     /**
-     * Gets the value of the matchCondition property.
+     * Gets the value of the matcherSet property.
      * 
-     * @return
-     *     possible object is
-     *     {@link FeatureMatcher }
-     *     
-     */
-    public FeatureMatcher getMatchCondition() {
-        return matchCondition;
-    }
-
-    /**
-     * Sets the value of the matchCondition property.
+     * &lt;p&gt; This accessor method returns a reference to the live list, not
+     * a snapshot. Therefore any modification you make to the returned list will
+     * be present inside the JAXB object. This is why there is not a
+     * &lt;CODE&gt;set&lt;/CODE&gt; method for the matcherSet property.
+     * 
+     * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+     * getMatcherSet().add(newItem); &lt;/pre&gt;
+     * 
+     * 
+     * &lt;p&gt; Objects of the following type(s) are allowed in the list
+     * {@link FeatureMatcherSet }
      * 
-     * @param value
-     *     allowed object is
-     *     {@link FeatureMatcher }
-     *     
-     */
-    public void setMatchCondition(FeatureMatcher value) {
-        this.matchCondition = value;
-    }
-
-    /**
-     * Gets the value of the compoundMatcher property.
      * 
-     * @return
-     *     possible object is
-     *     {@link FeatureMatcherSet.CompoundMatcher }
-     *     
      */
-    public FeatureMatcherSet.CompoundMatcher getCompoundMatcher() {
-        return compoundMatcher;
+    public List<FeatureMatcherSet> getMatcherSet()
+    {
+      if (matcherSet == null)
+      {
+        matcherSet = new ArrayList<FeatureMatcherSet>();
+      }
+      return this.matcherSet;
     }
 
     /**
-     * Sets the value of the compoundMatcher property.
+     * Gets the value of the and property.
      * 
-     * @param value
-     *     allowed object is
-     *     {@link FeatureMatcherSet.CompoundMatcher }
-     *     
      */
-    public void setCompoundMatcher(FeatureMatcherSet.CompoundMatcher value) {
-        this.compoundMatcher = value;
+    public boolean isAnd()
+    {
+      return and;
     }
 
-
     /**
-     * &lt;p&gt;Java class for anonymous complex type.
-     * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-     * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;sequence&amp;gt;
-     *         &amp;lt;element name="matcherSet" type="{www.jalview.org/colours}FeatureMatcherSet" maxOccurs="2" minOccurs="2"/&amp;gt;
-     *       &amp;lt;/sequence&amp;gt;
-     *       &amp;lt;attribute name="and" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
-     * 
+     * Sets the value of the and property.
      * 
      */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "matcherSet"
-    })
-    public static class CompoundMatcher {
-
-        @XmlElement(namespace = "", required = true)
-        protected List<FeatureMatcherSet> matcherSet;
-        @XmlAttribute(name = "and", required = true)
-        protected boolean and;
-
-        /**
-         * Gets the value of the matcherSet property.
-         * 
-         * &lt;p&gt;
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the matcherSet property.
-         * 
-         * &lt;p&gt;
-         * For example, to add a new item, do as follows:
-         * &lt;pre&gt;
-         *    getMatcherSet().add(newItem);
-         * &lt;/pre&gt;
-         * 
-         * 
-         * &lt;p&gt;
-         * Objects of the following type(s) are allowed in the list
-         * {@link FeatureMatcherSet }
-         * 
-         * 
-         */
-        public List<FeatureMatcherSet> getMatcherSet() {
-            if (matcherSet == null) {
-                matcherSet = new ArrayList<FeatureMatcherSet>();
-            }
-            return this.matcherSet;
-        }
-
-        /**
-         * Gets the value of the and property.
-         * 
-         */
-        public boolean isAnd() {
-            return and;
-        }
-
-        /**
-         * Sets the value of the and property.
-         * 
-         */
-        public void setAnd(boolean value) {
-            this.and = value;
-        }
-
+    public void setAnd(boolean value)
+    {
+      this.and = value;
     }
 
+  }
+
 }
index 5723e3d..cfb0293 100644 (file)
@@ -5,56 +5,56 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for FilterBy.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
- * &lt;pre&gt;
- * &amp;lt;simpleType name="FilterBy"&amp;gt;
- *   &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&amp;gt;
- *     &amp;lt;enumeration value="byLabel"/&amp;gt;
- *     &amp;lt;enumeration value="byScore"/&amp;gt;
- *     &amp;lt;enumeration value="byAttribute"/&amp;gt;
- *   &amp;lt;/restriction&amp;gt;
- * &amp;lt;/simpleType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class. &lt;pre&gt; &amp;lt;simpleType
+ * name="FilterBy"&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}string"&amp;gt; &amp;lt;enumeration
+ * value="byLabel"/&amp;gt; &amp;lt;enumeration value="byScore"/&amp;gt;
+ * &amp;lt;enumeration value="byAttribute"/&amp;gt; &amp;lt;/restriction&amp;gt;
+ * &amp;lt;/simpleType&amp;gt; &lt;/pre&gt;
  * 
  */
 @XmlType(name = "FilterBy", namespace = "www.jalview.org/colours")
 @XmlEnum
-public enum FilterBy {
-
-    @XmlEnumValue("byLabel")
-    BY_LABEL("byLabel"),
-    @XmlEnumValue("byScore")
-    BY_SCORE("byScore"),
-    @XmlEnumValue("byAttribute")
-    BY_ATTRIBUTE("byAttribute");
-    private final String value;
-
-    FilterBy(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static FilterBy fromValue(String v) {
-        for (FilterBy c: FilterBy.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
+public enum FilterBy
+{
+
+  @XmlEnumValue("byLabel")
+  BY_LABEL("byLabel"), @XmlEnumValue("byScore")
+  BY_SCORE("byScore"), @XmlEnumValue("byAttribute")
+  BY_ATTRIBUTE("byAttribute");
+
+  private final String value;
+
+  FilterBy(String v)
+  {
+    value = v;
+  }
+
+  public String value()
+  {
+    return value;
+  }
+
+  public static FilterBy fromValue(String v)
+  {
+    for (FilterBy c : FilterBy.values())
+    {
+      if (c.value.equals(v))
+      {
+        return c;
+      }
     }
+    throw new IllegalArgumentException(v);
+  }
 
 }
index 360c074..18a2571 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.util.ArrayList;
@@ -22,6849 +21,6891 @@ import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
 /**
  * &lt;p&gt;Java class for JalviewModel complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="JalviewModel"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element name="creationDate" type="{http://www.w3.org/2001/XMLSchema}dateTime"/&amp;gt;
- *         &amp;lt;element name="version" type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt;
- *         &amp;lt;element name="vamsasModel" type="{www.vamsas.ac.uk/jalview/version2}VAMSAS"/&amp;gt;
- *         &amp;lt;sequence&amp;gt;
- *           &amp;lt;element name="JSeq" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *             &amp;lt;complexType&amp;gt;
- *               &amp;lt;complexContent&amp;gt;
- *                 &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                   &amp;lt;sequence&amp;gt;
- *                     &amp;lt;element name="features" type="{www.jalview.org}feature" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *                     &amp;lt;element name="pdbids" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *                       &amp;lt;complexType&amp;gt;
- *                         &amp;lt;complexContent&amp;gt;
- *                           &amp;lt;extension base="{www.jalview.org}pdbentry"&amp;gt;
- *                             &amp;lt;sequence&amp;gt;
- *                               &amp;lt;element name="structureState" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *                                 &amp;lt;complexType&amp;gt;
- *                                   &amp;lt;simpleContent&amp;gt;
- *                                     &amp;lt;extension base="&amp;lt;http://www.w3.org/2001/XMLSchema&amp;gt;string"&amp;gt;
- *                                       &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
- *                                       &amp;lt;attribute name="visible" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                                       &amp;lt;attribute name="viewId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                                       &amp;lt;attribute name="alignwithAlignPanel" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
- *                                       &amp;lt;attribute name="colourwithAlignPanel" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *                                       &amp;lt;attribute name="colourByJmol" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
- *                                       &amp;lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                                     &amp;lt;/extension&amp;gt;
- *                                   &amp;lt;/simpleContent&amp;gt;
- *                                 &amp;lt;/complexType&amp;gt;
- *                               &amp;lt;/element&amp;gt;
- *                             &amp;lt;/sequence&amp;gt;
- *                           &amp;lt;/extension&amp;gt;
- *                         &amp;lt;/complexContent&amp;gt;
- *                       &amp;lt;/complexType&amp;gt;
- *                     &amp;lt;/element&amp;gt;
- *                     &amp;lt;element name="hiddenSequences" type="{http://www.w3.org/2001/XMLSchema}int" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *                     &amp;lt;element name="rnaViewer" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *                       &amp;lt;complexType&amp;gt;
- *                         &amp;lt;complexContent&amp;gt;
- *                           &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                             &amp;lt;sequence&amp;gt;
- *                               &amp;lt;element name="secondaryStructure" maxOccurs="unbounded"&amp;gt;
- *                                 &amp;lt;complexType&amp;gt;
- *                                   &amp;lt;complexContent&amp;gt;
- *                                     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                                       &amp;lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                                       &amp;lt;attribute name="annotationId" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                                       &amp;lt;attribute name="gapped" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                                       &amp;lt;attribute name="viewerState" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                                     &amp;lt;/restriction&amp;gt;
- *                                   &amp;lt;/complexContent&amp;gt;
- *                                 &amp;lt;/complexType&amp;gt;
- *                               &amp;lt;/element&amp;gt;
- *                             &amp;lt;/sequence&amp;gt;
- *                             &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
- *                             &amp;lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                             &amp;lt;attribute name="viewId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                             &amp;lt;attribute name="dividerLocation" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                             &amp;lt;attribute name="selectedRna" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                           &amp;lt;/restriction&amp;gt;
- *                         &amp;lt;/complexContent&amp;gt;
- *                       &amp;lt;/complexType&amp;gt;
- *                     &amp;lt;/element&amp;gt;
- *                   &amp;lt;/sequence&amp;gt;
- *                   &amp;lt;attribute name="colour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="start" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="end" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                   &amp;lt;attribute name="hidden" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="viewreference" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                 &amp;lt;/restriction&amp;gt;
- *               &amp;lt;/complexContent&amp;gt;
- *             &amp;lt;/complexType&amp;gt;
- *           &amp;lt;/element&amp;gt;
- *           &amp;lt;element name="JGroup" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *             &amp;lt;complexType&amp;gt;
- *               &amp;lt;complexContent&amp;gt;
- *                 &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                   &amp;lt;sequence&amp;gt;
- *                     &amp;lt;element name="seq" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/&amp;gt;
- *                     &amp;lt;element name="annotationColours" type="{www.jalview.org}AnnotationColourScheme" minOccurs="0"/&amp;gt;
- *                   &amp;lt;/sequence&amp;gt;
- *                   &amp;lt;attribute name="start" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="end" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                   &amp;lt;attribute name="colour" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                   &amp;lt;attribute name="consThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="pidThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="outlineColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="displayBoxes" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="displayText" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="colourText" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="textCol1" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="textCol2" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="textColThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="showUnconserved" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="ignoreGapsinConsensus" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
- *                   &amp;lt;attribute name="showConsensusHistogram" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
- *                   &amp;lt;attribute name="showSequenceLogo" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *                   &amp;lt;attribute name="normaliseSequenceLogo" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *                   &amp;lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                 &amp;lt;/restriction&amp;gt;
- *               &amp;lt;/complexContent&amp;gt;
- *             &amp;lt;/complexType&amp;gt;
- *           &amp;lt;/element&amp;gt;
- *           &amp;lt;element name="Viewport" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *             &amp;lt;complexType&amp;gt;
- *               &amp;lt;complexContent&amp;gt;
- *                 &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                   &amp;lt;sequence&amp;gt;
- *                     &amp;lt;element name="AnnotationColours" type="{www.jalview.org}AnnotationColourScheme" minOccurs="0"/&amp;gt;
- *                     &amp;lt;element name="hiddenColumns" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *                       &amp;lt;complexType&amp;gt;
- *                         &amp;lt;complexContent&amp;gt;
- *                           &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                             &amp;lt;attribute name="start" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                             &amp;lt;attribute name="end" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                           &amp;lt;/restriction&amp;gt;
- *                         &amp;lt;/complexContent&amp;gt;
- *                       &amp;lt;/complexType&amp;gt;
- *                     &amp;lt;/element&amp;gt;
- *                     &amp;lt;element name="calcIdParam" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *                       &amp;lt;complexType&amp;gt;
- *                         &amp;lt;complexContent&amp;gt;
- *                           &amp;lt;extension base="{www.jalview.org/xml/wsparamset}WebServiceParameterSet"&amp;gt;
- *                             &amp;lt;attribute name="calcId" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                             &amp;lt;attribute name="needsUpdate" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *                             &amp;lt;attribute name="autoUpdate" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                           &amp;lt;/extension&amp;gt;
- *                         &amp;lt;/complexContent&amp;gt;
- *                       &amp;lt;/complexType&amp;gt;
- *                     &amp;lt;/element&amp;gt;
- *                     &amp;lt;element name="overview" minOccurs="0"&amp;gt;
- *                       &amp;lt;complexType&amp;gt;
- *                         &amp;lt;complexContent&amp;gt;
- *                           &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                             &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
- *                             &amp;lt;attribute name="showHidden" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                             &amp;lt;attribute name="residueColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                             &amp;lt;attribute name="gapColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                             &amp;lt;attribute name="hiddenColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                             &amp;lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                           &amp;lt;/restriction&amp;gt;
- *                         &amp;lt;/complexContent&amp;gt;
- *                       &amp;lt;/complexType&amp;gt;
- *                     &amp;lt;/element&amp;gt;
- *                   &amp;lt;/sequence&amp;gt;
- *                   &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
- *                   &amp;lt;attribute name="conservationSelected" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="pidSelected" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="bgColour" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                   &amp;lt;attribute name="consThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="pidThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                   &amp;lt;attribute name="showFullId" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="rightAlignIds" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="showText" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="showColourText" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="showUnconserved" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *                   &amp;lt;attribute name="showBoxes" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="wrapAlignment" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="renderGaps" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="showSequenceFeatures" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="showNPfeatureTooltip" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="showDbRefTooltip" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="followHighlight" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
- *                   &amp;lt;attribute name="followSelection" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
- *                   &amp;lt;attribute name="showAnnotation" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="centreColumnLabels" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *                   &amp;lt;attribute name="showGroupConservation" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *                   &amp;lt;attribute name="showGroupConsensus" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *                   &amp;lt;attribute name="showConsensusHistogram" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
- *                   &amp;lt;attribute name="showSequenceLogo" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *                   &amp;lt;attribute name="normaliseSequenceLogo" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *                   &amp;lt;attribute name="ignoreGapsinConsensus" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
- *                   &amp;lt;attribute name="startRes" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="startSeq" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="charWidth" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="charHeight" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="fontName" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                   &amp;lt;attribute name="fontSize" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="fontStyle" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="idWidth" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="idWidthManuallyAdjusted" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="scaleProteinAsCdna" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
- *                   &amp;lt;attribute name="viewName" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                   &amp;lt;attribute name="sequenceSetId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                   &amp;lt;attribute name="gatheredViews" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="textCol1" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="textCol2" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="textColThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /&amp;gt;
- *                   &amp;lt;attribute name="complementId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                   &amp;lt;attribute name="showComplementFeatures" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *                   &amp;lt;attribute name="showComplementFeaturesOnTop" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *                 &amp;lt;/restriction&amp;gt;
- *               &amp;lt;/complexContent&amp;gt;
- *             &amp;lt;/complexType&amp;gt;
- *           &amp;lt;/element&amp;gt;
- *           &amp;lt;element name="UserColours" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *             &amp;lt;complexType&amp;gt;
- *               &amp;lt;complexContent&amp;gt;
- *                 &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                   &amp;lt;sequence&amp;gt;
- *                     &amp;lt;element name="UserColourScheme" type="{www.jalview.org/colours}JalviewUserColours"/&amp;gt;
- *                   &amp;lt;/sequence&amp;gt;
- *                   &amp;lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                 &amp;lt;/restriction&amp;gt;
- *               &amp;lt;/complexContent&amp;gt;
- *             &amp;lt;/complexType&amp;gt;
- *           &amp;lt;/element&amp;gt;
- *           &amp;lt;element name="tree" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *             &amp;lt;complexType&amp;gt;
- *               &amp;lt;complexContent&amp;gt;
- *                 &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                   &amp;lt;sequence minOccurs="0"&amp;gt;
- *                     &amp;lt;element name="title" type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt;
- *                     &amp;lt;element name="newick" type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt;
- *                   &amp;lt;/sequence&amp;gt;
- *                   &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
- *                   &amp;lt;attribute name="fontName" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                   &amp;lt;attribute name="fontSize" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="fontStyle" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="threshold" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
- *                   &amp;lt;attribute name="showBootstrap" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="showDistances" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="markUnlinked" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="fitToWindow" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="currentTree" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="columnWise" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *                   &amp;lt;attribute name="columnReference" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                   &amp;lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /&amp;gt;
- *                   &amp;lt;attribute name="linkToAllViews" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *                 &amp;lt;/restriction&amp;gt;
- *               &amp;lt;/complexContent&amp;gt;
- *             &amp;lt;/complexType&amp;gt;
- *           &amp;lt;/element&amp;gt;
- *           &amp;lt;element name="PcaViewer" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *             &amp;lt;complexType&amp;gt;
- *               &amp;lt;complexContent&amp;gt;
- *                 &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                   &amp;lt;sequence&amp;gt;
- *                     &amp;lt;element name="sequencePoint" maxOccurs="unbounded"&amp;gt;
- *                       &amp;lt;complexType&amp;gt;
- *                         &amp;lt;complexContent&amp;gt;
- *                           &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                             &amp;lt;attGroup ref="{www.jalview.org}position"/&amp;gt;
- *                             &amp;lt;attribute name="sequenceRef" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                           &amp;lt;/restriction&amp;gt;
- *                         &amp;lt;/complexContent&amp;gt;
- *                       &amp;lt;/complexType&amp;gt;
- *                     &amp;lt;/element&amp;gt;
- *                     &amp;lt;element name="axis" maxOccurs="3" minOccurs="3"&amp;gt;
- *                       &amp;lt;complexType&amp;gt;
- *                         &amp;lt;complexContent&amp;gt;
- *                           &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                             &amp;lt;attGroup ref="{www.jalview.org}position"/&amp;gt;
- *                           &amp;lt;/restriction&amp;gt;
- *                         &amp;lt;/complexContent&amp;gt;
- *                       &amp;lt;/complexType&amp;gt;
- *                     &amp;lt;/element&amp;gt;
- *                     &amp;lt;element name="seqPointMin"&amp;gt;
- *                       &amp;lt;complexType&amp;gt;
- *                         &amp;lt;complexContent&amp;gt;
- *                           &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                             &amp;lt;attGroup ref="{www.jalview.org}position"/&amp;gt;
- *                           &amp;lt;/restriction&amp;gt;
- *                         &amp;lt;/complexContent&amp;gt;
- *                       &amp;lt;/complexType&amp;gt;
- *                     &amp;lt;/element&amp;gt;
- *                     &amp;lt;element name="seqPointMax"&amp;gt;
- *                       &amp;lt;complexType&amp;gt;
- *                         &amp;lt;complexContent&amp;gt;
- *                           &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                             &amp;lt;attGroup ref="{www.jalview.org}position"/&amp;gt;
- *                           &amp;lt;/restriction&amp;gt;
- *                         &amp;lt;/complexContent&amp;gt;
- *                       &amp;lt;/complexType&amp;gt;
- *                     &amp;lt;/element&amp;gt;
- *                     &amp;lt;element name="pcaData" type="{www.jalview.org}PcaDataType"/&amp;gt;
- *                   &amp;lt;/sequence&amp;gt;
- *                   &amp;lt;attGroup ref="{www.jalview.org}SimilarityParams"/&amp;gt;
- *                   &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
- *                   &amp;lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                   &amp;lt;attribute name="scoreModelName" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                   &amp;lt;attribute name="xDim" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="yDim" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="zDim" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="bgColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                   &amp;lt;attribute name="scaleFactor" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
- *                   &amp;lt;attribute name="showLabels" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                   &amp;lt;attribute name="linkToAllViews" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                 &amp;lt;/restriction&amp;gt;
- *               &amp;lt;/complexContent&amp;gt;
- *             &amp;lt;/complexType&amp;gt;
- *           &amp;lt;/element&amp;gt;
- *           &amp;lt;element name="FeatureSettings" minOccurs="0"&amp;gt;
- *             &amp;lt;complexType&amp;gt;
- *               &amp;lt;complexContent&amp;gt;
- *                 &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                   &amp;lt;sequence&amp;gt;
- *                     &amp;lt;element name="setting" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *                       &amp;lt;complexType&amp;gt;
- *                         &amp;lt;complexContent&amp;gt;
- *                           &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                             &amp;lt;sequence&amp;gt;
- *                               &amp;lt;element name="attributeName" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="2" minOccurs="0"/&amp;gt;
- *                               &amp;lt;element name="matcherSet" type="{www.jalview.org/colours}FeatureMatcherSet" minOccurs="0"/&amp;gt;
- *                             &amp;lt;/sequence&amp;gt;
- *                             &amp;lt;attribute name="type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                             &amp;lt;attribute name="colour" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                             &amp;lt;attribute name="display" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                             &amp;lt;attribute name="order" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
- *                             &amp;lt;attribute name="mincolour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                             &amp;lt;attribute name="noValueColour" type="{www.jalview.org/colours}NoValueColour" default="Min" /&amp;gt;
- *                             &amp;lt;attribute name="threshold" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
- *                             &amp;lt;attribute name="threshstate" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                             &amp;lt;attribute name="max" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
- *                             &amp;lt;attribute name="min" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
- *                             &amp;lt;attribute name="colourByLabel" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                             &amp;lt;attribute name="autoScale" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                           &amp;lt;/restriction&amp;gt;
- *                         &amp;lt;/complexContent&amp;gt;
- *                       &amp;lt;/complexType&amp;gt;
- *                     &amp;lt;/element&amp;gt;
- *                     &amp;lt;element name="group" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *                       &amp;lt;complexType&amp;gt;
- *                         &amp;lt;complexContent&amp;gt;
- *                           &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                             &amp;lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                             &amp;lt;attribute name="display" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                           &amp;lt;/restriction&amp;gt;
- *                         &amp;lt;/complexContent&amp;gt;
- *                       &amp;lt;/complexType&amp;gt;
- *                     &amp;lt;/element&amp;gt;
- *                   &amp;lt;/sequence&amp;gt;
- *                 &amp;lt;/restriction&amp;gt;
- *               &amp;lt;/complexContent&amp;gt;
- *             &amp;lt;/complexType&amp;gt;
- *           &amp;lt;/element&amp;gt;
- *         &amp;lt;/sequence&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="JalviewModel"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="creationDate"
+ * type="{http://www.w3.org/2001/XMLSchema}dateTime"/&amp;gt; &amp;lt;element
+ * name="version" type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt;
+ * &amp;lt;element name="vamsasModel"
+ * type="{www.vamsas.ac.uk/jalview/version2}VAMSAS"/&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="JSeq" maxOccurs="unbounded"
+ * minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="features"
+ * type="{www.jalview.org}feature" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
+ * &amp;lt;element name="pdbids" maxOccurs="unbounded" minOccurs="0"&amp;gt;
+ * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt; &amp;lt;extension
+ * base="{www.jalview.org}pdbentry"&amp;gt; &amp;lt;sequence&amp;gt;
+ * &amp;lt;element name="structureState" maxOccurs="unbounded"
+ * minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;simpleContent&amp;gt; &amp;lt;extension
+ * base="&amp;lt;http://www.w3.org/2001/XMLSchema&amp;gt;string"&amp;gt;
+ * &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
+ * &amp;lt;attribute name="visible"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="viewId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;attribute name="alignwithAlignPanel"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+ * &amp;lt;attribute name="colourwithAlignPanel"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+ * &amp;lt;attribute name="colourByJmol"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+ * &amp;lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string"
+ * /&amp;gt; &amp;lt;/extension&amp;gt; &amp;lt;/simpleContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;/extension&amp;gt;
+ * &amp;lt;/complexContent&amp;gt; &amp;lt;/complexType&amp;gt;
+ * &amp;lt;/element&amp;gt; &amp;lt;element name="hiddenSequences"
+ * type="{http://www.w3.org/2001/XMLSchema}int" maxOccurs="unbounded"
+ * minOccurs="0"/&amp;gt; &amp;lt;element name="rnaViewer" maxOccurs="unbounded"
+ * minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="secondaryStructure"
+ * maxOccurs="unbounded"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+ * name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;attribute name="annotationId" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="gapped" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+ * &amp;lt;attribute name="viewerState"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attGroup
+ * ref="{www.jalview.org}swingwindow"/&amp;gt; &amp;lt;attribute name="title"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="viewId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;attribute name="dividerLocation"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="selectedRna" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="colour"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="start" use="required" type="{http://www.w3.org/2001/XMLSchema}int"
+ * /&amp;gt; &amp;lt;attribute name="end" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string"
+ * /&amp;gt; &amp;lt;attribute name="hidden"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="viewreference" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * /&amp;gt; &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+ * name="JGroup" maxOccurs="unbounded" minOccurs="0"&amp;gt;
+ * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="seq"
+ * type="{http://www.w3.org/2001/XMLSchema}string"
+ * maxOccurs="unbounded"/&amp;gt; &amp;lt;element name="annotationColours"
+ * type="{www.jalview.org}AnnotationColourScheme" minOccurs="0"/&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="start"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="end" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string"
+ * /&amp;gt; &amp;lt;attribute name="colour"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="consThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="pidThreshold"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="outlineColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="displayBoxes"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="displayText" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+ * &amp;lt;attribute name="colourText"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="textCol1" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="textCol2"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="textColThreshold" type="{http://www.w3.org/2001/XMLSchema}int"
+ * /&amp;gt; &amp;lt;attribute name="showUnconserved"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="ignoreGapsinConsensus" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * default="true" /&amp;gt; &amp;lt;attribute name="showConsensusHistogram"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+ * &amp;lt;attribute name="showSequenceLogo"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+ * &amp;lt;attribute name="normaliseSequenceLogo"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+ * &amp;lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string"
+ * /&amp;gt; &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+ * name="Viewport" maxOccurs="unbounded" minOccurs="0"&amp;gt;
+ * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="AnnotationColours"
+ * type="{www.jalview.org}AnnotationColourScheme" minOccurs="0"/&amp;gt;
+ * &amp;lt;element name="hiddenColumns" maxOccurs="unbounded"
+ * minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+ * name="start" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="end" type="{http://www.w3.org/2001/XMLSchema}int"
+ * /&amp;gt; &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+ * name="calcIdParam" maxOccurs="unbounded" minOccurs="0"&amp;gt;
+ * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt; &amp;lt;extension
+ * base="{www.jalview.org/xml/wsparamset}WebServiceParameterSet"&amp;gt;
+ * &amp;lt;attribute name="calcId" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="needsUpdate" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * default="false" /&amp;gt; &amp;lt;attribute name="autoUpdate" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+ * &amp;lt;/extension&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+ * name="overview" minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attGroup
+ * ref="{www.jalview.org}swingwindow"/&amp;gt; &amp;lt;attribute
+ * name="showHidden" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+ * &amp;lt;attribute name="residueColour"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="gapColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="hiddenColour"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attGroup
+ * ref="{www.jalview.org}swingwindow"/&amp;gt; &amp;lt;attribute
+ * name="conservationSelected" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * /&amp;gt; &amp;lt;attribute name="pidSelected"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="bgColour" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;attribute name="consThreshold"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="pidThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="title"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="showFullId" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+ * &amp;lt;attribute name="rightAlignIds"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="showText" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+ * &amp;lt;attribute name="showColourText"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="showUnconserved" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * default="false" /&amp;gt; &amp;lt;attribute name="showBoxes"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="wrapAlignment" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * /&amp;gt; &amp;lt;attribute name="renderGaps"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="showSequenceFeatures" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * /&amp;gt; &amp;lt;attribute name="showNPfeatureTooltip"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="showDbRefTooltip" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * /&amp;gt; &amp;lt;attribute name="followHighlight"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+ * &amp;lt;attribute name="followSelection"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+ * &amp;lt;attribute name="showAnnotation"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="centreColumnLabels" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * default="false" /&amp;gt; &amp;lt;attribute name="showGroupConservation"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+ * &amp;lt;attribute name="showGroupConsensus"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+ * &amp;lt;attribute name="showConsensusHistogram"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+ * &amp;lt;attribute name="showSequenceLogo"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+ * &amp;lt;attribute name="normaliseSequenceLogo"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+ * &amp;lt;attribute name="ignoreGapsinConsensus"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+ * &amp;lt;attribute name="startRes"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="startSeq" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="charWidth"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="charHeight" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="fontName"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="fontSize" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="fontStyle"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="idWidth" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="idWidthManuallyAdjusted"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="scaleProteinAsCdna" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * default="true" /&amp;gt; &amp;lt;attribute name="viewName"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="sequenceSetId" type="{http://www.w3.org/2001/XMLSchema}string"
+ * /&amp;gt; &amp;lt;attribute name="gatheredViews"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="textCol1" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="textCol2"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="textColThreshold" type="{http://www.w3.org/2001/XMLSchema}int"
+ * /&amp;gt; &amp;lt;attribute name="id"
+ * type="{http://www.w3.org/2001/XMLSchema}ID" /&amp;gt; &amp;lt;attribute
+ * name="complementId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;attribute name="showComplementFeatures"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+ * &amp;lt;attribute name="showComplementFeaturesOnTop"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+ * name="UserColours" maxOccurs="unbounded" minOccurs="0"&amp;gt;
+ * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="UserColourScheme"
+ * type="{www.jalview.org/colours}JalviewUserColours"/&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="id"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+ * name="tree" maxOccurs="unbounded" minOccurs="0"&amp;gt;
+ * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence minOccurs="0"&amp;gt; &amp;lt;element name="title"
+ * type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt; &amp;lt;element
+ * name="newick" type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attGroup
+ * ref="{www.jalview.org}swingwindow"/&amp;gt; &amp;lt;attribute name="fontName"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="fontSize" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="fontStyle"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="threshold" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
+ * &amp;lt;attribute name="showBootstrap"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="showDistances" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * /&amp;gt; &amp;lt;attribute name="markUnlinked"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="fitToWindow" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+ * &amp;lt;attribute name="currentTree"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="columnWise" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * default="false" /&amp;gt; &amp;lt;attribute name="columnReference"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /&amp;gt;
+ * &amp;lt;attribute name="linkToAllViews"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+ * name="PcaViewer" maxOccurs="unbounded" minOccurs="0"&amp;gt;
+ * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="sequencePoint"
+ * maxOccurs="unbounded"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attGroup
+ * ref="{www.jalview.org}position"/&amp;gt; &amp;lt;attribute name="sequenceRef"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+ * name="axis" maxOccurs="3" minOccurs="3"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attGroup
+ * ref="{www.jalview.org}position"/&amp;gt; &amp;lt;/restriction&amp;gt;
+ * &amp;lt;/complexContent&amp;gt; &amp;lt;/complexType&amp;gt;
+ * &amp;lt;/element&amp;gt; &amp;lt;element name="seqPointMin"&amp;gt;
+ * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;attGroup ref="{www.jalview.org}position"/&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+ * name="seqPointMax"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attGroup
+ * ref="{www.jalview.org}position"/&amp;gt; &amp;lt;/restriction&amp;gt;
+ * &amp;lt;/complexContent&amp;gt; &amp;lt;/complexType&amp;gt;
+ * &amp;lt;/element&amp;gt; &amp;lt;element name="pcaData"
+ * type="{www.jalview.org}PcaDataType"/&amp;gt; &amp;lt;/sequence&amp;gt;
+ * &amp;lt;attGroup ref="{www.jalview.org}SimilarityParams"/&amp;gt;
+ * &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
+ * &amp;lt;attribute name="title"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="scoreModelName" type="{http://www.w3.org/2001/XMLSchema}string"
+ * /&amp;gt; &amp;lt;attribute name="xDim"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="yDim" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="zDim" type="{http://www.w3.org/2001/XMLSchema}int"
+ * /&amp;gt; &amp;lt;attribute name="bgColour"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="scaleFactor" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
+ * &amp;lt;attribute name="showLabels"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="linkToAllViews" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * /&amp;gt; &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+ * name="FeatureSettings" minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="setting" maxOccurs="unbounded"
+ * minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="attributeName"
+ * type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="2"
+ * minOccurs="0"/&amp;gt; &amp;lt;element name="matcherSet"
+ * type="{www.jalview.org/colours}FeatureMatcherSet" minOccurs="0"/&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="type" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="colour" use="required" type="{http://www.w3.org/2001/XMLSchema}int"
+ * /&amp;gt; &amp;lt;attribute name="display" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt; &amp;lt;attribute
+ * name="order" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
+ * &amp;lt;attribute name="mincolour"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="noValueColour" type="{www.jalview.org/colours}NoValueColour"
+ * default="Min" /&amp;gt; &amp;lt;attribute name="threshold"
+ * type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt; &amp;lt;attribute
+ * name="threshstate" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;attribute name="max" type="{http://www.w3.org/2001/XMLSchema}float"
+ * /&amp;gt; &amp;lt;attribute name="min"
+ * type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt; &amp;lt;attribute
+ * name="colourByLabel" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * /&amp;gt; &amp;lt;attribute name="autoScale"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+ * name="group" maxOccurs="unbounded" minOccurs="0"&amp;gt;
+ * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;attribute name="name" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="display" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;/restriction&amp;gt;
+ * &amp;lt;/complexContent&amp;gt; &amp;lt;/complexType&amp;gt;
+ * &amp;lt;/element&amp;gt; &amp;lt;/sequence&amp;gt; &amp;lt;/sequence&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JalviewModel", namespace = "www.jalview.org", propOrder = {
-    "creationDate",
-    "version",
-    "vamsasModel",
-    "jSeq",
-    "jGroup",
-    "viewport",
-    "userColours",
-    "tree",
-    "pcaViewer",
-    "featureSettings"
-})
-public class JalviewModel {
-
-    @XmlElement(required = true)
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar creationDate;
-    @XmlElement(required = true)
-    protected String version;
-    @XmlElement(required = true)
-    protected VAMSAS vamsasModel;
-    @XmlElement(name = "JSeq")
-    protected List<JalviewModel.JSeq> jSeq;
-    @XmlElement(name = "JGroup")
-    protected List<JalviewModel.JGroup> jGroup;
-    @XmlElement(name = "Viewport")
-    protected List<JalviewModel.Viewport> viewport;
-    @XmlElement(name = "UserColours")
-    protected List<JalviewModel.UserColours> userColours;
-    protected List<JalviewModel.Tree> tree;
-    @XmlElement(name = "PcaViewer")
-    protected List<JalviewModel.PcaViewer> pcaViewer;
-    @XmlElement(name = "FeatureSettings")
-    protected JalviewModel.FeatureSettings featureSettings;
-
-    /**
-     * Gets the value of the creationDate property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getCreationDate() {
-        return creationDate;
-    }
-
-    /**
-     * Sets the value of the creationDate property.
+@XmlType(
+  name = "JalviewModel",
+  namespace = "www.jalview.org",
+  propOrder =
+  { "creationDate", "version", "vamsasModel", "jSeq", "jGroup", "viewport",
+      "userColours", "tree", "pcaViewer", "featureSettings" })
+public class JalviewModel
+{
+
+  @XmlElement(required = true)
+  @XmlSchemaType(name = "dateTime")
+  protected XMLGregorianCalendar creationDate;
+
+  @XmlElement(required = true)
+  protected String version;
+
+  @XmlElement(required = true)
+  protected VAMSAS vamsasModel;
+
+  @XmlElement(name = "JSeq")
+  protected List<JalviewModel.JSeq> jSeq;
+
+  @XmlElement(name = "JGroup")
+  protected List<JalviewModel.JGroup> jGroup;
+
+  @XmlElement(name = "Viewport")
+  protected List<JalviewModel.Viewport> viewport;
+
+  @XmlElement(name = "UserColours")
+  protected List<JalviewModel.UserColours> userColours;
+
+  protected List<JalviewModel.Tree> tree;
+
+  @XmlElement(name = "PcaViewer")
+  protected List<JalviewModel.PcaViewer> pcaViewer;
+
+  @XmlElement(name = "FeatureSettings")
+  protected JalviewModel.FeatureSettings featureSettings;
+
+  /**
+   * Gets the value of the creationDate property.
+   * 
+   * @return possible object is {@link XMLGregorianCalendar }
+   * 
+   */
+  public XMLGregorianCalendar getCreationDate()
+  {
+    return creationDate;
+  }
+
+  /**
+   * Sets the value of the creationDate property.
+   * 
+   * @param value
+   *          allowed object is {@link XMLGregorianCalendar }
+   * 
+   */
+  public void setCreationDate(XMLGregorianCalendar value)
+  {
+    this.creationDate = value;
+  }
+
+  /**
+   * Gets the value of the version property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getVersion()
+  {
+    return version;
+  }
+
+  /**
+   * Sets the value of the version property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setVersion(String value)
+  {
+    this.version = value;
+  }
+
+  /**
+   * Gets the value of the vamsasModel property.
+   * 
+   * @return possible object is {@link VAMSAS }
+   * 
+   */
+  public VAMSAS getVamsasModel()
+  {
+    return vamsasModel;
+  }
+
+  /**
+   * Sets the value of the vamsasModel property.
+   * 
+   * @param value
+   *          allowed object is {@link VAMSAS }
+   * 
+   */
+  public void setVamsasModel(VAMSAS value)
+  {
+    this.vamsasModel = value;
+  }
+
+  /**
+   * Gets the value of the jSeq property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the jSeq property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getJSeq().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link JalviewModel.JSeq }
+   * 
+   * 
+   */
+  public List<JalviewModel.JSeq> getJSeq()
+  {
+    if (jSeq == null)
+    {
+      jSeq = new ArrayList<JalviewModel.JSeq>();
+    }
+    return this.jSeq;
+  }
+
+  /**
+   * Gets the value of the jGroup property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the jGroup property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getJGroup().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link JalviewModel.JGroup }
+   * 
+   * 
+   */
+  public List<JalviewModel.JGroup> getJGroup()
+  {
+    if (jGroup == null)
+    {
+      jGroup = new ArrayList<JalviewModel.JGroup>();
+    }
+    return this.jGroup;
+  }
+
+  /**
+   * Gets the value of the viewport property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the viewport property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getViewport().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link JalviewModel.Viewport }
+   * 
+   * 
+   */
+  public List<JalviewModel.Viewport> getViewport()
+  {
+    if (viewport == null)
+    {
+      viewport = new ArrayList<JalviewModel.Viewport>();
+    }
+    return this.viewport;
+  }
+
+  /**
+   * Gets the value of the userColours property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the userColours property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getUserColours().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link JalviewModel.UserColours }
+   * 
+   * 
+   */
+  public List<JalviewModel.UserColours> getUserColours()
+  {
+    if (userColours == null)
+    {
+      userColours = new ArrayList<JalviewModel.UserColours>();
+    }
+    return this.userColours;
+  }
+
+  /**
+   * Gets the value of the tree property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the tree property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getTree().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link JalviewModel.Tree }
+   * 
+   * 
+   */
+  public List<JalviewModel.Tree> getTree()
+  {
+    if (tree == null)
+    {
+      tree = new ArrayList<JalviewModel.Tree>();
+    }
+    return this.tree;
+  }
+
+  /**
+   * Gets the value of the pcaViewer property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the pcaViewer property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getPcaViewer().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link JalviewModel.PcaViewer }
+   * 
+   * 
+   */
+  public List<JalviewModel.PcaViewer> getPcaViewer()
+  {
+    if (pcaViewer == null)
+    {
+      pcaViewer = new ArrayList<JalviewModel.PcaViewer>();
+    }
+    return this.pcaViewer;
+  }
+
+  /**
+   * Gets the value of the featureSettings property.
+   * 
+   * @return possible object is {@link JalviewModel.FeatureSettings }
+   * 
+   */
+  public JalviewModel.FeatureSettings getFeatureSettings()
+  {
+    return featureSettings;
+  }
+
+  /**
+   * Sets the value of the featureSettings property.
+   * 
+   * @param value
+   *          allowed object is {@link JalviewModel.FeatureSettings }
+   * 
+   */
+  public void setFeatureSettings(JalviewModel.FeatureSettings value)
+  {
+    this.featureSettings = value;
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+   * &amp;lt;sequence&amp;gt; &amp;lt;element name="setting"
+   * maxOccurs="unbounded" minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+   * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+   * &amp;lt;sequence&amp;gt; &amp;lt;element name="attributeName"
+   * type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="2"
+   * minOccurs="0"/&amp;gt; &amp;lt;element name="matcherSet"
+   * type="{www.jalview.org/colours}FeatureMatcherSet" minOccurs="0"/&amp;gt;
+   * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="type" use="required"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+   * name="colour" use="required" type="{http://www.w3.org/2001/XMLSchema}int"
+   * /&amp;gt; &amp;lt;attribute name="display" use="required"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="order"
+   * type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt; &amp;lt;attribute
+   * name="mincolour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;attribute name="noValueColour"
+   * type="{www.jalview.org/colours}NoValueColour" default="Min" /&amp;gt;
+   * &amp;lt;attribute name="threshold"
+   * type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt; &amp;lt;attribute
+   * name="threshstate" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;attribute name="max" type="{http://www.w3.org/2001/XMLSchema}float"
+   * /&amp;gt; &amp;lt;attribute name="min"
+   * type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt; &amp;lt;attribute
+   * name="colourByLabel" type="{http://www.w3.org/2001/XMLSchema}boolean"
+   * /&amp;gt; &amp;lt;attribute name="autoScale"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+   * name="group" maxOccurs="unbounded" minOccurs="0"&amp;gt;
+   * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+   * name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string"
+   * /&amp;gt; &amp;lt;attribute name="display" use="required"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+   * &amp;lt;/sequence&amp;gt; &amp;lt;/restriction&amp;gt;
+   * &amp;lt;/complexContent&amp;gt; &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(name = "", propOrder = { "setting", "group" })
+  public static class FeatureSettings
+  {
+
+    @XmlElement(namespace = "www.jalview.org")
+    protected List<JalviewModel.FeatureSettings.Setting> setting;
+
+    @XmlElement(namespace = "www.jalview.org")
+    protected List<JalviewModel.FeatureSettings.Group> group;
+
+    /**
+     * Gets the value of the setting property.
+     * 
+     * &lt;p&gt; This accessor method returns a reference to the live list, not
+     * a snapshot. Therefore any modification you make to the returned list will
+     * be present inside the JAXB object. This is why there is not a
+     * &lt;CODE&gt;set&lt;/CODE&gt; method for the setting property.
+     * 
+     * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+     * getSetting().add(newItem); &lt;/pre&gt;
+     * 
+     * 
+     * &lt;p&gt; Objects of the following type(s) are allowed in the list
+     * {@link JalviewModel.FeatureSettings.Setting }
+     * 
+     * 
+     */
+    public List<JalviewModel.FeatureSettings.Setting> getSetting()
+    {
+      if (setting == null)
+      {
+        setting = new ArrayList<JalviewModel.FeatureSettings.Setting>();
+      }
+      return this.setting;
+    }
+
+    /**
+     * Gets the value of the group property.
+     * 
+     * &lt;p&gt; This accessor method returns a reference to the live list, not
+     * a snapshot. Therefore any modification you make to the returned list will
+     * be present inside the JAXB object. This is why there is not a
+     * &lt;CODE&gt;set&lt;/CODE&gt; method for the group property.
+     * 
+     * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+     * getGroup().add(newItem); &lt;/pre&gt;
+     * 
+     * 
+     * &lt;p&gt; Objects of the following type(s) are allowed in the list
+     * {@link JalviewModel.FeatureSettings.Group }
+     * 
+     * 
+     */
+    public List<JalviewModel.FeatureSettings.Group> getGroup()
+    {
+      if (group == null)
+      {
+        group = new ArrayList<JalviewModel.FeatureSettings.Group>();
+      }
+      return this.group;
+    }
+
+    /**
+     * &lt;p&gt;Java class for anonymous complex type.
+     * 
+     * &lt;p&gt;The following schema fragment specifies the expected content
+     * contained within this class.
+     * 
+     * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+     * &amp;lt;restriction
+     * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+     * &amp;lt;attribute name="name" use="required"
+     * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+     * &amp;lt;attribute name="display" use="required"
+     * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+     * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+     * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "")
+    public static class Group
+    {
+
+      @XmlAttribute(name = "name", required = true)
+      protected String name;
+
+      @XmlAttribute(name = "display", required = true)
+      protected boolean display;
+
+      /**
+       * Gets the value of the name property.
+       * 
+       * @return possible object is {@link String }
+       * 
+       */
+      public String getName()
+      {
+        return name;
+      }
+
+      /**
+       * Sets the value of the name property.
+       * 
+       * @param value
+       *          allowed object is {@link String }
+       * 
+       */
+      public void setName(String value)
+      {
+        this.name = value;
+      }
+
+      /**
+       * Gets the value of the display property.
+       * 
+       */
+      public boolean isDisplay()
+      {
+        return display;
+      }
+
+      /**
+       * Sets the value of the display property.
+       * 
+       */
+      public void setDisplay(boolean value)
+      {
+        this.display = value;
+      }
+
+    }
+
+    /**
+     * &lt;p&gt;Java class for anonymous complex type.
+     * 
+     * &lt;p&gt;The following schema fragment specifies the expected content
+     * contained within this class.
+     * 
+     * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+     * &amp;lt;restriction
+     * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+     * &amp;lt;sequence&amp;gt; &amp;lt;element name="attributeName"
+     * type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="2"
+     * minOccurs="0"/&amp;gt; &amp;lt;element name="matcherSet"
+     * type="{www.jalview.org/colours}FeatureMatcherSet" minOccurs="0"/&amp;gt;
+     * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="type" use="required"
+     * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+     * &amp;lt;attribute name="colour" use="required"
+     * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+     * name="display" use="required"
+     * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+     * &amp;lt;attribute name="order"
+     * type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
+     * &amp;lt;attribute name="mincolour"
+     * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+     * name="noValueColour" type="{www.jalview.org/colours}NoValueColour"
+     * default="Min" /&amp;gt; &amp;lt;attribute name="threshold"
+     * type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
+     * &amp;lt;attribute name="threshstate"
+     * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+     * name="max" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
+     * &amp;lt;attribute name="min"
+     * type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
+     * &amp;lt;attribute name="colourByLabel"
+     * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+     * &amp;lt;attribute name="autoScale"
+     * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+     * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+     * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "", propOrder = { "attributeName", "matcherSet" })
+    public static class Setting
+    {
+
+      @XmlElement(namespace = "www.jalview.org")
+      protected List<String> attributeName;
+
+      @XmlElement(namespace = "www.jalview.org")
+      protected FeatureMatcherSet matcherSet;
+
+      @XmlAttribute(name = "type", required = true)
+      protected String type;
+
+      @XmlAttribute(name = "colour", required = true)
+      protected int colour;
+
+      @XmlAttribute(name = "display", required = true)
+      protected boolean display;
+
+      @XmlAttribute(name = "order")
+      protected Float order;
+
+      @XmlAttribute(name = "mincolour")
+      protected Integer mincolour;
+
+      @XmlAttribute(name = "noValueColour")
+      protected NoValueColour noValueColour;
+
+      @XmlAttribute(name = "threshold")
+      protected Float threshold;
+
+      @XmlAttribute(name = "threshstate")
+      protected Integer threshstate;
+
+      @XmlAttribute(name = "max")
+      protected Float max;
+
+      @XmlAttribute(name = "min")
+      protected Float min;
+
+      @XmlAttribute(name = "colourByLabel")
+      protected Boolean colourByLabel;
+
+      @XmlAttribute(name = "autoScale")
+      protected Boolean autoScale;
+
+      /**
+       * Gets the value of the attributeName property.
+       * 
+       * &lt;p&gt; This accessor method returns a reference to the live list,
+       * not a snapshot. Therefore any modification you make to the returned
+       * list will be present inside the JAXB object. This is why there is not a
+       * &lt;CODE&gt;set&lt;/CODE&gt; method for the attributeName property.
+       * 
+       * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+       * getAttributeName().add(newItem); &lt;/pre&gt;
+       * 
+       * 
+       * &lt;p&gt; Objects of the following type(s) are allowed in the list
+       * {@link String }
+       * 
+       * 
+       */
+      public List<String> getAttributeName()
+      {
+        if (attributeName == null)
+        {
+          attributeName = new ArrayList<String>();
+        }
+        return this.attributeName;
+      }
+
+      /**
+       * Gets the value of the matcherSet property.
+       * 
+       * @return possible object is {@link FeatureMatcherSet }
+       * 
+       */
+      public FeatureMatcherSet getMatcherSet()
+      {
+        return matcherSet;
+      }
+
+      /**
+       * Sets the value of the matcherSet property.
+       * 
+       * @param value
+       *          allowed object is {@link FeatureMatcherSet }
+       * 
+       */
+      public void setMatcherSet(FeatureMatcherSet value)
+      {
+        this.matcherSet = value;
+      }
+
+      /**
+       * Gets the value of the type property.
+       * 
+       * @return possible object is {@link String }
+       * 
+       */
+      public String getType()
+      {
+        return type;
+      }
+
+      /**
+       * Sets the value of the type property.
+       * 
+       * @param value
+       *          allowed object is {@link String }
+       * 
+       */
+      public void setType(String value)
+      {
+        this.type = value;
+      }
+
+      /**
+       * Gets the value of the colour property.
+       * 
+       */
+      public int getColour()
+      {
+        return colour;
+      }
+
+      /**
+       * Sets the value of the colour property.
+       * 
+       */
+      public void setColour(int value)
+      {
+        this.colour = value;
+      }
+
+      /**
+       * Gets the value of the display property.
+       * 
+       */
+      public boolean isDisplay()
+      {
+        return display;
+      }
+
+      /**
+       * Sets the value of the display property.
+       * 
+       */
+      public void setDisplay(boolean value)
+      {
+        this.display = value;
+      }
+
+      /**
+       * Gets the value of the order property.
+       * 
+       * @return possible object is {@link Float }
+       * 
+       */
+      public Float getOrder()
+      {
+        return order;
+      }
+
+      /**
+       * Sets the value of the order property.
+       * 
+       * @param value
+       *          allowed object is {@link Float }
+       * 
+       */
+      public void setOrder(Float value)
+      {
+        this.order = value;
+      }
+
+      /**
+       * Gets the value of the mincolour property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getMincolour()
+      {
+        return mincolour;
+      }
+
+      /**
+       * Sets the value of the mincolour property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setMincolour(Integer value)
+      {
+        this.mincolour = value;
+      }
+
+      /**
+       * Gets the value of the noValueColour property.
+       * 
+       * @return possible object is {@link NoValueColour }
+       * 
+       */
+      public NoValueColour getNoValueColour()
+      {
+        if (noValueColour == null)
+        {
+          return NoValueColour.MIN;
+        }
+        else
+        {
+          return noValueColour;
+        }
+      }
+
+      /**
+       * Sets the value of the noValueColour property.
+       * 
+       * @param value
+       *          allowed object is {@link NoValueColour }
+       * 
+       */
+      public void setNoValueColour(NoValueColour value)
+      {
+        this.noValueColour = value;
+      }
+
+      /**
+       * Gets the value of the threshold property.
+       * 
+       * @return possible object is {@link Float }
+       * 
+       */
+      public Float getThreshold()
+      {
+        return threshold;
+      }
+
+      /**
+       * Sets the value of the threshold property.
+       * 
+       * @param value
+       *          allowed object is {@link Float }
+       * 
+       */
+      public void setThreshold(Float value)
+      {
+        this.threshold = value;
+      }
+
+      /**
+       * Gets the value of the threshstate property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getThreshstate()
+      {
+        return threshstate;
+      }
+
+      /**
+       * Sets the value of the threshstate property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setThreshstate(Integer value)
+      {
+        this.threshstate = value;
+      }
+
+      /**
+       * Gets the value of the max property.
+       * 
+       * @return possible object is {@link Float }
+       * 
+       */
+      public Float getMax()
+      {
+        return max;
+      }
+
+      /**
+       * Sets the value of the max property.
+       * 
+       * @param value
+       *          allowed object is {@link Float }
+       * 
+       */
+      public void setMax(Float value)
+      {
+        this.max = value;
+      }
+
+      /**
+       * Gets the value of the min property.
+       * 
+       * @return possible object is {@link Float }
+       * 
+       */
+      public Float getMin()
+      {
+        return min;
+      }
+
+      /**
+       * Sets the value of the min property.
+       * 
+       * @param value
+       *          allowed object is {@link Float }
+       * 
+       */
+      public void setMin(Float value)
+      {
+        this.min = value;
+      }
+
+      /**
+       * Gets the value of the colourByLabel property.
+       * 
+       * @return possible object is {@link Boolean }
+       * 
+       */
+      public Boolean isColourByLabel()
+      {
+        return colourByLabel;
+      }
+
+      /**
+       * Sets the value of the colourByLabel property.
+       * 
+       * @param value
+       *          allowed object is {@link Boolean }
+       * 
+       */
+      public void setColourByLabel(Boolean value)
+      {
+        this.colourByLabel = value;
+      }
+
+      /**
+       * Gets the value of the autoScale property.
+       * 
+       * @return possible object is {@link Boolean }
+       * 
+       */
+      public Boolean isAutoScale()
+      {
+        return autoScale;
+      }
+
+      /**
+       * Sets the value of the autoScale property.
+       * 
+       * @param value
+       *          allowed object is {@link Boolean }
+       * 
+       */
+      public void setAutoScale(Boolean value)
+      {
+        this.autoScale = value;
+      }
+
+    }
+
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+   * &amp;lt;sequence&amp;gt; &amp;lt;element name="seq"
+   * type="{http://www.w3.org/2001/XMLSchema}string"
+   * maxOccurs="unbounded"/&amp;gt; &amp;lt;element name="annotationColours"
+   * type="{www.jalview.org}AnnotationColourScheme" minOccurs="0"/&amp;gt;
+   * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="start"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="end" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;attribute name="name"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+   * name="colour" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;attribute name="consThreshold"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="pidThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;attribute name="outlineColour"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="displayBoxes" type="{http://www.w3.org/2001/XMLSchema}boolean"
+   * /&amp;gt; &amp;lt;attribute name="displayText"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="colourText"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="textCol1"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="textCol2" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;attribute name="textColThreshold"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="showUnconserved" type="{http://www.w3.org/2001/XMLSchema}boolean"
+   * /&amp;gt; &amp;lt;attribute name="ignoreGapsinConsensus"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+   * &amp;lt;attribute name="showConsensusHistogram"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+   * &amp;lt;attribute name="showSequenceLogo"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+   * &amp;lt;attribute name="normaliseSequenceLogo"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+   * &amp;lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string"
+   * /&amp;gt; &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(name = "", propOrder = { "seq", "annotationColours" })
+  public static class JGroup
+  {
+
+    @XmlElement(namespace = "www.jalview.org", required = true)
+    protected List<String> seq;
+
+    @XmlElement(namespace = "www.jalview.org")
+    protected AnnotationColourScheme annotationColours;
+
+    @XmlAttribute(name = "start")
+    protected Integer start;
+
+    @XmlAttribute(name = "end")
+    protected Integer end;
+
+    @XmlAttribute(name = "name")
+    protected String name;
+
+    @XmlAttribute(name = "colour")
+    protected String colour;
+
+    @XmlAttribute(name = "consThreshold")
+    protected Integer consThreshold;
+
+    @XmlAttribute(name = "pidThreshold")
+    protected Integer pidThreshold;
+
+    @XmlAttribute(name = "outlineColour")
+    protected Integer outlineColour;
+
+    @XmlAttribute(name = "displayBoxes")
+    protected Boolean displayBoxes;
+
+    @XmlAttribute(name = "displayText")
+    protected Boolean displayText;
+
+    @XmlAttribute(name = "colourText")
+    protected Boolean colourText;
+
+    @XmlAttribute(name = "textCol1")
+    protected Integer textCol1;
+
+    @XmlAttribute(name = "textCol2")
+    protected Integer textCol2;
+
+    @XmlAttribute(name = "textColThreshold")
+    protected Integer textColThreshold;
+
+    @XmlAttribute(name = "showUnconserved")
+    protected Boolean showUnconserved;
+
+    @XmlAttribute(name = "ignoreGapsinConsensus")
+    protected Boolean ignoreGapsinConsensus;
+
+    @XmlAttribute(name = "showConsensusHistogram")
+    protected Boolean showConsensusHistogram;
+
+    @XmlAttribute(name = "showSequenceLogo")
+    protected Boolean showSequenceLogo;
+
+    @XmlAttribute(name = "normaliseSequenceLogo")
+    protected Boolean normaliseSequenceLogo;
+
+    @XmlAttribute(name = "id")
+    protected String id;
+
+    /**
+     * Gets the value of the seq property.
+     * 
+     * &lt;p&gt; This accessor method returns a reference to the live list, not
+     * a snapshot. Therefore any modification you make to the returned list will
+     * be present inside the JAXB object. This is why there is not a
+     * &lt;CODE&gt;set&lt;/CODE&gt; method for the seq property.
+     * 
+     * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+     * getSeq().add(newItem); &lt;/pre&gt;
+     * 
+     * 
+     * &lt;p&gt; Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
      * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
      */
-    public void setCreationDate(XMLGregorianCalendar value) {
-        this.creationDate = value;
+    public List<String> getSeq()
+    {
+      if (seq == null)
+      {
+        seq = new ArrayList<String>();
+      }
+      return this.seq;
     }
 
     /**
-     * Gets the value of the version property.
+     * Gets the value of the annotationColours property.
+     * 
+     * @return possible object is {@link AnnotationColourScheme }
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getVersion() {
-        return version;
+    public AnnotationColourScheme getAnnotationColours()
+    {
+      return annotationColours;
     }
 
     /**
-     * Sets the value of the version property.
+     * Sets the value of the annotationColours property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
+     *          allowed object is {@link AnnotationColourScheme }
+     * 
      */
-    public void setVersion(String value) {
-        this.version = value;
+    public void setAnnotationColours(AnnotationColourScheme value)
+    {
+      this.annotationColours = value;
     }
 
     /**
-     * Gets the value of the vamsasModel property.
+     * Gets the value of the start property.
+     * 
+     * @return possible object is {@link Integer }
      * 
-     * @return
-     *     possible object is
-     *     {@link VAMSAS }
-     *     
      */
-    public VAMSAS getVamsasModel() {
-        return vamsasModel;
+    public Integer getStart()
+    {
+      return start;
     }
 
     /**
-     * Sets the value of the vamsasModel property.
+     * Sets the value of the start property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link VAMSAS }
-     *     
+     *          allowed object is {@link Integer }
+     * 
      */
-    public void setVamsasModel(VAMSAS value) {
-        this.vamsasModel = value;
+    public void setStart(Integer value)
+    {
+      this.start = value;
     }
 
     /**
-     * Gets the value of the jSeq property.
+     * Gets the value of the end property.
      * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the jSeq property.
+     * @return possible object is {@link Integer }
      * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getJSeq().add(newItem);
-     * &lt;/pre&gt;
+     */
+    public Integer getEnd()
+    {
+      return end;
+    }
+
+    /**
+     * Sets the value of the end property.
      * 
+     * @param value
+     *          allowed object is {@link Integer }
      * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link JalviewModel.JSeq }
+     */
+    public void setEnd(Integer value)
+    {
+      this.end = value;
+    }
+
+    /**
+     * Gets the value of the name property.
      * 
+     * @return possible object is {@link String }
      * 
      */
-    public List<JalviewModel.JSeq> getJSeq() {
-        if (jSeq == null) {
-            jSeq = new ArrayList<JalviewModel.JSeq>();
-        }
-        return this.jSeq;
+    public String getName()
+    {
+      return name;
     }
 
     /**
-     * Gets the value of the jGroup property.
+     * Sets the value of the name property.
      * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the jGroup property.
+     * @param value
+     *          allowed object is {@link String }
      * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getJGroup().add(newItem);
-     * &lt;/pre&gt;
+     */
+    public void setName(String value)
+    {
+      this.name = value;
+    }
+
+    /**
+     * Gets the value of the colour property.
      * 
+     * @return possible object is {@link String }
      * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link JalviewModel.JGroup }
+     */
+    public String getColour()
+    {
+      return colour;
+    }
+
+    /**
+     * Sets the value of the colour property.
      * 
+     * @param value
+     *          allowed object is {@link String }
      * 
      */
-    public List<JalviewModel.JGroup> getJGroup() {
-        if (jGroup == null) {
-            jGroup = new ArrayList<JalviewModel.JGroup>();
-        }
-        return this.jGroup;
+    public void setColour(String value)
+    {
+      this.colour = value;
     }
 
     /**
-     * Gets the value of the viewport property.
+     * Gets the value of the consThreshold property.
      * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the viewport property.
+     * @return possible object is {@link Integer }
      * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getViewport().add(newItem);
-     * &lt;/pre&gt;
+     */
+    public Integer getConsThreshold()
+    {
+      return consThreshold;
+    }
+
+    /**
+     * Sets the value of the consThreshold property.
      * 
+     * @param value
+     *          allowed object is {@link Integer }
      * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link JalviewModel.Viewport }
+     */
+    public void setConsThreshold(Integer value)
+    {
+      this.consThreshold = value;
+    }
+
+    /**
+     * Gets the value of the pidThreshold property.
      * 
+     * @return possible object is {@link Integer }
      * 
      */
-    public List<JalviewModel.Viewport> getViewport() {
-        if (viewport == null) {
-            viewport = new ArrayList<JalviewModel.Viewport>();
-        }
-        return this.viewport;
+    public Integer getPidThreshold()
+    {
+      return pidThreshold;
     }
 
     /**
-     * Gets the value of the userColours property.
+     * Sets the value of the pidThreshold property.
      * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the userColours property.
+     * @param value
+     *          allowed object is {@link Integer }
      * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getUserColours().add(newItem);
-     * &lt;/pre&gt;
+     */
+    public void setPidThreshold(Integer value)
+    {
+      this.pidThreshold = value;
+    }
+
+    /**
+     * Gets the value of the outlineColour property.
      * 
+     * @return possible object is {@link Integer }
      * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link JalviewModel.UserColours }
+     */
+    public Integer getOutlineColour()
+    {
+      return outlineColour;
+    }
+
+    /**
+     * Sets the value of the outlineColour property.
      * 
+     * @param value
+     *          allowed object is {@link Integer }
      * 
      */
-    public List<JalviewModel.UserColours> getUserColours() {
-        if (userColours == null) {
-            userColours = new ArrayList<JalviewModel.UserColours>();
-        }
-        return this.userColours;
+    public void setOutlineColour(Integer value)
+    {
+      this.outlineColour = value;
     }
 
     /**
-     * Gets the value of the tree property.
+     * Gets the value of the displayBoxes property.
      * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the tree property.
+     * @return possible object is {@link Boolean }
      * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getTree().add(newItem);
-     * &lt;/pre&gt;
+     */
+    public Boolean isDisplayBoxes()
+    {
+      return displayBoxes;
+    }
+
+    /**
+     * Sets the value of the displayBoxes property.
      * 
+     * @param value
+     *          allowed object is {@link Boolean }
      * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link JalviewModel.Tree }
+     */
+    public void setDisplayBoxes(Boolean value)
+    {
+      this.displayBoxes = value;
+    }
+
+    /**
+     * Gets the value of the displayText property.
      * 
+     * @return possible object is {@link Boolean }
      * 
      */
-    public List<JalviewModel.Tree> getTree() {
-        if (tree == null) {
-            tree = new ArrayList<JalviewModel.Tree>();
-        }
-        return this.tree;
+    public Boolean isDisplayText()
+    {
+      return displayText;
     }
 
     /**
-     * Gets the value of the pcaViewer property.
+     * Sets the value of the displayText property.
      * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the pcaViewer property.
+     * @param value
+     *          allowed object is {@link Boolean }
      * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getPcaViewer().add(newItem);
-     * &lt;/pre&gt;
+     */
+    public void setDisplayText(Boolean value)
+    {
+      this.displayText = value;
+    }
+
+    /**
+     * Gets the value of the colourText property.
      * 
+     * @return possible object is {@link Boolean }
      * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link JalviewModel.PcaViewer }
+     */
+    public Boolean isColourText()
+    {
+      return colourText;
+    }
+
+    /**
+     * Sets the value of the colourText property.
      * 
+     * @param value
+     *          allowed object is {@link Boolean }
      * 
      */
-    public List<JalviewModel.PcaViewer> getPcaViewer() {
-        if (pcaViewer == null) {
-            pcaViewer = new ArrayList<JalviewModel.PcaViewer>();
-        }
-        return this.pcaViewer;
+    public void setColourText(Boolean value)
+    {
+      this.colourText = value;
     }
 
     /**
-     * Gets the value of the featureSettings property.
+     * Gets the value of the textCol1 property.
+     * 
+     * @return possible object is {@link Integer }
      * 
-     * @return
-     *     possible object is
-     *     {@link JalviewModel.FeatureSettings }
-     *     
      */
-    public JalviewModel.FeatureSettings getFeatureSettings() {
-        return featureSettings;
+    public Integer getTextCol1()
+    {
+      return textCol1;
     }
 
     /**
-     * Sets the value of the featureSettings property.
+     * Sets the value of the textCol1 property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link JalviewModel.FeatureSettings }
-     *     
+     *          allowed object is {@link Integer }
+     * 
      */
-    public void setFeatureSettings(JalviewModel.FeatureSettings value) {
-        this.featureSettings = value;
+    public void setTextCol1(Integer value)
+    {
+      this.textCol1 = value;
     }
 
+    /**
+     * Gets the value of the textCol2 property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getTextCol2()
+    {
+      return textCol2;
+    }
 
     /**
-     * &lt;p&gt;Java class for anonymous complex type.
+     * Sets the value of the textCol2 property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
      * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-     * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;sequence&amp;gt;
-     *         &amp;lt;element name="setting" maxOccurs="unbounded" minOccurs="0"&amp;gt;
-     *           &amp;lt;complexType&amp;gt;
-     *             &amp;lt;complexContent&amp;gt;
-     *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *                 &amp;lt;sequence&amp;gt;
-     *                   &amp;lt;element name="attributeName" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="2" minOccurs="0"/&amp;gt;
-     *                   &amp;lt;element name="matcherSet" type="{www.jalview.org/colours}FeatureMatcherSet" minOccurs="0"/&amp;gt;
-     *                 &amp;lt;/sequence&amp;gt;
-     *                 &amp;lt;attribute name="type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *                 &amp;lt;attribute name="colour" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *                 &amp;lt;attribute name="display" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *                 &amp;lt;attribute name="order" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
-     *                 &amp;lt;attribute name="mincolour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *                 &amp;lt;attribute name="noValueColour" type="{www.jalview.org/colours}NoValueColour" default="Min" /&amp;gt;
-     *                 &amp;lt;attribute name="threshold" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
-     *                 &amp;lt;attribute name="threshstate" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *                 &amp;lt;attribute name="max" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
-     *                 &amp;lt;attribute name="min" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
-     *                 &amp;lt;attribute name="colourByLabel" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *                 &amp;lt;attribute name="autoScale" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *               &amp;lt;/restriction&amp;gt;
-     *             &amp;lt;/complexContent&amp;gt;
-     *           &amp;lt;/complexType&amp;gt;
-     *         &amp;lt;/element&amp;gt;
-     *         &amp;lt;element name="group" maxOccurs="unbounded" minOccurs="0"&amp;gt;
-     *           &amp;lt;complexType&amp;gt;
-     *             &amp;lt;complexContent&amp;gt;
-     *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *                 &amp;lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *                 &amp;lt;attribute name="display" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *               &amp;lt;/restriction&amp;gt;
-     *             &amp;lt;/complexContent&amp;gt;
-     *           &amp;lt;/complexType&amp;gt;
-     *         &amp;lt;/element&amp;gt;
-     *       &amp;lt;/sequence&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
+     */
+    public void setTextCol2(Integer value)
+    {
+      this.textCol2 = value;
+    }
+
+    /**
+     * Gets the value of the textColThreshold property.
      * 
+     * @return possible object is {@link Integer }
      * 
      */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "setting",
-        "group"
-    })
-    public static class FeatureSettings {
+    public Integer getTextColThreshold()
+    {
+      return textColThreshold;
+    }
 
-        @XmlElement(namespace = "www.jalview.org")
-        protected List<JalviewModel.FeatureSettings.Setting> setting;
-        @XmlElement(namespace = "www.jalview.org")
-        protected List<JalviewModel.FeatureSettings.Group> group;
+    /**
+     * Sets the value of the textColThreshold property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setTextColThreshold(Integer value)
+    {
+      this.textColThreshold = value;
+    }
 
-        /**
-         * Gets the value of the setting property.
-         * 
-         * &lt;p&gt;
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the setting property.
-         * 
-         * &lt;p&gt;
-         * For example, to add a new item, do as follows:
-         * &lt;pre&gt;
-         *    getSetting().add(newItem);
-         * &lt;/pre&gt;
-         * 
-         * 
-         * &lt;p&gt;
-         * Objects of the following type(s) are allowed in the list
-         * {@link JalviewModel.FeatureSettings.Setting }
-         * 
-         * 
-         */
-        public List<JalviewModel.FeatureSettings.Setting> getSetting() {
-            if (setting == null) {
-                setting = new ArrayList<JalviewModel.FeatureSettings.Setting>();
-            }
-            return this.setting;
-        }
+    /**
+     * Gets the value of the showUnconserved property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isShowUnconserved()
+    {
+      return showUnconserved;
+    }
 
-        /**
-         * Gets the value of the group property.
-         * 
-         * &lt;p&gt;
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the group property.
-         * 
-         * &lt;p&gt;
-         * For example, to add a new item, do as follows:
-         * &lt;pre&gt;
-         *    getGroup().add(newItem);
-         * &lt;/pre&gt;
-         * 
-         * 
-         * &lt;p&gt;
-         * Objects of the following type(s) are allowed in the list
-         * {@link JalviewModel.FeatureSettings.Group }
-         * 
-         * 
-         */
-        public List<JalviewModel.FeatureSettings.Group> getGroup() {
-            if (group == null) {
-                group = new ArrayList<JalviewModel.FeatureSettings.Group>();
-            }
-            return this.group;
-        }
+    /**
+     * Sets the value of the showUnconserved property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowUnconserved(Boolean value)
+    {
+      this.showUnconserved = value;
+    }
 
+    /**
+     * Gets the value of the ignoreGapsinConsensus property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isIgnoreGapsinConsensus()
+    {
+      if (ignoreGapsinConsensus == null)
+      {
+        return true;
+      }
+      else
+      {
+        return ignoreGapsinConsensus;
+      }
+    }
 
-        /**
-         * &lt;p&gt;Java class for anonymous complex type.
-         * 
-         * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-         * 
-         * &lt;pre&gt;
-         * &amp;lt;complexType&amp;gt;
-         *   &amp;lt;complexContent&amp;gt;
-         *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-         *       &amp;lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-         *       &amp;lt;attribute name="display" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-         *     &amp;lt;/restriction&amp;gt;
-         *   &amp;lt;/complexContent&amp;gt;
-         * &amp;lt;/complexType&amp;gt;
-         * &lt;/pre&gt;
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Group {
-
-            @XmlAttribute(name = "name", required = true)
-            protected String name;
-            @XmlAttribute(name = "display", required = true)
-            protected boolean display;
-
-            /**
-             * Gets the value of the name property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getName() {
-                return name;
-            }
-
-            /**
-             * Sets the value of the name property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setName(String value) {
-                this.name = value;
-            }
-
-            /**
-             * Gets the value of the display property.
-             * 
-             */
-            public boolean isDisplay() {
-                return display;
-            }
-
-            /**
-             * Sets the value of the display property.
-             * 
-             */
-            public void setDisplay(boolean value) {
-                this.display = value;
-            }
+    /**
+     * Sets the value of the ignoreGapsinConsensus property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setIgnoreGapsinConsensus(Boolean value)
+    {
+      this.ignoreGapsinConsensus = value;
+    }
 
-        }
+    /**
+     * Gets the value of the showConsensusHistogram property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isShowConsensusHistogram()
+    {
+      if (showConsensusHistogram == null)
+      {
+        return true;
+      }
+      else
+      {
+        return showConsensusHistogram;
+      }
+    }
 
+    /**
+     * Sets the value of the showConsensusHistogram property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowConsensusHistogram(Boolean value)
+    {
+      this.showConsensusHistogram = value;
+    }
 
-        /**
-         * &lt;p&gt;Java class for anonymous complex type.
-         * 
-         * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-         * 
-         * &lt;pre&gt;
-         * &amp;lt;complexType&amp;gt;
-         *   &amp;lt;complexContent&amp;gt;
-         *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-         *       &amp;lt;sequence&amp;gt;
-         *         &amp;lt;element name="attributeName" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="2" minOccurs="0"/&amp;gt;
-         *         &amp;lt;element name="matcherSet" type="{www.jalview.org/colours}FeatureMatcherSet" minOccurs="0"/&amp;gt;
-         *       &amp;lt;/sequence&amp;gt;
-         *       &amp;lt;attribute name="type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-         *       &amp;lt;attribute name="colour" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-         *       &amp;lt;attribute name="display" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-         *       &amp;lt;attribute name="order" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
-         *       &amp;lt;attribute name="mincolour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-         *       &amp;lt;attribute name="noValueColour" type="{www.jalview.org/colours}NoValueColour" default="Min" /&amp;gt;
-         *       &amp;lt;attribute name="threshold" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
-         *       &amp;lt;attribute name="threshstate" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-         *       &amp;lt;attribute name="max" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
-         *       &amp;lt;attribute name="min" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
-         *       &amp;lt;attribute name="colourByLabel" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-         *       &amp;lt;attribute name="autoScale" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-         *     &amp;lt;/restriction&amp;gt;
-         *   &amp;lt;/complexContent&amp;gt;
-         * &amp;lt;/complexType&amp;gt;
-         * &lt;/pre&gt;
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "attributeName",
-            "matcherSet"
-        })
-        public static class Setting {
-
-            @XmlElement(namespace = "www.jalview.org")
-            protected List<String> attributeName;
-            @XmlElement(namespace = "www.jalview.org")
-            protected FeatureMatcherSet matcherSet;
-            @XmlAttribute(name = "type", required = true)
-            protected String type;
-            @XmlAttribute(name = "colour", required = true)
-            protected int colour;
-            @XmlAttribute(name = "display", required = true)
-            protected boolean display;
-            @XmlAttribute(name = "order")
-            protected Float order;
-            @XmlAttribute(name = "mincolour")
-            protected Integer mincolour;
-            @XmlAttribute(name = "noValueColour")
-            protected NoValueColour noValueColour;
-            @XmlAttribute(name = "threshold")
-            protected Float threshold;
-            @XmlAttribute(name = "threshstate")
-            protected Integer threshstate;
-            @XmlAttribute(name = "max")
-            protected Float max;
-            @XmlAttribute(name = "min")
-            protected Float min;
-            @XmlAttribute(name = "colourByLabel")
-            protected Boolean colourByLabel;
-            @XmlAttribute(name = "autoScale")
-            protected Boolean autoScale;
-
-            /**
-             * Gets the value of the attributeName property.
-             * 
-             * &lt;p&gt;
-             * This accessor method returns a reference to the live list,
-             * not a snapshot. Therefore any modification you make to the
-             * returned list will be present inside the JAXB object.
-             * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the attributeName property.
-             * 
-             * &lt;p&gt;
-             * For example, to add a new item, do as follows:
-             * &lt;pre&gt;
-             *    getAttributeName().add(newItem);
-             * &lt;/pre&gt;
-             * 
-             * 
-             * &lt;p&gt;
-             * Objects of the following type(s) are allowed in the list
-             * {@link String }
-             * 
-             * 
-             */
-            public List<String> getAttributeName() {
-                if (attributeName == null) {
-                    attributeName = new ArrayList<String>();
-                }
-                return this.attributeName;
-            }
-
-            /**
-             * Gets the value of the matcherSet property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link FeatureMatcherSet }
-             *     
-             */
-            public FeatureMatcherSet getMatcherSet() {
-                return matcherSet;
-            }
-
-            /**
-             * Sets the value of the matcherSet property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link FeatureMatcherSet }
-             *     
-             */
-            public void setMatcherSet(FeatureMatcherSet value) {
-                this.matcherSet = value;
-            }
-
-            /**
-             * Gets the value of the type property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getType() {
-                return type;
-            }
-
-            /**
-             * Sets the value of the type property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setType(String value) {
-                this.type = value;
-            }
-
-            /**
-             * Gets the value of the colour property.
-             * 
-             */
-            public int getColour() {
-                return colour;
-            }
-
-            /**
-             * Sets the value of the colour property.
-             * 
-             */
-            public void setColour(int value) {
-                this.colour = value;
-            }
-
-            /**
-             * Gets the value of the display property.
-             * 
-             */
-            public boolean isDisplay() {
-                return display;
-            }
-
-            /**
-             * Sets the value of the display property.
-             * 
-             */
-            public void setDisplay(boolean value) {
-                this.display = value;
-            }
-
-            /**
-             * Gets the value of the order property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Float }
-             *     
-             */
-            public Float getOrder() {
-                return order;
-            }
-
-            /**
-             * Sets the value of the order property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Float }
-             *     
-             */
-            public void setOrder(Float value) {
-                this.order = value;
-            }
-
-            /**
-             * Gets the value of the mincolour property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getMincolour() {
-                return mincolour;
-            }
-
-            /**
-             * Sets the value of the mincolour property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setMincolour(Integer value) {
-                this.mincolour = value;
-            }
-
-            /**
-             * Gets the value of the noValueColour property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link NoValueColour }
-             *     
-             */
-            public NoValueColour getNoValueColour() {
-                if (noValueColour == null) {
-                    return NoValueColour.MIN;
-                } else {
-                    return noValueColour;
-                }
-            }
-
-            /**
-             * Sets the value of the noValueColour property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link NoValueColour }
-             *     
-             */
-            public void setNoValueColour(NoValueColour value) {
-                this.noValueColour = value;
-            }
-
-            /**
-             * Gets the value of the threshold property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Float }
-             *     
-             */
-            public Float getThreshold() {
-                return threshold;
-            }
-
-            /**
-             * Sets the value of the threshold property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Float }
-             *     
-             */
-            public void setThreshold(Float value) {
-                this.threshold = value;
-            }
-
-            /**
-             * Gets the value of the threshstate property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getThreshstate() {
-                return threshstate;
-            }
-
-            /**
-             * Sets the value of the threshstate property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setThreshstate(Integer value) {
-                this.threshstate = value;
-            }
-
-            /**
-             * Gets the value of the max property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Float }
-             *     
-             */
-            public Float getMax() {
-                return max;
-            }
-
-            /**
-             * Sets the value of the max property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Float }
-             *     
-             */
-            public void setMax(Float value) {
-                this.max = value;
-            }
-
-            /**
-             * Gets the value of the min property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Float }
-             *     
-             */
-            public Float getMin() {
-                return min;
-            }
-
-            /**
-             * Sets the value of the min property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Float }
-             *     
-             */
-            public void setMin(Float value) {
-                this.min = value;
-            }
-
-            /**
-             * Gets the value of the colourByLabel property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Boolean }
-             *     
-             */
-            public Boolean isColourByLabel() {
-                return colourByLabel;
-            }
-
-            /**
-             * Sets the value of the colourByLabel property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Boolean }
-             *     
-             */
-            public void setColourByLabel(Boolean value) {
-                this.colourByLabel = value;
-            }
-
-            /**
-             * Gets the value of the autoScale property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Boolean }
-             *     
-             */
-            public Boolean isAutoScale() {
-                return autoScale;
-            }
-
-            /**
-             * Sets the value of the autoScale property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Boolean }
-             *     
-             */
-            public void setAutoScale(Boolean value) {
-                this.autoScale = value;
-            }
+    /**
+     * Gets the value of the showSequenceLogo property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isShowSequenceLogo()
+    {
+      if (showSequenceLogo == null)
+      {
+        return false;
+      }
+      else
+      {
+        return showSequenceLogo;
+      }
+    }
 
-        }
+    /**
+     * Sets the value of the showSequenceLogo property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowSequenceLogo(Boolean value)
+    {
+      this.showSequenceLogo = value;
+    }
 
+    /**
+     * Gets the value of the normaliseSequenceLogo property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isNormaliseSequenceLogo()
+    {
+      if (normaliseSequenceLogo == null)
+      {
+        return false;
+      }
+      else
+      {
+        return normaliseSequenceLogo;
+      }
     }
 
+    /**
+     * Sets the value of the normaliseSequenceLogo property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setNormaliseSequenceLogo(Boolean value)
+    {
+      this.normaliseSequenceLogo = value;
+    }
 
     /**
-     * &lt;p&gt;Java class for anonymous complex type.
+     * Gets the value of the id property.
+     * 
+     * @return possible object is {@link String }
      * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-     * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;sequence&amp;gt;
-     *         &amp;lt;element name="seq" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/&amp;gt;
-     *         &amp;lt;element name="annotationColours" type="{www.jalview.org}AnnotationColourScheme" minOccurs="0"/&amp;gt;
-     *       &amp;lt;/sequence&amp;gt;
-     *       &amp;lt;attribute name="start" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="end" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="colour" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="consThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="pidThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="outlineColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="displayBoxes" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="displayText" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="colourText" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="textCol1" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="textCol2" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="textColThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="showUnconserved" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="ignoreGapsinConsensus" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
-     *       &amp;lt;attribute name="showConsensusHistogram" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
-     *       &amp;lt;attribute name="showSequenceLogo" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-     *       &amp;lt;attribute name="normaliseSequenceLogo" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-     *       &amp;lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
+     */
+    public String getId()
+    {
+      return id;
+    }
+
+    /**
+     * Sets the value of the id property.
      * 
+     * @param value
+     *          allowed object is {@link String }
      * 
      */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "seq",
-        "annotationColours"
-    })
-    public static class JGroup {
-
-        @XmlElement(namespace = "www.jalview.org", required = true)
-        protected List<String> seq;
-        @XmlElement(namespace = "www.jalview.org")
-        protected AnnotationColourScheme annotationColours;
-        @XmlAttribute(name = "start")
-        protected Integer start;
-        @XmlAttribute(name = "end")
-        protected Integer end;
-        @XmlAttribute(name = "name")
-        protected String name;
-        @XmlAttribute(name = "colour")
-        protected String colour;
-        @XmlAttribute(name = "consThreshold")
-        protected Integer consThreshold;
-        @XmlAttribute(name = "pidThreshold")
-        protected Integer pidThreshold;
-        @XmlAttribute(name = "outlineColour")
-        protected Integer outlineColour;
-        @XmlAttribute(name = "displayBoxes")
-        protected Boolean displayBoxes;
-        @XmlAttribute(name = "displayText")
-        protected Boolean displayText;
-        @XmlAttribute(name = "colourText")
-        protected Boolean colourText;
-        @XmlAttribute(name = "textCol1")
-        protected Integer textCol1;
-        @XmlAttribute(name = "textCol2")
-        protected Integer textCol2;
-        @XmlAttribute(name = "textColThreshold")
-        protected Integer textColThreshold;
-        @XmlAttribute(name = "showUnconserved")
-        protected Boolean showUnconserved;
-        @XmlAttribute(name = "ignoreGapsinConsensus")
-        protected Boolean ignoreGapsinConsensus;
-        @XmlAttribute(name = "showConsensusHistogram")
-        protected Boolean showConsensusHistogram;
-        @XmlAttribute(name = "showSequenceLogo")
-        protected Boolean showSequenceLogo;
-        @XmlAttribute(name = "normaliseSequenceLogo")
-        protected Boolean normaliseSequenceLogo;
-        @XmlAttribute(name = "id")
-        protected String id;
+    public void setId(String value)
+    {
+      this.id = value;
+    }
 
-        /**
-         * Gets the value of the seq property.
-         * 
-         * &lt;p&gt;
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the seq property.
-         * 
-         * &lt;p&gt;
-         * For example, to add a new item, do as follows:
-         * &lt;pre&gt;
-         *    getSeq().add(newItem);
-         * &lt;/pre&gt;
-         * 
-         * 
-         * &lt;p&gt;
-         * Objects of the following type(s) are allowed in the list
-         * {@link String }
-         * 
-         * 
-         */
-        public List<String> getSeq() {
-            if (seq == null) {
-                seq = new ArrayList<String>();
-            }
-            return this.seq;
-        }
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+   * &amp;lt;sequence&amp;gt; &amp;lt;element name="features"
+   * type="{www.jalview.org}feature" maxOccurs="unbounded"
+   * minOccurs="0"/&amp;gt; &amp;lt;element name="pdbids" maxOccurs="unbounded"
+   * minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+   * &amp;lt;complexContent&amp;gt; &amp;lt;extension
+   * base="{www.jalview.org}pdbentry"&amp;gt; &amp;lt;sequence&amp;gt;
+   * &amp;lt;element name="structureState" maxOccurs="unbounded"
+   * minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+   * &amp;lt;simpleContent&amp;gt; &amp;lt;extension
+   * base="&amp;lt;http://www.w3.org/2001/XMLSchema&amp;gt;string"&amp;gt;
+   * &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
+   * &amp;lt;attribute name="visible"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="viewId"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+   * name="alignwithAlignPanel" type="{http://www.w3.org/2001/XMLSchema}boolean"
+   * default="true" /&amp;gt; &amp;lt;attribute name="colourwithAlignPanel"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+   * &amp;lt;attribute name="colourByJmol"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+   * &amp;lt;attribute name="type"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;/extension&amp;gt; &amp;lt;/simpleContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+   * &amp;lt;/sequence&amp;gt; &amp;lt;/extension&amp;gt;
+   * &amp;lt;/complexContent&amp;gt; &amp;lt;/complexType&amp;gt;
+   * &amp;lt;/element&amp;gt; &amp;lt;element name="hiddenSequences"
+   * type="{http://www.w3.org/2001/XMLSchema}int" maxOccurs="unbounded"
+   * minOccurs="0"/&amp;gt; &amp;lt;element name="rnaViewer"
+   * maxOccurs="unbounded" minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+   * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+   * &amp;lt;sequence&amp;gt; &amp;lt;element name="secondaryStructure"
+   * maxOccurs="unbounded"&amp;gt; &amp;lt;complexType&amp;gt;
+   * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+   * name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;attribute name="annotationId" use="required"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+   * name="gapped" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="viewerState"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+   * &amp;lt;/sequence&amp;gt; &amp;lt;attGroup
+   * ref="{www.jalview.org}swingwindow"/&amp;gt; &amp;lt;attribute name="title"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+   * name="viewId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;attribute name="dividerLocation"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="selectedRna" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+   * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="colour"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="start" use="required" type="{http://www.w3.org/2001/XMLSchema}int"
+   * /&amp;gt; &amp;lt;attribute name="end" use="required"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string"
+   * /&amp;gt; &amp;lt;attribute name="hidden"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="viewreference"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(
+    name = "",
+    propOrder =
+    { "features", "pdbids", "hiddenSequences", "rnaViewer" })
+  public static class JSeq
+  {
+
+    @XmlElement(namespace = "www.jalview.org")
+    protected List<Feature> features;
+
+    @XmlElement(namespace = "www.jalview.org")
+    protected List<JalviewModel.JSeq.Pdbids> pdbids;
+
+    @XmlElement(namespace = "www.jalview.org", type = Integer.class)
+    protected List<Integer> hiddenSequences;
+
+    @XmlElement(namespace = "www.jalview.org")
+    protected List<JalviewModel.JSeq.RnaViewer> rnaViewer;
+
+    @XmlAttribute(name = "colour")
+    protected Integer colour;
+
+    @XmlAttribute(name = "start", required = true)
+    protected int start;
+
+    @XmlAttribute(name = "end", required = true)
+    protected int end;
+
+    @XmlAttribute(name = "id", required = true)
+    protected String id;
+
+    @XmlAttribute(name = "hidden")
+    protected Boolean hidden;
+
+    @XmlAttribute(name = "viewreference")
+    protected Boolean viewreference;
 
-        /**
-         * Gets the value of the annotationColours property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link AnnotationColourScheme }
-         *     
-         */
-        public AnnotationColourScheme getAnnotationColours() {
-            return annotationColours;
-        }
+    /**
+     * Gets the value of the features property.
+     * 
+     * &lt;p&gt; This accessor method returns a reference to the live list, not
+     * a snapshot. Therefore any modification you make to the returned list will
+     * be present inside the JAXB object. This is why there is not a
+     * &lt;CODE&gt;set&lt;/CODE&gt; method for the features property.
+     * 
+     * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+     * getFeatures().add(newItem); &lt;/pre&gt;
+     * 
+     * 
+     * &lt;p&gt; Objects of the following type(s) are allowed in the list
+     * {@link Feature }
+     * 
+     * 
+     */
+    public List<Feature> getFeatures()
+    {
+      if (features == null)
+      {
+        features = new ArrayList<Feature>();
+      }
+      return this.features;
+    }
 
-        /**
-         * Sets the value of the annotationColours property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link AnnotationColourScheme }
-         *     
-         */
-        public void setAnnotationColours(AnnotationColourScheme value) {
-            this.annotationColours = value;
-        }
+    /**
+     * Gets the value of the pdbids property.
+     * 
+     * &lt;p&gt; This accessor method returns a reference to the live list, not
+     * a snapshot. Therefore any modification you make to the returned list will
+     * be present inside the JAXB object. This is why there is not a
+     * &lt;CODE&gt;set&lt;/CODE&gt; method for the pdbids property.
+     * 
+     * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+     * getPdbids().add(newItem); &lt;/pre&gt;
+     * 
+     * 
+     * &lt;p&gt; Objects of the following type(s) are allowed in the list
+     * {@link JalviewModel.JSeq.Pdbids }
+     * 
+     * 
+     */
+    public List<JalviewModel.JSeq.Pdbids> getPdbids()
+    {
+      if (pdbids == null)
+      {
+        pdbids = new ArrayList<JalviewModel.JSeq.Pdbids>();
+      }
+      return this.pdbids;
+    }
 
-        /**
-         * Gets the value of the start property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getStart() {
-            return start;
-        }
+    /**
+     * Gets the value of the hiddenSequences property.
+     * 
+     * &lt;p&gt; This accessor method returns a reference to the live list, not
+     * a snapshot. Therefore any modification you make to the returned list will
+     * be present inside the JAXB object. This is why there is not a
+     * &lt;CODE&gt;set&lt;/CODE&gt; method for the hiddenSequences property.
+     * 
+     * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+     * getHiddenSequences().add(newItem); &lt;/pre&gt;
+     * 
+     * 
+     * &lt;p&gt; Objects of the following type(s) are allowed in the list
+     * {@link Integer }
+     * 
+     * 
+     */
+    public List<Integer> getHiddenSequences()
+    {
+      if (hiddenSequences == null)
+      {
+        hiddenSequences = new ArrayList<Integer>();
+      }
+      return this.hiddenSequences;
+    }
 
-        /**
-         * Sets the value of the start property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setStart(Integer value) {
-            this.start = value;
-        }
+    /**
+     * Gets the value of the rnaViewer property.
+     * 
+     * &lt;p&gt; This accessor method returns a reference to the live list, not
+     * a snapshot. Therefore any modification you make to the returned list will
+     * be present inside the JAXB object. This is why there is not a
+     * &lt;CODE&gt;set&lt;/CODE&gt; method for the rnaViewer property.
+     * 
+     * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+     * getRnaViewer().add(newItem); &lt;/pre&gt;
+     * 
+     * 
+     * &lt;p&gt; Objects of the following type(s) are allowed in the list
+     * {@link JalviewModel.JSeq.RnaViewer }
+     * 
+     * 
+     */
+    public List<JalviewModel.JSeq.RnaViewer> getRnaViewer()
+    {
+      if (rnaViewer == null)
+      {
+        rnaViewer = new ArrayList<JalviewModel.JSeq.RnaViewer>();
+      }
+      return this.rnaViewer;
+    }
 
-        /**
-         * Gets the value of the end property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getEnd() {
-            return end;
-        }
+    /**
+     * Gets the value of the colour property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getColour()
+    {
+      return colour;
+    }
 
-        /**
-         * Sets the value of the end property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setEnd(Integer value) {
-            this.end = value;
-        }
+    /**
+     * Sets the value of the colour property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setColour(Integer value)
+    {
+      this.colour = value;
+    }
 
-        /**
-         * Gets the value of the name property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getName() {
-            return name;
-        }
+    /**
+     * Gets the value of the start property.
+     * 
+     */
+    public int getStart()
+    {
+      return start;
+    }
 
-        /**
-         * Sets the value of the name property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setName(String value) {
-            this.name = value;
-        }
+    /**
+     * Sets the value of the start property.
+     * 
+     */
+    public void setStart(int value)
+    {
+      this.start = value;
+    }
+
+    /**
+     * Gets the value of the end property.
+     * 
+     */
+    public int getEnd()
+    {
+      return end;
+    }
+
+    /**
+     * Sets the value of the end property.
+     * 
+     */
+    public void setEnd(int value)
+    {
+      this.end = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getId()
+    {
+      return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setId(String value)
+    {
+      this.id = value;
+    }
+
+    /**
+     * Gets the value of the hidden property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isHidden()
+    {
+      return hidden;
+    }
+
+    /**
+     * Sets the value of the hidden property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setHidden(Boolean value)
+    {
+      this.hidden = value;
+    }
+
+    /**
+     * Gets the value of the viewreference property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isViewreference()
+    {
+      return viewreference;
+    }
+
+    /**
+     * Sets the value of the viewreference property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setViewreference(Boolean value)
+    {
+      this.viewreference = value;
+    }
+
+    /**
+     * &lt;p&gt;Java class for anonymous complex type.
+     * 
+     * &lt;p&gt;The following schema fragment specifies the expected content
+     * contained within this class.
+     * 
+     * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+     * &amp;lt;extension base="{www.jalview.org}pdbentry"&amp;gt;
+     * &amp;lt;sequence&amp;gt; &amp;lt;element name="structureState"
+     * maxOccurs="unbounded" minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+     * &amp;lt;simpleContent&amp;gt; &amp;lt;extension
+     * base="&amp;lt;http://www.w3.org/2001/XMLSchema&amp;gt;string"&amp;gt;
+     * &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
+     * &amp;lt;attribute name="visible"
+     * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+     * &amp;lt;attribute name="viewId"
+     * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+     * &amp;lt;attribute name="alignwithAlignPanel"
+     * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+     * &amp;lt;attribute name="colourwithAlignPanel"
+     * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false"
+     * /&amp;gt; &amp;lt;attribute name="colourByJmol"
+     * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+     * &amp;lt;attribute name="type"
+     * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+     * &amp;lt;/extension&amp;gt; &amp;lt;/simpleContent&amp;gt;
+     * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+     * &amp;lt;/sequence&amp;gt; &amp;lt;/extension&amp;gt;
+     * &amp;lt;/complexContent&amp;gt; &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "", propOrder = { "structureState" })
+    public static class Pdbids extends Pdbentry
+    {
+
+      @XmlElement(namespace = "www.jalview.org")
+      protected List<JalviewModel.JSeq.Pdbids.StructureState> structureState;
+
+      /**
+       * Gets the value of the structureState property.
+       * 
+       * &lt;p&gt; This accessor method returns a reference to the live list,
+       * not a snapshot. Therefore any modification you make to the returned
+       * list will be present inside the JAXB object. This is why there is not a
+       * &lt;CODE&gt;set&lt;/CODE&gt; method for the structureState property.
+       * 
+       * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+       * getStructureState().add(newItem); &lt;/pre&gt;
+       * 
+       * 
+       * &lt;p&gt; Objects of the following type(s) are allowed in the list
+       * {@link JalviewModel.JSeq.Pdbids.StructureState }
+       * 
+       * 
+       */
+      public List<JalviewModel.JSeq.Pdbids.StructureState> getStructureState()
+      {
+        if (structureState == null)
+        {
+          structureState = new ArrayList<JalviewModel.JSeq.Pdbids.StructureState>();
+        }
+        return this.structureState;
+      }
+
+      /**
+       * &lt;p&gt;Java class for anonymous complex type.
+       * 
+       * &lt;p&gt;The following schema fragment specifies the expected content
+       * contained within this class.
+       * 
+       * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;simpleContent&amp;gt;
+       * &amp;lt;extension
+       * base="&amp;lt;http://www.w3.org/2001/XMLSchema&amp;gt;string"&amp;gt;
+       * &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
+       * &amp;lt;attribute name="visible"
+       * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+       * &amp;lt;attribute name="viewId"
+       * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+       * &amp;lt;attribute name="alignwithAlignPanel"
+       * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true"
+       * /&amp;gt; &amp;lt;attribute name="colourwithAlignPanel"
+       * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false"
+       * /&amp;gt; &amp;lt;attribute name="colourByJmol"
+       * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true"
+       * /&amp;gt; &amp;lt;attribute name="type"
+       * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+       * &amp;lt;/extension&amp;gt; &amp;lt;/simpleContent&amp;gt;
+       * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+       * 
+       * 
+       */
+      @XmlAccessorType(XmlAccessType.FIELD)
+      @XmlType(name = "", propOrder = { "value" })
+      public static class StructureState
+      {
+
+        @XmlValue
+        protected String value;
+
+        @XmlAttribute(name = "visible")
+        protected Boolean visible;
+
+        @XmlAttribute(name = "viewId")
+        protected String viewId;
+
+        @XmlAttribute(name = "alignwithAlignPanel")
+        protected Boolean alignwithAlignPanel;
+
+        @XmlAttribute(name = "colourwithAlignPanel")
+        protected Boolean colourwithAlignPanel;
+
+        @XmlAttribute(name = "colourByJmol")
+        protected Boolean colourByJmol;
+
+        @XmlAttribute(name = "type")
+        protected String type;
+
+        @XmlAttribute(name = "width")
+        protected Integer width;
+
+        @XmlAttribute(name = "height")
+        protected Integer height;
+
+        @XmlAttribute(name = "xpos")
+        protected Integer xpos;
+
+        @XmlAttribute(name = "ypos")
+        protected Integer ypos;
 
         /**
-         * Gets the value of the colour property.
+         * Gets the value of the value property.
+         * 
+         * @return possible object is {@link String }
          * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
          */
-        public String getColour() {
-            return colour;
+        public String getValue()
+        {
+          return value;
         }
 
         /**
-         * Sets the value of the colour property.
+         * Sets the value of the value property.
          * 
          * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
+         *          allowed object is {@link String }
+         * 
          */
-        public void setColour(String value) {
-            this.colour = value;
+        public void setValue(String value)
+        {
+          this.value = value;
         }
 
         /**
-         * Gets the value of the consThreshold property.
+         * Gets the value of the visible property.
+         * 
+         * @return possible object is {@link Boolean }
          * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
          */
-        public Integer getConsThreshold() {
-            return consThreshold;
+        public Boolean isVisible()
+        {
+          return visible;
         }
 
         /**
-         * Sets the value of the consThreshold property.
+         * Sets the value of the visible property.
          * 
          * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
+         *          allowed object is {@link Boolean }
+         * 
          */
-        public void setConsThreshold(Integer value) {
-            this.consThreshold = value;
+        public void setVisible(Boolean value)
+        {
+          this.visible = value;
         }
 
         /**
-         * Gets the value of the pidThreshold property.
+         * Gets the value of the viewId property.
+         * 
+         * @return possible object is {@link String }
          * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
          */
-        public Integer getPidThreshold() {
-            return pidThreshold;
+        public String getViewId()
+        {
+          return viewId;
         }
 
         /**
-         * Sets the value of the pidThreshold property.
+         * Sets the value of the viewId property.
          * 
          * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
+         *          allowed object is {@link String }
+         * 
          */
-        public void setPidThreshold(Integer value) {
-            this.pidThreshold = value;
+        public void setViewId(String value)
+        {
+          this.viewId = value;
         }
 
         /**
-         * Gets the value of the outlineColour property.
+         * Gets the value of the alignwithAlignPanel property.
+         * 
+         * @return possible object is {@link Boolean }
          * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
          */
-        public Integer getOutlineColour() {
-            return outlineColour;
+        public boolean isAlignwithAlignPanel()
+        {
+          if (alignwithAlignPanel == null)
+          {
+            return true;
+          }
+          else
+          {
+            return alignwithAlignPanel;
+          }
         }
 
         /**
-         * Sets the value of the outlineColour property.
+         * Sets the value of the alignwithAlignPanel property.
          * 
          * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
+         *          allowed object is {@link Boolean }
+         * 
          */
-        public void setOutlineColour(Integer value) {
-            this.outlineColour = value;
+        public void setAlignwithAlignPanel(Boolean value)
+        {
+          this.alignwithAlignPanel = value;
         }
 
         /**
-         * Gets the value of the displayBoxes property.
+         * Gets the value of the colourwithAlignPanel property.
+         * 
+         * @return possible object is {@link Boolean }
          * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
          */
-        public Boolean isDisplayBoxes() {
-            return displayBoxes;
+        public boolean isColourwithAlignPanel()
+        {
+          if (colourwithAlignPanel == null)
+          {
+            return false;
+          }
+          else
+          {
+            return colourwithAlignPanel;
+          }
         }
 
         /**
-         * Sets the value of the displayBoxes property.
+         * Sets the value of the colourwithAlignPanel property.
          * 
          * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
+         *          allowed object is {@link Boolean }
+         * 
          */
-        public void setDisplayBoxes(Boolean value) {
-            this.displayBoxes = value;
+        public void setColourwithAlignPanel(Boolean value)
+        {
+          this.colourwithAlignPanel = value;
         }
 
         /**
-         * Gets the value of the displayText property.
+         * Gets the value of the colourByJmol property.
+         * 
+         * @return possible object is {@link Boolean }
          * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
          */
-        public Boolean isDisplayText() {
-            return displayText;
+        public boolean isColourByJmol()
+        {
+          if (colourByJmol == null)
+          {
+            return true;
+          }
+          else
+          {
+            return colourByJmol;
+          }
         }
 
         /**
-         * Sets the value of the displayText property.
+         * Sets the value of the colourByJmol property.
          * 
          * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
+         *          allowed object is {@link Boolean }
+         * 
          */
-        public void setDisplayText(Boolean value) {
-            this.displayText = value;
+        public void setColourByJmol(Boolean value)
+        {
+          this.colourByJmol = value;
         }
 
         /**
-         * Gets the value of the colourText property.
+         * Gets the value of the type property.
+         * 
+         * @return possible object is {@link String }
          * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
          */
-        public Boolean isColourText() {
-            return colourText;
+        public String getType()
+        {
+          return type;
         }
 
         /**
-         * Sets the value of the colourText property.
+         * Sets the value of the type property.
          * 
          * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
+         *          allowed object is {@link String }
+         * 
          */
-        public void setColourText(Boolean value) {
-            this.colourText = value;
+        public void setType(String value)
+        {
+          this.type = value;
         }
 
         /**
-         * Gets the value of the textCol1 property.
+         * Gets the value of the width property.
+         * 
+         * @return possible object is {@link Integer }
          * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
          */
-        public Integer getTextCol1() {
-            return textCol1;
+        public Integer getWidth()
+        {
+          return width;
         }
 
         /**
-         * Sets the value of the textCol1 property.
+         * Sets the value of the width property.
          * 
          * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
+         *          allowed object is {@link Integer }
+         * 
          */
-        public void setTextCol1(Integer value) {
-            this.textCol1 = value;
+        public void setWidth(Integer value)
+        {
+          this.width = value;
         }
 
         /**
-         * Gets the value of the textCol2 property.
+         * Gets the value of the height property.
+         * 
+         * @return possible object is {@link Integer }
          * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
          */
-        public Integer getTextCol2() {
-            return textCol2;
+        public Integer getHeight()
+        {
+          return height;
         }
 
         /**
-         * Sets the value of the textCol2 property.
+         * Sets the value of the height property.
          * 
          * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
+         *          allowed object is {@link Integer }
+         * 
          */
-        public void setTextCol2(Integer value) {
-            this.textCol2 = value;
+        public void setHeight(Integer value)
+        {
+          this.height = value;
         }
 
         /**
-         * Gets the value of the textColThreshold property.
+         * Gets the value of the xpos property.
+         * 
+         * @return possible object is {@link Integer }
          * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
          */
-        public Integer getTextColThreshold() {
-            return textColThreshold;
+        public Integer getXpos()
+        {
+          return xpos;
         }
 
         /**
-         * Sets the value of the textColThreshold property.
+         * Sets the value of the xpos property.
          * 
          * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
+         *          allowed object is {@link Integer }
+         * 
          */
-        public void setTextColThreshold(Integer value) {
-            this.textColThreshold = value;
+        public void setXpos(Integer value)
+        {
+          this.xpos = value;
         }
 
         /**
-         * Gets the value of the showUnconserved property.
+         * Gets the value of the ypos property.
+         * 
+         * @return possible object is {@link Integer }
          * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
          */
-        public Boolean isShowUnconserved() {
-            return showUnconserved;
+        public Integer getYpos()
+        {
+          return ypos;
         }
 
         /**
-         * Sets the value of the showUnconserved property.
+         * Sets the value of the ypos property.
          * 
          * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
+         *          allowed object is {@link Integer }
+         * 
          */
-        public void setShowUnconserved(Boolean value) {
-            this.showUnconserved = value;
+        public void setYpos(Integer value)
+        {
+          this.ypos = value;
         }
 
+      }
+
+    }
+
+    /**
+     * &lt;p&gt;Java class for anonymous complex type.
+     * 
+     * &lt;p&gt;The following schema fragment specifies the expected content
+     * contained within this class.
+     * 
+     * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+     * &amp;lt;restriction
+     * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+     * &amp;lt;sequence&amp;gt; &amp;lt;element name="secondaryStructure"
+     * maxOccurs="unbounded"&amp;gt; &amp;lt;complexType&amp;gt;
+     * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+     * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+     * &amp;lt;attribute name="title"
+     * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+     * &amp;lt;attribute name="annotationId" use="required"
+     * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+     * &amp;lt;attribute name="gapped"
+     * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+     * &amp;lt;attribute name="viewerState"
+     * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+     * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+     * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+     * &amp;lt;/sequence&amp;gt; &amp;lt;attGroup
+     * ref="{www.jalview.org}swingwindow"/&amp;gt; &amp;lt;attribute
+     * name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+     * &amp;lt;attribute name="viewId"
+     * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+     * &amp;lt;attribute name="dividerLocation"
+     * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+     * name="selectedRna" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+     * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+     * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "", propOrder = { "secondaryStructure" })
+    public static class RnaViewer
+    {
+
+      @XmlElement(namespace = "www.jalview.org", required = true)
+      protected List<JalviewModel.JSeq.RnaViewer.SecondaryStructure> secondaryStructure;
+
+      @XmlAttribute(name = "title")
+      protected String title;
+
+      @XmlAttribute(name = "viewId")
+      protected String viewId;
+
+      @XmlAttribute(name = "dividerLocation")
+      protected Integer dividerLocation;
+
+      @XmlAttribute(name = "selectedRna")
+      protected Integer selectedRna;
+
+      @XmlAttribute(name = "width")
+      protected Integer width;
+
+      @XmlAttribute(name = "height")
+      protected Integer height;
+
+      @XmlAttribute(name = "xpos")
+      protected Integer xpos;
+
+      @XmlAttribute(name = "ypos")
+      protected Integer ypos;
+
+      /**
+       * Gets the value of the secondaryStructure property.
+       * 
+       * &lt;p&gt; This accessor method returns a reference to the live list,
+       * not a snapshot. Therefore any modification you make to the returned
+       * list will be present inside the JAXB object. This is why there is not a
+       * &lt;CODE&gt;set&lt;/CODE&gt; method for the secondaryStructure
+       * property.
+       * 
+       * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+       * getSecondaryStructure().add(newItem); &lt;/pre&gt;
+       * 
+       * 
+       * &lt;p&gt; Objects of the following type(s) are allowed in the list
+       * {@link JalviewModel.JSeq.RnaViewer.SecondaryStructure }
+       * 
+       * 
+       */
+      public List<JalviewModel.JSeq.RnaViewer.SecondaryStructure> getSecondaryStructure()
+      {
+        if (secondaryStructure == null)
+        {
+          secondaryStructure = new ArrayList<JalviewModel.JSeq.RnaViewer.SecondaryStructure>();
+        }
+        return this.secondaryStructure;
+      }
+
+      /**
+       * Gets the value of the title property.
+       * 
+       * @return possible object is {@link String }
+       * 
+       */
+      public String getTitle()
+      {
+        return title;
+      }
+
+      /**
+       * Sets the value of the title property.
+       * 
+       * @param value
+       *          allowed object is {@link String }
+       * 
+       */
+      public void setTitle(String value)
+      {
+        this.title = value;
+      }
+
+      /**
+       * Gets the value of the viewId property.
+       * 
+       * @return possible object is {@link String }
+       * 
+       */
+      public String getViewId()
+      {
+        return viewId;
+      }
+
+      /**
+       * Sets the value of the viewId property.
+       * 
+       * @param value
+       *          allowed object is {@link String }
+       * 
+       */
+      public void setViewId(String value)
+      {
+        this.viewId = value;
+      }
+
+      /**
+       * Gets the value of the dividerLocation property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getDividerLocation()
+      {
+        return dividerLocation;
+      }
+
+      /**
+       * Sets the value of the dividerLocation property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setDividerLocation(Integer value)
+      {
+        this.dividerLocation = value;
+      }
+
+      /**
+       * Gets the value of the selectedRna property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getSelectedRna()
+      {
+        return selectedRna;
+      }
+
+      /**
+       * Sets the value of the selectedRna property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setSelectedRna(Integer value)
+      {
+        this.selectedRna = value;
+      }
+
+      /**
+       * Gets the value of the width property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getWidth()
+      {
+        return width;
+      }
+
+      /**
+       * Sets the value of the width property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setWidth(Integer value)
+      {
+        this.width = value;
+      }
+
+      /**
+       * Gets the value of the height property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getHeight()
+      {
+        return height;
+      }
+
+      /**
+       * Sets the value of the height property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setHeight(Integer value)
+      {
+        this.height = value;
+      }
+
+      /**
+       * Gets the value of the xpos property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getXpos()
+      {
+        return xpos;
+      }
+
+      /**
+       * Sets the value of the xpos property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setXpos(Integer value)
+      {
+        this.xpos = value;
+      }
+
+      /**
+       * Gets the value of the ypos property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getYpos()
+      {
+        return ypos;
+      }
+
+      /**
+       * Sets the value of the ypos property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setYpos(Integer value)
+      {
+        this.ypos = value;
+      }
+
+      /**
+       * &lt;p&gt;Java class for anonymous complex type.
+       * 
+       * &lt;p&gt;The following schema fragment specifies the expected content
+       * contained within this class.
+       * 
+       * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+       * &amp;lt;restriction
+       * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+       * &amp;lt;attribute name="title"
+       * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+       * &amp;lt;attribute name="annotationId" use="required"
+       * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+       * &amp;lt;attribute name="gapped"
+       * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+       * &amp;lt;attribute name="viewerState"
+       * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+       * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+       * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+       * 
+       * 
+       */
+      @XmlAccessorType(XmlAccessType.FIELD)
+      @XmlType(name = "")
+      public static class SecondaryStructure
+      {
+
+        @XmlAttribute(name = "title")
+        protected String title;
+
+        @XmlAttribute(name = "annotationId", required = true)
+        protected String annotationId;
+
+        @XmlAttribute(name = "gapped")
+        protected Boolean gapped;
+
+        @XmlAttribute(name = "viewerState")
+        protected String viewerState;
+
         /**
-         * Gets the value of the ignoreGapsinConsensus property.
+         * Gets the value of the title property.
+         * 
+         * @return possible object is {@link String }
          * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
          */
-        public boolean isIgnoreGapsinConsensus() {
-            if (ignoreGapsinConsensus == null) {
-                return true;
-            } else {
-                return ignoreGapsinConsensus;
-            }
+        public String getTitle()
+        {
+          return title;
         }
 
         /**
-         * Sets the value of the ignoreGapsinConsensus property.
+         * Sets the value of the title property.
          * 
          * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
+         *          allowed object is {@link String }
+         * 
          */
-        public void setIgnoreGapsinConsensus(Boolean value) {
-            this.ignoreGapsinConsensus = value;
+        public void setTitle(String value)
+        {
+          this.title = value;
         }
 
         /**
-         * Gets the value of the showConsensusHistogram property.
+         * Gets the value of the annotationId property.
+         * 
+         * @return possible object is {@link String }
          * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
          */
-        public boolean isShowConsensusHistogram() {
-            if (showConsensusHistogram == null) {
-                return true;
-            } else {
-                return showConsensusHistogram;
-            }
+        public String getAnnotationId()
+        {
+          return annotationId;
         }
 
         /**
-         * Sets the value of the showConsensusHistogram property.
+         * Sets the value of the annotationId property.
          * 
          * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
+         *          allowed object is {@link String }
+         * 
          */
-        public void setShowConsensusHistogram(Boolean value) {
-            this.showConsensusHistogram = value;
+        public void setAnnotationId(String value)
+        {
+          this.annotationId = value;
         }
 
         /**
-         * Gets the value of the showSequenceLogo property.
+         * Gets the value of the gapped property.
+         * 
+         * @return possible object is {@link Boolean }
          * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
          */
-        public boolean isShowSequenceLogo() {
-            if (showSequenceLogo == null) {
-                return false;
-            } else {
-                return showSequenceLogo;
-            }
+        public Boolean isGapped()
+        {
+          return gapped;
         }
 
         /**
-         * Sets the value of the showSequenceLogo property.
+         * Sets the value of the gapped property.
          * 
          * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
+         *          allowed object is {@link Boolean }
+         * 
          */
-        public void setShowSequenceLogo(Boolean value) {
-            this.showSequenceLogo = value;
+        public void setGapped(Boolean value)
+        {
+          this.gapped = value;
         }
 
         /**
-         * Gets the value of the normaliseSequenceLogo property.
+         * Gets the value of the viewerState property.
+         * 
+         * @return possible object is {@link String }
          * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
          */
-        public boolean isNormaliseSequenceLogo() {
-            if (normaliseSequenceLogo == null) {
-                return false;
-            } else {
-                return normaliseSequenceLogo;
-            }
+        public String getViewerState()
+        {
+          return viewerState;
         }
 
         /**
-         * Sets the value of the normaliseSequenceLogo property.
+         * Sets the value of the viewerState property.
          * 
          * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setNormaliseSequenceLogo(Boolean value) {
-            this.normaliseSequenceLogo = value;
-        }
-
-        /**
-         * Gets the value of the id property.
+         *          allowed object is {@link String }
          * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
          */
-        public String getId() {
-            return id;
+        public void setViewerState(String value)
+        {
+          this.viewerState = value;
         }
 
-        /**
-         * Sets the value of the id property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setId(String value) {
-            this.id = value;
-        }
+      }
 
     }
 
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+   * &amp;lt;sequence&amp;gt; &amp;lt;element name="sequencePoint"
+   * maxOccurs="unbounded"&amp;gt; &amp;lt;complexType&amp;gt;
+   * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attGroup
+   * ref="{www.jalview.org}position"/&amp;gt; &amp;lt;attribute
+   * name="sequenceRef" type="{http://www.w3.org/2001/XMLSchema}string"
+   * /&amp;gt; &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+   * name="axis" maxOccurs="3" minOccurs="3"&amp;gt; &amp;lt;complexType&amp;gt;
+   * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attGroup
+   * ref="{www.jalview.org}position"/&amp;gt; &amp;lt;/restriction&amp;gt;
+   * &amp;lt;/complexContent&amp;gt; &amp;lt;/complexType&amp;gt;
+   * &amp;lt;/element&amp;gt; &amp;lt;element name="seqPointMin"&amp;gt;
+   * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attGroup
+   * ref="{www.jalview.org}position"/&amp;gt; &amp;lt;/restriction&amp;gt;
+   * &amp;lt;/complexContent&amp;gt; &amp;lt;/complexType&amp;gt;
+   * &amp;lt;/element&amp;gt; &amp;lt;element name="seqPointMax"&amp;gt;
+   * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attGroup
+   * ref="{www.jalview.org}position"/&amp;gt; &amp;lt;/restriction&amp;gt;
+   * &amp;lt;/complexContent&amp;gt; &amp;lt;/complexType&amp;gt;
+   * &amp;lt;/element&amp;gt; &amp;lt;element name="pcaData"
+   * type="{www.jalview.org}PcaDataType"/&amp;gt; &amp;lt;/sequence&amp;gt;
+   * &amp;lt;attGroup ref="{www.jalview.org}SimilarityParams"/&amp;gt;
+   * &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
+   * &amp;lt;attribute name="title"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+   * name="scoreModelName" type="{http://www.w3.org/2001/XMLSchema}string"
+   * /&amp;gt; &amp;lt;attribute name="xDim"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="yDim" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;attribute name="zDim" type="{http://www.w3.org/2001/XMLSchema}int"
+   * /&amp;gt; &amp;lt;attribute name="bgColour"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="scaleFactor" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
+   * &amp;lt;attribute name="showLabels"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="linkToAllViews"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(
+    name = "",
+    propOrder =
+    { "sequencePoint", "axis", "seqPointMin", "seqPointMax", "pcaData" })
+  public static class PcaViewer
+  {
+
+    @XmlElement(namespace = "www.jalview.org", required = true)
+    protected List<JalviewModel.PcaViewer.SequencePoint> sequencePoint;
+
+    @XmlElement(namespace = "www.jalview.org", required = true)
+    protected List<JalviewModel.PcaViewer.Axis> axis;
+
+    @XmlElement(namespace = "www.jalview.org", required = true)
+    protected JalviewModel.PcaViewer.SeqPointMin seqPointMin;
+
+    @XmlElement(namespace = "www.jalview.org", required = true)
+    protected JalviewModel.PcaViewer.SeqPointMax seqPointMax;
+
+    @XmlElement(namespace = "www.jalview.org", required = true)
+    protected PcaDataType pcaData;
+
+    @XmlAttribute(name = "title")
+    protected String title;
+
+    @XmlAttribute(name = "scoreModelName")
+    protected String scoreModelName;
+
+    @XmlAttribute(name = "xDim")
+    protected Integer xDim;
+
+    @XmlAttribute(name = "yDim")
+    protected Integer yDim;
+
+    @XmlAttribute(name = "zDim")
+    protected Integer zDim;
+
+    @XmlAttribute(name = "bgColour")
+    protected Integer bgColour;
+
+    @XmlAttribute(name = "scaleFactor")
+    protected Float scaleFactor;
+
+    @XmlAttribute(name = "showLabels")
+    protected Boolean showLabels;
+
+    @XmlAttribute(name = "linkToAllViews")
+    protected Boolean linkToAllViews;
+
+    @XmlAttribute(name = "includeGaps")
+    protected Boolean includeGaps;
+
+    @XmlAttribute(name = "matchGaps")
+    protected Boolean matchGaps;
+
+    @XmlAttribute(name = "includeGappedColumns")
+    protected Boolean includeGappedColumns;
+
+    @XmlAttribute(name = "denominateByShortestLength")
+    protected Boolean denominateByShortestLength;
+
+    @XmlAttribute(name = "width")
+    protected Integer width;
+
+    @XmlAttribute(name = "height")
+    protected Integer height;
+
+    @XmlAttribute(name = "xpos")
+    protected Integer xpos;
+
+    @XmlAttribute(name = "ypos")
+    protected Integer ypos;
 
     /**
-     * &lt;p&gt;Java class for anonymous complex type.
+     * Gets the value of the sequencePoint property.
      * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-     * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;sequence&amp;gt;
-     *         &amp;lt;element name="features" type="{www.jalview.org}feature" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
-     *         &amp;lt;element name="pdbids" maxOccurs="unbounded" minOccurs="0"&amp;gt;
-     *           &amp;lt;complexType&amp;gt;
-     *             &amp;lt;complexContent&amp;gt;
-     *               &amp;lt;extension base="{www.jalview.org}pdbentry"&amp;gt;
-     *                 &amp;lt;sequence&amp;gt;
-     *                   &amp;lt;element name="structureState" maxOccurs="unbounded" minOccurs="0"&amp;gt;
-     *                     &amp;lt;complexType&amp;gt;
-     *                       &amp;lt;simpleContent&amp;gt;
-     *                         &amp;lt;extension base="&amp;lt;http://www.w3.org/2001/XMLSchema&amp;gt;string"&amp;gt;
-     *                           &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
-     *                           &amp;lt;attribute name="visible" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *                           &amp;lt;attribute name="viewId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *                           &amp;lt;attribute name="alignwithAlignPanel" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
-     *                           &amp;lt;attribute name="colourwithAlignPanel" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-     *                           &amp;lt;attribute name="colourByJmol" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
-     *                           &amp;lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *                         &amp;lt;/extension&amp;gt;
-     *                       &amp;lt;/simpleContent&amp;gt;
-     *                     &amp;lt;/complexType&amp;gt;
-     *                   &amp;lt;/element&amp;gt;
-     *                 &amp;lt;/sequence&amp;gt;
-     *               &amp;lt;/extension&amp;gt;
-     *             &amp;lt;/complexContent&amp;gt;
-     *           &amp;lt;/complexType&amp;gt;
-     *         &amp;lt;/element&amp;gt;
-     *         &amp;lt;element name="hiddenSequences" type="{http://www.w3.org/2001/XMLSchema}int" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
-     *         &amp;lt;element name="rnaViewer" maxOccurs="unbounded" minOccurs="0"&amp;gt;
-     *           &amp;lt;complexType&amp;gt;
-     *             &amp;lt;complexContent&amp;gt;
-     *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *                 &amp;lt;sequence&amp;gt;
-     *                   &amp;lt;element name="secondaryStructure" maxOccurs="unbounded"&amp;gt;
-     *                     &amp;lt;complexType&amp;gt;
-     *                       &amp;lt;complexContent&amp;gt;
-     *                         &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *                           &amp;lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *                           &amp;lt;attribute name="annotationId" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *                           &amp;lt;attribute name="gapped" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *                           &amp;lt;attribute name="viewerState" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *                         &amp;lt;/restriction&amp;gt;
-     *                       &amp;lt;/complexContent&amp;gt;
-     *                     &amp;lt;/complexType&amp;gt;
-     *                   &amp;lt;/element&amp;gt;
-     *                 &amp;lt;/sequence&amp;gt;
-     *                 &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
-     *                 &amp;lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *                 &amp;lt;attribute name="viewId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *                 &amp;lt;attribute name="dividerLocation" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *                 &amp;lt;attribute name="selectedRna" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *               &amp;lt;/restriction&amp;gt;
-     *             &amp;lt;/complexContent&amp;gt;
-     *           &amp;lt;/complexType&amp;gt;
-     *         &amp;lt;/element&amp;gt;
-     *       &amp;lt;/sequence&amp;gt;
-     *       &amp;lt;attribute name="colour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="start" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="end" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="hidden" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="viewreference" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
+     * &lt;p&gt; This accessor method returns a reference to the live list, not
+     * a snapshot. Therefore any modification you make to the returned list will
+     * be present inside the JAXB object. This is why there is not a
+     * &lt;CODE&gt;set&lt;/CODE&gt; method for the sequencePoint property.
+     * 
+     * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+     * getSequencePoint().add(newItem); &lt;/pre&gt;
+     * 
+     * 
+     * &lt;p&gt; Objects of the following type(s) are allowed in the list
+     * {@link JalviewModel.PcaViewer.SequencePoint }
      * 
      * 
      */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "features",
-        "pdbids",
-        "hiddenSequences",
-        "rnaViewer"
-    })
-    public static class JSeq {
-
-        @XmlElement(namespace = "www.jalview.org")
-        protected List<Feature> features;
-        @XmlElement(namespace = "www.jalview.org")
-        protected List<JalviewModel.JSeq.Pdbids> pdbids;
-        @XmlElement(namespace = "www.jalview.org", type = Integer.class)
-        protected List<Integer> hiddenSequences;
-        @XmlElement(namespace = "www.jalview.org")
-        protected List<JalviewModel.JSeq.RnaViewer> rnaViewer;
-        @XmlAttribute(name = "colour")
-        protected Integer colour;
-        @XmlAttribute(name = "start", required = true)
-        protected int start;
-        @XmlAttribute(name = "end", required = true)
-        protected int end;
-        @XmlAttribute(name = "id", required = true)
-        protected String id;
-        @XmlAttribute(name = "hidden")
-        protected Boolean hidden;
-        @XmlAttribute(name = "viewreference")
-        protected Boolean viewreference;
-
-        /**
-         * Gets the value of the features property.
-         * 
-         * &lt;p&gt;
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the features property.
-         * 
-         * &lt;p&gt;
-         * For example, to add a new item, do as follows:
-         * &lt;pre&gt;
-         *    getFeatures().add(newItem);
-         * &lt;/pre&gt;
-         * 
-         * 
-         * &lt;p&gt;
-         * Objects of the following type(s) are allowed in the list
-         * {@link Feature }
-         * 
-         * 
-         */
-        public List<Feature> getFeatures() {
-            if (features == null) {
-                features = new ArrayList<Feature>();
-            }
-            return this.features;
-        }
+    public List<JalviewModel.PcaViewer.SequencePoint> getSequencePoint()
+    {
+      if (sequencePoint == null)
+      {
+        sequencePoint = new ArrayList<JalviewModel.PcaViewer.SequencePoint>();
+      }
+      return this.sequencePoint;
+    }
 
-        /**
-         * Gets the value of the pdbids property.
-         * 
-         * &lt;p&gt;
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the pdbids property.
-         * 
-         * &lt;p&gt;
-         * For example, to add a new item, do as follows:
-         * &lt;pre&gt;
-         *    getPdbids().add(newItem);
-         * &lt;/pre&gt;
-         * 
-         * 
-         * &lt;p&gt;
-         * Objects of the following type(s) are allowed in the list
-         * {@link JalviewModel.JSeq.Pdbids }
-         * 
-         * 
-         */
-        public List<JalviewModel.JSeq.Pdbids> getPdbids() {
-            if (pdbids == null) {
-                pdbids = new ArrayList<JalviewModel.JSeq.Pdbids>();
-            }
-            return this.pdbids;
-        }
+    /**
+     * Gets the value of the axis property.
+     * 
+     * &lt;p&gt; This accessor method returns a reference to the live list, not
+     * a snapshot. Therefore any modification you make to the returned list will
+     * be present inside the JAXB object. This is why there is not a
+     * &lt;CODE&gt;set&lt;/CODE&gt; method for the axis property.
+     * 
+     * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+     * getAxis().add(newItem); &lt;/pre&gt;
+     * 
+     * 
+     * &lt;p&gt; Objects of the following type(s) are allowed in the list
+     * {@link JalviewModel.PcaViewer.Axis }
+     * 
+     * 
+     */
+    public List<JalviewModel.PcaViewer.Axis> getAxis()
+    {
+      if (axis == null)
+      {
+        axis = new ArrayList<JalviewModel.PcaViewer.Axis>();
+      }
+      return this.axis;
+    }
 
-        /**
-         * Gets the value of the hiddenSequences property.
-         * 
-         * &lt;p&gt;
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the hiddenSequences property.
-         * 
-         * &lt;p&gt;
-         * For example, to add a new item, do as follows:
-         * &lt;pre&gt;
-         *    getHiddenSequences().add(newItem);
-         * &lt;/pre&gt;
-         * 
-         * 
-         * &lt;p&gt;
-         * Objects of the following type(s) are allowed in the list
-         * {@link Integer }
-         * 
-         * 
-         */
-        public List<Integer> getHiddenSequences() {
-            if (hiddenSequences == null) {
-                hiddenSequences = new ArrayList<Integer>();
-            }
-            return this.hiddenSequences;
-        }
+    /**
+     * Gets the value of the seqPointMin property.
+     * 
+     * @return possible object is {@link JalviewModel.PcaViewer.SeqPointMin }
+     * 
+     */
+    public JalviewModel.PcaViewer.SeqPointMin getSeqPointMin()
+    {
+      return seqPointMin;
+    }
 
-        /**
-         * Gets the value of the rnaViewer property.
-         * 
-         * &lt;p&gt;
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the rnaViewer property.
-         * 
-         * &lt;p&gt;
-         * For example, to add a new item, do as follows:
-         * &lt;pre&gt;
-         *    getRnaViewer().add(newItem);
-         * &lt;/pre&gt;
-         * 
-         * 
-         * &lt;p&gt;
-         * Objects of the following type(s) are allowed in the list
-         * {@link JalviewModel.JSeq.RnaViewer }
-         * 
-         * 
-         */
-        public List<JalviewModel.JSeq.RnaViewer> getRnaViewer() {
-            if (rnaViewer == null) {
-                rnaViewer = new ArrayList<JalviewModel.JSeq.RnaViewer>();
-            }
-            return this.rnaViewer;
-        }
+    /**
+     * Sets the value of the seqPointMin property.
+     * 
+     * @param value
+     *          allowed object is {@link JalviewModel.PcaViewer.SeqPointMin }
+     * 
+     */
+    public void setSeqPointMin(JalviewModel.PcaViewer.SeqPointMin value)
+    {
+      this.seqPointMin = value;
+    }
 
-        /**
-         * Gets the value of the colour property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getColour() {
-            return colour;
-        }
+    /**
+     * Gets the value of the seqPointMax property.
+     * 
+     * @return possible object is {@link JalviewModel.PcaViewer.SeqPointMax }
+     * 
+     */
+    public JalviewModel.PcaViewer.SeqPointMax getSeqPointMax()
+    {
+      return seqPointMax;
+    }
 
-        /**
-         * Sets the value of the colour property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setColour(Integer value) {
-            this.colour = value;
-        }
+    /**
+     * Sets the value of the seqPointMax property.
+     * 
+     * @param value
+     *          allowed object is {@link JalviewModel.PcaViewer.SeqPointMax }
+     * 
+     */
+    public void setSeqPointMax(JalviewModel.PcaViewer.SeqPointMax value)
+    {
+      this.seqPointMax = value;
+    }
 
-        /**
-         * Gets the value of the start property.
-         * 
-         */
-        public int getStart() {
-            return start;
-        }
+    /**
+     * Gets the value of the pcaData property.
+     * 
+     * @return possible object is {@link PcaDataType }
+     * 
+     */
+    public PcaDataType getPcaData()
+    {
+      return pcaData;
+    }
 
-        /**
-         * Sets the value of the start property.
-         * 
-         */
-        public void setStart(int value) {
-            this.start = value;
-        }
+    /**
+     * Sets the value of the pcaData property.
+     * 
+     * @param value
+     *          allowed object is {@link PcaDataType }
+     * 
+     */
+    public void setPcaData(PcaDataType value)
+    {
+      this.pcaData = value;
+    }
 
-        /**
-         * Gets the value of the end property.
-         * 
-         */
-        public int getEnd() {
-            return end;
-        }
+    /**
+     * Gets the value of the title property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getTitle()
+    {
+      return title;
+    }
 
-        /**
-         * Sets the value of the end property.
-         * 
-         */
-        public void setEnd(int value) {
-            this.end = value;
-        }
+    /**
+     * Sets the value of the title property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setTitle(String value)
+    {
+      this.title = value;
+    }
 
-        /**
-         * Gets the value of the id property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getId() {
-            return id;
-        }
+    /**
+     * Gets the value of the scoreModelName property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getScoreModelName()
+    {
+      return scoreModelName;
+    }
 
-        /**
-         * Sets the value of the id property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setId(String value) {
-            this.id = value;
-        }
+    /**
+     * Sets the value of the scoreModelName property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setScoreModelName(String value)
+    {
+      this.scoreModelName = value;
+    }
 
-        /**
-         * Gets the value of the hidden property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isHidden() {
-            return hidden;
-        }
+    /**
+     * Gets the value of the xDim property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getXDim()
+    {
+      return xDim;
+    }
 
-        /**
-         * Sets the value of the hidden property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setHidden(Boolean value) {
-            this.hidden = value;
-        }
+    /**
+     * Sets the value of the xDim property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setXDim(Integer value)
+    {
+      this.xDim = value;
+    }
 
-        /**
-         * Gets the value of the viewreference property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isViewreference() {
-            return viewreference;
-        }
+    /**
+     * Gets the value of the yDim property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getYDim()
+    {
+      return yDim;
+    }
 
-        /**
-         * Sets the value of the viewreference property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setViewreference(Boolean value) {
-            this.viewreference = value;
-        }
+    /**
+     * Sets the value of the yDim property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setYDim(Integer value)
+    {
+      this.yDim = value;
+    }
 
+    /**
+     * Gets the value of the zDim property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getZDim()
+    {
+      return zDim;
+    }
 
-        /**
-         * &lt;p&gt;Java class for anonymous complex type.
-         * 
-         * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-         * 
-         * &lt;pre&gt;
-         * &amp;lt;complexType&amp;gt;
-         *   &amp;lt;complexContent&amp;gt;
-         *     &amp;lt;extension base="{www.jalview.org}pdbentry"&amp;gt;
-         *       &amp;lt;sequence&amp;gt;
-         *         &amp;lt;element name="structureState" maxOccurs="unbounded" minOccurs="0"&amp;gt;
-         *           &amp;lt;complexType&amp;gt;
-         *             &amp;lt;simpleContent&amp;gt;
-         *               &amp;lt;extension base="&amp;lt;http://www.w3.org/2001/XMLSchema&amp;gt;string"&amp;gt;
-         *                 &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
-         *                 &amp;lt;attribute name="visible" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-         *                 &amp;lt;attribute name="viewId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-         *                 &amp;lt;attribute name="alignwithAlignPanel" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
-         *                 &amp;lt;attribute name="colourwithAlignPanel" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-         *                 &amp;lt;attribute name="colourByJmol" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
-         *                 &amp;lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-         *               &amp;lt;/extension&amp;gt;
-         *             &amp;lt;/simpleContent&amp;gt;
-         *           &amp;lt;/complexType&amp;gt;
-         *         &amp;lt;/element&amp;gt;
-         *       &amp;lt;/sequence&amp;gt;
-         *     &amp;lt;/extension&amp;gt;
-         *   &amp;lt;/complexContent&amp;gt;
-         * &amp;lt;/complexType&amp;gt;
-         * &lt;/pre&gt;
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "structureState"
-        })
-        public static class Pdbids
-            extends Pdbentry
-        {
+    /**
+     * Sets the value of the zDim property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setZDim(Integer value)
+    {
+      this.zDim = value;
+    }
 
-            @XmlElement(namespace = "www.jalview.org")
-            protected List<JalviewModel.JSeq.Pdbids.StructureState> structureState;
-
-            /**
-             * Gets the value of the structureState property.
-             * 
-             * &lt;p&gt;
-             * This accessor method returns a reference to the live list,
-             * not a snapshot. Therefore any modification you make to the
-             * returned list will be present inside the JAXB object.
-             * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the structureState property.
-             * 
-             * &lt;p&gt;
-             * For example, to add a new item, do as follows:
-             * &lt;pre&gt;
-             *    getStructureState().add(newItem);
-             * &lt;/pre&gt;
-             * 
-             * 
-             * &lt;p&gt;
-             * Objects of the following type(s) are allowed in the list
-             * {@link JalviewModel.JSeq.Pdbids.StructureState }
-             * 
-             * 
-             */
-            public List<JalviewModel.JSeq.Pdbids.StructureState> getStructureState() {
-                if (structureState == null) {
-                    structureState = new ArrayList<JalviewModel.JSeq.Pdbids.StructureState>();
-                }
-                return this.structureState;
-            }
-
-
-            /**
-             * &lt;p&gt;Java class for anonymous complex type.
-             * 
-             * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-             * 
-             * &lt;pre&gt;
-             * &amp;lt;complexType&amp;gt;
-             *   &amp;lt;simpleContent&amp;gt;
-             *     &amp;lt;extension base="&amp;lt;http://www.w3.org/2001/XMLSchema&amp;gt;string"&amp;gt;
-             *       &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
-             *       &amp;lt;attribute name="visible" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-             *       &amp;lt;attribute name="viewId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-             *       &amp;lt;attribute name="alignwithAlignPanel" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
-             *       &amp;lt;attribute name="colourwithAlignPanel" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-             *       &amp;lt;attribute name="colourByJmol" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
-             *       &amp;lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-             *     &amp;lt;/extension&amp;gt;
-             *   &amp;lt;/simpleContent&amp;gt;
-             * &amp;lt;/complexType&amp;gt;
-             * &lt;/pre&gt;
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class StructureState {
-
-                @XmlValue
-                protected String value;
-                @XmlAttribute(name = "visible")
-                protected Boolean visible;
-                @XmlAttribute(name = "viewId")
-                protected String viewId;
-                @XmlAttribute(name = "alignwithAlignPanel")
-                protected Boolean alignwithAlignPanel;
-                @XmlAttribute(name = "colourwithAlignPanel")
-                protected Boolean colourwithAlignPanel;
-                @XmlAttribute(name = "colourByJmol")
-                protected Boolean colourByJmol;
-                @XmlAttribute(name = "type")
-                protected String type;
-                @XmlAttribute(name = "width")
-                protected Integer width;
-                @XmlAttribute(name = "height")
-                protected Integer height;
-                @XmlAttribute(name = "xpos")
-                protected Integer xpos;
-                @XmlAttribute(name = "ypos")
-                protected Integer ypos;
-
-                /**
-                 * Gets the value of the value property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setValue(String value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets the value of the visible property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public Boolean isVisible() {
-                    return visible;
-                }
-
-                /**
-                 * Sets the value of the visible property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public void setVisible(Boolean value) {
-                    this.visible = value;
-                }
-
-                /**
-                 * Gets the value of the viewId property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getViewId() {
-                    return viewId;
-                }
-
-                /**
-                 * Sets the value of the viewId property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setViewId(String value) {
-                    this.viewId = value;
-                }
-
-                /**
-                 * Gets the value of the alignwithAlignPanel property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public boolean isAlignwithAlignPanel() {
-                    if (alignwithAlignPanel == null) {
-                        return true;
-                    } else {
-                        return alignwithAlignPanel;
-                    }
-                }
-
-                /**
-                 * Sets the value of the alignwithAlignPanel property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public void setAlignwithAlignPanel(Boolean value) {
-                    this.alignwithAlignPanel = value;
-                }
-
-                /**
-                 * Gets the value of the colourwithAlignPanel property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public boolean isColourwithAlignPanel() {
-                    if (colourwithAlignPanel == null) {
-                        return false;
-                    } else {
-                        return colourwithAlignPanel;
-                    }
-                }
-
-                /**
-                 * Sets the value of the colourwithAlignPanel property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public void setColourwithAlignPanel(Boolean value) {
-                    this.colourwithAlignPanel = value;
-                }
-
-                /**
-                 * Gets the value of the colourByJmol property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public boolean isColourByJmol() {
-                    if (colourByJmol == null) {
-                        return true;
-                    } else {
-                        return colourByJmol;
-                    }
-                }
-
-                /**
-                 * Sets the value of the colourByJmol property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public void setColourByJmol(Boolean value) {
-                    this.colourByJmol = value;
-                }
-
-                /**
-                 * Gets the value of the type property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getType() {
-                    return type;
-                }
-
-                /**
-                 * Sets the value of the type property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setType(String value) {
-                    this.type = value;
-                }
-
-                /**
-                 * Gets the value of the width property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link Integer }
-                 *     
-                 */
-                public Integer getWidth() {
-                    return width;
-                }
-
-                /**
-                 * Sets the value of the width property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link Integer }
-                 *     
-                 */
-                public void setWidth(Integer value) {
-                    this.width = value;
-                }
-
-                /**
-                 * Gets the value of the height property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link Integer }
-                 *     
-                 */
-                public Integer getHeight() {
-                    return height;
-                }
-
-                /**
-                 * Sets the value of the height property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link Integer }
-                 *     
-                 */
-                public void setHeight(Integer value) {
-                    this.height = value;
-                }
-
-                /**
-                 * Gets the value of the xpos property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link Integer }
-                 *     
-                 */
-                public Integer getXpos() {
-                    return xpos;
-                }
-
-                /**
-                 * Sets the value of the xpos property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link Integer }
-                 *     
-                 */
-                public void setXpos(Integer value) {
-                    this.xpos = value;
-                }
-
-                /**
-                 * Gets the value of the ypos property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link Integer }
-                 *     
-                 */
-                public Integer getYpos() {
-                    return ypos;
-                }
-
-                /**
-                 * Sets the value of the ypos property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link Integer }
-                 *     
-                 */
-                public void setYpos(Integer value) {
-                    this.ypos = value;
-                }
-
-            }
+    /**
+     * Gets the value of the bgColour property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getBgColour()
+    {
+      return bgColour;
+    }
 
-        }
+    /**
+     * Sets the value of the bgColour property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setBgColour(Integer value)
+    {
+      this.bgColour = value;
+    }
 
+    /**
+     * Gets the value of the scaleFactor property.
+     * 
+     * @return possible object is {@link Float }
+     * 
+     */
+    public Float getScaleFactor()
+    {
+      return scaleFactor;
+    }
 
-        /**
-         * &lt;p&gt;Java class for anonymous complex type.
-         * 
-         * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-         * 
-         * &lt;pre&gt;
-         * &amp;lt;complexType&amp;gt;
-         *   &amp;lt;complexContent&amp;gt;
-         *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-         *       &amp;lt;sequence&amp;gt;
-         *         &amp;lt;element name="secondaryStructure" maxOccurs="unbounded"&amp;gt;
-         *           &amp;lt;complexType&amp;gt;
-         *             &amp;lt;complexContent&amp;gt;
-         *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-         *                 &amp;lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-         *                 &amp;lt;attribute name="annotationId" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-         *                 &amp;lt;attribute name="gapped" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-         *                 &amp;lt;attribute name="viewerState" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-         *               &amp;lt;/restriction&amp;gt;
-         *             &amp;lt;/complexContent&amp;gt;
-         *           &amp;lt;/complexType&amp;gt;
-         *         &amp;lt;/element&amp;gt;
-         *       &amp;lt;/sequence&amp;gt;
-         *       &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
-         *       &amp;lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-         *       &amp;lt;attribute name="viewId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-         *       &amp;lt;attribute name="dividerLocation" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-         *       &amp;lt;attribute name="selectedRna" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-         *     &amp;lt;/restriction&amp;gt;
-         *   &amp;lt;/complexContent&amp;gt;
-         * &amp;lt;/complexType&amp;gt;
-         * &lt;/pre&gt;
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "secondaryStructure"
-        })
-        public static class RnaViewer {
-
-            @XmlElement(namespace = "www.jalview.org", required = true)
-            protected List<JalviewModel.JSeq.RnaViewer.SecondaryStructure> secondaryStructure;
-            @XmlAttribute(name = "title")
-            protected String title;
-            @XmlAttribute(name = "viewId")
-            protected String viewId;
-            @XmlAttribute(name = "dividerLocation")
-            protected Integer dividerLocation;
-            @XmlAttribute(name = "selectedRna")
-            protected Integer selectedRna;
-            @XmlAttribute(name = "width")
-            protected Integer width;
-            @XmlAttribute(name = "height")
-            protected Integer height;
-            @XmlAttribute(name = "xpos")
-            protected Integer xpos;
-            @XmlAttribute(name = "ypos")
-            protected Integer ypos;
-
-            /**
-             * Gets the value of the secondaryStructure property.
-             * 
-             * &lt;p&gt;
-             * This accessor method returns a reference to the live list,
-             * not a snapshot. Therefore any modification you make to the
-             * returned list will be present inside the JAXB object.
-             * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the secondaryStructure property.
-             * 
-             * &lt;p&gt;
-             * For example, to add a new item, do as follows:
-             * &lt;pre&gt;
-             *    getSecondaryStructure().add(newItem);
-             * &lt;/pre&gt;
-             * 
-             * 
-             * &lt;p&gt;
-             * Objects of the following type(s) are allowed in the list
-             * {@link JalviewModel.JSeq.RnaViewer.SecondaryStructure }
-             * 
-             * 
-             */
-            public List<JalviewModel.JSeq.RnaViewer.SecondaryStructure> getSecondaryStructure() {
-                if (secondaryStructure == null) {
-                    secondaryStructure = new ArrayList<JalviewModel.JSeq.RnaViewer.SecondaryStructure>();
-                }
-                return this.secondaryStructure;
-            }
-
-            /**
-             * Gets the value of the title property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getTitle() {
-                return title;
-            }
-
-            /**
-             * Sets the value of the title property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setTitle(String value) {
-                this.title = value;
-            }
-
-            /**
-             * Gets the value of the viewId property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getViewId() {
-                return viewId;
-            }
-
-            /**
-             * Sets the value of the viewId property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setViewId(String value) {
-                this.viewId = value;
-            }
-
-            /**
-             * Gets the value of the dividerLocation property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getDividerLocation() {
-                return dividerLocation;
-            }
-
-            /**
-             * Sets the value of the dividerLocation property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setDividerLocation(Integer value) {
-                this.dividerLocation = value;
-            }
-
-            /**
-             * Gets the value of the selectedRna property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getSelectedRna() {
-                return selectedRna;
-            }
-
-            /**
-             * Sets the value of the selectedRna property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setSelectedRna(Integer value) {
-                this.selectedRna = value;
-            }
-
-            /**
-             * Gets the value of the width property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getWidth() {
-                return width;
-            }
-
-            /**
-             * Sets the value of the width property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setWidth(Integer value) {
-                this.width = value;
-            }
-
-            /**
-             * Gets the value of the height property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getHeight() {
-                return height;
-            }
-
-            /**
-             * Sets the value of the height property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setHeight(Integer value) {
-                this.height = value;
-            }
-
-            /**
-             * Gets the value of the xpos property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getXpos() {
-                return xpos;
-            }
-
-            /**
-             * Sets the value of the xpos property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setXpos(Integer value) {
-                this.xpos = value;
-            }
-
-            /**
-             * Gets the value of the ypos property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getYpos() {
-                return ypos;
-            }
-
-            /**
-             * Sets the value of the ypos property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setYpos(Integer value) {
-                this.ypos = value;
-            }
-
-
-            /**
-             * &lt;p&gt;Java class for anonymous complex type.
-             * 
-             * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-             * 
-             * &lt;pre&gt;
-             * &amp;lt;complexType&amp;gt;
-             *   &amp;lt;complexContent&amp;gt;
-             *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-             *       &amp;lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-             *       &amp;lt;attribute name="annotationId" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-             *       &amp;lt;attribute name="gapped" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-             *       &amp;lt;attribute name="viewerState" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-             *     &amp;lt;/restriction&amp;gt;
-             *   &amp;lt;/complexContent&amp;gt;
-             * &amp;lt;/complexType&amp;gt;
-             * &lt;/pre&gt;
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "")
-            public static class SecondaryStructure {
-
-                @XmlAttribute(name = "title")
-                protected String title;
-                @XmlAttribute(name = "annotationId", required = true)
-                protected String annotationId;
-                @XmlAttribute(name = "gapped")
-                protected Boolean gapped;
-                @XmlAttribute(name = "viewerState")
-                protected String viewerState;
-
-                /**
-                 * Gets the value of the title property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getTitle() {
-                    return title;
-                }
-
-                /**
-                 * Sets the value of the title property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setTitle(String value) {
-                    this.title = value;
-                }
-
-                /**
-                 * Gets the value of the annotationId property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getAnnotationId() {
-                    return annotationId;
-                }
-
-                /**
-                 * Sets the value of the annotationId property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setAnnotationId(String value) {
-                    this.annotationId = value;
-                }
-
-                /**
-                 * Gets the value of the gapped property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public Boolean isGapped() {
-                    return gapped;
-                }
-
-                /**
-                 * Sets the value of the gapped property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public void setGapped(Boolean value) {
-                    this.gapped = value;
-                }
-
-                /**
-                 * Gets the value of the viewerState property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getViewerState() {
-                    return viewerState;
-                }
-
-                /**
-                 * Sets the value of the viewerState property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setViewerState(String value) {
-                    this.viewerState = value;
-                }
-
-            }
+    /**
+     * Sets the value of the scaleFactor property.
+     * 
+     * @param value
+     *          allowed object is {@link Float }
+     * 
+     */
+    public void setScaleFactor(Float value)
+    {
+      this.scaleFactor = value;
+    }
 
-        }
+    /**
+     * Gets the value of the showLabels property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isShowLabels()
+    {
+      return showLabels;
+    }
 
+    /**
+     * Sets the value of the showLabels property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowLabels(Boolean value)
+    {
+      this.showLabels = value;
     }
 
+    /**
+     * Gets the value of the linkToAllViews property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isLinkToAllViews()
+    {
+      return linkToAllViews;
+    }
 
     /**
-     * &lt;p&gt;Java class for anonymous complex type.
+     * Sets the value of the linkToAllViews property.
      * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-     * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;sequence&amp;gt;
-     *         &amp;lt;element name="sequencePoint" maxOccurs="unbounded"&amp;gt;
-     *           &amp;lt;complexType&amp;gt;
-     *             &amp;lt;complexContent&amp;gt;
-     *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *                 &amp;lt;attGroup ref="{www.jalview.org}position"/&amp;gt;
-     *                 &amp;lt;attribute name="sequenceRef" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *               &amp;lt;/restriction&amp;gt;
-     *             &amp;lt;/complexContent&amp;gt;
-     *           &amp;lt;/complexType&amp;gt;
-     *         &amp;lt;/element&amp;gt;
-     *         &amp;lt;element name="axis" maxOccurs="3" minOccurs="3"&amp;gt;
-     *           &amp;lt;complexType&amp;gt;
-     *             &amp;lt;complexContent&amp;gt;
-     *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *                 &amp;lt;attGroup ref="{www.jalview.org}position"/&amp;gt;
-     *               &amp;lt;/restriction&amp;gt;
-     *             &amp;lt;/complexContent&amp;gt;
-     *           &amp;lt;/complexType&amp;gt;
-     *         &amp;lt;/element&amp;gt;
-     *         &amp;lt;element name="seqPointMin"&amp;gt;
-     *           &amp;lt;complexType&amp;gt;
-     *             &amp;lt;complexContent&amp;gt;
-     *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *                 &amp;lt;attGroup ref="{www.jalview.org}position"/&amp;gt;
-     *               &amp;lt;/restriction&amp;gt;
-     *             &amp;lt;/complexContent&amp;gt;
-     *           &amp;lt;/complexType&amp;gt;
-     *         &amp;lt;/element&amp;gt;
-     *         &amp;lt;element name="seqPointMax"&amp;gt;
-     *           &amp;lt;complexType&amp;gt;
-     *             &amp;lt;complexContent&amp;gt;
-     *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *                 &amp;lt;attGroup ref="{www.jalview.org}position"/&amp;gt;
-     *               &amp;lt;/restriction&amp;gt;
-     *             &amp;lt;/complexContent&amp;gt;
-     *           &amp;lt;/complexType&amp;gt;
-     *         &amp;lt;/element&amp;gt;
-     *         &amp;lt;element name="pcaData" type="{www.jalview.org}PcaDataType"/&amp;gt;
-     *       &amp;lt;/sequence&amp;gt;
-     *       &amp;lt;attGroup ref="{www.jalview.org}SimilarityParams"/&amp;gt;
-     *       &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
-     *       &amp;lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="scoreModelName" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="xDim" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="yDim" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="zDim" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="bgColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="scaleFactor" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
-     *       &amp;lt;attribute name="showLabels" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="linkToAllViews" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setLinkToAllViews(Boolean value)
+    {
+      this.linkToAllViews = value;
+    }
+
+    /**
+     * Gets the value of the includeGaps property.
      * 
+     * @return possible object is {@link Boolean }
      * 
      */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "sequencePoint",
-        "axis",
-        "seqPointMin",
-        "seqPointMax",
-        "pcaData"
-    })
-    public static class PcaViewer {
-
-        @XmlElement(namespace = "www.jalview.org", required = true)
-        protected List<JalviewModel.PcaViewer.SequencePoint> sequencePoint;
-        @XmlElement(namespace = "www.jalview.org", required = true)
-        protected List<JalviewModel.PcaViewer.Axis> axis;
-        @XmlElement(namespace = "www.jalview.org", required = true)
-        protected JalviewModel.PcaViewer.SeqPointMin seqPointMin;
-        @XmlElement(namespace = "www.jalview.org", required = true)
-        protected JalviewModel.PcaViewer.SeqPointMax seqPointMax;
-        @XmlElement(namespace = "www.jalview.org", required = true)
-        protected PcaDataType pcaData;
-        @XmlAttribute(name = "title")
-        protected String title;
-        @XmlAttribute(name = "scoreModelName")
-        protected String scoreModelName;
-        @XmlAttribute(name = "xDim")
-        protected Integer xDim;
-        @XmlAttribute(name = "yDim")
-        protected Integer yDim;
-        @XmlAttribute(name = "zDim")
-        protected Integer zDim;
-        @XmlAttribute(name = "bgColour")
-        protected Integer bgColour;
-        @XmlAttribute(name = "scaleFactor")
-        protected Float scaleFactor;
-        @XmlAttribute(name = "showLabels")
-        protected Boolean showLabels;
-        @XmlAttribute(name = "linkToAllViews")
-        protected Boolean linkToAllViews;
-        @XmlAttribute(name = "includeGaps")
-        protected Boolean includeGaps;
-        @XmlAttribute(name = "matchGaps")
-        protected Boolean matchGaps;
-        @XmlAttribute(name = "includeGappedColumns")
-        protected Boolean includeGappedColumns;
-        @XmlAttribute(name = "denominateByShortestLength")
-        protected Boolean denominateByShortestLength;
-        @XmlAttribute(name = "width")
-        protected Integer width;
-        @XmlAttribute(name = "height")
-        protected Integer height;
-        @XmlAttribute(name = "xpos")
-        protected Integer xpos;
-        @XmlAttribute(name = "ypos")
-        protected Integer ypos;
-
-        /**
-         * Gets the value of the sequencePoint property.
-         * 
-         * &lt;p&gt;
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the sequencePoint property.
-         * 
-         * &lt;p&gt;
-         * For example, to add a new item, do as follows:
-         * &lt;pre&gt;
-         *    getSequencePoint().add(newItem);
-         * &lt;/pre&gt;
-         * 
-         * 
-         * &lt;p&gt;
-         * Objects of the following type(s) are allowed in the list
-         * {@link JalviewModel.PcaViewer.SequencePoint }
-         * 
-         * 
-         */
-        public List<JalviewModel.PcaViewer.SequencePoint> getSequencePoint() {
-            if (sequencePoint == null) {
-                sequencePoint = new ArrayList<JalviewModel.PcaViewer.SequencePoint>();
-            }
-            return this.sequencePoint;
-        }
-
-        /**
-         * Gets the value of the axis property.
-         * 
-         * &lt;p&gt;
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the axis property.
-         * 
-         * &lt;p&gt;
-         * For example, to add a new item, do as follows:
-         * &lt;pre&gt;
-         *    getAxis().add(newItem);
-         * &lt;/pre&gt;
-         * 
-         * 
-         * &lt;p&gt;
-         * Objects of the following type(s) are allowed in the list
-         * {@link JalviewModel.PcaViewer.Axis }
-         * 
-         * 
-         */
-        public List<JalviewModel.PcaViewer.Axis> getAxis() {
-            if (axis == null) {
-                axis = new ArrayList<JalviewModel.PcaViewer.Axis>();
-            }
-            return this.axis;
-        }
-
-        /**
-         * Gets the value of the seqPointMin property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link JalviewModel.PcaViewer.SeqPointMin }
-         *     
-         */
-        public JalviewModel.PcaViewer.SeqPointMin getSeqPointMin() {
-            return seqPointMin;
-        }
-
-        /**
-         * Sets the value of the seqPointMin property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link JalviewModel.PcaViewer.SeqPointMin }
-         *     
-         */
-        public void setSeqPointMin(JalviewModel.PcaViewer.SeqPointMin value) {
-            this.seqPointMin = value;
-        }
-
-        /**
-         * Gets the value of the seqPointMax property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link JalviewModel.PcaViewer.SeqPointMax }
-         *     
-         */
-        public JalviewModel.PcaViewer.SeqPointMax getSeqPointMax() {
-            return seqPointMax;
-        }
-
-        /**
-         * Sets the value of the seqPointMax property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link JalviewModel.PcaViewer.SeqPointMax }
-         *     
-         */
-        public void setSeqPointMax(JalviewModel.PcaViewer.SeqPointMax value) {
-            this.seqPointMax = value;
-        }
-
-        /**
-         * Gets the value of the pcaData property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link PcaDataType }
-         *     
-         */
-        public PcaDataType getPcaData() {
-            return pcaData;
-        }
-
-        /**
-         * Sets the value of the pcaData property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link PcaDataType }
-         *     
-         */
-        public void setPcaData(PcaDataType value) {
-            this.pcaData = value;
-        }
-
-        /**
-         * Gets the value of the title property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getTitle() {
-            return title;
-        }
-
-        /**
-         * Sets the value of the title property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setTitle(String value) {
-            this.title = value;
-        }
+    public Boolean isIncludeGaps()
+    {
+      return includeGaps;
+    }
 
-        /**
-         * Gets the value of the scoreModelName property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getScoreModelName() {
-            return scoreModelName;
-        }
+    /**
+     * Sets the value of the includeGaps property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setIncludeGaps(Boolean value)
+    {
+      this.includeGaps = value;
+    }
 
-        /**
-         * Sets the value of the scoreModelName property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setScoreModelName(String value) {
-            this.scoreModelName = value;
-        }
+    /**
+     * Gets the value of the matchGaps property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isMatchGaps()
+    {
+      return matchGaps;
+    }
 
-        /**
-         * Gets the value of the xDim property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getXDim() {
-            return xDim;
-        }
+    /**
+     * Sets the value of the matchGaps property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setMatchGaps(Boolean value)
+    {
+      this.matchGaps = value;
+    }
 
-        /**
-         * Sets the value of the xDim property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setXDim(Integer value) {
-            this.xDim = value;
-        }
+    /**
+     * Gets the value of the includeGappedColumns property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isIncludeGappedColumns()
+    {
+      return includeGappedColumns;
+    }
 
-        /**
-         * Gets the value of the yDim property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getYDim() {
-            return yDim;
-        }
+    /**
+     * Sets the value of the includeGappedColumns property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setIncludeGappedColumns(Boolean value)
+    {
+      this.includeGappedColumns = value;
+    }
 
-        /**
-         * Sets the value of the yDim property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setYDim(Integer value) {
-            this.yDim = value;
-        }
+    /**
+     * Gets the value of the denominateByShortestLength property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isDenominateByShortestLength()
+    {
+      return denominateByShortestLength;
+    }
 
-        /**
-         * Gets the value of the zDim property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getZDim() {
-            return zDim;
-        }
+    /**
+     * Sets the value of the denominateByShortestLength property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setDenominateByShortestLength(Boolean value)
+    {
+      this.denominateByShortestLength = value;
+    }
 
-        /**
-         * Sets the value of the zDim property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setZDim(Integer value) {
-            this.zDim = value;
-        }
+    /**
+     * Gets the value of the width property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getWidth()
+    {
+      return width;
+    }
 
-        /**
-         * Gets the value of the bgColour property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getBgColour() {
-            return bgColour;
-        }
+    /**
+     * Sets the value of the width property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setWidth(Integer value)
+    {
+      this.width = value;
+    }
 
-        /**
-         * Sets the value of the bgColour property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setBgColour(Integer value) {
-            this.bgColour = value;
-        }
+    /**
+     * Gets the value of the height property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getHeight()
+    {
+      return height;
+    }
 
-        /**
-         * Gets the value of the scaleFactor property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Float }
-         *     
-         */
-        public Float getScaleFactor() {
-            return scaleFactor;
-        }
+    /**
+     * Sets the value of the height property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setHeight(Integer value)
+    {
+      this.height = value;
+    }
 
-        /**
-         * Sets the value of the scaleFactor property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Float }
-         *     
-         */
-        public void setScaleFactor(Float value) {
-            this.scaleFactor = value;
-        }
+    /**
+     * Gets the value of the xpos property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getXpos()
+    {
+      return xpos;
+    }
 
-        /**
-         * Gets the value of the showLabels property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isShowLabels() {
-            return showLabels;
-        }
+    /**
+     * Sets the value of the xpos property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setXpos(Integer value)
+    {
+      this.xpos = value;
+    }
 
-        /**
-         * Sets the value of the showLabels property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowLabels(Boolean value) {
-            this.showLabels = value;
-        }
+    /**
+     * Gets the value of the ypos property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getYpos()
+    {
+      return ypos;
+    }
 
-        /**
-         * Gets the value of the linkToAllViews property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isLinkToAllViews() {
-            return linkToAllViews;
-        }
+    /**
+     * Sets the value of the ypos property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setYpos(Integer value)
+    {
+      this.ypos = value;
+    }
 
-        /**
-         * Sets the value of the linkToAllViews property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setLinkToAllViews(Boolean value) {
-            this.linkToAllViews = value;
-        }
+    /**
+     * &lt;p&gt;Java class for anonymous complex type.
+     * 
+     * &lt;p&gt;The following schema fragment specifies the expected content
+     * contained within this class.
+     * 
+     * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+     * &amp;lt;restriction
+     * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attGroup
+     * ref="{www.jalview.org}position"/&amp;gt; &amp;lt;/restriction&amp;gt;
+     * &amp;lt;/complexContent&amp;gt; &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "")
+    public static class Axis
+    {
+
+      @XmlAttribute(name = "xPos")
+      protected Float xPos;
+
+      @XmlAttribute(name = "yPos")
+      protected Float yPos;
+
+      @XmlAttribute(name = "zPos")
+      protected Float zPos;
+
+      /**
+       * Gets the value of the xPos property.
+       * 
+       * @return possible object is {@link Float }
+       * 
+       */
+      public Float getXPos()
+      {
+        return xPos;
+      }
+
+      /**
+       * Sets the value of the xPos property.
+       * 
+       * @param value
+       *          allowed object is {@link Float }
+       * 
+       */
+      public void setXPos(Float value)
+      {
+        this.xPos = value;
+      }
+
+      /**
+       * Gets the value of the yPos property.
+       * 
+       * @return possible object is {@link Float }
+       * 
+       */
+      public Float getYPos()
+      {
+        return yPos;
+      }
+
+      /**
+       * Sets the value of the yPos property.
+       * 
+       * @param value
+       *          allowed object is {@link Float }
+       * 
+       */
+      public void setYPos(Float value)
+      {
+        this.yPos = value;
+      }
+
+      /**
+       * Gets the value of the zPos property.
+       * 
+       * @return possible object is {@link Float }
+       * 
+       */
+      public Float getZPos()
+      {
+        return zPos;
+      }
+
+      /**
+       * Sets the value of the zPos property.
+       * 
+       * @param value
+       *          allowed object is {@link Float }
+       * 
+       */
+      public void setZPos(Float value)
+      {
+        this.zPos = value;
+      }
 
-        /**
-         * Gets the value of the includeGaps property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isIncludeGaps() {
-            return includeGaps;
-        }
+    }
 
-        /**
-         * Sets the value of the includeGaps property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setIncludeGaps(Boolean value) {
-            this.includeGaps = value;
-        }
+    /**
+     * &lt;p&gt;Java class for anonymous complex type.
+     * 
+     * &lt;p&gt;The following schema fragment specifies the expected content
+     * contained within this class.
+     * 
+     * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+     * &amp;lt;restriction
+     * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attGroup
+     * ref="{www.jalview.org}position"/&amp;gt; &amp;lt;/restriction&amp;gt;
+     * &amp;lt;/complexContent&amp;gt; &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "")
+    public static class SeqPointMax
+    {
+
+      @XmlAttribute(name = "xPos")
+      protected Float xPos;
+
+      @XmlAttribute(name = "yPos")
+      protected Float yPos;
+
+      @XmlAttribute(name = "zPos")
+      protected Float zPos;
+
+      /**
+       * Gets the value of the xPos property.
+       * 
+       * @return possible object is {@link Float }
+       * 
+       */
+      public Float getXPos()
+      {
+        return xPos;
+      }
+
+      /**
+       * Sets the value of the xPos property.
+       * 
+       * @param value
+       *          allowed object is {@link Float }
+       * 
+       */
+      public void setXPos(Float value)
+      {
+        this.xPos = value;
+      }
+
+      /**
+       * Gets the value of the yPos property.
+       * 
+       * @return possible object is {@link Float }
+       * 
+       */
+      public Float getYPos()
+      {
+        return yPos;
+      }
+
+      /**
+       * Sets the value of the yPos property.
+       * 
+       * @param value
+       *          allowed object is {@link Float }
+       * 
+       */
+      public void setYPos(Float value)
+      {
+        this.yPos = value;
+      }
+
+      /**
+       * Gets the value of the zPos property.
+       * 
+       * @return possible object is {@link Float }
+       * 
+       */
+      public Float getZPos()
+      {
+        return zPos;
+      }
+
+      /**
+       * Sets the value of the zPos property.
+       * 
+       * @param value
+       *          allowed object is {@link Float }
+       * 
+       */
+      public void setZPos(Float value)
+      {
+        this.zPos = value;
+      }
 
-        /**
-         * Gets the value of the matchGaps property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isMatchGaps() {
-            return matchGaps;
-        }
+    }
 
-        /**
-         * Sets the value of the matchGaps property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setMatchGaps(Boolean value) {
-            this.matchGaps = value;
-        }
+    /**
+     * &lt;p&gt;Java class for anonymous complex type.
+     * 
+     * &lt;p&gt;The following schema fragment specifies the expected content
+     * contained within this class.
+     * 
+     * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+     * &amp;lt;restriction
+     * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attGroup
+     * ref="{www.jalview.org}position"/&amp;gt; &amp;lt;/restriction&amp;gt;
+     * &amp;lt;/complexContent&amp;gt; &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "")
+    public static class SeqPointMin
+    {
+
+      @XmlAttribute(name = "xPos")
+      protected Float xPos;
+
+      @XmlAttribute(name = "yPos")
+      protected Float yPos;
+
+      @XmlAttribute(name = "zPos")
+      protected Float zPos;
+
+      /**
+       * Gets the value of the xPos property.
+       * 
+       * @return possible object is {@link Float }
+       * 
+       */
+      public Float getXPos()
+      {
+        return xPos;
+      }
+
+      /**
+       * Sets the value of the xPos property.
+       * 
+       * @param value
+       *          allowed object is {@link Float }
+       * 
+       */
+      public void setXPos(Float value)
+      {
+        this.xPos = value;
+      }
+
+      /**
+       * Gets the value of the yPos property.
+       * 
+       * @return possible object is {@link Float }
+       * 
+       */
+      public Float getYPos()
+      {
+        return yPos;
+      }
+
+      /**
+       * Sets the value of the yPos property.
+       * 
+       * @param value
+       *          allowed object is {@link Float }
+       * 
+       */
+      public void setYPos(Float value)
+      {
+        this.yPos = value;
+      }
+
+      /**
+       * Gets the value of the zPos property.
+       * 
+       * @return possible object is {@link Float }
+       * 
+       */
+      public Float getZPos()
+      {
+        return zPos;
+      }
+
+      /**
+       * Sets the value of the zPos property.
+       * 
+       * @param value
+       *          allowed object is {@link Float }
+       * 
+       */
+      public void setZPos(Float value)
+      {
+        this.zPos = value;
+      }
 
-        /**
-         * Gets the value of the includeGappedColumns property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isIncludeGappedColumns() {
-            return includeGappedColumns;
-        }
+    }
 
-        /**
-         * Sets the value of the includeGappedColumns property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setIncludeGappedColumns(Boolean value) {
-            this.includeGappedColumns = value;
-        }
+    /**
+     * &lt;p&gt;Java class for anonymous complex type.
+     * 
+     * &lt;p&gt;The following schema fragment specifies the expected content
+     * contained within this class.
+     * 
+     * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+     * &amp;lt;restriction
+     * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attGroup
+     * ref="{www.jalview.org}position"/&amp;gt; &amp;lt;attribute
+     * name="sequenceRef" type="{http://www.w3.org/2001/XMLSchema}string"
+     * /&amp;gt; &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+     * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "")
+    public static class SequencePoint
+    {
+
+      @XmlAttribute(name = "sequenceRef")
+      protected String sequenceRef;
+
+      @XmlAttribute(name = "xPos")
+      protected Float xPos;
+
+      @XmlAttribute(name = "yPos")
+      protected Float yPos;
+
+      @XmlAttribute(name = "zPos")
+      protected Float zPos;
+
+      /**
+       * Gets the value of the sequenceRef property.
+       * 
+       * @return possible object is {@link String }
+       * 
+       */
+      public String getSequenceRef()
+      {
+        return sequenceRef;
+      }
+
+      /**
+       * Sets the value of the sequenceRef property.
+       * 
+       * @param value
+       *          allowed object is {@link String }
+       * 
+       */
+      public void setSequenceRef(String value)
+      {
+        this.sequenceRef = value;
+      }
+
+      /**
+       * Gets the value of the xPos property.
+       * 
+       * @return possible object is {@link Float }
+       * 
+       */
+      public Float getXPos()
+      {
+        return xPos;
+      }
+
+      /**
+       * Sets the value of the xPos property.
+       * 
+       * @param value
+       *          allowed object is {@link Float }
+       * 
+       */
+      public void setXPos(Float value)
+      {
+        this.xPos = value;
+      }
+
+      /**
+       * Gets the value of the yPos property.
+       * 
+       * @return possible object is {@link Float }
+       * 
+       */
+      public Float getYPos()
+      {
+        return yPos;
+      }
+
+      /**
+       * Sets the value of the yPos property.
+       * 
+       * @param value
+       *          allowed object is {@link Float }
+       * 
+       */
+      public void setYPos(Float value)
+      {
+        this.yPos = value;
+      }
+
+      /**
+       * Gets the value of the zPos property.
+       * 
+       * @return possible object is {@link Float }
+       * 
+       */
+      public Float getZPos()
+      {
+        return zPos;
+      }
+
+      /**
+       * Sets the value of the zPos property.
+       * 
+       * @param value
+       *          allowed object is {@link Float }
+       * 
+       */
+      public void setZPos(Float value)
+      {
+        this.zPos = value;
+      }
 
-        /**
-         * Gets the value of the denominateByShortestLength property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isDenominateByShortestLength() {
-            return denominateByShortestLength;
-        }
+    }
 
-        /**
-         * Sets the value of the denominateByShortestLength property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setDenominateByShortestLength(Boolean value) {
-            this.denominateByShortestLength = value;
-        }
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;sequence
+   * minOccurs="0"&amp;gt; &amp;lt;element name="title"
+   * type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt; &amp;lt;element
+   * name="newick" type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt;
+   * &amp;lt;/sequence&amp;gt; &amp;lt;attGroup
+   * ref="{www.jalview.org}swingwindow"/&amp;gt; &amp;lt;attribute
+   * name="fontName" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;attribute name="fontSize"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="fontStyle" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;attribute name="threshold"
+   * type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt; &amp;lt;attribute
+   * name="showBootstrap" type="{http://www.w3.org/2001/XMLSchema}boolean"
+   * /&amp;gt; &amp;lt;attribute name="showDistances"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="markUnlinked"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="fitToWindow"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="currentTree"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="columnWise"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+   * &amp;lt;attribute name="columnReference"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+   * name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /&amp;gt;
+   * &amp;lt;attribute name="linkToAllViews"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(name = "", propOrder = { "title", "newick" })
+  public static class Tree
+  {
+
+    @XmlElement(namespace = "www.jalview.org")
+    protected String title;
+
+    @XmlElement(namespace = "www.jalview.org")
+    protected String newick;
+
+    @XmlAttribute(name = "fontName")
+    protected String fontName;
+
+    @XmlAttribute(name = "fontSize")
+    protected Integer fontSize;
+
+    @XmlAttribute(name = "fontStyle")
+    protected Integer fontStyle;
+
+    @XmlAttribute(name = "threshold")
+    protected Float threshold;
+
+    @XmlAttribute(name = "showBootstrap")
+    protected Boolean showBootstrap;
+
+    @XmlAttribute(name = "showDistances")
+    protected Boolean showDistances;
+
+    @XmlAttribute(name = "markUnlinked")
+    protected Boolean markUnlinked;
+
+    @XmlAttribute(name = "fitToWindow")
+    protected Boolean fitToWindow;
+
+    @XmlAttribute(name = "currentTree")
+    protected Boolean currentTree;
+
+    @XmlAttribute(name = "columnWise")
+    protected Boolean columnWise;
+
+    @XmlAttribute(name = "columnReference")
+    protected String columnReference;
+
+    @XmlAttribute(name = "id")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected String id;
+
+    @XmlAttribute(name = "linkToAllViews")
+    protected Boolean linkToAllViews;
+
+    @XmlAttribute(name = "width")
+    protected Integer width;
+
+    @XmlAttribute(name = "height")
+    protected Integer height;
+
+    @XmlAttribute(name = "xpos")
+    protected Integer xpos;
+
+    @XmlAttribute(name = "ypos")
+    protected Integer ypos;
 
-        /**
-         * Gets the value of the width property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getWidth() {
-            return width;
-        }
+    /**
+     * Gets the value of the title property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getTitle()
+    {
+      return title;
+    }
 
-        /**
-         * Sets the value of the width property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setWidth(Integer value) {
-            this.width = value;
-        }
+    /**
+     * Sets the value of the title property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setTitle(String value)
+    {
+      this.title = value;
+    }
 
-        /**
-         * Gets the value of the height property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getHeight() {
-            return height;
-        }
+    /**
+     * Gets the value of the newick property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getNewick()
+    {
+      return newick;
+    }
 
-        /**
-         * Sets the value of the height property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setHeight(Integer value) {
-            this.height = value;
-        }
+    /**
+     * Sets the value of the newick property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setNewick(String value)
+    {
+      this.newick = value;
+    }
 
-        /**
-         * Gets the value of the xpos property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getXpos() {
-            return xpos;
-        }
+    /**
+     * Gets the value of the fontName property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getFontName()
+    {
+      return fontName;
+    }
 
-        /**
-         * Sets the value of the xpos property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setXpos(Integer value) {
-            this.xpos = value;
-        }
+    /**
+     * Sets the value of the fontName property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setFontName(String value)
+    {
+      this.fontName = value;
+    }
 
-        /**
-         * Gets the value of the ypos property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getYpos() {
-            return ypos;
-        }
+    /**
+     * Gets the value of the fontSize property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getFontSize()
+    {
+      return fontSize;
+    }
 
-        /**
-         * Sets the value of the ypos property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setYpos(Integer value) {
-            this.ypos = value;
-        }
+    /**
+     * Sets the value of the fontSize property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setFontSize(Integer value)
+    {
+      this.fontSize = value;
+    }
 
+    /**
+     * Gets the value of the fontStyle property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getFontStyle()
+    {
+      return fontStyle;
+    }
 
-        /**
-         * &lt;p&gt;Java class for anonymous complex type.
-         * 
-         * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-         * 
-         * &lt;pre&gt;
-         * &amp;lt;complexType&amp;gt;
-         *   &amp;lt;complexContent&amp;gt;
-         *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-         *       &amp;lt;attGroup ref="{www.jalview.org}position"/&amp;gt;
-         *     &amp;lt;/restriction&amp;gt;
-         *   &amp;lt;/complexContent&amp;gt;
-         * &amp;lt;/complexType&amp;gt;
-         * &lt;/pre&gt;
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Axis {
-
-            @XmlAttribute(name = "xPos")
-            protected Float xPos;
-            @XmlAttribute(name = "yPos")
-            protected Float yPos;
-            @XmlAttribute(name = "zPos")
-            protected Float zPos;
-
-            /**
-             * Gets the value of the xPos property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Float }
-             *     
-             */
-            public Float getXPos() {
-                return xPos;
-            }
-
-            /**
-             * Sets the value of the xPos property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Float }
-             *     
-             */
-            public void setXPos(Float value) {
-                this.xPos = value;
-            }
-
-            /**
-             * Gets the value of the yPos property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Float }
-             *     
-             */
-            public Float getYPos() {
-                return yPos;
-            }
-
-            /**
-             * Sets the value of the yPos property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Float }
-             *     
-             */
-            public void setYPos(Float value) {
-                this.yPos = value;
-            }
-
-            /**
-             * Gets the value of the zPos property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Float }
-             *     
-             */
-            public Float getZPos() {
-                return zPos;
-            }
-
-            /**
-             * Sets the value of the zPos property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Float }
-             *     
-             */
-            public void setZPos(Float value) {
-                this.zPos = value;
-            }
+    /**
+     * Sets the value of the fontStyle property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setFontStyle(Integer value)
+    {
+      this.fontStyle = value;
+    }
 
-        }
+    /**
+     * Gets the value of the threshold property.
+     * 
+     * @return possible object is {@link Float }
+     * 
+     */
+    public Float getThreshold()
+    {
+      return threshold;
+    }
 
+    /**
+     * Sets the value of the threshold property.
+     * 
+     * @param value
+     *          allowed object is {@link Float }
+     * 
+     */
+    public void setThreshold(Float value)
+    {
+      this.threshold = value;
+    }
 
-        /**
-         * &lt;p&gt;Java class for anonymous complex type.
-         * 
-         * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-         * 
-         * &lt;pre&gt;
-         * &amp;lt;complexType&amp;gt;
-         *   &amp;lt;complexContent&amp;gt;
-         *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-         *       &amp;lt;attGroup ref="{www.jalview.org}position"/&amp;gt;
-         *     &amp;lt;/restriction&amp;gt;
-         *   &amp;lt;/complexContent&amp;gt;
-         * &amp;lt;/complexType&amp;gt;
-         * &lt;/pre&gt;
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class SeqPointMax {
-
-            @XmlAttribute(name = "xPos")
-            protected Float xPos;
-            @XmlAttribute(name = "yPos")
-            protected Float yPos;
-            @XmlAttribute(name = "zPos")
-            protected Float zPos;
-
-            /**
-             * Gets the value of the xPos property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Float }
-             *     
-             */
-            public Float getXPos() {
-                return xPos;
-            }
-
-            /**
-             * Sets the value of the xPos property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Float }
-             *     
-             */
-            public void setXPos(Float value) {
-                this.xPos = value;
-            }
-
-            /**
-             * Gets the value of the yPos property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Float }
-             *     
-             */
-            public Float getYPos() {
-                return yPos;
-            }
-
-            /**
-             * Sets the value of the yPos property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Float }
-             *     
-             */
-            public void setYPos(Float value) {
-                this.yPos = value;
-            }
-
-            /**
-             * Gets the value of the zPos property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Float }
-             *     
-             */
-            public Float getZPos() {
-                return zPos;
-            }
-
-            /**
-             * Sets the value of the zPos property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Float }
-             *     
-             */
-            public void setZPos(Float value) {
-                this.zPos = value;
-            }
+    /**
+     * Gets the value of the showBootstrap property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isShowBootstrap()
+    {
+      return showBootstrap;
+    }
 
-        }
+    /**
+     * Sets the value of the showBootstrap property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowBootstrap(Boolean value)
+    {
+      this.showBootstrap = value;
+    }
 
+    /**
+     * Gets the value of the showDistances property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isShowDistances()
+    {
+      return showDistances;
+    }
 
-        /**
-         * &lt;p&gt;Java class for anonymous complex type.
-         * 
-         * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-         * 
-         * &lt;pre&gt;
-         * &amp;lt;complexType&amp;gt;
-         *   &amp;lt;complexContent&amp;gt;
-         *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-         *       &amp;lt;attGroup ref="{www.jalview.org}position"/&amp;gt;
-         *     &amp;lt;/restriction&amp;gt;
-         *   &amp;lt;/complexContent&amp;gt;
-         * &amp;lt;/complexType&amp;gt;
-         * &lt;/pre&gt;
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class SeqPointMin {
-
-            @XmlAttribute(name = "xPos")
-            protected Float xPos;
-            @XmlAttribute(name = "yPos")
-            protected Float yPos;
-            @XmlAttribute(name = "zPos")
-            protected Float zPos;
-
-            /**
-             * Gets the value of the xPos property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Float }
-             *     
-             */
-            public Float getXPos() {
-                return xPos;
-            }
-
-            /**
-             * Sets the value of the xPos property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Float }
-             *     
-             */
-            public void setXPos(Float value) {
-                this.xPos = value;
-            }
-
-            /**
-             * Gets the value of the yPos property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Float }
-             *     
-             */
-            public Float getYPos() {
-                return yPos;
-            }
-
-            /**
-             * Sets the value of the yPos property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Float }
-             *     
-             */
-            public void setYPos(Float value) {
-                this.yPos = value;
-            }
-
-            /**
-             * Gets the value of the zPos property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Float }
-             *     
-             */
-            public Float getZPos() {
-                return zPos;
-            }
-
-            /**
-             * Sets the value of the zPos property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Float }
-             *     
-             */
-            public void setZPos(Float value) {
-                this.zPos = value;
-            }
+    /**
+     * Sets the value of the showDistances property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowDistances(Boolean value)
+    {
+      this.showDistances = value;
+    }
 
-        }
+    /**
+     * Gets the value of the markUnlinked property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isMarkUnlinked()
+    {
+      return markUnlinked;
+    }
 
+    /**
+     * Sets the value of the markUnlinked property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setMarkUnlinked(Boolean value)
+    {
+      this.markUnlinked = value;
+    }
 
-        /**
-         * &lt;p&gt;Java class for anonymous complex type.
-         * 
-         * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-         * 
-         * &lt;pre&gt;
-         * &amp;lt;complexType&amp;gt;
-         *   &amp;lt;complexContent&amp;gt;
-         *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-         *       &amp;lt;attGroup ref="{www.jalview.org}position"/&amp;gt;
-         *       &amp;lt;attribute name="sequenceRef" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-         *     &amp;lt;/restriction&amp;gt;
-         *   &amp;lt;/complexContent&amp;gt;
-         * &amp;lt;/complexType&amp;gt;
-         * &lt;/pre&gt;
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class SequencePoint {
-
-            @XmlAttribute(name = "sequenceRef")
-            protected String sequenceRef;
-            @XmlAttribute(name = "xPos")
-            protected Float xPos;
-            @XmlAttribute(name = "yPos")
-            protected Float yPos;
-            @XmlAttribute(name = "zPos")
-            protected Float zPos;
-
-            /**
-             * Gets the value of the sequenceRef property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getSequenceRef() {
-                return sequenceRef;
-            }
-
-            /**
-             * Sets the value of the sequenceRef property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setSequenceRef(String value) {
-                this.sequenceRef = value;
-            }
-
-            /**
-             * Gets the value of the xPos property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Float }
-             *     
-             */
-            public Float getXPos() {
-                return xPos;
-            }
-
-            /**
-             * Sets the value of the xPos property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Float }
-             *     
-             */
-            public void setXPos(Float value) {
-                this.xPos = value;
-            }
-
-            /**
-             * Gets the value of the yPos property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Float }
-             *     
-             */
-            public Float getYPos() {
-                return yPos;
-            }
-
-            /**
-             * Sets the value of the yPos property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Float }
-             *     
-             */
-            public void setYPos(Float value) {
-                this.yPos = value;
-            }
-
-            /**
-             * Gets the value of the zPos property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Float }
-             *     
-             */
-            public Float getZPos() {
-                return zPos;
-            }
-
-            /**
-             * Sets the value of the zPos property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Float }
-             *     
-             */
-            public void setZPos(Float value) {
-                this.zPos = value;
-            }
+    /**
+     * Gets the value of the fitToWindow property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isFitToWindow()
+    {
+      return fitToWindow;
+    }
 
-        }
+    /**
+     * Sets the value of the fitToWindow property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setFitToWindow(Boolean value)
+    {
+      this.fitToWindow = value;
+    }
 
+    /**
+     * Gets the value of the currentTree property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isCurrentTree()
+    {
+      return currentTree;
     }
 
+    /**
+     * Sets the value of the currentTree property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setCurrentTree(Boolean value)
+    {
+      this.currentTree = value;
+    }
 
     /**
-     * &lt;p&gt;Java class for anonymous complex type.
+     * Gets the value of the columnWise property.
+     * 
+     * @return possible object is {@link Boolean }
      * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-     * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;sequence minOccurs="0"&amp;gt;
-     *         &amp;lt;element name="title" type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt;
-     *         &amp;lt;element name="newick" type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt;
-     *       &amp;lt;/sequence&amp;gt;
-     *       &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
-     *       &amp;lt;attribute name="fontName" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="fontSize" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="fontStyle" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="threshold" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
-     *       &amp;lt;attribute name="showBootstrap" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="showDistances" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="markUnlinked" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="fitToWindow" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="currentTree" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="columnWise" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-     *       &amp;lt;attribute name="columnReference" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /&amp;gt;
-     *       &amp;lt;attribute name="linkToAllViews" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
+     */
+    public boolean isColumnWise()
+    {
+      if (columnWise == null)
+      {
+        return false;
+      }
+      else
+      {
+        return columnWise;
+      }
+    }
+
+    /**
+     * Sets the value of the columnWise property.
      * 
+     * @param value
+     *          allowed object is {@link Boolean }
      * 
      */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "title",
-        "newick"
-    })
-    public static class Tree {
+    public void setColumnWise(Boolean value)
+    {
+      this.columnWise = value;
+    }
 
-        @XmlElement(namespace = "www.jalview.org")
-        protected String title;
-        @XmlElement(namespace = "www.jalview.org")
-        protected String newick;
-        @XmlAttribute(name = "fontName")
-        protected String fontName;
-        @XmlAttribute(name = "fontSize")
-        protected Integer fontSize;
-        @XmlAttribute(name = "fontStyle")
-        protected Integer fontStyle;
-        @XmlAttribute(name = "threshold")
-        protected Float threshold;
-        @XmlAttribute(name = "showBootstrap")
-        protected Boolean showBootstrap;
-        @XmlAttribute(name = "showDistances")
-        protected Boolean showDistances;
-        @XmlAttribute(name = "markUnlinked")
-        protected Boolean markUnlinked;
-        @XmlAttribute(name = "fitToWindow")
-        protected Boolean fitToWindow;
-        @XmlAttribute(name = "currentTree")
-        protected Boolean currentTree;
-        @XmlAttribute(name = "columnWise")
-        protected Boolean columnWise;
-        @XmlAttribute(name = "columnReference")
-        protected String columnReference;
-        @XmlAttribute(name = "id")
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlID
-        @XmlSchemaType(name = "ID")
-        protected String id;
-        @XmlAttribute(name = "linkToAllViews")
-        protected Boolean linkToAllViews;
-        @XmlAttribute(name = "width")
-        protected Integer width;
-        @XmlAttribute(name = "height")
-        protected Integer height;
-        @XmlAttribute(name = "xpos")
-        protected Integer xpos;
-        @XmlAttribute(name = "ypos")
-        protected Integer ypos;
+    /**
+     * Gets the value of the columnReference property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getColumnReference()
+    {
+      return columnReference;
+    }
 
-        /**
-         * Gets the value of the title property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getTitle() {
-            return title;
-        }
+    /**
+     * Sets the value of the columnReference property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setColumnReference(String value)
+    {
+      this.columnReference = value;
+    }
 
-        /**
-         * Sets the value of the title property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setTitle(String value) {
-            this.title = value;
-        }
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getId()
+    {
+      return id;
+    }
 
-        /**
-         * Gets the value of the newick property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getNewick() {
-            return newick;
-        }
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setId(String value)
+    {
+      this.id = value;
+    }
 
-        /**
-         * Sets the value of the newick property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setNewick(String value) {
-            this.newick = value;
-        }
+    /**
+     * Gets the value of the linkToAllViews property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isLinkToAllViews()
+    {
+      if (linkToAllViews == null)
+      {
+        return false;
+      }
+      else
+      {
+        return linkToAllViews;
+      }
+    }
 
-        /**
-         * Gets the value of the fontName property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getFontName() {
-            return fontName;
-        }
+    /**
+     * Sets the value of the linkToAllViews property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setLinkToAllViews(Boolean value)
+    {
+      this.linkToAllViews = value;
+    }
 
-        /**
-         * Sets the value of the fontName property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setFontName(String value) {
-            this.fontName = value;
-        }
+    /**
+     * Gets the value of the width property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getWidth()
+    {
+      return width;
+    }
 
-        /**
-         * Gets the value of the fontSize property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getFontSize() {
-            return fontSize;
-        }
+    /**
+     * Sets the value of the width property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setWidth(Integer value)
+    {
+      this.width = value;
+    }
 
-        /**
-         * Sets the value of the fontSize property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setFontSize(Integer value) {
-            this.fontSize = value;
-        }
+    /**
+     * Gets the value of the height property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getHeight()
+    {
+      return height;
+    }
 
-        /**
-         * Gets the value of the fontStyle property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getFontStyle() {
-            return fontStyle;
-        }
+    /**
+     * Sets the value of the height property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setHeight(Integer value)
+    {
+      this.height = value;
+    }
 
-        /**
-         * Sets the value of the fontStyle property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setFontStyle(Integer value) {
-            this.fontStyle = value;
-        }
+    /**
+     * Gets the value of the xpos property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getXpos()
+    {
+      return xpos;
+    }
 
-        /**
-         * Gets the value of the threshold property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Float }
-         *     
-         */
-        public Float getThreshold() {
-            return threshold;
-        }
+    /**
+     * Sets the value of the xpos property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setXpos(Integer value)
+    {
+      this.xpos = value;
+    }
 
-        /**
-         * Sets the value of the threshold property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Float }
-         *     
-         */
-        public void setThreshold(Float value) {
-            this.threshold = value;
-        }
+    /**
+     * Gets the value of the ypos property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getYpos()
+    {
+      return ypos;
+    }
 
-        /**
-         * Gets the value of the showBootstrap property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isShowBootstrap() {
-            return showBootstrap;
-        }
+    /**
+     * Sets the value of the ypos property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setYpos(Integer value)
+    {
+      this.ypos = value;
+    }
 
-        /**
-         * Sets the value of the showBootstrap property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowBootstrap(Boolean value) {
-            this.showBootstrap = value;
-        }
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+   * &amp;lt;sequence&amp;gt; &amp;lt;element name="UserColourScheme"
+   * type="{www.jalview.org/colours}JalviewUserColours"/&amp;gt;
+   * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="id"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(name = "", propOrder = { "userColourScheme" })
+  public static class UserColours
+  {
+
+    @XmlElement(
+      name = "UserColourScheme",
+      namespace = "www.jalview.org",
+      required = true)
+    protected JalviewUserColours userColourScheme;
+
+    @XmlAttribute(name = "id")
+    protected String id;
 
-        /**
-         * Gets the value of the showDistances property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isShowDistances() {
-            return showDistances;
-        }
+    /**
+     * Gets the value of the userColourScheme property.
+     * 
+     * @return possible object is {@link JalviewUserColours }
+     * 
+     */
+    public JalviewUserColours getUserColourScheme()
+    {
+      return userColourScheme;
+    }
 
-        /**
-         * Sets the value of the showDistances property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowDistances(Boolean value) {
-            this.showDistances = value;
-        }
+    /**
+     * Sets the value of the userColourScheme property.
+     * 
+     * @param value
+     *          allowed object is {@link JalviewUserColours }
+     * 
+     */
+    public void setUserColourScheme(JalviewUserColours value)
+    {
+      this.userColourScheme = value;
+    }
 
-        /**
-         * Gets the value of the markUnlinked property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isMarkUnlinked() {
-            return markUnlinked;
-        }
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getId()
+    {
+      return id;
+    }
 
-        /**
-         * Sets the value of the markUnlinked property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setMarkUnlinked(Boolean value) {
-            this.markUnlinked = value;
-        }
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setId(String value)
+    {
+      this.id = value;
+    }
 
-        /**
-         * Gets the value of the fitToWindow property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isFitToWindow() {
-            return fitToWindow;
-        }
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+   * &amp;lt;sequence&amp;gt; &amp;lt;element name="AnnotationColours"
+   * type="{www.jalview.org}AnnotationColourScheme" minOccurs="0"/&amp;gt;
+   * &amp;lt;element name="hiddenColumns" maxOccurs="unbounded"
+   * minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+   * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+   * name="start" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;attribute name="end" type="{http://www.w3.org/2001/XMLSchema}int"
+   * /&amp;gt; &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+   * name="calcIdParam" maxOccurs="unbounded" minOccurs="0"&amp;gt;
+   * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;extension
+   * base="{www.jalview.org/xml/wsparamset}WebServiceParameterSet"&amp;gt;
+   * &amp;lt;attribute name="calcId" use="required"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+   * name="needsUpdate" type="{http://www.w3.org/2001/XMLSchema}boolean"
+   * default="false" /&amp;gt; &amp;lt;attribute name="autoUpdate"
+   * use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;/extension&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+   * name="overview" minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+   * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attGroup
+   * ref="{www.jalview.org}swingwindow"/&amp;gt; &amp;lt;attribute
+   * name="showHidden" type="{http://www.w3.org/2001/XMLSchema}boolean"
+   * /&amp;gt; &amp;lt;attribute name="residueColour"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="gapColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;attribute name="hiddenColour"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+   * &amp;lt;/sequence&amp;gt; &amp;lt;attGroup
+   * ref="{www.jalview.org}swingwindow"/&amp;gt; &amp;lt;attribute
+   * name="conservationSelected"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="pidSelected"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="bgColour"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+   * name="consThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;attribute name="pidThreshold"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;attribute name="showFullId"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="rightAlignIds"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="showText"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="showColourText"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="showUnconserved"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+   * &amp;lt;attribute name="showBoxes"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="wrapAlignment"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="renderGaps"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="showSequenceFeatures"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="showNPfeatureTooltip"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="showDbRefTooltip"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="followHighlight"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+   * &amp;lt;attribute name="followSelection"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+   * &amp;lt;attribute name="showAnnotation"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="centreColumnLabels"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+   * &amp;lt;attribute name="showGroupConservation"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+   * &amp;lt;attribute name="showGroupConsensus"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+   * &amp;lt;attribute name="showConsensusHistogram"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+   * &amp;lt;attribute name="showSequenceLogo"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+   * &amp;lt;attribute name="normaliseSequenceLogo"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+   * &amp;lt;attribute name="ignoreGapsinConsensus"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+   * &amp;lt;attribute name="startRes"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="startSeq" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;attribute name="charWidth"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="charHeight" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;attribute name="fontName"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+   * name="fontSize" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;attribute name="fontStyle"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="idWidth" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;attribute name="idWidthManuallyAdjusted"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="scaleProteinAsCdna"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
+   * &amp;lt;attribute name="viewName"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+   * name="sequenceSetId" type="{http://www.w3.org/2001/XMLSchema}string"
+   * /&amp;gt; &amp;lt;attribute name="gatheredViews"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;attribute name="textCol1"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="textCol2" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;attribute name="textColThreshold"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+   * name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /&amp;gt;
+   * &amp;lt;attribute name="complementId"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+   * name="showComplementFeatures"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+   * &amp;lt;attribute name="showComplementFeaturesOnTop"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(
+    name = "",
+    propOrder =
+    { "annotationColours", "hiddenColumns", "calcIdParam", "overview" })
+  public static class Viewport
+  {
+
+    @XmlElement(name = "AnnotationColours", namespace = "www.jalview.org")
+    protected AnnotationColourScheme annotationColours;
+
+    @XmlElement(namespace = "www.jalview.org")
+    protected List<JalviewModel.Viewport.HiddenColumns> hiddenColumns;
+
+    @XmlElement(namespace = "www.jalview.org")
+    protected List<JalviewModel.Viewport.CalcIdParam> calcIdParam;
+
+    @XmlElement(namespace = "www.jalview.org")
+    protected JalviewModel.Viewport.Overview overview;
+
+    @XmlAttribute(name = "conservationSelected")
+    protected Boolean conservationSelected;
+
+    @XmlAttribute(name = "pidSelected")
+    protected Boolean pidSelected;
+
+    @XmlAttribute(name = "bgColour")
+    protected String bgColour;
+
+    @XmlAttribute(name = "consThreshold")
+    protected Integer consThreshold;
+
+    @XmlAttribute(name = "pidThreshold")
+    protected Integer pidThreshold;
+
+    @XmlAttribute(name = "title")
+    protected String title;
+
+    @XmlAttribute(name = "showFullId")
+    protected Boolean showFullId;
+
+    @XmlAttribute(name = "rightAlignIds")
+    protected Boolean rightAlignIds;
+
+    @XmlAttribute(name = "showText")
+    protected Boolean showText;
+
+    @XmlAttribute(name = "showColourText")
+    protected Boolean showColourText;
+
+    @XmlAttribute(name = "showUnconserved")
+    protected Boolean showUnconserved;
+
+    @XmlAttribute(name = "showBoxes")
+    protected Boolean showBoxes;
+
+    @XmlAttribute(name = "wrapAlignment")
+    protected Boolean wrapAlignment;
 
-        /**
-         * Sets the value of the fitToWindow property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setFitToWindow(Boolean value) {
-            this.fitToWindow = value;
-        }
+    @XmlAttribute(name = "renderGaps")
+    protected Boolean renderGaps;
 
-        /**
-         * Gets the value of the currentTree property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isCurrentTree() {
-            return currentTree;
-        }
+    @XmlAttribute(name = "showSequenceFeatures")
+    protected Boolean showSequenceFeatures;
 
-        /**
-         * Sets the value of the currentTree property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setCurrentTree(Boolean value) {
-            this.currentTree = value;
-        }
+    @XmlAttribute(name = "showNPfeatureTooltip")
+    protected Boolean showNPfeatureTooltip;
 
-        /**
-         * Gets the value of the columnWise property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isColumnWise() {
-            if (columnWise == null) {
-                return false;
-            } else {
-                return columnWise;
-            }
-        }
+    @XmlAttribute(name = "showDbRefTooltip")
+    protected Boolean showDbRefTooltip;
 
-        /**
-         * Sets the value of the columnWise property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setColumnWise(Boolean value) {
-            this.columnWise = value;
-        }
+    @XmlAttribute(name = "followHighlight")
+    protected Boolean followHighlight;
 
-        /**
-         * Gets the value of the columnReference property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getColumnReference() {
-            return columnReference;
-        }
+    @XmlAttribute(name = "followSelection")
+    protected Boolean followSelection;
 
-        /**
-         * Sets the value of the columnReference property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setColumnReference(String value) {
-            this.columnReference = value;
-        }
+    @XmlAttribute(name = "showAnnotation")
+    protected Boolean showAnnotation;
 
-        /**
-         * Gets the value of the id property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getId() {
-            return id;
-        }
+    @XmlAttribute(name = "centreColumnLabels")
+    protected Boolean centreColumnLabels;
 
-        /**
-         * Sets the value of the id property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setId(String value) {
-            this.id = value;
-        }
+    @XmlAttribute(name = "showGroupConservation")
+    protected Boolean showGroupConservation;
 
-        /**
-         * Gets the value of the linkToAllViews property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isLinkToAllViews() {
-            if (linkToAllViews == null) {
-                return false;
-            } else {
-                return linkToAllViews;
-            }
-        }
+    @XmlAttribute(name = "showGroupConsensus")
+    protected Boolean showGroupConsensus;
 
-        /**
-         * Sets the value of the linkToAllViews property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setLinkToAllViews(Boolean value) {
-            this.linkToAllViews = value;
-        }
+    @XmlAttribute(name = "showConsensusHistogram")
+    protected Boolean showConsensusHistogram;
 
-        /**
-         * Gets the value of the width property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getWidth() {
-            return width;
-        }
+    @XmlAttribute(name = "showSequenceLogo")
+    protected Boolean showSequenceLogo;
 
-        /**
-         * Sets the value of the width property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setWidth(Integer value) {
-            this.width = value;
-        }
+    @XmlAttribute(name = "normaliseSequenceLogo")
+    protected Boolean normaliseSequenceLogo;
 
-        /**
-         * Gets the value of the height property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getHeight() {
-            return height;
-        }
+    @XmlAttribute(name = "ignoreGapsinConsensus")
+    protected Boolean ignoreGapsinConsensus;
 
-        /**
-         * Sets the value of the height property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setHeight(Integer value) {
-            this.height = value;
-        }
+    @XmlAttribute(name = "startRes")
+    protected Integer startRes;
 
-        /**
-         * Gets the value of the xpos property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getXpos() {
-            return xpos;
-        }
+    @XmlAttribute(name = "startSeq")
+    protected Integer startSeq;
 
-        /**
-         * Sets the value of the xpos property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setXpos(Integer value) {
-            this.xpos = value;
-        }
+    @XmlAttribute(name = "charWidth")
+    protected Integer charWidth;
 
-        /**
-         * Gets the value of the ypos property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getYpos() {
-            return ypos;
-        }
+    @XmlAttribute(name = "charHeight")
+    protected Integer charHeight;
 
-        /**
-         * Sets the value of the ypos property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setYpos(Integer value) {
-            this.ypos = value;
-        }
+    @XmlAttribute(name = "fontName")
+    protected String fontName;
 
-    }
+    @XmlAttribute(name = "fontSize")
+    protected Integer fontSize;
 
+    @XmlAttribute(name = "fontStyle")
+    protected Integer fontStyle;
 
-    /**
-     * &lt;p&gt;Java class for anonymous complex type.
-     * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-     * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;sequence&amp;gt;
-     *         &amp;lt;element name="UserColourScheme" type="{www.jalview.org/colours}JalviewUserColours"/&amp;gt;
-     *       &amp;lt;/sequence&amp;gt;
-     *       &amp;lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "userColourScheme"
-    })
-    public static class UserColours {
+    @XmlAttribute(name = "idWidth")
+    protected Integer idWidth;
 
-        @XmlElement(name = "UserColourScheme", namespace = "www.jalview.org", required = true)
-        protected JalviewUserColours userColourScheme;
-        @XmlAttribute(name = "id")
-        protected String id;
+    @XmlAttribute(name = "idWidthManuallyAdjusted")
+    protected Boolean idWidthManuallyAdjusted;
 
-        /**
-         * Gets the value of the userColourScheme property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link JalviewUserColours }
-         *     
-         */
-        public JalviewUserColours getUserColourScheme() {
-            return userColourScheme;
-        }
+    @XmlAttribute(name = "scaleProteinAsCdna")
+    protected Boolean scaleProteinAsCdna;
 
-        /**
-         * Sets the value of the userColourScheme property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link JalviewUserColours }
-         *     
-         */
-        public void setUserColourScheme(JalviewUserColours value) {
-            this.userColourScheme = value;
-        }
+    @XmlAttribute(name = "viewName")
+    protected String viewName;
 
-        /**
-         * Gets the value of the id property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getId() {
-            return id;
-        }
+    @XmlAttribute(name = "sequenceSetId")
+    protected String sequenceSetId;
 
-        /**
-         * Sets the value of the id property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setId(String value) {
-            this.id = value;
-        }
+    @XmlAttribute(name = "gatheredViews")
+    protected Boolean gatheredViews;
 
-    }
+    @XmlAttribute(name = "textCol1")
+    protected Integer textCol1;
 
+    @XmlAttribute(name = "textCol2")
+    protected Integer textCol2;
 
-    /**
-     * &lt;p&gt;Java class for anonymous complex type.
-     * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-     * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;sequence&amp;gt;
-     *         &amp;lt;element name="AnnotationColours" type="{www.jalview.org}AnnotationColourScheme" minOccurs="0"/&amp;gt;
-     *         &amp;lt;element name="hiddenColumns" maxOccurs="unbounded" minOccurs="0"&amp;gt;
-     *           &amp;lt;complexType&amp;gt;
-     *             &amp;lt;complexContent&amp;gt;
-     *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *                 &amp;lt;attribute name="start" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *                 &amp;lt;attribute name="end" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *               &amp;lt;/restriction&amp;gt;
-     *             &amp;lt;/complexContent&amp;gt;
-     *           &amp;lt;/complexType&amp;gt;
-     *         &amp;lt;/element&amp;gt;
-     *         &amp;lt;element name="calcIdParam" maxOccurs="unbounded" minOccurs="0"&amp;gt;
-     *           &amp;lt;complexType&amp;gt;
-     *             &amp;lt;complexContent&amp;gt;
-     *               &amp;lt;extension base="{www.jalview.org/xml/wsparamset}WebServiceParameterSet"&amp;gt;
-     *                 &amp;lt;attribute name="calcId" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *                 &amp;lt;attribute name="needsUpdate" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-     *                 &amp;lt;attribute name="autoUpdate" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *               &amp;lt;/extension&amp;gt;
-     *             &amp;lt;/complexContent&amp;gt;
-     *           &amp;lt;/complexType&amp;gt;
-     *         &amp;lt;/element&amp;gt;
-     *         &amp;lt;element name="overview" minOccurs="0"&amp;gt;
-     *           &amp;lt;complexType&amp;gt;
-     *             &amp;lt;complexContent&amp;gt;
-     *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *                 &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
-     *                 &amp;lt;attribute name="showHidden" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *                 &amp;lt;attribute name="residueColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *                 &amp;lt;attribute name="gapColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *                 &amp;lt;attribute name="hiddenColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *                 &amp;lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *               &amp;lt;/restriction&amp;gt;
-     *             &amp;lt;/complexContent&amp;gt;
-     *           &amp;lt;/complexType&amp;gt;
-     *         &amp;lt;/element&amp;gt;
-     *       &amp;lt;/sequence&amp;gt;
-     *       &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
-     *       &amp;lt;attribute name="conservationSelected" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="pidSelected" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="bgColour" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="consThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="pidThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="showFullId" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="rightAlignIds" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="showText" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="showColourText" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="showUnconserved" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-     *       &amp;lt;attribute name="showBoxes" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="wrapAlignment" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="renderGaps" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="showSequenceFeatures" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="showNPfeatureTooltip" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="showDbRefTooltip" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="followHighlight" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
-     *       &amp;lt;attribute name="followSelection" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
-     *       &amp;lt;attribute name="showAnnotation" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="centreColumnLabels" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-     *       &amp;lt;attribute name="showGroupConservation" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-     *       &amp;lt;attribute name="showGroupConsensus" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-     *       &amp;lt;attribute name="showConsensusHistogram" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
-     *       &amp;lt;attribute name="showSequenceLogo" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-     *       &amp;lt;attribute name="normaliseSequenceLogo" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-     *       &amp;lt;attribute name="ignoreGapsinConsensus" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
-     *       &amp;lt;attribute name="startRes" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="startSeq" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="charWidth" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="charHeight" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="fontName" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="fontSize" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="fontStyle" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="idWidth" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="idWidthManuallyAdjusted" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="scaleProteinAsCdna" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&amp;gt;
-     *       &amp;lt;attribute name="viewName" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="sequenceSetId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="gatheredViews" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="textCol1" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="textCol2" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="textColThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /&amp;gt;
-     *       &amp;lt;attribute name="complementId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="showComplementFeatures" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-     *       &amp;lt;attribute name="showComplementFeaturesOnTop" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "annotationColours",
-        "hiddenColumns",
-        "calcIdParam",
-        "overview"
-    })
-    public static class Viewport {
-
-        @XmlElement(name = "AnnotationColours", namespace = "www.jalview.org")
-        protected AnnotationColourScheme annotationColours;
-        @XmlElement(namespace = "www.jalview.org")
-        protected List<JalviewModel.Viewport.HiddenColumns> hiddenColumns;
-        @XmlElement(namespace = "www.jalview.org")
-        protected List<JalviewModel.Viewport.CalcIdParam> calcIdParam;
-        @XmlElement(namespace = "www.jalview.org")
-        protected JalviewModel.Viewport.Overview overview;
-        @XmlAttribute(name = "conservationSelected")
-        protected Boolean conservationSelected;
-        @XmlAttribute(name = "pidSelected")
-        protected Boolean pidSelected;
-        @XmlAttribute(name = "bgColour")
-        protected String bgColour;
-        @XmlAttribute(name = "consThreshold")
-        protected Integer consThreshold;
-        @XmlAttribute(name = "pidThreshold")
-        protected Integer pidThreshold;
-        @XmlAttribute(name = "title")
-        protected String title;
-        @XmlAttribute(name = "showFullId")
-        protected Boolean showFullId;
-        @XmlAttribute(name = "rightAlignIds")
-        protected Boolean rightAlignIds;
-        @XmlAttribute(name = "showText")
-        protected Boolean showText;
-        @XmlAttribute(name = "showColourText")
-        protected Boolean showColourText;
-        @XmlAttribute(name = "showUnconserved")
-        protected Boolean showUnconserved;
-        @XmlAttribute(name = "showBoxes")
-        protected Boolean showBoxes;
-        @XmlAttribute(name = "wrapAlignment")
-        protected Boolean wrapAlignment;
-        @XmlAttribute(name = "renderGaps")
-        protected Boolean renderGaps;
-        @XmlAttribute(name = "showSequenceFeatures")
-        protected Boolean showSequenceFeatures;
-        @XmlAttribute(name = "showNPfeatureTooltip")
-        protected Boolean showNPfeatureTooltip;
-        @XmlAttribute(name = "showDbRefTooltip")
-        protected Boolean showDbRefTooltip;
-        @XmlAttribute(name = "followHighlight")
-        protected Boolean followHighlight;
-        @XmlAttribute(name = "followSelection")
-        protected Boolean followSelection;
-        @XmlAttribute(name = "showAnnotation")
-        protected Boolean showAnnotation;
-        @XmlAttribute(name = "centreColumnLabels")
-        protected Boolean centreColumnLabels;
-        @XmlAttribute(name = "showGroupConservation")
-        protected Boolean showGroupConservation;
-        @XmlAttribute(name = "showGroupConsensus")
-        protected Boolean showGroupConsensus;
-        @XmlAttribute(name = "showConsensusHistogram")
-        protected Boolean showConsensusHistogram;
-        @XmlAttribute(name = "showSequenceLogo")
-        protected Boolean showSequenceLogo;
-        @XmlAttribute(name = "normaliseSequenceLogo")
-        protected Boolean normaliseSequenceLogo;
-        @XmlAttribute(name = "ignoreGapsinConsensus")
-        protected Boolean ignoreGapsinConsensus;
-        @XmlAttribute(name = "startRes")
-        protected Integer startRes;
-        @XmlAttribute(name = "startSeq")
-        protected Integer startSeq;
-        @XmlAttribute(name = "charWidth")
-        protected Integer charWidth;
-        @XmlAttribute(name = "charHeight")
-        protected Integer charHeight;
-        @XmlAttribute(name = "fontName")
-        protected String fontName;
-        @XmlAttribute(name = "fontSize")
-        protected Integer fontSize;
-        @XmlAttribute(name = "fontStyle")
-        protected Integer fontStyle;
-        @XmlAttribute(name = "idWidth")
-        protected Integer idWidth;
-        @XmlAttribute(name = "idWidthManuallyAdjusted")
-        protected Boolean idWidthManuallyAdjusted;
-        @XmlAttribute(name = "scaleProteinAsCdna")
-        protected Boolean scaleProteinAsCdna;
-        @XmlAttribute(name = "viewName")
-        protected String viewName;
-        @XmlAttribute(name = "sequenceSetId")
-        protected String sequenceSetId;
-        @XmlAttribute(name = "gatheredViews")
-        protected Boolean gatheredViews;
-        @XmlAttribute(name = "textCol1")
-        protected Integer textCol1;
-        @XmlAttribute(name = "textCol2")
-        protected Integer textCol2;
-        @XmlAttribute(name = "textColThreshold")
-        protected Integer textColThreshold;
-        @XmlAttribute(name = "id")
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlID
-        @XmlSchemaType(name = "ID")
-        protected String id;
-        @XmlAttribute(name = "complementId")
-        protected String complementId;
-        @XmlAttribute(name = "showComplementFeatures")
-        protected Boolean showComplementFeatures;
-        @XmlAttribute(name = "showComplementFeaturesOnTop")
-        protected Boolean showComplementFeaturesOnTop;
-        @XmlAttribute(name = "width")
-        protected Integer width;
-        @XmlAttribute(name = "height")
-        protected Integer height;
-        @XmlAttribute(name = "xpos")
-        protected Integer xpos;
-        @XmlAttribute(name = "ypos")
-        protected Integer ypos;
+    @XmlAttribute(name = "textColThreshold")
+    protected Integer textColThreshold;
 
-        /**
-         * Gets the value of the annotationColours property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link AnnotationColourScheme }
-         *     
-         */
-        public AnnotationColourScheme getAnnotationColours() {
-            return annotationColours;
-        }
+    @XmlAttribute(name = "id")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected String id;
 
-        /**
-         * Sets the value of the annotationColours property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link AnnotationColourScheme }
-         *     
-         */
-        public void setAnnotationColours(AnnotationColourScheme value) {
-            this.annotationColours = value;
-        }
+    @XmlAttribute(name = "complementId")
+    protected String complementId;
 
-        /**
-         * Gets the value of the hiddenColumns property.
-         * 
-         * &lt;p&gt;
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the hiddenColumns property.
-         * 
-         * &lt;p&gt;
-         * For example, to add a new item, do as follows:
-         * &lt;pre&gt;
-         *    getHiddenColumns().add(newItem);
-         * &lt;/pre&gt;
-         * 
-         * 
-         * &lt;p&gt;
-         * Objects of the following type(s) are allowed in the list
-         * {@link JalviewModel.Viewport.HiddenColumns }
-         * 
-         * 
-         */
-        public List<JalviewModel.Viewport.HiddenColumns> getHiddenColumns() {
-            if (hiddenColumns == null) {
-                hiddenColumns = new ArrayList<JalviewModel.Viewport.HiddenColumns>();
-            }
-            return this.hiddenColumns;
-        }
+    @XmlAttribute(name = "showComplementFeatures")
+    protected Boolean showComplementFeatures;
 
-        /**
-         * Gets the value of the calcIdParam property.
-         * 
-         * &lt;p&gt;
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the calcIdParam property.
-         * 
-         * &lt;p&gt;
-         * For example, to add a new item, do as follows:
-         * &lt;pre&gt;
-         *    getCalcIdParam().add(newItem);
-         * &lt;/pre&gt;
-         * 
-         * 
-         * &lt;p&gt;
-         * Objects of the following type(s) are allowed in the list
-         * {@link JalviewModel.Viewport.CalcIdParam }
-         * 
-         * 
-         */
-        public List<JalviewModel.Viewport.CalcIdParam> getCalcIdParam() {
-            if (calcIdParam == null) {
-                calcIdParam = new ArrayList<JalviewModel.Viewport.CalcIdParam>();
-            }
-            return this.calcIdParam;
-        }
+    @XmlAttribute(name = "showComplementFeaturesOnTop")
+    protected Boolean showComplementFeaturesOnTop;
 
-        /**
-         * Gets the value of the overview property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link JalviewModel.Viewport.Overview }
-         *     
-         */
-        public JalviewModel.Viewport.Overview getOverview() {
-            return overview;
-        }
+    @XmlAttribute(name = "width")
+    protected Integer width;
 
-        /**
-         * Sets the value of the overview property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link JalviewModel.Viewport.Overview }
-         *     
-         */
-        public void setOverview(JalviewModel.Viewport.Overview value) {
-            this.overview = value;
-        }
+    @XmlAttribute(name = "height")
+    protected Integer height;
 
-        /**
-         * Gets the value of the conservationSelected property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isConservationSelected() {
-            return conservationSelected;
-        }
+    @XmlAttribute(name = "xpos")
+    protected Integer xpos;
 
-        /**
-         * Sets the value of the conservationSelected property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setConservationSelected(Boolean value) {
-            this.conservationSelected = value;
-        }
+    @XmlAttribute(name = "ypos")
+    protected Integer ypos;
 
-        /**
-         * Gets the value of the pidSelected property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isPidSelected() {
-            return pidSelected;
-        }
+    /**
+     * Gets the value of the annotationColours property.
+     * 
+     * @return possible object is {@link AnnotationColourScheme }
+     * 
+     */
+    public AnnotationColourScheme getAnnotationColours()
+    {
+      return annotationColours;
+    }
 
-        /**
-         * Sets the value of the pidSelected property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setPidSelected(Boolean value) {
-            this.pidSelected = value;
-        }
+    /**
+     * Sets the value of the annotationColours property.
+     * 
+     * @param value
+     *          allowed object is {@link AnnotationColourScheme }
+     * 
+     */
+    public void setAnnotationColours(AnnotationColourScheme value)
+    {
+      this.annotationColours = value;
+    }
 
-        /**
-         * Gets the value of the bgColour property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getBgColour() {
-            return bgColour;
-        }
+    /**
+     * Gets the value of the hiddenColumns property.
+     * 
+     * &lt;p&gt; This accessor method returns a reference to the live list, not
+     * a snapshot. Therefore any modification you make to the returned list will
+     * be present inside the JAXB object. This is why there is not a
+     * &lt;CODE&gt;set&lt;/CODE&gt; method for the hiddenColumns property.
+     * 
+     * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+     * getHiddenColumns().add(newItem); &lt;/pre&gt;
+     * 
+     * 
+     * &lt;p&gt; Objects of the following type(s) are allowed in the list
+     * {@link JalviewModel.Viewport.HiddenColumns }
+     * 
+     * 
+     */
+    public List<JalviewModel.Viewport.HiddenColumns> getHiddenColumns()
+    {
+      if (hiddenColumns == null)
+      {
+        hiddenColumns = new ArrayList<JalviewModel.Viewport.HiddenColumns>();
+      }
+      return this.hiddenColumns;
+    }
 
-        /**
-         * Sets the value of the bgColour property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setBgColour(String value) {
-            this.bgColour = value;
-        }
+    /**
+     * Gets the value of the calcIdParam property.
+     * 
+     * &lt;p&gt; This accessor method returns a reference to the live list, not
+     * a snapshot. Therefore any modification you make to the returned list will
+     * be present inside the JAXB object. This is why there is not a
+     * &lt;CODE&gt;set&lt;/CODE&gt; method for the calcIdParam property.
+     * 
+     * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+     * getCalcIdParam().add(newItem); &lt;/pre&gt;
+     * 
+     * 
+     * &lt;p&gt; Objects of the following type(s) are allowed in the list
+     * {@link JalviewModel.Viewport.CalcIdParam }
+     * 
+     * 
+     */
+    public List<JalviewModel.Viewport.CalcIdParam> getCalcIdParam()
+    {
+      if (calcIdParam == null)
+      {
+        calcIdParam = new ArrayList<JalviewModel.Viewport.CalcIdParam>();
+      }
+      return this.calcIdParam;
+    }
 
-        /**
-         * Gets the value of the consThreshold property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getConsThreshold() {
-            return consThreshold;
-        }
+    /**
+     * Gets the value of the overview property.
+     * 
+     * @return possible object is {@link JalviewModel.Viewport.Overview }
+     * 
+     */
+    public JalviewModel.Viewport.Overview getOverview()
+    {
+      return overview;
+    }
 
-        /**
-         * Sets the value of the consThreshold property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setConsThreshold(Integer value) {
-            this.consThreshold = value;
-        }
+    /**
+     * Sets the value of the overview property.
+     * 
+     * @param value
+     *          allowed object is {@link JalviewModel.Viewport.Overview }
+     * 
+     */
+    public void setOverview(JalviewModel.Viewport.Overview value)
+    {
+      this.overview = value;
+    }
 
-        /**
-         * Gets the value of the pidThreshold property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getPidThreshold() {
-            return pidThreshold;
-        }
+    /**
+     * Gets the value of the conservationSelected property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isConservationSelected()
+    {
+      return conservationSelected;
+    }
 
-        /**
-         * Sets the value of the pidThreshold property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setPidThreshold(Integer value) {
-            this.pidThreshold = value;
-        }
+    /**
+     * Sets the value of the conservationSelected property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setConservationSelected(Boolean value)
+    {
+      this.conservationSelected = value;
+    }
+
+    /**
+     * Gets the value of the pidSelected property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isPidSelected()
+    {
+      return pidSelected;
+    }
 
-        /**
-         * Gets the value of the title property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getTitle() {
-            return title;
-        }
+    /**
+     * Sets the value of the pidSelected property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setPidSelected(Boolean value)
+    {
+      this.pidSelected = value;
+    }
 
-        /**
-         * Sets the value of the title property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setTitle(String value) {
-            this.title = value;
-        }
+    /**
+     * Gets the value of the bgColour property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getBgColour()
+    {
+      return bgColour;
+    }
 
-        /**
-         * Gets the value of the showFullId property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isShowFullId() {
-            return showFullId;
-        }
+    /**
+     * Sets the value of the bgColour property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setBgColour(String value)
+    {
+      this.bgColour = value;
+    }
 
-        /**
-         * Sets the value of the showFullId property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowFullId(Boolean value) {
-            this.showFullId = value;
-        }
+    /**
+     * Gets the value of the consThreshold property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getConsThreshold()
+    {
+      return consThreshold;
+    }
 
-        /**
-         * Gets the value of the rightAlignIds property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isRightAlignIds() {
-            return rightAlignIds;
-        }
+    /**
+     * Sets the value of the consThreshold property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setConsThreshold(Integer value)
+    {
+      this.consThreshold = value;
+    }
 
-        /**
-         * Sets the value of the rightAlignIds property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setRightAlignIds(Boolean value) {
-            this.rightAlignIds = value;
-        }
+    /**
+     * Gets the value of the pidThreshold property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getPidThreshold()
+    {
+      return pidThreshold;
+    }
 
-        /**
-         * Gets the value of the showText property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isShowText() {
-            return showText;
-        }
+    /**
+     * Sets the value of the pidThreshold property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setPidThreshold(Integer value)
+    {
+      this.pidThreshold = value;
+    }
 
-        /**
-         * Sets the value of the showText property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowText(Boolean value) {
-            this.showText = value;
-        }
+    /**
+     * Gets the value of the title property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getTitle()
+    {
+      return title;
+    }
 
-        /**
-         * Gets the value of the showColourText property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isShowColourText() {
-            return showColourText;
-        }
+    /**
+     * Sets the value of the title property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setTitle(String value)
+    {
+      this.title = value;
+    }
 
-        /**
-         * Sets the value of the showColourText property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowColourText(Boolean value) {
-            this.showColourText = value;
-        }
+    /**
+     * Gets the value of the showFullId property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isShowFullId()
+    {
+      return showFullId;
+    }
 
-        /**
-         * Gets the value of the showUnconserved property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isShowUnconserved() {
-            if (showUnconserved == null) {
-                return false;
-            } else {
-                return showUnconserved;
-            }
-        }
+    /**
+     * Sets the value of the showFullId property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowFullId(Boolean value)
+    {
+      this.showFullId = value;
+    }
 
-        /**
-         * Sets the value of the showUnconserved property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowUnconserved(Boolean value) {
-            this.showUnconserved = value;
-        }
+    /**
+     * Gets the value of the rightAlignIds property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isRightAlignIds()
+    {
+      return rightAlignIds;
+    }
 
-        /**
-         * Gets the value of the showBoxes property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isShowBoxes() {
-            return showBoxes;
-        }
+    /**
+     * Sets the value of the rightAlignIds property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setRightAlignIds(Boolean value)
+    {
+      this.rightAlignIds = value;
+    }
 
-        /**
-         * Sets the value of the showBoxes property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowBoxes(Boolean value) {
-            this.showBoxes = value;
-        }
+    /**
+     * Gets the value of the showText property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isShowText()
+    {
+      return showText;
+    }
 
-        /**
-         * Gets the value of the wrapAlignment property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isWrapAlignment() {
-            return wrapAlignment;
-        }
+    /**
+     * Sets the value of the showText property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowText(Boolean value)
+    {
+      this.showText = value;
+    }
 
-        /**
-         * Sets the value of the wrapAlignment property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setWrapAlignment(Boolean value) {
-            this.wrapAlignment = value;
-        }
+    /**
+     * Gets the value of the showColourText property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isShowColourText()
+    {
+      return showColourText;
+    }
 
-        /**
-         * Gets the value of the renderGaps property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isRenderGaps() {
-            return renderGaps;
-        }
+    /**
+     * Sets the value of the showColourText property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowColourText(Boolean value)
+    {
+      this.showColourText = value;
+    }
 
-        /**
-         * Sets the value of the renderGaps property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setRenderGaps(Boolean value) {
-            this.renderGaps = value;
-        }
+    /**
+     * Gets the value of the showUnconserved property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isShowUnconserved()
+    {
+      if (showUnconserved == null)
+      {
+        return false;
+      }
+      else
+      {
+        return showUnconserved;
+      }
+    }
 
-        /**
-         * Gets the value of the showSequenceFeatures property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isShowSequenceFeatures() {
-            return showSequenceFeatures;
-        }
+    /**
+     * Sets the value of the showUnconserved property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowUnconserved(Boolean value)
+    {
+      this.showUnconserved = value;
+    }
 
-        /**
-         * Sets the value of the showSequenceFeatures property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowSequenceFeatures(Boolean value) {
-            this.showSequenceFeatures = value;
-        }
+    /**
+     * Gets the value of the showBoxes property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isShowBoxes()
+    {
+      return showBoxes;
+    }
 
-        /**
-         * Gets the value of the showNPfeatureTooltip property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isShowNPfeatureTooltip() {
-            return showNPfeatureTooltip;
-        }
+    /**
+     * Sets the value of the showBoxes property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowBoxes(Boolean value)
+    {
+      this.showBoxes = value;
+    }
 
-        /**
-         * Sets the value of the showNPfeatureTooltip property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowNPfeatureTooltip(Boolean value) {
-            this.showNPfeatureTooltip = value;
-        }
+    /**
+     * Gets the value of the wrapAlignment property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isWrapAlignment()
+    {
+      return wrapAlignment;
+    }
 
-        /**
-         * Gets the value of the showDbRefTooltip property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isShowDbRefTooltip() {
-            return showDbRefTooltip;
-        }
+    /**
+     * Sets the value of the wrapAlignment property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setWrapAlignment(Boolean value)
+    {
+      this.wrapAlignment = value;
+    }
 
-        /**
-         * Sets the value of the showDbRefTooltip property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowDbRefTooltip(Boolean value) {
-            this.showDbRefTooltip = value;
-        }
+    /**
+     * Gets the value of the renderGaps property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isRenderGaps()
+    {
+      return renderGaps;
+    }
 
-        /**
-         * Gets the value of the followHighlight property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isFollowHighlight() {
-            if (followHighlight == null) {
-                return true;
-            } else {
-                return followHighlight;
-            }
-        }
+    /**
+     * Sets the value of the renderGaps property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setRenderGaps(Boolean value)
+    {
+      this.renderGaps = value;
+    }
+
+    /**
+     * Gets the value of the showSequenceFeatures property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isShowSequenceFeatures()
+    {
+      return showSequenceFeatures;
+    }
 
-        /**
-         * Sets the value of the followHighlight property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setFollowHighlight(Boolean value) {
-            this.followHighlight = value;
-        }
+    /**
+     * Sets the value of the showSequenceFeatures property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowSequenceFeatures(Boolean value)
+    {
+      this.showSequenceFeatures = value;
+    }
 
-        /**
-         * Gets the value of the followSelection property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isFollowSelection() {
-            if (followSelection == null) {
-                return true;
-            } else {
-                return followSelection;
-            }
-        }
+    /**
+     * Gets the value of the showNPfeatureTooltip property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isShowNPfeatureTooltip()
+    {
+      return showNPfeatureTooltip;
+    }
 
-        /**
-         * Sets the value of the followSelection property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setFollowSelection(Boolean value) {
-            this.followSelection = value;
-        }
+    /**
+     * Sets the value of the showNPfeatureTooltip property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowNPfeatureTooltip(Boolean value)
+    {
+      this.showNPfeatureTooltip = value;
+    }
 
-        /**
-         * Gets the value of the showAnnotation property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isShowAnnotation() {
-            return showAnnotation;
-        }
+    /**
+     * Gets the value of the showDbRefTooltip property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isShowDbRefTooltip()
+    {
+      return showDbRefTooltip;
+    }
 
-        /**
-         * Sets the value of the showAnnotation property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowAnnotation(Boolean value) {
-            this.showAnnotation = value;
-        }
+    /**
+     * Sets the value of the showDbRefTooltip property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowDbRefTooltip(Boolean value)
+    {
+      this.showDbRefTooltip = value;
+    }
 
-        /**
-         * Gets the value of the centreColumnLabels property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isCentreColumnLabels() {
-            if (centreColumnLabels == null) {
-                return false;
-            } else {
-                return centreColumnLabels;
-            }
-        }
+    /**
+     * Gets the value of the followHighlight property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isFollowHighlight()
+    {
+      if (followHighlight == null)
+      {
+        return true;
+      }
+      else
+      {
+        return followHighlight;
+      }
+    }
 
-        /**
-         * Sets the value of the centreColumnLabels property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setCentreColumnLabels(Boolean value) {
-            this.centreColumnLabels = value;
-        }
+    /**
+     * Sets the value of the followHighlight property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setFollowHighlight(Boolean value)
+    {
+      this.followHighlight = value;
+    }
 
-        /**
-         * Gets the value of the showGroupConservation property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isShowGroupConservation() {
-            if (showGroupConservation == null) {
-                return false;
-            } else {
-                return showGroupConservation;
-            }
-        }
+    /**
+     * Gets the value of the followSelection property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isFollowSelection()
+    {
+      if (followSelection == null)
+      {
+        return true;
+      }
+      else
+      {
+        return followSelection;
+      }
+    }
 
-        /**
-         * Sets the value of the showGroupConservation property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowGroupConservation(Boolean value) {
-            this.showGroupConservation = value;
-        }
+    /**
+     * Sets the value of the followSelection property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setFollowSelection(Boolean value)
+    {
+      this.followSelection = value;
+    }
 
-        /**
-         * Gets the value of the showGroupConsensus property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isShowGroupConsensus() {
-            if (showGroupConsensus == null) {
-                return false;
-            } else {
-                return showGroupConsensus;
-            }
-        }
+    /**
+     * Gets the value of the showAnnotation property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isShowAnnotation()
+    {
+      return showAnnotation;
+    }
 
-        /**
-         * Sets the value of the showGroupConsensus property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowGroupConsensus(Boolean value) {
-            this.showGroupConsensus = value;
-        }
+    /**
+     * Sets the value of the showAnnotation property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowAnnotation(Boolean value)
+    {
+      this.showAnnotation = value;
+    }
 
-        /**
-         * Gets the value of the showConsensusHistogram property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isShowConsensusHistogram() {
-            if (showConsensusHistogram == null) {
-                return true;
-            } else {
-                return showConsensusHistogram;
-            }
-        }
+    /**
+     * Gets the value of the centreColumnLabels property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isCentreColumnLabels()
+    {
+      if (centreColumnLabels == null)
+      {
+        return false;
+      }
+      else
+      {
+        return centreColumnLabels;
+      }
+    }
 
-        /**
-         * Sets the value of the showConsensusHistogram property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowConsensusHistogram(Boolean value) {
-            this.showConsensusHistogram = value;
-        }
+    /**
+     * Sets the value of the centreColumnLabels property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setCentreColumnLabels(Boolean value)
+    {
+      this.centreColumnLabels = value;
+    }
 
-        /**
-         * Gets the value of the showSequenceLogo property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isShowSequenceLogo() {
-            if (showSequenceLogo == null) {
-                return false;
-            } else {
-                return showSequenceLogo;
-            }
-        }
+    /**
+     * Gets the value of the showGroupConservation property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isShowGroupConservation()
+    {
+      if (showGroupConservation == null)
+      {
+        return false;
+      }
+      else
+      {
+        return showGroupConservation;
+      }
+    }
 
-        /**
-         * Sets the value of the showSequenceLogo property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowSequenceLogo(Boolean value) {
-            this.showSequenceLogo = value;
-        }
+    /**
+     * Sets the value of the showGroupConservation property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowGroupConservation(Boolean value)
+    {
+      this.showGroupConservation = value;
+    }
 
-        /**
-         * Gets the value of the normaliseSequenceLogo property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isNormaliseSequenceLogo() {
-            if (normaliseSequenceLogo == null) {
-                return false;
-            } else {
-                return normaliseSequenceLogo;
-            }
-        }
+    /**
+     * Gets the value of the showGroupConsensus property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isShowGroupConsensus()
+    {
+      if (showGroupConsensus == null)
+      {
+        return false;
+      }
+      else
+      {
+        return showGroupConsensus;
+      }
+    }
 
-        /**
-         * Sets the value of the normaliseSequenceLogo property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setNormaliseSequenceLogo(Boolean value) {
-            this.normaliseSequenceLogo = value;
-        }
+    /**
+     * Sets the value of the showGroupConsensus property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowGroupConsensus(Boolean value)
+    {
+      this.showGroupConsensus = value;
+    }
 
-        /**
-         * Gets the value of the ignoreGapsinConsensus property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isIgnoreGapsinConsensus() {
-            if (ignoreGapsinConsensus == null) {
-                return true;
-            } else {
-                return ignoreGapsinConsensus;
-            }
-        }
+    /**
+     * Gets the value of the showConsensusHistogram property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isShowConsensusHistogram()
+    {
+      if (showConsensusHistogram == null)
+      {
+        return true;
+      }
+      else
+      {
+        return showConsensusHistogram;
+      }
+    }
 
-        /**
-         * Sets the value of the ignoreGapsinConsensus property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setIgnoreGapsinConsensus(Boolean value) {
-            this.ignoreGapsinConsensus = value;
-        }
+    /**
+     * Sets the value of the showConsensusHistogram property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowConsensusHistogram(Boolean value)
+    {
+      this.showConsensusHistogram = value;
+    }
 
-        /**
-         * Gets the value of the startRes property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getStartRes() {
-            return startRes;
-        }
+    /**
+     * Gets the value of the showSequenceLogo property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isShowSequenceLogo()
+    {
+      if (showSequenceLogo == null)
+      {
+        return false;
+      }
+      else
+      {
+        return showSequenceLogo;
+      }
+    }
 
-        /**
-         * Sets the value of the startRes property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setStartRes(Integer value) {
-            this.startRes = value;
-        }
+    /**
+     * Sets the value of the showSequenceLogo property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowSequenceLogo(Boolean value)
+    {
+      this.showSequenceLogo = value;
+    }
 
-        /**
-         * Gets the value of the startSeq property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getStartSeq() {
-            return startSeq;
-        }
+    /**
+     * Gets the value of the normaliseSequenceLogo property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isNormaliseSequenceLogo()
+    {
+      if (normaliseSequenceLogo == null)
+      {
+        return false;
+      }
+      else
+      {
+        return normaliseSequenceLogo;
+      }
+    }
 
-        /**
-         * Sets the value of the startSeq property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setStartSeq(Integer value) {
-            this.startSeq = value;
-        }
+    /**
+     * Sets the value of the normaliseSequenceLogo property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setNormaliseSequenceLogo(Boolean value)
+    {
+      this.normaliseSequenceLogo = value;
+    }
 
-        /**
-         * Gets the value of the charWidth property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getCharWidth() {
-            return charWidth;
-        }
+    /**
+     * Gets the value of the ignoreGapsinConsensus property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isIgnoreGapsinConsensus()
+    {
+      if (ignoreGapsinConsensus == null)
+      {
+        return true;
+      }
+      else
+      {
+        return ignoreGapsinConsensus;
+      }
+    }
 
-        /**
-         * Sets the value of the charWidth property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setCharWidth(Integer value) {
-            this.charWidth = value;
-        }
+    /**
+     * Sets the value of the ignoreGapsinConsensus property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setIgnoreGapsinConsensus(Boolean value)
+    {
+      this.ignoreGapsinConsensus = value;
+    }
 
-        /**
-         * Gets the value of the charHeight property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getCharHeight() {
-            return charHeight;
-        }
+    /**
+     * Gets the value of the startRes property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getStartRes()
+    {
+      return startRes;
+    }
 
-        /**
-         * Sets the value of the charHeight property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setCharHeight(Integer value) {
-            this.charHeight = value;
-        }
+    /**
+     * Sets the value of the startRes property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setStartRes(Integer value)
+    {
+      this.startRes = value;
+    }
 
-        /**
-         * Gets the value of the fontName property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getFontName() {
-            return fontName;
-        }
+    /**
+     * Gets the value of the startSeq property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getStartSeq()
+    {
+      return startSeq;
+    }
 
-        /**
-         * Sets the value of the fontName property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setFontName(String value) {
-            this.fontName = value;
-        }
+    /**
+     * Sets the value of the startSeq property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setStartSeq(Integer value)
+    {
+      this.startSeq = value;
+    }
 
-        /**
-         * Gets the value of the fontSize property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getFontSize() {
-            return fontSize;
-        }
+    /**
+     * Gets the value of the charWidth property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getCharWidth()
+    {
+      return charWidth;
+    }
 
-        /**
-         * Sets the value of the fontSize property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setFontSize(Integer value) {
-            this.fontSize = value;
-        }
+    /**
+     * Sets the value of the charWidth property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setCharWidth(Integer value)
+    {
+      this.charWidth = value;
+    }
 
-        /**
-         * Gets the value of the fontStyle property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getFontStyle() {
-            return fontStyle;
-        }
+    /**
+     * Gets the value of the charHeight property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getCharHeight()
+    {
+      return charHeight;
+    }
 
-        /**
-         * Sets the value of the fontStyle property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setFontStyle(Integer value) {
-            this.fontStyle = value;
-        }
+    /**
+     * Sets the value of the charHeight property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setCharHeight(Integer value)
+    {
+      this.charHeight = value;
+    }
 
-        /**
-         * Gets the value of the idWidth property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getIdWidth() {
-            return idWidth;
-        }
+    /**
+     * Gets the value of the fontName property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getFontName()
+    {
+      return fontName;
+    }
 
-        /**
-         * Sets the value of the idWidth property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setIdWidth(Integer value) {
-            this.idWidth = value;
-        }
+    /**
+     * Sets the value of the fontName property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setFontName(String value)
+    {
+      this.fontName = value;
+    }
 
-        /**
-         * Gets the value of the idWidthManuallyAdjusted property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isIdWidthManuallyAdjusted() {
-            return idWidthManuallyAdjusted;
-        }
+    /**
+     * Gets the value of the fontSize property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getFontSize()
+    {
+      return fontSize;
+    }
 
-        /**
-         * Sets the value of the idWidthManuallyAdjusted property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setIdWidthManuallyAdjusted(Boolean value) {
-            this.idWidthManuallyAdjusted = value;
-        }
+    /**
+     * Sets the value of the fontSize property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setFontSize(Integer value)
+    {
+      this.fontSize = value;
+    }
 
-        /**
-         * Gets the value of the scaleProteinAsCdna property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isScaleProteinAsCdna() {
-            if (scaleProteinAsCdna == null) {
-                return true;
-            } else {
-                return scaleProteinAsCdna;
-            }
-        }
+    /**
+     * Gets the value of the fontStyle property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getFontStyle()
+    {
+      return fontStyle;
+    }
 
-        /**
-         * Sets the value of the scaleProteinAsCdna property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setScaleProteinAsCdna(Boolean value) {
-            this.scaleProteinAsCdna = value;
-        }
+    /**
+     * Sets the value of the fontStyle property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setFontStyle(Integer value)
+    {
+      this.fontStyle = value;
+    }
 
-        /**
-         * Gets the value of the viewName property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getViewName() {
-            return viewName;
-        }
+    /**
+     * Gets the value of the idWidth property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getIdWidth()
+    {
+      return idWidth;
+    }
 
-        /**
-         * Sets the value of the viewName property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setViewName(String value) {
-            this.viewName = value;
-        }
+    /**
+     * Sets the value of the idWidth property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setIdWidth(Integer value)
+    {
+      this.idWidth = value;
+    }
 
-        /**
-         * Gets the value of the sequenceSetId property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getSequenceSetId() {
-            return sequenceSetId;
-        }
+    /**
+     * Gets the value of the idWidthManuallyAdjusted property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isIdWidthManuallyAdjusted()
+    {
+      return idWidthManuallyAdjusted;
+    }
 
-        /**
-         * Sets the value of the sequenceSetId property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setSequenceSetId(String value) {
-            this.sequenceSetId = value;
-        }
+    /**
+     * Sets the value of the idWidthManuallyAdjusted property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setIdWidthManuallyAdjusted(Boolean value)
+    {
+      this.idWidthManuallyAdjusted = value;
+    }
 
-        /**
-         * Gets the value of the gatheredViews property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isGatheredViews() {
-            return gatheredViews;
-        }
+    /**
+     * Gets the value of the scaleProteinAsCdna property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isScaleProteinAsCdna()
+    {
+      if (scaleProteinAsCdna == null)
+      {
+        return true;
+      }
+      else
+      {
+        return scaleProteinAsCdna;
+      }
+    }
 
-        /**
-         * Sets the value of the gatheredViews property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setGatheredViews(Boolean value) {
-            this.gatheredViews = value;
-        }
+    /**
+     * Sets the value of the scaleProteinAsCdna property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setScaleProteinAsCdna(Boolean value)
+    {
+      this.scaleProteinAsCdna = value;
+    }
 
-        /**
-         * Gets the value of the textCol1 property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getTextCol1() {
-            return textCol1;
-        }
+    /**
+     * Gets the value of the viewName property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getViewName()
+    {
+      return viewName;
+    }
 
-        /**
-         * Sets the value of the textCol1 property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setTextCol1(Integer value) {
-            this.textCol1 = value;
-        }
+    /**
+     * Sets the value of the viewName property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setViewName(String value)
+    {
+      this.viewName = value;
+    }
 
-        /**
-         * Gets the value of the textCol2 property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getTextCol2() {
-            return textCol2;
-        }
+    /**
+     * Gets the value of the sequenceSetId property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getSequenceSetId()
+    {
+      return sequenceSetId;
+    }
 
-        /**
-         * Sets the value of the textCol2 property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setTextCol2(Integer value) {
-            this.textCol2 = value;
-        }
+    /**
+     * Sets the value of the sequenceSetId property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setSequenceSetId(String value)
+    {
+      this.sequenceSetId = value;
+    }
 
-        /**
-         * Gets the value of the textColThreshold property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getTextColThreshold() {
-            return textColThreshold;
-        }
+    /**
+     * Gets the value of the gatheredViews property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public Boolean isGatheredViews()
+    {
+      return gatheredViews;
+    }
 
-        /**
-         * Sets the value of the textColThreshold property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setTextColThreshold(Integer value) {
-            this.textColThreshold = value;
-        }
+    /**
+     * Sets the value of the gatheredViews property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setGatheredViews(Boolean value)
+    {
+      this.gatheredViews = value;
+    }
 
-        /**
-         * Gets the value of the id property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getId() {
-            return id;
-        }
+    /**
+     * Gets the value of the textCol1 property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getTextCol1()
+    {
+      return textCol1;
+    }
 
-        /**
-         * Sets the value of the id property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setId(String value) {
-            this.id = value;
-        }
+    /**
+     * Sets the value of the textCol1 property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setTextCol1(Integer value)
+    {
+      this.textCol1 = value;
+    }
 
-        /**
-         * Gets the value of the complementId property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getComplementId() {
-            return complementId;
-        }
+    /**
+     * Gets the value of the textCol2 property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getTextCol2()
+    {
+      return textCol2;
+    }
 
-        /**
-         * Sets the value of the complementId property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setComplementId(String value) {
-            this.complementId = value;
-        }
+    /**
+     * Sets the value of the textCol2 property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setTextCol2(Integer value)
+    {
+      this.textCol2 = value;
+    }
 
-        /**
-         * Gets the value of the showComplementFeatures property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isShowComplementFeatures() {
-            if (showComplementFeatures == null) {
-                return false;
-            } else {
-                return showComplementFeatures;
-            }
-        }
+    /**
+     * Gets the value of the textColThreshold property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getTextColThreshold()
+    {
+      return textColThreshold;
+    }
 
-        /**
-         * Sets the value of the showComplementFeatures property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowComplementFeatures(Boolean value) {
-            this.showComplementFeatures = value;
-        }
+    /**
+     * Sets the value of the textColThreshold property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setTextColThreshold(Integer value)
+    {
+      this.textColThreshold = value;
+    }
 
-        /**
-         * Gets the value of the showComplementFeaturesOnTop property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isShowComplementFeaturesOnTop() {
-            if (showComplementFeaturesOnTop == null) {
-                return false;
-            } else {
-                return showComplementFeaturesOnTop;
-            }
-        }
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getId()
+    {
+      return id;
+    }
 
-        /**
-         * Sets the value of the showComplementFeaturesOnTop property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setShowComplementFeaturesOnTop(Boolean value) {
-            this.showComplementFeaturesOnTop = value;
-        }
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setId(String value)
+    {
+      this.id = value;
+    }
 
-        /**
-         * Gets the value of the width property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getWidth() {
-            return width;
-        }
+    /**
+     * Gets the value of the complementId property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getComplementId()
+    {
+      return complementId;
+    }
 
-        /**
-         * Sets the value of the width property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setWidth(Integer value) {
-            this.width = value;
-        }
+    /**
+     * Sets the value of the complementId property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setComplementId(String value)
+    {
+      this.complementId = value;
+    }
 
-        /**
-         * Gets the value of the height property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getHeight() {
-            return height;
-        }
+    /**
+     * Gets the value of the showComplementFeatures property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isShowComplementFeatures()
+    {
+      if (showComplementFeatures == null)
+      {
+        return false;
+      }
+      else
+      {
+        return showComplementFeatures;
+      }
+    }
 
-        /**
-         * Sets the value of the height property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setHeight(Integer value) {
-            this.height = value;
-        }
+    /**
+     * Sets the value of the showComplementFeatures property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowComplementFeatures(Boolean value)
+    {
+      this.showComplementFeatures = value;
+    }
 
-        /**
-         * Gets the value of the xpos property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getXpos() {
-            return xpos;
-        }
+    /**
+     * Gets the value of the showComplementFeaturesOnTop property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isShowComplementFeaturesOnTop()
+    {
+      if (showComplementFeaturesOnTop == null)
+      {
+        return false;
+      }
+      else
+      {
+        return showComplementFeaturesOnTop;
+      }
+    }
 
-        /**
-         * Sets the value of the xpos property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setXpos(Integer value) {
-            this.xpos = value;
-        }
+    /**
+     * Sets the value of the showComplementFeaturesOnTop property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setShowComplementFeaturesOnTop(Boolean value)
+    {
+      this.showComplementFeaturesOnTop = value;
+    }
 
-        /**
-         * Gets the value of the ypos property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getYpos() {
-            return ypos;
-        }
+    /**
+     * Gets the value of the width property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getWidth()
+    {
+      return width;
+    }
 
-        /**
-         * Sets the value of the ypos property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setYpos(Integer value) {
-            this.ypos = value;
-        }
+    /**
+     * Sets the value of the width property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setWidth(Integer value)
+    {
+      this.width = value;
+    }
 
+    /**
+     * Gets the value of the height property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getHeight()
+    {
+      return height;
+    }
 
-        /**
-         * &lt;p&gt;Java class for anonymous complex type.
-         * 
-         * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-         * 
-         * &lt;pre&gt;
-         * &amp;lt;complexType&amp;gt;
-         *   &amp;lt;complexContent&amp;gt;
-         *     &amp;lt;extension base="{www.jalview.org/xml/wsparamset}WebServiceParameterSet"&amp;gt;
-         *       &amp;lt;attribute name="calcId" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-         *       &amp;lt;attribute name="needsUpdate" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-         *       &amp;lt;attribute name="autoUpdate" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-         *     &amp;lt;/extension&amp;gt;
-         *   &amp;lt;/complexContent&amp;gt;
-         * &amp;lt;/complexType&amp;gt;
-         * &lt;/pre&gt;
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class CalcIdParam
-            extends WebServiceParameterSet
-        {
+    /**
+     * Sets the value of the height property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setHeight(Integer value)
+    {
+      this.height = value;
+    }
 
-            @XmlAttribute(name = "calcId", required = true)
-            protected String calcId;
-            @XmlAttribute(name = "needsUpdate")
-            protected Boolean needsUpdate;
-            @XmlAttribute(name = "autoUpdate", required = true)
-            protected boolean autoUpdate;
-
-            /**
-             * Gets the value of the calcId property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getCalcId() {
-                return calcId;
-            }
-
-            /**
-             * Sets the value of the calcId property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setCalcId(String value) {
-                this.calcId = value;
-            }
-
-            /**
-             * Gets the value of the needsUpdate property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Boolean }
-             *     
-             */
-            public boolean isNeedsUpdate() {
-                if (needsUpdate == null) {
-                    return false;
-                } else {
-                    return needsUpdate;
-                }
-            }
-
-            /**
-             * Sets the value of the needsUpdate property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Boolean }
-             *     
-             */
-            public void setNeedsUpdate(Boolean value) {
-                this.needsUpdate = value;
-            }
-
-            /**
-             * Gets the value of the autoUpdate property.
-             * 
-             */
-            public boolean isAutoUpdate() {
-                return autoUpdate;
-            }
-
-            /**
-             * Sets the value of the autoUpdate property.
-             * 
-             */
-            public void setAutoUpdate(boolean value) {
-                this.autoUpdate = value;
-            }
+    /**
+     * Gets the value of the xpos property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getXpos()
+    {
+      return xpos;
+    }
 
-        }
+    /**
+     * Sets the value of the xpos property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setXpos(Integer value)
+    {
+      this.xpos = value;
+    }
 
+    /**
+     * Gets the value of the ypos property.
+     * 
+     * @return possible object is {@link Integer }
+     * 
+     */
+    public Integer getYpos()
+    {
+      return ypos;
+    }
 
-        /**
-         * &lt;p&gt;Java class for anonymous complex type.
-         * 
-         * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-         * 
-         * &lt;pre&gt;
-         * &amp;lt;complexType&amp;gt;
-         *   &amp;lt;complexContent&amp;gt;
-         *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-         *       &amp;lt;attribute name="start" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-         *       &amp;lt;attribute name="end" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-         *     &amp;lt;/restriction&amp;gt;
-         *   &amp;lt;/complexContent&amp;gt;
-         * &amp;lt;/complexType&amp;gt;
-         * &lt;/pre&gt;
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class HiddenColumns {
-
-            @XmlAttribute(name = "start")
-            protected Integer start;
-            @XmlAttribute(name = "end")
-            protected Integer end;
-
-            /**
-             * Gets the value of the start property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getStart() {
-                return start;
-            }
-
-            /**
-             * Sets the value of the start property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setStart(Integer value) {
-                this.start = value;
-            }
-
-            /**
-             * Gets the value of the end property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getEnd() {
-                return end;
-            }
-
-            /**
-             * Sets the value of the end property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setEnd(Integer value) {
-                this.end = value;
-            }
+    /**
+     * Sets the value of the ypos property.
+     * 
+     * @param value
+     *          allowed object is {@link Integer }
+     * 
+     */
+    public void setYpos(Integer value)
+    {
+      this.ypos = value;
+    }
 
+    /**
+     * &lt;p&gt;Java class for anonymous complex type.
+     * 
+     * &lt;p&gt;The following schema fragment specifies the expected content
+     * contained within this class.
+     * 
+     * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+     * &amp;lt;extension
+     * base="{www.jalview.org/xml/wsparamset}WebServiceParameterSet"&amp;gt;
+     * &amp;lt;attribute name="calcId" use="required"
+     * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+     * &amp;lt;attribute name="needsUpdate"
+     * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false"
+     * /&amp;gt; &amp;lt;attribute name="autoUpdate" use="required"
+     * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+     * &amp;lt;/extension&amp;gt; &amp;lt;/complexContent&amp;gt;
+     * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "")
+    public static class CalcIdParam extends WebServiceParameterSet
+    {
+
+      @XmlAttribute(name = "calcId", required = true)
+      protected String calcId;
+
+      @XmlAttribute(name = "needsUpdate")
+      protected Boolean needsUpdate;
+
+      @XmlAttribute(name = "autoUpdate", required = true)
+      protected boolean autoUpdate;
+
+      /**
+       * Gets the value of the calcId property.
+       * 
+       * @return possible object is {@link String }
+       * 
+       */
+      public String getCalcId()
+      {
+        return calcId;
+      }
+
+      /**
+       * Sets the value of the calcId property.
+       * 
+       * @param value
+       *          allowed object is {@link String }
+       * 
+       */
+      public void setCalcId(String value)
+      {
+        this.calcId = value;
+      }
+
+      /**
+       * Gets the value of the needsUpdate property.
+       * 
+       * @return possible object is {@link Boolean }
+       * 
+       */
+      public boolean isNeedsUpdate()
+      {
+        if (needsUpdate == null)
+        {
+          return false;
         }
+        else
+        {
+          return needsUpdate;
+        }
+      }
+
+      /**
+       * Sets the value of the needsUpdate property.
+       * 
+       * @param value
+       *          allowed object is {@link Boolean }
+       * 
+       */
+      public void setNeedsUpdate(Boolean value)
+      {
+        this.needsUpdate = value;
+      }
+
+      /**
+       * Gets the value of the autoUpdate property.
+       * 
+       */
+      public boolean isAutoUpdate()
+      {
+        return autoUpdate;
+      }
+
+      /**
+       * Sets the value of the autoUpdate property.
+       * 
+       */
+      public void setAutoUpdate(boolean value)
+      {
+        this.autoUpdate = value;
+      }
 
+    }
 
-        /**
-         * &lt;p&gt;Java class for anonymous complex type.
-         * 
-         * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-         * 
-         * &lt;pre&gt;
-         * &amp;lt;complexType&amp;gt;
-         *   &amp;lt;complexContent&amp;gt;
-         *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-         *       &amp;lt;attGroup ref="{www.jalview.org}swingwindow"/&amp;gt;
-         *       &amp;lt;attribute name="showHidden" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-         *       &amp;lt;attribute name="residueColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-         *       &amp;lt;attribute name="gapColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-         *       &amp;lt;attribute name="hiddenColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-         *       &amp;lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-         *     &amp;lt;/restriction&amp;gt;
-         *   &amp;lt;/complexContent&amp;gt;
-         * &amp;lt;/complexType&amp;gt;
-         * &lt;/pre&gt;
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Overview {
-
-            @XmlAttribute(name = "showHidden")
-            protected Boolean showHidden;
-            @XmlAttribute(name = "residueColour")
-            protected Integer residueColour;
-            @XmlAttribute(name = "gapColour")
-            protected Integer gapColour;
-            @XmlAttribute(name = "hiddenColour")
-            protected Integer hiddenColour;
-            @XmlAttribute(name = "title")
-            protected String title;
-            @XmlAttribute(name = "width")
-            protected Integer width;
-            @XmlAttribute(name = "height")
-            protected Integer height;
-            @XmlAttribute(name = "xpos")
-            protected Integer xpos;
-            @XmlAttribute(name = "ypos")
-            protected Integer ypos;
-
-            /**
-             * Gets the value of the showHidden property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Boolean }
-             *     
-             */
-            public Boolean isShowHidden() {
-                return showHidden;
-            }
-
-            /**
-             * Sets the value of the showHidden property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Boolean }
-             *     
-             */
-            public void setShowHidden(Boolean value) {
-                this.showHidden = value;
-            }
-
-            /**
-             * Gets the value of the residueColour property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getResidueColour() {
-                return residueColour;
-            }
-
-            /**
-             * Sets the value of the residueColour property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setResidueColour(Integer value) {
-                this.residueColour = value;
-            }
-
-            /**
-             * Gets the value of the gapColour property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getGapColour() {
-                return gapColour;
-            }
-
-            /**
-             * Sets the value of the gapColour property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setGapColour(Integer value) {
-                this.gapColour = value;
-            }
-
-            /**
-             * Gets the value of the hiddenColour property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getHiddenColour() {
-                return hiddenColour;
-            }
-
-            /**
-             * Sets the value of the hiddenColour property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setHiddenColour(Integer value) {
-                this.hiddenColour = value;
-            }
-
-            /**
-             * Gets the value of the title property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getTitle() {
-                return title;
-            }
-
-            /**
-             * Sets the value of the title property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setTitle(String value) {
-                this.title = value;
-            }
-
-            /**
-             * Gets the value of the width property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getWidth() {
-                return width;
-            }
-
-            /**
-             * Sets the value of the width property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setWidth(Integer value) {
-                this.width = value;
-            }
-
-            /**
-             * Gets the value of the height property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getHeight() {
-                return height;
-            }
-
-            /**
-             * Sets the value of the height property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setHeight(Integer value) {
-                this.height = value;
-            }
-
-            /**
-             * Gets the value of the xpos property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getXpos() {
-                return xpos;
-            }
-
-            /**
-             * Sets the value of the xpos property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setXpos(Integer value) {
-                this.xpos = value;
-            }
-
-            /**
-             * Gets the value of the ypos property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getYpos() {
-                return ypos;
-            }
-
-            /**
-             * Sets the value of the ypos property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setYpos(Integer value) {
-                this.ypos = value;
-            }
+    /**
+     * &lt;p&gt;Java class for anonymous complex type.
+     * 
+     * &lt;p&gt;The following schema fragment specifies the expected content
+     * contained within this class.
+     * 
+     * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+     * &amp;lt;restriction
+     * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+     * &amp;lt;attribute name="start"
+     * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+     * name="end" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+     * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+     * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "")
+    public static class HiddenColumns
+    {
+
+      @XmlAttribute(name = "start")
+      protected Integer start;
+
+      @XmlAttribute(name = "end")
+      protected Integer end;
+
+      /**
+       * Gets the value of the start property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getStart()
+      {
+        return start;
+      }
+
+      /**
+       * Sets the value of the start property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setStart(Integer value)
+      {
+        this.start = value;
+      }
+
+      /**
+       * Gets the value of the end property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getEnd()
+      {
+        return end;
+      }
+
+      /**
+       * Sets the value of the end property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setEnd(Integer value)
+      {
+        this.end = value;
+      }
 
-        }
+    }
+
+    /**
+     * &lt;p&gt;Java class for anonymous complex type.
+     * 
+     * &lt;p&gt;The following schema fragment specifies the expected content
+     * contained within this class.
+     * 
+     * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+     * &amp;lt;restriction
+     * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attGroup
+     * ref="{www.jalview.org}swingwindow"/&amp;gt; &amp;lt;attribute
+     * name="showHidden" type="{http://www.w3.org/2001/XMLSchema}boolean"
+     * /&amp;gt; &amp;lt;attribute name="residueColour"
+     * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+     * name="gapColour" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+     * &amp;lt;attribute name="hiddenColour"
+     * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+     * name="title" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+     * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+     * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "")
+    public static class Overview
+    {
+
+      @XmlAttribute(name = "showHidden")
+      protected Boolean showHidden;
+
+      @XmlAttribute(name = "residueColour")
+      protected Integer residueColour;
+
+      @XmlAttribute(name = "gapColour")
+      protected Integer gapColour;
+
+      @XmlAttribute(name = "hiddenColour")
+      protected Integer hiddenColour;
+
+      @XmlAttribute(name = "title")
+      protected String title;
+
+      @XmlAttribute(name = "width")
+      protected Integer width;
+
+      @XmlAttribute(name = "height")
+      protected Integer height;
+
+      @XmlAttribute(name = "xpos")
+      protected Integer xpos;
+
+      @XmlAttribute(name = "ypos")
+      protected Integer ypos;
+
+      /**
+       * Gets the value of the showHidden property.
+       * 
+       * @return possible object is {@link Boolean }
+       * 
+       */
+      public Boolean isShowHidden()
+      {
+        return showHidden;
+      }
+
+      /**
+       * Sets the value of the showHidden property.
+       * 
+       * @param value
+       *          allowed object is {@link Boolean }
+       * 
+       */
+      public void setShowHidden(Boolean value)
+      {
+        this.showHidden = value;
+      }
+
+      /**
+       * Gets the value of the residueColour property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getResidueColour()
+      {
+        return residueColour;
+      }
+
+      /**
+       * Sets the value of the residueColour property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setResidueColour(Integer value)
+      {
+        this.residueColour = value;
+      }
+
+      /**
+       * Gets the value of the gapColour property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getGapColour()
+      {
+        return gapColour;
+      }
+
+      /**
+       * Sets the value of the gapColour property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setGapColour(Integer value)
+      {
+        this.gapColour = value;
+      }
+
+      /**
+       * Gets the value of the hiddenColour property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getHiddenColour()
+      {
+        return hiddenColour;
+      }
+
+      /**
+       * Sets the value of the hiddenColour property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setHiddenColour(Integer value)
+      {
+        this.hiddenColour = value;
+      }
+
+      /**
+       * Gets the value of the title property.
+       * 
+       * @return possible object is {@link String }
+       * 
+       */
+      public String getTitle()
+      {
+        return title;
+      }
+
+      /**
+       * Sets the value of the title property.
+       * 
+       * @param value
+       *          allowed object is {@link String }
+       * 
+       */
+      public void setTitle(String value)
+      {
+        this.title = value;
+      }
+
+      /**
+       * Gets the value of the width property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getWidth()
+      {
+        return width;
+      }
+
+      /**
+       * Sets the value of the width property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setWidth(Integer value)
+      {
+        this.width = value;
+      }
+
+      /**
+       * Gets the value of the height property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getHeight()
+      {
+        return height;
+      }
+
+      /**
+       * Sets the value of the height property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setHeight(Integer value)
+      {
+        this.height = value;
+      }
+
+      /**
+       * Gets the value of the xpos property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getXpos()
+      {
+        return xpos;
+      }
+
+      /**
+       * Sets the value of the xpos property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setXpos(Integer value)
+      {
+        this.xpos = value;
+      }
+
+      /**
+       * Gets the value of the ypos property.
+       * 
+       * @return possible object is {@link Integer }
+       * 
+       */
+      public Integer getYpos()
+      {
+        return ypos;
+      }
+
+      /**
+       * Sets the value of the ypos property.
+       * 
+       * @param value
+       *          allowed object is {@link Integer }
+       * 
+       */
+      public void setYpos(Integer value)
+      {
+        this.ypos = value;
+      }
 
     }
 
+  }
+
 }
index 592ef1b..ea2c6ac 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.util.ArrayList;
@@ -16,597 +15,585 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for JalviewUserColours complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="JalviewUserColours"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element name="Version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="colour" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *           &amp;lt;complexType&amp;gt;
- *             &amp;lt;complexContent&amp;gt;
- *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                 &amp;lt;sequence&amp;gt;
- *                   &amp;lt;element name="attributeName" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="2" minOccurs="0"/&amp;gt;
- *                 &amp;lt;/sequence&amp;gt;
- *                 &amp;lt;attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                 &amp;lt;attribute name="RGB" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                 &amp;lt;attribute name="minRGB" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                 &amp;lt;attribute name="noValueColour" type="{www.jalview.org/colours}NoValueColour" default="Min" /&amp;gt;
- *                 &amp;lt;attribute name="threshType" type="{www.jalview.org/colours}ThresholdType" /&amp;gt;
- *                 &amp;lt;attribute name="threshold" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
- *                 &amp;lt;attribute name="max" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
- *                 &amp;lt;attribute name="min" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
- *                 &amp;lt;attribute name="colourByLabel" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *                 &amp;lt;attribute name="autoScale" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
- *               &amp;lt;/restriction&amp;gt;
- *             &amp;lt;/complexContent&amp;gt;
- *           &amp;lt;/complexType&amp;gt;
- *         &amp;lt;/element&amp;gt;
- *         &amp;lt;element name="filter" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *           &amp;lt;complexType&amp;gt;
- *             &amp;lt;complexContent&amp;gt;
- *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                 &amp;lt;sequence&amp;gt;
- *                   &amp;lt;element name="matcherSet" type="{www.jalview.org/colours}FeatureMatcherSet"/&amp;gt;
- *                 &amp;lt;/sequence&amp;gt;
- *                 &amp;lt;attribute name="featureType" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *               &amp;lt;/restriction&amp;gt;
- *             &amp;lt;/complexContent&amp;gt;
- *           &amp;lt;/complexType&amp;gt;
- *         &amp;lt;/element&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *       &amp;lt;attribute name="schemeName" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="JalviewUserColours"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="Version"
+ * type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&amp;gt;
+ * &amp;lt;element name="colour" maxOccurs="unbounded" minOccurs="0"&amp;gt;
+ * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="attributeName"
+ * type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="2"
+ * minOccurs="0"/&amp;gt; &amp;lt;/sequence&amp;gt; &amp;lt;attribute
+ * name="Name" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;attribute name="RGB" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="minRGB" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;attribute name="noValueColour"
+ * type="{www.jalview.org/colours}NoValueColour" default="Min" /&amp;gt;
+ * &amp;lt;attribute name="threshType"
+ * type="{www.jalview.org/colours}ThresholdType" /&amp;gt; &amp;lt;attribute
+ * name="threshold" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
+ * &amp;lt;attribute name="max" type="{http://www.w3.org/2001/XMLSchema}float"
+ * /&amp;gt; &amp;lt;attribute name="min"
+ * type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt; &amp;lt;attribute
+ * name="colourByLabel" type="{http://www.w3.org/2001/XMLSchema}boolean"
+ * /&amp;gt; &amp;lt;attribute name="autoScale"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+ * name="filter" maxOccurs="unbounded" minOccurs="0"&amp;gt;
+ * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="matcherSet"
+ * type="{www.jalview.org/colours}FeatureMatcherSet"/&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="featureType" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="schemeName"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JalviewUserColours", namespace = "www.jalview.org/colours", propOrder = {
-    "version",
-    "colour",
-    "filter"
-})
-public class JalviewUserColours {
-
-    @XmlElement(name = "Version", namespace = "")
-    protected String version;
-    @XmlElement(namespace = "")
-    protected List<JalviewUserColours.Colour> colour;
+@XmlType(
+  name = "JalviewUserColours",
+  namespace = "www.jalview.org/colours",
+  propOrder =
+  { "version", "colour", "filter" })
+public class JalviewUserColours
+{
+
+  @XmlElement(name = "Version", namespace = "")
+  protected String version;
+
+  @XmlElement(namespace = "")
+  protected List<JalviewUserColours.Colour> colour;
+
+  @XmlElement(namespace = "")
+  protected List<JalviewUserColours.Filter> filter;
+
+  @XmlAttribute(name = "schemeName")
+  protected String schemeName;
+
+  /**
+   * Gets the value of the version property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getVersion()
+  {
+    return version;
+  }
+
+  /**
+   * Sets the value of the version property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setVersion(String value)
+  {
+    this.version = value;
+  }
+
+  /**
+   * Gets the value of the colour property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the colour property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getColour().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link JalviewUserColours.Colour }
+   * 
+   * 
+   */
+  public List<JalviewUserColours.Colour> getColour()
+  {
+    if (colour == null)
+    {
+      colour = new ArrayList<JalviewUserColours.Colour>();
+    }
+    return this.colour;
+  }
+
+  /**
+   * Gets the value of the filter property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the filter property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getFilter().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link JalviewUserColours.Filter }
+   * 
+   * 
+   */
+  public List<JalviewUserColours.Filter> getFilter()
+  {
+    if (filter == null)
+    {
+      filter = new ArrayList<JalviewUserColours.Filter>();
+    }
+    return this.filter;
+  }
+
+  /**
+   * Gets the value of the schemeName property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getSchemeName()
+  {
+    return schemeName;
+  }
+
+  /**
+   * Sets the value of the schemeName property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setSchemeName(String value)
+  {
+    this.schemeName = value;
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+   * &amp;lt;sequence&amp;gt; &amp;lt;element name="attributeName"
+   * type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="2"
+   * minOccurs="0"/&amp;gt; &amp;lt;/sequence&amp;gt; &amp;lt;attribute
+   * name="Name" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;attribute name="RGB" use="required"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+   * name="minRGB" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;attribute name="noValueColour"
+   * type="{www.jalview.org/colours}NoValueColour" default="Min" /&amp;gt;
+   * &amp;lt;attribute name="threshType"
+   * type="{www.jalview.org/colours}ThresholdType" /&amp;gt; &amp;lt;attribute
+   * name="threshold" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
+   * &amp;lt;attribute name="max" type="{http://www.w3.org/2001/XMLSchema}float"
+   * /&amp;gt; &amp;lt;attribute name="min"
+   * type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt; &amp;lt;attribute
+   * name="colourByLabel" type="{http://www.w3.org/2001/XMLSchema}boolean"
+   * /&amp;gt; &amp;lt;attribute name="autoScale"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(name = "", propOrder = { "attributeName" })
+  public static class Colour
+  {
+
     @XmlElement(namespace = "")
-    protected List<JalviewUserColours.Filter> filter;
-    @XmlAttribute(name = "schemeName")
-    protected String schemeName;
+    protected List<String> attributeName;
+
+    @XmlAttribute(name = "Name")
+    protected String name;
+
+    @XmlAttribute(name = "RGB", required = true)
+    protected String rgb;
+
+    @XmlAttribute(name = "minRGB")
+    protected String minRGB;
+
+    @XmlAttribute(name = "noValueColour")
+    protected NoValueColour noValueColour;
+
+    @XmlAttribute(name = "threshType")
+    protected ThresholdType threshType;
+
+    @XmlAttribute(name = "threshold")
+    protected Float threshold;
+
+    @XmlAttribute(name = "max")
+    protected Float max;
+
+    @XmlAttribute(name = "min")
+    protected Float min;
+
+    @XmlAttribute(name = "colourByLabel")
+    protected Boolean colourByLabel;
+
+    @XmlAttribute(name = "autoScale")
+    protected Boolean autoScale;
+
+    /**
+     * Gets the value of the attributeName property.
+     * 
+     * &lt;p&gt; This accessor method returns a reference to the live list, not
+     * a snapshot. Therefore any modification you make to the returned list will
+     * be present inside the JAXB object. This is why there is not a
+     * &lt;CODE&gt;set&lt;/CODE&gt; method for the attributeName property.
+     * 
+     * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+     * getAttributeName().add(newItem); &lt;/pre&gt;
+     * 
+     * 
+     * &lt;p&gt; Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getAttributeName()
+    {
+      if (attributeName == null)
+      {
+        attributeName = new ArrayList<String>();
+      }
+      return this.attributeName;
+    }
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getName()
+    {
+      return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setName(String value)
+    {
+      this.name = value;
+    }
+
+    /**
+     * Gets the value of the rgb property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getRGB()
+    {
+      return rgb;
+    }
+
+    /**
+     * Sets the value of the rgb property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setRGB(String value)
+    {
+      this.rgb = value;
+    }
+
+    /**
+     * Gets the value of the minRGB property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getMinRGB()
+    {
+      return minRGB;
+    }
+
+    /**
+     * Sets the value of the minRGB property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setMinRGB(String value)
+    {
+      this.minRGB = value;
+    }
 
     /**
-     * Gets the value of the version property.
+     * Gets the value of the noValueColour property.
+     * 
+     * @return possible object is {@link NoValueColour }
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getVersion() {
-        return version;
+    public NoValueColour getNoValueColour()
+    {
+      if (noValueColour == null)
+      {
+        return NoValueColour.MIN;
+      }
+      else
+      {
+        return noValueColour;
+      }
     }
 
     /**
-     * Sets the value of the version property.
+     * Sets the value of the noValueColour property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
+     *          allowed object is {@link NoValueColour }
+     * 
      */
-    public void setVersion(String value) {
-        this.version = value;
+    public void setNoValueColour(NoValueColour value)
+    {
+      this.noValueColour = value;
     }
 
     /**
-     * Gets the value of the colour property.
+     * Gets the value of the threshType property.
      * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the colour property.
+     * @return possible object is {@link ThresholdType }
      * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getColour().add(newItem);
-     * &lt;/pre&gt;
+     */
+    public ThresholdType getThreshType()
+    {
+      return threshType;
+    }
+
+    /**
+     * Sets the value of the threshType property.
      * 
+     * @param value
+     *          allowed object is {@link ThresholdType }
      * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link JalviewUserColours.Colour }
+     */
+    public void setThreshType(ThresholdType value)
+    {
+      this.threshType = value;
+    }
+
+    /**
+     * Gets the value of the threshold property.
      * 
+     * @return possible object is {@link Float }
      * 
      */
-    public List<JalviewUserColours.Colour> getColour() {
-        if (colour == null) {
-            colour = new ArrayList<JalviewUserColours.Colour>();
-        }
-        return this.colour;
+    public Float getThreshold()
+    {
+      return threshold;
     }
 
     /**
-     * Gets the value of the filter property.
+     * Sets the value of the threshold property.
      * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the filter property.
+     * @param value
+     *          allowed object is {@link Float }
      * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getFilter().add(newItem);
-     * &lt;/pre&gt;
+     */
+    public void setThreshold(Float value)
+    {
+      this.threshold = value;
+    }
+
+    /**
+     * Gets the value of the max property.
      * 
+     * @return possible object is {@link Float }
      * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link JalviewUserColours.Filter }
+     */
+    public Float getMax()
+    {
+      return max;
+    }
+
+    /**
+     * Sets the value of the max property.
      * 
+     * @param value
+     *          allowed object is {@link Float }
      * 
      */
-    public List<JalviewUserColours.Filter> getFilter() {
-        if (filter == null) {
-            filter = new ArrayList<JalviewUserColours.Filter>();
-        }
-        return this.filter;
+    public void setMax(Float value)
+    {
+      this.max = value;
     }
 
     /**
-     * Gets the value of the schemeName property.
+     * Gets the value of the min property.
+     * 
+     * @return possible object is {@link Float }
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getSchemeName() {
-        return schemeName;
+    public Float getMin()
+    {
+      return min;
     }
 
     /**
-     * Sets the value of the schemeName property.
+     * Sets the value of the min property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
+     *          allowed object is {@link Float }
+     * 
+     */
+    public void setMin(Float value)
+    {
+      this.min = value;
+    }
+
+    /**
+     * Gets the value of the colourByLabel property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
      */
-    public void setSchemeName(String value) {
-        this.schemeName = value;
+    public Boolean isColourByLabel()
+    {
+      return colourByLabel;
     }
 
+    /**
+     * Sets the value of the colourByLabel property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setColourByLabel(Boolean value)
+    {
+      this.colourByLabel = value;
+    }
 
     /**
-     * &lt;p&gt;Java class for anonymous complex type.
-     * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-     * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;sequence&amp;gt;
-     *         &amp;lt;element name="attributeName" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="2" minOccurs="0"/&amp;gt;
-     *       &amp;lt;/sequence&amp;gt;
-     *       &amp;lt;attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="RGB" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="minRGB" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="noValueColour" type="{www.jalview.org/colours}NoValueColour" default="Min" /&amp;gt;
-     *       &amp;lt;attribute name="threshType" type="{www.jalview.org/colours}ThresholdType" /&amp;gt;
-     *       &amp;lt;attribute name="threshold" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
-     *       &amp;lt;attribute name="max" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
-     *       &amp;lt;attribute name="min" type="{http://www.w3.org/2001/XMLSchema}float" /&amp;gt;
-     *       &amp;lt;attribute name="colourByLabel" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *       &amp;lt;attribute name="autoScale" type="{http://www.w3.org/2001/XMLSchema}boolean" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
+     * Gets the value of the autoScale property.
      * 
+     * @return possible object is {@link Boolean }
      * 
      */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "attributeName"
-    })
-    public static class Colour {
-
-        @XmlElement(namespace = "")
-        protected List<String> attributeName;
-        @XmlAttribute(name = "Name")
-        protected String name;
-        @XmlAttribute(name = "RGB", required = true)
-        protected String rgb;
-        @XmlAttribute(name = "minRGB")
-        protected String minRGB;
-        @XmlAttribute(name = "noValueColour")
-        protected NoValueColour noValueColour;
-        @XmlAttribute(name = "threshType")
-        protected ThresholdType threshType;
-        @XmlAttribute(name = "threshold")
-        protected Float threshold;
-        @XmlAttribute(name = "max")
-        protected Float max;
-        @XmlAttribute(name = "min")
-        protected Float min;
-        @XmlAttribute(name = "colourByLabel")
-        protected Boolean colourByLabel;
-        @XmlAttribute(name = "autoScale")
-        protected Boolean autoScale;
-
-        /**
-         * Gets the value of the attributeName property.
-         * 
-         * &lt;p&gt;
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the attributeName property.
-         * 
-         * &lt;p&gt;
-         * For example, to add a new item, do as follows:
-         * &lt;pre&gt;
-         *    getAttributeName().add(newItem);
-         * &lt;/pre&gt;
-         * 
-         * 
-         * &lt;p&gt;
-         * Objects of the following type(s) are allowed in the list
-         * {@link String }
-         * 
-         * 
-         */
-        public List<String> getAttributeName() {
-            if (attributeName == null) {
-                attributeName = new ArrayList<String>();
-            }
-            return this.attributeName;
-        }
-
-        /**
-         * Gets the value of the name property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getName() {
-            return name;
-        }
-
-        /**
-         * Sets the value of the name property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setName(String value) {
-            this.name = value;
-        }
-
-        /**
-         * Gets the value of the rgb property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getRGB() {
-            return rgb;
-        }
-
-        /**
-         * Sets the value of the rgb property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setRGB(String value) {
-            this.rgb = value;
-        }
-
-        /**
-         * Gets the value of the minRGB property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getMinRGB() {
-            return minRGB;
-        }
-
-        /**
-         * Sets the value of the minRGB property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setMinRGB(String value) {
-            this.minRGB = value;
-        }
-
-        /**
-         * Gets the value of the noValueColour property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link NoValueColour }
-         *     
-         */
-        public NoValueColour getNoValueColour() {
-            if (noValueColour == null) {
-                return NoValueColour.MIN;
-            } else {
-                return noValueColour;
-            }
-        }
-
-        /**
-         * Sets the value of the noValueColour property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link NoValueColour }
-         *     
-         */
-        public void setNoValueColour(NoValueColour value) {
-            this.noValueColour = value;
-        }
-
-        /**
-         * Gets the value of the threshType property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link ThresholdType }
-         *     
-         */
-        public ThresholdType getThreshType() {
-            return threshType;
-        }
-
-        /**
-         * Sets the value of the threshType property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link ThresholdType }
-         *     
-         */
-        public void setThreshType(ThresholdType value) {
-            this.threshType = value;
-        }
-
-        /**
-         * Gets the value of the threshold property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Float }
-         *     
-         */
-        public Float getThreshold() {
-            return threshold;
-        }
-
-        /**
-         * Sets the value of the threshold property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Float }
-         *     
-         */
-        public void setThreshold(Float value) {
-            this.threshold = value;
-        }
-
-        /**
-         * Gets the value of the max property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Float }
-         *     
-         */
-        public Float getMax() {
-            return max;
-        }
-
-        /**
-         * Sets the value of the max property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Float }
-         *     
-         */
-        public void setMax(Float value) {
-            this.max = value;
-        }
-
-        /**
-         * Gets the value of the min property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Float }
-         *     
-         */
-        public Float getMin() {
-            return min;
-        }
-
-        /**
-         * Sets the value of the min property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Float }
-         *     
-         */
-        public void setMin(Float value) {
-            this.min = value;
-        }
-
-        /**
-         * Gets the value of the colourByLabel property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isColourByLabel() {
-            return colourByLabel;
-        }
-
-        /**
-         * Sets the value of the colourByLabel property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setColourByLabel(Boolean value) {
-            this.colourByLabel = value;
-        }
-
-        /**
-         * Gets the value of the autoScale property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isAutoScale() {
-            return autoScale;
-        }
-
-        /**
-         * Sets the value of the autoScale property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setAutoScale(Boolean value) {
-            this.autoScale = value;
-        }
+    public Boolean isAutoScale()
+    {
+      return autoScale;
+    }
 
+    /**
+     * Sets the value of the autoScale property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setAutoScale(Boolean value)
+    {
+      this.autoScale = value;
     }
 
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+   * &amp;lt;sequence&amp;gt; &amp;lt;element name="matcherSet"
+   * type="{www.jalview.org/colours}FeatureMatcherSet"/&amp;gt;
+   * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="featureType"
+   * use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(name = "", propOrder = { "matcherSet" })
+  public static class Filter
+  {
+
+    @XmlElement(namespace = "", required = true)
+    protected FeatureMatcherSet matcherSet;
+
+    @XmlAttribute(name = "featureType", required = true)
+    protected String featureType;
 
     /**
-     * &lt;p&gt;Java class for anonymous complex type.
+     * Gets the value of the matcherSet property.
      * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+     * @return possible object is {@link FeatureMatcherSet }
      * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;sequence&amp;gt;
-     *         &amp;lt;element name="matcherSet" type="{www.jalview.org/colours}FeatureMatcherSet"/&amp;gt;
-     *       &amp;lt;/sequence&amp;gt;
-     *       &amp;lt;attribute name="featureType" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
+     */
+    public FeatureMatcherSet getMatcherSet()
+    {
+      return matcherSet;
+    }
+
+    /**
+     * Sets the value of the matcherSet property.
      * 
+     * @param value
+     *          allowed object is {@link FeatureMatcherSet }
      * 
      */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "matcherSet"
-    })
-    public static class Filter {
-
-        @XmlElement(namespace = "", required = true)
-        protected FeatureMatcherSet matcherSet;
-        @XmlAttribute(name = "featureType", required = true)
-        protected String featureType;
-
-        /**
-         * Gets the value of the matcherSet property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link FeatureMatcherSet }
-         *     
-         */
-        public FeatureMatcherSet getMatcherSet() {
-            return matcherSet;
-        }
-
-        /**
-         * Sets the value of the matcherSet property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link FeatureMatcherSet }
-         *     
-         */
-        public void setMatcherSet(FeatureMatcherSet value) {
-            this.matcherSet = value;
-        }
-
-        /**
-         * Gets the value of the featureType property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getFeatureType() {
-            return featureType;
-        }
-
-        /**
-         * Sets the value of the featureType property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setFeatureType(String value) {
-            this.featureType = value;
-        }
+    public void setMatcherSet(FeatureMatcherSet value)
+    {
+      this.matcherSet = value;
+    }
 
+    /**
+     * Gets the value of the featureType property.
+     * 
+     * @return possible object is {@link String }
+     * 
+     */
+    public String getFeatureType()
+    {
+      return featureType;
     }
 
+    /**
+     * Sets the value of the featureType property.
+     * 
+     * @param value
+     *          allowed object is {@link String }
+     * 
+     */
+    public void setFeatureType(String value)
+    {
+      this.featureType = value;
+    }
+
+  }
+
 }
index d5cd7a8..644e6fe 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.math.BigInteger;
@@ -18,299 +17,291 @@ import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * 
- *                             This effectively represents a java.util.MapList
- *                             object
- *                     
+ * This effectively represents a java.util.MapList object
+ * 
  * 
  * &lt;p&gt;Java class for mapListType complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="mapListType"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element name="mapListFrom" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *           &amp;lt;complexType&amp;gt;
- *             &amp;lt;complexContent&amp;gt;
- *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                 &amp;lt;attribute name="start" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                 &amp;lt;attribute name="end" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *               &amp;lt;/restriction&amp;gt;
- *             &amp;lt;/complexContent&amp;gt;
- *           &amp;lt;/complexType&amp;gt;
- *         &amp;lt;/element&amp;gt;
- *         &amp;lt;element name="mapListTo" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *           &amp;lt;complexType&amp;gt;
- *             &amp;lt;complexContent&amp;gt;
- *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                 &amp;lt;attribute name="start" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *                 &amp;lt;attribute name="end" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
- *               &amp;lt;/restriction&amp;gt;
- *             &amp;lt;/complexContent&amp;gt;
- *           &amp;lt;/complexType&amp;gt;
- *         &amp;lt;/element&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *       &amp;lt;attribute name="mapFromUnit" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" /&amp;gt;
- *       &amp;lt;attribute name="mapToUnit" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" /&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="mapListType"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="mapListFrom"
+ * maxOccurs="unbounded" minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+ * name="start" use="required" type="{http://www.w3.org/2001/XMLSchema}int"
+ * /&amp;gt; &amp;lt;attribute name="end" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+ * name="mapListTo" maxOccurs="unbounded" minOccurs="0"&amp;gt;
+ * &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;attribute name="start" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt; &amp;lt;attribute
+ * name="end" use="required" type="{http://www.w3.org/2001/XMLSchema}int"
+ * /&amp;gt; &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="mapFromUnit" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}positiveInteger" /&amp;gt;
+ * &amp;lt;attribute name="mapToUnit" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}positiveInteger" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "mapListType", propOrder = {
-    "mapListFrom",
-    "mapListTo"
-})
-@XmlSeeAlso({
-    Mapping.class
-})
-public class MapListType {
+@XmlType(name = "mapListType", propOrder = { "mapListFrom", "mapListTo" })
+@XmlSeeAlso({ Mapping.class })
+public class MapListType
+{
+
+  protected List<MapListType.MapListFrom> mapListFrom;
+
+  protected List<MapListType.MapListTo> mapListTo;
+
+  @XmlAttribute(name = "mapFromUnit", required = true)
+  @XmlSchemaType(name = "positiveInteger")
+  protected BigInteger mapFromUnit;
+
+  @XmlAttribute(name = "mapToUnit", required = true)
+  @XmlSchemaType(name = "positiveInteger")
+  protected BigInteger mapToUnit;
+
+  /**
+   * Gets the value of the mapListFrom property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the mapListFrom property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getMapListFrom().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link MapListType.MapListFrom }
+   * 
+   * 
+   */
+  public List<MapListType.MapListFrom> getMapListFrom()
+  {
+    if (mapListFrom == null)
+    {
+      mapListFrom = new ArrayList<MapListType.MapListFrom>();
+    }
+    return this.mapListFrom;
+  }
+
+  /**
+   * Gets the value of the mapListTo property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the mapListTo property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getMapListTo().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link MapListType.MapListTo }
+   * 
+   * 
+   */
+  public List<MapListType.MapListTo> getMapListTo()
+  {
+    if (mapListTo == null)
+    {
+      mapListTo = new ArrayList<MapListType.MapListTo>();
+    }
+    return this.mapListTo;
+  }
+
+  /**
+   * Gets the value of the mapFromUnit property.
+   * 
+   * @return possible object is {@link BigInteger }
+   * 
+   */
+  public BigInteger getMapFromUnit()
+  {
+    return mapFromUnit;
+  }
+
+  /**
+   * Sets the value of the mapFromUnit property.
+   * 
+   * @param value
+   *          allowed object is {@link BigInteger }
+   * 
+   */
+  public void setMapFromUnit(BigInteger value)
+  {
+    this.mapFromUnit = value;
+  }
 
-    protected List<MapListType.MapListFrom> mapListFrom;
-    protected List<MapListType.MapListTo> mapListTo;
-    @XmlAttribute(name = "mapFromUnit", required = true)
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger mapFromUnit;
-    @XmlAttribute(name = "mapToUnit", required = true)
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger mapToUnit;
+  /**
+   * Gets the value of the mapToUnit property.
+   * 
+   * @return possible object is {@link BigInteger }
+   * 
+   */
+  public BigInteger getMapToUnit()
+  {
+    return mapToUnit;
+  }
+
+  /**
+   * Sets the value of the mapToUnit property.
+   * 
+   * @param value
+   *          allowed object is {@link BigInteger }
+   * 
+   */
+  public void setMapToUnit(BigInteger value)
+  {
+    this.mapToUnit = value;
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+   * name="start" use="required" type="{http://www.w3.org/2001/XMLSchema}int"
+   * /&amp;gt; &amp;lt;attribute name="end" use="required"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(name = "")
+  public static class MapListFrom
+  {
+
+    @XmlAttribute(name = "start", required = true)
+    protected int start;
+
+    @XmlAttribute(name = "end", required = true)
+    protected int end;
 
     /**
-     * Gets the value of the mapListFrom property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the mapListFrom property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getMapListFrom().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link MapListType.MapListFrom }
-     * 
+     * Gets the value of the start property.
      * 
      */
-    public List<MapListType.MapListFrom> getMapListFrom() {
-        if (mapListFrom == null) {
-            mapListFrom = new ArrayList<MapListType.MapListFrom>();
-        }
-        return this.mapListFrom;
+    public int getStart()
+    {
+      return start;
     }
 
     /**
-     * Gets the value of the mapListTo property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the mapListTo property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getMapListTo().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link MapListType.MapListTo }
-     * 
+     * Sets the value of the start property.
      * 
      */
-    public List<MapListType.MapListTo> getMapListTo() {
-        if (mapListTo == null) {
-            mapListTo = new ArrayList<MapListType.MapListTo>();
-        }
-        return this.mapListTo;
+    public void setStart(int value)
+    {
+      this.start = value;
     }
 
     /**
-     * Gets the value of the mapFromUnit property.
+     * Gets the value of the end property.
      * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
      */
-    public BigInteger getMapFromUnit() {
-        return mapFromUnit;
+    public int getEnd()
+    {
+      return end;
     }
 
     /**
-     * Sets the value of the mapFromUnit property.
+     * Sets the value of the end property.
      * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
      */
-    public void setMapFromUnit(BigInteger value) {
-        this.mapFromUnit = value;
+    public void setEnd(int value)
+    {
+      this.end = value;
     }
 
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+   * name="start" use="required" type="{http://www.w3.org/2001/XMLSchema}int"
+   * /&amp;gt; &amp;lt;attribute name="end" use="required"
+   * type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(name = "")
+  public static class MapListTo
+  {
+
+    @XmlAttribute(name = "start", required = true)
+    protected int start;
+
+    @XmlAttribute(name = "end", required = true)
+    protected int end;
+
     /**
-     * Gets the value of the mapToUnit property.
+     * Gets the value of the start property.
      * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
      */
-    public BigInteger getMapToUnit() {
-        return mapToUnit;
+    public int getStart()
+    {
+      return start;
     }
 
     /**
-     * Sets the value of the mapToUnit property.
+     * Sets the value of the start property.
      * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
      */
-    public void setMapToUnit(BigInteger value) {
-        this.mapToUnit = value;
+    public void setStart(int value)
+    {
+      this.start = value;
     }
 
-
     /**
-     * &lt;p&gt;Java class for anonymous complex type.
-     * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-     * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;attribute name="start" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="end" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
-     * 
+     * Gets the value of the end property.
      * 
      */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class MapListFrom {
-
-        @XmlAttribute(name = "start", required = true)
-        protected int start;
-        @XmlAttribute(name = "end", required = true)
-        protected int end;
-
-        /**
-         * Gets the value of the start property.
-         * 
-         */
-        public int getStart() {
-            return start;
-        }
-
-        /**
-         * Sets the value of the start property.
-         * 
-         */
-        public void setStart(int value) {
-            this.start = value;
-        }
-
-        /**
-         * Gets the value of the end property.
-         * 
-         */
-        public int getEnd() {
-            return end;
-        }
-
-        /**
-         * Sets the value of the end property.
-         * 
-         */
-        public void setEnd(int value) {
-            this.end = value;
-        }
-
+    public int getEnd()
+    {
+      return end;
     }
 
-
     /**
-     * &lt;p&gt;Java class for anonymous complex type.
-     * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-     * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;attribute name="start" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *       &amp;lt;attribute name="end" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
-     * 
+     * Sets the value of the end property.
      * 
      */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class MapListTo {
-
-        @XmlAttribute(name = "start", required = true)
-        protected int start;
-        @XmlAttribute(name = "end", required = true)
-        protected int end;
-
-        /**
-         * Gets the value of the start property.
-         * 
-         */
-        public int getStart() {
-            return start;
-        }
-
-        /**
-         * Sets the value of the start property.
-         * 
-         */
-        public void setStart(int value) {
-            this.start = value;
-        }
-
-        /**
-         * Gets the value of the end property.
-         * 
-         */
-        public int getEnd() {
-            return end;
-        }
-
-        /**
-         * Sets the value of the end property.
-         * 
-         */
-        public void setEnd(int value) {
-            this.end = value;
-        }
-
+    public void setEnd(int value)
+    {
+      this.end = value;
     }
 
+  }
+
 }
index d48a315..de9132a 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.util.ArrayList;
@@ -15,146 +14,139 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * Defines a mapping from the local frame to a matrix
- *                             and its associated data specified by MatrixType
- *                     
+ * Defines a mapping from the local frame to a matrix and its associated data
+ * specified by MatrixType
+ * 
  * 
  * &lt;p&gt;Java class for MapOnAMatrixType complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="MapOnAMatrixType"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element name="property" type="{www.vamsas.ac.uk/jalview/version2}property" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="mapping" type="{www.vamsas.ac.uk/jalview/version2}mapListType" minOccurs="0"/&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *       &amp;lt;attribute name="matrix" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="MapOnAMatrixType"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="property"
+ * type="{www.vamsas.ac.uk/jalview/version2}property" maxOccurs="unbounded"
+ * minOccurs="0"/&amp;gt; &amp;lt;element name="mapping"
+ * type="{www.vamsas.ac.uk/jalview/version2}mapListType" minOccurs="0"/&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="matrix" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="id" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MapOnAMatrixType", propOrder = {
-    "property",
-    "mapping"
-})
-public class MapOnAMatrixType {
+@XmlType(name = "MapOnAMatrixType", propOrder = { "property", "mapping" })
+public class MapOnAMatrixType
+{
 
-    protected List<Property> property;
-    protected MapListType mapping;
-    @XmlAttribute(name = "matrix", required = true)
-    protected String matrix;
-    @XmlAttribute(name = "id")
-    protected String id;
+  protected List<Property> property;
 
-    /**
-     * Gets the value of the property property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the property property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getProperty().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link Property }
-     * 
-     * 
-     */
-    public List<Property> getProperty() {
-        if (property == null) {
-            property = new ArrayList<Property>();
-        }
-        return this.property;
-    }
+  protected MapListType mapping;
 
-    /**
-     * Gets the value of the mapping property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MapListType }
-     *     
-     */
-    public MapListType getMapping() {
-        return mapping;
-    }
+  @XmlAttribute(name = "matrix", required = true)
+  protected String matrix;
 
-    /**
-     * Sets the value of the mapping property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MapListType }
-     *     
-     */
-    public void setMapping(MapListType value) {
-        this.mapping = value;
-    }
+  @XmlAttribute(name = "id")
+  protected String id;
 
-    /**
-     * Gets the value of the matrix property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMatrix() {
-        return matrix;
+  /**
+   * Gets the value of the property property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the property property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getProperty().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link Property }
+   * 
+   * 
+   */
+  public List<Property> getProperty()
+  {
+    if (property == null)
+    {
+      property = new ArrayList<Property>();
     }
+    return this.property;
+  }
 
-    /**
-     * Sets the value of the matrix property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMatrix(String value) {
-        this.matrix = value;
-    }
+  /**
+   * Gets the value of the mapping property.
+   * 
+   * @return possible object is {@link MapListType }
+   * 
+   */
+  public MapListType getMapping()
+  {
+    return mapping;
+  }
 
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
+  /**
+   * Sets the value of the mapping property.
+   * 
+   * @param value
+   *          allowed object is {@link MapListType }
+   * 
+   */
+  public void setMapping(MapListType value)
+  {
+    this.mapping = value;
+  }
 
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
+  /**
+   * Gets the value of the matrix property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getMatrix()
+  {
+    return matrix;
+  }
+
+  /**
+   * Sets the value of the matrix property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setMatrix(String value)
+  {
+    this.matrix = value;
+  }
+
+  /**
+   * Gets the value of the id property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getId()
+  {
+    return id;
+  }
+
+  /**
+   * Sets the value of the id property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setId(String value)
+  {
+    this.id = value;
+  }
 
 }
index 9c98af8..e53c4f7 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -15,130 +14,115 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * 
- *                                     Represent the jalview.datamodel.Mapping object -
- *                                     it also provides
- *                                     a way of storing sequences that are mapped 'to'
- *                                     without adding them
- *                                     to the sequence set (which will mean they are
- *                                     then added to the alignment too).
- *                             
+ * Represent the jalview.datamodel.Mapping object - it also provides a way of
+ * storing sequences that are mapped 'to' without adding them to the sequence
+ * set (which will mean they are then added to the alignment too).
+ * 
  * 
  * &lt;p&gt;Java class for anonymous complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;extension base="{www.vamsas.ac.uk/jalview/version2}mapListType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;choice minOccurs="0"&amp;gt;
- *           &amp;lt;element ref="{www.vamsas.ac.uk/jalview/version2}Sequence"/&amp;gt;
- *           &amp;lt;element name="dseqFor"&amp;gt;
- *             &amp;lt;simpleType&amp;gt;
- *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&amp;gt;
- *               &amp;lt;/restriction&amp;gt;
- *             &amp;lt;/simpleType&amp;gt;
- *           &amp;lt;/element&amp;gt;
- *         &amp;lt;/choice&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *       &amp;lt;attribute name="mappingType" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *     &amp;lt;/extension&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;extension
+ * base="{www.vamsas.ac.uk/jalview/version2}mapListType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;choice minOccurs="0"&amp;gt; &amp;lt;element
+ * ref="{www.vamsas.ac.uk/jalview/version2}Sequence"/&amp;gt; &amp;lt;element
+ * name="dseqFor"&amp;gt; &amp;lt;simpleType&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}string"&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/simpleType&amp;gt;
+ * &amp;lt;/element&amp;gt; &amp;lt;/choice&amp;gt; &amp;lt;/sequence&amp;gt;
+ * &amp;lt;attribute name="mappingType"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/extension&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "sequence",
-    "dseqFor"
-})
+@XmlType(name = "", propOrder = { "sequence", "dseqFor" })
 @XmlRootElement(name = "Mapping")
-public class Mapping
-    extends MapListType
+public class Mapping extends MapListType
 {
 
-    @XmlElement(name = "Sequence")
-    protected Sequence sequence;
-    protected String dseqFor;
-    @XmlAttribute(name = "mappingType")
-    protected String mappingType;
+  @XmlElement(name = "Sequence")
+  protected Sequence sequence;
+
+  protected String dseqFor;
+
+  @XmlAttribute(name = "mappingType")
+  protected String mappingType;
 
-    /**
-     * Gets the value of the sequence property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Sequence }
-     *     
-     */
-    public Sequence getSequence() {
-        return sequence;
-    }
+  /**
+   * Gets the value of the sequence property.
+   * 
+   * @return possible object is {@link Sequence }
+   * 
+   */
+  public Sequence getSequence()
+  {
+    return sequence;
+  }
 
-    /**
-     * Sets the value of the sequence property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Sequence }
-     *     
-     */
-    public void setSequence(Sequence value) {
-        this.sequence = value;
-    }
+  /**
+   * Sets the value of the sequence property.
+   * 
+   * @param value
+   *          allowed object is {@link Sequence }
+   * 
+   */
+  public void setSequence(Sequence value)
+  {
+    this.sequence = value;
+  }
 
-    /**
-     * Gets the value of the dseqFor property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDseqFor() {
-        return dseqFor;
-    }
+  /**
+   * Gets the value of the dseqFor property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getDseqFor()
+  {
+    return dseqFor;
+  }
 
-    /**
-     * Sets the value of the dseqFor property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDseqFor(String value) {
-        this.dseqFor = value;
-    }
+  /**
+   * Sets the value of the dseqFor property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setDseqFor(String value)
+  {
+    this.dseqFor = value;
+  }
 
-    /**
-     * Gets the value of the mappingType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMappingType() {
-        return mappingType;
-    }
+  /**
+   * Gets the value of the mappingType property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getMappingType()
+  {
+    return mappingType;
+  }
 
-    /**
-     * Sets the value of the mappingType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMappingType(String value) {
-        this.mappingType = value;
-    }
+  /**
+   * Sets the value of the mappingType property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setMappingType(String value)
+  {
+    this.mappingType = value;
+  }
 
 }
index 34d1158..65e65f6 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.math.BigInteger;
@@ -17,321 +16,313 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * Represents matrix data imported to Jalview, and the
- *                             results of any derived calculations (independent of a particular
- *                             view
- *                             on the matrix).
- *                     
+ * Represents matrix data imported to Jalview, and the results of any derived
+ * calculations (independent of a particular view on the matrix).
+ * 
  * 
  * &lt;p&gt;Java class for MatrixType complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="MatrixType"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element name="elements" type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt;
- *         &amp;lt;element name="groups" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="newick" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="property" type="{www.vamsas.ac.uk/jalview/version2}property" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *       &amp;lt;attribute name="type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="rows" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" /&amp;gt;
- *       &amp;lt;attribute name="cols" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" /&amp;gt;
- *       &amp;lt;attribute name="treeMethod" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="cutHeight" type="{http://www.w3.org/2001/XMLSchema}double" /&amp;gt;
- *       &amp;lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="MatrixType"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="elements"
+ * type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt; &amp;lt;element
+ * name="groups" type="{http://www.w3.org/2001/XMLSchema}string"
+ * maxOccurs="unbounded" minOccurs="0"/&amp;gt; &amp;lt;element name="newick"
+ * type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"
+ * minOccurs="0"/&amp;gt; &amp;lt;element name="property"
+ * type="{www.vamsas.ac.uk/jalview/version2}property" maxOccurs="unbounded"
+ * minOccurs="0"/&amp;gt; &amp;lt;/sequence&amp;gt; &amp;lt;attribute
+ * name="type" use="required" type="{http://www.w3.org/2001/XMLSchema}string"
+ * /&amp;gt; &amp;lt;attribute name="rows" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}integer" /&amp;gt; &amp;lt;attribute
+ * name="cols" use="required" type="{http://www.w3.org/2001/XMLSchema}integer"
+ * /&amp;gt; &amp;lt;attribute name="treeMethod"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="cutHeight" type="{http://www.w3.org/2001/XMLSchema}double" /&amp;gt;
+ * &amp;lt;attribute name="id" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MatrixType", propOrder = {
-    "elements",
-    "groups",
-    "newick",
-    "property"
-})
-public class MatrixType {
+@XmlType(
+  name = "MatrixType",
+  propOrder =
+  { "elements", "groups", "newick", "property" })
+public class MatrixType
+{
 
-    @XmlElement(required = true)
-    protected String elements;
-    protected List<String> groups;
-    protected List<String> newick;
-    protected List<Property> property;
-    @XmlAttribute(name = "type", required = true)
-    protected String type;
-    @XmlAttribute(name = "rows", required = true)
-    protected BigInteger rows;
-    @XmlAttribute(name = "cols", required = true)
-    protected BigInteger cols;
-    @XmlAttribute(name = "treeMethod")
-    protected String treeMethod;
-    @XmlAttribute(name = "cutHeight")
-    protected Double cutHeight;
-    @XmlAttribute(name = "id", required = true)
-    protected String id;
+  @XmlElement(required = true)
+  protected String elements;
 
-    /**
-     * Gets the value of the elements property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getElements() {
-        return elements;
-    }
+  protected List<String> groups;
 
-    /**
-     * Sets the value of the elements property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setElements(String value) {
-        this.elements = value;
-    }
+  protected List<String> newick;
 
-    /**
-     * Gets the value of the groups property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the groups property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getGroups().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getGroups() {
-        if (groups == null) {
-            groups = new ArrayList<String>();
-        }
-        return this.groups;
-    }
+  protected List<Property> property;
 
-    /**
-     * Gets the value of the newick property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the newick property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getNewick().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getNewick() {
-        if (newick == null) {
-            newick = new ArrayList<String>();
-        }
-        return this.newick;
-    }
+  @XmlAttribute(name = "type", required = true)
+  protected String type;
 
-    /**
-     * Gets the value of the property property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the property property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getProperty().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link Property }
-     * 
-     * 
-     */
-    public List<Property> getProperty() {
-        if (property == null) {
-            property = new ArrayList<Property>();
-        }
-        return this.property;
-    }
+  @XmlAttribute(name = "rows", required = true)
+  protected BigInteger rows;
 
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
+  @XmlAttribute(name = "cols", required = true)
+  protected BigInteger cols;
 
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
+  @XmlAttribute(name = "treeMethod")
+  protected String treeMethod;
 
-    /**
-     * Gets the value of the rows property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getRows() {
-        return rows;
-    }
+  @XmlAttribute(name = "cutHeight")
+  protected Double cutHeight;
 
-    /**
-     * Sets the value of the rows property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setRows(BigInteger value) {
-        this.rows = value;
-    }
+  @XmlAttribute(name = "id", required = true)
+  protected String id;
 
-    /**
-     * Gets the value of the cols property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getCols() {
-        return cols;
-    }
+  /**
+   * Gets the value of the elements property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getElements()
+  {
+    return elements;
+  }
 
-    /**
-     * Sets the value of the cols property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setCols(BigInteger value) {
-        this.cols = value;
-    }
+  /**
+   * Sets the value of the elements property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setElements(String value)
+  {
+    this.elements = value;
+  }
 
-    /**
-     * Gets the value of the treeMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTreeMethod() {
-        return treeMethod;
+  /**
+   * Gets the value of the groups property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the groups property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getGroups().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link String }
+   * 
+   * 
+   */
+  public List<String> getGroups()
+  {
+    if (groups == null)
+    {
+      groups = new ArrayList<String>();
     }
+    return this.groups;
+  }
 
-    /**
-     * Sets the value of the treeMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTreeMethod(String value) {
-        this.treeMethod = value;
+  /**
+   * Gets the value of the newick property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the newick property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getNewick().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link String }
+   * 
+   * 
+   */
+  public List<String> getNewick()
+  {
+    if (newick == null)
+    {
+      newick = new ArrayList<String>();
     }
+    return this.newick;
+  }
 
-    /**
-     * Gets the value of the cutHeight property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Double }
-     *     
-     */
-    public Double getCutHeight() {
-        return cutHeight;
+  /**
+   * Gets the value of the property property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the property property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getProperty().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link Property }
+   * 
+   * 
+   */
+  public List<Property> getProperty()
+  {
+    if (property == null)
+    {
+      property = new ArrayList<Property>();
     }
+    return this.property;
+  }
 
-    /**
-     * Sets the value of the cutHeight property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Double }
-     *     
-     */
-    public void setCutHeight(Double value) {
-        this.cutHeight = value;
-    }
+  /**
+   * Gets the value of the type property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getType()
+  {
+    return type;
+  }
 
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
+  /**
+   * Sets the value of the type property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setType(String value)
+  {
+    this.type = value;
+  }
 
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
+  /**
+   * Gets the value of the rows property.
+   * 
+   * @return possible object is {@link BigInteger }
+   * 
+   */
+  public BigInteger getRows()
+  {
+    return rows;
+  }
+
+  /**
+   * Sets the value of the rows property.
+   * 
+   * @param value
+   *          allowed object is {@link BigInteger }
+   * 
+   */
+  public void setRows(BigInteger value)
+  {
+    this.rows = value;
+  }
+
+  /**
+   * Gets the value of the cols property.
+   * 
+   * @return possible object is {@link BigInteger }
+   * 
+   */
+  public BigInteger getCols()
+  {
+    return cols;
+  }
+
+  /**
+   * Sets the value of the cols property.
+   * 
+   * @param value
+   *          allowed object is {@link BigInteger }
+   * 
+   */
+  public void setCols(BigInteger value)
+  {
+    this.cols = value;
+  }
+
+  /**
+   * Gets the value of the treeMethod property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getTreeMethod()
+  {
+    return treeMethod;
+  }
+
+  /**
+   * Sets the value of the treeMethod property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setTreeMethod(String value)
+  {
+    this.treeMethod = value;
+  }
+
+  /**
+   * Gets the value of the cutHeight property.
+   * 
+   * @return possible object is {@link Double }
+   * 
+   */
+  public Double getCutHeight()
+  {
+    return cutHeight;
+  }
+
+  /**
+   * Sets the value of the cutHeight property.
+   * 
+   * @param value
+   *          allowed object is {@link Double }
+   * 
+   */
+  public void setCutHeight(Double value)
+  {
+    this.cutHeight = value;
+  }
+
+  /**
+   * Gets the value of the id property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getId()
+  {
+    return id;
+  }
+
+  /**
+   * Sets the value of the id property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setId(String value)
+  {
+    this.id = value;
+  }
 
 }
index 8d22ad8..98dfe8a 100644 (file)
@@ -5,56 +5,56 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for NoValueColour.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
- * &lt;pre&gt;
- * &amp;lt;simpleType name="NoValueColour"&amp;gt;
- *   &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&amp;gt;
- *     &amp;lt;enumeration value="None"/&amp;gt;
- *     &amp;lt;enumeration value="Min"/&amp;gt;
- *     &amp;lt;enumeration value="Max"/&amp;gt;
- *   &amp;lt;/restriction&amp;gt;
- * &amp;lt;/simpleType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class. &lt;pre&gt; &amp;lt;simpleType
+ * name="NoValueColour"&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}string"&amp;gt; &amp;lt;enumeration
+ * value="None"/&amp;gt; &amp;lt;enumeration value="Min"/&amp;gt;
+ * &amp;lt;enumeration value="Max"/&amp;gt; &amp;lt;/restriction&amp;gt;
+ * &amp;lt;/simpleType&amp;gt; &lt;/pre&gt;
  * 
  */
 @XmlType(name = "NoValueColour", namespace = "www.jalview.org/colours")
 @XmlEnum
-public enum NoValueColour {
-
-    @XmlEnumValue("None")
-    NONE("None"),
-    @XmlEnumValue("Min")
-    MIN("Min"),
-    @XmlEnumValue("Max")
-    MAX("Max");
-    private final String value;
-
-    NoValueColour(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static NoValueColour fromValue(String v) {
-        for (NoValueColour c: NoValueColour.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
+public enum NoValueColour
+{
+
+  @XmlEnumValue("None")
+  NONE("None"), @XmlEnumValue("Min")
+  MIN("Min"), @XmlEnumValue("Max")
+  MAX("Max");
+
+  private final String value;
+
+  NoValueColour(String v)
+  {
+    value = v;
+  }
+
+  public String value()
+  {
+    return value;
+  }
+
+  public static NoValueColour fromValue(String v)
+  {
+    for (NoValueColour c : NoValueColour.values())
+    {
+      if (c.value.equals(v))
+      {
+        return c;
+      }
     }
+    throw new IllegalArgumentException(v);
+  }
 
 }
index 90ce3fa..27d9e41 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import javax.xml.bind.JAXBElement;
@@ -13,512 +12,587 @@ import javax.xml.bind.annotation.XmlElementDecl;
 import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
-
 /**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the jalview.xml.binding.jalview package. 
- * &lt;p&gt;An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
+ * This object contains factory methods for each Java content interface and Java
+ * element interface generated in the jalview.xml.binding.jalview package.
+ * &lt;p&gt;An ObjectFactory allows you to programatically construct new
+ * instances of the Java representation for XML content. The Java representation
+ * of XML content can consist of schema derived interfaces and classes
+ * representing the binding of schema type definitions, element declarations and
+ * model groups. Factory methods for each of these are provided in this class.
  * 
  */
 @XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _JalviewModel_QNAME = new QName("www.jalview.org", "JalviewModel");
-    private final static QName _JalviewUserColours_QNAME = new QName("www.jalview.org/colours", "JalviewUserColours");
-    private final static QName _WebServiceParameterSet_QNAME = new QName("www.jalview.org/xml/wsparamset", "WebServiceParameterSet");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: jalview.xml.binding.jalview
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link MapListType }
-     * 
-     */
-    public MapListType createMapListType() {
-        return new MapListType();
-    }
-
-    /**
-     * Create an instance of {@link Sequence }
-     * 
-     */
-    public Sequence createSequence() {
-        return new Sequence();
-    }
-
-    /**
-     * Create an instance of {@link AlcodonFrame }
-     * 
-     */
-    public AlcodonFrame createAlcodonFrame() {
-        return new AlcodonFrame();
-    }
-
-    /**
-     * Create an instance of {@link Annotation }
-     * 
-     */
-    public Annotation createAnnotation() {
-        return new Annotation();
-    }
-
-    /**
-     * Create an instance of {@link SequenceSet }
-     * 
-     */
-    public SequenceSet createSequenceSet() {
-        return new SequenceSet();
-    }
-
-    /**
-     * Create an instance of {@link FeatureMatcherSet }
-     * 
-     */
-    public FeatureMatcherSet createFeatureMatcherSet() {
-        return new FeatureMatcherSet();
-    }
-
-    /**
-     * Create an instance of {@link JalviewUserColours }
-     * 
-     */
-    public JalviewUserColours createJalviewUserColours() {
-        return new JalviewUserColours();
-    }
-
-    /**
-     * Create an instance of {@link Pdbentry }
-     * 
-     */
-    public Pdbentry createPdbentry() {
-        return new Pdbentry();
-    }
-
-    /**
-     * Create an instance of {@link Feature }
-     * 
-     */
-    public Feature createFeature() {
-        return new Feature();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel }
-     * 
-     */
-    public JalviewModel createJalviewModel() {
-        return new JalviewModel();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.FeatureSettings }
-     * 
-     */
-    public JalviewModel.FeatureSettings createJalviewModelFeatureSettings() {
-        return new JalviewModel.FeatureSettings();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.PcaViewer }
-     * 
-     */
-    public JalviewModel.PcaViewer createJalviewModelPcaViewer() {
-        return new JalviewModel.PcaViewer();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.Viewport }
-     * 
-     */
-    public JalviewModel.Viewport createJalviewModelViewport() {
-        return new JalviewModel.Viewport();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.JSeq }
-     * 
-     */
-    public JalviewModel.JSeq createJalviewModelJSeq() {
-        return new JalviewModel.JSeq();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.JSeq.RnaViewer }
-     * 
-     */
-    public JalviewModel.JSeq.RnaViewer createJalviewModelJSeqRnaViewer() {
-        return new JalviewModel.JSeq.RnaViewer();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.JSeq.Pdbids }
-     * 
-     */
-    public JalviewModel.JSeq.Pdbids createJalviewModelJSeqPdbids() {
-        return new JalviewModel.JSeq.Pdbids();
-    }
-
-    /**
-     * Create an instance of {@link AnnotationColourScheme }
-     * 
-     */
-    public AnnotationColourScheme createAnnotationColourScheme() {
-        return new AnnotationColourScheme();
-    }
-
-    /**
-     * Create an instance of {@link PcaDataType }
-     * 
-     */
-    public PcaDataType createPcaDataType() {
-        return new PcaDataType();
-    }
-
-    /**
-     * Create an instance of {@link DoubleVector }
-     * 
-     */
-    public DoubleVector createDoubleVector() {
-        return new DoubleVector();
-    }
-
-    /**
-     * Create an instance of {@link DoubleMatrix }
-     * 
-     */
-    public DoubleMatrix createDoubleMatrix() {
-        return new DoubleMatrix();
-    }
-
-    /**
-     * Create an instance of {@link Mapping }
-     * 
-     */
-    public Mapping createMapping() {
-        return new Mapping();
-    }
-
-    /**
-     * Create an instance of {@link MapListType.MapListFrom }
-     * 
-     */
-    public MapListType.MapListFrom createMapListTypeMapListFrom() {
-        return new MapListType.MapListFrom();
-    }
-
-    /**
-     * Create an instance of {@link MapListType.MapListTo }
-     * 
-     */
-    public MapListType.MapListTo createMapListTypeMapListTo() {
-        return new MapListType.MapListTo();
-    }
-
-    /**
-     * Create an instance of {@link SequenceType }
-     * 
-     */
-    public SequenceType createSequenceType() {
-        return new SequenceType();
-    }
-
-    /**
-     * Create an instance of {@link Sequence.DBRef }
-     * 
-     */
-    public Sequence.DBRef createSequenceDBRef() {
-        return new Sequence.DBRef();
-    }
-
-    /**
-     * Create an instance of {@link AlcodonFrame.Alcodon }
-     * 
-     */
-    public AlcodonFrame.Alcodon createAlcodonFrameAlcodon() {
-        return new AlcodonFrame.Alcodon();
-    }
-
-    /**
-     * Create an instance of {@link AlcodonFrame.AlcodMap }
-     * 
-     */
-    public AlcodonFrame.AlcodMap createAlcodonFrameAlcodMap() {
-        return new AlcodonFrame.AlcodMap();
-    }
-
-    /**
-     * Create an instance of {@link AnnotationElement }
-     * 
-     */
-    public AnnotationElement createAnnotationElement() {
-        return new AnnotationElement();
-    }
-
-    /**
-     * Create an instance of {@link Annotation.ThresholdLine }
-     * 
-     */
-    public Annotation.ThresholdLine createAnnotationThresholdLine() {
-        return new Annotation.ThresholdLine();
-    }
-
-    /**
-     * Create an instance of {@link MapOnAMatrixType }
-     * 
-     */
-    public MapOnAMatrixType createMapOnAMatrixType() {
-        return new MapOnAMatrixType();
-    }
-
-    /**
-     * Create an instance of {@link jalview.xml.binding.jalview.Property }
-     * 
-     */
-    public jalview.xml.binding.jalview.Property createProperty() {
-        return new jalview.xml.binding.jalview.Property();
-    }
-
-    /**
-     * Create an instance of {@link SequenceSet.SequenceSetProperties }
-     * 
-     */
-    public SequenceSet.SequenceSetProperties createSequenceSetSequenceSetProperties() {
-        return new SequenceSet.SequenceSetProperties();
-    }
-
-    /**
-     * Create an instance of {@link MatrixType }
-     * 
-     */
-    public MatrixType createMatrixType() {
-        return new MatrixType();
-    }
-
-    /**
-     * Create an instance of {@link VAMSAS }
-     * 
-     */
-    public VAMSAS createVAMSAS() {
-        return new VAMSAS();
-    }
-
-    /**
-     * Create an instance of {@link FeatureMatcher }
-     * 
-     */
-    public FeatureMatcher createFeatureMatcher() {
-        return new FeatureMatcher();
-    }
-
-    /**
-     * Create an instance of {@link WebServiceParameterSet }
-     * 
-     */
-    public WebServiceParameterSet createWebServiceParameterSet() {
-        return new WebServiceParameterSet();
-    }
-
-    /**
-     * Create an instance of {@link FeatureMatcherSet.CompoundMatcher }
-     * 
-     */
-    public FeatureMatcherSet.CompoundMatcher createFeatureMatcherSetCompoundMatcher() {
-        return new FeatureMatcherSet.CompoundMatcher();
-    }
-
-    /**
-     * Create an instance of {@link JalviewUserColours.Colour }
-     * 
-     */
-    public JalviewUserColours.Colour createJalviewUserColoursColour() {
-        return new JalviewUserColours.Colour();
-    }
-
-    /**
-     * Create an instance of {@link JalviewUserColours.Filter }
-     * 
-     */
-    public JalviewUserColours.Filter createJalviewUserColoursFilter() {
-        return new JalviewUserColours.Filter();
-    }
-
-    /**
-     * Create an instance of {@link Pdbentry.Property }
-     * 
-     */
-    public Pdbentry.Property createPdbentryProperty() {
-        return new Pdbentry.Property();
-    }
-
-    /**
-     * Create an instance of {@link Feature.OtherData }
-     * 
-     */
-    public Feature.OtherData createFeatureOtherData() {
-        return new Feature.OtherData();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.JGroup }
-     * 
-     */
-    public JalviewModel.JGroup createJalviewModelJGroup() {
-        return new JalviewModel.JGroup();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.UserColours }
-     * 
-     */
-    public JalviewModel.UserColours createJalviewModelUserColours() {
-        return new JalviewModel.UserColours();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.Tree }
-     * 
-     */
-    public JalviewModel.Tree createJalviewModelTree() {
-        return new JalviewModel.Tree();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.FeatureSettings.Setting }
-     * 
-     */
-    public JalviewModel.FeatureSettings.Setting createJalviewModelFeatureSettingsSetting() {
-        return new JalviewModel.FeatureSettings.Setting();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.FeatureSettings.Group }
-     * 
-     */
-    public JalviewModel.FeatureSettings.Group createJalviewModelFeatureSettingsGroup() {
-        return new JalviewModel.FeatureSettings.Group();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.PcaViewer.SequencePoint }
-     * 
-     */
-    public JalviewModel.PcaViewer.SequencePoint createJalviewModelPcaViewerSequencePoint() {
-        return new JalviewModel.PcaViewer.SequencePoint();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.PcaViewer.Axis }
-     * 
-     */
-    public JalviewModel.PcaViewer.Axis createJalviewModelPcaViewerAxis() {
-        return new JalviewModel.PcaViewer.Axis();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.PcaViewer.SeqPointMin }
-     * 
-     */
-    public JalviewModel.PcaViewer.SeqPointMin createJalviewModelPcaViewerSeqPointMin() {
-        return new JalviewModel.PcaViewer.SeqPointMin();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.PcaViewer.SeqPointMax }
-     * 
-     */
-    public JalviewModel.PcaViewer.SeqPointMax createJalviewModelPcaViewerSeqPointMax() {
-        return new JalviewModel.PcaViewer.SeqPointMax();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.Viewport.HiddenColumns }
-     * 
-     */
-    public JalviewModel.Viewport.HiddenColumns createJalviewModelViewportHiddenColumns() {
-        return new JalviewModel.Viewport.HiddenColumns();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.Viewport.CalcIdParam }
-     * 
-     */
-    public JalviewModel.Viewport.CalcIdParam createJalviewModelViewportCalcIdParam() {
-        return new JalviewModel.Viewport.CalcIdParam();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.Viewport.Overview }
-     * 
-     */
-    public JalviewModel.Viewport.Overview createJalviewModelViewportOverview() {
-        return new JalviewModel.Viewport.Overview();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.JSeq.RnaViewer.SecondaryStructure }
-     * 
-     */
-    public JalviewModel.JSeq.RnaViewer.SecondaryStructure createJalviewModelJSeqRnaViewerSecondaryStructure() {
-        return new JalviewModel.JSeq.RnaViewer.SecondaryStructure();
-    }
-
-    /**
-     * Create an instance of {@link JalviewModel.JSeq.Pdbids.StructureState }
-     * 
-     */
-    public JalviewModel.JSeq.Pdbids.StructureState createJalviewModelJSeqPdbidsStructureState() {
-        return new JalviewModel.JSeq.Pdbids.StructureState();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link JalviewModel }{@code >}
-     * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link JalviewModel }{@code >}
-     */
-    @XmlElementDecl(namespace = "www.jalview.org", name = "JalviewModel")
-    public JAXBElement<JalviewModel> createJalviewModel(JalviewModel value) {
-        return new JAXBElement<JalviewModel>(_JalviewModel_QNAME, JalviewModel.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link JalviewUserColours }{@code >}
-     * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link JalviewUserColours }{@code >}
-     */
-    @XmlElementDecl(namespace = "www.jalview.org/colours", name = "JalviewUserColours")
-    public JAXBElement<JalviewUserColours> createJalviewUserColours(JalviewUserColours value) {
-        return new JAXBElement<JalviewUserColours>(_JalviewUserColours_QNAME, JalviewUserColours.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link WebServiceParameterSet }{@code >}
-     * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link WebServiceParameterSet }{@code >}
-     */
-    @XmlElementDecl(namespace = "www.jalview.org/xml/wsparamset", name = "WebServiceParameterSet")
-    public JAXBElement<WebServiceParameterSet> createWebServiceParameterSet(WebServiceParameterSet value) {
-        return new JAXBElement<WebServiceParameterSet>(_WebServiceParameterSet_QNAME, WebServiceParameterSet.class, null, value);
-    }
+public class ObjectFactory
+{
+
+  private final static QName _JalviewModel_QNAME = new QName(
+          "www.jalview.org", "JalviewModel");
+
+  private final static QName _JalviewUserColours_QNAME = new QName(
+          "www.jalview.org/colours", "JalviewUserColours");
+
+  private final static QName _WebServiceParameterSet_QNAME = new QName(
+          "www.jalview.org/xml/wsparamset", "WebServiceParameterSet");
+
+  /**
+   * Create a new ObjectFactory that can be used to create new instances of
+   * schema derived classes for package: jalview.xml.binding.jalview
+   * 
+   */
+  public ObjectFactory()
+  {
+  }
+
+  /**
+   * Create an instance of {@link MapListType }
+   * 
+   */
+  public MapListType createMapListType()
+  {
+    return new MapListType();
+  }
+
+  /**
+   * Create an instance of {@link Sequence }
+   * 
+   */
+  public Sequence createSequence()
+  {
+    return new Sequence();
+  }
+
+  /**
+   * Create an instance of {@link AlcodonFrame }
+   * 
+   */
+  public AlcodonFrame createAlcodonFrame()
+  {
+    return new AlcodonFrame();
+  }
+
+  /**
+   * Create an instance of {@link Annotation }
+   * 
+   */
+  public Annotation createAnnotation()
+  {
+    return new Annotation();
+  }
+
+  /**
+   * Create an instance of {@link SequenceSet }
+   * 
+   */
+  public SequenceSet createSequenceSet()
+  {
+    return new SequenceSet();
+  }
+
+  /**
+   * Create an instance of {@link FeatureMatcherSet }
+   * 
+   */
+  public FeatureMatcherSet createFeatureMatcherSet()
+  {
+    return new FeatureMatcherSet();
+  }
+
+  /**
+   * Create an instance of {@link JalviewUserColours }
+   * 
+   */
+  public JalviewUserColours createJalviewUserColours()
+  {
+    return new JalviewUserColours();
+  }
+
+  /**
+   * Create an instance of {@link Pdbentry }
+   * 
+   */
+  public Pdbentry createPdbentry()
+  {
+    return new Pdbentry();
+  }
+
+  /**
+   * Create an instance of {@link Feature }
+   * 
+   */
+  public Feature createFeature()
+  {
+    return new Feature();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel }
+   * 
+   */
+  public JalviewModel createJalviewModel()
+  {
+    return new JalviewModel();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.FeatureSettings }
+   * 
+   */
+  public JalviewModel.FeatureSettings createJalviewModelFeatureSettings()
+  {
+    return new JalviewModel.FeatureSettings();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.PcaViewer }
+   * 
+   */
+  public JalviewModel.PcaViewer createJalviewModelPcaViewer()
+  {
+    return new JalviewModel.PcaViewer();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.Viewport }
+   * 
+   */
+  public JalviewModel.Viewport createJalviewModelViewport()
+  {
+    return new JalviewModel.Viewport();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.JSeq }
+   * 
+   */
+  public JalviewModel.JSeq createJalviewModelJSeq()
+  {
+    return new JalviewModel.JSeq();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.JSeq.RnaViewer }
+   * 
+   */
+  public JalviewModel.JSeq.RnaViewer createJalviewModelJSeqRnaViewer()
+  {
+    return new JalviewModel.JSeq.RnaViewer();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.JSeq.Pdbids }
+   * 
+   */
+  public JalviewModel.JSeq.Pdbids createJalviewModelJSeqPdbids()
+  {
+    return new JalviewModel.JSeq.Pdbids();
+  }
+
+  /**
+   * Create an instance of {@link AnnotationColourScheme }
+   * 
+   */
+  public AnnotationColourScheme createAnnotationColourScheme()
+  {
+    return new AnnotationColourScheme();
+  }
+
+  /**
+   * Create an instance of {@link PcaDataType }
+   * 
+   */
+  public PcaDataType createPcaDataType()
+  {
+    return new PcaDataType();
+  }
+
+  /**
+   * Create an instance of {@link DoubleVector }
+   * 
+   */
+  public DoubleVector createDoubleVector()
+  {
+    return new DoubleVector();
+  }
+
+  /**
+   * Create an instance of {@link DoubleMatrix }
+   * 
+   */
+  public DoubleMatrix createDoubleMatrix()
+  {
+    return new DoubleMatrix();
+  }
+
+  /**
+   * Create an instance of {@link Mapping }
+   * 
+   */
+  public Mapping createMapping()
+  {
+    return new Mapping();
+  }
+
+  /**
+   * Create an instance of {@link MapListType.MapListFrom }
+   * 
+   */
+  public MapListType.MapListFrom createMapListTypeMapListFrom()
+  {
+    return new MapListType.MapListFrom();
+  }
+
+  /**
+   * Create an instance of {@link MapListType.MapListTo }
+   * 
+   */
+  public MapListType.MapListTo createMapListTypeMapListTo()
+  {
+    return new MapListType.MapListTo();
+  }
+
+  /**
+   * Create an instance of {@link SequenceType }
+   * 
+   */
+  public SequenceType createSequenceType()
+  {
+    return new SequenceType();
+  }
+
+  /**
+   * Create an instance of {@link Sequence.DBRef }
+   * 
+   */
+  public Sequence.DBRef createSequenceDBRef()
+  {
+    return new Sequence.DBRef();
+  }
+
+  /**
+   * Create an instance of {@link AlcodonFrame.Alcodon }
+   * 
+   */
+  public AlcodonFrame.Alcodon createAlcodonFrameAlcodon()
+  {
+    return new AlcodonFrame.Alcodon();
+  }
+
+  /**
+   * Create an instance of {@link AlcodonFrame.AlcodMap }
+   * 
+   */
+  public AlcodonFrame.AlcodMap createAlcodonFrameAlcodMap()
+  {
+    return new AlcodonFrame.AlcodMap();
+  }
+
+  /**
+   * Create an instance of {@link AnnotationElement }
+   * 
+   */
+  public AnnotationElement createAnnotationElement()
+  {
+    return new AnnotationElement();
+  }
+
+  /**
+   * Create an instance of {@link Annotation.ThresholdLine }
+   * 
+   */
+  public Annotation.ThresholdLine createAnnotationThresholdLine()
+  {
+    return new Annotation.ThresholdLine();
+  }
+
+  /**
+   * Create an instance of {@link MapOnAMatrixType }
+   * 
+   */
+  public MapOnAMatrixType createMapOnAMatrixType()
+  {
+    return new MapOnAMatrixType();
+  }
+
+  /**
+   * Create an instance of {@link jalview.xml.binding.jalview.Property }
+   * 
+   */
+  public jalview.xml.binding.jalview.Property createProperty()
+  {
+    return new jalview.xml.binding.jalview.Property();
+  }
+
+  /**
+   * Create an instance of {@link SequenceSet.SequenceSetProperties }
+   * 
+   */
+  public SequenceSet.SequenceSetProperties createSequenceSetSequenceSetProperties()
+  {
+    return new SequenceSet.SequenceSetProperties();
+  }
+
+  /**
+   * Create an instance of {@link MatrixType }
+   * 
+   */
+  public MatrixType createMatrixType()
+  {
+    return new MatrixType();
+  }
+
+  /**
+   * Create an instance of {@link VAMSAS }
+   * 
+   */
+  public VAMSAS createVAMSAS()
+  {
+    return new VAMSAS();
+  }
+
+  /**
+   * Create an instance of {@link FeatureMatcher }
+   * 
+   */
+  public FeatureMatcher createFeatureMatcher()
+  {
+    return new FeatureMatcher();
+  }
+
+  /**
+   * Create an instance of {@link WebServiceParameterSet }
+   * 
+   */
+  public WebServiceParameterSet createWebServiceParameterSet()
+  {
+    return new WebServiceParameterSet();
+  }
+
+  /**
+   * Create an instance of {@link FeatureMatcherSet.CompoundMatcher }
+   * 
+   */
+  public FeatureMatcherSet.CompoundMatcher createFeatureMatcherSetCompoundMatcher()
+  {
+    return new FeatureMatcherSet.CompoundMatcher();
+  }
+
+  /**
+   * Create an instance of {@link JalviewUserColours.Colour }
+   * 
+   */
+  public JalviewUserColours.Colour createJalviewUserColoursColour()
+  {
+    return new JalviewUserColours.Colour();
+  }
+
+  /**
+   * Create an instance of {@link JalviewUserColours.Filter }
+   * 
+   */
+  public JalviewUserColours.Filter createJalviewUserColoursFilter()
+  {
+    return new JalviewUserColours.Filter();
+  }
+
+  /**
+   * Create an instance of {@link Pdbentry.Property }
+   * 
+   */
+  public Pdbentry.Property createPdbentryProperty()
+  {
+    return new Pdbentry.Property();
+  }
+
+  /**
+   * Create an instance of {@link Feature.OtherData }
+   * 
+   */
+  public Feature.OtherData createFeatureOtherData()
+  {
+    return new Feature.OtherData();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.JGroup }
+   * 
+   */
+  public JalviewModel.JGroup createJalviewModelJGroup()
+  {
+    return new JalviewModel.JGroup();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.UserColours }
+   * 
+   */
+  public JalviewModel.UserColours createJalviewModelUserColours()
+  {
+    return new JalviewModel.UserColours();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.Tree }
+   * 
+   */
+  public JalviewModel.Tree createJalviewModelTree()
+  {
+    return new JalviewModel.Tree();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.FeatureSettings.Setting }
+   * 
+   */
+  public JalviewModel.FeatureSettings.Setting createJalviewModelFeatureSettingsSetting()
+  {
+    return new JalviewModel.FeatureSettings.Setting();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.FeatureSettings.Group }
+   * 
+   */
+  public JalviewModel.FeatureSettings.Group createJalviewModelFeatureSettingsGroup()
+  {
+    return new JalviewModel.FeatureSettings.Group();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.PcaViewer.SequencePoint }
+   * 
+   */
+  public JalviewModel.PcaViewer.SequencePoint createJalviewModelPcaViewerSequencePoint()
+  {
+    return new JalviewModel.PcaViewer.SequencePoint();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.PcaViewer.Axis }
+   * 
+   */
+  public JalviewModel.PcaViewer.Axis createJalviewModelPcaViewerAxis()
+  {
+    return new JalviewModel.PcaViewer.Axis();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.PcaViewer.SeqPointMin }
+   * 
+   */
+  public JalviewModel.PcaViewer.SeqPointMin createJalviewModelPcaViewerSeqPointMin()
+  {
+    return new JalviewModel.PcaViewer.SeqPointMin();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.PcaViewer.SeqPointMax }
+   * 
+   */
+  public JalviewModel.PcaViewer.SeqPointMax createJalviewModelPcaViewerSeqPointMax()
+  {
+    return new JalviewModel.PcaViewer.SeqPointMax();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.Viewport.HiddenColumns }
+   * 
+   */
+  public JalviewModel.Viewport.HiddenColumns createJalviewModelViewportHiddenColumns()
+  {
+    return new JalviewModel.Viewport.HiddenColumns();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.Viewport.CalcIdParam }
+   * 
+   */
+  public JalviewModel.Viewport.CalcIdParam createJalviewModelViewportCalcIdParam()
+  {
+    return new JalviewModel.Viewport.CalcIdParam();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.Viewport.Overview }
+   * 
+   */
+  public JalviewModel.Viewport.Overview createJalviewModelViewportOverview()
+  {
+    return new JalviewModel.Viewport.Overview();
+  }
+
+  /**
+   * Create an instance of
+   * {@link JalviewModel.JSeq.RnaViewer.SecondaryStructure }
+   * 
+   */
+  public JalviewModel.JSeq.RnaViewer.SecondaryStructure createJalviewModelJSeqRnaViewerSecondaryStructure()
+  {
+    return new JalviewModel.JSeq.RnaViewer.SecondaryStructure();
+  }
+
+  /**
+   * Create an instance of {@link JalviewModel.JSeq.Pdbids.StructureState }
+   * 
+   */
+  public JalviewModel.JSeq.Pdbids.StructureState createJalviewModelJSeqPdbidsStructureState()
+  {
+    return new JalviewModel.JSeq.Pdbids.StructureState();
+  }
+
+  /**
+   * Create an instance of {@link JAXBElement }{@code <}{@link JalviewModel
+   * }{@code >}
+   * 
+   * @param value
+   *          Java instance representing xml element's value.
+   * @return the new instance of {@link JAXBElement
+   *         }{@code <}{@link JalviewModel }{@code >}
+   */
+  @XmlElementDecl(namespace = "www.jalview.org", name = "JalviewModel")
+  public JAXBElement<JalviewModel> createJalviewModel(JalviewModel value)
+  {
+    return new JAXBElement<JalviewModel>(_JalviewModel_QNAME,
+            JalviewModel.class, null, value);
+  }
+
+  /**
+   * Create an instance of {@link JAXBElement
+   * }{@code <}{@link JalviewUserColours }{@code >}
+   * 
+   * @param value
+   *          Java instance representing xml element's value.
+   * @return the new instance of {@link JAXBElement
+   *         }{@code <}{@link JalviewUserColours }{@code >}
+   */
+  @XmlElementDecl(
+    namespace = "www.jalview.org/colours",
+    name = "JalviewUserColours")
+  public JAXBElement<JalviewUserColours> createJalviewUserColours(
+          JalviewUserColours value)
+  {
+    return new JAXBElement<JalviewUserColours>(_JalviewUserColours_QNAME,
+            JalviewUserColours.class, null, value);
+  }
+
+  /**
+   * Create an instance of {@link JAXBElement
+   * }{@code <}{@link WebServiceParameterSet }{@code >}
+   * 
+   * @param value
+   *          Java instance representing xml element's value.
+   * @return the new instance of {@link JAXBElement
+   *         }{@code <}{@link WebServiceParameterSet }{@code >}
+   */
+  @XmlElementDecl(
+    namespace = "www.jalview.org/xml/wsparamset",
+    name = "WebServiceParameterSet")
+  public JAXBElement<WebServiceParameterSet> createWebServiceParameterSet(
+          WebServiceParameterSet value)
+  {
+    return new JAXBElement<WebServiceParameterSet>(
+            _WebServiceParameterSet_QNAME, WebServiceParameterSet.class,
+            null, value);
+  }
 
 }
index aa418e5..d33d47c 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,117 +12,114 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * 
- *                             The results of a PCA calculation
- *                     
+ * The results of a PCA calculation
+ * 
  * 
  * &lt;p&gt;Java class for PcaDataType complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="PcaDataType"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element name="pairwiseMatrix" type="{www.jalview.org}DoubleMatrix"/&amp;gt;
- *         &amp;lt;element name="tridiagonalMatrix" type="{www.jalview.org}DoubleMatrix"/&amp;gt;
- *         &amp;lt;element name="eigenMatrix" type="{www.jalview.org}DoubleMatrix"/&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="PcaDataType"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="pairwiseMatrix"
+ * type="{www.jalview.org}DoubleMatrix"/&amp;gt; &amp;lt;element
+ * name="tridiagonalMatrix" type="{www.jalview.org}DoubleMatrix"/&amp;gt;
+ * &amp;lt;element name="eigenMatrix"
+ * type="{www.jalview.org}DoubleMatrix"/&amp;gt; &amp;lt;/sequence&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PcaDataType", namespace = "www.jalview.org", propOrder = {
-    "pairwiseMatrix",
-    "tridiagonalMatrix",
-    "eigenMatrix"
-})
-public class PcaDataType {
+@XmlType(
+  name = "PcaDataType",
+  namespace = "www.jalview.org",
+  propOrder =
+  { "pairwiseMatrix", "tridiagonalMatrix", "eigenMatrix" })
+public class PcaDataType
+{
+
+  @XmlElement(required = true)
+  protected DoubleMatrix pairwiseMatrix;
+
+  @XmlElement(required = true)
+  protected DoubleMatrix tridiagonalMatrix;
 
-    @XmlElement(required = true)
-    protected DoubleMatrix pairwiseMatrix;
-    @XmlElement(required = true)
-    protected DoubleMatrix tridiagonalMatrix;
-    @XmlElement(required = true)
-    protected DoubleMatrix eigenMatrix;
+  @XmlElement(required = true)
+  protected DoubleMatrix eigenMatrix;
 
-    /**
-     * Gets the value of the pairwiseMatrix property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DoubleMatrix }
-     *     
-     */
-    public DoubleMatrix getPairwiseMatrix() {
-        return pairwiseMatrix;
-    }
+  /**
+   * Gets the value of the pairwiseMatrix property.
+   * 
+   * @return possible object is {@link DoubleMatrix }
+   * 
+   */
+  public DoubleMatrix getPairwiseMatrix()
+  {
+    return pairwiseMatrix;
+  }
 
-    /**
-     * Sets the value of the pairwiseMatrix property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DoubleMatrix }
-     *     
-     */
-    public void setPairwiseMatrix(DoubleMatrix value) {
-        this.pairwiseMatrix = value;
-    }
+  /**
+   * Sets the value of the pairwiseMatrix property.
+   * 
+   * @param value
+   *          allowed object is {@link DoubleMatrix }
+   * 
+   */
+  public void setPairwiseMatrix(DoubleMatrix value)
+  {
+    this.pairwiseMatrix = value;
+  }
 
-    /**
-     * Gets the value of the tridiagonalMatrix property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DoubleMatrix }
-     *     
-     */
-    public DoubleMatrix getTridiagonalMatrix() {
-        return tridiagonalMatrix;
-    }
+  /**
+   * Gets the value of the tridiagonalMatrix property.
+   * 
+   * @return possible object is {@link DoubleMatrix }
+   * 
+   */
+  public DoubleMatrix getTridiagonalMatrix()
+  {
+    return tridiagonalMatrix;
+  }
 
-    /**
-     * Sets the value of the tridiagonalMatrix property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DoubleMatrix }
-     *     
-     */
-    public void setTridiagonalMatrix(DoubleMatrix value) {
-        this.tridiagonalMatrix = value;
-    }
+  /**
+   * Sets the value of the tridiagonalMatrix property.
+   * 
+   * @param value
+   *          allowed object is {@link DoubleMatrix }
+   * 
+   */
+  public void setTridiagonalMatrix(DoubleMatrix value)
+  {
+    this.tridiagonalMatrix = value;
+  }
 
-    /**
-     * Gets the value of the eigenMatrix property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DoubleMatrix }
-     *     
-     */
-    public DoubleMatrix getEigenMatrix() {
-        return eigenMatrix;
-    }
+  /**
+   * Gets the value of the eigenMatrix property.
+   * 
+   * @return possible object is {@link DoubleMatrix }
+   * 
+   */
+  public DoubleMatrix getEigenMatrix()
+  {
+    return eigenMatrix;
+  }
 
-    /**
-     * Sets the value of the eigenMatrix property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DoubleMatrix }
-     *     
-     */
-    public void setEigenMatrix(DoubleMatrix value) {
-        this.eigenMatrix = value;
-    }
+  /**
+   * Sets the value of the eigenMatrix property.
+   * 
+   * @param value
+   *          allowed object is {@link DoubleMatrix }
+   * 
+   */
+  public void setEigenMatrix(DoubleMatrix value)
+  {
+    this.eigenMatrix = value;
+  }
 
 }
index 144076b..f53b801 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.util.ArrayList;
@@ -16,232 +15,223 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for pdbentry complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="pdbentry"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *         &amp;lt;element name="property" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *           &amp;lt;complexType&amp;gt;
- *             &amp;lt;complexContent&amp;gt;
- *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                 &amp;lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                 &amp;lt;attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *               &amp;lt;/restriction&amp;gt;
- *             &amp;lt;/complexContent&amp;gt;
- *           &amp;lt;/complexType&amp;gt;
- *         &amp;lt;/element&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *       &amp;lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="file" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="pdbentry"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;sequence
+ * maxOccurs="unbounded" minOccurs="0"&amp;gt; &amp;lt;element name="property"
+ * maxOccurs="unbounded" minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+ * name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string"
+ * /&amp;gt; &amp;lt;attribute name="value" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="id" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="type" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;attribute name="file" type="{http://www.w3.org/2001/XMLSchema}string"
+ * /&amp;gt; &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "pdbentry", namespace = "www.jalview.org", propOrder = {
-    "property"
-})
-@XmlSeeAlso({
-    jalview.xml.binding.jalview.JalviewModel.JSeq.Pdbids.class
-})
-public class Pdbentry {
-
-    protected List<Pdbentry.Property> property;
-    @XmlAttribute(name = "id", required = true)
-    protected String id;
-    @XmlAttribute(name = "type")
-    protected String type;
-    @XmlAttribute(name = "file")
-    protected String file;
-
-    /**
-     * Gets the value of the property property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the property property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getProperty().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link Pdbentry.Property }
-     * 
-     * 
-     */
-    public List<Pdbentry.Property> getProperty() {
-        if (property == null) {
-            property = new ArrayList<Pdbentry.Property>();
-        }
-        return this.property;
+@XmlType(
+  name = "pdbentry",
+  namespace = "www.jalview.org",
+  propOrder =
+  { "property" })
+@XmlSeeAlso({ jalview.xml.binding.jalview.JalviewModel.JSeq.Pdbids.class })
+public class Pdbentry
+{
+
+  protected List<Pdbentry.Property> property;
+
+  @XmlAttribute(name = "id", required = true)
+  protected String id;
+
+  @XmlAttribute(name = "type")
+  protected String type;
+
+  @XmlAttribute(name = "file")
+  protected String file;
+
+  /**
+   * Gets the value of the property property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the property property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getProperty().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link Pdbentry.Property }
+   * 
+   * 
+   */
+  public List<Pdbentry.Property> getProperty()
+  {
+    if (property == null)
+    {
+      property = new ArrayList<Pdbentry.Property>();
     }
+    return this.property;
+  }
+
+  /**
+   * Gets the value of the id property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getId()
+  {
+    return id;
+  }
+
+  /**
+   * Sets the value of the id property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setId(String value)
+  {
+    this.id = value;
+  }
+
+  /**
+   * Gets the value of the type property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getType()
+  {
+    return type;
+  }
+
+  /**
+   * Sets the value of the type property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setType(String value)
+  {
+    this.type = value;
+  }
+
+  /**
+   * Gets the value of the file property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getFile()
+  {
+    return file;
+  }
+
+  /**
+   * Sets the value of the file property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setFile(String value)
+  {
+    this.file = value;
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+   * name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string"
+   * /&amp;gt; &amp;lt;attribute name="value" use="required"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(name = "")
+  public static class Property
+  {
+
+    @XmlAttribute(name = "name", required = true)
+    protected String name;
+
+    @XmlAttribute(name = "value", required = true)
+    protected String value;
 
     /**
-     * Gets the value of the id property.
+     * Gets the value of the name property.
+     * 
+     * @return possible object is {@link String }
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getId() {
-        return id;
+    public String getName()
+    {
+      return name;
     }
 
     /**
-     * Sets the value of the id property.
+     * Sets the value of the name property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
+     *          allowed object is {@link String }
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getType() {
-        return type;
+    public void setName(String value)
+    {
+      this.name = value;
     }
 
     /**
-     * Sets the value of the type property.
+     * Gets the value of the value property.
      * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the file property.
+     * @return possible object is {@link String }
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getFile() {
-        return file;
+    public String getValue()
+    {
+      return value;
     }
 
     /**
-     * Sets the value of the file property.
+     * Sets the value of the value property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFile(String value) {
-        this.file = value;
-    }
-
-
-    /**
-     * &lt;p&gt;Java class for anonymous complex type.
-     * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-     * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
-     * 
+     *          allowed object is {@link String }
      * 
      */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Property {
-
-        @XmlAttribute(name = "name", required = true)
-        protected String name;
-        @XmlAttribute(name = "value", required = true)
-        protected String value;
-
-        /**
-         * Gets the value of the name property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getName() {
-            return name;
-        }
-
-        /**
-         * Sets the value of the name property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setName(String value) {
-            this.name = value;
-        }
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
+    public void setValue(String value)
+    {
+      this.value = value;
     }
 
+  }
+
 }
index 5fc6047..5e00f95 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,80 +12,78 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for property complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="property"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="property"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+ * name="name" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;attribute name="value"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "property")
-public class Property {
+public class Property
+{
+
+  @XmlAttribute(name = "name")
+  protected String name;
 
-    @XmlAttribute(name = "name")
-    protected String name;
-    @XmlAttribute(name = "value")
-    protected String value;
+  @XmlAttribute(name = "value")
+  protected String value;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+  /**
+   * Gets the value of the name property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getName()
+  {
+    return name;
+  }
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+  /**
+   * Sets the value of the name property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setName(String value)
+  {
+    this.name = value;
+  }
 
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
+  /**
+   * Gets the value of the value property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getValue()
+  {
+    return value;
+  }
 
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
+  /**
+   * Sets the value of the value property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setValue(String value)
+  {
+    this.value = value;
+  }
 
 }
index af05181..9f61a22 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.util.ArrayList;
@@ -17,332 +16,325 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for anonymous complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;extension base="{www.vamsas.ac.uk/jalview/version2}SequenceType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element name="DBRef" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *           &amp;lt;complexType&amp;gt;
- *             &amp;lt;complexContent&amp;gt;
- *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                 &amp;lt;sequence&amp;gt;
- *                   &amp;lt;element ref="{www.vamsas.ac.uk/jalview/version2}Mapping" minOccurs="0"/&amp;gt;
- *                 &amp;lt;/sequence&amp;gt;
- *                 &amp;lt;attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                 &amp;lt;attribute name="version" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                 &amp;lt;attribute name="accessionId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                 &amp;lt;attribute name="locus" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *                 &amp;lt;attribute name="canonical" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
- *               &amp;lt;/restriction&amp;gt;
- *             &amp;lt;/complexContent&amp;gt;
- *           &amp;lt;/complexType&amp;gt;
- *         &amp;lt;/element&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *       &amp;lt;attribute name="dsseqid" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="biotype" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *     &amp;lt;/extension&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;extension
+ * base="{www.vamsas.ac.uk/jalview/version2}SequenceType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="DBRef" maxOccurs="unbounded"
+ * minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element
+ * ref="{www.vamsas.ac.uk/jalview/version2}Mapping" minOccurs="0"/&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="source"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="version" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;attribute name="accessionId"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="locus" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false"
+ * /&amp;gt; &amp;lt;attribute name="canonical"
+ * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="dsseqid"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="biotype" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/extension&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "dbRef"
-})
+@XmlType(name = "", propOrder = { "dbRef" })
 @XmlRootElement(name = "Sequence")
-public class Sequence
-    extends SequenceType
+public class Sequence extends SequenceType
 {
 
-    @XmlElement(name = "DBRef")
-    protected List<Sequence.DBRef> dbRef;
-    @XmlAttribute(name = "dsseqid")
-    protected String dsseqid;
-    @XmlAttribute(name = "biotype")
-    protected String biotype;
+  @XmlElement(name = "DBRef")
+  protected List<Sequence.DBRef> dbRef;
+
+  @XmlAttribute(name = "dsseqid")
+  protected String dsseqid;
+
+  @XmlAttribute(name = "biotype")
+  protected String biotype;
+
+  /**
+   * Gets the value of the dbRef property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the dbRef property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getDBRef().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link Sequence.DBRef }
+   * 
+   * 
+   */
+  public List<Sequence.DBRef> getDBRef()
+  {
+    if (dbRef == null)
+    {
+      dbRef = new ArrayList<Sequence.DBRef>();
+    }
+    return this.dbRef;
+  }
+
+  /**
+   * Gets the value of the dsseqid property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getDsseqid()
+  {
+    return dsseqid;
+  }
+
+  /**
+   * Sets the value of the dsseqid property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setDsseqid(String value)
+  {
+    this.dsseqid = value;
+  }
+
+  /**
+   * Gets the value of the biotype property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getBiotype()
+  {
+    return biotype;
+  }
+
+  /**
+   * Sets the value of the biotype property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setBiotype(String value)
+  {
+    this.biotype = value;
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+   * &amp;lt;sequence&amp;gt; &amp;lt;element
+   * ref="{www.vamsas.ac.uk/jalview/version2}Mapping" minOccurs="0"/&amp;gt;
+   * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="source"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+   * name="version" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;attribute name="accessionId"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+   * name="locus" type="{http://www.w3.org/2001/XMLSchema}boolean"
+   * default="false" /&amp;gt; &amp;lt;attribute name="canonical"
+   * type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(name = "", propOrder = { "mapping" })
+  public static class DBRef
+  {
+
+    @XmlElement(name = "Mapping")
+    protected Mapping mapping;
+
+    @XmlAttribute(name = "source")
+    protected String source;
+
+    @XmlAttribute(name = "version")
+    protected String version;
+
+    @XmlAttribute(name = "accessionId")
+    protected String accessionId;
+
+    @XmlAttribute(name = "locus")
+    protected Boolean locus;
+
+    @XmlAttribute(name = "canonical")
+    protected Boolean canonical;
 
     /**
-     * Gets the value of the dbRef property.
+     * Gets the value of the mapping property.
      * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the dbRef property.
+     * @return possible object is {@link Mapping }
      * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getDBRef().add(newItem);
-     * &lt;/pre&gt;
+     */
+    public Mapping getMapping()
+    {
+      return mapping;
+    }
+
+    /**
+     * Sets the value of the mapping property.
+     * 
+     * @param value
+     *          allowed object is {@link Mapping }
+     * 
+     */
+    public void setMapping(Mapping value)
+    {
+      this.mapping = value;
+    }
+
+    /**
+     * Gets the value of the source property.
      * 
+     * @return possible object is {@link String }
      * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link Sequence.DBRef }
+     */
+    public String getSource()
+    {
+      return source;
+    }
+
+    /**
+     * Sets the value of the source property.
      * 
+     * @param value
+     *          allowed object is {@link String }
      * 
      */
-    public List<Sequence.DBRef> getDBRef() {
-        if (dbRef == null) {
-            dbRef = new ArrayList<Sequence.DBRef>();
-        }
-        return this.dbRef;
+    public void setSource(String value)
+    {
+      this.source = value;
     }
 
     /**
-     * Gets the value of the dsseqid property.
+     * Gets the value of the version property.
+     * 
+     * @return possible object is {@link String }
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getDsseqid() {
-        return dsseqid;
+    public String getVersion()
+    {
+      return version;
     }
 
     /**
-     * Sets the value of the dsseqid property.
+     * Sets the value of the version property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
+     *          allowed object is {@link String }
+     * 
      */
-    public void setDsseqid(String value) {
-        this.dsseqid = value;
+    public void setVersion(String value)
+    {
+      this.version = value;
     }
 
     /**
-     * Gets the value of the biotype property.
+     * Gets the value of the accessionId property.
+     * 
+     * @return possible object is {@link String }
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getBiotype() {
-        return biotype;
+    public String getAccessionId()
+    {
+      return accessionId;
     }
 
     /**
-     * Sets the value of the biotype property.
+     * Sets the value of the accessionId property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
+     *          allowed object is {@link String }
+     * 
      */
-    public void setBiotype(String value) {
-        this.biotype = value;
+    public void setAccessionId(String value)
+    {
+      this.accessionId = value;
     }
 
+    /**
+     * Gets the value of the locus property.
+     * 
+     * @return possible object is {@link Boolean }
+     * 
+     */
+    public boolean isLocus()
+    {
+      if (locus == null)
+      {
+        return false;
+      }
+      else
+      {
+        return locus;
+      }
+    }
 
     /**
-     * &lt;p&gt;Java class for anonymous complex type.
+     * Sets the value of the locus property.
      * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+     * @param value
+     *          allowed object is {@link Boolean }
      * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;sequence&amp;gt;
-     *         &amp;lt;element ref="{www.vamsas.ac.uk/jalview/version2}Mapping" minOccurs="0"/&amp;gt;
-     *       &amp;lt;/sequence&amp;gt;
-     *       &amp;lt;attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="version" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="accessionId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="locus" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-     *       &amp;lt;attribute name="canonical" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
+     */
+    public void setLocus(Boolean value)
+    {
+      this.locus = value;
+    }
+
+    /**
+     * Gets the value of the canonical property.
      * 
+     * @return possible object is {@link Boolean }
      * 
      */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "mapping"
-    })
-    public static class DBRef {
-
-        @XmlElement(name = "Mapping")
-        protected Mapping mapping;
-        @XmlAttribute(name = "source")
-        protected String source;
-        @XmlAttribute(name = "version")
-        protected String version;
-        @XmlAttribute(name = "accessionId")
-        protected String accessionId;
-        @XmlAttribute(name = "locus")
-        protected Boolean locus;
-        @XmlAttribute(name = "canonical")
-        protected Boolean canonical;
-
-        /**
-         * Gets the value of the mapping property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Mapping }
-         *     
-         */
-        public Mapping getMapping() {
-            return mapping;
-        }
-
-        /**
-         * Sets the value of the mapping property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Mapping }
-         *     
-         */
-        public void setMapping(Mapping value) {
-            this.mapping = value;
-        }
-
-        /**
-         * Gets the value of the source property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getSource() {
-            return source;
-        }
-
-        /**
-         * Sets the value of the source property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setSource(String value) {
-            this.source = value;
-        }
-
-        /**
-         * Gets the value of the version property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getVersion() {
-            return version;
-        }
-
-        /**
-         * Sets the value of the version property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setVersion(String value) {
-            this.version = value;
-        }
-
-        /**
-         * Gets the value of the accessionId property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getAccessionId() {
-            return accessionId;
-        }
-
-        /**
-         * Sets the value of the accessionId property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setAccessionId(String value) {
-            this.accessionId = value;
-        }
-
-        /**
-         * Gets the value of the locus property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isLocus() {
-            if (locus == null) {
-                return false;
-            } else {
-                return locus;
-            }
-        }
-
-        /**
-         * Sets the value of the locus property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setLocus(Boolean value) {
-            this.locus = value;
-        }
-
-        /**
-         * Gets the value of the canonical property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isCanonical() {
-            if (canonical == null) {
-                return false;
-            } else {
-                return canonical;
-            }
-        }
-
-        /**
-         * Sets the value of the canonical property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setCanonical(Boolean value) {
-            this.canonical = value;
-        }
+    public boolean isCanonical()
+    {
+      if (canonical == null)
+      {
+        return false;
+      }
+      else
+      {
+        return canonical;
+      }
+    }
 
+    /**
+     * Sets the value of the canonical property.
+     * 
+     * @param value
+     *          allowed object is {@link Boolean }
+     * 
+     */
+    public void setCanonical(Boolean value)
+    {
+      this.canonical = value;
     }
 
+  }
+
 }
index 751f6ca..c45fe81 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.util.ArrayList;
@@ -17,335 +16,319 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for anonymous complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element ref="{www.vamsas.ac.uk/jalview/version2}Sequence" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *         &amp;lt;element ref="{www.vamsas.ac.uk/jalview/version2}Annotation" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="sequenceSetProperties" maxOccurs="unbounded" minOccurs="0"&amp;gt;
- *           &amp;lt;complexType&amp;gt;
- *             &amp;lt;complexContent&amp;gt;
- *               &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *                 &amp;lt;attribute name="key" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *                 &amp;lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *               &amp;lt;/restriction&amp;gt;
- *             &amp;lt;/complexContent&amp;gt;
- *           &amp;lt;/complexType&amp;gt;
- *         &amp;lt;/element&amp;gt;
- *         &amp;lt;element ref="{www.vamsas.ac.uk/jalview/version2}AlcodonFrame" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="Matrix" type="{www.vamsas.ac.uk/jalview/version2}MatrixType" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *       &amp;lt;attribute name="gapChar" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="datasetId" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+ * &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element
+ * ref="{www.vamsas.ac.uk/jalview/version2}Sequence" maxOccurs="unbounded"
+ * minOccurs="0"/&amp;gt; &amp;lt;element
+ * ref="{www.vamsas.ac.uk/jalview/version2}Annotation" maxOccurs="unbounded"
+ * minOccurs="0"/&amp;gt; &amp;lt;element name="sequenceSetProperties"
+ * maxOccurs="unbounded" minOccurs="0"&amp;gt; &amp;lt;complexType&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+ * name="key" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;attribute name="value"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &amp;lt;/element&amp;gt; &amp;lt;element
+ * ref="{www.vamsas.ac.uk/jalview/version2}AlcodonFrame" maxOccurs="unbounded"
+ * minOccurs="0"/&amp;gt; &amp;lt;element name="Matrix"
+ * type="{www.vamsas.ac.uk/jalview/version2}MatrixType" maxOccurs="unbounded"
+ * minOccurs="0"/&amp;gt; &amp;lt;/sequence&amp;gt; &amp;lt;attribute
+ * name="gapChar" use="required" type="{http://www.w3.org/2001/XMLSchema}string"
+ * /&amp;gt; &amp;lt;attribute name="datasetId"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "sequence",
-    "annotation",
-    "sequenceSetProperties",
-    "alcodonFrame",
-    "matrix"
-})
+@XmlType(
+  name = "",
+  propOrder =
+  { "sequence", "annotation", "sequenceSetProperties", "alcodonFrame",
+      "matrix" })
 @XmlRootElement(name = "SequenceSet")
-public class SequenceSet {
+public class SequenceSet
+{
 
-    @XmlElement(name = "Sequence")
-    protected List<Sequence> sequence;
-    @XmlElement(name = "Annotation")
-    protected List<Annotation> annotation;
-    protected List<SequenceSet.SequenceSetProperties> sequenceSetProperties;
-    @XmlElement(name = "AlcodonFrame")
-    protected List<AlcodonFrame> alcodonFrame;
-    @XmlElement(name = "Matrix")
-    protected List<MatrixType> matrix;
-    @XmlAttribute(name = "gapChar", required = true)
-    protected String gapChar;
-    @XmlAttribute(name = "datasetId")
-    protected String datasetId;
+  @XmlElement(name = "Sequence")
+  protected List<Sequence> sequence;
 
-    /**
-     * Gets the value of the sequence property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the sequence property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getSequence().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link Sequence }
-     * 
-     * 
-     */
-    public List<Sequence> getSequence() {
-        if (sequence == null) {
-            sequence = new ArrayList<Sequence>();
-        }
-        return this.sequence;
+  @XmlElement(name = "Annotation")
+  protected List<Annotation> annotation;
+
+  protected List<SequenceSet.SequenceSetProperties> sequenceSetProperties;
+
+  @XmlElement(name = "AlcodonFrame")
+  protected List<AlcodonFrame> alcodonFrame;
+
+  @XmlElement(name = "Matrix")
+  protected List<MatrixType> matrix;
+
+  @XmlAttribute(name = "gapChar", required = true)
+  protected String gapChar;
+
+  @XmlAttribute(name = "datasetId")
+  protected String datasetId;
+
+  /**
+   * Gets the value of the sequence property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the sequence property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getSequence().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link Sequence }
+   * 
+   * 
+   */
+  public List<Sequence> getSequence()
+  {
+    if (sequence == null)
+    {
+      sequence = new ArrayList<Sequence>();
     }
+    return this.sequence;
+  }
 
-    /**
-     * Gets the value of the annotation property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the annotation property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getAnnotation().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link Annotation }
-     * 
-     * 
-     */
-    public List<Annotation> getAnnotation() {
-        if (annotation == null) {
-            annotation = new ArrayList<Annotation>();
-        }
-        return this.annotation;
+  /**
+   * Gets the value of the annotation property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the annotation property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getAnnotation().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link Annotation }
+   * 
+   * 
+   */
+  public List<Annotation> getAnnotation()
+  {
+    if (annotation == null)
+    {
+      annotation = new ArrayList<Annotation>();
     }
+    return this.annotation;
+  }
 
-    /**
-     * Gets the value of the sequenceSetProperties property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the sequenceSetProperties property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getSequenceSetProperties().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link SequenceSet.SequenceSetProperties }
-     * 
-     * 
-     */
-    public List<SequenceSet.SequenceSetProperties> getSequenceSetProperties() {
-        if (sequenceSetProperties == null) {
-            sequenceSetProperties = new ArrayList<SequenceSet.SequenceSetProperties>();
-        }
-        return this.sequenceSetProperties;
+  /**
+   * Gets the value of the sequenceSetProperties property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the sequenceSetProperties property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getSequenceSetProperties().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link SequenceSet.SequenceSetProperties }
+   * 
+   * 
+   */
+  public List<SequenceSet.SequenceSetProperties> getSequenceSetProperties()
+  {
+    if (sequenceSetProperties == null)
+    {
+      sequenceSetProperties = new ArrayList<SequenceSet.SequenceSetProperties>();
     }
+    return this.sequenceSetProperties;
+  }
 
-    /**
-     * Gets the value of the alcodonFrame property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the alcodonFrame property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getAlcodonFrame().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link AlcodonFrame }
-     * 
-     * 
-     */
-    public List<AlcodonFrame> getAlcodonFrame() {
-        if (alcodonFrame == null) {
-            alcodonFrame = new ArrayList<AlcodonFrame>();
-        }
-        return this.alcodonFrame;
+  /**
+   * Gets the value of the alcodonFrame property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the alcodonFrame property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getAlcodonFrame().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link AlcodonFrame }
+   * 
+   * 
+   */
+  public List<AlcodonFrame> getAlcodonFrame()
+  {
+    if (alcodonFrame == null)
+    {
+      alcodonFrame = new ArrayList<AlcodonFrame>();
     }
+    return this.alcodonFrame;
+  }
 
-    /**
-     * Gets the value of the matrix property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the matrix property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getMatrix().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link MatrixType }
-     * 
-     * 
-     */
-    public List<MatrixType> getMatrix() {
-        if (matrix == null) {
-            matrix = new ArrayList<MatrixType>();
-        }
-        return this.matrix;
+  /**
+   * Gets the value of the matrix property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the matrix property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getMatrix().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link MatrixType }
+   * 
+   * 
+   */
+  public List<MatrixType> getMatrix()
+  {
+    if (matrix == null)
+    {
+      matrix = new ArrayList<MatrixType>();
     }
+    return this.matrix;
+  }
+
+  /**
+   * Gets the value of the gapChar property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getGapChar()
+  {
+    return gapChar;
+  }
+
+  /**
+   * Sets the value of the gapChar property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setGapChar(String value)
+  {
+    this.gapChar = value;
+  }
+
+  /**
+   * Gets the value of the datasetId property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getDatasetId()
+  {
+    return datasetId;
+  }
+
+  /**
+   * Sets the value of the datasetId property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setDatasetId(String value)
+  {
+    this.datasetId = value;
+  }
+
+  /**
+   * &lt;p&gt;Java class for anonymous complex type.
+   * 
+   * &lt;p&gt;The following schema fragment specifies the expected content
+   * contained within this class.
+   * 
+   * &lt;pre&gt; &amp;lt;complexType&amp;gt; &amp;lt;complexContent&amp;gt;
+   * &amp;lt;restriction
+   * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt; &amp;lt;attribute
+   * name="key" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;attribute name="value"
+   * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+   * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+   * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
+   * 
+   * 
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlType(name = "")
+  public static class SequenceSetProperties
+  {
+
+    @XmlAttribute(name = "key")
+    protected String key;
+
+    @XmlAttribute(name = "value")
+    protected String value;
 
     /**
-     * Gets the value of the gapChar property.
+     * Gets the value of the key property.
+     * 
+     * @return possible object is {@link String }
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getGapChar() {
-        return gapChar;
+    public String getKey()
+    {
+      return key;
     }
 
     /**
-     * Sets the value of the gapChar property.
+     * Sets the value of the key property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGapChar(String value) {
-        this.gapChar = value;
-    }
-
-    /**
-     * Gets the value of the datasetId property.
+     *          allowed object is {@link String }
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getDatasetId() {
-        return datasetId;
+    public void setKey(String value)
+    {
+      this.key = value;
     }
 
     /**
-     * Sets the value of the datasetId property.
+     * Gets the value of the value property.
+     * 
+     * @return possible object is {@link String }
      * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
      */
-    public void setDatasetId(String value) {
-        this.datasetId = value;
+    public String getValue()
+    {
+      return value;
     }
 
-
     /**
-     * &lt;p&gt;Java class for anonymous complex type.
-     * 
-     * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
-     * 
-     * &lt;pre&gt;
-     * &amp;lt;complexType&amp;gt;
-     *   &amp;lt;complexContent&amp;gt;
-     *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
-     *       &amp;lt;attribute name="key" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *       &amp;lt;attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
-     *     &amp;lt;/restriction&amp;gt;
-     *   &amp;lt;/complexContent&amp;gt;
-     * &amp;lt;/complexType&amp;gt;
-     * &lt;/pre&gt;
+     * Sets the value of the value property.
      * 
+     * @param value
+     *          allowed object is {@link String }
      * 
      */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class SequenceSetProperties {
-
-        @XmlAttribute(name = "key")
-        protected String key;
-        @XmlAttribute(name = "value")
-        protected String value;
-
-        /**
-         * Gets the value of the key property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getKey() {
-            return key;
-        }
-
-        /**
-         * Sets the value of the key property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setKey(String value) {
-            this.key = value;
-        }
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
+    public void setValue(String value)
+    {
+      this.value = value;
     }
 
+  }
+
 }
index 429061b..4409e5b 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,140 +13,132 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for SequenceType complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="SequenceType"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element name="sequence" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *       &amp;lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *       &amp;lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="SequenceType"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="sequence"
+ * type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&amp;gt;
+ * &amp;lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"
+ * minOccurs="0"/&amp;gt; &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="id"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt; &amp;lt;attribute
+ * name="description" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SequenceType", propOrder = {
-    "sequence",
-    "name"
-})
-@XmlSeeAlso({
-    Sequence.class
-})
-public class SequenceType {
-
-    protected String sequence;
-    protected String name;
-    @XmlAttribute(name = "id")
-    protected String id;
-    @XmlAttribute(name = "description")
-    protected String description;
-
-    /**
-     * Gets the value of the sequence property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSequence() {
-        return sequence;
-    }
-
-    /**
-     * Sets the value of the sequence property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSequence(String value) {
-        this.sequence = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
+@XmlType(name = "SequenceType", propOrder = { "sequence", "name" })
+@XmlSeeAlso({ Sequence.class })
+public class SequenceType
+{
+
+  protected String sequence;
+
+  protected String name;
+
+  @XmlAttribute(name = "id")
+  protected String id;
+
+  @XmlAttribute(name = "description")
+  protected String description;
+
+  /**
+   * Gets the value of the sequence property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getSequence()
+  {
+    return sequence;
+  }
+
+  /**
+   * Sets the value of the sequence property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setSequence(String value)
+  {
+    this.sequence = value;
+  }
+
+  /**
+   * Gets the value of the name property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * Sets the value of the name property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setName(String value)
+  {
+    this.name = value;
+  }
+
+  /**
+   * Gets the value of the id property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getId()
+  {
+    return id;
+  }
+
+  /**
+   * Sets the value of the id property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setId(String value)
+  {
+    this.id = value;
+  }
+
+  /**
+   * Gets the value of the description property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getDescription()
+  {
+    return description;
+  }
+
+  /**
+   * Sets the value of the description property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setDescription(String value)
+  {
+    this.description = value;
+  }
 
 }
index f6570a2..a417840 100644 (file)
@@ -5,42 +5,38 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for ThresholdType.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
- * &lt;pre&gt;
- * &amp;lt;simpleType name="ThresholdType"&amp;gt;
- *   &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&amp;gt;
- *     &amp;lt;enumeration value="NONE"/&amp;gt;
- *     &amp;lt;enumeration value="ABOVE"/&amp;gt;
- *     &amp;lt;enumeration value="BELOW"/&amp;gt;
- *   &amp;lt;/restriction&amp;gt;
- * &amp;lt;/simpleType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class. &lt;pre&gt; &amp;lt;simpleType
+ * name="ThresholdType"&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}string"&amp;gt; &amp;lt;enumeration
+ * value="NONE"/&amp;gt; &amp;lt;enumeration value="ABOVE"/&amp;gt;
+ * &amp;lt;enumeration value="BELOW"/&amp;gt; &amp;lt;/restriction&amp;gt;
+ * &amp;lt;/simpleType&amp;gt; &lt;/pre&gt;
  * 
  */
 @XmlType(name = "ThresholdType", namespace = "www.jalview.org/colours")
 @XmlEnum
-public enum ThresholdType {
+public enum ThresholdType
+{
 
-    NONE,
-    ABOVE,
-    BELOW;
+  NONE, ABOVE, BELOW;
 
-    public String value() {
-        return name();
-    }
+  public String value()
+  {
+    return name();
+  }
 
-    public static ThresholdType fromValue(String v) {
-        return valueOf(v);
-    }
+  public static ThresholdType fromValue(String v)
+  {
+    return valueOf(v);
+  }
 
 }
index 6c5240f..a3fb1e9 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.util.ArrayList;
@@ -15,95 +14,85 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for VAMSAS complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="VAMSAS"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element name="Tree" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *         &amp;lt;element ref="{www.vamsas.ac.uk/jalview/version2}SequenceSet" maxOccurs="unbounded" minOccurs="0"/&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="VAMSAS"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="Tree"
+ * type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"
+ * minOccurs="0"/&amp;gt; &amp;lt;element
+ * ref="{www.vamsas.ac.uk/jalview/version2}SequenceSet" maxOccurs="unbounded"
+ * minOccurs="0"/&amp;gt; &amp;lt;/sequence&amp;gt; &amp;lt;/restriction&amp;gt;
+ * &amp;lt;/complexContent&amp;gt; &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VAMSAS", propOrder = {
-    "tree",
-    "sequenceSet"
-})
-public class VAMSAS {
+@XmlType(name = "VAMSAS", propOrder = { "tree", "sequenceSet" })
+public class VAMSAS
+{
+
+  @XmlElement(name = "Tree")
+  protected List<String> tree;
 
-    @XmlElement(name = "Tree")
-    protected List<String> tree;
-    @XmlElement(name = "SequenceSet")
-    protected List<SequenceSet> sequenceSet;
+  @XmlElement(name = "SequenceSet")
+  protected List<SequenceSet> sequenceSet;
 
-    /**
-     * Gets the value of the tree property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the tree property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getTree().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getTree() {
-        if (tree == null) {
-            tree = new ArrayList<String>();
-        }
-        return this.tree;
+  /**
+   * Gets the value of the tree property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the tree property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getTree().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link String }
+   * 
+   * 
+   */
+  public List<String> getTree()
+  {
+    if (tree == null)
+    {
+      tree = new ArrayList<String>();
     }
+    return this.tree;
+  }
 
-    /**
-     * Gets the value of the sequenceSet property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the sequenceSet property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getSequenceSet().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link SequenceSet }
-     * 
-     * 
-     */
-    public List<SequenceSet> getSequenceSet() {
-        if (sequenceSet == null) {
-            sequenceSet = new ArrayList<SequenceSet>();
-        }
-        return this.sequenceSet;
+  /**
+   * Gets the value of the sequenceSet property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the sequenceSet property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getSequenceSet().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link SequenceSet }
+   * 
+   * 
+   */
+  public List<SequenceSet> getSequenceSet()
+  {
+    if (sequenceSet == null)
+    {
+      sequenceSet = new ArrayList<SequenceSet>();
     }
+    return this.sequenceSet;
+  }
 
 }
index 181d9e1..a8e663c 100644 (file)
@@ -5,7 +5,6 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-
 package jalview.xml.binding.jalview;
 
 import java.util.ArrayList;
@@ -18,177 +17,173 @@ import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * &lt;p&gt;Java class for WebServiceParameterSet complex type.
  * 
- * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.
+ * &lt;p&gt;The following schema fragment specifies the expected content
+ * contained within this class.
  * 
- * &lt;pre&gt;
- * &amp;lt;complexType name="WebServiceParameterSet"&amp;gt;
- *   &amp;lt;complexContent&amp;gt;
- *     &amp;lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
- *       &amp;lt;sequence&amp;gt;
- *         &amp;lt;element name="Version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&amp;gt;
- *         &amp;lt;element name="serviceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/&amp;gt;
- *         &amp;lt;element name="parameters" type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt;
- *       &amp;lt;/sequence&amp;gt;
- *       &amp;lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
- *     &amp;lt;/restriction&amp;gt;
- *   &amp;lt;/complexContent&amp;gt;
- * &amp;lt;/complexType&amp;gt;
- * &lt;/pre&gt;
+ * &lt;pre&gt; &amp;lt;complexType name="WebServiceParameterSet"&amp;gt;
+ * &amp;lt;complexContent&amp;gt; &amp;lt;restriction
+ * base="{http://www.w3.org/2001/XMLSchema}anyType"&amp;gt;
+ * &amp;lt;sequence&amp;gt; &amp;lt;element name="Version"
+ * type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&amp;gt;
+ * &amp;lt;element name="description"
+ * type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&amp;gt;
+ * &amp;lt;element name="serviceURL"
+ * type="{http://www.w3.org/2001/XMLSchema}anyURI"
+ * maxOccurs="unbounded"/&amp;gt; &amp;lt;element name="parameters"
+ * type="{http://www.w3.org/2001/XMLSchema}string"/&amp;gt;
+ * &amp;lt;/sequence&amp;gt; &amp;lt;attribute name="name" use="required"
+ * type="{http://www.w3.org/2001/XMLSchema}string" /&amp;gt;
+ * &amp;lt;/restriction&amp;gt; &amp;lt;/complexContent&amp;gt;
+ * &amp;lt;/complexType&amp;gt; &lt;/pre&gt;
  * 
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "WebServiceParameterSet", namespace = "www.jalview.org/xml/wsparamset", propOrder = {
-    "version",
-    "description",
-    "serviceURL",
-    "parameters"
-})
+@XmlType(
+  name = "WebServiceParameterSet",
+  namespace = "www.jalview.org/xml/wsparamset",
+  propOrder =
+  { "version", "description", "serviceURL", "parameters" })
 @XmlSeeAlso({
-    jalview.xml.binding.jalview.JalviewModel.Viewport.CalcIdParam.class
-})
-public class WebServiceParameterSet {
-
-    @XmlElement(name = "Version", namespace = "")
-    protected String version;
-    @XmlElement(namespace = "")
-    protected String description;
-    @XmlElement(namespace = "", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected List<String> serviceURL;
-    @XmlElement(namespace = "", required = true)
-    protected String parameters;
-    @XmlAttribute(name = "name", required = true)
-    protected String name;
-
-    /**
-     * Gets the value of the version property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Sets the value of the version property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVersion(String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the serviceURL property.
-     * 
-     * &lt;p&gt;
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a &lt;CODE&gt;set&lt;/CODE&gt; method for the serviceURL property.
-     * 
-     * &lt;p&gt;
-     * For example, to add a new item, do as follows:
-     * &lt;pre&gt;
-     *    getServiceURL().add(newItem);
-     * &lt;/pre&gt;
-     * 
-     * 
-     * &lt;p&gt;
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getServiceURL() {
-        if (serviceURL == null) {
-            serviceURL = new ArrayList<String>();
-        }
-        return this.serviceURL;
-    }
-
-    /**
-     * Gets the value of the parameters property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getParameters() {
-        return parameters;
-    }
-
-    /**
-     * Sets the value of the parameters property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setParameters(String value) {
-        this.parameters = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
+    jalview.xml.binding.jalview.JalviewModel.Viewport.CalcIdParam.class })
+public class WebServiceParameterSet
+{
+
+  @XmlElement(name = "Version", namespace = "")
+  protected String version;
+
+  @XmlElement(namespace = "")
+  protected String description;
+
+  @XmlElement(namespace = "", required = true)
+  @XmlSchemaType(name = "anyURI")
+  protected List<String> serviceURL;
+
+  @XmlElement(namespace = "", required = true)
+  protected String parameters;
+
+  @XmlAttribute(name = "name", required = true)
+  protected String name;
+
+  /**
+   * Gets the value of the version property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getVersion()
+  {
+    return version;
+  }
+
+  /**
+   * Sets the value of the version property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setVersion(String value)
+  {
+    this.version = value;
+  }
+
+  /**
+   * Gets the value of the description property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getDescription()
+  {
+    return description;
+  }
+
+  /**
+   * Sets the value of the description property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setDescription(String value)
+  {
+    this.description = value;
+  }
+
+  /**
+   * Gets the value of the serviceURL property.
+   * 
+   * &lt;p&gt; This accessor method returns a reference to the live list, not a
+   * snapshot. Therefore any modification you make to the returned list will be
+   * present inside the JAXB object. This is why there is not a
+   * &lt;CODE&gt;set&lt;/CODE&gt; method for the serviceURL property.
+   * 
+   * &lt;p&gt; For example, to add a new item, do as follows: &lt;pre&gt;
+   * getServiceURL().add(newItem); &lt;/pre&gt;
+   * 
+   * 
+   * &lt;p&gt; Objects of the following type(s) are allowed in the list
+   * {@link String }
+   * 
+   * 
+   */
+  public List<String> getServiceURL()
+  {
+    if (serviceURL == null)
+    {
+      serviceURL = new ArrayList<String>();
     }
+    return this.serviceURL;
+  }
+
+  /**
+   * Gets the value of the parameters property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getParameters()
+  {
+    return parameters;
+  }
+
+  /**
+   * Sets the value of the parameters property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setParameters(String value)
+  {
+    this.parameters = value;
+  }
+
+  /**
+   * Gets the value of the name property.
+   * 
+   * @return possible object is {@link String }
+   * 
+   */
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * Sets the value of the name property.
+   * 
+   * @param value
+   *          allowed object is {@link String }
+   * 
+   */
+  public void setName(String value)
+  {
+    this.name = value;
+  }
 
 }
index bb3301a..3ebfa3e 100644 (file)
@@ -5,5 +5,7 @@
 // Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
-@javax.xml.bind.annotation.XmlSchema(namespace = "www.vamsas.ac.uk/jalview/version2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@javax.xml.bind.annotation.XmlSchema(
+  namespace = "www.vamsas.ac.uk/jalview/version2",
+  elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package jalview.xml.binding.jalview;
index 44bea81..05575f4 100644 (file)
@@ -87,22 +87,23 @@ public class TestAlignSeq
     assertEquals(as.getAStr1(), as.getAStr2());
 
     Mapping s1tos2 = as.getMappingFromS1(false);
-    checkMapping(s1tos2,s1,s2);
+    checkMapping(s1tos2, s1, s2);
   }
 
-  public void checkMapping(Mapping s1tos2,SequenceI _s1,SequenceI _s2)
+  public void checkMapping(Mapping s1tos2, SequenceI _s1, SequenceI _s2)
   {
     System.out.println(s1tos2.getMap().toString());
     for (int i = _s2.getStart(); i < _s2.getEnd(); i++)
     {
-      int p=s1tos2.getPosition(i);
-      char s2c=_s2.getCharAt(i-_s2.getStart());
-      char s1c=_s1.getCharAt(p-_s1.getStart());
-      System.out.println("Position in s2: " + i +s2c 
-      + " maps to position in s1: " +p+s1c);
-      assertEquals(s1c,s2c);
+      int p = s1tos2.getPosition(i);
+      char s2c = _s2.getCharAt(i - _s2.getStart());
+      char s1c = _s1.getCharAt(p - _s1.getStart());
+      System.out.println("Position in s2: " + i + s2c
+              + " maps to position in s1: " + p + s1c);
+      assertEquals(s1c, s2c);
     }
   }
+
   @Test(groups = { "Functional" })
   /**
    * simple test that mapping from alignment corresponds identical positions.
@@ -121,9 +122,9 @@ public class TestAlignSeq
     assertEquals(as.getAStr1(), as.getAStr2().toUpperCase(Locale.ROOT));
 
     Mapping s1tos2 = as.getMappingFromS1(false);
-    assertEquals("ASdFA",as.getAStr2());
+    assertEquals("ASdFA", as.getAStr2());
     // verify mapping is consistent between original all-caps sequences
-    checkMapping(s1tos2,s1,s2);
+    checkMapping(s1tos2, s1, s2);
   }
 
   @Test(groups = { "Functional" })
index de6185c..62d1822 100644 (file)
@@ -49,7 +49,7 @@ public class CommandsTest
   }
 
   @AfterMethod(alwaysRun = true)
-  public void tearDown() 
+  public void tearDown()
   {
     try
     {
@@ -96,7 +96,7 @@ public class CommandsTest
   }
   */
 
-  @Test(groups = {"Functional","testTask3"}, dataProvider = "cmdLines")
+  @Test(groups = { "Functional", "testTask3" }, dataProvider = "cmdLines")
   public void commandsOpenTest(String cmdLine, boolean cmdArgs,
           int numFrames, String[] sequences)
   {
index 4615204..94ea5f8 100644 (file)
@@ -428,13 +428,15 @@ public class AlignmentAnnotationTests
     assertNull(ann.annotations[0]);
     assertNull(ann.annotations[4]);
   }
+
   /**
    * test the contact matrix nogroups property methods
    */
-  @Test(groups= {"Functional"})
+  @Test(groups = { "Functional" })
   public void test_contactMatrixGroups()
   {
-    AlignmentAnnotation aa = new AlignmentAnnotation("foo","foo desc",null);
+    AlignmentAnnotation aa = new AlignmentAnnotation("foo", "foo desc",
+            null);
     assertTrue(aa.isShowGroupsForContactMatrix());
     aa.setShowGroupsForContactMatrix(false);
     assertFalse(aa.isShowGroupsForContactMatrix());
@@ -444,7 +446,6 @@ public class AlignmentAnnotationTests
     assertTrue(aa.isShowGroupsForContactMatrix());
     // copy should not be updated
     assertFalse(copy.isShowGroupsForContactMatrix());
-    
-    
+
   }
 }
index fa7aca5..33f3998 100644 (file)
@@ -73,7 +73,8 @@ public class PAEContactMatrixTest
     verifyPAEmatrix(seq, aa, 0, 0, 4);
 
     // test clustering
-    paematrix.setGroupSet(GroupSet.makeGroups(paematrix, false,0.1f, false));
+    paematrix.setGroupSet(
+            GroupSet.makeGroups(paematrix, false, 0.1f, false));
 
     // remap - test the MappableContactMatrix.liftOver method
     SequenceI newseq = new Sequence("Seq", "ASDQEASDQEASDQE");
@@ -117,8 +118,9 @@ public class PAEContactMatrixTest
     newaa = AlignmentUtils.addReferenceAnnotationTo(alForSeq, alseq, newaa,
             null);
     // check for null on out of bounds
-    ContactListI alcl = alForSeq.getContactListFor(newaa, newaa.annotations.length);
-    assertNull(alcl,"Should've gotten null!");
+    ContactListI alcl = alForSeq.getContactListFor(newaa,
+            newaa.annotations.length);
+    assertNull(alcl, "Should've gotten null!");
     // now check for mapping
     alcl = alForSeq.getContactListFor(newaa, 1);
     assertNotNull(alcl);
@@ -213,18 +215,18 @@ public class PAEContactMatrixTest
   /**
    * check mapping and resolution methods work
    */
-  @Test(groups= {"Functional"})
-  public void testMappableContactMatrix() {
+  @Test(groups = { "Functional" })
+  public void testMappableContactMatrix()
+  {
     SequenceI newseq = new Sequence("Seq", "ASDQEASDQEASDQE");
-    MapList map = new MapList(new int[]
-            { 5, 9 }, new int[] { 1, 5 }, 1, 1);
-    AlignmentAnnotation aa = newseq
-            .addContactList(new PAEContactMatrix(newseq,map, PAEdata,null));
+    MapList map = new MapList(new int[] { 5, 9 }, new int[] { 1, 5 }, 1, 1);
+    AlignmentAnnotation aa = newseq.addContactList(
+            new PAEContactMatrix(newseq, map, PAEdata, null));
     ContactListI clist = newseq.getContactListFor(aa, 4);
     assertNotNull(clist);
     clist = newseq.getContactListFor(aa, 3);
     assertNull(clist);
-    
+
     ContactMatrixI cm = newseq.getContactMatrixFor(aa);
     MappableContactMatrixI mcm = (MappableContactMatrixI) cm;
     int[] pos = mcm.getMappedPositionsFor(newseq, 0);
@@ -232,19 +234,18 @@ public class PAEContactMatrixTest
 
     pos = mcm.getMappedPositionsFor(newseq, 1);
     assertNotNull(pos);
-    assertEquals(pos[0],4+newseq.getStart());
-    
+    assertEquals(pos[0], 4 + newseq.getStart());
+
     pos = mcm.getMappedPositionsFor(newseq, 6); // after end of matrix
     assertNull(pos);
     pos = mcm.getMappedPositionsFor(newseq, 5); // at end of matrix
     assertNotNull(pos);
-    assertEquals(pos[0],8+newseq.getStart());
+    assertEquals(pos[0], 8 + newseq.getStart());
     SequenceI alseq = newseq.deriveSequence();
-    alseq.insertCharAt(5,'-');
+    alseq.insertCharAt(5, '-');
     pos = mcm.getMappedPositionsFor(alseq, 5); // at end of matrix
     assertNotNull(pos);
-    assertEquals(pos[0],8+newseq.getStart());
-    
-    
+    assertEquals(pos[0], 8 + newseq.getStart());
+
   }
 }
index 8059af9..ee232c0 100644 (file)
@@ -226,8 +226,7 @@ public class SearchResultsTest
     assertTrue(m.adjacent(seq1, 6, 8));
     assertTrue(m.adjacent(seq1, 5, 8));
     assertTrue(m.adjacent(seq1, 0, 1));
-    
-    
+
     assertFalse(m.adjacent(seq2, 3, 3));
     assertFalse(m.adjacent(null, 3, 3));
   }
@@ -339,7 +338,8 @@ public class SearchResultsTest
   @Test(groups = { "Functional" })
   public void testAppendResult()
   {
-    SequenceI seq1 = new Sequence("", "abcdefghijklm"),seq2=new Sequence("","defdefdefdef");
+    SequenceI seq1 = new Sequence("", "abcdefghijklm"),
+            seq2 = new Sequence("", "defdefdefdef");
     SearchResultsI sr = new SearchResults();
     sr.appendResult(seq1, 3, 5);
     assertEquals(1, sr.getCount());
@@ -355,14 +355,15 @@ public class SearchResultsTest
     assertTrue(sr.appendResult(seq2, 7, 49));
     assertTrue(sr.appendResult(seq2, 0, 30));
     assertEquals(2, sr.getCount());
-    int c=0;
-    for (SearchResultMatchI sre: sr.getResults())
+    int c = 0;
+    for (SearchResultMatchI sre : sr.getResults())
     {
       c++;
     }
-    assertEquals(c,2);
-    
+    assertEquals(c, 2);
+
   }
+
   /**
    * Test for method that checks if search results matches a sequence region
    */
index 7bbb9f3..948a5fb 100644 (file)
@@ -1052,37 +1052,41 @@ public class SequenceTest
     assertEquals("ABCDEF",
             derived.getDatasetSequence().getSequenceAsString());
   }
-  
+
   /**
    * test that creating a copy of an existing sequence with dataset sequence and
    * associated contact matrix yields annotation associated with the same
    * contact matrix in the copy
    */
-  @Test(groups= {"Functional"})
+  @Test(groups = { "Functional" })
   public void testCopyPasteStyleDerivesequence_withcontactMatrixAnn()
   {
-    SequenceI seq1=new Sequence("seq1","ACDACDACD");
+    SequenceI seq1 = new Sequence("seq1", "ACDACDACD");
     seq1.createDatasetSequence();
     ContactMatrixI cm = new SeqDistanceContactMatrix(seq1.getLength());
-    // addContactList needs to return annotation addable to the sequence reference it was called from
+    // addContactList needs to return annotation addable to the sequence
+    // reference it was called from
     AlignmentAnnotation aann = seq1.addContactList(cm);
-    assertTrue(aann.sequenceRef==seq1);
-    assertEquals(1,seq1.getAnnotation().length);
+    assertTrue(aann.sequenceRef == seq1);
+    assertEquals(1, seq1.getAnnotation().length);
     assertNotNull(seq1.getContactListFor(seq1.getAnnotation()[0], 1));
-    
-    SequenceI seq_derived=seq1.deriveSequence();
-    assertEquals(1,seq_derived.getAnnotation().length);
-    assertTrue(cm==seq_derived.getContactMatrixFor(seq_derived.getAnnotation()[0]));
-    assertNotNull(seq_derived.getContactListFor(seq_derived.getAnnotation()[0], 1));
-    
+
+    SequenceI seq_derived = seq1.deriveSequence();
+    assertEquals(1, seq_derived.getAnnotation().length);
+    assertTrue(cm == seq_derived
+            .getContactMatrixFor(seq_derived.getAnnotation()[0]));
+    assertNotNull(seq_derived
+            .getContactListFor(seq_derived.getAnnotation()[0], 1));
+
     // copy paste actually uses the copy constructor .. so
-    
-    SequenceI seq_copied=new Sequence((Sequence)seq_derived);
-    assertEquals(1,seq_copied.getAnnotation().length);
-    assertTrue(cm==seq_copied.getContactMatrixFor(seq_copied.getAnnotation()[0]));
-    assertNotNull(seq_copied.getContactListFor(seq_copied.getAnnotation()[0], 1));
-    
-    
+
+    SequenceI seq_copied = new Sequence((Sequence) seq_derived);
+    assertEquals(1, seq_copied.getAnnotation().length);
+    assertTrue(cm == seq_copied
+            .getContactMatrixFor(seq_copied.getAnnotation()[0]));
+    assertNotNull(
+            seq_copied.getContactListFor(seq_copied.getAnnotation()[0], 1));
+
   }
 
   @Test(groups = { "Functional" })
@@ -2319,12 +2323,12 @@ public class SequenceTest
     origSeq.addDBRef(new DBRefEntry("UNIPROT", "0", "Q12345", null, true));
 
     toSeq.transferAnnotation(origSeq, null);
-    assertEquals("DESCRIPTION",toSeq.getDescription());
+    assertEquals("DESCRIPTION", toSeq.getDescription());
     toSeq = new Sequence("MYSEQ", "THISISASEQ");
     toSeq.setDescription("unchanged");
     toSeq.transferAnnotation(origSeq, null);
-    assertEquals("unchanged",toSeq.getDescription());
-    
+    assertEquals("unchanged", toSeq.getDescription());
+
     assertTrue(toSeq.getDBRefs().size() == 1);
 
     assertTrue(toSeq.getDBRefs().get(0).isCanonical());
index 00e7b21..6edd86e 100644 (file)
@@ -824,11 +824,11 @@ public class PDBFTSRestClientTest
                           + "        \"resolution\":2.2,\n"
                           + "        \"title\":\"Crystal structure of the complex between maize sulfite reductase and ferredoxin in the form-2 crystal\"}]\n"
                           + "  }}" });
-      mocks.add(new String[] { 
-          "https://www.ebi.ac.uk/pdbe/search/pdb/select?wt=json&fl=pdb_id,title,experimental_method,resolution&rows=500&start=0&q=(4gs9+OR+6bvb+OR+8ck8+OR+8ck3+OR+6x3d+OR+8ck4+OR+6x28+OR+6i7r+OR+3h82+OR+6i7q+OR+6x21+OR+4xt2+OR+5kiz+OR+7q5v+OR+6x2h+OR+7q5x+OR+3f1n+OR+3f1o+OR+2a24+OR+3f1p+OR+1p97+OR+4ghi+OR+3h7w+OR+6d09+OR+6czw+OR+7ujv+OR+5tbm+OR+5ufp+OR+4pky+OR+6d0b+OR+6d0c+OR+6x37)+AND+molecule_sequence:%5B''+TO+*%5D+AND+status:REL&sort="
-           ,
-          readJsonStringFromFile(
-                  "test/jalview/fts/threedbeacons/q99814_tdb_pdbfts_query_resp.txt")});
+      mocks.add(
+              new String[]
+              { "https://www.ebi.ac.uk/pdbe/search/pdb/select?wt=json&fl=pdb_id,title,experimental_method,resolution&rows=500&start=0&q=(4gs9+OR+6bvb+OR+8ck8+OR+8ck3+OR+6x3d+OR+8ck4+OR+6x28+OR+6i7r+OR+3h82+OR+6i7q+OR+6x21+OR+4xt2+OR+5kiz+OR+7q5v+OR+6x2h+OR+7q5x+OR+3f1n+OR+3f1o+OR+2a24+OR+3f1p+OR+1p97+OR+4ghi+OR+3h7w+OR+6d09+OR+6czw+OR+7ujv+OR+5tbm+OR+5ufp+OR+4pky+OR+6d0b+OR+6d0c+OR+6x37)+AND+molecule_sequence:%5B''+TO+*%5D+AND+status:REL&sort=",
+                  readJsonStringFromFile(
+                          "test/jalview/fts/threedbeacons/q99814_tdb_pdbfts_query_resp.txt") });
     } catch (Throwable e)
     {
       Assert.fail("Couldn't read mock data.", e);
index 40e29d3..19e50e0 100644 (file)
@@ -500,5 +500,5 @@ public class TDBeaconsFTSRestClientTest
     System.out.println("Search summary : \n" + response.getSearchSummary());
     // System.out.println(response.getSearchSummary().size());
   }
-  
+
 }
index 7399c66..1da6504 100644 (file)
@@ -539,29 +539,34 @@ public class AlignViewportTest
     assertEquals(0, ranges.getStartSeq());
     assertEquals(2, ranges.getEndSeq());
   }
-  @Test(groups = {"Functional"})
+
+  @Test(groups = { "Functional" })
   public void testGetSelectionAsNewSequences_withContactMatrices()
   {
-    SequenceI seq = new Sequence("seq","ACADA");
+    SequenceI seq = new Sequence("seq", "ACADA");
     ContactMatrixI cmat = new SeqDistanceContactMatrix(5);
     seq.addContactList(cmat);
-    Alignment al = new Alignment(new SequenceI[] {seq.deriveSequence() });
+    Alignment al = new Alignment(new SequenceI[] { seq.deriveSequence() });
     al.addAnnotation(al.getSequenceAt(0).getAnnotation()[0]);
-    AlignFrame af = new AlignFrame(al,500,500);
-    
+    AlignFrame af = new AlignFrame(al, 500, 500);
+
     SequenceI selseqs[] = af.getViewport().getSelectionAsNewSequence();
     assertNotNull(selseqs[0].getAnnotation());
     assertNotNull(selseqs[0].getAnnotation()[0]);
-    assertEquals(cmat,selseqs[0].getContactMatrixFor(selseqs[0].getAnnotation()[0]));
-    
-    assertNotNull(selseqs[0].getContactListFor(selseqs[0].getAnnotation()[0], 2));
-    
+    assertEquals(cmat,
+            selseqs[0].getContactMatrixFor(selseqs[0].getAnnotation()[0]));
+
+    assertNotNull(
+            selseqs[0].getContactListFor(selseqs[0].getAnnotation()[0], 2));
+
     // now select everything and test again
     af.selectAllSequenceMenuItem_actionPerformed(null);
     selseqs = af.getViewport().getSelectionAsNewSequence();
     assertNotNull(selseqs[0].getAnnotation());
     assertNotNull(selseqs[0].getAnnotation()[0]);
-    assertEquals(cmat,selseqs[0].getContactMatrixFor(selseqs[0].getAnnotation()[0]));
-    assertNotNull(selseqs[0].getContactListFor(selseqs[0].getAnnotation()[0], 2));
+    assertEquals(cmat,
+            selseqs[0].getContactMatrixFor(selseqs[0].getAnnotation()[0]));
+    assertNotNull(
+            selseqs[0].getContactListFor(selseqs[0].getAnnotation()[0], 2));
   }
 }
index a39257c..a221bd1 100644 (file)
@@ -209,10 +209,10 @@ public class AlignmentPanelTest
 
   /**
    * Test the variant of calculateIdWidth that computes the longest of any
-   * sequence name or annotation label width
-   * FIXME: JAL-4291: test needs updating for JAL-244 and JAL-4091
+   * sequence name or annotation label width FIXME: JAL-4291: test needs
+   * updating for JAL-244 and JAL-4091
    */
-  @Test(groups = "Functional",enabled=false)
+  @Test(groups = "Functional", enabled = false)
   public void testCalculateIdWidth_withMaxWidth()
   {
     AlignViewportI av = af.alignPanel.getAlignViewport();
@@ -300,6 +300,7 @@ public class AlignmentPanelTest
     Cache.setProperty("FIGURE_AUTOIDWIDTH", Boolean.TRUE.toString());
     assertEquals(115, af.alignPanel.getVisibleIdWidth(false));
   }
+
   @Test(groups = { "Functional", "Not-bamboo" })
   public void testresetIdWidth()
   {
@@ -310,20 +311,22 @@ public class AlignmentPanelTest
     assertEquals(w, af.alignPanel.getIdPanel().getWidth());
     assertEquals(w, 115);
 
-    // manually adjust 
+    // manually adjust
     af.viewport.setIdWidth(200);
     w = af.alignPanel.calculateIdWidth().width;
-    assertTrue(af.alignPanel.getIdPanel().getIdCanvas().isManuallyAdjusted());
+    assertTrue(
+            af.alignPanel.getIdPanel().getIdCanvas().isManuallyAdjusted());
     assertEquals(w, af.alignPanel.getIdPanel().getWidth());
 
     af.viewport.setIdWidth(-1);
     af.alignPanel.getIdPanel().getIdCanvas().setManuallyAdjusted(false);
     w = af.alignPanel.calculateIdWidth().width;
-    
+
     assertEquals(w, af.alignPanel.getIdPanel().getWidth());
 
-    assertNotEquals(w,115);
+    assertNotEquals(w, 115);
   }
+
   @Test(groups = "Functional")
   public void testSetOverviewTitle()
   {
index 7cc4cc1..12c4c6c 100644 (file)
@@ -281,13 +281,19 @@ public class FeatureSettingsTest
             "<html>By Score (&gt; 4.0)<br>" + simpleTooltip
                     + "</br></html>");
   }
-  String fsfile="<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><ns2:JalviewUserColours schemeName=\"Sequence Features\" xmlns:ns2=\"www.jalview.org/colours\">",fsfile2="<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<ns2:JalviewUserColours schemeName=\"Sequence Features\" xmlns:ns2=\"www.jalview.org/colours\">";
-  @Test(groups="Functional")
+
+  String fsfile = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><ns2:JalviewUserColours schemeName=\"Sequence Features\" xmlns:ns2=\"www.jalview.org/colours\">",
+          fsfile2 = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<ns2:JalviewUserColours schemeName=\"Sequence Features\" xmlns:ns2=\"www.jalview.org/colours\">";
+
+  @Test(groups = "Functional")
   public void testIdentifyFeatureSettingsFile() throws Exception
   {
-    FileFormatI type = new IdentifyFile().identify(fsfile, DataSourceType.PASTE);
-    assertTrue(FileFormat.FeatureSettings==type,"Feature settings file was identified as "+type);
+    FileFormatI type = new IdentifyFile().identify(fsfile,
+            DataSourceType.PASTE);
+    assertTrue(FileFormat.FeatureSettings == type,
+            "Feature settings file was identified as " + type);
     type = new IdentifyFile().identify(fsfile2, DataSourceType.PASTE);
-    assertTrue(FileFormat.FeatureSettings==type,"Feature settings file with newline was identified as "+type);
+    assertTrue(FileFormat.FeatureSettings == type,
+            "Feature settings file with newline was identified as " + type);
   }
 }
index 20e72b9..0649dee 100644 (file)
@@ -64,10 +64,12 @@ public class ScalePanelTest
     ScalePanel scalePanel = alignFrame.alignPanel.getScalePanel();
 
     MouseEvent mouse = new MouseEvent(scalePanel, 0, 1, 0, 4, 0, 1, false);
-    
+
     // check the bounded lookup is not returning negatives
-    assertEquals(alignFrame.alignPanel.getSeqPanel().findAlignmentColumn(mouse),0);
-    
+    assertEquals(
+            alignFrame.alignPanel.getSeqPanel().findAlignmentColumn(mouse),
+            0);
+
     scalePanel.mousePressed(mouse);
     scalePanel.mouseDragged(mouse);
 
index d47df46..649c78a 100644 (file)
@@ -845,14 +845,12 @@ public class SeqPanelTest
     assertEquals(testee.findColumn(evt), -1);
     assertEquals(testee.findAlignmentColumn(evt), 0);
 
-
     x = labelWidth;
     evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, 0, 0, 0,
             0, false, 0);
     assertEquals(testee.findColumn(evt), 0);
     assertEquals(testee.findAlignmentColumn(evt), 0);
 
-
     /*
      * x over right edge of last residue (including scale left)
      */
@@ -862,8 +860,7 @@ public class SeqPanelTest
     evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, 0, 0, 0,
             0, false, 0);
     assertEquals(testee.findColumn(evt), residuesWide - 1);
-    assertEquals(testee.findAlignmentColumn(evt), residuesWide-1);
-
+    assertEquals(testee.findAlignmentColumn(evt), residuesWide - 1);
 
     /*
      * x over scale right (beyond drawn columns) results in -1
@@ -881,8 +878,7 @@ public class SeqPanelTest
     // on scale
     assertEquals(testee.findColumn(evt), -1);
     // return right-most column visible
-    assertEquals(testee.findAlignmentColumn(evt), residuesWide2-1);
-
+    assertEquals(testee.findAlignmentColumn(evt), residuesWide2 - 1);
 
     // todo add startRes offset, hidden columns
 
index 4579b9c..28dd594 100644 (file)
@@ -246,23 +246,25 @@ public class StructureChooserQuerySourceTest
     upSeq_fer1_maize
             .addDBRef(new DBRefEntry("UNIPROT", "0", "P27787", null, true));
     upSeq_fer1_maize.createDatasetSequence();
-    
-    upSeq_epas1_human = new Sequence("EPAS1_HUMAN","MTADKEKKRSSSERRKEKSRDAARCRRSKETEVFYELAHELPLPHSVSSHLDKASIMRLAISFLRTHKLLSS\n"
-            + "VCSENESEAEADQQMDNLYLKALEGFIAVVTQDGDMIFLSENISKFMGLTQVELTGHSIFDFTHPCDHEEIR\n"
-            + "ENLSLKNGSGFGKKSKDMSTERDFFMRMKCTVTNRGRTVNLKSATWKVLHCTGQVKVYNNCPPHNSLCGYKE\n"
-            + "PLLSCLIIMCEPIQHPSHMDIPLDSKTFLSRHSMDMKFTYCDDRITELIGYHPEELLGRSAYEFYHALDSEN\n"
-            + "MTKSHQNLCTKGQVVSGQYRMLAKHGGYVWLETQGTVIYNPRNLQPQCIMCVNYVLSEIEKNDVVFSMDQTE\n"
-            + "SLFKPHLMAMNSIFDSSGKGAVSEKSNFLFTKLKEEPEELAQLAPTPGDAIISLDFGNQNFEESSAYGKAIL\n"
-            + "PPSQPWATELRSHSTQSEAGSLPAFTVPQAAAPGSTTPSATSSSSSCSTPNSPEDYYTSLDNDLKIEVIEKL\n"
-            + "FAMDTEAKDQCSTQTDFNELDLETLAPYIPMDGEDFQLSPICPEERLLAENPQSTPQHCFSAMTNIFQPLAP\n"
-            + "VAPHSPFLLDKFQQQLESKKTEPEHRPMSSIFFDAGSKASLPPCCGQASTPLSSMGGRSNTQWPPDPPLHFG\n"
-            + "PTKWAVGDQRTEFLGAAPLGPPVSPPHVSTFKTRSAKGFGARGPDVLSPAMVALSNKLKLKRQLEYEEQAFQ\n"
-            + "DLSGGDPPGGSTSHLMWKRMKNLRGGSCPLMPDKPLSANVPNDKFTQNPMRGLGHPLRHLPLPQPPSAISPG\n"
-            + "ENSKSRFPPQCYATQYQDYSLSSAHKVSGMASRLLGPSFESYLLPELTRYDCEVNVPVLGSSTLLQGGDLLR\n"
-            + "ALDQAT");
-    upSeq_epas1_human.setDescription("Endothelial PAS domain-containing protein 1");
+
+    upSeq_epas1_human = new Sequence("EPAS1_HUMAN",
+            "MTADKEKKRSSSERRKEKSRDAARCRRSKETEVFYELAHELPLPHSVSSHLDKASIMRLAISFLRTHKLLSS\n"
+                    + "VCSENESEAEADQQMDNLYLKALEGFIAVVTQDGDMIFLSENISKFMGLTQVELTGHSIFDFTHPCDHEEIR\n"
+                    + "ENLSLKNGSGFGKKSKDMSTERDFFMRMKCTVTNRGRTVNLKSATWKVLHCTGQVKVYNNCPPHNSLCGYKE\n"
+                    + "PLLSCLIIMCEPIQHPSHMDIPLDSKTFLSRHSMDMKFTYCDDRITELIGYHPEELLGRSAYEFYHALDSEN\n"
+                    + "MTKSHQNLCTKGQVVSGQYRMLAKHGGYVWLETQGTVIYNPRNLQPQCIMCVNYVLSEIEKNDVVFSMDQTE\n"
+                    + "SLFKPHLMAMNSIFDSSGKGAVSEKSNFLFTKLKEEPEELAQLAPTPGDAIISLDFGNQNFEESSAYGKAIL\n"
+                    + "PPSQPWATELRSHSTQSEAGSLPAFTVPQAAAPGSTTPSATSSSSSCSTPNSPEDYYTSLDNDLKIEVIEKL\n"
+                    + "FAMDTEAKDQCSTQTDFNELDLETLAPYIPMDGEDFQLSPICPEERLLAENPQSTPQHCFSAMTNIFQPLAP\n"
+                    + "VAPHSPFLLDKFQQQLESKKTEPEHRPMSSIFFDAGSKASLPPCCGQASTPLSSMGGRSNTQWPPDPPLHFG\n"
+                    + "PTKWAVGDQRTEFLGAAPLGPPVSPPHVSTFKTRSAKGFGARGPDVLSPAMVALSNKLKLKRQLEYEEQAFQ\n"
+                    + "DLSGGDPPGGSTSHLMWKRMKNLRGGSCPLMPDKPLSANVPNDKFTQNPMRGLGHPLRHLPLPQPPSAISPG\n"
+                    + "ENSKSRFPPQCYATQYQDYSLSSAHKVSGMASRLLGPSFESYLLPELTRYDCEVNVPVLGSSTLLQGGDLLR\n"
+                    + "ALDQAT");
+    upSeq_epas1_human
+            .setDescription("Endothelial PAS domain-containing protein 1");
     upSeq_epas1_human
-    .addDBRef(new DBRefEntry("UNIPROT", "0", "Q99814", null, true));
+            .addDBRef(new DBRefEntry("UNIPROT", "0", "Q99814", null, true));
     upSeq_epas1_human.createDatasetSequence();
   }
 
@@ -273,7 +275,7 @@ public class StructureChooserQuerySourceTest
     upSeq = null;
     upSeq_r1ab = null;
     upSeq_fer1_maize = null;
-    upSeq_epas1_human=null;
+    upSeq_epas1_human = null;
   }
 
   @SuppressWarnings("deprecation")
@@ -465,7 +467,7 @@ public class StructureChooserQuerySourceTest
               pdbResponse);
       assertEquals(upResponse.getNumberOfItemsFound(),
               joinedResp.getNumberOfItemsFound());
-      
+
       // Special data test case
       if (testUpSeq.getDisplayId(true)
               .equals(upSeq_epas1_human.getDisplayId(true)))
@@ -510,7 +512,8 @@ public class StructureChooserQuerySourceTest
   {
     setUp();
     return new Object[][] { { upSeq }, { upSeq_insulin }, { upSeq_r1ab },
-        { upSeq_fer1_maize },{upSeq_epas1_human} };
+        { upSeq_fer1_maize },
+        { upSeq_epas1_human } };
   }
 
   @Test(groups = { "Functional" })
@@ -533,5 +536,5 @@ public class StructureChooserQuerySourceTest
     name = "abcde12[345a]fg";
     AssertJUnit.assertEquals("abcde12345afg",
             PDBStructureChooserQuerySource.sanitizeSeqName(name));
-  }  
+  }
 }
index d2b6f65..d4edfa1 100644 (file)
@@ -65,14 +65,16 @@ public class RNAMLfileTest
 
   }
 
-  @Test(groups= {"Functional"})
+  @Test(groups = { "Functional" })
   public void testRnamlSeqImport() throws IOException
   {
-    RnamlFile parser = new RnamlFile("examples/testdata/7WKP-rna1.xml", DataSourceType.FILE);
-    SequenceI[] seqs  = parser.getSeqsAsArray();
+    RnamlFile parser = new RnamlFile("examples/testdata/7WKP-rna1.xml",
+            DataSourceType.FILE);
+    SequenceI[] seqs = parser.getSeqsAsArray();
     assertNotNull(seqs);
-    assertEquals(seqs.length,1);
-    assertEquals(seqs[0].getEnd()-seqs[0].getStart()+1,seqs[0].getSequence().length);
+    assertEquals(seqs.length, 1);
+    assertEquals(seqs[0].getEnd() - seqs[0].getStart() + 1,
+            seqs[0].getSequence().length);
   }
 
 }
index 9391eb1..a9031e3 100644 (file)
@@ -432,7 +432,7 @@ public class SequenceAnnotationReportTest
     assertTrue(report.startsWith("<i>\n" + "<br/>\n" + "UNIPROT P30410,\n"
             + " P30411,\n" + " P30412,\n" + " P30413,...<br/>\n"
             + "PDB0 3iu1<br/>\n" + "PDB1 3iu1<br/>"));
-    assertTrue(report.endsWith("PDB3 3iu1<br/>\n"+"PDB4,...<br/>\n"
+    assertTrue(report.endsWith("PDB3 3iu1<br/>\n" + "PDB4,...<br/>\n"
             + "(Output Sequence Details to list all database references)\n"
             + "</i>"));
   }
index ce34044..a4ade0a 100644 (file)
@@ -84,28 +84,29 @@ public class JvCacheableInputBoxTest
     cacheBox.addItem(testInput);
     cacheBox.setSelectedItem(testInput);
     cacheBox.updateCache();
-    boolean done[]=new boolean[] { false };
+    boolean done[] = new boolean[] { false };
     // this event gets processed after updateCache's update event on the swing
     // thread
     SwingUtilities.invokeLater(() -> {
-        done[0]=true;
+      done[0] = true;
     });
-    long t=0;
-    while (!done[0] && t<200)
+    long t = 0;
+    while (!done[0] && t < 200)
     {
-      try {
+      try
+      {
         Thread.sleep(7);
         t++;
-        } catch (InterruptedException e)
-        {
-          e.printStackTrace();
-        }
+      } catch (InterruptedException e)
+      {
+        e.printStackTrace();
+      }
     }
     if (!done[0])
     {
       Assert.fail("Giving up after 1.4s waiting for cache to be updated.");
     }
-    
+
     LinkedHashSet<String> foundCache = appCache
             .getAllCachedItemsFor(TEST_CACHE_KEY);
     Assert.assertTrue(foundCache.contains(testInput));
index ebd265a..dcf8feb 100644 (file)
@@ -1551,12 +1551,12 @@ public class Jalview2xmlTests extends Jalview2xmlBase
   @Test(groups = { "Functional" })
   public void testMatrixToFloatsAndBack()
   {
-    int imax=2000;
-    int i=imax;
-    SequenceI sq = new Sequence("dummy","SEQ");
-    while (sq.getLength()<i)
+    int imax = 2000;
+    int i = imax;
+    SequenceI sq = new Sequence("dummy", "SEQ");
+    while (sq.getLength() < i)
     {
-      sq.setSequence(sq.getSequenceAsString()+'Q');
+      sq.setSequence(sq.getSequenceAsString() + 'Q');
     }
     float[][] paevals = new float[i][i];
     for (i = imax - 1; i >= 0; i--)
@@ -1576,16 +1576,17 @@ public class Jalview2xmlTests extends Jalview2xmlBase
             sq.getLength(), sq.getLength());
     assertEquals(vals[3][4], paevals[3][4]);
     assertEquals(vals[4][3], paevals[4][3]);
-    
+
     // test recovery
-    for (i=0;i<imax;i++)
+    for (i = 0; i < imax; i++)
     {
-      for (int j=0;j<imax;j++)
+      for (int j = 0; j < imax; j++)
       {
-        assertEquals(vals[i][j],paevals[i][j]);
+        assertEquals(vals[i][j], paevals[i][j]);
       }
     }
   }
+
   @Test(groups = { "Functional" })
   public void testPAEsaveRestore() throws Exception
   {
@@ -1615,7 +1616,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase
             sq.getLength(), sq.getLength());
     assertEquals(vals[3][4], paevals[3][4]);
     assertEquals(vals[4][3], paevals[4][3]);
-    dummyMat.setGroupSet(GroupSet.makeGroups(dummyMat, false,0.5f, false));
+    dummyMat.setGroupSet(GroupSet.makeGroups(dummyMat, false, 0.5f, false));
     Assert.assertNotSame(dummyMat.getNewick(), "");
     AlignmentAnnotation paeCm = sq.addContactList(dummyMat);
     al.addAnnotation(paeCm);
@@ -1689,12 +1690,13 @@ public class Jalview2xmlTests extends Jalview2xmlBase
     Assert.assertEquals(restoredMat.getNewick(), dummyMat.getNewick());
 
     // verify no duplicate PAE matrix data when new view created and saved
-    
+
     // add reference annotations to view first, then copy
-    AlignmentUtils.addReferenceAnnotationTo(newAl, newAl.getSequenceAt(0), newSeq.getAnnotation()[0],null);
-    
+    AlignmentUtils.addReferenceAnnotationTo(newAl, newAl.getSequenceAt(0),
+            newSeq.getAnnotation()[0], null);
+
     AlignmentViewPanel newview = af.newView("copy of PAE", true);
-    
+
     // redundant asserts here check all is good with the new view firest...
     AlignmentI newviewAl = newview.getAlignment();
     SequenceI newviewSeq = newviewAl.getSequenceAt(0);
@@ -1703,16 +1705,17 @@ public class Jalview2xmlTests extends Jalview2xmlBase
     Assert.assertEquals(newviewSeq.getAnnotation()[0].graph, paeCm.graph);
     // check we have just one contact matrix mapping
     Assert.assertEquals(newviewSeq.getContactMaps().size(), 1);
-    
+
     // and can be found for the annotation on the sequence
     ContactMatrixI newviewMat = newviewSeq
             .getContactMatrixFor(newviewSeq.getAnnotation()[0]);
     Assert.assertNotNull(newviewMat);
 
     Assert.assertTrue(newviewMat == restoredMat);
-    
-    // save the two views and restore. Now look at visible annotation to check all views have shared refs.
-    
+
+    // save the two views and restore. Now look at visible annotation to check
+    // all views have shared refs.
+
     tfile = File.createTempFile("testStoreAndRecoverPAEmatrixTwoViews",
             ".jvp");
     new Jalview2XML(false).saveState(tfile);
@@ -1724,83 +1727,93 @@ public class Jalview2xmlTests extends Jalview2xmlBase
     AlignmentAnnotation view1aa = newAl.getSequenceAt(0).getAnnotation()[0];
 
     newviewAl = af.getAlignPanels().get(1).getAlignment();
-    AlignmentAnnotation view2aa = newviewAl.getSequenceAt(0).getAnnotation()[0];
+    AlignmentAnnotation view2aa = newviewAl.getSequenceAt(0)
+            .getAnnotation()[0];
 
-    // annotations are shared across alignment views - so should still have an identical pair of annotations.
-    Assert.assertTrue(view1aa==view2aa);
+    // annotations are shared across alignment views - so should still have an
+    // identical pair of annotations.
+    Assert.assertTrue(view1aa == view2aa);
     // identical annotations means identical contact matrix mappings
-    Assert.assertEquals(newAl.getDataset().getSequenceAt(0).getContactMaps().size(), 1);
+    Assert.assertEquals(
+            newAl.getDataset().getSequenceAt(0).getContactMaps().size(), 1);
 
-    // TODO Verify when distinct mappable PAEs are created, only one PAE dataset is actually held.
+    // TODO Verify when distinct mappable PAEs are created, only one PAE dataset
+    // is actually held.
     // Assert.assertTrue(view1aa!=view2aa);
     // restoredMat = newAl.getContactMatrixFor(view1aa);
     // newviewMat = newviewAl.getContactMatrixFor(view2aa);
     // Assert.assertTrue(restoredMat!=newviewMat);
-    
+
   }
 
   @Test(groups = "Functional")
-  public void testStoreAndRestoreIDwidthAndAnnotationHeight() throws IOException
+  public void testStoreAndRestoreIDwidthAndAnnotationHeight()
+          throws IOException
   {
     Desktop.instance.closeAll_actionPerformed(null);
     final String SECONDVIEW = "With Diffferent IDwidth";
     // create a new tempfile
     File tempfile = File.createTempFile("jvIdWidthStoreRestore", "jvp");
 
+    AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(
+            "examples/exampleFile.jvp", DataSourceType.FILE);
+    assertNotNull(af, "Didn't read in the example file correctly.");
+    // FIXME JAL-4281 test made platform dependent to pass, but probably
+    // shouldn't be platform dependent
+    assertEquals(af.alignPanel.getAlignViewport().getIdWidth(),
+            Platform.isAMacAndNotJS() ? 144 : 138,
+            "Legacy project import should have fixed ID width");
+    assertTrue(
+            af.alignPanel.getIdPanel().getIdCanvas().isManuallyAdjusted());
 
-    AlignFrame af = new FileLoader().LoadFileWaitTillLoaded("examples/exampleFile.jvp",
-              DataSourceType.FILE);
-      assertNotNull(af, "Didn't read in the example file correctly.");
-      // FIXME JAL-4281 test made platform dependent to pass, but probably shouldn't be platform dependent
-      assertEquals(af.alignPanel.getAlignViewport().getIdWidth(), Platform.isAMacAndNotJS() ? 144 : 138,
-              "Legacy project import should have fixed ID width");
-      assertTrue(af.alignPanel.getIdPanel().getIdCanvas().isManuallyAdjusted());
-      
-      
-      af.alignPanel.getAlignViewport().setIdWidth(100);
-      af.alignPanel.updateLayout();
-      assertTrue(af.alignPanel.getIdPanel().getIdCanvas().isManuallyAdjusted());
-      
-      Jalview2XML jv2xml = new jalview.project.Jalview2XML(false);
-      tempfile.delete();
-      jv2xml.saveState(tempfile);
-      assertTrue(jv2xml.errorMessage == null,
-              "Failed to save dummy project with PCA: test broken");
-      af = null;
-      // load again.
-      Desktop.instance.closeAll_actionPerformed(null);
-      af = new FileLoader().LoadFileWaitTillLoaded(
-              tempfile.getCanonicalPath(), DataSourceType.FILE);
-      assertTrue(af.alignPanel.getIdPanel().getIdCanvas()
-              .isManuallyAdjusted());
-      assertEquals(af.alignPanel.getAlignViewport().getIdWidth(), 100,
-              "New project exported and import should have adjusted ID width");
-
-      af.alignPanel.getAlignViewport().setIdWidth(100);
-      af.alignPanel.updateLayout();
-      assertTrue(af.alignPanel.getIdPanel().getIdCanvas().isManuallyAdjusted());
-      
-      // now make it autoadjusted
-      af.alignPanel.getAlignViewport().setIdWidth(-1);
-      af.alignPanel.getIdPanel().getIdCanvas().setManuallyAdjusted(false);
-      af.alignPanel.updateLayout();
-      assertFalse(af.alignPanel.getIdPanel().getIdCanvas().isManuallyAdjusted());
-      assertTrue(af.alignPanel.getAlignViewport().getIdWidth()>-1,
-              "New project exported and import should have adjusted ID width");
-      
-      jv2xml = new jalview.project.Jalview2XML(false);
-      tempfile.delete();
-      jv2xml.saveState(tempfile);
-      assertTrue(jv2xml.errorMessage == null,
-              "Failed to save dummy project with PCA: test broken");
-      af = null;
-      // load again.
-      Desktop.instance.closeAll_actionPerformed(null);
-      af = new FileLoader().LoadFileWaitTillLoaded(
-              tempfile.getCanonicalPath(), DataSourceType.FILE);
-      assertFalse(af.alignPanel.getIdPanel().getIdCanvas().isManuallyAdjusted());
-      assertTrue(af.alignPanel.getAlignViewport().getIdWidth()>-1,
-              "New project exported and import should have adjusted ID width");
+    af.alignPanel.getAlignViewport().setIdWidth(100);
+    af.alignPanel.updateLayout();
+    assertTrue(
+            af.alignPanel.getIdPanel().getIdCanvas().isManuallyAdjusted());
+
+    Jalview2XML jv2xml = new jalview.project.Jalview2XML(false);
+    tempfile.delete();
+    jv2xml.saveState(tempfile);
+    assertTrue(jv2xml.errorMessage == null,
+            "Failed to save dummy project with PCA: test broken");
+    af = null;
+    // load again.
+    Desktop.instance.closeAll_actionPerformed(null);
+    af = new FileLoader().LoadFileWaitTillLoaded(
+            tempfile.getCanonicalPath(), DataSourceType.FILE);
+    assertTrue(
+            af.alignPanel.getIdPanel().getIdCanvas().isManuallyAdjusted());
+    assertEquals(af.alignPanel.getAlignViewport().getIdWidth(), 100,
+            "New project exported and import should have adjusted ID width");
+
+    af.alignPanel.getAlignViewport().setIdWidth(100);
+    af.alignPanel.updateLayout();
+    assertTrue(
+            af.alignPanel.getIdPanel().getIdCanvas().isManuallyAdjusted());
+
+    // now make it autoadjusted
+    af.alignPanel.getAlignViewport().setIdWidth(-1);
+    af.alignPanel.getIdPanel().getIdCanvas().setManuallyAdjusted(false);
+    af.alignPanel.updateLayout();
+    assertFalse(
+            af.alignPanel.getIdPanel().getIdCanvas().isManuallyAdjusted());
+    assertTrue(af.alignPanel.getAlignViewport().getIdWidth() > -1,
+            "New project exported and import should have adjusted ID width");
+
+    jv2xml = new jalview.project.Jalview2XML(false);
+    tempfile.delete();
+    jv2xml.saveState(tempfile);
+    assertTrue(jv2xml.errorMessage == null,
+            "Failed to save dummy project with PCA: test broken");
+    af = null;
+    // load again.
+    Desktop.instance.closeAll_actionPerformed(null);
+    af = new FileLoader().LoadFileWaitTillLoaded(
+            tempfile.getCanonicalPath(), DataSourceType.FILE);
+    assertFalse(
+            af.alignPanel.getIdPanel().getIdCanvas().isManuallyAdjusted());
+    assertTrue(af.alignPanel.getAlignViewport().getIdWidth() > -1,
+            "New project exported and import should have adjusted ID width");
   }
 
 }
index 6e38e89..6b36dbd 100644 (file)
@@ -42,7 +42,7 @@ import jalview.ws.datamodel.MappableContactMatrixI;
 
 public class ContactGeometryTest
 {
-  @Test(groups="Functional")
+  @Test(groups = "Functional")
   public void testCoverageofRange()
   {
     // a really dumb test to make sure we really cover the requested pixel and
@@ -66,76 +66,84 @@ public class ContactGeometryTest
       }
     }
   }
+
   @Test(groups = "Functional")
   public void testContactGeometry()
   {
     SequenceI sq = new Sequence("a", "SSSQ");
     MappableContactMatrixI cm = new SeqDistanceContactMatrix(4);
     AlignmentAnnotation cm_aan = sq.addContactList(cm);
-    checkConsistencyFor(sq,cm_aan);
+    checkConsistencyFor(sq, cm_aan);
     // Also check all is good when there's a sequence mapping involved
-    MappableContactMatrixI newcm=cm.liftOver(sq,
+    MappableContactMatrixI newcm = cm.liftOver(sq,
             new Mapping(sq, new MapList(new int[]
             { 1, 4 }, new int[] { 1, 4 }, 1, 1)));
     AlignmentAnnotation mapped_cm = sq.addContactList(newcm);
-    checkConsistencyFor(sq,mapped_cm);    
+    checkConsistencyFor(sq, mapped_cm);
   }
+
   // Do some asserts for a sequence and a contact matrix
   private void checkConsistencyFor(SequenceI sq, AlignmentAnnotation cm_aan)
   {
-    int col=1;
+    int col = 1;
     ContactListI cl = sq.getContactListFor(cm_aan, col);
     assertNotNull(cl);
-    assertEquals(cl.getContactHeight(),4);
-    
-    // Map contacts 0 to 3 to a tiny range and check    
-    ContactGeometry  testee = new ContactGeometry(cl,2);
-    assertEquals(testee.contacts_per_pixel,2d);
+    assertEquals(cl.getContactHeight(), 4);
+
+    // Map contacts 0 to 3 to a tiny range and check
+    ContactGeometry testee = new ContactGeometry(cl, 2);
+    assertEquals(testee.contacts_per_pixel, 2d);
     ContactGeometry.contactInterval lastInterval = testee.mapFor(1);
-    assertEquals(lastInterval.cStart,2);
-    assertEquals(lastInterval.cEnd,3);
-    assertEquals(lastInterval.pStart,1);
-    assertEquals(lastInterval.pEnd,1);
-    ContactGeometry.contactInterval another = testee.mapFor(1,2); 
-    assertEquals(lastInterval,another);
+    assertEquals(lastInterval.cStart, 2);
+    assertEquals(lastInterval.cEnd, 3);
+    assertEquals(lastInterval.pStart, 1);
+    assertEquals(lastInterval.pEnd, 1);
+    ContactGeometry.contactInterval another = testee.mapFor(1, 2);
+    assertEquals(lastInterval, another);
     // Also check for a big pixel range
     testee = new ContactGeometry(cl, 395);
     lastInterval = testee.mapFor(390, 395); // 395 is one over limit.
     assertNotNull(lastInterval);
-    assertEquals(lastInterval.cEnd,3);
-    assertEquals(lastInterval.pEnd,394);
+    assertEquals(lastInterval.cEnd, 3);
+    assertEquals(lastInterval.pEnd, 394);
     // Map contacts 0 to 3 to Pixels 0-9, 10-19, 20-29, 30-39
     testee = new ContactGeometry(cl, 40);
 
     // verify mapping from pixel to contacts
-    
+
     // renderer thinks base 0 for pixel coordinates
     // contact coordinates are base 1
     for (int p = 0; p < 40; p++)
     {
-      int expectC=(p / 10);
-      int expectP=(expectC)*10;
+      int expectC = (p / 10);
+      int expectP = (expectC) * 10;
       ContactGeometry.contactInterval ci_at = testee.mapFor(p),
               ci_from = testee.mapFor(p, p);
       assertNotNull(ci_at);
       // mapFor and map should locate the same pixel window
-      assertEquals(ci_at.cStart, expectC,"Different cStart at position "+p);
-      assertEquals(ci_at.cEnd, expectC,"Different cEnd at position "+p);
-      assertEquals(ci_at.pStart,expectP, "Different pStart at position "+p);
-      assertEquals(ci_at.pEnd,expectP+9, "Different pEnd at position "+p);
-      
-      assertEquals(ci_from,ci_at, "Different contactIntervals at position "+p);
+      assertEquals(ci_at.cStart, expectC,
+              "Different cStart at position " + p);
+      assertEquals(ci_at.cEnd, expectC, "Different cEnd at position " + p);
+      assertEquals(ci_at.pStart, expectP,
+              "Different pStart at position " + p);
+      assertEquals(ci_at.pEnd, expectP + 9,
+              "Different pEnd at position " + p);
+
+      assertEquals(ci_from, ci_at,
+              "Different contactIntervals at position " + p);
       // also test getRangeFor
       ContactRange cr = cl.getRangeFor(ci_at.cStart, ci_at.cEnd);
-      assertEquals(cr.getFrom_column(),cr.getTo_column());
-      assertEquals((double) cr.getMean(),(double)Math.abs(col-cr.getFrom_column()), "Didn't resolve expected value at position "+p);
+      assertEquals(cr.getFrom_column(), cr.getTo_column());
+      assertEquals((double) cr.getMean(),
+              (double) Math.abs(col - cr.getFrom_column()),
+              "Didn't resolve expected value at position " + p);
     }
-    
+
     ContactGeometry.contactInterval ci_at0 = testee.mapFor(0);
     ContactGeometry.contactInterval ci_at9 = testee.mapFor(9);
     assertNotNull(ci_at9);
-    
-    assertEquals(ci_at0,ci_at9);
+
+    assertEquals(ci_at0, ci_at9);
 
     // Adjacent cell
     ContactGeometry.contactInterval ci_at10 = testee.mapFor(10);
@@ -143,16 +151,18 @@ public class ContactGeometryTest
     ContactGeometry.contactInterval ci_at11 = testee.mapFor(11);
     assertNotNull(ci_at11);
 
-    assertEquals(ci_at11,ci_at10,"Off-by-one in ContactGeometry mapping.");
+    assertEquals(ci_at11, ci_at10,
+            "Off-by-one in ContactGeometry mapping.");
+
+    assertNotEquals(ci_at0, ci_at10,
+            "Expected adjacent cells to be not equal.");
 
-    assertNotEquals(ci_at0,ci_at10,"Expected adjacent cells to be not equal.");
-    
     // verify adjacent window is mapped
-    assertEquals(ci_at11.cStart,ci_at9.cStart+1);
-    
-    assertEquals(ci_at9.cEnd+1,ci_at11.cStart);
-    assertEquals(ci_at9.cEnd+1,ci_at11.cEnd);
-    
+    assertEquals(ci_at11.cStart, ci_at9.cStart + 1);
+
+    assertEquals(ci_at9.cEnd + 1, ci_at11.cStart);
+    assertEquals(ci_at9.cEnd + 1, ci_at11.cEnd);
+
     // verify interval/intersection
     // column selection is base 0
     ColumnSelection cs = new ColumnSelection();
@@ -170,7 +180,7 @@ public class ContactGeometryTest
       cs.removeElement(2);
       assertFalse(testee.intersects(testee.mapFor(21), cs, null, mask));
       mask = !mask;
-    } while (!mask);    
-    
+    } while (!mask);
+
   }
 }
index 0f5bd4d..d5b2e0b 100644 (file)
@@ -195,10 +195,11 @@ public class SiftsClientTest
     SiftsSettings.setCacheThresholdInDays("2");
     SiftsSettings.setFailSafePIDThreshold("70");
     PDBfile pdbFile;
-    
+
     pdbFile = new PDBfile(false, false, false,
             "test/jalview/io/" + testPDBId + ".pdb", DataSourceType.FILE);
-    // TODO: this uses a network connection - we should mock the sifts testPDBId.xml.gz
+    // TODO: this uses a network connection - we should mock the sifts
+    // testPDBId.xml.gz
     siftsClient = new SiftsClient(pdbFile);
   }
 
@@ -207,11 +208,13 @@ public class SiftsClientTest
   {
     siftsClient = null;
   }
-  
-  @Test(groups= {"Functional"})
-  public void testSIFTsDownloadURL() {
+
+  @Test(groups = { "Functional" })
+  public void testSIFTsDownloadURL()
+  {
     String expectedUrl = "https://ftp.ebi.ac.uk/pub/databases/msd/sifts/split_xml/xy/1xyz.sifts.xml.gz";
-    Assert.assertEquals(SiftsClient.getDownloadUrlFor("1xyz.sifts.xml.gz"), expectedUrl);
+    Assert.assertEquals(SiftsClient.getDownloadUrlFor("1xyz.sifts.xml.gz"),
+            expectedUrl);
   }
 
   @Test(groups = { "Network" })
@@ -376,7 +379,8 @@ public class SiftsClientTest
   {
     SequenceI invalidTestSeq = new Sequence("testSeq", "ABCDEFGH");
     DBRefEntry invalidDBRef = new DBRefEntry();
-    invalidDBRef.setAccessionId("BLAR"); // note no version is set, so also invalid
+    invalidDBRef.setAccessionId("BLAR"); // note no version is set, so also
+                                         // invalid
     invalidTestSeq.addDBRef(invalidDBRef);
     siftsClient.getValidSourceDBRef(invalidTestSeq);
   }