From: <de...@us...> - 2014-01-10 17:38:30
|
Revision: 8564 http://sourceforge.net/p/fudaa/svn/8564 Author: deniger Date: 2014-01-10 17:38:27 +0000 (Fri, 10 Jan 2014) Log Message: ----------- CRUE-614, CRUE-598 Modified Paths: -------------- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/FileDeleteResult.java trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGrapheModelListener.java Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/FileDeleteResult.java =================================================================== --- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/FileDeleteResult.java 2014-01-10 17:38:12 UTC (rev 8563) +++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/FileDeleteResult.java 2014-01-10 17:38:27 UTC (rev 8564) @@ -6,6 +6,7 @@ /** * Permet de savoir quel + * * @author deniger ( genesis) */ public class FileDeleteResult { @@ -17,6 +18,14 @@ return dirNotDeleted; } + public boolean isNotEmpty() { + return !isEmpty(); + } + + public boolean isEmpty() { + return filesNotDeleted.isEmpty() && dirNotDeleted.isEmpty(); + } + public List<File> getFilesNotDeleted() { return filesNotDeleted; } Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java =================================================================== --- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java 2014-01-10 17:38:12 UTC (rev 8563) +++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java 2014-01-10 17:38:27 UTC (rev 8564) @@ -97,7 +97,7 @@ longueurPas_ = axeX.longueurPas_; modeGraduations_ = axeX.modeGraduations_; nbSousGraduations_ = axeX.nbSousGraduations_; - range = axeX.range_; + range = axeX.range_ == null ? null : new CtuluRange(axeX.range_); } public EGAxeHorizontal generateAxe() { Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGrapheModelListener.java =================================================================== --- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGrapheModelListener.java 2014-01-10 17:38:12 UTC (rev 8563) +++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGrapheModelListener.java 2014-01-10 17:38:27 UTC (rev 8564) @@ -25,7 +25,6 @@ /** * @param _c la courbe dont le contenu a ete modifie. null si toutes ou inconnue. - * @param _mustRestore TODO * @param _mustRestore true si on doit restaurer la vue */ void courbeContentChanged(EGObject _c, boolean _mustRestore); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |