|
From: <de...@us...> - 2003-08-22 21:49:57
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv7810/commun
Modified Files:
FudaaCommonImplementation.java FudaaUI.java
Log Message:
tr: ajout de l'export pour le maillage
gestion affichage maillage
commun modif mineure
Index: FudaaCommonImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaCommonImplementation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FudaaCommonImplementation.java 19 Aug 2003 07:48:38 -0000 1.2
--- FudaaCommonImplementation.java 22 Aug 2003 16:02:23 -0000 1.3
***************
*** 36,39 ****
--- 36,40 ----
import org.fudaa.dodico.commun.DodicoAnalyze;
+ import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
***************
*** 42,45 ****
--- 43,47 ----
import org.fudaa.ebli.impression.EbliMiseEnPagePreferencesPanel;
import org.fudaa.ebli.impression.EbliPageable;
+
import org.fudaa.fudaa.commun.aide.FudaaAidePreferencesPanel;
import org.fudaa.fudaa.commun.aide.FudaaAstuces;
***************
*** 175,185 ****
{
String action = _evt.getActionCommand();
- String arg = "";
int i = action.indexOf('(');
if (i >= 0)
{
! arg = action.substring(i + 1, action.length() - 1);
! action = action.substring(0, i);
}
--- 177,185 ----
{
String action = _evt.getActionCommand();
int i = action.indexOf('(');
if (i >= 0)
{
! action =action.substring(i + 1, action.length() - 1).substring(0, i);
}
***************
*** 366,394 ****
*
*/
! public boolean manageErrorOperation(FileOperationSynthese _opResult)
{
if (_opResult.getClosingException() != null)
{
System.err.println(
! "FATAL :erreur lors de la fermeture de " + _opResult.getFile());
}
if (_opResult.getAnalyze() != null)
{
! if (_opResult.getAnalyze().getFatalError() != null)
! {
- DodicoAnalyze.Field f = _opResult.getAnalyze().getFatalError();
- error(
- _opResult.getDesc(),
- f.getOffset() < 0 ? f.getMessage() : f.toString());
- return true;
- }
- else
- {
- FudaaLib.showError(
- this,
- _opResult.getDesc(),
- _opResult.getAnalyze().getResume());
- }
}
return false;
--- 366,380 ----
*
*/
! public boolean manageErrorOperationAndIsFatal(FileOperationSynthese _opResult)
{
if (_opResult.getClosingException() != null)
{
System.err.println(
! "FATAL :erreur lors de la fermeture de " + _opResult.getAnalyze().getRessource());
}
if (_opResult.getAnalyze() != null)
{
! return manageAnalyzeAndIsFatal(_opResult.getAnalyze());
}
return false;
***************
*** 477,480 ****
--- 463,489 ----
else
return null;
+ }
+
+ public boolean manageAnalyzeAndIsFatal(DodicoAnalyze.Editor _analyze) {
+ return _analyze==null?false:manageAnalyzeAndIsFatal(_analyze.toAnalyze());
+ }
+
+ /**
+ * Renvoie true si fatal error.
+ */
+ public boolean manageAnalyzeAndIsFatal(DodicoAnalyze _analyze) {
+ if(_analyze==null) return false;
+ if(!_analyze.isEmpty()){
+ _analyze.printResume();
+ }
+ if (_analyze.getFatalError() != null)
+ {
+ DodicoAnalyze.Field f = _analyze.getFatalError();
+ error(
+ _analyze.getDesc(),
+ f.getOffset() < 0 ? f.getMessage() : f.toString());
+ return true;
+ }
+ return false;
}
Index: FudaaUI.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaUI.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FudaaUI.java 4 Jul 2003 16:05:04 -0000 1.1
--- FudaaUI.java 22 Aug 2003 16:02:23 -0000 1.2
***************
*** 9,12 ****
--- 9,13 ----
package org.fudaa.fudaa.commun;
+ import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoUI;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
***************
*** 23,27 ****
* Gere les erreurs survenues pour l'operation et renvoie true si erreur fatale.
*/
! public boolean manageErrorOperation(FileOperationSynthese _opResult);
}
--- 24,30 ----
* Gere les erreurs survenues pour l'operation et renvoie true si erreur fatale.
*/
! public boolean manageErrorOperationAndIsFatal(FileOperationSynthese _opResult);
!
! public boolean manageAnalyzeAndIsFatal(DodicoAnalyze _analyze);
}
|