Menu
▾
▴
fudaa-svn-commit
|
From: <bma...@us...> - 2015-04-17 13:48:08
|
Revision: 9110
http://sourceforge.net/p/fudaa/svn/9110
Author: bmarchan
Date: 2015-04-17 13:48:00 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
Ajout L&F Nimbus
Modified Paths:
--------------
trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuPreferences.java
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaLookPreferencesPanel.java
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuPreferences.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuPreferences.java 2015-04-16 15:30:15 UTC (rev 9109)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuPreferences.java 2015-04-17 13:48:00 UTC (rev 9110)
@@ -148,6 +148,8 @@
} finally {
BuLib.forgetLnf();
}
+ } else if (lnfname.equals("ASPECT_NIMBUS")) {
+ lnfclass = "javax.swing.plaf.nimbus.NimbusLookAndFeel";
} else if (lnfname.equals("ASPECT_METOUIA")) {
lnfclass = "net.sourceforge.mlf.metouia.MetouiaLookAndFeel";
} else if (lnfname.equals("ASPECT_MOTIF")) {
Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaLookPreferencesPanel.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaLookPreferencesPanel.java 2015-04-16 15:30:15 UTC (rev 9109)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaLookPreferencesPanel.java 2015-04-17 13:48:00 UTC (rev 9110)
@@ -44,7 +44,7 @@
BuGridLayout loGen_;
BuGridLayout loGenDesk_;
BuPreferences options_;
- Map optionsStr_;
+ Map<Object,Object> optionsStr_;
BuPanel pnGenDesk_;
BuTextField tfGenAspSkinlf_, tfGenAspOyoaha_;
@@ -58,7 +58,7 @@
appli_ = _appli;
options_ = BuPreferences.BU;
cbRenderer_ = new BuOptionRenderer();
- optionsStr_ = new HashMap();
+ optionsStr_ = new HashMap<Object, Object>();
final String aspectStr = "aspect";
optionsStr_.put("DESKTOP_UNIFORME", new BuOptionItem(getS("Uniforme"), BuResource.BU.getMenuIcon("uniforme")));
optionsStr_.put("DESKTOP_DEGRADE", new BuOptionItem(getS("D\xE9grad\xE9"), BuResource.BU.getMenuIcon("degrade")));
@@ -99,6 +99,8 @@
.isEnabled("ASPECT_METAL")));
optionsStr_.put("ASPECT_MOTIF", new BuOptionItem("Motif", BuResource.BU.getMenuIcon(aspectStr), options_
.isEnabled("ASPECT_MOTIF")));
+ optionsStr_.put("ASPECT_NIMBUS", new BuOptionItem("Nimbus", BuResource.BU.getMenuIcon(aspectStr), options_
+ .isEnabled("ASPECT_NIMBUS")));
optionsStr_.put("ASPECT_NEXT", new BuOptionItem("Next", BuResource.BU.getMenuIcon(aspectStr), options_
.isEnabled("ASPECT_NEXT")));
optionsStr_.put("ASPECT_ORGANIC", new BuOptionItem("Organic", BuResource.BU.getMenuIcon(aspectStr), options_
@@ -153,7 +155,7 @@
// Aspect
lbGenAspAspect_ = new BuLabel(getS("Aspect:"), SwingConstants.RIGHT);
- items = new BuOptionItem[11];
+ items = new BuOptionItem[12];
int i = 0;
items[i++] = optionsStr_.get(getAspectDefaut());
// items[ i++]=optionsStr_.get("ASPECT_AMIGA");
@@ -161,7 +163,6 @@
items[i++] = optionsStr_.get("ASPECT_GTK");
// items[ i++]=optionsStr_.get("ASPECT_KUNSTSTOFF");
items[i++] = optionsStr_.get("ASPECT_LIQUID");
- items[i++] = optionsStr_.get("ASPECT_SUBSTANCE");
items[i++] = optionsStr_.get("ASPECT_MAC");
items[i++] = optionsStr_.get("ASPECT_METAL");
items[i++] = optionsStr_.get("ASPECT_MOTIF");
@@ -169,9 +170,11 @@
* items[ i++]=optionsStr_.get("ASPECT_NEXT"); items[i++]=optionsStr_.get("ASPECT_ORGANIC");
* items[i++]=optionsStr_.get("ASPECT_OYOAHA");
*/
+ items[i++] = optionsStr_.get("ASPECT_NIMBUS");
items[i++] = optionsStr_.get("ASPECT_PLASTIC");
items[i++] = optionsStr_.get("ASPECT_PLASTIC3D");
items[i++] = optionsStr_.get("ASPECT_PLASTICXP");
+ items[i++] = optionsStr_.get("ASPECT_SUBSTANCE");
/*
* items[i++]=optionsStr_.get("ASPECT_SKINLF"); items[i++]=optionsStr_.get("ASPECT_SLAF");
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-04-20 09:13:05
|
Revision: 9112
http://sourceforge.net/p/fudaa/svn/9112
Author: bmarchan
Date: 2015-04-20 09:12:57 +0000 (Mon, 20 Apr 2015)
Log Message:
-----------
Palette de d?\195?\169placement nouvelle possibilit?\195?\169 : Si calque de deplacement est null, pas de deplacement interactif
Modified Paths:
--------------
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneDeplacementAction.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/BPaletteDeplacement.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliActionPaletteAbstract.java
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneDeplacementAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneDeplacementAction.java 2015-04-20 09:08:21 UTC (rev 9111)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneDeplacementAction.java 2015-04-20 09:12:57 UTC (rev 9112)
@@ -24,7 +24,9 @@
import org.fudaa.ebli.ressource.EbliResource;
/**
- * Une action pour faire une rotation d'objets GIS, reagissant au changement de calque selectionn\xE9.
+ * Une action pour faire un d\xE9placement d'objets GIS, reagissant au changement de calque selectionn\xE9.
+ * Cette action permet un d\xE9placement \xE0 la souris, ou par un panneau Dx,Dy,Dz.
+ *
* @author Fred Deniger, mar...@de...
* @version $Id: SceneDeplacementAction.java,v 1.1.2.1 2008-05-13 12:10:47 bmarchan Exp $
*/
@@ -37,17 +39,22 @@
/**
* @param _m l'arbre des calques
+ * @param _cqDep Le calque d'interaction pour le d\xE9placement \xE0 la souris. Si
+ * <code>null</code>, le d\xE9placement ne se fait que par le panneau de
+ * saisie de Dx,Dy,Dz
*/
public SceneDeplacementAction(final TreeSelectionModel _m, final ZEditorDefault _editor, EbliFormatterInterface _formatter, ZCalqueDeplacementInteraction _cqDep) {
super(EbliLib.getS("D\xE9placer des objets"), EbliResource.EBLI.getToolIcon("fleche-deplacement"), "GLOBAL_MOVE", _m);
formatter_=_formatter;
pnCalques_=_editor.getPanel();
// Pour capter l'activation d'un autre calque.
- pnCalques_.getController().addPropertyChangeListener("gele", this);
+ if (_cqDep!=null)
+ pnCalques_.getController().addPropertyChangeListener("gele", this);
cqDep_=_cqDep;
setSceneEditor(_editor.getSceneEditor());
- cqDep_.addPropertyChangeListener("gele",this);
+ if (cqDep_!=null)
+ cqDep_.addPropertyChangeListener("gele",this);
setEnabled(isTargetValid(super.target_));
}
/**
@@ -66,12 +73,14 @@
@Override
public void changeAction(){
super.changeAction();
- if (isSelected()) {
- pnCalques_.setCalqueInteractionActif(cqDep_);
+ if (cqDep_!=null) {
+ if (isSelected()) {
+ pnCalques_.setCalqueInteractionActif(cqDep_);
+ }
+ else {
+ pnCalques_.setCalqueSelectionActif();
+ }
}
- else {
- pnCalques_.setCalqueSelectionActif();
- }
}
@@ -83,7 +92,8 @@
@Override
protected BPalettePanelInterface buildPaletteContent() {
BPaletteDeplacement pal=new BPaletteDeplacement(sceneEditor_,formatter_);
- pal.setCalqueDeplacement(cqDep_);
+ if (cqDep_!=null)
+ pal.setCalqueDeplacement(cqDep_);
return pal;
}
@@ -101,6 +111,7 @@
@Override
public void internalFrameClosing(InternalFrameEvent e) {
- pnCalques_.setCalqueSelectionActif();
+ if (cqDep_!=null)
+ pnCalques_.setCalqueSelectionActif();
}
}
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/BPaletteDeplacement.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/BPaletteDeplacement.java 2015-04-20 09:08:21 UTC (rev 9111)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/BPaletteDeplacement.java 2015-04-20 09:12:57 UTC (rev 9112)
@@ -107,22 +107,19 @@
dz = (Double) tfDz_.getValue();
}
if (dx != null && dy != null && dz != null) {
- deplacement_.getTarget().moved(dx.doubleValue(), dy.doubleValue(), dz.doubleValue(), false);
+ sceneEditor_.moveSelectedObjects(dx, dy, dz);
}
-
}
}
+ /**
+ * @param _dep Le calque de d\xE9placement : Si <code>null</code>, le d\xE9placement ne se fait que par les Dx,Dy,DZ.
+ */
public void setCalqueDeplacement(ZCalqueDeplacementInteraction _dep) {
deplacement_ = _dep;
- deplacement_.specPanel_ = this;
+ if (deplacement_!=null)
+ deplacement_.specPanel_ = this;
}
-// public void close(){
-// if (FuLog.isTrace()) {
-// FuLog.trace("EBL: " + getClass().getName() + " close");
-// }
-// deplacement_.specPanel_ = null;
-// }
@Override
public JComponent getComponent() {
@@ -131,7 +128,7 @@
@Override
public void updateState() {
- if (deplacement_.isDragged()) {
+ if (deplacement_!=null && deplacement_.isDragged()) {
tfDx_.setEditable(false);
tfDy_.setEditable(false);
tfDz_.setEditable(false);
@@ -148,7 +145,7 @@
tfDx_.setEditable(true);
tfDy_.setEditable(true);
tfDz_.setEditable(true);
- btApply_.setEnabled(!deplacement_.isSelectionEmpty());
+ btApply_.setEnabled(!sceneEditor_.getScene().isSelectionEmpty());
}
}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliActionPaletteAbstract.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliActionPaletteAbstract.java 2015-04-20 09:08:21 UTC (rev 9111)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliActionPaletteAbstract.java 2015-04-20 09:12:57 UTC (rev 9112)
@@ -215,6 +215,7 @@
}
dial_.setModal(dialogIsModal);
dial_.setContentPane(window_.getContentPane());
+ dial_.setTitle(window_.getTitle());
dial_.pack();
dial_.addWindowListener(new WindowAdapter() {
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-04-21 15:37:05
|
Revision: 9117
http://sourceforge.net/p/fudaa/svn/9117
Author: bmarchan
Date: 2015-04-21 15:36:56 +0000 (Tue, 21 Apr 2015)
Log Message:
-----------
Petites am?\195?\169liorations pour les ?\195?\169ditions de geometries (Formattage/nommage des colonnes X,Y)
Modified Paths:
--------------
trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISZoneCollection.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliObjetsEditorPanel.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliObjetsMultiEditorPanel.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModelePointEditable.java
Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISZoneCollection.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISZoneCollection.java 2015-04-20 13:41:08 UTC (rev 9116)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISZoneCollection.java 2015-04-21 15:36:56 UTC (rev 9117)
@@ -927,17 +927,20 @@
throw new IllegalArgumentException("Au moins l'un des deux index est incoh\xE9rent.");
}
if (_index1 != _index2) {
- CtuluCommandComposite cmd = new CtuluCommandComposite();
+ CtuluCommandComposite cmd=new CtuluCommandComposite();
// Permutation des g\xE9om\xE9tries
super.switchGeometries(_index1, _index2, cmd);
// Permutation des valeurs d'attributs
- for (int i = 0; i < attr_.length; i++) {
- Object tmp = attr_[i].getObjectValueAt(_index1);
- attr_[i].setObject(_index1, attr_[i].getObjectValueAt(_index2), cmd);
- attr_[i].setObject(_index2, tmp, cmd);
+
+ if (attr_ != null) {
+ for (int i=0; i < attr_.length; i++) {
+ Object tmp=attr_[i].getObjectValueAt(_index1);
+ attr_[i].setObject(_index1, attr_[i].getObjectValueAt(_index2), cmd);
+ attr_[i].setObject(_index2, tmp, cmd);
+ }
+ fireAttributeValueChanged(-1, null, _index1, null);
+ fireAttributeValueChanged(-1, null, _index2, null);
}
- fireAttributeValueChanged(-1, null, _index1, null);
- fireAttributeValueChanged(-1, null, _index2, null);
if (_cmd != null) {
_cmd.addCmd(cmd.getSimplify());
}
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliObjetsEditorPanel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliObjetsEditorPanel.java 2015-04-20 13:41:08 UTC (rev 9116)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliObjetsEditorPanel.java 2015-04-21 15:36:56 UTC (rev 9117)
@@ -6,10 +6,12 @@
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
+
import javax.swing.JCheckBox;
+
import org.fudaa.ctulu.CtuluCommandContainer;
-import org.fudaa.ctulu.gis.GISZoneCollection;
import org.fudaa.ctulu.gui.CtuluValuesEditorPanel;
+import org.fudaa.ebli.commun.EbliCoordinateDefinition;
import org.fudaa.ebli.commun.EbliLib;
/**
@@ -23,13 +25,13 @@
/**
* Constructeur.
- * @param _zone La collection contenant les g\xE9om\xE9tries.
+ * @param _model Le mod\xE8le \xE9ditable contenant les g\xE9om\xE9tries.
* @param _idx Les indices des objets selectionn\xE9s.
* @param _cmd Le manager undo/redo
*/
- public EbliObjetsEditorPanel(final GISZoneCollection _zone, final int[] _idx, final CtuluCommandContainer _cmd) {
- super(new EbliObjetsMultiEditorPanel(_zone,_idx),_cmd);
- decorePanel(_zone.getNbGeometries()==_idx.length);
+ public EbliObjetsEditorPanel(final ZModeleEditable _model, final int[] _idx, final CtuluCommandContainer _cmd, EbliCoordinateDefinition[] _coordDefs) {
+ super(new EbliObjetsMultiEditorPanel(_model,_idx, _coordDefs),_cmd);
+ decorePanel(_model.getNombre()==_idx.length);
}
/**
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliObjetsMultiEditorPanel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliObjetsMultiEditorPanel.java 2015-04-20 13:41:08 UTC (rev 9116)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliObjetsMultiEditorPanel.java 2015-04-21 15:36:56 UTC (rev 9117)
@@ -7,10 +7,6 @@
*/
package org.fudaa.ebli.calque.edition;
-import com.memoire.bu.BuButton;
-import com.memoire.bu.BuLabel;
-import com.memoire.bu.BuResource;
-import com.memoire.bu.BuVerticalLayout;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
@@ -20,15 +16,17 @@
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
+
import javax.swing.BorderFactory;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
+
import org.fudaa.ctulu.CtuluCommandComposite;
import org.fudaa.ctulu.collection.CtuluCollection;
-import org.fudaa.ctulu.editor.CtuluValueEditorDefaults;
+import org.fudaa.ctulu.editor.CtuluValueEditorDouble;
import org.fudaa.ctulu.editor.CtuluValueEditorI;
import org.fudaa.ctulu.gis.GISAttributeInterface;
import org.fudaa.ctulu.gis.GISAttributeModel;
@@ -37,8 +35,14 @@
import org.fudaa.ctulu.gui.CtuluValuesMultiEditorPanel;
import org.fudaa.ctulu.gui.CtuluValuesParameters;
import org.fudaa.ctulu.gui.CtuluValuesParametersDefault;
+import org.fudaa.ebli.commun.EbliCoordinateDefinition;
import org.fudaa.ebli.commun.EbliLib;
+import com.memoire.bu.BuButton;
+import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuResource;
+import com.memoire.bu.BuVerticalLayout;
+
/**
* Un editeur pour les g\xE9om\xE9tries d'un calque. Permet l'\xE9dition des g\xE9om\xE9tries et leur reordonnancement.
*
@@ -55,7 +59,7 @@
* True : Seules les g\xE9om\xE9tries s\xE9lectionn\xE9es sont prisent en compte
*/
private boolean isFiltered_ = true;
- private GISZoneCollection zone_;
+ private ZModeleEditable model_;
/**
* Indice de zone vers sortable row
*/
@@ -113,13 +117,13 @@
}
/**
- * @param _zone La collection des g\xE9om\xE9tries.
+ * @param _model Le mod\xE8le \xE9ditable.
* @param _idx Les indices selectionn\xE9s.
*/
- public EbliObjetsMultiEditorPanel(GISZoneCollection _zone, final int[] _idx) {
- super(buildParams(_zone, _idx));
+ public EbliObjetsMultiEditorPanel(ZModeleEditable _model, final int[] _idx, EbliCoordinateDefinition[] _coordDefs) {
+ super(buildParams(_model.getGeomData(), _idx, _coordDefs));
- zone_ = _zone;
+ model_ = _model;
idxInitMdlSel_ = _idx;
for (Row row : rows_) {
@@ -138,7 +142,7 @@
* @param _idx Les indices selectionn\xE9s
* @return Les param\xE8tres.
*/
- private static CtuluValuesParameters buildParams(final GISZoneCollection _zone, final int[] _idx) {
+ private static CtuluValuesParameters buildParams(final GISZoneCollection _zone, final int[] _idx, EbliCoordinateDefinition[] _coordDefs) {
CtuluValuesParametersDefault params = new CtuluValuesParametersDefault();
final List<String> names = new ArrayList<String>(_zone.getNbAttributes() + 2);
@@ -149,10 +153,16 @@
if (_zone instanceof GISZoneCollectionPoint) {
GISZoneCollectionPoint ptZone = (GISZoneCollectionPoint) _zone;
- names.add("X");
- names.add("Y");
- editor.add(CtuluValueEditorDefaults.DOUBLE_EDITOR);
- editor.add(CtuluValueEditorDefaults.DOUBLE_EDITOR);
+ names.add(_coordDefs[0].getName());
+ names.add(_coordDefs[1].getName());
+ CtuluValueEditorDouble coordEditor;
+ // Editeurs X,Y respectent le formattage.
+ coordEditor=new CtuluValueEditorDouble();
+ coordEditor.setFormatter(_coordDefs[0].getFormatter().getXYFormatter());
+ editor.add(coordEditor);
+ coordEditor=new CtuluValueEditorDouble();
+ coordEditor.setFormatter(_coordDefs[1].getFormatter().getXYFormatter());
+ editor.add(coordEditor);
model.add(ptZone.createEditForX());
model.add(ptZone.createEditForY());
for (int i = 0; i < ptZone.getNbAttributes(); i++) {
@@ -200,8 +210,10 @@
* Construit les comparateurs pour chaque colonne.
*/
private void buildComparators() {
+ GISZoneCollection zone=model_.getGeomData();
+
// Pour une collection de points
- if (zone_ instanceof GISZoneCollectionPoint) {
+ if (zone instanceof GISZoneCollectionPoint) {
// Comparateur pour X
comparators_.add(new ValueRowComparator(comparators_.size(), new Comparator<Double>() {
@@ -219,8 +231,8 @@
}
}));
// Les autres comparateurs
- for (int i = 0; i < zone_.getNbAttributes(); i++) {
- final GISAttributeInterface att = zone_.getAttribute(i);
+ for (int i = 0; i < zone.getNbAttributes(); i++) {
+ final GISAttributeInterface att = zone.getAttribute(i);
// FIXME BM: G\xE9rer attribut non visible.
if (att.isEditable() && att.isUserVisible()) {
comparators_.add(new ValueRowComparator(comparators_.size(), att.getComparator()));
@@ -228,8 +240,8 @@
}
} // Pour toute autre liste
else {
- for (int i = 0; i < zone_.getNbAttributes(); i++) {
- final GISAttributeInterface att = zone_.getAttribute(i);
+ for (int i = 0; i < zone.getNbAttributes(); i++) {
+ final GISAttributeInterface att = zone.getAttribute(i);
// FIXME BM: G\xE9rer attribut non visible.
if (!att.isAtomicValue() && att.isEditable() && att.isUserVisible()) {
comparators_.add(new ValueRowComparator(comparators_.size(), att.getComparator()));
@@ -512,7 +524,7 @@
// Les lignes ont \xE9t\xE9 d\xE9plac\xE9es => Il faut d\xE9placer aussi les g\xE9om\xE9tries dans la collection.
if (initInd != irow) {
// Les g\xE9om\xE9tries sont switch\xE9es, les index initiaux aussi.
- zone_.switchGeometries(irow, initInd, cmp);
+ model_.getGeomData().switchGeometries(irow, initInd, cmp);
// Les index initiaux aussi
for (int i = irow + 1; i < rows_.size(); i++) {
SortableRow row = (SortableRow) rows_.get(i);
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java 2015-04-20 13:41:08 UTC (rev 9116)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java 2015-04-21 15:36:56 UTC (rev 9117)
@@ -7,13 +7,13 @@
*/
package org.fudaa.ebli.calque.edition;
-import com.memoire.fu.FuLog;
-import com.vividsolutions.jts.geom.Geometry;
import gnu.trove.TObjectIntHashMap;
+
import java.awt.Color;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
+
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluCommandComposite;
@@ -43,6 +43,9 @@
import org.fudaa.ebli.trace.TraceIcon;
import org.nfunk.jep.Variable;
+import com.memoire.fu.FuLog;
+import com.vividsolutions.jts.geom.Geometry;
+
/**
* @author Fred Deniger
* @version $Id$
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java 2015-04-20 13:41:08 UTC (rev 9116)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java 2015-04-21 15:36:56 UTC (rev 9117)
@@ -848,8 +848,8 @@
editSingleObject(calque);
} else {
// Plusieurs g\xE9om\xE9tries sont \xE0 \xE9diter
- EbliObjetsEditorPanel pn = new EbliObjetsEditorPanel(calque.getModelEditable().getGeomData(),
- calque.getLayerSelection().getSelectedIndex(), getMng());
+ EbliObjetsEditorPanel pn = new EbliObjetsEditorPanel(calque.getModelEditable(),
+ calque.getLayerSelection().getSelectedIndex(), getMng(), getCoordinateDefinitions());
// if (calque.getModelEditable().getGeomData() instanceof GISZoneCollectionPoint)
// pn=GISGuiBuilder.buildFor((GISZoneCollectionPoint)calque.getModelEditable().getGeomData(), calque.getLayerSelection()
// .getSelectedIndex(), getMng());
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModelePointEditable.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModelePointEditable.java 2015-04-20 13:41:08 UTC (rev 9116)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModelePointEditable.java 2015-04-21 15:36:56 UTC (rev 9117)
@@ -255,6 +255,7 @@
_d.put(EbliLib.getS("Nombre de points"), CtuluLibString.getString(getNombre()));
final int nb = _layer.isSelectionEmpty() ? 0 : _layer.getLayerSelection().getNbSelectedIndex();
_d.put(EbliLib.getS("Nombre de points s\xE9lectionn\xE9s"), CtuluLibString.getString(nb));
+ // 2 points
if (nb == 2) {
final int i = _layer.getLayerSelection().getMaxIndex();
final int i2 = _layer.getLayerSelection().getMinIndex();
@@ -262,9 +263,13 @@
CtuluLib.DEFAULT_NUMBER_FORMAT.format(CtuluLibGeometrie.getDistance(getX(i), getY(i), getX(i2), getY(i2))));
return;
}
+ // Plusieurs points
if (nb != 1) {
return;
}
+ // 1 point
+ _d.put("X", ""+getX(_layer.getLayerSelection().getMaxIndex()));
+ _d.put("Y", ""+getY(_layer.getLayerSelection().getMaxIndex()));
final int idxNode = _layer.getLayerSelection().getMaxIndex();
_d.setTitle(EbliLib.getS("Point {0}", CtuluLibString.getString(idxNode + 1)));
final GISZoneCollection model = getGeomData();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-04-23 10:34:19
|
Revision: 9120
http://sourceforge.net/p/fudaa/svn/9120
Author: bmarchan
Date: 2015-04-23 10:34:12 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
ebli-graphe-3D : Traduction par defaut dans EbliResource
Modified Paths:
--------------
trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
trunk/framework/ebli-graphe-3D/src/main/java/org/fudaa/ebli/graphe3D/ui/panel/EG3dBtnPanel.java
Property Changed:
----------------
trunk/framework/ebli-network/
Modified: trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
===================================================================
--- trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2015-04-21 21:34:11 UTC (rev 9119)
+++ trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2015-04-23 10:34:12 UTC (rev 9120)
@@ -890,4 +890,20 @@
D\xE9cimation\: {0} point(s) enlev\xE9(s)=Decimation\: {0} point(s) removed
{0} objet(s) d\xE9plac\xE9(s)={0} object{s) moved
Ajouter un sommet=Add a vertex
-{0} obj. s\xE9lect.={0} selected obj.
\ No newline at end of file
+{0} obj. s\xE9lect.={0} selected obj.
+Redimensionner=Resize
+Afficher les extr\xE9mit\xE9s=Show boxe's lines
+Afficher les axes X et Y=Display x and y axis
+Afficher la grille= Display grid
+Afficher l'axe Z=Display Z axis
+Voir le maillage=Display the meshing
+Mode cach\xE9=Hidden mode
+Mode spectre=Spectrum mode
+Nuance de gris=Gray shade
+Nuance= Shade
+Mode Fog=Fog mode
+Type Wireframe=Wireframe type
+Type Surface=Surface type
+Type Nuage de points=Points fog type
+Mode contour=Contour mode
+Mode densit\xE9=Density mode
Modified: trunk/framework/ebli-graphe-3D/src/main/java/org/fudaa/ebli/graphe3D/ui/panel/EG3dBtnPanel.java
===================================================================
--- trunk/framework/ebli-graphe-3D/src/main/java/org/fudaa/ebli/graphe3D/ui/panel/EG3dBtnPanel.java 2015-04-21 21:34:11 UTC (rev 9119)
+++ trunk/framework/ebli-graphe-3D/src/main/java/org/fudaa/ebli/graphe3D/ui/panel/EG3dBtnPanel.java 2015-04-23 10:34:12 UTC (rev 9120)
@@ -19,6 +19,7 @@
import org.fudaa.ebli.graphe3D.data.EG3dSurfaceModel.PlotType;
import org.fudaa.ebli.graphe3D.renderer.EG3dDefaultDataRenderer;
import org.fudaa.ebli.graphe3D.ui.EG3dScrollablePanel;
+import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.ebli.trace.TraceLigne;
import com.memoire.bu.BuResource;
@@ -359,7 +360,8 @@
buttonGroup2.add(surfaceType);
buttonGroup2.add(contourType);
buttonGroup2.add(densityType);
- translate(BuResource.BU);
+ // Par defaut, la traduction est dans le fichier de traduction Ebli.
+ translate(EbliResource.EBLI);
}
Index: trunk/framework/ebli-network
===================================================================
--- trunk/framework/ebli-network 2015-04-21 21:34:11 UTC (rev 9119)
+++ trunk/framework/ebli-network 2015-04-23 10:34:12 UTC (rev 9120)
Property changes on: trunk/framework/ebli-network
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,4 ##
+.classpath
+.project
+target
+.settings
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-04-23 12:50:45
|
Revision: 9122
http://sourceforge.net/p/fudaa/svn/9122
Author: bmarchan
Date: 2015-04-23 12:50:42 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
Message de conditions pour certaines actions de modification
Modified Paths:
--------------
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneDeplacementAction.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneRotationAction.java
trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneDeplacementAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneDeplacementAction.java 2015-04-23 10:34:56 UTC (rev 9121)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneDeplacementAction.java 2015-04-23 12:50:42 UTC (rev 9122)
@@ -9,8 +9,10 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+
import javax.swing.event.InternalFrameEvent;
import javax.swing.tree.TreeSelectionModel;
+
import org.fudaa.ebli.calque.ZEbliCalquesPanel;
import org.fudaa.ebli.calque.edition.BPaletteDeplacement;
import org.fudaa.ebli.calque.edition.ZCalqueDeplacementInteraction;
@@ -115,4 +117,14 @@
if (cqDep_!=null)
pnCalques_.setCalqueSelectionActif();
}
+
+ @Override
+ public String getEnableCondition() {
+ if (sceneEditor_!=null && sceneEditor_.getScene().isRestrictedToCalqueActif()) {
+ return EbliLib.getS("Un calque \xE9ditable doit \xEAtre selectionn\xE9");
+ }
+ else {
+ return super.getEnableCondition();
+ }
+ }
}
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneRotationAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneRotationAction.java 2015-04-23 10:34:56 UTC (rev 9121)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneRotationAction.java 2015-04-23 12:50:42 UTC (rev 9122)
@@ -8,6 +8,7 @@
package org.fudaa.ebli.calque.action;
import javax.swing.tree.TreeSelectionModel;
+
import org.fudaa.ebli.calque.edition.BPaletteRotation;
import org.fudaa.ebli.calque.edition.ZCalqueEditable;
import org.fudaa.ebli.calque.edition.ZEditorInterface;
@@ -61,4 +62,14 @@
protected BPalettePanelInterface buildPaletteContent() {
return new BPaletteRotation(sceneEditor_,formatter_);
}
+
+ @Override
+ public String getEnableCondition() {
+ if (sceneEditor_!=null && sceneEditor_.getScene().isRestrictedToCalqueActif()) {
+ return EbliLib.getS("Un calque \xE9ditable doit \xEAtre selectionn\xE9");
+ }
+ else {
+ return super.getEnableCondition();
+ }
+ }
}
Modified: trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
===================================================================
--- trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2015-04-23 10:34:56 UTC (rev 9121)
+++ trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2015-04-23 12:50:42 UTC (rev 9122)
@@ -907,3 +907,4 @@
Type Nuage de points=Points fog type
Mode contour=Contour mode
Mode densit\xE9=Density mode
+Un calque \xE9ditable doit \xEAtre selectionn\xE9=An editable layer must be selected
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-09-10 16:56:05
|
Revision: 9165
http://sourceforge.net/p/fudaa/svn/9165
Author: deniger
Date: 2015-09-10 16:56:03 +0000 (Thu, 10 Sep 2015)
Log Message:
-----------
CRUE-657
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbeSimple.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComponentFactory.java
Added Paths:
-----------
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliBasicComponentFactory.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComposedIcon.java
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbeSimple.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbeSimple.java 2015-09-10 14:41:11 UTC (rev 9164)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbeSimple.java 2015-09-10 16:56:03 UTC (rev 9165)
@@ -36,7 +36,7 @@
super.fillWithInfo(_table, _selectedPt);
final String pre = EbliLib.getS("Axe vertical:") + CtuluLibString.ESPACE;
final EGAxeVertical axe = getAxeY();
- if (_table != null) {
+ if (_table != null && axe != null) {
_table.put(pre + EbliLib.getS("Borne min"), axe.getStringAffiche(axe.getMinimum()));
_table.put(pre + EbliLib.getS("Borne max"), axe.getStringAffiche(axe.getMaximum()));
}
Added: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliBasicComponentFactory.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliBasicComponentFactory.java (rev 0)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliBasicComponentFactory.java 2015-09-10 16:56:03 UTC (rev 9165)
@@ -0,0 +1,53 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ebli.commun;
+
+import com.memoire.bu.BuButton;
+import com.memoire.bu.BuCheckBoxMenuItem;
+import com.memoire.bu.BuMenuItem;
+import com.memoire.bu.BuToggleButton;
+import javax.swing.AbstractButton;
+import javax.swing.JCheckBox;
+import javax.swing.JMenuItem;
+import javax.swing.JToggleButton;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class EbliBasicComponentFactory {
+
+ public AbstractButton createButton() {
+ return new BuButton();
+ }
+
+ public AbstractButton createToggleButton() {
+ return new BuToggleButton();
+ }
+
+ public JMenuItem createCheckBoxMenuItem() {
+ return new BuCheckBoxMenuItem();
+ }
+
+ public JMenuItem createMenuItem() {
+ return new BuMenuItem();
+ }
+
+ public AbstractButton createToolToggleButton() {
+ return new BuToggleButton();
+ }
+
+ public AbstractButton createCheckBox() {
+ return new JCheckBox();
+ }
+
+ public AbstractButton createPaletteButton(EbliActionPaletteAbstract _a) {
+ return new EbliPaletteButton(_a);
+ }
+
+ public AbstractButton createToolButton(EbliActionSimple _a) {
+ return new EbliButtonTool(_a);
+ }
+
+}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComponentFactory.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComponentFactory.java 2015-09-10 14:41:11 UTC (rev 9164)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComponentFactory.java 2015-09-10 16:56:03 UTC (rev 9165)
@@ -10,18 +10,11 @@
package org.fudaa.ebli.commun;
import javax.swing.AbstractButton;
-import javax.swing.JCheckBox;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.JToggleButton;
-import com.memoire.bu.BuButton;
-import com.memoire.bu.BuCheckBoxMenuItem;
-import com.memoire.bu.BuColorIcon;
-import com.memoire.bu.BuComposedIcon;
-import com.memoire.bu.BuMenuItem;
-import com.memoire.bu.BuToggleButton;
import java.awt.Color;
/**
@@ -29,11 +22,13 @@
* @version $Id: EbliComponentFactory.java,v 1.12 2006-09-19 14:55:55 deniger Exp $
*/
public final class EbliComponentFactory {
-
+
public final static EbliComponentFactory INSTANCE = new EbliComponentFactory();
-
+
private Color useSelectedIcon;
+ EbliBasicComponentFactory componentFactory = new EbliBasicComponentFactory();
+
/**
*
*/
@@ -41,6 +36,14 @@
super();
}
+ public EbliBasicComponentFactory getComponentFactory() {
+ return componentFactory;
+ }
+
+ public void setComponentFactory(EbliBasicComponentFactory componentFactory) {
+ this.componentFactory = componentFactory;
+ }
+
public Color getUseSelectedIcon() {
return useSelectedIcon;
}
@@ -54,7 +57,7 @@
_r.setSelected(_a.isSelected());
_a.addPropertyChangeListener(new EbliSelectedChangeListener(_r));
}
-
+
public void addActionsToMenu(final EbliActionInterface[] _acs, final JMenu _dest) {
if ((_acs != null) && (_dest != null)) {
final int n = _acs.length;
@@ -68,7 +71,7 @@
}
}
}
-
+
public void addActionsToMenu(final EbliActionInterface[] _acs, final JPopupMenu _dest) {
if ((_acs != null) && (_dest != null)) {
final int n = _acs.length;
@@ -82,63 +85,63 @@
}
}
}
-
+
public AbstractButton buildButton(final EbliActionChangeState _a) {
- final JToggleButton r = new BuToggleButton();
+ final AbstractButton r = componentFactory.createToggleButton();
decoreStateButton(r, _a);
- if (useSelectedIcon != null && _a.getIcon() != null) {
- BuComposedIcon selectedIcon = new BuComposedIcon(_a.getIcon(), new BuColorIcon(useSelectedIcon));
- r.setSelectedIcon(selectedIcon);
- }
return r;
}
-
+
public AbstractButton buildButton(final EbliActionSimple _a) {
- final AbstractButton r = new BuButton();
+ final AbstractButton r = componentFactory.createButton();
r.setAction(_a);
return r;
}
-
+
public JMenuItem buildMenuItem(final EbliActionChangeState _a) {
- final BuCheckBoxMenuItem r = new BuCheckBoxMenuItem();
+ final JMenuItem r = componentFactory.createCheckBoxMenuItem();
decoreStateButton(r, _a);
return r;
}
-
+
public JMenuItem buildMenuItem(final EbliActionSimple _a) {
- final JMenuItem r = new BuMenuItem();
+ final JMenuItem r = componentFactory.createMenuItem();
r.setAction(_a);
return r;
}
-
+
public AbstractButton buildToolButton(final EbliActionChangeState _a) {
- final AbstractButton r = new BuToggleButton();
+ final AbstractButton r = componentFactory.createToolToggleButton();
decoreStateButton(r, _a);
decoreToolBarButton(r);
+ if (useSelectedIcon != null && _a.getIcon() != null) {
+ EbliComposedIcon selectedIcon = new EbliComposedIcon(useSelectedIcon, _a.getIcon());
+ r.setSelectedIcon(selectedIcon);
+ }
return r;
}
-
+
public AbstractButton buildCheckBox(final EbliActionChangeState _a) {
- final AbstractButton r = new JCheckBox();
+ final AbstractButton r = componentFactory.createCheckBox();
decoreStateButton(r, _a);
decoreToolBarButton(r);
r.setText(_a.getTitle());
return r;
}
-
+
public AbstractButton buildToolButton(final EbliActionPaletteAbstract _a) {
- final AbstractButton r = new EbliPaletteButton(_a);
+ final AbstractButton r = componentFactory.createPaletteButton(_a);
decoreStateButton(r, _a);
decoreToolBarButton(r);
return r;
}
-
+
public AbstractButton buildToolButton(final EbliActionSimple _a) {
- final AbstractButton r = new EbliButtonTool(_a);
+ final AbstractButton r = componentFactory.createToolButton(_a);
decoreToolBarButton(r);
return r;
}
-
+
public void decoreToolBarButton(final AbstractButton _r) {
_r.setText("");
_r.setRolloverEnabled(true);
Added: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComposedIcon.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComposedIcon.java (rev 0)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComposedIcon.java 2015-09-10 16:56:03 UTC (rev 9165)
@@ -0,0 +1,56 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ebli.commun;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import javax.swing.Icon;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class EbliComposedIcon implements Icon {
+
+ private Color background;
+ private Icon icon;
+
+ public EbliComposedIcon(Color background, Icon icon) {
+ this.background = background;
+ this.icon = icon;
+ }
+
+ public Color getBackground() {
+ return background;
+ }
+
+ public void setBackground(Color background) {
+ this.background = background;
+ }
+
+ public Icon getIcon() {
+ return icon;
+ }
+
+ public void setIcon(Icon icon) {
+ this.icon = icon;
+ }
+
+
+ public void paintIcon(Component c, Graphics g, int x, int y) {
+ g.setColor(background);
+ g.fillRect(x, y, icon.getIconWidth(), icon.getIconHeight());
+ icon.paintIcon(c, g, x, y);
+ }
+
+ public int getIconWidth() {
+ return icon.getIconWidth();
+ }
+
+ public int getIconHeight() {
+ return icon.getIconHeight();
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-09-17 23:41:21
|
Revision: 9170
http://sourceforge.net/p/fudaa/svn/9170
Author: deniger
Date: 2015-09-17 23:41:19 +0000 (Thu, 17 Sep 2015)
Log Message:
-----------
CRUE-662
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java
trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
Added Paths:
-----------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCsvFileImporter.java
Added: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCsvFileImporter.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCsvFileImporter.java (rev 0)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCsvFileImporter.java 2015-09-17 23:41:19 UTC (rev 9170)
@@ -0,0 +1,47 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ebli.courbe;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import javax.swing.JFileChooser;
+import org.fudaa.ctulu.gui.CtuluFileChooserCsvExcel;
+import org.fudaa.ctulu.table.CtuluExcelCsvFileReader;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class EGCsvFileImporter {
+
+ private final EGTableGraphePanel panel;
+
+ EGCsvFileImporter(EGTableGraphePanel aThis) {
+ this.panel = aThis;
+ }
+
+ void importCsv() {
+ final CtuluFileChooserCsvExcel choose = new CtuluFileChooserCsvExcel(panel);
+ choose.setDialogType(JFileChooser.OPEN_DIALOG);
+ choose.setTester(null);
+ final File f = choose.getDestFile();
+ if (f == null) {
+ return;
+ }
+ final String[][] values = new CtuluExcelCsvFileReader(f).readFile();
+ if (values == null) {
+ return;
+ }
+ panel.t_.deleteAllValues();
+ panel.t_.clearSelection();
+ ArrayList tab = new ArrayList(values.length);
+ for (int i = 0; i < values.length; i++) {
+ String[] value = values[i];
+ tab.add(Arrays.asList(value));
+ }
+ panel.t_.insertTableInTable(tab);
+ }
+
+}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java 2015-09-17 23:40:54 UTC (rev 9169)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java 2015-09-17 23:41:19 UTC (rev 9170)
@@ -208,6 +208,7 @@
EGGraphe a_;
BuToolButton btAdd_;
BuToolButton btCopy_;
+ BuToolButton btImport_;
BuToolButton btAlign_;
BuToolButton btRemove_;
BuLabel lb_;
@@ -313,6 +314,19 @@
}
}
+ public void deleteAllValues() {
+ final EGTableModel model = (EGTableModel) getModel();
+ if (!model.isModelXModifiable()) {
+ return;
+ }
+ final int[] row = new int[model.getRowCount()];
+ for (int i = 0; i < row.length; i++) {
+ row[i] = i;
+ }
+ // on ne peut pas tout enlever
+ model.c_.getModel().removeValue(row, model.a_.getCmd());
+ }
+
private void addValuesInModel(final List _tab, final EGTableModel _model, final CtuluDoubleParser _doubleParser,
final CtuluCommandComposite _cmp, final int _maxUpdate) {
final int nbLine = _tab.size();
@@ -551,14 +565,14 @@
txt.setColumns(10);
t_
.setDefaultEditor(Double.class, new BuTableCellEditor(txt) {
- @Override
- public boolean isCellEditable(final EventObject _evt) {
- if (_evt instanceof MouseEvent) {
- return ((MouseEvent) _evt).getClickCount() >= 2;
- }
- return true;
- }
- });
+ @Override
+ public boolean isCellEditable(final EventObject _evt) {
+ if (_evt instanceof MouseEvent) {
+ return ((MouseEvent) _evt).getClickCount() >= 2;
+ }
+ return true;
+ }
+ });
t_.setModel(createValuesTableModel());
t_.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
@@ -611,6 +625,9 @@
if (btCopy_ != null) {
btCopy_.setEnabled(modifiable && c.getModel().isXModifiable());
}
+ if (btImport_ != null) {
+ btImport_.setEnabled(modifiable && c.getModel().isXModifiable());
+ }
if (btAdd_ != null) {
btAdd_.setEnabled(modifiable && c.getModel().isXModifiable()
&& selection_.getSelection() != null && selection_.getSelection().getNbSelectedIndex() >= 2);
@@ -693,6 +710,11 @@
protected void tablePaste() {
t_.paste();
}
+
+ protected void tableImport() {
+ new EGCsvFileImporter(this).importCsv();
+ }
+
EbliActionSimple actionDelete;
public EbliActionSimple getActionDelete() {
@@ -701,9 +723,6 @@
}
return actionDelete;
-
-
-
}
public class DeleteAction extends EbliActionSimple {
@@ -767,6 +786,19 @@
}
});
+ btImport_ = new BuToolButton();
+ btImport_.setIcon(EbliResource.EBLI.getToolIcon("crystal_importer"));
+ btImport_.setMargin(zeroInset);
+ btImport_.setActionCommand("IMPORT");
+ btImport_.setToolTipText("<html>" + EbliLib.getS("Importer depuis un fichier Excel/csv") + "<br><b>" + EbliLib.getS(
+ "Toutes les valeurs actuelles seront remplac\xE9es"));
+ btImport_.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ EGTableGraphePanel.this.tableImport();
+ }
+ });
+
btRemove_ = new BuToolButton();
btRemove_.setMargin(zeroInset);
btRemove_.setIcon(EbliResource.EBLI.getToolIcon("node-delete"));
@@ -792,6 +824,7 @@
pnBt.setLayout(new BuButtonLayout(1, SwingConstants.LEFT));
if (addPasteButtons) {
pnBt.add(btCopy_);
+ pnBt.add(btImport_);
}
if (addTopButtons) {
pnBt.add(btAdd_);
@@ -822,6 +855,7 @@
public void removeEditButtons() {
removeEditButtonsButCopy();
removeButton(btCopy_);
+ removeButton(btImport_);
}
public void removeEditButtonsButCopy() {
@@ -840,7 +874,8 @@
@Override
public void axeContentChanged(final EGAxe _c) {
- (getSpecTableModel()).fireTableChanged(new TableModelEvent(getSpecTableModel(), 0, getSpecTableModel().getRowCount() - 1, TableModelEvent.ALL_COLUMNS, TableModelEvent.UPDATE));
+ (getSpecTableModel()).fireTableChanged(new TableModelEvent(getSpecTableModel(), 0, getSpecTableModel().getRowCount() - 1,
+ TableModelEvent.ALL_COLUMNS, TableModelEvent.UPDATE));
repaint();
}
Modified: trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
===================================================================
--- trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2015-09-17 23:40:54 UTC (rev 9169)
+++ trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2015-09-17 23:41:19 UTC (rev 9170)
@@ -23,6 +23,8 @@
Choix couleur contour=Foreground color
Choix couleur de fond=Background color
Coller une s\xE9rie de valeurs depuis le presse-papier=Copy a list of value from the clipboard
+Importer depuis un fichier Excel/csv=Import values form Excel/Csv file
+Toutes les valeurs actuelles seront remplac\xE9es=All current values will be replaced
Police=Font
Choisir=Choose
Transparence=Transparency
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-09-22 22:09:21
|
Revision: 9174
http://sourceforge.net/p/fudaa/svn/9174
Author: deniger
Date: 2015-09-22 22:09:19 +0000 (Tue, 22 Sep 2015)
Log Message:
-----------
CRUE-662
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLibArray.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTable.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java
Added Paths:
-----------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableExportInterface.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableModelUpdatable.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLibArray.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLibArray.java 2015-09-17 23:44:40 UTC (rev 9173)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLibArray.java 2015-09-22 22:09:19 UTC (rev 9174)
@@ -26,6 +26,8 @@
import javax.swing.ListSelectionModel;
import com.memoire.fu.FuEmptyArrays;
+import java.util.HashMap;
+import java.util.Map;
/**
* Des methodes statiques concernant les tableaux.
@@ -896,6 +898,17 @@
return -1;
}
+ public static <T extends ToStringTransformable> Map<String, T> toMapOfString(Collection<T> in) {
+ HashMap<String, T> res = new HashMap<String, T>();
+ if (in == null) {
+ return res;
+ }
+ for (T t : in) {
+ res.put(t.getAsString(), t);
+ }
+ return res;
+ }
+
/**
* Transpose un tableau de double \xE0 2 dimensions.
*
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTable.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTable.java 2015-09-17 23:44:40 UTC (rev 9173)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTable.java 2015-09-22 22:09:19 UTC (rev 9174)
@@ -361,6 +361,12 @@
selectedColumm = 0;
selectedRow = 0;
}
+ if (selectedColumm == 0 && getModel() instanceof CtuluTableExportInterface) {
+ int modelIndex = getColumnModel().getColumn(0).getModelIndex();
+ if (!((CtuluTableExportInterface) getModel()).isColumnExportable(modelIndex)) {
+ selectedColumm = 1;
+ }
+ }
for (int i = 0; i < _tab.size(); i++) {
if ((i + selectedRow) < numberRow) {
Added: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableExportInterface.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableExportInterface.java (rev 0)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableExportInterface.java 2015-09-22 22:09:19 UTC (rev 9174)
@@ -0,0 +1,14 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ctulu.table;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public interface CtuluTableExportInterface {
+
+ boolean isColumnExportable(int colModel);
+
+}
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java 2015-09-17 23:44:40 UTC (rev 9173)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java 2015-09-22 22:09:19 UTC (rev 9174)
@@ -18,6 +18,7 @@
import com.memoire.bu.BuPreferences;
import com.memoire.bu.BuRadioButton;
import com.memoire.bu.BuScrollPane;
+import gnu.trove.TIntArrayList;
import java.awt.Cursor;
import java.awt.Window;
import java.awt.event.ItemEvent;
@@ -30,6 +31,7 @@
import javax.swing.JList;
import javax.swing.JTable;
import javax.swing.ListSelectionModel;
+import javax.swing.table.TableColumn;
import org.fudaa.ctulu.CsvWriter;
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibString;
@@ -39,6 +41,7 @@
import org.fudaa.ctulu.gui.CtuluFileChooserCsvExcel.TypeChoosen;
import org.fudaa.ctulu.table.CtuluTableCsvWriter;
import org.fudaa.ctulu.table.CtuluTableExcelWriter;
+import org.fudaa.ctulu.table.CtuluTableExportInterface;
import org.fudaa.ctulu.table.CtuluTableModelDefault;
import org.fudaa.ctulu.table.CtuluTableModelInterface;
import org.fudaa.ctulu.table.CtuluTableXlsxWriter;
@@ -82,7 +85,6 @@
public static void doExport(final JTable _t, final CtuluUI _ui, final Window _f) {
doExport(DEFAULT_SEPARATOR, _t, _ui, _f);
}
-
public static void doExport(final char separator, final JTable _t, final CtuluUI _ui, final Window _f) {
final CtuluFileChooserCsvExcel choose = new CtuluFileChooserCsvExcel(_ui);
final File f = choose.getDestFile();
@@ -109,15 +111,31 @@
ui_ = _ui;
choosenType_ = type;
cbModel_ = new BuList();
+ final TIntArrayList exportableColumns = new TIntArrayList();
+ CtuluTableExportInterface exportInterface = null;
+ if (table_.getModel() instanceof CtuluTableExportInterface) {
+ exportInterface = (CtuluTableExportInterface) table_.getModel();
+ }
+
+ for (int i = 0; i < table_.getColumnCount(); i++) {
+ final TableColumn column = table_.getColumnModel().getColumn(i);
+ boolean toAdd = true;
+ if (exportInterface != null) {
+ toAdd = exportInterface.isColumnExportable(column.getModelIndex());
+ }
+ if (toAdd) {
+ exportableColumns.add(i);
+ }
+ }
cbModel_.setModel(new AbstractListModel() {
@Override
public Object getElementAt(final int _index) {
- return table_.getColumnName(_index);
+ return table_.getColumnName(exportableColumns.get(_index));
}
@Override
public int getSize() {
- return table_.getColumnCount();
+ return exportableColumns.size();
}
});
final ButtonGroup bg = new ButtonGroup();
@@ -185,6 +203,29 @@
}
}
final BuGlassPaneStop s = new BuGlassPaneStop();
+ //on enleve les colonnes non exportables
+ if (table_.getModel() instanceof CtuluTableExportInterface) {
+ CtuluTableExportInterface exportInterface = (CtuluTableExportInterface) table_.getModel();
+ final TIntArrayList toExport = new TIntArrayList();
+ if (col == null) {
+ for (int i = 0; i < table_.getColumnCount(); i++) {
+ final TableColumn column = table_.getColumnModel().getColumn(i);
+ boolean toAdd = exportInterface.isColumnExportable(column.getModelIndex());
+ if (toAdd) {
+ toExport.add(i);
+ }
+ }
+ } else {
+ for (int i = 0; i < col.length; i++) {
+ final TableColumn column = table_.getColumnModel().getColumn(col[i]);
+ boolean toAdd = exportInterface.isColumnExportable(column.getModelIndex());
+ if (toAdd) {
+ toExport.add(i);
+ }
+ }
+ }
+ col = toExport.toNativeArray();
+ }
final int[] colToWrite = col;
final int[] rowToWrite = row;
parentDial_.setGlassPane(s);
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java 2015-09-17 23:44:40 UTC (rev 9173)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java 2015-09-22 22:09:19 UTC (rev 9174)
@@ -40,6 +40,7 @@
import org.fudaa.ctulu.gui.CtuluLibSwing;
import org.fudaa.ctulu.gui.CtuluSelectionListTableModelUpdater;
import org.fudaa.ctulu.table.CtuluTable;
+import org.fudaa.ctulu.table.CtuluTableExportInterface;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.ressource.EbliResource;
@@ -60,7 +61,7 @@
public static class SpecTableModel extends EGTableModel {
- private EGTableGraphePanel graphePanel;
+ protected final EGTableGraphePanel graphePanel;
Double newX_;
Double newY_;
@@ -284,6 +285,12 @@
int selectedColumm = getSelectedColumn();
int selectedRow = getSelectedRow();
final CtuluDoubleParser doubleParser = new CtuluDoubleParser();
+ if (selectedColumm <= 0 && getModel() instanceof CtuluTableExportInterface) {
+ int modelIndex = getColumnModel().getColumn(0).getModelIndex();
+ if (!((CtuluTableExportInterface) getModel()).isColumnExportable(modelIndex)) {
+ selectedColumm = 1;
+ }
+ }
final CtuluCommandComposite cmp = new CtuluCommandComposite();
if (selectedRow >= 0) {
@@ -379,6 +386,9 @@
private int updateLines(final List _tab, final EGTableModel _model, final int _selectedColumm,
final int _selectedRow, final CtuluDoubleParser _doubleParser, final CtuluCommandComposite _cmp) {
+ if (_model instanceof EGTableModelUpdatable) {
+ return ((EGTableModelUpdatable) _model).updateLines(_tab, _selectedColumm, _selectedRow, _doubleParser, _cmp);
+ }
final int nbLine = _tab.size();
final int maxUpdate = Math.min(nbLine, _model.c_.getModel().getNbValues() - _selectedRow);
for (int i = 0; i < maxUpdate; i++) {
Added: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableModelUpdatable.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableModelUpdatable.java (rev 0)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableModelUpdatable.java 2015-09-22 22:09:19 UTC (rev 9174)
@@ -0,0 +1,19 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ebli.courbe;
+
+import java.util.List;
+import org.fudaa.ctulu.CtuluCommandComposite;
+import org.fudaa.ctulu.CtuluDoubleParser;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public interface EGTableModelUpdatable {
+
+ int updateLines(final List _tab, final int _selectedColumm,
+ final int _selectedRow, final CtuluDoubleParser _doubleParser, final CtuluCommandComposite _cmp);
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-09-23 21:38:55
|
Revision: 9176
http://sourceforge.net/p/fudaa/svn/9176
Author: deniger
Date: 2015-09-23 21:38:52 +0000 (Wed, 23 Sep 2015)
Log Message:
-----------
CRUE-644
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluDialog.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCsvFileImporter.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableModel.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableModelUpdatable.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java
Added Paths:
-----------
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluDialogPreferences.java
Modified: trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt
===================================================================
--- trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt 2015-09-22 22:11:45 UTC (rev 9175)
+++ trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt 2015-09-23 21:38:52 UTC (rev 9176)
@@ -335,4 +335,8 @@
Restaurer la fen\xEAtre parente=Restore the parent window
Maximiser la fen\xEAtre parente=Maximize the parent window
Le contenu du fichier de g\xE9or\xE9f\xE9rencement n'est pas valide ( il doit contenir 6 lignes)=The content of the georeferencing file is not valid ( must contain 6 lines)
-La ligne {0} n'est pas valide et ne peut pas \xEAtre transform\xE9e en nombre=The line {0} is not valid and cannot be transformed to a number
\ No newline at end of file
+La ligne {0} n'est pas valide et ne peut pas \xEAtre transform\xE9e en nombre=The line {0} is not valid and cannot be transformed to a number
+S\xE9lection des donn\xE9es \xE0 exporter=Select data to export
+Export termin\xE9=Export finished
+Donn\xE9es export\xE9es dans le fichier\n {0}=Data exported in the file\n {0}
+Enregistrer sous=Save as
\ No newline at end of file
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluDialog.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluDialog.java 2015-09-22 22:11:45 UTC (rev 9175)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluDialog.java 2015-09-23 21:38:52 UTC (rev 9176)
@@ -136,6 +136,11 @@
afficheDialog(true, _r);
return response_;
}
+ public int afficheDialogModal(final boolean modify) {
+ setModal(true);
+ afficheDialog(modify, null);
+ return response_;
+ }
/**
* @param _loc le point en haut a gauche de la nouvelle fenetre
Added: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluDialogPreferences.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluDialogPreferences.java (rev 0)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluDialogPreferences.java 2015-09-23 21:38:52 UTC (rev 9176)
@@ -0,0 +1,354 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ctulu.gui;
+
+import com.memoire.bu.BuDesktop;
+import com.memoire.fu.FuPreferences;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.util.List;
+import java.util.Map;
+import java.util.prefs.Preferences;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+import javax.swing.table.TableColumn;
+import org.apache.commons.lang.StringUtils;
+import org.jdesktop.swingx.JXTable;
+import org.jdesktop.swingx.table.TableColumnExt;
+import org.jdesktop.swingx.table.TableColumnModelExt;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class CtuluDialogPreferences {
+
+ public static boolean isWindowMaximized(JFrame main) {
+ int extendedState = main.getExtendedState();
+ return isExtendedStateMaximized(extendedState);
+ }
+
+ public static boolean isExtendedStateMaximized(int extendedState) {
+ return (extendedState & Frame.MAXIMIZED_BOTH) == Frame.MAXIMIZED_BOTH;
+ }
+
+ public static void saveComponentLocationAndDimension(Component main, final Preferences preferences,
+ final String prefix) {
+ saveIn(main.getSize(), prefix, preferences);
+ saveIn(main.getLocation(), prefix, preferences);
+ }
+ public static void saveComponentLocationAndDimension(Component main, final FuPreferences preferences,
+ final String prefix) {
+ saveIn(main.getSize(), prefix, preferences);
+ saveIn(main.getLocation(), prefix, preferences);
+ }
+
+ public static void ensureJInternalFrameWillBeVisible(JInternalFrame main, BuDesktop parent) {
+ Point init = main.getLocation();
+ Dimension initDim = main.getSize();
+ int maxW = parent.getWidth();
+ int maxH = parent.getHeight();
+ int ifW = initDim.width;
+ int ifH = initDim.height;
+ ifW = Math.min(maxW, ifW);
+ ifH = Math.min(maxH, ifH);
+ int locX = Math.max(0, Math.min(init.x, maxW - ifW));
+ int locY = Math.max(0, Math.min(init.y, maxH - ifH));
+ Point newPt = new Point(locX, locY);
+ Dimension newDimension = new Dimension(ifW, ifH);
+ if (!newPt.equals(init) || newDimension.equals(initDim)) {
+ main.setLocation(newPt);
+ main.setSize(newDimension);
+ }
+ }
+
+ public static Point loadComponentLocationAndDimension(final Component window, final Preferences preferences,
+ final String mainWindow) {
+
+ final Dimension dim = loadDim(mainWindow, preferences);
+ if (dim != null) {
+ window.setPreferredSize(dim);
+ window.setSize(dim);
+ }
+ final Point loc = loadLocation(mainWindow, preferences);
+ if (loc != null) {
+ window.setLocation(loc);
+ }
+ return loc;
+ }
+ public static Point loadComponentLocationAndDimension(final Component window, final FuPreferences preferences,
+ final String mainWindow) {
+
+ final Dimension dim = loadDim(mainWindow, preferences);
+ if (dim != null) {
+ window.setPreferredSize(dim);
+ window.setSize(dim);
+ }
+ final Point loc = loadLocation(mainWindow, preferences);
+ if (loc != null) {
+ window.setLocation(loc);
+ }
+ return loc;
+ }
+
+ /**
+ * @param prefix le prefixe a utilser pour les cles
+ * @param parentDim
+ * @param pref les preferences a utiliser
+ * @return la dim lue ou null si non trouvee
+ */
+ public static Dimension loadRatioDim(final String prefix, final Dimension parentDim, final Preferences pref) {
+ final double w = pref.getDouble(prefix + ".ratio.w", -1d);
+ if (w <= 0) {
+ return null;
+ }
+ final double h = pref.getDouble(prefix + ".ratio.h", -1d);
+ if (h <= 0) {
+ return null;
+ }
+ return new Dimension((int) (w * parentDim.width), (int) (h * parentDim.height));
+ }
+
+ /**
+ * @param prefix le prefixe a utilser pour les cles
+ * @param pref les preferences a utiliser
+ * @return le point lu ou null si non trouve
+ */
+ public static Point loadLocation(final String prefix, final Preferences pref) {
+ final int x = pref.getInt(prefix + ".x", -1);
+ if (x < 0) {
+ return null;
+ }
+ final int y = pref.getInt(prefix + ".y", -1);
+ if (y < 0) {
+ return null;
+ }
+ return new Point(x, y);
+ }
+ public static Point loadLocation(final String prefix, final FuPreferences pref) {
+ final int x = pref.getIntegerProperty(prefix + ".x", -1);
+ if (x < 0) {
+ return null;
+ }
+ final int y = pref.getIntegerProperty(prefix + ".y", -1);
+ if (y < 0) {
+ return null;
+ }
+ return new Point(x, y);
+ }
+
+ /**
+ * @param pref les pref a modifier
+ * @param table la table a sauver: colonne + visibilite
+ */
+ public static void saveTablePreferences(final Preferences pref, final JXTable table) {
+ final List<TableColumn> columns = ((TableColumnModelExt) table.getColumnModel()).getColumns(true);
+ final String tablePrefix = getComponentPreferencesPrefix(table);
+ saveIn(table.getSize(), tablePrefix + "dimension.", pref);
+ final String wId = tablePrefix + "column.width.";
+ final String visibleId = tablePrefix + "column.visible.";
+ for (final TableColumn tableColumn : columns) {
+ final String colName = table.getModel().getColumnName(tableColumn.getModelIndex());
+ pref.putInt(wId + colName, tableColumn.getWidth());
+ pref.putBoolean(visibleId + colName, ((TableColumnExt) tableColumn).isVisible());
+ }
+ }
+
+ public static GraphicsDevice getDevice(final Component window) {
+ GraphicsDevice[] screenDevices = GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices();
+ Rectangle boundsOfWindow = window.getBounds();
+ if (screenDevices != null && screenDevices.length > 1) {
+ for (GraphicsDevice graphicsDevice : screenDevices) {
+ Rectangle bounds = graphicsDevice.getDefaultConfiguration().getBounds();
+ Point p = new Point(boundsOfWindow.x, bounds.y);
+ if (bounds.contains(p)) {
+ p.x = boundsOfWindow.x + boundsOfWindow.width;
+ if (bounds.contains(p)) {
+ return graphicsDevice;
+ }
+ }
+ }
+ }
+ return GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
+ }
+
+ public static void ensureComponentWillBeVisible(final Component window, final Point initLocation) {
+
+ final Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+ ensureComponentWillBeVisible(window, initLocation, screenSize);
+ GraphicsDevice[] screenDevices = GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices();
+ if (screenDevices != null && screenDevices.length > 1) {
+ GraphicsDevice device = getDevice(window);
+ if (device != null) {
+ ensureComponentWillBeVisible(window, initLocation, device.getDefaultConfiguration().getBounds().getSize(),
+ false);
+ }
+ }
+ }
+
+ private static void ensureComponentWillBeVisible(final Component window, final Point initLocation,
+ final Dimension screenSize) {
+ ensureComponentWillBeVisible(window, initLocation, screenSize, true);
+ }
+
+ private static void ensureComponentWillBeVisible(final Component window, final Point initLocation,
+ final Dimension screenSize, boolean modifyX) {
+ final Dimension dim = window.getSize();
+
+ boolean size = false;
+ if (dim.width > screenSize.width) {
+ size = true;
+ dim.width = screenSize.width;
+ }
+ if (dim.height > screenSize.height) {
+ size = true;
+ dim.height = screenSize.height;
+ }
+ if (size) {
+ window.setSize(dim);
+ window.setPreferredSize(dim);
+ }
+ if (initLocation == null) {
+ return;
+ }
+ if (modifyX) {
+ initLocation.x = Math.max(0, Math.min(initLocation.x, screenSize.width - dim.width));
+ }
+ initLocation.y = Math.max(0, Math.min(initLocation.y, screenSize.height - dim.height));
+ window.setLocation(initLocation);
+ }
+
+ /**
+ * @param d le point a sauvegarder
+ * @param prefix le prefixe a utilser pour les cles
+ * @param pref les preferences a modifier
+ */
+ public static void saveIn(final Point d, final String prefix, final Preferences pref) {
+ // on s'assure d'avoir au moins 0: car si la fenetre est maximise, la location
+ // renvoie -4 ,-4
+ pref.putInt(prefix + ".x", Math.max(0, d.x));
+ pref.putInt(prefix + ".y", Math.max(0, d.y));
+ }
+ public static void saveIn(final Point d, final String prefix, final FuPreferences pref) {
+ // on s'assure d'avoir au moins 0: car si la fenetre est maximise, la location
+ // renvoie -4 ,-4
+ pref.putIntegerProperty(prefix + ".x", Math.max(0, d.x));
+ pref.putIntegerProperty(prefix + ".y", Math.max(0, d.y));
+ }
+
+ /**
+ * @param prefix le prefixe a utilser pour les cles
+ * @param pref les preferences a utiliser
+ * @return la dim lue ou null si non trouvee
+ */
+ public static Dimension loadDim(final String prefix, final Preferences pref) {
+ final int w = pref.getInt(prefix + ".w", -1);
+ if (w <= 0) {
+ return null;
+ }
+ final int h = pref.getInt(prefix + ".h", -1);
+ if (h <= 0) {
+ return null;
+ }
+ return new Dimension(w, h);
+ }
+ public static Dimension loadDim(final String prefix, final FuPreferences pref) {
+ final int w = pref.getIntegerProperty(prefix + ".w", -1);
+ if (w <= 0) {
+ return null;
+ }
+ final int h = pref.getIntegerProperty(prefix + ".h", -1);
+ if (h <= 0) {
+ return null;
+ }
+ return new Dimension(w, h);
+ }
+
+ public static boolean loadExtendedState(final String prefix, final Preferences pref) {
+ return pref.getBoolean(prefix + ".isExtended", false);
+ }
+
+ public static void saveExtendedState(final String prefix, final Preferences pref, boolean val) {
+ pref.putBoolean(prefix + ".isExtended", val);
+ }
+
+ public static void saveIn(final Dimension d, final String prefix, final Preferences pref) {
+ pref.putInt(prefix + ".w", d.width);
+ pref.putInt(prefix + ".h", d.height);
+ }
+ public static void saveIn(final Dimension d, final String prefix, final FuPreferences pref) {
+ pref.putIntegerProperty(prefix + ".w", d.width);
+ pref.putIntegerProperty(prefix + ".h", d.height);
+ }
+
+ /**
+ * @param d les dimension du composant a suaver
+ * @param parentDim les dimension parentes utilisees pour le ratio.
+ * @param prefix prefix a utiliser pour les preferences
+ * @param pref lles preferences a modifier
+ */
+ public static void saveRatioIn(final Dimension d, final Dimension parentDim, final String prefix,
+ final Preferences pref) {
+ pref.putDouble(prefix + ".ratio.w", ((double) d.width) / (double) parentDim.width);
+ pref.putDouble(prefix + ".ratio.h", ((double) d.height) / (double) parentDim.height);
+ }
+
+ /**
+ * @param pref les preferences a utiliser
+ * @param table la table a modifier
+ * @param defaultWidths les largeurs a utiliser par default
+ */
+ public static void loadTablePreferences(final Preferences pref, final JXTable table,
+ final Map<String, Integer> defaultWidths) {
+ final String tablePrefix = getComponentPreferencesPrefix(table);
+ loadTableSizePreferences(pref, table, tablePrefix);
+ final List<TableColumn> columns = ((TableColumnModelExt) table.getColumnModel()).getColumns(true);
+
+ final String wId = tablePrefix + "column.width.";
+ final String visibleId = tablePrefix + "column.visible.";
+ for (final TableColumn tableColumn : columns) {
+ final String colName = table.getModel().getColumnName(tableColumn.getModelIndex());
+ final Integer defaultWidth = defaultWidths == null ? null : defaultWidths.get(colName);
+ final int w = pref.getInt(wId + colName, defaultWidth == null ? -1 : defaultWidth.intValue());
+ if (w > 0) {
+ tableColumn.setPreferredWidth(w);
+ tableColumn.setWidth(w);
+ }
+ // par defaut les colonnes sont visibles: donc on ne traite que le cas cache.
+ if (!pref.getBoolean(visibleId + colName, true)) {
+ ((TableColumnExt) tableColumn).setVisible(false);
+ }
+ }
+ }
+
+ /**
+ * Dimensionne la table selon les preferences sauvegardees.
+ *
+ * @param pref les preferences a utiliser
+ * @param table la table a modifier
+ * @param defaultWidths les largeurs a utiliser par default
+ */
+ private static void loadTableSizePreferences(final Preferences pref, final JXTable table, final String tablePrefix) {
+ final Dimension d = loadDim(tablePrefix + "dimension.", pref);
+ if (d != null) {
+ table.setSize(d);
+ }
+ }
+
+ /**
+ * @param t
+ * @return
+ */
+ private static String getComponentPreferencesPrefix(final JComponent t) {
+ return StringUtils.defaultString(t.getName(), "noName") + ".";
+ }
+
+}
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java 2015-09-22 22:11:45 UTC (rev 9175)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java 2015-09-23 21:38:52 UTC (rev 9176)
@@ -57,6 +57,7 @@
CtuluFileChooserTestWritable tester = new CtuluFileChooserTestWritable(parentComponent);
tester.setAppendExtension(true, null);
setFileFilter(ftXslx_);
+ setDialogTitle(CtuluLib.getS("Enregistrer sous"));
setTester(tester);
}
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java 2015-09-22 22:11:45 UTC (rev 9175)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java 2015-09-23 21:38:52 UTC (rev 9176)
@@ -20,6 +20,7 @@
import com.memoire.bu.BuScrollPane;
import gnu.trove.TIntArrayList;
import java.awt.Cursor;
+import java.awt.Point;
import java.awt.Window;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
@@ -32,6 +33,7 @@
import javax.swing.JTable;
import javax.swing.ListSelectionModel;
import javax.swing.table.TableColumn;
+import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CsvWriter;
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibString;
@@ -79,17 +81,37 @@
pn.separator = separator;
final CtuluDialog dial = CtuluDialogPanel.createDialog(windowParent, pn);
pn.setParentDial(dial);
- dial.afficheDialogModal();
+ dial.setTitle(CtuluLib.getS("S\xE9lection des donn\xE9es \xE0 exporter"));
+ Point isSet = CtuluDialogPreferences.loadComponentLocationAndDimension(dial, BuPreferences.BU, "exportExcelDialog");
+ CtuluDialogPreferences.ensureComponentWillBeVisible(dial, dial.getLocation());
+ dial.afficheDialogModal(isSet == null);
+ CtuluDialogPreferences.saveComponentLocationAndDimension(dial, BuPreferences.BU, "exportExcelDialog");
+ BuPreferences.BU.writeIniFile();
}
public static void doExport(final JTable _t, final CtuluUI _ui, final Window _f) {
doExport(DEFAULT_SEPARATOR, _t, _ui, _f);
}
+
public static void doExport(final char separator, final JTable _t, final CtuluUI _ui, final Window _f) {
final CtuluFileChooserCsvExcel choose = new CtuluFileChooserCsvExcel(_ui);
+ String defaultDir = BuPreferences.BU.getStringProperty("export.excel.lastPath", null);
+ if (StringUtils.isNotBlank(defaultDir)) {
+ File dir = new File(defaultDir);
+ if (dir.exists() && dir.isDirectory()) {
+ choose.setCurrentDirectory(dir);
+
+ }
+ }
final File f = choose.getDestFile();
if (f == null) {
return;
+ } else {
+ File dir = f.getParentFile();
+ if (dir != null) {
+ BuPreferences.BU.putStringProperty("export.excel.lastPath", dir.getAbsolutePath());
+ BuPreferences.BU.writeIniFile();
+ }
}
CtuluTableExportPanel.showExportDialog(separator, _t, f, choose.getTypeChoosen(), _ui);
}
@@ -264,6 +286,9 @@
s.setVisible(false);
parentDial_.getRootPane().remove(s);
parentDial_.setCursor(Cursor.getDefaultCursor());
+ ui_.message(CtuluResource.CTULU.getString("Export termin\xE9"), CtuluResource.CTULU.getString("Donn\xE9es export\xE9es dans le fichier\n {0}",
+ dest_.
+ getAbsolutePath()), false);
}
});
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCsvFileImporter.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCsvFileImporter.java 2015-09-22 22:11:45 UTC (rev 9175)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCsvFileImporter.java 2015-09-23 21:38:52 UTC (rev 9176)
@@ -7,6 +7,8 @@
import java.util.ArrayList;
import java.util.Arrays;
import javax.swing.JFileChooser;
+import org.fudaa.ctulu.CtuluLib;
+import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.gui.CtuluFileChooserCsvExcel;
import org.fudaa.ctulu.table.CtuluExcelCsvFileReader;
@@ -15,13 +17,13 @@
* @author Frederic Deniger
*/
public class EGCsvFileImporter {
-
+
private final EGTableGraphePanel panel;
-
+
EGCsvFileImporter(EGTableGraphePanel aThis) {
this.panel = aThis;
}
-
+
void importCsv() {
final CtuluFileChooserCsvExcel choose = new CtuluFileChooserCsvExcel(panel);
choose.setDialogType(JFileChooser.OPEN_DIALOG);
@@ -39,9 +41,15 @@
ArrayList tab = new ArrayList(values.length);
for (int i = 0; i < values.length; i++) {
String[] value = values[i];
+ //la premier ligne peut \xEAtre les entetes
+ if (i == 0) {
+ if (!CtuluLibString.isNumeric(value[0])) {
+ continue;
+ }
+ }
tab.add(Arrays.asList(value));
}
panel.t_.insertTableInTable(tab);
}
-
+
}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java 2015-09-22 22:11:45 UTC (rev 9175)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java 2015-09-23 21:38:52 UTC (rev 9176)
@@ -12,8 +12,10 @@
package org.fudaa.ebli.courbe;
import com.memoire.bu.BuMenu;
+import com.memoire.bu.BuPreferences;
import com.memoire.bu.BuResource;
import com.memoire.bu.BuTable;
+import java.awt.Point;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
@@ -30,12 +32,14 @@
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumnModel;
import org.fudaa.ctulu.gui.CtuluCellTextDecimalRenderer;
+import org.fudaa.ctulu.gui.CtuluDialogPreferences;
import org.fudaa.ctulu.gui.CtuluPopupMenu;
import org.fudaa.ctulu.gui.CtuluUIDialog;
import org.fudaa.ctulu.table.CtuluTable;
import org.fudaa.ctulu.table.CtuluTableSortModel;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.commun.EbliPreferences;
import org.fudaa.ebli.commun.EbliTableInfoPanel;
import org.fudaa.ebli.commun.EbliTableInfoTarget;
import org.fudaa.ebli.ressource.EbliResource;
@@ -152,7 +156,8 @@
menu.setIcon(BuResource.BU.getMenuIcon("configurer"));
final ActionListener ac = new OptionActionListener(tableModel, table);
final boolean isCourbeSelected = courbesSelected.size() > 0;
- menu.addCheckBox(EbliLib.getS("Afficher uniquement les courbes s\xE9lectionn\xE9es"), "SHOW_SELECTED_COURBES", null, isCourbeSelected, isCourbeSelected)
+ menu.addCheckBox(EbliLib.getS("Afficher uniquement les courbes s\xE9lectionn\xE9es"), "SHOW_SELECTED_COURBES", null, isCourbeSelected,
+ isCourbeSelected)
.addActionListener(ac);
menu.addCheckBox(EbliLib.getS("Afficher une seule colonne des abscisses"), "SHOW_ONE_TIME", null, true, false).addActionListener(ac);
tableModel.setShowOnlySelected(isCourbeSelected);
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java 2015-09-22 22:11:45 UTC (rev 9175)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java 2015-09-23 21:38:52 UTC (rev 9176)
@@ -336,6 +336,10 @@
private void addValuesInModel(final List _tab, final EGTableModel _model, final CtuluDoubleParser _doubleParser,
final CtuluCommandComposite _cmp, final int _maxUpdate) {
+ if (_model instanceof EGTableModelUpdatable) {
+ ((EGTableModelUpdatable) _model).addValuesInModel(_tab, _doubleParser, _cmp, _maxUpdate);
+ return;
+ }
final int nbLine = _tab.size();
final TDoubleArrayList newX = new TDoubleArrayList(nbLine - _maxUpdate + 1);
final TDoubleArrayList newY = new TDoubleArrayList(nbLine - _maxUpdate + 1);
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableModel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableModel.java 2015-09-22 22:11:45 UTC (rev 9175)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableModel.java 2015-09-23 21:38:52 UTC (rev 9176)
@@ -91,19 +91,19 @@
c_.getModel().setValue(_rowIndex, x, y, a_.getCmd());
}
- public void setValueAt(final double _val, final int _rowIndex, final int _columnIndex,
+ public boolean setValueAt(final double _val, final int _rowIndex, final int _columnIndex,
final CtuluCommandContainer _cmd) {
final double x = _columnIndex == xColIndex ? _val : c_.getModel().getX(_rowIndex);
final double y = _columnIndex == yColIndex ? _val : c_.getModel().getY(_rowIndex);
- c_.getModel().setValue(_rowIndex, x, y, _cmd);
+ return c_.getModel().setValue(_rowIndex, x, y, _cmd);
}
public void addValueAt(final double _x, final double _y, final CtuluCommandContainer _cmd) {
c_.getModel().addValue(_x, _y, _cmd);
}
- public void addValueAt(final double[] _x, final double[] _y, final CtuluCommandContainer _cmd) {
- c_.getModel().addValue(_x, _y, _cmd);
+ public final boolean addValueAt(final double[] _x, final double[] _y, final CtuluCommandContainer _cmd) {
+ return c_.getModel().addValue(_x, _y, _cmd);
}
protected void selectedCourbeChanged(final EGCourbe _a) {
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableModelUpdatable.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableModelUpdatable.java 2015-09-22 22:11:45 UTC (rev 9175)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableModelUpdatable.java 2015-09-23 21:38:52 UTC (rev 9176)
@@ -16,4 +16,6 @@
int updateLines(final List _tab, final int _selectedColumm,
final int _selectedRow, final CtuluDoubleParser _doubleParser, final CtuluCommandComposite _cmp);
+ public void addValuesInModel(List _tab, CtuluDoubleParser _doubleParser, CtuluCommandComposite _cmp, int _maxUpdate);
+
}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java 2015-09-22 22:11:45 UTC (rev 9175)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java 2015-09-23 21:38:52 UTC (rev 9176)
@@ -32,11 +32,13 @@
import java.awt.event.ActionEvent;
import java.awt.event.ItemEvent;
import java.awt.event.KeyEvent;
+import javax.swing.JTable;
import javax.units.SI;
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.gui.CtuluCellTextDecimalRenderer;
+import org.fudaa.ctulu.gui.CtuluDialogPreferences;
import org.fudaa.ctulu.gui.CtuluLibSwing;
import org.fudaa.ctulu.gui.CtuluTableExportPanel;
import org.fudaa.ctulu.table.CtuluTableColumnHeader;
@@ -210,6 +212,7 @@
sortedModel_.setModel(globalModel_);
sortedModel_.setSortOnUpdate(true);
table_.setModel(sortedModel_);
+ table_.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
table_.getActionMap().remove("copy");
String t = (String) table_.getClientProperty("TABLE_TITLE");
if (t == null) {
@@ -236,11 +239,15 @@
}
add(new BuScrollPane(table_), BuBorderLayout.CENTER);
// l'ordre de ces 2 lignes est important
- table_.setTableHeader(new CtuluTableColumnHeader(colModel_));
+ CtuluTableColumnHeader header = new CtuluTableColumnHeader(colModel_);
+ table_.setTableHeader(header);
+
sortedModel_.install(table_);
table_.setColumnModel(colModel_);
table_.setCellSelectionEnabled(true);
-
+ for (int i = 0; i < colModel_.getColumnCount(); i++) {
+ header.adjustWidth(colModel_.getColumn(i));
+ }
}
}
@@ -303,8 +310,12 @@
dialog_.pack();
dialog_.setTitle(target_.getTitle());
dialog_.setLocationRelativeTo(CtuluLibSwing.getFrameAncestor(ui_.getParentComponent()));
+ CtuluDialogPreferences.loadComponentLocationAndDimension(dialog_, EbliPreferences.EBLI, "graphe.table");
+ CtuluDialogPreferences.ensureComponentWillBeVisible(dialog_, dialog_.getLocation());
dialog_.show();
dialog_.dispose();
+ CtuluDialogPreferences.saveComponentLocationAndDimension(dialog_, EbliPreferences.EBLI, "graphe.table");
+ EbliPreferences.EBLI.writeIniFile();
dialog_ = null;
}
private ExportTableCommentSupplier exportTableCommentSupplier;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-10-09 19:53:26
|
Revision: 9183
http://sourceforge.net/p/fudaa/svn/9183
Author: deniger
Date: 2015-10-09 19:53:24 +0000 (Fri, 09 Oct 2015)
Log Message:
-----------
CRUE-644
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluExcelCsvFileReader.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableColumnHeader.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableSortModel.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportData.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java
trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
Added Paths:
-----------
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportTask.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTimeLabel.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluExcelCsvFileReader.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluExcelCsvFileReader.java 2015-10-09 11:59:10 UTC (rev 9182)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluExcelCsvFileReader.java 2015-10-09 19:53:24 UTC (rev 9183)
@@ -13,8 +13,6 @@
import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableColumnHeader.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableColumnHeader.java 2015-10-09 11:59:10 UTC (rev 9182)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableColumnHeader.java 2015-10-09 19:53:24 UTC (rev 9183)
@@ -164,6 +164,7 @@
w = computePreferredWidth(getTable(), _column, i);
_column.setMaxWidth(Integer.MAX_VALUE);
_column.setPreferredWidth(w);
+ _column.setWidth(w);
}
}
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableSortModel.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableSortModel.java 2015-10-09 11:59:10 UTC (rev 9182)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableSortModel.java 2015-10-09 19:53:24 UTC (rev 9183)
@@ -8,6 +8,7 @@
package org.fudaa.ctulu.table;
import com.memoire.bu.BuTableSortModel;
+import org.apache.commons.lang.StringUtils;
/**
* @author fred deniger
@@ -15,9 +16,9 @@
*/
public class CtuluTableSortModel extends BuTableSortModel {
- protected final int compareNumberRowsByColumn(final int _row1,final int _row2,final int _col){
- final Object o1 = model_.getValueAt(_row1, _col);
- final Object o2 = model_.getValueAt(_row2, _col);
+ protected final int compareNumberRowsByColumn(final int _row1, final int _row2, final int _col) {
+ final Object o1 = model_.getValueAt(_row1, _col);
+ final Object o2 = model_.getValueAt(_row2, _col);
if ((o1 == null) && (o2 == null)) {
return 0;
@@ -26,8 +27,12 @@
} else if (o2 == null) {
return 1;
}
- final double d1 = ((Number) o1).doubleValue();
- final double d2 = ((Number) o2).doubleValue();
+ Class clazz = model_.getColumnClass(_col);
+ if (String.class.equals(clazz) || Number.class.isAssignableFrom(clazz)) {
+ return o1.toString().compareTo(o2.toString());
+ }
+ final double d1 = ((Number) o1).doubleValue();
+ final double d2 = ((Number) o2).doubleValue();
if (d1 < d2) {
return -1;
@@ -39,21 +44,20 @@
}
@Override
- public int compare(final int _row1,final int _row2){
+ public int compare(final int _row1, final int _row2) {
compares++;
- final int nc = model_.getRowCount();
+ final int nc = model_.getRowCount();
- for (int i = 0; i < nbcols_; i++)
- //for(int i=nbcols_-1;i>=0;i--)
+ for (int i = 0; i < nbcols_; i++) //for(int i=nbcols_-1;i>=0;i--)
{
- final int c = columns_[i];
+ final int c = columns_[i];
if ((c < 0) || (c >= nc)) {
continue;
}
int s = Number.class.isAssignableFrom(model_.getColumnClass(c)) ? compareNumberRowsByColumn(
- _row1, _row2, c) : compareRowsByColumn(_row1, _row2, c);
+ _row1, _row2, c) : compareRowsByColumn(_row1, _row2, c);
if (descending_[i]) {
s = -s;
}
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java 2015-10-09 11:59:10 UTC (rev 9182)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java 2015-10-09 19:53:24 UTC (rev 9183)
@@ -12,20 +12,17 @@
package org.fudaa.ctulu.gui;
import com.memoire.bu.BuBorderLayout;
-import com.memoire.bu.BuGlassPaneStop;
-import com.memoire.bu.BuLib;
import com.memoire.bu.BuList;
import com.memoire.bu.BuPreferences;
import com.memoire.bu.BuRadioButton;
import com.memoire.bu.BuScrollPane;
+import com.memoire.bu.BuTable;
import gnu.trove.TIntArrayList;
-import java.awt.Cursor;
import java.awt.Point;
import java.awt.Window;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.io.File;
-import java.text.DecimalFormat;
import javax.swing.AbstractListModel;
import javax.swing.ButtonGroup;
import javax.swing.JDialog;
@@ -34,49 +31,54 @@
import javax.swing.ListSelectionModel;
import javax.swing.table.TableColumn;
import org.apache.commons.lang.StringUtils;
-import org.fudaa.ctulu.CsvWriter;
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.CtuluResource;
-import org.fudaa.ctulu.CtuluTaskDelegate;
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.gui.CtuluFileChooserCsvExcel.TypeChoosen;
-import org.fudaa.ctulu.table.CtuluTableCsvWriter;
-import org.fudaa.ctulu.table.CtuluTableExcelWriter;
import org.fudaa.ctulu.table.CtuluTableExportInterface;
-import org.fudaa.ctulu.table.CtuluTableModelDefault;
-import org.fudaa.ctulu.table.CtuluTableModelInterface;
-import org.fudaa.ctulu.table.CtuluTableXlsxWriter;
-import org.jdesktop.swingx.JXTreeTable;
/**
* @author DENIGER
*/
@SuppressWarnings("serial")
public final class CtuluTableExportPanel extends CtuluDialogPanel implements ItemListener {
-
+
private static final char DEFAULT_SEPARATOR = '\t';
JList cbModel_;
BuRadioButton cbOnlySelected_;
- File dest_;
- TypeChoosen choosenType_;
- final JTable table_;
- final CtuluUI ui_;
+
+ final CtuluTableExportTask exportTask;
JDialog parentDial_;
char separator = '\t';
-
+
+ public static void setShowColumnsToExport(final BuTable _b, final boolean _show) {
+ _b.putClientProperty("TABLE_SHOW_COLUMNS_TO_EXPORT", Boolean.valueOf(_show));
+ }
+
+ public static boolean isshowColumnToExport(final JTable _b) {
+ final Boolean res = (Boolean) _b.getClientProperty("TABLE_SHOW_COLUMNS_TO_EXPORT");
+ return res == null ? true : res.booleanValue();
+ }
+
public static void showExportDialog(final char separator, final JTable _table, final File _dest, final TypeChoosen type,
final CtuluUI _ui) {
showExportDialog(separator, _table, _dest, type, _ui, CtuluLibSwing.getFrameAncestor(_ui.getParentComponent()));
}
-
+
public static void showExportDialog(final JTable _table, final File _dest, final TypeChoosen type, final CtuluUI _ui,
final Window windowParent) {
showExportDialog('\t', _table, _dest, type, _ui, windowParent);
}
-
+
public static void showExportDialog(final char separator, final JTable _table, final File _dest, final TypeChoosen type,
final CtuluUI _ui, final Window windowParent) {
+ if (!isshowColumnToExport(_table)) {
+ CtuluTableExportTask task = new CtuluTableExportTask(_table, _ui, type, _dest);
+ task.setSeparator(separator);
+ task.export(null, null);
+ return;
+ }
final CtuluTableExportPanel pn = new CtuluTableExportPanel(_table, _dest, type, _ui);
pn.separator = separator;
final CtuluDialog dial = CtuluDialogPanel.createDialog(windowParent, pn);
@@ -88,11 +90,11 @@
CtuluDialogPreferences.saveComponentLocationAndDimension(dial, BuPreferences.BU, "exportExcelDialog");
BuPreferences.BU.writeIniFile();
}
-
+
public static void doExport(final JTable _t, final CtuluUI _ui, final Window _f) {
doExport(DEFAULT_SEPARATOR, _t, _ui, _f);
}
-
+
public static void doExport(final char separator, final JTable _t, final CtuluUI _ui, final Window _f) {
final CtuluFileChooserCsvExcel choose = new CtuluFileChooserCsvExcel(_ui);
String defaultDir = BuPreferences.BU.getStringProperty("export.excel.lastPath", null);
@@ -100,7 +102,7 @@
File dir = new File(defaultDir);
if (dir.exists() && dir.isDirectory()) {
choose.setCurrentDirectory(dir);
-
+
}
}
final File f = choose.getDestFile();
@@ -115,32 +117,29 @@
}
CtuluTableExportPanel.showExportDialog(separator, _t, f, choose.getTypeChoosen(), _ui);
}
-
+
public static void doExport(char separator, final JTable _t, final CtuluUI _ui) {
doExport(separator, _t, _ui, CtuluLibSwing.getFrameAncestor(_ui.getParentComponent()));
}
-
+
public static void doExport(final JTable _t, final CtuluUI _ui) {
doExport('\t', _t, _ui, CtuluLibSwing.getFrameAncestor(_ui.getParentComponent()));
}
-
+
@SuppressWarnings("serial")
private CtuluTableExportPanel(final JTable _table, final File _dest, final TypeChoosen type, final CtuluUI _ui) {
super(false);
setLayout(new BuBorderLayout(5, 5));
- table_ = _table;
- dest_ = _dest;
- ui_ = _ui;
- choosenType_ = type;
+ exportTask = new CtuluTableExportTask(_table, _ui, type, _dest);
cbModel_ = new BuList();
final TIntArrayList exportableColumns = new TIntArrayList();
CtuluTableExportInterface exportInterface = null;
- if (table_.getModel() instanceof CtuluTableExportInterface) {
- exportInterface = (CtuluTableExportInterface) table_.getModel();
+ if (_table.getModel() instanceof CtuluTableExportInterface) {
+ exportInterface = (CtuluTableExportInterface) _table.getModel();
}
-
- for (int i = 0; i < table_.getColumnCount(); i++) {
- final TableColumn column = table_.getColumnModel().getColumn(i);
+
+ for (int i = 0; i < _table.getColumnCount(); i++) {
+ final TableColumn column = _table.getColumnModel().getColumn(i);
boolean toAdd = true;
if (exportInterface != null) {
toAdd = exportInterface.isColumnExportable(column.getModelIndex());
@@ -152,9 +151,9 @@
cbModel_.setModel(new AbstractListModel() {
@Override
public Object getElementAt(final int _index) {
- return table_.getColumnName(exportableColumns.get(_index));
+ return exportTask.getTable().getColumnName(exportableColumns.get(_index));
}
-
+
@Override
public int getSize() {
return exportableColumns.size();
@@ -164,7 +163,7 @@
final BuRadioButton col = new BuRadioButton(CtuluLib.getS("Exporter les colonnes suivantes:"));
bg.add(col);
add(col, BuBorderLayout.NORTH);
- final boolean isCellSelected = !table_.getSelectionModel().isSelectionEmpty();
+ final boolean isCellSelected = !exportTask.getTable().getSelectionModel().isSelectionEmpty();
add(new BuScrollPane(cbModel_), BuBorderLayout.CENTER);
cbModel_.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
cbModel_.getSelectionModel().setSelectionInterval(0, cbModel_.getModel().getSize() - 1);
@@ -178,7 +177,7 @@
col.setSelected(true);
add(cbOnlySelected_, BuBorderLayout.SOUTH);
}
-
+
@Override
public String getHelpText() {
String msg = CtuluLib.getS("Vous pouvez s\xE9lectionner les colonnes \xE0 exporter");
@@ -190,24 +189,25 @@
msg += "<br>" + CtuluLib.getS("Par d\xE9faut, toutes les colonnes sont s\xE9lectionn\xE9es pour l'exportation.");
return "<html><body>" + msg + "</body></html>";
}
-
+
protected void nothingToExport() {
- ui_.warn(CtuluResource.CTULU.getString("Exportation annul\xE9e"), CtuluResource.CTULU.getString("Ancune donn\xE9e n'a \xE9t\xE9 s\xE9lectionn\xE9e"), false);
+ exportTask.getUi().warn(CtuluResource.CTULU.getString("Exportation annul\xE9e"), CtuluResource.CTULU.getString("Ancune donn\xE9e n'a \xE9t\xE9 s\xE9lectionn\xE9e"),
+ false);
}
-
+
@Override
public void apply() {
int[] col = null;
int[] row = null;
if (cbOnlySelected_.isSelected()) {
- col = table_.getSelectedColumns();
- if (!table_.getColumnSelectionAllowed()) {
- col = new int[table_.getColumnCount()];
+ col = exportTask.getTable().getSelectedColumns();
+ if (!exportTask.getTable().getColumnSelectionAllowed()) {
+ col = new int[exportTask.getTable().getColumnCount()];
for (int i = 0; i < col.length; i++) {
col[i] = i;
}
}
- row = table_.getSelectedRows();
+ row = exportTask.getTable().getSelectedRows();
if ((col == null || row == null) || (row.length == 0 || col.length == 0)) {
nothingToExport();
return;
@@ -224,95 +224,18 @@
col = null;
}
}
- final BuGlassPaneStop s = new BuGlassPaneStop();
- //on enleve les colonnes non exportables
- if (table_.getModel() instanceof CtuluTableExportInterface) {
- CtuluTableExportInterface exportInterface = (CtuluTableExportInterface) table_.getModel();
- final TIntArrayList toExport = new TIntArrayList();
- if (col == null) {
- for (int i = 0; i < table_.getColumnCount(); i++) {
- final TableColumn column = table_.getColumnModel().getColumn(i);
- boolean toAdd = exportInterface.isColumnExportable(column.getModelIndex());
- if (toAdd) {
- toExport.add(i);
- }
- }
- } else {
- for (int i = 0; i < col.length; i++) {
- final TableColumn column = table_.getColumnModel().getColumn(col[i]);
- boolean toAdd = exportInterface.isColumnExportable(column.getModelIndex());
- if (toAdd) {
- toExport.add(i);
- }
- }
- }
- col = toExport.toNativeArray();
- }
- final int[] colToWrite = col;
- final int[] rowToWrite = row;
- parentDial_.setGlassPane(s);
- parentDial_.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
- s.setVisible(true);
- final CtuluTaskDelegate task = ui_.createTask(CtuluLib.getS("Export format texte"));
- task.start(new Runnable() {
- @Override
- public void run() {
- final CtuluTableModelInterface m = createDefaultModele(colToWrite, rowToWrite);
- try {
- if (TypeChoosen.XLS.equals(choosenType_)) {
- final CtuluTableExcelWriter w = new CtuluTableExcelWriter(m, dest_);
- w.write(task.getStateReceiver());
- } else if (TypeChoosen.XLSX.equals(choosenType_)) {
- final CtuluTableXlsxWriter w = new CtuluTableXlsxWriter(m, dest_);
- w.write(task.getStateReceiver());
- } else {
- int nbDigits = BuPreferences.BU.getIntegerProperty(CtuluTablePreferencesComponent.COORDS_EXPORT_NB_DIGITS, -1);
- DecimalFormat fmt;
- if (nbDigits == -1) {
- fmt = null;
- } else {
- fmt = CtuluLib.getDecimalFormat();
- fmt.setMaximumFractionDigits(nbDigits);
- }
- final CtuluTableCsvWriter w = new CtuluTableCsvWriter(new CsvWriter(dest_), m, separator, fmt);
- w.write(task.getStateReceiver());
- }
- } catch (final Exception e) {
- ui_.error(dest_.getName(), e.getLocalizedMessage(), false);
- }
- BuLib.invokeLater(new Runnable() {
- @Override
- public void run() {
- s.setVisible(false);
- parentDial_.getRootPane().remove(s);
- parentDial_.setCursor(Cursor.getDefaultCursor());
- ui_.message(CtuluResource.CTULU.getString("Export termin\xE9"), CtuluResource.CTULU.getString("Donn\xE9es export\xE9es dans le fichier\n {0}",
- dest_.
- getAbsolutePath()), false);
- }
- });
-
- }
-
- private CtuluTableModelInterface createDefaultModele(final int[] colToWrite, final int[] rowToWrite) {
- if (table_ instanceof JXTreeTable) {
- return new CtuluTreeTableModelDefault((JXTreeTable) table_, colToWrite,
- rowToWrite);
- }
- return new CtuluTableModelDefault(table_, colToWrite, rowToWrite);
- }
- });
+ exportTask.export(col, row);
}
-
+
@Override
public void itemStateChanged(final ItemEvent _e) {
cbModel_.setEnabled(!cbOnlySelected_.isSelected());
}
-
+
public JDialog getParentDial() {
return parentDial_;
}
-
+
public void setParentDial(final JDialog _parentDial) {
parentDial_ = _parentDial;
}
Added: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportTask.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportTask.java (rev 0)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportTask.java 2015-10-09 19:53:24 UTC (rev 9183)
@@ -0,0 +1,165 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ctulu.gui;
+
+import com.memoire.bu.BuGlassPaneStop;
+import com.memoire.bu.BuLib;
+import com.memoire.bu.BuPreferences;
+import gnu.trove.TIntArrayList;
+import java.awt.Cursor;
+import java.io.File;
+import static java.io.File.separator;
+import java.text.DecimalFormat;
+import javax.swing.JDialog;
+import javax.swing.JTable;
+import javax.swing.table.TableColumn;
+import org.fudaa.ctulu.CsvWriter;
+import org.fudaa.ctulu.CtuluLib;
+import org.fudaa.ctulu.CtuluResource;
+import org.fudaa.ctulu.CtuluTaskDelegate;
+import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.table.CtuluTableCsvWriter;
+import org.fudaa.ctulu.table.CtuluTableExcelWriter;
+import org.fudaa.ctulu.table.CtuluTableExportInterface;
+import org.fudaa.ctulu.table.CtuluTableModelDefault;
+import org.fudaa.ctulu.table.CtuluTableModelInterface;
+import org.fudaa.ctulu.table.CtuluTableXlsxWriter;
+import org.jdesktop.swingx.JXTreeTable;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class CtuluTableExportTask {
+
+ private final JTable table_;
+ private final CtuluUI ui_;
+ private final CtuluFileChooserCsvExcel.TypeChoosen choosenType_;
+ private final File dest_;
+ private JDialog parentDial_;
+ private char separator = '\t';
+
+ public CtuluTableExportTask(JTable table_, CtuluUI ui_, CtuluFileChooserCsvExcel.TypeChoosen choosenType_, File dest_) {
+ this.table_ = table_;
+ this.ui_ = ui_;
+ this.choosenType_ = choosenType_;
+ this.dest_ = dest_;
+ }
+
+ public JTable getTable() {
+ return table_;
+ }
+
+ public CtuluUI getUi() {
+ return ui_;
+ }
+
+ public CtuluFileChooserCsvExcel.TypeChoosen getChoosenType() {
+ return choosenType_;
+ }
+
+ public File getDest() {
+ return dest_;
+ }
+
+ public JDialog getParentDial() {
+ return parentDial_;
+ }
+
+ public char getSeparator() {
+ return separator;
+ }
+
+ public void setParentDial(JDialog parentDial_) {
+ this.parentDial_ = parentDial_;
+ }
+
+ public void setSeparator(char separator) {
+ this.separator = separator;
+ }
+
+ private CtuluTableModelInterface createDefaultModele(final int[] colToWrite, final int[] rowToWrite) {
+ if (table_ instanceof JXTreeTable) {
+ return new CtuluTreeTableModelDefault((JXTreeTable) table_, colToWrite,
+ rowToWrite);
+ }
+ return new CtuluTableModelDefault(table_, colToWrite, rowToWrite);
+ }
+
+ public void export(int[] col, int[] row) {
+ final BuGlassPaneStop s = new BuGlassPaneStop();
+ //on enleve les colonnes non exportables
+ if (table_.getModel() instanceof CtuluTableExportInterface) {
+ CtuluTableExportInterface exportInterface = (CtuluTableExportInterface) table_.getModel();
+ final TIntArrayList toExport = new TIntArrayList();
+ if (col == null) {
+ for (int i = 0; i < table_.getColumnCount(); i++) {
+ final TableColumn column = table_.getColumnModel().getColumn(i);
+ boolean toAdd = exportInterface.isColumnExportable(column.getModelIndex());
+ if (toAdd) {
+ toExport.add(i);
+ }
+ }
+ } else {
+ for (int i = 0; i < col.length; i++) {
+ final TableColumn column = table_.getColumnModel().getColumn(col[i]);
+ boolean toAdd = exportInterface.isColumnExportable(column.getModelIndex());
+ if (toAdd) {
+ toExport.add(i);
+ }
+ }
+ }
+ col = toExport.toNativeArray();
+ }
+ final int[] colToWrite = col;
+ final int[] rowToWrite = row;
+ if (parentDial_ != null) {
+ parentDial_.setGlassPane(s);
+ parentDial_.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+ }
+ s.setVisible(true);
+ final CtuluTaskDelegate task = ui_.createTask(CtuluLib.getS("Export format texte"));
+ task.start(new Runnable() {
+ @Override
+ public void run() {
+ final CtuluTableModelInterface m = createDefaultModele(colToWrite, rowToWrite);
+ try {
+ if (CtuluFileChooserCsvExcel.TypeChoosen.XLS.equals(choosenType_)) {
+ final CtuluTableExcelWriter w = new CtuluTableExcelWriter(m, dest_);
+ w.write(task.getStateReceiver());
+ } else if (CtuluFileChooserCsvExcel.TypeChoosen.XLSX.equals(choosenType_)) {
+ final CtuluTableXlsxWriter w = new CtuluTableXlsxWriter(m, dest_);
+ w.write(task.getStateReceiver());
+ } else {
+ int nbDigits = BuPreferences.BU.getIntegerProperty(CtuluTablePreferencesComponent.COORDS_EXPORT_NB_DIGITS, -1);
+ DecimalFormat fmt;
+ if (nbDigits == -1) {
+ fmt = null;
+ } else {
+ fmt = CtuluLib.getDecimalFormat();
+ fmt.setMaximumFractionDigits(nbDigits);
+ }
+ final CtuluTableCsvWriter w = new CtuluTableCsvWriter(new CsvWriter(dest_), m, separator, fmt);
+ w.write(task.getStateReceiver());
+ }
+ } catch (final Exception e) {
+ ui_.error(dest_.getName(), e.getLocalizedMessage(), false);
+ }
+ BuLib.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ s.setVisible(false);
+ if (parentDial_ != null) {
+ parentDial_.getRootPane().remove(s);
+ parentDial_.setCursor(Cursor.getDefaultCursor());
+ }
+ ui_.message(CtuluResource.CTULU.getString("Export termin\xE9"), CtuluResource.CTULU.getString("Donn\xE9es export\xE9es dans le fichier\n {0}",
+ dest_.
+ getAbsolutePath()), true);
+ }
+ });
+ }
+ });
+ }
+}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportData.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportData.java 2015-10-09 11:59:10 UTC (rev 9182)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportData.java 2015-10-09 19:53:24 UTC (rev 9183)
@@ -11,15 +11,18 @@
*/
package org.fudaa.ebli.courbe;
-import gnu.trove.TDoubleHashSet;
import gnu.trove.TIntArrayList;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import jxl.write.Label;
import jxl.write.Number;
import jxl.write.WritableCell;
+import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluLibString;
@@ -168,10 +171,11 @@
private final static class SameH extends EGExportData {
double[] time_;
+ List<String> labels;
SameH(final EGCourbe[] _cs, final EGGraphe _g, boolean _onlyH, boolean showLabels) {
super(_cs, _g, showLabels);
- final TDoubleHashSet set = new TDoubleHashSet();
+ Set<EGTimeLabel> set = new HashSet<EGTimeLabel>();
maxCol_ = cs_.length + 1;
final EGAxeHorizontal h = g_.getTransformer().getXAxe();
for (int i = cs_.length - 1; i >= 0; i--) {
@@ -179,27 +183,61 @@
for (int j = c.getModel().getNbValues() - 1; j >= 0; j--) {
final double x = c.getModel().getX(j);
if ((!_onlyH) || (h.containsPoint(x))) {
- set.add(x);
+ EGTimeLabel value = new EGTimeLabel(x);
+ set.add(value);
+ value.setLabel(c.getModel().getPointLabel(j));
}
}
}
- time_ = set.toArray();
+ List<EGTimeLabel> values = new ArrayList<EGTimeLabel>(set);
+ Collections.sort(values);
+ time_ = new double[values.size()];
+ for (int i = 0; i < time_.length; i++) {
+ time_[i] = values.get(i).getX();
+ }
Arrays.sort(time_);
maxLine_ = time_.length;
- column_ = new String[_cs.length + 1];
- column_[0] = h.getTitre();
+ int nbCols = _cs.length + 1;
+ if (showLabels) {
+ nbCols++;
+ }
+ column_ = new String[nbCols];
+ int offset = 0;
+ if (showLabels) {
+ offset = 1;
+ column_[0] = "";
+ if (cs_.length > 0 && cs_[0].getModel() instanceof EgModelLabelNamed) {
+ column_[0] = ((EgModelLabelNamed) cs_[0].getModel()).getLabelColumnName();
+ }
+ labels = new ArrayList<String>();
+ for (EGTimeLabel value : values) {
+ labels.add(value.getLabel());
+ }
+ }
+ column_[offset] = h.getTitre();
for (int i = 0; i < _cs.length; i++) {
- column_[i + 1] = _cs[i].getTitle();
+ column_[i + 1 + offset] = _cs[i].getTitle();
}
}
@Override
public Object getValue(final int _row, final int _col) {
final double x = time_[_row];
- if (_col == 0) {
+ int offset = 0;
+ if (showLabel) {
+ offset = 1;
+ if (_col == 0) {
+ if (_row < labels.size()) {
+ return labels.get(_row);
+ }
+ return "";
+
+ }
+ }
+ if (_col == offset) {
return getXValueFor(x);
}
- return getYValueFor(cs_[_col - 1], cs_[_col - 1].interpol(x));
+ return getYValueFor(cs_[_col - 1 - offset], cs_[_col - 1 - offset].interpol(x));
}
}
@@ -289,4 +327,4 @@
public final int getMaxRow() {
return maxLine_;
}
-}
\ No newline at end of file
+}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java 2015-10-09 11:59:10 UTC (rev 9182)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java 2015-10-09 19:53:24 UTC (rev 9183)
@@ -12,10 +12,8 @@
package org.fudaa.ebli.courbe;
import com.memoire.bu.BuMenu;
-import com.memoire.bu.BuPreferences;
import com.memoire.bu.BuResource;
import com.memoire.bu.BuTable;
-import java.awt.Point;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
@@ -25,6 +23,7 @@
import java.util.List;
import java.util.Map;
import javax.swing.AbstractButton;
+import javax.swing.JCheckBox;
import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JInternalFrame;
@@ -32,14 +31,14 @@
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumnModel;
import org.fudaa.ctulu.gui.CtuluCellTextDecimalRenderer;
-import org.fudaa.ctulu.gui.CtuluDialogPreferences;
import org.fudaa.ctulu.gui.CtuluPopupMenu;
+import org.fudaa.ctulu.gui.CtuluTableExportPanel;
import org.fudaa.ctulu.gui.CtuluUIDialog;
import org.fudaa.ctulu.table.CtuluTable;
+import org.fudaa.ctulu.table.CtuluTableColumnHeader;
import org.fudaa.ctulu.table.CtuluTableSortModel;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.ebli.commun.EbliLib;
-import org.fudaa.ebli.commun.EbliPreferences;
import org.fudaa.ebli.commun.EbliTableInfoPanel;
import org.fudaa.ebli.commun.EbliTableInfoTarget;
import org.fudaa.ebli.ressource.EbliResource;
@@ -66,12 +65,32 @@
}
boolean displayAll;
boolean addOptions = true;
+ boolean addCheckbox = false;
+ //boolean utilise pour afficher ou pas le dialogue permettant d'afficher les colonnes a exporter
+ boolean showColumnToExport = false;
boolean showLabel;
public boolean isShowLabel() {
return showLabel;
}
+ public boolean isShowColumnToExport() {
+ return showColumnToExport;
+ }
+
+ public void setShowColumnToExport(boolean showColumnToExport) {
+ this.showColumnToExport = showColumnToExport;
+ }
+
+
+ public boolean isAddCheckbox() {
+ return addCheckbox;
+ }
+
+ public void setAddCheckbox(boolean addCheckbox) {
+ this.addCheckbox = addCheckbox;
+ }
+
public void setShowLabel(boolean showLabel) {
this.showLabel = showLabel;
}
@@ -151,6 +170,7 @@
title = EbliResource.EBLI.getString("Courbes");
}
EbliTableInfoPanel.setTitle(table, title);
+ List<JComponent> components = new ArrayList<JComponent>();
if (addOptions) {
final BuMenu menu = new BuMenu(EbliLib.getS("Options"), "OPTIONS");
menu.setIcon(BuResource.BU.getMenuIcon("configurer"));
@@ -173,9 +193,21 @@
}
}
});
- EbliTableInfoPanel.setJMenuBarComponents(table, new JComponent[]{menu});
+ components.add(menu);
}
+ if (addCheckbox) {
+ JCheckBox ch = new JCheckBox(EbliLib.getS("Factorisation des abscisses"));
+ ch.setActionCommand("SHOW_ONE_TIME");
+ ch.addActionListener(new OptionActionListener(tableModel, table));
+ components.add(ch);
+ }
+
+ if (!components.isEmpty()) {
+ EbliTableInfoPanel.setJMenuBarComponents(table, components.toArray(new JComponent[components.size()]));
+ }
+
EbliTableInfoPanel.setShowSelectedRow(table, false);
+ CtuluTableExportPanel.setShowColumnsToExport(table, showColumnToExport);
return table;
}
@@ -207,6 +239,9 @@
} else if ("SHOW_ONE_TIME".equals(com)) {
Map<Object, TableCellRenderer> cellsRenderer = getCellsRenderer();
target_.setShowOneTime(((AbstractButton) _e.getSource()).isSelected());
+ for (int i = 0; i < table_.getColumnCount(); i++) {
+ ((CtuluTableColumnHeader) table_.getTableHeader()).adjustWidth(table_.getColumnModel().getColumn(i));
+ }
putCellsRenderer(cellsRenderer);
}
if (idx > 0 && model != null) {
Added: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTimeLabel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTimeLabel.java (rev 0)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTimeLabel.java 2015-10-09 19:53:24 UTC (rev 9183)
@@ -0,0 +1,68 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ebli.courbe;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class EGTimeLabel implements Comparable<EGTimeLabel> {
+
+ private final double x;
+ private String label;
+
+ public EGTimeLabel(double x) {
+ this.x = x;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public double getX() {
+ return x;
+ }
+
+
+ public void setLabel(String label) {
+ this.label = label;
+ }
+
+ @Override
+ public int compareTo(EGTimeLabel o) {
+ if (o == this) {
+ return 0;
+ }
+ if (o == null) {
+ return 1;
+ }
+ if (equals(o)) {
+ return 0;
+ }
+ return x - o.x > 0 ? 1 : -1;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 5;
+ hash = 89 * hash + (int) (Double.doubleToLongBits(this.x) ^ (Double.doubleToLongBits(this.x) >>> 32));
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final EGTimeLabel other = (EGTimeLabel) obj;
+ if (Double.doubleToLongBits(this.x) != Double.doubleToLongBits(other.x)) {
+ return false;
+ }
+ return true;
+ }
+
+}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java 2015-10-09 11:59:10 UTC (rev 9182)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java 2015-10-09 19:53:24 UTC (rev 9183)
@@ -28,6 +28,7 @@
import javax.swing.table.TableModel;
import com.memoire.bu.*;
+import com.memoire.fu.FuLog;
import java.awt.Frame;
import java.awt.event.ActionEvent;
import java.awt.event.ItemEvent;
@@ -117,6 +118,7 @@
return res == null ? true : res.booleanValue();
}
+
/**
* Enregistre le titre dans les propriete (putClientProperty) de la table.
*
@@ -148,6 +150,8 @@
public static void setShowSelectedRow(final BuTable _b, final boolean _show) {
_b.putClientProperty("TABLE_SHOW_SELECTED_ROW", Boolean.valueOf(_show));
}
+
+
final TableColumnModel colModel_;
JDialog dialog_;
boolean displaySelected_;
@@ -329,8 +333,12 @@
copy();
} else if ("EXPORT_CSV".equals(_e.getActionCommand())) {
table_.putClientProperty(CtuluTableModelInterface.EXPORT_COMMENT_PROPERTY, null);
- if (exportTableCommentSupplier != null) {
- table_.putClientProperty(CtuluTableModelInterface.EXPORT_COMMENT_PROPERTY, exportTableCommentSupplier.getComments());
+ try {
+ if (exportTableCommentSupplier != null) {
+ table_.putClientProperty(CtuluTableModelInterface.EXPORT_COMMENT_PROPERTY, exportTableCommentSupplier.getComments());
+ }
+ } catch (NullPointerException ex) {
+ FuLog.error(ex);
}
CtuluTableExportPanel.doExport(';', table_, ui_);
Modified: trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
===================================================================
--- trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2015-10-09 11:59:10 UTC (rev 9182)
+++ trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2015-10-09 19:53:24 UTC (rev 9183)
@@ -910,4 +910,5 @@
Mode contour=Contour mode
Mode densit\xE9=Density mode
Un calque \xE9ditable doit \xEAtre selectionn\xE9=An editable layer must be selected
-Autom. zoom=Zoom auto
\ No newline at end of file
+Autom. zoom=Zoom auto
+Factorisation des abscisses=Factoring abscissa
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-11-25 22:19:39
|
Revision: 9201
http://sourceforge.net/p/fudaa/svn/9201
Author: deniger
Date: 2015-11-25 22:19:36 +0000 (Wed, 25 Nov 2015)
Log Message:
-----------
CRUE-667
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportData.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGMultiCourbeTableModel.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTimeLabel.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java
Added Paths:
-----------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportDataBuilder.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDataCellDoubleValue.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDateCellDoubleValueCellRenderer.java
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportData.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportData.java 2015-11-25 22:18:53 UTC (rev 9200)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportData.java 2015-11-25 22:19:36 UTC (rev 9201)
@@ -11,6 +11,7 @@
*/
package org.fudaa.ebli.courbe;
+import org.fudaa.ebli.commun.EbliDataCellDoubleValue;
import gnu.trove.TIntArrayList;
import java.util.ArrayList;
import java.util.Arrays;
@@ -41,26 +42,34 @@
return showLabel;
}
- public Object getXValueFor(final double xValue) {
+ public String getStringXValueFor(final double xValue) {
if (g_.getModel().getAxeX().getSpecificFormatExport() != null) {
return g_.getModel().getAxeX().getSpecificFormatExport().format(xValue);
}
if (g_.getModel().getAxeX().getSpecificFormat() != null) {
return g_.getModel().getAxeX().getSpecificFormat().format(xValue);
}
- return CtuluLib.getDouble(xValue);
+ return Double.toString(xValue);
}
- public Object getYValueFor(final EGCourbe courbe, final double yValue) {
+ public String getStringYValueFor(final EGCourbe courbe, final double yValue) {
if (courbe.getAxeY() != null && courbe.getAxeY().getSpecificFormatExport() != null) {
return courbe.getAxeY().getSpecificFormatExport().format(yValue);
}
if (courbe.getAxeY() != null && courbe.getAxeY().getSpecificFormat() != null) {
return courbe.getAxeY().getSpecificFormat().format(yValue);
}
- return CtuluLib.getDouble(yValue);
+ return Double.toString(yValue);
}
+ public EbliDataCellDoubleValue getXValueFor(final double xValue) {
+ return new EbliDataCellDoubleValue(getStringXValueFor(xValue), xValue);
+ }
+
+ public Object getYValueFor(final EGCourbe courbe, final double yValue) {
+ return new EbliDataCellDoubleValue(getStringYValueFor(courbe, yValue), yValue);
+ }
+
final static class AllData extends EGExportData {
AllData(final EGCourbe[] _cs, final EGGraphe _g, boolean showLabel) {
@@ -78,6 +87,12 @@
}
@Override
+ public Class getColumnClass(int _col) {
+ boolean label = showLabel && (_col % 3 == 0);
+ return label ? String.class : EbliDataCellDoubleValue.class;
+ }
+
+ @Override
public Object getValue(final int _row, final int _col) {
boolean label = showLabel && (_col % 3 == 0);
final boolean x = showLabel ? (_col % 3 == 1) : (_col % 2 == 0);
@@ -151,6 +166,11 @@
}
@Override
+ public Class getColumnClass(int _col) {
+ return EbliDataCellDoubleValue.class;
+ }
+
+ @Override
public Object getValue(final int _row, final int _col) {
final boolean x = (_col % 2 == 0);
final int courbeIdx = x ? _col / 2 : (_col - 1) / 2;
@@ -196,11 +216,11 @@
}
Arrays.sort(time_);
maxLine_ = time_.length;
- int nbCols = _cs.length + 1;
+// int nbCols = _cs.length + 1;
if (showLabels) {
- nbCols++;
+ maxCol_++;
}
- column_ = new String[nbCols];
+ column_ = new String[maxCol_];
int offset = 0;
if (showLabels) {
offset = 1;
@@ -220,6 +240,14 @@
}
@Override
+ public Class getColumnClass(int _col) {
+ if (showLabel && _col == 0) {
+ return String.class;
+ }
+ return EbliDataCellDoubleValue.class;
+ }
+
+ @Override
public Object getValue(final int _row, final int _col) {
final double x = time_[_row];
int offset = 0;
@@ -242,9 +270,27 @@
public static EGExportData createExportData(final EGCourbe[] courbesInitiales, final EGGraphe _g, final boolean _isSameH,
final boolean _onlyHiewed, boolean showLabel, final ProgressionInterface _prog) {
+ final EGExportDataBuilder exportDataBuilder = _g.getExportDataBuilder();
+ if (exportDataBuilder != null) {
+ return exportDataBuilder.createExportData(courbesInitiales, _g, _isSameH, showLabel);
+ }
+ EGCourbe[] _cs = prepareCourbesForExport(courbesInitiales);
+ if (_isSameH) {
+ return new SameH(_cs, _g, _onlyHiewed, showLabel);
+ } else if (_onlyHiewed) {
+ return new HViewedOnly(_cs, _g, showLabel);
+ }
+ return new AllData(_cs, _g, showLabel);
+
+ }
+
+ public static EGCourbe[] prepareCourbesForExport(final EGCourbe[] courbesInitiales) {
List<EGCourbe> courbes = new ArrayList<EGCourbe>();
for (int i = 0; i < courbesInitiales.length; i++) {
EGCourbe egCourbe = courbesInitiales[i];
+ if (!egCourbe.isVisible()) {
+ continue;
+ }
Collection<EGCourbe> associatesCourbesForExport = egCourbe.getAssociatesCourbesForExport();
if (CtuluLibArray.isNotEmpty(associatesCourbesForExport)) {
courbes.addAll(associatesCourbesForExport);
@@ -252,21 +298,15 @@
courbes.add(egCourbe);
}
EGCourbe[] _cs = (EGCourbe[]) courbes.toArray(new EGCourbe[courbes.size()]);
- if (_isSameH) {
- return new SameH(_cs, _g, _onlyHiewed, showLabel);
- } else if (_onlyHiewed) {
- return new HViewedOnly(_cs, _g, showLabel);
- }
- return new AllData(_cs, _g, showLabel);
-
+ return _cs;
}
- String[] column_;
- EGCourbe[] cs_;
- EGGraphe g_;
- int maxCol_;
- int maxLine_;
+ protected String[] column_;
+ protected EGCourbe[] cs_;
+ protected EGGraphe g_;
+ protected int maxCol_;
+ protected int maxLine_;
- EGExportData(final EGCourbe[] _cs, final EGGraphe _g, boolean showLabel) {
+ protected EGExportData(final EGCourbe[] _cs, final EGGraphe _g, boolean showLabel) {
cs_ = _cs;
this.showLabel = showLabel;
g_ = _g;
@@ -294,6 +334,8 @@
return column_[_i];
}
+ public abstract Class getColumnClass(final int _i);
+
public EGCourbe getCourbe(final int _idx) {
return cs_[_idx];
}
Added: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportDataBuilder.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportDataBuilder.java (rev 0)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportDataBuilder.java 2015-11-25 22:19:36 UTC (rev 9201)
@@ -0,0 +1,24 @@
+/*
+GPL 2
+ */
+package org.fudaa.ebli.courbe;
+
+/**
+ * Une factory pour customiser les exports de donn\xE9es d'un graphe.
+ *
+ * @author Frederic Deniger
+ */
+public interface EGExportDataBuilder {
+
+ /**
+ *
+ * @param courbesInitiales les courbes initiales sans pr\xE9traitement. Utiliser \xE9ventuellement
+ * org.fudaa.ebli.courbe.EGExportData.prepareCourbesForExport(EGCourbe[]) pour filtrer les courbes ( visible et ajouter les courbes li\xE9es)
+ * @param _g
+ * @param _isSameH
+ * @param showLabel
+ * @return
+ */
+ EGExportData createExportData(final EGCourbe[] courbesInitiales, final EGGraphe _g, final boolean _isSameH, boolean showLabel);
+
+}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java 2015-11-25 22:18:53 UTC (rev 9200)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java 2015-11-25 22:19:36 UTC (rev 9201)
@@ -93,6 +93,7 @@
protected CtuluRange xRange_;
EGHorizontalBanner horizontalBanner;
private ExportTableCommentSupplier exportTableCommentSupplier;
+ private EGExportDataBuilder exportDataBuilder;
public EGGraphe(final EGGrapheModel _m) {
addComponentListener(this);
@@ -110,6 +111,15 @@
initTitlesOrigins();
}
+ public EGExportDataBuilder getExportDataBuilder() {
+ return exportDataBuilder;
+ }
+
+ public void setExportDataBuilder(EGExportDataBuilder exportDataBuilder) {
+ this.exportDataBuilder = exportDataBuilder;
+ }
+
+
public void setExportTableCommentSupplier(ExportTableCommentSupplier exportTableCommentSupplier) {
this.exportTableCommentSupplier = exportTableCommentSupplier;
}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGMultiCourbeTableModel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGMultiCourbeTableModel.java 2015-11-25 22:18:53 UTC (rev 9200)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGMultiCourbeTableModel.java 2015-11-25 22:19:36 UTC (rev 9201)
@@ -78,7 +78,7 @@
@Override
public Class getColumnClass(final int _columnIndex) {
- return Double.class;
+ return current_.getColumnClass(_columnIndex);
}
@Override
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java 2015-11-25 22:18:53 UTC (rev 9200)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java 2015-11-25 22:19:36 UTC (rev 9201)
@@ -11,6 +11,8 @@
*/
package org.fudaa.ebli.courbe;
+import org.fudaa.ebli.commun.EbliDataCellDoubleValue;
+import org.fudaa.ebli.commun.EbliDateCellDoubleValueCellRenderer;
import com.memoire.bu.BuMenu;
import com.memoire.bu.BuResource;
import com.memoire.bu.BuTable;
@@ -156,6 +158,7 @@
final EGMultiCourbeTableModel tableModel = new EGMultiCourbeTableModel(cs, (EGCourbe[]) courbesSelected.toArray(new EGCourbe[courbesSelected
.size()]), graphe_, showLabel);
final CtuluTable table = new CtuluTable(tableModel);
+ table.setDefaultRenderer(EbliDataCellDoubleValue.class, new EbliDateCellDoubleValueCellRenderer());
String title = null;
final JInternalFrame iframe = (JInternalFrame) SwingUtilities.getAncestorOfClass(JInternalFrame.class, graphe_);
if (iframe == null) {
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTimeLabel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTimeLabel.java 2015-11-25 22:18:53 UTC (rev 9200)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTimeLabel.java 2015-11-25 22:19:36 UTC (rev 9201)
@@ -11,6 +11,7 @@
private final double x;
private String label;
+ private String subLabel;
public EGTimeLabel(double x) {
this.x = x;
@@ -24,7 +25,14 @@
return x;
}
+ public String getSubLabel() {
+ return subLabel;
+ }
+ public void setSubLabel(String subLabel) {
+ this.subLabel = subLabel;
+ }
+
public void setLabel(String label) {
this.label = label;
}
Added: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDataCellDoubleValue.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDataCellDoubleValue.java (rev 0)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDataCellDoubleValue.java 2015-11-25 22:19:36 UTC (rev 9201)
@@ -0,0 +1,64 @@
+/*
+GPL 2
+ */
+package org.fudaa.ebli.commun;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class EbliDataCellDoubleValue implements Comparable<EbliDataCellDoubleValue> {
+
+ private final String formattedValue;
+ private final double value;
+
+ public EbliDataCellDoubleValue(String formattedValue, double value) {
+ this.formattedValue = formattedValue;
+ this.value = value;
+ }
+
+ public String getFormattedValue() {
+ return formattedValue;
+ }
+
+ public double getValue() {
+ return value;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 3;
+ hash = 37 * hash + (int) (Double.doubleToLongBits(this.value) ^ (Double.doubleToLongBits(this.value) >>> 32));
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final EbliDataCellDoubleValue other = (EbliDataCellDoubleValue) obj;
+ if (Double.doubleToLongBits(this.value) != Double.doubleToLongBits(other.value)) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public int compareTo(EbliDataCellDoubleValue o) {
+ if (o == null) {
+ return 1;
+ }
+ if (o == this) {
+ return 0;
+ }
+ return value > o.value ? 1 : (value < o.value ? -1 : 0);
+ }
+
+}
Added: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDateCellDoubleValueCellRenderer.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDateCellDoubleValueCellRenderer.java (rev 0)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDateCellDoubleValueCellRenderer.java 2015-11-25 22:19:36 UTC (rev 9201)
@@ -0,0 +1,20 @@
+/*
+GPL 2
+ */
+package org.fudaa.ebli.commun;
+
+import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.gui.CtuluCellTextRenderer;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class EbliDateCellDoubleValueCellRenderer extends CtuluCellTextRenderer {
+
+ @Override
+ protected void setValue(final Object _value) {
+ setText((_value == null) ? CtuluLibString.EMPTY_STRING : ((EbliDataCellDoubleValue) _value).getFormattedValue());
+ }
+
+}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java 2015-11-25 22:18:53 UTC (rev 9200)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java 2015-11-25 22:19:36 UTC (rev 9201)
@@ -118,7 +118,6 @@
return res == null ? true : res.booleanValue();
}
-
/**
* Enregistre le titre dans les propriete (putClientProperty) de la table.
*
@@ -151,7 +150,6 @@
_b.putClientProperty("TABLE_SHOW_SELECTED_ROW", Boolean.valueOf(_show));
}
-
final TableColumnModel colModel_;
JDialog dialog_;
boolean displaySelected_;
@@ -195,11 +193,12 @@
final TableColumnModel init = table_.getColumnModel();
final int nb = init.getColumnCount();
// TODO a continuer
-
+ EbliDateCellDoubleValueCellRenderer doubleValueRenderer = new EbliDateCellDoubleValueCellRenderer();
for (int i = 0; i < nb; i++) {
TableColumn column = init.getColumn(i);
int modelIdx = column.getModelIndex();
- if (table_.getModel().getColumnClass(modelIdx).equals(Double.class)) {
+ final Class<?> columnClass = table_.getModel().getColumnClass(modelIdx);
+ if (columnClass.equals(Double.class)) {
CtuluCellTextDecimalRenderer renderer = new CtuluCellTextDecimalRenderer();
if (_defs[0].getName().equalsIgnoreCase(table_.getModel().getColumnName(modelIdx))) {
renderer.setFormatter(_defs[0].getFormatter().getXYFormatter());
@@ -209,6 +208,9 @@
renderer.setFormatter(_defs[2].getFormatter().getXYFormatter());
}
column.setCellRenderer(renderer);
+ } else if (columnClass.equals(EbliDataCellDoubleValue.class)) {
+ column.setCellRenderer(doubleValueRenderer);
+
}
colModel_.addColumn(column);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-11-25 23:30:03
|
Revision: 9204
http://sourceforge.net/p/fudaa/svn/9204
Author: deniger
Date: 2015-11-25 23:30:00 +0000 (Wed, 25 Nov 2015)
Log Message:
-----------
CRUE-667
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportData.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDateCellDoubleValueCellRenderer.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java
Added Paths:
-----------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableCellDoubleValue.java
Removed Paths:
-------------
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDataCellDoubleValue.java
Copied: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableCellDoubleValue.java (from rev 9201, trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDataCellDoubleValue.java)
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableCellDoubleValue.java (rev 0)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableCellDoubleValue.java 2015-11-25 23:30:00 UTC (rev 9204)
@@ -0,0 +1,70 @@
+/*
+GPL 2
+ */
+package org.fudaa.ctulu.table;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class CtuluTableCellDoubleValue implements Comparable<CtuluTableCellDoubleValue> {
+
+ private final String formattedValue;
+ private final double value;
+
+ public CtuluTableCellDoubleValue(String formattedValue, double value) {
+ this.formattedValue = formattedValue == null ? Double.toString(value) : formattedValue;
+ this.value = value;
+ }
+
+ public String getFormattedValue() {
+ return formattedValue;
+ }
+
+ public double getValue() {
+ return value;
+ }
+
+ @Override
+ public String toString() {
+ return formattedValue;
+ }
+
+
+ @Override
+ public int hashCode() {
+ int hash = 3;
+ hash = 37 * hash + (int) (Double.doubleToLongBits(this.value) ^ (Double.doubleToLongBits(this.value) >>> 32));
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final CtuluTableCellDoubleValue other = (CtuluTableCellDoubleValue) obj;
+ if (Double.doubleToLongBits(this.value) != Double.doubleToLongBits(other.value)) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public int compareTo(CtuluTableCellDoubleValue o) {
+ if (o == null) {
+ return 1;
+ }
+ if (o == this) {
+ return 0;
+ }
+ return value > o.value ? 1 : (value < o.value ? -1 : 0);
+ }
+
+}
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java 2015-11-25 22:57:46 UTC (rev 9203)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java 2015-11-25 23:30:00 UTC (rev 9204)
@@ -86,6 +86,8 @@
createCell.setCellValue(((Number) value).doubleValue());
} else if (Date.class.equals(dataClass)) {
createCell.setCellValue(((Date) value));
+ } else if (CtuluTableCellDoubleValue.class.equals(dataClass)) {
+ createCell.setCellValue(((CtuluTableCellDoubleValue) value).getValue());
} else {
createCell.setCellValue(value.toString());
}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportData.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportData.java 2015-11-25 22:57:46 UTC (rev 9203)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportData.java 2015-11-25 23:30:00 UTC (rev 9204)
@@ -11,7 +11,7 @@
*/
package org.fudaa.ebli.courbe;
-import org.fudaa.ebli.commun.EbliDataCellDoubleValue;
+import org.fudaa.ctulu.table.CtuluTableCellDoubleValue;
import gnu.trove.TIntArrayList;
import java.util.ArrayList;
import java.util.Arrays;
@@ -23,7 +23,6 @@
import jxl.write.Label;
import jxl.write.Number;
import jxl.write.WritableCell;
-import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.ProgressionInterface;
@@ -62,12 +61,12 @@
return Double.toString(yValue);
}
- public EbliDataCellDoubleValue getXValueFor(final double xValue) {
- return new EbliDataCellDoubleValue(getStringXValueFor(xValue), xValue);
+ public CtuluTableCellDoubleValue getXValueFor(final double xValue) {
+ return new CtuluTableCellDoubleValue(getStringXValueFor(xValue), xValue);
}
public Object getYValueFor(final EGCourbe courbe, final double yValue) {
- return new EbliDataCellDoubleValue(getStringYValueFor(courbe, yValue), yValue);
+ return new CtuluTableCellDoubleValue(getStringYValueFor(courbe, yValue), yValue);
}
final static class AllData extends EGExportData {
@@ -89,7 +88,7 @@
@Override
public Class getColumnClass(int _col) {
boolean label = showLabel && (_col % 3 == 0);
- return label ? String.class : EbliDataCellDoubleValue.class;
+ return label ? String.class : CtuluTableCellDoubleValue.class;
}
@Override
@@ -167,7 +166,7 @@
@Override
public Class getColumnClass(int _col) {
- return EbliDataCellDoubleValue.class;
+ return CtuluTableCellDoubleValue.class;
}
@Override
@@ -244,7 +243,7 @@
if (showLabel && _col == 0) {
return String.class;
}
- return EbliDataCellDoubleValue.class;
+ return CtuluTableCellDoubleValue.class;
}
@Override
@@ -350,6 +349,10 @@
final Double d = (Double) value;
return new Number(_colInXls, _rowInXls, d.doubleValue());
}
+ if (value instanceof CtuluTableCellDoubleValue) {
+ final CtuluTableCellDoubleValue d = (CtuluTableCellDoubleValue) value;
+ return new Number(_colInXls, _rowInXls, d.getValue());
+ }
String asString = value.toString();
try {
double d = Double.parseDouble(asString.replace(',', '.'));
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java 2015-11-25 22:57:46 UTC (rev 9203)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java 2015-11-25 23:30:00 UTC (rev 9204)
@@ -11,7 +11,7 @@
*/
package org.fudaa.ebli.courbe;
-import org.fudaa.ebli.commun.EbliDataCellDoubleValue;
+import org.fudaa.ctulu.table.CtuluTableCellDoubleValue;
import org.fudaa.ebli.commun.EbliDateCellDoubleValueCellRenderer;
import com.memoire.bu.BuMenu;
import com.memoire.bu.BuResource;
@@ -158,7 +158,7 @@
final EGMultiCourbeTableModel tableModel = new EGMultiCourbeTableModel(cs, (EGCourbe[]) courbesSelected.toArray(new EGCourbe[courbesSelected
.size()]), graphe_, showLabel);
final CtuluTable table = new CtuluTable(tableModel);
- table.setDefaultRenderer(EbliDataCellDoubleValue.class, new EbliDateCellDoubleValueCellRenderer());
+ table.setDefaultRenderer(CtuluTableCellDoubleValue.class, new EbliDateCellDoubleValueCellRenderer());
String title = null;
final JInternalFrame iframe = (JInternalFrame) SwingUtilities.getAncestorOfClass(JInternalFrame.class, graphe_);
if (iframe == null) {
Deleted: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDataCellDoubleValue.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDataCellDoubleValue.java 2015-11-25 22:57:46 UTC (rev 9203)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDataCellDoubleValue.java 2015-11-25 23:30:00 UTC (rev 9204)
@@ -1,64 +0,0 @@
-/*
-GPL 2
- */
-package org.fudaa.ebli.commun;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class EbliDataCellDoubleValue implements Comparable<EbliDataCellDoubleValue> {
-
- private final String formattedValue;
- private final double value;
-
- public EbliDataCellDoubleValue(String formattedValue, double value) {
- this.formattedValue = formattedValue;
- this.value = value;
- }
-
- public String getFormattedValue() {
- return formattedValue;
- }
-
- public double getValue() {
- return value;
- }
-
- @Override
- public int hashCode() {
- int hash = 3;
- hash = 37 * hash + (int) (Double.doubleToLongBits(this.value) ^ (Double.doubleToLongBits(this.value) >>> 32));
- return hash;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final EbliDataCellDoubleValue other = (EbliDataCellDoubleValue) obj;
- if (Double.doubleToLongBits(this.value) != Double.doubleToLongBits(other.value)) {
- return false;
- }
- return true;
- }
-
- @Override
- public int compareTo(EbliDataCellDoubleValue o) {
- if (o == null) {
- return 1;
- }
- if (o == this) {
- return 0;
- }
- return value > o.value ? 1 : (value < o.value ? -1 : 0);
- }
-
-}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDateCellDoubleValueCellRenderer.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDateCellDoubleValueCellRenderer.java 2015-11-25 22:57:46 UTC (rev 9203)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDateCellDoubleValueCellRenderer.java 2015-11-25 23:30:00 UTC (rev 9204)
@@ -3,6 +3,7 @@
*/
package org.fudaa.ebli.commun;
+import org.fudaa.ctulu.table.CtuluTableCellDoubleValue;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.gui.CtuluCellTextRenderer;
@@ -14,7 +15,9 @@
@Override
protected void setValue(final Object _value) {
- setText((_value == null) ? CtuluLibString.EMPTY_STRING : ((EbliDataCellDoubleValue) _value).getFormattedValue());
+ setHorizontalTextPosition(RIGHT);
+ setHorizontalAlignment(RIGHT);
+ setText((_value == null) ? CtuluLibString.EMPTY_STRING : ((CtuluTableCellDoubleValue) _value).getFormattedValue());
}
}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java 2015-11-25 22:57:46 UTC (rev 9203)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java 2015-11-25 23:30:00 UTC (rev 9204)
@@ -7,6 +7,7 @@
*/
package org.fudaa.ebli.commun;
+import org.fudaa.ctulu.table.CtuluTableCellDoubleValue;
import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import java.awt.Component;
import java.awt.event.ActionListener;
@@ -39,6 +40,7 @@
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.gui.CtuluCellTextDecimalRenderer;
+import org.fudaa.ctulu.gui.CtuluCellTextRenderer;
import org.fudaa.ctulu.gui.CtuluDialogPreferences;
import org.fudaa.ctulu.gui.CtuluLibSwing;
import org.fudaa.ctulu.gui.CtuluTableExportPanel;
@@ -194,6 +196,7 @@
final int nb = init.getColumnCount();
// TODO a continuer
EbliDateCellDoubleValueCellRenderer doubleValueRenderer = new EbliDateCellDoubleValueCellRenderer();
+ CtuluCellTextRenderer textRenderer = new CtuluCellTextRenderer();
for (int i = 0; i < nb; i++) {
TableColumn column = init.getColumn(i);
int modelIdx = column.getModelIndex();
@@ -208,9 +211,10 @@
renderer.setFormatter(_defs[2].getFormatter().getXYFormatter());
}
column.setCellRenderer(renderer);
- } else if (columnClass.equals(EbliDataCellDoubleValue.class)) {
+ } else if (columnClass.equals(CtuluTableCellDoubleValue.class)) {
column.setCellRenderer(doubleValueRenderer);
-
+ } else if (columnClass.equals(String.class)) {
+ column.setCellRenderer(textRenderer);
}
colModel_.addColumn(column);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-02-19 19:22:50
|
Revision: 9279
http://sourceforge.net/p/fudaa/svn/9279
Author: deniger
Date: 2016-02-19 19:22:47 +0000 (Fri, 19 Feb 2016)
Log Message:
-----------
CRUE-657
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java
trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserTestWritable.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserWriter.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportTask.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java 2016-02-19 18:33:17 UTC (rev 9278)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java 2016-02-19 19:22:47 UTC (rev 9279)
@@ -33,9 +33,9 @@
* @version $Id: CtuluTableExcelWriter.java,v 1.7 2007-04-16 16:33:53 deniger Exp $
*/
public class CtuluTableXlsxWriter implements CtuluWriter {
-
+
CtuluTableModelInterface table_;
-
+
File dest_;
/**
@@ -47,13 +47,14 @@
table_ = _table;
dest_ = _dest;
}
-
+
public CtuluTableXlsxWriter() {
super();
}
/**
* @param _p le receveur de l'avancement
+ * @throws IllegalStateException si erreur d'ecriture du fichier.
*/
@Override
public void write(final ProgressionInterface _p) {
@@ -104,52 +105,57 @@
if (_p != null) {
_p.setProgression(80);
}
- writeToFile(wb);
+ boolean ok = writeToFile(wb);
+ if (!ok) {
+ throw new IllegalStateException(CtuluResource.CTULU.getString("Impossible d'\xE9crire dans le fichier '{0}'. Il est probablement ouvert.", dest_.
+ getName()));
+ }
} finally {
}
-
+
}
-
- protected void writeToFile(Workbook wb) {
+
+ protected boolean writeToFile(Workbook wb) {
FileOutputStream fileOut = null;
try {
fileOut = new FileOutputStream(dest_);
wb.write(fileOut);
fileOut.close();
- } catch (IOException ex) {
- Logger.getLogger(CtuluTableXlsxWriter.class.getName()).log(Level.SEVERE, null, ex);
+ } catch (Exception ex) {
+ return false;
} finally {
CtuluLibFile.close(fileOut);
}
+ return true;
}
-
+
BuFileFilter ftXsl_ = new BuFileFilter(new String[]{"xlsx"}, CtuluResource.CTULU.getString("Fichier Excel"));
-
+
@Override
public BuFileFilter getFilter() {
return ftXsl_;
}
-
+
@Override
public void setFile(File f) {
dest_ = f;
}
-
+
@Override
public void setModel(CtuluTableModelInterface _model) {
table_ = _model;
}
-
+
String extension_ = ".xlsx";
-
+
@Override
public String getMostPopularExtension() {
return extension_;
}
-
+
@Override
public boolean allowFormatData() {
return true;
}
-
+
}
Modified: trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt
===================================================================
--- trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt 2016-02-19 18:33:17 UTC (rev 9278)
+++ trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt 2016-02-19 19:22:47 UTC (rev 9279)
@@ -339,4 +339,5 @@
S\xE9lection des donn\xE9es \xE0 exporter=Select data to export
Export termin\xE9=Export finished
Donn\xE9es export\xE9es dans le fichier\n {0}=Data exported in the file\n {0}
-Enregistrer sous=Save as
\ No newline at end of file
+Enregistrer sous=Save as
+Impossible d'\xE9crire dans le fichier '{0}'. Il est probablement ouvert.=The file {0} can't be written. It should be opened by another process.
\ No newline at end of file
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java 2016-02-19 18:33:17 UTC (rev 9278)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java 2016-02-19 19:22:47 UTC (rev 9279)
@@ -51,7 +51,6 @@
return ftXslx_;
}
-
public CtuluFileChooserCsvExcel(Component parentComponent) {
this.parentComponent = parentComponent;
ftCsv_ = new BuFileFilter(new String[]{"csv", "txt"}, CtuluResource.CTULU.getString("Texte CSV"));
@@ -69,6 +68,7 @@
setApproveButtonToolTipText(CtuluLib.getS("L'extension du fichier sera automatiquement compl\xE9t\xE9e"));
CtuluFileChooserTestWritable tester = new CtuluFileChooserTestWritable(parentComponent);
tester.setAppendExtension(true, null);
+ tester.setAppendStrictExtension(true);
setFileFilter(ftXslx_);
setDialogTitle(CtuluLib.getS("Enregistrer sous"));
setTester(tester);
@@ -94,6 +94,9 @@
return null;
}
File f = getSelectedFile();
+ if (tester_ instanceof CtuluFileChooserTestWritable) {
+ return ((CtuluFileChooserTestWritable) tester_).getDestFile(f, this);
+ }
return completeExtension(f);
}
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserTestWritable.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserTestWritable.java 2016-02-19 18:33:17 UTC (rev 9278)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserTestWritable.java 2016-02-19 19:22:47 UTC (rev 9279)
@@ -55,7 +55,7 @@
}
else if (appendStrictExt_ && ext!=null) {
- return CtuluLibFile.appendStrictExtensionIfNeeded(_initFile, ext);
+ return CtuluLibFile.changeExtension(_initFile, ext);
}
return _initFile;
}
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserWriter.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserWriter.java 2016-02-19 18:33:17 UTC (rev 9278)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserWriter.java 2016-02-19 19:22:47 UTC (rev 9279)
@@ -19,14 +19,14 @@
*
*/
public class CtuluFileChooserWriter extends CtuluFileChooser {
-
+
final List<CtuluWriter> listWriter_;
final CtuluUI ui_;
-
+
public CtuluFileChooserWriter(CtuluUI _ui, final List<CtuluWriter> _listWriter) {
-
+
ui_ = _ui;
-
+
if (_listWriter != null) {
listWriter_ = _listWriter;
} else {
@@ -44,8 +44,9 @@
setApproveButtonToolTipText(CtuluLib.getS("L'extension du fichier sera automatiquement compl\xE9t\xE9e"));
CtuluFileChooserTestWritable tester = new CtuluFileChooserTestWritable(_ui);
tester.setAppendExtension(true, null);
+ tester.setAppendStrictExtension(true);
setTester(tester);
-
+
}
/**
@@ -61,17 +62,17 @@
}
return null;
}
-
+
public File getDestFile() {
final int res = showDialog(ui_.getParentComponent(), BuResource.BU.getString("Continuer"));
if (res != JFileChooser.APPROVE_OPTION) {
return null;
}
File f = getSelectedFile();
-
+
return completeExtension(f);
}
-
+
private File completeExtension(File f) {
if (f == null) {
return null;
@@ -79,5 +80,5 @@
f = new File(f.getAbsolutePath() + getSelectedWriter().getMostPopularExtension());
return f;
}
-
+
}
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportTask.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportTask.java 2016-02-19 18:33:17 UTC (rev 9278)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportTask.java 2016-02-19 19:22:47 UTC (rev 9279)
@@ -124,6 +124,7 @@
@Override
public void run() {
final CtuluTableModelInterface m = createDefaultModele(colToWrite, rowToWrite);
+ boolean ok = true;
try {
if (CtuluFileChooserCsvExcel.TypeChoosen.XLS.equals(choosenType_)) {
final CtuluTableExcelWriter w = new CtuluTableExcelWriter(m, dest_);
@@ -144,21 +145,24 @@
w.write(task.getStateReceiver());
}
} catch (final Exception e) {
+ ok = false;
ui_.error(dest_.getName(), e.getLocalizedMessage(), false);
}
- BuLib.invokeLater(new Runnable() {
- @Override
- public void run() {
- s.setVisible(false);
- if (parentDial_ != null) {
- parentDial_.getRootPane().remove(s);
- parentDial_.setCursor(Cursor.getDefaultCursor());
+ if (ok) {
+ BuLib.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ s.setVisible(false);
+ if (parentDial_ != null) {
+ parentDial_.getRootPane().remove(s);
+ parentDial_.setCursor(Cursor.getDefaultCursor());
+ }
+ ui_.message(CtuluResource.CTULU.getString("Export termin\xE9"), CtuluResource.CTULU.getString("Donn\xE9es export\xE9es dans le fichier\n {0}",
+ dest_.
+ getAbsolutePath()), true);
}
- ui_.message(CtuluResource.CTULU.getString("Export termin\xE9"), CtuluResource.CTULU.getString("Donn\xE9es export\xE9es dans le fichier\n {0}",
- dest_.
- getAbsolutePath()), true);
- }
- });
+ });
+ }
}
});
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 20:01:03
|
Revision: 9327
http://sourceforge.net/p/fudaa/svn/9327
Author: deniger
Date: 2016-04-11 20:01:01 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-framework-1.7
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-graphe-3D/pom.xml
trunk/framework/ebli-network/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
trunk/framework/fudaa-dico/pom.xml
trunk/framework/fudaa-dico/server/pom.xml
trunk/framework/fudaa-dico/ui/pom.xml
trunk/framework/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ctulu-bu/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ctulu-common/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ctulu-fu/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ctulu-gis/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ctulu-ui/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ctulu-video/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/dodico-common/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ebli-1d/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ebli-2d/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ebli-3d/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ebli-common/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ebli-graphe/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-graphe-3D/pom.xml
===================================================================
--- trunk/framework/ebli-graphe-3D/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ebli-graphe-3D/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -1,30 +1,29 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
- </parent>
- <groupId>org.fudaa.framework.ebli</groupId>
- <artifactId>ebli-graphe-3D</artifactId>
- <name>ebli-graphe-3D</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.ebli</groupId>
- <artifactId>ebli-common</artifactId>
- </dependency>
-
- </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.fudaa.framework</groupId>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.7</version>
+ </parent>
+ <groupId>org.fudaa.framework.ebli</groupId>
+ <artifactId>ebli-graphe-3D</artifactId>
+ <name>ebli-graphe-3D</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ebli</groupId>
+ <artifactId>ebli-common</artifactId>
+ </dependency>
+
+ </dependencies>
+</project>
Modified: trunk/framework/ebli-network/pom.xml
===================================================================
--- trunk/framework/ebli-network/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ebli-network/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-network</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/fudaa-common/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/fudaa-common-save/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
Modified: trunk/framework/fudaa-dico/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/fudaa-dico/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
Modified: trunk/framework/fudaa-dico/server/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/server/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/fudaa-dico/server/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>dico-server</artifactId>
Modified: trunk/framework/fudaa-dico/ui/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/ui/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/fudaa-dico/ui/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<artifactId>dico-ui</artifactId>
<name>Dico UI</name>
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
<url>http://www.fudaa.fr/sites/devel/fudaa-framework/</url>
<properties>
<projetEncoding>ISO-8859-15</projetEncoding>
@@ -19,10 +19,10 @@
<name>Fudaa Framework</name>
<description>La partie commune du framework fudaa</description>
<scm>
- <connection>scm:svn:http://svn.code.sf.net/p/fudaa/svn/trunk/framework/</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/trunk/framework
+ <connection>scm:svn:http://svn.code.sf.net/p/fudaa/svn/tags/framework/fudaa-framework-1.7</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/framework/fudaa-framework-1.7
</developerConnection>
- <url>https://svn.code.sf.net/p/fudaa/svn/trunk/framework</url>
+ <url>https://svn.code.sf.net/p/fudaa/svn/tags/framework/fudaa-framework-1.7</url>
</scm>
<modules>
<module>ctulu-fu</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 20:01:29
|
Revision: 9329
http://sourceforge.net/p/fudaa/svn/9329
Author: deniger
Date: 2016-04-11 20:01:27 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-graphe-3D/pom.xml
trunk/framework/ebli-network/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
trunk/framework/fudaa-dico/pom.xml
trunk/framework/fudaa-dico/server/pom.xml
trunk/framework/fudaa-dico/ui/pom.xml
trunk/framework/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ctulu-bu/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ctulu-common/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ctulu-fu/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ctulu-gis/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ctulu-ui/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ctulu-video/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/dodico-common/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ebli-1d/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ebli-2d/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ebli-3d/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ebli-common/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ebli-graphe/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-graphe-3D/pom.xml
===================================================================
--- trunk/framework/ebli-graphe-3D/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ebli-graphe-3D/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe-3D</artifactId>
Modified: trunk/framework/ebli-network/pom.xml
===================================================================
--- trunk/framework/ebli-network/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ebli-network/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-network</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/fudaa-common/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/fudaa-common-save/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
Modified: trunk/framework/fudaa-dico/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/fudaa-dico/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
Modified: trunk/framework/fudaa-dico/server/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/server/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/fudaa-dico/server/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>dico-server</artifactId>
Modified: trunk/framework/fudaa-dico/ui/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/ui/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/fudaa-dico/ui/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<artifactId>dico-ui</artifactId>
<name>Dico UI</name>
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
<url>http://www.fudaa.fr/sites/devel/fudaa-framework/</url>
<properties>
<projetEncoding>ISO-8859-15</projetEncoding>
@@ -19,10 +19,10 @@
<name>Fudaa Framework</name>
<description>La partie commune du framework fudaa</description>
<scm>
- <connection>scm:svn:http://svn.code.sf.net/p/fudaa/svn/tags/framework/fudaa-framework-1.7</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/framework/fudaa-framework-1.7
+ <connection>scm:svn:http://svn.code.sf.net/p/fudaa/svn/trunk/framework/</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/trunk/framework
</developerConnection>
- <url>https://svn.code.sf.net/p/fudaa/svn/tags/framework/fudaa-framework-1.7</url>
+ <url>https://svn.code.sf.net/p/fudaa/svn/trunk/framework</url>
</scm>
<modules>
<module>ctulu-fu</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-18 14:00:36
|
Revision: 9351
http://sourceforge.net/p/fudaa/svn/9351
Author: deniger
Date: 2016-04-18 14:00:34 +0000 (Mon, 18 Apr 2016)
Log Message:
-----------
version 1.8
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-common/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2016-04-18 13:57:53 UTC (rev 9350)
+++ trunk/framework/ctulu-bu/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2016-04-18 13:57:53 UTC (rev 9350)
+++ trunk/framework/ctulu-common/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2016-04-18 13:57:53 UTC (rev 9350)
+++ trunk/framework/ctulu-fu/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2016-04-18 13:57:53 UTC (rev 9350)
+++ trunk/framework/ctulu-gis/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2016-04-18 13:57:53 UTC (rev 9350)
+++ trunk/framework/ctulu-ui/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2016-04-18 13:57:53 UTC (rev 9350)
+++ trunk/framework/dodico-common/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2016-04-18 13:57:53 UTC (rev 9350)
+++ trunk/framework/ebli-1d/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2016-04-18 13:57:53 UTC (rev 9350)
+++ trunk/framework/ebli-2d/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2016-04-18 13:57:53 UTC (rev 9350)
+++ trunk/framework/ebli-common/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-18 14:01:31
|
Revision: 9352
http://sourceforge.net/p/fudaa/svn/9352
Author: deniger
Date: 2016-04-18 14:01:28 +0000 (Mon, 18 Apr 2016)
Log Message:
-----------
version 1.8
Modified Paths:
--------------
trunk/framework/ctulu-video/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-graphe-3D/pom.xml
trunk/framework/ebli-network/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
+++ trunk/framework/ctulu-video/pom.xml 2016-04-18 14:01:28 UTC (rev 9352)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
+++ trunk/framework/ebli-3d/pom.xml 2016-04-18 14:01:28 UTC (rev 9352)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
+++ trunk/framework/ebli-graphe/pom.xml 2016-04-18 14:01:28 UTC (rev 9352)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-graphe-3D/pom.xml
===================================================================
--- trunk/framework/ebli-graphe-3D/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
+++ trunk/framework/ebli-graphe-3D/pom.xml 2016-04-18 14:01:28 UTC (rev 9352)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe-3D</artifactId>
Modified: trunk/framework/ebli-network/pom.xml
===================================================================
--- trunk/framework/ebli-network/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
+++ trunk/framework/ebli-network/pom.xml 2016-04-18 14:01:28 UTC (rev 9352)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-network</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2016-04-18 14:01:28 UTC (rev 9352)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
+++ trunk/framework/fudaa-common/pom.xml 2016-04-18 14:01:28 UTC (rev 9352)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2016-04-18 14:01:28 UTC (rev 9352)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2016-04-18 14:00:34 UTC (rev 9351)
+++ trunk/framework/fudaa-common-save/pom.xml 2016-04-18 14:01:28 UTC (rev 9352)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.8</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-18 15:09:49
|
Revision: 9364
http://sourceforge.net/p/fudaa/svn/9364
Author: deniger
Date: 2016-04-18 15:09:46 +0000 (Mon, 18 Apr 2016)
Log Message:
-----------
version 1.9-SNAPSHOT
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-graphe-3D/pom.xml
trunk/framework/ebli-network/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2016-04-18 15:05:48 UTC (rev 9363)
+++ trunk/framework/ctulu-bu/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2016-04-18 15:05:48 UTC (rev 9363)
+++ trunk/framework/ctulu-common/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2016-04-18 15:05:48 UTC (rev 9363)
+++ trunk/framework/ctulu-fu/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2016-04-18 15:05:48 UTC (rev 9363)
+++ trunk/framework/ctulu-gis/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2016-04-18 15:05:48 UTC (rev 9363)
+++ trunk/framework/ctulu-ui/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2016-04-18 15:05:48 UTC (rev 9363)
+++ trunk/framework/ctulu-video/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2016-04-18 15:05:48 UTC (rev 9363)
+++ trunk/framework/dodico-common/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2016-04-18 15:05:48 UTC (rev 9363)
+++ trunk/framework/ebli-1d/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2016-04-18 15:05:48 UTC (rev 9363)
+++ trunk/framework/ebli-2d/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2016-04-18 15:05:48 UTC (rev 9363)
+++ trunk/framework/ebli-3d/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2016-04-18 15:05:48 UTC (rev 9363)
+++ trunk/framework/ebli-common/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2016-04-18 15:05:48 UTC (rev 9363)
+++ trunk/framework/ebli-graphe/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-graphe-3D/pom.xml
===================================================================
--- trunk/framework/ebli-graphe-3D/pom.xml 2016-04-18 15:05:48 UTC (rev 9363)
+++ trunk/framework/ebli-graphe-3D/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe-3D</artifactId>
Modified: trunk/framework/ebli-network/pom.xml
===================================================================
--- trunk/framework/ebli-network/pom.xml 2016-04-18 15:05:48 UTC (rev 9363)
+++ trunk/framework/ebli-network/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-network</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2016-04-18 15:05:48 UTC (rev 9363)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-18 15:10:34
|
Revision: 9365
http://sourceforge.net/p/fudaa/svn/9365
Author: deniger
Date: 2016-04-18 15:10:31 +0000 (Mon, 18 Apr 2016)
Log Message:
-----------
version 1.9-SNAPSHOT
Modified Paths:
--------------
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
+++ trunk/framework/fudaa-common/pom.xml 2016-04-18 15:10:31 UTC (rev 9365)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2016-04-18 15:10:31 UTC (rev 9365)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2016-04-18 15:09:46 UTC (rev 9364)
+++ trunk/framework/fudaa-common-save/pom.xml 2016-04-18 15:10:31 UTC (rev 9365)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-10-13 08:37:01
|
Revision: 9435
http://sourceforge.net/p/fudaa/svn/9435
Author: deniger
Date: 2016-10-13 08:36:59 +0000 (Thu, 13 Oct 2016)
Log Message:
-----------
CRUE-667: Import de conditions aux limites
Modified Paths:
--------------
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCsvFileImporter.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java 2016-10-13 08:36:32 UTC (rev 9434)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java 2016-10-13 08:36:59 UTC (rev 9435)
@@ -35,23 +35,43 @@
final BuFileFilter ftXslx_;
final Component parentComponent;
- public CtuluFileChooserCsvExcel(CtuluUI _ui) {
- this(_ui == null ? null : _ui.getParentComponent());
+ public static CtuluFileChooserCsvExcel createSaveFileChooser() {
+ CtuluFileChooserCsvExcel fileChooser = new CtuluFileChooserCsvExcel((CtuluUI) null);
+ fileChooser.setDialogType(JFileChooser.SAVE_DIALOG);
+ return fileChooser;
}
- public BuFileFilter getFtCsv() {
- return ftCsv_;
+ public static CtuluFileChooserCsvExcel createSaveFileChooser(CtuluUI ui) {
+ CtuluFileChooserCsvExcel fileChooser = new CtuluFileChooserCsvExcel(ui);
+ fileChooser.setDialogType(JFileChooser.SAVE_DIALOG);
+ return fileChooser;
}
- public BuFileFilter getFtXsl() {
- return ftXsl_;
+ public static CtuluFileChooserCsvExcel createOpenFileChooser() {
+ CtuluFileChooserCsvExcel fileChooser = new CtuluFileChooserCsvExcel((CtuluUI) null);
+ fileChooser.setDialogType(JFileChooser.OPEN_DIALOG);
+ fileChooser.setTester(null);
+ return fileChooser;
}
- public BuFileFilter getFtXslx() {
- return ftXslx_;
+ public static CtuluFileChooserCsvExcel createOpenFileChooser(Component parentComponent) {
+ CtuluFileChooserCsvExcel fileChooser = new CtuluFileChooserCsvExcel(parentComponent);
+ fileChooser.setDialogType(JFileChooser.OPEN_DIALOG);
+ fileChooser.setTester(null);
+ return fileChooser;
}
+ public CtuluFileChooserCsvExcel() {
+ this((Component) null);
+
+ }
+
+ public CtuluFileChooserCsvExcel(CtuluUI _ui) {
+ this(_ui == null ? null : _ui.getParentComponent());
+ }
+
public CtuluFileChooserCsvExcel(Component parentComponent) {
+ super(true);
this.parentComponent = parentComponent;
ftCsv_ = new BuFileFilter(new String[]{"csv", "txt"}, CtuluResource.CTULU.getString("Texte CSV"));
ftCsv_.setExtensionListInDescription(true);
@@ -74,6 +94,18 @@
setTester(tester);
}
+ public BuFileFilter getFtCsv() {
+ return ftCsv_;
+ }
+
+ public BuFileFilter getFtXsl() {
+ return ftXsl_;
+ }
+
+ public BuFileFilter getFtXslx() {
+ return ftXslx_;
+ }
+
/**
* @return true si le format excel est choisi
*/
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java 2016-10-13 08:36:32 UTC (rev 9434)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java 2016-10-13 08:36:59 UTC (rev 9435)
@@ -53,7 +53,7 @@
}
public static void doExport(final char separator, final CtuluTableModelInterface _t, final CtuluUI _ui, final Window _f) {
- final CtuluFileChooserCsvExcel choose = new CtuluFileChooserCsvExcel(_ui);
+ final CtuluFileChooserCsvExcel choose = CtuluFileChooserCsvExcel.createSaveFileChooser(_ui);
final File f = choose.getDestFile();
if (f == null) {
return;
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCsvFileImporter.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCsvFileImporter.java 2016-10-13 08:36:32 UTC (rev 9434)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCsvFileImporter.java 2016-10-13 08:36:59 UTC (rev 9435)
@@ -7,6 +7,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import javax.swing.JFileChooser;
+import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.gui.CtuluFileChooserCsvExcel;
import org.fudaa.ctulu.table.CtuluExcelCsvFileReader;
@@ -23,23 +24,29 @@
this.panel = aThis;
}
- void importCsv() {
- final CtuluFileChooserCsvExcel choose = new CtuluFileChooserCsvExcel(panel);
+ void importTablerFile() {
+ final CtuluFileChooserCsvExcel choose = CtuluFileChooserCsvExcel.createOpenFileChooser(panel);
choose.setDialogType(JFileChooser.OPEN_DIALOG);
choose.setTester(null);
final File f = choose.getDestFile();
if (f == null) {
return;
}
- final String[][] values = new CtuluExcelCsvFileReader(f).readFile();
+ final CtuluExcelCsvFileReader ctuluExcelCsvFileReader = new CtuluExcelCsvFileReader(f);
+ final String[][] values = ctuluExcelCsvFileReader.readFile();
if (values == null) {
return;
}
+ boolean isCsv = !ctuluExcelCsvFileReader.isExcel();
panel.t_.deleteAllValues();
panel.t_.clearSelection();
ArrayList tab = new ArrayList(values.length);
for (int i = 0; i < values.length; i++) {
String[] value = values[i];
+ //ignore les commentaire
+ if (isCsv && CtuluLibArray.isNotEmpty(value) && value[0] != null && value[0].startsWith("#")) {
+ continue;
+ }
//la premier ligne peut \xEAtre les entetes
if (i == 0) {
if (!CtuluLibString.isNumeric(value[0])) {
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java 2016-10-13 08:36:32 UTC (rev 9434)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java 2016-10-13 08:36:59 UTC (rev 9435)
@@ -725,8 +725,8 @@
t_.paste();
}
- protected void tableImport() {
- new EGCsvFileImporter(this).importCsv();
+ public void tableImport() {
+ new EGCsvFileImporter(this).importTablerFile();
}
EbliActionSimple actionDelete;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2017-01-02 14:42:30
|
Revision: 9496
http://sourceforge.net/p/fudaa/svn/9496
Author: bmarchan
Date: 2017-01-02 14:42:28 +0000 (Mon, 02 Jan 2017)
Log Message:
-----------
Ajout d'une methode pour tester qu'une URL est accessible.
Modified Paths:
--------------
trunk/framework/ctulu-fu/src/main/java/com/memoire/fu/FuLib.java
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaStartupExitPreferencesPanel.java
Modified: trunk/framework/ctulu-fu/src/main/java/com/memoire/fu/FuLib.java
===================================================================
--- trunk/framework/ctulu-fu/src/main/java/com/memoire/fu/FuLib.java 2016-12-30 14:55:02 UTC (rev 9495)
+++ trunk/framework/ctulu-fu/src/main/java/com/memoire/fu/FuLib.java 2017-01-02 14:42:28 UTC (rev 9496)
@@ -14,11 +14,25 @@
import java.beans.BeanInfo;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.StreamTokenizer;
+import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
import java.lang.reflect.Member;
import java.lang.reflect.Method;
+import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLDecoder;
@@ -1907,4 +1921,23 @@
* System.exit(0); } BuPreferences.BU.put("memory",""+m); }
*/
+ /**
+ * Controls that a resource exists on WWW.
+ *
+ * @param _url The url to be found.
+ * @return True : The file exists and is accessible.
+ */
+ public static boolean existsURL(URL _url) {
+ try {
+ HttpURLConnection.setFollowRedirects(false);
+ HttpURLConnection con=(HttpURLConnection) _url.openConnection();
+ con.setRequestMethod("HEAD");
+ // note : you may also need
+ // con.setInstanceFollowRedirects(false);
+ return (con.getResponseCode() == HttpURLConnection.HTTP_OK);
+ }
+ catch (Exception e) {
+ return false;
+ }
+ }
}
Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaStartupExitPreferencesPanel.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaStartupExitPreferencesPanel.java 2016-12-30 14:55:02 UTC (rev 9495)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaStartupExitPreferencesPanel.java 2017-01-02 14:42:28 UTC (rev 9496)
@@ -25,9 +25,11 @@
*/
public class FudaaStartupExitPreferencesPanel extends BuAbstractPreferencesPanel implements ActionListener {
+ public static final String PREF_CHECK_NEW_VERSION = "check.update";
+
private final String splash_ = "splashscreen.visible";
private final String exit_ = "confirm.exit";
- private final String update_ = "check.update";
+
final BuCheckBox cbExit_;
final BuCheckBox cbSplash_;
final BuCheckBox cbUpdate_;
@@ -75,7 +77,7 @@
BuPreferences.BU.putBooleanProperty(exit_, cbExit_.isSelected());
BuPreferences.BU.putBooleanProperty(splash_, cbSplash_.isSelected());
if (cbUpdate_ != null) {
- BuPreferences.BU.putBooleanProperty(update_, cbUpdate_.isSelected());
+ BuPreferences.BU.putBooleanProperty(PREF_CHECK_NEW_VERSION, cbUpdate_.isSelected());
}
setDirty(false);
}
@@ -85,7 +87,7 @@
cbExit_.setSelected(BuPreferences.BU.getBooleanProperty(exit_, true));
cbSplash_.setSelected(BuPreferences.BU.getBooleanProperty(splash_, true));
if (cbUpdate_ != null) {
- cbUpdate_.setSelected(BuPreferences.BU.getBooleanProperty(update_, true));
+ cbUpdate_.setSelected(BuPreferences.BU.getBooleanProperty(PREF_CHECK_NEW_VERSION, true));
}
setDirty(false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2017-05-15 20:56:44
|
Revision: 9556
http://sourceforge.net/p/fudaa/svn/9556
Author: bmarchan
Date: 2017-05-15 20:56:41 +0000 (Mon, 15 May 2017)
Log Message:
-----------
TableEditors : Flag d'edition seulement lors d'un doubleclick
Modified Paths:
--------------
trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuTableCellEditor.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluNumberFormatDefault.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorDouble.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorInteger.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorLong.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorString.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorTime.java
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuTableCellEditor.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuTableCellEditor.java 2017-05-15 10:42:34 UTC (rev 9555)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuTableCellEditor.java 2017-05-15 20:56:41 UTC (rev 9556)
@@ -11,9 +11,11 @@
package com.memoire.bu;
import java.awt.Component;
+import java.awt.event.MouseEvent;
import java.util.Enumeration;
import java.util.EventObject;
import java.util.Vector;
+
import javax.swing.JTable;
import javax.swing.event.CellEditorListener;
import javax.swing.event.ChangeEvent;
@@ -30,6 +32,7 @@
Object oldValue_;
BuTextField tf_;
Vector listeners_;
+ boolean editOnDblClick_=false;
public BuTableCellEditor(BuTextField _tf) {
if (_tf == null) {
@@ -39,6 +42,11 @@
tf_ = _tf;
listeners_ = new Vector(1, 1);
}
+
+ public BuTableCellEditor(BuTextField _tf, boolean _editOnDblClick) {
+ this(_tf);
+ editOnDblClick_=_editOnDblClick;
+ }
public void setSelectAll(boolean selectAll) {
tf_.setSelectAllIsGainFocus(selectAll);
@@ -72,6 +80,12 @@
}
public boolean isCellEditable(EventObject _evt) {
+ if (!editOnDblClick_)
+ return true;
+
+ if (_evt instanceof MouseEvent) {
+ return ((MouseEvent) _evt).getClickCount()>=2;
+ }
return true;
}
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluNumberFormatDefault.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluNumberFormatDefault.java 2017-05-15 10:42:34 UTC (rev 9555)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluNumberFormatDefault.java 2017-05-15 20:56:41 UTC (rev 9556)
@@ -118,6 +118,10 @@
fmt_ = _fmt == null ? DEFAULT : _fmt;
}
+ public NumberFormat getFmt() {
+ return fmt_;
+ }
+
@Override
public String toLocalizedPattern() {
return fmt_ instanceof DecimalFormat ? ((DecimalFormat) fmt_).toLocalizedPattern() : null;
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorDouble.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorDouble.java 2017-05-15 10:42:34 UTC (rev 9555)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorDouble.java 2017-05-15 20:56:41 UTC (rev 9556)
@@ -103,12 +103,12 @@
@Override
public TableCellEditor createTableEditorComponent() {
- return new BuTableCellEditor((BuTextField) createEditorComponent());
+ return new BuTableCellEditor((BuTextField) createEditorComponent(), true);
}
@Override
public TableCellEditor createCommonTableEditorComponent() {
- return new BuTableCellEditor((BuTextField) createCommonEditorComponent());
+ return new BuTableCellEditor((BuTextField) createCommonEditorComponent(), true);
}
public final CtuluNumberFormatI getFormatter() {
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorInteger.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorInteger.java 2017-05-15 10:42:34 UTC (rev 9555)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorInteger.java 2017-05-15 20:56:41 UTC (rev 9556)
@@ -80,12 +80,12 @@
@Override
public TableCellEditor createTableEditorComponent() {
- return new BuTableCellEditor((BuTextField) createEditorComponent());
+ return new BuTableCellEditor((BuTextField) createEditorComponent(), true);
}
@Override
public TableCellEditor createCommonTableEditorComponent() {
- return new BuTableCellEditor((BuTextField) createCommonEditorComponent());
+ return new BuTableCellEditor((BuTextField) createCommonEditorComponent(), true);
}
@Override
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorLong.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorLong.java 2017-05-15 10:42:34 UTC (rev 9555)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorLong.java 2017-05-15 20:56:41 UTC (rev 9556)
@@ -83,12 +83,12 @@
@Override
public TableCellEditor createTableEditorComponent() {
- return new BuTableCellEditor((BuTextField) createEditorComponent());
+ return new BuTableCellEditor((BuTextField) createEditorComponent(), true);
}
@Override
public TableCellEditor createCommonTableEditorComponent() {
- return new BuTableCellEditor((BuTextField) createCommonEditorComponent());
+ return new BuTableCellEditor((BuTextField) createCommonEditorComponent(), true);
}
@Override
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorString.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorString.java 2017-05-15 10:42:34 UTC (rev 9555)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorString.java 2017-05-15 20:56:41 UTC (rev 9556)
@@ -164,12 +164,12 @@
@Override
public TableCellEditor createTableEditorComponent(){
- return new BuTableCellEditor((BuTextField) createEditorComponent());
+ return new BuTableCellEditor((BuTextField) createEditorComponent(), true);
}
@Override
public TableCellEditor createCommonTableEditorComponent(){
- return new BuTableCellEditor((BuTextField) createCommonEditorComponent());
+ return new BuTableCellEditor((BuTextField) createCommonEditorComponent(), true);
}
@Override
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorTime.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorTime.java 2017-05-15 10:42:34 UTC (rev 9555)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorTime.java 2017-05-15 20:56:41 UTC (rev 9556)
@@ -91,7 +91,7 @@
@Override
public TableCellEditor createTableEditorComponent() {
- return new BuTableCellEditor((BuTextField) createEditorComponent()) {
+ return new BuTableCellEditor((BuTextField) createEditorComponent(), true) {
@Override
public Component getTableCellEditorComponent(final JTable _table, final Object _value, final boolean _selected,
@@ -103,14 +103,6 @@
}
@Override
- public boolean isCellEditable(final EventObject _evt) {
- if (_evt instanceof MouseEvent) {
- return ((MouseEvent) _evt).getClickCount() >= 2;
- }
- return true;
- }
-
- @Override
public boolean stopCellEditing() {
if (getCellEditorValue() == null) {
return false;
@@ -122,7 +114,7 @@
@Override
public TableCellEditor createCommonTableEditorComponent() {
- return new BuTableCellEditor((BuTextField) createCommonEditorComponent()) {
+ return new BuTableCellEditor((BuTextField) createCommonEditorComponent(), true) {
@Override
public Component getTableCellEditorComponent(final JTable _table, final Object _value, final boolean _selected,
@@ -133,14 +125,6 @@
}
@Override
- public boolean isCellEditable(final EventObject _evt) {
- if (_evt instanceof MouseEvent) {
- return ((MouseEvent) _evt).getClickCount() >= 2;
- }
- return true;
- }
-
- @Override
public boolean stopCellEditing() {
if (getCellEditorValue() == null) {
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2017-05-15 20:58:59
|
Revision: 9557
http://sourceforge.net/p/fudaa/svn/9557
Author: bmarchan
Date: 2017-05-15 20:58:57 +0000 (Mon, 15 May 2017)
Log Message:
-----------
Edition de geometrie : Les tableaux supportent le Cut/Paste
Modified Paths:
--------------
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluValuesMultiEditorPanel.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliFormatter.java
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluValuesMultiEditorPanel.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluValuesMultiEditorPanel.java 2017-05-15 20:56:41 UTC (rev 9556)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluValuesMultiEditorPanel.java 2017-05-15 20:58:57 UTC (rev 9557)
@@ -11,16 +11,13 @@
*/
package org.fudaa.ctulu.gui;
-import com.memoire.bu.BuBorderLayout;
-import com.memoire.bu.BuScrollPane;
-import java.awt.Color;
-import java.awt.Component;
import java.util.ArrayList;
import java.util.List;
+
import javax.swing.JTable;
-import javax.swing.SwingConstants;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableColumnModel;
+
import org.fudaa.ctulu.CtuluCommandComposite;
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluLib;
@@ -29,6 +26,9 @@
import org.fudaa.ctulu.editor.CtuluValueEditorI;
import org.fudaa.ctulu.table.CtuluTable;
+import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuScrollPane;
+
/**
* Un editeur de collections de valeurs.
*
@@ -251,29 +251,16 @@
model_ = new ValueTableModel();
table_ = new CtuluTable();
- table_.setRowSelectionAllowed(true);
+ // Pour permettre le copy/paste facilement surle tableau.
+ table_.setCellSelectionEnabled(true);
table_.setModel(model_);
- final TableColumnModel model = table_.getColumnModel();
- final CtuluCellTextRenderer render = new CtuluCellTextRenderer() {
- @Override
- public Component getTableCellRendererComponent(JTable _table, Object _value, boolean _isSelected, boolean _hasFocus, int _row, int _column) {
-
- String affValue = editors_[_column - 1].toString(_value);
- final Component r = super.getTableCellRendererComponent(_table, affValue, _isSelected, _hasFocus, _row, _column);
- setForeground(model_.isModified(_row, _column) ? Color.BLUE : _table.getForeground());
- return r;
- }
- };
- render.setHorizontalAlignment(SwingConstants.RIGHT);
+ TableColumnModel model = table_.getColumnModel();
// on construit les labels et les editeurs
for (int i = 0; i < title_.length; i++) {
model.getColumn(i + 1).setCellEditor(editors_[i].createTableEditorComponent());
- model.getColumn(i + 1).setCellRenderer(render);
}
- final CtuluCellTextRenderer intRenderer = new CtuluCellTextRenderer();
- intRenderer.setHorizontalAlignment(SwingConstants.RIGHT);
- model.getColumn(0).setCellRenderer(intRenderer);
+
add(new BuScrollPane(table_), BuBorderLayout.CENTER);
}
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java 2017-05-15 20:56:41 UTC (rev 9556)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java 2017-05-15 20:58:57 UTC (rev 9557)
@@ -135,6 +135,8 @@
setLayout(new BuBorderLayout());
// Construction de la table
table_ = new CtuluTable();
+ // Pour permettre le copy/paste facilement surle tableau.
+ table_.setCellSelectionEnabled(true);
table_.setModel(modelData_);
modelData_.updateEditorAndRenderer(table_);
// Gestion des erreurs
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java 2017-05-15 20:56:41 UTC (rev 9556)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java 2017-05-15 20:58:57 UTC (rev 9557)
@@ -7,10 +7,6 @@
*/
package org.fudaa.ebli.calque.edition;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.LinearRing;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -18,6 +14,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import javax.swing.JTable;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
@@ -24,6 +21,7 @@
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel;
+
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluCommandComposite;
import org.fudaa.ctulu.CtuluCommandContainer;
@@ -39,13 +37,18 @@
import org.fudaa.ctulu.gis.GISZoneAttributeFactory;
import org.fudaa.ctulu.gis.GISZoneCollection;
import org.fudaa.ctulu.gis.GISZoneCollectionGeometry;
-import org.fudaa.ctulu.gui.CtuluCellBooleanRenderer;
-import org.fudaa.ctulu.gui.CtuluCellDoubleRenderer;
import org.fudaa.ebli.calque.ZModelGeometryListener;
import org.fudaa.ebli.calque.ZModeleGeometry;
import org.fudaa.ebli.commun.EbliCoordinateDefinition;
+import org.fudaa.ebli.commun.EbliFormatter;
import org.fudaa.ebli.commun.EbliLib;
+import com.memoire.bu.BuTableCellRenderer;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.CoordinateSequence;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.LinearRing;
+
/**
* Cette classe permet d'adapter l'interface d'un ZModeleGeometry sur une g\xE9om\xE9trie sp\xE9cifique. C'est \xE0 dire que l'adapter se greffe sur le mod\xE8le et
* selectionne une des g\xE9om\xE9tries. Toutes les m\xE9thodes propos\xE9es par cette interface seront r\xE9alis\xE9es sur cette g\xE9om\xE9trie.
@@ -1035,11 +1038,18 @@
TableCellEditor editorXY = CtuluValueEditorDefaults.DOUBLE_EDITOR.createTableEditorComponent();
cols.getColumn(1).setCellEditor(editorXY);
cols.getColumn(2).setCellEditor(editorXY);
- cols.getColumn(1).setCellRenderer(new CtuluCellDoubleRenderer(coordDefs_[0].getFormatter().getXYFormatter()));
- cols.getColumn(2).setCellRenderer(new CtuluCellDoubleRenderer(coordDefs_[1].getFormatter().getXYFormatter()));
+ BuTableCellRenderer xRenderer = new BuTableCellRenderer();
+ BuTableCellRenderer yRenderer = new BuTableCellRenderer();
+ xRenderer.setNumberFormat(((EbliFormatter) coordDefs_[0].getFormatter()).getFmt());
+ yRenderer.setNumberFormat(((EbliFormatter) coordDefs_[1].getFormatter()).getFmt());
+ cols.getColumn(1).setCellRenderer(xRenderer);
+ cols.getColumn(2).setCellRenderer(yRenderer);
// Colonnes des attributs
if (modele_ != null) {
+ BuTableCellRenderer otherRenderer = new BuTableCellRenderer();
+ otherRenderer.setNumberFormat(((EbliFormatter) coordDefs_[2].getFormatter()).getFmt());
+
for (int i = 0; i < lattrs_.size(); i++) {
CtuluValueEditorI editor = lattrs_.get(i).getEditor();
if (editor != null) {
@@ -1046,13 +1056,8 @@
final TableCellEditor createTableEditorComponent = editor.createTableEditorComponent();
cols.getColumn(3 + i).setCellEditor(createTableEditorComponent);
}
- // Le renderer pour les Double
- if (lattrs_.get(i).getDataClass().equals(Double.class)) {
- cols.getColumn(3 + i).setCellRenderer(new CtuluCellDoubleRenderer(coordDefs_[2].getFormatter().getXYFormatter()));
- } // Pour un Boolean
- else if (lattrs_.get(i).getDataClass().equals(Boolean.class)) {
- cols.getColumn(3 + i).setCellRenderer(new CtuluCellBooleanRenderer());
- }
+ // Le renderer pour les colonnes attributs
+ cols.getColumn(3 + i).setCellRenderer(otherRenderer);
}
}
}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliFormatter.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliFormatter.java 2017-05-15 20:56:41 UTC (rev 9556)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliFormatter.java 2017-05-15 20:58:57 UTC (rev 9557)
@@ -47,6 +47,11 @@
buildDefaultXYFormatter();
((CtuluNumberFormatDefault) formatter_).setFmt(_fmt);
}
+
+ public NumberFormat getFmt() {
+ buildDefaultXYFormatter();
+ return ((CtuluNumberFormatDefault) formatter_).getFmt();
+ }
protected void buildDefaultXYFormatter() {
if (formatter_ == null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2017-05-21 19:18:32
|
Revision: 9559
http://sourceforge.net/p/fudaa/svn/9559
Author: deniger
Date: 2017-05-21 19:18:29 +0000 (Sun, 21 May 2017)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-graphe-3D/pom.xml
trunk/framework/ebli-network/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
trunk/framework/fudaa-dico/pom.xml
trunk/framework/fudaa-dico/server/pom.xml
trunk/framework/fudaa-dico/ui/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ctulu-bu/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ctulu-common/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ctulu-fu/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ctulu-gis/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ctulu-ui/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ctulu-video/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/dodico-common/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ebli-1d/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ebli-2d/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ebli-3d/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ebli-common/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ebli-graphe/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-graphe-3D/pom.xml
===================================================================
--- trunk/framework/ebli-graphe-3D/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ebli-graphe-3D/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe-3D</artifactId>
Modified: trunk/framework/ebli-network/pom.xml
===================================================================
--- trunk/framework/ebli-network/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ebli-network/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-network</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/fudaa-common/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/fudaa-common-save/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
Modified: trunk/framework/fudaa-dico/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/fudaa-dico/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
Modified: trunk/framework/fudaa-dico/server/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/server/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/fudaa-dico/server/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>dico-server</artifactId>
Modified: trunk/framework/fudaa-dico/ui/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/ui/pom.xml 2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/fudaa-dico/ui/pom.xml 2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.9</version>
</parent>
<artifactId>dico-ui</artifactId>
<name>Dico UI</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2017-05-21 20:18:24
|
Revision: 9602
http://sourceforge.net/p/fudaa/svn/9602
Author: deniger
Date: 2017-05-21 20:18:22 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 2.0-SNAPSHOT
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-graphe-3D/pom.xml
trunk/framework/ebli-network/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
trunk/framework/fudaa-dico/pom.xml
trunk/framework/fudaa-dico/server/pom.xml
trunk/framework/fudaa-dico/ui/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ctulu-bu/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ctulu-common/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ctulu-gis/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ctulu-ui/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ctulu-video/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/dodico-common/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ebli-1d/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ebli-3d/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ebli-common/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ebli-graphe/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-graphe-3D/pom.xml
===================================================================
--- trunk/framework/ebli-graphe-3D/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ebli-graphe-3D/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe-3D</artifactId>
Modified: trunk/framework/ebli-network/pom.xml
===================================================================
--- trunk/framework/ebli-network/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ebli-network/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-network</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/fudaa-common/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/fudaa-common-save/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
Modified: trunk/framework/fudaa-dico/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/fudaa-dico/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
Modified: trunk/framework/fudaa-dico/server/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/server/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/fudaa-dico/server/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>dico-server</artifactId>
Modified: trunk/framework/fudaa-dico/ui/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/ui/pom.xml 2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/fudaa-dico/ui/pom.xml 2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
- <version>1.9</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<artifactId>dico-ui</artifactId>
<name>Dico UI</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X