Menu
▾
▴
|
From: <opa...@us...> - 2008-08-05 15:08:05
|
Revision: 3710
http://fudaa.svn.sourceforge.net/fudaa/?rev=3710&view=rev
Author: opasteur
Date: 2008-08-05 15:08:13 +0000 (Tue, 05 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java
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-05 07:51:22 UTC (rev 3709)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2008-08-05 15:08:13 UTC (rev 3710)
@@ -15,8 +15,10 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import javax.swing.JCheckBox;
@@ -244,6 +246,7 @@
removeAction("DUPLIQUER");
removeAction("CREER");
removeAction("INDEX_THEMA");
+ removeAction("POINTEURAIDE");
//fred inutile fait par FudaaCommonImplementation
((BuMenu)mb.getMenu("MENU_EDITION")).addMenuItem(
"Console",
@@ -450,6 +453,10 @@
paramsGenerauxQualiteDEau();
} else if (action.equals("PARAM_RESULTAT_POUR_QUALITEDEAU")) {
paramsGResultatPourQualiteDEau();
+ /* } else if (action.equals("AIDE_INDEX")) {
+ //final FudaaHelpPanel panel = getHelpPanel();
+ //panel.showHelp();
+ */
} else if (
action.equals("ASSISTANT")
|| action.equals("TACHE")
@@ -2173,6 +2180,29 @@
}
+///On surcharge displayHelp pour pouvoir modifier le nom de l'application,
+//le nom utilis\xE9 \xE9tant celui fournit dans isApp_.name
+ public void displayHelp(final String _url) {
+ super.displayHelp(FuLib.replace(_url,"fudaa-mascaret","src\\mascaret"));
+ }
+
+
+ public void contextHelp(String _url) {
+ System.err.println("MascaretImplementation contextHelp called"+_url);
+
+ try {
+
+ if (_url==null || _url.length()==0) _url ="mascaret/index.html";
+
+ _url= "aide\\src\\"+_url;
+ System.err.println(_url);
+ displayURL(_url);
+
+ } catch (Exception ex) {
+
+ ex.printStackTrace();
+ }
+ }
/* private void setEtat(int etat_) {
etat= etat_;
}*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm_...@us...> - 2009-07-31 12:06:31
|
Revision: 5004
http://fudaa.svn.sourceforge.net/fudaa/?rev=5004&view=rev
Author: jm_lacombe
Date: 2009-07-31 12:06:15 +0000 (Fri, 31 Jul 2009)
Log Message:
-----------
Passage de la version 3.1.alpha3 (aout 2008) en 3.1.beta1 (31/07/2009)
Modified Paths:
--------------
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2009-07-31 12:03:56 UTC (rev 5003)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2009-07-31 12:06:15 UTC (rev 5004)
@@ -113,7 +113,6 @@
import com.memoire.fu.FuLib;
import org.fudaa.ctulu.CtuluLib;
/**
- * @version $Revision: 1.85 $ $Date: 2008-03-07 09:47:04 $ by $Author: opasteur $
* @author Jean-Marc Lacombe
*/
final public class MascaretImplementation extends Hydraulique1dBaseImplementation {
@@ -147,9 +146,9 @@
static {
isApp_.name= "Fudaa-Mascaret";
- isApp_.version= "3.1.alpha3";
- isApp_.date= "0-Aug-2008";
- isApp_.rights= "Tous droits r\xE9serv\xE9s. EDF-CETMEF (c) 2001-2008";
+ isApp_.version= "3.1.beta1";
+ isApp_.date= "31-Juillet-2009";
+ isApp_.rights= "Tous droits r\xE9serv\xE9s. EDF-CETMEF (c) 2001-2009";
isApp_.contact= "ass...@ed...";
isApp_.license= "licence GPL et Graticiel pour le noyau de calcul";
isApp_.languages= "fr";
@@ -171,7 +170,7 @@
isApp_.libraries= null;
isApp_.thanks= new String[] { "Fudaa team" };
idApp_.name= "Fudaa-Mascaret";
- idApp_.version= "3.1.alpha2";
+ idApp_.version= "3.1.beta1";
idApp_.organization= "EDF-CETMEF";
idApp_.author= "EDF R&D et CETMEF";
idApp_.contact= "ass...@ed...";
@@ -348,7 +347,7 @@
new BuDialogMessage(
getApp(),
getInformationsSoftware(),
- "Noyaux de calcul:\n Mascaret 5.2 et 6.1\nAuteur:\n EDF - CETMEF \nContact:\n ass...@ed...")
+ "Noyaux de calcul:\n Mascaret 5.2 et 7.0\nAuteur:\n EDF - CETMEF \nContact:\n ass...@ed...")
.activate();
} else if (action.equals("CREER")) {
creer();
@@ -581,7 +580,7 @@
System.err.println("Execution du calcul...");
ICalculMascaret calculEnCours = (ICalculMascaret)HYDRO_KONVERT.calculHydraulique1d.calculCode();
- //Calage Auto uniquement en 6.1
+ //Calage Auto \xE0 partir en 6.1
calculEnCours.setNoyau(false);
calculEnCours.calcul(CONNEXION_MASCARET);
@@ -1178,7 +1177,7 @@
.activate();
return;
}
-
+
// Lecture du fichier Mascaret et transfert dans l'objet metier.
Notifieur.getNotifieur().setEventMuet(true);
@@ -2197,21 +2196,21 @@
public void displayHelp(final String _url) {
super.displayHelp(FuLib.replace(_url,"fudaa-mascaret","src\\mascaret"));
}
-
+
public void contextHelp(String _url) {
System.err.println("MascaretImplementation contextHelp called"+_url);
-
+
try {
-
+
if (_url==null || _url.length()==0) _url ="mascaret/index.html";
-
+
_url= "aide\\src\\"+_url;
System.err.println(_url);
displayURL(_url);
-
+
} catch (Exception ex) {
-
+
ex.printStackTrace();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
