[Osmose-dev-devel] osmose/src/osmose/application/common OSMFullScreenFrame.java, 1.2, 1.3

[Olivier G. <og...@us...>]

Update of /cvsroot/osmose-dev/osmose/src/osmose/application/common
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6501/src/osmose/application/common

Modified Files:
	OSMFullScreenFrame.java 
Log Message:
Added choice for putting bullet lists in notes (by Fatimatou)

Index: OSMFullScreenFrame.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/OSMFullScreenFrame.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OSMFullScreenFrame.java	3 Oct 2007 21:31:13 -0000	1.2
--- OSMFullScreenFrame.java	17 Feb 2008 22:11:50 -0000	1.3
***************
*** 58,87 ****
    }
  
  
    /**
     * To create a full screen frame.
     */
!   public OSMFullScreenFrame() {
!     super();
!     setTitle(OSMApplication.Localisation.getString("SVR_Visualisation"));
!     m_Running = false;
!     m_InFullScreen = false;
! 
! 
!     // Get the default device (Generaly only one device)
!     m_Device = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
! 
! this.setUndecorated(true);
! this.setIgnoreRepaint(true);
! this.setResizable(false);
!     // To know if full screen is supported
!     m_FullScreenSupported = m_Device.isFullScreenSupported();
!    /* if(OSMApplication.isMacOsX())
!     {
!       m_FullScreenSupported = false;
!       setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
!       enableEvents(AWTEvent.WINDOW_EVENT_MASK);
!     }*/
!   }
  
  
--- 58,99 ----
    }
  
+   /**
+    * To return the number of screens
+    */
+    protected int getNumberScreen(){
+ 	GraphicsDevice[] gs = GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices();
+ 	return gs.length;
+     }
  
    /**
     * To create a full screen frame.
     */
!    
!     public OSMFullScreenFrame() {
! 	    super();
! 	    setTitle(OSMApplication.Localisation.getString("SVR_Visualisation"));
! 	    m_Running = false;
! 	    m_InFullScreen = false;
! 	    GraphicsDevice[] gs = GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices();
!         if(gs.length==1){
! 	       // Get the default device when there is only one device
! 	       m_Device = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
! 	    
! 	       // To know if full screen is supported
! 	      m_FullScreenSupported = m_Device.isFullScreenSupported();
!        }
!        if(gs.length==2){
!      	// Get the device 
!  	     m_Device = gs[0];
!  	     m_Device1= gs[1];
!  	     
!  	    // To know if full screen is supported for the two devices
!  	     m_FullScreenSupported = m_Device.isFullScreenSupported() & m_Device1.isFullScreenSupported();
!  	    
!      } 	
!       this.setUndecorated(true);
! 	  this.setIgnoreRepaint(true);
! 	     this.setResizable(false);
!      }
  
  
***************
*** 115,119 ****
          setResizable(false);
          setIgnoreRepaint(true);
!         m_Device.setFullScreenWindow(this);
        }
        else { // Not supported -> Only windowed mode
--- 127,139 ----
          setResizable(false);
          setIgnoreRepaint(true);
!         //If there is only one screen
!         if(getNumberScreen()==1){
!           m_Device.setFullScreenWindow(this);
!         }
!         // if there is two screen
!         if(getNumberScreen()==2){
!         	m_Device.setFullScreenWindow(this);
!         	m_Device1.setFullScreenWindow(this);
!         }
        }
        else { // Not supported -> Only windowed mode
***************
*** 122,127 ****
        m_InFullScreen = true;
        begin2Draw();
!       while(m_Running)
!         Thread.sleep(50);
      }
      catch(Exception e) {}
--- 142,149 ----
        m_InFullScreen = true;
        begin2Draw();
!       if(getNumberScreen()== 1){
!     	  while(m_Running)
!     	    Thread.sleep(50);
!        }
      }
      catch(Exception e) {}
***************
*** 129,133 ****
--- 151,161 ----
        if(m_InFullScreen) {
          if(m_FullScreenSupported) { // Return from full screen mode
+           if(getNumberScreen()==1){
            m_Device.setFullScreenWindow(null);
+           }
+           if(getNumberScreen()==2){
+         	  m_Device.setFullScreenWindow(null);
+         	  m_Device1.setFullScreenWindow(null);
+           }
            hide();
            m_InFullScreen = false;
***************
*** 159,163 ****
        setBounds(0, 0, bounds.width, bounds.height);
      }
!     else
      {
        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
--- 187,191 ----
        setBounds(0, 0, bounds.width, bounds.height);
      }
!    else
      {
        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
***************
*** 165,172 ****
        setUndecorated(true);
      }
      setVisible(true);
      toFront();
    }
! 
  
    /**
--- 193,210 ----
        setUndecorated(true);
      }
+    
      setVisible(true);
      toFront();
    }
!   
!   /**
!    * device where to display the second device
!    */
!   private GraphicsDevice m_Device1;
!   
!   /**
!    * Device where to display if there is only one device or for the first device
!    */
!   private GraphicsDevice m_Device;
  
    /**
***************
*** 183,192 ****
  
    /**
-    * Device where to display
-    */
-   private GraphicsDevice m_Device;
- 
- 
-   /**
     * Thread's life...
     */
--- 221,224 ----