X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDasSourceBrowser.java;h=f781473d4395551bf94fa8a0a243e826f79121e3;hb=aa91e8c4561c2dd0f18760e18fb0052979733bf8;hp=329990e2d0ffb5303aff7d3871bee2af3241ada2;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git

diff --git a/src/jalview/gui/DasSourceBrowser.java b/src/jalview/gui/DasSourceBrowser.java
index 329990e..f781473 100644
--- a/src/jalview/gui/DasSourceBrowser.java
+++ b/src/jalview/gui/DasSourceBrowser.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,6 +20,7 @@
  */
 package jalview.gui;
 
+import jalview.bin.Cache;
 import jalview.jbgui.GDasSourceBrowser;
 import jalview.util.MessageManager;
 import jalview.util.TableSorter;
@@ -63,7 +64,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
   {
     fs = featureSettings;
     // TODO DasSourceRegistryProvider API
-    sourceRegistry = jalview.bin.Cache.getDasSourceRegistry();
+    sourceRegistry = Cache.getDasSourceRegistry();
     String registry = sourceRegistry.getDasRegistryURL();
 
     registryURL.setText(registry);
@@ -174,7 +175,9 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
 
     if (nickName == null)
     {
-      fullDetails.setText(text + MessageManager.getString("label.select_das_service_from_table"));
+      fullDetails.setText(text
+              + MessageManager
+                      .getString("label.select_das_service_from_table"));
       return;
     }
 
@@ -358,7 +361,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
 
   public void refresh_actionPerformed(ActionEvent e)
   {
-    saveProperties(jalview.bin.Cache.applicationProperties);
+    saveProperties(Cache.applicationProperties);
 
     Thread worker = new Thread(this);
     worker.start();
@@ -433,21 +436,25 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
 
     JTextField nametf = new JTextField(nickname, 40);
     JTextField urltf = new JTextField(url, 40);
-    JCheckBox seqs = new JCheckBox(MessageManager.getString("label.sequence_source"));
+    JCheckBox seqs = new JCheckBox(
+            MessageManager.getString("label.sequence_source"));
     seqs.setSelected(seqsrc);
     JPanel panel = new JPanel(new BorderLayout());
     JPanel pane12 = new JPanel(new BorderLayout());
-    pane12.add(new JLabel(MessageManager.getString("label.structure_manager")), BorderLayout.CENTER);
+    pane12.add(new JLabel(MessageManager.getString("label.name")),
+            BorderLayout.CENTER);
     pane12.add(nametf, BorderLayout.EAST);
     panel.add(pane12, BorderLayout.NORTH);
     pane12 = new JPanel(new BorderLayout());
-    pane12.add(new JLabel(MessageManager.getString("label.url")), BorderLayout.NORTH);
+    pane12.add(new JLabel(MessageManager.getString("label.url")),
+            BorderLayout.NORTH);
     pane12.add(seqs, BorderLayout.SOUTH);
     pane12.add(urltf, BorderLayout.EAST);
     panel.add(pane12, BorderLayout.SOUTH);
 
     int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop,
-            panel, MessageManager.getString("label.enter_local_das_source"),
+            panel,
+            MessageManager.getString("label.enter_local_das_source"),
             JOptionPane.OK_CANCEL_OPTION);
 
     if (reply != JOptionPane.OK_OPTION)
@@ -519,10 +526,13 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
 
     if (!sourceRegistry.getSource(nickname).isLocal())
     {
-      JOptionPane.showInternalMessageDialog(Desktop.desktop,
-              MessageManager.getString("label.you_can_only_edit_or_remove_local_das_sources"),
-              MessageManager.getString("label.public_das_source"),
-              JOptionPane.WARNING_MESSAGE);
+      JOptionPane
+              .showInternalMessageDialog(
+                      Desktop.desktop,
+                      MessageManager
+                              .getString("label.you_can_only_edit_or_remove_local_das_sources"),
+                      MessageManager.getString("label.public_das_source"),
+                      JOptionPane.WARNING_MESSAGE);
       return;
     }
 
@@ -674,7 +684,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
 
   void setSelectedFromProperties()
   {
-    String active = jalview.bin.Cache.getDefault("DAS_ACTIVE_SOURCE",
+    String active = Cache.getDefault("DAS_ACTIVE_SOURCE",
             "uniprot");
     StringTokenizer st = new StringTokenizer(active, "\t");
     selectedSources = new Vector();
@@ -698,11 +708,11 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
   {
     if (registryURL.getText() == null || registryURL.getText().length() < 1)
     {
-      properties.remove(jalview.bin.Cache.DAS_REGISTRY_URL);
+      properties.remove(Cache.DAS_REGISTRY_URL);
     }
     else
     {
-      properties.setProperty(jalview.bin.Cache.DAS_REGISTRY_URL,
+      properties.setProperty(Cache.DAS_REGISTRY_URL,
               registryURL.getText());
     }
 
@@ -715,11 +725,11 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
       }
     }
 
-    properties.setProperty(jalview.bin.Cache.DAS_ACTIVE_SOURCE,
+    properties.setProperty(Cache.DAS_ACTIVE_SOURCE,
             sb.toString());
 
     String sourceprop = sourceRegistry.getLocalSourceString();
-    properties.setProperty(jalview.bin.Cache.DAS_LOCAL_SOURCE, sourceprop);
+    properties.setProperty(Cache.DAS_LOCAL_SOURCE, sourceprop);
   }
 
   class DASTableModel extends AbstractTableModel
@@ -731,7 +741,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
     }
 
     private String[] columnNames = new String[]
-    { "Nickname", "Use Source" };
+    { MessageManager.getString("label.nickname"), MessageManager.getString("label.use_source") };
 
     private Object[][] data;