babeldoc-devel — Babeldoc developer list

Re: [Babeldoc-devel] JMS Scanner

[Bill H. <Bil...@Ac...>]

The JMS scanner that is in 1.1.9 seems to look in a queue and seems to be set up to do 
so based on the doScan() call (from ScannerWorker?).  I'm not sure this will work, as my 
queue will discard messages for which there is no active receiver when the message 
arrives.

In any case, what I really need is a persistent queue and a durable consumer for the 
pub/sub type of JMS queue, so I've taken JMS Scanner and written a new 
JmsTopicScanner that takes a config file to identify the topic, persistent/non-persistent, 
and durable/non-durable consumer. (as well as other config requirements).

I've currently put it under scanner rather than j2ee, as I was not sure about whether the 
j2ee stuff had to run as EJB's under an app server and wanted to avoid that, so I just put 
it into the standard scanner package. I can change that later based on your preferences.

Anyway, it is beginning to run, and ScannerWorker seems to find it based on the 
ScannerWorker.config file, but I need some pointers about who's in control.

Based on my (so far ligh)t reading of the code, ScannerWorker calls the scanner 
doScan() method based on a time setting.  However, what I want is that the scanner is a 
registered JMS consumer that gets a onMessage(message) call-back (from JMS) when 
a message arrives, and then it will process the message and enqueue it.  Thus, no 
doScan() required.  Is there a control issue here?  Can I make ScannerWorker wait 
forever?

Thanks,

Bill







On 11 Sep 2003 at 19:09, Bruce McDonald wrote:

> No real documentation - I would appreciate if you could add the
> necessary  config options descriptions.
> 
> On Wednesday 10 September 2003 06:37 pm, Bill Harrelson wrote:
> > Yep,  it's there, silly me, I was looking in babeldoc-scanners.jar.
> >
> > Thanks,
> >
> > Bill
> >
> > (is there doc. for it, or do I need to download the source and read
> > that?)
> >
> > On 10 Sep 2003 at 14:06, McDonald, Bruce wrote:
> > > Its not in 1.1.9????  Check in the j2ee module.
> > >
> > > -----Original Message-----
> > > From: Bill Harrelson [mailto:Bil...@Ac...]
> > > Sent: Wednesday, September 10, 2003 11:38 AM
> > > To: Bab...@li...
> > > Subject: [Babeldoc-devel] JMS Scanner
> > >
> > >
> > > I think I remember that someone on the development list was
> > > writing a JMS scanner and JMS writer, and I'm about to need one.
> > >
> > > I've been playing around with 1.1.9, but I don't find it in there.
> > > Has it been checked in?  Is it available?  Do I need to write it?
> > >
> > > Thanks,
> > >
> > > Bill
> > >
> > >
> > >
> > > -------------------------------------------------------
> > > This sf.net email is sponsored by:ThinkGeek
> > > Welcome to geek heaven.
> > > http://thinkgeek.com/sf
> > > _______________________________________________
> > > Babeldoc-devel mailing list
> > > Bab...@li...
> > > https://lists.sourceforge.net/lists/listinfo/babeldoc-devel

[Babeldoc-devel] Running a transformation without the command line

[<Wil...@co...>]

I really like the flat file handling and was wondering in general if it's
possible to strip out any particular module and run it on it's own without
loading and saving files to disk or using the command line.  I'd like to be
able to take a file that was submitted via  a browser and do a file
translation.  Can you point me in the right direction in the code where I
might be able to plug into the babeldoc framework?   So I'm thinking
something like a class that takes a string (the csv input) and returns a
string (the xml response) rather than providing a file name.  I'm just
starting to look at the source code and could figure this out eventually
but I thought I'd ask the experts to get a head start!

Thanks

---------------------------------------------------
Will Kriski, M.Sc, P.Eng.
DeltaEffects Inc.
(403) 850-7159
http://www.deltaeffects.com

[Babeldoc-devel] Configuration file on classpath (J2EE integration)

[Walt Teh-M. Y. <wal...@as...>]

Hi,

I'm trying to get Babeldoc 1.1.9-dev to work in a J2EE web project.
However it doesn't seem to pick up custom configuration files that I put
under WEB-INF/classes.  I successfully integrated the stable version
(1.0.2) to the project by supplying configuration files in the classpath
under WEB-INF/classes and it does pick up and initialises itself
properly.

After looking into the source, it seems like
getN_MatchingUrlsInSearchPath() in com.babeldoc.core.ResourceLoader
always adds the classpath to the end of the search path.  If I
understand the source correctly, this means the configuration files in
the classpath are considered the *most general* and will be overridden
subsequently if the same configuration options are found in the jar
files.  And as the core jar includes a set of default configuration
files, it seems impossible to override those defaults by supplying
configuration files at the classpath.

I wonder if someone could explain why the classpath is added after all
modules search paths.

Ps/ I'm aware that by setting the system property babeldoc.user, I'll be
able to override the default configuration.  But I'd like to be able to
do it from the classpath where possible.

-- Walt

[Babeldoc-devel] babeldoc/modules/conversion/src/com/babeldoc/conversion/flatfile/digester DigesterConversionUnmarshaller.java,1.2,1.3

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/flatfile/digester
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/conversion/src/com/babeldoc/conversion/flatfile/digester

Modified Files:
	DigesterConversionUnmarshaller.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: DigesterConversionUnmarshaller.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/flatfile/digester/DigesterConversionUnmarshaller.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DigesterConversionUnmarshaller.java	7 Aug 2003 21:09:02 -0000	1.2
--- DigesterConversionUnmarshaller.java	16 Sep 2003 05:19:00 -0000	1.3
***************
*** 74,78 ****
  
  import org.apache.commons.digester.Digester;
! import org.apache.commons.lang.NumberUtils;
  
  import org.xml.sax.SAXException;
--- 74,78 ----
  
  import org.apache.commons.digester.Digester;
! import org.apache.commons.lang.math.NumberUtils;
  
  import org.xml.sax.SAXException;

