Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4023] branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src /org/fudaa/ebli
|
From: <emm...@us...> - 2008-10-02 12:26:18
|
Revision: 4023
http://fudaa.svn.sourceforge.net/fudaa/?rev=4023&view=rev
Author: emmanuel_martin
Date: 2008-10-02 12:26:09 +0000 (Thu, 02 Oct 2008)
Log Message:
-----------
Modification du comportement de la fen?\195?\170tre d'edition de g?\195?\169ometry et correction d'un bug.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueGISEditionAction.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliActionPaletteAbstract.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueGISEditionAction.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueGISEditionAction.java 2008-10-01 21:14:21 UTC (rev 4022)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueGISEditionAction.java 2008-10-02 12:26:09 UTC (rev 4023)
@@ -10,6 +10,8 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import javax.swing.event.InternalFrameEvent;
+import javax.swing.event.InternalFrameListener;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.tree.TreeSelectionModel;
@@ -29,7 +31,7 @@
* @version $Id: CalqueGISEditionAction.java,v 1.6.6.2 2008-05-13 12:10:47 emartin Exp $
*/
public class CalqueGISEditionAction extends EbliActionPaletteTreeModel implements PropertyChangeListener {
-
+
private ZEditorDefault editor_;
private ZScene scene_;
private boolean hide_; // Vrai si le panel d'\xE9dition est ferm\xE9.
@@ -103,6 +105,8 @@
hide_ = !hide_;
if(hide_){
unactivePanel();
+ if(editor_.getPanel().getController().getCqSelectionI()!=null)
+ editor_.getPanel().getController().getCqSelectionI().setGele(false);
// Gele du calque d'edition
if(calqueEdition_!=null)
editor_.getPanel().unsetCalqueInteractionActif(calqueEdition_);
@@ -134,6 +138,8 @@
*/
public void valueChanged(final TreeSelectionEvent _e) {
unactivePanel();
+ if(editor_.getPanel().getController().getCqSelectionI()!=null)
+ editor_.getPanel().getController().getCqSelectionI().setGele(false);
setTarget(getTarget((TreeSelectionModel) _e.getSource()));
}
@@ -148,4 +154,10 @@
unactivePanel();
}
}
+
+ public void internalFrameClosing(InternalFrameEvent e) {
+ unactivePanel();
+ if(editor_.getPanel().getController().getCqSelectionI()!=null)
+ editor_.getPanel().getController().getCqSelectionI().setGele(false);
+ }
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java 2008-10-01 21:14:21 UTC (rev 4022)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java 2008-10-02 12:26:09 UTC (rev 4023)
@@ -1432,20 +1432,23 @@
* @see java.awt.event.KeyListener#keyPressed(java.awt.event.KeyEvent)
*/
public void keyPressed(KeyEvent _e) {
- getFormeEnCours().keyPressed(_e);
+ if(getFormeEnCours()!=null)
+ getFormeEnCours().keyPressed(_e);
}
/* (non-Javadoc)
* @see java.awt.event.KeyListener#keyReleased(java.awt.event.KeyEvent)
*/
public void keyReleased(KeyEvent _e) {
- getFormeEnCours().keyReleased(_e);
+ if(getFormeEnCours()!=null)
+ getFormeEnCours().keyReleased(_e);
}
/* (non-Javadoc)
* @see java.awt.event.KeyListener#keyTyped(java.awt.event.KeyEvent)
*/
public void keyTyped(KeyEvent _e) {
- getFormeEnCours().keyTyped(_e);
+ if(getFormeEnCours()!=null)
+ getFormeEnCours().keyTyped(_e);
}
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java 2008-10-01 21:14:21 UTC (rev 4022)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java 2008-10-02 12:26:09 UTC (rev 4023)
@@ -15,7 +15,6 @@
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ctulu.CtuluUI;
-import org.fudaa.ctulu.gis.GISPolygone;
import org.fudaa.ebli.calque.ZCalqueLigneBrisee;
import org.fudaa.ebli.calque.ZModeleLigneBrisee;
import org.fudaa.ebli.calque.dessin.DeForme;
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliActionPaletteAbstract.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliActionPaletteAbstract.java 2008-10-01 21:14:21 UTC (rev 4022)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliActionPaletteAbstract.java 2008-10-02 12:26:09 UTC (rev 4023)
@@ -10,7 +10,6 @@
import java.awt.Dialog;
import java.awt.Dimension;
import java.awt.Point;
-import java.awt.Window;
import java.awt.event.MouseWheelListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
@@ -23,19 +22,20 @@
import javax.swing.JInternalFrame;
import javax.swing.SwingUtilities;
import javax.swing.event.InternalFrameEvent;
+import javax.swing.event.InternalFrameListener;
+import org.fudaa.ctulu.gui.CtuluLibSwing;
+
import com.memoire.bu.BuDesktop;
import com.memoire.bu.BuLib;
import com.memoire.bu.BuPalette;
-import org.fudaa.ctulu.gui.CtuluLibSwing;
-
/**
* Une action d\xE9clenchant l'affichage d'une palette.
* @author deniger
* @version $Id: EbliActionPaletteAbstract.java,v 1.21 2007-06-13 12:57:45 deniger Exp $
*/
-public abstract class EbliActionPaletteAbstract extends EbliActionChangeState {
+public abstract class EbliActionPaletteAbstract extends EbliActionChangeState implements InternalFrameListener {
private static int nbr_ = -1;
JDialog dial_;
@@ -84,6 +84,7 @@
window_.setContent(buildContentPane);
window_.getContentPane().setFocusable(true);
window_.pack();
+ window_.addInternalFrameListener(this);
}
}
@@ -281,4 +282,38 @@
public void updateStateBeforeShow() {}
+ /* (non-Javadoc)
+ * @see javax.swing.event.InternalFrameListener#internalFrameActivated(javax.swing.event.InternalFrameEvent)
+ */
+ public void internalFrameActivated(InternalFrameEvent e) {}
+
+ /* (non-Javadoc)
+ * @see javax.swing.event.InternalFrameListener#internalFrameClosed(javax.swing.event.InternalFrameEvent)
+ */
+ public void internalFrameClosed(InternalFrameEvent e) {}
+
+ /* (non-Javadoc)
+ * @see javax.swing.event.InternalFrameListener#internalFrameClosing(javax.swing.event.InternalFrameEvent)
+ */
+ public void internalFrameClosing(InternalFrameEvent e) {}
+
+ /* (non-Javadoc)
+ * @see javax.swing.event.InternalFrameListener#internalFrameDeactivated(javax.swing.event.InternalFrameEvent)
+ */
+ public void internalFrameDeactivated(InternalFrameEvent e) {}
+
+ /* (non-Javadoc)
+ * @see javax.swing.event.InternalFrameListener#internalFrameDeiconified(javax.swing.event.InternalFrameEvent)
+ */
+ public void internalFrameDeiconified(InternalFrameEvent e) {}
+
+ /* (non-Javadoc)
+ * @see javax.swing.event.InternalFrameListener#internalFrameIconified(javax.swing.event.InternalFrameEvent)
+ */
+ public void internalFrameIconified(InternalFrameEvent e) {}
+
+ /* (non-Javadoc)
+ * @see javax.swing.event.InternalFrameListener#internalFrameOpened(javax.swing.event.InternalFrameEvent)
+ */
+ public void internalFrameOpened(InternalFrameEvent e) {}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
