git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Authority, type and labels
[jalview.git] / src / jalview / jbgui / GDasSourceBrowser.java
diff --git a/src/jalview/jbgui/GDasSourceBrowser.java b/src/jalview/jbgui/GDasSourceBrowser.java
index 953f995..4e5480d 100755 (executable)
--- a/src/jalview/jbgui/GDasSourceBrowser.java
+++ b/src/jalview/jbgui/GDasSourceBrowser.java
@@ -68,10 +68,6 @@ public class GDasSourceBrowser
       }\r
     });\r
     fullDetails.setEditable(false);\r
-    jLabel1.setText("<html><p align=\"right\">Show sources serving</p></html>");\r
-    jLabel2.setText("and");\r
-    jLabel3.setHorizontalAlignment(SwingConstants.RIGHT);\r
-    jLabel3.setText("<html><p align=\"right\">using coordinates</p></html>");\r
     registryLabel.setHorizontalAlignment(SwingConstants.TRAILING);\r
     registryLabel.setText("Use Registry");\r
     addLocal.setText("Add Local Source");\r
@@ -85,60 +81,50 @@ public class GDasSourceBrowser
     jPanel1.setLayout(flowLayout1);\r
     jPanel1.setMinimumSize(new Dimension(596, 30));\r
     jPanel1.setPreferredSize(new Dimension(596, 30));\r
+    jScrollPane2.setBorder(titledBorder3);\r
+    jScrollPane3.setBorder(titledBorder4);\r
+    jScrollPane4.setBorder(titledBorder5);\r
     scrollPane.getViewport().add(table);\r
     fullDetailsScrollpane.getViewport().add(fullDetails);\r
-    jScrollPane3.getViewport().add(coords1);\r
-    jScrollPane2.getViewport().add(capabilities);\r
-    jScrollPane4.getViewport().add(coords2);\r
+    jScrollPane3.getViewport().add(filter2);\r
+    jScrollPane4.getViewport().add(filter3);\r
     jPanel1.add(refresh, null);\r
     jPanel1.add(addLocal, null);\r
     jPanel1.add(progressBar, null);\r
