[Jcommander-commit] plugins/org.jcommander.ui.compare/src/org/jcommander/compare ComparePlugin.java,

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.compare/src/org/jcommander/compare
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24987/src/org/jcommander/compare

Modified Files:
	ComparePlugin.java 
Log Message:
Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log.

Index: ComparePlugin.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.compare/src/org/jcommander/compare/ComparePlugin.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ComparePlugin.java	17 Apr 2006 21:31:07 -0000	1.4
--- ComparePlugin.java	25 Apr 2006 09:27:43 -0000	1.5
***************
*** 30,33 ****
--- 30,34 ----
  import org.osgi.framework.BundleContext;
  import org.apache.commons.vfs.*;
+ import org.apache.log4j.Logger;
  
  /**
***************
*** 39,42 ****
--- 40,45 ----
  	private static ComparePlugin plugin;
  	
+ 	protected static Logger logger = Logger.getLogger(AbstractUIPlugin.class);
+ 	
  	public static final String COMPARE_PERSPECTIVE_ID = "org.jcommander.compare.Compare";
  	
***************
*** 74,78 ****
  		
  		public FileInput(FileObject file, String base) {
! 			//System.out.println(file.getName());
  			this.file=file;
  			this.base=base;
--- 77,81 ----
  		
  		public FileInput(FileObject file, String base) {
! 			//logger.debug(file.getName());
  			this.file=file;
  			this.base=base;
***************
*** 80,84 ****
  
  		public FileInput(FileObject file) {
! 			System.out.println(file.getName());
  			this.file=file;
  			this.base="";
--- 83,87 ----
  
  		public FileInput(FileObject file) {
! 			logger.debug(file.getName());
  			this.file=file;
  			this.base="";
***************
*** 89,93 ****
  		 */
  		public Object[] getChildren() {
! 			//System.out.println("getchildren");
  			try {
  				if (file.getChildren()==null)
--- 92,96 ----
  		 */
  		public Object[] getChildren() {
! 			//logger.debug("getchildren");
  			try {
  				if (file.getChildren()==null)
***************
*** 104,108 ****
  				filelist = file.getChildren();
  			} catch (FileSystemException e) {
! 				e.printStackTrace();
  			}
  			
--- 107,111 ----
  				filelist = file.getChildren();
  			} catch (FileSystemException e) {
! 				logger.error(e,e);
  			}
  			
***************
*** 144,149 ****
  				if (file.getType()==FileType.FOLDER) return ImageBroker.FOLDER_ICON;
  			} catch (FileSystemException e) {
! 				// TODO Auto-generated catch block
! 				e.printStackTrace();
  			}
  			int dot = file.getName().getBaseName().lastIndexOf('.');
--- 147,151 ----
  				if (file.getType()==FileType.FOLDER) return ImageBroker.FOLDER_ICON;
  			} catch (FileSystemException e) {
! 				logger.error(e,e);
  			}
  			int dot = file.getName().getBaseName().lastIndexOf('.');
***************
*** 170,174 ****
  			try {
  				if (file.getType()==FileType.FOLDER) {
! 					System.out.println(FOLDER_TYPE);
  					return FOLDER_TYPE;
  				} else {
--- 172,176 ----
  			try {
  				if (file.getType()==FileType.FOLDER) {
! 					logger.debug(FOLDER_TYPE);
  					return FOLDER_TYPE;
  				} else {
***************
*** 177,185 ****
  					return name.substring(dot+1);
  				}
! 				//System.out.println((file.getType()==FileType.FOLDER)?FOLDER_TYPE:TEXT_TYPE);
  				//return (file.getType()==FileType.FOLDER)?FOLDER_TYPE:TEXT_TYPE;
  			} catch (FileSystemException e) {
! 				// TODO Auto-generated catch block
! 				e.printStackTrace();
  			}
  			return null;
--- 179,186 ----
  					return name.substring(dot+1);
  				}
! 				//logger.debug((file.getType()==FileType.FOLDER)?FOLDER_TYPE:TEXT_TYPE);
  				//return (file.getType()==FileType.FOLDER)?FOLDER_TYPE:TEXT_TYPE;
  			} catch (FileSystemException e) {
! 				logger.error(e,e);
  			}
  			return null;
***************
*** 194,199 ****
  				return file.getContent().getInputStream();
  			} catch (FileSystemException e1) {
! 				// TODO Auto-generated catch block
! 				e1.printStackTrace();
  			}
  			return null;
--- 195,199 ----
  				return file.getContent().getInputStream();
  			} catch (FileSystemException e1) {
! 				logger.error(e1);
  			}
  			return null;
***************
*** 208,223 ****
  			// TODO Auto-generated method stub
  			try {
! 				System.out.println("setContent");
  				String nC=new String(newContent);
! 				System.out.println(nC);
  				OutputStream oStream=file.getContent().getOutputStream();
  				oStream.write(nC.getBytes());
  				oStream.close();
  			} catch (FileSystemException e) {
! 				// TODO Auto-generated catch block
! 				e.printStackTrace();
  			} catch (IOException e) {
! 				// TODO Auto-generated catch block
! 				e.printStackTrace();
  			}
  		}
