JAL-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...

[jalview.git] / src / jalview / gui / StructureChooser.java

diff --git a/src/jalview/gui/StructureChooser.java b/src/jalview/gui/StructureChooser.java
index cb09b7c..9c4f6c8 100644 (file)
--- a/src/jalview/gui/StructureChooser.java
+++ b/src/jalview/gui/StructureChooser.java
@@ -143,20 +143,22 @@ public class StructureChooser extends GStructureChooser
    */
   protected void discoverStructureViews()
   {
-    if (Desktop.getInstance() != null)
+    Desktop desktop = Desktop.getInstance();
+    if (desktop != null)
     {
       targetView.removeAllItems();
-      Desktop d = Desktop.getInstance();
-      if (d.lastTargetedView != null && !d.lastTargetedView.isVisible())
+      if (desktop.lastTargetedView != null
+              && !desktop.lastTargetedView.isVisible())
       {
-        d.lastTargetedView = null;
+        desktop.lastTargetedView = null;
       }
       int linkedViewsAt = 0;
-      for (StructureViewerBase view : Desktop.getInstance()
+      for (StructureViewerBase view : desktop
               .getStructureViewers(null, null))
       {
-        StructureViewer viewHandler = (d.lastTargetedView != null
-                && d.lastTargetedView.sview == view) ? d.lastTargetedView
+        StructureViewer viewHandler = (desktop.lastTargetedView != null
+                && desktop.lastTargetedView.sview == view)
+                        ? desktop.lastTargetedView
                         : StructureViewer.reconfigure(view);
 
         if (view.isLinkedWith(ap))
@@ -177,9 +179,9 @@ public class StructureChooser extends GStructureChooser
       if (targetView.getItemCount() > 0)
       {
         targetView.setVisible(true);
-        if (d.lastTargetedView != null)
+        if (desktop.lastTargetedView != null)
         {
-          targetView.setSelectedItem(d.lastTargetedView);
+          targetView.setSelectedItem(desktop.lastTargetedView);
         }
         else
         {