tn5250j/src/org/tn5250j/tools XTFRFile.java,1.14,1.15

[email protected]
Newsgroups gmane.comp.java.tn5250j.cvs
Message-ID <[email protected]>
Update of /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv26694/src/org/tn5250j/tools

Modified Files:
	XTFRFile.java 
Log Message:
Several bugfixes.

Index: XTFRFile.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools/XTFRFile.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** XTFRFile.java	22 Dec 2003 14:19:55 -0000	1.14
--- XTFRFile.java	20 Jan 2004 15:53:28 -0000	1.15
***************
*** 530,534 ****
  		gbc = new GridBagConstraints();
  		gbc.gridx = 1; gbc.gridy = 0;
! 		gbc.gridwidth = 2;		
  		gbc.anchor = GridBagConstraints.WEST;
  		gbc.insets = new Insets(5, 5, 5, 10);
--- 530,534 ----
  		gbc = new GridBagConstraints();
  		gbc.gridx = 1; gbc.gridy = 0;
! 		gbc.gridwidth = 2;
  		gbc.anchor = GridBagConstraints.WEST;
  		gbc.insets = new Insets(5, 5, 5, 10);
***************
*** 546,550 ****
  		gbc.gridwidth = 2;
  		gbc.anchor = GridBagConstraints.WEST;
! 		gbc.insets = new Insets(5, 5, 5, 10);		
  		as400p.add(hostFile, gbc);
  		JLabel idpLabel = new JLabel(LangTool.getString("xtfr.labelUserId"));
--- 546,550 ----
  		gbc.gridwidth = 2;
  		gbc.anchor = GridBagConstraints.WEST;
! 		gbc.insets = new Insets(5, 5, 5, 10);
  		as400p.add(hostFile, gbc);
  		JLabel idpLabel = new JLabel(LangTool.getString("xtfr.labelUserId"));
***************
*** 559,563 ****
  		gbc.gridx = 1; gbc.gridy = 2;
  		gbc.anchor = GridBagConstraints.WEST;
! 		gbc.insets = new Insets(5, 5, 5, 5);				
  		as400p.add(user, gbc);
  		// password panel
--- 559,563 ----
  		gbc.gridx = 1; gbc.gridy = 2;
  		gbc.anchor = GridBagConstraints.WEST;
! 		gbc.insets = new Insets(5, 5, 5, 5);
  		as400p.add(user, gbc);
  		// password panel
***************
*** 573,585 ****
  		gbc.gridx = 1; gbc.gridy = 3;
  		gbc.anchor = GridBagConstraints.WEST;
! 		gbc.insets = new Insets(5, 5, 5, 5);		
  		as400p.add(password, gbc);
  		// Query Wizard
  		useQuery = new JCheckBox(LangTool.getString("xtfr.labelUseQuery"));
  		useQuery.addItemListener(this);
  		gbc = new GridBagConstraints();
  		gbc.gridx = 0; gbc.gridy = 4;
  		gbc.anchor = GridBagConstraints.WEST;
! 		gbc.insets = new Insets(5, 10, 5, 5);		
  		as400p.add(useQuery, gbc);
  		//query button
--- 573,586 ----
  		gbc.gridx = 1; gbc.gridy = 3;
  		gbc.anchor = GridBagConstraints.WEST;
! 		gbc.insets = new Insets(5, 5, 5, 5);
  		as400p.add(password, gbc);
  		// Query Wizard
  		useQuery = new JCheckBox(LangTool.getString("xtfr.labelUseQuery"));
  		useQuery.addItemListener(this);
+ 
  		gbc = new GridBagConstraints();
  		gbc.gridx = 0; gbc.gridy = 4;
  		gbc.anchor = GridBagConstraints.WEST;
! 		gbc.insets = new Insets(5, 10, 5, 5);
  		as400p.add(useQuery, gbc);
  		//query button
***************
*** 595,599 ****
  		gbc.anchor = GridBagConstraints.WEST;
  		gbc.fill = GridBagConstraints.HORIZONTAL;
! 		gbc.insets = new Insets(0, 5, 0, 5);		
  		as400p.add(queryWizard, gbc);
  		// Field Selection panel
--- 596,600 ----
  		gbc.anchor = GridBagConstraints.WEST;
  		gbc.fill = GridBagConstraints.HORIZONTAL;
! 		gbc.insets = new Insets(0, 5, 0, 5);
  		as400p.add(queryWizard, gbc);
  		// Field Selection panel
***************
*** 610,614 ****
  		gbc.anchor = GridBagConstraints.CENTER;
  		gbc.insets = new Insets(0, 5, 0, 5);
! 		as400p.add(allFields, gbc);		
  		selectedFields =
  			new JRadioButton(LangTool.getString("xtfr.labelSelectedFields"));
--- 611,615 ----
  		gbc.anchor = GridBagConstraints.CENTER;
  		gbc.insets = new Insets(0, 5, 0, 5);
! 		as400p.add(allFields, gbc);
  		selectedFields =
  			new JRadioButton(LangTool.getString("xtfr.labelSelectedFields"));
***************
*** 617,621 ****
  		gbc.anchor = GridBagConstraints.CENTER;
  		gbc.insets = new Insets(0, 5, 0, 10);
! 		as400p.add(selectedFields, gbc);				
  		ButtonGroup fieldGroup = new ButtonGroup();
  		fieldGroup.add(allFields);
--- 618,622 ----
  		gbc.anchor = GridBagConstraints.CENTER;
  		gbc.insets = new Insets(0, 5, 0, 10);
