Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5656] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fudaa/tr
|
From: <de...@us...> - 2010-01-29 02:01:50
|
Revision: 5656
http://fudaa.svn.sourceforge.net/fudaa/?rev=5656&view=rev
Author: deniger
Date: 2010-01-29 02:01:43 +0000 (Fri, 29 Jan 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionFusionGraphes.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceManager.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileBuilder.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileFillePanel.java
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2010-01-29 00:09:41 UTC (rev 5655)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2010-01-29 02:01:43 UTC (rev 5656)
@@ -111,8 +111,10 @@
infoSoft = new BuInformationsSoftware();
infoSoft.name = "prepro";
- infoSoft.version = "1.00";
- infoSoft.date = "2010-01-27";
+ infoSoft.version = "0.96RC5";
+ infoSoft.date = "2010-01-28";
+// infoSoft.version = "1.00";
+// infoSoft.date = "2010-01-27";
infoSoft.rights = TrResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)2003-2009";
infoSoft.contact = "fre...@fu...";
infoSoft.license = "GPL2";
@@ -128,7 +130,7 @@
} else {
infoSoft.man = manUrl.toString() + '/';
}
- infoSoft.authors = new String[] { "Fr\xE9d\xE9ric Deniger", "Nicolas Clavreul", "M\xE9d\xE9ric FARGEIX" };
+ infoSoft.authors = new String[] { "Fr\xE9d\xE9ric Deniger", "Nicolas Clavreul" };
infoSoft.contributors = new String[] { "Equipes Dodico, Ebli et Fudaa" };
infoSoft.documentors = new String[] { "" };
infoSoft.testers = new String[] { "Fr\xE9d\xE9ric Deniger, Patrick Gomi, Vanessya Laborie", "Andr\xE9 Paquier",
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionFusionGraphes.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionFusionGraphes.java 2010-01-29 00:09:41 UTC (rev 5655)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionFusionGraphes.java 2010-01-29 02:01:43 UTC (rev 5656)
@@ -8,10 +8,20 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.DefaultListModel;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.ListSelectionModel;
import com.memoire.bu.BuDialog;
import com.memoire.bu.BuDialogConfirmation;
@@ -339,9 +349,11 @@
}
// -- v\xE9rification pour les l\xE9gendes --//
- if (((EbliWidgetControllerGraphe) grapheWidget.getController()).hasLegende()) scene_.removeNode(grapheWidget
- .getNodeLegende());
+ if (((EbliWidgetControllerGraphe) grapheWidget.getController()).hasLegende()) {
+ grapheWidget.removeAllSatellites();
+ }
+
// --suppression du graphe merge --//
scene_.removeNodeWithEdges(nodeToMerge);
@@ -351,7 +363,7 @@
remplirCombo();
if (((EbliWidgetControllerGraphe) widgetGraphe_.getController()).hasLegende()) {
- scene_.removeNode(widgetGraphe_.getNodeLegende());
+ widgetGraphe_.removeAllSatellites();
scene_.refresh();
((EbliWidgetControllerGraphe) widgetGraphe_.getController()).ajoutLegende();
scene_.refresh();
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceManager.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceManager.java 2010-01-29 00:09:41 UTC (rev 5655)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceManager.java 2010-01-29 02:01:43 UTC (rev 5656)
@@ -2,18 +2,17 @@
import java.awt.Dimension;
import java.awt.Point;
+import java.io.EOFException;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
-import java.nio.charset.Charset;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -36,6 +35,7 @@
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.gui.CtuluFileChooser;
import org.fudaa.ctulu.gui.CtuluLibSwing;
+import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.ebli.visuallibrary.EbliNode;
import org.fudaa.ebli.visuallibrary.EbliScene;
@@ -388,7 +388,7 @@
try {
- in = createObjectInputStream(file);
+ in = EbliLib.createObjectInpuStream(file, getParser());
int nbFichiersToGenrate;
// -- lecture readme --//
@@ -622,7 +622,7 @@
// -- outputstream du xstream --//
ObjectInputStream in = null;
try {
- in = createObjectInputStream(file);
+ in = EbliLib.createObjectInpuStream(file, getParser());
// -- recuperation du multiSourceActivator--//
final TrPostMultiSourceActivator2 multiProjectActivator = new TrPostMultiSourceActivator2(trprojet_);
@@ -643,7 +643,7 @@
// -- liste qui contient l'ensemble des fichiers \xE0 recharger pour les vues 2d et vues 1d
final List<String> listeReloadSource = new ArrayList<String>();
parametres.put("RELOAD", listeReloadSource);
- nbSources=Math.min(nbSources,listeCouplesIdSources.size());
+ nbSources = Math.min(nbSources, listeCouplesIdSources.size());
for (int i = 0; i < nbSources; i++) {
if (listeCouplesIdSources.get(i).rechargerLesLiens) {
@@ -752,7 +752,7 @@
if (fileVariables.canRead()) {
ObjectInputStream in = null;
try {
- in = createObjectInputStream(fileVariables);
+ in = EbliLib.createObjectInpuStream(fileVariables, getParser());
Object var = in.readObject();
if (var instanceof TrPostUserVariableSaver) {
final TrPostUserVariableSaver varUser = (TrPostUserVariableSaver) var;
@@ -905,7 +905,7 @@
ObjectOutputStream out = null;
try {
mkdirParent(file);
- out = getParser().createObjectOutputStream(new FileWriter(file));
+ out = EbliLib.createObjectOutpuStream(file,getParser());
// --readme --//
out.writeObject(XmlCommentaire.getCommentaireName());
@@ -940,7 +940,7 @@
// -- outputstream du xstream --//
ObjectInputStream in = null;
try {
- in = createObjectInputStream(file);
+ in = EbliLib.createObjectInpuStream(file, getParser());
// --readme --//
final Object debuTfichier = in.readObject();
if (debuTfichier instanceof XmlCommentaire) {
@@ -962,16 +962,6 @@
return liste;
}
- private ObjectInputStream createObjectInputStream(final File file) throws IOException, FileNotFoundException {
- XStream parser = getParser();
- return createObjectInpuStream(file, parser);
- }
-
- private ObjectInputStream createObjectInpuStream(final File file, XStream parser) throws IOException,
- FileNotFoundException {
- return parser.createObjectInputStream(new InputStreamReader(new FileInputStream(file),Charset.forName("UTF-8")));
- }
-
/**
* Methode qui charge le projet,l'ensemble des sources et toutes les widgets dans les layouts.
*
@@ -1259,7 +1249,7 @@
// -- inputstream du xstream --//
ObjectInputStream in = null;
try {
- in = createObjectInputStream(file);
+ in = EbliLib.createObjectInpuStream(file, getParser());
// -- r\xE9cup\xE9ration de la scene xml --//
final EbliSceneSerializeXml sceneXml = (EbliSceneSerializeXml) in.readObject();
@@ -1284,47 +1274,53 @@
final Map<EbliWidgetSerializeXml, Integer> listePositionWidgetLinked = new HashMap<EbliWidgetSerializeXml, Integer>();
// -- r\xE9cup\xE9ration via xml des eblinode/widgets --//
- for (int i = 0; i < sceneXml.getNbFrames(); i++) {
+ boolean endReached = false;
+ try {
+ for (int i = 0; i < sceneXml.getNbFrames(); i++) {
- // lecture xml de l objet
- final Object objetXml = in.readObject();
- if (objetXml == null || !(objetXml instanceof EbliWidgetSerializeXml)) {
- managerError.addMessageError(nomRepertoireLayout + ": l'objet xml N\xB0" + i
- + " lu n'est pas un descripteur de frame valide");
- } else {
- final EbliWidgetSerializeXml widgetXml = (EbliWidgetSerializeXml) objetXml;
+ // lecture xml de l objet
+ final Object objetXml = in.readObject();
+ if (objetXml == null || !(objetXml instanceof EbliWidgetSerializeXml)) {
+ managerError.addMessageError(nomRepertoireLayout + ": l'objet xml N\xB0" + i
+ + " lu n'est pas un descripteur de frame valide");
+ } else {
+ final EbliWidgetSerializeXml widgetXml = (EbliWidgetSerializeXml) objetXml;
- if (!widgetXml.isLinked()) {
- // generation de la widget dans la scene
- parametres.put("nodeName", getNodeName(listeCouplesNoms, widgetXml.getId()));
- final EbliNode node = widgetXml.generateWidgetInScene(parametres, scenToUpdate);
- if (node != null) {
- // ajout des noeuds a ajouter dans la selection
- if (widgetXml.isSelected()) {
- listeNodeSelect.add(node);
- }
+ if (!widgetXml.isLinked()) {
+ // generation de la widget dans la scene
+ parametres.put("nodeName", getNodeName(listeCouplesNoms, widgetXml.getId()));
+ final EbliNode node = widgetXml.generateWidgetInScene(parametres, scenToUpdate);
+ if (node != null) {
+ // ajout des noeuds a ajouter dans la selection
+ if (widgetXml.isSelected()) {
+ listeNodeSelect.add(node);
+ }
- // ajout de la creation d'un groupe
- if (!widgetXml.getIdGroup().equals(EbliWidgetGroup.NOGROUP)) {
- // il y a un group a prendre en compte d'id
- final String idGroup = widgetXml.getIdGroup();
- if (listeGroupToPerform.get(idGroup) == null) {
- // on init
- listeGroupToPerform.put(idGroup, new HashSet<Object>());
+ // ajout de la creation d'un groupe
+ if (!widgetXml.getIdGroup().equals(EbliWidgetGroup.NOGROUP)) {
+ // il y a un group a prendre en compte d'id
+ final String idGroup = widgetXml.getIdGroup();
+ if (listeGroupToPerform.get(idGroup) == null) {
+ // on init
+ listeGroupToPerform.put(idGroup, new HashSet<Object>());
+ }
+ // on ajoute l'objet node pour la widget
+ listeGroupToPerform.get(idGroup).add(node);
}
- // on ajoute l'objet node pour la widget
- listeGroupToPerform.get(idGroup).add(node);
}
+
+ } else {
+ // -- on ajoute la widget liee a la liste des widget a cree au
+ // final--//
+ listeWidgetLinked.add(widgetXml);
+ listePositionWidgetLinked.put(widgetXml, new Integer(i));
}
- } else {
- // -- on ajoute la widget liee a la liste des widget a cree au
- // final--//
- listeWidgetLinked.add(widgetXml);
- listePositionWidgetLinked.put(widgetXml, new Integer(i));
}
-
}
+ } catch (EOFException e) {
+ endReached = true;
+
}
// --On executre les widgets liees --//
@@ -1333,11 +1329,11 @@
// generation de la widget dans la scene
parametres.put("nodeName", getNodeName(listeCouplesNoms, widgetXml.getId()));
final EbliNode node = widgetXml.generateWidgetInScene(parametres, scenToUpdate);
- if (node == null|| node.getWidget()==null) {
+ if (node == null || node.getWidget() == null) {
continue;
}
// ajout des noeuds a ajouter dans la selection
- if (widgetXml.isSelected() && node.getWidget()!=null) {
+ if (widgetXml.isSelected() && node.getWidget() != null) {
listeNodeSelect.add(node);
}
@@ -1361,12 +1357,15 @@
// -- lecture des groupes --//
// -- ecriture des groupes --//
- final int nbGroups = in.readInt();
- final HashMap<String, EbliWidgetGroupSerializeXml> listeGroupes = new HashMap<String, EbliWidgetGroupSerializeXml>();
+ Map<String, EbliWidgetGroupSerializeXml> listeGroupes = Collections.emptyMap();
+ if (!endReached) {
+ final int nbGroups = in.readInt();
+ listeGroupes = new HashMap<String, EbliWidgetGroupSerializeXml>();
- for (int i = 0; i < nbGroups; i++) {
- final EbliWidgetGroupSerializeXml group = (EbliWidgetGroupSerializeXml) in.readObject();
- listeGroupes.put(group.getId(), group);
+ for (int i = 0; i < nbGroups; i++) {
+ final EbliWidgetGroupSerializeXml group = (EbliWidgetGroupSerializeXml) in.readObject();
+ listeGroupes.put(group.getId(), group);
+ }
}
scenToUpdate.refresh();
@@ -1392,8 +1391,7 @@
}
// -- on ajoute les noeuds selectionnes a ebliScene --//
- if(listeNodeSelect!=null)
- scenToUpdate.setSelectedObjects(listeNodeSelect);
+ if (listeNodeSelect != null) scenToUpdate.setSelectedObjects(listeNodeSelect);
// mise a jour de la scene
scenToUpdate.refresh();
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileBuilder.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileBuilder.java 2010-01-29 00:09:41 UTC (rev 5655)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileBuilder.java 2010-01-29 02:01:43 UTC (rev 5656)
@@ -169,8 +169,8 @@
final EGCourbeChild courbeChild2 = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
getMeshResultsMng(_prog).getDefaultRes(), false));
if (addXYForNode && addXYForMesh) {
- courbeChild.setTitle(courbeChild.getTitle() + sep + MvResource.getS("Elements"));
- courbeChild2.setTitle(courbeChild2.getTitle() + sep + MvResource.getS("Elements"));
+ courbeChild.setTitle(courbeChild.getTitle() + sep + MvResource.getS("El\xE9ments"));
+ courbeChild2.setTitle(courbeChild2.getTitle() + sep + MvResource.getS("El\xE9ments"));
}
grCoord.addEGComponent(courbeChild);
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileFillePanel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileFillePanel.java 2010-01-29 00:09:41 UTC (rev 5655)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileFillePanel.java 2010-01-29 02:01:43 UTC (rev 5656)
@@ -85,7 +85,7 @@
super(new EGGraphe(_a));
ui_ = _ui;
final EGAxeHorizontal h = new EGAxeHorizontal();
- h.setTitre(EbliLib.getS("abscisse"));
+ h.setTitre(EbliLib.getS("Abscisse"));
h.setUnite("m");
getGraphe().setXAxe(h);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
