From: Olivier G. <og...@us...> - 2007-10-03 21:31:42
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/dialog In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18733/src/osmose/application/dialog Modified Files: OSMDialogApplicationPreferences.java OSMDialogDocInfo.java OSMDialogDocumentColors.java OSMDialogExport.java OSMDialogPageSettings.java OSMDialogPresentationOption.java OSMDialogSearch.java Log Message: Adapt code for Java 1.6 (some warnings remain) Index: OSMDialogPresentationOption.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/dialog/OSMDialogPresentationOption.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMDialogPresentationOption.java 30 Aug 2005 17:44:08 -0000 1.1.1.1 --- OSMDialogPresentationOption.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 30,34 **** * <p>Description : This class is the frame of the presentation options.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * * date 2003-08-20 09:00 --- 30,34 ---- * <p>Description : This class is the frame of the presentation options.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : Quadrille Ingenierie</p> * * date 2003-08-20 09:00 Index: OSMDialogPageSettings.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/dialog/OSMDialogPageSettings.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMDialogPageSettings.java 30 Aug 2005 17:44:08 -0000 1.1.1.1 --- OSMDialogPageSettings.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 29,33 **** * <p>Description : This class is the frame of the slide printer page settings.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * * date 2003-08-18 15:00 --- 29,33 ---- * <p>Description : This class is the frame of the slide printer page settings.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : Quadrille Ingenierie</p> * * date 2003-08-18 15:00 Index: OSMDialogSearch.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/dialog/OSMDialogSearch.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMDialogSearch.java 30 Aug 2005 17:44:08 -0000 1.1.1.1 --- OSMDialogSearch.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 30,34 **** * <p>Description : This class is the frame of the application export.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * * date 2003-08-19 11:00 --- 30,34 ---- * <p>Description : This class is the frame of the application export.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : Quadrille Ingenierie</p> * * date 2003-08-19 11:00 Index: OSMDialogApplicationPreferences.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/dialog/OSMDialogApplicationPreferences.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMDialogApplicationPreferences.java 14 Nov 2005 22:15:09 -0000 1.2 --- OSMDialogApplicationPreferences.java 3 Oct 2007 21:31:14 -0000 1.3 *************** *** 34,38 **** * <p>Description : This class is the frame of the application preferences.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * * @author Olivier Hoareau < oli...@tr... > --- 34,38 ---- * <p>Description : This class is the frame of the application preferences.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : Quadrille Ingenierie</p> * * @author Olivier Hoareau < oli...@tr... > *************** *** 149,153 **** /** ! * APPLICATION => Sensibilité Panel. */ JPanel pSens = new JPanel(); --- 149,153 ---- /** ! * APPLICATION => Sensibilite Panel. */ JPanel pSens = new JPanel(); *************** *** 257,262 **** pMedia.add(plMedia, new Rectangle(0, 0, 1, 1)); final JComboBox cbMedia = new JComboBox(); ! for(Enumeration enum = m_MediaType2.elements();enum.hasMoreElements();) ! cbMedia.addItem(enum.nextElement()); cbMedia.addKeyListener(this); JPanel pcbMedia = new JPanel(); --- 257,262 ---- pMedia.add(plMedia, new Rectangle(0, 0, 1, 1)); final JComboBox cbMedia = new JComboBox(); ! for(Enumeration enumer = m_MediaType2.elements();enumer.hasMoreElements();) ! cbMedia.addItem(enumer.nextElement()); cbMedia.addKeyListener(this); JPanel pcbMedia = new JPanel(); *************** *** 279,283 **** ! // Ajout d'un panel pour la taille des éléments. JPanel eltPanel = new JPanel(); eltPanel.setLayout(new OSMGraphPaperLayout(new Dimension(6, 2), 1, 1)); --- 279,283 ---- ! // Ajout d'un panel pour la taille des elements. JPanel eltPanel = new JPanel(); eltPanel.setLayout(new OSMGraphPaperLayout(new Dimension(6, 2), 1, 1)); Index: OSMDialogExport.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/dialog/OSMDialogExport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMDialogExport.java 3 May 2007 21:06:01 -0000 1.2 --- OSMDialogExport.java 3 Oct 2007 21:31:14 -0000 1.3 *************** *** 38,42 **** * <p>Description : This class is the frame of the application export.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * * date 2003-08-19 11:00 --- 38,42 ---- * <p>Description : This class is the frame of the application export.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : Quadrille Ingenierie</p> * * date 2003-08-19 11:00 Index: OSMDialogDocInfo.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/dialog/OSMDialogDocInfo.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMDialogDocInfo.java 30 Aug 2005 17:44:07 -0000 1.1.1.1 --- OSMDialogDocInfo.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 30,34 **** * <p>Description : This class is the frame of the document settings.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author Olivier Hoareau < oli...@tr... > * @version 1.0 --- 30,34 ---- * <p>Description : This class is the frame of the document settings.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : Quadrille Ingenierie</p> * @author Olivier Hoareau < oli...@tr... > * @version 1.0 Index: OSMDialogDocumentColors.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/dialog/OSMDialogDocumentColors.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMDialogDocumentColors.java 30 Aug 2005 17:44:07 -0000 1.1.1.1 --- OSMDialogDocumentColors.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 31,35 **** * <p>Description : This class is the frame of the document colors settings.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * * date 2003-09-10 09:00 --- 31,35 ---- * <p>Description : This class is the frame of the document colors settings.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : Quadrille Ingenierie</p> * * date 2003-09-10 09:00 *************** *** 222,226 **** * <p>Description : inner class that implements the caret listener</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author non attribuable * @version 1.0 --- 222,226 ---- * <p>Description : inner class that implements the caret listener</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : </p> * @author non attribuable * @version 1.0 *************** *** 249,253 **** * <p>Description : inner class for mouse listener</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author non attribuable * @version 1.0 --- 249,253 ---- * <p>Description : inner class for mouse listener</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : </p> * @author non attribuable * @version 1.0 |