Thread: [Osmose-dev-devel] osmose/src/osmose/application/common OSMBackGroundComponent.java, 1.1.1.1, 1.2 O

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	OSMBackGroundComponent.java OSMComponent.java 
	OSMEditorPanel.java OSMFrame.java OSMFullScreenFrame.java 
	OSMPropertyChangeEventDispatcher.java 
	OSMResizableComponent.java OSMSlidePanel.java 
	OSMTxtComponent.java 
Log Message:
Adapt code for Java 1.6 (some warnings remain)

Index: OSMSlidePanel.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/OSMSlidePanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OSMSlidePanel.java	30 Aug 2005 17:44:00 -0000	1.1.1.1
--- OSMSlidePanel.java	3 Oct 2007 21:31:13 -0000	1.2
***************
*** 28,32 ****
   * component can be added, moved and resized to compose the slide.</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Société : Quadrille Ingénierie</p>
   * @author : TD, OH
   * @version 1.0
--- 28,32 ----
   * component can be added, moved and resized to compose the slide.</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Societe : Quadrille Ingenierie</p>
   * @author : TD, OH
   * @version 1.0

Index: OSMFullScreenFrame.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/OSMFullScreenFrame.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OSMFullScreenFrame.java	30 Aug 2005 17:43:59 -0000	1.1.1.1
--- OSMFullScreenFrame.java	3 Oct 2007 21:31:13 -0000	1.2
***************
*** 25,29 ****
   * <p>Description : Represent a frame that can be display in full screen mode.</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Société : Quadrille</p>
   * @author TD
   * @version 1.0
--- 25,29 ----
   * <p>Description : Represent a frame that can be display in full screen mode.</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Societe : Quadrille</p>
   * @author TD
   * @version 1.0

Index: OSMResizableComponent.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/OSMResizableComponent.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OSMResizableComponent.java	30 Aug 2005 17:44:00 -0000	1.1.1.1
--- OSMResizableComponent.java	3 Oct 2007 21:31:13 -0000	1.2
***************
*** 25,29 ****
   * an OSMEditorPanel.</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Société : Quadrille Ingénierie</p>
   * @author : TD
   * @version 1.0
--- 25,29 ----
   * an OSMEditorPanel.</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Societe : Quadrille Ingenierie</p>
   * @author : TD
   * @version 1.0

Index: OSMComponent.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/OSMComponent.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OSMComponent.java	30 Aug 2005 17:43:59 -0000	1.1.1.1
--- OSMComponent.java	3 Oct 2007 21:31:13 -0000	1.2
***************
*** 25,29 ****
   * <p>Description : This is a generic swing component usable with OSMEditorPanel.</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Société : Quadrille Ingénierie</p>
   * @author : TD
   * @version 1.0
--- 25,29 ----
   * <p>Description : This is a generic swing component usable with OSMEditorPanel.</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Societe : Quadrille Ingenierie</p>
   * @author : TD
   * @version 1.0

Index: OSMBackGroundComponent.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/OSMBackGroundComponent.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OSMBackGroundComponent.java	30 Aug 2005 17:43:59 -0000	1.1.1.1
--- OSMBackGroundComponent.java	3 Oct 2007 21:31:13 -0000	1.2
***************
*** 27,31 ****
   * <p>Description : To display slide background.</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Société : Quadrille.</p>
   * @author TD
   * @version 1.0
--- 27,31 ----
   * <p>Description : To display slide background.</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Societe : Quadrille.</p>
   * @author TD
   * @version 1.0

Index: OSMPropertyChangeEventDispatcher.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/OSMPropertyChangeEventDispatcher.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OSMPropertyChangeEventDispatcher.java	30 Aug 2005 17:44:00 -0000	1.1.1.1
--- OSMPropertyChangeEventDispatcher.java	3 Oct 2007 21:31:13 -0000	1.2
***************
*** 27,31 ****
   * <p>Description : convenience class to dispatching property change event</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Société : Quadrille Ingénierie</p>
   *
   * date     2003-08-29 09:00
--- 27,31 ----
   * <p>Description : convenience class to dispatching property change event</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Societe : Quadrille Ingenierie</p>
   *
   * date     2003-08-29 09:00
***************
*** 112,117 ****
    public boolean removePropertyChangeListener(PropertyChangeListener _l) {
      boolean found = false;
!     for(Enumeration enum = pr_.elements();enum.hasMoreElements();) {
!       Vector _prop = (Vector)pr_.get(enum.nextElement());
        if((_prop != null) && (!_prop.contains(_l))) {
          found = true;
--- 112,117 ----
    public boolean removePropertyChangeListener(PropertyChangeListener _l) {
      boolean found = false;
!     for(Enumeration enumer = pr_.elements();enumer.hasMoreElements();) {
!       Vector _prop = (Vector)pr_.get(enumer.nextElement());
        if((_prop != null) && (!_prop.contains(_l))) {
          found = true;

Index: OSMTxtComponent.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/OSMTxtComponent.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OSMTxtComponent.java	30 Aug 2005 17:44:00 -0000	1.1.1.1
--- OSMTxtComponent.java	3 Oct 2007 21:31:13 -0000	1.2
***************
*** 25,29 ****
   * <p>Description : This class is used to draw text in a panel.</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Société : Quadrille Ingénierie</p>
   * @author : OH
   * @version 1.0
--- 25,29 ----
   * <p>Description : This class is used to draw text in a panel.</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Societe : Quadrille Ingenierie</p>
   * @author : OH
   * @version 1.0
***************
*** 78,89 ****
        g.setFont(this.m_Font);
        FontMetrics metrics = g.getFontMetrics();
!       Enumeration enum = getTextLines(m_Text, metrics, getWidth());
        int k = 0;
        int txtpos;
        String _line;
        int lmax = 0;
!       while(enum.hasMoreElements()) {
          k++;
!         _line = (String)enum.nextElement();
          txtpos = k * (m_Font.getSize() + TXT_INTERLINE);
          g.drawString(_line, TXT_INTERLINE, txtpos);
--- 78,89 ----
        g.setFont(this.m_Font);
        FontMetrics metrics = g.getFontMetrics();
!       Enumeration enumer = getTextLines(m_Text, metrics, getWidth());
        int k = 0;
        int txtpos;
        String _line;
        int lmax = 0;
!       while(enumer.hasMoreElements()) {
          k++;
!         _line = (String)enumer.nextElement();
          txtpos = k * (m_Font.getSize() + TXT_INTERLINE);
          g.drawString(_line, TXT_INTERLINE, txtpos);

Index: OSMEditorPanel.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/OSMEditorPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OSMEditorPanel.java	30 Aug 2005 17:43:59 -0000	1.1.1.1
--- OSMEditorPanel.java	3 Oct 2007 21:31:13 -0000	1.2
***************
*** 27,31 ****
   * This panel supports multiselection.</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Société : Quadrille Ingénierie</p>
   * @author : TD
   * @version 1.0
--- 27,31 ----
   * This panel supports multiselection.</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Societe : Quadrille Ingenierie</p>
   * @author : TD
   * @version 1.0

Index: OSMFrame.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/OSMFrame.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OSMFrame.java	30 Aug 2005 17:43:59 -0000	1.1.1.1
--- OSMFrame.java	3 Oct 2007 21:31:13 -0000	1.2
***************
*** 24,28 ****
   * <p>Description : This is a generic frame for the application.</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Société : Quadrille Ingénierie</p>
   * @author : TD
   * @version 1.0
--- 24,28 ----
   * <p>Description : This is a generic frame for the application.</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Societe : Quadrille Ingenierie</p>
   * @author : TD
   * @version 1.0

Thread: [Osmose-dev-devel] osmose/src/osmose/application/common OSMBackGroundComponent.java, 1.1.1.1, 1.2 O

osmose-dev-devel