krysalis-update/src/java/org/krysalis/depot/common/util/classpath PathPart.java,1.1,1.2 PathWalker.java,1.1,1.2 PathContext.java,1.1,1.2 PathSet.java,1.1,1.2
Nick Chalko <[email protected]> Wed, 08 Dec 2004 09:11:50 +0000
| Newsgroups | gmane.comp.krysalis.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/common/util/classpath
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26470/src/java/org/krysalis/depot/common/util/classpath
Modified Files:
PathPart.java PathWalker.java PathContext.java PathSet.java
Log Message:
format
Index: PathContext.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/common/util/classpath/PathContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PathContext.java 8 Dec 2004 09:06:38 -0000 1.1
--- PathContext.java 8 Dec 2004 09:11:48 -0000 1.2
***************
*** 32,41 ****
public class PathContext implements Dumpable, DOMProducer {
private PathSet m_pathSet = null;
private ClassLoaderContext m_loaderContext = null;
public PathContext() {
m_pathSet = PathSet.getClasspath();
!
! m_loaderContext = new ClassLoaderContext(ClassLoader.getSystemClassLoader());
classInit();
}
--- 32,43 ----
public class PathContext implements Dumpable, DOMProducer {
private PathSet m_pathSet = null;
+
private ClassLoaderContext m_loaderContext = null;
public PathContext() {
m_pathSet = PathSet.getClasspath();
!
! m_loaderContext = new ClassLoaderContext(ClassLoader
! .getSystemClassLoader());
classInit();
}
***************
*** 43,47 ****
public PathContext(PathSet pathSet) {
m_pathSet = pathSet;
! m_loaderContext = new ClassLoaderContext(ClassLoader.getSystemClassLoader());
classInit();
}
--- 45,50 ----
public PathContext(PathSet pathSet) {
m_pathSet = pathSet;
! m_loaderContext = new ClassLoaderContext(ClassLoader
! .getSystemClassLoader());
classInit();
}
***************
*** 57,61 ****
m_pathSet = pathSet;
m_loaderContext = new ClassLoaderContext(classloader);
!
classInit();
}
--- 60,64 ----
m_pathSet = pathSet;
m_loaderContext = new ClassLoaderContext(classloader);
!
classInit();
}
***************
*** 85,89 ****
}
! /*
* @see java.lang.Object#equals(java.lang.Object)
*/
--- 88,92 ----
}
! /*
* @see java.lang.Object#equals(java.lang.Object)
*/
***************
*** 94,111 ****
PathContext otherPathContext = (PathContext) other;
! //:TODO: Compare hierarchies also ???...
equal = otherPathContext.m_loaderContext.equals(m_loaderContext);
if (equal)
equal = otherPathContext.m_pathSet.equals(m_pathSet);
! }
! else
! throw new IllegalArgumentException(
! "Not a PathContext: " + other.getClass().getName());
return equal;
}
! /*
* @see java.lang.Object#hashCode()
*/
--- 97,113 ----
PathContext otherPathContext = (PathContext) other;
! // :TODO: Compare hierarchies also ???...
equal = otherPathContext.m_loaderContext.equals(m_loaderContext);
if (equal)
equal = otherPathContext.m_pathSet.equals(m_pathSet);
! } else
! throw new IllegalArgumentException("Not a PathContext: "
! + other.getClass().getName());
return equal;
}
! /*
* @see java.lang.Object#hashCode()
*/
***************
*** 119,127 ****
}
!
! private void dumpClassLoader(
! PrintWriter out,
! int depth,
! ClassLoader classloader) {
String indent = DebugUtils.getIndent(depth);
--- 121,126 ----
}
! private void dumpClassLoader(PrintWriter out, int depth,
! ClassLoader classloader) {
String indent = DebugUtils.getIndent(depth);
***************
*** 138,157 ****
public void produceDOM(Document document, Element element) {
! Element pc = DOMUtils.insertElement(document,element,"PathContext");
produceClassloaderDOM(document, pc, m_loaderContext.getClassLoader());
m_pathSet.produceDOM(document, pc);
}
! private void produceClassloaderDOM(
! Document document,
! Element element,
! ClassLoader classloader) {
Element cl = DOMUtils.insertElement(document, element, "Classloader");
! DOMUtils.insertAttribute(
! document,
! cl,
! "type",
! classloader.getClass().getName());
DOMUtils.insertText(document, cl, classloader.toString());
--- 137,151 ----
public void produceDOM(Document document, Element element) {
! Element pc = DOMUtils.insertElement(document, element, "PathContext");
produceClassloaderDOM(document, pc, m_loaderContext.getClassLoader());
m_pathSet.produceDOM(document, pc);
}
! private void produceClassloaderDOM(Document document, Element element,
! ClassLoader classloader) {
Element cl = DOMUtils.insertElement(document, element, "Classloader");
! DOMUtils.insertAttribute(document, cl, "type", classloader.getClass()
! .getName());
DOMUtils.insertText(document, cl, classloader.toString());
Index: PathPart.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/common/util/classpath/PathPart.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PathPart.java 8 Dec 2004 09:06:38 -0000 1.1
--- PathPart.java 8 Dec 2004 09:11:48 -0000 1.2
***************
*** 40,43 ****
--- 40,44 ----
/**
* Returns the part.
+ *
* @return String
*/
***************
*** 48,52 ****
/**
* Sets the part.
! * @param part The part to set
*/
public void setPart(File file) {
--- 49,55 ----
/**
* Sets the part.
! *
! * @param part
! * The part to set
*/
public void setPart(File file) {
***************
*** 58,62 ****
}
! /* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
--- 61,67 ----
}
! /*
! * (non-Javadoc)
! *
* @see java.lang.Object#equals(java.lang.Object)
*/
***************
*** 71,75 ****
}
! /* (non-Javadoc)
* @see java.lang.Object#hashCode()
*/
--- 76,82 ----
}
! /*
! * (non-Javadoc)
! *
* @see java.lang.Object#hashCode()
*/
Index: PathWalker.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/common/util/classpath/PathWalker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PathWalker.java 8 Dec 2004 09:06:38 -0000 1.1
--- PathWalker.java 8 Dec 2004 09:11:48 -0000 1.2
***************
*** 15,19 ****
*/
-
package org.krysalis.depot.common.util.classpath;
--- 15,18 ----
***************
*** 44,49 ****
/**
! *
! * @author Adam R. B. Jack.
*/
public class PathWalker {
--- 43,48 ----
/**
! *
! * @author Adam R. B. Jack.
*/
public class PathWalker {
***************
*** 60,66 ****
--- 59,69 ----
//
private ArrayList m_fileListeners = null;
+
private ArrayList m_fileContentsListeners = null;
+
private ArrayList m_directoryListeners = null;
+
private ArrayList m_jarListeners = null;
+
private ArrayList m_manifestListeners = null;
***************
*** 68,72 ****
/**
! * @param base -- $CWD for this activity
* @param pathSet
*/
--- 71,76 ----
/**
! * @param base --
! * $CWD for this activity
* @param pathSet
*/
***************
*** 94,100 ****
if (listener instanceof FileContentsListener)
! registerFileContentsListener(
! (FileContentsListener) listener,
! context);
if (listener instanceof DirectoryListener)
--- 98,103 ----
if (listener instanceof FileContentsListener)
! registerFileContentsListener((FileContentsListener) listener,
! context);
if (listener instanceof DirectoryListener)
***************
*** 105,111 ****
}
! public void registerFileListener(
! FileListener fileListener,
! Object context) {
if (null == m_fileListeners)
m_fileListeners = new ArrayList();
--- 108,112 ----
}
! public void registerFileListener(FileListener fileListener, Object context) {
if (null == m_fileListeners)
m_fileListeners = new ArrayList();
***************
*** 115,120 ****
public void registerFileContentsListener(
! FileContentsListener fileContentsListener,
! Object context) {
if (null == m_fileContentsListeners)
m_fileContentsListeners = new ArrayList();
--- 116,120 ----
public void registerFileContentsListener(
! FileContentsListener fileContentsListener, Object context) {
if (null == m_fileContentsListeners)
m_fileContentsListeners = new ArrayList();
***************
*** 123,129 ****
}
! public void registerDirectoryListener(
! DirectoryListener dirListener,
! Object context) {
if (null == m_directoryListeners)
m_directoryListeners = new ArrayList();
--- 123,128 ----
}
! public void registerDirectoryListener(DirectoryListener dirListener,
! Object context) {
if (null == m_directoryListeners)
m_directoryListeners = new ArrayList();
***************
*** 132,138 ****
}
! public void registerDropListener(
! DropListener dropListener,
! Object context) {
if (null == m_dropListeners)
m_dropListeners = new ArrayList();
--- 131,135 ----
}
! public void registerDropListener(DropListener dropListener, Object context) {
if (null == m_dropListeners)
m_dropListeners = new ArrayList();
***************
*** 141,147 ****
}
! public void registerManifestListener(
! ManifestListener manifestListener,
! Object context) {
if (null == m_manifestListeners)
m_manifestListeners = new ArrayList();
--- 138,143 ----
}
! public void registerManifestListener(ManifestListener manifestListener,
! Object context) {
if (null == m_manifestListeners)
m_manifestListeners = new ArrayList();
***************
*** 162,173 ****
public void walk() {
! // System.out.println("Walk the path....");
// Anything to do?
! if ((null == m_fileListeners)
! && (null == m_fileContentsListeners)
! && (null == m_manifestListeners)
! && (null == m_directoryListeners)
! && (null == m_jarListeners))
return;
--- 158,167 ----
public void walk() {
! // System.out.println("Walk the path....");
// Anything to do?
! if ((null == m_fileListeners) && (null == m_fileContentsListeners)
! && (null == m_manifestListeners)
! && (null == m_directoryListeners) && (null == m_jarListeners))
return;
***************
*** 180,203 ****
processDrops(dropList);
! boolean searchJarContents =
! (null != m_fileListeners)
|| (null != m_fileContentsListeners)
|| (null != m_manifestListeners)
|| (null != m_directoryListeners);
! boolean searchDirContents =
! (null != m_fileListeners) || (null != m_fileContentsListeners);
for (Iterator parts = m_pathSet.iterator(); parts.hasNext();) {
PathPart pathPart = (PathPart) parts.next();
//
! // Get an abstract file for this.
//
! // Todo -- Hmm, load via class loader?
//
File file = pathPart.getPart();
String fileName = file.getAbsolutePath();
! // System.out.println("File:" + file);
if (file.exists()) {
--- 174,196 ----
processDrops(dropList);
! boolean searchJarContents = (null != m_fileListeners)
|| (null != m_fileContentsListeners)
|| (null != m_manifestListeners)
|| (null != m_directoryListeners);
! boolean searchDirContents = (null != m_fileListeners)
! || (null != m_fileContentsListeners);
for (Iterator parts = m_pathSet.iterator(); parts.hasNext();) {
PathPart pathPart = (PathPart) parts.next();
//
! // Get an abstract file for this.
//
! // Todo -- Hmm, load via class loader?
//
File file = pathPart.getPart();
String fileName = file.getAbsolutePath();
! // System.out.println("File:" + file);
if (file.exists()) {
***************
*** 211,219 ****
if (searchJarContents)
walkIntoJAR(file);
! }
! else
processFile(file, ROOT, fileName);
! }
! else {
//
// Process This file
--- 204,210 ----
if (searchJarContents)
walkIntoJAR(file);
! } else
processFile(file, ROOT, fileName);
! } else {
//
// Process This file
***************
*** 224,233 ****
walkIntoDirectory(file);
}
! }
! else {
! //:TODO: add a "sanitize" path -- someday, this is too
// verbose...
! Logger.getLogger().debug(
! "Invalid part in path [" + file + "]");
}
}
--- 215,222 ----
walkIntoDirectory(file);
}
! } else {
! // :TODO: add a "sanitize" path -- someday, this is too
// verbose...
! Logger.getLogger().debug("Invalid part in path [" + file + "]");
}
}
***************
*** 235,239 ****
private void walkIntoJAR(File jar) {
! // System.out.println("Walk JAR: " + jar);
try {
--- 224,228 ----
private void walkIntoJAR(File jar) {
! // System.out.println("Walk JAR: " + jar);
try {
***************
*** 243,247 ****
if ((null != manifest) && (null != m_manifestListeners)) {
! //System.out.println("Process Manifest: " + manifest);
processManifest(jar, manifest);
}
--- 232,236 ----
if ((null != manifest) && (null != m_manifestListeners)) {
! // System.out.println("Process Manifest: " + manifest);
processManifest(jar, manifest);
}
***************
*** 252,256 ****
JarEntry entry = (JarEntry) e.nextElement();
! //System.out.println("Entry: " + entry);
File entryFile = new File(entry.getName());
--- 241,245 ----
JarEntry entry = (JarEntry) e.nextElement();
! // System.out.println("Entry: " + entry);
File entryFile = new File(entry.getName());
***************
*** 261,283 ****
if (null != m_fileContentsListeners) {
! if (!filter(entry.getName(),
! m_fileContentsListeners)) {
InputStream contents = null;
try {
contents = jf.getInputStream(entry);
! processFileContents(
! entryFile,
! ROOT,
! contents,
! "JAR:" + jar.getName());
! }
! finally {
if (null != contents)
try {
contents.close();
}
! catch (Exception ee) {
! };
}
}
--- 250,267 ----
if (null != m_fileContentsListeners) {
! if (!filter(entry.getName(), m_fileContentsListeners)) {
InputStream contents = null;
try {
contents = jf.getInputStream(entry);
! processFileContents(entryFile, ROOT, contents,
! "JAR:" + jar.getName());
! } finally {
if (null != contents)
try {
contents.close();
+ } catch (Exception ee) {
}
! ;
}
}
***************
*** 285,290 ****
}
}
! }
! catch (Throwable t) {Logger.getLogger().error("Throwable:" + jar + ")", t);
}
}
--- 269,274 ----
}
}
! } catch (Throwable t) {
! Logger.getLogger().error("Throwable:" + jar + ")", t);
}
}
***************
*** 295,299 ****
private void walkIntoDirectory(File directory, String path, File root) {
! //System.out.println("Walk Directory: " + directory + "\t" + root);
String[] files = directory.list();
--- 279,283 ----
private void walkIntoDirectory(File directory, String path, File root) {
! // System.out.println("Walk Directory: " + directory + "\t" + root);
String[] files = directory.list();
***************
*** 303,316 ****
String fileName = files[i];
! String pathName =
! (null != path) ? path + "/" + fileName : fileName;
File file = new File(root, pathName);
if (file.exists()) {
if (file.isFile()) {
! processFile(
! file,
! root,
! "File:" + directory.getAbsolutePath());
if (null != m_fileContentsListeners) {
--- 287,298 ----
String fileName = files[i];
! String pathName = (null != path) ? path + "/" + fileName
! : fileName;
File file = new File(root, pathName);
if (file.exists()) {
if (file.isFile()) {
! processFile(file, root, "File:"
! + directory.getAbsolutePath());
if (null != m_fileContentsListeners) {
***************
*** 319,368 ****
InputStream contents = null;
try {
! File absoluteFile =
! new File(root, pathName);
! contents =
! new FileInputStream(
! absoluteFile.getAbsoluteFile());
! processFileContents(
! file,
! root,
! contents,
! "File:" + file);
! }
! catch (Exception fe) {
Logger.getLogger().error(
! "Exception opening file: " + file,
! fe);
! }
! finally {
if (null != contents)
try {
contents.close();
}
! catch (Exception ee) {
! };
}
}
}
! }
! else {
String dirName = file.getName();
! String subPath =
! ((null != path) ? path + "." + dirName : dirName);
walkIntoDirectory(file, subPath, root);
}
! }
! else
Logger.getLogger().debug(
! "Invalid part in path [" + file + "]");
}
}
private void processDirectory(File directory, String location) {
! for (Iterator listeners = m_directoryListeners.iterator();
! listeners.hasNext();
! ) {
Tuple tuple = (Tuple) listeners.next();
DirectoryListener listener = (DirectoryListener) tuple.getFirst();
--- 301,340 ----
InputStream contents = null;
try {
! File absoluteFile = new File(root, pathName);
! contents = new FileInputStream(absoluteFile
! .getAbsoluteFile());
! processFileContents(file, root, contents,
! "File:" + file);
! } catch (Exception fe) {
Logger.getLogger().error(
! "Exception opening file: " + file,
! fe);
! } finally {
if (null != contents)
try {
contents.close();
+ } catch (Exception ee) {
}
! ;
}
}
}
! } else {
String dirName = file.getName();
! String subPath = ((null != path) ? path + "." + dirName
! : dirName);
walkIntoDirectory(file, subPath, root);
}
! } else
Logger.getLogger().debug(
! "Invalid part in path [" + file + "]");
}
}
private void processDirectory(File directory, String location) {
! for (Iterator listeners = m_directoryListeners.iterator(); listeners
! .hasNext();) {
Tuple tuple = (Tuple) listeners.next();
DirectoryListener listener = (DirectoryListener) tuple.getFirst();
***************
*** 375,395 ****
if (listener instanceof NameFilter)
! filter =
! ((NameFilter) listener).filter(
! directory.getAbsolutePath(),
! context);
if (!filter)
! listener.processDirectory(
! tuple.getSecond(),
! directory,
! location);
}
}
private void processJar(File file, String location) {
! for (Iterator listeners = m_jarListeners.iterator();
! listeners.hasNext();
! ) {
Tuple tuple = (Tuple) listeners.next();
--- 347,362 ----
if (listener instanceof NameFilter)
! filter = ((NameFilter) listener).filter(directory
! .getAbsolutePath(), context);
if (!filter)
! listener.processDirectory(tuple.getSecond(), directory,
! location);
}
}
private void processJar(File file, String location) {
! for (Iterator listeners = m_jarListeners.iterator(); listeners
! .hasNext();) {
Tuple tuple = (Tuple) listeners.next();
***************
*** 403,409 ****
if (listener instanceof NameFilter)
! filter =
! ((NameFilter) listener).filter(
! file.getAbsolutePath(),
context);
--- 370,374 ----
if (listener instanceof NameFilter)
! filter = ((NameFilter) listener).filter(file.getAbsolutePath(),
context);
***************
*** 414,420 ****
private void processManifest(File file, Manifest manifest) {
! for (Iterator listeners = m_manifestListeners.iterator();
! listeners.hasNext();
! ) {
Tuple tuple = (Tuple) listeners.next();
--- 379,384 ----
private void processManifest(File file, Manifest manifest) {
! for (Iterator listeners = m_manifestListeners.iterator(); listeners
! .hasNext();) {
Tuple tuple = (Tuple) listeners.next();
***************
*** 428,434 ****
if (listener instanceof NameFilter)
! filter =
! ((NameFilter) listener).filter(
! file.getAbsolutePath(),
context);
--- 392,396 ----
if (listener instanceof NameFilter)
! filter = ((NameFilter) listener).filter(file.getAbsolutePath(),
context);
***************
*** 440,452 ****
private void processFile(File file, File rootDir, String location) {
! Logger.getLogger().debug(
! "Process File:" + file + "[" + location + "]");
! //System.out.println(
! // "Process File:" + file + "[" + location + "]");
! for (Iterator listeners = m_fileListeners.iterator();
! listeners.hasNext();
! ) {
//
--- 402,412 ----
private void processFile(File file, File rootDir, String location) {
! Logger.getLogger().debug("Process File:" + file + "[" + location + "]");
! // System.out.println(
! // "Process File:" + file + "[" + location + "]");
! for (Iterator listeners = m_fileListeners.iterator(); listeners
! .hasNext();) {
//
***************
*** 464,470 ****
if (listener instanceof NameFilter)
! filter =
! ((NameFilter) listener).filter(
! file.getAbsolutePath(),
context);
--- 424,428 ----
if (listener instanceof NameFilter)
! filter = ((NameFilter) listener).filter(file.getAbsolutePath(),
context);
***************
*** 482,488 ****
Logger.getLogger().debug("Process Drop:" + entity + "]");
! for (Iterator listeners = m_dropListeners.iterator();
! listeners.hasNext();
! ) {
//
--- 440,445 ----
Logger.getLogger().debug("Process Drop:" + entity + "]");
! for (Iterator listeners = m_dropListeners.iterator(); listeners
! .hasNext();) {
//
***************
*** 497,513 ****
}
! private void processFileContents(
! File file,
! File rootDir,
! InputStream fileContents,
! String location) {
! Logger.getLogger().debug(
! "Process File:" + file + "[" + location + "]");
int readers = 0;
! for (Iterator listeners = m_fileContentsListeners.iterator();
! listeners.hasNext();
! ) {
//
--- 454,465 ----
}
! private void processFileContents(File file, File rootDir,
! InputStream fileContents, String location) {
! Logger.getLogger().debug("Process File:" + file + "[" + location + "]");
int readers = 0;
! for (Iterator listeners = m_fileContentsListeners.iterator(); listeners
! .hasNext();) {
//
***************
*** 516,521 ****
Tuple tuple = (Tuple) listeners.next();
! FileContentsListener listener =
! ((FileContentsListener) (tuple.getFirst()));
Object context = tuple.getSecond();
--- 468,473 ----
Tuple tuple = (Tuple) listeners.next();
! FileContentsListener listener = ((FileContentsListener) (tuple
! .getFirst()));
Object context = tuple.getSecond();
***************
*** 526,532 ****
if (listener instanceof NameFilter)
! filter =
! ((NameFilter) listener).filter(
! file.getAbsolutePath(),
context);
--- 478,482 ----
if (listener instanceof NameFilter)
! filter = ((NameFilter) listener).filter(file.getAbsolutePath(),
context);
***************
*** 534,549 ****
if (++readers > 1) {
! //:TODO: Nasty bug w/ contents already read, can't
! // easily reset to start, have to re-code to open
// each time. Harder for in JAR...
! throw new IllegalStateException("Can't have two readers on one stream, need to re-code.");
}
! listener.processFile(
! context,
! file,
! rootDir,
! fileContents,
! location);
}
}
--- 484,496 ----
if (++readers > 1) {
! // :TODO: Nasty bug w/ contents already read, can't
! // easily reset to start, have to re-code to open
// each time. Harder for in JAR...
! throw new IllegalStateException(
! "Can't have two readers on one stream, need to re-code.");
}
! listener.processFile(context, file, rootDir, fileContents,
! location);
}
}
***************
*** 564,569 ****
/**
*
! * Goes throgu a list of listeners and *ALL* are NameFilters
! * and *ALL* don't want it, return "true".
*
* @param name
--- 511,516 ----
/**
*
! * Goes throgu a list of listeners and *ALL* are NameFilters and *ALL* don't
! * want it, return "true".
*
* @param name
***************
*** 574,580 ****
boolean filter = true;
! for (Iterator listeners = listenerList.iterator();
! listeners.hasNext() && filter;
! ) {
//
--- 521,526 ----
boolean filter = true;
! for (Iterator listeners = listenerList.iterator(); listeners.hasNext()
! && filter;) {
//
***************
*** 588,593 ****
if (listener instanceof NameFilter) {
filter &= ((NameFilter) listener).filter(name, context);
! }
! else
filter = false;
}
--- 534,538 ----
if (listener instanceof NameFilter) {
filter &= ((NameFilter) listener).filter(name, context);
! } else
filter = false;
}
***************
*** 597,602 ****
/**
* Returns the pathSet.
* @return PathSet
! */
public PathSet getPathSet() {
return m_pathSet;
--- 542,548 ----
/**
* Returns the pathSet.
+ *
* @return PathSet
! */
public PathSet getPathSet() {
return m_pathSet;
***************
*** 605,610 ****
/**
* Sets the pathSet.
! * @param pathSet The pathSet to set
! */
public void setPathSet(PathSet pathSet) {
m_pathSet = pathSet;
--- 551,558 ----
/**
* Sets the pathSet.
! *
! * @param pathSet
! * The pathSet to set
! */
public void setPathSet(PathSet pathSet) {
m_pathSet = pathSet;
Index: PathSet.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/common/util/classpath/PathSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PathSet.java 8 Dec 2004 09:06:38 -0000 1.1
--- PathSet.java 8 Dec 2004 09:11:48 -0000 1.2
***************
*** 38,41 ****
--- 38,42 ----
private boolean m_changed = false;
+
private String m_baseDir = null;
***************
*** 65,70 ****
public static PathSet getSystemBootClasspath() {
! String bootClassPath =
! SystemUtils.getSystemProperty("sun.boot.class.path");
Logger.getLogger().debug("Boot Class Path: " + bootClassPath);
--- 66,71 ----
public static PathSet getSystemBootClasspath() {
! String bootClassPath = SystemUtils
! .getSystemProperty("sun.boot.class.path");
Logger.getLogger().debug("Boot Class Path: " + bootClassPath);
***************
*** 114,121 ****
public void importPath(String path) {
! for (StringTokenizer tokens =
! new StringTokenizer(path, SystemUtils.g_pathSeparator);
! tokens.hasMoreTokens();
! ) {
add(tokens.nextToken());
}
--- 115,120 ----
public void importPath(String path) {
! for (StringTokenizer tokens = new StringTokenizer(path,
! SystemUtils.g_pathSeparator); tokens.hasMoreTokens();) {
add(tokens.nextToken());
}
***************
*** 133,137 ****
PathPart pathPart = (PathPart) iter.next();
try {
! //:TODO: From base?
File partFile = pathPart.getPart();
--- 132,136 ----
PathPart pathPart = (PathPart) iter.next();
try {
! // :TODO: From base?
File partFile = pathPart.getPart();
***************
*** 139,144 ****
dropList.add(pathPart);
}
! }
! catch (Exception e) {
dropList.add(pathPart);
}
--- 138,142 ----
dropList.add(pathPart);
}
! } catch (Exception e) {
dropList.add(pathPart);
}
***************
*** 194,199 ****
newParts.add(part);
set.add(part);
! }
! else
Logger.getLogger().debug("Drop duplicate: " + part);
}
--- 192,196 ----
newParts.add(part);
set.add(part);
! } else
Logger.getLogger().debug("Drop duplicate: " + part);
}
***************
*** 203,210 ****
}
! //:TODO: Allow a "strong check" (uniquify/order) to see if two of
! // these are the same, could save a lot of performance...
! //:TODO: add hash and equal, hmm - -they done for me?
// what about (1) uniqify (2) sort (3) compare...
--- 200,207 ----
}
! // :TODO: Allow a "strong check" (uniquify/order) to see if two of
! // these are the same, could save a lot of performance...
! // :TODO: add hash and equal, hmm - -they done for me?
// what about (1) uniqify (2) sort (3) compare...
***************
*** 215,221 ****
part = (PathPart) partObject;
if (partObject instanceof File)
! part = new PathPart((File)partObject);
if (partObject instanceof String)
! part = new PathPart((String)partObject);
m_changed = true;
--- 212,218 ----
part = (PathPart) partObject;
if (partObject instanceof File)
! part = new PathPart((File) partObject);
if (partObject instanceof String)
! part = new PathPart((String) partObject);
m_changed = true;
***************
*** 224,228 ****
}
! /* (non-Javadoc)
* @see java.util.List#add(int, java.lang.Object)
*/
--- 221,227 ----
}
! /*
! * (non-Javadoc)
! *
* @see java.util.List#add(int, java.lang.Object)
*/
***************
*** 233,239 ****
part = (PathPart) partObject;
if (partObject instanceof File)
! part = new PathPart((File)partObject);
if (partObject instanceof String)
! part = new PathPart((String)partObject);
m_changed = true;
--- 232,238 ----
part = (PathPart) partObject;
if (partObject instanceof File)
! part = new PathPart((File) partObject);
if (partObject instanceof String)
! part = new PathPart((String) partObject);
m_changed = true;
***************
*** 242,246 ****
}
! /* (non-Javadoc)
* @see java.util.Collection#addAll(java.util.Collection)
*/
--- 241,247 ----
}
! /*
! * (non-Javadoc)
! *
* @see java.util.Collection#addAll(java.util.Collection)
*/
***************
*** 250,254 ****
}
! /* (non-Javadoc)
* @see java.util.List#addAll(int, java.util.Collection)
*/
--- 251,257 ----
}
! /*
! * (non-Javadoc)
! *
* @see java.util.List#addAll(int, java.util.Collection)
*/
***************
*** 257,265 ****
return super.addAll(arg0, arg1);
}
-
public void produceDOM(Document document, Element element) {
! Element ps = DOMUtils.insertElement(document,element,"PathSet");
! DOMUtils.insertAttribute(document,ps,"name",getName());
DOMUtils.produceDOM(document, ps, iterator());
}
--- 260,267 ----
return super.addAll(arg0, arg1);
}
public void produceDOM(Document document, Element element) {
! Element ps = DOMUtils.insertElement(document, element, "PathSet");
! DOMUtils.insertAttribute(document, ps, "name", getName());
DOMUtils.produceDOM(document, ps, iterator());
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/