ruper2/src/java/core/org/krysalis/ruper/files DefaultResourceFilenameAnalyzer.java,1.2,1.3

Update of /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/files
In directory sc8-pr-cvs1:/tmp/cvs-serv5134/src/java/core/org/krysalis/ruper/files

Modified Files:
	DefaultResourceFilenameAnalyzer.java 
Log Message:
1) Finished Query & Query Engine
2) Worked on Files

Index: DefaultResourceFilenameAnalyzer.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/files/DefaultResourceFilenameAnalyzer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DefaultResourceFilenameAnalyzer.java	5 Sep 2003 15:54:42 -0000	1.2
--- DefaultResourceFilenameAnalyzer.java	8 Sep 2003 23:21:40 -0000	1.3
***************
*** 15,21 ****
--- 15,23 ----
  import org.krysalis.ruper.RuperException;
  import org.krysalis.ruper.RuperRuntimeException;
+ import org.krysalis.ruper.log.Logger;
  import org.krysalis.ruper.protocols.VirtualResourceLocator;
  import org.krysalis.ruper.resource.Resource;
  import org.krysalis.ruper.resource.ResourceType;
+ import org.krysalis.ruper.util.text.Messages;
  import org.krysalis.version.VersionException;
  import org.krysalis.version.impl.KrysalisVersion;
***************
*** 127,135 ****
  			//
  			else {
! 				//:TODO: ???
  			}
  		}
  		catch (RuperException re) {
! 			//:TODO: log/context/listeners...
  		}
  
--- 129,142 ----
  			//
  			else {
! 				Logger.getLog().error(
! 					Messages.getString("UNKNOWN_OBJECT_TYPE", entity));
  			}
  		}
  		catch (RuperException re) {
! 			Logger.getLog().error(
! 				Messages.getString(
! 					"EXCEPTION2",
! 					new Object[] { entity, re.getLocalizedMessage()}),
! 				re);
  		}
  
***************
*** 166,169 ****
--- 173,181 ----
  		throws RuperException {
  
+ 		Logger.getLog().debug(
+ 			Messages.getString(
+ 				"PROCESS",
+ 				new Object[] { resourceName, location }));
+ 
  		// Parts...
  		String extension = null;
***************
*** 209,214 ****
  			name = remainder;
  
! 		System.out.println("Id=" + name + ": Version=" + version);
! 		System.out.println("Type=" + type + " w/ Extn=" + extension);
  
  		try {
--- 221,228 ----
  			name = remainder;
  
! 		Logger.getLog().debug(
! 			Messages.getString(
! 				"EXTRACTED",
! 				new Object[] { name, version, type, extension }));
  
  		try {
***************
*** 220,234 ****
  					resourceName,
  					location);
- 			//:TODO: Fix
  
  			if (!store.contains(temp)) {
  				store.addResource(temp);
  			}
  			else {
! 				// Merge...
  			}
  		}
  		catch (VersionException ve) {
! 			//:TODO:
  		}
  
--- 234,262 ----
  					resourceName,
  					location);
  
+ 			//:TODO: Could be written better
  			if (!store.contains(temp)) {
  				store.addResource(temp);
  			}
  			else {
! 
! 				//:TODO: Fix
! 				Logger.getLog().debug(
! 					Messages.getString(
! 						"MERGE",
! 						new Object[] { resourceName, location, temp }));
  			}
  		}
  		catch (VersionException ve) {
! 
! 			Logger.getLog().error(
! 				Messages.getString(
! 					"EXCEPTION3",
! 					new Object[] {
! 						resourceName,
! 						location,
! 						ve.getLocalizedMessage()}),
! 				ve);
! 
  		}
  
***************
*** 297,301 ****
  			if (0 == probableExtns.size())
  				throw new RuperException(
! 					"Unable to extract extension from " + resourceName);
  		extension = (String) probableExtns.get(0);
  
--- 325,329 ----
  			if (0 == probableExtns.size())
  				throw new RuperException(
! 					"Unable to extract extension from [" + resourceName + "]");
  		extension = (String) probableExtns.get(0);
  




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf