Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor LidoLimiteCourbeEditor.java,1.1,1.2 LidoLoiclmLibraryEditor.java,1.1,1.2 LidoLimitePermEditor.java,1.1,1.2 LidoSingulariteEditor.java,1.1,1.2 LidoPermSectionsEditor.java,1.1,1.2 LidoNonpermTempEditor.java,1.1,1.2 LidoPermPlanimetrageMinmaxEditor.java,1.1,1.2 LidoProfilEditor.java,1.1,1.2 LidoSingulariteCourbeEditor.java,1.1,1.2 LidoSingulariteSeuilNoyeEditor.java,1.1,1.2 LidoSingulariteSeuilDenoyeEditor.java,1.1,1.2 LidoLimiteMareeEditor.java,1.1,1.2
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor
In directory sc8-pr-cvs1:/tmp/cvs-serv32205/fudaa/src/org/fudaa/fudaa/lido/editor
Modified Files:
LidoLimiteCourbeEditor.java LidoLoiclmLibraryEditor.java
LidoLimitePermEditor.java LidoSingulariteEditor.java
LidoPermSectionsEditor.java LidoNonpermTempEditor.java
LidoPermPlanimetrageMinmaxEditor.java LidoProfilEditor.java
LidoSingulariteCourbeEditor.java
LidoSingulariteSeuilNoyeEditor.java
LidoSingulariteSeuilDenoyeEditor.java
LidoLimiteMareeEditor.java
Log Message:
suppression variable inutile
suppression new String
Index: LidoLimiteCourbeEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoLimiteCourbeEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LidoLimiteCourbeEditor.java 30 Jan 2003 12:54:15 -0000 1.1
--- LidoLimiteCourbeEditor.java 18 Mar 2003 16:57:05 -0000 1.2
***************
*** 146,150 ****
pnDebitTable.setBorder(new LineBorder(Color.black));
pnDebitTable.setLayout(new BuVerticalLayout(0, false, false));
! pnDebitTable.add(new BuMultiLabel(TAB_LABEL), 0);
tbDebit_=new DebitTable();
addPropertyChangeListener(tbDebit_);
--- 146,150 ----
pnDebitTable.setBorder(new LineBorder(Color.black));
pnDebitTable.setLayout(new BuVerticalLayout(0, false, false));
! pnDebitTable.add(new BuLabelMultiLine(TAB_LABEL), 0);
tbDebit_=new DebitTable();
addPropertyChangeListener(tbDebit_);
***************
*** 221,226 ****
{
String cmd=e.getActionCommand();
- Object src=e.getSource();
- Container content=getContentPane();
if( "VALIDER".equals(cmd) ) {
if( tbDebit_.isEditing() ) {
--- 221,224 ----
***************
*** 264,268 ****
if( "SUPPRIMERLOI".equals(cmd) ) {
ph_.LOICLM().supprimeLoiclm(cl_);
- SParametresCondLimBlocCLM old=cl_;
cl_=null;
objectDeleted();
--- 262,265 ----
***************
*** 361,370 ****
- public void print(PrintJob _j, Graphics _g)
- {
- if( graphe_==null ) return;
- graphe_.setName(getTitle());
- graphe_.print(_j, _g);
- }
public int print(Graphics _g,PageFormat _format, int _page)
--- 358,361 ----
Index: LidoLoiclmLibraryEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoLoiclmLibraryEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LidoLoiclmLibraryEditor.java 30 Jan 2003 12:54:16 -0000 1.1
--- LidoLoiclmLibraryEditor.java 18 Mar 2003 16:57:06 -0000 1.2
***************
*** 67,71 ****
{
if( (clm_==null)||(clm_.condLimites==null) ) {
! resize(new Dimension(300, 200));
return;
}
--- 67,71 ----
{
if( (clm_==null)||(clm_.condLimites==null) ) {
! setSize(new Dimension(300, 200));
return;
}
Index: LidoLimitePermEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoLimitePermEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LidoLimitePermEditor.java 30 Jan 2003 12:54:16 -0000 1.1
--- LidoLimitePermEditor.java 18 Mar 2003 16:57:06 -0000 1.2
***************
*** 99,104 ****
{
String cmd=e.getActionCommand();
- Object src=e.getSource();
- Container content=getContentPane();
if( "VALIDER".equals(cmd) ) {
if( getValeurs() ) {
--- 99,102 ----
***************
*** 111,115 ****
if( "SUPPRIMERLOI".equals(cmd) ) {
ph_.LOICLM().supprimeLoiclm(cl_);
- SParametresCondLimBlocCLM old=cl_;
cl_=null;
objectDeleted();
--- 109,112 ----
Index: LidoSingulariteEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoSingulariteEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LidoSingulariteEditor.java 30 Jan 2003 12:54:13 -0000 1.1
--- LidoSingulariteEditor.java 18 Mar 2003 16:57:06 -0000 1.2
***************
*** 136,140 ****
}
Number val=null;
- Number ov=null;
// numBief n'est pas editable
//val=(Integer)tfNumero_.getValue();
--- 136,139 ----
Index: LidoPermSectionsEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoPermSectionsEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LidoPermSectionsEditor.java 30 Jan 2003 12:54:15 -0000 1.1
--- LidoPermSectionsEditor.java 18 Mar 2003 16:57:07 -0000 1.2
***************
*** 60,66 ****
}
pnBas_.add(rbs_[0], n++);
! pnBas_.add(new BuMultiLabel("les abscisses des profils sont prises\ncomme abscisses de sections de calcul"), n++);
pnBas_.add(rbs_[1], n++);
! pnBas_.add(new BuMultiLabel("les abscisses des sections de calcul\nsont définies en séries"), n++);
// ON VIRE LES CAS 3 ET 4 CAR ILS NE SONT JAMAIS UTILISES DANS LIDO ET EN PLUS ILS DECONNENT
// pnBas_.add(rbs_[2], n++);
--- 60,66 ----
}
pnBas_.add(rbs_[0], n++);
! pnBas_.add(new BuLabelMultiLine("les abscisses des profils sont prises\ncomme abscisses de sections de calcul"), n++);
pnBas_.add(rbs_[1], n++);
! pnBas_.add(new BuLabelMultiLine("les abscisses des sections de calcul\nsont définies en séries"), n++);
// ON VIRE LES CAS 3 ET 4 CAR ILS NE SONT JAMAIS UTILISES DANS LIDO ET EN PLUS ILS DECONNENT
// pnBas_.add(rbs_[2], n++);
Index: LidoNonpermTempEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoNonpermTempEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LidoNonpermTempEditor.java 30 Jan 2003 12:54:14 -0000 1.1
--- LidoNonpermTempEditor.java 18 Mar 2003 16:57:07 -0000 1.2
***************
*** 55,59 ****
int n=0;
! BuMultiLabel lbMilieu=new BuMultiLabel("Détermination des variables temporelles\npour un régime non permanent");
lbMilieu.setFont(lbMilieu.getFont().deriveFont(lbMilieu.getFont().getSize()+2));
lbMilieu.setForeground(Color.black);
--- 55,59 ----
int n=0;
! BuLabelMultiLine lbMilieu=new BuLabelMultiLine("Détermination des variables temporelles\npour un régime non permanent");
lbMilieu.setFont(lbMilieu.getFont().deriveFont(lbMilieu.getFont().getSize()+2));
lbMilieu.setForeground(Color.black);
***************
*** 340,345 ****
if( "".equals(t) ) return 0.;
double time=0.;
! String mode=new String(mode_);
! String eaten=new String(t);
String spit="";
int ind=0;
--- 340,345 ----
if( "".equals(t) ) return 0.;
double time=0.;
! String mode=mode_;
! String eaten=t;
String spit="";
int ind=0;
***************
*** 393,397 ****
long time=(long)_time;
String text="";
! String mode=new String(mode_);
long val;
// jours
--- 393,397 ----
long time=(long)_time;
String text="";
! String mode=String.valueOf(mode_);
long val;
// jours
Index: LidoPermPlanimetrageMinmaxEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoPermPlanimetrageMinmaxEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LidoPermPlanimetrageMinmaxEditor.java 30 Jan 2003 12:54:16 -0000 1.1
--- LidoPermPlanimetrageMinmaxEditor.java 18 Mar 2003 16:57:07 -0000 1.2
***************
*** 320,329 ****
}
- public void print(PrintJob _j, Graphics _g)
- {
- if( graphe_==null ) return;
- graphe_.setName(getTitle());
- graphe_.print(_j, _g);
- }
public int getNumberOfPages()
--- 320,323 ----
Index: LidoProfilEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoProfilEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LidoProfilEditor.java 30 Jan 2003 12:54:13 -0000 1.1
--- LidoProfilEditor.java 18 Mar 2003 16:57:08 -0000 1.2
***************
*** 439,443 ****
if( cmd==null ) cmd="";
Object src=e.getSource();
- int mod=e.getModifiers();
if( "VALIDER".equals(cmd) ) {
--- 439,442 ----
Index: LidoSingulariteCourbeEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoSingulariteCourbeEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LidoSingulariteCourbeEditor.java 30 Jan 2003 12:54:15 -0000 1.1
--- LidoSingulariteCourbeEditor.java 18 Mar 2003 16:57:08 -0000 1.2
***************
*** 222,226 ****
tfSpecific_.setActionCommand("VARMAXCOT");
tfSpecific_.setColumns(8);
! pn3.add(new BuMultiLabel("Variation max de la cote\npendant le pas de temps"), n++);
pn3.add(tfSpecific_, n++);
}
--- 222,226 ----
tfSpecific_.setActionCommand("VARMAXCOT");
tfSpecific_.setColumns(8);
! pn3.add(new BuLabelMultiLine("Variation max de la cote\npendant le pas de temps"), n++);
pn3.add(tfSpecific_, n++);
}
***************
*** 236,240 ****
pnDebitTable.setBorder(new LineBorder(Color.black));
pnDebitTable.setLayout(new BuVerticalLayout(0, false, false));
! pnDebitTable.add(new BuMultiLabel(TAB_LABEL), 0);
tbDebit_=new DebitTable();
addPropertyChangeListener(tbDebit_);
--- 236,240 ----
pnDebitTable.setBorder(new LineBorder(Color.black));
pnDebitTable.setLayout(new BuVerticalLayout(0, false, false));
! pnDebitTable.add(new BuLabelMultiLine(TAB_LABEL), 0);
tbDebit_=new DebitTable();
addPropertyChangeListener(tbDebit_);
***************
*** 319,324 ****
{
String cmd=e.getActionCommand();
- Object src=e.getSource();
- Container content=getContentPane();
if( "VALIDER".equals(cmd) ) {
if( tbDebit_.isEditing() ) {
--- 319,322 ----
Index: LidoSingulariteSeuilNoyeEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoSingulariteSeuilNoyeEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LidoSingulariteSeuilNoyeEditor.java 30 Jan 2003 12:54:13 -0000 1.1
--- LidoSingulariteSeuilNoyeEditor.java 18 Mar 2003 16:57:09 -0000 1.2
***************
*** 230,234 ****
String cmd=e.getActionCommand();
Object src=e.getSource();
- Container content=getContentPane();
if( "VALIDER".equals(cmd) ) {
if( tbDebit_.isEditing() ) {
--- 230,233 ----
Index: LidoSingulariteSeuilDenoyeEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoSingulariteSeuilDenoyeEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LidoSingulariteSeuilDenoyeEditor.java 30 Jan 2003 12:54:16 -0000 1.1
--- LidoSingulariteSeuilDenoyeEditor.java 18 Mar 2003 16:57:10 -0000 1.2
***************
*** 187,191 ****
String cmd=e.getActionCommand();
Object src=e.getSource();
- Container content=getContentPane();
if( "VALIDER".equals(cmd) ) {
if( tbDebit_.isEditing() ) {
--- 187,190 ----
Index: LidoLimiteMareeEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoLimiteMareeEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LidoLimiteMareeEditor.java 30 Jan 2003 12:54:17 -0000 1.1
--- LidoLimiteMareeEditor.java 18 Mar 2003 16:57:11 -0000 1.2
***************
*** 42,46 ****
private SParametresCondLimBlocCLM cl_;
// commun
! private BuButton btCreer_, btSupprimer_, btSupprimerLoi_, btDeselectionner_;
private BuTextField tfNomLoi_, tfHaute_, tfBasse_, tfDuree_;
private JSlider slDecalage_;
--- 42,46 ----
private SParametresCondLimBlocCLM cl_;
// commun
! private BuButton btSupprimerLoi_;
private BuTextField tfNomLoi_, tfHaute_, tfBasse_, tfDuree_;
private JSlider slDecalage_;
***************
*** 137,142 ****
{
String cmd=e.getActionCommand();
- Object src=e.getSource();
- Container content=getContentPane();
if( "VALIDER".equals(cmd) ) {
if( getValeurs() ) {
--- 137,140 ----
***************
*** 151,155 ****
if( "SUPPRIMERLOI".equals(cmd) ) {
ph_.LOICLM().supprimeLoiclm(cl_);
! SParametresCondLimBlocCLM old=cl_;
cl_=null;
objectDeleted();
--- 149,153 ----
if( "SUPPRIMERLOI".equals(cmd) ) {
ph_.LOICLM().supprimeLoiclm(cl_);
! //SParametresCondLimBlocCLM old=cl_;
cl_=null;
objectDeleted();
***************
*** 238,247 ****
}
- public void print(PrintJob _j, Graphics _g)
- {
- if( graphe_==null ) return;
- graphe_.setName(getTitle());
- graphe_.print(_j, _g);
- }
public int getNumberOfPages()
--- 236,239 ----
|