! 		as400p.add(selectedFields, gbc);
  		ButtonGroup fieldGroup = new ButtonGroup();
  		fieldGroup.add(allFields);
***************
*** 635,639 ****
  		gbc.anchor = GridBagConstraints.CENTER;
  		gbc.insets = new Insets(0, 5, 5, 5);
! 		as400p.add(txtDesc, gbc);		
  		intDesc = new JRadioButton(LangTool.getString("xtfr.labelTxtDescInt"));
  		gbc = new GridBagConstraints();
--- 636,640 ----
  		gbc.anchor = GridBagConstraints.CENTER;
  		gbc.insets = new Insets(0, 5, 5, 5);
! 		as400p.add(txtDesc, gbc);
  		intDesc = new JRadioButton(LangTool.getString("xtfr.labelTxtDescInt"));
  		gbc = new GridBagConstraints();
***************
*** 641,645 ****
  		gbc.anchor = GridBagConstraints.CENTER;
  		gbc.insets = new Insets(0, 5, 5, 10);
! 		as400p.add(intDesc, gbc);	
  		ButtonGroup txtDescGroup = new ButtonGroup();
  		txtDescGroup.add(txtDesc);
--- 642,646 ----
  		gbc.anchor = GridBagConstraints.CENTER;
  		gbc.insets = new Insets(0, 5, 5, 10);
! 		as400p.add(intDesc, gbc);
  		ButtonGroup txtDescGroup = new ButtonGroup();
  		txtDescGroup.add(txtDesc);
***************
*** 744,748 ****
  		gbc.fill = GridBagConstraints.HORIZONTAL;
  		gbc.insets = new Insets(0, 5, 5, 5);
! 		pcp.add(decimalSeparator, gbc);		
  
  		sp.add(as400p, BorderLayout.NORTH);
--- 745,749 ----
  		gbc.fill = GridBagConstraints.HORIZONTAL;
  		gbc.insets = new Insets(0, 5, 5, 5);
! 		pcp.add(decimalSeparator, gbc);
  
  		sp.add(as400p, BorderLayout.NORTH);
***************
*** 771,774 ****
--- 772,784 ----
  		this.setTitle(LangTool.getString("xtfr.title"));
  
+ 		//QueryPanel when Use Query selected
+ 		as400QueryP = new JPanel();
+ 		as400QueryP.setLayout(new BorderLayout());
+ 
+ 		queryStatement = new JTextArea(2, 40);
+ 		JScrollPane scrollPane = new JScrollPane(queryStatement);
+ 		queryStatement.setLineWrap(true);
+ 		as400QueryP.add(scrollPane, BorderLayout.CENTER);
+ 
  		initXTFRFields();
  
***************
*** 784,796 ****
  			(screenSize.width - frameSize.width) / 2,
  			(screenSize.height - frameSize.height) / 2);
- 			
- 		//QueryPanel when Use Query selected
- 		as400QueryP = new JPanel();
- 		as400QueryP.setLayout(new BorderLayout());
- 
- 		queryStatement = new JTextArea(2, 40);
- 		JScrollPane scrollPane = new JScrollPane(queryStatement);
- 		queryStatement.setLineWrap(true);
- 		as400QueryP.add(scrollPane, BorderLayout.CENTER);
  
  		// now show the world what we can do
--- 794,797 ----
***************
*** 934,943 ****
  				gbc.anchor = GridBagConstraints.CENTER;
  				gbc.insets = new Insets(0, 5, 0, 5);
! 				as400p.add(allFields, gbc);		
  				gbc = new GridBagConstraints();
  				gbc.gridx = 2; gbc.gridy = 5;
  				gbc.anchor = GridBagConstraints.CENTER;
  				gbc.insets = new Insets(0, 5, 0, 10);
! 				as400p.add(selectedFields, gbc);				
  				// Field Text Description panel
  				gbc = new GridBagConstraints();
--- 935,944 ----
  				gbc.anchor = GridBagConstraints.CENTER;
  				gbc.insets = new Insets(0, 5, 0, 5);
! 				as400p.add(allFields, gbc);
  				gbc = new GridBagConstraints();
  				gbc.gridx = 2; gbc.gridy = 5;
  				gbc.anchor = GridBagConstraints.CENTER;
  				gbc.insets = new Insets(0, 5, 0, 10);
! 				as400p.add(selectedFields, gbc);
  				// Field Text Description panel
  				gbc = new GridBagConstraints();
***************
*** 951,960 ****
  				gbc.anchor = GridBagConstraints.CENTER;
  				gbc.insets = new Insets(0, 5, 5, 5);
! 				as400p.add(txtDesc, gbc);		
  				gbc = new GridBagConstraints();
  				gbc.gridx = 2; gbc.gridy = 6;
  				gbc.anchor = GridBagConstraints.CENTER;
  				gbc.insets = new Insets(0, 5, 5, 10);
! 				as400p.add(intDesc, gbc);	
  			}
  			this.validate();
--- 952,961 ----
  				gbc.anchor = GridBagConstraints.CENTER;
  				gbc.insets = new Insets(0, 5, 5, 5);
! 				as400p.add(txtDesc, gbc);
  				gbc = new GridBagConstraints();
  				gbc.gridx = 2; gbc.gridy = 6;
  				gbc.anchor = GridBagConstraints.CENTER;
  				gbc.insets = new Insets(0, 5, 5, 10);
! 				as400p.add(intDesc, gbc);
  			}
  			this.validate();




-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.