-    this.add(registryLabel, new GridBagConstraints(0, 2, 2, 1, 0.0, 0.0\r
+    jScrollPane2.getViewport().add(filter1);\r
+    this.add(registryLabel, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0\r
         , GridBagConstraints.WEST, GridBagConstraints.NONE,\r
         new Insets(11, 2, 0, 0), 9, 2));\r
-    this.add(registryURL, new GridBagConstraints(2, 2, 5, 1, 1.0, 0.0\r
+    this.add(registryURL, new GridBagConstraints(1, 2, 4, 1, 1.0, 0.0\r
                                                  , GridBagConstraints.WEST,\r
                                                  GridBagConstraints.HORIZONTAL,\r
                                                  new Insets(6, 7, 0, 10), 393,\r
                                                  3));\r
-    this.add(jLabel2, new GridBagConstraints(5, 1, 1, 1, 0.0, 0.0\r
-                                             , GridBagConstraints.WEST,\r
-                                             GridBagConstraints.NONE,\r
-                                             new Insets(36, 7, 35, 0), 5, 21));\r
-    this.add(jLabel3, new GridBagConstraints(3, 1, 1, 1, 0.0, 0.0\r
-                                             , GridBagConstraints.WEST,\r
-                                             GridBagConstraints.NONE,\r
-                                             new Insets(33, 0, 29, 0), 5, 16));\r
-    this.add(jLabel1,\r
-             new GridBagConstraints(0, 1, 1, GridBagConstraints.REMAINDER, 0.0,\r
-                                    0.0\r
-                                    , GridBagConstraints.WEST,\r
-                                    GridBagConstraints.NONE,\r
-                                    new Insets( -60, 2, 0, 0), 5, 20));\r
-    this.add(jPanel1, new GridBagConstraints(0, 3, 7, 1, 1.0, 1.0\r
+    this.add(jPanel1, new GridBagConstraints(0, 3, 5, 1, 1.0, 1.0\r
                                              , GridBagConstraints.CENTER,\r
                                              GridBagConstraints.HORIZONTAL,\r
                                              new Insets(0, 0, 0, 0), 0, 0));\r
-    this.add(fullDetailsScrollpane, new GridBagConstraints(3, 0, 4, 1, 1.0, 1.0\r
+    this.add(fullDetailsScrollpane, new GridBagConstraints(2, 0, 3, 1, 1.0, 1.0\r
         , GridBagConstraints.CENTER, GridBagConstraints.BOTH,\r
         new Insets(3, 0, 0, 3), 240, 130));\r
-    this.add(scrollPane, new GridBagConstraints(0, 0, 3, 1, 1.0, 1.0\r
+    this.add(scrollPane, new GridBagConstraints(0, 0, 2, 1, 1.0, 1.0\r
                                                 , GridBagConstraints.CENTER,\r
                                                 GridBagConstraints.BOTH,\r
                                                 new Insets(3, 2, 0, 0), 150,\r
                                                 130));\r
-    this.add(jScrollPane3, new GridBagConstraints(4, 1, 1, 1, 1.0, 1.0\r
+    this.add(jScrollPane3, new GridBagConstraints(2, 1, 1, 1, 1.0, 1.0\r
                                                   , GridBagConstraints.CENTER,\r
                                                   GridBagConstraints.BOTH,\r
-                                                  new Insets(9, 0, 0, 0), 80, 0));\r
-    this.add(jScrollPane2, new GridBagConstraints(1, 1, 2, 1, 1.0, 1.0\r
+                                                  new Insets(0, 0, 0, 0), 80, 0));\r
+    this.add(jScrollPane4, new GridBagConstraints(4, 1, 1, 1, 1.0, 1.0\r
                                                   , GridBagConstraints.CENTER,\r
                                                   GridBagConstraints.BOTH,\r
-                                                  new Insets(9, 0, 0, 0), 80, 0));\r
-    this.add(jScrollPane4, new GridBagConstraints(6, 1, 1, 1, 1.0, 1.0\r
+                                                  new Insets(0, 0, 0, 9), 80, 0));\r
+    this.add(jScrollPane2, new GridBagConstraints(0, 1, 2, 1, 1.0, 1.0\r
                                                   , GridBagConstraints.CENTER,\r
                                                   GridBagConstraints.BOTH,\r
-                                                  new Insets(9, 0, 0, 9), 80, 0));\r
+                                                  new Insets(0, 0, 0, 0), 80,\r
+                                                  60));\r
   }\r
 \r
   protected JTable table = new JTable();\r
@@ -149,12 +135,9 @@ public class GDasSourceBrowser
   protected JScrollPane scrollPane = new JScrollPane();\r
   TitledBorder titledBorder2 = new TitledBorder("Full Details");\r
   protected JScrollPane fullDetailsScrollpane = new JScrollPane();\r
-  protected JList capabilities = new JList();\r
-  protected JList coords1 = new JList();\r
-  protected JList coords2 = new JList();\r
-  JLabel jLabel1 = new JLabel();\r
-  JLabel jLabel2 = new JLabel();\r
-  JLabel jLabel3 = new JLabel();\r
+  protected JList filter1 = new JList();\r
+  protected JList filter2 = new JList();\r
+  protected JList filter3 = new JList();\r
   JScrollPane jScrollPane2 = new JScrollPane();\r
   JScrollPane jScrollPane3 = new JScrollPane();\r
   JScrollPane jScrollPane4 = new JScrollPane();\r
@@ -164,6 +147,9 @@ public class GDasSourceBrowser
   JPanel jPanel1 = new JPanel();\r
   FlowLayout flowLayout1 = new FlowLayout();\r
   GridBagLayout gridBagLayout1 = new GridBagLayout();\r
+  TitledBorder titledBorder3 = new TitledBorder("Authority:");\r
+  TitledBorder titledBorder4 = new TitledBorder("Type:");\r
+  TitledBorder titledBorder5 = new TitledBorder("Label:");\r
   public void refresh_actionPerformed(ActionEvent e)\r
   {\r
 \r