fudaa-cvs-commit

[<de...@us...>]

Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/state
In directory sc8-pr-cvs1:/tmp/cvs-serv32411/ebli/src/org/fudaa/ebli/calque/state

Modified Files:
	EbliStateSelection.java 
Log Message:
Modifs mineures

Index: EbliStateSelection.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/state/EbliStateSelection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EbliStateSelection.java	30 Jan 2003 11:42:31 -0000	1.1
--- EbliStateSelection.java	21 Feb 2003 16:39:56 -0000	1.2
***************
*** 14,25 ****
  
  import org.fudaa.ebli.calque.BCalque;
! import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
! import org.fudaa.ebli.calque.ZCalqueSelectionInteraction;
! import org.fudaa.ebli.calque.ZEbliFilleCalques;
  import org.fudaa.ebli.calque.state.*;
  import org.fudaa.ebli.commun.EbliLib;
  
  /**
!  * 
   * @author deniger
   * @version $Id$
--- 14,23 ----
  
  import org.fudaa.ebli.calque.BCalque;
! import org.fudaa.ebli.calque.*;
  import org.fudaa.ebli.calque.state.*;
  import org.fudaa.ebli.commun.EbliLib;
  
  /**
!  *
   * @author deniger
   * @version $Id$
***************
*** 30,50 ****
    protected AbstractButton button_;
    protected int mode_;
!   ZEbliFilleCalques f_;
!   public EbliStateSelection(ZEbliFilleCalques _f,int _mode,AbstractButton _bu)
    {
!     cqS_=_f.getCalqueSelection();
      button_=_bu;
      mode_=_mode;
!     f_=_f;
    }
!   
    public synchronized void activate()
    {
      cqS_.setGele(false);
      cqS_.setModeSelection(mode_);
!     f_.getArbreCalque().addTreeSelectionListener(this);
!     majCalqueSelection(f_.getCalqueActif());
    }
!   
    private void majCalqueSelection(BCalque _b)
    {
--- 28,52 ----
    protected AbstractButton button_;
    protected int mode_;
!   protected BArbreCalque arbre_;
!   public EbliStateSelection(ZCalqueSelectionInteraction _inter,BArbreCalque _arbre,
!                             int _mode,AbstractButton _bu)
! //  public EbliStateSelection(ZEbliFilleCalques _f,int _mode,AbstractButton _bu)
    {
!     cqS_=_inter;
      button_=_bu;
      mode_=_mode;
!     arbre_=_arbre;
    }
! 
    public synchronized void activate()
    {
      cqS_.setGele(false);
      cqS_.setModeSelection(mode_);
!     arbre_.addTreeSelectionListener(this);
!     BCalque[] cqs=arbre_.getSelection();
!     if((cqs!=null) && (cqs.length>0))
!     majCalqueSelection(cqs[cqs.length-1]);
    }
! 
    private void majCalqueSelection(BCalque _b)
    {
***************
*** 55,65 ****
        if (z.modeleDonnees().getNombre() != 0)
        {
!         System.out.println("calque ajoute");
          cqS_.add(z);
        }
      }
    }
!     
!     
    /**
     * @see org.fudaa.ebli.calque.EbliState#destroy()
--- 57,67 ----
        if (z.modeleDonnees().getNombre() != 0)
        {
!         if(EbliLib.DEBUG) System.out.println("calque ajoute");
          cqS_.add(z);
        }
      }
    }
! 
! 
    /**
     * @see org.fudaa.ebli.calque.EbliState#destroy()
***************
*** 72,76 ****
    }
  
!   
    public synchronized void valueChanged(TreeSelectionEvent _evt)
    {
--- 74,78 ----
    }
  
! 
    public synchronized void valueChanged(TreeSelectionEvent _evt)
    {
***************
*** 78,90 ****
      majCalqueSelection((BCalque) cqs[cqs.length - 1]);
    }
!   
  public static class Ponctuelle extends EbliStateSelection
  {
!   
!   public Ponctuelle(ZEbliFilleCalques _f,AbstractButton _b)
    {
!     super(_f,ZCalqueSelectionInteraction.PONCTUEL,_b);
    }
!   
    public String getDescription()
    {
--- 80,92 ----
      majCalqueSelection((BCalque) cqs[cqs.length - 1]);
    }
! 
  public static class Ponctuelle extends EbliStateSelection
  {
! 
!   public Ponctuelle(ZCalqueSelectionInteraction _inter,BArbreCalque _arbre,AbstractButton _b)
    {
!     super(_inter,_arbre,ZCalqueSelectionInteraction.PONCTUEL,_b);
    }
! 
    public String getDescription()
    {
***************
*** 96,105 ****
  public static class Rectangle extends EbliStateSelection
  {
!   
!   public Rectangle(ZEbliFilleCalques _f,AbstractButton _b)
    {
!     super(_f,ZCalqueSelectionInteraction.RECTANGLE,_b);
    }
!   
    public String getDescription()
    {
--- 98,107 ----
  public static class Rectangle extends EbliStateSelection
  {
! 
!   public Rectangle(ZCalqueSelectionInteraction _inter,BArbreCalque _arbre,AbstractButton _b)
    {
!     super(_inter,_arbre,ZCalqueSelectionInteraction.RECTANGLE,_b);
    }
! 
    public String getDescription()
    {
***************
*** 110,119 ****
  public static class  Polygone extends EbliStateSelection
  {
!   
!   public Polygone(ZEbliFilleCalques _f,AbstractButton _b)
    {
!     super(_f,ZCalqueSelectionInteraction.POLYGONE,_b);
    }
!   
    public String getDescription()
    {
--- 112,121 ----
  public static class  Polygone extends EbliStateSelection
  {
! 
!   public Polygone(ZCalqueSelectionInteraction _inter,BArbreCalque _arbre,AbstractButton _b)
    {
!     super(_inter,_arbre,ZCalqueSelectionInteraction.POLYGONE,_b);
    }
! 
    public String getDescription()
    {