Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/ebli/src/org/fudaa/ebli/calque ZEbliCalquesPanel.java,1.1,1.2 BArbreCalque.java,1.8,1.9 BArbreCalqueModel.java,1.5,1.6 EbliFilleCalques.java,1.12,1.13 ZEbliFilleCalques.java,1.21,1.22 BCalqueLegende.java,1.5,1.6 EbliFilleCalquesInterface.java,1.2,1.3
|
From: Frederic D. <de...@us...> - 2004-03-31 08:27:48
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10281/src/org/fudaa/ebli/calque Modified Files: ZEbliCalquesPanel.java BArbreCalque.java BArbreCalqueModel.java EbliFilleCalques.java ZEbliFilleCalques.java BCalqueLegende.java EbliFilleCalquesInterface.java Log Message: Correction design Index: ZEbliFilleCalques.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliFilleCalques.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ZEbliFilleCalques.java 12 Feb 2004 15:58:51 -0000 1.21 --- ZEbliFilleCalques.java 31 Mar 2004 08:15:43 -0000 1.22 *************** *** 8,48 **** */ package org.fudaa.ebli.calque; - import java.awt.Color; import java.awt.Component; - import java.awt.Cursor; import java.awt.Dimension; - import java.awt.Font; import java.awt.Graphics; - import java.awt.Graphics2D; - import java.awt.Rectangle; - import java.awt.Shape; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.print.PageFormat; - import java.awt.print.Printable; - import java.beans.PropertyChangeEvent; - import java.beans.PropertyChangeListener; - import java.text.DecimalFormat; import java.util.ArrayList; - import java.util.Arrays; import javax.swing.Action; - import javax.swing.ActionMap; import javax.swing.BorderFactory; import javax.swing.DefaultCellEditor; import javax.swing.Icon; - import javax.swing.InputMap; - import javax.swing.JColorChooser; import javax.swing.JComponent; import javax.swing.JDesktopPane; - import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JTable; import javax.swing.JViewport; - import javax.swing.KeyStroke; import javax.swing.event.InternalFrameEvent; import javax.swing.event.TableModelListener; - import javax.swing.event.TreeSelectionEvent; - import javax.swing.event.TreeSelectionListener; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; --- 8,30 ---- *************** *** 50,55 **** import javax.swing.tree.TreeSelectionModel; - import org.fudaa.ctulu.CtuluLib; - import com.memoire.bu.BuBorderLayout; import com.memoire.bu.BuCheckBox; --- 32,35 ---- *************** *** 58,83 **** import com.memoire.bu.BuInformationsDocument; import com.memoire.bu.BuLabel; - import com.memoire.bu.BuLib; import com.memoire.bu.BuMenu; - import com.memoire.bu.BuPanel; import com.memoire.bu.BuPopupMenu; import com.memoire.bu.BuScrollPane; - import com.memoire.bu.BuSeparator; import com.memoire.bu.BuTable; import org.fudaa.ebli.calque.action.EbliActionInterface; - import org.fudaa.ebli.calque.action.EbliChangeStateAction; import org.fudaa.ebli.calque.action.EbliComponentFactory; import org.fudaa.ebli.calque.action.EbliPaletteAction; - import org.fudaa.ebli.calque.action.EbliSimpleAction; import org.fudaa.ebli.commun.EbliPreferences; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; - import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.impression.EbliFilleImprimable; - import org.fudaa.ebli.impression.EbliPrinter; - import org.fudaa.ebli.palette.BSelecteurReduitFonteNewVersion; - import org.fudaa.ebli.palette.BSelecteurReduitPaletteCouleur; - import org.fudaa.ebli.repere.BControleNavigation; - import org.fudaa.ebli.repere.BControleRepereTexte; import org.fudaa.ebli.ressource.EbliResource; /** --- 38,53 ---- import com.memoire.bu.BuInformationsDocument; import com.memoire.bu.BuLabel; import com.memoire.bu.BuMenu; import com.memoire.bu.BuPopupMenu; import com.memoire.bu.BuScrollPane; import com.memoire.bu.BuTable; import org.fudaa.ebli.calque.action.EbliActionInterface; import org.fudaa.ebli.calque.action.EbliComponentFactory; import org.fudaa.ebli.calque.action.EbliPaletteAction; import org.fudaa.ebli.commun.EbliPreferences; + import org.fudaa.ebli.dialog.EbliSimpleDialog; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; import org.fudaa.ebli.impression.EbliFilleImprimable; import org.fudaa.ebli.ressource.EbliResource; /** *************** *** 104,108 **** * seront construits. * @param _vc la vue calque associee - * @param _arbre le model 'arbre associe */ public ZEbliFilleCalques(BCalque _vc) { --- 74,77 ---- *************** *** 118,123 **** /** * @param _vc la vue calque associee - * @param _arbre l'arbre associe - * @param _groupSelection si true ce groupe sera construit. idem pour les * autres * @param _appli l'appli associee --- 87,90 ---- *************** *** 134,137 **** --- 101,105 ---- this(_vc, _appli, _id, false, true, true); } + public ZEbliFilleCalques( boolean _groupSelection, *************** *** 262,268 **** */ public void setSelected(boolean b) throws java.beans.PropertyVetoException { - if (b) { - pn_.updateArbreCalque(); - } super.setSelected(b); } --- 230,233 ---- *************** *** 292,304 **** if (specificToolsPrefView_ == null) { specificToolsPrefView_= new ViewPreferences(); - specificToolsPrefView_.setTitle(EbliResource.getS("Affichage")); } else specificToolsPrefView_.init(); ! specificToolsPrefView_.affiche(this); } /** * @return SpecificMenus */ - protected JMenu[] mnSpecifics_= null; public JMenu[] getSpecificMenus() { if (mnSpecifics_ == null) { --- 257,270 ---- if (specificToolsPrefView_ == null) { specificToolsPrefView_= new ViewPreferences(); } else specificToolsPrefView_.init(); ! EbliSimpleDialog p=new EbliSimpleDialog(specificToolsPrefView_); ! p.setTitle(EbliResource.getS("Affichage")); ! specificToolsPrefView_.afficheModale(this); } + protected JMenu[] mnSpecifics_= null; /** * @return SpecificMenus */ public JMenu[] getSpecificMenus() { if (mnSpecifics_ == null) { *************** *** 336,340 **** _dest.add(null); for (int i= 0; i < n; i++) { ! if (isPreferencesVisible(_r[i])) { _dest.add(_r[i].buildToolButton(EbliComponentFactory.INSTANCE)); if ((_bu != null) && (_r[i] instanceof EbliPaletteAction)) { --- 302,307 ---- _dest.add(null); for (int i= 0; i < n; i++) { ! if(_r[i]==null) _dest.add(null); ! else if (isPreferencesVisible(_r[i])) { _dest.add(_r[i].buildToolButton(EbliComponentFactory.INSTANCE)); if ((_bu != null) && (_r[i] instanceof EbliPaletteAction)) { *************** *** 342,345 **** --- 309,313 ---- } } + } } *************** *** 367,370 **** --- 335,339 ---- buildToolButtonFor(pn_.navigationActionGroup_, l, buJ, true); buildToolButtonFor(pn_.standardActionGroup_, l, buJ, true); + buildToolButtonFor(pn_.specificTools_, l, buJ, true); specificTools_= new JComponent[l.size()]; l.toArray(specificTools_); *************** *** 486,490 **** protected GroupModel model_; ViewPreferences() { ! super(EbliSimpleDialogPanel.OK_CANCEL_APPLY_OPTION); this.setLayout(new BuBorderLayout()); this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); --- 455,459 ---- protected GroupModel model_; ViewPreferences() { ! super(); this.setLayout(new BuBorderLayout()); this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); *************** *** 667,669 **** --- 636,646 ---- return null; } + /** + * @see java.lang.Object#finalize() + */ + protected void finalize() throws Throwable { + super.finalize(); + System.out.println("finalize"); + } + } Index: BCalqueLegende.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueLegende.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BCalqueLegende.java 25 Nov 2003 10:06:37 -0000 1.5 --- BCalqueLegende.java 31 Mar 2004 08:15:43 -0000 1.6 *************** *** 8,40 **** */ package org.fudaa.ebli.calque; ! import com.memoire.bu.*; ! import org.fudaa.ebli.palette.*; import org.fudaa.ebli.ressource.EbliResource; - import java.awt.*; - import java.util.*; - import javax.swing.*; - import javax.swing.border.*; /** [...1055 lines suppressed...] + } + /** * Recalcul de la hauteur du cadre */ /* ! * private void updateTaille(Graphics _g) { FontMetrics fm=_g.getFontMetrics(); int ! * totalHeight=inter_; int totalWidth=0; int textWidth=0; int textHeight=fm.getHeight(); for(int ! * i=0; i <icones_.length; i++) { if( i <textes_.length ) textWidth=fm.stringWidth(textes_[i]); ! * else textWidth=fm.stringWidth(defaultText); totalHeight+=Math.max(icones_[i].getIconHeight(), ! * textHeight)+inter_; totalWidth=Math.max(totalWidth, ! * icones_[i].getIconWidth()+inter_+textWidth); } inter_; taille_.width=Math.max(taille_.width, ! * totalWidth); taille_.height=Math.max(taille_.height, totalHeight); } ! */ } + class ParamsPanel { + // public String title; public Color bg; Index: BArbreCalque.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BArbreCalque.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** BArbreCalque.java 11 Dec 2003 12:41:51 -0000 1.8 --- BArbreCalque.java 31 Mar 2004 08:15:43 -0000 1.9 *************** *** 8,36 **** */ package org.fudaa.ebli.calque; ! import com.memoire.bu.*; ! import org.fudaa.ebli.commun.EbliLib; ! import org.fudaa.ebli.geometrie.*; ! import org.fudaa.ebli.palette.*; ! //import org.fudaa.ebli.repere.*; ! import org.fudaa.ebli.ressource.*; ! import javax.swing.*; ! import javax.swing.border.*; [...1132 lines suppressed...] + public JMenuItem addMenuItem( ! String _s, ! String _cmd, ! BuIcon _icon, ! boolean _enabled) { ! JMenuItem r = new JMenuItem(); r.setName("mi" + _cmd); r.setActionCommand(_cmd); *************** *** 636,639 **** } /** ! * Modele de donnees pour l'arbre de calques. ! */ --- 735,738 ---- } /** ! * Modele de donnees pour l'arbre de calques. ! */ Index: BArbreCalqueModel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BArbreCalqueModel.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BArbreCalqueModel.java 12 Feb 2004 15:58:50 -0000 1.5 --- BArbreCalqueModel.java 31 Mar 2004 08:15:43 -0000 1.6 *************** *** 10,22 **** import java.awt.event.ActionEvent; import java.awt.event.ActionListener; - import java.awt.event.ComponentListener; import java.awt.event.ContainerEvent; import java.awt.event.ContainerListener; - import java.awt.event.HierarchyEvent; - import java.awt.event.HierarchyListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Iterator; import javax.swing.JMenuItem; import javax.swing.event.TreeModelEvent; --- 10,20 ---- import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ContainerEvent; import java.awt.event.ContainerListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Iterator; + import javax.swing.JMenuItem; import javax.swing.event.TreeModelEvent; *************** *** 27,33 **** --- 25,33 ---- import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; + import com.memoire.bu.BuMenu; import com.memoire.bu.BuPopupMenu; import com.memoire.bu.BuResource; + import org.fudaa.ebli.ressource.EbliResource; /** *************** *** 58,62 **** return p == null ? null : (BCalque)p.getLastPathComponent(); } ! public final void setCalque(BCalque _cq) { if (_cq != calque_) { if ((calque_ != null) && (calque_.isGroupeCalque())) { --- 58,62 ---- return p == null ? null : (BCalque)p.getLastPathComponent(); } ! private final void setCalque(BCalque _cq) { if (_cq != calque_) { if ((calque_ != null) && (calque_.isGroupeCalque())) { Index: EbliFilleCalques.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/EbliFilleCalques.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** EbliFilleCalques.java 12 Mar 2004 10:17:42 -0000 1.12 --- EbliFilleCalques.java 31 Mar 2004 08:15:43 -0000 1.13 *************** *** 328,340 **** pack(); } - public void setSelected(boolean b) throws java.beans.PropertyVetoException { - if (b && (arbreModel_.getRootCalque() != vc_.getCalque())) { - arbreModel_.setCalque(vc_.getCalque()); - arbreModel_.refresh(); - // if( pbRepere.getDesktop()==null ) - // pbRepere.setDesktop((BuDesktop)getDesktopPane()); - } - super.setSelected(b); - } /** * Methode pour vider programmatiquement la selection. --- 328,331 ---- Index: EbliFilleCalquesInterface.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/EbliFilleCalquesInterface.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EbliFilleCalquesInterface.java 25 Nov 2003 10:06:37 -0000 1.2 --- EbliFilleCalquesInterface.java 31 Mar 2004 08:15:43 -0000 1.3 *************** *** 13,16 **** --- 13,19 ---- */ public interface EbliFilleCalquesInterface { + /** + * @return le model pour l'arbre calque + */ public BArbreCalqueModel getArbreCalqueModel(); } Index: ZEbliCalquesPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ZEbliCalquesPanel.java 12 Feb 2004 15:58:51 -0000 1.1 --- ZEbliCalquesPanel.java 31 Mar 2004 08:15:43 -0000 1.2 *************** *** 38,46 **** import javax.swing.event.TreeSelectionListener; - import org.fudaa.ctulu.CtuluLib; - import com.memoire.bu.BuBorderLayout; - import com.memoire.bu.BuCommonInterface; - import com.memoire.bu.BuInformationsDocument; import com.memoire.bu.BuLabel; import com.memoire.bu.BuLib; --- 38,42 ---- *************** *** 49,60 **** import com.memoire.bu.BuPopupMenu; import com.memoire.bu.BuSeparator; - import com.memoire.bu.BuTabbedPane; import org.fudaa.ebli.calque.action.EbliActionInterface; import org.fudaa.ebli.calque.action.EbliChangeStateAction; import org.fudaa.ebli.calque.action.EbliComponentFactory; import org.fudaa.ebli.calque.action.EbliPaletteAction; - import org.fudaa.ebli.calque.action.EbliSimpleAction; import org.fudaa.ebli.calque.action.EbliShowPanelAction; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.impression.EbliPrinter; --- 45,56 ---- import com.memoire.bu.BuPopupMenu; import com.memoire.bu.BuSeparator; + import org.fudaa.ctulu.CtuluLib; import org.fudaa.ebli.calque.action.EbliActionInterface; import org.fudaa.ebli.calque.action.EbliChangeStateAction; import org.fudaa.ebli.calque.action.EbliComponentFactory; import org.fudaa.ebli.calque.action.EbliPaletteAction; import org.fudaa.ebli.calque.action.EbliShowPanelAction; + import org.fudaa.ebli.calque.action.EbliSimpleAction; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.impression.EbliPrinter; *************** *** 106,110 **** protected BGroupeCalque gcDonnees_; /* Variable stockant les specifics tools*/ ! protected JComponent[] specificTools_; protected BuLabel mode_; private boolean customize_; --- 102,106 ---- protected BGroupeCalque gcDonnees_; /* Variable stockant les specifics tools*/ ! protected EbliActionInterface[] specificTools_; protected BuLabel mode_; private boolean customize_; *************** *** 117,121 **** * seront construits. * @param _vc la vue calque associee - * @param _arbre le model 'arbre associe */ public ZEbliCalquesPanel(BCalque _vc) { --- 113,116 ---- *************** *** 347,351 **** gcDonnees_.detruire(calques[i]); } ! gcDonnees_.add(_c); modelArbre_.refresh(); } --- 342,348 ---- gcDonnees_.detruire(calques[i]); } ! if(_c!=null){ ! gcDonnees_.add(_c); ! } modelArbre_.refresh(); } *************** *** 577,586 **** } - public void updateArbreCalque() { - if (modelArbre_.getRootCalque() != gcDonnees_) { - modelArbre_.setCalque(gcDonnees_); - modelArbre_.refresh(); - } - } void setCalqueInteractionActif(BCalqueInteraction _b) { if (cqInteractionActif_ == _b) { --- 574,577 ---- *************** *** 812,816 **** ZCalqueAffichageDonneesInterface z= (ZCalqueAffichageDonneesInterface)cqActif_; ! if (z.modeleDonnees().getNombre() != 0) { enable= true; } --- 803,807 ---- ZCalqueAffichageDonneesInterface z= (ZCalqueAffichageDonneesInterface)cqActif_; ! if ((z.modeleDonnees()!=null) && (z.modeleDonnees().getNombre() != 0) ){ enable= true; } |
