[Gmod-apollo-cmts] CVS: apollo/src/java/apollo/dataadapter/das DASAdapterGUI.java,1.1.2.5,1.1.2.6

[Suzanna L. <su...@us...>]

Update of /cvsroot/gmod/apollo/src/java/apollo/dataadapter/das
In directory usw-pr-cvs1:/tmp/cvs-serv13130/apollo/dataadapter/das

Modified Files:
      Tag: sanger_branch
	DASAdapterGUI.java 
Log Message:

fixed appearance of DAS dialog box (again!)



Index: DASAdapterGUI.java
===================================================================
RCS file: /cvsroot/gmod/apollo/src/java/apollo/dataadapter/das/Attic/DASAdapterGUI.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** DASAdapterGUI.java	29 Jul 2002 19:22:22 -0000	1.1.2.5
--- DASAdapterGUI.java	29 Jul 2002 21:49:30 -0000	1.1.2.6
***************
*** 54,61 ****
  	serverList = new JComboBox();
  	seqList = new JComboBox();
! 	hiTextBox = new JTextField();
! 	hiTextBox.setMaximumSize (new Dimension (125, 12));
! 	lowTextBox = new JTextField();
! 	lowTextBox.setMaximumSize (new Dimension (125, 12));
  	historyList = new JComboBox();
  
--- 54,59 ----
  	serverList = new JComboBox();
  	seqList = new JComboBox();
! 	hiTextBox = new JTextField(12);
! 	lowTextBox = new JTextField(12);
  	historyList = new JComboBox();
  
***************
*** 164,212 ****
  	hiLabel.setForeground (Color.black);
  
  	Box serverBox = new Box(BoxLayout.X_AXIS);
  	serverBox.setForeground (Color.black);
! 	serverBox.add(Box.createHorizontalGlue());
  	serverBox.add(serverLabel);
- 	serverBox.add(Box.createRigidArea(new Dimension(5, 0)));
- 	serverBox.add(serverList);
  	serverBox.add(Box.createHorizontalGlue());
  
  	Box seqBox = new Box(BoxLayout.X_AXIS);
  	seqBox.setForeground (Color.black);
! 	seqBox.add(Box.createHorizontalGlue());
  	seqBox.add(seqLabel);
- 	seqBox.add(Box.createRigidArea(new Dimension(5, 0)));
- 	seqBox.add(seqList);
  	seqBox.add(Box.createHorizontalGlue());
  
  	Box rangeBox = new Box(BoxLayout.X_AXIS);
  	rangeBox.setForeground (Color.black);
! 	rangeBox.add(Box.createHorizontalGlue());
  	rangeBox.add(lowLabel);
! 	rangeBox.add(Box.createRigidArea(new Dimension(10, 0)));
  	rangeBox.add(lowTextBox);
  	rangeBox.add(hiLabel);
! 	rangeBox.add(Box.createRigidArea(new Dimension(10, 0)));
  	rangeBox.add(hiTextBox);
! 	rangeBox.add(Box.createHorizontalGlue());
  
  	Box historyBox = new Box(BoxLayout.X_AXIS);
  	historyBox.setForeground (Color.black);
! 	historyBox.add(Box.createHorizontalGlue());
  	historyBox.add(historyLabel);
- 	historyBox.add(Box.createRigidArea(new Dimension(10, 0)));
- 	historyBox.add(historyList);
  	historyBox.add(Box.createHorizontalGlue());
  
  	Box pane = new Box(BoxLayout.Y_AXIS);
  	pane.setForeground (Color.black);
! 	pane.add(Box.createVerticalGlue());
  	pane.add(serverBox);
! 	pane.add(Box.createRigidArea(new Dimension(6, 0)));
  	pane.add(seqBox);
! 	pane.add(Box.createRigidArea(new Dimension(6, 0)));
  	pane.add(rangeBox);
! 	pane.add(Box.createRigidArea(new Dimension(6, 0)));
  	pane.add(historyBox);
  	pane.add(Box.createVerticalGlue());
  
--- 162,219 ----
  	hiLabel.setForeground (Color.black);
  
+ 	lowTextBox.setMinimumSize (new Dimension (400, 24));
+ 	hiTextBox.setMinimumSize (new Dimension (400, 24));
+ 	lowTextBox.setMaximumSize (new Dimension (400, 24));
+ 	hiTextBox.setMaximumSize (new Dimension (400, 24));
+ 
+ 	Dimension horizontal_margin = new Dimension (12, 0);
  	Box serverBox = new Box(BoxLayout.X_AXIS);
  	serverBox.setForeground (Color.black);
! 	serverBox.add(Box.createRigidArea(horizontal_margin));
  	serverBox.add(serverLabel);
  	serverBox.add(Box.createHorizontalGlue());
+ 	serverBox.add(serverList);
+ 	serverBox.add(Box.createRigidArea(horizontal_margin));
  
  	Box seqBox = new Box(BoxLayout.X_AXIS);
  	seqBox.setForeground (Color.black);
! 	seqBox.add(Box.createRigidArea(horizontal_margin));
  	seqBox.add(seqLabel);
  	seqBox.add(Box.createHorizontalGlue());
+ 	seqBox.add(seqList);
+ 	seqBox.add(Box.createRigidArea(horizontal_margin));
  
  	Box rangeBox = new Box(BoxLayout.X_AXIS);
  	rangeBox.setForeground (Color.black);
! 	rangeBox.add(Box.createRigidArea(horizontal_margin));
  	rangeBox.add(lowLabel);
! 	rangeBox.add(Box.createHorizontalGlue());
  	rangeBox.add(lowTextBox);
+ 	rangeBox.add(Box.createRigidArea(horizontal_margin));
  	rangeBox.add(hiLabel);
! 	rangeBox.add(Box.createRigidArea(horizontal_margin));
  	rangeBox.add(hiTextBox);
! 	rangeBox.add(Box.createRigidArea(horizontal_margin));
  
  	Box historyBox = new Box(BoxLayout.X_AXIS);
  	historyBox.setForeground (Color.black);
! 	historyBox.add(Box.createRigidArea(horizontal_margin));
  	historyBox.add(historyLabel);
  	historyBox.add(Box.createHorizontalGlue());
+ 	historyBox.add(historyList);
+ 	historyBox.add(Box.createRigidArea(horizontal_margin));
  
  	Box pane = new Box(BoxLayout.Y_AXIS);
+ 	Dimension vertical_margin = new Dimension (0, 12);
  	pane.setForeground (Color.black);
! 	pane.add(Box.createRigidArea(vertical_margin));
  	pane.add(serverBox);
! 	pane.add(Box.createRigidArea(vertical_margin));
  	pane.add(seqBox);
! 	pane.add(Box.createRigidArea(vertical_margin));
  	pane.add(rangeBox);
! 	pane.add(Box.createRigidArea(vertical_margin));
  	pane.add(historyBox);
+ 	pane.add(Box.createRigidArea(vertical_margin));
  	pane.add(Box.createVerticalGlue());