|
From: <de...@us...> - 2003-08-22 19:08:52
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression In directory sc8-pr-cvs1:/tmp/cvs-serv6613/impression Modified Files: EbliDjaFrame.java EbliFilleImprimable.java EbliFillePrevisualisation.java EbliMiseEnPagePanel.java EbliMiseEnPagePreferencesPanel.java EbliPageFormat.java EbliPageableDelegate.java EbliPrinter.java Log Message: Corrections mineures Index: EbliDjaFrame.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliDjaFrame.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EbliDjaFrame.java 18 Mar 2003 16:19:13 -0000 1.2 --- EbliDjaFrame.java 22 Aug 2003 15:55:31 -0000 1.3 *************** *** 10,22 **** package org.fudaa.ebli.impression; import java.awt.print.PageFormat; import java.awt.print.Printable; - import java.awt.Graphics; - - import com.memoire.bu.BuInformationsSoftware; import com.memoire.bu.BuCommonImplementation; import com.memoire.bu.BuInformationsDocument; ! import com.memoire.dja.DjaFrame; import com.memoire.dja.DjaGrid; --- 10,20 ---- package org.fudaa.ebli.impression; + import java.awt.Graphics; import java.awt.print.PageFormat; import java.awt.print.Printable; import com.memoire.bu.BuCommonImplementation; import com.memoire.bu.BuInformationsDocument; ! import com.memoire.bu.BuInformationsSoftware; import com.memoire.dja.DjaFrame; import com.memoire.dja.DjaGrid; Index: EbliFilleImprimable.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliFilleImprimable.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EbliFilleImprimable.java 18 Mar 2003 16:19:13 -0000 1.2 --- EbliFilleImprimable.java 22 Aug 2003 15:55:31 -0000 1.3 *************** *** 14,19 **** import com.memoire.bu.BuCommonInterface; - import com.memoire.bu.BuInformationsSoftware; import com.memoire.bu.BuInformationsDocument; import com.memoire.bu.BuInternalFrame; --- 14,19 ---- import com.memoire.bu.BuCommonInterface; import com.memoire.bu.BuInformationsDocument; + import com.memoire.bu.BuInformationsSoftware; import com.memoire.bu.BuInternalFrame; Index: EbliFillePrevisualisation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliFillePrevisualisation.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EbliFillePrevisualisation.java 18 Mar 2003 16:19:13 -0000 1.3 --- EbliFillePrevisualisation.java 22 Aug 2003 15:55:31 -0000 1.4 *************** *** 11,73 **** ! import java.io.IOException; ! import java.lang.Math; ! ! import java.awt.Graphics; import java.awt.Component; ! import java.awt.GraphicsEnvironment; ! import java.awt.GraphicsConfiguration; import java.awt.Graphics2D; ! import java.awt.Color; ! import java.awt.FlowLayout; import java.awt.Shape; - import java.awt.Dimension; - - import java.awt.print.PrinterJob; - import java.awt.print.PrinterException; - import java.awt.print.PageFormat; - - import java.awt.event.ActionListener; - import java.awt.event.MouseListener; - import java.awt.event.MouseAdapter; - import java.awt.event.ItemListener; import java.awt.event.ActionEvent; ! import java.awt.event.MouseEvent; import java.awt.event.ItemEvent; ! import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; - import javax.swing.UIManager; - import javax.swing.ListCellRenderer; - import javax.swing.JComponent; import javax.swing.AbstractButton; - import javax.swing.JFrame; - import javax.swing.JList; - import javax.swing.JLabel; - import javax.swing.JScrollPane; import javax.swing.BorderFactory; import javax.swing.DefaultComboBoxModel; import com.memoire.bu.BuButton; import com.memoire.bu.BuComboBox; ! import com.memoire.bu.BuMenuItem; ! import com.memoire.bu.BuToggleButton; ! import com.memoire.bu.BuLabel; import com.memoire.bu.BuIcon; - import com.memoire.bu.BuComboBox; - import com.memoire.bu.BuMenuBar; import com.memoire.bu.BuInternalFrame; import com.memoire.bu.BuPanel; ! import com.memoire.bu.BuBorderLayout; ! import com.memoire.bu.BuGridLayout; ! import com.memoire.bu.BuHorizontalLayout; ! //import com.memoire.bu.BuResource; ! import com.memoire.bu.BuCommonInterface; import org.fudaa.ebli.ressource.EbliResource; - import org.fudaa.ebli.trace.TraceLigne; - import org.fudaa.ebli.ressource.EbliResource; /** --- 11,52 ---- ! import java.awt.Color; import java.awt.Component; ! import java.awt.Dimension; ! import java.awt.Graphics; import java.awt.Graphics2D; ! import java.awt.GraphicsConfiguration; ! import java.awt.GraphicsEnvironment; import java.awt.Shape; import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; import java.awt.event.ItemEvent; ! import java.awt.event.ItemListener; import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; + import java.awt.print.PageFormat; + import java.awt.print.PrinterException; import javax.swing.AbstractButton; import javax.swing.BorderFactory; import javax.swing.DefaultComboBoxModel; + import javax.swing.JComponent; + import javax.swing.JList; + import javax.swing.JScrollPane; + import javax.swing.ListCellRenderer; + import javax.swing.UIManager; import com.memoire.bu.BuButton; import com.memoire.bu.BuComboBox; ! import com.memoire.bu.BuCommonInterface; ! import com.memoire.bu.BuGridLayout; import com.memoire.bu.BuIcon; import com.memoire.bu.BuInternalFrame; + import com.memoire.bu.BuLabel; import com.memoire.bu.BuPanel; ! import com.memoire.bu.BuToggleButton; import org.fudaa.ebli.ressource.EbliResource; import org.fudaa.ebli.trace.TraceLigne; /** Index: EbliMiseEnPagePanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliMiseEnPagePanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EbliMiseEnPagePanel.java 18 Mar 2003 16:19:13 -0000 1.2 --- EbliMiseEnPagePanel.java 22 Aug 2003 15:55:31 -0000 1.3 *************** *** 10,44 **** package org.fudaa.ebli.impression; - import java.awt.GridLayout; import java.awt.Color; ! import java.awt.Font; ! ! import java.awt.print.PageFormat; ! import java.awt.print.PrinterJob; ! ! import java.awt.event.ActionListener; ! import java.awt.event.ItemListener; import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; - import javax.swing.DefaultComboBoxModel; - import javax.swing.JComponent; - import javax.swing.JFrame; import javax.swing.BorderFactory; ! import javax.swing.border.Border; - import javax.swing.border.CompoundBorder; - import javax.swing.border.TitledBorder; - - import java.text.NumberFormat; import com.memoire.bu.BuButton; - import com.memoire.bu.BuComboBox; import com.memoire.bu.BuCheckBox; ! import com.memoire.bu.BuPanel; ! import com.memoire.bu.BuLabel; import com.memoire.bu.BuGridLayout; import com.memoire.bu.BuVerticalLayout; - import com.memoire.bu.BuBorderLayout; import org.fudaa.ebli.ressource.EbliResource; --- 10,35 ---- package org.fudaa.ebli.impression; import java.awt.Color; ! import java.awt.GridLayout; import java.awt.event.ActionEvent; + import java.awt.event.ActionListener; import java.awt.event.ItemEvent; + import java.awt.event.ItemListener; + import java.awt.print.PageFormat; + import java.awt.print.PrinterJob; + import java.text.NumberFormat; import javax.swing.BorderFactory; ! import javax.swing.DefaultComboBoxModel; import javax.swing.border.Border; + import com.memoire.bu.BuBorderLayout; import com.memoire.bu.BuButton; import com.memoire.bu.BuCheckBox; ! import com.memoire.bu.BuComboBox; import com.memoire.bu.BuGridLayout; + import com.memoire.bu.BuLabel; + import com.memoire.bu.BuPanel; import com.memoire.bu.BuVerticalLayout; import org.fudaa.ebli.ressource.EbliResource; Index: EbliMiseEnPagePreferencesPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliMiseEnPagePreferencesPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EbliMiseEnPagePreferencesPanel.java 18 Mar 2003 16:19:13 -0000 1.2 --- EbliMiseEnPagePreferencesPanel.java 22 Aug 2003 15:55:31 -0000 1.3 *************** *** 10,31 **** package org.fudaa.ebli.impression; - import java.awt.event.ActionEvent; - import java.awt.FlowLayout; - import java.awt.print.PageFormat; import java.awt.print.Paper; - import javax.swing.DefaultComboBoxModel; - import javax.swing.JComponent; - import com.memoire.bu.BuAbstractPreferencesPanel; - import com.memoire.bu.BuInformationsDocument; - import com.memoire.bu.BuInformationsSoftware; - import com.memoire.bu.BuCommonInterface; - import com.memoire.bu.BuButton; - import com.memoire.bu.BuResource; - import com.memoire.bu.BuPanel; - import com.memoire.bu.BuLabel; - import com.memoire.bu.BuGridLayout; import com.memoire.bu.BuBorderLayout; --- 10,17 ---- Index: EbliPageFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliPageFormat.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EbliPageFormat.java 18 Mar 2003 16:19:12 -0000 1.3 --- EbliPageFormat.java 22 Aug 2003 15:55:31 -0000 1.4 *************** *** 11,29 **** - import java.awt.Font; import java.awt.Color; import java.awt.FontMetrics; - import java.awt.Shape; import java.awt.Graphics; import java.awt.Graphics2D; ! import java.awt.geom.Rectangle2D; - import java.awt.print.PageFormat; import java.awt.print.Paper; import java.awt.print.PrinterJob; - import com.memoire.bu.BuInformationsSoftware; import com.memoire.bu.BuInformationsDocument; import org.fudaa.ebli.ressource.EbliResource; --- 11,27 ---- import java.awt.Color; + import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.Graphics2D; ! import java.awt.Shape; import java.awt.geom.Rectangle2D; import java.awt.print.PageFormat; import java.awt.print.Paper; import java.awt.print.PrinterJob; import com.memoire.bu.BuInformationsDocument; + import com.memoire.bu.BuInformationsSoftware; import org.fudaa.ebli.ressource.EbliResource; Index: EbliPageableDelegate.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliPageableDelegate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EbliPageableDelegate.java 18 Mar 2003 16:19:13 -0000 1.2 --- EbliPageableDelegate.java 22 Aug 2003 15:55:31 -0000 1.3 *************** *** 10,24 **** package org.fudaa.ebli.impression; - import java.util.Hashtable; - import java.awt.Graphics; - import java.awt.Graphics2D; - import java.awt.print.PrinterJob; import java.awt.print.PageFormat; - import java.awt.print.Paper; - import java.awt.print.Printable; import java.awt.print.Pageable; ! ! import javax.swing.JComponent; /** --- 10,17 ---- package org.fudaa.ebli.impression; import java.awt.Graphics; import java.awt.print.PageFormat; import java.awt.print.Pageable; ! import java.awt.print.Printable; /** Index: EbliPrinter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliPrinter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EbliPrinter.java 18 Mar 2003 16:19:12 -0000 1.2 --- EbliPrinter.java 22 Aug 2003 15:55:31 -0000 1.3 *************** *** 10,23 **** package org.fudaa.ebli.impression; ! import java.awt.*; ! import java.awt.font.*; ! import java.awt.image.BufferedImage; ! import java.awt.print.*; import java.text.AttributedString; ! import java.util.*; ! import javax.swing.*; ! import java.awt.geom.*; ! import javax.swing.table.*; ! import javax.swing.text.*; --- 10,29 ---- package org.fudaa.ebli.impression; ! import java.awt.Color; ! import java.awt.Component; ! import java.awt.Font; ! import java.awt.Graphics; ! import java.awt.Graphics2D; ! import java.awt.Image; ! import java.awt.Rectangle; ! import java.awt.Shape; ! import java.awt.font.LineBreakMeasurer; ! import java.awt.font.TextAttribute; ! import java.awt.font.TextLayout; ! import java.awt.print.PageFormat; ! import java.awt.print.Printable; import java.text.AttributedString; ! ! import javax.swing.JTable; |