Update of /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18733/src/osmose/application/common/slidecomponent
Modified Files:
OSMSlideRtfComponent.java OSMSlideTxtComponent.java
Log Message:
Adapt code for Java 1.6 (some warnings remain)
Index: OSMSlideRtfComponent.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideRtfComponent.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OSMSlideRtfComponent.java 30 Aug 2005 17:44:02 -0000 1.1.1.1
--- OSMSlideRtfComponent.java 3 Oct 2007 21:31:13 -0000 1.2
***************
*** 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: OSMSlideTxtComponent.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideTxtComponent.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OSMSlideTxtComponent.java 30 Aug 2005 17:44:03 -0000 1.1.1.1
--- OSMSlideTxtComponent.java 3 Oct 2007 21:31:13 -0000 1.2
***************
*** 59,70 ****
g2D.setFont(m_Font);
FontMetrics metrics = g2D.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() - 2 * txtinterlines;
g.drawString(_line, txtinterlines, txtpos);
--- 59,70 ----
g2D.setFont(m_Font);
FontMetrics metrics = g2D.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() - 2 * txtinterlines;
g.drawString(_line, txtinterlines, txtpos);
|
