[Nextobjects-devel] nextobjects/nextobjects/src/org/devaki/nextobjects NextObjects.java,1.10,1.11

[<efl...@us...>]

Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects
In directory sc8-pr-cvs1:/tmp/cvs-serv12214/src/org/devaki/nextobjects

Modified Files:
	NextObjects.java 
Log Message:
Fixed major bug in merise transform.


Index: NextObjects.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/NextObjects.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** NextObjects.java	24 May 2003 18:50:46 -0000	1.10
--- NextObjects.java	25 May 2003 08:02:36 -0000	1.11
***************
*** 99,107 ****
      splash.jProgressBar1.setString("Loading properties");
      NOTools nOTools = new NOTools();
!     splash.jProgressBar1.setValue(5);
!     
!    
! 
!     
  
  
--- 99,103 ----
      splash.jProgressBar1.setString("Loading properties");
      NOTools nOTools = new NOTools();
!     splash.jProgressBar1.setValue(5);   
  
  
***************
*** 119,128 ****
      // Set icon for nextObjects
      this.setIconImage(Toolkit.getDefaultToolkit().getImage(org.devaki.nextobjects.NextObjects.class.getResource(
!                         "/org/devaki/nextobjects/icons/icon.gif")));
! 
  
      // Set size
!     this.setSize(Integer.parseInt(NOTools.NO_PROPS.getProperty("width")),
!                  Integer.parseInt(NOTools.NO_PROPS.getProperty("heigth")));
  
      // Create the ModelMan object
--- 115,134 ----
      // Set icon for nextObjects
      this.setIconImage(Toolkit.getDefaultToolkit().getImage(org.devaki.nextobjects.NextObjects.class.getResource(
!                         "/org/devaki/nextobjects/icons/icon.png")));
  
      // Set size
!      int w=640;
!      int h=480;
!      try {
! 		w=Integer.parseInt(NOTools.NO_PROPS.getProperty("width"));
! 		h=Integer.parseInt(NOTools.NO_PROPS.getProperty("heigth"));			
!      } catch (Exception e) {
!      	w=640;
!      	h=480;
!      	logger.error("Setting default window size.");     	
!      }
! 	if (w<10 || h< 10)	{ h=480; w=480; }     
!      this.setSize(w,h);
!     
  
      // Create the ModelMan object
***************
*** 148,152 ****
      this.getContentPane().setLayout(new GridBagLayout());
      // Set divider location of the horizontal split panel
!     jSplitPane2.setDividerLocation((int)this.getSize().getHeight() - 200);
  
      /** Listeners **/
--- 154,158 ----
      this.getContentPane().setLayout(new GridBagLayout());
      // Set divider location of the horizontal split panel
!     jSplitPane2.setDividerLocation((int)this.getSize().getHeight() - 220);
  
      /** Listeners **/