[Fudaa-svn-commit] SF.net SVN: fudaa:[3778] trunk/fudaa_devel

[<opa...@us...>]

Revision: 3778
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3778&view=rev
Author:   opasteur
Date:     2008-08-12 12:12:59 +0000 (Tue, 12 Aug 2008)

Log Message:
-----------
Corresction du bug sur les donn?\195?\169es affich?\195?\169es  lors de la selection de plusieurs casiers ou liaisons

Modified Paths:
--------------
    trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoAnalyzer.java
    trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java
    trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java
    trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java

Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoAnalyzer.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoAnalyzer.java	2008-08-12 10:56:13 UTC (rev 3777)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoAnalyzer.java	2008-08-12 12:12:59 UTC (rev 3778)
@@ -661,8 +661,7 @@
       }
       stemp = entite.isDefautValuesValides();
       final String app = (String) mapEncours.get(kw_.getApparence());
-      System.err.println("app "+app);
-      System.err.println("stemp "+stemp);
+
       if (stemp != null && ((app == null) || (app.indexOf("IS REQUIRED") < 0))) {
         analyze_.addFatalError(getQuoteString() + noms[0] + "': "
             + DicoResource.getS("Les valeurs par d\xE9faut sont invalides"), ligne);
@@ -670,6 +669,7 @@
         return;
       }
       stemp = type.isChoicesValides();
+      
       if (stemp != null) {
         analyze_.addFatalError(getQuoteString() + noms[0] + "': "
             + DicoResource.getS("Les valeurs CHOIX sont invalides"), ligne);

Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java	2008-08-12 10:56:13 UTC (rev 3777)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java	2008-08-12 12:12:59 UTC (rev 3778)
@@ -1468,7 +1468,6 @@
   }
 
   private static SParametresProfil mascaretEnteteProfil(String line) throws NoSuchElementException, NumberFormatException {
-    System.err.println("hjohkh");
 	  StringTokenizer st=new StringTokenizer(line);
     SParametresProfil res=null;
     /* String motCle = */

Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java	2008-08-12 10:56:13 UTC (rev 3777)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java	2008-08-12 12:12:59 UTC (rev 3778)
@@ -689,11 +689,11 @@
 
 			for (int i= 0; i < nbPasTemps; i++) {
 				int indiceCourbe= 1;
-				for (int n = 0; n < resCasiersLiasons.length; n++) {
+			  for (int n = 0; n < resCasiersLiasons.length; n++) {
 				for (int j= 0; j < indicesVar.length; j++) {
 					vals= resCasiersLiasons[n].valeursVariables();
 					
-					res[indiceCourbe][i]= vals[indicesVar[j]-1][i][0];
+					res[indiceCourbe][i]= vals[indicesVar[j]][i][0];
 					indiceCourbe++;
 				}
 			}

Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java	2008-08-12 10:56:13 UTC (rev 3777)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java	2008-08-12 12:12:59 UTC (rev 3778)
@@ -1169,6 +1169,16 @@
       fdico=new File(SERVEUR_MASCARET.getCheminNoyau(),"dico.txt");
     }
 
+    if (!fdico.exists())   {
+    	new BuDialogMessage(
+            (BuCommonInterface) Hydraulique1dBaseApplication.FRAME,
+            ((BuCommonInterface) Hydraulique1dBaseApplication.FRAME)
+            .getInformationsSoftware(),
+            "Le fichier dictionaire n'existe pas !")
+            .activate();
+    	return;
+    }
+    
     // Lecture du fichier Mascaret et transfert dans l'objet metier.
 
     Notifieur.getNotifieur().setEventMuet(true);


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