From 87256ba36fb105a1115067ffe2563412e9281d2d Mon Sep 17 00:00:00 2001 From: hansonr Date: Wed, 8 May 2019 06:29:37 -0500 Subject: [PATCH 1/1] JAL-3253 preliminary static fixes for JavaScript Desktop.instance and Desktop.getInstance() Jalview.instance and Jalview.getInstance() AlignmentSorter.instance and AlignmentSorter.getInstance() ArgsParser static final options *SoapBindingStub static final _operations Clean up of headless business Clean up of ArgsParser options --- doc/parameters.xlsx | Bin 0 -> 44673 bytes src/ext/vamsas/JpredSoapBindingStub.java | 6 +- src/ext/vamsas/MuscleWSSoapBindingStub.java | 6 +- src/ext/vamsas/RegistryServiceSoapBindingStub.java | 3 +- .../vamsas/SeqSearchServiceSoapBindingStub.java | 7 +- src/ext/vamsas/ServiceHandle.java | 4 +- src/jalview/analysis/AlignmentSorter.java | 144 +++++++---- src/jalview/analysis/GeneticCodes.java | 91 ++++--- src/jalview/analysis/scoremodels/ScoreMatrix.java | 3 +- src/jalview/analysis/scoremodels/ScoreModels.java | 33 ++- src/jalview/bin/ArgsParser.java | 51 +++- src/jalview/bin/Cache.java | 13 +- src/jalview/bin/Jalview.java | 257 ++++++++++---------- src/jalview/gui/AlignExportOptions.java | 2 +- src/jalview/gui/AlignFrame.java | 44 ++-- src/jalview/gui/AlignViewport.java | 10 +- src/jalview/gui/AlignmentPanel.java | 3 +- src/jalview/gui/AnnotationColourChooser.java | 2 +- src/jalview/gui/AnnotationLabels.java | 2 +- src/jalview/gui/AppJmol.java | 2 +- src/jalview/gui/AssociatePdbFileWithSeq.java | 2 +- src/jalview/gui/CalculationChooser.java | 2 +- src/jalview/gui/ChimeraViewFrame.java | 4 +- src/jalview/gui/ColourMenuHelper.java | 2 +- src/jalview/gui/CrossRefAction.java | 2 +- src/jalview/gui/CutAndPasteTransfer.java | 6 +- src/jalview/gui/Desktop.java | 193 +++++++++------ src/jalview/gui/FeatureEditor.java | 4 +- src/jalview/gui/Finder.java | 4 +- src/jalview/gui/IdPanel.java | 2 +- src/jalview/gui/JalviewDialog.java | 6 +- src/jalview/gui/LineartOptions.java | 2 +- src/jalview/gui/OOMWarning.java | 2 +- src/jalview/gui/PopupMenu.java | 4 +- src/jalview/gui/Preferences.java | 12 +- src/jalview/gui/PromptUserConfig.java | 2 +- src/jalview/gui/SequenceFetcher.java | 2 +- src/jalview/gui/SplashScreen.java | 12 +- src/jalview/gui/SplitFrame.java | 10 +- src/jalview/gui/StructureChooser.java | 6 +- src/jalview/gui/StructureViewerBase.java | 2 +- src/jalview/gui/UserDefinedColours.java | 10 +- src/jalview/gui/UserQuestionnaireCheck.java | 2 +- src/jalview/gui/VamsasApplication.java | 12 +- src/jalview/gui/WebserviceInfo.java | 2 +- src/jalview/gui/WsJobParameters.java | 8 +- src/jalview/gui/WsParamSetManager.java | 4 +- src/jalview/gui/WsPreferences.java | 18 +- src/jalview/io/BackupFiles.java | 8 +- src/jalview/io/FileLoader.java | 30 +-- src/jalview/io/HTMLOutput.java | 25 +- src/jalview/io/HtmlSvgOutput.java | 4 +- src/jalview/io/VamsasAppDatastore.java | 6 +- src/jalview/io/WSWUBlastClient.java | 2 +- src/jalview/io/vamsas/Sequencemapping.java | 2 +- src/jalview/jbgui/GAlignFrame.java | 3 +- src/jalview/jbgui/GDesktop.java | 11 +- src/jalview/jbgui/GPreferences.java | 2 +- src/jalview/jbgui/GSequenceLink.java | 4 +- src/jalview/project/Jalview2XML.java | 36 +-- src/jalview/schemes/ResidueProperties.java | 3 +- src/jalview/util/Platform.java | 26 +- src/jalview/ws/jws1/Discoverer.java | 4 +- src/jalview/ws/jws1/JPredClient.java | 2 +- src/jalview/ws/jws1/MsaWSClient.java | 4 +- src/jalview/ws/jws1/SeqSearchWSClient.java | 4 +- src/jalview/ws/jws2/MsaWSClient.java | 4 +- .../ws/jws2/SequenceAnnotationWSClient.java | 4 +- src/jalview/ws/jws2/jabaws2/Jws2Instance.java | 2 +- src/jalview/ws/rest/RestClient.java | 2 +- test/jalview/analysis/DnaTest.java | 24 +- test/jalview/ext/jmol/JmolViewerTest.java | 2 +- .../ext/rbvi/chimera/JalviewChimeraView.java | 2 +- test/jalview/gui/AlignFrameTest.java | 2 +- test/jalview/gui/AlignViewportTest.java | 12 +- test/jalview/gui/FreeUpMemoryTest.java | 4 +- test/jalview/gui/SeqPanelTest.java | 2 +- test/jalview/io/AnnotatedPDBFileInputTest.java | 2 +- test/jalview/io/CrossRef2xmlTests.java | 8 +- test/jalview/io/FeaturesFileTest.java | 2 +- test/jalview/io/Jalview2xmlBase.java | 6 +- test/jalview/io/JalviewExportPropertiesTests.java | 2 +- test/jalview/project/Jalview2xmlTests.java | 28 +-- test/jalview/schemes/ColourSchemesTest.java | 2 +- .../structure/StructureSelectionManagerTest.java | 2 +- 85 files changed, 746 insertions(+), 562 deletions(-) create mode 100644 doc/parameters.xlsx mode change 100755 => 100644 src/ext/vamsas/JpredSoapBindingStub.java diff --git a/doc/parameters.xlsx b/doc/parameters.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..fcbd0fda697b85abc998c0c41bcded167bd5f72e GIT binary patch literal 44673 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 literal 0 HcmV?d00001 diff --git a/src/ext/vamsas/JpredSoapBindingStub.java b/src/ext/vamsas/JpredSoapBindingStub.java old mode 100755 new mode 100644 index cff8081..8345551 --- a/src/ext/vamsas/JpredSoapBindingStub.java +++ b/src/ext/vamsas/JpredSoapBindingStub.java @@ -31,7 +31,7 @@ public class JpredSoapBindingStub extends org.apache.axis.client.Stub private java.util.Vector cachedDeserFactories = new java.util.Vector(); - static org.apache.axis.description.OperationDesc[] _operations; + private static org.apache.axis.description.OperationDesc[] _operations; static { @@ -260,6 +260,7 @@ public class JpredSoapBindingStub extends org.apache.axis.client.Stub } } + @Override public java.lang.String predict(vamsas.objects.simple.Sequence seq) throws java.rmi.RemoteException { @@ -297,6 +298,7 @@ public class JpredSoapBindingStub extends org.apache.axis.client.Stub } } + @Override public java.lang.String predictOnMsa( vamsas.objects.simple.Msfalignment msf) throws java.rmi.RemoteException @@ -335,6 +337,7 @@ public class JpredSoapBindingStub extends org.apache.axis.client.Stub } } + @Override public vamsas.objects.simple.Secstructpred getpredict( java.lang.String job_id) throws java.rmi.RemoteException { @@ -373,6 +376,7 @@ public class JpredSoapBindingStub extends org.apache.axis.client.Stub } } + @Override public vamsas.objects.simple.JpredResult getresult(java.lang.String job_id) throws java.rmi.RemoteException { diff --git a/src/ext/vamsas/MuscleWSSoapBindingStub.java b/src/ext/vamsas/MuscleWSSoapBindingStub.java index 1f8d231..026066c 100755 --- a/src/ext/vamsas/MuscleWSSoapBindingStub.java +++ b/src/ext/vamsas/MuscleWSSoapBindingStub.java @@ -23,7 +23,7 @@ package ext.vamsas; public class MuscleWSSoapBindingStub extends org.apache.axis.client.Stub implements ext.vamsas.MuscleWS { - static org.apache.axis.description.OperationDesc[] _operations; + private static final org.apache.axis.description.OperationDesc[] _operations; static { @@ -296,6 +296,7 @@ public class MuscleWSSoapBindingStub extends org.apache.axis.client.Stub } } + @Override public vamsas.objects.simple.WsJobId align( vamsas.objects.simple.SequenceSet seqSet) throws java.rmi.RemoteException @@ -337,6 +338,7 @@ public class MuscleWSSoapBindingStub extends org.apache.axis.client.Stub } } + @Override public vamsas.objects.simple.Alignment getalign(java.lang.String job_id) throws java.rmi.RemoteException { @@ -378,6 +380,7 @@ public class MuscleWSSoapBindingStub extends org.apache.axis.client.Stub } } + @Override public vamsas.objects.simple.MsaResult getResult(java.lang.String job_id) throws java.rmi.RemoteException { @@ -419,6 +422,7 @@ public class MuscleWSSoapBindingStub extends org.apache.axis.client.Stub } } + @Override public vamsas.objects.simple.WsJobId cancel(java.lang.String jobId) throws java.rmi.RemoteException { diff --git a/src/ext/vamsas/RegistryServiceSoapBindingStub.java b/src/ext/vamsas/RegistryServiceSoapBindingStub.java index 08b2a6b..f010ee8 100755 --- a/src/ext/vamsas/RegistryServiceSoapBindingStub.java +++ b/src/ext/vamsas/RegistryServiceSoapBindingStub.java @@ -31,7 +31,7 @@ public class RegistryServiceSoapBindingStub extends private java.util.Vector cachedDeserFactories = new java.util.Vector(); - static org.apache.axis.description.OperationDesc[] _operations; + private static org.apache.axis.description.OperationDesc[] _operations; static { @@ -192,6 +192,7 @@ public class RegistryServiceSoapBindingStub extends } } + @Override public ext.vamsas.ServiceHandles getServices() throws java.rmi.RemoteException { diff --git a/src/ext/vamsas/SeqSearchServiceSoapBindingStub.java b/src/ext/vamsas/SeqSearchServiceSoapBindingStub.java index 390ceb6..df0a504 100644 --- a/src/ext/vamsas/SeqSearchServiceSoapBindingStub.java +++ b/src/ext/vamsas/SeqSearchServiceSoapBindingStub.java @@ -31,7 +31,7 @@ public class SeqSearchServiceSoapBindingStub extends private java.util.Vector cachedDeserFactories = new java.util.Vector(); - static org.apache.axis.description.OperationDesc[] _operations; + private static final org.apache.axis.description.OperationDesc[] _operations; static { @@ -299,6 +299,7 @@ public class SeqSearchServiceSoapBindingStub extends } } + @Override public java.lang.String getDatabase() throws java.rmi.RemoteException { if (super.cachedEndpoint == null) @@ -335,6 +336,7 @@ public class SeqSearchServiceSoapBindingStub extends } } + @Override public vamsas.objects.simple.SeqSearchResult getResult( java.lang.String job_id) throws java.rmi.RemoteException { @@ -373,6 +375,7 @@ public class SeqSearchServiceSoapBindingStub extends } } + @Override public vamsas.objects.simple.WsJobId psearch( vamsas.objects.simple.Alignment al, java.lang.String database) throws java.rmi.RemoteException @@ -412,6 +415,7 @@ public class SeqSearchServiceSoapBindingStub extends } } + @Override public vamsas.objects.simple.WsJobId search( vamsas.objects.simple.Sequence s, java.lang.String database) throws java.rmi.RemoteException @@ -450,6 +454,7 @@ public class SeqSearchServiceSoapBindingStub extends } } + @Override public vamsas.objects.simple.WsJobId cancel(java.lang.String jobId) throws java.rmi.RemoteException { diff --git a/src/ext/vamsas/ServiceHandle.java b/src/ext/vamsas/ServiceHandle.java index 83412ea..428b5ea 100755 --- a/src/ext/vamsas/ServiceHandle.java +++ b/src/ext/vamsas/ServiceHandle.java @@ -126,6 +126,7 @@ public class ServiceHandle implements java.io.Serializable private java.lang.Object __equalsCalc = null; + @Override public synchronized boolean equals(java.lang.Object obj) { if (obj == null) @@ -162,6 +163,7 @@ public class ServiceHandle implements java.io.Serializable private boolean __hashCodeCalc = false; + @Override public synchronized int hashCode() { if (__hashCodeCalc) @@ -191,7 +193,7 @@ public class ServiceHandle implements java.io.Serializable } // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc( + private static final org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc( ServiceHandle.class, true); static diff --git a/src/jalview/analysis/AlignmentSorter.java b/src/jalview/analysis/AlignmentSorter.java index 7ecce49..e5038ba 100755 --- a/src/jalview/analysis/AlignmentSorter.java +++ b/src/jalview/analysis/AlignmentSorter.java @@ -29,6 +29,7 @@ import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; import jalview.datamodel.SequenceNode; +import jalview.util.Platform; import jalview.util.QuickSort; import java.util.ArrayList; @@ -53,38 +54,77 @@ import java.util.List; */ public class AlignmentSorter { + + static AlignmentSorter instance; + + public static AlignmentSorter getInstance() + { + + // BH 2019.05.08 need to isolate static fields in JavaScript + + AlignmentSorter i = instance; + @SuppressWarnings("unused") + ThreadGroup g = null; + if (Platform.isJS()) + { + g = Thread.currentThread().getThreadGroup(); + /** + * @j2sNative i = g._jalviewScoreModelsInstance; + * + */ + } + if (i == null) + { + i = new AlignmentSorter(); + + if (Platform.isJS()) + { + /** + * @j2sNative g._jalviewScoreModelsInstance = i; + * + */ + } + else + { + instance = i; + } + } + return i; + } + /* * todo: refactor searches to follow a basic pattern: (search property, last * search state, current sort direction) */ - static boolean sortIdAscending = true; + boolean sortIdAscending = true; - static int lastGroupHash = 0; + int lastGroupHash = 0; - static boolean sortGroupAscending = true; + boolean sortGroupAscending = true; - static AlignmentOrder lastOrder = null; + AlignmentOrder lastOrder = null; - static boolean sortOrderAscending = true; + boolean sortOrderAscending = true; - static TreeModel lastTree = null; + TreeModel lastTree = null; - static boolean sortTreeAscending = true; + boolean sortTreeAscending = true; - /* + + /** * last Annotation Label used for sort by Annotation score */ - private static String lastSortByAnnotation; + private String lastSortByAnnotation; - /* - * string hash of last arguments to sortByFeature - * (sort order toggles if this is unchanged between sorts) + /** + * string hash of last arguments to sortByFeature (sort order toggles if this + * is unchanged between sorts) */ - private static String sortByFeatureCriteria; + private String sortByFeatureCriteria; - private static boolean sortByFeatureAscending = true; + private boolean sortByFeatureAscending = true; - private static boolean sortLengthAscending; + private boolean sortLengthAscending; /** * Sorts sequences in the alignment by Percentage Identity with the given @@ -222,7 +262,8 @@ public class AlignmentSorter QuickSort.sort(ids, seqs); - if (sortIdAscending) + AlignmentSorter as = getInstance(); + if (as.sortIdAscending) { setReverseOrder(align, seqs); } @@ -231,7 +272,7 @@ public class AlignmentSorter setOrder(align, seqs); } - sortIdAscending = !sortIdAscending; + as.sortIdAscending = !as.sortIdAscending; } /** @@ -255,7 +296,9 @@ public class AlignmentSorter QuickSort.sort(length, seqs); - if (sortLengthAscending) + AlignmentSorter as = getInstance(); + + if (as.sortLengthAscending) { setReverseOrder(align, seqs); } @@ -264,7 +307,7 @@ public class AlignmentSorter setOrder(align, seqs); } - sortLengthAscending = !sortLengthAscending; + as.sortLengthAscending = !as.sortLengthAscending; } /** @@ -281,14 +324,16 @@ public class AlignmentSorter // ORDERS BY GROUP SIZE List groups = new ArrayList<>(); - if (groups.hashCode() != lastGroupHash) + AlignmentSorter as = getInstance(); + + if (groups.hashCode() != as.lastGroupHash) { - sortGroupAscending = true; - lastGroupHash = groups.hashCode(); + as.sortGroupAscending = true; + as.lastGroupHash = groups.hashCode(); } else { - sortGroupAscending = !sortGroupAscending; + as.sortGroupAscending = !as.sortGroupAscending; } // SORTS GROUPS BY SIZE @@ -328,7 +373,7 @@ public class AlignmentSorter } } - if (sortGroupAscending) + if (as.sortGroupAscending) { setOrder(align, seqs); } @@ -401,16 +446,18 @@ public class AlignmentSorter // Get an ordered vector of sequences which may also be present in align List tmp = order.getOrder(); - if (lastOrder == order) + AlignmentSorter as = getInstance(); + + if (as.lastOrder == order) { - sortOrderAscending = !sortOrderAscending; + as.sortOrderAscending = !as.sortOrderAscending; } else { - sortOrderAscending = true; + as.sortOrderAscending = true; } - if (sortOrderAscending) + if (as.sortOrderAscending) { setOrder(align, tmp); } @@ -473,18 +520,20 @@ public class AlignmentSorter { List tmp = getOrderByTree(align, tree); + AlignmentSorter as = getInstance(); + // tmp should properly permute align with tree. - if (lastTree != tree) + if (as.lastTree != tree) { - sortTreeAscending = true; - lastTree = tree; + as.sortTreeAscending = true; + as.lastTree = tree; } else { - sortTreeAscending = !sortTreeAscending; + as.sortTreeAscending = !as.sortTreeAscending; } - if (sortTreeAscending) + if (as.sortTreeAscending) { setOrder(align, tmp); } @@ -658,9 +707,12 @@ public class AlignmentSorter } jalview.util.QuickSort.sort(scores, seqs); - if (lastSortByAnnotation != scoreLabel) + + AlignmentSorter as = getInstance(); + + if (as.lastSortByAnnotation != scoreLabel) { - lastSortByAnnotation = scoreLabel; + as.lastSortByAnnotation = scoreLabel; setOrder(alignment, seqs); } else @@ -809,6 +861,8 @@ public class AlignmentSorter } } + boolean doSort = false; + if (FEATURE_SCORE.equals(method)) { if (hasScores == 0) @@ -834,7 +888,7 @@ public class AlignmentSorter } } } - QuickSort.sortByDouble(scores, seqs, sortByFeatureAscending); + doSort = true; } else if (FEATURE_DENSITY.equals(method)) { @@ -846,9 +900,12 @@ public class AlignmentSorter // System.err.println("Sorting on Density: seq "+seqs[i].getName()+ // " Feats: "+featureCount+" Score : "+scores[i]); } - QuickSort.sortByDouble(scores, seqs, sortByFeatureAscending); + doSort = true; + } + if (doSort) + { + QuickSort.sortByDouble(scores, seqs, getInstance().sortByFeatureAscending); } - setOrder(alignment, seqs); } @@ -883,16 +940,17 @@ public class AlignmentSorter /* * if resorting on the same criteria, toggle sort order */ - if (sortByFeatureCriteria == null - || !scoreCriteria.equals(sortByFeatureCriteria)) + AlignmentSorter as = getInstance(); + if (as.sortByFeatureCriteria == null + || !scoreCriteria.equals(as.sortByFeatureCriteria)) { - sortByFeatureAscending = true; + as.sortByFeatureAscending = true; } else { - sortByFeatureAscending = !sortByFeatureAscending; + as.sortByFeatureAscending = !as.sortByFeatureAscending; } - sortByFeatureCriteria = scoreCriteria; + as.sortByFeatureCriteria = scoreCriteria; } } diff --git a/src/jalview/analysis/GeneticCodes.java b/src/jalview/analysis/GeneticCodes.java index 137b7f8..69a3846 100644 --- a/src/jalview/analysis/GeneticCodes.java +++ b/src/jalview/analysis/GeneticCodes.java @@ -12,13 +12,30 @@ import java.util.Map; import java.util.StringTokenizer; /** - * A singleton that provides instances of genetic code translation tables + * A static class that provides instances of genetic code translation tables * * @author gmcarstairs * @see https://www.ncbi.nlm.nih.gov/Taxonomy/Utils/wprintgc.cgi */ public final class GeneticCodes { + + /** + * As implemented, this has to be the first table defined in the data file. + */ + private static GeneticCodeI standardTable; + + /** + * + * @return the standard code table (table 1) + */ + public static GeneticCodeI getStandardCodeTable() + { + return (standardTable == null + ? standardTable = codeTables.values().iterator().next() + : standardTable); + } + private static final int CODON_LENGTH = 3; private static final String QUOTE = "\""; @@ -39,42 +56,31 @@ public final class GeneticCodes private static final String RESOURCE_FILE = "/GeneticCodes.dat"; - private static GeneticCodes instance = new GeneticCodes(); - - private Map ambiguityCodes; + private static final Map ambiguityCodes; /* * loaded code tables, with keys in order of loading */ - private Map codeTables; + private static final Map codeTables; - /** - * Private constructor enforces singleton - */ - private GeneticCodes() + static { - if (instance == null) - { - ambiguityCodes = new HashMap<>(); + ambiguityCodes = new HashMap<>(); - /* - * LinkedHashMap preserves order of addition of entries, - * so we can assume the Standard Code Table is the first - */ - codeTables = new LinkedHashMap<>(); - loadAmbiguityCodes(AMBIGUITY_CODES_FILE); - loadCodes(RESOURCE_FILE); - } + /* + * LinkedHashMap preserves order of addition of entries, + * so we can assume the Standard Code Table is the first + */ + codeTables = new LinkedHashMap<>(); + loadAmbiguityCodes(AMBIGUITY_CODES_FILE); + loadCodes(RESOURCE_FILE); } /** - * Returns the singleton instance of this class - * - * @return + * Private constructor enforces no instantiation */ - public static GeneticCodes getInstance() + private GeneticCodes() { - return instance; } /** @@ -82,41 +88,30 @@ public final class GeneticCodes * * @return */ - public Iterable getCodeTables() + public static Iterable getCodeTables() { return codeTables.values(); } /** - * Answers the code table with the given id + * Answers the code table with the given id -- test suite only * * @param id * @return */ - public GeneticCodeI getCodeTable(String id) + public static GeneticCodeI getCodeTable(String id) { return codeTables.get(id); } /** - * A convenience method that returns the standard code table (table 1). As - * implemented, this has to be the first table defined in the data file. - * - * @return - */ - public GeneticCodeI getStandardCodeTable() - { - return codeTables.values().iterator().next(); - } - - /** * Loads the code tables from a data file */ - protected void loadCodes(String fileName) + private static void loadCodes(String fileName) { try { - InputStream is = getClass().getResourceAsStream(fileName); + InputStream is = GeneticCodes.class.getResourceAsStream(fileName); if (is == null) { System.err.println("Resource file not found: " + fileName); @@ -163,11 +158,11 @@ public final class GeneticCodes * * @param fileName */ - protected void loadAmbiguityCodes(String fileName) + private static void loadAmbiguityCodes(String fileName) { try { - InputStream is = getClass().getResourceAsStream(fileName); + InputStream is = GeneticCodes.class.getResourceAsStream(fileName); if (is == null) { System.err.println("Resource file not found: " + fileName); @@ -209,7 +204,7 @@ public final class GeneticCodes * @return * @throws IOException */ - protected String readLine(BufferedReader dataIn) throws IOException + private static String readLine(BufferedReader dataIn) throws IOException { String line = dataIn.readLine(); while (line != null && line.startsWith("#")) @@ -247,7 +242,8 @@ public final class GeneticCodes * @return * @throws IOException */ - protected String loadOneTable(BufferedReader dataIn) throws IOException + private static String loadOneTable(BufferedReader dataIn) + throws IOException { String name = null; String id = null; @@ -307,7 +303,7 @@ public final class GeneticCodes * @param name * @param codons */ - protected void registerCodeTable(final String id, final String name, + private static void registerCodeTable(final String id, final String name, final Map codons) { codeTables.put(id, new GeneticCodeI() @@ -365,7 +361,7 @@ public final class GeneticCodes * @param codeTable * @return */ - protected String getAmbiguousTranslation(String codon, + protected static String getAmbiguousTranslation(String codon, Map ambiguous, GeneticCodeI codeTable) { if (codon.length() != CODON_LENGTH) @@ -423,4 +419,5 @@ public final class GeneticCodes ambiguous.put(codon, peptide); return peptide; } + } diff --git a/src/jalview/analysis/scoremodels/ScoreMatrix.java b/src/jalview/analysis/scoremodels/ScoreMatrix.java index b206339..c53ecdb 100644 --- a/src/jalview/analysis/scoremodels/ScoreMatrix.java +++ b/src/jalview/analysis/scoremodels/ScoreMatrix.java @@ -54,7 +54,8 @@ public class ScoreMatrix extends SimilarityScoreModel * score matrix (JAL-2397) * Set this flag to true (via Groovy) for 2.10.1 behaviour */ - private static boolean scoreGapAsAny = false; + // BH 2019.05.08 was static but not ever set + private boolean scoreGapAsAny = false; public static final short UNMAPPED = (short) -1; diff --git a/src/jalview/analysis/scoremodels/ScoreModels.java b/src/jalview/analysis/scoremodels/ScoreModels.java index ebc9a26..fd579dc 100644 --- a/src/jalview/analysis/scoremodels/ScoreModels.java +++ b/src/jalview/analysis/scoremodels/ScoreModels.java @@ -25,6 +25,7 @@ import jalview.api.analysis.ScoreModelI; import jalview.io.DataSourceType; import jalview.io.FileParse; import jalview.io.ScoreMatrixFile; +import jalview.util.Platform; import java.io.IOException; import java.util.LinkedHashMap; @@ -43,8 +44,6 @@ public class ScoreModels private static ScoreModels instance; - private Map models; - /** * Answers the singleton instance of this class, with lazy initialisation * (built-in score models are loaded on the first call to this method) @@ -53,13 +52,37 @@ public class ScoreModels */ public static ScoreModels getInstance() { - if (instance == null) + ScoreModels m = instance; + @SuppressWarnings("unused") + ThreadGroup g = null; + if (Platform.isJS()) { - instance = new ScoreModels(); + g = Thread.currentThread().getThreadGroup(); + /** + * @j2sNative m = g._jalviewScoreModelsInstance; + * + */ } - return instance; + if (m == null) + { + m = new ScoreModels(); + if (Platform.isJS()) + { + /** + * @j2sNative g._jalviewScoreModelsInstance = m; + * + */ + } + else + { + instance = m; + } + } + return m; } + private Map models; + /** * Private constructor to enforce use of singleton. Registers Jalview's * "built-in" score models: diff --git a/src/jalview/bin/ArgsParser.java b/src/jalview/bin/ArgsParser.java index c927f1f..2c6cea7 100644 --- a/src/jalview/bin/ArgsParser.java +++ b/src/jalview/bin/ArgsParser.java @@ -34,11 +34,58 @@ import java.util.Vector; */ public class ArgsParser { - Vector vargs = null; + + public static final String ANNOTATIONS = "annotations"; + + public static final String COLOUR = "colour"; + + public static final String FEATURES = "features"; + + public static final String GROOVY = "groovy"; + + public static final String GROUPS = "groups"; + + public static final String HEADLESS = "headless"; + + public static final String JABAWS = "jabaws"; + + public static final String NOANNOTATION = "no-annotation"; + + public static final String NOANNOTATION2 = "noannotation"; // BH 2019.05.07 + + public static final String NODISPLAY = "nodisplay"; + + public static final String NOGUI = "nogui"; + + public static final String NONEWS = "nonews"; + + public static final String NOQUESTIONNAIRE = "noquestionnaire"; + + public static final String NOSORTBYTREE = "nosortbytree"; + + public static final String NOUSAGESTATS = "nousagestats"; + + public static final String OPEN = "open"; + + public static final String PROPS = "props"; + + public static final String QUESTIONNAIRE = "questionnaire"; + + public static final String SETPROP = "setprop"; + + public static final String SORTBYTREE = "sortbytree"; + + public static final String TREE = "tree"; + + public static final String VDOC = "vdoc"; + + public static final String VSESS = "vsess"; + + private Vector vargs = null; public ArgsParser(String[] args) { - vargs = new Vector(); + vargs = new Vector<>(); for (int i = 0; i < args.length; i++) { String arg = args[i].trim(); diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java index b6ff253..fe136bc 100755 --- a/src/jalview/bin/Cache.java +++ b/src/jalview/bin/Cache.java @@ -417,9 +417,9 @@ public class Cache } if (authorDetails == null) { - applicationProperties.remove("AUTHORS"); - applicationProperties.remove("AUTHORFNAMES"); - applicationProperties.remove("YEAR"); + applicationProperties.remove("AUTHORS"); + applicationProperties.remove("AUTHORFNAMES"); + applicationProperties.remove("YEAR"); } // FIND THE VERSION NUMBER AND BUILD DATE FROM jalview.jar @@ -445,7 +445,7 @@ public class Cache } if (buildDetails == null) { - applicationProperties.remove("VERSION"); + applicationProperties.remove("VERSION"); } String jnlpVersion = System.getProperty("jalview.version"); String codeVersion = getProperty("VERSION"); @@ -493,9 +493,8 @@ public class Cache // "DEFAULT_PDB_FILE_PARSER", DEFAULT_PDB_FILE_PARSER)); // jnlpVersion will be null if we're using InstallAnywhere // Dont do this check if running in headless mode - if (jnlpVersion == null && getDefault("VERSION_CHECK", true) - && (System.getProperty("java.awt.headless") == null || System - .getProperty("java.awt.headless").equals("false"))) + if (jnlpVersion == null && !Jalview.isHeadlessMode() + && getDefault("VERSION_CHECK", true)) { class VersionChecker extends Thread diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index 694fe00..fcda026 100755 --- a/src/jalview/bin/Jalview.java +++ b/src/jalview/bin/Jalview.java @@ -92,13 +92,58 @@ public class Jalview Platform.getURLCommandArguments(); } - // singleton instance of this class + private boolean headless; + + public static boolean isHeadlessMode() + { + return getInstance().headless; + } + + /** + * singleton instance of this class in Java only + */ private static Jalview instance; + public static Jalview getInstance() + { + Jalview j; + @SuppressWarnings("unused") + ThreadGroup g = Thread.currentThread().getThreadGroup(); + /** + * @j2sNative j = g._jalviewInstance; + */ + { + j = instance; + } + return j; + } + + private static void setInstance(Jalview j) + { + @SuppressWarnings("unused") + ThreadGroup g = Thread.currentThread().getThreadGroup(); + /** + * @j2s g._jalviewInstance = j; + */ + { + instance = j; + } + } + private Desktop desktop; - public static AlignFrame currentAlignFrame; + private AlignFrame currentAlignFrame; + + public static AlignFrame getCurrentAlignFrame() + { + return getInstance().currentAlignFrame; + } + + public static void setCurrentAlignFrame(AlignFrame currentAlignFrame) + { + getInstance().currentAlignFrame = currentAlignFrame; + } static { @@ -110,21 +155,21 @@ public class Jalview */ { // grab all the rights we can for the JVM - Policy.setPolicy(new Policy() - { - @Override - public PermissionCollection getPermissions(CodeSource codesource) - { - Permissions perms = new Permissions(); - perms.add(new AllPermission()); - return (perms); - } - - @Override - public void refresh() - { - } - }); + Policy.setPolicy(new Policy() + { + @Override + public PermissionCollection getPermissions(CodeSource codesource) + { + Permissions perms = new Permissions(); + perms.add(new AllPermission()); + return (perms); + } + + @Override + public void refresh() + { + } + }); } } @@ -187,11 +232,6 @@ public class Jalview } - public static Jalview getInstance() - { - return instance; - } - /** * main class for Jalview application * @@ -200,23 +240,23 @@ public class Jalview */ public static void main(String[] args) { -// setLogging(); // BH - for event debugging in JavaScript - instance = new Jalview(); - instance.doMain(args); -} + // setLogging(); // BH - for event debugging in JavaScript + setInstance(new Jalview()); + getInstance().doMain(args); + } - private static void logClass(String name) - { - // BH - for event debugging in JavaScript - ConsoleHandler consoleHandler = new ConsoleHandler(); - consoleHandler.setLevel(Level.ALL); - Logger logger = Logger.getLogger(name); - logger.setLevel(Level.ALL); - logger.addHandler(consoleHandler); + private static void logClass(String name) + { + // BH - for event debugging in JavaScript + ConsoleHandler consoleHandler = new ConsoleHandler(); + consoleHandler.setLevel(Level.ALL); + Logger logger = Logger.getLogger(name); + logger.setLevel(Level.ALL); + logger.addHandler(consoleHandler); } @SuppressWarnings("unused") - private static void setLogging() + private static void setLogging() { /** @@ -227,26 +267,23 @@ public class Jalview System.out.println("not in js"); } - // BH - for event debugging in JavaScript (Java mode only) + // BH - for event debugging in JavaScript (Java mode only) if (!Platform.isJS()) /** * Java only * * @j2sIgnore */ - { - Logger.getLogger("").setLevel(Level.ALL); - logClass("java.awt.EventDispatchThread"); - logClass("java.awt.EventQueue"); - logClass("java.awt.Component"); - logClass("java.awt.focus.Component"); - logClass("java.awt.focus.DefaultKeyboardFocusManager"); - } + { + Logger.getLogger("").setLevel(Level.ALL); + logClass("java.awt.EventDispatchThread"); + logClass("java.awt.EventQueue"); + logClass("java.awt.Component"); + logClass("java.awt.focus.Component"); + logClass("java.awt.focus.DefaultKeyboardFocusManager"); + } } - - - /** * @param args @@ -266,10 +303,9 @@ public class Jalview + System.getProperty("os.version")); ArgsParser aparser = new ArgsParser(args); - boolean headless = false; - String usrPropsFile = aparser.getValue("props"); - Cache.loadProperties(usrPropsFile); // must do this before + String usrPropsFile = aparser.getValue(ArgsParser.PROPS); + Cache.loadProperties(usrPropsFile); if (usrPropsFile != null) { System.out.println( @@ -288,15 +324,17 @@ public class Jalview showUsage(); System.exit(0); } - if (aparser.contains("nodisplay") || aparser.contains("nogui") - || aparser.contains("headless")) + if (aparser.contains(ArgsParser.NODISPLAY) + || aparser.contains(ArgsParser.NOGUI) + || aparser.contains(ArgsParser.HEADLESS) + || "true".equals(System.getProperty("java.awt.headless"))) { - System.setProperty("java.awt.headless", "true"); headless = true; } + // anything else! - final String jabawsUrl = aparser.getValue("jabaws"); + final String jabawsUrl = aparser.getValue(ArgsParser.JABAWS); if (jabawsUrl != null) { try @@ -312,7 +350,8 @@ public class Jalview } } - String defs = aparser.getValue("setprop"); + // check for property setting + String defs = aparser.getValue(ArgsParser.SETPROP); while (defs != null) { int p = defs.indexOf('='); @@ -325,15 +364,10 @@ public class Jalview System.out.println("Executing setprop argument: " + defs); if (Platform.isJS()) { - Cache.setProperty(defs.substring(0,p), defs.substring(p+1)); + Cache.setProperty(defs.substring(0, p), defs.substring(p + 1)); } } - defs = aparser.getValue("setprop"); - } - if (System.getProperty("java.awt.headless") != null - && System.getProperty("java.awt.headless").equals("true")) - { - headless = true; + defs = aparser.getValue(ArgsParser.SETPROP); } System.setProperty("http.agent", "Jalview Desktop/" + Cache.getDefault("VERSION", "Unknown")); @@ -377,8 +411,9 @@ public class Jalview "Failed to set QuaQua look and feel: " + e.toString()); } } - if (lookAndFeel == null || !(lookAndFeel.getClass() - .isAssignableFrom(UIManager.getLookAndFeel().getClass())) + if (lookAndFeel == null + || !(lookAndFeel.getClass().isAssignableFrom( + UIManager.getLookAndFeel().getClass())) || !UIManager.getLookAndFeel().getClass().toString() .toLowerCase().contains("quaqua")) { @@ -406,16 +441,7 @@ public class Jalview if (!headless) { - desktop = new Desktop() -// { -// // BH testing -// @Override -// protected void processEvent(AWTEvent e) { -// System.out.println("Jalview.java " + e); -// super.processEvent(e); -// } -// } - ; + desktop = new Desktop(); desktop.setInBatchMode(true); // indicate we are starting up desktop.setVisible(true); @@ -427,7 +453,7 @@ public class Jalview */ { desktop.startServiceDiscovery(); - if (!aparser.contains("nousagestats")) + if (!aparser.contains(ArgsParser.NOUSAGESTATS)) { startUsageStats(desktop); } @@ -436,9 +462,9 @@ public class Jalview System.err.println("CMD [-nousagestats] executed successfully!"); } - if (!aparser.contains("noquestionnaire")) + if (!aparser.contains(ArgsParser.NOQUESTIONNAIRE)) { - String url = aparser.getValue("questionnaire"); + String url = aparser.getValue(ArgsParser.QUESTIONNAIRE); if (url != null) { // Start the desktop questionnaire prompter with the specified @@ -470,7 +496,7 @@ public class Jalview .println("CMD [-noquestionnaire] executed successfully!"); } - if (!aparser.contains("nonews")) + if (!aparser.contains(ArgsParser.NONEWS)) { desktop.checkForNews(); } @@ -479,24 +505,24 @@ public class Jalview } } - String file = null, data = null; + String data = null; FileFormatI format = null; DataSourceType protocol = null; FileLoader fileLoader = new FileLoader(!headless); - String groovyscript = null; // script to execute after all loading is + // script to execute after all loading is // completed one way or another // extract groovy argument and execute if necessary - groovyscript = aparser.getValue("groovy", true); - file = aparser.getValue("open", true); + String groovyscript = aparser.getValue(ArgsParser.GROOVY, true); + String file = aparser.getValue(ArgsParser.OPEN, true); if (file == null && desktop == null) { System.out.println("No files to open!"); System.exit(1); } - String vamsasImport = aparser.getValue("vdoc"); - String vamsasSession = aparser.getValue("vsess"); + String vamsasImport = aparser.getValue(ArgsParser.VDOC); + String vamsasSession = aparser.getValue(ArgsParser.VSESS); if (vamsasImport != null || vamsasSession != null) { if (desktop == null || headless) @@ -594,11 +620,12 @@ public class Jalview System.out.println("CMD [-open " + file + "] executed successfully!"); if (!Platform.isJS()) - /** - * ignore in JavaScript -- can't just file existence - could load it? - * - * @j2sIgnore - */ + /** + * ignore in JavaScript -- can't just check file existence - could load + * it? + * + * @j2sIgnore + */ { if (!file.startsWith("http://") && !file.startsWith("https://")) // BH 2019 added https check for Java @@ -614,7 +641,7 @@ public class Jalview } } - protocol = AppletFormatAdapter.checkProtocol(file); + protocol = AppletFormatAdapter.checkProtocol(file); try { @@ -633,14 +660,13 @@ public class Jalview else { setCurrentAlignFrame(af); - data = aparser.getValue("colour", true); + data = aparser.getValue(ArgsParser.COLOUR, true); if (data != null) { data.replaceAll("%20", " "); - ColourSchemeI cs = ColourSchemeProperty - .getColourScheme(af.getViewport(), - af.getViewport().getAlignment(), data); + ColourSchemeI cs = ColourSchemeProperty.getColourScheme( + af.getViewport(), af.getViewport().getAlignment(), data); if (cs != null) { @@ -651,7 +677,7 @@ public class Jalview } // Must maintain ability to use the groups flag - data = aparser.getValue("groups", true); + data = aparser.getValue(ArgsParser.GROUPS, true); if (data != null) { af.parseFeaturesFile(data, @@ -660,7 +686,7 @@ public class Jalview System.out.println( "CMD groups[-" + data + "] executed successfully!"); } - data = aparser.getValue("features", true); + data = aparser.getValue(ArgsParser.FEATURES, true); if (data != null) { af.parseFeaturesFile(data, @@ -670,7 +696,7 @@ public class Jalview "CMD [-features " + data + "] executed successfully!"); } - data = aparser.getValue("annotations", true); + data = aparser.getValue(ArgsParser.ANNOTATIONS, true); if (data != null) { af.loadJalviewDataFile(data, null, null, null); @@ -679,7 +705,7 @@ public class Jalview "CMD [-annotations " + data + "] executed successfully!"); } // set or clear the sortbytree flag. - if (aparser.contains("sortbytree")) + if (aparser.contains(ArgsParser.SORTBYTREE)) { af.getViewport().setSortByTree(true); if (af.getViewport().getSortByTree()) @@ -687,7 +713,8 @@ public class Jalview System.out.println("CMD [-sortbytree] executed successfully!"); } } - if (aparser.contains("no-annotation")) + if (aparser.contains(ArgsParser.NOANNOTATION) + || aparser.contains(ArgsParser.NOANNOTATION2)) { af.getViewport().setShowAnnotation(false); if (!af.getViewport().isShowAnnotation()) @@ -695,7 +722,7 @@ public class Jalview System.out.println("CMD no-annotation executed successfully!"); } } - if (aparser.contains("nosortbytree")) + if (aparser.contains(ArgsParser.NOSORTBYTREE)) { af.getViewport().setSortByTree(false); if (!af.getViewport().getSortByTree()) @@ -704,7 +731,7 @@ public class Jalview .println("CMD [-nosortbytree] executed successfully!"); } } - data = aparser.getValue("tree", true); + data = aparser.getValue(ArgsParser.TREE, true); if (data != null) { try @@ -737,6 +764,10 @@ public class Jalview String imageName = "unnamed.png"; while (aparser.getSize() > 1) { + // PNG filename + // SVG filename + // HTML filename + // biojsmsa filename String outputFormat = aparser.nextValue(); file = aparser.nextValue(); @@ -951,8 +982,9 @@ public class Jalview /** * start a User Config prompt asking if we can log usage statistics. */ - PromptUserConfig prompter = new PromptUserConfig(Desktop.desktop, - "USAGESTATS", "Jalview Usage Statistics", + PromptUserConfig prompter = new PromptUserConfig( + Desktop.getDesktopPane(), "USAGESTATS", + "Jalview Usage Statistics", "Do you want to help make Jalview better by enabling " + "the collection of usage statistics with Google Analytics ?" + "\n\n(you can enable or disable usage tracking in the preferences)", @@ -1095,16 +1127,6 @@ public class Jalview } } - public static boolean isHeadlessMode() - { - String isheadless = System.getProperty("java.awt.headless"); - if (isheadless != null && isheadless.equalsIgnoreCase("true")) - { - return true; - } - return false; - } - public AlignFrame[] getAlignFrames() { return desktop == null ? new AlignFrame[] { getCurrentAlignFrame() } @@ -1128,13 +1150,4 @@ public class Jalview } } - public static AlignFrame getCurrentAlignFrame() - { - return Jalview.currentAlignFrame; - } - - public static void setCurrentAlignFrame(AlignFrame currentAlignFrame) - { - Jalview.currentAlignFrame = currentAlignFrame; - } } diff --git a/src/jalview/gui/AlignExportOptions.java b/src/jalview/gui/AlignExportOptions.java index 70601c9..3a8fb7c 100644 --- a/src/jalview/gui/AlignExportOptions.java +++ b/src/jalview/gui/AlignExportOptions.java @@ -96,7 +96,7 @@ public class AlignExportOptions extends JPanel this.settings = defaults; this.isComplexAlignFile = format.isComplexAlignFile(); init(viewport.hasHiddenRows(), viewport.hasHiddenColumns()); - dialog = JvOptionPane.newOptionDialog(Desktop.desktop); + dialog = JvOptionPane.newOptionDialog(Desktop.getDesktopPane()); } /** diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index 27a0f76..594319f 100644 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -392,7 +392,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, }); buildColourMenu(); - if (Desktop.desktop != null) + if (Desktop.getDesktopPane() != null) { this.setDropTarget(new java.awt.dnd.DropTarget(this, this)); if (!Platform.isJS()) @@ -815,7 +815,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, private void addServiceListeners() { final java.beans.PropertyChangeListener thisListener; - Desktop.instance.addJalviewPropertyChangeListener("services", + Desktop.getInstance().addJalviewPropertyChangeListener("services", thisListener = new java.beans.PropertyChangeListener() { @Override @@ -846,7 +846,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, javax.swing.event.InternalFrameEvent evt) { // System.out.println("deregistering discoverer listener"); - Desktop.instance.removeJalviewPropertyChangeListener("services", + Desktop.getInstance().removeJalviewPropertyChangeListener("services", thisListener); closeMenuItem_actionPerformed(true); } @@ -1027,7 +1027,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, @Override public void addFromFile_actionPerformed(ActionEvent e) { - Desktop.instance.inputLocalFileMenuItem_actionPerformed(viewport); + Desktop.getInstance().inputLocalFileMenuItem_actionPerformed(viewport); } @Override @@ -1041,7 +1041,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, // file is reloaded. if (FileFormat.Jalview.equals(currentFileFormat)) { - JInternalFrame[] frames = Desktop.desktop.getAllFrames(); + JInternalFrame[] frames = Desktop.getDesktopPane().getAllFrames(); for (int i = 0; i < frames.length; i++) { if (frames[i] instanceof AlignFrame && frames[i] != this @@ -1051,14 +1051,14 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, try { frames[i].setSelected(true); - Desktop.instance.closeAssociatedWindows(); + Desktop.getInstance().closeAssociatedWindows(); } catch (java.beans.PropertyVetoException ex) { } } } - Desktop.instance.closeAssociatedWindows(); + Desktop.getInstance().closeAssociatedWindows(); FileLoader loader = new FileLoader(); DataSourceType protocol = fileName.startsWith("http:") @@ -1116,14 +1116,14 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, @Override public void addFromText_actionPerformed(ActionEvent e) { - Desktop.instance + Desktop.getInstance() .inputTextboxMenuItem_actionPerformed(viewport.getAlignPanel()); } @Override public void addFromURL_actionPerformed(ActionEvent e) { - Desktop.instance.inputURLMenuItem_actionPerformed(viewport); + Desktop.getInstance().inputURLMenuItem_actionPerformed(viewport); } @Override @@ -1167,7 +1167,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, // todo is this (2005) test now obsolete - value is never null? while (currentFileFormat == null) { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager .getString("label.select_file_format_before_saving"), MessageManager.getString("label.file_format_not_specified"), @@ -1939,7 +1939,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, .setContents(new StringSelection(""), null); Toolkit.getDefaultToolkit().getSystemClipboard().setContents(ss, - Desktop.instance); + Desktop.getInstance()); } catch (OutOfMemoryError er) { new OOMWarning("copying region", er); @@ -2439,7 +2439,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, + 1) == viewport.getAlignment().getWidth()) ? true : false; if (wholeHeight && wholeWidth) { - JvOptionPane dialog = JvOptionPane.newOptionDialog(Desktop.desktop); + JvOptionPane dialog = JvOptionPane.newOptionDialog(Desktop.getDesktopPane()); dialog.setResponseHandler(0, okAction); // 0 = OK_OPTION Object[] options = new Object[] { MessageManager.getString("action.ok"), MessageManager.getString("action.cancel") }; @@ -2913,7 +2913,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, @Override public void gatherViews_actionPerformed(ActionEvent e) { - Desktop.instance.gatherViews(this); + Desktop.getInstance().gatherViews(this); } /** @@ -3690,7 +3690,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, { if (_s.getLength() < sg.getEndRes()) { - JvOptionPane.showMessageDialog(Desktop.desktop, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), MessageManager.getString( "label.selected_region_to_tree_may_only_contain_residues_or_gaps"), MessageManager.getString( @@ -4012,7 +4012,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, viewport.setCurrentTree(showNewickTree(fin, filePath).getTree()); } catch (Exception ex) { - JvOptionPane.showMessageDialog(Desktop.desktop, ex.getMessage(), + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), ex.getMessage(), MessageManager .getString("label.problem_reading_tree_file"), JvOptionPane.WARNING_MESSAGE); @@ -4020,7 +4020,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, } if (fin != null && fin.hasWarningMessage()) { - JvOptionPane.showMessageDialog(Desktop.desktop, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), fin.getWarningMessage(), MessageManager.getString( "label.possible_problem_with_tree_file"), @@ -4400,7 +4400,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, final String errorTitle = MessageManager .getString("label.implementation_error") + MessageManager.getString("label.translation_failed"); - JvOptionPane.showMessageDialog(Desktop.desktop, msg, errorTitle, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), msg, errorTitle, JvOptionPane.ERROR_MESSAGE); return; } @@ -4410,7 +4410,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, "label.select_at_least_three_bases_in_at_least_one_sequence_to_cDNA_translation"); final String errorTitle = MessageManager .getString("label.translation_failed"); - JvOptionPane.showMessageDialog(Desktop.desktop, msg, errorTitle, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), msg, errorTitle, JvOptionPane.WARNING_MESSAGE); } else @@ -4626,7 +4626,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, PDBEntry pe = new AssociatePdbFileWithSeq() .associatePdbWithSeq(fm[0].toString(), (DataSourceType) fm[1], toassoc, false, - Desktop.instance); + Desktop.getInstance()); if (pe != null) { System.err.println("Associated file : " @@ -4737,7 +4737,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, { // some problem - if no warning its probable that the ID matching // process didn't work - JvOptionPane.showMessageDialog(Desktop.desktop, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), tcf.getWarningMessage() == null ? MessageManager.getString( "label.check_file_matches_sequence_ids_alignment") @@ -4830,7 +4830,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, + (format != null ? "(parsing as '" + format + "' file)" : ""), - oom, Desktop.desktop); + oom, Desktop.getDesktopPane()); } } @@ -5639,7 +5639,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, } catch (Exception ex) { System.err.println((ex.toString())); - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager.getString("label.couldnt_run_groovy_script"), MessageManager.getString("label.groovy_support_failed"), JvOptionPane.ERROR_MESSAGE); diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java index 7d01222..5f56fd9 100644 --- a/src/jalview/gui/AlignViewport.java +++ b/src/jalview/gui/AlignViewport.java @@ -384,7 +384,7 @@ public class AlignViewport extends AlignmentViewport if (align != null) { StructureSelectionManager ssm = StructureSelectionManager - .getStructureSelectionManager(Desktop.instance); + .getStructureSelectionManager(Desktop.getInstance()); ssm.registerMappings(align.getCodonFrames()); } @@ -406,7 +406,7 @@ public class AlignViewport extends AlignmentViewport if (mappings != null) { StructureSelectionManager ssm = StructureSelectionManager - .getStructureSelectionManager(Desktop.instance); + .getStructureSelectionManager(Desktop.getInstance()); for (AlignedCodonFrame acf : mappings) { if (noReferencesTo(acf)) @@ -532,7 +532,7 @@ public class AlignViewport extends AlignmentViewport public void sendSelection() { jalview.structure.StructureSelectionManager - .getStructureSelectionManager(Desktop.instance) + .getStructureSelectionManager(Desktop.getInstance()) .sendSelection(new SequenceGroup(getSelectionGroup()), new ColumnSelection(getColumnSelection()), new HiddenColumns(getAlignment().getHiddenColumns()), @@ -578,7 +578,7 @@ public class AlignViewport extends AlignmentViewport public StructureSelectionManager getStructureSelectionManager() { return StructureSelectionManager - .getStructureSelectionManager(Desktop.instance); + .getStructureSelectionManager(Desktop.getInstance()); } @Override @@ -770,7 +770,7 @@ public class AlignViewport extends AlignmentViewport * dialog responses 0, 1, 2 (even though JOptionPane shows them * in reverse order) */ - JvOptionPane dialog = JvOptionPane.newOptionDialog(Desktop.desktop) + JvOptionPane dialog = JvOptionPane.newOptionDialog(Desktop.getDesktopPane()) .setResponseHandler(0, new Runnable() { @Override diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java index 9cb690f..20d06e9 100644 --- a/src/jalview/gui/AlignmentPanel.java +++ b/src/jalview/gui/AlignmentPanel.java @@ -1376,8 +1376,7 @@ public class AlignmentPanel extends GAlignmentPanel implements { int seqPanelWidth = getSeqPanel().seqCanvas.getWidth(); - if (System.getProperty("java.awt.headless") != null - && System.getProperty("java.awt.headless").equals("true")) + if (Jalview.isHeadlessMode()) { seqPanelWidth = alignFrame.getWidth() - getVisibleIdWidth() - vscroll.getPreferredSize().width diff --git a/src/jalview/gui/AnnotationColourChooser.java b/src/jalview/gui/AnnotationColourChooser.java index e89c1c2..bd05be1 100644 --- a/src/jalview/gui/AnnotationColourChooser.java +++ b/src/jalview/gui/AnnotationColourChooser.java @@ -301,7 +301,7 @@ public class AnnotationColourChooser extends AnnotationRowFilter updateView(); } }; - JalviewColourChooser.showColourChooser(Desktop.getDesktop(), ttl, + JalviewColourChooser.showColourChooser(Desktop.getDesktopPane(), ttl, colourPanel.getBackground(), listener); } diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java index a0a0df8..399f70f 100755 --- a/src/jalview/gui/AnnotationLabels.java +++ b/src/jalview/gui/AnnotationLabels.java @@ -971,7 +971,7 @@ public class AnnotationLabels extends JPanel seqs, omitHidden, alignmentStartEnd); Toolkit.getDefaultToolkit().getSystemClipboard() - .setContents(new StringSelection(output), Desktop.instance); + .setContents(new StringSelection(output), Desktop.getInstance()); HiddenColumns hiddenColumns = null; diff --git a/src/jalview/gui/AppJmol.java b/src/jalview/gui/AppJmol.java index 7179a18..b88ac35 100644 --- a/src/jalview/gui/AppJmol.java +++ b/src/jalview/gui/AppJmol.java @@ -546,7 +546,7 @@ public class AppJmol extends StructureViewerBase } if (errormsgs.length() > 0) { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager.formatMessage( "label.pdb_entries_couldnt_be_retrieved", new String[] { errormsgs.toString() }), diff --git a/src/jalview/gui/AssociatePdbFileWithSeq.java b/src/jalview/gui/AssociatePdbFileWithSeq.java index fe0aedf..154582f 100644 --- a/src/jalview/gui/AssociatePdbFileWithSeq.java +++ b/src/jalview/gui/AssociatePdbFileWithSeq.java @@ -65,7 +65,7 @@ public class AssociatePdbFileWithSeq if (prompt) { - reply = JvOptionPane.showInternalInputDialog(Desktop.desktop, + reply = JvOptionPane.showInternalInputDialog(Desktop.getDesktopPane(), MessageManager .getString("label.couldnt_find_pdb_id_in_file"), MessageManager.getString("label.no_pdb_id_in_file"), diff --git a/src/jalview/gui/CalculationChooser.java b/src/jalview/gui/CalculationChooser.java index 097a5a0..093eb48 100644 --- a/src/jalview/gui/CalculationChooser.java +++ b/src/jalview/gui/CalculationChooser.java @@ -545,7 +545,7 @@ public class CalculationChooser extends JPanel SequenceGroup sg = viewport.getSelectionGroup(); if (sg != null && sg.getSize() < MIN_TREE_SELECTION) { - JvOptionPane.showMessageDialog(Desktop.desktop, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), MessageManager.formatMessage( "label.you_need_at_least_n_sequences", MIN_TREE_SELECTION), diff --git a/src/jalview/gui/ChimeraViewFrame.java b/src/jalview/gui/ChimeraViewFrame.java index 9167c00..fff1eed 100644 --- a/src/jalview/gui/ChimeraViewFrame.java +++ b/src/jalview/gui/ChimeraViewFrame.java @@ -336,7 +336,7 @@ public class ChimeraViewFrame extends StructureViewerBase if (!jmb.launchChimera()) { - JvOptionPane.showMessageDialog(Desktop.desktop, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), MessageManager.getString("label.chimera_failed"), MessageManager.getString("label.error_loading_file"), JvOptionPane.ERROR_MESSAGE); @@ -497,7 +497,7 @@ public class ChimeraViewFrame extends StructureViewerBase if (errormsgs.length() > 0) { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager.formatMessage( "label.pdb_entries_couldnt_be_retrieved", new Object[] { errormsgs.toString() }), diff --git a/src/jalview/gui/ColourMenuHelper.java b/src/jalview/gui/ColourMenuHelper.java index 6eab07d..6d0d0c9 100644 --- a/src/jalview/gui/ColourMenuHelper.java +++ b/src/jalview/gui/ColourMenuHelper.java @@ -158,7 +158,7 @@ public class ColourMenuHelper ActionListener al = radioItem.getActionListeners()[0]; radioItem.removeActionListener(al); int option = JvOptionPane.showInternalConfirmDialog( - Desktop.desktop, + Desktop.getDesktopPane(), MessageManager .getString("label.remove_from_default_list"), MessageManager diff --git a/src/jalview/gui/CrossRefAction.java b/src/jalview/gui/CrossRefAction.java index b5275e8..1feb15a 100644 --- a/src/jalview/gui/CrossRefAction.java +++ b/src/jalview/gui/CrossRefAction.java @@ -437,7 +437,7 @@ public class CrossRefAction implements Runnable .setGapCharacter(alignFrame.viewport.getGapCharacter()); StructureSelectionManager ssm = StructureSelectionManager - .getStructureSelectionManager(Desktop.instance); + .getStructureSelectionManager(Desktop.getInstance()); /* * register any new mappings for sequence mouseover etc diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java index d328a0d..4badcba 100644 --- a/src/jalview/gui/CutAndPasteTransfer.java +++ b/src/jalview/gui/CutAndPasteTransfer.java @@ -234,7 +234,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer .println(MessageManager.getString("label.couldnt_read_data")); if (!Jalview.isHeadlessMode()) { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), AppletFormatAdapter.getSupportedFormats(), MessageManager.getString("label.couldnt_read_data"), JvOptionPane.WARNING_MESSAGE); @@ -253,7 +253,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer } catch (IOException ex) { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, MessageManager + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager .formatMessage("label.couldnt_read_pasted_text", new String[] { ex.toString() }), MessageManager.getString("label.error_parsing_text"), @@ -342,7 +342,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer .println(MessageManager.getString("label.couldnt_read_data")); if (!Jalview.isHeadlessMode()) { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), AppletFormatAdapter.getSupportedFormats(), MessageManager.getString("label.couldnt_read_data"), JvOptionPane.WARNING_MESSAGE); diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index cd8330a..d2967d7 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -20,8 +20,6 @@ */ package jalview.gui; -import static jalview.util.UrlConstants.SEQUENCE_ID; - import jalview.api.AlignViewportI; import jalview.api.AlignmentViewPanel; import jalview.bin.Cache; @@ -134,26 +132,27 @@ import org.stackoverflowusers.file.WindowsShortcut; * @author $author$ * @version $Revision: 1.155 $ */ +@SuppressWarnings("serial") public class Desktop extends jalview.jbgui.GDesktop implements DropTargetListener, ClipboardOwner, IProgressIndicator, jalview.api.StructureSelectionManagerProvider { - private static int DEFAULT_MIN_WIDTH = 300; + private final static int DEFAULT_MIN_WIDTH = 300; - private static int DEFAULT_MIN_HEIGHT = 250; + private final static int DEFAULT_MIN_HEIGHT = 250; - private static int ALIGN_FRAME_DEFAULT_MIN_WIDTH = 600; + private final static int ALIGN_FRAME_DEFAULT_MIN_WIDTH = 600; - private static int ALIGN_FRAME_DEFAULT_MIN_HEIGHT = 70; + private final static int ALIGN_FRAME_DEFAULT_MIN_HEIGHT = 70; - private static final String EXPERIMENTAL_FEATURES = "EXPERIMENTAL_FEATURES"; + private final static String EXPERIMENTAL_FEATURES = "EXPERIMENTAL_FEATURES"; private JalviewChangeSupport changeSupport = new JalviewChangeSupport(); /** * news reader - null if it was never started. */ - private BlogReader jvnews = null; + BlogReader jvnews = null; private File projectFile; @@ -192,16 +191,47 @@ public class Desktop extends jalview.jbgui.GDesktop listener); } - /** Singleton Desktop instance */ - public static Desktop instance; + /** + * Singleton Desktop instance only in Java; + */ + private static Desktop instance; - public static MyDesktopPane desktop; + public static Desktop getInstance() + { + Desktop d; + @SuppressWarnings("unused") + ThreadGroup g = Thread.currentThread().getThreadGroup(); + /** + * @j2sNative d = g._jalviewDesktopInstance; + */ + { + d = instance; + } + return d; + } - public static MyDesktopPane getDesktop() + private static void setInstance(Desktop d) { - // BH 2018 could use currentThread() here as a reference to a - // Hashtable in JavaScript - return desktop; + @SuppressWarnings("unused") + ThreadGroup g = Thread.currentThread().getThreadGroup(); + /** + * @j2s g._jalviewDesktopInstance = d; + */ + { + instance = d; + } + } + + private MyDesktopPane desktopPane; + + public static MyDesktopPane getDesktopPane() + { + return getInstance().desktopPane; + } + + private void setDesktopPane(MyDesktopPane pane) + { + getInstance().desktopPane = pane; } static int openFrameCount = 0; @@ -237,7 +267,7 @@ public class Desktop extends jalview.jbgui.GDesktop } catch (NullPointerException npe) { Point p = getMousePosition(); - instance.showPasteMenu(p.x, p.y); + getInstance().showPasteMenu(p.x, p.y); } } @@ -285,14 +315,14 @@ public class Desktop extends jalview.jbgui.GDesktop public void endDraggingFrame(JComponent f) { delegate.endDraggingFrame(f); - desktop.repaint(); + getDesktopPane().repaint(); } @Override public void endResizingFrame(JComponent f) { delegate.endResizingFrame(f); - desktop.repaint(); + getDesktopPane().repaint(); } @Override @@ -352,7 +382,7 @@ public class Desktop extends jalview.jbgui.GDesktop * block are spawned off as threads rather than waited for during this * constructor. */ - instance = this; + setInstance(this); if (!Platform.isJS()) { doVamsasClientCheck(); @@ -365,10 +395,10 @@ public class Desktop extends jalview.jbgui.GDesktop false); boolean showjconsole = jalview.bin.Cache.getDefault("SHOW_JAVA_CONSOLE", false); - desktop = new MyDesktopPane(selmemusage); + setDesktopPane(new MyDesktopPane(selmemusage)); showMemusage.setSelected(selmemusage); - desktop.setBackground(Color.white); + getDesktopPane().setBackground(Color.white); getContentPane().setLayout(new BorderLayout()); // alternate config - have scrollbars - see notes in JAL-153 // JScrollPane sp = new JScrollPane(); @@ -381,17 +411,17 @@ public class Desktop extends jalview.jbgui.GDesktop getRootPane().putClientProperty("swingjs.overflow.hidden", "false"); } - getContentPane().add(desktop, BorderLayout.CENTER); - desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE); + getContentPane().add(getDesktopPane(), BorderLayout.CENTER); + getDesktopPane().setDragMode(JDesktopPane.OUTLINE_DRAG_MODE); // This line prevents Windows Look&Feel resizing all new windows to maximum // if previous window was maximised - desktop.setDesktopManager(new MyDesktopManager( + getDesktopPane().setDesktopManager(new MyDesktopManager( (Platform.isWindowsAndNotJS() ? new DefaultDesktopManager() : Platform.isAMacAndNotJS() ? new AquaInternalFrameManager( - desktop.getDesktopManager()) - : desktop.getDesktopManager()))); + getDesktopPane().getDesktopManager()) + : getDesktopPane().getDesktopManager()))); Rectangle dims = getLastKnownDimensions(""); if (dims != null) @@ -480,7 +510,7 @@ public class Desktop extends jalview.jbgui.GDesktop } - this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this)); + this.setDropTarget(new java.awt.dnd.DropTarget(getDesktopPane(), this)); this.addWindowListener(new WindowAdapter() { @@ -512,7 +542,7 @@ public class Desktop extends jalview.jbgui.GDesktop } } }); - desktop.addMouseListener(ma); + getDesktopPane().addMouseListener(ma); } @@ -577,10 +607,10 @@ public class Desktop extends jalview.jbgui.GDesktop public void run() { Cache.log.debug("Downloading data from identifiers.org"); - UrlDownloadClient client = new UrlDownloadClient(); + // UrlDownloadClient client = new UrlDownloadClient(); try { - client.download(IdOrgSettings.getUrl(), + UrlDownloadClient.download(IdOrgSettings.getUrl(), IdOrgSettings.getDownloadLocation()); } catch (IOException e) { @@ -598,7 +628,7 @@ public class Desktop extends jalview.jbgui.GDesktop showNews(showNews.isSelected()); } - void showNews(boolean visible) + protected void showNews(boolean visible) { Cache.log.debug((visible ? "Showing" : "Hiding") + " news."); showNews.setSelected(visible); @@ -610,10 +640,10 @@ public class Desktop extends jalview.jbgui.GDesktop public void run() { long now = System.currentTimeMillis(); - Desktop.instance.setProgressBar( + Desktop.getInstance().setProgressBar( MessageManager.getString("status.refreshing_news"), now); jvnews.refreshNews(); - Desktop.instance.setProgressBar(null, now); + Desktop.getInstance().setProgressBar(null, now); jvnews.showNews(); } }).start(); @@ -718,7 +748,7 @@ public class Desktop extends jalview.jbgui.GDesktop } } - void showPasteMenu(int x, int y) + protected void showPasteMenu(int x, int y) { JPopupMenu popup = new JPopupMenu(); JMenuItem item = new JMenuItem( @@ -860,8 +890,7 @@ public class Desktop extends jalview.jbgui.GDesktop // A HEADLESS STATE WHEN NO DESKTOP EXISTS. MUST RETURN // IF JALVIEW IS RUNNING HEADLESS // /////////////////////////////////////////////// - if (instance == null || (System.getProperty("java.awt.headless") != null - && System.getProperty("java.awt.headless").equals("true"))) + if (instance == null || Jalview.isHeadlessMode()) { return; } @@ -901,13 +930,13 @@ public class Desktop extends jalview.jbgui.GDesktop * add an entry for the new frame in the Window menu * (and remove it when the frame is closed) */ - final JMenuItem menuItem = new JMenuItem(title); + JMenuItem menuItem = new JMenuItem(title); frame.addInternalFrameListener(new InternalFrameAdapter() { @Override public void internalFrameActivated(InternalFrameEvent evt) { - JInternalFrame itf = desktop.getSelectedFrame(); + JInternalFrame itf = getDesktopPane().getSelectedFrame(); if (itf != null) { if (itf instanceof AlignFrame) @@ -939,7 +968,7 @@ public class Desktop extends jalview.jbgui.GDesktop { menuItem.removeActionListener(menuItem.getActionListeners()[0]); } - windowMenu.remove(menuItem); + getInstance().windowMenu.remove(menuItem); }; }); @@ -961,9 +990,9 @@ public class Desktop extends jalview.jbgui.GDesktop setKeyBindings(frame); - desktop.add(frame); + getDesktopPane().add(frame); - windowMenu.add(menuItem); + getInstance().windowMenu.add(menuItem); frame.toFront(); try @@ -988,7 +1017,6 @@ public class Desktop extends jalview.jbgui.GDesktop */ private static void setKeyBindings(JInternalFrame frame) { - @SuppressWarnings("serial") final Action closeAction = new AbstractAction() { @Override @@ -1256,7 +1284,8 @@ public class Desktop extends jalview.jbgui.GDesktop { String msg = MessageManager .formatMessage("label.couldnt_locate", url); - JvOptionPane.showInternalMessageDialog(Desktop.desktop, msg, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), + msg, MessageManager.getString("label.url_not_found"), JvOptionPane.WARNING_MESSAGE); @@ -1277,7 +1306,8 @@ public class Desktop extends jalview.jbgui.GDesktop }; String dialogOption = MessageManager .getString("label.input_alignment_from_url"); - JvOptionPane.newOptionDialog(desktop).setResponseHandler(0, action) + JvOptionPane.newOptionDialog(getDesktopPane()) + .setResponseHandler(0, action) .showInternalDialog(panel, dialogOption, JvOptionPane.YES_NO_CANCEL_OPTION, JvOptionPane.PLAIN_MESSAGE, null, options, @@ -1363,7 +1393,7 @@ public class Desktop extends jalview.jbgui.GDesktop public void aboutMenuItem_actionPerformed(ActionEvent e) { // StringBuffer message = getAboutMessage(false); - // JvOptionPane.showInternalMessageDialog(Desktop.desktop, + // JvOptionPane.showInternalMessageDialog(Desktop.getDesktop(), // // message.toString(), "About Jalview", JvOptionPane.INFORMATION_MESSAGE); new Thread(new Runnable() @@ -1473,7 +1503,7 @@ public class Desktop extends jalview.jbgui.GDesktop public void closeAll_actionPerformed(ActionEvent e) { // TODO show a progress bar while closing? - JInternalFrame[] frames = desktop.getAllFrames(); + JInternalFrame[] frames = getDesktopPane().getAllFrames(); for (int i = 0; i < frames.length; i++) { try @@ -1544,7 +1574,7 @@ public class Desktop extends jalview.jbgui.GDesktop @Override protected void showMemusage_actionPerformed(ActionEvent e) { - desktop.showMemoryUsage(showMemusage.isSelected()); + getDesktopPane().showMemoryUsage(showMemusage.isSelected()); } /* @@ -1581,7 +1611,7 @@ public class Desktop extends jalview.jbgui.GDesktop void reorderAssociatedWindows(boolean minimize, boolean close) { - JInternalFrame[] frames = desktop.getAllFrames(); + JInternalFrame[] frames = getDesktopPane().getAllFrames(); if (frames == null || frames.length < 1) { return; @@ -1765,7 +1795,7 @@ public class Desktop extends jalview.jbgui.GDesktop saveState_actionPerformed(true); } - private void setProjectFile(File choice) + protected void setProjectFile(File choice) { this.projectFile = choice; } @@ -1815,7 +1845,7 @@ public class Desktop extends jalview.jbgui.GDesktop { Cache.log.error( "Problems whilst loading project from " + choice, ex); - JvOptionPane.showMessageDialog(Desktop.desktop, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), MessageManager.formatMessage( "label.error_whilst_loading_project_from", new Object[] @@ -1925,7 +1955,7 @@ public class Desktop extends jalview.jbgui.GDesktop */ public static AlignmentPanel[] getAlignmentPanels(String alignmentId) { - if (Desktop.desktop == null) + if (Desktop.getDesktopPane() == null) { // no frames created and in headless mode // TODO: verify that frames are recoverable when in headless mode @@ -1967,7 +1997,7 @@ public class Desktop extends jalview.jbgui.GDesktop public static AlignmentViewport[] getViewports(String sequenceSetId) { List viewp = new ArrayList<>(); - if (desktop != null) + if (getDesktopPane() != null) { AlignFrame[] frames = Desktop.getAlignFrames(); @@ -2053,7 +2083,7 @@ public class Desktop extends jalview.jbgui.GDesktop { source.viewport.setGatherViewsHere(true); source.viewport.setExplodedGeometry(source.getBounds()); - JInternalFrame[] frames = desktop.getAllFrames(); + JInternalFrame[] frames = getDesktopPane().getAllFrames(); String viewId = source.viewport.getSequenceSetId(); for (int t = 0; t < frames.length; t++) @@ -2110,7 +2140,7 @@ public class Desktop extends jalview.jbgui.GDesktop String fle = chooser.getSelectedFile().toString(); if (!vamsasImport(chooser.getSelectedFile())) { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager.formatMessage( "label.couldnt_import_as_vamsas_session", new Object[] @@ -2411,7 +2441,7 @@ public class Desktop extends jalview.jbgui.GDesktop removeProgressPanel(progpanel); if (warnmsg != null) { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), warnmsg, warnttl, JvOptionPane.ERROR_MESSAGE); } @@ -2448,7 +2478,7 @@ public class Desktop extends jalview.jbgui.GDesktop public JInternalFrame[] getAllFrames() { - return desktop.getAllFrames(); + return getDesktopPane().getAllFrames(); } /** @@ -2487,7 +2517,7 @@ public class Desktop extends jalview.jbgui.GDesktop while (li.hasNext()) { String link = li.next(); - if (link.contains(SEQUENCE_ID) + if (link.contains(UrlConstants.SEQUENCE_ID) && !UrlConstants.isDefaultString(link)) { check = true; @@ -2534,7 +2564,7 @@ public class Desktop extends jalview.jbgui.GDesktop }); msgPanel.add(jcb); - JvOptionPane.showMessageDialog(Desktop.desktop, msgPanel, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), msgPanel, MessageManager .getString("label.SEQUENCE_ID_no_longer_used"), JvOptionPane.WARNING_MESSAGE); @@ -2649,11 +2679,11 @@ public class Desktop extends jalview.jbgui.GDesktop { if (Jalview.isHeadlessMode()) { - // Desktop.desktop is null in headless mode - return new AlignFrame[] { Jalview.currentAlignFrame }; + // Desktop.getDesktop() is null in headless mode + return new AlignFrame[] { Jalview.getCurrentAlignFrame() }; } - JInternalFrame[] frames = Desktop.desktop.getAllFrames(); + JInternalFrame[] frames = Desktop.getDesktopPane().getAllFrames(); if (frames == null) { @@ -2698,7 +2728,7 @@ public class Desktop extends jalview.jbgui.GDesktop */ public GStructureViewer[] getJmols() { - JInternalFrame[] frames = Desktop.desktop.getAllFrames(); + JInternalFrame[] frames = Desktop.getDesktopPane().getAllFrames(); if (frames == null) { @@ -2734,7 +2764,7 @@ public class Desktop extends jalview.jbgui.GDesktop } catch (Exception ex) { jalview.bin.Cache.log.error("Groovy Shell Creation failed.", ex); - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager.getString("label.couldnt_create_groovy_shell"), MessageManager.getString("label.groovy_support_failed"), @@ -2745,7 +2775,7 @@ public class Desktop extends jalview.jbgui.GDesktop /** * Open the Groovy console */ - void openGroovyConsole() + private void openGroovyConsole() { if (groovyConsole == null) { @@ -2931,7 +2961,7 @@ public class Desktop extends jalview.jbgui.GDesktop */ public static AlignFrame getAlignFrameFor(AlignViewportI viewport) { - if (desktop != null) + if (getDesktopPane() != null) { AlignmentPanel[] aps = getAlignmentPanels( viewport.getSequenceSetId()); @@ -2993,7 +3023,7 @@ public class Desktop extends jalview.jbgui.GDesktop if (discoverer == null) { discoverer = new jalview.ws.jws1.Discoverer(); - // register PCS handler for desktop. + // register PCS handler for getDesktop(). discoverer.addPropertyChangeListener(changeSupport); } // JAL-940 - disabled JWS1 service configuration - always start discoverer @@ -3075,7 +3105,7 @@ public class Desktop extends jalview.jbgui.GDesktop * * jd.waitForInput(); */ - JvOptionPane.showConfirmDialog(Desktop.desktop, + JvOptionPane.showConfirmDialog(Desktop.getDesktopPane(), new JLabel("
" + ermsg + "
" + "

It may be that you have invalid JABA URLs
in your web service preferences," @@ -3101,7 +3131,7 @@ public class Desktop extends jalview.jbgui.GDesktop } } - private Runnable serviceChangedDialog = null; + Runnable serviceChangedDialog = null; /** * start a thread to open a URL in the configured browser. Pops up a warning @@ -3112,7 +3142,7 @@ public class Desktop extends jalview.jbgui.GDesktop */ public static void showUrl(final String url) { - showUrl(url, Desktop.instance); + showUrl(url, Desktop.getInstance()); } /** @@ -3141,7 +3171,7 @@ public class Desktop extends jalview.jbgui.GDesktop jalview.util.BrowserLauncher.openURL(url); } catch (Exception ex) { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager .getString("label.web_browser_not_found_unix"), MessageManager.getString("label.web_browser_not_found"), @@ -3157,15 +3187,16 @@ public class Desktop extends jalview.jbgui.GDesktop }).start(); } - public static WsParamSetManager wsparamManager = null; + private WsParamSetManager wsparamManager = null; public static ParamManager getUserParameterStore() { - if (wsparamManager == null) + Desktop d = getInstance(); + if (d.wsparamManager == null) { - wsparamManager = new WsParamSetManager(); + d.wsparamManager = new WsParamSetManager(); } - return wsparamManager; + return d.wsparamManager; } /** @@ -3210,12 +3241,12 @@ public class Desktop extends jalview.jbgui.GDesktop /** * flag indicating if dialogExecutor should try to acquire a permit */ - private volatile boolean dialogPause = true; + volatile boolean dialogPause = true; /** * pause the queue */ - private java.util.concurrent.Semaphore block = new Semaphore(0); + java.util.concurrent.Semaphore block = new Semaphore(0); private static groovy.ui.Console groovyConsole; @@ -3241,7 +3272,7 @@ public class Desktop extends jalview.jbgui.GDesktop } ; } - if (instance == null) + if (getInstance() == null) { return; } @@ -3405,7 +3436,7 @@ public class Desktop extends jalview.jbgui.GDesktop String topViewId = myTopFrame.viewport.getSequenceSetId(); String bottomViewId = myBottomFrame.viewport.getSequenceSetId(); - JInternalFrame[] frames = desktop.getAllFrames(); + JInternalFrame[] frames = getDesktopPane().getAllFrames(); for (JInternalFrame frame : frames) { if (frame instanceof SplitFrame && frame != source) @@ -3468,6 +3499,7 @@ public class Desktop extends jalview.jbgui.GDesktop * - the payload from the drop event * @throws Exception */ + @SuppressWarnings("unchecked") public static void transferFromDropTarget(List files, List protocols, DropTargetDropEvent evt, Transferable t) throws Exception @@ -3538,7 +3570,7 @@ public class Desktop extends jalview.jbgui.GDesktop { // Works on Windows and MacOSX Cache.log.debug("Drop handled as javaFileListFlavor"); - for (Object file : (List) t + for (Object file : (List) t .getTransferData(DataFlavor.javaFileListFlavor)) { files.add(file); @@ -3702,7 +3734,7 @@ public class Desktop extends jalview.jbgui.GDesktop Class structureViewerClass) { List result = new ArrayList<>(); - JInternalFrame[] frames = Desktop.instance.getAllFrames(); + JInternalFrame[] frames = Desktop.getInstance().getAllFrames(); for (JInternalFrame frame : frames) { @@ -3721,4 +3753,5 @@ public class Desktop extends jalview.jbgui.GDesktop } return result; } + } diff --git a/src/jalview/gui/FeatureEditor.java b/src/jalview/gui/FeatureEditor.java index d547c58..a02ec36 100644 --- a/src/jalview/gui/FeatureEditor.java +++ b/src/jalview/gui/FeatureEditor.java @@ -222,7 +222,7 @@ public class FeatureEditor updateColourButton(mainPanel, colour, featureColour); }; }; - JalviewColourChooser.showColourChooser(Desktop.getDesktop(), + JalviewColourChooser.showColourChooser(Desktop.getDesktopPane(), title, featureColour.getColour(), listener); } else @@ -412,7 +412,7 @@ public class FeatureEditor * set dialog action handlers for OK (create/Amend) and Cancel options * also for Delete if applicable (when amending features) */ - JvOptionPane dialog = JvOptionPane.newOptionDialog(Desktop.desktop) + JvOptionPane dialog = JvOptionPane.newOptionDialog(Desktop.getDesktopPane()) .setResponseHandler(0, okAction).setResponseHandler(2, cancelAction); if (!forCreate) { diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java index a1693f7..2a6adda 100755 --- a/src/jalview/gui/Finder.java +++ b/src/jalview/gui/Finder.java @@ -176,7 +176,7 @@ public class Finder extends GFinder */ boolean getFocusedViewport() { - if (focusfixed || Desktop.desktop == null) + if (focusfixed || Desktop.getDesktopPane() == null) { if (ap != null && av != null) { @@ -187,7 +187,7 @@ public class Finder extends GFinder } // now checks further down the window stack to fix bug // https://mantis.lifesci.dundee.ac.uk/view.php?id=36008 - JInternalFrame[] frames = Desktop.desktop.getAllFrames(); + JInternalFrame[] frames = Desktop.getDesktopPane().getAllFrames(); for (int f = 0; f < frames.length; f++) { JInternalFrame alignFrame = frames[f]; diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java index 6b312ad..dc94dee 100755 --- a/src/jalview/gui/IdPanel.java +++ b/src/jalview/gui/IdPanel.java @@ -246,7 +246,7 @@ public class IdPanel extends JPanel jalview.util.BrowserLauncher.openURL(url); } catch (Exception ex) { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager.getString("label.web_browser_not_found_unix"), MessageManager.getString("label.web_browser_not_found"), JvOptionPane.WARNING_MESSAGE); diff --git a/src/jalview/gui/JalviewDialog.java b/src/jalview/gui/JalviewDialog.java index 1d7bf3d..0ff5606 100644 --- a/src/jalview/gui/JalviewDialog.java +++ b/src/jalview/gui/JalviewDialog.java @@ -78,11 +78,11 @@ public abstract class JalviewDialog extends JPanel boolean block, String title, int width, int height) { - frame = new JDialog(Desktop.instance, modal); + frame = new JDialog(Desktop.getInstance(), modal); frame.setTitle(title); - if (Desktop.instance != null) + if (Desktop.getInstance() != null) { - Rectangle deskr = Desktop.instance.getBounds(); + Rectangle deskr = Desktop.getInstance().getBounds(); frame.setBounds(new Rectangle((int) (deskr.getCenterX() - width / 2), (int) (deskr.getCenterY() - height / 2), width, height)); } diff --git a/src/jalview/gui/LineartOptions.java b/src/jalview/gui/LineartOptions.java index d55733c..fc6fd23 100644 --- a/src/jalview/gui/LineartOptions.java +++ b/src/jalview/gui/LineartOptions.java @@ -86,7 +86,7 @@ public class LineartOptions extends JPanel ex.printStackTrace(); } - dialog = JvOptionPane.newOptionDialog(Desktop.desktop); + dialog = JvOptionPane.newOptionDialog(Desktop.getDesktopPane()); } /** diff --git a/src/jalview/gui/OOMWarning.java b/src/jalview/gui/OOMWarning.java index 02c8fe1..dc5d0f5 100644 --- a/src/jalview/gui/OOMWarning.java +++ b/src/jalview/gui/OOMWarning.java @@ -72,7 +72,7 @@ public class OOMWarning implements Runnable public OOMWarning(String string, OutOfMemoryError oomerror) { - this(string, oomerror, Desktop.desktop); + this(string, oomerror, Desktop.getDesktopPane()); } @Override diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java index ad33110..a356def 100644 --- a/src/jalview/gui/PopupMenu.java +++ b/src/jalview/gui/PopupMenu.java @@ -307,7 +307,7 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener jalview.util.BrowserLauncher.openURL(url); } catch (Exception ex) { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager.getString("label.web_browser_not_found_unix"), MessageManager.getString("label.web_browser_not_found"), JvOptionPane.WARNING_MESSAGE); @@ -1985,7 +1985,7 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener refresh(); }; }; - JalviewColourChooser.showColourChooser(Desktop.getDesktop(), + JalviewColourChooser.showColourChooser(Desktop.getDesktopPane(), title, Color.BLUE, listener); } diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java index 9d5596e..cc2961f 100755 --- a/src/jalview/gui/Preferences.java +++ b/src/jalview/gui/Preferences.java @@ -857,7 +857,7 @@ public class Preferences extends GPreferences Integer.toString(getComboIntStringKey(backupfilesPresetsCombo))); Cache.saveProperties(); - Desktop.instance.doConfigureStructurePrefs(); + Desktop.getInstance().doConfigureStructurePrefs(); try { frame.setClosed(true); @@ -968,7 +968,7 @@ public class Preferences extends GPreferences boolean valid = false; while (!valid) { - if (JvOptionPane.showInternalConfirmDialog(Desktop.desktop, link, + if (JvOptionPane.showInternalConfirmDialog(Desktop.getDesktopPane(), link, MessageManager.getString("label.new_sequence_url_link"), JvOptionPane.OK_CANCEL_OPTION, -1, null) == JvOptionPane.OK_OPTION) @@ -1020,7 +1020,7 @@ public class Preferences extends GPreferences boolean valid = false; while (!valid) { - if (JvOptionPane.showInternalConfirmDialog(Desktop.desktop, link, + if (JvOptionPane.showInternalConfirmDialog(Desktop.getDesktopPane(), link, MessageManager.getString("label.edit_sequence_url_link"), JvOptionPane.OK_CANCEL_OPTION, -1, null) == JvOptionPane.OK_OPTION) @@ -1193,7 +1193,7 @@ public class Preferences extends GPreferences } catch (NumberFormatException x) { userIdWidth.setText(""); - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager .getString("warn.user_defined_width_requirements"), MessageManager.getString("label.invalid_id_column_width"), @@ -1219,7 +1219,7 @@ public class Preferences extends GPreferences File f = new File(chimeraPath.getText()); if (!f.canExecute()) { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager.getString("label.invalid_chimera_path"), MessageManager.getString("label.invalid_name"), JvOptionPane.ERROR_MESSAGE); @@ -1258,7 +1258,7 @@ public class Preferences extends GPreferences if (!found) { String[] options = { "OK", "Help" }; - int showHelp = JvOptionPane.showInternalOptionDialog(Desktop.desktop, + int showHelp = JvOptionPane.showInternalOptionDialog(Desktop.getDesktopPane(), JvSwingUtils.wrapTooltip(true, MessageManager.getString("label.chimera_missing")), "", JvOptionPane.YES_NO_OPTION, JvOptionPane.WARNING_MESSAGE, diff --git a/src/jalview/gui/PromptUserConfig.java b/src/jalview/gui/PromptUserConfig.java index cb59452..77d83a8 100644 --- a/src/jalview/gui/PromptUserConfig.java +++ b/src/jalview/gui/PromptUserConfig.java @@ -200,7 +200,7 @@ public class PromptUserConfig implements Runnable } try { - int reply = JvOptionPane.showConfirmDialog(Desktop.desktop, // component, + int reply = JvOptionPane.showConfirmDialog(Desktop.getDesktopPane(), // component, dialogText, dialogTitle, (allowCancel) ? JvOptionPane.YES_NO_CANCEL_OPTION : JvOptionPane.YES_NO_OPTION, diff --git a/src/jalview/gui/SequenceFetcher.java b/src/jalview/gui/SequenceFetcher.java index 646a7f1..7b408a4 100755 --- a/src/jalview/gui/SequenceFetcher.java +++ b/src/jalview/gui/SequenceFetcher.java @@ -860,7 +860,7 @@ public class SequenceFetcher extends JPanel implements Runnable @Override public void run() { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, error, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), error, MessageManager.getString("label.error_retrieving_data"), JvOptionPane.WARNING_MESSAGE); } diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java index 2b87e10..98b24d1 100755 --- a/src/jalview/gui/SplashScreen.java +++ b/src/jalview/gui/SplashScreen.java @@ -160,7 +160,7 @@ public class SplashScreen extends JPanel System.err.println("Error when loading images!"); } } while (!mt.checkAll()); - Desktop.instance.setIconImage(logo); + Desktop.getInstance().setIconImage(logo); } } catch (Exception ex) { @@ -191,7 +191,7 @@ public class SplashScreen extends JPanel } add(authlist, BorderLayout.CENTER); authlist.addMouseListener(closer); - Desktop.desktop.add(iframe); + Desktop.getDesktopPane().add(iframe); refreshText(); } @@ -203,7 +203,7 @@ public class SplashScreen extends JPanel @SuppressWarnings("unused") protected boolean refreshText() { - String newtext = Desktop.instance.getAboutMessage(true).toString(); + String newtext = Desktop.getInstance().getAboutMessage(true).toString(); // System.err.println("Text found: \n"+newtext+"\nEnd of newtext."); if (oldtext != newtext.length()) { @@ -236,8 +236,8 @@ public class SplashScreen extends JPanel authlist.setSize(new Dimension(750, 375)); add(authlist, BorderLayout.CENTER); revalidate(); - iframe.setBounds((Desktop.instance.getWidth() - 750) / 2, - (Desktop.instance.getHeight() - 375) / 2, 750, + iframe.setBounds((Desktop.getInstance().getWidth() - 750) / 2, + (Desktop.getInstance().getHeight() - 375) / 2, 750, authlist.getHeight() + iconimg.getHeight()); iframe.validate(); iframe.setVisible(true); @@ -287,7 +287,7 @@ public class SplashScreen extends JPanel } closeSplash(); - Desktop.instance.startDialogQueue(); + Desktop.getInstance().startDialogQueue(); } /** diff --git a/src/jalview/gui/SplitFrame.java b/src/jalview/gui/SplitFrame.java index e066c75..55a9c61 100644 --- a/src/jalview/gui/SplitFrame.java +++ b/src/jalview/gui/SplitFrame.java @@ -132,7 +132,7 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI // allow about 65 pixels for Desktop decorators on Windows int newHeight = Math.min(height, - Desktop.instance.getHeight() - DESKTOP_DECORATORS_HEIGHT); + Desktop.getInstance().getHeight() - DESKTOP_DECORATORS_HEIGHT); if (newHeight != height) { int oldDividerLocation = getDividerLocation(); @@ -150,7 +150,7 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI // TODO if CommandListener is only ever 1:1 for complementary views, // may change broadcast pattern to direct messaging (more efficient) final StructureSelectionManager ssm = StructureSelectionManager - .getStructureSelectionManager(Desktop.instance); + .getStructureSelectionManager(Desktop.getInstance()); ssm.addCommandListener(((AlignFrame) getTopFrame()).getViewport()); ssm.addCommandListener(((AlignFrame) getBottomFrame()).getViewport()); } @@ -556,7 +556,7 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI adjustLayout(); final StructureSelectionManager ssm = StructureSelectionManager - .getStructureSelectionManager(Desktop.instance); + .getStructureSelectionManager(Desktop.getInstance()); ssm.addCommandListener(newTopPanel.av); ssm.addCommandListener(newBottomPanel.av); } @@ -683,7 +683,7 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI */ protected void expandViews_actionPerformed() { - Desktop.instance.explodeViews(this); + Desktop.getInstance().explodeViews(this); } /** @@ -692,7 +692,7 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI */ protected void gatherViews_actionPerformed() { - Desktop.instance.gatherViews(this); + Desktop.getInstance().gatherViews(this); } /** diff --git a/src/jalview/gui/StructureChooser.java b/src/jalview/gui/StructureChooser.java index 23b7fcf..5b15ef1 100644 --- a/src/jalview/gui/StructureChooser.java +++ b/src/jalview/gui/StructureChooser.java @@ -148,7 +148,7 @@ public class StructureChooser extends GStructureChooser */ private void discoverStructureViews() { - if (Desktop.instance != null) + if (Desktop.getInstance() != null) { targetView.removeAllItems(); if (lastTargetedView != null && !lastTargetedView.isVisible()) @@ -156,7 +156,7 @@ public class StructureChooser extends GStructureChooser lastTargetedView = null; } int linkedViewsAt = 0; - for (StructureViewerBase view : Desktop.instance + for (StructureViewerBase view : Desktop.getInstance() .getStructureViewers(null, null)) { StructureViewer viewHandler = (lastTargetedView != null @@ -998,7 +998,7 @@ public class StructureChooser extends GStructureChooser PDBEntry fileEntry = new AssociatePdbFileWithSeq() .associatePdbWithSeq(selectedPdbFileName, DataSourceType.FILE, selectedSequence, true, - Desktop.instance); + Desktop.getInstance()); sViewer = launchStructureViewer( ssm, new PDBEntry[] diff --git a/src/jalview/gui/StructureViewerBase.java b/src/jalview/gui/StructureViewerBase.java index 418a84d..af48093 100644 --- a/src/jalview/gui/StructureViewerBase.java +++ b/src/jalview/gui/StructureViewerBase.java @@ -407,7 +407,7 @@ public abstract class StructureViewerBase extends GStructureViewer */ protected List getViewersFor(AlignmentPanel alp) { - return Desktop.instance.getStructureViewers(alp, this.getClass()); + return Desktop.getInstance().getStructureViewers(alp, this.getClass()); } @Override diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java index 4846049..2f18f43 100755 --- a/src/jalview/gui/UserDefinedColours.java +++ b/src/jalview/gui/UserDefinedColours.java @@ -448,7 +448,7 @@ public class UserDefinedColours extends GUserDefinedColours { if (isNoSelectionMade()) { - JvOptionPane.showMessageDialog(Desktop.desktop, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), MessageManager .getString("label.no_colour_selection_in_scheme"), MessageManager.getString("label.no_colour_selection_warn"), @@ -503,7 +503,7 @@ public class UserDefinedColours extends GUserDefinedColours String[] options = new String[] { title, MessageManager.getString("label.dont_save_changes"), }; final String question = JvSwingUtils.wrapTooltip(true, message); - int response = JvOptionPane.showOptionDialog(Desktop.desktop, + int response = JvOptionPane.showOptionDialog(Desktop.getDesktopPane(), question, title, JvOptionPane.DEFAULT_OPTION, JvOptionPane.PLAIN_MESSAGE, null, options, options[0]); @@ -557,7 +557,7 @@ public class UserDefinedColours extends GUserDefinedColours { if (isNoSelectionMade()) { - JvOptionPane.showMessageDialog(Desktop.desktop, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), MessageManager .getString("label.no_colour_selection_in_scheme"), MessageManager.getString("label.no_colour_selection_warn"), @@ -741,7 +741,7 @@ public class UserDefinedColours extends GUserDefinedColours String name = schemeName.getText().trim(); if (name.length() < 1) { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager .getString("label.user_colour_scheme_must_have_name"), MessageManager.getString("label.no_name_colour_scheme"), @@ -756,7 +756,7 @@ public class UserDefinedColours extends GUserDefinedColours * @j2sIgnore */ { - int reply = JvOptionPane.showInternalConfirmDialog(Desktop.desktop, + int reply = JvOptionPane.showInternalConfirmDialog(Desktop.getDesktopPane(), MessageManager.formatMessage( "label.colour_scheme_exists_overwrite", new Object[] { name, name }), diff --git a/src/jalview/gui/UserQuestionnaireCheck.java b/src/jalview/gui/UserQuestionnaireCheck.java index ef86756..e12586a 100644 --- a/src/jalview/gui/UserQuestionnaireCheck.java +++ b/src/jalview/gui/UserQuestionnaireCheck.java @@ -141,7 +141,7 @@ public class UserQuestionnaireCheck implements Runnable + qid + "&rid=" + rid; jalview.bin.Cache.log .info("Prompting user for questionnaire at " + qurl); - int reply = JvOptionPane.showInternalConfirmDialog(Desktop.desktop, + int reply = JvOptionPane.showInternalConfirmDialog(Desktop.getDesktopPane(), MessageManager.getString("label.jalview_new_questionnaire"), MessageManager.getString("label.jalview_user_survey"), JvOptionPane.YES_NO_OPTION, JvOptionPane.QUESTION_MESSAGE); diff --git a/src/jalview/gui/VamsasApplication.java b/src/jalview/gui/VamsasApplication.java index c094b1c..2053fb2 100644 --- a/src/jalview/gui/VamsasApplication.java +++ b/src/jalview/gui/VamsasApplication.java @@ -173,7 +173,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource } } catch (InvalidSessionDocumentException e) { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager.getString( "label.vamsas_doc_couldnt_be_opened_as_new_session"), @@ -455,7 +455,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource VamsasAppDatastore vds = new VamsasAppDatastore(doc, vobj2jv, jv2vobj, baseProvEntry(), alRedoState); // wander through frames - JInternalFrame[] frames = Desktop.desktop.getAllFrames(); + JInternalFrame[] frames = Desktop.getDesktopPane().getAllFrames(); if (frames == null) { @@ -660,7 +660,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource Cache.log.debug( "Asking user if the vamsas session should be stored."); int reply = JvOptionPane.showInternalConfirmDialog( - Desktop.desktop, + Desktop.getDesktopPane(), "The current VAMSAS session has unsaved data - do you want to save it ?", "VAMSAS Session Shutdown", JvOptionPane.YES_NO_OPTION, @@ -669,7 +669,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource if (reply == JvOptionPane.YES_OPTION) { Cache.log.debug("Prompting for vamsas store filename."); - Desktop.instance.vamsasSave_actionPerformed(null); + Desktop.getInstance().vamsasSave_actionPerformed(null); Cache.log .debug("Finished attempt at storing document."); } @@ -688,7 +688,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource public void disableGui(boolean b) { - Desktop.instance.setVamsasUpdate(b); + Desktop.getInstance().setVamsasUpdate(b); } Hashtable _backup_vobj2jv; @@ -763,7 +763,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource { final IPickManager pm = vclient.getPickManager(); final StructureSelectionManager ssm = StructureSelectionManager - .getStructureSelectionManager(Desktop.instance); + .getStructureSelectionManager(Desktop.getInstance()); final VamsasApplication me = this; pm.registerMessageHandler(new IMessageHandler() { diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java index c6137cc..ae013ec 100644 --- a/src/jalview/gui/WebserviceInfo.java +++ b/src/jalview/gui/WebserviceInfo.java @@ -711,7 +711,7 @@ public class WebserviceInfo extends GWebserviceInfo @Override public void run() { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, message, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), message, title, JvOptionPane.WARNING_MESSAGE); } diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java index 976e551..da00a25 100644 --- a/src/jalview/gui/WsJobParameters.java +++ b/src/jalview/gui/WsJobParameters.java @@ -215,12 +215,12 @@ public class WsJobParameters extends JPanel implements ItemListener, public boolean showRunDialog() { - frame = new JDialog(Desktop.instance, true); + frame = new JDialog(Desktop.getInstance(), true); frame.setTitle(MessageManager.formatMessage("label.edit_params_for", new String[] { service.getActionText() })); - Rectangle deskr = Desktop.instance.getBounds(); + Rectangle deskr = Desktop.getInstance().getBounds(); Dimension pref = this.getPreferredSize(); frame.setBounds( new Rectangle((int) (deskr.getCenterX() - pref.width / 2), @@ -436,8 +436,8 @@ public class WsJobParameters extends JPanel implements ItemListener, dialogpanel.add(canceljob); // JAL-1580: setMaximumSize() doesn't work, so just size for the worst case: // check for null is for JUnit usage - final int windowHeight = Desktop.instance == null ? 540 - : Desktop.instance.getHeight(); + final int windowHeight = Desktop.getInstance() == null ? 540 + : Desktop.getInstance().getHeight(); setPreferredSize(new Dimension(540, windowHeight)); add(dialogpanel, BorderLayout.SOUTH); validate(); diff --git a/src/jalview/gui/WsParamSetManager.java b/src/jalview/gui/WsParamSetManager.java index bb5d996..0f315eb 100644 --- a/src/jalview/gui/WsParamSetManager.java +++ b/src/jalview/gui/WsParamSetManager.java @@ -203,7 +203,7 @@ public class WsParamSetManager implements ParamManager chooser.setDialogTitle(MessageManager .getString("label.choose_filename_for_param_file")); chooser.setToolTipText(MessageManager.getString("action.save")); - int value = chooser.showSaveDialog(Desktop.instance); + int value = chooser.showSaveDialog(Desktop.getInstance()); if (value == JalviewFileChooser.APPROVE_OPTION) { outfile = chooser.getSelectedFile(); @@ -311,7 +311,7 @@ public class WsParamSetManager implements ParamManager File pfile = new File(filename); if (pfile.exists() && pfile.canWrite()) { - if (JvOptionPane.showConfirmDialog(Desktop.instance, + if (JvOptionPane.showConfirmDialog(Desktop.getInstance(), "Delete the preset's file, too ?", "Delete User Preset ?", JvOptionPane.OK_CANCEL_OPTION) == JvOptionPane.OK_OPTION) { diff --git a/src/jalview/gui/WsPreferences.java b/src/jalview/gui/WsPreferences.java index 850ef21..9966c02 100644 --- a/src/jalview/gui/WsPreferences.java +++ b/src/jalview/gui/WsPreferences.java @@ -454,7 +454,7 @@ public class WsPreferences extends GWsPreferences boolean valid = false; int resp = JvOptionPane.CANCEL_OPTION; while (!valid && (resp = JvOptionPane.showInternalConfirmDialog( - Desktop.desktop, panel, title, + Desktop.getDesktopPane(), panel, title, JvOptionPane.OK_CANCEL_OPTION)) == JvOptionPane.OK_OPTION) { try @@ -472,13 +472,13 @@ public class WsPreferences extends GWsPreferences } catch (Exception e) { valid = false; - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager.getString("label.invalid_url")); } } if (valid && resp == JvOptionPane.OK_OPTION) { - int validate = JvOptionPane.showInternalConfirmDialog(Desktop.desktop, + int validate = JvOptionPane.showInternalConfirmDialog(Desktop.getDesktopPane(), MessageManager.getString("info.validate_jabaws_server"), MessageManager.getString("label.test_server"), JvOptionPane.YES_NO_OPTION); @@ -491,7 +491,7 @@ public class WsPreferences extends GWsPreferences } else { - int opt = JvOptionPane.showInternalOptionDialog(Desktop.desktop, + int opt = JvOptionPane.showInternalOptionDialog(Desktop.getDesktopPane(), "The Server '" + foo.toString() + "' failed validation,\ndo you want to add it anyway? ", "Server Validation Failed", JvOptionPane.YES_NO_OPTION, @@ -502,7 +502,7 @@ public class WsPreferences extends GWsPreferences } else { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager.getString( "warn.server_didnt_pass_validation")); } @@ -595,7 +595,7 @@ public class WsPreferences extends GWsPreferences if (lastrefresh != update) { lastrefresh = update; - Desktop.instance.startServiceDiscovery(true); // wait around for all + Desktop.getInstance().startServiceDiscovery(true); // wait around for all // threads to complete updateList(); @@ -616,15 +616,15 @@ public class WsPreferences extends GWsPreferences public void run() { long ct = System.currentTimeMillis(); - Desktop.instance.setProgressBar(MessageManager + Desktop.getInstance().setProgressBar(MessageManager .getString("status.refreshing_web_service_menus"), ct); if (lastrefresh != update) { lastrefresh = update; - Desktop.instance.startServiceDiscovery(true); + Desktop.getInstance().startServiceDiscovery(true); updateList(); } - Desktop.instance.setProgressBar(null, ct); + Desktop.getInstance().setProgressBar(null, ct); } }).start(); diff --git a/src/jalview/io/BackupFiles.java b/src/jalview/io/BackupFiles.java index dae1c02..c697a99 100644 --- a/src/jalview/io/BackupFiles.java +++ b/src/jalview/io/BackupFiles.java @@ -539,7 +539,7 @@ public class BackupFiles MessageManager.getString("label.delete"), MessageManager.getString("label.rename") }; - confirmButton = JvOptionPane.showOptionDialog(Desktop.desktop, + confirmButton = JvOptionPane.showOptionDialog(Desktop.getDesktopPane(), messageSB.toString(), MessageManager.getString("label.backupfiles_confirm_delete"), JvOptionPane.YES_NO_OPTION, JvOptionPane.WARNING_MESSAGE, @@ -559,7 +559,7 @@ public class BackupFiles MessageManager.getString("label.delete"), MessageManager.getString("label.keep") }; - confirmButton = JvOptionPane.showOptionDialog(Desktop.desktop, + confirmButton = JvOptionPane.showOptionDialog(Desktop.getDesktopPane(), messageSB.toString(), MessageManager.getString("label.backupfiles_confirm_delete"), JvOptionPane.YES_NO_OPTION, JvOptionPane.WARNING_MESSAGE, @@ -594,7 +594,7 @@ public class BackupFiles Long.toString(df.length()) })); } - int confirmButton = JvOptionPane.showConfirmDialog(Desktop.desktop, + int confirmButton = JvOptionPane.showConfirmDialog(Desktop.getDesktopPane(), messageSB.toString(), MessageManager .getString("label.backupfiles_confirm_delete"), @@ -683,7 +683,7 @@ public class BackupFiles "label.backupfiles_confirm_save_new_saved_file_not_ok")); } - int confirmButton = JvOptionPane.showConfirmDialog(Desktop.desktop, + int confirmButton = JvOptionPane.showConfirmDialog(Desktop.getDesktopPane(), messageSB.toString(), MessageManager .getString("label.backupfiles_confirm_save_file"), diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java index 95f85e6..0d46e76 100755 --- a/src/jalview/io/FileLoader.java +++ b/src/jalview/io/FileLoader.java @@ -278,9 +278,9 @@ public class FileLoader implements Runnable Runtime rt = Runtime.getRuntime(); try { - if (Desktop.instance != null) + if (Desktop.getInstance() != null) { - Desktop.instance.startLoading(file); + Desktop.getInstance().startLoading(file); } if (format == null) { @@ -302,12 +302,12 @@ public class FileLoader implements Runnable if (format == null) { - Desktop.instance.stopLoading(); + Desktop.getInstance().stopLoading(); System.err.println("The input file \"" + file + "\" has null or unidentifiable data content!"); if (!Jalview.isHeadlessMode()) { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager.getString("label.couldnt_read_data") + " in " + file + "\n" + AppletFormatAdapter.getSupportedFormats(), @@ -318,7 +318,7 @@ public class FileLoader implements Runnable } // TODO: cache any stream datasources as a temporary file (eg. PDBs // retrieved via URL) - if (Desktop.desktop != null && Desktop.desktop.isShowMemoryUsage()) + if (Desktop.getDesktopPane() != null && Desktop.getDesktopPane().isShowMemoryUsage()) { System.gc(); memused = (rt.maxMemory() - rt.totalMemory() + rt.freeMemory()); // free @@ -411,7 +411,7 @@ public class FileLoader implements Runnable // register PDB entries with desktop's structure selection // manager StructureSelectionManager - .getStructureSelectionManager(Desktop.instance) + .getStructureSelectionManager(Desktop.getInstance()) .registerPDBEntry(pdbe); } } @@ -500,23 +500,23 @@ public class FileLoader implements Runnable } else { - if (Desktop.instance != null) + if (Desktop.getInstance() != null) { - Desktop.instance.stopLoading(); + Desktop.getInstance().stopLoading(); } final String errorMessage = MessageManager.getString( "label.couldnt_load_file") + " " + title + "\n" + error; // TODO: refactor FileLoader to be independent of Desktop / Applet GUI // bits ? - if (raiseGUI && Desktop.desktop != null) + if (raiseGUI && Desktop.getDesktopPane() != null) { javax.swing.SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), errorMessage, MessageManager .getString("label.error_loading_file"), @@ -544,7 +544,7 @@ public class FileLoader implements Runnable @Override public void run() { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager.formatMessage( "label.problems_opening_file", new String[] { file }), @@ -566,7 +566,7 @@ public class FileLoader implements Runnable @Override public void run() { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager.formatMessage( "warn.out_of_memory_loading_file", new String[] { file }), @@ -588,7 +588,7 @@ public class FileLoader implements Runnable // memory // after // load - if (Desktop.desktop != null && Desktop.desktop.isShowMemoryUsage()) + if (Desktop.getDesktopPane() != null && Desktop.getDesktopPane().isShowMemoryUsage()) { if (alignFrame != null) { @@ -610,9 +610,9 @@ public class FileLoader implements Runnable } } // remove the visual delay indicator - if (Desktop.instance != null) + if (Desktop.getInstance() != null) { - Desktop.instance.stopLoading(); + Desktop.getInstance().stopLoading(); } } diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java index 54e7e4b..6b6dc24 100644 --- a/src/jalview/io/HTMLOutput.java +++ b/src/jalview/io/HTMLOutput.java @@ -22,6 +22,7 @@ package jalview.io; import jalview.api.AlignExportSettingsI; import jalview.bin.Cache; +import jalview.bin.Jalview; import jalview.datamodel.AlignExportSettingsAdapter; import jalview.datamodel.AlignmentExportData; import jalview.gui.AlignmentPanel; @@ -231,7 +232,7 @@ public abstract class HTMLOutput implements Runnable protected void setProgressMessage(String message) { - if (pIndicator != null && !isHeadless()) + if (pIndicator != null && !Jalview.isHeadlessMode()) { pIndicator.setProgressBar(message, pSessionId); } @@ -241,16 +242,16 @@ public abstract class HTMLOutput implements Runnable } } - /** - * Answers true if HTML export is invoke in headless mode or false otherwise - * - * @return - */ - protected boolean isHeadless() - { - return System.getProperty("java.awt.headless") != null - && System.getProperty("java.awt.headless").equals("true"); - } + // /** + // * Answers true if HTML export is invoke in headless mode or false otherwise + // * + // * @return + // */ + // protected boolean isHeadless() + // { + // return System.getProperty("java.awt.headless") != null + // && System.getProperty("java.awt.headless").equals("true"); + // } /** * This method provides implementation of consistent behaviour which should @@ -259,7 +260,7 @@ public abstract class HTMLOutput implements Runnable */ protected void exportCompleted() { - if (isLaunchInBrowserAfterExport() && !isHeadless()) + if (isLaunchInBrowserAfterExport() && !Jalview.isHeadlessMode()) { try { diff --git a/src/jalview/io/HtmlSvgOutput.java b/src/jalview/io/HtmlSvgOutput.java index b8241c8..d4a4651 100644 --- a/src/jalview/io/HtmlSvgOutput.java +++ b/src/jalview/io/HtmlSvgOutput.java @@ -21,6 +21,7 @@ package jalview.io; import jalview.bin.Cache; +import jalview.bin.Jalview; import jalview.gui.AlignmentPanel; import jalview.gui.LineartOptions; import jalview.gui.OOMWarning; @@ -223,7 +224,8 @@ public class HtmlSvgOutput extends HTMLOutput /* * Prompt for character rendering style if preference is not set */ - if (renderStyle.equalsIgnoreCase("Prompt each time") && !isHeadless()) + if (renderStyle.equalsIgnoreCase("Prompt each time") + && !Jalview.isHeadlessMode()) { LineartOptions svgOption = new LineartOptions("HTML", textOption); svgOption.setResponseAction(1, new Runnable() diff --git a/src/jalview/io/VamsasAppDatastore.java b/src/jalview/io/VamsasAppDatastore.java index adf4447..c2954f0 100644 --- a/src/jalview/io/VamsasAppDatastore.java +++ b/src/jalview/io/VamsasAppDatastore.java @@ -720,9 +720,9 @@ public class VamsasAppDatastore // /SAVE THE TREES // ///////////////////////////////// // FIND ANY ASSOCIATED TREES - if (Desktop.desktop != null) + if (Desktop.getDesktopPane() != null) { - javax.swing.JInternalFrame[] frames = Desktop.instance + javax.swing.JInternalFrame[] frames = Desktop.getInstance() .getAllFrames(); for (int t = 0; t < frames.length; t++) @@ -1479,7 +1479,7 @@ public class VamsasAppDatastore if (mappings != null) { jalview.structure.StructureSelectionManager - .getStructureSelectionManager(Desktop.instance) + .getStructureSelectionManager(Desktop.getInstance()) .registerMappings(mappings); } } diff --git a/src/jalview/io/WSWUBlastClient.java b/src/jalview/io/WSWUBlastClient.java index 63b78b2..e24c2f3 100755 --- a/src/jalview/io/WSWUBlastClient.java +++ b/src/jalview/io/WSWUBlastClient.java @@ -150,7 +150,7 @@ public class WSWUBlastClient { // This must be outside the run() body as java 1.5 // will not return any value from the OptionPane to the expired thread. - int reply = JvOptionPane.showConfirmDialog(Desktop.desktop, + int reply = JvOptionPane.showConfirmDialog(Desktop.getDesktopPane(), "Automatically update suggested ids?", "Auto replace sequence ids", JvOptionPane.YES_NO_OPTION); diff --git a/src/jalview/io/vamsas/Sequencemapping.java b/src/jalview/io/vamsas/Sequencemapping.java index 0a582e5..402ffdf 100644 --- a/src/jalview/io/vamsas/Sequencemapping.java +++ b/src/jalview/io/vamsas/Sequencemapping.java @@ -365,7 +365,7 @@ public class Sequencemapping extends Rangetype } bindjvvobj(mapping, sequenceMapping); jalview.structure.StructureSelectionManager - .getStructureSelectionManager(Desktop.instance) + .getStructureSelectionManager(Desktop.getInstance()) .registerMapping(acf); // Try to link up any conjugate database references in the two sequences // matchConjugateDBRefs(from, to, mapping); diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index 8bbfb8d..de20556 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -1242,8 +1242,7 @@ public class GAlignFrame extends JInternalFrame showTranslation .setText(MessageManager.getString("label.translate_cDNA")); boolean first = true; - for (final GeneticCodeI table : GeneticCodes.getInstance() - .getCodeTables()) + for (final GeneticCodeI table : GeneticCodes.getCodeTables()) { JMenuItem item = new JMenuItem(table.getId() + " " + table.getName()); showTranslation.add(item); diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java index 2ea3774..943e705 100755 --- a/src/jalview/jbgui/GDesktop.java +++ b/src/jalview/jbgui/GDesktop.java @@ -37,16 +37,14 @@ import javax.swing.JMenuBar; import javax.swing.JMenuItem; /** - * DOCUMENT ME! + * abstract class super to jalview.gui.Desktop * - * @author $author$ - * @version $Revision$ */ @SuppressWarnings("serial") -public class GDesktop extends JFrame +public abstract class GDesktop extends JFrame { - protected static JMenu windowMenu = new JMenu(); + public JMenu windowMenu = new JMenu(); // BH 2019.05.07 was static JMenuBar desktopMenubar = new JMenuBar(); @@ -110,7 +108,7 @@ public class GDesktop extends JFrame protected JCheckBoxMenuItem showConsole = new JCheckBoxMenuItem(); - protected JCheckBoxMenuItem showNews = new JCheckBoxMenuItem(); + public JCheckBoxMenuItem showNews = new JCheckBoxMenuItem(); protected JMenuItem snapShotWindow = new JMenuItem(); @@ -119,7 +117,6 @@ public class GDesktop extends JFrame */ public GDesktop() { - super(); try { jbInit(); diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index 3c35e4e..5fbc3d7 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -2193,7 +2193,7 @@ public class GPreferences extends JPanel boolean ret = false; String warningMessage = MessageManager .getString("label.warning_confirm_change_reverse"); - int confirm = JvOptionPane.showConfirmDialog(Desktop.desktop, + int confirm = JvOptionPane.showConfirmDialog(Desktop.getDesktopPane(), warningMessage, MessageManager.getString("label.change_increment_decrement"), JvOptionPane.YES_NO_OPTION, JvOptionPane.WARNING_MESSAGE); diff --git a/src/jalview/jbgui/GSequenceLink.java b/src/jalview/jbgui/GSequenceLink.java index a43e504..2ec7051 100755 --- a/src/jalview/jbgui/GSequenceLink.java +++ b/src/jalview/jbgui/GSequenceLink.java @@ -219,7 +219,7 @@ public class GSequenceLink extends JPanel return true; } - JvOptionPane.showInternalMessageDialog(jalview.gui.Desktop.desktop, + JvOptionPane.showInternalMessageDialog(jalview.gui.Desktop.getDesktopPane(), MessageManager.getString("warn.url_must_contain"), MessageManager.getString("label.invalid_url"), JvOptionPane.WARNING_MESSAGE); @@ -228,7 +228,7 @@ public class GSequenceLink extends JPanel public void notifyDuplicate() { - JvOptionPane.showInternalMessageDialog(jalview.gui.Desktop.desktop, + JvOptionPane.showInternalMessageDialog(jalview.gui.Desktop.getDesktopPane(), MessageManager.getString("warn.name_cannot_be_duplicate"), MessageManager.getString("label.invalid_name"), JvOptionPane.WARNING_MESSAGE); diff --git a/src/jalview/project/Jalview2XML.java b/src/jalview/project/Jalview2XML.java index 4d772a1..1aac037 100644 --- a/src/jalview/project/Jalview2XML.java +++ b/src/jalview/project/Jalview2XML.java @@ -1081,7 +1081,7 @@ public class Jalview2XML * only view *should* be coped with sensibly. */ // This must have been loaded, is it still visible? - JInternalFrame[] frames = Desktop.desktop.getAllFrames(); + JInternalFrame[] frames = Desktop.getDesktopPane().getAllFrames(); String matchedFile = null; for (int f = frames.length - 1; f > -1; f--) { @@ -1233,9 +1233,9 @@ public class Jalview2XML { // FIND ANY ASSOCIATED TREES // NOT IMPLEMENTED FOR HEADLESS STATE AT PRESENT - if (Desktop.desktop != null) + if (Desktop.getDesktopPane() != null) { - JInternalFrame[] frames = Desktop.desktop.getAllFrames(); + JInternalFrame[] frames = Desktop.getDesktopPane().getAllFrames(); for (int t = 0; t < frames.length; t++) { @@ -1279,9 +1279,9 @@ public class Jalview2XML /* * save PCA viewers */ - if (!storeDS && Desktop.desktop != null) + if (!storeDS && Desktop.getDesktopPane() != null) { - for (JInternalFrame frame : Desktop.desktop.getAllFrames()) + for (JInternalFrame frame : Desktop.getDesktopPane().getAllFrames()) { if (frame instanceof PCAPanel) { @@ -1919,11 +1919,11 @@ public class Jalview2XML final SequenceI jds, List viewIds, AlignmentPanel ap, boolean storeDataset) { - if (Desktop.desktop == null) + if (Desktop.getDesktopPane() == null) { return; } - JInternalFrame[] frames = Desktop.desktop.getAllFrames(); + JInternalFrame[] frames = Desktop.getDesktopPane().getAllFrames(); for (int f = frames.length - 1; f > -1; f--) { if (frames[f] instanceof AppVarna) @@ -2915,9 +2915,9 @@ public class Jalview2XML { // used to attempt to parse as V1 castor-generated xml } - if (Desktop.instance != null) + if (Desktop.getInstance() != null) { - Desktop.instance.stopLoading(); + Desktop.getInstance().stopLoading(); } if (af != null) { @@ -2945,7 +2945,7 @@ public class Jalview2XML */ for (AlignFrame fr : gatherToThisFrame.values()) { - Desktop.instance.gatherViews(fr); + Desktop.getInstance().gatherViews(fr); } restoreSplitFrames(); @@ -2954,7 +2954,7 @@ public class Jalview2XML if (ds.getCodonFrames() != null) { StructureSelectionManager - .getStructureSelectionManager(Desktop.instance) + .getStructureSelectionManager(Desktop.getInstance()) .registerMappings(ds.getCodonFrames()); } } @@ -2963,9 +2963,9 @@ public class Jalview2XML reportErrors(); } - if (Desktop.instance != null) + if (Desktop.getInstance() != null) { - Desktop.instance.stopLoading(); + Desktop.getInstance().stopLoading(); } return af; @@ -3046,7 +3046,7 @@ public class Jalview2XML */ for (SplitFrame sf : gatherTo) { - Desktop.instance.gatherViews(sf); + Desktop.getInstance().gatherViews(sf); } splitFrameCandidates.clear(); @@ -3105,7 +3105,7 @@ public class Jalview2XML @Override public void run() { - JvOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), finalErrorMessage, "Error " + (saving ? "saving" : "loading") + " Jalview file", @@ -3576,7 +3576,7 @@ public class Jalview2XML entry.setProperty(prop.getName(), prop.getValue()); } StructureSelectionManager - .getStructureSelectionManager(Desktop.instance) + .getStructureSelectionManager(Desktop.getInstance()) .registerPDBEntry(entry); // adds PDBEntry to datasequence's set (since Jalview 2.10) if (al.getSequenceAt(i).getDatasetSequence() != null) @@ -4294,7 +4294,7 @@ public class Jalview2XML int height = safeInt(structureState.getHeight()); // Probably don't need to do this anymore... - // Desktop.desktop.getComponentAt(x, y); + // Desktop.getDesktop().getComponentAt(x, y); // TODO: NOW: check that this recovers the PDB file correctly. String pdbFile = loadPDBFile(jprovider, pdbid.getId(), pdbid.getFile()); @@ -4778,7 +4778,7 @@ public class Jalview2XML { try { - frames = Desktop.desktop.getAllFrames(); + frames = Desktop.getDesktopPane().getAllFrames(); } catch (ArrayIndexOutOfBoundsException e) { // occasional No such child exceptions are thrown here... diff --git a/src/jalview/schemes/ResidueProperties.java b/src/jalview/schemes/ResidueProperties.java index 5f84ca0..5bbe46d 100755 --- a/src/jalview/schemes/ResidueProperties.java +++ b/src/jalview/schemes/ResidueProperties.java @@ -896,8 +896,7 @@ public class ResidueProperties public static String codonTranslate(String lccodon) { - String peptide = GeneticCodes.getInstance().getStandardCodeTable() - .translate(lccodon); + String peptide = GeneticCodes.getStandardCodeTable().translate(lccodon); if ("*".equals(peptide)) { return "STOP"; diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java index f9eb2a6..523f816 100644 --- a/src/jalview/util/Platform.java +++ b/src/jalview/util/Platform.java @@ -54,7 +54,7 @@ public class Platform private static Boolean isNoJSMac = null, isNoJSWin = null, isMac = null, isWin = null; - private static Boolean isHeadless = null; + // private static Boolean isHeadless = null; /** * added to group mouse events into Windows and nonWindows (mac, unix, linux) @@ -111,18 +111,18 @@ public class Platform return (isNoJSWin == null ? (isNoJSWin = !isJS && isWin()) : isNoJSWin); } - /** - * - * @return true if we are running in non-interactive no UI mode - */ - public static boolean isHeadless() - { - if (isHeadless == null) - { - isHeadless = "true".equals(System.getProperty("java.awt.headless")); - } - return isHeadless; - } + // /** + // * + // * @return true if we are running in non-interactive no UI mode + // */ + // public static boolean isHeadless() + // { + // if (isHeadless == null) + // { + // isHeadless = "true".equals(System.getProperty("java.awt.headless")); + // } + // return isHeadless; + // } /** * diff --git a/src/jalview/ws/jws1/Discoverer.java b/src/jalview/ws/jws1/Discoverer.java index bee9fad..ec8c89c 100644 --- a/src/jalview/ws/jws1/Discoverer.java +++ b/src/jalview/ws/jws1/Discoverer.java @@ -246,9 +246,9 @@ public class Discoverer implements Runnable // JBPNote - should do this a better way! if (f.getFaultReason().indexOf("(407)") > -1) { - if (jalview.gui.Desktop.desktop != null) + if (jalview.gui.Desktop.getDesktopPane() != null) { - JvOptionPane.showMessageDialog(jalview.gui.Desktop.desktop, + JvOptionPane.showMessageDialog(jalview.gui.Desktop.getDesktopPane(), MessageManager.getString("label.set_proxy_settings"), MessageManager .getString("label.proxy_authorization_failed"), diff --git a/src/jalview/ws/jws1/JPredClient.java b/src/jalview/ws/jws1/JPredClient.java index 3b7bdb6..3dd8104 100644 --- a/src/jalview/ws/jws1/JPredClient.java +++ b/src/jalview/ws/jws1/JPredClient.java @@ -323,7 +323,7 @@ public class JPredClient extends WS1Client } catch (Exception ex) { - JvOptionPane.showMessageDialog(Desktop.desktop, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), MessageManager.formatMessage( "label.secondary_structure_prediction_service_couldnt_be_located", new String[] diff --git a/src/jalview/ws/jws1/MsaWSClient.java b/src/jalview/ws/jws1/MsaWSClient.java index 4a09625..e97d309 100644 --- a/src/jalview/ws/jws1/MsaWSClient.java +++ b/src/jalview/ws/jws1/MsaWSClient.java @@ -78,7 +78,7 @@ public class MsaWSClient extends WS1Client alignFrame = _alignFrame; if (!sh.getAbstractName().equals("MsaWS")) { - JvOptionPane.showMessageDialog(Desktop.desktop, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), MessageManager.formatMessage( "label.service_called_is_not_msa_service", new String[] @@ -91,7 +91,7 @@ public class MsaWSClient extends WS1Client if ((wsInfo = setWebService(sh)) == null) { - JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), MessageManager .formatMessage("label.msa_service_is_unknown", new String[] { sh.getName() }), MessageManager.getString("label.internal_jalview_error"), diff --git a/src/jalview/ws/jws1/SeqSearchWSClient.java b/src/jalview/ws/jws1/SeqSearchWSClient.java index 53338d3..cb965f0 100644 --- a/src/jalview/ws/jws1/SeqSearchWSClient.java +++ b/src/jalview/ws/jws1/SeqSearchWSClient.java @@ -84,7 +84,7 @@ public class SeqSearchWSClient extends WS1Client // name to service client name if (!sh.getAbstractName().equals(this.getServiceActionKey())) { - JvOptionPane.showMessageDialog(Desktop.desktop, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), MessageManager.formatMessage( "label.service_called_is_not_seq_search_service", new String[] @@ -97,7 +97,7 @@ public class SeqSearchWSClient extends WS1Client if ((wsInfo = setWebService(sh)) == null) { - JvOptionPane.showMessageDialog(Desktop.desktop, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), MessageManager.formatMessage( "label.seq_search_service_is_unknown", new String[] { sh.getName() }), diff --git a/src/jalview/ws/jws2/MsaWSClient.java b/src/jalview/ws/jws2/MsaWSClient.java index 23c6949..319252a 100644 --- a/src/jalview/ws/jws2/MsaWSClient.java +++ b/src/jalview/ws/jws2/MsaWSClient.java @@ -107,7 +107,7 @@ public class MsaWSClient extends Jws2Client if (!(sh.service instanceof MsaWS)) { // redundant at mo - but may change - JvOptionPane.showMessageDialog(Desktop.desktop, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), MessageManager.formatMessage( "label.service_called_is_not_msa_service", new String[] @@ -120,7 +120,7 @@ public class MsaWSClient extends Jws2Client server = (MsaWS) sh.service; if ((wsInfo = setWebService(sh, false)) == null) { - JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), MessageManager .formatMessage("label.msa_service_is_unknown", new String[] { sh.serviceType }), MessageManager.getString("label.internal_jalview_error"), diff --git a/src/jalview/ws/jws2/SequenceAnnotationWSClient.java b/src/jalview/ws/jws2/SequenceAnnotationWSClient.java index 45bddac..9358c76 100644 --- a/src/jalview/ws/jws2/SequenceAnnotationWSClient.java +++ b/src/jalview/ws/jws2/SequenceAnnotationWSClient.java @@ -67,7 +67,7 @@ public class SequenceAnnotationWSClient extends Jws2Client // dan changed! dan test. comment out if conditional // if (alignFrame.getViewport().getAlignment().isNucleotide()) // { - // JvOptionPane.showMessageDialog(Desktop.desktop, sh.serviceType + // JvOptionPane.showMessageDialog(Desktop.getDesktop(), sh.serviceType // + " can only be used\nfor amino acid alignments.", // "Wrong type of sequences!", JvOptionPane.WARNING_MESSAGE); // return; @@ -242,7 +242,7 @@ public class SequenceAnnotationWSClient extends Jws2Client @Override public void actionPerformed(ActionEvent arg0) { - Desktop.instance.showUrl(service.docUrl); + Desktop.getInstance().showUrl(service.docUrl); } }); annotservice.setToolTipText( diff --git a/src/jalview/ws/jws2/jabaws2/Jws2Instance.java b/src/jalview/ws/jws2/jabaws2/Jws2Instance.java index 2f3c298..a4e2e75 100644 --- a/src/jalview/ws/jws2/jabaws2/Jws2Instance.java +++ b/src/jalview/ws/jws2/jabaws2/Jws2Instance.java @@ -186,7 +186,7 @@ public class Jws2Instance try { paramStore = new JabaParamStore(this, - (Desktop.instance != null ? Desktop.getUserParameterStore() + (Desktop.getInstance() != null ? Desktop.getUserParameterStore() : null)); } catch (Exception ex) { diff --git a/src/jalview/ws/rest/RestClient.java b/src/jalview/ws/rest/RestClient.java index a71b70d..08f137d 100644 --- a/src/jalview/ws/rest/RestClient.java +++ b/src/jalview/ws/rest/RestClient.java @@ -329,7 +329,7 @@ public class RestClient extends WSClient else { // TODO: try to tell the user why the job couldn't be started. - JvOptionPane.showMessageDialog(Desktop.desktop, + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), (jobsthread.hasWarnings() ? jobsthread.getWarnings() : MessageManager.getString( "label.job_couldnt_be_started_check_input")), diff --git a/test/jalview/analysis/DnaTest.java b/test/jalview/analysis/DnaTest.java index 27ae8cd..631b535 100644 --- a/test/jalview/analysis/DnaTest.java +++ b/test/jalview/analysis/DnaTest.java @@ -139,8 +139,8 @@ public class DnaTest Iterator contigs = cs.getVisContigsIterator(0, alf.getWidth(), false); Dna dna = new Dna(av, contigs); - AlignmentI translated = dna.translateCdna(GeneticCodes.getInstance() - .getStandardCodeTable()); + AlignmentI translated = dna + .translateCdna(GeneticCodes.getStandardCodeTable()); assertNotNull("Couldn't do a full width translation of test data.", translated); } @@ -171,8 +171,8 @@ public class DnaTest alf.getWidth(), false); AlignViewportI av = new AlignViewport(alf, cs); Dna dna = new Dna(av, vcontigs); - AlignmentI transAlf = dna.translateCdna(GeneticCodes.getInstance() - .getStandardCodeTable()); + AlignmentI transAlf = dna + .translateCdna(GeneticCodes.getStandardCodeTable()); assertTrue("Translation failed (ipos=" + ipos + ") No alignment data.", transAlf != null); @@ -199,8 +199,8 @@ public class DnaTest Iterator contigs = cs.getVisContigsIterator(0, alf.getWidth(), false); Dna dna = new Dna(av, contigs); - AlignmentI translated = dna.translateCdna(GeneticCodes.getInstance() - .getStandardCodeTable()); + AlignmentI translated = dna + .translateCdna(GeneticCodes.getStandardCodeTable()); String aa = translated.getSequenceAt(0).getSequenceAsString(); assertEquals( "AAAACCDDEEFFGGGGHHIIIKKLLLLLLMNNPPPPQQRRRRRRSSSSSSTTTTVVVVWYY***", @@ -225,8 +225,8 @@ public class DnaTest Iterator contigs = cs.getVisContigsIterator(0, alf.getWidth(), false); Dna dna = new Dna(av, contigs); - AlignmentI translated = dna.translateCdna(GeneticCodes.getInstance() - .getStandardCodeTable()); + AlignmentI translated = dna + .translateCdna(GeneticCodes.getStandardCodeTable()); String aa = translated.getSequenceAt(0).getSequenceAsString(); assertEquals("AACDDGGGGHHIIIKKLLLLLLMNNPPPPQQRRRRRRSSSSSSTTTTVVVVW", aa); } @@ -313,8 +313,8 @@ public class DnaTest Iterator contigs = cs.getVisContigsIterator(0, cdna.getWidth(), false); Dna dna = new Dna(av, contigs); - AlignmentI translated = dna.translateCdna(GeneticCodes.getInstance() - .getStandardCodeTable()); + AlignmentI translated = dna + .translateCdna(GeneticCodes.getStandardCodeTable()); /* * Jumble the cDNA sequences and translate. @@ -330,8 +330,8 @@ public class DnaTest av = new AlignViewport(cdnaReordered, cs); contigs = cs.getVisContigsIterator(0, cdna.getWidth(), false); dna = new Dna(av, contigs); - AlignmentI translated2 = dna.translateCdna(GeneticCodes.getInstance() - .getStandardCodeTable()); + AlignmentI translated2 = dna + .translateCdna(GeneticCodes.getStandardCodeTable()); /* * Check translated sequences are the same in both alignments. diff --git a/test/jalview/ext/jmol/JmolViewerTest.java b/test/jalview/ext/jmol/JmolViewerTest.java index e451ed2..7ef0d16 100644 --- a/test/jalview/ext/jmol/JmolViewerTest.java +++ b/test/jalview/ext/jmol/JmolViewerTest.java @@ -74,7 +74,7 @@ public class JmolViewerTest @AfterClass(alwaysRun = true) public static void tearDownAfterClass() throws Exception { - jalview.gui.Desktop.instance.closeAll_actionPerformed(null); + jalview.gui.Desktop.getInstance().closeAll_actionPerformed(null); } @Test(groups = { "Functional" }) diff --git a/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java b/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java index 734f7eb..194d34a 100644 --- a/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java +++ b/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java @@ -95,7 +95,7 @@ public class JalviewChimeraView @AfterClass(alwaysRun = true) public static void tearDownAfterClass() throws Exception { - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); } @AfterMethod(alwaysRun = true) diff --git a/test/jalview/gui/AlignFrameTest.java b/test/jalview/gui/AlignFrameTest.java index 454ff61..fd10d99 100644 --- a/test/jalview/gui/AlignFrameTest.java +++ b/test/jalview/gui/AlignFrameTest.java @@ -164,7 +164,7 @@ public class AlignFrameTest @AfterMethod(alwaysRun = true) public void tearDown() { - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); } /** diff --git a/test/jalview/gui/AlignViewportTest.java b/test/jalview/gui/AlignViewportTest.java index 959abb0..75e8065 100644 --- a/test/jalview/gui/AlignViewportTest.java +++ b/test/jalview/gui/AlignViewportTest.java @@ -80,7 +80,7 @@ public class AlignViewportTest * remove any sequence mappings left lying around by other tests */ StructureSelectionManager ssm = StructureSelectionManager - .getStructureSelectionManager(Desktop.instance); + .getStructureSelectionManager(Desktop.getInstance()); ssm.resetAll(); } @@ -128,7 +128,7 @@ public class AlignViewportTest * mappings */ StructureSelectionManager ssm = StructureSelectionManager - .getStructureSelectionManager(Desktop.instance); + .getStructureSelectionManager(Desktop.getInstance()); List sequenceMappings = ssm.getSequenceMappings(); assertEquals(2, sequenceMappings.size()); assertTrue(sequenceMappings.contains(acf1)); @@ -150,10 +150,10 @@ public class AlignViewportTest @Test(groups = { "Functional" }) public void testDeregisterMapping_withNoReference() { - Desktop d = Desktop.instance; + Desktop d = Desktop.getInstance(); assertNotNull(d); StructureSelectionManager ssm = StructureSelectionManager - .getStructureSelectionManager(Desktop.instance); + .getStructureSelectionManager(Desktop.getInstance()); ssm.resetAll(); AlignFrame af1 = new FileLoader().LoadFileWaitTillLoaded( @@ -213,10 +213,10 @@ public class AlignViewportTest @Test(groups = { "Functional" }) public void testDeregisterMapping_withReference() { - Desktop d = Desktop.instance; + Desktop d = Desktop.getInstance(); assertNotNull(d); StructureSelectionManager ssm = StructureSelectionManager - .getStructureSelectionManager(Desktop.instance); + .getStructureSelectionManager(Desktop.getInstance()); ssm.resetAll(); AlignFrame af1 = new FileLoader().LoadFileWaitTillLoaded( diff --git a/test/jalview/gui/FreeUpMemoryTest.java b/test/jalview/gui/FreeUpMemoryTest.java index 9b21274..ee2b898 100644 --- a/test/jalview/gui/FreeUpMemoryTest.java +++ b/test/jalview/gui/FreeUpMemoryTest.java @@ -70,7 +70,7 @@ public class FreeUpMemoryTest doStuffInJalview(f); - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); checkUsedMemory(35L); } @@ -109,7 +109,7 @@ public class FreeUpMemoryTest * sanity check - fails if any frame was added after * closeAll_actionPerformed */ - assertEquals(Desktop.instance.getAllFrames().length, 0); + assertEquals(Desktop.getInstance().getAllFrames().length, 0); /* * if this assertion fails diff --git a/test/jalview/gui/SeqPanelTest.java b/test/jalview/gui/SeqPanelTest.java index 6783514..54c967f 100644 --- a/test/jalview/gui/SeqPanelTest.java +++ b/test/jalview/gui/SeqPanelTest.java @@ -252,7 +252,7 @@ public class SeqPanelTest @AfterMethod(alwaysRun = true) public void tearDown() { - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); } @Test(groups = "Functional") diff --git a/test/jalview/io/AnnotatedPDBFileInputTest.java b/test/jalview/io/AnnotatedPDBFileInputTest.java index 8eb3796..b8ac0fa 100644 --- a/test/jalview/io/AnnotatedPDBFileInputTest.java +++ b/test/jalview/io/AnnotatedPDBFileInputTest.java @@ -207,7 +207,7 @@ public class AnnotatedPDBFileInputTest @AfterClass(alwaysRun = true) public static void tearDownAfterClass() throws Exception { - jalview.gui.Desktop.instance.closeAll_actionPerformed(null); + jalview.gui.Desktop.getInstance().closeAll_actionPerformed(null); } diff --git a/test/jalview/io/CrossRef2xmlTests.java b/test/jalview/io/CrossRef2xmlTests.java index 6e4593d..daadfa5 100644 --- a/test/jalview/io/CrossRef2xmlTests.java +++ b/test/jalview/io/CrossRef2xmlTests.java @@ -135,7 +135,7 @@ public class CrossRef2xmlTests extends Jalview2xmlBase { // retrieve dbref - SequenceFetcher sf = new SequenceFetcher(Desktop.instance, + SequenceFetcher sf = new SequenceFetcher(Desktop.getInstance(), forSource, forAccession); sf.run(); AlignFrame[] afs = Desktop.getAlignFrames(); @@ -162,7 +162,7 @@ public class CrossRef2xmlTests extends Jalview2xmlBase } else { - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); // recover stored project af = new FileLoader(false).LoadFileWaitTillLoaded( savedProjects.get(first).toString(), DataSourceType.FILE); @@ -229,7 +229,7 @@ public class CrossRef2xmlTests extends Jalview2xmlBase } else { - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); pass3 = 0; // recover stored project File storedProject = savedProjects.get(nextxref); @@ -340,7 +340,7 @@ public class CrossRef2xmlTests extends Jalview2xmlBase } else { - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); // recover stored project File storedProject = savedProjects.get(nextnextxref); if (storedProject == null) diff --git a/test/jalview/io/FeaturesFileTest.java b/test/jalview/io/FeaturesFileTest.java index 77c18db..fdef53d 100644 --- a/test/jalview/io/FeaturesFileTest.java +++ b/test/jalview/io/FeaturesFileTest.java @@ -71,7 +71,7 @@ public class FeaturesFileTest * remove any sequence mappings created so they don't pollute other tests */ StructureSelectionManager ssm = StructureSelectionManager - .getStructureSelectionManager(Desktop.instance); + .getStructureSelectionManager(Desktop.getInstance()); ssm.resetAll(); } diff --git a/test/jalview/io/Jalview2xmlBase.java b/test/jalview/io/Jalview2xmlBase.java index fbdd782..3a0560c 100644 --- a/test/jalview/io/Jalview2xmlBase.java +++ b/test/jalview/io/Jalview2xmlBase.java @@ -70,16 +70,16 @@ public class Jalview2xmlBase @AfterClass(alwaysRun = true) public static void tearDownAfterClass() throws Exception { - jalview.gui.Desktop.instance.closeAll_actionPerformed(null); + jalview.gui.Desktop.getInstance().closeAll_actionPerformed(null); } @BeforeTest(alwaysRun = true) public static void clearDesktop() { - if (Desktop.instance != null && Desktop.getFrames() != null + if (Desktop.getInstance() != null && Desktop.getFrames() != null && Desktop.getFrames().length > 0) { - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); } } diff --git a/test/jalview/io/JalviewExportPropertiesTests.java b/test/jalview/io/JalviewExportPropertiesTests.java index 06d177d..1614453 100644 --- a/test/jalview/io/JalviewExportPropertiesTests.java +++ b/test/jalview/io/JalviewExportPropertiesTests.java @@ -63,7 +63,7 @@ public class JalviewExportPropertiesTests @AfterClass(alwaysRun = true) public static void tearDownAfterClass() throws Exception { - jalview.gui.Desktop.instance.closeAll_actionPerformed(null); + jalview.gui.Desktop.getInstance().closeAll_actionPerformed(null); } diff --git a/test/jalview/project/Jalview2xmlTests.java b/test/jalview/project/Jalview2xmlTests.java index e9221e0..830a759 100644 --- a/test/jalview/project/Jalview2xmlTests.java +++ b/test/jalview/project/Jalview2xmlTests.java @@ -405,7 +405,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase @Test(groups = { "Functional" }, enabled = true) public void testStoreAndRecoverExpandedviews() throws Exception { - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); AlignFrame af = new FileLoader().LoadFileWaitTillLoaded( "examples/exampleFile_2_7.jar", DataSourceType.FILE); @@ -433,7 +433,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase { Assert.fail("Didn't save the expanded view state", e); } - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); if (Desktop.getAlignFrames() != null) { Assert.assertEquals(Desktop.getAlignFrames().length, 0); @@ -459,7 +459,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase @Test(groups = { "Functional" }) public void testStoreAndRecoverReferenceSeqSettings() throws Exception { - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); AlignFrame af = new FileLoader().LoadFileWaitTillLoaded( "examples/exampleFile_2_7.jar", DataSourceType.FILE); assertNotNull(af, "Didn't read in the example file correctly."); @@ -498,7 +498,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase { Assert.fail("Didn't save the expanded view state", e); } - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); if (Desktop.getAlignFrames() != null) { Assert.assertEquals(Desktop.getAlignFrames().length, 0); @@ -592,7 +592,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase @Test(groups = { "Functional" }) public void testStoreAndRecoverGroupRepSeqs() throws Exception { - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); AlignFrame af = new FileLoader().LoadFileWaitTillLoaded( "examples/uniref50.fa", DataSourceType.FILE); assertNotNull(af, "Didn't read in the example file correctly."); @@ -667,7 +667,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase { Assert.fail("Didn't save the expanded view state", e); } - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); if (Desktop.getAlignFrames() != null) { Assert.assertEquals(Desktop.getAlignFrames().length, 0); @@ -712,7 +712,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase @Test(groups = { "Functional" }) public void testStoreAndRecoverPDBEntry() throws Exception { - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); String exampleFile = "examples/3W5V.pdb"; AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(exampleFile, DataSourceType.FILE); @@ -761,7 +761,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase { Assert.fail("Didn't save the state", e); } - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); if (Desktop.getAlignFrames() != null) { Assert.assertEquals(Desktop.getAlignFrames().length, 0); @@ -812,7 +812,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase @Test(groups = { "Functional" }) public void testStoreAndRecoverColourThresholds() throws IOException { - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); AlignFrame af = new FileLoader().LoadFileWaitTillLoaded( "examples/uniref50.fa", DataSourceType.FILE); @@ -872,7 +872,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase ".jvp"); tfile.deleteOnExit(); new Jalview2XML(false).saveState(tfile); - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); af = new FileLoader().LoadFileWaitTillLoaded(tfile.getAbsolutePath(), DataSourceType.FILE); Assert.assertNotNull(af, "Failed to reload project"); @@ -1081,7 +1081,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase @Test(groups = { "Functional" }) public void testMergeDatasetsforManyViews() throws IOException { - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); // complex project - one dataset, several views on several alignments AlignFrame af = new FileLoader(false).LoadFileWaitTillLoaded( @@ -1125,7 +1125,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase @Test(groups = "Functional") public void testPcaViewAssociation() throws IOException { - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); final String PCAVIEWNAME = "With PCA"; // create a new tempfile File tempfile = File.createTempFile("jvPCAviewAssoc", "jvp"); @@ -1159,10 +1159,10 @@ public class Jalview2xmlTests extends Jalview2xmlBase } // load again. - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); AlignFrame af = new FileLoader().LoadFileWaitTillLoaded( tempfile.getCanonicalPath(), DataSourceType.FILE); - JInternalFrame[] frames = Desktop.instance.getAllFrames(); + JInternalFrame[] frames = Desktop.getInstance().getAllFrames(); // PCA and the tabbed alignment view should be the only two windows on the // desktop assertEquals(frames.length, 2, diff --git a/test/jalview/schemes/ColourSchemesTest.java b/test/jalview/schemes/ColourSchemesTest.java index 5db3743..06be31e 100644 --- a/test/jalview/schemes/ColourSchemesTest.java +++ b/test/jalview/schemes/ColourSchemesTest.java @@ -172,7 +172,7 @@ public class ColourSchemesTest @AfterClass(alwaysRun = true) public static void tearDownAfterClass() throws Exception { - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); } @Test(groups = "Functional") diff --git a/test/jalview/structure/StructureSelectionManagerTest.java b/test/jalview/structure/StructureSelectionManagerTest.java index e59648f..dab692f 100644 --- a/test/jalview/structure/StructureSelectionManagerTest.java +++ b/test/jalview/structure/StructureSelectionManagerTest.java @@ -199,7 +199,7 @@ public class StructureSelectionManagerTest extends Jalview2xmlBase { // for some reason 'BeforeMethod' (which should be inherited from // Jalview2XmlBase isn't always called)... - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); try { Thread.sleep(200); } catch (Exception foo) {}; -- 1.7.10.2