Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4962] trunk/fudaa_devel
|
From: <de...@us...> - 2009-07-21 09:52:03
|
Revision: 4962
http://fudaa.svn.sourceforge.net/fudaa/?rev=4962&view=rev
Author: deniger
Date: 2009-07-21 09:51:56 +0000 (Tue, 21 Jul 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/fudaa_devel/ctulu/src/com/memoire/bu/BuMenuItem.java
trunk/fudaa_devel/ctulu/src/com/memoire/bu/BuVfsOperations.java
trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/AcmeGifEncoder.java
trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/AcmeImageEncoder.java
trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/AcmeIntHashtable.java
trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/AcmeJpegEncoder.java
trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/AcmePpmEncoder.java
trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/CtuluGif89EncoderImmediateSave.java
trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/DirectGif89Frame.java
trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/Gif89Encoder.java
trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/Gif89Frame.java
trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/GifColorTable.java
trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/IndexGif89Frame.java
trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/Put.java
trunk/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationOutputGIF.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleNoteDeCalculs.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeGraphiqueDialog.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeLib.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeMobilisationDefenseResultats.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreImplementation.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarDialogPictureViewer.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarLib.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviGraphiqueResultat.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjetsManagerFille.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceManager.java
Added Paths:
-----------
trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/
Removed Paths:
-------------
trunk/fudaa_devel/ctulu/src/com/memoire/acme/
trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/CtuluRemoveContentDirectory.java
Modified: trunk/fudaa_devel/ctulu/src/com/memoire/bu/BuMenuItem.java
===================================================================
--- trunk/fudaa_devel/ctulu/src/com/memoire/bu/BuMenuItem.java 2009-07-21 08:39:50 UTC (rev 4961)
+++ trunk/fudaa_devel/ctulu/src/com/memoire/bu/BuMenuItem.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -13,17 +13,12 @@
import java.awt.Graphics;
import java.awt.Point;
-import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.List;
import javax.swing.Action;
import javax.swing.Icon;
import javax.swing.JMenuItem;
-import org.fudaa.ctulu.CtuluLibGenerator;
-
/**
* Like JMenuItem but with better management of icons.
*/
@@ -55,13 +50,7 @@
if(clone.getAccelerator()!=null)
this.setAccelerator(clone.getAccelerator());
- if(clone.id_!=null)
- this.id_=clone.id_;
- else {
- String gene= CtuluLibGenerator.getInstance().deliverUniqueStringId();
- this.id_=gene;
- clone.id_=gene;
- }
+ this.setId(clone.getId());
}
public BuMenuItem(BuIcon _icon)
@@ -138,9 +127,9 @@
BuMenuItem clone=(BuMenuItem)obj;
- if(clone.id_==null || this.id_==null)
+ if(clone.getId()==null || this.getId()==null)
return false;
- if(!clone.id_.equals(this.id_))
+ if(!clone.getId().equals(this.getId()))
return false;
//
// if(clone.getText()!=null && this.getText()!=null )
@@ -176,4 +165,18 @@
if(r==null) r=new Point(getWidth(),0);
return r;
}
+
+/**
+ * @param id_ the id_ to set
+ */
+public void setId(String id_) {
+ this.id_ = id_;
}
+
+/**
+ * @return the id_
+ */
+public String getId() {
+ return id_;
+}
+}
Modified: trunk/fudaa_devel/ctulu/src/com/memoire/bu/BuVfsOperations.java
===================================================================
--- trunk/fudaa_devel/ctulu/src/com/memoire/bu/BuVfsOperations.java 2009-07-21 08:39:50 UTC (rev 4961)
+++ trunk/fudaa_devel/ctulu/src/com/memoire/bu/BuVfsOperations.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -18,95 +18,72 @@
import javax.swing.JOptionPane;
-import org.fudaa.ctulu.CtuluRemoveContentDirectory;
import com.memoire.fu.FuComparator;
import com.memoire.fu.FuLog;
import com.memoire.vfs.VfsFile;
import com.memoire.vfs.VfsOperations;
-public class BuVfsOperations
- implements VfsOperations
-{
- //private static final boolean DEBUG=Bu.DEBUG&&true;
- private static final boolean TRACE=Bu.TRACE&&true;
+public class BuVfsOperations implements VfsOperations {
+ // private static final boolean DEBUG=Bu.DEBUG&&true;
+ private static final boolean TRACE = Bu.TRACE && true;
protected BuInformationsSoftware il_;
- public BuVfsOperations(BuInformationsSoftware _il)
- {
- il_=_il;
+ public BuVfsOperations(BuInformationsSoftware _il) {
+ il_ = _il;
}
- public final void renameFile(File _o)
- {
- final VfsFile f=VfsFile.ensureVfsFile(_o);
- if(f==null) return;
- BuLib.invokeOutsideLater(new Runnable()
- {
- public void run()
- {
+ public final void renameFile(File _o) {
+ final VfsFile f = VfsFile.ensureVfsFile(_o);
+ if (f == null) return;
+ BuLib.invokeOutsideLater(new Runnable() {
+ public void run() {
renameFile0(f);
}
});
}
- public final void copyFile(File _src,File _dst)
- {
- final VfsFile src=VfsFile.ensureVfsFile(_src);
- final VfsFile dst=VfsFile.ensureVfsFile(_dst);
+ public final void copyFile(File _src, File _dst) {
+ final VfsFile src = VfsFile.ensureVfsFile(_src);
+ final VfsFile dst = VfsFile.ensureVfsFile(_dst);
- if(TRACE&&FuLog.isTrace())
- FuLog.trace("BVO: copy "+src+" to "+dst);
+ if (TRACE && FuLog.isTrace()) FuLog.trace("BVO: copy " + src + " to " + dst);
- BuLib.invokeOutsideLater(new Runnable()
- {
- public void run()
- {
- copyFile0(src,dst);
+ BuLib.invokeOutsideLater(new Runnable() {
+ public void run() {
+ copyFile0(src, dst);
}
});
}
- public final void moveFiles(final File[] _o,final File _dir)
- {
- BuLib.invokeOutsideLater(new Runnable()
- {
- public void run()
- {
- moveOrCopyFiles0(_o,_dir,false,true);
+ public final void moveFiles(final File[] _o, final File _dir) {
+ BuLib.invokeOutsideLater(new Runnable() {
+ public void run() {
+ moveOrCopyFiles0(_o, _dir, false, true);
}
});
}
- public final void copyFiles(final File[] _o,final File _dir)
- {
- BuLib.invokeOutsideLater(new Runnable()
- {
- public void run()
- {
- moveOrCopyFiles0(_o,_dir,true,true);
+ public final void copyFiles(final File[] _o, final File _dir) {
+ BuLib.invokeOutsideLater(new Runnable() {
+ public void run() {
+ moveOrCopyFiles0(_o, _dir, true, true);
}
});
}
- public final void linkFiles(final File[] _o,final File _dir)
- {
- BuLib.invokeOutsideLater(new Runnable()
- {
- public void run()
- {
- linkFiles0(_o,_dir);
+ public final void linkFiles(final File[] _o, final File _dir) {
+ BuLib.invokeOutsideLater(new Runnable() {
+ public void run() {
+ linkFiles0(_o, _dir);
}
});
}
- public final void deleteFiles(final File[] _o)
- {
- BuLib.invokeOutsideLater(new Runnable()
- {
- public void run()
- {
+ public final void deleteFiles(final File[] _o) {
+ BuLib.invokeOutsideLater(new Runnable() {
+ public void run() {
deleteFiles0(_o);
}
});
@@ -114,27 +91,18 @@
// Impl.
- protected boolean renameFile0(VfsFile _f)
- {
- String type=(_f.isDirectory() ? "r\xE9pertoire" : "fichier");
+ protected boolean renameFile0(VfsFile _f) {
+ String type = (_f.isDirectory() ? "r\xE9pertoire" : "fichier");
- BuDialogInput d=new BuDialogInput
- (null,il_,_("Renommer"),
- _("Nouveau nom du "+type+":"),
- _f.getName());
+ BuDialogInput d = new BuDialogInput(null, il_, _("Renommer"), _("Nouveau nom du " + type + ":"), _f.getName());
- if(d.activate()==JOptionPane.OK_OPTION)
- {
- String name =d.getValue();
- VfsFile target=_f.getParentVfsFile().createChild(name);
-
- if(!_f.renameTo(target))
- {
- new BuDialogError
- (null,null,
- _("Impossible de renommer le "+type+" {0} en {1}",
- new Object[] { _f.getName(),name }))
- .activate();
+ if (d.activate() == JOptionPane.OK_OPTION) {
+ String name = d.getValue();
+ VfsFile target = _f.getParentVfsFile().createChild(name);
+
+ if (!_f.renameTo(target)) {
+ new BuDialogError(null, null, _("Impossible de renommer le " + type + " {0} en {1}", new Object[] {
+ _f.getName(), name })).activate();
return false;
}
}
@@ -142,161 +110,137 @@
return true;
}
- protected boolean copyFile0(VfsFile _src,VfsFile _dst)
- {
- if((_src==null)||!_src.exists())
- {
- new BuDialogError
- (null,il_,_("Le fichier {0} n'existe pas",_src)).activate();
+ protected boolean copyFile0(VfsFile _src, VfsFile _dst) {
+ if ((_src == null) || !_src.exists()) {
+ new BuDialogError(null, il_, _("Le fichier {0} n'existe pas", _src)).activate();
return false;
}
- if(_src.isDirectory())
- {
- if((_dst==null)||(_dst.exists()&&!_dst.isDirectory()))
- {
- new BuDialogError
- (null,il_,_("La destination {0} n'est pas un r\xE9pertoire",_dst)).activate();
+ if (_src.isDirectory()) {
+ if ((_dst == null) || (_dst.exists() && !_dst.isDirectory())) {
+ new BuDialogError(null, il_, _("La destination {0} n'est pas un r\xE9pertoire", _dst)).activate();
return false;
}
- if(!_dst.exists())
- {
- if(!_dst.mkdirs())
- {
- new BuDialogError
- (null,il_,
- _("Le r\xE9pertoire {0} n'a pu \xEAtre cr\xE9e")).activate();
+ if (!_dst.exists()) {
+ if (!_dst.mkdirs()) {
+ new BuDialogError(null, il_, _("Le r\xE9pertoire {0} n'a pu \xEAtre cr\xE9e")).activate();
return false;
}
}
- moveOrCopyFiles0(_src.listFiles(),_dst,true,false);
+ moveOrCopyFiles0(_src.listFiles(), _dst, true, false);
return true;
}
- if((_dst==null)||_dst.isDirectory())
- {
- new BuDialogError
- (null,il_,_("La destination {0} est un r\xE9pertoire",_dst)).activate();
+ if ((_dst == null) || _dst.isDirectory()) {
+ new BuDialogError(null, il_, _("La destination {0} est un r\xE9pertoire", _dst)).activate();
return false;
}
- if(_dst.exists())
- {
- if(new BuDialogConfirmation
- (null,il_,
- _("Remplacer le fichier {0} ?",_dst))
- .activate()!=JOptionPane.YES_OPTION)
- return false;
+ if (_dst.exists()) {
+ if (new BuDialogConfirmation(null, il_, _("Remplacer le fichier {0} ?", _dst)).activate() != JOptionPane.YES_OPTION) return false;
}
- boolean failed=false;
- try
- {
- if(TRACE&&FuLog.isTrace())
- FuLog.trace
- ("BVO: destination "+_dst.getAbsolutePath());
-
- InputStream fis=_src.getInputStream();
- OutputStream fos=_dst.getOutputStream();
- int c=0;
- while(true)
- {
- c=fis.read();
- if(c==-1) break;
+ boolean failed = false;
+ try {
+ if (TRACE && FuLog.isTrace()) FuLog.trace("BVO: destination " + _dst.getAbsolutePath());
+
+ InputStream fis = _src.getInputStream();
+ OutputStream fos = _dst.getOutputStream();
+ int c = 0;
+ while (true) {
+ c = fis.read();
+ if (c == -1) break;
fos.write(c);
}
fis.close();
fos.close();
+ } catch (Exception ex) {
+ FuLog.error("BVO: I/O #127", ex);
+ failed = true;
}
- catch(Exception ex)
- {
- FuLog.error("BVO: I/O #127",ex);
- failed=true;
- }
- if(failed)
- {
- new BuDialogError
- (null,il_,
- _("Le fichier {0} n'a pu \xEAtre copi\xE9 dans {1}",
- new Object[] { _src,_dst })).activate();
+ if (failed) {
+ new BuDialogError(null, il_, _("Le fichier {0} n'a pu \xEAtre copi\xE9 dans {1}", new Object[] { _src, _dst }))
+ .activate();
return false;
}
return true;
}
- protected void linkFiles0(File[] _o, File _dir)
- {
- new BuDialogError
- (null,il_,_("La cr\xE9ation de liens n'est pas disponible")).activate();
+ protected void linkFiles0(File[] _o, File _dir) {
+ new BuDialogError(null, il_, _("La cr\xE9ation de liens n'est pas disponible")).activate();
}
- protected void deleteFiles0(File[] _os)
- {
- File[] _o=new File[_os.length];
- System.arraycopy(_os,0, _o , 0, _o.length);
- Arrays.sort(_o,FuComparator.REVERSE_STRING_COMPARATOR);
- String to="";
- int no=0;
+ public static boolean deleteDir(final File _f) {
+ if (_f == null) { return false; }
+ final File[] files = _f.listFiles();
+ if (files != null) {
+ for (int i = files.length - 1; i >= 0; i--) {
+ if (files[i].isFile()) {
+ try {
+ files[i].delete();
+ } catch (final RuntimeException _evt) {
+ FuLog.error(_evt);
- for(int i=0;i<_o.length;i++)
- {
- if(_o[i]!=null)
- {
- VfsFile src=VfsFile.ensureVfsFile(_o[i]);
- if((src!=null)&&src.exists())
- {
- String s=src.getName();
- no++; to+=" "+s+"\n";
- }
+ }
+ } else {
+ deleteDir(files[i]);
+ }
}
+
}
+ return _f.delete();
+ }
- if(TRACE&&FuLog.isTrace())
- FuLog.trace("BVO: "+no+" files");
+ protected void deleteFiles0(File[] _os) {
+ File[] _o = new File[_os.length];
+ System.arraycopy(_os, 0, _o, 0, _o.length);
+ Arrays.sort(_o, FuComparator.REVERSE_STRING_COMPARATOR);
+ String to = "";
+ int no = 0;
- if((no>0)&&
- (new BuDialogConfirmation
- (null,il_,
- _("D\xE9truire ces {0} fichiers ?",no)+"\n"+to)
- .activate()==JOptionPane.YES_OPTION))
- {
- for(int i=0;i<_o.length;i++)
- {
- if(_o[i]!=null)
- {
- VfsFile src=VfsFile.ensureVfsFile(_o[i]);
- if(TRACE&&FuLog.isTrace())
- FuLog.trace("BVO: src "+src+" "+src.exists());
- if((src!=null)&&src.exists())
- {
- //String s=src.getName();
+ for (int i = 0; i < _o.length; i++) {
+ if (_o[i] != null) {
+ VfsFile src = VfsFile.ensureVfsFile(_o[i]);
+ if ((src != null) && src.exists()) {
+ String s = src.getName();
+ no++;
+ to += " " + s + "\n";
+ }
+ }
+ }
- boolean failed=false;
- if(TRACE&&FuLog.isTrace())
- FuLog.trace("BVO: delete "+src);
- try {
- if(src.isDirectory()){
- try{
- CtuluRemoveContentDirectory.contentDirectoryRemover(src);
- failed=!src.delete();
- //failed=false;
- }catch(Exception e){
- failed=true;
- }
- }
- else
- failed=!src.delete();
-
+ if (TRACE && FuLog.isTrace()) FuLog.trace("BVO: " + no + " files");
+
+ if ((no > 0)
+ && (new BuDialogConfirmation(null, il_, _("D\xE9truire ces {0} fichiers ?", no) + "\n" + to).activate() == JOptionPane.YES_OPTION)) {
+ for (int i = 0; i < _o.length; i++) {
+ if (_o[i] != null) {
+ VfsFile src = VfsFile.ensureVfsFile(_o[i]);
+ if (TRACE && FuLog.isTrace()) FuLog.trace("BVO: src " + src + " " + src.exists());
+ if ((src != null) && src.exists()) {
+ // String s=src.getName();
+
+ boolean failed = false;
+ if (TRACE && FuLog.isTrace()) FuLog.trace("BVO: delete " + src);
+ try {
+ if (src.isDirectory()) {
+ try {
+ deleteDir(src);
+ failed = !src.delete();
+ // failed=false;
+ } catch (Exception e) {
+ failed = true;
+ }
+ } else failed = !src.delete();
+
+ } catch (Exception ex) {
+ failed = true;
}
- catch(Exception ex) { failed=true; }
- if(failed)
- {
- new BuDialogError
- (null,il_,_("Le fichier {0} n'a pu \xEAtre d\xE9truit",src))
- .activate();
+ if (failed) {
+ new BuDialogError(null, il_, _("Le fichier {0} n'a pu \xEAtre d\xE9truit", src)).activate();
}
}
}
@@ -304,185 +248,122 @@
}
}
- protected void moveOrCopyFiles0(File[] _o,File _dir,boolean _copy,boolean _confirm)
- {
- VfsFile dir=VfsFile.ensureVfsFile(_dir);
- if(TRACE&&FuLog.isTrace())
- FuLog.trace("BVO: "+(_copy ? "copy" : "move")+" "+
- _o.length+" files to "+dir);
+ protected void moveOrCopyFiles0(File[] _o, File _dir, boolean _copy, boolean _confirm) {
+ VfsFile dir = VfsFile.ensureVfsFile(_dir);
+ if (TRACE && FuLog.isTrace()) FuLog.trace("BVO: " + (_copy ? "copy" : "move") + " " + _o.length + " files to "
+ + dir);
- if((dir==null)||!dir.exists())
- {
- new BuDialogError
- (null,il_,_("Le repertoire {0} n'existe pas",dir)).activate();
+ if ((dir == null) || !dir.exists()) {
+ new BuDialogError(null, il_, _("Le repertoire {0} n'existe pas", dir)).activate();
return;
}
- if(!dir.canWrite())
- {
- new BuDialogError
- (null,il_,_("Le repertoire {0} est en lecture seule",dir)).activate();
+ if (!dir.canWrite()) {
+ new BuDialogError(null, il_, _("Le repertoire {0} est en lecture seule", dir)).activate();
return;
}
- String to="";
- String te="";
- int no=0;
- int ne=0;
+ String to = "";
+ String te = "";
+ int no = 0;
+ int ne = 0;
- for(int i=0;i<_o.length;i++)
- {
- if(_o[i]!=null)
- {
- VfsFile src=VfsFile.ensureVfsFile(_o[i]);
- //FuLog.debug("FILE="+src);
- if((src!=null)&&src.exists())
- {
- //FuLog.debug("BVO: dst="+cdir+" src="+src.getClass());
- //if(src.getClass()!=cdir) _copy=true;
-
- String s=src.getName();
- VfsFile dst=dir.createChild(s);
- if(dst.exists()) { ne++; te+=" "+s+"\n"; }
- else { no++; to+=" "+s+"\n"; }
- }
+ for (int i = 0; i < _o.length; i++) {
+ if (_o[i] != null) {
+ VfsFile src = VfsFile.ensureVfsFile(_o[i]);
+ // FuLog.debug("FILE="+src);
+ if ((src != null) && src.exists()) {
+ // FuLog.debug("BVO: dst="+cdir+" src="+src.getClass());
+ // if(src.getClass()!=cdir) _copy=true;
+
+ String s = src.getName();
+ VfsFile dst = dir.createChild(s);
+ if (dst.exists()) {
+ ne++;
+ te += " " + s + "\n";
+ } else {
+ no++;
+ to += " " + s + "\n";
+ }
+ }
}
}
- if(TRACE&&FuLog.isTrace())
- FuLog.trace("BVO: "+no+" files");
+ if (TRACE && FuLog.isTrace()) FuLog.trace("BVO: " + no + " files");
- if(_confirm&&
- (no>0)&&
- (new BuDialogConfirmation
- (null,il_,
- _(_copy
- ? "Copier ces {0} fichiers dans {1} ?"
- : "D\xE9placer ces {0} fichiers dans {1} ?",
- new Object[] { ""+no,dir })
- +"\n"+to)
- .activate()==JOptionPane.YES_OPTION))
- {
- for(int i=0;i<_o.length;i++)
- {
- if(_o[i]!=null)
- {
- VfsFile src=VfsFile.ensureVfsFile(_o[i]);
- if(TRACE&&FuLog.isTrace())
- FuLog.trace("BVO: src "+src+" "+src.exists());
- if((src!=null)&&src.exists())
- {
- String s=src.getName();
- VfsFile dst=dir.createChild(s);
- //new File(_dir,s);
- if(TRACE&&FuLog.isTrace())
- FuLog.trace
- ("BVO: dst "+dst+" "+dst.exists()+" =="+dst.equals(src));
- if(!dst.exists()&&!dst.equals(src))
- {
- if(_copy)
- {
- //if(src.isDirectory())
- //{
- copyFile0(src,dst);
- //}
+ if (_confirm
+ && (no > 0)
+ && (new BuDialogConfirmation(null, il_, _(_copy ? "Copier ces {0} fichiers dans {1} ?"
+ : "D\xE9placer ces {0} fichiers dans {1} ?", new Object[] { "" + no, dir })
+ + "\n" + to).activate() == JOptionPane.YES_OPTION)) {
+ for (int i = 0; i < _o.length; i++) {
+ if (_o[i] != null) {
+ VfsFile src = VfsFile.ensureVfsFile(_o[i]);
+ if (TRACE && FuLog.isTrace()) FuLog.trace("BVO: src " + src + " " + src.exists());
+ if ((src != null) && src.exists()) {
+ String s = src.getName();
+ VfsFile dst = dir.createChild(s);
+ // new File(_dir,s);
+ if (TRACE && FuLog.isTrace()) FuLog.trace("BVO: dst " + dst + " " + dst.exists() + " ==" + dst.equals(src));
+ if (!dst.exists() && !dst.equals(src)) {
+ if (_copy) {
+ // if(src.isDirectory())
+ // {
+ copyFile0(src, dst);
+ // }
/*
- else
- {
- if(TRACE&&FuLog.isTrace())
- FuLog.trace("BVO: copy "+src+" to "+dst);
- boolean failed=false;
- try
- {
- if(TRACE&&FuLog.isTrace()) FuLog.trace
- ("BVO: destination "+dst.getAbsolutePath());
-
- InputStream fis=src.getInputStream();
- OutputStream fos=dst.getOutputStream();
- int c=0;
- int n=0;
- while(true)
- {
- c=fis.read();
- if(c==-1) break;
- fos.write(c);
- }
-
- fis.close();
- fos.close();
- }
- catch(Exception ex)
- {
- FuLog.error("BVO: I/O #145",ex);
- failed=true;
- }
- if(failed)
- {
- new BuDialogError
- (null,il_,
- _("Le fichier {0} n'a pu \xEAtre copi\xE9 dans {1}",
- new Object[] { src,dir })).activate();
- //if(dst.exists()) dst.delete();
- }
- }
- */
- }
- else
- {
- boolean failed=false;
- if(TRACE&&FuLog.isTrace())
- FuLog.trace("BVO: rename "+src+" to "+dst);
- try { failed=!src.renameTo(dst); }
- catch(Exception ex) { failed=true; }
- if(failed)
- {
- new BuDialogError
- (null,il_,
- _("Le fichier {0} n'a pu \xEAtre d\xE9plac\xE9 dans {1}",
- new Object[] { src,dir })).activate();
- //if(dst.exists()) dst.delete();
- }
- }
- }
- else
- {
- te+=s+"\n";
- ne++;
- }
- }
- }
+ * else { if(TRACE&&FuLog.isTrace()) FuLog.trace("BVO: copy "+src+" to "+dst); boolean failed=false; try
+ * { if(TRACE&&FuLog.isTrace()) FuLog.trace ("BVO: destination "+dst.getAbsolutePath());
+ *
+ * InputStream fis=src.getInputStream(); OutputStream fos=dst.getOutputStream(); int c=0; int n=0;
+ * while(true) { c=fis.read(); if(c==-1) break; fos.write(c); }
+ *
+ * fis.close(); fos.close(); } catch(Exception ex) { FuLog.error("BVO: I/O #145",ex); failed=true; }
+ * if(failed) { new BuDialogError (null,il_, _("Le fichier {0} n'a pu \xEAtre copi\xE9 dans {1}", new Object[]
+ * { src,dir })).activate(); //if(dst.exists()) dst.delete(); } }
+ */
+ } else {
+ boolean failed = false;
+ if (TRACE && FuLog.isTrace()) FuLog.trace("BVO: rename " + src + " to " + dst);
+ try {
+ failed = !src.renameTo(dst);
+ } catch (Exception ex) {
+ failed = true;
+ }
+ if (failed) {
+ new BuDialogError(null, il_, _("Le fichier {0} n'a pu \xEAtre d\xE9plac\xE9 dans {1}",
+ new Object[] { src, dir })).activate();
+ // if(dst.exists()) dst.delete();
+ }
+ }
+ } else {
+ te += s + "\n";
+ ne++;
+ }
+ }
+ }
}
}
- if(ne>0)
- new BuDialogError
- (null,il_,
- _(_copy
- ? "Les {0} fichiers suivants n'ont pas \xE9t\xE9 copi\xE9s "+
- "car ils existent d\xE9j\xE0 dans {1}"
- : "Les {0} fichiers suivants n'ont pas \xE9t\xE9 d\xE9plac\xE9s "+
- "car ils existent d\xE9j\xE0 dans {1}",
- new Object[] { ""+ne,dir })+
- " :\n"+te).activate();
+ if (ne > 0) new BuDialogError(null, il_, _(_copy ? "Les {0} fichiers suivants n'ont pas \xE9t\xE9 copi\xE9s "
+ + "car ils existent d\xE9j\xE0 dans {1}" : "Les {0} fichiers suivants n'ont pas \xE9t\xE9 d\xE9plac\xE9s "
+ + "car ils existent d\xE9j\xE0 dans {1}", new Object[] { "" + ne, dir })
+ + " :\n" + te).activate();
}
- public final String _(final String _s)
- {
+ public final String _(final String _s) {
return BuResource.BU.getString(_s);
}
- public final String _(final String _s,final Object[] _p)
- {
- return BuResource.BU.getString(_s,_p);
+ public final String _(final String _s, final Object[] _p) {
+ return BuResource.BU.getString(_s, _p);
}
- public final String _(final String _s,final Object _p)
- {
- return BuResource.BU.getString(_s,new Object[] { _p });
+ public final String _(final String _s, final Object _p) {
+ return BuResource.BU.getString(_s, new Object[] { _p });
}
- public final String _(final String _s,final int _p)
- {
- return BuResource.BU.getString(_s,new Object[] { ""+_p });
+ public final String _(final String _s, final int _p) {
+ return BuResource.BU.getString(_s, new Object[] { "" + _p });
}
}
Deleted: trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/CtuluRemoveContentDirectory.java
===================================================================
--- trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/CtuluRemoveContentDirectory.java 2009-07-21 08:39:50 UTC (rev 4961)
+++ trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/CtuluRemoveContentDirectory.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -1,101 +0,0 @@
-package org.fudaa.ctulu;
-
-import java.io.File;
-/**
- * Classe qui permet de faire le m\xE9nage dans un repertoire.
- * On fournit le repertoire cible.
- * le thread supprime le contenu du repertoire (tous les fichiers du repertoire.)
- * @author Adrien Hadoux
- *
- */
-public class CtuluRemoveContentDirectory {
-
-
- public File[] listing;
-
- public File Finit;
-
- /**
- * Methode statique a appeler pour effacer recursivemetn le contenu d un repertoire
- * @param file
- */
- public static void contentDirectoryRemover(File file){
- new CtuluRemoveContentDirectory (file).demarrerSupression();
- }
-
-
- public CtuluRemoveContentDirectory(File Finit) {
- // on recupere le parametre
- this.Finit = Finit;
-
- }
-
-
-
-
- public void demarrerSupression() {
- // on verifie si c'est un repertoire .....
- if (Finit.isDirectory()) {
- // si s'en est un on liste son contenu
- listing = Finit.listFiles();
-
-
-
- // poiur chaque sous repertoire ...
- for (int i = 0; i < listing.length; i++) {
- // ...on verifie si c'est des fichier ...
- if (listing[i].isFile()) {
- // ... si ca en est on les supprime
- boolean b = listing[i].delete();
- // on verifie si tout c'est bien passe
- System.out.println("suppession de :" + listing[i] + ":"
- + b);
- }
- // si c'est un repertoire on demare une methode...
- else{
- // on demare la methode
- removeDirectoryContentRecursivly(listing[i]);
- listing[i].delete();
- }
- }
-
-
- }
-
-
- }
-
-
-
- private void removeDirectoryContentRecursivly(File ToDel) {
-
- File[] listing2 = ToDel.listFiles();
-
- if(listing2==null || listing2.length==0){
- ToDel.delete();
- return;
- }
- for (int i= 0;i<listing2.length; i++) {
- // ...verifie si c'est un fichier
- if (listing2[i].isFile()) {
- // on le supprime et on verifie que c'est bon
- boolean b = listing2[i].delete();
-
- }
- // sinon c'est un repertoire
- else {
- // on applique de nouveau la methode sur le repertoire
- removeDirectoryContentRecursivly(listing2[i]);
- }
- }
-
- //-- on finit par supprimer le directory, sinon loop infinie garantie! --//
- ToDel.delete();
-
- }
-
-
-
-
-
-}
Modified: trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/AcmeGifEncoder.java
===================================================================
--- trunk/fudaa_devel/ctulu/src/com/memoire/acme/AcmeGifEncoder.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/AcmeGifEncoder.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -1,6 +1,6 @@
-package com.memoire.acme;
+package org.fudaa.ctulu.gif;
// AcmeGifEncoder - write out an image as a GIF
//
Modified: trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/AcmeImageEncoder.java
===================================================================
--- trunk/fudaa_devel/ctulu/src/com/memoire/acme/AcmeImageEncoder.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/AcmeImageEncoder.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -1,6 +1,6 @@
-package com.memoire.acme;
+package org.fudaa.ctulu.gif;
// AcmeImageEncoder - abstract class for writing out an image
//
Modified: trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/AcmeIntHashtable.java
===================================================================
--- trunk/fudaa_devel/ctulu/src/com/memoire/acme/AcmeIntHashtable.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/AcmeIntHashtable.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -1,6 +1,6 @@
-package com.memoire.acme;
+package org.fudaa.ctulu.gif;
// AcmeIntHashtable - a Hashtable that uses ints as the keys
// This is 90% based on JavaSoft's java.util.Hashtable.
Modified: trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/AcmeJpegEncoder.java
===================================================================
--- trunk/fudaa_devel/ctulu/src/com/memoire/acme/AcmeJpegEncoder.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/AcmeJpegEncoder.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -1,6 +1,6 @@
-package com.memoire.acme;
+package org.fudaa.ctulu.gif;
// AcmeJpegEncoder - write out an image as a JPEG
//
Modified: trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/AcmePpmEncoder.java
===================================================================
--- trunk/fudaa_devel/ctulu/src/com/memoire/acme/AcmePpmEncoder.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/AcmePpmEncoder.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -1,6 +1,6 @@
-package com.memoire.acme;
+package org.fudaa.ctulu.gif;
// AcmePpmEncoder - write out an image as a PPM
//
Modified: trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/CtuluGif89EncoderImmediateSave.java
===================================================================
--- trunk/fudaa_devel/ctulu/src/com/memoire/acme/CtuluGif89EncoderImmediateSave.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/CtuluGif89EncoderImmediateSave.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -1,7 +1,7 @@
//******************************************************************************
// Gif89Encoder.java
//******************************************************************************
-package com.memoire.acme;
+package org.fudaa.ctulu.gif;
import java.awt.Dimension;
import java.awt.Image;
Modified: trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/DirectGif89Frame.java
===================================================================
--- trunk/fudaa_devel/ctulu/src/com/memoire/acme/DirectGif89Frame.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/DirectGif89Frame.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -1,7 +1,7 @@
//******************************************************************************
// DirectGif89Frame.java
//******************************************************************************
-package com.memoire.acme;
+package org.fudaa.ctulu.gif;
import java.awt.Image;
import java.awt.image.PixelGrabber;
Modified: trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/Gif89Encoder.java
===================================================================
--- trunk/fudaa_devel/ctulu/src/com/memoire/acme/Gif89Encoder.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/Gif89Encoder.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -1,7 +1,7 @@
//******************************************************************************
// Gif89Encoder.java
//******************************************************************************
-package com.memoire.acme;
+package org.fudaa.ctulu.gif;
import java.awt.Color;
import java.awt.Dimension;
Modified: trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/Gif89Frame.java
===================================================================
--- trunk/fudaa_devel/ctulu/src/com/memoire/acme/Gif89Frame.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/Gif89Frame.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -1,7 +1,7 @@
//******************************************************************************
// Gif89Frame.java
//******************************************************************************
-package com.memoire.acme;
+package org.fudaa.ctulu.gif;
import java.awt.Point;
import java.io.IOException;
Modified: trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/GifColorTable.java
===================================================================
--- trunk/fudaa_devel/ctulu/src/com/memoire/acme/GifColorTable.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/GifColorTable.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -5,7 +5,7 @@
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
-package com.memoire.acme;
+package org.fudaa.ctulu.gif;
import java.awt.Color;
import java.io.IOException;
Modified: trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/IndexGif89Frame.java
===================================================================
--- trunk/fudaa_devel/ctulu/src/com/memoire/acme/IndexGif89Frame.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/IndexGif89Frame.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -1,7 +1,7 @@
//******************************************************************************
// IndexGif89Frame.java
//******************************************************************************
-package com.memoire.acme;
+package org.fudaa.ctulu.gif;
//==============================================================================
/** Instances of this Gif89Frame subclass are constructed from bitmaps in the
Modified: trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/Put.java
===================================================================
--- trunk/fudaa_devel/ctulu/src/com/memoire/acme/Put.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/fudaa_devel/ctulu/src/org/fudaa/ctulu/gif/Put.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -1,7 +1,7 @@
//******************************************************************************
// Put.java
//******************************************************************************
-package com.memoire.acme;
+package org.fudaa.ctulu.gif;
import java.io.IOException;
import java.io.OutputStream;
Modified: trunk/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationOutputGIF.java
===================================================================
--- trunk/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationOutputGIF.java 2009-07-21 08:39:50 UTC (rev 4961)
+++ trunk/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationOutputGIF.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -13,9 +13,9 @@
import java.io.FileOutputStream;
import java.io.IOException;
-import com.memoire.acme.CtuluGif89EncoderImmediateSave;
import com.memoire.fu.FuLog;
+import org.fudaa.ctulu.gif.CtuluGif89EncoderImmediateSave;
import org.fudaa.ctulu.image.CtuluImageProducer;
import org.fudaa.ctulu.image.CtuluLibImage;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleNoteDeCalculs.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleNoteDeCalculs.java 2009-07-21 08:39:50 UTC (rev 4961)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleNoteDeCalculs.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -26,9 +26,9 @@
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.gif.AcmeGifEncoder;
import org.fudaa.fudaa.commun.projet.FudaaProjet;
-import com.memoire.acme.AcmeGifEncoder;
import com.memoire.bu.BuButton;
import com.memoire.bu.BuCommonInterface;
import com.memoire.bu.BuLabel;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeGraphiqueDialog.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeGraphiqueDialog.java 2009-07-21 08:39:50 UTC (rev 4961)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeGraphiqueDialog.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -17,9 +17,9 @@
import javax.swing.JComponent;
import javax.swing.JOptionPane;
+import org.fudaa.ctulu.gif.AcmeGifEncoder;
import org.fudaa.ebli.graphe.BGraphe;
-import com.memoire.acme.AcmeGifEncoder;
import com.memoire.bu.BuButton;
import com.memoire.bu.BuCommonInterface;
import com.memoire.bu.BuDialog;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeLib.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeLib.java 2009-07-21 08:39:50 UTC (rev 4961)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeLib.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -25,6 +25,7 @@
import javax.swing.table.DefaultTableModel;
import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.gif.AcmeGifEncoder;
import org.fudaa.dodico.corba.albe.SAction;
import org.fudaa.dodico.corba.albe.SCoefficientsPartiels;
import org.fudaa.dodico.corba.albe.SCombinaisonMateriaux;
@@ -46,7 +47,6 @@
import org.fudaa.ebli.graphe.Lecteur;
import org.fudaa.fudaa.commun.projet.FudaaFiltreFichier;
-import com.memoire.acme.AcmeGifEncoder;
import com.memoire.bu.BuButton;
import com.memoire.bu.BuCommonInterface;
import com.memoire.bu.BuDialogConfirmation;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeMobilisationDefenseResultats.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeMobilisationDefenseResultats.java 2009-07-21 08:39:50 UTC (rev 4961)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeMobilisationDefenseResultats.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -19,11 +19,11 @@
import javax.swing.JOptionPane;
import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.gif.AcmeGifEncoder;
import org.fudaa.ebli.graphe.BGraphe;
import org.fudaa.ebli.graphe.Graphe;
import org.fudaa.ebli.graphe.Lecteur;
-import com.memoire.acme.AcmeGifEncoder;
import com.memoire.bu.BuCommonInterface;
import com.memoire.bu.BuLabelMultiLine;
import com.memoire.bu.BuPanel;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreImplementation.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreImplementation.java 2009-07-21 08:39:50 UTC (rev 4961)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreImplementation.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -24,10 +24,10 @@
import javax.swing.JOptionPane;
import javax.swing.event.InternalFrameEvent;
-import com.memoire.acme.AcmeGifEncoder;
import com.memoire.bu.*;
import com.memoire.fu.FuLib;
+import org.fudaa.ctulu.gif.AcmeGifEncoder;
import org.fudaa.dodico.corba.diapre.ICalculDiapre;
import org.fudaa.dodico.corba.diapre.ICalculDiapreHelper;
import org.fudaa.dodico.corba.diapre.IParametresDiapre;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarDialogPictureViewer.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarDialogPictureViewer.java 2009-07-21 08:39:50 UTC (rev 4961)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarDialogPictureViewer.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -23,10 +23,10 @@
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
-import com.memoire.acme.AcmeGifEncoder;
import com.memoire.bu.BuCommonInterface;
import com.memoire.bu.BuDialog;
+import org.fudaa.ctulu.gif.AcmeGifEncoder;
import org.fudaa.ebli.graphe.BGraphe;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarLib.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarLib.java 2009-07-21 08:39:50 UTC (rev 4961)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarLib.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -48,11 +48,11 @@
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableColumn;
-import com.memoire.acme.AcmeGifEncoder;
import com.memoire.bu.*;
import com.memoire.fu.FuLib;
import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.gif.AcmeGifEncoder;
import org.fudaa.dodico.corba.oscar.*;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviGraphiqueResultat.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviGraphiqueResultat.java 2009-07-21 08:39:50 UTC (rev 4961)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviGraphiqueResultat.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -19,11 +19,11 @@
import javax.swing.JComponent;
-import com.memoire.acme.AcmeGifEncoder;
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuPanel;
+import org.fudaa.ctulu.gif.AcmeGifEncoder;
import org.fudaa.ebli.graphe.Axe;
import org.fudaa.ebli.graphe.BGraphe;
import org.fudaa.ebli.graphe.Contrainte;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjetsManagerFille.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjetsManagerFille.java 2009-07-21 08:39:50 UTC (rev 4961)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjetsManagerFille.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -16,6 +16,7 @@
import javax.swing.event.ListSelectionListener;
import javax.swing.tree.TreePath;
+import org.fudaa.ctulu.CtuluLibGenerator;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.fudaa.tr.common.TrResource;
import org.fudaa.fudaa.tr.post.actions.TrPostActionOpenSrc;
@@ -180,8 +181,11 @@
int indexSource=projet_.listeSrc_.indexOf(src);
- for(BuMenuItem item:this.projet_.getlisteSousMenuProjets_().get(indexSource))
+ for(BuMenuItem item:this.projet_.getlisteSousMenuProjets_().get(indexSource)){
+ if(item.getId()==null)
+ item.setId(CtuluLibGenerator.getInstance().deliverUniqueStringId());
popup.add(new BuMenuItem(item));
+ }
//-- affichage au bon endroit --//
popup.show(listProjets_, x, y);
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceManager.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceManager.java 2009-07-21 08:39:50 UTC (rev 4961)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceManager.java 2009-07-21 09:51:56 UTC (rev 4962)
@@ -23,7 +23,6 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluLibFile;
-import org.fudaa.ctulu.CtuluRemoveContentDirectory;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.gui.CtuluFileChooser;
import org.fudaa.ctulu.gui.CtuluLibSwing;
@@ -159,7 +158,7 @@
fileChooser.setDialogTitle(EbliResource.EBLI.getString("S\xE9lectionnez l'emplacement de votre projet"));
fileChooser.setAcceptAllFileFilterUsed(false);
fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
- //fileChooser.addChoosableFileFilter(new TrPostFileFilter.DirectoryPOSTFilter());
+ // fileChooser.addChoosableFileFilter(new TrPostFileFilter.DirectoryPOSTFilter());
// -- par defaut on choisis le nom du fichier resultat + .POST --//
@@ -195,44 +194,42 @@
if (projet_ != null) { // initialiser le saveas dans le meme rep
// fileChooser.setSelectedFile(projet_);
}
- File conteneurProjet =null;
-
- int reponse = fileChooser.showSaveDialog(CtuluLibSwing.getFrameAncestor(ui_.getParentComponent()));
+ File conteneurProjet = null;
+
+ int reponse = fileChooser.showSaveDialog(CtuluLibSwing.getFrameAncestor(ui_.getParentComponent()));
if (reponse == JFileChooser.APPROVE_OPTION) {
- conteneurProjet = fileChooser.getSelectedFile();
- }else
- return false;
-
+ conteneurProjet = fileChooser.getSelectedFile();
+ } else return false;
- if(conteneurProjet.exists() && !conteneurProjet.isDirectory()){
-
- trprojet_.impl_.error(TrResource.getS("Erreur, le fichier choisit doit \xEAtre un r\xE9pertoire"));
- return false;
+ if (conteneurProjet.exists() && !conteneurProjet.isDirectory()) {
+
+ trprojet_.impl_.error(TrResource.getS("Erreur, le fichier choisit doit \xEAtre un r\xE9pertoire"));
+ return false;
}
- // -- test si le fichier choisit par l'utilisateur existe djea, si oui. demander confirmation d'ecrasement --//
- if (conteneurProjet.exists()) {
-
- boolean resp = trprojet_.impl_.question("Fichier " + conteneurProjet.getName() + " existant", "Le fichier "
- + conteneurProjet.getName() + " existe d\xE9j\xE0.\n Voulez-vous l'\xE9craser ?");
- if (!resp) return false;
- }
+ // -- test si le fichier choisit par l'utilisateur existe djea, si oui. demander confirmation d'ecrasement --//
+ if (conteneurProjet.exists()) {
- if (projet_ == null || !projet_.equals(conteneurProjet)) projet_ = new File(GetExtensionName(conteneurProjet
- .getAbsolutePath()));
- // creation du repertoire global contenant toutes les donn\xE9es
- if (projet_.mkdir()) {
- return true;
- } else
+ boolean resp = trprojet_.impl_.question("Fichier " + conteneurProjet.getName() + " existant", "Le fichier "
+ + conteneurProjet.getName() + " existe d\xE9j\xE0.\n Voulez-vous l'\xE9craser ?");
+ if (!resp) return false;
+ }
- if (projet_.isDirectory()) {
- return true;
- } else {
- ui_.error(EbliResource.EBLI.getString("Impossible de cr\xE9er le r\xE9pertoire"));
- return false;
- }
+ if (projet_ == null || !projet_.equals(conteneurProjet)) projet_ = new File(GetExtensionName(conteneurProjet
+ .getAbsolutePath()));
+ // creation du repertoire global contenant toutes les donn\xE9es
+ if (projet_.mkdir()) {
+ return true;
+ } else
- } else if (projet_ != null)
+ if (projet_.isDirectory()) {
+ return true;
+ } else {
+ ui_.error(EbliResource.EBLI.getString("Impossible de cr\xE9er le r\xE9pertoire"));
+ return false;
+ }
+
+ } else if (projet_ != null)
// -- on sauvegarde au meme emplacement --//
return true;
else return false;
@@ -873,7 +870,7 @@
File fileVar = new File(pathVariables);
if (fileVar.isDirectory()) {
- CtuluRemoveContentDirectory.contentDirectoryRemover(fileVar);
+ CtuluLibFile.deleteDir(fileVar);
} else fileVar.mkdir();
} catch (final Exception e) {
@@ -1132,7 +1129,7 @@
File fichierGraphes = new File(pathGraphes);
if (fichierGraphes.isDirectory()) {
// -- on le nettoie --//
- CtuluRemoveContentDirectory.contentDirectoryRemover(fichierGraphes);
+ CtuluLibFile.deleteDir(fichierGraphes);
} else fichierGraphes.mkdir();
} catch (final Exception e) {
@@ -1145,7 +1142,7 @@
File fichierCalques = new File(pathCalques);
if (fichierCalques.isDirectory()) {
// -- on le nettoie --//
- CtuluRemoveContentDirectory.contentDirectoryRemover(fichierCalques);
+ CtuluLibFile.deleteDir(fichierCalques);
} else fichierCalques.mkdir();
} catch (final Exception e) {
@@ -1158,7 +1155,7 @@
File fichierText = new File(pathText);
if (fichierText.isDirectory()) {
// -- on le nettoie --//
- CtuluRemoveContentDirectory.contentDirectoryRemover(fichierText);
+ CtuluLibFile.deleteDir(fichierText);
} else fichierText.mkdir();
} catch (final Exception e) {
@@ -1223,20 +1220,21 @@
for (final Widget child : widget.getChildren()) {
final EbliNode node = (EbliNode) scene.findObject(child);
// ecriture de l objet
- if (node != null){
+ if (node != null) {
- out.writeObject(new EbliWidgetSerializeXml(node, parametres));
- listeNomsComposants.add(new EbliWidgetSerializeXml.CoupleNomId(node.getTitle(), node.getWidget().getId()));
+ out.writeObject(new EbliWidgetSerializeXml(node, parametres));
+ listeNomsComposants
+ .add(new EbliWidgetSerializeXml.CoupleNomId(node.getTitle(), node.getWidget().getId()));
}
}
} else {
final EbliNode node = (EbliNode) scene.findObject(widget);
// ecriture de l objet
- if (node != null){
-
- out.writeObject(new EbliWidgetSerializeXml(node, parametres));
- listeNomsComposants.add(new EbliWidgetSerializeXml.CoupleNomId(node.getTitle(), node.getWidget().getId()));
+ if (node != null) {
+
+ out.writeObject(new EbliWidgetSerializeXml(node, parametres));
+ listeNomsComposants.add(new EbliWidgetSerializeXml.CoupleNomId(node.getTitle(), node.getWidget().getId()));
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
