Update of /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/collecting/collectors
In directory sc8-pr-cvs1:/tmp/cvs-serv18085/src/java/org/krysalis/version/collecting/collectors
Modified Files:
VersionBrandCollector.java ClassLoaderCollector.java
PackageCollector.java JarManifestCollector.java
Log Message:
1) Refactored some shared behaviours
2) Worked on constraints colelcting/evaluating/result sets...
Index: VersionBrandCollector.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/collecting/collectors/VersionBrandCollector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VersionBrandCollector.java 18 Feb 2003 22:17:09 -0000 1.4
--- VersionBrandCollector.java 5 Mar 2003 19:57:12 -0000 1.5
***************
*** 56,61 ****
package org.krysalis.version.collecting.collectors;
! import org.krysalis.version.collecting.Collector;
! import org.krysalis.version.collecting.EntryCollection;
import org.krysalis.version.exception.VersionException;
import org.krysalis.version.internal.VersionIdentifier;
--- 56,61 ----
package org.krysalis.version.collecting.collectors;
! import org.krysalis.version.collecting.VersionCollector;
! import org.krysalis.version.collecting.VersionCollection;
import org.krysalis.version.exception.VersionException;
import org.krysalis.version.internal.VersionIdentifier;
***************
*** 66,69 ****
--- 66,70 ----
import org.krysalis.version.util.classpath.walker.ClassListener;
import org.krysalis.version.util.classpath.walker.PathWalker;
+ import org.krysalis.version.util.debug.DebugUtils;
import org.krysalis.version.util.logging.VersionLogger;
import org.krysalis.version.util.note.AnnotationScratchpad;
***************
*** 77,82 ****
* @author ajack.
*/
! public class VersionBrandCollector extends Collector implements ClassListener {
! private EntryCollection m_collection = null;
private VersionBrandLoader m_loader = null;
private PathWalker m_searcher = null;
--- 78,83 ----
* @author ajack.
*/
! public class VersionBrandCollector extends VersionCollector implements ClassListener {
! private VersionCollection m_collection = null;
private VersionBrandLoader m_loader = null;
private PathWalker m_searcher = null;
***************
*** 113,117 ****
}
! public void collectInto(EntryCollection collection)
throws VersionException {
// :TODO: Not my favourite two lines of code, feels 'odd'
--- 114,118 ----
}
! public void collectInto(VersionCollection collection)
throws VersionException {
// :TODO: Not my favourite two lines of code, feels 'odd'
***************
*** 123,127 ****
}
! public void collectInto(EntryCollection collection, PathSet pathSet)
throws VersionException {
// :TODO: Not my favourite two lines of code, feels 'odd'
--- 124,128 ----
}
! public void collectInto(VersionCollection collection, PathSet pathSet)
throws VersionException {
// :TODO: Not my favourite two lines of code, feels 'odd'
***************
*** 161,165 ****
public static void main(String args[]) throws Exception {
! (new VersionBrandCollector()).collect().dump(System.out);
}
--- 162,166 ----
public static void main(String args[]) throws Exception {
! DebugUtils.dump((new VersionBrandCollector()).collect());
}
Index: ClassLoaderCollector.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/collecting/collectors/ClassLoaderCollector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ClassLoaderCollector.java 4 Feb 2003 07:47:05 -0000 1.4
--- ClassLoaderCollector.java 5 Mar 2003 19:57:13 -0000 1.5
***************
*** 56,61 ****
package org.krysalis.version.collecting.collectors;
! import org.krysalis.version.collecting.Collector;
! import org.krysalis.version.collecting.EntryCollection;
//
--- 56,62 ----
package org.krysalis.version.collecting.collectors;
! import org.krysalis.version.collecting.VersionCollector;
! import org.krysalis.version.collecting.VersionCollection;
! import org.krysalis.version.util.debug.DebugUtils;
//
***************
*** 66,71 ****
* @author ajack
*/
! public class ClassLoaderCollector extends Collector {
! public void collectInto(EntryCollection collection) {
//ClassLoader loader = ClassLoader.getSystemClassLoader();
--- 67,72 ----
* @author ajack
*/
! public class ClassLoaderCollector extends VersionCollector {
! public void collectInto(VersionCollection collection) {
//ClassLoader loader = ClassLoader.getSystemClassLoader();
***************
*** 80,84 ****
public static void main(String args[]) throws Exception {
! (new ClassLoaderCollector()).collect().dump(System.out);
}
}
--- 81,85 ----
public static void main(String args[]) throws Exception {
! DebugUtils.dump((new ClassLoaderCollector()).collect());
}
}
Index: PackageCollector.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/collecting/collectors/PackageCollector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PackageCollector.java 5 Feb 2003 22:17:08 -0000 1.6
--- PackageCollector.java 5 Mar 2003 19:57:13 -0000 1.7
***************
*** 56,61 ****
package org.krysalis.version.collecting.collectors;
! import org.krysalis.version.collecting.Collector;
! import org.krysalis.version.collecting.EntryCollection;
import org.krysalis.version.exception.VersionException;
import org.krysalis.version.internal.VersionIdentifierHelper;
--- 56,61 ----
package org.krysalis.version.collecting.collectors;
! import org.krysalis.version.collecting.VersionCollector;
! import org.krysalis.version.collecting.VersionCollection;
import org.krysalis.version.exception.VersionException;
import org.krysalis.version.internal.VersionIdentifierHelper;
***************
*** 63,66 ****
--- 63,67 ----
import org.krysalis.version.loading.loaders.VersionBrandLoader;
import org.krysalis.version.loading.loaders.VersionPackageLoader;
+ import org.krysalis.version.util.debug.DebugUtils;
import org.krysalis.version.util.logging.VersionLogger;
import org.krysalis.version.util.note.AnnotationScratchpad;
***************
*** 69,73 ****
* @author ajack
*/
! public class PackageCollector extends Collector {
private VersionBrandLoader m_classLoader = null;
private VersionPackageLoader m_packageLoader = null;
--- 70,74 ----
* @author ajack
*/
! public class PackageCollector extends VersionCollector {
private VersionBrandLoader m_classLoader = null;
private VersionPackageLoader m_packageLoader = null;
***************
*** 78,82 ****
}
! public void collectInto(EntryCollection collection) {
Package packages[] = Package.getPackages();
--- 79,83 ----
}
! public void collectInto(VersionCollection collection) {
Package packages[] = Package.getPackages();
***************
*** 112,116 ****
public static void main(String args[]) throws Exception {
PackageCollector s = new PackageCollector();
! s.collect().dump(System.out);
}
}
--- 113,117 ----
public static void main(String args[]) throws Exception {
PackageCollector s = new PackageCollector();
! DebugUtils.dump(s.collect());
}
}
Index: JarManifestCollector.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/collecting/collectors/JarManifestCollector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JarManifestCollector.java 4 Feb 2003 07:47:05 -0000 1.6
--- JarManifestCollector.java 5 Mar 2003 19:57:13 -0000 1.7
***************
*** 61,66 ****
import java.util.jar.Manifest;
! import org.krysalis.version.collecting.Collector;
! import org.krysalis.version.collecting.EntryCollection;
import org.krysalis.version.exception.VersionException;
import org.krysalis.version.formatting.exception.VersionFormatException;
--- 61,66 ----
import java.util.jar.Manifest;
! import org.krysalis.version.collecting.VersionCollector;
! import org.krysalis.version.collecting.VersionCollection;
import org.krysalis.version.exception.VersionException;
import org.krysalis.version.formatting.exception.VersionFormatException;
***************
*** 70,73 ****
--- 70,74 ----
import org.krysalis.version.util.classpath.walker.ManifestListener;
import org.krysalis.version.util.classpath.walker.PathWalker;
+ import org.krysalis.version.util.debug.DebugUtils;
import org.krysalis.version.util.logging.VersionLogger;
import org.krysalis.version.util.note.AnnotationScratchpad;
***************
*** 80,87 ****
*/
public class JarManifestCollector
! extends Collector
implements ManifestListener {
private VersionJarLoader m_loader = null;
! private EntryCollection m_collection = null;
private PathWalker m_searcher = null;
--- 81,88 ----
*/
public class JarManifestCollector
! extends VersionCollector
implements ManifestListener {
private VersionJarLoader m_loader = null;
! private VersionCollection m_collection = null;
private PathWalker m_searcher = null;
***************
*** 96,100 ****
}
! public void collectInto(EntryCollection collection)
throws VersionException {
// :TODO: Not my favourite two lines of code, feels 'odd'
--- 97,101 ----
}
! public void collectInto(VersionCollection collection)
throws VersionException {
// :TODO: Not my favourite two lines of code, feels 'odd'
***************
*** 144,148 ****
public static void main(String args[]) throws Exception {
! (new JarManifestCollector()).collect().dump(System.out);
}
}
--- 145,149 ----
public static void main(String args[]) throws Exception {
! DebugUtils.dump((new JarManifestCollector()).collect());
}
}
-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The debugger
for complex code. Debugging C/C++ programs can leave you feeling lost and
disoriented. TotalView can help you find your way. Available on major UNIX
and Linux platforms. Try it free. www.etnus.com
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.