[Jake2-commits] jake2/src/jake2/qcommon Q2DataDialog.java,1.2,1.3 Qcommon.java,1.8,1.9 Q2DataTest.java,1.2,NONE

[Holger Z. <hz...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/qcommon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2615/src/jake2/qcommon

Modified Files:
	Q2DataDialog.java Qcommon.java 
Removed Files:
	Q2DataTest.java 
Log Message:
move test method

Index: Qcommon.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Qcommon.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Qcommon.java	19 Sep 2004 19:53:51 -0000	1.8
--- Qcommon.java	19 Sep 2004 20:53:07 -0000	1.9
***************
*** 87,91 ****
  
  			FS.setCDDir(); // use cddir from config.cfg
! 			Q2DataTest.run(); // test for valid baseq2
  			reconfigure(); // reload default.cfg and config.cfg
  			
--- 87,91 ----
  
  			FS.setCDDir(); // use cddir from config.cfg
! 			Jake2.Q2Dialog.testQ2Data(); // test for valid baseq2
  			reconfigure(); // reload default.cfg and config.cfg
  			

Index: Q2DataDialog.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Q2DataDialog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Q2DataDialog.java	19 Sep 2004 19:53:51 -0000	1.2
--- Q2DataDialog.java	19 Sep 2004 20:53:07 -0000	1.3
***************
*** 232,235 ****
--- 232,248 ----
  	}
  	
+ 	void testQ2Data() {
+ 		while (FS.LoadFile("pics/colormap.pcx") == null) {
+ 			showChooseDialog();
+ 			
+ 			try {
+ 				synchronized(this) {
+ 					wait();
+ 				}
+ 			} catch (InterruptedException e) {}
+ 		}
+ 		showStatus();
+ 	}
+ 		
  	static class Jake2Canvas extends Canvas {
  		private Image image;

--- Q2DataTest.java DELETED ---