[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core BabeldocCommand.java,1.16,1.17 ResourceLoader.java,1.7,1.8

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/core/src/com/babeldoc/core

Modified Files:
	BabeldocCommand.java ResourceLoader.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: BabeldocCommand.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/BabeldocCommand.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** BabeldocCommand.java	12 Aug 2003 00:28:29 -0000	1.16
--- BabeldocCommand.java	16 Sep 2003 05:19:00 -0000	1.17
***************
*** 267,274 ****
  	public void setupShutdownHook() {
  		/**
! 		 * TODO: DOCUMENT ME!
! 		 *
! 		 * @author $author$
! 		 * @version $Revision$
  		 */
  		class ShutMeDownNicely extends Thread {
--- 267,271 ----
  	public void setupShutdownHook() {
  		/**
! 		 * Thread class that will be executed when this command shutsdown.
  		 */
  		class ShutMeDownNicely extends Thread {
***************
*** 286,290 ****
  
  			/**
! 			 * TODO: DOCUMENT ME!
  			 */
  			public void run() {
--- 283,287 ----
  
  			/**
! 			 * shut down the command by calling finishUp
  			 */
  			public void run() {

Index: ResourceLoader.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/ResourceLoader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ResourceLoader.java	8 Jul 2003 02:46:50 -0000	1.7
--- ResourceLoader.java	16 Sep 2003 05:19:00 -0000	1.8
***************
*** 301,305 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
     * @param args DOCUMENT ME!
--- 301,305 ----
  
    /**
!    * Simple tester
     *
     * @param args DOCUMENT ME!

[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/journal/command JournalCommand.java,1.5,1.6

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/command
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/core/src/com/babeldoc/core/journal/command

Modified Files:
	JournalCommand.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: JournalCommand.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/command/JournalCommand.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JournalCommand.java	19 Jul 2003 15:32:27 -0000	1.5
--- JournalCommand.java	16 Sep 2003 05:19:00 -0000	1.6
***************
*** 398,404 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param qts DOCUMENT ME!
     */
    protected void renderQueryTickets(QueryTicket[] qts) {
--- 398,404 ----
  
    /**
!    * Query the journal and render the results
     *
!    * @param qts The tickets to query
     */
    protected void renderQueryTickets(QueryTicket[] qts) {

[Babeldoc-devel] babeldoc/modules/core/lib commons-lang.jar,1.1.1.1,1.2 versions,1.4,1.5

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/core/lib

Modified Files:
	commons-lang.jar versions 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: commons-lang.jar
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/lib/commons-lang.jar,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
Binary files /tmp/cvspEx0dA and /tmp/cvsA4BpW1 differ

Index: versions
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/lib/versions,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** versions	6 Aug 2003 23:33:05 -0000	1.4
--- versions	16 Sep 2003 05:19:00 -0000	1.5
***************
*** 5,8 ****
--- 5,10 ----
  Jakarta:commons-discovery.jar:0.2.0
  Jakarta:commons-httpclient.jar:2.0beta1
+ Jakarta:commons-lang.jar:2.0
+ 
  
  Apache:xalan.jar:2.5.1

[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester Connection.java,1.4,1.5 DigesterPipelineUnmarshaller.java,1.6,1.7 Dynamic.java,1.4,1.5 Option.java,1.4,1.5 Pipeline.java,1.4,1.5 StageInst.java,1.4,1.5

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/core/src/com/babeldoc/core/pipeline/xml/digester

Modified Files:
	Connection.java DigesterPipelineUnmarshaller.java Dynamic.java 
	Option.java Pipeline.java StageInst.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: Connection.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/Connection.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Connection.java	12 Aug 2003 23:44:44 -0000	1.4
--- Connection.java	16 Sep 2003 05:19:01 -0000	1.5
***************
*** 79,85 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param sink DOCUMENT ME!
     */
    public void setSink(String sink) {
--- 79,85 ----
  
    /**
!    * Set the sink stage
     *
!    * @param sink stage as a sink
     */
    public void setSink(String sink) {
***************
*** 88,94 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getSink() {
--- 88,92 ----
  
    /**
!    * @return get the sink stage
     */
    public String getSink() {
***************
*** 97,103 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param source DOCUMENT ME!
     */
    public void setSource(String source) {
--- 95,101 ----
  
    /**
!    * Set the source stage
     *
!    * @param source the source stage
     */
    public void setSource(String source) {
***************
*** 106,112 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getSource() {
--- 104,108 ----
  
    /**
!    * @return get the source stage
     */
    public String getSource() {

Index: DigesterPipelineUnmarshaller.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/DigesterPipelineUnmarshaller.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DigesterPipelineUnmarshaller.java	12 Aug 2003 23:44:44 -0000	1.6
--- DigesterPipelineUnmarshaller.java	16 Sep 2003 05:19:01 -0000	1.7
***************
*** 77,82 ****
  import java.io.InputStream;
  
- import java.util.ArrayList;
  import java.util.Iterator;
  
  
--- 77,82 ----
  import java.io.InputStream;
  
  import java.util.Iterator;
+ import java.util.Collection;
  
  
***************
*** 143,147 ****
    public com.babeldoc.core.pipeline.PipelineStageConnection[] getPipelineStageConnections() {
      try {
!       ArrayList connections = pipeline.getDynamic().getConnections();
        com.babeldoc.core.pipeline.PipelineStageConnection[] pstageConnections = new com.babeldoc.core.pipeline.PipelineStageConnection[connections.size()];
        int count = 0;
--- 143,147 ----
    public com.babeldoc.core.pipeline.PipelineStageConnection[] getPipelineStageConnections() {
      try {
!       Collection connections = pipeline.getDynamic().getConnections();
        com.babeldoc.core.pipeline.PipelineStageConnection[] pstageConnections = new com.babeldoc.core.pipeline.PipelineStageConnection[connections.size()];
        int count = 0;
***************
*** 173,177 ****
        config.setValue(pipeline.getDynamic().getEntryStage());
  
!       ArrayList stages = pipeline.getDynamic().getStageInsts();
  
        for (Iterator sIter = stages.iterator(); sIter.hasNext();) {
--- 173,177 ----
        config.setValue(pipeline.getDynamic().getEntryStage());
  
!       Collection stages = pipeline.getDynamic().getStageInsts();
  
        for (Iterator sIter = stages.iterator(); sIter.hasNext();) {
***************
*** 181,185 ****
          stageConfig.addChild(new ConfigData(STAGE_DESC,  stageInst.getDesc()));
  
!         ArrayList configs = stageInst.getOptions();
  
          for (Iterator i = configs.iterator(); i.hasNext();) {
--- 181,185 ----
          stageConfig.addChild(new ConfigData(STAGE_DESC,  stageInst.getDesc()));
  
!         Collection configs = stageInst.getOptions();
  
          for (Iterator i = configs.iterator(); i.hasNext();) {
***************
*** 220,224 ****
  
      if (option.getSubOptions().size() > 0) {
!       ArrayList suboptions = option.getSubOptions();
  
        for (Iterator i = suboptions.iterator(); i.hasNext();) {
--- 220,224 ----
  
      if (option.getSubOptions().size() > 0) {
!       Collection suboptions = option.getSubOptions();
  
        for (Iterator i = suboptions.iterator(); i.hasNext();) {

Index: Dynamic.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/Dynamic.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Dynamic.java	12 Aug 2003 23:44:45 -0000	1.4
--- Dynamic.java	16 Sep 2003 05:19:01 -0000	1.5
***************
*** 67,70 ****
--- 67,71 ----
  
  import java.util.ArrayList;
+ import java.util.Collection;
  
  
***************
*** 78,107 ****
   */
  public class Dynamic {
!   private ArrayList connections = new ArrayList();
!   private ArrayList stageInsts = new ArrayList();
    private String entryStage;
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param connections DOCUMENT ME!
     */
!   public void setConnections(ArrayList connections) {
      this.connections = connections;
    }
  
    /**
-    * TODO: DOCUMENT ME!
-    *
     * @return DOCUMENT ME!
     */
!   public ArrayList getConnections() {
      return connections;
    }
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param entryStage DOCUMENT ME!
     */
    public void setEntryStage(String entryStage) {
--- 79,111 ----
   */
  public class Dynamic {
!   /** the collection of connections */
!   private Collection connections = new ArrayList();
! 
!   /** the stage insts collection */
!   private Collection stageInsts = new ArrayList();
! 
!   /** the entry stage */
    private String entryStage;
  
    /**
!    * Set the connections
     *
!    * @param connections
     */
!   public void setConnections(Collection connections) {
      this.connections = connections;
    }
  
    /**
     * @return DOCUMENT ME!
     */
!   public Collection getConnections() {
      return connections;
    }
  
    /**
!    * set the entry stage
     *
!    * @param entryStage
     */
    public void setEntryStage(String entryStage) {
***************
*** 110,116 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getEntryStage() {
--- 114,118 ----
  
    /**
!    * @return get the entry stage
     */
    public String getEntryStage() {
***************
*** 119,125 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param stageInsts DOCUMENT ME!
     */
    public void setStageInsts(ArrayList stageInsts) {
--- 121,127 ----
  
    /**
!    * set the stage insts
     *
!    * @param stageInsts
     */
    public void setStageInsts(ArrayList stageInsts) {
***************
*** 128,143 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
!   public ArrayList getStageInsts() {
      return stageInsts;
    }
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param connection DOCUMENT ME!
     */
    public void addConnection(Connection connection) {
--- 130,143 ----
  
    /**
!    * @return Get the stage insts
     */
!   public Collection getStageInsts() {
      return stageInsts;
    }
  
    /**
!    * Add a connection
     *
!    * @param connection
     */
    public void addConnection(Connection connection) {
***************
*** 146,152 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param stageInst DOCUMENT ME!
     */
    public void addStageInst(StageInst stageInst) {
--- 146,152 ----
  
    /**
!    * Add a stage instance
     *
!    * @param stageInst
     */
    public void addStageInst(StageInst stageInst) {

Index: Option.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/Option.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Option.java	12 Aug 2003 23:44:45 -0000	1.4
--- Option.java	16 Sep 2003 05:19:01 -0000	1.5
***************
*** 67,70 ****
--- 67,71 ----
  
  import java.util.ArrayList;
+ import java.util.Collection;
  
  
***************
*** 78,89 ****
   */
  public class Option {
!   private ArrayList subOptions = new ArrayList();
    private String name;
    private String value;
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param name DOCUMENT ME!
     */
    public void setName(String name) {
--- 79,95 ----
   */
  public class Option {
!   /** the collection of suboptions */
!   private Collection subOptions = new ArrayList();
! 
!   /** the option name */
    private String name;
+ 
+   /** the value of the option */
    private String value;
  
    /**
!    * Set the name of the option
     *
!    * @param name
     */
    public void setName(String name) {
***************
*** 92,98 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getName() {
--- 98,102 ----
  
    /**
!    * @return get the name of the option
     */
    public String getName() {
***************
*** 101,125 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param subOptions DOCUMENT ME!
     */
!   public void setSubOptions(ArrayList subOptions) {
      this.subOptions = subOptions;
    }
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
!   public ArrayList getSubOptions() {
      return subOptions;
    }
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param value DOCUMENT ME!
     */
    public void setValue(String value) {
--- 105,127 ----
  
    /**
!    * Set the suboptions
     *
!    * @param subOptions
     */
!   public void setSubOptions(Collection subOptions) {
      this.subOptions = subOptions;
    }
  
    /**
!    * @return collection of sub options
     */
!   public Collection getSubOptions() {
      return subOptions;
    }
  
    /**
!    * Set the value of the option
     *
!    * @param value
     */
    public void setValue(String value) {
***************
*** 128,134 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getValue() {
--- 130,134 ----
  
    /**
!    * @return Get the value of the option
     */
    public String getValue() {
***************
*** 137,143 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param option DOCUMENT ME!
     */
    public void addSubOption(Option option) {
--- 137,143 ----
  
    /**
!    * Add an option as a suboption
     *
!    * @param option
     */
    public void addSubOption(Option option) {

Index: Pipeline.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/Pipeline.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Pipeline.java	12 Aug 2003 23:44:45 -0000	1.4
--- Pipeline.java	16 Sep 2003 05:19:01 -0000	1.5
***************
*** 75,86 ****
   */
  public class Pipeline {
    private Dynamic dynamic;
    private String documentation;
    private String name;
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param documentation DOCUMENT ME!
     */
    public void setDocumentation(String documentation) {
--- 75,91 ----
   */
  public class Pipeline {
+   /** the dynamic portions of the pipeline */
    private Dynamic dynamic;
+ 
+   /** the documentation of the pipeline */
    private String documentation;
+ 
+   /** the name of the pipeline */
    private String name;
  
    /**
!    * Set the documentation on the pipeline
     *
!    * @param documentation
     */
    public void setDocumentation(String documentation) {
***************
*** 89,95 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getDocumentation() {
--- 94,98 ----
  
    /**
!    * @return get the documentation
     */
    public String getDocumentation() {
***************
*** 98,104 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param dynamic DOCUMENT ME!
     */
    public void setDynamic(Dynamic dynamic) {
--- 101,107 ----
  
    /**
!    * set the dynamic option
     *
!    * @param dynamic
     */
    public void setDynamic(Dynamic dynamic) {
***************
*** 107,113 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public Dynamic getDynamic() {
--- 110,114 ----
  
    /**
!    * @return get the dynamic option
     */
    public Dynamic getDynamic() {
***************
*** 116,122 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param name DOCUMENT ME!
     */
    public void setName(String name) {
--- 117,123 ----
  
    /**
!    * set the name
     *
!    * @param name
     */
    public void setName(String name) {
***************
*** 125,131 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getName() {
--- 126,130 ----
  
    /**
!    * @return get the pipeline name
     */
    public String getName() {
***************
*** 134,140 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param dynamic DOCUMENT ME!
     */
    public void addDynamic(Dynamic dynamic) {
--- 133,139 ----
  
    /**
!    * Add a dynamic portion
     *
!    * @param dynamic
     */
    public void addDynamic(Dynamic dynamic) {

Index: StageInst.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/StageInst.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StageInst.java	12 Aug 2003 23:44:45 -0000	1.4
--- StageInst.java	16 Sep 2003 05:19:01 -0000	1.5
***************
*** 67,70 ****
--- 67,71 ----
  
  import java.util.ArrayList;
+ import java.util.Collection;
  
  
***************
*** 78,88 ****
   */
  public class StageInst {
!   private ArrayList options = new ArrayList();
    private String desc;
    private String name;
    private String type;
  
    /**
!    * TODO: DOCUMENT ME!
     *
     * @param desc DOCUMENT ME!
--- 79,97 ----
   */
  public class StageInst {
! 
!   /** the collection of options */
!   private Collection options = new ArrayList();
! 
!   /** the stage description */
    private String desc;
+ 
+   /** the name of the stage */
    private String name;
+ 
+   /** the type of the stage */
    private String type;
  
    /**
!    * Set the description
     *
     * @param desc DOCUMENT ME!
***************
*** 93,99 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getDesc() {
--- 102,106 ----
  
    /**
!    * @return get the description
     */
    public String getDesc() {
***************
*** 102,108 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param name DOCUMENT ME!
     */
    public void setName(String name) {
--- 109,115 ----
  
    /**
!    * set the name of the stage instance
     *
!    * @param name
     */
    public void setName(String name) {
***************
*** 111,117 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getName() {
--- 118,122 ----
  
    /**
!    * @return get the pipeline stage name
     */
    public String getName() {
***************
*** 120,144 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param options DOCUMENT ME!
     */
!   public void setOptions(ArrayList options) {
      this.options = options;
    }
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
!   public ArrayList getOptions() {
      return options;
    }
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param type DOCUMENT ME!
     */
    public void setType(String type) {
--- 125,147 ----
  
    /**
!    * set the options
     *
!    * @param options collection of options
     */
!   public void setOptions(Collection options) {
      this.options = options;
    }
  
    /**
!    * @return Get the options collections
     */
!   public Collection getOptions() {
      return options;
    }
  
    /**
!    * Get the type
     *
!    * @param type
     */
    public void setType(String type) {
***************
*** 147,153 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getType() {
--- 150,154 ----
  
    /**
!    * @return get the type of the stage
     */
    public String getType() {
***************
*** 156,162 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param option DOCUMENT ME!
     */
    public void addOption(Option option) {
--- 157,163 ----
  
    /**
!    * add the option
     *
!    * @param option
     */
    public void addOption(Option option) {

[Babeldoc-devel] babeldoc/modules/gui/src/com/babeldoc/gui/wizard SimpleWizardController.java,1.4,1.5

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/gui/src/com/babeldoc/gui/wizard

Modified Files:
	SimpleWizardController.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: SimpleWizardController.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/SimpleWizardController.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SimpleWizardController.java	26 Aug 2003 22:23:32 -0000	1.4
--- SimpleWizardController.java	16 Sep 2003 05:19:02 -0000	1.5
***************
*** 68,72 ****
  import com.babeldoc.gui.wizard.IWizardController;
  
! import org.apache.commons.lang.NumberUtils;
  
  import java.awt.*;
--- 68,72 ----
  import com.babeldoc.gui.wizard.IWizardController;
  
! import org.apache.commons.lang.math.NumberUtils;
  
  import java.awt.*;
***************
*** 112,116 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
     * @return DOCUMENT ME!
--- 112,116 ----
  
    /**
!    * Get the dimensions
     *
     * @return DOCUMENT ME!
***************
*** 121,126 ****
  
      for (int i = 0; i < panels.length; ++i) {
!       width = NumberUtils.maximum(width, panels[i].getWidth(), 100);
!       height = NumberUtils.maximum(height, panels[i].getHeight(), 100);
      }
  
--- 121,126 ----
  
      for (int i = 0; i < panels.length; ++i) {
!       width = NumberUtils.max(width, panels[i].getWidth(), 100);
!       height = NumberUtils.max(height, panels[i].getHeight(), 100);
      }
  
***************
*** 142,150 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param current DOCUMENT ME!
     *
!    * @return DOCUMENT ME!
     */
    public boolean canDoBack(WizardPanel current) {
--- 142,150 ----
  
    /**
!    * Can this controller go backwards - only if panel is greater than 0.
     *
!    * @param current panel to go back from
     *
!    * @return flag to indicate whether can go back
     */
    public boolean canDoBack(WizardPanel current) {

[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/pipeline/stage DomifyPipelineStage.java,1.14,1.15 SmtpWriterPipelineStage.java,1.11,1.12 SocketWriterPipelineStage.java,1.6,1.7

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/stage
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/core/src/com/babeldoc/core/pipeline/stage

Modified Files:
	DomifyPipelineStage.java SmtpWriterPipelineStage.java 
	SocketWriterPipelineStage.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: DomifyPipelineStage.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/stage/DomifyPipelineStage.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DomifyPipelineStage.java	30 Jul 2003 22:48:57 -0000	1.14
--- DomifyPipelineStage.java	16 Sep 2003 05:19:01 -0000	1.15
***************
*** 358,364 ****
  
            /**
!            * TODO: DOCUMENT ME!
!            *
!            * @return DOCUMENT ME!
             */
            public String getErrorDescription() {
--- 358,362 ----
  
            /**
!            * @return error description
             */
            public String getErrorDescription() {
***************
*** 367,373 ****
  
            /**
!            * TODO: DOCUMENT ME!
!            *
!            * @param exception DOCUMENT ME!
             */
            public void error(SAXParseException exception) {
--- 365,369 ----
  
            /**
!            * @param exception
             */
            public void error(SAXParseException exception) {
***************
*** 393,397 ****
  
            /**
!            * TODO: DOCUMENT ME!
             *
             * @param exception DOCUMENT ME!
--- 389,393 ----
  
            /**
!            * Handle warngings
             *
             * @param exception DOCUMENT ME!

Index: SmtpWriterPipelineStage.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/stage/SmtpWriterPipelineStage.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SmtpWriterPipelineStage.java	22 Aug 2003 08:11:40 -0000	1.11
--- SmtpWriterPipelineStage.java	16 Sep 2003 05:19:01 -0000	1.12
***************
*** 298,304 ****
  
        /**
!        * TODO: DOCUMENT ME!
!        *
!        * @return DOCUMENT ME!
         *
         * @throws IOException DOCUMENT ME!
--- 298,302 ----
  
        /**
!        * @return input stream of the document
         *
         * @throws IOException DOCUMENT ME!
***************
*** 309,315 ****
  
        /**
!        * TODO: DOCUMENT ME!
!        *
!        * @return DOCUMENT ME!
         *
         * @throws IOException DOCUMENT ME!
--- 307,311 ----
  
        /**
!        * @return output stream of the document
         *
         * @throws IOException DOCUMENT ME!
***************
*** 320,326 ****
  
        /**
!        * TODO: DOCUMENT ME!
!        *
!        * @return DOCUMENT ME!
         */
        public String getContentType() {
--- 316,320 ----
  
        /**
!        * @return the mimetype of the document
         */
        public String getContentType() {
***************
*** 329,335 ****
  
        /**
!        * TODO: DOCUMENT ME!
!        *
!        * @return DOCUMENT ME!
         */
        public String getName() {
--- 323,327 ----
  
        /**
!        * @return the name of the document
         */
        public String getName() {

Index: SocketWriterPipelineStage.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/stage/SocketWriterPipelineStage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SocketWriterPipelineStage.java	27 Jun 2003 02:19:59 -0000	1.6
--- SocketWriterPipelineStage.java	16 Sep 2003 05:19:01 -0000	1.7
***************
*** 73,76 ****
--- 73,78 ----
  import com.babeldoc.core.pipeline.PipelineStage;
  import com.babeldoc.core.pipeline.PipelineStageInfo;
+ import com.babeldoc.core.pipeline.PipelineStageResult;
+ import com.babeldoc.core.pipeline.PipelineException;
  
  import java.io.BufferedReader;
***************
*** 202,217 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param strBuffer DOCUMENT ME!
     *
     * @return DOCUMENT ME!
     *
!    * @throws com.babeldoc.core.pipeline.PipelineException DOCUMENT ME!
     * @throws JournalException DOCUMENT ME!
     */
!   private com.babeldoc.core.pipeline.PipelineStageResult[] processResponse(
!     StringBuffer strBuffer)
!       throws com.babeldoc.core.pipeline.PipelineException, JournalException {
      if ((strBuffer != null) && (strBuffer.length() > 0)) {
        String[] results = { strBuffer.toString() };
--- 204,218 ----
  
    /**
!    * Process the results from the communication
     *
!    * @param strBuffer from the socket
     *
     * @return DOCUMENT ME!
     *
!    * @throws PipelineException DOCUMENT ME!
     * @throws JournalException DOCUMENT ME!
     */
!   private PipelineStageResult[] processResponse(StringBuffer strBuffer)
!       throws PipelineException, JournalException {
      if ((strBuffer != null) && (strBuffer.length() > 0)) {
        String[] results = { strBuffer.toString() };

[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/resource ResourceType.java,1.4,1.5

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/resource
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/core/src/com/babeldoc/core/resource

Modified Files:
	ResourceType.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: ResourceType.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/resource/ResourceType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ResourceType.java	27 Jun 2003 02:19:59 -0000	1.4
--- ResourceType.java	16 Sep 2003 05:19:01 -0000	1.5
***************
*** 71,76 ****
  /**
   * Characterize the type of resource.  This type maps to a name and a class to
!  * actually provide a concrete implementation. TODO:  Implement this in terms
!  * of Type
   *
   * @author Bmcdonald
--- 71,75 ----
  /**
   * Characterize the type of resource.  This type maps to a name and a class to
!  * actually provide a concrete implementation.
   *
   * @author Bmcdonald

[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/pipeline/command PipelineCommand.java,1.10,1.11 PipelineCommandTest.java,1.3,1.4

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/command
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/core/src/com/babeldoc/core/pipeline/command

Modified Files:
	PipelineCommand.java PipelineCommandTest.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: PipelineCommand.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/command/PipelineCommand.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PipelineCommand.java	12 Aug 2003 23:44:44 -0000	1.10
--- PipelineCommand.java	16 Sep 2003 05:19:01 -0000	1.11
***************
*** 115,121 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param commandLine DOCUMENT ME!
     */
    public void execute(CommandLine commandLine) {
--- 115,121 ----
  
    /**
!    * Execute the command line
     *
!    * @param commandLine to be executed
     */
    public void execute(CommandLine commandLine) {

Index: PipelineCommandTest.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/command/PipelineCommandTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PipelineCommandTest.java	27 Jun 2003 02:19:58 -0000	1.3
--- PipelineCommandTest.java	16 Sep 2003 05:19:01 -0000	1.4
***************
*** 69,72 ****
--- 69,73 ----
  import junit.framework.TestCase;
  import junit.framework.TestSuite;
+ import com.babeldoc.core.EnvironmentLoader;
  
  
***************
*** 97,103 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @return DOCUMENT ME!
     */
    public static Test suite() {
--- 98,104 ----
  
    /**
!    * Make a test suite
     *
!    * @return get the test suite
     */
    public static Test suite() {
***************
*** 108,112 ****
  
    /**
!    * TODO: DOCUMENT ME!
     */
    public void testPipelineAndStage() {
--- 109,113 ----
  
    /**
!    * setup the test pipeline and stage
     */
    public void testPipelineAndStage() {
***************
*** 118,133 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @throws Exception DOCUMENT ME!
     */
    protected void setUp() throws Exception {
!     com.babeldoc.core.EnvironmentLoader.loadEnvironment();
    }
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @throws Exception DOCUMENT ME!
     */
    protected void tearDown() throws Exception {
--- 119,134 ----
  
    /**
!    * Setup the test
     *
!    * @throws Exception
     */
    protected void setUp() throws Exception {
!     EnvironmentLoader.loadEnvironment();
    }
  
    /**
!    * Teardown the test
     *
!    * @throws Exception
     */
    protected void tearDown() throws Exception {

[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/user UserContext.java,1.4,1.5

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/user
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/core/src/com/babeldoc/core/user

Modified Files:
	UserContext.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: UserContext.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/user/UserContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** UserContext.java	27 Jun 2003 02:20:00 -0000	1.4
--- UserContext.java	16 Sep 2003 05:19:02 -0000	1.5
***************
*** 159,163 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
     * @param authenticated DOCUMENT ME!
--- 159,163 ----
  
    /**
!    * Set this as authenticated
     *
     * @param authenticated DOCUMENT ME!

[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/journal/simple SimpleJournal.java,1.10,1.11

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/simple
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/core/src/com/babeldoc/core/journal/simple

Modified Files:
	SimpleJournal.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: SimpleJournal.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/simple/SimpleJournal.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SimpleJournal.java	3 Sep 2003 03:25:31 -0000	1.10
--- SimpleJournal.java	16 Sep 2003 05:19:00 -0000	1.11
***************
*** 85,89 ****
  import java.util.Collection;
  
! import org.apache.commons.lang.NumberUtils;
  
  
--- 85,89 ----
  import java.util.Collection;
  
! import org.apache.commons.lang.math.NumberUtils;
  
  

[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/pipeline/error RedirectErrorHandler.java,1.4,1.5

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/error
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/core/src/com/babeldoc/core/pipeline/error

Modified Files:
	RedirectErrorHandler.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: RedirectErrorHandler.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/error/RedirectErrorHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RedirectErrorHandler.java	27 Jun 2003 02:19:59 -0000	1.4
--- RedirectErrorHandler.java	16 Sep 2003 05:19:01 -0000	1.5
***************
*** 80,89 ****
  public class RedirectErrorHandler implements IPipelineStageErrorHandler {
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param stage DOCUMENT ME!
!    * @param pe DOCUMENT ME!
     *
!    * @return DOCUMENT ME!
     */
    public boolean handlePipelineStageError(IPipelineStage stage,
--- 80,89 ----
  public class RedirectErrorHandler implements IPipelineStageErrorHandler {
    /**
!    * Called when an error is encountered
     *
!    * @param stage the pipeline stage that encountered the exception
!    * @param pe the pipeline exception
     *
!    * @return can this pipeline stage proceed?
     */
    public boolean handlePipelineStageError(IPipelineStage stage,

[Babeldoc-devel] babeldoc/modules/gui/src/com/babeldoc/gui/config AddConfigOptionAction.java,1.1,1.2 AddConfigSuboptionAction.java,1.1,1.2 BooleanConfigOptionComponent.java,1.8,1.9 ComplexConfigOptionComponent.java,1.6,1.7 ConfigOptionModel.java,1.2,1.3 ConfigOptionPanel.java,1.8,1.9

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/config
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/gui/src/com/babeldoc/gui/config

Modified Files:
	AddConfigOptionAction.java AddConfigSuboptionAction.java 
	BooleanConfigOptionComponent.java 
	ComplexConfigOptionComponent.java ConfigOptionModel.java 
	ConfigOptionPanel.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: AddConfigOptionAction.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/config/AddConfigOptionAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AddConfigOptionAction.java	13 Sep 2003 15:33:10 -0000	1.1
--- AddConfigOptionAction.java	16 Sep 2003 05:19:02 -0000	1.2
***************
*** 68,72 ****
  import com.babeldoc.gui.wizard.addconfig.AddConfigWizard;
  import com.babeldoc.core.option.ConfigOption;
- import com.babeldoc.core.option.ConfigInfo;
  
  import java.awt.event.ActionEvent;
--- 68,71 ----
***************
*** 77,81 ****
  public class AddConfigOptionAction
      extends ConfigAction {
!   public static final String ADD_CONFIG_OPTION = "Add config option";
  
    /**
--- 76,80 ----
  public class AddConfigOptionAction
      extends ConfigAction {
!   public static final String ADD_CONFIG_OPTION = "Add config option...";
  
    /**

Index: AddConfigSuboptionAction.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/config/AddConfigSuboptionAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AddConfigSuboptionAction.java	13 Sep 2003 15:33:10 -0000	1.1
--- AddConfigSuboptionAction.java	16 Sep 2003 05:19:02 -0000	1.2
***************
*** 76,80 ****
  public class AddConfigSuboptionAction
      extends ConfigAction {
!   public static final String ADD_SUB_OPTION = "Add sub option";
    private ConfigOption option;
  
--- 76,80 ----
  public class AddConfigSuboptionAction
      extends ConfigAction {
!   public static final String ADD_SUB_OPTION = "Add sub option...";
    private ConfigOption option;
  

Index: BooleanConfigOptionComponent.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/config/BooleanConfigOptionComponent.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** BooleanConfigOptionComponent.java	13 Sep 2003 22:40:40 -0000	1.8
--- BooleanConfigOptionComponent.java	16 Sep 2003 05:19:02 -0000	1.9
***************
*** 155,159 ****
  
    /**
!    * TODO: DOCUMENT ME!
     */
    public void displayConfigValue() {
--- 155,159 ----
  
    /**
!    * Display the configuration value
     */
    public void displayConfigValue() {
***************
*** 163,167 ****
  
    /**
!    * TODO: DOCUMENT ME!
     */
    public void displayDefault() {
--- 163,167 ----
  
    /**
!    * Display the default value
     */
    public void displayDefault() {

Index: ComplexConfigOptionComponent.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/config/ComplexConfigOptionComponent.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ComplexConfigOptionComponent.java	13 Aug 2003 22:53:26 -0000	1.6
--- ComplexConfigOptionComponent.java	16 Sep 2003 05:19:02 -0000	1.7
***************
*** 88,91 ****
--- 88,94 ----
  /**
   * Handle the gui for complex components
+  *
+  * @author bmcdonald
+  * @version 1.1
   */
  public class ComplexConfigOptionComponent extends ConfigOptionComponent {
***************
*** 191,195 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
     * @param parent DOCUMENT ME!
--- 194,198 ----
  
    /**
!    * Add an object
     *
     * @param parent DOCUMENT ME!

Index: ConfigOptionModel.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/config/ConfigOptionModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConfigOptionModel.java	13 Sep 2003 15:33:10 -0000	1.2
--- ConfigOptionModel.java	16 Sep 2003 05:19:02 -0000	1.3
***************
*** 308,312 ****
            return 0;
          } else {
!           System.out.println("IConfigOptions.size: "+options.size());
            return options.size();
          }
--- 308,312 ----
            return 0;
          } else {
! //          System.out.println("IConfigOptions.size: "+options.size());
            return options.size();
          }

Index: ConfigOptionPanel.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/config/ConfigOptionPanel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ConfigOptionPanel.java	13 Sep 2003 15:33:10 -0000	1.8
--- ConfigOptionPanel.java	16 Sep 2003 05:19:02 -0000	1.9
***************
*** 150,157 ****
     */
    public void displayValues() {
!     System.out.println("Displaying values");
      for (Iterator iterator = getConfigComponents().iterator(); iterator.hasNext();) {
        ConfigOptionComponent cfgcomp = (ConfigOptionComponent) iterator.next();
!       System.out.println("handling: "+cfgcomp);
        cfgcomp.displayConfigValue();
      }
--- 150,157 ----
     */
    public void displayValues() {
! //    System.out.println("Displaying values");
      for (Iterator iterator = getConfigComponents().iterator(); iterator.hasNext();) {
        ConfigOptionComponent cfgcomp = (ConfigOptionComponent) iterator.next();
! //      System.out.println("handling: "+cfgcomp);
        cfgcomp.displayConfigValue();
      }

[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/pipeline/feeder AsynchronousFeeder.java,1.10,1.11 DiskQueueTest.java,1.5,1.6

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/feeder
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/core/src/com/babeldoc/core/pipeline/feeder

Modified Files:
	AsynchronousFeeder.java DiskQueueTest.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: AsynchronousFeeder.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/feeder/AsynchronousFeeder.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AsynchronousFeeder.java	12 Aug 2003 23:44:44 -0000	1.10
--- AsynchronousFeeder.java	16 Sep 2003 05:19:01 -0000	1.11
***************
*** 75,79 ****
  import com.babeldoc.core.pipeline.PipelineException;
  
! import org.apache.commons.lang.NumberUtils;
  
  import java.util.Collection;
--- 75,79 ----
  import com.babeldoc.core.pipeline.PipelineException;
  
! import org.apache.commons.lang.math.NumberUtils;
  
  import java.util.Collection;

Index: DiskQueueTest.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/feeder/DiskQueueTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DiskQueueTest.java	4 Aug 2003 23:46:38 -0000	1.5
--- DiskQueueTest.java	16 Sep 2003 05:19:01 -0000	1.6
***************
*** 95,99 ****
  
    /**
!    * TODO: DOCUMENT ME!
     */
    public void setUp() {
--- 95,99 ----
  
    /**
!    * Setup the test
     */
    public void setUp() {
***************
*** 121,125 ****
  
    /**
!    * TODO: DOCUMENT ME!
     */
    public void testAddGetDocument() {
--- 121,125 ----
  
    /**
!    * Adding and getting documents
     */
    public void testAddGetDocument() {
***************
*** 136,140 ****
  
    /**
!    * TODO: DOCUMENT ME!
     */
    public void testQueueSize() {
--- 136,140 ----
  
    /**
!    * Test the queue size
     */
    public void testQueueSize() {
***************
*** 170,174 ****
  
    /**
!    * TODO: DOCUMENT ME!
     */
    public void testRepeatedAddGetDocument() {
--- 170,174 ----
  
    /**
!    * Test repeated adding / getting document
     */
    public void testRepeatedAddGetDocument() {

[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/pipeline/processor AsyncPipelineStageProcessor.java,1.3,1.4 ThreadPooledPipelineStageProcessor.java,1.5,1.6

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/processor
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/core/src/com/babeldoc/core/pipeline/processor

Modified Files:
	AsyncPipelineStageProcessor.java 
	ThreadPooledPipelineStageProcessor.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: AsyncPipelineStageProcessor.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/processor/AsyncPipelineStageProcessor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AsyncPipelineStageProcessor.java	12 Aug 2003 23:44:44 -0000	1.3
--- AsyncPipelineStageProcessor.java	16 Sep 2003 05:19:01 -0000	1.4
***************
*** 75,79 ****
  import java.util.*;
  
! import org.apache.commons.lang.NumberUtils;
  
  /**
--- 75,79 ----
  import java.util.*;
  
! import org.apache.commons.lang.math.NumberUtils;
  
  /**

Index: ThreadPooledPipelineStageProcessor.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/processor/ThreadPooledPipelineStageProcessor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ThreadPooledPipelineStageProcessor.java	12 Aug 2003 23:44:44 -0000	1.5
--- ThreadPooledPipelineStageProcessor.java	16 Sep 2003 05:19:01 -0000	1.6
***************
*** 78,82 ****
  import java.util.*;
  
! import org.apache.commons.lang.NumberUtils;
  import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
  
--- 78,82 ----
  import java.util.*;
  
! import org.apache.commons.lang.math.NumberUtils;
  import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
  

[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/pipeline PipelineFactory.java,1.12,1.13 PipelineStage.java,1.20,1.21 PipelineStageFactoryType.java,1.3,1.4 PipelineStageInfo.java,1.8,1.9

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/core/src/com/babeldoc/core/pipeline

Modified Files:
	PipelineFactory.java PipelineStage.java 
	PipelineStageFactoryType.java PipelineStageInfo.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: PipelineFactory.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/PipelineFactory.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PipelineFactory.java	27 Aug 2003 03:13:35 -0000	1.12
--- PipelineFactory.java	16 Sep 2003 05:19:00 -0000	1.13
***************
*** 374,380 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getPipeline() {
--- 374,378 ----
  
    /**
!    * @return get the pipeline
     */
    public String getPipeline() {
***************
*** 383,389 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getStage() {
--- 381,385 ----
  
    /**
!    * @return Get the stage
     */
    public String getStage() {

Index: PipelineStage.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/PipelineStage.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** PipelineStage.java	3 Sep 2003 03:25:31 -0000	1.20
--- PipelineStage.java	16 Sep 2003 05:19:00 -0000	1.21
***************
*** 542,550 ****
  
  	/**
! 	 * TODO: DOCUMENT ME!
  	 *
! 	 * @return DOCUMENT ME!
  	 *
! 	 * @throws PipelineException DOCUMENT ME!
  	 */
  	public abstract PipelineStageResult[] process() throws PipelineException;
--- 542,551 ----
  
  	/**
! 	 * Do the hard work and then return each of the pipeline stage results.  This really
!    * is the heart of what each pipeline stage must do.
  	 *
! 	 * @return array of pipeline stage results.
  	 *
! 	 * @throws PipelineException for any processing issues
  	 */
  	public abstract PipelineStageResult[] process() throws PipelineException;
***************
*** 834,839 ****
  	/**
  	 * Get error handler defined specified for this stage. If no handler provided
! 	 * or wrong class name set, then use default one. TODO: Should we throw
! 	 * Exception to indicate that configuration is wrong? 
  	 *
  	 * @return
--- 835,841 ----
  	/**
  	 * Get error handler defined specified for this stage. If no handler provided
! 	 * or wrong class name set, then use default one.
!    *
!    * TODO: Should we throw Exception to indicate that configuration is wrong?
  	 *
  	 * @return

Index: PipelineStageFactoryType.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/PipelineStageFactoryType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PipelineStageFactoryType.java	27 Jun 2003 02:19:58 -0000	1.3
--- PipelineStageFactoryType.java	16 Sep 2003 05:19:01 -0000	1.4
***************
*** 103,109 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getServicePrefix() {
--- 103,107 ----
  
    /**
!    * @return Get the pipeline stage factory service prefix.
     */
    public String getServicePrefix() {

Index: PipelineStageInfo.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/PipelineStageInfo.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PipelineStageInfo.java	12 Aug 2003 23:44:44 -0000	1.8
--- PipelineStageInfo.java	16 Sep 2003 05:19:01 -0000	1.9
***************
*** 123,127 ****
  
        /**
!        * TODO:  Add complex type handling here. //add suboption if exists if
         * (option.isComplex()) { System.out.println("Option " +
         * option.getName() + " complex.. Addind suboption "
--- 123,128 ----
  
        /**
!        * TODO:  Add complex type handling here.
!        * //add suboption if exists if
         * (option.isComplex()) { System.out.println("Option " +
         * option.getName() + " complex.. Addind suboption "

[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/option BooleanConfigOptionType.java,1.5,1.6 ConfigInfo.java,1.13,1.14 DirectoryConfigOptionType.java,1.3,1.4

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/option
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/core/src/com/babeldoc/core/option

Modified Files:
	BooleanConfigOptionType.java ConfigInfo.java 
	DirectoryConfigOptionType.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: BooleanConfigOptionType.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/option/BooleanConfigOptionType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BooleanConfigOptionType.java	27 Jun 2003 02:19:58 -0000	1.5
--- BooleanConfigOptionType.java	16 Sep 2003 05:19:00 -0000	1.6
***************
*** 77,83 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @return DOCUMENT ME!
     */
    public String getName() {
--- 77,83 ----
  
    /**
!    * Get the name of the boolean option type
     *
!    * @return name of the boolean
     */
    public String getName() {

Index: ConfigInfo.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/option/ConfigInfo.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ConfigInfo.java	13 Sep 2003 03:33:43 -0000	1.13
--- ConfigInfo.java	16 Sep 2003 05:19:00 -0000	1.14
***************
*** 71,75 ****
  import java.util.*;
  
! import org.apache.commons.lang.NumberUtils;
  import org.apache.commons.lang.builder.ToStringBuilder;
  import org.apache.commons.collections.SequencedHashMap;
--- 71,75 ----
  import java.util.*;
  
! import org.apache.commons.lang.math.NumberUtils;
  import org.apache.commons.lang.builder.ToStringBuilder;
  import org.apache.commons.collections.SequencedHashMap;

Index: DirectoryConfigOptionType.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/option/DirectoryConfigOptionType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DirectoryConfigOptionType.java	27 Jun 2003 02:19:58 -0000	1.3
--- DirectoryConfigOptionType.java	16 Sep 2003 05:19:00 -0000	1.4
***************
*** 74,81 ****
   */
  public class DirectoryConfigOptionType implements IConfigOptionType {
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getName() {
--- 74,80 ----
   */
  public class DirectoryConfigOptionType implements IConfigOptionType {
+ 
    /**
!    * @return Get the name of option type
     */
    public String getName() {

[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/journal/query JournalQueryTest.java,1.3,1.4

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/query
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/core/src/com/babeldoc/core/journal/query

Modified Files:
	JournalQueryTest.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: JournalQueryTest.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/query/JournalQueryTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JournalQueryTest.java	27 Jun 2003 02:19:58 -0000	1.3
--- JournalQueryTest.java	16 Sep 2003 05:19:00 -0000	1.4
***************
*** 107,113 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public static Test suite() {
--- 107,111 ----
  
    /**
!    * @return make a test suite
     */
    public static Test suite() {
***************
*** 118,124 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @throws Exception DOCUMENT ME!
     */
    public void testGetAllTickets() throws Exception {
--- 116,120 ----
  
    /**
!    * @throws Exception
     */
    public void testGetAllTickets() throws Exception {
***************
*** 140,145 ****
  
    /**
-    * TODO: DOCUMENT ME!
-    *
     * @throws Exception DOCUMENT ME!
     */
--- 136,139 ----
***************
*** 151,157 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @throws Exception DOCUMENT ME!
     */
    public void testGetNewTickets() throws Exception {
--- 145,151 ----
  
    /**
!    * Test getting new tickets
     *
!    * @throws Exception
     */
    public void testGetNewTickets() throws Exception {
***************
*** 166,170 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
     * @throws Exception DOCUMENT ME!
--- 160,164 ----
  
    /**
!    * Get new tickets newest first
     *
     * @throws Exception DOCUMENT ME!
***************
*** 183,187 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
     * @throws Exception DOCUMENT ME!
--- 177,181 ----
  
    /**
!    * Get new tickets oldest first
     *
     * @throws Exception DOCUMENT ME!
***************
*** 199,203 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
     * @throws Exception DOCUMENT ME!
--- 193,197 ----
  
    /**
!    * Get the updated documents
     *
     * @throws Exception DOCUMENT ME!
***************
*** 210,214 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
     * @throws Exception DOCUMENT ME!
--- 204,208 ----
  
    /**
!    * Get update status tickets
     *
     * @throws Exception DOCUMENT ME!
***************
*** 221,225 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
     * @throws Exception DOCUMENT ME!
--- 215,219 ----
  
    /**
!    * Setup the journal
     *
     * @throws Exception DOCUMENT ME!
***************
*** 231,235 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
     * @throws Exception DOCUMENT ME!
--- 225,229 ----
  
    /**
!    * teardown the journal
     *
     * @throws Exception DOCUMENT ME!

[Babeldoc-devel] babeldoc/modules/gui/src/com/babeldoc/gui/config BooleanConfigOptionComponent.java,1.7,1.8 ValueListConfigOptionComponent.java,1.7,1.8

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/config
In directory sc8-pr-cvs1:/tmp/cvs-serv1360/com/babeldoc/gui/config

Modified Files:
	BooleanConfigOptionComponent.java 
	ValueListConfigOptionComponent.java 
Log Message:
removed debug messages

Index: BooleanConfigOptionComponent.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/config/BooleanConfigOptionComponent.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BooleanConfigOptionComponent.java	13 Sep 2003 15:33:10 -0000	1.7
--- BooleanConfigOptionComponent.java	13 Sep 2003 22:40:40 -0000	1.8
***************
*** 131,135 ****
            boolean selected = ((JCheckBox) getComponent()).isSelected();
            try {
!             System.out.println("Action performed:- option: "+getOption().getName()+"  selection="+Boolean.toString(selected));
              getOption().setValue(Boolean.toString(selected));
            } catch (MutableConfigValueException e1) {
--- 131,135 ----
            boolean selected = ((JCheckBox) getComponent()).isSelected();
            try {
! //            System.out.println("Action performed:- option: "+getOption().getName()+"  selection="+Boolean.toString(selected));
              getOption().setValue(Boolean.toString(selected));
            } catch (MutableConfigValueException e1) {
***************
*** 158,162 ****
     */
    public void displayConfigValue() {
!     System.out.println("Displaying boolean value: "+getOption().getValue());
      box.setSelected(BooleanConfigOptionType.TRUE.equals(getOption().getValue()));
    }
--- 158,162 ----
     */
    public void displayConfigValue() {
! //    System.out.println("Displaying boolean value: "+getOption().getValue());
      box.setSelected(BooleanConfigOptionType.TRUE.equals(getOption().getValue()));
    }

Index: ValueListConfigOptionComponent.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/config/ValueListConfigOptionComponent.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ValueListConfigOptionComponent.java	13 Sep 2003 15:33:10 -0000	1.7
--- ValueListConfigOptionComponent.java	13 Sep 2003 22:40:40 -0000	1.8
***************
*** 119,123 ****
    public JComponent getGuiComponent() {
      if (combo == null) {
-       System.out.println("111");
        ValueListConfigOptionType vlconfigtype = (ValueListConfigOptionType) getOption().getType();
        combo = new JComboBox(vlconfigtype.getValidTypes());
--- 119,122 ----
***************
*** 126,130 ****
          combo.setSelectedItem(getOption().getDefaultValue());
        }
-       System.out.println("222");
  
        combo.addFocusListener(new ConfigOptionFocusListener(combo, getOption()) {
--- 125,128 ----
***************
*** 141,145 ****
        });
  
-       System.out.println("333");
        combo.setToolTipText(getOption().getDescription());
        combo.setMaximumSize(new Dimension(1000, 25));
--- 139,142 ----
***************
*** 162,167 ****
     */
    public void displayConfigValue() {
-     System.out.println("bbb"+combo==null);
-     System.out.println("aaa"+getOption()==null);
      combo.setSelectedItem(getOption().getValue());
    }
--- 159,162 ----

[Babeldoc-devel] babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addconfig AddConfigController.java,NONE,1.1 AddConfigModel.java,NONE,1.1 AddConfigWizard.java,NONE,1.1 AddConfigWizardCommand.java,NONE,1.1 AddConfigWizardPanel.java,NONE,1.1 NameAddConfigWizardPanel.java,NONE,1.1 TypeAddConfigWizardPanel.java,NONE,1.1

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addconfig
In directory sc8-pr-cvs1:/tmp/cvs-serv19450/com/babeldoc/gui/wizard/addconfig

Added Files:
	AddConfigController.java AddConfigModel.java 
	AddConfigWizard.java AddConfigWizardCommand.java 
	AddConfigWizardPanel.java NameAddConfigWizardPanel.java 
	TypeAddConfigWizardPanel.java 
Log Message:
Lots of GUI loving!  Been working on the pipeline builder tool
and getting into some shape.  Now the pipeline stage configuration editing is looking a whole lot better.

--- NEW FILE: AddConfigController.java ---
/* ====================================================================
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2000 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution,
 *    if any, must include the following acknowledgment:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowledgment may appear in the software itself,
 *    if and wherever such third-party acknowledgments normally appear.
 *
 * 4. The names "Apache" and "Apache Software Foundation" must
 *    not be used to endorse or promote products derived from this
 *    software without prior written permission. For written
 *    permission, please contact ap...@ap....
 *
 * 5. Products derived from this software may not be called "Apache",
 *    nor may "Apache" appear in their name, without prior written
 *    permission of the Apache Software Foundation.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 *
 * Portions of this software are based upon public domain software
 * originally written at the National Center for Supercomputing Applications,
 * University of Illinois, Urbana-Champaign.
 * ====================================================================
 *
 * Babeldoc:  The Universal Document Processor
 *
 * $Header: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addconfig/AddConfigController.java,v 1.1 2003/09/13 15:33:11 triphop Exp $
 * $DateTime$
 * $Author: triphop $
 *
 */
package com.babeldoc.gui.wizard.addconfig;

import com.babeldoc.gui.wizard.SimpleWizardController;
import com.babeldoc.gui.wizard.StandardWizardPanel;
import com.babeldoc.gui.wizard.WizardPanel;


/**
 * The controller to manage the movement between the two panels in the add
 * pipeline wizard.
 */
public class AddConfigController extends SimpleWizardController {
  private AddConfigModel model;

  /**
   * Constructor.
   *
   * @param model
   */
  public AddConfigController(AddConfigModel model) {
    this.setModel(model);
    this.panels = new StandardWizardPanel[] { new NameAddConfigWizardPanel(model), new TypeAddConfigWizardPanel(model) };
  }

  /**
   * TODO: DOCUMENT ME!
   *
   * @param model DOCUMENT ME!
   */
  public void setModel(AddConfigModel model) {
    this.model = model;
  }

  /**
   * Get the model.
   *
   * @return
   */
  public AddConfigModel getModel() {
    return model;
  }

  /**
   * Can only go back if there is a panel to go back to and it is allowed to
   * change the pipeline (this is because the model was constructed using the
   * pipeline name)
   *
   * @param current
   *
   * @return
   */
  public boolean canDoBack(WizardPanel current) {
    int number = ((StandardWizardPanel) current).getNumber();

    return (number > 0);
  }

  /**
   * Can only finish on final panel.
   *
   * @param current
   *
   * @return
   */
  public boolean canDoFinish(WizardPanel current) {
    int number = ((StandardWizardPanel) current).getNumber();

    return number == TypeAddConfigWizardPanel.NUMBER &&
        getModel().getConfigName()!=null;
  }

  /**
   * Finish the wizard.
   *
   * @param current
   */
  public void finish(WizardPanel current) {
    this.getModel().setFinished(true);
    closeDialog();
  }

  /**
   * Validate some of the panels.
   *
   * @param current
   *
   * @return
   */
  public WizardPanel next(WizardPanel current) {
    return super.next(current);
  }

  /**
   * Little bit of trickery here - start from 1 if pipeline set.
   *
   * @return
   */
  public WizardPanel start() {
    return panels[0];
  }
}

--- NEW FILE: AddConfigModel.java ---
/* ====================================================================
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2000 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution,
 *    if any, must include the following acknowledgment:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowledgment may appear in the software itself,
 *    if and wherever such third-party acknowledgments normally appear.
 *
 * 4. The names "Apache" and "Apache Software Foundation" must
 *    not be used to endorse or promote products derived from this
 *    software without prior written permission. For written
 *    permission, please contact ap...@ap....
 *
 * 5. Products derived from this software may not be called "Apache",
 *    nor may "Apache" appear in their name, without prior written
 *    permission of the Apache Software Foundation.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 *
 * Portions of this software are based upon public domain software
 * originally written at the National Center for Supercomputing Applications,
 * University of Illinois, Urbana-Champaign.
 * ====================================================================
 *
 * Babeldoc:  The Universal Document Processor
 *
 * $Header: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addconfig/AddConfigModel.java,v 1.1 2003/09/13 15:33:11 triphop Exp $
 * $DateTime$
 * $Author: triphop $
 *
 */
package com.babeldoc.gui.wizard.addconfig;

import com.babeldoc.core.option.ConfigOption;
import com.babeldoc.core.option.IConfigOptionType;
import com.babeldoc.core.LogService;

import com.babeldoc.gui.wizard.WizardModel;

import java.lang.reflect.Field;
import java.util.Map;
import java.util.HashMap;



/**
 * AddConfigModel contains the data to manage the creation of a new configuration
 * option.
 *
 * @author bmcdonald
 * @version 1.1
 */
public class AddConfigModel extends WizardModel {
  private String configName;
  private String configType;
  private String configDesc;
  private ConfigOption configOption;
  private Map map;
  private String [] types;


  /**
   * Ctor
   */
  public AddConfigModel() {
  }

  /**
   * We write the pipeline stage information to the  configuration files.
   *
   * @param finished
   */
  public void setFinished(boolean finished) {
    super.setFinished(finished);

    if (finished) {
      Class c = (Class)map.get(getConfigType());
      System.out.println(c);

      try {
        IConfigOptionType type = (IConfigOptionType)(c.newInstance());
        setConfigOption(new ConfigOption(getConfigName(), type, null, false, getConfigDesc()));
      } catch (InstantiationException e) {
        LogService.getInstance().logError(e);
      } catch (IllegalAccessException e) {
        LogService.getInstance().logError(e);
      }
    }
  }

  public String getConfigName() {
    return configName;
  }

  public void setConfigName(String configName) {
    this.configName = configName;
  }

  public String getConfigType() {
    return configType;
  }

  public void setConfigType(String configType) {
    this.configType = configType;
  }

  public ConfigOption getConfigOption() {
    return configOption;
  }

  public void setConfigOption(ConfigOption configOption) {
    this.configOption = configOption;
  }

  /**
   * @return Get the list of possible configuration option types
   */
  public String[] getConfigOptionTypes() {
    if(map==null) {
      Class optionType = IConfigOptionType.class;
      map = new HashMap();

      Field[] fields = optionType.getDeclaredFields();
      types = new String[fields.length];
      for (int i = 0; i < fields.length; i++) {
        Field field = fields[i];
        map.put(field.getName(), field.getType());
        types[i] = field.getName();
      }
    }
    return types;
  }

  public String getConfigDesc() {
    return configDesc;
  }

  public void setConfigDesc(String configDesc) {
    this.configDesc = configDesc;
  }
}

--- NEW FILE: AddConfigWizard.java ---
/* ====================================================================
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2000 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution,
 *    if any, must include the following acknowledgment:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowledgment may appear in the software itself,
 *    if and wherever such third-party acknowledgments normally appear.
 *
 * 4. The names "Apache" and "Apache Software Foundation" must
 *    not be used to endorse or promote products derived from this
 *    software without prior written permission. For written
 *    permission, please contact ap...@ap....
 *
 * 5. Products derived from this software may not be called "Apache",
 *    nor may "Apache" appear in their name, without prior written
 *    permission of the Apache Software Foundation.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 *
 * Portions of this software are based upon public domain software
 * originally written at the National Center for Supercomputing Applications,
 * University of Illinois, Urbana-Champaign.
 * ====================================================================
 *
 * Babeldoc:  The Universal Document Processor
 *
 * $Header: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addconfig/AddConfigWizard.java,v 1.1 2003/09/13 15:33:11 triphop Exp $
 * $DateTime$
 * $Author: triphop $
 *
 */
package com.babeldoc.gui.wizard.addconfig;

import com.babeldoc.core.I18n;

import com.babeldoc.gui.wizard.WizardDialog;


/**
 * The AddPipelineStageWizard allows for quick and easy access to the wizard.
 * Simply execute the static run method and then browse the returned model
 * object to getChild the results.
 *
 * @author bmcdonald
 * @version 1.1
 */
public class AddConfigWizard {
  private AddConfigModel model;

  /**
   * Private constructor - use the run method getChild an instance.
   *
   * @param model
   */
  private AddConfigWizard(AddConfigModel model) {
    this.model = model;
  }

  /**
   * Run the wizard.
   *
   * @return
   */
  public static final AddConfigWizard run() {
    AddConfigWizard wizard = new AddConfigWizard(new AddConfigModel());
    WizardDialog wiz = new WizardDialog(I18n.get("gui.wizard.addstage.title"),
        new AddConfigController(wizard.getModel()));
    wiz.pack();
    wiz.show();

    return wizard;
  }

  /**
   * Get the stored model
   *
   * @return
   */
  public AddConfigModel getModel() {
    return model;
  }
}

--- NEW FILE: AddConfigWizardCommand.java ---
/* ====================================================================
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2000 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution,
 *    if any, must include the following acknowledgment:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowledgment may appear in the software itself,
 *    if and wherever such third-party acknowledgments normally appear.
 *
 * 4. The names "Apache" and "Apache Software Foundation" must
 *    not be used to endorse or promote products derived from this
 *    software without prior written permission. For written
 *    permission, please contact ap...@ap....
 *
 * 5. Products derived from this software may not be called "Apache",
 *    nor may "Apache" appear in their name, without prior written
 *    permission of the Apache Software Foundation.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 *
 * Portions of this software are based upon public domain software
 * originally written at the National Center for Supercomputing Applications,
 * University of Illinois, Urbana-Champaign.
 * ====================================================================
 *
 * Babeldoc:  The Universal Document Processor
 *
 * $Header: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addconfig/AddConfigWizardCommand.java,v 1.1 2003/09/13 15:33:11 triphop Exp $
 * $DateTime$
 * $Author: triphop $
 *
 */
package com.babeldoc.gui.wizard.addconfig;

import com.babeldoc.core.BabeldocCommand;
import com.babeldoc.core.I18n;

import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;


/**
 * The AddConfigWizardCommnand drives the configuration wizard code.
 *
 * @author bmcdonald
 * @version 1.1
 */
public class AddConfigWizardCommand extends BabeldocCommand {
  /**
   * Creates a new LightConfigCommand object.
   */
  public AddConfigWizardCommand() {
  }

  /**
   * Process the commands on the command line
   *
   * @param args the command line
   */
  public AddConfigWizardCommand(String[] args) {
    super("addconfig", "Add a configuration option", args);
  }

  /**
   * Execute the commandline
   *
   * @param commandLine
   */
  public void execute(CommandLine commandLine) {
    AddConfigWizard.run();
    System.exit(0);
  }

  /**
   * Main routine
   *
   * @param args
   */
  public static void main(String[] args) {
    new AddConfigWizardCommand(args);
    System.exit(0);
  }

  /**
   * Setup the command line arguments
   *
   * @param options the commandline options to look for
   */
  public void setupCommandLine(Options options) {
    super.setupCommandLine(options);
  }
}

--- NEW FILE: AddConfigWizardPanel.java ---
/* ====================================================================
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2000 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution,
 *    if any, must include the following acknowledgment:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowledgment may appear in the software itself,
 *    if and wherever such third-party acknowledgments normally appear.
 *
 * 4. The names "Apache" and "Apache Software Foundation" must
 *    not be used to endorse or promote products derived from this
 *    software without prior written permission. For written
 *    permission, please contact ap...@ap....
 *
 * 5. Products derived from this software may not be called "Apache",
 *    nor may "Apache" appear in their name, without prior written
 *    permission of the Apache Software Foundation.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 *
 * Portions of this software are based upon public domain software
 * originally written at the National Center for Supercomputing Applications,
 * University of Illinois, Urbana-Champaign.
 * ====================================================================
 *
 * Babeldoc:  The Universal Document Processor
 *
 * $Header: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addconfig/AddConfigWizardPanel.java,v 1.1 2003/09/13 15:33:11 triphop Exp $
 * $DateTime$
 * $Author: triphop $
 *
 */
package com.babeldoc.gui.wizard.addconfig;

import com.babeldoc.gui.wizard.StandardWizardPanel;


/**
 * Base class of the add
 *
 * @author bmcdonald
 * @version 1.1
 */
public abstract class AddConfigWizardPanel extends StandardWizardPanel {
  private AddConfigModel model = null;

  /**
   * Constructor to set the model, panel number and the left hand side
   * information panel.
   *
   * @param model
   * @param number
   * @param info
   */
  public AddConfigWizardPanel(AddConfigModel model, int number,
    String info) {
    super(number, info);
    this.model = model;
  }

  /**
   * Set the model
   *
   * @param model
   */
  public void setModel(AddConfigModel model) {
    this.model = model;
  }

  /**
   * Get the model
   *
   * @return
   */
  public AddConfigModel getModel() {
    return model;
  }
}

--- NEW FILE: NameAddConfigWizardPanel.java ---
/* ====================================================================
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2000 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution,
 *    if any, must include the following acknowledgment:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowledgment may appear in the software itself,
 *    if and wherever such third-party acknowledgments normally appear.
 *
 * 4. The names "Apache" and "Apache Software Foundation" must
 *    not be used to endorse or promote products derived from this
 *    software without prior written permission. For written
 *    permission, please contact ap...@ap....
 *
 * 5. Products derived from this software may not be called "Apache",
 *    nor may "Apache" appear in their name, without prior written
 *    permission of the Apache Software Foundation.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 *
 * Portions of this software are based upon public domain software
 * originally written at the National Center for Supercomputing Applications,
 * University of Illinois, Urbana-Champaign.
 * ====================================================================
 *
 * Babeldoc:  The Universal Document Processor
 *
 * $Header: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addconfig/NameAddConfigWizardPanel.java,v 1.1 2003/09/13 15:33:11 triphop Exp $
 * $DateTime$
 * $Author: triphop $
 *
 */
package com.babeldoc.gui.wizard.addconfig;

import javax.swing.*;
import java.awt.*;
import java.awt.event.FocusListener;
import java.awt.event.FocusEvent;


/**
 * The name selection wizard panel in this wizard
 *
 * @author bmcdonald
 * @version 1.1
 */
public class NameAddConfigWizardPanel
     extends AddConfigWizardPanel
     implements FocusListener {

  public static final int NUMBER = 0;

  /** swing components */
  private JTextField name = new JTextField();
  private JTextField desc = new JTextField();

  /**
   * Constructor to set the model, panel number and the left hand side
   * information panel.
   *
   * @param model
   */
  public NameAddConfigWizardPanel(AddConfigModel model) {
    super(model, NUMBER, "Enter the name of the\n configuration option");
    setupRightPanel();
  }

  /**
   * Override this method.  This is called from the wizard dialog just prior to
   * showing your wizard panel.  This is used to setup the components on the
   * the panel
   */
  protected void initialize() {
    if(getModel().getConfigName()!=null) {
      name.setText(getModel().getConfigName());
      name.requestFocus();
    }
  }

  /**
   * Add the list to the panel, setup the listener to set the model when the
   * pipeline selection changes.
   */
  private void setupRightPanel() {
    JPanel downpanel = new JPanel();
    downpanel.setLayout(new BoxLayout(downpanel, BoxLayout.PAGE_AXIS));
    downpanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
    name.setMaximumSize(new Dimension(1000, 20));
    downpanel.add(name);


    downpanel.add(Box.createVerticalBox());
    this.add(downpanel, BorderLayout.CENTER);

    name.addFocusListener(this);
  }

  /**
   * Invoked when a component gains the keyboard focus.
   */
  public void focusGained(FocusEvent e) {
  }

  /**
   * Invoked when a component loses the keyboard focus.
   */
  public void focusLost(FocusEvent e) {
    if(name.getText()!=null) {
      getModel().setConfigName(name.getText());
    }
  }
}

--- NEW FILE: TypeAddConfigWizardPanel.java ---
package com.babeldoc.gui.wizard.addconfig;

import javax.swing.*;
import javax.swing.event.ListSelectionListener;
import javax.swing.event.ListSelectionEvent;


/**
 * The add configuration option wizard panel in this wizard for selecting the
 * type of the configuration option.
 *
 * @author bmcdonald
 * @version 1.1
 */
public class TypeAddConfigWizardPanel
     extends AddConfigWizardPanel{

  public static final int NUMBER = 1;

  /** swing components */
  private DefaultListModel listmodel;
  private JList list;

  /**
   * Constructor to set the model, panel number and the left hand side
   * information panel.
   *
   * @param model
   */
  public TypeAddConfigWizardPanel(AddConfigModel model) {
    super(model, NUMBER, "Select the type of the configuration option");
    setupRightPanel();
  }

  /**
   * Override this method.  This is called from the wizard dialog just prior to
   * showing your wizard panel.  This is used to setup the components on the
   * the panel
   */
  protected void initialize() {
    int selected = 0;

    String [] types = getModel().getConfigOptionTypes();
    for(int i = 0; i < types.length; ++i) {
      listmodel.addElement(types[i]);
      if(types[i].equals(getModel().getConfigType())) {
        selected = i;
      }
    }
    list.setSelectedIndex(selected);
    list.requestFocus();
  }

  /**
   * Add the list to the panel, setup the listener to set the model when the
   * pipeline selection changes.
   */
  private void setupRightPanel() {
    listmodel = new DefaultListModel();
    list = new JList();
    list.setModel(listmodel);
    list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
    list.addListSelectionListener(new ListSelectionListener() {
        public void valueChanged(ListSelectionEvent e) {
          if (!e.getValueIsAdjusting()) {
            //          int index = e.getFirstIndex();
            String configType = (String) list.getSelectedValue();

            if (configType != null) {
              getModel().setConfigType(configType);
            }
          }
        }
      });
    this.setBorder(BorderFactory.createEmptyBorder(10, 20, 10, 20));
    this.add(new JScrollPane(list));
  }
}

[Babeldoc-devel] babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addstage AddPipelineStageController.java,1.4,1.5 AddPipelineStageModel.java,1.6,1.7 GetStageConfigWizardPanel.java,1.4,1.5

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addstage
In directory sc8-pr-cvs1:/tmp/cvs-serv19450/com/babeldoc/gui/wizard/addstage

Modified Files:
	AddPipelineStageController.java AddPipelineStageModel.java 
	GetStageConfigWizardPanel.java 
Log Message:
Lots of GUI loving!  Been working on the pipeline builder tool
and getting into some shape.  Now the pipeline stage configuration editing is looking a whole lot better.

Index: AddPipelineStageController.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addstage/AddPipelineStageController.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AddPipelineStageController.java	11 Jun 2003 23:35:38 -0000	1.4
--- AddPipelineStageController.java	13 Sep 2003 15:33:11 -0000	1.5
***************
*** 91,97 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param model DOCUMENT ME!
     */
    public void setModel(AddPipelineStageModel model) {
--- 91,97 ----
  
    /**
!    * Set the model
     *
!    * @param model
     */
    public void setModel(AddPipelineStageModel model) {
***************
*** 143,149 ****
    public void finish(WizardPanel current) {
      if (((GetStageConfigWizardPanel) current).getConfigPanel().isValid()) {
-       GetStageConfigWizardPanel cfgpanel = (GetStageConfigWizardPanel) current;
-       this.getModel().setPipelineStageConfiguration(cfgpanel.getConfigPanel()
-                                                             .getStageProperties());
        this.getModel().setFinished(true);
        closeDialog();
--- 143,146 ----

Index: AddPipelineStageModel.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addstage/AddPipelineStageModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AddPipelineStageModel.java	26 Aug 2003 22:23:32 -0000	1.6
--- AddPipelineStageModel.java	13 Sep 2003 15:33:11 -0000	1.7
***************
*** 67,77 ****
  
  import com.babeldoc.core.option.IConfigInfo;
  import com.babeldoc.core.pipeline.*;
  
  import com.babeldoc.gui.pipeline.builder.PipelineBuilderModel;
  import com.babeldoc.gui.wizard.WizardModel;
  
- import java.util.Properties;
- 
  
  /**
--- 67,77 ----
  
  import com.babeldoc.core.option.IConfigInfo;
+ import com.babeldoc.core.option.MutableConfigValueException;
  import com.babeldoc.core.pipeline.*;
+ import com.babeldoc.core.LogService;
  
  import com.babeldoc.gui.pipeline.builder.PipelineBuilderModel;
  import com.babeldoc.gui.wizard.WizardModel;
  
  
  /**
***************
*** 82,85 ****
--- 82,86 ----
    private String stage;
    private String stageType;
+   private IConfigInfo stageInfo;
    private boolean pipelineChangeable = true;
    private boolean showDefaults = true;
***************
*** 172,198 ****
     * @return
     *
-    * @throws Exception
     */
!   public IConfigInfo getPipelineStageConfigInfo() throws Exception {
!     Class stage = PipelineStageType.getPipelineStageType(stageType)
!                                    .getTypeClass();
  
!     if (stage != null) {
!       IPipelineStage pstage = (IPipelineStage) (stage.newInstance());
  
!       return pstage.getInfo();
!     } else {
!       return null;
      }
    }
  
-   /**
-    * TODO: DOCUMENT ME!
-    *
-    * @param properties DOCUMENT ME!
-    */
-   public void setPipelineStageConfiguration(Properties properties) {
-     PipelineBuilderModel.setPipelineStageProperties(pipeline, stage, properties);
-   }
  
    /**
--- 173,205 ----
     * @return
     *
     */
!   public IConfigInfo getPipelineStageConfigInfo() {
!     if(stageInfo==null) {
!       Class stageClass = PipelineStageType.getPipelineStageType(stageType).getTypeClass();
  
!       if (stage != null) {
!         try {
!           IPipelineStage pstage = (IPipelineStage) (stageClass.newInstance());
  
!           // Setup the pipeline stage & the information objects
!           pstage.setName(getStage());
!           stageInfo = pstage.getInfo();
!           stageInfo.setName(getStage());
!           try {
!             stageInfo.getOption("stageType").setValue(getStageType());
!           } catch (MutableConfigValueException e) {
!             // Should never happen with stageType
!           }
! 
!         } catch (InstantiationException e) {
!           LogService.getInstance().logError(e);
!         } catch (IllegalAccessException e) {
!           LogService.getInstance().logError(e);
!         }
!       }
      }
+     return stageInfo;
    }
  
  
    /**

Index: GetStageConfigWizardPanel.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addstage/GetStageConfigWizardPanel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GetStageConfigWizardPanel.java	26 Aug 2003 22:23:32 -0000	1.4
--- GetStageConfigWizardPanel.java	13 Sep 2003 15:33:11 -0000	1.5
***************
*** 108,117 ****
        configPanel.removeAll();
        configPanel.initialize(getModel().getPipelineStageConfigInfo());
! 
!       if (getModel().isShowDefaults()) {
!         configPanel.displayDefaults();
!       } else {
!         configPanel.displayValues();
!       }
      } catch (Exception e) {
        e.printStackTrace();
--- 108,112 ----
        configPanel.removeAll();
        configPanel.initialize(getModel().getPipelineStageConfigInfo());
!       configPanel.displayValues();
      } catch (Exception e) {
        e.printStackTrace();

[Babeldoc-devel] babeldoc/modules/gui/src/com/babeldoc/gui/treetable AbstractTreeTableModel.java,1.1,1.2 JTreeTable.java,1.1,1.2 TreeTableModel.java,1.1,1.2 TreeTableModelAdapter.java,1.1,1.2

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/treetable
In directory sc8-pr-cvs1:/tmp/cvs-serv19450/com/babeldoc/gui/treetable

Modified Files:
	AbstractTreeTableModel.java JTreeTable.java 
	TreeTableModel.java TreeTableModelAdapter.java 
Log Message:
Lots of GUI loving!  Been working on the pipeline builder tool
and getting into some shape.  Now the pipeline stage configuration editing is looking a whole lot better.

Index: AbstractTreeTableModel.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/treetable/AbstractTreeTableModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractTreeTableModel.java	12 Jun 2003 04:51:25 -0000	1.1
--- AbstractTreeTableModel.java	13 Sep 2003 15:33:11 -0000	1.2
***************
*** 1,4 ****
  /*
!  * @(#)AbstractTreeTableModel.java	1.2 98/10/27
   *
   * Copyright 1997, 1998 by Sun Microsystems, Inc.,
--- 1,6 ----
+ package com.babeldoc.gui.treetable;
+ 
  /*
!  * @(#)com.babeldoc.gui.treetable.AbstractTreeTableModel.java	1.2 98/10/27
   *
   * Copyright 1997, 1998 by Sun Microsystems, Inc.,
***************
*** 12,16 ****
   * you entered into with Sun.
   */
- package com.babeldoc.gui.treetable;
  
  import javax.swing.event.EventListenerList;
--- 14,17 ----
***************
*** 21,25 ****
  /**
   * @version 1.2 10/27/98
!  * An abstract implementation of the TreeTableModel interface, handling the list
   * of listeners.
   * @author Philip Milne
--- 22,26 ----
  /**
   * @version 1.2 10/27/98
!  * An abstract implementation of the com.babeldoc.gui.treetable.TreeTableModel interface, handling the list
   * of listeners.
   * @author Philip Milne
***************
*** 172,176 ****
  
    //
!   // Default impelmentations for methods in the TreeTableModel interface.
    //
  
--- 173,177 ----
  
    //
!   // Default impelmentations for methods in the com.babeldoc.gui.treetable.TreeTableModel interface.
    //
  

Index: JTreeTable.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/treetable/JTreeTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JTreeTable.java	12 Jun 2003 04:51:25 -0000	1.1
--- JTreeTable.java	13 Sep 2003 15:33:11 -0000	1.2
***************
*** 2,71 ****
  
  /*
!  * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
!  *
!  * Redistribution and use in source and binary forms, with or
!  * without modification, are permitted provided that the following
!  * conditions are met:
!  *
!  * - Redistributions of source code must retain the above copyright
!  *   notice, this list of conditions and the following disclaimer.
!  *
!  * - Redistribution in binary form must reproduce the above
!  *   copyright notice, this list of conditions and the following
!  *   disclaimer in the documentation and/or other materials
!  *   provided with the distribution.
!  *
!  * Neither the name of Sun Microsystems, Inc. or the names of
!  * contributors may be used to endorse or promote products derived
!  * from this software without specific prior written permission.
   *
!  * This software is provided "AS IS," without a warranty of any
!  * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
!  * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
!  * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
!  * EXCLUDED. SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY
!  * DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR
!  * RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE OR
!  * ITS DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE
!  * FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT,
!  * SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER
!  * CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF
!  * THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS
!  * BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
   *
!  * You acknowledge that this software is not designed, licensed or
!  * intended for use in the design, construction, operation or
!  * maintenance of any nuclear facility.
   */
  
- import com.babeldoc.gui.treetable.TreeTableModel;
- import com.babeldoc.gui.treetable.TreeTableModelAdapter;
- 
  import javax.swing.*;
- import javax.swing.border.Border;
  import javax.swing.event.ListSelectionEvent;
  import javax.swing.event.ListSelectionListener;
  import javax.swing.table.TableCellRenderer;
  import javax.swing.tree.*;
  import java.awt.*;
- import java.awt.event.InputEvent;
  import java.awt.event.MouseEvent;
  import java.util.EventObject;
  
  public class JTreeTable extends JTable {
    /** A subclass of JTree. */
    protected TreeTableCellRenderer tree;
  
- 
    public JTreeTable(TreeTableModel treeTableModel) {
      super();
  
! // Creates the tree. It will be used as a renderer and editor.
      tree = new TreeTableCellRenderer(treeTableModel);
  
! // Installs a tableModel representing the visible rows in the tree.
      super.setModel(new TreeTableModelAdapter(treeTableModel, tree));
  
! // Forces the JTable and JTree to share their row selection models.
      ListToTreeSelectionModelWrapper selectionWrapper = new
          ListToTreeSelectionModelWrapper();
--- 2,52 ----
  
  /*
!  * @(#)com.babeldoc.gui.treetable.JTreeTable.java	1.2 98/10/27
   *
!  * Copyright 1997, 1998 by Sun Microsystems, Inc.,
!  * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
!  * All rights reserved.
   *
!  * This software is the confidential and proprietary information
!  * of Sun Microsystems, Inc. ("Confidential Information").  You
!  * shall not disclose such Confidential Information and shall use
!  * it only in accordance with the terms of the license agreement
!  * you entered into with Sun.
   */
  
  import javax.swing.*;
  import javax.swing.event.ListSelectionEvent;
  import javax.swing.event.ListSelectionListener;
+ import javax.swing.table.TableCellEditor;
  import javax.swing.table.TableCellRenderer;
  import javax.swing.tree.*;
  import java.awt.*;
  import java.awt.event.MouseEvent;
  import java.util.EventObject;
  
+ /**
+  * This example shows how to create a simple com.babeldoc.gui.treetable.JTreeTable component,
+  * by using a JTree as a renderer (and editor) for the cells in a
+  * particular column in the JTable.
+  *
+  * @version 1.2 10/27/98
+  *
+  * @author Philip Milne
+  * @author Scott Violet
+  */
  public class JTreeTable extends JTable {
    /** A subclass of JTree. */
    protected TreeTableCellRenderer tree;
  
    public JTreeTable(TreeTableModel treeTableModel) {
      super();
  
! // Create the tree. It will be used as a renderer and editor.
      tree = new TreeTableCellRenderer(treeTableModel);
  
! // Install a tableModel representing the visible rows in the tree.
      super.setModel(new TreeTableModelAdapter(treeTableModel, tree));
  
! // Force the JTable and JTree to share their row selection models.
      ListToTreeSelectionModelWrapper selectionWrapper = new
          ListToTreeSelectionModelWrapper();
***************
*** 73,77 ****
      setSelectionModel(selectionWrapper.getListSelectionModel());
  
! // Installs the tree editor renderer and editor.
      setDefaultRenderer(TreeTableModel.class, tree);
      setDefaultEditor(TreeTableModel.class, new TreeTableCellEditor());
--- 54,58 ----
      setSelectionModel(selectionWrapper.getListSelectionModel());
  
! // Install the tree editor renderer and editor.
      setDefaultRenderer(TreeTableModel.class, tree);
      setDefaultEditor(TreeTableModel.class, new TreeTableCellEditor());
***************
*** 87,97 ****
      if (tree.getRowHeight() < 1) {
        // Metal looks better like this.
!       setRowHeight(20);
      }
    }
  
    /**
     * Overridden to message super and forward the method to the tree.
!    * Since the tree is not actually in the component hierarchy it will
     * never receive this unless we forward it in this manner.
     */
--- 68,79 ----
      if (tree.getRowHeight() < 1) {
        // Metal looks better like this.
!       setRowHeight(18);
      }
    }
  
+ 
    /**
     * Overridden to message super and forward the method to the tree.
!    * Since the tree is not actually in the component hieachy it will
     * never receive this unless we forward it in this manner.
     */
***************
*** 100,107 ****
      if (tree != null) {
        tree.updateUI();
-       // Do this so that the editor is referencing the current renderer
-       // from the tree. The renderer can potentially change each time
-       // laf changes.
-       setDefaultEditor(TreeTableModel.class, new TreeTableCellEditor());
      }
  // Use the tree's default foreground and background colors in the
--- 82,85 ----
***************
*** 111,118 ****
    }
  
!   /**
!    * Workaround for BasicTableUI anomaly. Make sure the UI never tries to
!    * resize the editor. The UI currently uses different techniques to
!    * paint the renderers and editors; overriding setBounds() below
     * is not the right thing to do for an editor. Returning -1 for the
     * editing row in this case, ensures the editor is never painted.
--- 89,95 ----
    }
  
!   /* Workaround for BasicTableUI anomaly. Make sure the UI never tries to
!    * paint the editor. The UI currently uses different techniques to
!    * paint the renderers and editors and overriding setBounds() below
     * is not the right thing to do for an editor. Returning -1 for the
     * editing row in this case, ensures the editor is never painted.
***************
*** 124,154 ****
  
    /**
-    * Returns the actual row that is editing as <code>getEditingRow</code>
-    * will always return -1.
-    */
-   private int realEditingRow() {
-     return editingRow;
-   }
- 
-   /**
-    * This is overridden to invoke super's implementation, and then,
-    * if the receiver is editing a Tree column, the editor's bounds is
-    * reset. The reason we have to do this is because JTable doesn't
-    * think the table is being edited, as <code>getEditingRow</code> returns
-    * -1, and therefore doesn't automatically resize the editor for us.
-    */
-   public void sizeColumnsToFit(int resizingColumn) {
-     super.sizeColumnsToFit(resizingColumn);
-     if (getEditingColumn() != -1 && getColumnClass(editingColumn) ==
-         TreeTableModel.class) {
-       Rectangle cellRect = getCellRect(realEditingRow(),
-           getEditingColumn(), false);
-       Component component = getEditorComponent();
-       component.setBounds(cellRect);
-       component.validate();
-     }
-   }
- 
-   /**
     * Overridden to pass the new rowHeight to the tree.
     */
--- 101,104 ----
***************
*** 168,185 ****
  
    /**
-    * Overridden to invoke repaint for the particular location if
-    * the column contains the tree. This is done as the tree editor does
-    * not fill the bounds of the cell, we need the renderer to paint
-    * the tree in the background, and then draw the editor over it.
-    */
-   public boolean editCellAt(int row, int column, EventObject e) {
-     boolean retValue = super.editCellAt(row, column, e);
-     if (retValue && getColumnClass(column) == TreeTableModel.class) {
-       repaint(getCellRect(row, column, false));
-     }
-     return retValue;
-   }
- 
-   /**
     * A TreeCellRenderer that displays a JTree.
     */
--- 118,121 ----
***************
*** 188,194 ****
      /** Last table/tree row asked to renderer. */
      protected int visibleRow;
-     /** Border to draw around the tree, if this is non-null, it will
-      * be painted. */
-     protected Border highlightBorder;
  
      public TreeTableCellRenderer(TreeModel model) {
--- 124,127 ----
***************
*** 246,255 ****
        g.translate(0, -visibleRow * getRowHeight());
        super.paint(g);
-       // Draw the Table border if we have focus.
-       if (highlightBorder != null) {
-         highlightBorder.paintBorder(this, g, 0, visibleRow *
-             getRowHeight(), getWidth(),
-             getRowHeight());
-       }
      }
  
--- 179,182 ----
***************
*** 262,304 ****
                                                     boolean hasFocus,
                                                     int row, int column) {
!       Color background;
!       Color foreground;
! 
!       if (isSelected) {
!         background = table.getSelectionBackground();
!         foreground = table.getSelectionForeground();
!       } else {
!         background = table.getBackground();
!         foreground = table.getForeground();
!       }
!       highlightBorder = null;
!       if (realEditingRow() == row && getEditingColumn() == column) {
!         background = UIManager.getColor("Table.focusCellBackground");
!         foreground = UIManager.getColor("Table.focusCellForeground");
!       } else if (hasFocus) {
!         highlightBorder = UIManager.getBorder
!             ("Table.focusCellHighlightBorder");
!         if (isCellEditable(row, column)) {
!           background = UIManager.getColor
!               ("Table.focusCellBackground");
!           foreground = UIManager.getColor
!               ("Table.focusCellForeground");
!         }
!       }
  
        visibleRow = row;
-       setBackground(background);
- 
-       TreeCellRenderer tcr = getCellRenderer();
-       if (tcr instanceof DefaultTreeCellRenderer) {
-         DefaultTreeCellRenderer dtcr = ((DefaultTreeCellRenderer) tcr);
-         if (isSelected) {
-           dtcr.setTextSelectionColor(foreground);
-           dtcr.setBackgroundSelectionColor(background);
-         } else {
-           dtcr.setTextNonSelectionColor(foreground);
-           dtcr.setBackgroundNonSelectionColor(background);
-         }
-       }
        return this;
      }
--- 189,198 ----
                                                     boolean hasFocus,
                                                     int row, int column) {
!       if (isSelected)
!         setBackground(table.getSelectionBackground());
!       else
!         setBackground(table.getBackground());
  
        visibleRow = row;
        return this;
      }
***************
*** 307,425 ****
  
    /**
!    * An editor that can be used to edit the tree column. This extends
!    * DefaultCellEditor and uses a JTextField (actually, TreeTableTextField)
!    * to perform the actual editing.
!    * <p>To support editing of the tree column we can not make the tree
!    * editable. The reason this doesn't work is that you can not use
!    * the same component for editing and renderering. The table may have
!    * the need to paint cells, while a cell is being edited. If the same
!    * component were used for the rendering and editing the component would
!    * be moved around, and the contents would change. When editing, this
!    * is undesirable, the contents of the text field must stay the same,
!    * including the caret blinking, and selections persisting. For this
!    * reason the editing is done via a TableCellEditor.
!    * <p>Another interesting thing to be aware of is how tree positions
!    * its render and editor. The render/editor is responsible for drawing the
!    * icon indicating the type of node (leaf, branch...). The tree is
!    * responsible for drawing any other indicators, perhaps an additional
!    * +/- sign, or lines connecting the various nodes. So, the renderer
!    * is positioned based on depth. On the other hand, table always makes
!    * its editor fill the contents of the cell. To get the allusion
!    * that the table cell editor is part of the tree, we don't want the
!    * table cell editor to fill the cell bounds. We want it to be placed
!    * in the same manner as tree places it editor, and have table message
!    * the tree to paint any decorations the tree wants. Then, we would
!    * only have to worry about the editing part. The approach taken
!    * here is to determine where tree would place the editor, and to override
!    * the <code>reshape</code> method in the JTextField component to
!    * nudge the textfield to the location tree would place it. Since
!    * JTreeTable will paint the tree behind the editor everything should
!    * just work. So, that is what we are doing here. Determining of
!    * the icon position will only work if the TreeCellRenderer is
!    * an instance of DefaultTreeCellRenderer. If you need custom
!    * TreeCellRenderers, that don't descend from DefaultTreeCellRenderer,
!    * and you want to support editing in JTreeTable, you will have
!    * to do something similiar.
     */
!   public class TreeTableCellEditor extends DefaultCellEditor {
!     public TreeTableCellEditor() {
!       super(new TreeTableTextField());
!     }
! 
!     /**
!      * Overridden to determine an offset that tree would place the
!      * editor at. The offset is determined from the
!      * <code>getRowBounds</code> JTree method, and additionally
!      * from the icon DefaultTreeCellRenderer will use.
!      * <p>The offset is then set on the TreeTableTextField component
!      * created in the constructor, and returned.
!      */
      public Component getTableCellEditorComponent(JTable table,
                                                   Object value,
                                                   boolean isSelected,
                                                   int r, int c) {
!       Component component = super.getTableCellEditorComponent
!           (table, value, isSelected, r, c);
!       JTree t = getTree();
!       boolean rv = t.isRootVisible();
!       int offsetRow = rv ? r : r - 1;
!       Rectangle bounds = t.getRowBounds(offsetRow);
!       int offset = bounds.x;
!       TreeCellRenderer tcr = t.getCellRenderer();
!       if (tcr instanceof DefaultTreeCellRenderer) {
!         Object node = t.getPathForRow(offsetRow).
!             getLastPathComponent();
!         Icon icon;
!         if (t.getModel().isLeaf(node))
!           icon = ((DefaultTreeCellRenderer) tcr).getLeafIcon();
!         else if (tree.isExpanded(offsetRow))
!           icon = ((DefaultTreeCellRenderer) tcr).getOpenIcon();
!         else
!           icon = ((DefaultTreeCellRenderer) tcr).getClosedIcon();
!         if (icon != null) {
!           offset += ((DefaultTreeCellRenderer) tcr).getIconTextGap() +
!               icon.getIconWidth();
!         }
!       }
!       ((TreeTableTextField) getComponent()).offset = offset;
!       return component;
      }
  
      /**
!      * This is overridden to forward the event to the tree. This will
!      * return true if the click count >= 3, or the event is null.
       */
      public boolean isCellEditable(EventObject e) {
        if (e instanceof MouseEvent) {
!         MouseEvent me = (MouseEvent) e;
!         // If the modifiers are not 0 (or the left mouse button),
!         // tree may try and toggle the selection, and table
!         // will then try and toggle, resulting in the
!         // selection remaining the same. To avoid this, we
!         // only dispatch when the modifiers are 0 (or the left mouse
!         // button).
!         if (me.getModifiers() == 0 ||
!             me.getModifiers() == InputEvent.BUTTON1_MASK) {
!           for (int counter = getColumnCount() - 1; counter >= 0;
!                counter--) {
!             if (getColumnClass(counter) == TreeTableModel.class) {
!               MouseEvent newME = new MouseEvent
!                   (JTreeTable.this.tree, me.getID(),
!                       me.getWhen(), me.getModifiers(),
!                       me.getX() - getCellRect(0, counter, true).x,
!                       me.getY(), me.getClickCount(),
!                       me.isPopupTrigger());
!               JTreeTable.this.tree.dispatchEvent(newME);
!               break;
!             }
            }
          }
-         if (me.getClickCount() >= 3) {
-           return true;
-         }
-         return false;
-       }
-       if (e == null) {
-         return true;
        }
        return false;
--- 201,249 ----
  
    /**
!    * TreeTableCellEditor implementation. Component returned is the
!    * JTree.
     */
!   public class TreeTableCellEditor extends AbstractCellEditor implements
!       TableCellEditor {
      public Component getTableCellEditorComponent(JTable table,
                                                   Object value,
                                                   boolean isSelected,
                                                   int r, int c) {
!       return tree;
      }
  
      /**
!      * Overridden to return false, and if the event is a mouse event
!      * it is forwarded to the tree.<p>
!      * The behavior for this is debatable, and should really be offered
!      * as a property. By returning false, all keyboard actions are
!      * implemented in terms of the table. By returning true, the
!      * tree would get a chance to do something with the keyboard
!      * events. For the most part this is ok. But for certain keys,
!      * such as left/right, the tree will expand/collapse where as
!      * the table focus should really move to a different column. Page
!      * up/down should also be implemented in terms of the table.
!      * By returning false this also has the added benefit that clicking
!      * outside of the bounds of the tree node, but still in the tree
!      * column will select the row, whereas if this returned true
!      * that wouldn't be the case.
!      * <p>By returning false we are also enforcing the policy that
!      * the tree will never be editable (at least by a key sequence).
       */
      public boolean isCellEditable(EventObject e) {
        if (e instanceof MouseEvent) {
!         for (int counter = getColumnCount() - 1; counter >= 0;
!              counter--) {
!           if (getColumnClass(counter) == TreeTableModel.class) {
!             MouseEvent me = (MouseEvent) e;
!             MouseEvent newME = new MouseEvent(tree, me.getID(),
!                 me.getWhen(), me.getModifiers(),
!                 me.getX() - getCellRect(0, counter, true).x,
!                 me.getY(), me.getClickCount(),
!                 me.isPopupTrigger());
!             tree.dispatchEvent(newME);
!             break;
            }
          }
        }
        return false;
***************
*** 429,447 ****
  
    /**
-    * Component used by TreeTableCellEditor. The only thing this does
-    * is to override the <code>reshape</code> method, and to ALWAYS
-    * make the x location be <code>offset</code>.
-    */
-   static class TreeTableTextField extends JTextField {
-     public int offset;
- 
-     public void reshape(int x, int y, int w, int h) {
-       int newX = Math.max(x, offset);
-       super.reshape(newX, y, w - (newX - x), h);
-     }
-   }
- 
- 
-   /**
     * ListToTreeSelectionModelWrapper extends DefaultTreeSelectionModel
     * to listen for changes in the ListSelectionModel it maintains. Once
--- 253,256 ----
***************
*** 540,543 ****
    }
  }
- 
- 
--- 349,350 ----

Index: TreeTableModel.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/treetable/TreeTableModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TreeTableModel.java	12 Jun 2003 04:51:25 -0000	1.1
--- TreeTableModel.java	13 Sep 2003 15:33:11 -0000	1.2
***************
*** 1,4 ****
  /*
!  * TreeTableModel.java
   *
   * Copyright (c) 1998 Sun Microsystems, Inc. All Rights Reserved.
--- 1,6 ----
+ package com.babeldoc.gui.treetable;
+ 
  /*
!  * com.babeldoc.gui.treetable.TreeTableModel.java
   *
   * Copyright (c) 1998 Sun Microsystems, Inc. All Rights Reserved.
***************
*** 18,31 ****
   *
   */
- package com.babeldoc.gui.treetable;
  
  import javax.swing.tree.TreeModel;
  
  /**
!  * TreeTableModel is the model used by a JTreeTable. It extends TreeModel
   * to add methods for getting inforamtion about the set of columns each
!  * node in the TreeTableModel may have. Each column, like a column in
   * a TableModel, has a name and a type associated with it. Each node in
!  * the TreeTableModel can return a value for each of the columns and
   * set that value if isCellEditable() returns true.
   *
--- 20,32 ----
   *
   */
  
  import javax.swing.tree.TreeModel;
  
  /**
!  * com.babeldoc.gui.treetable.TreeTableModel is the model used by a com.babeldoc.gui.treetable.JTreeTable. It extends TreeModel
   * to add methods for getting inforamtion about the set of columns each
!  * node in the com.babeldoc.gui.treetable.TreeTableModel may have. Each column, like a column in
   * a TableModel, has a name and a type associated with it. Each node in
!  * the com.babeldoc.gui.treetable.TreeTableModel can return a value for each of the columns and
   * set that value if isCellEditable() returns true.
   *

Index: TreeTableModelAdapter.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/treetable/TreeTableModelAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TreeTableModelAdapter.java	12 Jun 2003 04:51:25 -0000	1.1
--- TreeTableModelAdapter.java	13 Sep 2003 15:33:11 -0000	1.2
***************
*** 1,4 ****
  /*
!  * @(#)TreeTableModelAdapter.java	1.2 98/10/27
   *
   * Copyright 1997, 1998 by Sun Microsystems, Inc.,
--- 1,6 ----
+ package com.babeldoc.gui.treetable;
+ 
  /*
!  * @(#)com.babeldoc.gui.treetable.TreeTableModelAdapter.java	1.2 98/10/27
   *
   * Copyright 1997, 1998 by Sun Microsystems, Inc.,
***************
*** 13,18 ****
   */
  
- package com.babeldoc.gui.treetable;
- 
  import javax.swing.*;
  import javax.swing.event.TreeExpansionEvent;
--- 15,18 ----
***************
*** 24,28 ****
  
  /**
!  * This is a wrapper class takes a TreeTableModel and implements
   * the table model interface. The implementation is trivial, with
   * all of the event dispatching support provided by the superclass:
--- 24,28 ----
  
  /**
!  * This is a wrapper class takes a com.babeldoc.gui.treetable.TreeTableModel and implements
   * the table model interface. The implementation is trivial, with
   * all of the event dispatching support provided by the superclass:
***************
*** 95,99 ****
    }
  
!   public Object nodeForRow(int row) {
      TreePath treePath = tree.getPathForRow(row);
      return treePath.getLastPathComponent();
--- 95,99 ----
    }
  
!   protected Object nodeForRow(int row) {
      TreePath treePath = tree.getPathForRow(row);
      return treePath.getLastPathComponent();