Update of /cvsroot/xdoclet/generama/src/main/java/org/generama
In directory sc8-pr-cvs1:/tmp/cvs-serv31484/src/main/java/org/generama
Modified Files:
AbstractPlugin.java Generama.java MetadataProvider.java
Plugin.java WriterMapper.java
Removed Files:
AbstractGeneramaTestCase.java PluginContainer.java
Log Message:
Big refactoring. Simplifications mostly.
Index: AbstractPlugin.java
===================================================================
RCS file: /cvsroot/xdoclet/generama/src/main/java/org/generama/AbstractPlugin.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AbstractPlugin.java 10 Sep 2003 14:06:51 -0000 1.4
--- AbstractPlugin.java 20 Sep 2003 12:24:32 -0000 1.5
***************
*** 63,67 ****
}
! public File getDestdir() {
return destdir;
}
--- 63,67 ----
}
! public File getDestdirFile() {
return destdir;
}
***************
*** 84,90 ****
}
! public void execute() throws IOException, GeneramaException {
Collection metadata = metadataProvider.getMetadata();
-
if(metadata == null) {
throw new GeneramaException("Metadata was null. Got metadata from " +
metadataProvider.toString(), null);
--- 84,89 ----
}
! public void execute() throws IOException, Exception {
Collection metadata = metadataProvider.getMetadata();
if(metadata == null) {
throw new GeneramaException("Metadata was null. Got metadata from " +
metadataProvider.toString(), null);
***************
*** 99,104 ****
Object meta = (Object) iterator.next();
if(shouldGenerate(meta)) {
! String metaName = metadataProvider.getOriginalFileName(meta);
! Writer out = writerMapper.getWriter(metaName, this);
generate(out, meta);
}
--- 98,102 ----
Object meta = (Object) iterator.next();
if(shouldGenerate(meta)) {
! Writer out = writerMapper.getWriter(meta, this);
generate(out, meta);
}
Index: Generama.java
===================================================================
RCS file: /cvsroot/xdoclet/generama/src/main/java/org/generama/Generama.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Generama.java 10 Sep 2003 14:06:51 -0000 1.3
--- Generama.java 20 Sep 2003 12:24:32 -0000 1.4
***************
*** 1,14 ****
package org.generama;
- import org.picocontainer.defaults.DefaultPicoContainer;
- import org.picocontainer.defaults.ComponentAdapterFactory;
- import org.picocontainer.defaults.DefaultComponentAdapterFactory;
import org.picocontainer.MutablePicoContainer;
! import org.picocontainer.extras.InvokingComponentAdapterFactory;
!
/**
! * Generama is a class that can create a <a
href="http://www.picocontainer.org/";>PicoContainer</a>
! * which is preconfigured with some components that will do code generation.
*
* @author Aslak Hellesøy
--- 1,9 ----
package org.generama;
import org.picocontainer.MutablePicoContainer;
! import org.generama.velocity.ClasspathVelocityComponent;
/**
! * This class installs the core Generama components in a <a
href="http://www.picocontainer.org/";>PicoContainer</a>
*
* @author Aslak Hellesøy
***************
*** 24,39 ****
}
! // TODO we should use a helper pico to lace together the factories,
!
! public MutablePicoContainer createPicoContainer() {
! ComponentAdapterFactory defaultFactory = new
DefaultComponentAdapterFactory();
! ComponentAdapterFactory invokingFactory = new
InvokingComponentAdapterFactory(defaultFactory, "execute", null, null);
!
! MutablePicoContainer pico = new DefaultPicoContainer(invokingFactory);
!
pico.registerComponentImplementation(MetadataProvider.class,
metadataProviderClass);
pico.registerComponentImplementation(WriterMapper.class, writerMapperClass);
-
- return pico;
}
}
--- 19,30 ----
}
! /**
! * Installs the Generama components. <b>It is essential that pico is
instantiated with
! * a chain of executing (execute()) and beanprop comp factories.
! */
! public void install(MutablePicoContainer pico) {
! pico.registerComponentImplementation(ClasspathVelocityComponent.class);
pico.registerComponentImplementation(MetadataProvider.class,
metadataProviderClass);
pico.registerComponentImplementation(WriterMapper.class, writerMapperClass);
}
}
Index: MetadataProvider.java
===================================================================
RCS file: /cvsroot/xdoclet/generama/src/main/java/org/generama/MetadataProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MetadataProvider.java 10 Sep 2003 14:06:51 -0000 1.3
--- MetadataProvider.java 20 Sep 2003 12:24:32 -0000 1.4
***************
*** 9,15 ****
*/
public interface MetadataProvider {
! Collection getMetadata();
String getOriginalFileName(Object metadata);
-
String getOriginalPackageName(Object metadata);
}
--- 9,14 ----
*/
public interface MetadataProvider {
! Collection getMetadata() throws Exception ;
String getOriginalFileName(Object metadata);
String getOriginalPackageName(Object metadata);
}
Index: Plugin.java
===================================================================
RCS file: /cvsroot/xdoclet/generama/src/main/java/org/generama/Plugin.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Plugin.java 10 Sep 2003 14:06:51 -0000 1.5
--- Plugin.java 20 Sep 2003 12:24:32 -0000 1.6
***************
*** 2,6 ****
import java.io.IOException;
- import java.io.File;
/**
--- 2,5 ----
***************
*** 12,18 ****
// boolean shouldGenerate(Object metadata);
// boolean isMultiOutput();
! // File getDestdir();
// String getDestinationPackage(Object metadata);
// String getDestinationFilename(Object metadata);
! public void execute() throws IOException, GeneramaException;
}
--- 11,17 ----
// boolean shouldGenerate(Object metadata);
// boolean isMultiOutput();
! // File getDestdirFile();
// String getDestinationPackage(Object metadata);
// String getDestinationFilename(Object metadata);
! public void execute() throws IOException, Exception;
}
Index: WriterMapper.java
===================================================================
RCS file: /cvsroot/xdoclet/generama/src/main/java/org/generama/WriterMapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** WriterMapper.java 10 Sep 2003 14:06:51 -0000 1.3
--- WriterMapper.java 20 Sep 2003 12:24:32 -0000 1.4
***************
*** 10,13 ****
*/
public interface WriterMapper {
! Writer getWriter(String string, AbstractPlugin plugin) throws IOException;
}
--- 10,13 ----
*/
public interface WriterMapper {
! Writer getWriter(Object metadata, AbstractPlugin plugin) throws IOException;
}
--- AbstractGeneramaTestCase.java DELETED ---
--- PluginContainer.java DELETED ---
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
