bprocessor-commit

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/properties
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5293/src/net/sourceforge/bprocessor/gui/properties

Modified Files:
	Settings.java 
Log Message:
Delays showing the GUI window until the GLView  is done with initialisation.
Displays a SplashWindow on startup, that are removed when the GUI window is displayed.

Index: Settings.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/properties/Settings.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Settings.java	4 Aug 2005 06:06:26 -0000	1.1
--- Settings.java	21 Oct 2005 08:42:47 -0000	1.2
***************
*** 7,12 ****
  package net.sourceforge.bprocessor.gui.properties;
  
! import net.sourceforge.bprocessor.model.db.Database;
! import net.sourceforge.bprocessor.model.db.DatabaseFactory;
  
  import java.io.FileInputStream;
--- 7,12 ----
  package net.sourceforge.bprocessor.gui.properties;
  
! //import net.sourceforge.bprocessor.model.db.Database;
! //import net.sourceforge.bprocessor.model.db.DatabaseFactory;
  
  import java.io.FileInputStream;
***************
*** 96,101 ****
      String password = getProperty(CONNECTION_PASSWORD);
      boolean autodrop = Boolean.valueOf(getProperty(CONNECTION_AUTODROP)).booleanValue();
! 
!     DatabaseFactory.getInstance().setDatabase(type, url, user, password, autodrop);
    }
  
--- 96,102 ----
      String password = getProperty(CONNECTION_PASSWORD);
      boolean autodrop = Boolean.valueOf(getProperty(CONNECTION_AUTODROP)).booleanValue();
!     System.out.println("Applying Properties");
!     //DatabaseFactory.getInstance().setDatabase(type, url, user, password, autodrop);
!     System.out.println("Done Applying Properties");
    }
  
***************
*** 105,117 ****
    private void defaultSettings() {
      clear();
  
!     Database db = DatabaseFactory.getInstance().getDatabase();
! 
!     setProperty(DATABASE_NAME, db.getName());
!     setProperty(DATABASE_TYPE, Integer.toString(db.getType()));
!     setProperty(CONNECTION_URL, db.getUrl());
!     setProperty(CONNECTION_USER, db.getUser());
!     setProperty(CONNECTION_PASSWORD, db.getPassword());
!     setProperty(CONNECTION_AUTODROP, Boolean.toString(db.getAutodrop()));
    }
  }
--- 106,119 ----
    private void defaultSettings() {
      clear();
+     //System.out.println("Getting Database Instance");
+     //Database db = DatabaseFactory.getInstance().getDatabase();
+     //System.out.println("DONE");
  
!     //setProperty(DATABASE_NAME, db.getName());
!     //setProperty(DATABASE_TYPE, Integer.toString(db.getType()));
!     //setProperty(CONNECTION_URL, db.getUrl());
!     //setProperty(CONNECTION_USER, db.getUser());
!     //setProperty(CONNECTION_PASSWORD, db.getPassword());
!     //setProperty(CONNECTION_AUTODROP, Boolean.toString(db.getAutodrop()));
    }
  }