*** FileFormat.java.old	Wed Oct  9 13:02:24 2002
--- FileFormat.java	Fri Dec 13 23:44:04 2002
*************** public abstract class FileFormat {
*** 15,20 ****
--- 15,28 ----
  	static final String FORMAT_PACKAGE = "org.eclipse.swt.internal.image";
  	static final String FORMAT_SUFFIX = "FileFormat";
  	static final String[] FORMATS = {"WinBMP", "WinBMP", "GIF", "WinICO", "JPEG", "PNG"};
+ 	static final FileFormat[] FORMATS_CLASSES = {
+ 		new WinBMPFileFormat(),
+ 		new WinBMPFileFormat(),
+ 		new GIFFileFormat(),
+ 		new WinICOFileFormat(),
+ 		new JPEGFileFormat(),
+ 		new PNGFileFormat()
+ 	};
  	
  	LEDataInputStream inputStream;
  	LEDataOutputStream outputStream;
*************** public static ImageData[] load(InputStre
*** 54,68 ****
  	for (int i = 1; i < FORMATS.length; i++) {
  		if (FORMATS[i] != null) {
  			try {
! 				Class clazz = Class.forName(FORMAT_PACKAGE + '.' + FORMATS[i] + FORMAT_SUFFIX);
! 				fileFormat = (FileFormat) clazz.newInstance();
! 				if (fileFormat.isFileFormat(stream)) {
  					isSupported = true;
  					break;
  				}
- 			} catch (ClassNotFoundException e) {
- 				FORMATS[i] = null;
  			} catch (Exception e) {
  			}
  		}
  	}
--- 62,74 ----
  	for (int i = 1; i < FORMATS.length; i++) {
  		if (FORMATS[i] != null) {
  			try {
! 				if (FORMATS_CLASSES[i].isFileFormat(stream)) {
! 					fileFormat = FORMATS_CLASSES[i];
  					isSupported = true;
  					break;
  				}
  			} catch (Exception e) {
+ 				System.out.println(e.toString());
  			}
  		}
  	}