--- 208,221 ----
  			// TODO Auto-generated method stub
  			try {
! 				logger.debug("setContent");
  				String nC=new String(newContent);
! 				logger.debug(nC);
  				OutputStream oStream=file.getContent().getOutputStream();
  				oStream.write(nC.getBytes());
  				oStream.close();
  			} catch (FileSystemException e) {
! 				logger.error(e,e);
  			} catch (IOException e) {
! 				logger.error(e,e);
  			}
  		}
***************
*** 226,234 ****
  			// TODO Implement!
  //			if ((dest==null)&&(src!=null)) {
! //				System.out.println("Add: "+((FileInput)src).file.getName().getURI());
  //			} else if ((dest!=null)&&(src==null)) {
! //				System.out.println("Remove: "+((FileInput)src).file.getName().getURI());
  //			}
! 			System.out.println("replace");
  			try{
  				if (dest!=null) {
--- 224,232 ----
  			// TODO Implement!
  //			if ((dest==null)&&(src!=null)) {
! //				logger.debug("Add: "+((FileInput)src).file.getName().getURI());
  //			} else if ((dest!=null)&&(src==null)) {
! //				logger.debug("Remove: "+((FileInput)src).file.getName().getURI());
  //			}
! 			logger.debug("replace");
  			try{
  				if (dest!=null) {
***************
*** 242,249 ****
  							return fDest;
  						} else {
! 							System.out.println("Error in FileInput.replace: Src no FileInput");
  						}
  					} else {
! 						System.out.println("Error in FileInput.replace: Dest no FileInput");
  					} 
  				} else if (src!=null) {
--- 240,247 ----
  							return fDest;
  						} else {
! 							logger.error("Error in FileInput.replace: Src no FileInput");
  						}
  					} else {
! 						logger.error("Error in FileInput.replace: Dest no FileInput");
  					} 
  				} else if (src!=null) {
***************
*** 251,266 ****
  						FileInput fSrc = (FileInput) src;
  						FileObject fDest=file.resolveFile(fSrc.file.getName().getBaseName());
! 						System.out.println("Copying to "+fDest.getName().getURI());
  						fDest.copyFrom(fSrc.file,new AllFileSelector());
  						return new FileInput(fDest,base);
  					} else {
! 						System.out.println("Error in FileInput.replace: Src no FileInput");
  					}
  				} else {
! 					System.out.println("Error in FileInput.replace: Src and Dest null");
  				}
  			} catch (FileSystemException e) {
! 				// TODO: handle exception
! 				e.printStackTrace();
  			}
  			return null;
--- 249,263 ----
  						FileInput fSrc = (FileInput) src;
  						FileObject fDest=file.resolveFile(fSrc.file.getName().getBaseName());
! 						logger.debug("Copying to "+fDest.getName().getURI());
  						fDest.copyFrom(fSrc.file,new AllFileSelector());
  						return new FileInput(fDest,base);
  					} else {
! 						logger.debug("Error in FileInput.replace: Src no FileInput");
  					}
  				} else {
! 					logger.debug("Error in FileInput.replace: Src and Dest null");
  				}
  			} catch (FileSystemException e) {
! 				logger.error(e,e);
  			}
  			return null;
***************
*** 317,322 ****
  			IWorkbenchPage page = PlatformUI.getWorkbench().showPerspective(COMPARE_PERSPECTIVE_ID, EclipseBroker.getWorkbenchWindow());
  			} catch (WorkbenchException e) {
! 				// TODO Auto-generated catch block
! 				e.printStackTrace();
  			}
  			
--- 314,318 ----
  			IWorkbenchPage page = PlatformUI.getWorkbench().showPerspective(COMPARE_PERSPECTIVE_ID, EclipseBroker.getWorkbenchWindow());
  			} catch (WorkbenchException e) {
! 				logger.error(e,e);
  			}
  			
***************
*** 365,373 ****
  		        	Object fRoot;
  		        	Differencer d = new Differencer();
! 		        	//System.out.println("Finding diffs");
  		        	fRoot = d.findDifferences(false,monitor,null,null,
  		        			new FileInput(fLeftFile),
  		        			new FileInput(fRightFile));
! 		        	//System.out.println("found diffs");
  		        	
  		        	return fRoot;
--- 361,369 ----
  		        	Object fRoot;
  		        	Differencer d = new Differencer();
! 		        	//logger.debug("Finding diffs");
  		        	fRoot = d.findDifferences(false,monitor,null,null,
  		        			new FileInput(fLeftFile),
  		        			new FileInput(fRightFile));
! 		        	//logger.debug("found diffs");
  		        	
  		        	return fRoot;

[Jcommander-commit] plugins/org.jcommander.ui.compare/src/org/jcommander/compare ComparePlugin.java,

[Jcommander-commit] plugins/org.jcommander.ui.compare/src/org/jcommander/compare ComparePlugin.java,1.4,1.5