From: Olivier G. <og...@us...> - 2008-04-04 22:07:12
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/dialog In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11829/src/osmose/application/dialog Modified Files: OSMDialogDocumentColors.java OSMDialogDocInfo.java OSMDialogExport.java OSMDialogPresentationOption.java OSMDialogApplicationPreferences.java OSMDialogPageSettings.java Log Message: Removed usage of deprecated APIs Index: OSMDialogPresentationOption.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/dialog/OSMDialogPresentationOption.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMDialogPresentationOption.java 3 Oct 2007 21:31:14 -0000 1.2 --- OSMDialogPresentationOption.java 4 Apr 2008 22:07:13 -0000 1.3 *************** *** 49,53 **** else if(e.getKeyCode() == KeyEvent.VK_ESCAPE) ! hide(); } --- 49,53 ---- else if(e.getKeyCode() == KeyEvent.VK_ESCAPE) ! setVisible(false); } *************** *** 81,85 **** // Refresh it... OSMApplication.SlideEditor.refresh(); ! hide(); } --- 81,85 ---- // Refresh it... OSMApplication.SlideEditor.refresh(); ! setVisible(false); } *************** *** 125,129 **** bCancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { ! hide(); } }); --- 125,129 ---- bCancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { ! setVisible(false); } }); Index: OSMDialogPageSettings.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/dialog/OSMDialogPageSettings.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMDialogPageSettings.java 3 Oct 2007 21:31:14 -0000 1.2 --- OSMDialogPageSettings.java 4 Apr 2008 22:07:13 -0000 1.3 *************** *** 51,55 **** else if(e.getKeyCode() == KeyEvent.VK_ESCAPE) ! hide(); } --- 51,55 ---- else if(e.getKeyCode() == KeyEvent.VK_ESCAPE) ! setVisible(false); } *************** *** 90,94 **** bCancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { ! hide(); } }); --- 90,94 ---- bCancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { ! setVisible(false); } }); *************** *** 182,186 **** p.setIncludedOnFirstSlide("notes", m_NotesIncluded); p.setProperty("notes.position", m_NotesPosition); ! hide(); } public void keyTyped(KeyEvent e) { --- 182,186 ---- p.setIncludedOnFirstSlide("notes", m_NotesIncluded); p.setProperty("notes.position", m_NotesPosition); ! setVisible(false); } public void keyTyped(KeyEvent e) { Index: OSMDialogApplicationPreferences.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/dialog/OSMDialogApplicationPreferences.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** OSMDialogApplicationPreferences.java 3 Apr 2008 22:22:58 -0000 1.5 --- OSMDialogApplicationPreferences.java 4 Apr 2008 22:07:13 -0000 1.6 *************** *** 55,59 **** else if(e.getKeyCode() == KeyEvent.VK_ESCAPE) ! hide(); } --- 55,59 ---- else if(e.getKeyCode() == KeyEvent.VK_ESCAPE) ! setVisible(false); } *************** *** 138,142 **** bCancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { ! hide(); } }); --- 138,142 ---- bCancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { ! setVisible(false); } }); *************** *** 600,604 **** OSMApplication.TreeEditor.repaintAllComponents(); OSMApplication.SlideEditor.refresh(); ! hide(); } public void keyTyped(KeyEvent e) { --- 600,604 ---- OSMApplication.TreeEditor.repaintAllComponents(); OSMApplication.SlideEditor.refresh(); ! setVisible(false); } public void keyTyped(KeyEvent e) { Index: OSMDialogExport.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/dialog/OSMDialogExport.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OSMDialogExport.java 3 Oct 2007 21:31:14 -0000 1.3 --- OSMDialogExport.java 4 Apr 2008 22:07:13 -0000 1.4 *************** *** 128,132 **** bCancel.addActionListener(new ActionListener(){ public void actionPerformed(ActionEvent e){ ! hide(); }}); bCancel.addKeyListener(this); --- 128,132 ---- bCancel.addActionListener(new ActionListener(){ public void actionPerformed(ActionEvent e){ ! setVisible(false); }}); bCancel.addKeyListener(this); *************** *** 415,419 **** proceed(); else if (e.getKeyCode() == KeyEvent.VK_ESCAPE) ! hide(); } --- 415,419 ---- proceed(); else if (e.getKeyCode() == KeyEvent.VK_ESCAPE) ! setVisible(false); } *************** *** 467,471 **** else if (m_FormatHtml) exportToHTML(); ! hide(); } } --- 467,471 ---- else if (m_FormatHtml) exportToHTML(); ! setVisible(false); } } *************** *** 478,482 **** { this.m_Proceed=false; ! this.show(); return this.m_Proceed; } --- 478,482 ---- { this.m_Proceed=false; ! setVisible(true); return this.m_Proceed; } Index: OSMDialogDocInfo.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/dialog/OSMDialogDocInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMDialogDocInfo.java 3 Oct 2007 21:31:14 -0000 1.2 --- OSMDialogDocInfo.java 4 Apr 2008 22:07:13 -0000 1.3 *************** *** 47,51 **** else if(e.getKeyCode() == KeyEvent.VK_ESCAPE) ! hide(); } --- 47,51 ---- else if(e.getKeyCode() == KeyEvent.VK_ESCAPE) ! setVisible(false); } *************** *** 136,140 **** bCancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { ! hide(); } }); --- 136,140 ---- bCancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { ! setVisible(false); } }); Index: OSMDialogDocumentColors.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/dialog/OSMDialogDocumentColors.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMDialogDocumentColors.java 3 Oct 2007 21:31:14 -0000 1.2 --- OSMDialogDocumentColors.java 4 Apr 2008 22:07:13 -0000 1.3 *************** *** 53,57 **** else if(e.getKeyCode() == KeyEvent.VK_ESCAPE) ! hide(); } --- 53,57 ---- else if(e.getKeyCode() == KeyEvent.VK_ESCAPE) ! setVisible(false); } *************** *** 69,73 **** m_Document.getPresentation().setProperty("colors.color" + (i + 1) + ".color", (Color)m_ColorColors.get(i)); } ! hide(); } --- 69,73 ---- m_Document.getPresentation().setProperty("colors.color" + (i + 1) + ".color", (Color)m_ColorColors.get(i)); } ! setVisible(false); } *************** *** 76,81 **** * to show this dialog box and put the focus on a specified component */ ! public void show() { ! super.show(); } --- 76,81 ---- * to show this dialog box and put the focus on a specified component */ ! public void showThis() { ! super.setVisible(true); } *************** *** 127,131 **** bCancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { ! hide(); } }); --- 127,131 ---- bCancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { ! setVisible(false); } }); |