From: <bma...@us...> - 2015-02-16 14:03:24
|
Revision: 9024 http://sourceforge.net/p/fudaa/svn/9024 Author: bmarchan Date: 2015-02-16 14:03:12 +0000 (Mon, 16 Feb 2015) Log Message: ----------- Nettoyage Modified Paths: -------------- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOriginalView.java trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivAutoCacheAction.java trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivSelectImagesAction.java trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivResultsDefault.java Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOriginalView.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOriginalView.java 2015-02-16 13:18:14 UTC (rev 9023) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOriginalView.java 2015-02-16 14:03:12 UTC (rev 9024) @@ -24,7 +24,6 @@ import org.fudaa.ebli.commun.EbliUIProperties; import org.fudaa.ebli.trace.TraceIcon; import org.fudaa.ebli.trace.TraceIconModel; -import org.fudaa.fudaa.piv.action.PivNewTransectAction; import org.fudaa.fudaa.piv.action.PivOriginalViewAction; import org.fudaa.fudaa.piv.action.PivOrthoGRPAction; import org.fudaa.fudaa.piv.layer.PivImageRasterLayer; Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivAutoCacheAction.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivAutoCacheAction.java 2015-02-16 13:18:14 UTC (rev 9023) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivAutoCacheAction.java 2015-02-16 14:03:12 UTC (rev 9024) @@ -7,7 +7,6 @@ */ package org.fudaa.fudaa.piv.action; -import org.fudaa.ctulu.CtuluAnalyze; import org.fudaa.ctulu.gui.CtuluDialog; import org.fudaa.ctulu.gui.CtuluTaskOperationGUI; import org.fudaa.ebli.commun.EbliActionChangeState; @@ -54,8 +53,6 @@ public void act() { try { - CtuluAnalyze ana=new CtuluAnalyze(); - ana.setDesc(getName()); impl.getCurrentProject().rebuiltAllCacheImagesIfNeeded(this); } finally { Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivSelectImagesAction.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivSelectImagesAction.java 2015-02-16 13:18:14 UTC (rev 9023) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivSelectImagesAction.java 2015-02-16 14:03:12 UTC (rev 9024) @@ -10,7 +10,7 @@ import java.awt.event.ActionEvent; import java.io.File; -import org.fudaa.ctulu.CtuluAnalyze; +import org.fudaa.ctulu.CtuluLog; import org.fudaa.ctulu.gui.CtuluDialog; import org.fudaa.ctulu.gui.CtuluTaskOperationGUI; import org.fudaa.ebli.commun.EbliActionSimple; @@ -81,11 +81,11 @@ @Override public void act() { try { - CtuluAnalyze ana=new CtuluAnalyze(); + CtuluLog ana=new CtuluLog(); ana.setDesc(getName()); impl.getCurrentProject().setSrcImagesFiles(srcImgFiles, this, ana); - if (ana.containsErrorOrFatalError()) { + if (ana.containsErrorOrSevereError()) { impl.error(ana.getResume()); return; } Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java 2015-02-16 13:18:14 UTC (rev 9023) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java 2015-02-16 14:03:12 UTC (rev 9024) @@ -20,10 +20,10 @@ import javax.imageio.ImageReader; import javax.imageio.stream.ImageInputStream; -import org.fudaa.ctulu.CtuluAnalyze; import org.fudaa.ctulu.CtuluIOResult; import org.fudaa.ctulu.CtuluLibArray; import org.fudaa.ctulu.CtuluLibFile; +import org.fudaa.ctulu.CtuluLog; import org.fudaa.ctulu.ProgressionInterface; import org.fudaa.ctulu.gui.CtuluTaskOperationGUI; import org.fudaa.fudaa.piv.PivPreferences; @@ -576,7 +576,7 @@ * * @param _files Les images. */ - public void setSrcImagesFiles(File[] _files, CtuluTaskOperationGUI _task, CtuluAnalyze _ana) { + public void setSrcImagesFiles(File[] _files, CtuluTaskOperationGUI _task, CtuluLog _ana) { File imgInpDir=new File(rootPath,IMG_PGM_DIR); imgInpDir.mkdirs(); @@ -628,7 +628,7 @@ * @param _imgOrig Les fichiers d'origine \xE0 reconditionner. * @return true : Tout s'est bien d\xE9roul\xE9. */ - public boolean repack(CtuluAnalyze _ana, CtuluTaskOperationGUI _task, File[] _imgOrig) { + public boolean repack(CtuluLog _ana, CtuluTaskOperationGUI _task, File[] _imgOrig) { File imgInpDir=new File(rootPath,IMG_PGM_DIR); if (_task!=null) Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivResultsDefault.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivResultsDefault.java 2015-02-16 13:18:14 UTC (rev 9023) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivResultsDefault.java 2015-02-16 14:03:12 UTC (rev 9024) @@ -1,7 +1,6 @@ package org.fudaa.fudaa.piv.metier; import gnu.trove.TDoubleArrayList; -import gnu.trove.TIntArrayList; import java.util.ArrayList; import java.util.HashMap; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |