Thread: [Fudaa-svn-commit] SF.net SVN: fudaa:[5572] trunk/framework/ebli-1d/src/main/java/org/fudaa/ ebli/c

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5572
          http://fudaa.svn.sourceforge.net/fudaa/?rev=5572&view=rev
Author:   deniger
Date:     2010-01-03 20:29:21 +0000 (Sun, 03 Jan 2010)

Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
===================================================================

--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java	2009-12-23 02:48:43 UTC (rev 5571)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java	2010-01-03 20:29:21 UTC (rev 5572)
@@ -215,7 +215,7 @@
   }
 
   public void addModelListener(final EGGrapheModelListener _l) {
-    listenerList.add(EGGrapheModelListener.class, _l);
+    getModel().addModelListener(_l);
   }
 
   public synchronized void addPropertyChangeListener(final String _propertyName, final PropertyChangeListener _listener) {
@@ -551,7 +551,7 @@
   }
 
   public void removeModelListener(final EGGrapheModelListener _l) {
-    listenerList.remove(EGGrapheModelListener.class, _l);
+    getModel().removeModelListener(_l);
   }
 
   public void restore() {

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java	2009-12-23 02:48:43 UTC (rev 5571)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java	2010-01-03 20:29:21 UTC (rev 5572)
@@ -39,7 +39,6 @@
 import org.fudaa.ctulu.gui.CtuluDecimalFormatEditPanel;
 import org.fudaa.ctulu.gui.CtuluDialogPanel;
 import org.fudaa.ebli.commun.EbliLib;
-import org.fudaa.ebli.controle.BConfigurePalette;
 import org.fudaa.ebli.ressource.EbliResource;
 import org.fudaa.ebli.trace.TraceIcon;
 import org.fudaa.ebli.trace.TraceLigne;
@@ -52,6 +51,26 @@
 public class EGPaletteLegendeGraphe extends CtuluDialogPanel implements ActionListener, ListSelectionListener,
     BuBorders {
 
+  private final class EGGrapheModelListenerImplementation implements EGGrapheModelListener {
+    public void structureChanged() {
+
+    }
+
+    public void courbeContentChanged(final EGObject c, final boolean mustRestore) {
+    }
+
+    public void courbeAspectChanged(final EGObject c, final boolean visibil) {
+      model_.fireContentsChanged(this, 0, model_.getSize() - 1);
+
+    }
+
+    public void axeContentChanged(final EGAxe c) {
+
+    }
+
+    public void axeAspectChanged(final EGAxe c) {}
+  }
+
   /**
    * Un icone
    * 
@@ -69,17 +88,17 @@
       return 30;
     }
 
-    public void paintIcon(Component _c, Graphics _g, int _x, int _y) {
-      Graphics2D g = (Graphics2D) _g;
+    public void paintIcon(final Component _c, final Graphics _g, final int _x, final int _y) {
+      final Graphics2D g = (Graphics2D) _g;
       g.setColor(Color.white);
       g.fillRect(_x, _y, _x + getIconWidth(), _y + getIconHeight());
-      int middleH = _y + getIconHeight() / 2;
+      final int middleH = _y + getIconHeight() / 2;
       traceLigne_.dessineTrait(g, _x, middleH, _x + getIconWidth(), middleH);
       traceIcon_.paintIconCentre(g, _x + getIconWidth() / 2, middleH);
 
     }
 
-    protected void setCourbe(EGCourbe _c) {
+    protected void setCourbe(final EGCourbe _c) {
       traceLigne_.getModel().updateData(_c.getLigneModel());
       traceIcon_.getModel().updateData(_c.getIconModel());
       traceIcon_.setTaille(getIconHeight() / 4);// a voir
@@ -100,8 +119,8 @@
     public LegendeRenderer() {}
 
     @Override
-    protected void setValue(Object _value) {
-      EGCourbe cb = (EGCourbe) _value;
+    protected void setValue(final Object _value) {
+      final EGCourbe cb = (EGCourbe) _value;
       icon_.setCourbe(cb);
       setIcon(icon_);
       setText(cb.getTitle());
@@ -110,10 +129,29 @@
 
   }
 
+  class CustomDefaultListModel extends DefaultListModel {
+
+    @Override
+    public void fireContentsChanged(Object source, int index0, int index1) {
+      super.fireContentsChanged(source, index0, index1);
+    }
+
+    @Override
+    public void fireIntervalAdded(Object source, int index0, int index1) {
+      super.fireIntervalAdded(source, index0, index1);
+    }
+
+    @Override
+    public void fireIntervalRemoved(Object source, int index0, int index1) {
+      super.fireIntervalRemoved(source, index0, index1);
+    }
+
+  }
+
   /**
    * Graphe associ\xE9 a la palette
    */
-  private EGGraphe graphe_;
+  private final EGGraphe graphe_;
 
   /**
    * Bouton qui applique les changements
@@ -141,17 +179,37 @@
    */
   private JList list_;
 
-  DefaultListModel model_;
+  CustomDefaultListModel model_;
 
+  private EGGrapheModelListenerImplementation modelListener;
+
   // BConfigurePalette paletteConf_ = new BConfigurePalette(true);
 
-  public EGPaletteLegendeGraphe(EGGraphe graphe) {
+  public EGPaletteLegendeGraphe(final EGGraphe graphe) {
     graphe_ = graphe;
     // mapTitles_=new HashMap<BuTextField, EGCourbe>();
     // -- construction du panel des l\xE9gendes --//
     buildContent();
   }
+  
+  @Override
+  public void cancel() {
+    graphe_.removeModelListener(modelListener);
+    super.cancel();
+  }
+  
+  @Override
+  public boolean ok() {
+    graphe_.removeModelListener(modelListener);
+    return super.ok();
+  }
 
+  @Override
+  public void closeDialog() {
+    graphe_.removeModelListener(modelListener);
+    super.closeDialog();
+  }
+
   /**
    * Appelee lorsqu'on appuie sur le bouton appliquer
    */
@@ -160,13 +218,14 @@
   }
 
   private void actionFormat() {
-    CtuluNumberFormatI ctuluNumberFormatI = format_;
+    final CtuluNumberFormatI ctuluNumberFormatI = format_;
     /*
      * CtuluNumberFormatI fmt = getDefaultFormat(); if (fmt == null) { fmt = CtuluLib.DEFAULT_NUMBER_FORMAT; }
      */
     final CtuluDecimalFormatEditPanel fmtSelect = new CtuluDecimalFormatEditPanel(ctuluNumberFormatI);
     fmtSelect.setErrorTextUnable();
     final CtuluDialogPanel pn = new CtuluDialogPanel() {
+      @Override
       public boolean valide() {
         return fmtSelect.valide();
       }
@@ -191,7 +250,7 @@
     }
   }
 
-  public void actionPerformed(ActionEvent _e) {
+  public void actionPerformed(final ActionEvent _e) {
 
     final Object s = _e.getSource();
     if (s == btApply_) {
@@ -220,7 +279,9 @@
 
     // -- liste des courbes --//
     list_ = new JList();
-    model_ = new DefaultListModel();
+    modelListener = new EGGrapheModelListenerImplementation();
+    graphe_.getModel().addModelListener(modelListener);
+    model_ = new CustomDefaultListModel();
     for (int i = 0; i < cs.length; i++) {
       model_.addElement(cs[i]);
     }
@@ -229,7 +290,7 @@
     list_.getSelectionModel().addListSelectionListener(this);
     list_.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 
-    BuScrollPane sp = new BuScrollPane(list_);
+    final BuScrollPane sp = new BuScrollPane(list_);
     sp.setPreferredSize(new Dimension(150, 100));
     sp.setBorder(BorderFactory.createTitledBorder(EbliResource.EBLI.getString("Liste des courbes")));
     add(sp, BuBorderLayout.NORTH);
@@ -238,9 +299,9 @@
     pnColor.setLayout(new BuButtonLayout(1, SwingConstants.LEFT));
 
     // -- update le panel des donn\xE9es
-    
+
     paletteAction = new EGConfigureActionPalette();
-    JComponent paletteComp = paletteAction.buildContentPane();
+    final JComponent paletteComp = paletteAction.buildContentPane();
     updatePanelData();
     // paletteConf_.setPreferredSize(new Dimension(300,300));
     paletteComp.setBorder(BorderFactory.createTitledBorder(EbliResource.EBLI.getString("Param\xE9trage")));
@@ -253,7 +314,7 @@
     btApply_.setToolTipText(EbliLib.getS("Appliquer les modifications"));
     btApply_.addActionListener(this);
     btRefresh_ = new BuButton(BuResource.BU.getIcon("rafraichir"));
-    btRefresh_.setText(EbliLib.getS("initialiser"));
+    btRefresh_.setText(EbliLib.getS("R\xE9initialiser les titres"));
     btRefresh_.setToolTipText(EbliLib.getS("Initialiser les plages des couleurs"));
     btRefresh_.addActionListener(this);
     btRefresh_.setEnabled(true);
@@ -274,11 +335,11 @@
   }
 
   private EGCourbe[] getSelectedCourbes() {
-    int[] select = this.list_.getSelectedIndices();
-    if (select == null) return null;
-    EGCourbe[] res = new EGCourbe[select.length];
+    final int[] select = this.list_.getSelectedIndices();
+    if (select == null) { return null; }
+    final EGCourbe[] res = new EGCourbe[select.length];
     for (int i = 0; i < res.length; i++) {
-      res[i] = (EGCourbe) list_.getModel().getElementAt(i);
+      res[i] = (EGCourbe) list_.getModel().getElementAt(select[i]);
     }
     return res;
   }
@@ -298,8 +359,7 @@
     paletteAction.setPaletteTarget(getSelectedCourbes());
   }
 
-  public void valueChanged(ListSelectionEvent e) {
-
+  public void valueChanged(final ListSelectionEvent e) {
     updatePanelData();
   }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Fudaa-svn-commit] SF.net SVN: fudaa:[5572] trunk/framework/ebli-1d/src/main/java/org/fudaa/ ebli/c

https://gitlab.com/fudaa

fudaa-svn-commit