Menu
▾
▴
fudaa-cvs-commit — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(89) |
Mar
(219) |
Apr
(82) |
May
(33) |
Jun
(11) |
Jul
(129) |
Aug
(357) |
Sep
(34) |
Oct
(37) |
Nov
(42) |
Dec
(182) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(59) |
Feb
(74) |
Mar
(196) |
Apr
(205) |
May
(109) |
Jun
(268) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2004-03-12 16:11:16
|
Update of /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16275/src/com/memoire/xml Removed Files: Ontology.java Log Message: Update ctulu --- Ontology.java DELETED --- |
|
From: <de...@us...> - 2004-03-12 16:09:24
|
Update of /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15871 Modified Files: XmlListener.java XmlNode.java XmlParser.java XmlReader.java Log Message: Update ctulu Index: XmlListener.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/xml/XmlListener.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** XmlListener.java 29 Jan 2003 11:24:20 -0000 1.1 --- XmlListener.java 12 Mar 2004 15:49:49 -0000 1.2 *************** *** 11,16 **** package com.memoire.xml; - import com.memoire.xml.*; - public interface XmlListener --- 11,14 ---- Index: XmlNode.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/xml/XmlNode.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** XmlNode.java 29 Jan 2003 11:24:20 -0000 1.1 --- XmlNode.java 12 Mar 2004 15:49:49 -0000 1.2 *************** *** 11,15 **** package com.memoire.xml; - import com.memoire.xml.*; import java.util.*; --- 11,14 ---- *************** *** 28,32 **** { Object o=e.nextElement(); ! if(!(o instanceof XmlNode)) r+=o.toString().trim(); } return r; --- 27,31 ---- { Object o=e.nextElement(); ! if(!(o instanceof XmlNode)) r+=o.toString();//.trim(); } return r; *************** *** 64,67 **** --- 63,79 ---- } + public int findSize() + { + int r=0; + Enumeration e=children_.elements(); + while(e.hasMoreElements()) + { + r++; + Object o=e.nextElement(); + if(o instanceof XmlNode) r+=((XmlNode)o).findSize(); + } + return r; + } + public XmlNode getNode(String _name) { Index: XmlParser.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/xml/XmlParser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** XmlParser.java 29 Jan 2003 11:24:20 -0000 1.1 --- XmlParser.java 12 Mar 2004 15:49:49 -0000 1.2 *************** *** 11,17 **** package com.memoire.xml; - import com.memoire.xml.*; import java.io.*; import java.util.*; --- 11,17 ---- package com.memoire.xml; import java.io.*; + import java.net.*; import java.util.*; *************** *** 33,42 **** public XmlParser(String _origin) throws IOException { ! this(new FileReader(_origin),_origin,XML); } public XmlParser(String _origin,int _mode) throws IOException { ! this(new FileReader(_origin),_origin,_mode); } --- 33,56 ---- public XmlParser(String _origin) throws IOException { ! this(_origin,XML); } public XmlParser(String _origin,int _mode) throws IOException { ! this(convert(_origin),_origin,_mode); ! } ! ! private static final Reader convert(String _o) throws IOException ! { ! Reader r=null; ! try ! { ! r=new InputStreamReader(new URL(_o).openStream()); ! } ! catch(MalformedURLException ex) ! { ! r=new FileReader(_o); ! } ! return r; } *************** *** 51,54 **** --- 65,78 ---- } + public XmlParser(URL _origin) throws IOException + { + this(new InputStreamReader(_origin.openStream()),_origin.toString(),XML); + } + + public XmlParser(URL _origin, int _mode) throws IOException + { + this(new InputStreamReader(_origin.openStream()),_origin.toString(),_mode); + } + public XmlParser(Reader _in, String _origin) { *************** *** 58,63 **** public XmlParser(Reader _in, String _origin, int _mode) { in_ =_in; ! buf_ =new char[1024]; nbc_ =0; origin_ =_origin; --- 82,90 ---- public XmlParser(Reader _in, String _origin, int _mode) { + if(!(_in instanceof BufferedReader)) + _in=new BufferedReader(_in); + in_ =_in; ! buf_ =new char[8]; nbc_ =0; origin_ =_origin; *************** *** 68,72 **** } ! protected static final String replace(String _s, String _a, String _b) { String r=_s; --- 95,100 ---- } ! // same as FuLib.replace ! public static final String replace(String _s, String _a, String _b) { String r=_s; *************** *** 194,197 **** --- 222,233 ---- tag--; } + else + if((t=='[')&&peekC()=='C') + { + putC(t); + do { sb.append(readC()); } + while(!sb.toString().endsWith("]]>")); + tag--; + } else putC(t); } *************** *** 376,384 **** if((getMode()==HTML) &&( "BR" .equals(t) ||"HR" .equals(t) ||"IMG" .equals(t) ||"LINK" .equals(t) ||"INPUT".equals(t) ! ||"META" .equals(t))) listener_.endElement(t); } --- 412,422 ---- if((getMode()==HTML) &&( "BR" .equals(t) + ||"FRAME".equals(t) ||"HR" .equals(t) ||"IMG" .equals(t) ||"LINK" .equals(t) ||"INPUT".equals(t) ! ||"META" .equals(t) ! ||"PARAM".equals(t))) listener_.endElement(t); } *************** *** 398,406 **** if( (getMode()==HTML) &&( "BR" .equals(e) ||"HR" .equals(e) ||"IMG" .equals(e) ||"LINK" .equals(e) ||"INPUT".equals(e) ! ||"META" .equals(e))) ; else --- 436,446 ---- if( (getMode()==HTML) &&( "BR" .equals(e) + ||"FRAME".equals(e) ||"HR" .equals(e) ||"IMG" .equals(e) ||"LINK" .equals(e) ||"INPUT".equals(e) ! ||"META" .equals(e) ! ||"PARAM".equals(e))) ; else *************** *** 415,422 **** } else if("<!".equals(e)) { //System.err.println("DECLARATION"); ! do { e=readToken(); } while(!">".equals(e)); } else --- 455,469 ---- } else + if(e.startsWith("<![CDATA[")) + { + //System.err.println("BINARY DATA"); + listener_.text(e.substring(9,e.length()-3)); + } + else if("<!".equals(e)) { //System.err.println("DECLARATION"); ! do { e=readToken(); } ! while(!">".equals(e)); } else Index: XmlReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/xml/XmlReader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** XmlReader.java 29 Jan 2003 11:24:20 -0000 1.1 --- XmlReader.java 12 Mar 2004 15:49:49 -0000 1.2 *************** *** 11,15 **** package com.memoire.xml; - import com.memoire.xml.*; import java.util.*; --- 11,14 ---- *************** *** 24,55 **** Integer I90=new Integer(90); Integer I80=new Integer(80); Integer I70=new Integer(70); Integer I60=new Integer(60); Integer I55=new Integer(55); Integer I50=new Integer(50); Integer I45=new Integer(45); Integer I42=new Integer(42); Integer I40=new Integer(40); Integer I30=new Integer(30); Integer I20=new Integer(20); Integer I10=new Integer(10); ! ORDER.put("HTML",I90); ! ORDER.put("HEAD",I80); ! ORDER.put("BODY",I80); ! ORDER.put("APPLET",I70); ! ORDER.put("DIV",I60); ! ORDER.put("TABLE",I55); ! ORDER.put("TR",I50); ! ORDER.put("TD",I45); ! ORDER.put("P",I42); ORDER.put("UL",I40); --- 23,79 ---- Integer I90=new Integer(90); + Integer I95=new Integer(95); Integer I80=new Integer(80); + Integer I75=new Integer(75); Integer I70=new Integer(70); + Integer I65=new Integer(65); Integer I60=new Integer(60); Integer I55=new Integer(55); Integer I50=new Integer(50); Integer I45=new Integer(45); + Integer I44=new Integer(44); + Integer I43=new Integer(43); Integer I42=new Integer(42); Integer I40=new Integer(40); Integer I30=new Integer(30); Integer I20=new Integer(20); + Integer I15=new Integer(15); Integer I10=new Integer(10); + Integer I05=new Integer(05); ! ORDER.put("SCRIPT" ,I95); ! ORDER.put("HTML" ,I90); ! ORDER.put("HEAD" ,I80); ! ORDER.put("BODY" ,I80); ! ORDER.put("FRAMESET" ,I75); ! ORDER.put("NOFRAMES" ,I75); ! ORDER.put("NOSCRIPT" ,I75); ! ORDER.put("FRAME" ,I70); ! ORDER.put("APPLET" ,I65); ! ORDER.put("DIV" ,I60); ! ORDER.put("BLOCKQUOTE",I60); ! ORDER.put("TABLE" ,I55); ! ! ORDER.put("TR" ,I50); ! ! ORDER.put("TD" ,I45); ! ! ORDER.put("FONT" ,I44); ! ! ORDER.put("H1",I43); ! ORDER.put("H2",I43); ! ORDER.put("H3",I43); ! ORDER.put("H4",I43); ! ORDER.put("H5",I43); ! ORDER.put("H6",I43); ! ! ORDER.put("P" ,I42); ORDER.put("UL",I40); *************** *** 58,65 **** ORDER.put("LI",I20); ! ORDER.put("A",I10); ! ORDER.put("IMG",I10); ! ORDER.put("B",I10); ! ORDER.put("I",I10); } --- 82,93 ---- ORDER.put("LI",I20); ! ORDER.put("A" ,I15); ! ! ORDER.put("EM",I10); ! ORDER.put("B" ,I10); ! ORDER.put("I" ,I10); ! ! ORDER.put("IMG" ,I05); ! ORDER.put("PARAM",I65); } *************** *** 93,97 **** public void startElement(String _tag) { ! //System.err.println("START "+_tag); XmlNode n=new XmlNode(); --- 121,125 ---- public void startElement(String _tag) { ! // System.err.println("START "+_tag); XmlNode n=new XmlNode(); *************** *** 103,107 **** { if( (mode_==XmlParser.HTML) ! &¤t_.tag_.equals(_tag)&&!_tag.equals("FONT")) missingTag(_tag); } --- 131,137 ---- { if( (mode_==XmlParser.HTML) ! &¤t_.tag_.equals(_tag) ! &&!_tag.equals("FONT") ! &&!_tag.equals("FRAMESET")) missingTag(_tag); } *************** *** 115,123 **** { if( !_tag.equals("P") &&!_tag.equals("LI") &&!_tag.equals("OPTION") &&!_tag.equals("PARAM") &&!_tag.equals("A")) ! System.err.println("MISSING END: "+_tag); endElement(_tag); --- 145,154 ---- { if( !_tag.equals("P") + &&!_tag.equals("BLOCKQUOTE") &&!_tag.equals("LI") &&!_tag.equals("OPTION") &&!_tag.equals("PARAM") &&!_tag.equals("A")) ! System.err.println("XRD: missing end "+_tag); endElement(_tag); *************** *** 128,132 **** if(nodes_.size()==0) { ! System.err.println("END NEEDED "+_tag); return; } --- 159,163 ---- if(nodes_.size()==0) { ! System.err.println("XRD: end needed "+_tag); return; } *************** *** 134,137 **** --- 165,170 ---- XmlNode n=(XmlNode)nodes_.peek(); + //if(n.tag_.equals("item")) System.err.println(n); + if(_tag.equals(n.tag_)) { *************** *** 177,181 **** else { ! error("block: "+n.tag_+" /"+_tag); //dump(); } --- 210,214 ---- else { ! error("XRD: block "+n.tag_+" /"+_tag); //dump(); } *************** *** 209,213 **** public void error(String _message) { ! System.err.println("ERROR "+_message+" ["+lineno_+":"+charno_+"]"); //System.exit(1); } --- 242,246 ---- public void error(String _message) { ! System.err.println("XRD: error "+_message+" ["+lineno_+":"+charno_+"]"); //System.exit(1); } |
Update of /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15434 Modified Files: RE.java RECharIndexed.java RECharIndexedCharArray.java RECharIndexedInputStream.java RECharIndexedString.java RECharIndexedStringBuffer.java REException.java REFilterInputStream.java REMatch.java REMatchEnumeration.java RESyntax.java REToken.java RETokenAny.java RETokenBackRef.java RETokenChar.java RETokenEnd.java RETokenOneOf.java RETokenPOSIX.java RETokenRange.java RETokenRepeated.java RETokenStart.java Log Message: Maj ctulu Index: RE.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/RE.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RE.java 29 Jan 2003 11:22:54 -0000 1.1 --- RE.java 12 Mar 2004 15:47:47 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: RECharIndexed.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/RECharIndexed.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RECharIndexed.java 29 Jan 2003 11:22:54 -0000 1.1 --- RECharIndexed.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: RECharIndexedCharArray.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/RECharIndexedCharArray.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RECharIndexedCharArray.java 29 Jan 2003 11:22:54 -0000 1.1 --- RECharIndexedCharArray.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: RECharIndexedInputStream.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/RECharIndexedInputStream.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RECharIndexedInputStream.java 29 Jan 2003 11:22:54 -0000 1.1 --- RECharIndexedInputStream.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: RECharIndexedString.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/RECharIndexedString.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RECharIndexedString.java 29 Jan 2003 11:22:54 -0000 1.1 --- RECharIndexedString.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: RECharIndexedStringBuffer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/RECharIndexedStringBuffer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RECharIndexedStringBuffer.java 29 Jan 2003 11:22:54 -0000 1.1 --- RECharIndexedStringBuffer.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: REException.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/REException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** REException.java 29 Jan 2003 11:22:54 -0000 1.1 --- REException.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: REFilterInputStream.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/REFilterInputStream.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** REFilterInputStream.java 29 Jan 2003 11:22:54 -0000 1.1 --- REFilterInputStream.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: REMatch.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/REMatch.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** REMatch.java 29 Jan 2003 11:22:54 -0000 1.1 --- REMatch.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: REMatchEnumeration.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/REMatchEnumeration.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** REMatchEnumeration.java 29 Jan 2003 11:22:54 -0000 1.1 --- REMatchEnumeration.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: RESyntax.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/RESyntax.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RESyntax.java 29 Jan 2003 11:22:54 -0000 1.1 --- RESyntax.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: REToken.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/REToken.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** REToken.java 29 Jan 2003 11:22:54 -0000 1.1 --- REToken.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- *************** *** 23,29 **** */ - - import java.io.ByteArrayOutputStream; - abstract class REToken { // used by RETokenStart and RETokenEnd --- 20,23 ---- Index: RETokenAny.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/RETokenAny.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RETokenAny.java 29 Jan 2003 11:22:54 -0000 1.1 --- RETokenAny.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: RETokenBackRef.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/RETokenBackRef.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RETokenBackRef.java 29 Jan 2003 11:22:54 -0000 1.1 --- RETokenBackRef.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: RETokenChar.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/RETokenChar.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RETokenChar.java 29 Jan 2003 11:22:54 -0000 1.1 --- RETokenChar.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: RETokenEnd.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/RETokenEnd.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RETokenEnd.java 29 Jan 2003 11:22:54 -0000 1.1 --- RETokenEnd.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: RETokenOneOf.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/RETokenOneOf.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RETokenOneOf.java 29 Jan 2003 11:22:54 -0000 1.1 --- RETokenOneOf.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: RETokenPOSIX.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/RETokenPOSIX.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RETokenPOSIX.java 29 Jan 2003 11:22:54 -0000 1.1 --- RETokenPOSIX.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- *************** *** 23,29 **** */ - - import java.util.Hashtable; - class RETokenPOSIX extends REToken { int m_type; --- 20,23 ---- Index: RETokenRange.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/RETokenRange.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RETokenRange.java 29 Jan 2003 11:22:54 -0000 1.1 --- RETokenRange.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: RETokenRepeated.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/RETokenRepeated.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RETokenRepeated.java 29 Jan 2003 11:22:54 -0000 1.1 --- RETokenRepeated.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- Index: RETokenStart.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/re/RETokenStart.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RETokenStart.java 29 Jan 2003 11:22:54 -0000 1.1 --- RETokenStart.java 12 Mar 2004 15:47:48 -0000 1.2 *************** *** 1,6 **** - - package com.memoire.re; - import com.memoire.re.*; /* --- 1,3 ---- |
|
From: <de...@us...> - 2004-03-12 16:04:22
|
Update of /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14799 Added Files: DndSensible.java Log Message: Maj --- NEW FILE: DndSensible.java --- /** * @modification $Date: 2004/03/12 15:44:45 $ * @statut unstable * @file DndSensible.java * @version 0.36 * @author Guillaume Desnoix * @email gui...@de... * @license GNU General Public License 2 (GPL2) * @copyright 1998-2001 Guillaume Desnoix */ package com.memoire.dnd; import java.awt.*; public interface DndSensible { void acceptableDrop(Point _loc); void exitedDrop(); } |
Update of /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14592 Modified Files: DndIcons.java DndLib.java DndManageBackground.java DndManageData.java DndManageProperty.java DndManageText.java DndModes.java DndMultiIcon.java DndProperty.java DndRequestData.java DndRequestItem.java DndRequestObject.java DndRequestSelection.java DndSource.java DndTarget.java DndTest.java DndTransferData.java DndTransferObject.java DndTransferString.java Log Message: Maj ctulu Index: DndIcons.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndIcons.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndIcons.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndIcons.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 11,19 **** package com.memoire.dnd; - import com.memoire.dnd.*; - - import java.awt.*; - import java.awt.event.*; import java.lang.reflect.*; import java.util.*; --- 11,15 ---- Index: DndLib.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndLib.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndLib.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndLib.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 13,25 **** import java.awt.*; - //import java.awt.event.*; - //import java.beans.*; - //import java.io.*; import java.lang.reflect.*; import java.util.*; - //import javax.swing.*; - //import com.memoire.dnd.*; - public class DndLib { --- 13,19 ---- Index: DndManageBackground.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndManageBackground.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndManageBackground.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndManageBackground.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 11,16 **** package com.memoire.dnd; - import com.memoire.dnd.*; - import java.awt.*; --- 11,14 ---- Index: DndManageData.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndManageData.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndManageData.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndManageData.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 15,19 **** import java.io.*; import javax.swing.*; - import com.memoire.dnd.*; public interface DndManageData --- 15,18 ---- Index: DndManageProperty.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndManageProperty.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndManageProperty.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndManageProperty.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 11,16 **** package com.memoire.dnd; - import com.memoire.dnd.*; - import java.awt.*; --- 11,14 ---- Index: DndManageText.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndManageText.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndManageText.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndManageText.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 11,16 **** package com.memoire.dnd; - import com.memoire.dnd.*; - import java.awt.*; --- 11,14 ---- Index: DndModes.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndModes.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndModes.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndModes.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 11,16 **** package com.memoire.dnd; - import com.memoire.dnd.*; - public interface DndModes --- 11,14 ---- Index: DndMultiIcon.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndMultiIcon.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndMultiIcon.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndMultiIcon.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 11,19 **** package com.memoire.dnd; - import com.memoire.dnd.*; - import java.awt.*; - import java.util.*; import javax.swing.*; --- 11,16 ---- Index: DndProperty.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndProperty.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndProperty.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndProperty.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 11,16 **** package com.memoire.dnd; - import com.memoire.dnd.*; - public class DndProperty --- 11,14 ---- Index: DndRequestData.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndRequestData.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndRequestData.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndRequestData.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 15,19 **** import java.io.*; import javax.swing.*; - import com.memoire.dnd.*; public interface DndRequestData --- 15,18 ---- Index: DndRequestItem.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndRequestItem.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndRequestItem.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndRequestItem.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 11,16 **** package com.memoire.dnd; - import com.memoire.dnd.*; - import java.awt.*; --- 11,14 ---- Index: DndRequestObject.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndRequestObject.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndRequestObject.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndRequestObject.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 11,16 **** package com.memoire.dnd; - import com.memoire.dnd.*; - import java.awt.*; --- 11,14 ---- *************** *** 20,24 **** implements DndRequestData { ! private Object[] data_; public DndRequestObject(Object _data) --- 18,22 ---- implements DndRequestData { ! protected Object[] data_; public DndRequestObject(Object _data) Index: DndRequestSelection.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndRequestSelection.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndRequestSelection.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndRequestSelection.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 11,16 **** package com.memoire.dnd; - import com.memoire.dnd.*; - import java.awt.*; --- 11,14 ---- *************** *** 21,60 **** implements DndRequestData { ! public static final DndRequestSelection SINGLETON= ! new DndRequestSelection(); ! protected DndRequestSelection() { } ! public Object[] request(JComponent _component,Point _location) { ! Object[] r=null; ! if(_component instanceof JList) ! { ! JList list=(JList)_component; ! r=list.getSelectedValues(); ! } ! else ! if(_component instanceof JTree) ! { ! JTree tree=(JTree)_component; ! TreePath[] path=tree.getSelectionPaths(); ! if(path!=null) ! { ! int l =path.length; ! r=new Object[l]; ! for(int i=0;i<l;i++) ! r[i]=path[i].getLastPathComponent(); ! } ! } ! /* ! if(r!=null) ! System.err.println("VALUE[]="+r.length); ! */ ! if((r!=null)&&(r.length==0)) r=null; ! return (r!=null ? new Object[] { r } : new Object[0]); } } --- 19,83 ---- implements DndRequestData { ! public static final DndRequestSelection SINGLETON= ! new DndRequestSelection(false); ! public static final DndRequestSelection SINGLETON_WITH_STRINGS= ! new DndRequestSelection(true); ! protected boolean strings_; ! ! protected DndRequestSelection(boolean _strings) ! { ! strings_=_strings; ! } ! ! public Object[] request(JComponent _component,Point _location) ! { ! Object[] r=null; ! ! if(_component instanceof JList) { ! JList list=(JList)_component; ! r=list.getSelectedValues(); ! } ! else ! if(_component instanceof JTree) ! { ! JTree tree=(JTree)_component; ! TreePath[] path=tree.getSelectionPaths(); ! if(path!=null) ! { ! int l =path.length; ! r=new Object[l]; ! for(int i=0;i<l;i++) ! r[i]=path[i].getLastPathComponent(); ! } ! } ! /* ! if(r!=null) ! System.err.println("VALUE[]="+r.length); ! */ ! if((r!=null)&&(r.length==0)) r=null; ! if(r==null) ! { ! return new Object[0]; } + else + if(strings_) + { + int l=r.length; + String[] s=new String[l]; + for(int i=0;i<l;i++) + s[i]=(r[i]==null ? null : r[i].toString()); + return new Object[] { r,s }; + } + else + { + return new Object[] { r }; + } + } } Index: DndSource.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndSource.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndSource.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndSource.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 16,24 **** import java.beans.*; import java.io.*; - import java.lang.reflect.*; - import java.util.*; import javax.swing.*; - import com.memoire.dnd.*; public class DndSource --- 16,21 ---- *************** *** 44,48 **** } ! public DndSource(DndRequestData _request, int _mask) { request_ =_request; --- 41,45 ---- } ! private DndSource(DndRequestData _request, int _mask) { request_ =_request; *************** *** 98,107 **** --- 95,112 ---- public void mouseReleased(MouseEvent _evt) { + if(over_ instanceof DndSensible) + ((DndSensible)over_).exitedDrop(); + if(dragging_) { + dragging_=false; + JComponent s=(JComponent)_evt.getSource(); s.setCursor(cursor_); s.putClientProperty("DND_EVENTS",null); + if(s instanceof DndSensible) + ((DndSensible)s).exitedDrop(); + if((over_!=null)&&(target_!=null)&&(values_!=null)&&(loc_!=null)) target_.drop(values_,over_, *************** *** 120,124 **** values_=null; loc_=null; - dragging_=false; windows_=null; timer_.stop(); --- 125,128 ---- *************** *** 143,147 **** private Point oldp_; private boolean oldtip_; ! private javax.swing.Timer timer_=new javax.swing.Timer(1000,this); //private static Icon noDropIcon =new ImageIcon("dnd-nodrop_24.gif"); --- 147,151 ---- private Point oldp_; private boolean oldtip_; ! private javax.swing.Timer timer_=new javax.swing.Timer(1500,this); //private static Icon noDropIcon =new ImageIcon("dnd-nodrop_24.gif"); *************** *** 202,206 **** dragging_=true; cursor_=s.getCursor(); ! s.setCursor(new Cursor(Cursor.CROSSHAIR_CURSOR)); values_=v; ow=0; --- 206,210 ---- dragging_=true; cursor_=s.getCursor(); ! s.setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); values_=v; ow=0; *************** *** 250,253 **** --- 254,258 ---- { if(r instanceof Frame) ((Frame)r).toFront(); + //System.err.println("TOP="+r.getClass()); return r; } *************** *** 293,296 **** --- 298,302 ---- private void display(Component top,Point p, boolean tip) { + if(!dragging_) return; if(tip && oldtip_) return; oldtip_=tip; *************** *** 305,310 **** --- 311,320 ---- */ + JComponent previous=over_; + if((top==null)||!top.getBounds().contains(p)) + { over_=null; + } else { *************** *** 316,319 **** --- 326,333 ---- boolean first=true; + over_ =null; + target_=null; + loc_ =null; + while(again) { *************** *** 321,325 **** again=false; ! //System.err.println("C="+c.getClass()); if( first&&(c instanceof JComponent) &&(((JComponent)c).getClientProperty("DND_TARGET")!=null)) --- 335,340 ---- again=false; ! //System.err.println("C="+c.getClass()+" "+c.isShowing()); ! if( first&&(c instanceof JComponent) &&(((JComponent)c).getClientProperty("DND_TARGET")!=null)) *************** *** 344,347 **** --- 359,369 ---- q=SwingUtilities.convertPoint(d,q.x,q.y,c); again=true; + + + if(d instanceof JDesktopPane) + { + over_=null; + loc_ =null; + } } *************** *** 360,463 **** : null); ! over_ =null; ! target_=null; ! ! /* ! if(jc!=null) ! { ! String tmp="AGAIN="+again+" JC="+jc; ! tmp=tmp.substring(0,Math.min(78,tmp.length())); ! System.err.println(tmp); ! } ! */ ! ! if((jc!=null)&&(jc.getClientProperty("DND_TARGET")!=null) ! &&(!again||!(jc instanceof JDesktopPane))) { ! /* ! if(jc!=over_) ! { ! System.err.println("Over "+c.getName()+ ! ":"+c.getClass().getName()+ ! " xy="+q.x+","+q.y); ! } ! */ ! ! //System.err.println(("Over="+jc).substring(0,78)); ! ! over_ =jc; ! target_=(DndTarget)over_.getClientProperty("DND_TARGET"); //System.err.println(("Target="+target_));//.substring(0,78)); //System.err.println(("Accept="+target_.isAcceptable(values_))); ! if( !target_.isAcceptable(values_) ! ||!over_.isEnabled()) ! { ! loc_ =null; ! again=(c!=d); ! } ! else { loc_ =q; ! again=false; } } else - if(c instanceof JInternalFrame.JDesktopIcon) { ! JInternalFrame frame=((JInternalFrame.JDesktopIcon)c) ! .getInternalFrame(); ! try { frame.setIcon(false); } ! catch(PropertyVetoException ex) { } ! } ! } ! } ! ! //System.err.println("XY="+q.x+","+q.y); ! //System.err.println("Over "+c.getClass().getName()); ! ! /* ! if(c!=over_) ! { ! if(c instanceof JComponent) ! over_=(JComponent)c; ! else ! over_=null; ! ! System.err.println("Over "+c.getName()+ ! ":"+c.getClass().getName()+ ! " xy="+q.x+","+q.y); ! ! if(over_!=null) ! { ! target_=(DndTarget) ! over_.getClientProperty("DND_TARGET"); ! if(target_!=null) { ! if( !target_.isAcceptable(values_) ! ||!over_.isEnabled()) ! { ! // over_=null; ! // target_=null; ! loc_=null; ! again=true; ! //System.err.println("reject drop !"); ! } ! else ! { ! loc_=q; ! //SwingUtilities.convertPoint(s,p.x,p.y,over_); ! //System.err.println("can drop !"); ! } } - - //if(target_==null) - //s.setCursor(new Cursor(Cursor.HAND_CURSOR)); - //else - //s.setCursor(new Cursor(Cursor.CROSSHAIR_CURSOR)); } } ! */ if( DndIcons.isIconDisplayed() --- 382,428 ---- : null); ! if((jc!=null)&&(jc.getClientProperty("DND_TARGET")!=null)) ! //&&!again)//||!(jc instanceof JDesktopPane))) { ! target_=(DndTarget)jc.getClientProperty("DND_TARGET"); //System.err.println(("Target="+target_));//.substring(0,78)); //System.err.println(("Accept="+target_.isAcceptable(values_))); ! over_=null; ! loc_ =null; ! again=(c!=d); ! ! if( target_.isAcceptable(values_) ! &&jc.isEnabled() ! &&(this!=jc.getClientProperty("DND_SOURCE"))) { + over_=jc; loc_ =q; ! //again=(c!=d);//false; } } else { ! if(c instanceof JInternalFrame.JDesktopIcon) { ! over_=null; ! loc_ =null; ! JInternalFrame frame=((JInternalFrame.JDesktopIcon)c) ! .getInternalFrame(); ! try { frame.setIcon(false); } ! catch(PropertyVetoException ex) { } } } } ! ! //System.err.println("XY="+q.x+","+q.y); ! //if(over_!=null) ! // System.err.println("Over "+over_.getClass().getName()+" "+loc_); ! } ! ! if(dragging_&&(loc_!=null)) ! if(over_ instanceof DndSensible) ! ((DndSensible)over_).acceptableDrop(loc_); if( DndIcons.isIconDisplayed() *************** *** 469,495 **** { if((oldtop_!=null)&&(oldtop_!=top)) - { - //System.err.println(new Rectangle(ox-1,oy-1,ow+1,oh+1)); - /*RepaintManager rm=RepaintManager.currentManager(oldtop_); - rm.paintDirtyRegions(); - rm.addDirtyRegion((JComponent)oldtop_,ox-1,oy-1,ow+1,oh+1); - rm.paintDirtyRegions(); - */ - //oldtop_.repaint(ox-1,oy-1,ow+1,oh+1); - //((JComponent)oldtop_).paintImmediately(ox-1,oy-1,ow+1,oh+1); oldtop_.repaint(); - } - //((JComponent)top).paintImmediately(ox-1,oy-1,ow+1,oh+1); if(top!=null) - { - /* - RepaintManager rm=RepaintManager.currentManager(top); - rm.paintDirtyRegions(); - rm.addDirtyRegion((JComponent)top,ox-1,oy-1,ow+1,oh+1); - rm.paintDirtyRegions(); - */ ((JComponent)top).paintImmediately(ox-1,oy-1,ow+1,oh+1); - } ox=p.x; --- 434,441 ---- *************** *** 561,571 **** } } ! catch(Exception ex) { } } } public void actionPerformed(ActionEvent _evt) { ! display(oldtop_,oldp_,true); } } --- 507,520 ---- } } ! catch(Exception ex) { System.err.println("DND: #563 "+ex); } } + + if((previous!=over_)&&(previous instanceof DndSensible)) + ((DndSensible)previous).exitedDrop(); } public void actionPerformed(ActionEvent _evt) { ! display(oldtop_,oldp_,true); } } Index: DndTarget.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndTarget.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndTarget.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndTarget.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 13,21 **** import java.awt.*; - import java.awt.event.*; import java.io.*; import java.util.*; import javax.swing.*; - import com.memoire.dnd.*; public class DndTarget --- 13,19 ---- *************** *** 172,175 **** --- 170,176 ---- public void drop(Object[] _data, JComponent _comp, Point _loc) { + //if(_comp instanceof DndSensible) + //((DndSensible)_comp).exitedDrop(); + Class clazz=getAcceptedClass(_data); Index: DndTest.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndTest.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndTest.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 11,16 **** package com.memoire.dnd; - import com.memoire.dnd.*; - import java.awt.*; --- 11,14 ---- Index: DndTransferData.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndTransferData.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndTransferData.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndTransferData.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 13,17 **** import java.io.*; - import com.memoire.dnd.*; public interface DndTransferData --- 13,16 ---- Index: DndTransferObject.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndTransferObject.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndTransferObject.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndTransferObject.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 11,16 **** package com.memoire.dnd; - import com.memoire.dnd.*; - public class DndTransferObject --- 11,14 ---- Index: DndTransferString.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/dnd/DndTransferString.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DndTransferString.java 23 Sep 2003 19:04:31 -0000 1.2 --- DndTransferString.java 12 Mar 2004 15:44:05 -0000 1.3 *************** *** 11,16 **** package com.memoire.dnd; - import com.memoire.dnd.*; - public class DndTransferString --- 11,14 ---- |
Update of /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/bu In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13626 Modified Files: BuAbilityInterface.java BuAbstractCellRenderer.java BuAbstractPreferencesPanel.java BuActionChecker.java BuActionEnabler.java BuActionRemover.java BuApplet.java BuApplication.java BuAssistant.java BuAutoStyledDocument.java BuBackgroundPainter.java BuBmpLoader.java BuBorderLayout.java BuBorders.java BuBrowserControl.java BuBrowserFrame.java BuBrowserPreferencesPanel.java BuButton.java BuButtonLayout.java BuButtonPanel.java BuCharValidator.java BuCheckBox.java BuCheckBox3States.java BuCheckBoxMenuItem.java BuColorIcon.java BuColumn.java BuComboBox.java BuCommandPreferencesPanel.java BuCommonImplementation.java BuCommonInterface.java BuComposedIcon.java BuContentFrame.java BuCutCopyPasteInterface.java BuDesktop.java BuDesktopManager.java BuDesktopPreferencesPanel.java BuDialog.java BuDialogChoice.java BuDialogConfirmation.java BuDialogError.java BuDialogFind.java BuDialogInput.java BuDialogList.java BuDialogMessage.java BuDialogMulti.java BuDialogReplace.java BuDialogWarning.java BuDirWinPreferencesPanel.java BuDynamicMenu.java BuEditorPane.java BuEmptyIcon.java BuEmptyList.java BuExplorer.java BuFileChooser.java BuFileExtensions.java BuFileFilter.java BuFileFilterAll.java BuFileFilterDirectory.java BuFileRenderer.java BuFileViewer.java BuFilters.java BuFixedSizeIcon.java BuFontChooser.java BuFrameImage.java BuGenericPreferencesModel.java BuGenericPreferencesPanel.java BuGlassPaneHelp.java BuGlassPaneStop.java BuGridLayout.java BuHeaderPanel.java BuHelpFrame.java BuHorizontalLayout.java BuIcon.java BuIconPreferencesPanel.java BuInformationsDocument.java BuInformationsPerson.java BuInformationsSoftware.java BuInformationsUser.java BuInsets.java BuInternalFrame.java BuLabel.java BuLabelInfo.java BuLabelMultiLine.java BuLanguagePreferencesPanel.java BuLib.java BuLightBorder.java BuList.java BuLookPreferencesPanel.java BuMacEnv.java BuMainPanel.java BuMenu.java BuMenuBar.java BuMenuInternalFrames.java BuMenuItem.java BuMenuLayout.java BuMenuRecentFiles.java BuMenuTools.java BuMetalCustomTheme.java BuMonitorAbstract.java BuMonitorClock.java BuMonitorCpu.java BuMonitorMemory.java BuMonitorPreferencesPanel.java BuMonitorTime.java BuMultiLabel.java BuNumericValueValidator.java BuOptionItem.java BuOptionRenderer.java BuOverlayLayout.java BuPalette.java BuPanel.java BuPasswordField.java BuPicture.java BuPopupButton.java BuPopupMenu.java BuPopupWindow.java BuPreferences.java BuPreferencesFrame.java BuPreferencesInterface.java BuPreviewFrame.java BuPreviewJob.java BuPrintable.java BuPrinter.java BuProgressBar.java BuRadioButton.java BuRadioButtonMenuItem.java BuRegistry.java BuResource.java BuRobustIcon.java BuScriptPreferencesPanel.java BuScrollPane.java BuSelectFindReplaceInterface.java BuSeparator.java BuShell.java BuSlafCustomTheme.java BuSpecificBar.java BuSplashScreen.java BuSplit2Pane.java BuSplit3Pane.java BuSplitPane.java BuStatusBar.java BuStringValidator.java BuSubApp.java BuTabbedPane.java BuTable.java BuTableCellEditor.java BuTableCellRenderer.java BuTableRowHeader.java BuTableRowHeaderRenderer.java BuTableStaticModel.java BuTask.java BuTaskOperation.java BuTaskView.java BuTerminal.java BuTerminalDisplay.java BuTerminalKey.java BuTextArea.java BuTextComponentInterface.java BuTextField.java BuTextPane.java BuTextureIcon.java BuTimer.java BuTitledPanel.java BuToggleButton.java BuToolBar.java BuToolButton.java BuToolsModel.java BuToolsPreferencesPanel.java BuTranslatedIcon.java BuTransparentButton.java BuTree.java BuUndoRedoInterface.java BuUpdateGUI.java BuUserPreferencesPanel.java BuValueValidator.java BuVerticalLayout.java BuWizardDialog.java BuWizardTask.java BuWizardTaskSample.java Log Message: Maj bu Index: BuBmpLoader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/bu/BuBmpLoader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BuBmpLoader.java 25 Sep 2003 16:56:15 -0000 1.2 --- BuBmpLoader.java 12 Mar 2004 15:41:00 -0000 1.3 *************** *** 1,285 **** ! ! package com.memoire.bu; ! ! /** ! * This class implements a Bmp Loader. ! * ! *----------------------------------------------------------------------- ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. ! * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! *---------------------------------------------------------------------- ! */ ! ! import java.awt.*; ! import java.awt.image.*; ! import java.io.*; ! ! /** ! * A decoder for Windows bitmap (.Bmp) files. ! * Compression not supported. ! * Source code provided by JavaZoom under the LGPL. ! */ ! public class BuBmpLoader ! { ! private InputStream is; ! private int curPos = 0; ! ! private int bitmapOffset; // starting position of image data ! ! private int width; // image width in pixels ! private int height; // image height in pixels ! private short bitsPerPixel; // 1, 4, 8, or 24 (no color map) ! private int compression; // 0 (none), 1 (8-bit RLE), or 2 (4-bit RLE) ! private int actualSizeOfBitmap; ! private int scanLineSize; ! private int actualColorsUsed; ! ! private byte r[], g[], b[]; // color palette ! private int noOfEntries; ! ! private byte[] byteData; // Unpacked data ! private int[] intData; // Unpacked data ! ! public BuBmpLoader() ! { ! } ! ! public Image getBmpImage(InputStream stream) throws Exception ! { ! read(stream); ! return Toolkit.getDefaultToolkit().createImage(getImageSource()); ! } ! ! private int readInt() throws IOException { ! int b1 = is.read(); ! int b2 = is.read(); ! int b3 = is.read(); ! int b4 = is.read(); ! curPos += 4; ! return ((b4 << 24) + (b3 << 16) + (b2 << 8) + (b1 << 0)); ! } ! ! ! private short readShort() throws IOException { ! int b1 = is.read(); ! int b2 = is.read(); ! curPos += 4; ! return (short)((b2 << 8) + b1); ! } ! ! ! void getFileHeader() throws Exception { ! // Actual contents (14 bytes): ! short fileType = 0x4d42;// always "BM" ! int fileSize; // size of file in bytes ! short reserved1 = 0; // always 0 ! short reserved2 = 0; // always 0 ! ! fileType = readShort(); ! if (fileType != 0x4d42) ! throw new Exception("Not a BMP file"); // wrong file type ! fileSize = readInt(); ! reserved1 = readShort(); ! reserved2 = readShort(); ! bitmapOffset = readInt(); ! } ! ! void getBitmapHeader() throws IOException { ! ! // Actual contents (40 bytes): ! int size; // size of this header in bytes ! short planes; // no. of color planes: always 1 ! int sizeOfBitmap; // size of bitmap in bytes (may be 0: if so, calculate) ! int horzResolution; // horizontal resolution, pixels/meter (may be 0) ! int vertResolution; // vertical resolution, pixels/meter (may be 0) ! int colorsUsed; // no. of colors in palette (if 0, calculate) ! int colorsImportant; // no. of important colors (appear first in palette) (0 means all are important) ! boolean topDown; ! int noOfPixels; ! ! size = readInt(); ! width = readInt(); ! height = readInt(); ! planes = readShort(); ! bitsPerPixel = readShort(); ! compression = readInt(); ! sizeOfBitmap = readInt(); ! horzResolution = readInt(); ! vertResolution = readInt(); ! colorsUsed = readInt(); ! colorsImportant = readInt(); ! ! topDown = (height < 0); ! noOfPixels = width * height; ! ! // Scan line is padded with zeroes to be a multiple of four bytes ! scanLineSize = ((width * bitsPerPixel + 31) / 32) * 4; ! ! if (sizeOfBitmap != 0) ! actualSizeOfBitmap = sizeOfBitmap; ! else ! // a value of 0 doesn't mean zero - it means we have to calculate it ! actualSizeOfBitmap = scanLineSize * height; ! ! if (colorsUsed != 0) ! actualColorsUsed = colorsUsed; ! else ! // a value of 0 means we determine this based on the bits per pixel ! if (bitsPerPixel < 16) ! actualColorsUsed = 1 << bitsPerPixel; ! else ! actualColorsUsed = 0; // no palette ! } ! ! ! void getPalette() throws IOException { ! noOfEntries = actualColorsUsed; ! //IJ.write("noOfEntries: " + noOfEntries); ! if (noOfEntries>0) { ! r = new byte[noOfEntries]; ! g = new byte[noOfEntries]; ! b = new byte[noOfEntries]; ! ! int reserved; ! for (int i = 0; i < noOfEntries; i++) { ! b[i] = (byte)is.read(); ! g[i] = (byte)is.read(); ! r[i] = (byte)is.read(); ! reserved = is.read(); ! curPos += 4; ! } ! } ! } ! ! void unpack(byte[] rawData, int rawOffset, int[] intData, int intOffset, int w) { ! int j = intOffset; ! int k = rawOffset; ! int mask = 0xff; ! for (int i = 0; i < w; i++) { ! int b0 = (((int)(rawData[k++])) & mask); ! int b1 = (((int)(rawData[k++])) & mask) << 8; ! int b2 = (((int)(rawData[k++])) & mask) << 16; ! intData[j] = 0xff000000 | b0 | b1 | b2; ! j++; ! } ! } ! ! ! void unpack(byte[] rawData, int rawOffset, int bpp, ! byte[] byteData, int byteOffset, int w) throws Exception { ! int j = byteOffset; ! int k = rawOffset; ! byte mask; ! int pixPerByte; ! ! switch (bpp) { ! case 1: mask = (byte)0x01; pixPerByte = 8; break; ! case 4: mask = (byte)0x0f; pixPerByte = 2; break; ! case 8: mask = (byte)0xff; pixPerByte = 1; break; ! default: ! throw new Exception("Unsupported bits-per-pixel value"); ! } ! ! for (int i = 0;;) { ! int shift = 8 - bpp; ! for (int ii = 0; ii < pixPerByte; ii++) { ! byte br = rawData[k]; ! br >>= shift; ! byteData[j] = (byte)(br & mask); ! //System.out.println("Setting byteData[" + j + "]=" + Test.byteToHex(byteData[j])); ! j++; ! i++; ! if (i == w) return; ! shift -= bpp; ! } ! k++; ! } ! } ! ! ! void getPixelData() throws Exception { ! byte[] rawData; // the raw unpacked data ! ! // Skip to the start of the bitmap data (if we are not already there) ! long skip = bitmapOffset - curPos; ! if (skip > 0) { ! is.skip(skip); ! curPos += skip; ! } ! ! int len = scanLineSize; ! if (bitsPerPixel > 8) ! intData = new int[width * height]; ! else ! byteData = new byte[width * height]; ! rawData = new byte[actualSizeOfBitmap]; ! int rawOffset = 0; ! int offset = (height - 1) * width; ! for (int i = height - 1; i >= 0; i--) { ! int n = is.read(rawData, rawOffset, len); ! if (n < len) throw new Exception("Scan line ended prematurely after " ! + n + " bytes"); ! if (bitsPerPixel > 8) { ! // Unpack and create one int per pixel ! unpack(rawData, rawOffset, intData, offset, width); ! } ! else { ! // Unpack and create one byte per pixel ! unpack(rawData, rawOffset, bitsPerPixel, ! byteData, offset, width); ! } ! rawOffset += len; ! offset -= width; ! } ! } ! ! public void read(InputStream is) throws Exception { ! this.is = is; ! getFileHeader(); ! getBitmapHeader(); ! if (compression!=0) ! throw new Exception(" BMP Compression not supported"); ! getPalette(); ! getPixelData(); ! } ! ! ! public MemoryImageSource getImageSource() { ! ColorModel cm; ! MemoryImageSource mis; ! ! if (noOfEntries > 0) { ! // There is a color palette; create an IndexColorModel ! cm = new IndexColorModel(bitsPerPixel, ! noOfEntries, r, g, b); ! } else { ! // There is no palette; use the default RGB color model ! cm = ColorModel.getRGBdefault(); ! } ! ! // Create MemoryImageSource ! ! if (bitsPerPixel > 8) { ! // use one int per pixel ! mis = new MemoryImageSource(width, ! height, cm, intData, 0, width); ! } else { ! // use one byte per pixel ! mis = new MemoryImageSource(width, ! height, cm, byteData, 0, width); ! } ! ! return mis; // this can be used by Component.createImage() ! } ! } --- 1,285 ---- ! ! package com.memoire.bu; ! ! /** ! * This class implements a Bmp Loader. ! * ! *----------------------------------------------------------------------- ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. ! * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! *---------------------------------------------------------------------- ! */ ! ! import java.awt.*; ! import java.awt.image.*; ! import java.io.*; ! ! /** ! * A decoder for Windows bitmap (.Bmp) files. ! * Compression not supported. ! * Source code provided by JavaZoom under the LGPL. ! */ ! public class BuBmpLoader ! { ! private InputStream is; ! private int curPos = 0; ! ! private int bitmapOffset; // starting position of image data ! ! private int width; // image width in pixels ! private int height; // image height in pixels ! private short bitsPerPixel; // 1, 4, 8, or 24 (no color map) ! private int compression; // 0 (none), 1 (8-bit RLE), or 2 (4-bit RLE) ! private int actualSizeOfBitmap; ! private int scanLineSize; ! private int actualColorsUsed; ! ! private byte r[], g[], b[]; // color palette ! private int noOfEntries; ! ! private byte[] byteData; // Unpacked data ! private int[] intData; // Unpacked data ! ! public BuBmpLoader() ! { ! } ! ! public Image getBmpImage(InputStream stream) throws Exception ! { ! read(stream); ! return Toolkit.getDefaultToolkit().createImage(getImageSource()); ! } ! ! private int readInt() throws IOException { ! int b1 = is.read(); ! int b2 = is.read(); ! int b3 = is.read(); ! int b4 = is.read(); ! curPos += 4; ! return ((b4 << 24) + (b3 << 16) + (b2 << 8) + (b1 << 0)); ! } ! ! ! private short readShort() throws IOException { ! int b1 = is.read(); ! int b2 = is.read(); ! curPos += 4; ! return (short)((b2 << 8) + b1); ! } ! ! ! void getFileHeader() throws Exception { ! // Actual contents (14 bytes): ! short fileType = 0x4d42;// always "BM" ! int fileSize; // size of file in bytes ! short reserved1 = 0; // always 0 ! short reserved2 = 0; // always 0 ! ! fileType = readShort(); ! if (fileType != 0x4d42) ! throw new Exception("Not a BMP file"); // wrong file type ! fileSize = readInt(); ! reserved1 = readShort(); ! reserved2 = readShort(); ! bitmapOffset = readInt(); ! } ! ! void getBitmapHeader() throws IOException { ! ! // Actual contents (40 bytes): ! int size; // size of this header in bytes ! short planes; // no. of color planes: always 1 ! int sizeOfBitmap; // size of bitmap in bytes (may be 0: if so, calculate) ! int horzResolution; // horizontal resolution, pixels/meter (may be 0) ! int vertResolution; // vertical resolution, pixels/meter (may be 0) ! int colorsUsed; // no. of colors in palette (if 0, calculate) ! int colorsImportant; // no. of important colors (appear first in palette) (0 means all are important) ! boolean topDown; ! int noOfPixels; ! ! size = readInt(); ! width = readInt(); ! height = readInt(); ! planes = readShort(); ! bitsPerPixel = readShort(); ! compression = readInt(); ! sizeOfBitmap = readInt(); ! horzResolution = readInt(); ! vertResolution = readInt(); ! colorsUsed = readInt(); ! colorsImportant = readInt(); ! ! topDown = (height < 0); ! noOfPixels = width * height; ! ! // Scan line is padded with zeroes to be a multiple of four bytes ! scanLineSize = ((width * bitsPerPixel + 31) / 32) * 4; ! ! if (sizeOfBitmap != 0) ! actualSizeOfBitmap = sizeOfBitmap; ! else ! // a value of 0 doesn't mean zero - it means we have to calculate it ! actualSizeOfBitmap = scanLineSize * height; ! ! if (colorsUsed != 0) ! actualColorsUsed = colorsUsed; ! else ! // a value of 0 means we determine this based on the bits per pixel ! if (bitsPerPixel < 16) ! actualColorsUsed = 1 << bitsPerPixel; ! else ! actualColorsUsed = 0; // no palette ! } ! ! ! void getPalette() throws IOException { ! noOfEntries = actualColorsUsed; ! //IJ.write("noOfEntries: " + noOfEntries); ! if (noOfEntries>0) { ! r = new byte[noOfEntries]; ! g = new byte[noOfEntries]; ! b = new byte[noOfEntries]; ! ! int reserved; ! for (int i = 0; i < noOfEntries; i++) { ! b[i] = (byte)is.read(); ! g[i] = (byte)is.read(); ! r[i] = (byte)is.read(); ! reserved = is.read(); ! curPos += 4; ! } ! } ! } ! ! void unpack(byte[] rawData, int rawOffset, int[] intData, int intOffset, int w) { ! int j = intOffset; ! int k = rawOffset; ! int mask = 0xff; ! for (int i = 0; i < w; i++) { ! int b0 = (((int)(rawData[k++])) & mask); ! int b1 = (((int)(rawData[k++])) & mask) << 8; ! int b2 = (((int)(rawData[k++])) & mask) << 16; ! intData[j] = 0xff000000 | b0 | b1 | b2; ! j++; ! } ! } ! ! ! void unpack(byte[] rawData, int rawOffset, int bpp, ! byte[] byteData, int byteOffset, int w) throws Exception { ! int j = byteOffset; ! int k = rawOffset; ! byte mask; ! int pixPerByte; ! ! switch (bpp) { ! case 1: mask = (byte)0x01; pixPerByte = 8; break; ! case 4: mask = (byte)0x0f; pixPerByte = 2; break; ! case 8: mask = (byte)0xff; pixPerByte = 1; break; ! default: ! throw new Exception("Unsupported bits-per-pixel value"); ! } ! ! for (int i = 0;;) { ! int shift = 8 - bpp; ! for (int ii = 0; ii < pixPerByte; ii++) { ! byte br = rawData[k]; ! br >>= shift; ! byteData[j] = (byte)(br & mask); ! //System.out.println("Setting byteData[" + j + "]=" + Test.byteToHex(byteData[j])); ! j++; ! i++; ! if (i == w) return; ! shift -= bpp; ! } ! k++; ! } ! } ! ! ! void getPixelData() throws Exception { ! byte[] rawData; // the raw unpacked data ! ! // Skip to the start of the bitmap data (if we are not already there) ! long skip = bitmapOffset - curPos; ! if (skip > 0) { ! is.skip(skip); ! curPos += skip; ! } ! ! int len = scanLineSize; ! if (bitsPerPixel > 8) ! intData = new int[width * height]; ! else ! byteData = new byte[width * height]; ! rawData = new byte[actualSizeOfBitmap]; ! int rawOffset = 0; ! int offset = (height - 1) * width; ! for (int i = height - 1; i >= 0; i--) { ! int n = is.read(rawData, rawOffset, len); ! if (n < len) throw new Exception("Scan line ended prematurely after " ! + n + " bytes"); ! if (bitsPerPixel > 8) { ! // Unpack and create one int per pixel ! unpack(rawData, rawOffset, intData, offset, width); ! } ! else { ! // Unpack and create one byte per pixel ! unpack(rawData, rawOffset, bitsPerPixel, ! byteData, offset, width); ! } ! rawOffset += len; ! offset -= width; ! } ! } ! ! public void read(InputStream is) throws Exception { ! this.is = is; ! getFileHeader(); ! getBitmapHeader(); ! if (compression!=0) ! throw new Exception(" BMP Compression not supported"); ! getPalette(); ! getPixelData(); ! } ! ! ! public MemoryImageSource getImageSource() { ! ColorModel cm; ! MemoryImageSource mis; ! ! if (noOfEntries > 0) { ! // There is a color palette; create an IndexColorModel ! cm = new IndexColorModel(bitsPerPixel, ! noOfEntries, r, g, b); ! } else { ! // There is no palette; use the default RGB color model ! cm = ColorModel.getRGBdefault(); ! } ! ! // Create MemoryImageSource ! ! if (bitsPerPixel > 8) { ! // use one int per pixel ! mis = new MemoryImageSource(width, ! height, cm, intData, 0, width); ! } else { ! // use one byte per pixel ! mis = new MemoryImageSource(width, ! height, cm, byteData, 0, width); ! } ! ! return mis; // this can be used by Component.createImage() ! } ! } |
Update of /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/acme In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11615 Modified Files: AcmeGifEncoder.java AcmeImageEncoder.java AcmeIntHashtable.java AcmeJpegEncoder.java AcmePpmEncoder.java Log Message: Maj bu Index: AcmeGifEncoder.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/acme/AcmeGifEncoder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AcmeGifEncoder.java 29 Jan 2003 11:03:21 -0000 1.1 --- AcmeGifEncoder.java 12 Mar 2004 15:35:33 -0000 1.2 *************** *** 2,6 **** package com.memoire.acme; - import com.memoire.acme.*; // AcmeGifEncoder - write out an image as a GIF --- 2,5 ---- Index: AcmeImageEncoder.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/acme/AcmeImageEncoder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AcmeImageEncoder.java 29 Jan 2003 11:03:21 -0000 1.1 --- AcmeImageEncoder.java 12 Mar 2004 15:35:33 -0000 1.2 *************** *** 2,6 **** package com.memoire.acme; - import com.memoire.acme.*; // AcmeImageEncoder - abstract class for writing out an image --- 2,5 ---- Index: AcmeIntHashtable.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/acme/AcmeIntHashtable.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AcmeIntHashtable.java 29 Jan 2003 11:03:21 -0000 1.1 --- AcmeIntHashtable.java 12 Mar 2004 15:35:33 -0000 1.2 *************** *** 2,6 **** package com.memoire.acme; - import com.memoire.acme.*; // AcmeIntHashtable - a Hashtable that uses ints as the keys --- 2,5 ---- Index: AcmeJpegEncoder.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/acme/AcmeJpegEncoder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AcmeJpegEncoder.java 29 Jan 2003 11:03:21 -0000 1.1 --- AcmeJpegEncoder.java 12 Mar 2004 15:35:33 -0000 1.2 *************** *** 2,6 **** package com.memoire.acme; - import com.memoire.acme.*; // AcmeJpegEncoder - write out an image as a JPEG --- 2,5 ---- *************** *** 37,41 **** import java.awt.image.*; ! /// Write out an image as a JPEG. // DOESN'T WORK YET. --- 36,40 ---- import java.awt.image.*; ! // Write out an image as a JPEG. // DOESN'T WORK YET. Index: AcmePpmEncoder.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/acme/AcmePpmEncoder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AcmePpmEncoder.java 29 Jan 2003 11:03:21 -0000 1.1 --- AcmePpmEncoder.java 12 Mar 2004 15:35:33 -0000 1.2 *************** *** 2,6 **** package com.memoire.acme; - import com.memoire.acme.*; // AcmePpmEncoder - write out an image as a PPM --- 2,5 ---- |
Update of /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/bu In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8561 Added Files: aide_32.gif alma_22.gif ant_20.gif ant_26.gif ant_32.gif ant_48.png ant_64.png aproposde_32.gif arreter_22.gif aspect_22.gif bu_internalframe_corner.gif bu_internalframe_corner_metal.gif bu_internalframe_corner_ocean.gif bu_link.gif bu_wizard.gif bu_wizard.png bureau_32.gif calculer_22.gif cdrom_24.gif cdrom_32.gif cdrom_64.png clavier_32.gif coller_32.gif configurer_32.gif controler_22.gif corbeille_32.gif corbeillepleine_32.gif cpu_32.gif creer_32.gif degrade_22.gif dessiner_32.gif disquedur_32.gif disquette_32.gif document_32.gif dossier_20.gif dossier_22.gif dossier_24.gif dossier_26.gif dossier_32.gif dossier_64.png editer_32.gif enregistrer_32.gif enregistrerprojet_32.gif enregistrersous_32.gif enregistrertout_22.gif enregistrertout_32.gif envoyer_16.gif envoyer_22.gif envoyer_24.gif envoyer_32.gif executer_32.gif executerprojet_32.gif explorateur_32.gif exporter_32.gif fonte_32.gif ftp_32.gif graphe_32.gif image_32.gif importer_32.gif imprimante_16.gif imprimante_20.gif imprimante_22.gif imprimante_24.gif imprimante_26.gif imprimante_32.gif imprimante_48.png imprimante_64.png imprimer_32.gif liste_32.gif maison_26.gif maison_32.gif maj_32.gif make_20.gif make_26.gif make_32.gif make_48.png make_64.png monitor_32.gif musique_32.gif ordinateur_32.gif ouvrir_32.gif ouvrirprojet_32.gif pointeuraide_32.gif preference_32.gif previsualiser_32.gif quitter_32.gif rechercher_32.gif remplacer_32.gif renommer_22.gif signet_16.gif signet_22.gif signet_24.gif signet_26.gif signet_32.gif son_32.gif tableau_32.gif tache_22.gif tache_32.gif telephone_16.gif terminal_32.gif terminer_22.gif texte_32.gif texture_22.gif uniforme_22.gif video_32.gif www_32.gif Log Message: maj bu --- NEW FILE: aide_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: alma_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ant_20.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ant_26.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ant_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ant_48.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ant_64.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: aproposde_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arreter_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: aspect_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bu_internalframe_corner.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bu_internalframe_corner_metal.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bu_internalframe_corner_ocean.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bu_link.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bu_wizard.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bu_wizard.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bureau_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: calculer_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: cdrom_24.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: cdrom_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: cdrom_64.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: clavier_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: coller_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: configurer_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: controler_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: corbeille_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: corbeillepleine_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: cpu_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: creer_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: degrade_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dessiner_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: disquedur_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: disquette_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: document_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dossier_20.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dossier_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dossier_24.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dossier_26.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dossier_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dossier_64.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: editer_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: enregistrer_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: enregistrerprojet_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: enregistrersous_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: enregistrertout_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: enregistrertout_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: envoyer_16.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: envoyer_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: envoyer_24.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: envoyer_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: executer_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: executerprojet_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: explorateur_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: exporter_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fonte_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ftp_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: graphe_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: image_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: importer_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: imprimante_16.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: imprimante_20.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: imprimante_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: imprimante_24.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: imprimante_26.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: imprimante_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: imprimante_48.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: imprimante_64.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: imprimer_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: liste_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: maison_26.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: maison_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: maj_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: make_20.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: make_26.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: make_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: make_48.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: make_64.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: monitor_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: musique_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ordinateur_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ouvrir_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ouvrirprojet_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pointeuraide_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: preference_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: previsualiser_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: quitter_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rechercher_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: remplacer_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: renommer_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: signet_16.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: signet_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: signet_24.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: signet_26.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: signet_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: son_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tableau_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tache_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tache_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: telephone_16.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: terminal_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: terminer_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: texte_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: texture_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: uniforme_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: video_32.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: www_32.gif --- (This appears to be a binary file; contents omitted.) |
|
From: <de...@us...> - 2004-03-12 10:37:08
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/tableau In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9547/src/org/fudaa/ebli/tableau Modified Files: EbliPanelListEditorModel.java Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur Index: EbliPanelListEditorModel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/tableau/EbliPanelListEditorModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EbliPanelListEditorModel.java 12 Dec 2003 10:52:26 -0000 1.1 --- EbliPanelListEditorModel.java 12 Mar 2004 10:17:43 -0000 1.2 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.ebli.tableau; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; *************** *** 25,32 **** */ public class EbliPanelListEditorModel extends AbstractTableModel { ! protected Vector v_; private boolean showNumber_; private int maxValueNb_; ! Vector proposedValues_; Object defaultValue_; public EbliPanelListEditorModel() { --- 26,33 ---- */ public class EbliPanelListEditorModel extends AbstractTableModel { ! protected ArrayList v_; private boolean showNumber_; private int maxValueNb_; ! ArrayList proposedValues_; Object defaultValue_; public EbliPanelListEditorModel() { *************** *** 69,77 **** boolean _showNumber, int _maxValueNb) { - v_= _v; maxValueNb_= _maxValueNb; ! if ((maxValueNb_ > 0) && (v_.size() > _maxValueNb)) { ! v_.setSize(maxValueNb_); } showNumber_= _showNumber; defaultValue_= CtuluLib.EMPTY_STRING; --- 70,79 ---- boolean _showNumber, int _maxValueNb) { maxValueNb_= _maxValueNb; ! if ((maxValueNb_ > 0) && (_v.size() > _maxValueNb)) { ! v_=new ArrayList(_v.subList(0,_maxValueNb)); } + else + v_= new ArrayList(_v); showNumber_= _showNumber; defaultValue_= CtuluLib.EMPTY_STRING; *************** *** 177,181 **** } public void setData(Object[] _o) { ! v_.removeAllElements(); if (_o != null) { int n= _o.length; --- 179,183 ---- } public void setData(Object[] _o) { ! v_.clear(); if (_o != null) { int n= _o.length; *************** *** 204,208 **** int n= v_.size(); if ((maxValueNb_ > 0) && (v_.size() > maxValueNb_)) { ! v_.setSize(maxValueNb_); fireTableRowsDeleted(maxValueNb_, n - 1); } --- 206,212 ---- int n= v_.size(); if ((maxValueNb_ > 0) && (v_.size() > maxValueNb_)) { ! for(int i=v_.size()-1;i>=maxValueNb_;i--){ ! v_.remove(i); ! } fireTableRowsDeleted(maxValueNb_, n - 1); } *************** *** 214,218 **** else { if (proposedValues_ == null) { ! proposedValues_= new Vector(_o.length); } else { proposedValues_.clear(); --- 218,222 ---- else { if (proposedValues_ == null) { ! proposedValues_= new ArrayList(_o.length); } else { proposedValues_.clear(); *************** *** 230,234 **** else { if (proposedValues_ == null) { ! proposedValues_= new Vector(10); } else { proposedValues_.clear(); --- 234,238 ---- else { if (proposedValues_ == null) { ! proposedValues_= new ArrayList(10); } else { proposedValues_.clear(); |
|
From: <de...@us...> - 2004-03-12 10:37:08
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9547/src/org/fudaa/ebli/calque Modified Files: EbliFilleCalques.java Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur Index: EbliFilleCalques.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/EbliFilleCalques.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** EbliFilleCalques.java 21 Jan 2004 11:02:17 -0000 1.11 --- EbliFilleCalques.java 12 Mar 2004 10:17:42 -0000 1.12 *************** *** 675,683 **** // TreeSelection (mise a jour des etats des boutons de Selection en fonction du calque) public void valueChanged(TreeSelectionEvent _evt) { Object[] cqs= _evt.getPath().getPath(); cqActif_= (BCalque)cqs[cqs.length - 1]; // Le panneau des boutons de sélection est invisible => Pas d'action. ! if (!pnSelection_.isVisible()) ! return; boolean enable= false; cqSelectionI_.removeAll(); --- 675,684 ---- // TreeSelection (mise a jour des etats des boutons de Selection en fonction du calque) public void valueChanged(TreeSelectionEvent _evt) { + if ((pnSelection_==null) || (!pnSelection_.isVisible())) + return; Object[] cqs= _evt.getPath().getPath(); cqActif_= (BCalque)cqs[cqs.length - 1]; // Le panneau des boutons de sélection est invisible => Pas d'action. ! boolean enable= false; cqSelectionI_.removeAll(); |
|
From: <de...@us...> - 2004-03-12 10:37:05
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/refonde In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9271/src/org/fudaa/fudaa/refonde Modified Files: RefondeFilleCalques.java RefondeFillePost.java Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur Index: RefondeFilleCalques.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/refonde/RefondeFilleCalques.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RefondeFilleCalques.java 25 Nov 2003 10:14:14 -0000 1.6 --- RefondeFilleCalques.java 12 Mar 2004 10:17:04 -0000 1.7 *************** *** 325,328 **** --- 325,329 ---- public void valueChanged(TreeSelectionEvent _evt) { super.valueChanged(_evt); + if(btSel2Pts_==null) return; Object cq= _evt.getPath().getLastPathComponent(); btSel2Pts_.setEnabled("cqCONTOURS".equals(((BCalque)cq).getName())); Index: RefondeFillePost.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/refonde/RefondeFillePost.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RefondeFillePost.java 25 Nov 2003 10:14:15 -0000 1.5 --- RefondeFillePost.java 12 Mar 2004 10:17:05 -0000 1.6 *************** *** 235,241 **** // Mise a jour du panneau de palette. if (cqActif_ instanceof RefondeCalqueCarte) ! pnPal_.setPalette(((RefondeCalqueCarte)cqActif_).getPalette()); else ! pnPal_.setPalette(new RefondePaletteCouleurPlage()); } catch (NullPointerException e) {} } --- 235,241 ---- // Mise a jour du panneau de palette. if (cqActif_ instanceof RefondeCalqueCarte) ! if(pnPal_!=null) pnPal_.setPalette(((RefondeCalqueCarte)cqActif_).getPalette()); else ! if(pnPal_!=null) pnPal_.setPalette(new RefondePaletteCouleurPlage()); } catch (NullPointerException e) {} } |
|
From: <de...@us...> - 2004-03-12 10:37:00
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9271/src/org/fudaa/fudaa/meshviewer Modified Files: MvActLoadDefault.java Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur Index: MvActLoadDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActLoadDefault.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MvActLoadDefault.java 10 Mar 2004 09:13:30 -0000 1.2 --- MvActLoadDefault.java 12 Mar 2004 10:17:06 -0000 1.3 *************** *** 110,114 **** ft= guessFormat(file.getName(), FT_LIST); } ! if (file != null) { loadFileAct( _s, --- 110,114 ---- ft= guessFormat(file.getName(), FT_LIST); } ! if( (file != null) && (ft!=null)){ loadFileAct( _s, |
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9271/src/org/fudaa/fudaa/fdico Modified Files: fdico_en.fr_txt FDicoFilleProjet.java FDicoCalculLocal.java FDicoChooserPanel.java FDicoProjet.java Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur Index: fdico_en.fr_txt =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/fdico_en.fr_txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fdico_en.fr_txt 12 Feb 2004 16:15:20 -0000 1.1 --- fdico_en.fr_txt 12 Mar 2004 10:17:03 -0000 1.2 *************** *** 31,33 **** Modifier le titre du projet=Modify the project's title Initialiser le filtre=Initialyze filter ! Le nom du fichier ne doit pas comporter d'espace=The filename must not contain spaces \ No newline at end of file --- 31,34 ---- Modifier le titre du projet=Modify the project's title Initialiser le filtre=Initialyze filter ! Le nom du fichier ne doit pas comporter d'espace=The filename must not contain spaces ! Créer les fichiers de log=Create log files \ No newline at end of file Index: FDicoFilleProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoFilleProjet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FDicoFilleProjet.java 12 Feb 2004 16:15:19 -0000 1.1 --- FDicoFilleProjet.java 12 Mar 2004 10:17:04 -0000 1.2 *************** *** 8,31 **** */ package org.fudaa.fudaa.fdico; import java.awt.Component; import java.beans.PropertyVetoException; import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.event.ChangeEvent; - import javax.swing.event.ChangeListener; import javax.swing.event.InternalFrameEvent; import com.memoire.bu.BuCommonImplementation; - import com.memoire.bu.BuInternalFrame; import com.memoire.bu.BuResource; import com.memoire.bu.BuSelectFindReplaceInterface; ! import com.memoire.bu.BuTabbedPane; ! import com.memoire.bu.BuUndoRedoInterface; import org.fudaa.dodico.commun.DodicoCommandManager; import org.fudaa.ebli.calque.action.EbliActionInterface; import org.fudaa.ebli.calque.action.EbliComponentFactory; import org.fudaa.fudaa.commun.FudaaCommonImplementation; ! import org.fudaa.fudaa.commun.FudaaLib; ! import org.fudaa.fudaa.commun.undo.*; /** * @author deniger --- 8,29 ---- */ package org.fudaa.fudaa.fdico; + import java.awt.Component; import java.beans.PropertyVetoException; + import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.event.ChangeEvent; import javax.swing.event.InternalFrameEvent; import com.memoire.bu.BuCommonImplementation; import com.memoire.bu.BuResource; import com.memoire.bu.BuSelectFindReplaceInterface; ! import org.fudaa.dodico.commun.DodicoCommandManager; import org.fudaa.ebli.calque.action.EbliActionInterface; import org.fudaa.ebli.calque.action.EbliComponentFactory; import org.fudaa.fudaa.commun.FudaaCommonImplementation; ! import org.fudaa.fudaa.commun.undo.FudaaUndoPaneFille; /** * @author deniger *************** *** 33,104 **** */ public class FDicoFilleProjet ! extends FudaaUndoPaneFille ! implements BuSelectFindReplaceInterface { ! protected JComponent[] specificTools_; ! private FDicoProjet projet_; private FDicoEntitePanel pnEnt_; ! BuCommonImplementation impl_; ! public FDicoFilleProjet(FDicoProjet _proj, FudaaCommonImplementation _impl) { ! this(_proj,_impl,null); } ! public FDicoFilleProjet(FDicoProjet _proj, FudaaCommonImplementation _impl,Component _leftUp) { super(_proj.getTitle(), true, true, true, true, _impl.getUndoCmdListener()); ! impl_= _impl; ! FDicoProjectPanel projPane= new FDicoProjectPanel(_proj); super.addTab( ! BuResource.BU.getString("Projet"), ! null, ! projPane, ! FDicoResource.getS("Les fichiers du projet"), ! projPane.getCmdMng()); ! DodicoCommandManager cmd= new DodicoCommandManager(); ! pnEnt_= new FDicoEntitePanel(new FDicoEntiteTableModel(_proj, cmd),_leftUp); super.addTab( ! FDicoResource.getS("Mot-clés"), ! null, ! pnEnt_, ! FDicoResource.getS("Mot-clés"), ! cmd); ! projet_= _proj; } ! ! public FDicoEntitePanel getEntitePanel(){ return pnEnt_; } ! ! ! /** ! * */ public JComponent[] getSpecificTools() { if (specificTools_ == null) { ! EbliActionInterface[] actions= projet_.getSpecificActions(); ! if (actions == null) ! return null; ! specificTools_= new JComponent[actions.length]; ! int n= specificTools_.length; ! for (int i= 0; i < n; i++) { ! specificTools_[i]= ! actions[i].buildToolButton(EbliComponentFactory.INSTANCE); } } return specificTools_; } private void antiTableBug() { ! Component c= getSelectedComponent(); if (c instanceof FDicoEntitePanel) { ! JTable table= ((FDicoEntitePanel)c).getTable(); ! if (table.getCellEditor() != null) ! table.getCellEditor().cancelCellEditing(); ! int selectedCol= table.getSelectedColumn(); if (selectedCol >= 0) { ! FDicoTableColumn col= ! (FDicoTableColumn)table.getColumnModel().getColumn(selectedCol); if (col.getIdentifier() == FDicoTableColumnIdentifier.COLUMN_VALEUR) { ! int i= ! table.getColumnModel().getColumnIndex( ! FDicoTableColumnIdentifier.COLUMN_NOM); table.setColumnSelectionInterval(i, i); } --- 31,129 ---- */ public class FDicoFilleProjet ! extends FudaaUndoPaneFille ! implements BuSelectFindReplaceInterface { ! ! protected JComponent[] specificTools_; ! private FDicoProjet projet_; private FDicoEntitePanel pnEnt_; ! BuCommonImplementation impl_; ! ! /** ! * Appelle le constructeur complet sans composant pour le partie "haut-gauche" ! * @param _proj le projet en question : non null! ! * @param _impl l'implementation parent : non null! ! */ public FDicoFilleProjet(FDicoProjet _proj, FudaaCommonImplementation _impl) { ! this(_proj, _impl, null); } ! ! /** ! * @param _proj le projet en question : non null! ! * @param _impl l'implementation parent : non null! ! * @param _leftUp le composant a ajouter en haut a gauche du panneau des mot-clé : null possible ! */ ! public FDicoFilleProjet(FDicoProjet _proj, FudaaCommonImplementation _impl, Component _leftUp) { super(_proj.getTitle(), true, true, true, true, _impl.getUndoCmdListener()); ! impl_ = _impl; ! FDicoProjectPanel projPane = new FDicoProjectPanel(_proj); super.addTab( ! BuResource.BU.getString("Projet"), ! null, ! projPane, ! FDicoResource.getS("Les fichiers du projet"), ! projPane.getCmdMng()); ! DodicoCommandManager cmd = new DodicoCommandManager(); ! pnEnt_ = new FDicoEntitePanel(new FDicoEntiteTableModel(_proj, cmd), _leftUp); super.addTab( ! FDicoResource.getS("Mot-clés"), ! null, ! pnEnt_, ! FDicoResource.getS("Mot-clés"), ! cmd); ! projet_ = _proj; } ! ! /** ! * @return le panneau des mot-clés ! */ ! public FDicoEntitePanel getEntitePanel() { return pnEnt_; } ! /** ! * Remet a null les outils specifiques. ! */ ! public void applicationPreferencesChanged() { ! fireInternalFrameEvent(InternalFrameEvent.INTERNAL_FRAME_DEACTIVATED); ! specificTools_ = null; ! fireInternalFrameEvent(InternalFrameEvent.INTERNAL_FRAME_ACTIVATED); ! } ! ! ! ! /** ! * Construit les outils specifiques si nécessaires. ! * ! * @return les outils specifiques. */ public JComponent[] getSpecificTools() { if (specificTools_ == null) { ! EbliActionInterface[] actions = projet_.getSpecificActions(); ! if (actions == null) ! return null; ! specificTools_ = new JComponent[actions.length]; ! int n = specificTools_.length; ! for (int i = 0; i < n; i++) { ! specificTools_[i] = ! actions[i].buildToolButton(EbliComponentFactory.INSTANCE); } } return specificTools_; } + private void antiTableBug() { ! Component c = getSelectedComponent(); if (c instanceof FDicoEntitePanel) { ! JTable table = ((FDicoEntitePanel) c).getTable(); ! if (table.getCellEditor() != null) ! table.getCellEditor().cancelCellEditing(); ! int selectedCol = table.getSelectedColumn(); if (selectedCol >= 0) { ! FDicoTableColumn col = ! (FDicoTableColumn) table.getColumnModel().getColumn(selectedCol); if (col.getIdentifier() == FDicoTableColumnIdentifier.COLUMN_VALEUR) { ! int i = ! table.getColumnModel().getColumnIndex( ! FDicoTableColumnIdentifier.COLUMN_NOM); table.setColumnSelectionInterval(i, i); } *************** *** 106,114 **** } } /** ! * */ public void redo() { ! DodicoCommandManager mng= getActiveCmdMng(); if (mng != null) { antiTableBug(); --- 131,140 ---- } } + /** ! * * */ public void redo() { ! DodicoCommandManager mng = getActiveCmdMng(); if (mng != null) { antiTableBug(); *************** *** 116,124 **** } } /** ! * */ public void undo() { ! DodicoCommandManager mng= getActiveCmdMng(); if (mng != null) { antiTableBug(); --- 142,151 ---- } } + /** ! * * */ public void undo() { ! DodicoCommandManager mng = getActiveCmdMng(); if (mng != null) { antiTableBug(); *************** *** 126,176 **** } } /** ! * */ public void find() { if (getSelectedComponent() == pnEnt_) { ! pnEnt_.activeFind(); } } /** ! * */ public void replace() {} /** ! * */ public void select() {} /** ! * */ public void setSelected(boolean b) throws PropertyVetoException { super.setSelected(b); ! if(impl_!=null) ! impl_.setEnabledForAction("RECHERCHER",b && (pnEnt_!=null) && (getSelectedComponent() == pnEnt_)); } /** ! * */ public void stateChanged(ChangeEvent e) { super.stateChanged(e); ! if(impl_!=null) ! impl_.setEnabledForAction("RECHERCHER", (pnEnt_!=null) && (getSelectedComponent() == pnEnt_)); } ! ! public void saveLastModification(){ ! if(pnEnt_!=null) pnEnt_.saveLastModification(); } /** ! * */ protected void fireInternalFrameEvent(int id) { ! if(id==InternalFrameEvent.INTERNAL_FRAME_CLOSED){ ! if(pnEnt_!=null) pnEnt_.saveView(); ! } super.fireInternalFrameEvent(id); } - } --- 153,220 ---- } } + /** ! * * */ public void find() { if (getSelectedComponent() == pnEnt_) { ! pnEnt_.activeFind(); } } + /** ! * NE fait rien ! * ! * @see com.memoire.bu.BuSelectFindReplaceInterface#replace() */ public void replace() {} + /** ! * Ne fait rien ! * ! * @see com.memoire.bu.BuSelectFindReplaceInterface#select() */ public void select() {} + /** ! * Met a jour l'etat du bouton "rechercher" ! * ! * @see javax.swing.JInternalFrame#setSelected(boolean) */ public void setSelected(boolean b) throws PropertyVetoException { super.setSelected(b); ! if (impl_ != null) ! impl_.setEnabledForAction("RECHERCHER", b && (pnEnt_ != null) ! && (getSelectedComponent() == pnEnt_)); } + /** ! * Met a jour l'etat du bouton "rechercher" ! * ! * @see javax.swing.event.ChangeListener#stateChanged(javax.swing.event.ChangeEvent) */ public void stateChanged(ChangeEvent e) { super.stateChanged(e); ! if (impl_ != null) ! impl_.setEnabledForAction("RECHERCHER", (pnEnt_ != null) ! && (getSelectedComponent() == pnEnt_)); } ! ! /** ! * Sauvegarde des dernières modifs dans le panneau des mot-clés ! */ ! public void saveLastModification() { ! if (pnEnt_ != null) pnEnt_.saveLastModification(); } /** ! * Sauvegarde la vue avant que la fenetre soit fermée. ! * @see javax.swing.JInternalFrame#fireInternalFrameEvent(int) */ protected void fireInternalFrameEvent(int id) { ! if (id == InternalFrameEvent.INTERNAL_FRAME_CLOSED) { ! if (pnEnt_ != null) pnEnt_.saveView(); } super.fireInternalFrameEvent(id); } } Index: FDicoCalculLocal.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoCalculLocal.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FDicoCalculLocal.java 12 Feb 2004 16:15:19 -0000 1.1 --- FDicoCalculLocal.java 12 Mar 2004 10:17:04 -0000 1.2 *************** *** 11,29 **** import javax.swing.JCheckBox; - import org.fudaa.ctulu.CtuluLib; - - import com.memoire.bu.BuBorderLayout; import com.memoire.bu.BuCheckBox; import com.memoire.bu.BuGridLayout; ! import org.fudaa.dodico.calcul.CalculExec; ! import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.dico.DicoExec; - import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; - import org.fudaa.fudaa.commun.calcul.FudaaCalculOp; /** * @author deniger --- 11,25 ---- import javax.swing.JCheckBox; + import javax.swing.JTextField; import com.memoire.bu.BuCheckBox; import com.memoire.bu.BuGridLayout; ! import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.dico.DicoExec; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; import org.fudaa.fudaa.commun.calcul.FudaaCalculOp; + import org.fudaa.fudaa.tr.TrResource; /** * @author deniger *************** *** 38,42 **** public void execute() { ! CalculPanel p=new CalculPanel(); if(EbliSimpleDialogPanel.isOkResponse(p.afficheModale(projet_.getImpl().getFrame(), projet_.getCodeName()))){ getDicoExec().setLog(p.isLog()); --- 34,38 ---- public void execute() { ! CalculPanel p=new CalculPanel(getDicoExec().getExecName(),projet_.getParamsFile().getAbsolutePath()); if(EbliSimpleDialogPanel.isOkResponse(p.afficheModale(projet_.getImpl().getFrame(), projet_.getCodeName()))){ getDicoExec().setLog(p.isLog()); *************** *** 65,75 **** } ! private class CalculPanel extends EbliSimpleDialogPanel{ ! JCheckBox cbLog_; ! CalculPanel(){ addEmptyBorder(10); setLayout(new BuGridLayout(2,10,10)); ! addStringText(getDicoExec().getExecName()).setEnabled(false); ! addStringText(projet_.getParamsFile().getAbsolutePath()).setEnabled(false); addLabel(CtuluLib.EMPTY_STRING); cbLog_=new BuCheckBox(FDicoResource.getS("Créer les fichiers de log")); --- 61,76 ---- } ! public static class CalculPanel extends EbliSimpleDialogPanel{ ! private JCheckBox cbLog_; ! protected JTextField execField_; ! ! public CalculPanel(String execName,String _file){ addEmptyBorder(10); setLayout(new BuGridLayout(2,10,10)); ! addLabel(TrResource.getS("Exécutable")+": "); ! execField_=addStringText(execName); ! execField_.setEnabled(false); ! addLabel(TrResource.getS("Fichier")+": "); ! addStringText(_file).setEnabled(false); addLabel(CtuluLib.EMPTY_STRING); cbLog_=new BuCheckBox(FDicoResource.getS("Créer les fichiers de log")); *************** *** 85,88 **** --- 86,96 ---- FDicoPreferences.FD.putBooleanProperty("calcul.log", cbLog_.isSelected()); } + /** + * @return Returns the execField. + */ + public JTextField getExecField() { + return execField_; + } + } } Index: FDicoChooserPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoChooserPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FDicoChooserPanel.java 10 Mar 2004 09:13:29 -0000 1.2 --- FDicoChooserPanel.java 12 Mar 2004 10:17:04 -0000 1.3 *************** *** 12,15 **** --- 12,16 ---- import java.awt.event.ItemListener; import java.io.File; + import java.util.List; import javax.swing.AbstractListModel; *************** *** 20,23 **** --- 21,26 ---- import javax.swing.JList; import javax.swing.JTextField; + import javax.swing.ListCellRenderer; + import javax.swing.ListModel; import javax.swing.UIManager; *************** *** 80,84 **** add(new BuLabel(FDicoResource.getS("Dictionnaire") + s)); BuComboBox cb= new BuComboBox(); ! dicoChooser_= new FormatComboBoxModel(); cb.setModel(dicoChooser_); cb.setRenderer(new DicoDescCellRenderer()); --- 83,87 ---- add(new BuLabel(FDicoResource.getS("Dictionnaire") + s)); BuComboBox cb= new BuComboBox(); ! dicoChooser_= new FormatComboBoxModel(dicoMng_.formats_); cb.setModel(dicoChooser_); cb.setRenderer(new DicoDescCellRenderer()); *************** *** 115,119 **** return new File(fic_.getText()); } ! private class DicoDescCellRenderer extends DefaultListCellRenderer { /** * --- 118,130 ---- return new File(fic_.getText()); } ! ! public static ListCellRenderer getDicoCellRenderer(){ ! return new DicoDescCellRenderer(); ! } ! ! public static ComboBoxModel createModel(DicoManager _mng){ ! return new FormatComboBoxModel(_mng.formats_); ! } ! private static class DicoDescCellRenderer extends DefaultListCellRenderer { /** * *************** *** 144,153 **** } } ! public class FormatComboBoxModel extends AbstractListModel implements ComboBoxModel { DicoCasFileFormat selected_; ! public FormatComboBoxModel() { ! selected_= (DicoCasFileFormat)dicoMng_.formats_.get(0); } /** --- 155,166 ---- } } ! public static class FormatComboBoxModel extends AbstractListModel implements ComboBoxModel { DicoCasFileFormat selected_; ! List l_; ! public FormatComboBoxModel(List _l) { ! l_=_l; ! selected_= (DicoCasFileFormat)l_.get(0); } /** *************** *** 175,179 **** */ public Object getElementAt(int arg0) { ! return dicoMng_.formats_.get(arg0); } /** --- 188,192 ---- */ public Object getElementAt(int arg0) { ! return l_.get(arg0); } /** *************** *** 181,185 **** */ public int getSize() { ! return dicoMng_.formats_.size(); } } --- 194,198 ---- */ public int getSize() { ! return l_.size(); } } Index: FDicoProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoProjet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FDicoProjet.java 12 Feb 2004 16:15:20 -0000 1.1 --- FDicoProjet.java 12 Mar 2004 10:17:04 -0000 1.2 *************** *** 16,21 **** import javax.swing.JTable; - import org.fudaa.ctulu.CtuluLib; - import com.memoire.bu.BuBorderLayout; import com.memoire.bu.BuInformationsDocument; --- 16,19 ---- *************** *** 27,32 **** import com.memoire.bu.BuTextField; import org.fudaa.dodico.calcul.CalculLauncher; - import org.fudaa.dodico.commun.DodicoCmdMngListener; import org.fudaa.dodico.commun.DodicoCommandManager; import org.fudaa.dodico.commun.ProgressionInterface; --- 25,30 ---- import com.memoire.bu.BuTextField; + import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.calcul.CalculLauncher; import org.fudaa.dodico.commun.DodicoCommandManager; import org.fudaa.dodico.commun.ProgressionInterface; *************** *** 36,44 **** import org.fudaa.dodico.dico.DicoParams; import org.fudaa.dodico.dico.DicoParamsListener; - import org.fudaa.ebli.calque.action.EbliActionInterface; import org.fudaa.ebli.calque.action.EbliSimpleAction; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; - import org.fudaa.fudaa.commun.FudaaCommonImplementation; import org.fudaa.fudaa.commun.FudaaUI; --- 34,40 ---- *************** *** 58,61 **** --- 54,66 ---- FudaaCommonImplementation impl_; FDicoParams params_; + /** + * Creer un projet dico. Change de langue si nécessaire. + * @param _file le fichier cas + * @param _fileFormat le format utilise + * @param _progress la barre de progression + * @param _ui l'interface utilisateur + * @param _dicoMng le manager des fichiers dico. + * @return + */ public static FDicoProjet init( File _file, *************** *** 73,80 **** --- 78,92 ---- return null; } + + /** + * Met a jour l'etat des boutons pour le lancement du calcul. + */ public void validChange() { actions_.setEnableCalcul(isValide()); } + /** + * @return l'entite specifiant le titre de l'etude. + */ public DicoEntite getTitleEntite(){ return getDicoParams().getDicoFileFormatVersion().getTitreEntite(); *************** *** 82,85 **** --- 94,101 ---- + /** + * Change le titre du projet et met a jour l'historique des actions undo/redo + * @param _mng le manager des commandes + */ public void changeTitleProjet(DodicoCommandManager _mng){ EbliSimpleDialogPanel pn= new EbliSimpleDialogPanel(); *************** *** 101,113 **** /** ! * */ public FDicoEntiteFileTableModelInterface createEntiteFileTableModel() { return params_.getEntiteFilesTableModel(); } protected FDicoProjet(FDicoParams _param) { params_= _param; actions_= new FudaaCalculAction(this, false); } public void setActionStopVisible(boolean b) { if (b != actions_.isStopCalculVisible()) { --- 117,135 ---- /** ! * @return model des entites fichiers pour Jtable ! * @see FDicoParams#getEntiteFileNb() */ public FDicoEntiteFileTableModelInterface createEntiteFileTableModel() { return params_.getEntiteFilesTableModel(); } + protected FDicoProjet(FDicoParams _param) { params_= _param; actions_= new FudaaCalculAction(this, false); } + /** + * Met a jour les actions lance/arret calcul + * @param b le nouveau etat du bouton arret du calcul + */ public void setActionStopVisible(boolean b) { if (b != actions_.isStopCalculVisible()) { *************** *** 116,120 **** } /** ! * */ public BuInformationsDocument getInformationsDocument() { --- 138,142 ---- } /** ! * @return les informations sur le document */ public BuInformationsDocument getInformationsDocument() { *************** *** 123,126 **** --- 145,151 ---- return idoc_; } + /** + * @see org.fudaa.fudaa.fdico.FDicoProjetInterface#getParamsFile() + */ public File getParamsFile() { if (getDicoParams() == null) *************** *** 128,131 **** --- 153,159 ---- return params_.getMainFile(); } + /** + * @see org.fudaa.fudaa.fdico.FDicoProjetInterface#getTitle() + */ public String getTitle() { if (params_ == null) *************** *** 133,139 **** --- 161,171 ---- return params_.getTitle(); } + /** + * @see org.fudaa.fudaa.fdico.FDicoProjetInterface#getImpl() + */ public FudaaCommonImplementation getImpl() { return impl_; } + protected void buildEntiteFille() { if (entiteFille_ != null) *************** *** 142,145 **** --- 174,181 ---- } + /** + * Active ( si pas deja fait) ce projet dans l'implemention passee en parametre + * @param _impl l'implementation parent + */ public void active(FudaaCommonImplementation _impl) { if (impl_ != null) *************** *** 148,152 **** activeEntiteFille(); } ! public void activeEntiteFille() { if (impl_ == null) return; --- 184,192 ---- activeEntiteFille(); } ! ! /** ! * Methode a ne pas appele ( utiliser active). Laisse en protected afin de pouvoir etre redéfinie. ! */ ! protected void activeEntiteFille() { if (impl_ == null) return; *************** *** 167,173 **** } ! public FDicoFilleProjet getProjetFille(){ return entiteFille_; } public boolean isValide() { return params_.isValide(); --- 207,221 ---- } ! /** ! * Ne construit pas le panneau. ! * @return le panneau projet ! */ ! protected FDicoFilleProjet getProjetFille(){ return entiteFille_; } + /** + * @return true si les parametres sont valides + * + */ public boolean isValide() { return params_.isValide(); *************** *** 177,180 **** --- 225,231 ---- if(entiteFille_!=null) entiteFille_.saveLastModification(); } + /** + * @see org.fudaa.fudaa.fdico.FDicoProjetInterface#save(org.fudaa.dodico.commun.ProgressionInterface) + */ public void save(ProgressionInterface _prog) { validLastModification(); *************** *** 197,200 **** --- 248,255 ---- _prog.setProgression(100); } + /** + * Sauve le projet dans un autre fichier + * @param _prog la barre de progression + */ public void saveAs(ProgressionInterface _prog) { validLastModification(); *************** *** 220,228 **** } /** ! * */ public FudaaUI getUI() { return params_.getUI(); } public boolean isModified() { if (params_ != null) --- 275,286 ---- } /** ! * @return l'interface utilisateur */ public FudaaUI getUI() { return params_.getUI(); } + /** + * @return + */ public boolean isModified() { if (params_ != null) *************** *** 230,233 **** --- 288,294 ---- return false; } + /** + * Ferme le projet et ses fenetres. + */ public void close() { if(entiteFille_!=null) { *************** *** 239,243 **** } /** ! * */ public String getCodeName() { --- 300,305 ---- } /** ! * @see org.fudaa.fudaa.fdico.FDicoProjetInterface#getCodeName() ! * @return le code issu du fichier dico */ public String getCodeName() { *************** *** 247,251 **** } /** ! * @return */ public FudaaCalculAction getCalculActions() { --- 309,313 ---- } /** ! * @return les actions */ public FudaaCalculAction getCalculActions() { |
|
From: <de...@us...> - 2004-03-12 10:37:00
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9271/src/org/fudaa/fudaa/tr Modified Files: TrExplorer.java TrApplicationManager.java TrProjet.java TrFileFormatManager.java tr_en.fr_txt TrImplHelper.java TrImplementation.java Added Files: maillage_16.gif prepro_16.gif Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur --- NEW FILE: maillage_16.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: prepro_16.gif --- (This appears to be a binary file; contents omitted.) Index: TrExplorer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrExplorer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TrExplorer.java 10 Mar 2004 09:13:29 -0000 1.1 --- TrExplorer.java 12 Mar 2004 10:17:01 -0000 1.2 *************** *** 16,24 **** --- 16,28 ---- import com.memoire.bu.BuActionEnabler; + import com.memoire.bu.BuDynamicMenu; import com.memoire.bu.BuExplorer; + import com.memoire.bu.BuMenu; + import com.memoire.bu.BuMenuItem; import com.memoire.bu.BuResource; import com.memoire.fu.FuFile; import org.fudaa.ebli.filechooser.EbliFavoriteFiles; + import org.fudaa.fudaa.commun.exec.FudaaExec; *************** *** 30,36 **** public class TrExplorer extends BuExplorer implements Observer{ ! private TrApplicationManager appli_; ! private ActionListener dirAction_; ! private ActionListener fileAction_; /** * @param _appli --- 34,38 ---- public class TrExplorer extends BuExplorer implements Observer{ ! protected TrApplicationManager appli_; /** * @param _appli *************** *** 55,58 **** --- 57,68 ---- /** + * Methode appelee lors d'un changement des applications utilisee. + */ + public void applicationPreferencesChanged(){ + buildMenuForDir(); + buildMenuForFiles(); + } + + /** * @param _mng le nouveau gestion des appli. */ *************** *** 67,72 **** miOuvrirFichier_ = pmFiles_.addMenuItem (BuResource.BU.getString("Ouvrir"), "OUVRIR_FICHIER", true); ! if(this.fileAction_==null) fileAction_=new FileActionListener(); ! appli_.buildCmdForMenuFile(pmFiles_,fileAction_); pmFiles_.addSeparator(); pmFiles_.addMenuItem(BuResource.BU.getString("Tout sélectionner"), "TOUTSELECTIONNER", true); --- 77,81 ---- miOuvrirFichier_ = pmFiles_.addMenuItem (BuResource.BU.getString("Ouvrir"), "OUVRIR_FICHIER", true); ! appli_.buildCmdForMenuFile(pmFiles_,this); pmFiles_.addSeparator(); pmFiles_.addMenuItem(BuResource.BU.getString("Tout sélectionner"), "TOUTSELECTIONNER", true); *************** *** 74,87 **** pmFiles_.addMenuItem(BuResource.BU.getString("Renommer..."), "RENOMMER_FICHIER", true); pmFiles_.addMenuItem(BuResource.BU.getString("Détruire..."), "DETRUIRE_FICHIER", true); - } private void buildMenuForDir(){ pmDirs_.removeAll(); ! if(this.dirAction_==null) dirAction_=new DirActionListener(); ! appli_.buildCmdForMenuDir(pmDirs_,dirAction_); ! pmDirs_.addSeparator(); ! pmDirs_.addMenuItem(BuResource.BU.getString("Ouvrir" ),"OUVRIR_REPERTOIRE" ,true); ! pmDirs_.addSeparator(); pmDirs_.addMenuItem(BuResource.BU.getString("Renommer..."),"RENOMMER_REPERTOIRE",true); pmDirs_.addMenuItem(BuResource.BU.getString("Détruire..."),"DETRUIRE_REPERTOIRE",true); --- 83,93 ---- pmFiles_.addMenuItem(BuResource.BU.getString("Renommer..."), "RENOMMER_FICHIER", true); pmFiles_.addMenuItem(BuResource.BU.getString("Détruire..."), "DETRUIRE_FICHIER", true); } + + private void buildMenuForDir(){ pmDirs_.removeAll(); ! appli_.buildCmdForMenuDir(pmDirs_,this); pmDirs_.addMenuItem(BuResource.BU.getString("Renommer..."),"RENOMMER_REPERTOIRE",true); pmDirs_.addMenuItem(BuResource.BU.getString("Détruire..."),"DETRUIRE_REPERTOIRE",true); *************** *** 91,95 **** { int l = files_.getSelectedValues().length; ! BuActionEnabler.setEnabledForAction(pmFiles_, "OUVRIR_FICHIER", (l > 0) ); BuActionEnabler.setEnabledForAction(pmFiles_, "DETRUIRE_FICHIER", l == 1); BuActionEnabler.setEnabledForAction(pmFiles_, "RENOMMER_FICHIER", l == 1); --- 97,101 ---- { int l = files_.getSelectedValues().length; ! BuActionEnabler.setEnabledForAction(pmFiles_, "OUVRIR_FICHIER", (l ==1) ); BuActionEnabler.setEnabledForAction(pmFiles_, "DETRUIRE_FICHIER", l == 1); BuActionEnabler.setEnabledForAction(pmFiles_, "RENOMMER_FICHIER", l == 1); *************** *** 118,166 **** } - /** - * @param _cmd la commande - * @param _f le repertoire sélectionne - */ - public void dirAction(String _cmd,File _f){ - appli_.dirAction(_cmd,_f); - } ! /** ! * @param _cmd la commande ! * @param _f le fichier selectionne ! */ ! public void fileAction(String _cmd,File _f){ ! appli_.fileAction(_cmd,_f); } ! ! private class DirActionListener implements ActionListener{ ! /** ! * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ ! public void actionPerformed(ActionEvent _e) { ! if(dirs_.getSelectedValues().length==1) ! TrExplorer.this.dirAction(_e.getActionCommand(),getSelectedDirectory()); ! } ! } ! ! ! private class FileActionListener implements ActionListener{ ! ! /** ! * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ ! public void actionPerformed(ActionEvent _e) { ! if(files_.getSelectedValues().length==1) ! TrExplorer.this.fileAction(_e.getActionCommand(),getSelectedFile()); ! } } } --- 124,168 ---- } ! public BuMenuItem createDirAction(FudaaExec _ex){ ! return new ExplorerMenuItem(_ex,true); } + public BuMenuItem createFileAction(FudaaExec _ex){ + return new ExplorerMenuItem(_ex,false); + } + ! private class ExplorerMenuItem extends BuMenuItem{ ! FudaaExec exec_; ! boolean dir_; /** ! * */ ! public ExplorerMenuItem(FudaaExec _exe,boolean _dir) { ! exec_=_exe; ! dir_=_dir; ! setAction(exec_.getAction()); } ! ! /** ! * @see javax.swing.AbstractButton#fireActionPerformed(java.awt.event.ActionEvent) */ ! protected void fireActionPerformed(ActionEvent _event) { ! if(dir_){ ! exec_.execInDir(getSelectedDirectory()); ! } ! else exec_.execOnFile(getSelectedFile()); } } + /** + * @see com.memoire.bu.BuExplorer#updateMenuDirs() + */ + protected void updateMenuDirs() { + super.updateMenuDirs(); + } } Index: TrApplicationManager.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrApplicationManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TrApplicationManager.java 10 Mar 2004 09:13:29 -0000 1.1 --- TrApplicationManager.java 12 Mar 2004 10:17:01 -0000 1.2 *************** *** 12,15 **** --- 12,16 ---- import java.awt.event.ActionListener; import java.io.File; + import javax.swing.Icon; import com.memoire.bu.BuDynamicMenu; import com.memoire.bu.BuMenu; *************** *** 22,26 **** --- 23,29 ---- import org.fudaa.dodico.fichiers.FileFormatSoftware; import org.fudaa.fudaa.commun.exec.FudaaAppliManagerImpl; + import org.fudaa.fudaa.commun.exec.FudaaExec; import org.fudaa.fudaa.meshviewer.Mv; + import org.fudaa.fudaa.ressource.FudaaResource; *************** *** 31,34 **** --- 34,182 ---- public class TrApplicationManager extends FudaaAppliManagerImpl { + private class FudaaExecConsole extends FudaaExec { + + /** + */ + public FudaaExecConsole() { + super("console"); + } + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#execInDir(java.io.File) + */ + public void execInDir(File _dir) { + getImpl().openLogFrame(true); + } + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#execOnFile(java.io.File) + */ + public void execOnFile(File _target) { + getImpl().openFileInLogFrame(_target); + } + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#getIcon() + */ + public Icon getIcon() { + return FudaaResource.FUDAA.getIcon("tail"); + } + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#getShownName() + */ + public String getShownName() { + return TrResource.getS("Console"); + } + } + + protected class FudaaExecCreateProjectH2d extends FudaaExec { + + /** + */ + public FudaaExecCreateProjectH2d(String _name) { + super(_name); + } + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#execInDir(java.io.File) + */ + public void execInDir(File _dir) { + getImpl().creer(); + } + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#execOnFile(java.io.File) + */ + public void execOnFile(File _target) { + getImpl().creer(_target); + } + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#getIcon() + */ + public Icon getIcon() { + return TrResource.TR.getIcon("prepro_16"); + } + } + + private class FudaaExecMeshView extends FudaaExec { + + /** + */ + public FudaaExecMeshView() { + super("meshview"); + } + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#execInDir(java.io.File) + */ + public void execInDir(File _dir) { + buildMv(null); + } + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#execOnFile(java.io.File) + */ + public void execOnFile(File _target) { + buildMv(_target); + } + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#getIcon() + */ + public Icon getIcon() { + return TrResource.TR.getIcon("maillage"); + } + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#getShownName() + */ + public String getShownName() { + return TrResource.getS("Meshview"); + } + } + + private class FudaaExecPrepro extends FudaaExec { + + /** + */ + public FudaaExecPrepro() { + super("prepro"); + } + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#execInDir(java.io.File) + */ + public void execInDir(File _dir) { + getImpl().creer(); + } + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#execOnFile(java.io.File) + */ + public void execOnFile(File _target) { + /* + * if(getImpl().getFileFormatMng().isRefluxFile(_target.getName())){ + * getImpl().ouvrir(_target,TrImplHelper.getImplHelper(FileFormatSoftware.REFLUX_IS.name,getImpl())); } + */ + getImpl().ouvrir(_target); + } + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#getIcon() + */ + public Icon getIcon() { + return TrResource.TR.getIcon("prepro_16"); + } + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#getShownName() + */ + public String getShownName() { + return TrResource.getS("Prepro"); + } + } + private class TrAppliMainMenu extends BuDynamicMenu { *************** *** 59,64 **** } ! protected BuMenuItem createProject_; ! private BuDynamicMenu mainMenu_; /** --- 207,216 ---- } ! private FudaaExecConsole consoleExec_; ! private FudaaExecMeshView meshViewExec_; ! private FudaaExecPrepro preproExec_; ! protected BuMenuItem createProject_; ! private BuMenu mainMenu_; ! private BuMenu menuOuvrirAvec_; /** *************** *** 79,102 **** } ! /** ! * Permet de mettre a jour l'etat du menu ouvrir ! * @param _miOuvrirFichier ! * @param _nbSelectedFile ! * @param _selectedFile ! */ ! public void updateOuvrirMenu(BuMenuItem _miOuvrirFichier, int _nbSelectedFile, ! FuFile _selectedFile) { ! if (_nbSelectedFile == 1) { ! String s = ouvrir(_selectedFile, true); ! _miOuvrirFichier.setText(BuResource.BU.getString("Ouvrir") + CtuluLib.ESPACE ! + (s == null ? CtuluLib.EMPTY_STRING : "(" + s + ")")); ! _miOuvrirFichier.setEnabled(true); ! } ! else { ! _miOuvrirFichier.setText(BuResource.BU.getString("Ouvrir")); ! _miOuvrirFichier.setEnabled(false); ! } } /** * Ajoute les applications par defaut pour le prepro. --- 231,251 ---- } ! private FudaaExecConsole getConsoleExec() { ! if (consoleExec_ == null) consoleExec_ = new FudaaExecConsole(); ! return consoleExec_; ! } ! ! private FudaaExecMeshView getMvExec() { ! if (meshViewExec_ == null) meshViewExec_ = new FudaaExecMeshView(); ! return meshViewExec_; } + private FudaaExecPrepro getPreproExec() { + if (preproExec_ == null) preproExec_ = new FudaaExecPrepro(); + return preproExec_; + } + + protected void buildMainMenuFirstItems(BuMenu _m) {} + /** * Ajoute les applications par defaut pour le prepro. *************** *** 104,122 **** * @param _m */ ! protected void buildTrItem(BuMenu _m) { BuMenuItem it = new BuMenuItem(TrResource.getS("Explorateur")); it.setActionCommand("EXPLORER"); it.addActionListener(this); _m.add(it); ! it = new BuMenuItem(TrResource.getS("Meshiew")); ! it.setActionCommand("MESHVIEW"); ! it.addActionListener(this); _m.add(it); ! it = new BuMenuItem(TrResource.getS("Console")); ! it.setActionCommand("CONSOLE"); ! it.addActionListener(this); _m.add(it); } --- 253,280 ---- * @param _m */ ! protected final void buildTrItem(BuMenu _m) { ! buildMainMenuFirstItems(_m); BuMenuItem it = new BuMenuItem(TrResource.getS("Explorateur")); it.setActionCommand("EXPLORER"); + it.setIcon(BuResource.BU.getIcon("explorateur")); it.addActionListener(this); _m.add(it); ! it = new BuMenuItem(); ! it.setAction(getMvExec().getAction()); _m.add(it); ! it = new BuMenuItem(); ! it.setAction(getConsoleExec().getAction()); _m.add(it); } + /** + * Methode appele lors de l'action "creer projet" + * + * @param _f le fichier maillage + */ + protected void createProject(File _f) { + getImpl().creer(_f); + } + *************** *** 145,152 **** imp.ouvrirId(FileFormatSoftware.REFLUX_IS.name, _f); } ! else ! if (_infoOnly) ! return TrResource.getS("MeshViewer"); ! if (mng.isGridExtension(name) != null) { buildMv(_f); } --- 303,309 ---- imp.ouvrirId(FileFormatSoftware.REFLUX_IS.name, _f); } ! else if (mng.isGridExtension(name) != null) { ! if (_infoOnly) ! return TrResource.getS("MeshViewer"); buildMv(_f); } *************** *** 160,170 **** */ public void actionPerformed(ActionEvent _e) { ! String action = _e.getActionCommand(); ! if ("CONSOLE".equals(action)) { ! getImpl().openLogFrame(); ! } else if ("EXPLORER".equals(action)) { getImpl().showExplorer(); - } else if ("MESHVIEW".equals(action)) { - buildMv(null); } super.actionPerformed(_e); --- 317,322 ---- */ public void actionPerformed(ActionEvent _e) { ! if ("EXPLORER".equals(_e.getActionCommand())) { getImpl().showExplorer(); } super.actionPerformed(_e); *************** *** 173,221 **** /** * Methode a surcharger pour ajouter des actions au menu contextuel des rep. ! * Les evenements sont a recuperer dans la methode {@link #dirAction(String, File)}. * @param _m le menu contextuel a modifier ! * @param _l le listener a UTILISER ( dispatch les evenments) */ ! public void buildCmdForMenuDir(BuPopupMenu _m, ActionListener _l) {} /** ! * Methode a surcharger pour ajouter des actions au menu contextuel des fichiers. ! * Les evenements sont a recuperer dans la methode {@link #fileAction(String, File)}. * @param _m le menu de dest - * @param _l le listener */ ! public void buildCmdForMenuFile(BuPopupMenu _m, ActionListener _l) { ! createProject_ = new BuMenuItem(null, TrResource.TR.getString("Créer projet")); ! createProject_.setActionCommand("CREATE_PROJECT"); ! createProject_.setIcon(BuResource.BU.getIcon("creer")); ! createProject_.addActionListener(_l); ! _m.add(createProject_); } ! /** ! * Methode appele par les items ajoutés dans la fonction {@link #buildCmdForMenuDir(BuPopupMenu, ActionListener)} ! * @param cmd la commande ! * @param _f le repertoire selectionne ! */ ! public void dirAction(String cmd, File _f) {} ! ! /** ! * @param cmd la commande envoyee ! * @param _f le fichier selectionnee ! */ ! public void fileAction(String cmd, File _f) { ! if ("CREATE_PROJECT".equals(cmd)) { ! createProject(_f); ! } } - /** - * Methode appele lors de l'action "creer projet" - * @param _f le fichier maillage - */ - protected void createProject(File _f) { - getImpl().creer(_f); - } /** --- 325,354 ---- /** * Methode a surcharger pour ajouter des actions au menu contextuel des rep. ! * * @param _m le menu contextuel a modifier ! * @return true si menus ajoutes */ ! public boolean buildCmdForMenuDir(BuPopupMenu _m, TrExplorer _explor) { ! _m.add(buildDirMenuItem(_explor)); ! return true; ! } /** ! * Methode a surcharger pour ajouter des actions au menu contextuel des fichiers. ! * * @param _m le menu de dest */ ! public void buildCmdForMenuFile(BuPopupMenu _m, TrExplorer _explor) { ! menuOuvrirAvec_=buildMenuOuvrirAvec(_explor); ! _m.add(menuOuvrirAvec_); } ! protected void buildCmdForMenuFileOpenWith(BuMenu _m, TrExplorer _explor) { ! _m.add(_explor.createFileAction(getPreproExec())); ! _m.add(_explor.createFileAction(getMvExec())); ! _m.add(_explor.createFileAction(getConsoleExec())); } /** *************** *** 246,249 **** --- 379,383 ---- mainMenu_.removeAll(); } + getImpl().applicationPreferencesChanged(); } *************** *** 253,258 **** */ public void updateMenuFiles(int _nbFileChoosen, File _f) { ! createProject_.setEnabled((_nbFileChoosen == 1) ! && (getImpl().getFileFormatMng().isGridExtension(_f.getName()) != null)); } } --- 387,450 ---- */ public void updateMenuFiles(int _nbFileChoosen, File _f) { ! menuOuvrirAvec_.setEnabled(_nbFileChoosen==1); ! } ! ! /** ! * Permet de mettre a jour l'etat du menu ouvrir ! * ! * @param _miOuvrirFichier ! * @param _nbSelectedFile ! * @param _selectedFile ! */ ! public void updateOuvrirMenu(BuMenuItem _miOuvrirFichier, int _nbSelectedFile, ! FuFile _selectedFile) { ! if (_nbSelectedFile == 1) { ! String s = ouvrir(_selectedFile, true); ! _miOuvrirFichier.setText(BuResource.BU.getString("Ouvrir") + CtuluLib.ESPACE ! + (s == null ? CtuluLib.EMPTY_STRING : "(" + s + ")")); ! _miOuvrirFichier.setEnabled(true); ! } ! else { ! _miOuvrirFichier.setText(BuResource.BU.getString("Ouvrir")); ! _miOuvrirFichier.setEnabled(false); ! } ! } ! ! private final BuMenu buildMenuOuvrirAvec(final TrExplorer _explorer) { ! return new BuDynamicMenu(TrResource.getS("Ouvrir avec..."), "LAUNCH") { ! ! public boolean isActive() { ! return isEnabled(); ! } ! ! public void build() { ! if (getMenuComponentCount() == 0) { ! buildCmdForMenuFileOpenWith(this, _explorer); ! addSeparator(); ! int nb = getActionsNb(); ! for (int i = 0; i < nb; i++) { ! add(_explorer.createFileAction(getExec(i))); ! } ! } ! } ! }; ! } ! ! protected BuMenu buildDirMenuItem(final TrExplorer _explorer) { ! return new BuDynamicMenu(TrResource.getS("Exécuter..."), "LAUNCH") { ! ! public boolean isActive() { ! return true; ! } ! ! public void build() { ! if (getMenuComponentCount() == 0) { ! int nb = getActionsNb(); ! for (int i = 0; i < nb; i++) { ! add(_explorer.createDirAction(getExec(i))); ! } ! } ! } ! }; } } Index: TrProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrProjet.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** TrProjet.java 21 Jan 2004 11:07:28 -0000 1.14 --- TrProjet.java 12 Mar 2004 10:17:01 -0000 1.15 *************** *** 9,21 **** package org.fudaa.fudaa.tr; import java.io.File; ! import javax.swing.JMenu; import com.memoire.bu.BuInformationsDocument; import com.memoire.bu.BuMenu; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.h2d.H2dEvolutionManager; - - import org.fudaa.ebli.calque.action.EbliActionInterface; - import org.fudaa.fudaa.commun.FudaaCommonImplementation; - import org.fudaa.fudaa.commun.calcul.FudaaCalculAction; import org.fudaa.fudaa.commun.calcul.FudaaCalculSupportInterface; /** --- 9,18 ---- package org.fudaa.fudaa.tr; import java.io.File; ! import com.memoire.bu.BuInformationsDocument; import com.memoire.bu.BuMenu; + import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.h2d.H2dEvolutionManager; import org.fudaa.fudaa.commun.calcul.FudaaCalculSupportInterface; /** *************** *** 43,45 **** --- 40,43 ---- public void loadAll(ProgressionInterface _inter); public void activeGrapheFille(); + public void applicationPreferencesChanged(); } Index: TrFileFormatManager.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrFileFormatManager.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TrFileFormatManager.java 10 Mar 2004 09:13:29 -0000 1.9 --- TrFileFormatManager.java 12 Mar 2004 10:17:01 -0000 1.10 *************** *** 234,239 **** */ public boolean isCasFile(String _file) { ! return ("cas".equals(_file)) || _file.endsWith(".cas") ! || (_file.startsWith("cas") && (_file.indexOf('.') < 0)); } --- 234,238 ---- */ public boolean isCasFile(String _file) { ! return (_file.startsWith("cas")) || _file.endsWith(".cas"); } Index: tr_en.fr_txt =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/tr_en.fr_txt,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** tr_en.fr_txt 12 Feb 2004 16:15:21 -0000 1.14 --- tr_en.fr_txt 12 Mar 2004 10:17:01 -0000 1.15 *************** *** 189,191 **** Certaines courbes temporelles ne sont pas assez étendues dans le temps( cela sera automatiquement corrigé)=Some time curves are not width enough (this will be automtically corrected) Importer des courbes depuis fichier csv=Import curves from a csv file ! Noeuds frontières=Frontier nodes \ No newline at end of file --- 189,192 ---- Certaines courbes temporelles ne sont pas assez étendues dans le temps( cela sera automatiquement corrigé)=Some time curves are not width enough (this will be automtically corrected) Importer des courbes depuis fichier csv=Import curves from a csv file ! Noeuds frontières=Frontier nodes ! Créer projet Telemac=Create a telemac project \ No newline at end of file Index: TrImplHelper.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrImplHelper.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** TrImplHelper.java 10 Mar 2004 09:13:29 -0000 1.12 --- TrImplHelper.java 12 Mar 2004 10:17:01 -0000 1.13 *************** *** 48,51 **** --- 48,55 ---- return null; } + + public static TrImplHelper getTelemacImplHelper(TrImplementation _impl){ + return getImplHelper(FileFormatSoftware.TELEMAC_IS.name,_impl); + } TrApplicationManager appliMng_; *************** *** 54,57 **** --- 58,63 ---- appliMng_ = _mng; } + + private void addOuvrirAutre() { *************** *** 92,96 **** } ! protected TrApplicationManager getAppliMng() { return appliMng_; } --- 98,102 ---- } ! public final TrApplicationManager getAppliMng() { return appliMng_; } Index: TrImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrImplementation.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** TrImplementation.java 10 Mar 2004 09:13:29 -0000 1.22 --- TrImplementation.java 12 Mar 2004 10:17:01 -0000 1.23 *************** *** 10,14 **** import ghm.followgui.FollowApp; - import java.awt.Component; import java.awt.Dimension; --- 10,13 ---- *************** *** 24,28 **** import java.util.ArrayList; import java.util.Map; - import javax.swing.AbstractButton; import javax.swing.JComponent; --- 23,26 ---- *************** *** 33,37 **** import javax.swing.JScrollPane; import javax.swing.SwingUtilities; - import com.memoire.acme.AcmeGifEncoder; import com.memoire.bu.BuBrowserPreferencesPanel; --- 31,34 ---- *************** *** 58,62 **** import com.memoire.bu.BuTaskView; import com.memoire.bu.BuUserPreferencesPanel; - import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.commun.ProgressionInterface; --- 55,58 ---- *************** *** 366,369 **** --- 362,377 ---- super.exit(); } + + /** + * Methode appelee lors d'un changement des applications utilisee. + */ + public void applicationPreferencesChanged(){ + if(explorer_!=null){ + ((TrExplorer)explorer_.getContentPane()).applicationPreferencesChanged(); + } + if(currentProject_!=null) + currentProject_.applicationPreferencesChanged(); + + } protected String getCurrentProjectHelp() { *************** *** 380,383 **** --- 388,395 ---- protected void openLogFrame(final boolean _show) { + openLogFrame(_show, null); + } + + protected void openLogFrame(final boolean _show, final File _f) { if (tailFrame_ != null) { tailFrame_.getFrame().show(); *************** *** 386,390 **** public void act() { ! openLogFrameAction(_show); } } --- 398,402 ---- public void act() { ! openLogFrameAction(_show, _f); } } *************** *** 393,405 **** } protected void openLogFrameAction(final boolean _show) { if (tailFrame_ != null) { tailFrame_.getFrame().show(); } else { try { ! tailFrame_ = ! FollowApp.openFollowApp( ! new String[] { new File("ts.log").getAbsolutePath()}, ! _show); tailFrame_.setCloseFrameExitJvm(false); } catch (IOException e) { --- 405,439 ---- } + protected void openFileInLogFrame(File _f) { + if (tailFrame_ == null) { + openLogFrame(true, _f); + } + else { + tailFrame_.openFile(_f,false,true); + tailFrame_.show(); + } + } + protected void openLogFrameAction(final boolean _show) { + openLogFrameAction(_show, null); + } + + protected void openLogFrameAction(final boolean _show, final File _f) { if (tailFrame_ != null) { tailFrame_.getFrame().show(); } else { try { ! if (_f == null) ! tailFrame_ = ! FollowApp.openFollowApp( ! new String[] { new File("ts.log").getAbsolutePath()}, ! _show); ! else ! { ! tailFrame_ = ! FollowApp.openFollowApp( ! new String[] { new File("ts.log").getAbsolutePath(), _f.getAbsolutePath()}, ! _show); ! } tailFrame_.setCloseFrameExitJvm(false); } catch (IOException e) { *************** *** 630,633 **** --- 664,671 ---- if (implHelper_ != null) implHelper_.unactive(); initImplHelperFromPref(); + if (explorer_ != null) { + ((TrExplorer) explorer_.getContentPane()).setAppliManager(getCurrentImplHelper() + .getAppliMng()); + } getFrame().repaint(); } |
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9271/src/org/fudaa/fudaa/tr/reflux Modified Files: TrRefluxProjectFactory.java TrRefluxProjet.java TrRefluxImplHelper.java TrRefluxFilleProjet.java Added Files: TrRefluxAppliManager.java Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur --- NEW FILE: TrRefluxAppliManager.java --- /* * @file TrRefluxAppliManager.java * @creation 11 mars 2004 * @modification $Date: 2004/03/12 10:17:00 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.fudaa.tr.reflux; import java.io.File; import javax.swing.Icon; import com.memoire.bu.BuMenuItem; import com.memoire.bu.BuPopupMenu; import com.memoire.bu.BuResource; import org.fudaa.fudaa.commun.exec.FudaaExec; import org.fudaa.fudaa.tr.TrApplicationManager; import org.fudaa.fudaa.tr.TrExplorer; import org.fudaa.fudaa.tr.TrImplementation; import org.fudaa.fudaa.tr.TrResource; /** * @author Fred Deniger * @version $id$ */ public class TrRefluxAppliManager extends TrApplicationManager { BuMenuItem createProjet_; BuMenuItem launchReflux_; private class FudaaExecLaunchReflux extends FudaaExec { public FudaaExecLaunchReflux() { super(TrResource.getS("Exécuter Reflux")); } /** * @see org.fudaa.fudaa.commun.exec.FudaaExec#execInDir(java.io.File) */ public void execInDir(File _dir) { } /** * @see org.fudaa.fudaa.commun.exec.FudaaExec#execOnFile(java.io.File) */ public void execOnFile(File _target) { TrRefluxProjet.launchCalcul(_target, getImpl()).execute(); } /** * @see org.fudaa.fudaa.commun.exec.FudaaExec#getIcon() */ public Icon getIcon() { return BuResource.BU.getIcon("executer"); } } /** * @param _impl */ public TrRefluxAppliManager(TrImplementation _impl) { super(_impl); } /** * @see org.fudaa.fudaa.tr.TrApplicationManager#buildCmdForMenuFile(com.memoire.bu.BuPopupMenu, * org.fudaa.fudaa.tr.TrExplorer) */ public void buildCmdForMenuFile(BuPopupMenu _m, TrExplorer _explor) { super.buildCmdForMenuFile(_m, _explor); createProject_ = _explor.createFileAction(new FudaaExecCreateProjectH2d(TrResource .getS("Créer projet Reflux"))); launchReflux_ = _explor.createFileAction(new FudaaExecLaunchReflux()); _m.add(createProject_); _m.add(launchReflux_); } /** * @see org.fudaa.fudaa.tr.TrApplicationManager#updateMenuFiles(int, java.io.File) */ public void updateMenuFiles(int _nbFileChoosen, File _f) { super.updateMenuFiles(_nbFileChoosen, _f); createProject_.setEnabled((_nbFileChoosen == 1) && (null != getImpl().getFileFormatMng().isGridExtension(_f.getName()))); launchReflux_.setEnabled((_nbFileChoosen == 1) && (getImpl().getFileFormatMng().isRefluxFile(_f.getName()))); } } Index: TrRefluxProjectFactory.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjectFactory.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TrRefluxProjectFactory.java 12 Feb 2004 16:15:21 -0000 1.7 --- TrRefluxProjectFactory.java 12 Mar 2004 10:16:59 -0000 1.8 *************** *** 15,18 **** --- 15,19 ---- import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.ef.EfGrid; + import org.fudaa.dodico.ef.EfGridSource; import org.fudaa.dodico.ef.EfLib; import org.fudaa.dodico.ef.EfElementType; *************** *** 95,99 **** return null; } ! EfGrid g= (EfGrid)op.getSource(); if ((g.getPtsNb() == 0) || (g.getEltNb() == 0)) { _ui.error(TrResource.getS("Maillage vide")); --- 96,100 ---- return null; } ! EfGrid g= ((EfGridSource)op.getSource()).getGrid(); if ((g.getPtsNb() == 0) || (g.getEltNb() == 0)) { _ui.error(TrResource.getS("Maillage vide")); Index: TrRefluxProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjet.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** TrRefluxProjet.java 10 Mar 2004 09:13:30 -0000 1.19 --- TrRefluxProjet.java 12 Mar 2004 10:17:00 -0000 1.20 *************** *** 25,28 **** --- 25,29 ---- import org.fudaa.dodico.calcul.CalculLauncher; + import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.dico.DicoParams; *************** *** 81,84 **** --- 82,86 ---- } + /** * @see org.fudaa.fudaa.tr.TrProjet#getSoftwareID() *************** *** 263,266 **** --- 265,300 ---- return params_.getTitle(); } + + public static CalculLauncher launchCalcul(final File _f,final TrImplementation _impl){ + FudaaCalculOp op= new FudaaCalculOp(new RefluxExec()) { + public File proceedParamFile(ProgressionInterface _inter) { + return _f; + } + /** + * @return + */ + protected String getTaskName() { + return TrResource.getS("lancement Reflux"); + } + public void actionToDoJustAfterLaunching() { + File out=new File( DodicoLib.getSansExtension(_f.getAbsolutePath())+".out"); + if (!out.exists()) { + try { + Thread.currentThread().sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + if (out.exists()) { + FollowApp app= _impl.getTailFrame(); + app.openFile(out, true, true); + app.getFrame().show(); + } + } + }; + op.setImpl(_impl); + return op; + + } /** * *************** *** 531,533 **** --- 565,576 ---- public void loadAll(ProgressionInterface _inter) {} + /** + * @see org.fudaa.fudaa.tr.TrProjet#applicationPreferencesChanged() + */ + public void applicationPreferencesChanged() { + if(fille_!=null){ + fille_.applicationPreferencesChanged(); + } + } + } Index: TrRefluxImplHelper.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxImplHelper.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** TrRefluxImplHelper.java 10 Mar 2004 09:13:30 -0000 1.12 --- TrRefluxImplHelper.java 12 Mar 2004 10:17:00 -0000 1.13 *************** *** 132,136 **** public TrRefluxImplHelper(TrImplementation _impl) { ! super(new TrApplicationManager(_impl)); } --- 132,136 ---- public TrRefluxImplHelper(TrImplementation _impl) { ! super(new TrRefluxAppliManager(_impl)); } *************** *** 225,227 **** --- 225,229 ---- return _ouvrir(_op, _f, _bu); } + + } Index: TrRefluxFilleProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxFilleProjet.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TrRefluxFilleProjet.java 12 Feb 2004 16:15:21 -0000 1.10 --- TrRefluxFilleProjet.java 12 Mar 2004 10:17:00 -0000 1.11 *************** *** 170,173 **** --- 170,177 ---- return specificComponents_; } + + public void applicationPreferencesChanged(){ + specificComponents_=null; + } private class PrincipalPanel extends BuPanel |
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9271/src/org/fudaa/fudaa/tr/telemac Modified Files: TrTelemacRubensExec.java TrTelemacAppliManager.java TrTelemacImplHelper.java TrTelemacCommunParametres.java TrTelemacCommunProjet.java Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur Index: TrTelemacRubensExec.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacRubensExec.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TrTelemacRubensExec.java 10 Mar 2004 09:13:29 -0000 1.1 --- TrTelemacRubensExec.java 12 Mar 2004 10:16:58 -0000 1.2 *************** *** 9,17 **** package org.fudaa.fudaa.tr.telemac; import org.fudaa.ctulu.CtuluLib; - import org.fudaa.dodico.fichiers.FileFormatSoftware; import org.fudaa.fudaa.commun.exec.FudaaExec; - import org.fudaa.fudaa.commun.exec.FudaaExecAction; - import org.fudaa.fudaa.tr.TrPreferences; --- 9,16 ---- package org.fudaa.fudaa.tr.telemac; + import java.io.File; + import org.fudaa.ctulu.CtuluLib; import org.fudaa.fudaa.commun.exec.FudaaExec; *************** *** 21,25 **** * */ ! public class TrTelemacRubensExec extends FudaaExecAction{ private String[] paramDefault_; --- 20,24 ---- * */ ! public class TrTelemacRubensExec extends FudaaExec{ private String[] paramDefault_; *************** *** 29,41 **** */ public TrTelemacRubensExec() { ! super(FudaaExec.loadFromPref("rubens", TrPreferences.TR, FileFormatSoftware.TELEMAC_IS.name)); ! String id="rubens"; ! if (exec_ == null) { ! if (CtuluLib.DEBUG) CtuluLib.debug("load default exec: " + id); ! setExec(new FudaaExec(id, id, "(intern)appli/" + id)); ! } } --- 28,38 ---- */ public TrTelemacRubensExec() { ! super("rubens", "rubens", "(intern)appli/rubens"); ! reloadFromPref(); } + + *************** *** 50,53 **** --- 47,74 ---- return paramDefault_; } + + + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#getParamForFile(java.io.File) + */ + protected String[] getParamForFile(File _f) { + if(CtuluLib.isFrenchLanguageSelected()){ + return new String[]{_f.getAbsolutePath()}; + } + else + return new String[]{"-a",_f.getAbsolutePath()}; + } + + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#reloadFromPref() + */ + public void reloadFromPref() { + super.reloadFromPref(); + if(getIconURL()==null) setIconURL("(intern)appli/rubens"); + if(getExecCommand()==null) setExecCommand("rubens"); + if(getShownName()==null) setShownName("rubens"); + + } } Index: TrTelemacAppliManager.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacAppliManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TrTelemacAppliManager.java 10 Mar 2004 09:13:29 -0000 1.1 --- TrTelemacAppliManager.java 12 Mar 2004 10:16:58 -0000 1.2 *************** *** 10,28 **** import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; import java.io.File; import java.io.IOException; import com.memoire.bu.BuMenu; import com.memoire.bu.BuMenuItem; import com.memoire.bu.BuPopupMenu; import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.fichiers.FileFormatSoftware; ! import org.fudaa.dodico.telemac.io.SerafinFileFormat; import org.fudaa.fudaa.commun.exec.FudaaExec; ! import org.fudaa.fudaa.commun.exec.FudaaExecAction; import org.fudaa.fudaa.ressource.FudaaResource; import org.fudaa.fudaa.tr.TrApplicationManager; import org.fudaa.fudaa.tr.TrImplementation; import org.fudaa.fudaa.tr.TrPreferences; --- 10,42 ---- import java.awt.event.ActionEvent; ! import java.awt.event.ItemEvent; ! import java.awt.event.ItemListener; import java.io.File; import java.io.IOException; + import javax.swing.Icon; + + import com.memoire.bu.BuBorderLayout; + import com.memoire.bu.BuComboBox; import com.memoire.bu.BuMenu; import com.memoire.bu.BuMenuItem; import com.memoire.bu.BuPopupMenu; + import com.memoire.bu.BuResource; import org.fudaa.ctulu.CtuluLib; + import org.fudaa.dodico.commun.ProgressionInterface; + import org.fudaa.dodico.dico.DicoCasFileFormat; + import org.fudaa.dodico.dico.DicoExec; import org.fudaa.dodico.fichiers.FileFormatSoftware; ! import org.fudaa.dodico.telemac.TelemacDicoManager; ! import org.fudaa.dodico.telemac.io.Telemac2dFileFormat; ! import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; ! import org.fudaa.fudaa.commun.calcul.FudaaCalculOp; import org.fudaa.fudaa.commun.exec.FudaaExec; ! import org.fudaa.fudaa.fdico.FDicoCalculLocal; ! import org.fudaa.fudaa.fdico.FDicoChooserPanel; import org.fudaa.fudaa.ressource.FudaaResource; import org.fudaa.fudaa.tr.TrApplicationManager; + import org.fudaa.fudaa.tr.TrExplorer; import org.fudaa.fudaa.tr.TrImplementation; import org.fudaa.fudaa.tr.TrPreferences; *************** *** 35,42 **** */ public final class TrTelemacAppliManager extends TrApplicationManager { ! private FudaaExecAction matisseExecAction_; ! private FudaaExecAction rubensExec_; ! private BuMenuItem createRubensProject_; /** --- 49,120 ---- */ public final class TrTelemacAppliManager extends TrApplicationManager { + + private class FudaaExecLaunchTelemac extends FudaaExec{ + + /** + * Constructeur par defaut. + */ + public FudaaExecLaunchTelemac(){ + super(TrResource.getS("Exécuter application Télémac")); + } + /** + * @see org.fudaa.fudaa.commun.exec.FudaaExec#execInDir(java.io.File) + */ + public void execInDir(File _dir) { + } ! /** ! * @see org.fudaa.fudaa.commun.exec.FudaaExec#execOnFile(java.io.File) ! */ ! public void execOnFile(File _target) { ! launchCalcul(_target); ! } ! ! /** ! * @see org.fudaa.fudaa.commun.exec.FudaaExec#getIcon() ! */ ! public Icon getIcon() { ! return BuResource.BU.getIcon("executer"); ! } ! ! } ! ! ! protected class FudaaExecCreateProjectRubens extends FudaaExec { ! ! /** ! */ ! public FudaaExecCreateProjectRubens() { ! super("rubens"); ! } ! ! /** ! * @see org.fudaa.fudaa.commun.exec.FudaaExec#execInDir(java.io.File) ! */ ! public void execInDir(File _dir) { ! getRubensExec().execInDir(_dir); ! } ! ! /** ! * @see org.fudaa.fudaa.commun.exec.FudaaExec#execOnFile(java.io.File) ! */ ! public void execOnFile(File _target) { ! TrTelemacAppliManager.this.createRubensProject(_target); ! } ! ! /** ! * @see org.fudaa.fudaa.commun.exec.FudaaExec#getIcon() ! */ ! public Icon getIcon() { ! return getRubensExec().getIcon(); ! } ! } ! ! private FudaaExec matisseExecAction_; ! private FudaaExec rubensExec_; ! // protected BuMenu createProject_; ! protected BuMenuItem createH2dProject_; ! protected BuMenuItem createRubensProject_; ! protected BuMenuItem execTelemac_; /** *************** *** 45,89 **** public TrTelemacAppliManager(TrImplementation _impl) { super(_impl); - getMatisseExec(); } ! private FudaaExecAction getExec(String _id) { ! FudaaExec r = FudaaExec.loadFromPref(_id, TrPreferences.TR, getSoftwareID()); if (r == null) { if (CtuluLib.DEBUG) CtuluLib.debug("load default exec: " + _id); r = new FudaaExec(_id, _id, "(intern)appli/" + _id); } if (r != null) ! return new FudaaExecAction(r); else return null; } /** * @see org.fudaa.fudaa.tr.TrApplicationManager#buildTrItem(com.memoire.bu.BuMenu) */ ! protected synchronized void buildTrItem(BuMenu _m) { BuMenuItem it; if (getRubensExec() != null) { it = new BuMenuItem(); ! it.setAction(rubensExec_); _m.add(it); } if (getMatisseExec() != null) { it = new BuMenuItem(); ! it.setAction(matisseExecAction_); _m.add(it); } ! it = new BuMenuItem(TrResource.getS("Explorateur")); ! it.setActionCommand("EXPLORER"); ! it.addActionListener(this); ! _m.add(it); ! it = new BuMenuItem(TrResource.getS("Meshiew")); ! it.setActionCommand("MESHVIEW"); ! it.addActionListener(this); ! _m.add(it); ! it = new BuMenuItem(TrResource.getS("Console")); ! it.setActionCommand("CONSOLE"); ! it.addActionListener(this); ! _m.add(it); } --- 123,158 ---- public TrTelemacAppliManager(TrImplementation _impl) { super(_impl); } ! private FudaaExec getExec(String _id) { ! FudaaExec r = FudaaExec.loadFromPref(_id); if (r == null) { if (CtuluLib.DEBUG) CtuluLib.debug("load default exec: " + _id); r = new FudaaExec(_id, _id, "(intern)appli/" + _id); } + if (r.getIconURL() == null) r.setIconURL("(intern)appli/" + _id); if (r != null) ! return r; else return null; } /** + * Ajoute les menus pour matisse et rubens. + * * @see org.fudaa.fudaa.tr.TrApplicationManager#buildTrItem(com.memoire.bu.BuMenu) */ ! protected synchronized void buildMainMenuFirstItems(BuMenu _m) { BuMenuItem it; if (getRubensExec() != null) { it = new BuMenuItem(); ! it.setAction(rubensExec_.getAction()); _m.add(it); } if (getMatisseExec() != null) { it = new BuMenuItem(); ! it.setAction(matisseExecAction_.getAction()); _m.add(it); } ! _m.addSeparator(); } *************** *** 98,113 **** /** ! * @see org.fudaa.fudaa.tr.TrApplicationManager#buildCmdForMenuDir(com.memoire.bu.BuPopupMenu, ! * java.awt.event.ActionListener) */ ! public void buildCmdForMenuDir(BuPopupMenu _m, ActionListener _l) { ! BuMenuItem it = new BuMenuItem(null, TrResource.TR.getString("Lancer Rubens")); ! it.setActionCommand("OPEN_RUBENS_IN"); ! it.addActionListener(_l); ! _m.add(it); ! it = new BuMenuItem(null, TrResource.TR.getString("Lancer Matisse")); ! it.setActionCommand("OPEN_MATISSE_IN"); ! it.addActionListener(_l); ! _m.add(it); } --- 167,180 ---- /** ! * @see org.fudaa.fudaa.tr.TrApplicationManager#buildCmdForMenuDir(com.memoire.bu.BuPopupMenu, org.fudaa.fudaa.tr.TrExplorer) */ ! public boolean buildCmdForMenuDir(BuPopupMenu _m, TrExplorer _explorer) { ! if (isRubensActif()) ! _m.add(_explorer.createDirAction(getRubensExec())); ! if (isMatisseActif()) { ! _m.add(_explorer.createDirAction(getMatisseExec())); ! } ! _m.add(super.buildDirMenuItem(_explorer)); ! return true; } *************** *** 116,161 **** */ public void updateMenuFiles(int _nbFileChoosen, File _f) { ! createProject_.setEnabled((_nbFileChoosen == 1) ! && (getImpl().getFileFormatMng().isGridExtension(_f.getName()) == SerafinFileFormat ! .getInstance())); ! createRubensProject_.setEnabled((_nbFileChoosen==1) && (_f.getName().endsWith(".slf"))); } /** * @see org.fudaa.fudaa.tr.TrApplicationManager#buildCmdForMenuFile(com.memoire.bu.BuPopupMenu, ! * java.awt.event.ActionListener) */ ! public void buildCmdForMenuFile(BuPopupMenu _m, ActionListener _l) { ! super.buildCmdForMenuFile(_m,_l); ! createRubensProject_ = new BuMenuItem(null, TrResource.TR.getString("Créer projet Rubens")); ! createRubensProject_.setActionCommand("CREATE_RUBENS_PROJECT"); ! createRubensProject_.addActionListener(_l); ! _m.add(createRubensProject_); ! } ! ! /** ! * @see org.fudaa.fudaa.tr.TrApplicationManager#dirAction(java.lang.String, java.io.File) ! */ ! public void dirAction(String cmd, File _f) { ! if ("OPEN_MATISSE_IN".equals(cmd)) { ! if (this.matisseExecAction_ == null) getMatisseExec(); ! if (this.matisseExecAction_ != null) ! matisseExecAction_.execInDir(_f); ! } ! if ("OPEN_RUBENS_IN".equals(cmd)) { ! if (this.rubensExec_ == null) getRubensExec(); ! if (this.rubensExec_ != null) ! rubensExec_.execInDir(_f); ! } } - /** * @return l'exe pour matisse */ ! public final FudaaExecAction getMatisseExec() { if (!isMatisseActif()) return null; if (matisseExecAction_ == null) { --- 183,227 ---- */ public void updateMenuFiles(int _nbFileChoosen, File _f) { ! super.updateMenuFiles(_nbFileChoosen, _f); ! createH2dProject_.setEnabled(_nbFileChoosen == 1); ! execTelemac_.setEnabled((_nbFileChoosen == 1) && (getImpl().getFileFormatMng().isCasFile(_f.getName()))); } + /** * @see org.fudaa.fudaa.tr.TrApplicationManager#buildCmdForMenuFile(com.memoire.bu.BuPopupMenu, ! * org.fudaa.fudaa.tr.TrExplorer) */ ! public final void buildCmdForMenuFile(BuPopupMenu _m, final TrExplorer _explorer) { ! super.buildCmdForMenuFile(_m, _explorer); ! //Commentaire a considerer lorsque rubens sera de nouveau opérationnel ! /* createProject_ = new BuDynamicMenu(TrResource.getS("Créer projet"), "CREATE_PROJECT") { + public boolean isActive() { + return this.isEnabled(); + } ! public void build() { ! if (getMenuComponentCount() == 0) { ! createH2dProject_ = _explorer.createFileAction(new FudaaExecCreateProjectH2d("Telemac")); ! add(createH2dProject_); ! if (isRubensActif()) { ! createRubensProject_ = _explorer.createFileAction(new FudaaExecCreateProjectRubens()); ! add(createRubensProject_); ! } ! } ! } ! };*/ ! createH2dProject_ = _explorer.createFileAction(new FudaaExecCreateProjectH2d("Créer projet Telemac")); ! _m.add(createH2dProject_); ! execTelemac_=_explorer.createFileAction(new FudaaExecLaunchTelemac()); ! _m.add(execTelemac_); } /** * @return l'exe pour matisse */ ! public final FudaaExec getMatisseExec() { if (!isMatisseActif()) return null; if (matisseExecAction_ == null) { *************** *** 169,173 **** * @return l'exe pour rubens */ ! public FudaaExecAction getRubensExec() { if (!isRubensActif()) return null; if (rubensExec_ == null) rubensExec_ = new TrTelemacRubensExec(); --- 235,239 ---- * @return l'exe pour rubens */ ! public FudaaExec getRubensExec() { if (!isRubensActif()) return null; if (rubensExec_ == null) rubensExec_ = new TrTelemacRubensExec(); *************** *** 208,227 **** /** - * Enregistre dans les prefs l'etat de matisse - */ - public void saveMatisseExec() { - if (matisseExecAction_ != null) - FudaaExec.savePref(matisseExecAction_.getExec(), TrPreferences.TR, getSoftwareID()); - } - - /** - * Enregistre dans les prefs l'état de rubens - */ - public void saveRubensExec() { - if (rubensExec_ != null) - FudaaExec.savePref(rubensExec_.getExec(), TrPreferences.TR, getSoftwareID()); - } - - /** * @param _b le nouvel etat pour l'exe matisse */ --- 274,277 ---- *************** *** 238,286 **** if (!_b) rubensExec_ = null; } ! /** ! * @see org.fudaa.fudaa.tr.TrApplicationManager#fileAction(java.lang.String, java.io.File) ! */ ! public void fileAction(String _cmd, File _f) { ! if("CREATE_RUBENS_PROJECT".equals(_cmd)){ ! createRubensProject(_f); } - else - super.fileAction(_cmd, _f); } ! ! private void createRubensProject(File _f){ ! File parent= _f.getParentFile(); ! if(!parent.canWrite()){ getImpl().error( ! FudaaResource.getS( ! "Le fichier {0} ne peut pas être écrit. Vérifier les droits utilisateur de votre système", ! _f.getAbsolutePath())); return; } ! if(new File(parent,"project.RUB").exists()){ ! if(getImpl().confirmation("Rubens",TrResource.getS("Un projet Rubens existe déjà")+CtuluLib.LINE_SEP+ ! TrResource.getS("Voulez-vous ouvrir rubens dans ce répertoire")+" ?")){ rubensExec_.execInDir(_f); } return; } ! File rubProj=new File(_f,"project.RUB"); ! if(!rubProj.mkdir()){ getImpl().error( ! FudaaResource.getS( ! "Le fichier {0} ne peut pas être écrit. Vérifier les droits utilisateur de votre système", ! rubProj.getAbsolutePath())); return; } ! File bidonFile=new File(rubProj,"bidon.i"); ! try{ ! bidonFile.createNewFile(); } ! catch(IOException e){ e.printStackTrace(); getImpl().error( ! FudaaResource.getS( ! "Le fichier {0} ne peut pas être écrit. Vérifier les droits utilisateur de votre système", ! bidonFile.getAbsolutePath())); } rubensExec_.execInDir(parent); --- 288,362 ---- if (!_b) rubensExec_ = null; } ! ! protected void launchCalcul(final File _f) { ! EbliSimpleDialogPanel pn = new EbliSimpleDialogPanel(); ! pn.setLayout(new BuBorderLayout()); ! BuComboBox cb = new BuComboBox(); ! cb.setModel(FDicoChooserPanel.createModel(TelemacDicoManager.getINSTANCE())); ! cb.setRenderer(FDicoChooserPanel.getDicoCellRenderer()); ! pn.add(cb, BuBorderLayout.NORTH); ! DicoCasFileFormat ft = TelemacDicoManager.getINSTANCE().getFileFormat( ! Telemac2dFileFormat.getInstance().getName()); ! cb.setSelectedItem(ft); ! final FDicoCalculLocal.CalculPanel l = new FDicoCalculLocal.CalculPanel(ft.getLastVersionImpl() ! .getDico().getCodeName(), _f.getAbsolutePath()); ! cb.addItemListener(new ItemListener(){ ! public void itemStateChanged(ItemEvent _e){ ! if(_e.getStateChange()==ItemEvent.SELECTED){ ! l.getExecField().setText(((DicoCasFileFormat)_e.getItem()).getLastVersionImpl().getDico().getCodeName()); ! } ! } ! ! }); ! pn.add(l, BuBorderLayout.CENTER); ! int i=pn.afficheModale(getImpl().getFrame()); ! if(EbliSimpleDialogPanel.isOkResponse(i)){ ! DicoExec dicoExec=new DicoExec(l.getExecField().getText()); ! dicoExec.setLog(l.isLog()); ! FudaaCalculOp f=new FudaaCalculOp(dicoExec){ ! public File proceedParamFile(ProgressionInterface _inter){ ! return _f; ! } ! }; ! f.setImpl(getImpl()); ! f.execute(); } } ! ! protected void createRubensProject(File _f) { ! File parent = _f.getParentFile(); ! if (!parent.canWrite()) { getImpl().error( ! FudaaResource.getS( ! "Le fichier {0} ne peut pas être écrit. Vérifier les droits utilisateur de votre système", ! _f.getAbsolutePath())); return; } ! if (new File(parent, "project.RUB").exists()) { ! if (getImpl().confirmation("Rubens", ! TrResource.getS("Un projet Rubens existe déjà") + CtuluLib.LINE_SEP + ! TrResource.getS("Voulez-vous ouvrir rubens dans ce répertoire") + " ?")) { rubensExec_.execInDir(_f); } return; } ! File rubProj = new File(_f, "project.RUB"); ! if (!rubProj.mkdir()) { getImpl().error( ! FudaaResource.getS( ! "Le fichier {0} ne peut pas être écrit. Vérifier les droits utilisateur de votre système", ! rubProj.getAbsolutePath())); return; } ! File bidonFile = new File(rubProj, "bidon.i"); ! try { ! bidonFile.createNewFile(); } ! catch (IOException e) { e.printStackTrace(); getImpl().error( ! FudaaResource.getS( ! "Le fichier {0} ne peut pas être écrit. Vérifier les droits utilisateur de votre système", ! bidonFile.getAbsolutePath())); } rubensExec_.execInDir(parent); *************** *** 289,292 **** } - } --- 365,367 ---- Index: TrTelemacImplHelper.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacImplHelper.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** TrTelemacImplHelper.java 10 Mar 2004 09:13:29 -0000 1.14 --- TrTelemacImplHelper.java 12 Mar 2004 10:16:58 -0000 1.15 *************** *** 115,127 **** - /** - * @see org.fudaa.fudaa.tr.TrImplHelper#createAppliMng() - */ - protected TrApplicationManager createAppliMng() { - return new TrTelemacAppliManager(getImpl()); - } - - - /** --- 115,118 ---- Index: TrTelemacCommunParametres.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacCommunParametres.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TrTelemacCommunParametres.java 10 Mar 2004 09:13:29 -0000 1.10 --- TrTelemacCommunParametres.java 12 Mar 2004 10:16:58 -0000 1.11 *************** *** 66,69 **** --- 66,84 ---- } + /** + * @return le repertoire contenant le maillage. Si impossible, renvoie le repertoire du projet. + */ + public File getGridBaseDir(){ + DicoEntite entFile= getDicoFileFormatVersion().getMaillageEntiteFile(); + if(entFile!=null){ + String path=getAbsolutePathSet(entFile); + if((path!=null) && (path.length()>0)){ + return new File(path).getParentFile(); + } + } + return getDirBase(); + } + + private synchronized boolean _loadGeometrie(ProgressionInterface _prg) { DicoEntite entFile= getDicoFileFormatVersion().getMaillageEntiteFile(); *************** *** 99,107 **** getDicoFileFormatVersion().getDefaultSerafinFormat().getVariableFond(); int numVariable=-1; ! String name; for(int i=0;i<fond.length;i++){ numVariable= TelemacLib.contientVariable(sInter, fond[i]); if(numVariable>=0){ ! name=fond[i]; numVariable=i; break; --- 114,122 ---- getDicoFileFormatVersion().getDefaultSerafinFormat().getVariableFond(); int numVariable=-1; ! // String name; for(int i=0;i<fond.length;i++){ numVariable= TelemacLib.contientVariable(sInter, fond[i]); if(numVariable>=0){ ! //name=fond[i]; numVariable=i; break; *************** *** 270,289 **** --- 285,322 ---- } + /** + * @see org.fudaa.fudaa.tr.TrParametres#canImportEvolution() + */ public boolean canImportEvolution(){ return params_.isTransientAvailable(); } + /** + * @return le manager des conditions limites + */ public H2dTelemacBcManager getClManager() { return params_.getTelemacCLManager(); } + /** + * @return la version telemac utilisee + */ public TelemacDicoFileFormatVersion getDicoFileFormatVersion() { return (TelemacDicoFileFormatVersion)getFileFormatVersion(); } + /** + * @return le manager des courbes transitoires + */ public H2dEvolutionManager getEvolMng(){ return params_.getEvolMng(); } + /** + * @return le fichier cas + */ public File getFileCas() { return getMainFile(); } + /** + * @see org.fudaa.fudaa.tr.TrParametres#getH2dParametres() + */ public H2dParameters getH2dParametres() { return getTelemacParametres(); *************** *** 292,295 **** --- 325,331 ---- + /** + * @return l'implementation parente + */ public FudaaCommonImplementation getImpl() { return (FudaaCommonImplementation)getUI(); *************** *** 298,301 **** --- 334,338 ---- * Renvoie le maillage. Si nul, il est necessaire de charger * le maillage avec {@link #loadGeometrie(ProgressionInterface) loadGeometrie} + * @return le maillage */ public EfGrid getMaillage() { *************** *** 304,322 **** return params_.getMaillage(); } public H2dTelemacParameters getTelemacParametres() { return params_; } public boolean isAllLoaded() { return isBoundaryConditionLoaded(); } public boolean isBoundaryConditionLoaded() { return dicoParams_.isLoaded(getDicoFileFormatVersion().getCLEntiteFile()); } public boolean isGeometrieLoaded() { return dicoParams_.isLoaded( getDicoFileFormatVersion().getMaillageEntiteFile()); } /** ! * @return true if the parameters corresponding to the entity are loaded. */ public boolean isParametersLoaded(DicoEntite _ent) { --- 341,373 ---- return params_.getMaillage(); } + /** + * @return les parametres telemac + */ public H2dTelemacParameters getTelemacParametres() { return params_; } + /** + * @return true si les conditions limites sont chargees + */ public boolean isAllLoaded() { return isBoundaryConditionLoaded(); } + /** + * @return true si les conditions limites sont chargees + */ public boolean isBoundaryConditionLoaded() { return dicoParams_.isLoaded(getDicoFileFormatVersion().getCLEntiteFile()); } + /** + * @see org.fudaa.fudaa.tr.TrParametres#isGeometrieLoaded() + */ public boolean isGeometrieLoaded() { return dicoParams_.isLoaded( getDicoFileFormatVersion().getMaillageEntiteFile()); } + /** ! * @return true if the parameters corresponding to the entity are loaded. ! * @param _ent l'entite a tester */ public boolean isParametersLoaded(DicoEntite _ent) { *************** *** 325,331 **** --- 376,388 ---- + /** + * @see org.fudaa.fudaa.fdico.FDicoParams#isValide() + */ public boolean isValide() { return super.isValide(); } + /** + * @param _prg le receveur pour la progression + */ public final void loadAll(ProgressionInterface _prg) { if (!isAllLoaded()) { *************** *** 333,336 **** --- 390,396 ---- } } + /** + * @see org.fudaa.fudaa.tr.TrParametres#loadGeometrie(org.fudaa.dodico.commun.ProgressionInterface) + */ public void loadGeometrie(ProgressionInterface _prg) { if (!isGeometrieLoaded()) { Index: TrTelemacCommunProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacCommunProjet.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TrTelemacCommunProjet.java 12 Feb 2004 16:15:22 -0000 1.9 --- TrTelemacCommunProjet.java 12 Mar 2004 10:16:59 -0000 1.10 *************** *** 8,15 **** --- 8,18 ---- */ package org.fudaa.fudaa.tr.telemac; + import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; + import java.util.ArrayList; + import java.util.List; [...1061 lines suppressed...] ! * Charge tous les parametres possibles ! * @see org.fudaa.fudaa.tr.TrProjet#loadAll(org.fudaa.dodico.commun.ProgressionInterface) */ public void loadAll(ProgressionInterface _inter) { *************** *** 510,512 **** --- 644,655 ---- } + /** + * MEt a jour le fenetre interne des mot-clés + * @see org.fudaa.fudaa.tr.TrProjet#applicationPreferencesChanged() + */ + public void applicationPreferencesChanged() { + if (super.entiteFille_ != null) { + super.entiteFille_.applicationPreferencesChanged(); + } + } } \ No newline at end of file |
|
From: <de...@us...> - 2004-03-12 10:36:32
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9271 Modified Files: build.xml Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur Index: build.xml =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/build.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** build.xml 10 Mar 2004 09:13:30 -0000 1.13 --- build.xml 12 Mar 2004 10:17:07 -0000 1.14 *************** *** 374,380 **** ---FUDAA: copie des ressources de ${fudaa.src.dir} ---- ---FUDAA: dans ${fudaa.classes.dir} --- ! </echo> ! ! <copy todir="${fudaa.classes.dir}" verbose="true"> <fileset dir="${fudaa.src.dir}"> <patternset refid="ressources.fic"/> --- 374,379 ---- ---FUDAA: copie des ressources de ${fudaa.src.dir} ---- ---FUDAA: dans ${fudaa.classes.dir} --- ! </echo> ! <copy todir="${fudaa.classes.dir}"> <fileset dir="${fudaa.src.dir}"> <patternset refid="ressources.fic"/> *************** *** 577,581 **** /> ! <delete file="${temp.file}"/> <!-- Suppression de tous les fichiers xml --> <delete> --- 576,580 ---- /> ! <delete file="${temp.file}"/> <!-- Suppression de tous les fichiers xml --> <delete> *************** *** 589,593 **** description="lancement de jdepend sur toutes les sources" > ! <delete dir="${fudaa.check.dir}/depend"/> <mkdir dir="${fudaa.check.dir}/depend"/> <property name="temp.file" value="${fudaa.check.dir}/temp.html"/> --- 588,592 ---- description="lancement de jdepend sur toutes les sources" > ! <delete dir="${fudaa.check.dir}/depend"/> <mkdir dir="${fudaa.check.dir}/depend"/> <property name="temp.file" value="${fudaa.check.dir}/temp.html"/> *************** *** 619,623 **** /> </style> ! <delete file="${temp.file}"/> <!-- Suppression de tous les fichiers xml <delete> --- 618,622 ---- /> </style> ! <delete file="${temp.file}"/> <!-- Suppression de tous les fichiers xml <delete> *************** *** 632,636 **** description="lancement de jdepend sur toutes les sources" > ! <delete dir="${fudaa.check.dir}/depend"/> <mkdir dir="${fudaa.check.dir}/depend"/> <property name="temp.file" value="${fudaa.check.dir}/temp.html"/> --- 631,635 ---- description="lancement de jdepend sur toutes les sources" > ! <delete dir="${fudaa.check.dir}/depend"/> <mkdir dir="${fudaa.check.dir}/depend"/> <property name="temp.file" value="${fudaa.check.dir}/temp.html"/> *************** *** 663,667 **** <report format="frames" todir="${fudaa.check.dir}/junit"/> </junitreport> ! <delete file="${temp.file}"/> <!-- Suppression de tous les fichiers xml --> <delete> --- 662,666 ---- <report format="frames" todir="${fudaa.check.dir}/junit"/> </junitreport> ! <delete file="${temp.file}"/> <!-- Suppression de tous les fichiers xml --> <delete> *************** *** 815,819 **** ---FUDAA:suppression de ${fudaa.build.dir}--- </echo> ! <delete includeEmptyDirs="true" quiet="true"> <fileset dir="${fudaa.build.dir}"/> </delete> --- 814,818 ---- ---FUDAA:suppression de ${fudaa.build.dir}--- </echo> ! <delete includeEmptyDirs="true" quiet="true"> <fileset dir="${fudaa.build.dir}"/> </delete> |
|
From: <de...@us...> - 2004-03-12 10:36:32
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9271/src/org/fudaa/fudaa/ressource Modified Files: fudaa_en.fr_txt Added Files: tail_16.gif tail_20.gif tail_22.gif Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur --- NEW FILE: tail_16.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tail_20.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tail_22.gif --- (This appears to be a binary file; contents omitted.) Index: fudaa_en.fr_txt =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource/fudaa_en.fr_txt,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** fudaa_en.fr_txt 12 Feb 2004 16:15:20 -0000 1.12 --- fudaa_en.fr_txt 12 Mar 2004 10:17:07 -0000 1.13 *************** *** 208,210 **** Vue=View Construction vue=View construction ! Contröles=Controls \ No newline at end of file --- 208,212 ---- Vue=View Construction vue=View construction ! Contrôles=Controls ! Ouvrir avec=Open with ! Exécuter application Télémac=Execute Telemac soft \ No newline at end of file |
|
From: <de...@us...> - 2004-03-12 10:36:32
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/calcul In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9271/src/org/fudaa/fudaa/commun/calcul Modified Files: FudaaCalculAction.java FudaaCalculOp.java Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur Index: FudaaCalculAction.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/calcul/FudaaCalculAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FudaaCalculAction.java 25 Nov 2003 10:13:29 -0000 1.6 --- FudaaCalculAction.java 12 Mar 2004 10:17:06 -0000 1.7 *************** *** 9,19 **** package org.fudaa.fudaa.commun.calcul; import java.awt.event.ActionEvent; ! import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.JPanel; import com.memoire.bu.BuButton; import com.memoire.bu.BuButtonLayout; import com.memoire.bu.BuPanel; import com.memoire.bu.BuResource; import org.fudaa.dodico.calcul.CalculLauncher; import org.fudaa.dodico.calcul.CalculListener; --- 9,21 ---- package org.fudaa.fudaa.commun.calcul; import java.awt.event.ActionEvent; ! import javax.swing.Action; import javax.swing.JPanel; + import com.memoire.bu.BuButton; import com.memoire.bu.BuButtonLayout; import com.memoire.bu.BuPanel; import com.memoire.bu.BuResource; + import org.fudaa.dodico.calcul.CalculLauncher; import org.fudaa.dodico.calcul.CalculListener; Index: FudaaCalculOp.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/calcul/FudaaCalculOp.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FudaaCalculOp.java 12 Dec 2003 10:58:41 -0000 1.7 --- FudaaCalculOp.java 12 Mar 2004 10:17:06 -0000 1.8 *************** *** 80,84 **** exe_.setUI(impl_); exe_.setProgression(_progress); ! exe_.launch(f, this); actionToDoJustAfterLaunching(); setEtat( --- 80,90 ---- exe_.setUI(impl_); exe_.setProgression(_progress); ! try{ ! exe_.launch(f, this); ! } ! catch(RuntimeException e){ ! impl_.error(exe_.toString(),e.getMessage()); ! } ! actionToDoJustAfterLaunching(); setEtat( |
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource/appli In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9271/src/org/fudaa/fudaa/ressource/appli Added Files: rubens_22.gif matisse_26.gif matisse_22.gif rubens_26.gif rubens_16.gif matisse_16.gif Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur --- NEW FILE: rubens_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: matisse_26.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: matisse_22.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rubens_26.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rubens_16.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: matisse_16.gif --- (This appears to be a binary file; contents omitted.) |
|
From: <de...@us...> - 2004-03-12 10:36:16
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9059/src/org/fudaa/dodico/dico Modified Files: DicoExec.java DicoParams.java Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur Index: DicoExec.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoExec.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DicoExec.java 11 Dec 2003 12:41:26 -0000 1.5 --- DicoExec.java 12 Mar 2004 10:16:11 -0000 1.6 *************** *** 9,18 **** package org.fudaa.dodico.dico; import java.io.File; ! import java.util.ArrayList; ! import com.memoire.bu.BuResource; ! import com.memoire.fu.FuLib; import org.fudaa.dodico.calcul.CalculExec; - import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPreferences; import org.fudaa.dodico.commun.DodicoUI; /** --- 9,17 ---- package org.fudaa.dodico.dico; import java.io.File; ! ! import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.calcul.CalculExec; import org.fudaa.dodico.commun.DodicoPreferences; + import org.fudaa.dodico.commun.DodicoResource; import org.fudaa.dodico.commun.DodicoUI; /** *************** *** 62,64 **** --- 61,70 ---- log_= _b; } + /** + * @see java.lang.Object#toString() + */ + public String toString() { + return DodicoResource.getS("Exécutable"+CtuluLib.ESPACE+execName_); + } + } Index: DicoParams.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoParams.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** DicoParams.java 12 Feb 2004 15:32:43 -0000 1.16 --- DicoParams.java 12 Mar 2004 10:16:11 -0000 1.17 *************** *** 51,55 **** DicoCasInterface _i, DicoCasFileFormatVersionAbstract _dico) { ! this(_i.getInputs(), _i.getComments(), _dico); } /** --- 51,55 ---- DicoCasInterface _i, DicoCasFileFormatVersionAbstract _dico) { ! this(_i==null?null:_i.getInputs(),_i==null?null: _i.getComments(), _dico); } /** *************** *** 60,66 **** Map _keysCommentaire, DicoCasFileFormatVersionAbstract _dico) { - entitesValues_= (_inits == null ? new Hashtable() : new Hashtable(_inits)); ft_= _dico; casFileEntite_= ft_.getFichierPrincipalEntite(); if (casFileEntite_ != null) { entitesValues_.remove(casFileEntite_); --- 60,66 ---- Map _keysCommentaire, DicoCasFileFormatVersionAbstract _dico) { ft_= _dico; casFileEntite_= ft_.getFichierPrincipalEntite(); + entitesValues_= (_inits == null ? new Hashtable() : new Hashtable(_inits)); if (casFileEntite_ != null) { entitesValues_.remove(casFileEntite_); *************** *** 72,75 **** --- 72,76 ---- if (_keysCommentaire != null) entitesCommentaires_= new Hashtable(_keysCommentaire); + } public int getEntiteFileNb() { |
|
From: <de...@us...> - 2004-03-12 10:36:15
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9059/src/org/fudaa/dodico/reflux Modified Files: RefluxExec.java Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur Index: RefluxExec.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/RefluxExec.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RefluxExec.java 11 Dec 2003 12:41:28 -0000 1.4 --- RefluxExec.java 12 Mar 2004 10:16:10 -0000 1.5 *************** *** 8,18 **** */ package org.fudaa.dodico.reflux; import java.io.File; - import java.util.Arrays; - import java.util.List; import com.memoire.fu.FuLib; import org.fudaa.dodico.calcul.CalculExec; - import org.fudaa.dodico.calcul.CalculLauncher; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoUI; /** --- 8,19 ---- */ package org.fudaa.dodico.reflux; + import java.io.File; import com.memoire.fu.FuLib; + + import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.calcul.CalculExec; import org.fudaa.dodico.commun.DodicoLib; + import org.fudaa.dodico.commun.DodicoResource; import org.fudaa.dodico.commun.DodicoUI; /** *************** *** 21,53 **** */ public class RefluxExec extends CalculExec { public RefluxExec() { setChangeWorkingDirectory(true); setLauchInNewTerm(true); } /** ! * */ public String[] getLaunchCmd( ! File _paramsFile, ! DodicoUI _ui) { ! String[] param= ! new String[] { DodicoLib.getSansExtension(_paramsFile.getName())}; ! if (FuLib.isWindows()) ! return CalculExec.manageLauncher( ! "reflux", ! "reflux.exe", ! "reflux-launch.tpl.bat", ! "reflux-launch.bat", ! param, ! _ui); ! else if (FuLib.isLinux()) ! return CalculExec.manageLauncher( ! "reflux", ! "reflux-Linux.x", ! "reflux-launch.tpl.sh", ! "reflux-launch.sh", ! param, ! _ui); return null; } } --- 22,73 ---- */ public class RefluxExec extends CalculExec { + public RefluxExec() { setChangeWorkingDirectory(true); setLauchInNewTerm(true); } + /** ! * * */ public String[] getLaunchCmd( ! File _paramsFile, ! DodicoUI _ui) { ! String[] param = ! new String[] { DodicoLib.getSansExtension(_paramsFile.getName())}; ! if (FuLib.isWindows()) { ! File launcher = CalculExec.manageLauncher( ! "reflux", ! "reflux.exe", ! "reflux-launch.tpl.bat", ! "reflux-launch.bat", ! _ui); ! File f = new File("serveurs/reflux/reflux-project.tpl.bat"); ! File dest = new File(_paramsFile.getParentFile(), "reflux-" ! + DodicoLib.getSansExtension(_paramsFile.getName()) + ".bat"); ! if (!DodicoLib.replaceAndCopyFile(f, dest, "@reflux-bat@", launcher.getAbsolutePath(), ! "@project@", DodicoLib.getSansExtension(_paramsFile.getName()))) { ! _ui.error( ! "Copie de fichier", ! "Erreur lors de la copie de " + f); ! return null; ! } ! return new String[] {dest.getAbsolutePath()}; ! } ! else if (FuLib.isLinux()) ! return new String[]{CalculExec.manageLauncher( ! "reflux", ! "reflux-Linux.x", ! "reflux-launch.tpl.sh", ! "reflux-launch.sh", ! _ui).getAbsolutePath(),_paramsFile.getAbsolutePath()}; return null; } + /** + * @see java.lang.Object#toString() + */ + public String toString() { + return DodicoResource.getS("Exécutable"+CtuluLib.ESPACE+"reflux"); + } + } |
|
From: <de...@us...> - 2004-03-12 10:35:40
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9059/src/org/fudaa/dodico/objet Modified Files: CExec.java RequeteServeurDodico.java Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur Index: CExec.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/CExec.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CExec.java 12 Dec 2003 10:30:54 -0000 1.9 --- CExec.java 12 Mar 2004 10:16:13 -0000 1.10 *************** *** 16,19 **** --- 16,20 ---- import org.fudaa.ctulu.CtuluLib; + import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoResource; /** *************** *** 148,153 **** if (CtuluLib.DEBUG) System.out.println("lancement processus"); ! if (execDirectory_ != null) p= Runtime.getRuntime().exec(cmd_,null, execDirectory_); else p= Runtime.getRuntime().exec(cmd_); --- 149,157 ---- if (CtuluLib.DEBUG) System.out.println("lancement processus"); ! if (execDirectory_ != null){ ! DodicoLib.printStringArray(cmd_); p= Runtime.getRuntime().exec(cmd_,null, execDirectory_); + } + else p= Runtime.getRuntime().exec(cmd_); Index: RequeteServeurDodico.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/RequeteServeurDodico.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RequeteServeurDodico.java 25 Nov 2003 10:11:46 -0000 1.7 --- RequeteServeurDodico.java 12 Mar 2004 10:16:13 -0000 1.8 *************** *** 219,225 **** } catch (Exception e) { e.printStackTrace(); - } finally { - return stringArray(v); } } /** --- 219,224 ---- } catch (Exception e) { e.printStackTrace(); } + return stringArray(v); } /** |
|
From: <de...@us...> - 2004-03-12 10:35:40
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/calcul In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9059/src/org/fudaa/dodico/calcul Modified Files: CalculExec.java Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur Index: CalculExec.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/CalculExec.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CalculExec.java 12 Dec 2003 10:30:52 -0000 1.5 --- CalculExec.java 12 Mar 2004 10:16:13 -0000 1.6 *************** *** 8,18 **** */ package org.fudaa.dodico.calcul; import java.io.File; import java.io.PrintStream; - import org.fudaa.ctulu.CtuluLib; - import com.memoire.fu.FuLib; - import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPreferences; --- 8,16 ---- */ package org.fudaa.dodico.calcul; + import java.io.File; import java.io.PrintStream; import org.fudaa.ctulu.CtuluLib; import com.memoire.fu.FuLib; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPreferences; *************** *** 23,58 **** import org.fudaa.dodico.objet.CExecListener; /** ! * Classe permettant d'utiliser facilement la classe Cexec et de creer ! * des fichiers de lancement. * @author deniger * @version $Id$ */ public abstract class CalculExec { ! PrintStream outError_; ! PrintStream outStandard_; ProgressionInterface progress_; ! DodicoUI ui_; ! String pathForExec_; ! boolean changeWorkingDirectory_; ! boolean launchInNewTerm_; ! String exec_; public CalculExec() { ! outError_= System.err; ! outStandard_= System.out; } public void launch(File _f, CExecListener _l) { ! if (ui_ == null) ! ui_= DodicoUIDefault.INSTANCE; ! String[] cmd=getLaunchCmd(_f, ui_); ! if(launchInNewTerm_) cmd=getCmdWithNewTermCmd(cmd); ! CExec ex= new CExec(cmd); ! ex.setCatchExceptions(true); if (changeWorkingDirectory_) { ex.setExecDirectory(_f.getParentFile()); } ! // if (pathForExec_ != null){ ! // Runtime.getRuntime(); ! // ex.setEnvVariable(new String[] { "PATH=" + pathForExec_ }); ! // } ex.setErrStream(outError_); --- 21,60 ---- import org.fudaa.dodico.objet.CExecListener; /** ! * Classe permettant d'utiliser facilement la classe Cexec et de creer des fichiers de lancement. ! * * @author deniger * @version $Id$ */ public abstract class CalculExec { ! ! PrintStream outError_; ! PrintStream outStandard_; ProgressionInterface progress_; ! DodicoUI ui_; ! String pathForExec_; ! boolean changeWorkingDirectory_; ! boolean launchInNewTerm_; ! String exec_; ! public CalculExec() { ! outError_ = System.err; ! outStandard_ = System.out; } + public void launch(File _f, CExecListener _l) { ! if (ui_ == null) ! ui_ = DodicoUIDefault.INSTANCE; ! String[] cmd = getLaunchCmd(_f, ui_); ! if (launchInNewTerm_) cmd = getCmdWithNewTermCmd(cmd); ! DodicoLib.printStringArray(cmd); ! CExec ex = new CExec(cmd); ! ex.setCatchExceptions(false); if (changeWorkingDirectory_) { ex.setExecDirectory(_f.getParentFile()); } ! // if (pathForExec_ != null){ ! // Runtime.getRuntime(); ! // ex.setEnvVariable(new String[] { "PATH=" + pathForExec_ }); ! // } ex.setErrStream(outError_); *************** *** 73,187 **** } } public String[] getTermCmd() { if (FuLib.isWindows()) { if (FuLib.getSystemProperty("os.name").indexOf("9") > 0) { ! String[] r= new String[2]; ! r[0]= "command.com"; ! r[1]= "/C"; return r; } ! String[] r= new String[2]; ! r[0]= "cmd.exe"; ! r[1]= "/C"; return r; } ! String[] r= new String[2]; ! r[0]= "xterm"; ! r[1]= "-e"; return r; } public String[] getCmdWithNewTermCmd(String[] _cmd) { ! StringBuffer s= new StringBuffer(_cmd.length * 10); ! int n= _cmd.length; ! s.append(_cmd); ! for (int i= 1; i < n; i++) { ! s.append(CtuluLib.ESPACE).append(_cmd); } ! String cmd= ! DodicoPreferences.DODICO.getStringProperty("cexec.term.launch", null); ! if (cmd != null) { ! String[] init= DodicoLib.parseString(cmd, CtuluLib.ESPACE); ! int nInit= init.length; ! String[] r= new String[nInit + 1]; ! System.arraycopy(init, 0, r, 0, nInit); ! r[nInit]= s.toString(); ! return r; } ! String[] deb=getTermCmd(); ! if(FuLib.isLinux() || FuLib.isUnix()){ ! s.append("sh -c"); } ! String[] r=new String[deb.length+_cmd.length]; System.arraycopy(deb, 0, r, 0, deb.length); ! System.arraycopy(_cmd, 0, r, deb.length, _cmd.length); return r; } public abstract String[] getLaunchCmd( ! File _paramsFile, ! DodicoUI _ui); /** ! * Permet de creer (si necessaire) un launcher special pour le code ! * <code>_serveurName</code>. A partir d'un template ! * (le fichier serveur/<code>_launchertplFile</code>) ! * cree un launcher <code>_launcherFile</code> qui pourra ! * lancer l'executable <code>_exeFile</code> depuis n'importe quel ! * dossier. Le calculManager ne sert qu'a recuperer les erreurs. ! * Voir le serveur reflux pour exemple. ! * @return renvoie un tableau du type [_launchFile,_launcherArgs[0],_launcherArgs[i],...] * */ ! public static String[] manageLauncher( ! String _serveurName, ! String _exeFile, ! String _launchtplFile, ! String _launchFile, ! String[] _launcherArgs, ! DodicoUI _ui) { ! File serveurDir= new File("serveurs/" + _serveurName + "/"); ! File launchFile= new File(serveurDir, _launchFile); ! File in= new File(serveurDir, _launchtplFile); ! if (!launchFile.exists() || (in.lastModified()>launchFile.lastModified())) { ! ! File serveur= new File(serveurDir, _exeFile); ! String newToken= serveur.getAbsolutePath(); if (!DodicoLib.replaceAndCopyFile(in, launchFile, "@exe@", newToken)) { _ui.error( ! "Copie de fichier", ! "Erreur lors de la copie de " + _launchtplFile); } } ! int n= _launcherArgs == null ? 0 : _launcherArgs.length; ! String[] r= new String[1 + n]; ! r[0]= launchFile.getAbsolutePath(); ! for (int i= 0; i < n; i++) { ! r[i + 1]= _launcherArgs[i]; ! } ! return r; } /** ! * */ public PrintStream getOutError() { return outError_; } /** ! * */ public PrintStream getOutStandard() { return outStandard_; } /** ! * */ public void setOutError(PrintStream _writer) { ! outError_= _writer; } /** ! * */ public void setOutStandard(PrintStream _writer) { ! outStandard_= _writer; } /** * @return --- 75,186 ---- } } + public String[] getTermCmd() { if (FuLib.isWindows()) { if (FuLib.getSystemProperty("os.name").indexOf("9") > 0) { ! String[] r = new String[2]; ! r[0] = "command.com"; ! r[1] = "/C"; return r; } ! String[] r = new String[2]; ! r[0] = "cmd.exe"; ! r[1] = "/C"; return r; } ! String[] r = new String[2]; ! r[0] = "xterm"; ! r[1] = "-e"; return r; } + public String[] getCmdWithNewTermCmd(String[] _cmd) { ! StringBuffer s = new StringBuffer(_cmd.length * 10); ! int n = _cmd.length; ! if (FuLib.isLinux() || FuLib.isUnix()) { ! s.append("sh -c "); } ! s.append(_cmd[0]); ! for (int i = 1; i < n; i++) { ! s.append(CtuluLib.ESPACE).append(_cmd[i]); } ! String cmd = ! DodicoPreferences.DODICO.getStringProperty("cexec.term.launch", null); ! String[] deb=null; ! if (cmd != null) { ! String[] init = DodicoLib.parseString(cmd, CtuluLib.ESPACE); ! int nInit = init.length; ! deb = new String[nInit + 1]; ! System.arraycopy(init, 0, deb, 0, nInit); } ! if(deb==null) deb = getTermCmd(); ! String[] r = new String[deb.length + 1]; System.arraycopy(deb, 0, r, 0, deb.length); ! r[r.length - 1] = "\""+s.toString()+"\""; return r; } + public abstract String[] getLaunchCmd( ! File _paramsFile, ! DodicoUI _ui); /** ! * Permet de creer (si necessaire) un launcher special pour le code <code>_serveurName</code>. ! * A partir d'un template (le fichier serveur/ <code>_launchertplFile</code>) cree un launcher ! * <code>_launcherFile</code> qui pourra lancer l'executable <code>_exeFile</code> depuis ! * n'importe quel dossier. Le calculManager ne sert qu'a recuperer les erreurs. Voir le serveur ! * reflux pour exemple. * + * @return renvoie un tableau du type [_launchFile,_launcherArgs[0],_launcherArgs[i],...] */ ! public static File manageLauncher( ! String _serveurName, ! String _exeFile, ! String _launchtplFile, ! String _launchFile, ! DodicoUI _ui) { ! File serveurDir = new File("serveurs/" + _serveurName + "/"); ! File launchFile = new File(serveurDir, _launchFile); ! File in = new File(serveurDir, _launchtplFile); ! if (!launchFile.exists() || (in.lastModified() > launchFile.lastModified())) { ! File serveur = new File(serveurDir, _exeFile); ! String newToken = serveur.getAbsolutePath(); if (!DodicoLib.replaceAndCopyFile(in, launchFile, "@exe@", newToken)) { _ui.error( ! "Copie de fichier", ! "Erreur lors de la copie de " + _launchtplFile); } } ! return launchFile; } + /** ! * * */ public PrintStream getOutError() { return outError_; } + /** ! * * */ public PrintStream getOutStandard() { return outStandard_; } + /** ! * * */ public void setOutError(PrintStream _writer) { ! outError_ = _writer; } + /** ! * * */ public void setOutStandard(PrintStream _writer) { ! outStandard_ = _writer; } + /** * @return *************** *** 190,199 **** return progress_; } /** * @param _interface */ public void setProgression(ProgressionInterface _interface) { ! progress_= _interface; } /** * @return --- 189,200 ---- return progress_; } + /** * @param _interface */ public void setProgression(ProgressionInterface _interface) { ! progress_ = _interface; } + /** * @return *************** *** 202,247 **** return ui_; } /** * @param _dodicoUI */ public void setUI(DodicoUI _dodicoUI) { ! if (_dodicoUI != null) ! ui_= _dodicoUI; } /** ! * */ public boolean isChangeWorkingDirectory() { return changeWorkingDirectory_; } /** ! * */ public boolean isLauchInNewTerm() { return launchInNewTerm_; } /** ! * */ public String getPathForExec() { return pathForExec_; } /** ! * */ public void setChangeWorkingDirectory(boolean _b) { ! changeWorkingDirectory_= _b; } /** ! * */ public void setLauchInNewTerm(boolean _b) { ! launchInNewTerm_= _b; } /** ! * */ public void setPathForExec(String _string) { ! pathForExec_= _string; } } --- 203,255 ---- return ui_; } + /** * @param _dodicoUI */ public void setUI(DodicoUI _dodicoUI) { ! if (_dodicoUI != null) ! ui_ = _dodicoUI; } + /** ! * * */ public boolean isChangeWorkingDirectory() { return changeWorkingDirectory_; } + /** ! * * */ public boolean isLauchInNewTerm() { return launchInNewTerm_; } + /** ! * * */ public String getPathForExec() { return pathForExec_; } + /** ! * * */ public void setChangeWorkingDirectory(boolean _b) { ! changeWorkingDirectory_ = _b; } + /** ! * * */ public void setLauchInNewTerm(boolean _b) { ! launchInNewTerm_ = _b; } + /** ! * * */ public void setPathForExec(String _string) { ! pathForExec_ = _string; } } |
|
From: <de...@us...> - 2004-03-12 10:35:40
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9059/src/org/fudaa/dodico/telemac Modified Files: TelemacDicoManager.java Log Message: Correction bufg EbliFlles... Ajout commentaire tr Finalisation superviseur Index: TelemacDicoManager.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/TelemacDicoManager.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** TelemacDicoManager.java 12 Dec 2003 10:30:54 -0000 1.15 --- TelemacDicoManager.java 12 Mar 2004 10:16:13 -0000 1.16 *************** *** 11,15 **** import org.fudaa.ctulu.CtuluLib; - import org.fudaa.dodico.dico.DicoCasFileFormat; import org.fudaa.dodico.dico.DicoCasFileFormatVersion; --- 11,14 ---- |
