Menu
▾
▴
fudaa-svn-commit
|
From: <bma...@us...> - 2011-04-22 15:14:02
|
Revision: 6238
http://fudaa.svn.sourceforge.net/fudaa/?rev=6238&view=rev
Author: bmarchan
Date: 2011-04-22 15:13:56 +0000 (Fri, 22 Apr 2011)
Log Message:
-----------
Chgt de version avant livraison
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-04-22 15:13:16 UTC (rev 6237)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-04-22 15:13:56 UTC (rev 6238)
@@ -83,8 +83,8 @@
protected static BuInformationsSoftware isMdl_ = new BuInformationsSoftware();
static {
isMdl_.name = "Modeleur";
- isMdl_.version = "1.1_b20110325";
- isMdl_.date = "2011-03-25";
+ isMdl_.version = "1.1_b20110422";
+ isMdl_.date = "2011-04-22";
isMdl_.rights = "Tous droits r\xE9serv\xE9s. CETMEF (c)1999-2011";
isMdl_.license = "GPL2";
isMdl_.languages = "fr,en";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-05-05 10:09:06
|
Revision: 6248
http://fudaa.svn.sourceforge.net/fudaa/?rev=6248&view=rev
Author: bmarchan
Date: 2011-05-05 10:08:58 +0000 (Thu, 05 May 2011)
Log Message:
-----------
Chgt version -> 1.1
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-05-05 10:04:26 UTC (rev 6247)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-05-05 10:08:58 UTC (rev 6248)
@@ -83,8 +83,8 @@
protected static BuInformationsSoftware isMdl_ = new BuInformationsSoftware();
static {
isMdl_.name = "Modeleur";
- isMdl_.version = "1.1_b20110422";
- isMdl_.date = "2011-04-22";
+ isMdl_.version = "1.1";
+ isMdl_.date = "2011-05-05";
isMdl_.rights = "Tous droits r\xE9serv\xE9s. CETMEF (c)1999-2011";
isMdl_.license = "GPL2";
isMdl_.languages = "fr,en";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-05-05 12:09:29
|
Revision: 6249
http://fudaa.svn.sourceforge.net/fudaa/?rev=6249&view=rev
Author: bmarchan
Date: 2011-05-05 12:09:23 +0000 (Thu, 05 May 2011)
Log Message:
-----------
Chgt version -> 1.1_b20110505
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-05-05 10:08:58 UTC (rev 6248)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-05-05 12:09:23 UTC (rev 6249)
@@ -83,7 +83,7 @@
protected static BuInformationsSoftware isMdl_ = new BuInformationsSoftware();
static {
isMdl_.name = "Modeleur";
- isMdl_.version = "1.1";
+ isMdl_.version = "1.1_b20110505";
isMdl_.date = "2011-05-05";
isMdl_.rights = "Tous droits r\xE9serv\xE9s. CETMEF (c)1999-2011";
isMdl_.license = "GPL2";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-05-05 12:13:26
|
Revision: 6250
http://fudaa.svn.sourceforge.net/fudaa/?rev=6250&view=rev
Author: bmarchan
Date: 2011-05-05 12:13:20 +0000 (Thu, 05 May 2011)
Log Message:
-----------
Chgt version -> 1.1
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-05-05 12:09:23 UTC (rev 6249)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-05-05 12:13:20 UTC (rev 6250)
@@ -83,7 +83,7 @@
protected static BuInformationsSoftware isMdl_ = new BuInformationsSoftware();
static {
isMdl_.name = "Modeleur";
- isMdl_.version = "1.1_b20110505";
+ isMdl_.version = "1.1";
isMdl_.date = "2011-05-05";
isMdl_.rights = "Tous droits r\xE9serv\xE9s. CETMEF (c)1999-2011";
isMdl_.license = "GPL2";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-06-06 16:37:23
|
Revision: 6278
http://fudaa.svn.sourceforge.net/fudaa/?rev=6278&view=rev
Author: bmarchan
Date: 2011-06-06 16:37:17 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
Gestion undo/redo sur outils externes.
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-06-06 16:36:24 UTC (rev 6277)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-06-06 16:37:17 UTC (rev 6278)
@@ -33,7 +33,6 @@
import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.fudaa.commun.FudaaProjectStateListener;
import org.fudaa.fudaa.commun.FudaaProjetStateInterface;
-import org.fudaa.fudaa.commun.exetools.FudaaManageExeTools;
import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
import org.fudaa.fudaa.commun.impl.FudaaGuiLib;
import org.fudaa.fudaa.commun.impl.FudaaLookPreferencesPanel;
@@ -51,7 +50,6 @@
import com.memoire.bu.BuBrowserPreferencesPanel;
import com.memoire.bu.BuColumn;
import com.memoire.bu.BuDesktopPreferencesPanel;
-import com.memoire.bu.BuFileFilter;
import com.memoire.bu.BuInformationsSoftware;
import com.memoire.bu.BuLanguagePreferencesPanel;
import com.memoire.bu.BuLib;
@@ -67,16 +65,8 @@
import com.memoire.bu.BuTaskView;
import com.memoire.bu.BuUserPreferencesPanel;
import com.memoire.fu.FuLog;
-import javax.swing.JDialog;
-import org.fudaa.ctulu.gui.CtuluOptionPane;
-import org.fudaa.dodico.mascaret.io.MascaretGEO2dFileFormat;
-import org.fudaa.dodico.rubar.io.RubarStCnFileFormat;
import org.fudaa.ebli.commun.EbliActionMap;
-import org.fudaa.fudaa.commun.exetools.FudaaExeTool;
-import org.fudaa.fudaa.sig.exetools.FSigFileExporterI;
import org.fudaa.fudaa.modeleur.action.MdlBiefImportAction;
-import org.fudaa.fudaa.sig.exetools.FSigFileExporterMascaretGEO2d;
-import org.fudaa.fudaa.sig.exetools.FSigFileExporterRubarSt;
import org.fudaa.fudaa.sig.exetools.FSigManageExeTools;
/**
@@ -195,6 +185,8 @@
void createNew2dFrame() {
mdl2dFrame_ = new MdlFille2d(this);
addInternalFrame(mdl2dFrame_);
+ getExeToolManager().setRootLayer(mdl2dFrame_.getDonneesCalque());
+ getExeToolManager().setCommandManager(mdl2dFrame_.getCmdMng());
}
/**
@@ -203,7 +195,6 @@
void createNew1dFrame() {
if (mdl1dFrame_==null) {
mdl1dFrame_=new MdlFille1d(this);
- getExeToolManager().setRootLayer(mdl2dFrame_.getDonneesCalque());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-06-07 09:07:40
|
Revision: 6281
http://fudaa.svn.sourceforge.net/fudaa/?rev=6281&view=rev
Author: bmarchan
Date: 2011-06-07 09:07:31 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
Chgt de version en 1.2_b20110607 avant diffusion.
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-06-07 09:06:02 UTC (rev 6280)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-06-07 09:07:31 UTC (rev 6281)
@@ -81,8 +81,8 @@
protected static BuInformationsSoftware isMdl_ = new BuInformationsSoftware();
static {
isMdl_.name = MdlResource.getS("Modeleur");
- isMdl_.version = "1.1";
- isMdl_.date = "2011-05-05";
+ isMdl_.version = "1.2_b20110607";
+ isMdl_.date = "2011-06-07";
isMdl_.rights = MdlResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2011";
isMdl_.license = "GPL2";
isMdl_.languages = "fr,en";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-06-07 15:41:46
|
Revision: 6285
http://fudaa.svn.sourceforge.net/fudaa/?rev=6285&view=rev
Author: bmarchan
Date: 2011-06-07 15:41:40 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
Fix : Sortie possible de l'appli pendant sauvegarde => Base de donn?\195?\169es corrompue. On n'autorise plus la sortie.
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-06-07 15:39:55 UTC (rev 6284)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-06-07 15:41:40 UTC (rev 6285)
@@ -332,9 +332,19 @@
* Surcharge de la m\xE9thode pour pouvoir sauvegarder les pr\xE9f\xE9rences.
*/
public void exit() {
- confirmExit();
+ if (!isExitCanceled())
+ confirmExit();
}
+ boolean exitCanceled_=false;
+ private boolean isExitCanceled() {
+ return exitCanceled_;
+ }
+
+ private void setExitCanceled(boolean _b) {
+ exitCanceled_=_b;
+ }
+
/**
* Confirmation de la sortie avec ou sans sauvegarde.
*/
@@ -478,14 +488,22 @@
*/
public void save() {
if (project_.getParamsFile() != null) {
- CtuluRunnable act = new CtuluRunnable(FudaaSaveLib.getActionSaveTitle(), this) {
-
+
+ CtuluRunnable act=new CtuluRunnable(FudaaSaveLib.getActionSaveTitle(), this) {
public boolean run(ProgressionInterface _proj) {
- if (FSigProjectPersistence.saveProject(MdlImplementation.this, project_, project_.getParamsFile(), _proj)) {
- updateRecentFiles(project_.getParamsFile());
- return true;
+ try {
+ setGlassPaneStop();
+ setExitCanceled(true);
+ if (FSigProjectPersistence.saveProject(MdlImplementation.this, project_, project_.getParamsFile(), _proj)) {
+ updateRecentFiles(project_.getParamsFile());
+ return true;
+ }
+ return false;
}
- return false;
+ finally {
+ unsetGlassPaneStop();
+ setExitCanceled(false);
+ }
}
};
act.setAfterRunnable(getSaveSwingRunnable(project_.getParamsFile()), true);
@@ -493,33 +511,33 @@
} else
saveAs();
}
-
+
/**
* Action "Enregistrer sous" le projet.
*/
public void saveAs() {
final File f = chooseNewFile(true);
if (f == null) return;
-// Test pour empecher la fermeture de l'appli lors de la sauvegarde. A etendre \xE0 save().
-// CtuluOptionPane pn=new CtuluOptionPane("Une sauvegarde est en cours. Merci de patienter");
-// final JDialog d=pn.createDialog("Message");
-// d.pack();
-// d.setModal(true);
CtuluRunnable act = new CtuluRunnable(FudaaSaveLib.getActionSaveTitle(), this) {
-
public boolean run(ProgressionInterface _proj) {
- if (FSigProjectPersistence.saveProject(MdlImplementation.this, project_, f, _proj)) {
- updateRecentFiles(f);
- return true;
+ try {
+ setGlassPaneStop();
+ setExitCanceled(true);
+ if (FSigProjectPersistence.saveProject(MdlImplementation.this, project_, f, _proj)) {
+ updateRecentFiles(f);
+ return true;
+ }
+ return false;
}
- return false;
+ finally {
+ unsetGlassPaneStop();
+ setExitCanceled(false);
+ }
}
};
- act.setAfterRunnable(getSaveSwingRunnable(f/*,d*/), true);
+ act.setAfterRunnable(getSaveSwingRunnable(f), true);
act.run();
-
-// d.setVisible(true);
}
protected boolean isProjectModified() {
@@ -588,21 +606,28 @@
// on initilialise le fichier de dest si n\xE9cessaire
setFileIfNeeded();
if (project_.getParamsFile()==null) return false;
- CtuluRunnable act = new CtuluRunnable(FudaaSaveLib.getActionSaveTitle(), this) {
-
+
+ CtuluRunnable act=new CtuluRunnable(FudaaSaveLib.getActionSaveTitle(), this) {
public boolean run(ProgressionInterface _prog) {
// le fichier peut etre null si l'utilisateur a refuse de pr\xE9ciser un fichier
// dans ce cas, on ne sauvegarde pas.
if (project_.getParamsFile() != null) {
- setGlassPaneStop();
- FSigProjectPersistence.saveProject(MdlImplementation.this, project_,
- project_.getParamsFile(), _prog);
- updateRecentFiles(project_.getParamsFile());
-
- unsetGlassPaneStop();
- return true;
+ try {
+ setGlassPaneStop();
+ setExitCanceled(true);
+ FSigProjectPersistence.saveProject(MdlImplementation.this, project_,
+ project_.getParamsFile(), _prog);
+ updateRecentFiles(project_.getParamsFile());
+ return true;
+ }
+ finally {
+ unsetGlassPaneStop();
+ setExitCanceled(false);
+ }
}
- else return false;
+ else {
+ return false;
+ }
}
};
// le r sera lance apres et dans le thread swing
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-06-16 11:43:52
|
Revision: 6302
http://fudaa.svn.sourceforge.net/fudaa/?rev=6302&view=rev
Author: bmarchan
Date: 2011-06-16 11:43:45 +0000 (Thu, 16 Jun 2011)
Log Message:
-----------
Verison => 1.2_b20110616 + ajout panneau de pr?\195?\169f?\195?\169rences pour export du tableau de valeurs.
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-06-16 11:41:27 UTC (rev 6301)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-06-16 11:43:45 UTC (rev 6302)
@@ -6,6 +6,7 @@
*/
package org.fudaa.fudaa.modeleur;
+import com.memoire.bu.BuAbstractPreferencesComponent;
import java.awt.Dimension;
import java.awt.Point;
import java.awt.event.ActionEvent;
@@ -49,6 +50,7 @@
import com.memoire.bu.BuAbstractPreferencesPanel;
import com.memoire.bu.BuBrowserPreferencesPanel;
import com.memoire.bu.BuColumn;
+import com.memoire.bu.BuContainerPreferencesPanel;
import com.memoire.bu.BuDesktopPreferencesPanel;
import com.memoire.bu.BuInformationsSoftware;
import com.memoire.bu.BuLanguagePreferencesPanel;
@@ -65,6 +67,8 @@
import com.memoire.bu.BuTaskView;
import com.memoire.bu.BuUserPreferencesPanel;
import com.memoire.fu.FuLog;
+import org.fudaa.ctulu.gui.CtuluTablePreferencesComponent;
+import org.fudaa.ebli.calque.EbliGISPreferencesComponent;
import org.fudaa.ebli.commun.EbliActionMap;
import org.fudaa.fudaa.modeleur.action.MdlBiefImportAction;
import org.fudaa.fudaa.sig.exetools.FSigManageExeTools;
@@ -81,8 +85,8 @@
protected static BuInformationsSoftware isMdl_ = new BuInformationsSoftware();
static {
isMdl_.name = MdlResource.getS("Modeleur");
- isMdl_.version = "1.2_b20110607";
- isMdl_.date = "2011-06-07";
+ isMdl_.version = "1.2_b20110616";
+ isMdl_.date = "2011-06-16";
isMdl_.rights = MdlResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2011";
isMdl_.license = "GPL2";
isMdl_.languages = "fr,en";
@@ -233,10 +237,12 @@
return true;
}
+ @Override
protected boolean buildFudaaReportTool() {
return true;
}
+ @Override
protected boolean buildImageToolIcon() {
return true;
}
@@ -283,10 +289,7 @@
});
}
- protected boolean useScrollInBuDesktop() {
- return true;
- }
-
+ @Override
public void actionPerformed(ActionEvent _evt) {
final String action = _evt.getActionCommand();
if (action == null) {
@@ -331,6 +334,7 @@
/**
* Surcharge de la m\xE9thode pour pouvoir sauvegarder les pr\xE9f\xE9rences.
*/
+ @Override
public void exit() {
if (!isExitCanceled())
confirmExit();
@@ -348,6 +352,7 @@
/**
* Confirmation de la sortie avec ou sans sauvegarde.
*/
+ @Override
public boolean confirmExit() {
if (!FudaaStartupExitPreferencesPanel.isExitConfirmed() ||
question(MdlResource.getS("Quitter"), MdlResource.getS("Voulez-vous vraiment quitter ce logiciel ?"))) {
@@ -375,6 +380,7 @@
/**
* Action "Fermer" le projet en cours.
*/
+ @Override
public void close() {
saveAndCloseProjet(null);
updateActionsState();
@@ -665,6 +671,7 @@
/**
* Methode surcharg\xE9e pour les panneau de pr\xE9f\xE9rence.
*/
+ @Override
protected void buildPreferences(final List<BuAbstractPreferencesPanel> _frAddTab) {
_frAddTab.add(new BuUserPreferencesPanel(this));
_frAddTab.add(new BuLanguagePreferencesPanel(this));
@@ -673,6 +680,12 @@
_frAddTab.add(new FudaaLookPreferencesPanel(this));
_frAddTab.add(new BuBrowserPreferencesPanel(this));
_frAddTab.add(new EbliMiseEnPagePreferencesPanel());
+ _frAddTab.add(new BuContainerPreferencesPanel(MdlResource.getS("Visuel"),MdlResource.getS("Cartographie"),
+ new BuAbstractPreferencesComponent[] {
+ new CtuluTablePreferencesComponent(),
+ new EbliGISPreferencesComponent()
+ }
+ ));
}
/**
@@ -718,6 +731,7 @@
/**
* Mise en place de l'application ava,nt affichage.
*/
+ @Override
public void init() {
super.init();
// Pour forcer l'activation du command listener.
@@ -856,6 +870,7 @@
removeAction("VISIBLE_LEFTCOLUMN");
}
+ @Override
public void start() {
super.start();
super.addFrameListLeft();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-06-27 10:33:38
|
Revision: 6317
http://fudaa.svn.sourceforge.net/fudaa/?rev=6317&view=rev
Author: bmarchan
Date: 2011-06-27 10:33:31 +0000 (Mon, 27 Jun 2011)
Log Message:
-----------
Add : Sauvegarde des largeurs colonnes + correctif sur action close() + maximisation des fenetres internes
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-06-27 10:31:13 UTC (rev 6316)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-06-27 10:33:31 UTC (rev 6317)
@@ -14,6 +14,8 @@
import java.io.File;
import java.io.IOException;
import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.swing.JComponent;
import javax.swing.JInternalFrame;
@@ -67,6 +69,7 @@
import com.memoire.bu.BuTaskView;
import com.memoire.bu.BuUserPreferencesPanel;
import com.memoire.fu.FuLog;
+import javax.swing.SwingUtilities;
import org.fudaa.ctulu.gui.CtuluTablePreferencesComponent;
import org.fudaa.ebli.calque.EbliGISPreferencesComponent;
import org.fudaa.ebli.commun.EbliActionMap;
@@ -138,6 +141,8 @@
/** Projet modeleur. */
MdlProjet project_;
FSigManageExeTools toolMng_;
+ /** Si true, l'utilisateur peut sortir de l'application par Quitter. */
+ boolean exitCanceled_=false;
public MdlImplementation() {
super();
@@ -340,16 +345,28 @@
confirmExit();
}
- boolean exitCanceled_=false;
private boolean isExitCanceled() {
return exitCanceled_;
}
+ /**
+ * Definit si l'action Exit est autoris\xE9e (par exemple lors d'une sauvegarde)
+ * @param _b True : L'action est autoris\xE9e.
+ */
private void setExitCanceled(boolean _b) {
exitCanceled_=_b;
}
/**
+ * L'action close est g\xE9r\xE9e au niveau applicatif (et non fenetre par fenetre).
+ * @return false
+ */
+ @Override
+ public boolean isCloseFrameMode() {
+ return false;
+ }
+
+ /**
* Confirmation de la sortie avec ou sans sauvegarde.
*/
@Override
@@ -724,12 +741,34 @@
BuPreferences.BU.putIntegerProperty("window.y", p.y);
BuPreferences.BU.putIntegerProperty("window.w", d.width);
BuPreferences.BU.putIntegerProperty("window.h", d.height);
+ BuPreferences.BU.putIntegerProperty("leftcolumn.width",getMainPanel().getLeftColumn().getWidth());
+ BuPreferences.BU.putIntegerProperty("rightcolumn.width",getMainPanel().getRightColumn().getWidth());
BuPreferences.BU.writeIniFile();
BuRegistry.unregister(this.getFrame());
}
+
/**
+ * Maximisation syst\xE9matique de la fenetre.
+ * @param _f La fenetre ajout\xE9e.
+ */
+ @Override
+ public void addInternalFrame(final JInternalFrame _f) {
+ super.addInternalFrame(_f);
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ try {
+ _f.setMaximum(true);
+ }
+ catch (PropertyVetoException ex) {
+ Logger.getLogger(MdlImplementation.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
+ });
+ }
+
+ /**
* Mise en place de l'application ava,nt affichage.
*/
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-07-08 14:14:24
|
Revision: 6330
http://fudaa.svn.sourceforge.net/fudaa/?rev=6330&view=rev
Author: bmarchan
Date: 2011-07-08 14:14:18 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
Chgt de version
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-07-08 14:12:19 UTC (rev 6329)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-07-08 14:14:18 UTC (rev 6330)
@@ -88,8 +88,8 @@
protected static BuInformationsSoftware isMdl_ = new BuInformationsSoftware();
static {
isMdl_.name = MdlResource.getS("Modeleur");
- isMdl_.version = "1.2_b20110616";
- isMdl_.date = "2011-06-16";
+ isMdl_.version = "1.2_b20110708";
+ isMdl_.date = "2011-07-08";
isMdl_.rights = MdlResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2011";
isMdl_.license = "GPL2";
isMdl_.languages = "fr,en";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-08-02 09:22:59
|
Revision: 6336
http://fudaa.svn.sourceforge.net/fudaa/?rev=6336&view=rev
Author: bmarchan
Date: 2011-08-02 09:22:53 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
Add : Nouveau panneau export
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-08-02 09:22:24 UTC (rev 6335)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-08-02 09:22:53 UTC (rev 6336)
@@ -71,6 +71,7 @@
import com.memoire.fu.FuLog;
import javax.swing.SwingUtilities;
import org.fudaa.ctulu.gui.CtuluTablePreferencesComponent;
+import org.fudaa.dodico.mascaret.io.MascaretExportPreferencesComponent;
import org.fudaa.ebli.calque.EbliGISPreferencesComponent;
import org.fudaa.ebli.commun.EbliActionMap;
import org.fudaa.fudaa.modeleur.action.MdlBiefImportAction;
@@ -699,11 +700,16 @@
_frAddTab.add(new EbliMiseEnPagePreferencesPanel());
_frAddTab.add(new BuContainerPreferencesPanel(MdlResource.getS("Visuel"),MdlResource.getS("Cartographie"),
new BuAbstractPreferencesComponent[] {
- new CtuluTablePreferencesComponent(),
new EbliGISPreferencesComponent(),
new MdlLayerTreePreferencesComponent()
}
));
+ _frAddTab.add(new BuContainerPreferencesPanel(MdlResource.getS("Export"),
+ new BuAbstractPreferencesComponent[] {
+ new CtuluTablePreferencesComponent(),
+ new MascaretExportPreferencesComponent(),
+ }
+ ));
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-08-03 08:07:55
|
Revision: 6339
http://fudaa.svn.sourceforge.net/fudaa/?rev=6339&view=rev
Author: bmarchan
Date: 2011-08-03 08:07:49 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
Chgt de version -> 1.2_b20110803
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-08-02 14:44:19 UTC (rev 6338)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-08-03 08:07:49 UTC (rev 6339)
@@ -89,8 +89,8 @@
protected static BuInformationsSoftware isMdl_ = new BuInformationsSoftware();
static {
isMdl_.name = MdlResource.getS("Modeleur");
- isMdl_.version = "1.2_b20110708";
- isMdl_.date = "2011-07-08";
+ isMdl_.version = "1.2_b20110803";
+ isMdl_.date = "2011-08-03";
isMdl_.rights = MdlResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2011";
isMdl_.license = "GPL2";
isMdl_.languages = "fr,en";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-10-17 13:31:54
|
Revision: 6538
http://fudaa.svn.sourceforge.net/fudaa/?rev=6538&view=rev
Author: bmarchan
Date: 2011-10-17 13:31:44 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
Chgt de version -> 1.2_b20111017
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-10-17 13:30:39 UTC (rev 6537)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-10-17 13:31:44 UTC (rev 6538)
@@ -89,8 +89,8 @@
protected static BuInformationsSoftware isMdl_ = new BuInformationsSoftware();
static {
isMdl_.name = MdlResource.getS("Modeleur");
- isMdl_.version = "1.2_b20110804";
- isMdl_.date = "2011-08-04";
+ isMdl_.version = "1.2_b20111017";
+ isMdl_.date = "2011-10-17";
isMdl_.rights = MdlResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2011";
isMdl_.license = "GPL2";
isMdl_.languages = "fr,en";
@@ -814,7 +814,7 @@
setEnabledForAction("SEND_COMMENT", true);
setEnabledForAction("LAUNCH_JAVAWS", true);
final BuMenu mFichier = (BuMenu) b.getMenu("MENU_FICHIER");
- mFichier.addMenuItem(TrResource.getS("Fermer toutes les applications"), "CLOSE_ALL", BuResource.BU
+ mFichier.addMenuItem(MdlResource.getS("Fermer toutes les applications"), "CLOSE_ALL", BuResource.BU
.getIcon("fermer"), true, 0);
final BuToolBar tb = getMainToolBar();
if (!isSupervisor()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-12-01 10:28:25
|
Revision: 6745
http://fudaa.svn.sourceforge.net/fudaa/?rev=6745&view=rev
Author: bmarchan
Date: 2011-12-01 10:28:19 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
Fix : Suppression undo/redo en cas d'ouverture d'un projet
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-12-01 10:19:23 UTC (rev 6744)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-12-01 10:28:19 UTC (rev 6745)
@@ -467,6 +467,7 @@
public void run() {
try {
addInternalFrame(mdl2dFrame_);
+ mdl2dFrame_.getCmdMng().clean();
if (swingRun != null) swingRun.run();
@@ -475,6 +476,7 @@
try {
loader=new FudaaSaveZipLoader(f);
mdl1dFrame_.restoreFrom(loader, null);
+ mdl1dFrame_.getCmdMng().clean();
}
catch (IOException _exc) {}
finally {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-12-22 17:12:13
|
Revision: 6879
http://fudaa.svn.sourceforge.net/fudaa/?rev=6879&view=rev
Author: bmarchan
Date: 2011-12-22 17:12:04 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
Chgt de version -> 1.2
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-12-22 17:09:10 UTC (rev 6878)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-12-22 17:12:04 UTC (rev 6879)
@@ -93,8 +93,8 @@
protected static BuInformationsSoftware isMdl_ = new BuInformationsSoftware();
static {
isMdl_.name = MdlResource.getS("Modeleur");
- isMdl_.version = "1.2_b20111017";
- isMdl_.date = "2011-10-17";
+ isMdl_.version = "1.2";
+ isMdl_.date = "2011-12-22";
isMdl_.rights = MdlResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2011";
isMdl_.license = "GPL2";
isMdl_.languages = "fr,en";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-01-10 16:32:42
|
Revision: 8200
http://fudaa.svn.sourceforge.net/fudaa/?rev=8200&view=rev
Author: deniger
Date: 2013-01-10 16:32:35 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2013-01-10 16:31:55 UTC (rev 8199)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2013-01-10 16:32:35 UTC (rev 8200)
@@ -94,8 +94,8 @@
static {
isMdl_.name = MdlResource.getS("Modeleur");
- isMdl_.version = "1.2";
- isMdl_.date = "2011-12-22";
+ isMdl_.version = "1.2RC4";
+ isMdl_.date = "2013-01-10";
isMdl_.rights = MdlResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)1999-2011";
isMdl_.license = "GPL2";
isMdl_.languages = "fr,en";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-01-16 22:10:53
|
Revision: 8217
http://fudaa.svn.sourceforge.net/fudaa/?rev=8217&view=rev
Author: deniger
Date: 2013-01-16 22:10:46 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
optimisation maillage important
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2013-01-16 22:10:09 UTC (rev 8216)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2013-01-16 22:10:46 UTC (rev 8217)
@@ -95,8 +95,8 @@
static {
isMdl_.name = MdlResource.getS("Modeleur");
- isMdl_.version = "1.2RC5";
- isMdl_.date = "2013-01-14";
+ isMdl_.version = "1.2RC6";
+ isMdl_.date = "2013-01-17";
isMdl_.rights = MdlResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)1999-2011";
isMdl_.license = "GPL2";
isMdl_.languages = "fr,en";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-01-21 10:03:43
|
Revision: 8231
http://fudaa.svn.sourceforge.net/fudaa/?rev=8231&view=rev
Author: deniger
Date: 2013-01-21 10:03:36 +0000 (Mon, 21 Jan 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2013-01-21 09:38:55 UTC (rev 8230)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2013-01-21 10:03:36 UTC (rev 8231)
@@ -95,8 +95,8 @@
static {
isMdl_.name = MdlResource.getS("Modeleur");
- isMdl_.version = "1.2RC6";
- isMdl_.date = "2013-01-17";
+ isMdl_.version = "1.2RC7";
+ isMdl_.date = "2013-01-21";
isMdl_.rights = MdlResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)1999-2011";
isMdl_.license = "GPL2";
isMdl_.languages = "fr,en";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-01-24 09:46:08
|
Revision: 8254
http://fudaa.svn.sourceforge.net/fudaa/?rev=8254&view=rev
Author: deniger
Date: 2013-01-24 09:45:57 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
incr?\195?\169ment version
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2013-01-24 07:46:01 UTC (rev 8253)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2013-01-24 09:45:57 UTC (rev 8254)
@@ -95,8 +95,8 @@
static {
isMdl_.name = MdlResource.getS("Modeleur");
- isMdl_.version = "1.2RC7";
- isMdl_.date = "2013-01-21";
+ isMdl_.version = "1.2RC8";
+ isMdl_.date = "2013-01-24";
isMdl_.rights = MdlResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)1999-2011";
isMdl_.license = "GPL2";
isMdl_.languages = "fr,en";
@@ -484,7 +484,9 @@
FudaaSaveZipLoader loader = new FudaaSaveZipLoader(f);
// Recup des infos pour utilisateur.
BuInformationsSoftware is = FudaaSaveProject.getSoftwareInfos(loader);
- FuLog.trace("File version : " + (is.version == null ? "Undefined" : is.version));
+ if (is != null) {
+ FuLog.trace("File version : " + (is.version == null ? "Undefined" : is.version));
+ }
r = FudaaSaveLib.restoreFille(MdlImplementation.this, mdl2dFrame_, _proj, loader);
} catch (final IOException _evt) {
@@ -733,7 +735,7 @@
*/
@Override
protected void buildPreferences(final List<BuAbstractPreferencesPanel> _frAddTab) {
-
+
_frAddTab.add(new FudaaPerformancePreferencesPanel(this));
_frAddTab.add(new BuUserPreferencesPanel(this));
_frAddTab.add(new BuLanguagePreferencesPanel(this));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-06-24 20:04:09
|
Revision: 8423
http://sourceforge.net/p/fudaa/svn/8423
Author: deniger
Date: 2013-06-24 20:04:06 +0000 (Mon, 24 Jun 2013)
Log Message:
-----------
nettoyage du cache si modification de l'affichage ou non des lignes orient?\195?\169es.
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2013-06-24 19:52:12 UTC (rev 8422)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2013-06-24 20:04:06 UTC (rev 8423)
@@ -95,8 +95,8 @@
static {
isMdl_.name = MdlResource.getS("Modeleur");
- isMdl_.version = "1.2RC8";
- isMdl_.date = "2013-01-24";
+ isMdl_.version = "1.2RC9";
+ isMdl_.date = "2013-06-24";
isMdl_.rights = MdlResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)1999-2011";
isMdl_.license = "GPL2";
isMdl_.languages = "fr,en";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X