From 43c02ae950e2d1a068bf2455f33c8756951b82ed Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Wed, 12 Jul 2006 11:21:41 +0000 Subject: [PATCH] Authority, type and labels --- src/jalview/jbgui/GDasSourceBrowser.java | 62 ++++++++++++------------------ 1 file changed, 24 insertions(+), 38 deletions(-) diff --git a/src/jalview/jbgui/GDasSourceBrowser.java b/src/jalview/jbgui/GDasSourceBrowser.java index 953f995..4e5480d 100755 --- a/src/jalview/jbgui/GDasSourceBrowser.java +++ b/src/jalview/jbgui/GDasSourceBrowser.java @@ -68,10 +68,6 @@ public class GDasSourceBrowser } }); fullDetails.setEditable(false); - jLabel1.setText("

Show sources serving

"); - jLabel2.setText("and"); - jLabel3.setHorizontalAlignment(SwingConstants.RIGHT); - jLabel3.setText("

using coordinates

"); registryLabel.setHorizontalAlignment(SwingConstants.TRAILING); registryLabel.setText("Use Registry"); addLocal.setText("Add Local Source"); @@ -85,60 +81,50 @@ public class GDasSourceBrowser jPanel1.setLayout(flowLayout1); jPanel1.setMinimumSize(new Dimension(596, 30)); jPanel1.setPreferredSize(new Dimension(596, 30)); + jScrollPane2.setBorder(titledBorder3); + jScrollPane3.setBorder(titledBorder4); + jScrollPane4.setBorder(titledBorder5); scrollPane.getViewport().add(table); fullDetailsScrollpane.getViewport().add(fullDetails); - jScrollPane3.getViewport().add(coords1); - jScrollPane2.getViewport().add(capabilities); - jScrollPane4.getViewport().add(coords2); + jScrollPane3.getViewport().add(filter2); + jScrollPane4.getViewport().add(filter3); jPanel1.add(refresh, null); jPanel1.add(addLocal, null); jPanel1.add(progressBar, null); - this.add(registryLabel, new GridBagConstraints(0, 2, 2, 1, 0.0, 0.0 + jScrollPane2.getViewport().add(filter1); + this.add(registryLabel, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0 , GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(11, 2, 0, 0), 9, 2)); - this.add(registryURL, new GridBagConstraints(2, 2, 5, 1, 1.0, 0.0 + this.add(registryURL, new GridBagConstraints(1, 2, 4, 1, 1.0, 0.0 , GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(6, 7, 0, 10), 393, 3)); - this.add(jLabel2, new GridBagConstraints(5, 1, 1, 1, 0.0, 0.0 - , GridBagConstraints.WEST, - GridBagConstraints.NONE, - new Insets(36, 7, 35, 0), 5, 21)); - this.add(jLabel3, new GridBagConstraints(3, 1, 1, 1, 0.0, 0.0 - , GridBagConstraints.WEST, - GridBagConstraints.NONE, - new Insets(33, 0, 29, 0), 5, 16)); - this.add(jLabel1, - new GridBagConstraints(0, 1, 1, GridBagConstraints.REMAINDER, 0.0, - 0.0 - , GridBagConstraints.WEST, - GridBagConstraints.NONE, - new Insets( -60, 2, 0, 0), 5, 20)); - this.add(jPanel1, new GridBagConstraints(0, 3, 7, 1, 1.0, 1.0 + this.add(jPanel1, new GridBagConstraints(0, 3, 5, 1, 1.0, 1.0 , GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); - this.add(fullDetailsScrollpane, new GridBagConstraints(3, 0, 4, 1, 1.0, 1.0 + this.add(fullDetailsScrollpane, new GridBagConstraints(2, 0, 3, 1, 1.0, 1.0 , GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(3, 0, 0, 3), 240, 130)); - this.add(scrollPane, new GridBagConstraints(0, 0, 3, 1, 1.0, 1.0 + this.add(scrollPane, new GridBagConstraints(0, 0, 2, 1, 1.0, 1.0 , GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(3, 2, 0, 0), 150, 130)); - this.add(jScrollPane3, new GridBagConstraints(4, 1, 1, 1, 1.0, 1.0 + this.add(jScrollPane3, new GridBagConstraints(2, 1, 1, 1, 1.0, 1.0 , GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(9, 0, 0, 0), 80, 0)); - this.add(jScrollPane2, new GridBagConstraints(1, 1, 2, 1, 1.0, 1.0 + new Insets(0, 0, 0, 0), 80, 0)); + this.add(jScrollPane4, new GridBagConstraints(4, 1, 1, 1, 1.0, 1.0 , GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(9, 0, 0, 0), 80, 0)); - this.add(jScrollPane4, new GridBagConstraints(6, 1, 1, 1, 1.0, 1.0 + new Insets(0, 0, 0, 9), 80, 0)); + this.add(jScrollPane2, new GridBagConstraints(0, 1, 2, 1, 1.0, 1.0 , GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(9, 0, 0, 9), 80, 0)); + new Insets(0, 0, 0, 0), 80, + 60)); } protected JTable table = new JTable(); @@ -149,12 +135,9 @@ public class GDasSourceBrowser protected JScrollPane scrollPane = new JScrollPane(); TitledBorder titledBorder2 = new TitledBorder("Full Details"); protected JScrollPane fullDetailsScrollpane = new JScrollPane(); - protected JList capabilities = new JList(); - protected JList coords1 = new JList(); - protected JList coords2 = new JList(); - JLabel jLabel1 = new JLabel(); - JLabel jLabel2 = new JLabel(); - JLabel jLabel3 = new JLabel(); + protected JList filter1 = new JList(); + protected JList filter2 = new JList(); + protected JList filter3 = new JList(); JScrollPane jScrollPane2 = new JScrollPane(); JScrollPane jScrollPane3 = new JScrollPane(); JScrollPane jScrollPane4 = new JScrollPane(); @@ -164,6 +147,9 @@ public class GDasSourceBrowser JPanel jPanel1 = new JPanel(); FlowLayout flowLayout1 = new FlowLayout(); GridBagLayout gridBagLayout1 = new GridBagLayout(); + TitledBorder titledBorder3 = new TitledBorder("Authority:"); + TitledBorder titledBorder4 = new TitledBorder("Type:"); + TitledBorder titledBorder5 = new TitledBorder("Label:"); public void refresh_actionPerformed(ActionEvent e) { -- 1.7.10.2