You can subscribe to this list here.
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(46) |
Jul
(37) |
Aug
(154) |
Sep
(140) |
Oct
(132) |
Nov
(104) |
Dec
(67) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2009 |
Jan
(113) |
Feb
(73) |
Mar
(102) |
Apr
(106) |
May
(114) |
Jun
(67) |
Jul
(116) |
Aug
(48) |
Sep
(108) |
Oct
(296) |
Nov
(56) |
Dec
(53) |
2010 |
Jan
(95) |
Feb
(31) |
Mar
(40) |
Apr
(12) |
May
(10) |
Jun
(27) |
Jul
(19) |
Aug
(81) |
Sep
(48) |
Oct
(45) |
Nov
(40) |
Dec
(7) |
2011 |
Jan
(16) |
Feb
(32) |
Mar
(55) |
Apr
(38) |
May
(24) |
Jun
(37) |
Jul
(12) |
Aug
(16) |
Sep
(97) |
Oct
(90) |
Nov
(101) |
Dec
(89) |
2012 |
Jan
(18) |
Feb
(2) |
Mar
(54) |
Apr
(69) |
May
(97) |
Jun
(131) |
Jul
(70) |
Aug
(48) |
Sep
(48) |
Oct
(119) |
Nov
(194) |
Dec
(60) |
2013 |
Jan
(73) |
Feb
(35) |
Mar
(42) |
Apr
(28) |
May
(7) |
Jun
(17) |
Jul
(27) |
Aug
(10) |
Sep
(38) |
Oct
(12) |
Nov
(4) |
Dec
(16) |
2014 |
Jan
(33) |
Feb
(37) |
Mar
(19) |
Apr
(3) |
May
(47) |
Jun
(26) |
Jul
(22) |
Aug
|
Sep
(10) |
Oct
(30) |
Nov
(24) |
Dec
(19) |
2015 |
Jan
(13) |
Feb
(16) |
Mar
(36) |
Apr
(19) |
May
(5) |
Jun
(5) |
Jul
(3) |
Aug
(11) |
Sep
(22) |
Oct
(7) |
Nov
(14) |
Dec
|
2016 |
Jan
|
Feb
(26) |
Mar
(13) |
Apr
(61) |
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
(27) |
Nov
(14) |
Dec
(21) |
2017 |
Jan
(30) |
Feb
(4) |
Mar
(3) |
Apr
(5) |
May
(69) |
Jun
(29) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <de...@us...> - 2016-10-12 07:23:37
|
Revision: 9420 http://sourceforge.net/p/fudaa/svn/9420 Author: deniger Date: 2016-10-12 07:23:35 +0000 (Wed, 12 Oct 2016) Log Message: ----------- Changement de nom pour des classe d'exemplle: Test -> Example Modified Paths: -------------- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLibFile.java Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLibFile.java =================================================================== --- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLibFile.java 2016-10-12 07:17:25 UTC (rev 9419) +++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLibFile.java 2016-10-12 07:23:35 UTC (rev 9420) @@ -330,6 +330,7 @@ /** * Supprime un repertoire, avec tous les fichiers qu'il contient. + * * @param _f Le repertoire a d\xE9truire * @return True : Le repertoire a \xE9t\xE9 correctement d\xE9truit. */ @@ -677,14 +678,19 @@ return copyFileChannel(_fileFrom, _fileTo, _append); } + public static File getFileFromJar(final String pathInJar, File destFile) { + return getFileFromJar(pathInJar, destFile, CtuluLibFile.class); + + } + /** * @param pathInJar la pathInJar a lire * @return le fichier ou une copie si necessaire */ - public static File getFileFromJar(final String pathInJar, File destFile) { + public static File getFileFromJar(final String pathInJar, File destFile, Class clazzToLoad) { URI uri = null; try { - final URL resource = CtuluLibFile.class.getResource(pathInJar); + final URL resource = clazzToLoad.getResource(pathInJar); assert resource != null; uri = resource.toURI(); } catch (final URISyntaxException e) { @@ -962,10 +968,8 @@ /** * Renvoie l'extension du fichier.<br> - * <code>'fichier.jpg'</code> renverra - * <code>'jpg'</code>.<br> - * <code>'fichier'</code> renverra - * <code>null</code>. + * <code>'fichier.jpg'</code> renverra <code>'jpg'</code>.<br> + * <code>'fichier'</code> renverra <code>null</code>. * * @param _fName le nom du fichier * @return null si pas d'extension sinon l'extension sans point This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-10-12 06:58:09
|
Revision: 9418 http://sourceforge.net/p/fudaa/svn/9418 Author: deniger Date: 2016-10-12 06:58:06 +0000 (Wed, 12 Oct 2016) Log Message: ----------- Changement de nom pour des classe d'exemplle: Test -> Example Added Paths: ----------- trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/BGrapheExample.java trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/FrameImpressionExample.java trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/GrapheExample.java Removed Paths: ------------- trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/TestBGraphe.java trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/TestFrameImpression.java trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/TestGraphe.java Copied: trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/BGrapheExample.java (from rev 9367, trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/TestBGraphe.java) =================================================================== --- trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/BGrapheExample.java (rev 0) +++ trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/BGrapheExample.java 2016-10-12 06:58:06 UTC (rev 9418) @@ -0,0 +1,318 @@ +/* + * @file TestGraphe.java + * @creation 1999-02-24 + * @modification $Date: 2006-12-05 10:14:36 $ + * @license GNU General Public License 2 + * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne + * @mail de...@fu... + */ +package org.fudaa.ebli.graphe.example; + +import java.applet.Applet; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.print.PageFormat; +import java.awt.print.Printable; +import java.awt.print.PrinterJob; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.io.File; +import java.io.FileReader; +import java.io.Reader; + +import javax.swing.JComponent; +import javax.swing.JDesktopPane; +import javax.swing.JDialog; +import javax.swing.JFileChooser; +import javax.swing.JFrame; +import javax.swing.JInternalFrame; +import javax.swing.JMenuBar; + +import com.memoire.bu.BuButton; +import com.memoire.bu.BuDialogError; +import com.memoire.bu.BuFileChooser; +import com.memoire.bu.BuInformationsDocument; +import com.memoire.bu.BuInformationsSoftware; +import com.memoire.bu.BuInternalFrame; +import com.memoire.bu.BuResource; + +import org.fudaa.ebli.graphe.BGraphe; +import org.fudaa.ebli.graphe.BGraphePersonnaliseur; +import org.fudaa.ebli.graphe.Graphe; +import org.fudaa.ebli.graphe.Lecteur; +import org.fudaa.ebli.impression.EbliFillePrevisualisation; +import org.fudaa.ebli.impression.EbliMiseEnPageDialog; +import org.fudaa.ebli.impression.EbliPageFormat; +import org.fudaa.ebli.impression.EbliPageable; +import org.fudaa.ebli.impression.EbliPageableDelegate; + +/** + * Graphe Definition File. + * + * @version $Revision: 1.7 $ $Date: 2006-12-05 10:14:36 $ by $Author: deniger $ + * @author Axel von Arnim + * @see Applet + */ +public class BGrapheExample extends JFrame implements ActionListener { + File defaultHome_ = new File(System.getProperty("user.home")); + BuInformationsSoftware is_; + JDesktopPane desk_; + + public BGrapheExample() { + this(null); + } + + public BGrapheExample(final String _fichier) { + super("Visualisation graphe"); + setDefaultCloseOperation(EXIT_ON_CLOSE); + desk_ = new JDesktopPane(); + setSize(new Dimension(640, 480)); + setContentPane(desk_); + final BuButton open = new BuButton("ouvrir"); + open.setActionCommand("OPEN"); + open.addActionListener(this); + final JMenuBar menu = new JMenuBar(); + menu.add(open); + setJMenuBar(menu); + if (_fichier != null) { + litFichier(_fichier); + } + show(); + } + + public void addInternal(final JInternalFrame _g) { + _g.setVisible(true); + desk_.add(_g); + } + class IFrameGraphe extends BuInternalFrame implements EbliPageable { + EbliFillePrevisualisation previsu_; + public BGraphe graphe_; + EbliPageableDelegate delegueImpression_; + + public IFrameGraphe(final BGraphe _graphe) { + super(); + graphe_ = _graphe; + delegueImpression_ = new EbliPageableDelegate(this); + this.setSize(new Dimension(640, 480)); + graphe_.setInteractif(true); + this.setContentPane(graphe_); + final BuButton open = new BuButton("ouvrir"); + open.setActionCommand("OPEN"); + open.addActionListener(this); + final BuButton pers = new BuButton("perso"); + pers.setActionCommand("PERSO"); + pers.addActionListener(this); + final BuButton impr = new BuButton("imprimer"); + impr.setActionCommand("IMPRIMER"); + impr.addActionListener(this); + final BuButton prev = new BuButton("previsualiser"); + prev.setActionCommand("PREVISUALISER"); + prev.addActionListener(this); + final BuButton fermer = new BuButton("fermer"); + fermer.setActionCommand("FERMER"); + fermer.addActionListener(this); + final JMenuBar menu = new JMenuBar(); + menu.add(open); + menu.add(pers); + menu.add(impr); + menu.add(prev); + menu.add(fermer); + this.setJMenuBar(menu); + } + + private void openPersonnaliseur() { + final Graphe gr = graphe_.getGraphe(); + if (gr == null) { + return; + } + final JDialog dl = new JDialog(BGrapheExample.this); + final BGraphePersonnaliseur p = new BGraphePersonnaliseur(gr); + p.addPropertyChangeListener(new PropertyChangeListener() { + public void propertyChange(final PropertyChangeEvent _evt) { + graphe_.fullRepaint(); + } + }); + dl.setContentPane(p); + dl.pack(); + dl.show(); + } + + public int print(final Graphics _g, final PageFormat _format, final int _numPage) { + return graphe_.print(_g, _format, _numPage); + } + + public int getNumberOfPages() { + return 1; + } + + public Printable getPrintable(final int _i) { + if (delegueImpression_ == null) { + delegueImpression_ = new EbliPageableDelegate(this); + } + return delegueImpression_.getPrintable(_i); + } + + public PageFormat getPageFormat(final int _i) { + if (delegueImpression_ == null) { + delegueImpression_ = new EbliPageableDelegate(this); + } + return delegueImpression_.getPageFormat(_i); + } + + public EbliPageFormat getDefaultEbliPageFormat() { + if (delegueImpression_ == null) { + delegueImpression_ = new EbliPageableDelegate(this); + } + return delegueImpression_.getDefaultEbliPageFormat(); + } + + public BuInformationsDocument getInformationsDocument() { + return graphe_.getInformationsDocument(); + } + + public BuInformationsSoftware getInformationsSoftware() { + return BGrapheExample.this.is_; + } + + private void gestionnaireImpression(final String _commande) { + if ("IMPRIMER".equals(_commande)) { + cmdImprimer(this); + } else if ("MISEENPAGE".equals(_commande)) { + cmdMiseEnPage(this); + } else if ("PREVISUALISER".equals(_commande)) { + cmdPrevisualisation(this); + } + } + + /** + * Impression de la page <code>_target</code> dans un nouveau thread. + */ + public void cmdImprimer(final EbliPageable _target) { + final PrinterJob printJob = PrinterJob.getPrinterJob(); + printJob.setPageable(_target); + if (printJob.printDialog()) { + new Thread(BuResource.BU.getString("Impression")) { + public void run() { + try { + printJob.print(); + } catch (final Exception _printException) { + _printException.printStackTrace(); + } + } + }.start(); + } + } + + public void cmdMiseEnPage(final EbliPageable _target) { + new EbliMiseEnPageDialog(_target, null, null).activate(); + } + + public void cmdPrevisualisation(final EbliPageable _target) { + if (previsu_ == null) { + previsu_ = new EbliFillePrevisualisation(null, _target); + final JMenuBar me = new JMenuBar(); + final JComponent[] meI = previsu_.getSpecificTools(); + for (int i = 0; i < meI.length; i++) { + me.add(meI[i]); + } + previsu_.setJMenuBar(me); + } + BGrapheExample.this.addInternal(previsu_); + previsu_.moveToFront(); + } + + public void actionPerformed(final ActionEvent _ae) { + final String com = _ae.getActionCommand(); + if ("PERSO".equals(com)) { + openPersonnaliseur(); + } else if (("PREVISUALISER".equals(com)) || ("MISEENPAGE".equals(com)) || ("IMPRIMER".equals(com))) { + gestionnaireImpression(com); + } else if ("FERMER".equals(com)) { + this.dispose(); + } + } + } + + private void litFichier(final String _fic) { + Graphe g = null; + try { + final Reader is = new FileReader(_fic); + final Lecteur lin = new Lecteur(is); + if (_fic.endsWith(".gdf")) { + g = parse(lin); + } else { + g = parseXY(lin); + } + } catch (final Exception e) { + e.printStackTrace(); + } + if (g != null) { + g.copyright_ = false; + final BGraphe bf = new BGraphe(); + bf.setGraphe(g); + final IFrameGraphe f = new IFrameGraphe(bf); + f.setSize(new Dimension(540, 380)); + addInternal(f); + } else { + new BuDialogError(null, null, "Erreur de lecture").activate(); + } + } + + public void actionPerformed(final ActionEvent _ae) { + final String com = _ae.getActionCommand(); + if ("OPEN".equals(com)) { + open(); + } + } + + public static Graphe parse(final Lecteur _l) { + Graphe r = null; + String t = _l.get(); + while (!t.equals("")) { + if (t.equals("graphe")) { + r = Graphe.parse(_l, null); + } else { + System.err.println("Erreur de syntaxe: " + t); + } + t = _l.get(); + } + return r; + } + + public static Graphe parseXY(final Lecteur _l) { + return Graphe.parseXY(_l); + } + + private void open() { + final BuFileChooser f = new BuFileChooser(); + f.setDialogType(JFileChooser.OPEN_DIALOG); + f.setCurrentDirectory(defaultHome_); + f.setFileSelectionMode(JFileChooser.FILES_ONLY); + final int i = f.showOpenDialog(this); + if (i == JFileChooser.APPROVE_OPTION) { + final File file = f.getSelectedFile(); + final File parent = file.getParentFile(); + if (parent != null) { + defaultHome_ = parent; + } + litFichier(file.getAbsolutePath()); + } + } + + public BuInformationsSoftware getInformationsSoftware() { + if (is_ == null) { + is_ = new BuInformationsSoftware(); + } + return is_; + } + + public static void main(final String[] _args) { + if (_args.length < 1) { + new BGrapheExample(); + } else { + new BGrapheExample(_args[0]); + } + } +} Copied: trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/FrameImpressionExample.java (from rev 9367, trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/TestFrameImpression.java) =================================================================== --- trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/FrameImpressionExample.java (rev 0) +++ trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/FrameImpressionExample.java 2016-10-12 06:58:06 UTC (rev 9418) @@ -0,0 +1,154 @@ +/* + * @file TestFrameImpression.java + * @creation 2001-06-28 + * @modification $Date: 2006-10-19 14:13:24 $ + * @license GNU General Public License 2 + * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne + * @mail de...@fu... + */ +package org.fudaa.ebli.graphe.example; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.print.PageFormat; +import java.awt.print.Printable; +import java.awt.print.PrinterJob; +import java.io.IOException; + +import javax.swing.JFrame; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JTable; + +import org.fudaa.ebli.graphe.BGraphe; +import org.fudaa.ebli.graphe.Graphe; +import org.fudaa.ebli.graphe.Lecteur; +/** + * @version $Id: TestFrameImpression.java,v 1.2 2006-10-19 14:13:24 deniger Exp $ + * @author Fred Deniger + */ +public class FrameImpressionExample + extends JFrame + implements ActionListener, Printable { + /** + * GrapheFrame + */ + public FrameImpressionExample() { + super(); + setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + final JMenuBar menu= new JMenuBar(); + final JMenuItem imprime= new JMenuItem("Imprimer"); + imprime.addActionListener(this); + final JMenuItem change= new JMenuItem("Changer le mode"); + change.addActionListener(this); + menu.add(imprime); + menu.add(change); + setJMenuBar(menu); + setSize(new Dimension(640, 480)); + show(); + } + /** + * .... + * + * @param _comp + */ + private void imprimer(final Printable _comp) { + final PrinterJob printJob= PrinterJob.getPrinterJob(); + printJob.setPrintable(_comp); + if (printJob.printDialog()) { + try { + printJob.print(); + System.out.println("fini"); + } catch (final Exception PrintException) { + PrintException.printStackTrace(); + } + } + } + /** + * .... + * + * @param _fichier + */ + public void loadFichier(final String _fichier) { + try { + final Graphe g= + Graphe.parse(new Lecteur(new java.io.FileReader(_fichier)), null); + final BGraphe bg= new BGraphe(); + bg.setGraphe(g); + setContentPane(bg); + bg.revalidate(); + } catch (final IOException e) { + e.printStackTrace(); + System.exit(1); + } + } + /** + * .... + */ + public void chargerTableau() { + final JTable table= new JTable(10, 10); + for (int i= 0; i < table.getColumnCount(); i++) { + for (int j= 0; j < table.getRowCount(); j++) { + table.setValueAt("Essai col" + i + " ligne" + j, i, j); + } + } + setContentPane(table); + table.revalidate(); + } + public int print(final Graphics _g, final PageFormat _format, final int _numPage) { + System.err.println("passage" + _numPage); + if (_numPage != 0) { + return Printable.NO_SUCH_PAGE; + } + System.out.println(_g); + ((BGraphe)getContentPane()).print(_g, _format, _numPage); + return Printable.PAGE_EXISTS; + } + /** + * .... + * + * @param _e + */ + public void actionPerformed(final ActionEvent _e) { + if ("Imprimer".equals(_e.getActionCommand())) { + System.out.println("Impression demand\xE9e"); + imprimer(this); + /* + Component cont = getContentPane(); + if(cont instanceof Printable) + { + System.out.println("\nImprimable"); + //imprimer((Printable)cont); + imprimer(this) + } + else + { + System.out.println("\nNon imprimable"); + } + } + else if("Changer le mode".equals(_e.getActionCommand())) + { + // if(getContentPane() instanceof BGraphe) + // { + // System.out.println("changement de mode"); + // ((BGrapheEssai)getContentPane()).changeMode(); + // } + }*/ + } + } + /** + * main de TestFrameImpression class + * + * @param args The command line arguments + */ + public static void main(final String[] args) { + if (args.length == 0) { + System.out.println("Usage: TestFrameImpression <fichier>"); + System.exit(1); + } + final FrameImpressionExample frame= new FrameImpressionExample(); + //frame.chargerTableau(); + frame.loadFichier(args[0]); + } +} Copied: trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/GrapheExample.java (from rev 9367, trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/TestGraphe.java) =================================================================== --- trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/GrapheExample.java (rev 0) +++ trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/GrapheExample.java 2016-10-12 06:58:06 UTC (rev 9418) @@ -0,0 +1,165 @@ +/* + * @creation 1999-02-24 + * @modification $Date: 2006-10-19 14:13:24 $ + * @license GNU General Public License 2 + * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne + * @mail de...@fu... + */ +package org.fudaa.ebli.graphe.example; + +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Image; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.io.FileReader; +import java.io.Reader; + +import javax.swing.JFrame; + +import org.fudaa.ctulu.CtuluLibString; + +import org.fudaa.ebli.graphe.BGraphe; +import org.fudaa.ebli.graphe.BGraphePersonnaliseur; +import org.fudaa.ebli.graphe.Graphe; +import org.fudaa.ebli.graphe.Lecteur; + +/** + * Graphe Definition File. + * + * @version $Revision: 1.6 $ $Date: 2006-10-19 14:13:24 $ by $Author: deniger $ + * @author Axel von Arnim + */ +public class GrapheExample extends JFrame implements Runnable { + String erreur_; + int temps_; + int w_, h_; + Thread animation_; + Image tampon_; + public Graphe graphe_; + Lecteur lin_; + String file_; + + public GrapheExample(final String _f) { + super(); + file_ = _f; + setSize(new Dimension(640, 480)); + show(); + init(); + } + + public void error(final String _m) { + erreur_ = "Erreur: " + getClass() + CtuluLibString.DOT + _m; + System.err.println(erreur_); + } + + public void init() { + erreur_ = ""; + temps_ = 0; + w_ = getSize().width; + h_ = getSize().height; + tampon_ = createImage(w_, h_); + try { + final Reader is = new FileReader(file_); + lin_ = new Lecteur(is); + if (file_.endsWith(".gdf")) { + parse(); + } else { + parseXY(); + } + } catch (final Exception e) { + e.printStackTrace(); + } + if ((graphe_ != null) && !graphe_.animation_) { + maj(); + } + + final BGraphe bgraphe = new BGraphe(); + bgraphe.setSize(w_, h_); + bgraphe.setSize(getSize()); + graphe_.titre_ = "Courbe de de dzergfset sfdsg g fdsf sdf sdfsd sg qgq "; + bgraphe.setGraphe(graphe_); + bgraphe.setInteractif(true); + setContentPane(bgraphe); + } + + public void parse() { + String t = lin_.get(); + while (!t.equals("")) { + if (t.equals("graphe")) { + graphe_ = Graphe.parse(lin_, null); + } else { + System.err.println("Erreur de syntaxe: " + t); + } + t = lin_.get(); + } + } + + public void parseXY() { + graphe_ = Graphe.parseXY(lin_); + } + + public void maj() { + final Graphics g = tampon_.getGraphics(); + if (graphe_ != null) { + graphe_.dessine(g, 0, 0, w_, h_, temps_, null); + } + } + + public void update(final Graphics _g) { + paint(_g); + } + + public void start() { + if ((graphe_ != null) && graphe_.animation_) { + animation_ = new Thread(this); + animation_.start(); + } + } + + public void stop() { + if ((graphe_ != null) && graphe_.animation_) { + graphe_.animation_ = false; + } + } + + public void run() { + if ((graphe_ != null) && graphe_.animation_) { + while (graphe_.animation_) { + final long avant = System.currentTimeMillis(); + maj(); + repaint(); + temps_++; + final long apres = System.currentTimeMillis(); + System.err.println("Temps = " + (apres - avant)); + if (apres - avant < graphe_.vitesse_) { + try { + Thread.sleep(graphe_.vitesse_ + avant - apres); + } catch (final InterruptedException e) { + e.printStackTrace(); + } + } + } + } + } + + public static void main(final String[] _args) { + if (_args.length < 1) { + System.err.println("Usage: java TestGraphe <fichier>"); + System.exit(1); + } + final GrapheExample frame = new GrapheExample(_args[0]); + final JFrame dl = new JFrame(); + final BGraphePersonnaliseur p = new BGraphePersonnaliseur(frame.graphe_); + p.addPropertyChangeListener(new PropertyChangeListener() { + public void propertyChange(final PropertyChangeEvent _evt) { + frame.maj(); + frame.repaint(); + } + }); + dl.setContentPane(p); + dl.pack(); + dl.show(); + frame.start(); + } +} Deleted: trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/TestBGraphe.java =================================================================== --- trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/TestBGraphe.java 2016-10-04 16:24:45 UTC (rev 9417) +++ trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/TestBGraphe.java 2016-10-12 06:58:06 UTC (rev 9418) @@ -1,318 +0,0 @@ -/* - * @file TestGraphe.java - * @creation 1999-02-24 - * @modification $Date: 2006-12-05 10:14:36 $ - * @license GNU General Public License 2 - * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne - * @mail de...@fu... - */ -package org.fudaa.ebli.graphe.example; - -import java.applet.Applet; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.print.PageFormat; -import java.awt.print.Printable; -import java.awt.print.PrinterJob; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.io.File; -import java.io.FileReader; -import java.io.Reader; - -import javax.swing.JComponent; -import javax.swing.JDesktopPane; -import javax.swing.JDialog; -import javax.swing.JFileChooser; -import javax.swing.JFrame; -import javax.swing.JInternalFrame; -import javax.swing.JMenuBar; - -import com.memoire.bu.BuButton; -import com.memoire.bu.BuDialogError; -import com.memoire.bu.BuFileChooser; -import com.memoire.bu.BuInformationsDocument; -import com.memoire.bu.BuInformationsSoftware; -import com.memoire.bu.BuInternalFrame; -import com.memoire.bu.BuResource; - -import org.fudaa.ebli.graphe.BGraphe; -import org.fudaa.ebli.graphe.BGraphePersonnaliseur; -import org.fudaa.ebli.graphe.Graphe; -import org.fudaa.ebli.graphe.Lecteur; -import org.fudaa.ebli.impression.EbliFillePrevisualisation; -import org.fudaa.ebli.impression.EbliMiseEnPageDialog; -import org.fudaa.ebli.impression.EbliPageFormat; -import org.fudaa.ebli.impression.EbliPageable; -import org.fudaa.ebli.impression.EbliPageableDelegate; - -/** - * Graphe Definition File. - * - * @version $Revision: 1.7 $ $Date: 2006-12-05 10:14:36 $ by $Author: deniger $ - * @author Axel von Arnim - * @see Applet - */ -public class TestBGraphe extends JFrame implements ActionListener { - File defaultHome_ = new File(System.getProperty("user.home")); - BuInformationsSoftware is_; - JDesktopPane desk_; - - public TestBGraphe() { - this(null); - } - - public TestBGraphe(final String _fichier) { - super("Visualisation graphe"); - setDefaultCloseOperation(EXIT_ON_CLOSE); - desk_ = new JDesktopPane(); - setSize(new Dimension(640, 480)); - setContentPane(desk_); - final BuButton open = new BuButton("ouvrir"); - open.setActionCommand("OPEN"); - open.addActionListener(this); - final JMenuBar menu = new JMenuBar(); - menu.add(open); - setJMenuBar(menu); - if (_fichier != null) { - litFichier(_fichier); - } - show(); - } - - public void addInternal(final JInternalFrame _g) { - _g.setVisible(true); - desk_.add(_g); - } - class IFrameGraphe extends BuInternalFrame implements EbliPageable { - EbliFillePrevisualisation previsu_; - public BGraphe graphe_; - EbliPageableDelegate delegueImpression_; - - public IFrameGraphe(final BGraphe _graphe) { - super(); - graphe_ = _graphe; - delegueImpression_ = new EbliPageableDelegate(this); - this.setSize(new Dimension(640, 480)); - graphe_.setInteractif(true); - this.setContentPane(graphe_); - final BuButton open = new BuButton("ouvrir"); - open.setActionCommand("OPEN"); - open.addActionListener(this); - final BuButton pers = new BuButton("perso"); - pers.setActionCommand("PERSO"); - pers.addActionListener(this); - final BuButton impr = new BuButton("imprimer"); - impr.setActionCommand("IMPRIMER"); - impr.addActionListener(this); - final BuButton prev = new BuButton("previsualiser"); - prev.setActionCommand("PREVISUALISER"); - prev.addActionListener(this); - final BuButton fermer = new BuButton("fermer"); - fermer.setActionCommand("FERMER"); - fermer.addActionListener(this); - final JMenuBar menu = new JMenuBar(); - menu.add(open); - menu.add(pers); - menu.add(impr); - menu.add(prev); - menu.add(fermer); - this.setJMenuBar(menu); - } - - private void openPersonnaliseur() { - final Graphe gr = graphe_.getGraphe(); - if (gr == null) { - return; - } - final JDialog dl = new JDialog(TestBGraphe.this); - final BGraphePersonnaliseur p = new BGraphePersonnaliseur(gr); - p.addPropertyChangeListener(new PropertyChangeListener() { - public void propertyChange(final PropertyChangeEvent _evt) { - graphe_.fullRepaint(); - } - }); - dl.setContentPane(p); - dl.pack(); - dl.show(); - } - - public int print(final Graphics _g, final PageFormat _format, final int _numPage) { - return graphe_.print(_g, _format, _numPage); - } - - public int getNumberOfPages() { - return 1; - } - - public Printable getPrintable(final int _i) { - if (delegueImpression_ == null) { - delegueImpression_ = new EbliPageableDelegate(this); - } - return delegueImpression_.getPrintable(_i); - } - - public PageFormat getPageFormat(final int _i) { - if (delegueImpression_ == null) { - delegueImpression_ = new EbliPageableDelegate(this); - } - return delegueImpression_.getPageFormat(_i); - } - - public EbliPageFormat getDefaultEbliPageFormat() { - if (delegueImpression_ == null) { - delegueImpression_ = new EbliPageableDelegate(this); - } - return delegueImpression_.getDefaultEbliPageFormat(); - } - - public BuInformationsDocument getInformationsDocument() { - return graphe_.getInformationsDocument(); - } - - public BuInformationsSoftware getInformationsSoftware() { - return TestBGraphe.this.is_; - } - - private void gestionnaireImpression(final String _commande) { - if ("IMPRIMER".equals(_commande)) { - cmdImprimer(this); - } else if ("MISEENPAGE".equals(_commande)) { - cmdMiseEnPage(this); - } else if ("PREVISUALISER".equals(_commande)) { - cmdPrevisualisation(this); - } - } - - /** - * Impression de la page <code>_target</code> dans un nouveau thread. - */ - public void cmdImprimer(final EbliPageable _target) { - final PrinterJob printJob = PrinterJob.getPrinterJob(); - printJob.setPageable(_target); - if (printJob.printDialog()) { - new Thread(BuResource.BU.getString("Impression")) { - public void run() { - try { - printJob.print(); - } catch (final Exception _printException) { - _printException.printStackTrace(); - } - } - }.start(); - } - } - - public void cmdMiseEnPage(final EbliPageable _target) { - new EbliMiseEnPageDialog(_target, null, null).activate(); - } - - public void cmdPrevisualisation(final EbliPageable _target) { - if (previsu_ == null) { - previsu_ = new EbliFillePrevisualisation(null, _target); - final JMenuBar me = new JMenuBar(); - final JComponent[] meI = previsu_.getSpecificTools(); - for (int i = 0; i < meI.length; i++) { - me.add(meI[i]); - } - previsu_.setJMenuBar(me); - } - TestBGraphe.this.addInternal(previsu_); - previsu_.moveToFront(); - } - - public void actionPerformed(final ActionEvent _ae) { - final String com = _ae.getActionCommand(); - if ("PERSO".equals(com)) { - openPersonnaliseur(); - } else if (("PREVISUALISER".equals(com)) || ("MISEENPAGE".equals(com)) || ("IMPRIMER".equals(com))) { - gestionnaireImpression(com); - } else if ("FERMER".equals(com)) { - this.dispose(); - } - } - } - - private void litFichier(final String _fic) { - Graphe g = null; - try { - final Reader is = new FileReader(_fic); - final Lecteur lin = new Lecteur(is); - if (_fic.endsWith(".gdf")) { - g = parse(lin); - } else { - g = parseXY(lin); - } - } catch (final Exception e) { - e.printStackTrace(); - } - if (g != null) { - g.copyright_ = false; - final BGraphe bf = new BGraphe(); - bf.setGraphe(g); - final IFrameGraphe f = new IFrameGraphe(bf); - f.setSize(new Dimension(540, 380)); - addInternal(f); - } else { - new BuDialogError(null, null, "Erreur de lecture").activate(); - } - } - - public void actionPerformed(final ActionEvent _ae) { - final String com = _ae.getActionCommand(); - if ("OPEN".equals(com)) { - open(); - } - } - - public static Graphe parse(final Lecteur _l) { - Graphe r = null; - String t = _l.get(); - while (!t.equals("")) { - if (t.equals("graphe")) { - r = Graphe.parse(_l, null); - } else { - System.err.println("Erreur de syntaxe: " + t); - } - t = _l.get(); - } - return r; - } - - public static Graphe parseXY(final Lecteur _l) { - return Graphe.parseXY(_l); - } - - private void open() { - final BuFileChooser f = new BuFileChooser(); - f.setDialogType(JFileChooser.OPEN_DIALOG); - f.setCurrentDirectory(defaultHome_); - f.setFileSelectionMode(JFileChooser.FILES_ONLY); - final int i = f.showOpenDialog(this); - if (i == JFileChooser.APPROVE_OPTION) { - final File file = f.getSelectedFile(); - final File parent = file.getParentFile(); - if (parent != null) { - defaultHome_ = parent; - } - litFichier(file.getAbsolutePath()); - } - } - - public BuInformationsSoftware getInformationsSoftware() { - if (is_ == null) { - is_ = new BuInformationsSoftware(); - } - return is_; - } - - public static void main(final String[] _args) { - if (_args.length < 1) { - new TestBGraphe(); - } else { - new TestBGraphe(_args[0]); - } - } -} Deleted: trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/TestFrameImpression.java =================================================================== --- trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/TestFrameImpression.java 2016-10-04 16:24:45 UTC (rev 9417) +++ trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/TestFrameImpression.java 2016-10-12 06:58:06 UTC (rev 9418) @@ -1,154 +0,0 @@ -/* - * @file TestFrameImpression.java - * @creation 2001-06-28 - * @modification $Date: 2006-10-19 14:13:24 $ - * @license GNU General Public License 2 - * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne - * @mail de...@fu... - */ -package org.fudaa.ebli.graphe.example; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.print.PageFormat; -import java.awt.print.Printable; -import java.awt.print.PrinterJob; -import java.io.IOException; - -import javax.swing.JFrame; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; -import javax.swing.JTable; - -import org.fudaa.ebli.graphe.BGraphe; -import org.fudaa.ebli.graphe.Graphe; -import org.fudaa.ebli.graphe.Lecteur; -/** - * @version $Id: TestFrameImpression.java,v 1.2 2006-10-19 14:13:24 deniger Exp $ - * @author Fred Deniger - */ -public class TestFrameImpression - extends JFrame - implements ActionListener, Printable { - /** - * GrapheFrame - */ - public TestFrameImpression() { - super(); - setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - final JMenuBar menu= new JMenuBar(); - final JMenuItem imprime= new JMenuItem("Imprimer"); - imprime.addActionListener(this); - final JMenuItem change= new JMenuItem("Changer le mode"); - change.addActionListener(this); - menu.add(imprime); - menu.add(change); - setJMenuBar(menu); - setSize(new Dimension(640, 480)); - show(); - } - /** - * .... - * - * @param _comp - */ - private void imprimer(final Printable _comp) { - final PrinterJob printJob= PrinterJob.getPrinterJob(); - printJob.setPrintable(_comp); - if (printJob.printDialog()) { - try { - printJob.print(); - System.out.println("fini"); - } catch (final Exception PrintException) { - PrintException.printStackTrace(); - } - } - } - /** - * .... - * - * @param _fichier - */ - public void loadFichier(final String _fichier) { - try { - final Graphe g= - Graphe.parse(new Lecteur(new java.io.FileReader(_fichier)), null); - final BGraphe bg= new BGraphe(); - bg.setGraphe(g); - setContentPane(bg); - bg.revalidate(); - } catch (final IOException e) { - e.printStackTrace(); - System.exit(1); - } - } - /** - * .... - */ - public void chargerTableau() { - final JTable table= new JTable(10, 10); - for (int i= 0; i < table.getColumnCount(); i++) { - for (int j= 0; j < table.getRowCount(); j++) { - table.setValueAt("Essai col" + i + " ligne" + j, i, j); - } - } - setContentPane(table); - table.revalidate(); - } - public int print(final Graphics _g, final PageFormat _format, final int _numPage) { - System.err.println("passage" + _numPage); - if (_numPage != 0) { - return Printable.NO_SUCH_PAGE; - } - System.out.println(_g); - ((BGraphe)getContentPane()).print(_g, _format, _numPage); - return Printable.PAGE_EXISTS; - } - /** - * .... - * - * @param _e - */ - public void actionPerformed(final ActionEvent _e) { - if ("Imprimer".equals(_e.getActionCommand())) { - System.out.println("Impression demand\xE9e"); - imprimer(this); - /* - Component cont = getContentPane(); - if(cont instanceof Printable) - { - System.out.println("\nImprimable"); - //imprimer((Printable)cont); - imprimer(this) - } - else - { - System.out.println("\nNon imprimable"); - } - } - else if("Changer le mode".equals(_e.getActionCommand())) - { - // if(getContentPane() instanceof BGraphe) - // { - // System.out.println("changement de mode"); - // ((BGrapheEssai)getContentPane()).changeMode(); - // } - }*/ - } - } - /** - * main de TestFrameImpression class - * - * @param args The command line arguments - */ - public static void main(final String[] args) { - if (args.length == 0) { - System.out.println("Usage: TestFrameImpression <fichier>"); - System.exit(1); - } - final TestFrameImpression frame= new TestFrameImpression(); - //frame.chargerTableau(); - frame.loadFichier(args[0]); - } -} Deleted: trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/TestGraphe.java =================================================================== --- trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/TestGraphe.java 2016-10-04 16:24:45 UTC (rev 9417) +++ trunk/framework/ebli-graphe/src/test/java/org/fudaa/ebli/graphe/example/TestGraphe.java 2016-10-12 06:58:06 UTC (rev 9418) @@ -1,165 +0,0 @@ -/* - * @creation 1999-02-24 - * @modification $Date: 2006-10-19 14:13:24 $ - * @license GNU General Public License 2 - * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne - * @mail de...@fu... - */ -package org.fudaa.ebli.graphe.example; - -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Image; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.io.FileReader; -import java.io.Reader; - -import javax.swing.JFrame; - -import org.fudaa.ctulu.CtuluLibString; - -import org.fudaa.ebli.graphe.BGraphe; -import org.fudaa.ebli.graphe.BGraphePersonnaliseur; -import org.fudaa.ebli.graphe.Graphe; -import org.fudaa.ebli.graphe.Lecteur; - -/** - * Graphe Definition File. - * - * @version $Revision: 1.6 $ $Date: 2006-10-19 14:13:24 $ by $Author: deniger $ - * @author Axel von Arnim - */ -public class TestGraphe extends JFrame implements Runnable { - String erreur_; - int temps_; - int w_, h_; - Thread animation_; - Image tampon_; - public Graphe graphe_; - Lecteur lin_; - String file_; - - public TestGraphe(final String _f) { - super(); - file_ = _f; - setSize(new Dimension(640, 480)); - show(); - init(); - } - - public void error(final String _m) { - erreur_ = "Erreur: " + getClass() + CtuluLibString.DOT + _m; - System.err.println(erreur_); - } - - public void init() { - erreur_ = ""; - temps_ = 0; - w_ = getSize().width; - h_ = getSize().height; - tampon_ = createImage(w_, h_); - try { - final Reader is = new FileReader(file_); - lin_ = new Lecteur(is); - if (file_.endsWith(".gdf")) { - parse(); - } else { - parseXY(); - } - } catch (final Exception e) { - e.printStackTrace(); - } - if ((graphe_ != null) && !graphe_.animation_) { - maj(); - } - - final BGraphe bgraphe = new BGraphe(); - bgraphe.setSize(w_, h_); - bgraphe.setSize(getSize()); - graphe_.titre_ = "Courbe de de dzergfset sfdsg g fdsf sdf sdfsd sg qgq "; - bgraphe.setGraphe(graphe_); - bgraphe.setInteractif(true); - setContentPane(bgraphe); - } - - public void parse() { - String t = lin_.get(); - while (!t.equals("")) { - if (t.equals("graphe")) { - graphe_ = Graphe.parse(lin_, null); - } else { - System.err.println("Erreur de syntaxe: " + t); - } - t = lin_.get(); - } - } - - public void parseXY() { - graphe_ = Graphe.parseXY(lin_); - } - - public void maj() { - final Graphics g = tampon_.getGraphics(); - if (graphe_ != null) { - graphe_.dessine(g, 0, 0, w_, h_, temps_, null); - } - } - - public void update(final Graphics _g) { - paint(_g); - } - - public void start() { - if ((graphe_ != null) && graphe_.animation_) { - animation_ = new Thread(this); - animation_.start(); - } - } - - public void stop() { - if ((graphe_ != null) && graphe_.animation_) { - graphe_.animation_ = false; - } - } - - public void run() { - if ((graphe_ != null) && graphe_.animation_) { - while (graphe_.animation_) { - final long avant = System.currentTimeMillis(); - maj(); - repaint(); - temps_++; - final long apres = System.currentTimeMillis(); - System.err.println("Temps = " + (apres - avant)); - if (apres - avant < graphe_.vitesse_) { - try { - Thread.sleep(graphe_.vitesse_ + avant - apres); - } catch (final InterruptedException e) { - e.printStackTrace(); - } - } - } - } - } - - public static void main(final String[] _args) { - if (_args.length < 1) { - System.err.println("Usage: java TestGraphe <fichier>"); - System.exit(1); - } - final TestGraphe frame = new TestGraphe(_args[0]); - final JFrame dl = new JFrame(); - final BGraphePersonnaliseur p = new BGraphePersonnaliseur(frame.graphe_); - p.addPropertyChangeListener(new PropertyChangeListener() { - public void propertyChange(final PropertyChangeEvent _evt) { - frame.maj(); - frame.repaint(); - } - }); - dl.setContentPane(p); - dl.pack(); - dl.show(); - frame.start(); - } -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-10-04 16:09:25
|
Revision: 9416 http://sourceforge.net/p/fudaa/svn/9416 Author: deniger Date: 2016-10-04 16:09:23 +0000 (Tue, 04 Oct 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/framework/fudaa-dico/ui/pom.xml Modified: trunk/framework/fudaa-dico/ui/pom.xml =================================================================== --- trunk/framework/fudaa-dico/ui/pom.xml 2016-09-27 05:54:37 UTC (rev 9415) +++ trunk/framework/fudaa-dico/ui/pom.xml 2016-10-04 16:09:23 UTC (rev 9416) @@ -4,7 +4,7 @@ <parent> <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId> <artifactId>fudaa-dico</artifactId> - <version>1.8-SNAPSHOT</version> + <version>1.9-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. |
From: <de...@us...> - 2016-07-18 22:29:40
|
Revision: 9403 http://sourceforge.net/p/fudaa/svn/9403 Author: deniger Date: 2016-07-18 22:29:37 +0000 (Mon, 18 Jul 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java =================================================================== --- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java 2016-07-18 22:24:05 UTC (rev 9402) +++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java 2016-07-18 22:29:37 UTC (rev 9403) @@ -337,6 +337,14 @@ super.componentOpened(); } + /** + * Pas de peristance Netbeans RCP car géré par methodes custom: + * org.fudaa.fudaa.crue.common.UserPreferencesSaver.loadDialogLocationAndDimension(JDialog) et + * org.fudaa.fudaa.crue.common.log.CtuluLogsTopComponent.readPreferences() En fait cette fenetre n'est pas tout le temps affiché comme un + * TopComponent (pour visualiser le contenu d'une cellule par exemple) et donc on ne peut pas utiliser le mécanisme netbeans RCP. + * + * @return PERSISTENCE_NEVER + */ @Override public int getPersistenceType() { return PERSISTENCE_NEVER; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-07-18 22:24:09
|
Revision: 9402 http://sourceforge.net/p/fudaa/svn/9402 Author: deniger Date: 2016-07-18 22:24:05 +0000 (Mon, 18 Jul 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/LogsDisplayer.java Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/LogsDisplayer.java =================================================================== --- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/LogsDisplayer.java 2016-07-18 22:20:23 UTC (rev 9401) +++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/LogsDisplayer.java 2016-07-18 22:24:05 UTC (rev 9402) @@ -34,7 +34,7 @@ * @param persistencePrefixForDialog le préfixe utilisé pour persister les * @return la dialogue utilisee pour afficher les messages d'erreurs/avertissements/info */ - protected static JDialog getErrorDialog(final CtuluLogsTopComponent table, String title, String persistencePrefixForDialog) { + public static JDialog createErrorDialog(final CtuluLogsTopComponent table, String title, String persistencePrefixForDialog) { DialogDescriptor nd = new DialogDescriptor( table, title, @@ -82,7 +82,7 @@ } }); dialog.setVisible(true); - table.writePreferences(); + table.writePreferences(table.getClass()); UserPreferencesSaver.saveLocationAndDimension(dialog); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-07-18 22:20:26
|
Revision: 9401 http://sourceforge.net/p/fudaa/svn/9401 Author: deniger Date: 2016-07-18 22:20:23 +0000 (Mon, 18 Jul 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/LogsPropertyEditor.java Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/LogsPropertyEditor.java =================================================================== --- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/LogsPropertyEditor.java 2016-07-18 22:04:21 UTC (rev 9400) +++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/LogsPropertyEditor.java 2016-07-18 22:20:23 UTC (rev 9401) @@ -9,13 +9,17 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Rectangle; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.beans.PropertyEditorSupport; +import javax.swing.JDialog; import javax.swing.JLabel; import org.fudaa.ctulu.CtuluLogGroup; import org.fudaa.ctulu.CtuluLogLevel; import org.fudaa.dodico.crue.common.io.CrueIOResu; import org.fudaa.dodico.crue.io.rtfa.RTFAResultLine; import org.fudaa.dodico.crue.io.rtfa.RTFAResultLinesLoader; +import org.fudaa.fudaa.crue.common.UserPreferencesSaver; import org.fudaa.fudaa.crue.common.helper.CrueProgressUtils; import org.fudaa.fudaa.crue.common.log.CtuluLogsTopComponent; import org.fudaa.fudaa.crue.common.log.LogsDisplayer; @@ -106,8 +110,22 @@ CtuluLogGroup logs = res == null ? null : res.getMetier(); if ((logs != null) && (getNbLog(logs) != 0)) { final CtuluLogsTopComponent table = new CtuluLogsTopComponent(); + //pour avoir un identifiant de persistance unique + table.setPreferencePrefix(getClass().getName()); table.setLogGroup(logs); - return table; + //le dernier paramètre permet d'avoir un id uniquement pour la persistance + final JDialog dialog = LogsDisplayer.createErrorDialog(table, title, getClass().getName()); + //pour persister les propriétés du dialogue et de la table à la fermeture. + dialog.addWindowListener(new WindowAdapter() { + @Override + public void windowClosed(WindowEvent e) { + table.writePreferences(table.getClass()); + UserPreferencesSaver.saveLocationAndDimension(dialog); + } + + }); + + return dialog; } return new JLabel(NbBundle.getMessage(LogsPropertyEditor.class, "noLogs")); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-07-18 22:04:23
|
Revision: 9400 http://sourceforge.net/p/fudaa/svn/9400 Author: deniger Date: 2016-07-18 22:04:21 +0000 (Mon, 18 Jul 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/LogsDisplayer.java Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/LogsDisplayer.java =================================================================== --- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/LogsDisplayer.java 2016-07-08 09:22:00 UTC (rev 9399) +++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/LogsDisplayer.java 2016-07-18 22:04:21 UTC (rev 9400) @@ -27,7 +27,14 @@ */ public class LogsDisplayer { - protected static void displayError(final CtuluLogsTopComponent table, String title) { + /** + * + * @param table la table contenant les données + * @param title le titre du dialogue + * @param persistencePrefixForDialog le préfixe utilisé pour persister les + * @return la dialogue utilisee pour afficher les messages d'erreurs/avertissements/info + */ + protected static JDialog getErrorDialog(final CtuluLogsTopComponent table, String title, String persistencePrefixForDialog) { DialogDescriptor nd = new DialogDescriptor( table, title, @@ -37,17 +44,41 @@ null); nd.setOptions(new Object[]{DialogDescriptor.OK_OPTION}); - SysdocUrlBuilder.installDialogHelpCtx(nd, "bdlBilanOperations", null,false); + SysdocUrlBuilder.installDialogHelpCtx(nd, "bdlBilanOperations", null, false); JDialog dialog = (JDialog) DialogDisplayer.getDefault().createDialog(nd); dialog.setModal(true); - dialog.setName(table.getClass().getName()); + dialog.setName(persistencePrefixForDialog); UserPreferencesSaver.loadDialogLocationAndDimension(dialog); EventQueue.invokeLater(new Runnable() { @Override public void run() { table.readPreferences(); + } + }); + return dialog; + } + protected static void displayError(final CtuluLogsTopComponent table, String title, String persistencePrefixForDialog) { + DialogDescriptor nd = new DialogDescriptor( + table, + title, + true, + JOptionPane.OK_OPTION, + DialogDescriptor.OK_OPTION, + null); + + nd.setOptions(new Object[]{DialogDescriptor.OK_OPTION}); + SysdocUrlBuilder.installDialogHelpCtx(nd, "bdlBilanOperations", null, false); + JDialog dialog = (JDialog) DialogDisplayer.getDefault().createDialog(nd); + dialog.setModal(true); + dialog.setName(persistencePrefixForDialog); + UserPreferencesSaver.loadDialogLocationAndDimension(dialog); + EventQueue.invokeLater(new Runnable() { + @Override + public void run() { + table.readPreferences(); + } }); dialog.setVisible(true); @@ -55,6 +86,10 @@ UserPreferencesSaver.saveLocationAndDimension(dialog); } + protected static void displayError(final CtuluLogsTopComponent table, String title) { + displayError(table, title, table.getClass().getName()); + } + public static boolean displayErrorWithQuestion(final CtuluLog group, final String title, final String msgTop, final String msgEnd) { if (!EventQueue.isDispatchThread()) { @@ -77,7 +112,7 @@ JOptionPane.YES_NO_OPTION, DialogDescriptor.YES_OPTION, null); - SysdocUrlBuilder.installDialogHelpCtx(nd, "bdlBilanOperations", null,false); + SysdocUrlBuilder.installDialogHelpCtx(nd, "bdlBilanOperations", null, false); JDialog dialog = (JDialog) DialogDisplayer.getDefault().createDialog(nd); dialog.setModal(true); dialog.setName("question" + table.getClass().getName()); @@ -87,7 +122,6 @@ public void run() { table.readPreferences(); - } }); dialog.setVisible(true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-04-26 22:30:07
|
Revision: 9391 http://sourceforge.net/p/fudaa/svn/9391 Author: deniger Date: 2016-04-26 22:30:04 +0000 (Tue, 26 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2016-04-26 22:06:09 UTC (rev 9390) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2016-04-26 22:30:04 UTC (rev 9391) @@ -72,8 +72,8 @@ infoSoft = new BuInformationsSoftware(); infoSoft.name = "prepro"; - infoSoft.version = "1.3.1-RC10"; - infoSoft.date = "2016-20-01"; + infoSoft.version = "1.3.0-RC12"; + infoSoft.date = "2016-04-27"; infoSoft.rights = TrResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)2003-2009"; infoSoft.contact = "fre...@fu..."; infoSoft.license = "GPL2"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-04-26 22:06:12
|
Revision: 9390 http://sourceforge.net/p/fudaa/svn/9390 Author: deniger Date: 2016-04-26 22:06:09 +0000 (Tue, 26 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileXYProvider.java Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileXYProvider.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileXYProvider.java 2016-04-26 22:05:44 UTC (rev 9389) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileXYProvider.java 2016-04-26 22:06:09 UTC (rev 9390) @@ -174,6 +174,7 @@ public static Cached createCachedData(double[] x, double[] y, FastBitSet hiddenSegment, FastBitSet hiddenPoint, LineString lineString) { Cached res = new Cached(x, y, hiddenSegment, hiddenPoint); res.setProfilelineString(lineString); + res.recomputeYRange(); return res; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-04-26 22:05:47
|
Revision: 9389 http://sourceforge.net/p/fudaa/svn/9389 Author: deniger Date: 2016-04-26 22:05:44 +0000 (Tue, 26 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerVariableDisplay.java Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerVariableDisplay.java =================================================================== --- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerVariableDisplay.java 2016-04-26 22:05:21 UTC (rev 9388) +++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerVariableDisplay.java 2016-04-26 22:05:44 UTC (rev 9389) @@ -25,104 +25,108 @@ import org.fudaa.ebli.trace.TraceBox; /** - * Decorator to FsigLayer that allow to display values of variable on FsigLayer for any variable declared on its parent - * group. + * Decorator to FsigLayer that allow to display values of variable on FsigLayer for any variable declared on its parent group. * * @author Adrien Hadoux */ public class FSigLayerVariableDisplay implements BSelecteurListTarget { - private boolean showValues = false; - private TraceBox paintBox = new TraceBox(); - ListSelectionModel selectionModel = new DefaultListSelectionModel(); - DefaultListModel listModel = new DefaultListModel(); + private boolean showValues = false; + private TraceBox paintBox = new TraceBox(); + ListSelectionModel selectionModel = new DefaultListSelectionModel(); + DefaultListModel listModel = new DefaultListModel(); - public TraceBox getTraceBox() { - return paintBox; - } - public void changeColor(Color color) { - paintBox.setColorText(color); - } - public void changeColorBackGround(Color color) { - paintBox.setColorFond(color); - } - public void changeBorderColor(Color color){ - paintBox.setColorBoite(color); - } - - public void changePosition() { - paintBox.setVertical(!paintBox.isVertical()); - } - - @Override - public ListModel getListModel() { - return listModel; - } + public TraceBox getTraceBox() { + return paintBox; + } - @Override - public ListSelectionModel getListSelectionModel() { - return selectionModel; - } + public void changeColor(Color color) { + paintBox.setColorText(color); + } - public void paintValueOfPoint(GISDataModel model, final Graphics2D _g, final GrPoint p, final int indicePoint, - final GrMorphisme _versEcran, final GrBoite _clipReel) { - if (showValues) { - String value = getValueForIdx(indicePoint, model); - if (StringUtils.isNotBlank(value)) { - paintBox.paintBox(_g, (int) p.x_, (int) p.y_, value); - } - } - } + public void changeColorBackGround(Color color) { + paintBox.setColorFond(color); + } - public boolean isShowValues() { - return this.showValues; + public void changeBorderColor(Color color) { + paintBox.setColorBoite(color); + } + + public void changePosition() { + paintBox.setVertical(!paintBox.isVertical()); + } + + @Override + public ListModel getListModel() { + return listModel; + } + + @Override + public ListSelectionModel getListSelectionModel() { + return selectionModel; + } + + public void paintValueOfPoint(GISDataModel model, final Graphics2D _g, final GrPoint p, final int indicePoint, + final GrMorphisme _versEcran, final GrBoite _clipReel) { + if (showValues) { + String value = getValueForIdx(indicePoint, model); + if (StringUtils.isNotBlank(value)) { + paintBox.paintBox(_g, (int) p.x_, (int) p.y_, value); + } } - - public void showValues(final boolean showValues, final BCalque contener) { - this.showValues = showValues; - contener.repaint(); - } + } - public void feedVariable(final FSigLayerGroup parent) { - if (listModel == null) { - listModel = new DefaultListModel(); - } else { - listModel.removeAllElements(); - } + public boolean isShowValues() { + return this.showValues; + } - for (GISAttributeInterface att : parent.getAttributes()) { - listModel.addElement(att); - } + public void showValues(final boolean showValues, final BCalque contener) { + this.showValues = showValues; + contener.repaint(); + } + public void feedVariable(final FSigLayerGroup parent) { + if (listModel == null) { + listModel = new DefaultListModel(); + } else { + listModel.removeAllElements(); } + if (parent != null && parent.getAttributes() != null) { + for (GISAttributeInterface att : parent.getAttributes()) { + listModel.addElement(att); + } + } - /** - * display variable value for Idx. - * - * @param idX - * @return - */ - public String getValueForIdx(final int idX, GISDataModel dataModel) { - int index = selectionModel.getMinSelectionIndex() == -1 ? 0 : selectionModel.getMinSelectionIndex(); + } - if (dataModel!= null) { - DecimalFormat decFormat = new DecimalFormat("##.####"); - if (dataModel.getNbAttributes() >index && idX< dataModel.getNumGeometries() && - dataModel.getValue(index, idX) != null && dataModel.getValue(index, idX) instanceof Double) { - - return decFormat.format(dataModel.getDoubleValue(0, idX)); - }else if (dataModel.getNbAttributes() >index && dataModel.getValue(index,0) instanceof GISAttributeModelDoubleArray) { - GISAttributeModelDoubleArray array =(GISAttributeModelDoubleArray)dataModel.getValue(index,0); - if(idX < array.getSize()) - return decFormat.format( array.getValue(idX)); - } else if(dataModel.getNbAttributes() ==0 && dataModel instanceof GISZoneCollection) { - GISZoneCollection collection = (GISZoneCollection)dataModel; - if(idX <collection.getCoordinates().length) { - return decFormat.format( collection.getCoordinates()[idX].z); - } - } + /** + * display variable value for Idx. + * + * @param idX + * @return + */ + public String getValueForIdx(final int idX, GISDataModel dataModel) { + int index = selectionModel.getMinSelectionIndex() == -1 ? 0 : selectionModel.getMinSelectionIndex(); + + if (dataModel != null) { + DecimalFormat decFormat = new DecimalFormat("##.####"); + if (dataModel.getNbAttributes() > index && idX < dataModel.getNumGeometries() + && dataModel.getValue(index, idX) != null && dataModel.getValue(index, idX) instanceof Double) { + + return decFormat.format(dataModel.getDoubleValue(0, idX)); + } else if (dataModel.getNbAttributes() > index && dataModel.getValue(index, 0) instanceof GISAttributeModelDoubleArray) { + GISAttributeModelDoubleArray array = (GISAttributeModelDoubleArray) dataModel.getValue(index, 0); + if (idX < array.getSize()) { + return decFormat.format(array.getValue(idX)); } - return ""; + } else if (dataModel.getNbAttributes() == 0 && dataModel instanceof GISZoneCollection) { + GISZoneCollection collection = (GISZoneCollection) dataModel; + if (idX < collection.getCoordinates().length) { + return decFormat.format(collection.getCoordinates()[idX].z); + } + } } + return ""; + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-04-26 22:05:23
|
Revision: 9388 http://sourceforge.net/p/fudaa/svn/9388 Author: deniger Date: 2016-04-26 22:05:21 +0000 (Tue, 26 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/soft/fudaa-modeleur/pom.xml trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java Modified: trunk/soft/fudaa-modeleur/pom.xml =================================================================== --- trunk/soft/fudaa-modeleur/pom.xml 2016-04-26 22:01:01 UTC (rev 9387) +++ trunk/soft/fudaa-modeleur/pom.xml 2016-04-26 22:05:21 UTC (rev 9388) @@ -39,51 +39,45 @@ <artifactId>fudaa-mesh</artifactId> <version>${fudaa-mesh.version}</version> <exclusions> - <!-- exclude ebli common --> - <exclusion> - <groupId>org.fudaa.framework.ebli</groupId> - <artifactId>ebli-1d</artifactId> - </exclusion> - </exclusions> + <!-- exclude ebli common --> + <exclusion> + <groupId>org.fudaa.framework.ebli</groupId> + <artifactId>ebli-1d</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.fudaa.framework.ebli</groupId> <artifactId>ebli-1d</artifactId> <!-- il nous faut les dernières version de ebli common --> - <version>${fudaa-framework.version}</version> <exclusions> - <!-- exclude ebli common --> - <exclusion> - <groupId>org.fudaa.framework.ebli</groupId> - <artifactId>ebli-common</artifactId> - </exclusion> - </exclusions> + <!-- exclude ebli common --> + <exclusion> + <groupId>org.fudaa.framework.ebli</groupId> + <artifactId>ebli-common</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.fudaa.framework.ctulu</groupId> - <artifactId>ctulu-fu</artifactId> - <version>${fudaa-framework.version}</version> - </dependency> - <dependency> - <groupId>org.fudaa.framework.ctulu</groupId> - <artifactId>ctulu-bu</artifactId> - <version>${fudaa-framework.version}</version> - </dependency> - <dependency> - <groupId>org.fudaa.framework.ctulu</groupId> - <artifactId>ctulu-ui</artifactId> - <version>${fudaa-framework.version}</version> - </dependency> - <dependency> - <groupId>org.fudaa.framework.ebli</groupId> - <artifactId>ebli-common</artifactId> - <version>${fudaa-framework.version}</version> - </dependency> - <dependency> - <groupId>org.fudaa.business.fudaa-ef</groupId> - <artifactId>ef-core</artifactId> - <version>${fudaa-business.version}</version> - </dependency> + <groupId>org.fudaa.framework.ctulu</groupId> + <artifactId>ctulu-fu</artifactId> + </dependency> + <dependency> + <groupId>org.fudaa.framework.ctulu</groupId> + <artifactId>ctulu-bu</artifactId> + </dependency> + <dependency> + <groupId>org.fudaa.framework.ctulu</groupId> + <artifactId>ctulu-ui</artifactId> + </dependency> + <dependency> + <groupId>org.fudaa.framework.ebli</groupId> + <artifactId>ebli-common</artifactId> + </dependency> + <dependency> + <groupId>org.fudaa.business.fudaa-ef</groupId> + <artifactId>ef-core</artifactId> + </dependency> <dependency> <groupId>junit</groupId> Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java =================================================================== --- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java 2016-04-26 22:01:01 UTC (rev 9387) +++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java 2016-04-26 22:05:21 UTC (rev 9388) @@ -107,7 +107,7 @@ double zoffSet_; private String title; - + public CourbeGeomModel() { } @@ -116,6 +116,11 @@ return false; } + @Override + public int[] getInitRows() { + return null; + } + /** * @return Retourne le profil associ\xE9. */ @@ -344,7 +349,7 @@ } public String getTitle() { - return title!=null?title:MdlResource.getS("Courbe"); + return title != null ? title : MdlResource.getS("Courbe"); } public double getX(int _idx) { @@ -542,10 +547,6 @@ public void replayData(EGGrapheModel model, Map infos, CtuluUI impl) { } - @Override - public int[] getInitRows() { - return null; - } } protected class EmptyCurveModel implements EGModel { @@ -556,6 +557,11 @@ } @Override + public int[] getInitRows() { + return null; + } + + @Override public boolean useSpecificIcon(int idx) { return false; } @@ -686,10 +692,6 @@ public void replayData(EGGrapheModel model, Map infos, CtuluUI impl) { } - @Override - public int[] getInitRows() { - return null; - } } /** @@ -782,7 +784,7 @@ * La courbe suivante */ EGCourbeSimple nextCurve_; - + /* Un modele de courbe vide */ // EmptyCurveModel emptyModel_=new EmptyCurveModel(); // Les boutons permettant de modifier les positions des rives et des limites de stockages. \\ @@ -794,7 +796,6 @@ BuToggleButton btShowPrevNext_; private EGGrapheSimpleModel grapheModel_; - private EGAxeVertical axeY_; private ProfileSetI profSet_; private int selectedPrf_ = -1; @@ -874,9 +875,9 @@ // Les actions a conserver. HashSet<String> actionsKept = new HashSet<String>(Arrays.asList( new String[]{ - "SELECT", "RESTORE", "AUTO_REST", "CONFIGURE_REPERE", - "ZOOM", "SUIVI", "MOVE_POINT", "CONFIGURE", "INFOS", "TABLE" - })); + "SELECT", "RESTORE", "AUTO_REST", "CONFIGURE_REPERE", + "ZOOM", "SUIVI", "MOVE_POINT", "CONFIGURE", "INFOS", "TABLE" + })); for (int i = 0; i < actionAbs.length; i++) { if (actionAbs[i] != null && actionsKept.contains(actionAbs[i].getValue(Action.ACTION_COMMAND_KEY))) { @@ -897,7 +898,8 @@ _actions.add(btShowPrevNext_); // Bouton d'alignement. - EbliActionPaletteAbstract btAlign = new EbliActionPaletteAbstract(MdlResource.getS("Alignement des profils"), MdlResource.MDL.getIcon("aligner-profils"), "ALIGNMENT") { + EbliActionPaletteAbstract btAlign = new EbliActionPaletteAbstract(MdlResource.getS("Alignement des profils"), MdlResource.MDL.getIcon( + "aligner-profils"), "ALIGNMENT") { @Override protected JComponent buildContentPane() { return new CurveOptionPanel(VueCourbe.this); @@ -1138,7 +1140,7 @@ prevCurve_.setAspectContour(c); prevCurve_.setIconeModel(new TraceIconModel(TraceIcon.CARRE_PLEIN, 1, c)); grapheModel_.addCourbe(prevCurve_, null); - + c = Color.GREEN.darker(); nextCurve_ = new EGCourbeSimple(axeY_, new CourbeGeomModel()); nextCurve_.setLigneModel(new TraceLigneModel(TraceLigne.TIRETE, 0.5f, c)); @@ -1155,9 +1157,9 @@ grapheModel_.addCourbe(courbe_, null); } - public EGCourbeSimple getCourbe() { - return courbe_; - } + public EGCourbeSimple getCourbe() { + return courbe_; + } /** * Mise a jour des courbes, par changement de mod\xE8le. @@ -1217,43 +1219,34 @@ grapheVue_.structureChanged(); } - - - - public int buildCurve(TraceLigneModel model, int idxProfil) { - CourbeGeomModel md = new CourbeGeomModel(); - EGCourbeSimple courbe = new EGCourbeSimple(axeY_, md); - courbe.setLigneModel(model); - courbe.setAspectContour(courbe.getLigneModel().getCouleur()); - courbe.setIconeModel(new TraceIconModel(TraceIcon.CARRE_PLEIN, 1, courbe.getLigneModel().getCouleur())); - grapheModel_.addCourbe(courbe, null); - ProfilContainerI pf = profSet_.getProfil(idxProfil); - double xoff = computeXOffset(pf, profSet_.getProfil(idxProfil)); - double zoff = computeZOffset(pf, profSet_.getProfil(idxProfil)); - md.setProfil(pf); - md.setOffsets(xoff, zoff); - courbe.setVisible(true); - courbe.setTitle(pf.getName()); - - - - return grapheModel_.getCourbes().length-1; - } - - - public void updateComparisonCurves(final int[] selection, final ComparisonCurvesPanel panelComparison, - final MdlCompareProfilePanel compPanel, final int idxProf) { - if (panelComparison.updateComparisonCurves(this, selection,compPanel, idxProf)) { - setPrevNextVisible(false); - grapheVue_.structureChanged(); - updateLabels(); - } + public int buildCurve(TraceLigneModel model, int idxProfil) { + CourbeGeomModel md = new CourbeGeomModel(); + EGCourbeSimple courbe = new EGCourbeSimple(axeY_, md); + courbe.setLigneModel(model); + courbe.setAspectContour(courbe.getLigneModel().getCouleur()); + courbe.setIconeModel(new TraceIconModel(TraceIcon.CARRE_PLEIN, 1, courbe.getLigneModel().getCouleur())); + grapheModel_.addCourbe(courbe, null); + ProfilContainerI pf = profSet_.getProfil(idxProfil); + double xoff = computeXOffset(pf, profSet_.getProfil(idxProfil)); + double zoff = computeZOffset(pf, profSet_.getProfil(idxProfil)); + md.setProfil(pf); + md.setOffsets(xoff, zoff); + courbe.setVisible(true); + courbe.setTitle(pf.getName()); + + return grapheModel_.getCourbes().length - 1; + } + + public void updateComparisonCurves(final int[] selection, final ComparisonCurvesPanel panelComparison, + final MdlCompareProfilePanel compPanel, final int idxProf) { + if (panelComparison.updateComparisonCurves(this, selection, compPanel, idxProf)) { + setPrevNextVisible(false); + grapheVue_.structureChanged(); + updateLabels(); } + } - - - /** * Mise a jour des lignes remarquables sur le graphe pour \xEAtre en conformit\xE9 avec le profil courant. */ @@ -1272,27 +1265,32 @@ // Rive gauche double absCurv = courbeModel_.getProfil().getAbsCurvRiveGauche(); if (absCurv != -1) { - courbe_.addMarqueur(new EGCourbeMarqueur(absCurv, MdlResource.getS("RG"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.blue), false)); + courbe_. + addMarqueur(new EGCourbeMarqueur(absCurv, MdlResource.getS("RG"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.blue), false)); } // Rive droite absCurv = courbeModel_.getProfil().getAbsCurvRiveDroite(); if (absCurv != -1) { - courbe_.addMarqueur(new EGCourbeMarqueur(absCurv, MdlResource.getS("RD"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.blue), false)); + courbe_. + addMarqueur(new EGCourbeMarqueur(absCurv, MdlResource.getS("RD"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.blue), false)); } // Axe hydraulique absCurv = courbeModel_.getProfil().getAbsCurvAxeHydrauliqueOnProfil(); if (absCurv != -1) { - courbe_.addMarqueur(new EGCourbeMarqueur(absCurv, MdlResource.getS("AH"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.green.darker()), false)); + courbe_.addMarqueur(new EGCourbeMarqueur(absCurv, MdlResource.getS("AH"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.green. + darker()), false)); } // Limite stockage gauche absCurv = courbeModel_.getProfil().getAbsCurvLimiteStockageGauche(); if (absCurv != -1) { - courbe_.addMarqueur(new EGCourbeMarqueur(absCurv, MdlResource.getS("SG"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.green), false)); + courbe_.addMarqueur( + new EGCourbeMarqueur(absCurv, MdlResource.getS("SG"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.green), false)); } // Limite stockage droite absCurv = courbeModel_.getProfil().getAbsCurvLimiteStockageDroite(); if (absCurv != -1) { - courbe_.addMarqueur(new EGCourbeMarqueur(absCurv, MdlResource.getS("SD"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.green), false)); + courbe_.addMarqueur( + new EGCourbeMarqueur(absCurv, MdlResource.getS("SD"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.green), false)); } // grapheVue_.structureChanged(); @@ -1313,16 +1311,13 @@ } public EGGrapheSimpleModel getGrapheModel() { - return grapheModel_; - } + return grapheModel_; + } - public EGGraphe getGraphe() { - return grapheVue_; - } + public EGGraphe getGraphe() { + return grapheVue_; + } - - - /** * Selectionne les points dont les indices sont pass\xE9s en param\xE8tre. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-04-26 22:01:03
|
Revision: 9387 http://sourceforge.net/p/fudaa/svn/9387 Author: deniger Date: 2016-04-26 22:01:01 +0000 (Tue, 26 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/soft/fudaa-modeleur/pom.xml Modified: trunk/soft/fudaa-modeleur/pom.xml =================================================================== --- trunk/soft/fudaa-modeleur/pom.xml 2016-04-26 21:57:57 UTC (rev 9386) +++ trunk/soft/fudaa-modeleur/pom.xml 2016-04-26 22:01:01 UTC (rev 9387) @@ -4,13 +4,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <properties> - <fudaa-mesh.version>1.7-SNAPSHOT</fudaa-mesh.version> - <fudaa-framework.version>1.7-SNAPSHOT</fudaa-framework.version> - <fudaa-framework.version>1.7-SNAPSHOT</fudaa-framework.version> - <fudaa-business.version>1.6-SNAPSHOT</fudaa-business.version> - - <javaCompiler>1.6</javaCompiler> - <targetJdk>1.6</targetJdk> + <fudaa-mesh.version>1.9-SNAPSHOT</fudaa-mesh.version> + <javaCompiler>1.7</javaCompiler> + <targetJdk>1.7</targetJdk> </properties> <parent> <groupId>org.fudaa.pom</groupId> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-04-26 21:57:59
|
Revision: 9386 http://sourceforge.net/p/fudaa/svn/9386 Author: deniger Date: 2016-04-26 21:57:57 +0000 (Tue, 26 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGroupPersistBuilder.java Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGroupPersistBuilder.java =================================================================== --- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGroupPersistBuilder.java 2016-04-25 07:44:34 UTC (rev 9385) +++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGroupPersistBuilder.java 2016-04-26 21:57:57 UTC (rev 9386) @@ -2,6 +2,7 @@ import java.io.File; import java.util.Map; +import org.apache.commons.lang.StringUtils; import org.fudaa.ctulu.CtuluAnalyze; public abstract class EGGroupPersistBuilder<T extends EGGroup> extends EGPersistBuilder<T, EGGroupPersist> { @@ -31,6 +32,9 @@ EGAxeVertical axe = persist.axeY.generateAxe(); group.setAxeY(axe); group.setTitle(persist.title); + if (StringUtils.isBlank(axe.getTitre())) { + axe.setTitre(group.getTitle()); + } group.setIdGroup(persist.groupId); group.isVisible_ = persist.isVisible; } 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:49:14
|
Revision: 9382 http://sourceforge.net/p/fudaa/svn/9382 Author: deniger Date: 2016-04-18 15:49:11 +0000 (Mon, 18 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionEditionCreator.java trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionEditionCreator.java =================================================================== --- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionEditionCreator.java 2016-04-18 15:41:39 UTC (rev 9381) +++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionEditionCreator.java 2016-04-18 15:49:11 UTC (rev 9382) @@ -153,7 +153,7 @@ //on reinitialise correctement les frottements: if (litNumerote.getFrot() == null) { if (litNumerote.getIsLitActif()) { - assert litNumerote.getIsLitMineur() == false;//ne doit jamais arriver. +// assert litNumerote.getIsLitMineur() == false;//ne doit jamais arriver. litNumerote.setFrot(editionProfilCreator.getOrCreateFrtMajeur(sousModele, controller.ccm)); } else { if (emptyDonFrtFkSto == null) { Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java =================================================================== --- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java 2016-04-18 15:41:39 UTC (rev 9381) +++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java 2016-04-18 15:49:11 UTC (rev 9382) @@ -50,7 +50,7 @@ @Override protected boolean isProcessorEnable() { - return selection.isActionEnable(); + return selection != null && selection.isActionEnable(); } @Override 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:41:42
|
Revision: 9381 http://sourceforge.net/p/fudaa/svn/9381 Author: deniger Date: 2016-04-18 15:41:39 +0000 (Mon, 18 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/soft/fudaa-prepro/pom.xml Modified: trunk/soft/fudaa-prepro/pom.xml =================================================================== --- trunk/soft/fudaa-prepro/pom.xml 2016-04-18 15:40:58 UTC (rev 9380) +++ trunk/soft/fudaa-prepro/pom.xml 2016-04-18 15:41:39 UTC (rev 9381) @@ -4,8 +4,8 @@ <properties> <fudaa-mesh.version>1.9-SNAPSHOT</fudaa-mesh.version> - <javaCompiler>1.6</javaCompiler> - <targetJdk>1.6</targetJdk> + <javaCompiler>1.7</javaCompiler> + <targetJdk>1.7</targetJdk> </properties> <parent> 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:41:01
|
Revision: 9380 http://sourceforge.net/p/fudaa/svn/9380 Author: deniger Date: 2016-04-18 15:40:58 +0000 (Mon, 18 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/framework/fudaa-dico/pom.xml Modified: trunk/framework/fudaa-dico/pom.xml =================================================================== --- trunk/framework/fudaa-dico/pom.xml 2016-04-18 15:40:48 UTC (rev 9379) +++ trunk/framework/fudaa-dico/pom.xml 2016-04-18 15:40:58 UTC (rev 9380) @@ -9,7 +9,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.fudaa-dico</groupId> <artifactId>fudaa-dico</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:40:50
|
Revision: 9379 http://sourceforge.net/p/fudaa/svn/9379 Author: deniger Date: 2016-04-18 15:40:48 +0000 (Mon, 18 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/soft/fudaa-prepro/pom.xml Modified: trunk/soft/fudaa-prepro/pom.xml =================================================================== --- trunk/soft/fudaa-prepro/pom.xml 2016-04-18 15:37:08 UTC (rev 9378) +++ trunk/soft/fudaa-prepro/pom.xml 2016-04-18 15:40:48 UTC (rev 9379) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <properties> - <fudaa-mesh.version>1.7-SNAPSHOT</fudaa-mesh.version> + <fudaa-mesh.version>1.9-SNAPSHOT</fudaa-mesh.version> <javaCompiler>1.6</javaCompiler> <targetJdk>1.6</targetJdk> </properties> 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:37:10
|
Revision: 9378 http://sourceforge.net/p/fudaa/svn/9378 Author: deniger Date: 2016-04-18 15:37:08 +0000 (Mon, 18 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/soft/fudaa-mesh/pom.xml Modified: trunk/soft/fudaa-mesh/pom.xml =================================================================== --- trunk/soft/fudaa-mesh/pom.xml 2016-04-18 15:35:55 UTC (rev 9377) +++ trunk/soft/fudaa-mesh/pom.xml 2016-04-18 15:37:08 UTC (rev 9378) @@ -4,9 +4,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <properties> - <fudaa-sig.version>1.8-SNAPSHOT</fudaa-sig.version> - <javaCompiler>1.6</javaCompiler> - <targetJdk>1.6</targetJdk> + <fudaa-sig.version>1.9-SNAPSHOT</fudaa-sig.version> + <javaCompiler>1.7</javaCompiler> + <targetJdk>1.7</targetJdk> </properties> <parent> <groupId>org.fudaa.pom</groupId> @@ -15,7 +15,7 @@ </parent> <groupId>org.fudaa.soft.fudaa-mesh</groupId> <artifactId>fudaa-mesh</artifactId> - <version>1.8-SNAPSHOT</version> + <version>1.9-SNAPSHOT</version> <name>Fudaa-Mesh</name> <dependencyManagement> <dependencies> 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:35:57
|
Revision: 9377 http://sourceforge.net/p/fudaa/svn/9377 Author: deniger Date: 2016-04-18 15:35:55 +0000 (Mon, 18 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/framework/pom.xml Modified: trunk/framework/pom.xml =================================================================== --- trunk/framework/pom.xml 2016-04-18 15:30:56 UTC (rev 9376) +++ trunk/framework/pom.xml 2016-04-18 15:35:55 UTC (rev 9377) @@ -13,7 +13,7 @@ <properties> <projetEncoding>ISO-8859-15</projetEncoding> <!-- la version du compiler --> - <javaCompiler>1.6</javaCompiler> + <javaCompiler>1.7</javaCompiler> </properties> <packaging>pom</packaging> <name>Fudaa Framework</name> 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:30:58
|
Revision: 9376 http://sourceforge.net/p/fudaa/svn/9376 Author: deniger Date: 2016-04-18 15:30:56 +0000 (Mon, 18 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/business/dodico-h2d/core/pom.xml Modified: trunk/business/dodico-h2d/core/pom.xml =================================================================== --- trunk/business/dodico-h2d/core/pom.xml 2016-04-18 15:30:37 UTC (rev 9375) +++ trunk/business/dodico-h2d/core/pom.xml 2016-04-18 15:30:56 UTC (rev 9376) @@ -4,7 +4,7 @@ <parent> <groupId>org.fudaa.business.dodico-h2d</groupId> <artifactId>dodico-h2d</artifactId> - <version>1.8</version> + <version>1.9-SNAPSHOT</version> </parent> <artifactId>h2d-core</artifactId> <name>Core h2d</name> 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:30:40
|
Revision: 9375 http://sourceforge.net/p/fudaa/svn/9375 Author: deniger Date: 2016-04-18 15:30:37 +0000 (Mon, 18 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/business/dodico-h2d/io/pom.xml Modified: trunk/business/dodico-h2d/io/pom.xml =================================================================== --- trunk/business/dodico-h2d/io/pom.xml 2016-04-18 15:30:23 UTC (rev 9374) +++ trunk/business/dodico-h2d/io/pom.xml 2016-04-18 15:30:37 UTC (rev 9375) @@ -4,7 +4,7 @@ <parent> <groupId>org.fudaa.business.dodico-h2d</groupId> <artifactId>dodico-h2d</artifactId> - <version>1.8</version> + <version>1.9-SNAPSHOT</version> </parent> <artifactId>h2d-io</artifactId> <name>I/O pour h2d</name> 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:30:24
|
Revision: 9374 http://sourceforge.net/p/fudaa/svn/9374 Author: deniger Date: 2016-04-18 15:30:23 +0000 (Mon, 18 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/framework/fudaa-dico/server/pom.xml Modified: trunk/framework/fudaa-dico/server/pom.xml =================================================================== --- trunk/framework/fudaa-dico/server/pom.xml 2016-04-18 15:25:11 UTC (rev 9373) +++ trunk/framework/fudaa-dico/server/pom.xml 2016-04-18 15:30:23 UTC (rev 9374) @@ -4,7 +4,7 @@ <parent> <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId> <artifactId>fudaa-dico</artifactId> - <version>1.8-SNAPSHOT</version> + <version>1.9-SNAPSHOT</version> </parent> <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId> <artifactId>dico-server</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:25:14
|
Revision: 9373 http://sourceforge.net/p/fudaa/svn/9373 Author: deniger Date: 2016-04-18 15:25:11 +0000 (Mon, 18 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/business/fudaa-sig/pom.xml Modified: trunk/business/fudaa-sig/pom.xml =================================================================== --- trunk/business/fudaa-sig/pom.xml 2016-04-18 15:23:50 UTC (rev 9372) +++ trunk/business/fudaa-sig/pom.xml 2016-04-18 15:25:11 UTC (rev 9373) @@ -2,7 +2,7 @@ <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> <properties> - <dodico-h2d.version>1.8</dodico-h2d.version> + <dodico-h2d.version>1.9-SNAPSHOT</dodico-h2d.version> <javaCompiler>1.7</javaCompiler> <targetJdk>1.7</targetJdk> </properties> @@ -14,7 +14,7 @@ </parent> <groupId>org.fudaa.business.fudaa-sig</groupId> <artifactId>fudaa-sig</artifactId> - <version>1.8</version> + <version>1.9-SNAPSHOT</version> <name>fudaa-sig</name> <dependencyManagement> <dependencies> 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:23:52
|
Revision: 9372 http://sourceforge.net/p/fudaa/svn/9372 Author: deniger Date: 2016-04-18 15:23:50 +0000 (Mon, 18 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/business/fudaa-ef/pom.xml Modified: trunk/business/fudaa-ef/pom.xml =================================================================== --- trunk/business/fudaa-ef/pom.xml 2016-04-18 15:23:24 UTC (rev 9371) +++ trunk/business/fudaa-ef/pom.xml 2016-04-18 15:23:50 UTC (rev 9372) @@ -6,7 +6,7 @@ <fudaa-framework.version>1.9-SNAPSHOT</fudaa-framework.version> <projetEncoding>ISO-8859-15</projetEncoding> <!-- la version du compiler --> - <javaCompiler>1.6</javaCompiler> + <javaCompiler>1.7</javaCompiler> </properties> <parent> 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:23:26
|
Revision: 9371 http://sourceforge.net/p/fudaa/svn/9371 Author: deniger Date: 2016-04-18 15:23:24 +0000 (Mon, 18 Apr 2016) Log Message: ----------- version 1.9-SNAPSHOT Modified Paths: -------------- trunk/business/dodico-h2d/pom.xml Modified: trunk/business/dodico-h2d/pom.xml =================================================================== --- trunk/business/dodico-h2d/pom.xml 2016-04-18 15:18:14 UTC (rev 9370) +++ trunk/business/dodico-h2d/pom.xml 2016-04-18 15:23:24 UTC (rev 9371) @@ -6,7 +6,7 @@ <fudaa-ef.version>1.9-SNAPSHOT</fudaa-ef.version> <projetEncoding>ISO-8859-15</projetEncoding> <!-- la version du compiler --> - <javaCompiler>1.6</javaCompiler> + <javaCompiler>1.7</javaCompiler> </properties> <parent> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |