X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2Fvamsas%2FDatasetsequence.java;fp=src%2Fjalview%2Fio%2Fvamsas%2FDatasetsequence.java;h=462f5af5e7d7178ac54fae815da9b7904dc4a81c;hb=9e2b4ccd9c95ffa75130bf808b0037ea6a1054ca;hp=9db7a8e1d430c7e060df9744bd1245889ff7fe4e;hpb=4dd40d33a5becefd51c31a426f2501b21029f82c;p=jalview.git diff --git a/src/jalview/io/vamsas/Datasetsequence.java b/src/jalview/io/vamsas/Datasetsequence.java index 9db7a8e..462f5af 100644 --- a/src/jalview/io/vamsas/Datasetsequence.java +++ b/src/jalview/io/vamsas/Datasetsequence.java @@ -79,7 +79,8 @@ public class Datasetsequence extends DatastoreItem SequenceI sequence = (SequenceI) jvobj; if (!sequence.getSequenceAsString().equals(sq.getSequence())) { - log.warn("Potential Client Error ! - mismatch of dataset sequence: and jalview internal dataset sequence."); + log.warn( + "Potential Client Error ! - mismatch of dataset sequence: and jalview internal dataset sequence."); } else { @@ -140,8 +141,8 @@ public class Datasetsequence extends DatastoreItem { modified |= new jalview.io.vamsas.Sequencefeature(datastore, (jalview.datamodel.SequenceFeature) sq - .getSequenceFeatures()[sf], dataset, - (Sequence) vobj).docWasUpdated(); + .getSequenceFeatures()[sf], + dataset, (Sequence) vobj).docWasUpdated(); } } return modified; @@ -183,7 +184,7 @@ public class Datasetsequence extends DatastoreItem for (int db = 0; db < entries.length; db++) { modifiedthedoc |= new jalview.io.vamsas.Dbref(datastore, - // dbentry = + // dbentry = entries[db], sq, (Sequence) vobj, dataset).docWasUpdated(); } @@ -210,7 +211,7 @@ public class Datasetsequence extends DatastoreItem for (int db = 0; db < entries.length; db++) { modifiedtheseq |= new jalview.io.vamsas.Dbref(datastore, - // dbentry = + // dbentry = entries[db], vsq, sq).jvWasUpdated(); } } @@ -219,7 +220,8 @@ public class Datasetsequence extends DatastoreItem public void conflict() { - log.warn("Conflict in dataset sequence update to document. Overwriting document"); + log.warn( + "Conflict in dataset sequence update to document. Overwriting document"); // TODO: could try to import from document data to jalview first. and then updateToDoc(); }