Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action
In directory sc8-pr-cvs1:/tmp/cvs-serv15000/calque/action
Modified Files:
EbliChangeStateAction.java EbliComponentFactory.java
EbliPaletteAction.java EbliPaletteButton.java
Log Message:
Maj general
Index: EbliChangeStateAction.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EbliChangeStateAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EbliChangeStateAction.java 11 Dec 2003 12:41:51 -0000 1.3
--- EbliChangeStateAction.java 21 Jan 2004 11:02:18 -0000 1.4
***************
*** 58,62 ****
*
*/
! public final AbstractButton buildToolButton(EbliComponentFactory _f) {
return _f.buildToolButton(this);
}
--- 58,62 ----
*
*/
! public AbstractButton buildToolButton(EbliComponentFactory _f) {
return _f.buildToolButton(this);
}
Index: EbliComponentFactory.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EbliComponentFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EbliComponentFactory.java 25 Nov 2003 10:06:39 -0000 1.2
--- EbliComponentFactory.java 21 Jan 2004 11:02:18 -0000 1.3
***************
*** 58,61 ****
--- 58,69 ----
return r;
}
+
+ public AbstractButton buildToolButton(EbliPaletteAction a) {
+ AbstractButton r= new EbliPaletteButton(a);
+ decoreStateButton(r, a);
+ decoreToolBarButton(r);
+ return r;
+ }
+
public AbstractButton buildToolButton(EbliSimpleAction a) {
AbstractButton r= new BuToolButton();
Index: EbliPaletteAction.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EbliPaletteAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EbliPaletteAction.java 19 Dec 2003 12:06:41 -0000 1.4
--- EbliPaletteAction.java 21 Jan 2004 11:02:18 -0000 1.5
***************
*** 33,38 ****
*/
public class EbliPaletteAction
! extends EbliChangeStateAction
! implements VetoableChangeListener {
protected BuPalette window_;
public EbliPaletteAction(
--- 33,37 ----
*/
public class EbliPaletteAction
! extends EbliChangeStateAction{
protected BuPalette window_;
public EbliPaletteAction(
***************
*** 104,107 ****
--- 103,107 ----
public void updateBeforeShow() {}
+
private void showWindow() {
if (loc_ == null) {
***************
*** 144,158 ****
}
}
/**
*
*/
! public void vetoableChange(PropertyChangeEvent evt)
! throws PropertyVetoException {
! if (evt.getPropertyName() == JInternalFrame.IS_SELECTED_PROPERTY) {
! if ((((Boolean)evt.getNewValue()).booleanValue()) && (isSelected()))
! showWindow();
! else
! hideWindow();
! }
}
}
--- 144,154 ----
}
}
+
/**
*
*/
! public AbstractButton buildToolButton(EbliComponentFactory _f) {
! return _f.buildToolButton(this);
}
+
}
Index: EbliPaletteButton.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EbliPaletteButton.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EbliPaletteButton.java 25 Nov 2003 10:06:39 -0000 1.2
--- EbliPaletteButton.java 21 Jan 2004 11:02:18 -0000 1.3
***************
*** 26,31 ****
if (_b != isVisible()) {
ac_.setMainButtonVisible(_b);
}
! super.setVisible(_b);
}
public void setDesktop(BuDesktop _d) {
--- 26,32 ----
if (_b != isVisible()) {
ac_.setMainButtonVisible(_b);
+ super.setVisible(_b);
}
!
}
public void setDesktop(BuDesktop _d) {
|