[tm-cvs-commit] dmcknight org.eclipse.tm.rse/plugins/org.eclipse.rse.imp

[Eclipse CVS Genie <genie@xxxxxxxxxxx>]

Update of /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files
In directory dev2:/tmp/cvs-serv25075/src/org/eclipse/rse/internal/importexport/files

Modified Files:
	RemoteImportWizardPage1.java UniFilePlus.java 
Log Message:
[368465] Import Files -RSE - Cyclic Symbolic Reference problem


Index: RemoteImportWizardPage1.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteImportWizardPage1.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** RemoteImportWizardPage1.java	24 Jun 2010 18:39:20 -0000	1.15
--- RemoteImportWizardPage1.java	13 Jan 2012 15:15:03 -0000	1.16
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2010 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2011 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
***************
*** 19,22 ****
--- 19,23 ----
   * David McKnight   (IBM)        - [276535] File Conflict when Importing Remote Folder with Case-Differentiated-Only Filenames into Project
   * David McKnight   (IBM)        - [191558] [importexport][efs] Import to Project doesn't work with remote EFS projects
+  * David McKnight   (IBM)        - [368465] Import Files -RSE - Cyclic Symbolic Reference problem
   *******************************************************************************/
  package org.eclipse.rse.internal.importexport.files;
***************
*** 142,145 ****
--- 143,147 ----
  		private IImportStructureProvider _provider;
  		private MinimizedFileSystemElement _element;
+ 		private List _resultsQueried;
  		private volatile boolean _isActive = false;
  
***************
*** 149,152 ****
--- 151,155 ----
  			_provider = provider;
  			_element = element;
+ 			_resultsQueried = new ArrayList();
  		}
  
***************
*** 187,198 ****
  			while (childrenEnum.hasNext()) {
  				Object child = childrenEnum.next();
! 				String elementLabel = _provider.getLabel(child);
! 				//Create one level below
! 				MinimizedFileSystemElement result = new MinimizedFileSystemElement(elementLabel, element, _provider.isFolder(child));
! 				result.setFileSystemObject(child);
! 
! 				if (child instanceof UniFilePlus){
! 					if (((UniFilePlus)child).isDirectory()){
! 						resultsToQuery.add(result);
  					}
  				}
--- 190,205 ----
  			while (childrenEnum.hasNext()) {
  				Object child = childrenEnum.next();
! 				if (!_resultsQueried.contains(child)){
! 					_resultsQueried.add(child);
! 				
! 					String elementLabel = _provider.getLabel(child);
! 					//Create one level below
! 					MinimizedFileSystemElement result = new MinimizedFileSystemElement(elementLabel, element, _provider.isFolder(child));
! 					result.setFileSystemObject(child);
! 	
! 					if (child instanceof UniFilePlus){
! 						if (((UniFilePlus)child).isDirectory()){
! 							resultsToQuery.add(result);
! 						}
  					}
  				}

Index: UniFilePlus.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/UniFilePlus.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** UniFilePlus.java	17 Apr 2009 15:03:31 -0000	1.9
--- UniFilePlus.java	13 Jan 2012 15:15:03 -0000	1.10
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2009 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2011 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
***************
*** 14,17 ****
--- 14,18 ----
   * Takuya Miyamoto - [185925] Integrate Platform/Team Synchronization
   * David McKnight   (IBM)        - [272708] [import/export] fix various bugs with the synchronization support
+  * David McKnight   (IBM)        - [368465] Import Files -RSE - Cyclic Symbolic Reference problem
   *******************************************************************************/
  package org.eclipse.rse.internal.importexport.files;
***************
*** 58,68 ****
  		return remoteFile.canWrite();
  	}
! 
  	public int compareTo(File pathname) {
! 		if (pathname instanceof UniFilePlus) return remoteFile.compareTo(pathname);
  		return super.compareTo(pathname);
  	}
! 
! 	/*
  	 public int compareTo(Object o)
  	 {
--- 59,69 ----
  		return remoteFile.canWrite();
  	}
! 	
  	public int compareTo(File pathname) {
! 		if (pathname instanceof UniFilePlus) 
! 			return remoteFile.compareTo(pathname);
  		return super.compareTo(pathname);
  	}
! /*
  	 public int compareTo(Object o)
  	 {
***************
*** 119,123 ****
  
  	public boolean equals(Object obj) {
! 		return remoteFile.equals(obj);
  	}
  
--- 120,130 ----
  
  	public boolean equals(Object obj) {
! 		if (obj instanceof UniFilePlus){
! 			UniFilePlus uniF = (UniFilePlus)obj;
! 			return remoteFile.getCanonicalPath().equals(uniF.remoteFile.getCanonicalPath());
! 		}
! 		else {
! 			return remoteFile.equals(obj);
! 		}
  	}