You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xmlbeans-cvs@xml.apache.org by pc...@apache.org on 2004/03/02 09:28:19 UTC
cvs commit: xml-xmlbeans/v2/test/src/jamtest/tests/org/apache/xmlbeans/test/jam ClassesJamTest.java ParserJamTest.java SourcesJamTest.java
pcal 2004/03/02 00:28:19
Modified: v2/src/jam/org/apache/xmlbeans/impl/jam JServiceFactory.java
v2/src/jam/org/apache/xmlbeans/impl/jam/provider
DefaultJResultFactory.java
v2/test/src/jamtest/tests/org/apache/xmlbeans/test/jam
ClassesJamTest.java ParserJamTest.java
SourcesJamTest.java
Log:
jam: more un-renaming
Revision Changes Path
1.5 +4 -4 xml-xmlbeans/v2/src/jam/org/apache/xmlbeans/impl/jam/JServiceFactory.java
Index: JServiceFactory.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/jam/org/apache/xmlbeans/impl/jam/JServiceFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JServiceFactory.java 2 Mar 2004 06:32:13 -0000 1.4
+++ JServiceFactory.java 2 Mar 2004 08:28:19 -0000 1.5
@@ -64,7 +64,7 @@
* Create a new JServiceParams instance. The params can be populated
* and then given to the createService method to create a new JService.
*/
- public abstract JServiceParams createResultParams();
+ public abstract JServiceParams createServiceParams();
/**
* Create a new JService from the given parameters.
@@ -73,18 +73,18 @@
* @throws IllegalArgumentException if the params is null or not
* an instance returned by createServiceParams().
*/
- public abstract JService createResult(JServiceParams params) throws IOException;
+ public abstract JService createService(JServiceParams params) throws IOException;
// ========================================================================
// main() method
public static void main(String[] args) {
try {
- JServiceParams sp = getInstance().createResultParams();
+ JServiceParams sp = getInstance().createServiceParams();
for(int i=0; i<args.length; i++) {
sp.includeSourceFiles(new File("."),args[i]);
}
- JService service = getInstance().createResult(sp);
+ JService service = getInstance().createService(sp);
JamPrinter jp = JamPrinter.newInstance();
PrintWriter out = new PrintWriter(System.out);
for(JClassIterator i = service.getClasses(); i.hasNext(); ) {
1.4 +2 -2 xml-xmlbeans/v2/src/jam/org/apache/xmlbeans/impl/jam/provider/DefaultJResultFactory.java
Index: DefaultJResultFactory.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/jam/org/apache/xmlbeans/impl/jam/provider/DefaultJResultFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultJResultFactory.java 2 Mar 2004 06:32:13 -0000 1.3
+++ DefaultJResultFactory.java 2 Mar 2004 08:28:19 -0000 1.4
@@ -45,11 +45,11 @@
// ========================================================================
// JServiceFactory implementation
- public JServiceParams createResultParams() {
+ public JServiceParams createServiceParams() {
return new JServiceParamsImpl();
}
- public JService createResult(JServiceParams jsps) throws IOException {
+ public JService createService(JServiceParams jsps) throws IOException {
//assert that they aren't implementing JServiceParams themselves or
//getting them from somewhere else
if (!(jsps instanceof JServiceParamsImpl)) {
1.4 +2 -2 xml-xmlbeans/v2/test/src/jamtest/tests/org/apache/xmlbeans/test/jam/ClassesJamTest.java
Index: ClassesJamTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/jamtest/tests/org/apache/xmlbeans/test/jam/ClassesJamTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClassesJamTest.java 2 Mar 2004 06:32:13 -0000 1.3
+++ ClassesJamTest.java 2 Mar 2004 08:28:19 -0000 1.4
@@ -80,9 +80,9 @@
protected JService getResultToTest() throws IOException {
JServiceFactory jsf = JServiceFactory.getInstance();
- JServiceParams params = jsf.createResultParams();
+ JServiceParams params = jsf.createServiceParams();
params.includeClassFiles(getDummyclassesClassDir(),"**/*.class");
- return jsf.createResult(params);
+ return jsf.createService(params);
}
protected boolean isAnnotationsAvailable() {
1.3 +2 -2 xml-xmlbeans/v2/test/src/jamtest/tests/org/apache/xmlbeans/test/jam/ParserJamTest.java
Index: ParserJamTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/jamtest/tests/org/apache/xmlbeans/test/jam/ParserJamTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParserJamTest.java 2 Mar 2004 06:32:13 -0000 1.2
+++ ParserJamTest.java 2 Mar 2004 08:28:19 -0000 1.3
@@ -39,9 +39,9 @@
protected JService getResultToTest() throws IOException {
JServiceFactory jsf = new NewJServiceFactory();
- JServiceParams params = jsf.createResultParams();
+ JServiceParams params = jsf.createServiceParams();
params.includeSourceFiles(getDummyclassesSourceRoot(),"**/*.java");
- return jsf.createResult(params);
+ return jsf.createService(params);
}
protected boolean isAnnotationsAvailable() {
1.4 +2 -2 xml-xmlbeans/v2/test/src/jamtest/tests/org/apache/xmlbeans/test/jam/SourcesJamTest.java
Index: SourcesJamTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/jamtest/tests/org/apache/xmlbeans/test/jam/SourcesJamTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SourcesJamTest.java 2 Mar 2004 06:32:13 -0000 1.3
+++ SourcesJamTest.java 2 Mar 2004 08:28:19 -0000 1.4
@@ -80,9 +80,9 @@
protected JService getResultToTest() throws IOException {
JServiceFactory jsf = JServiceFactory.getInstance();
- JServiceParams params = jsf.createResultParams();
+ JServiceParams params = jsf.createServiceParams();
params.includeSourceFiles(getDummyclassesSourceRoot(),"**/*.java");
- return jsf.createResult(params);
+ return jsf.createService(params);
}
protected boolean isAnnotationsAvailable() {
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org