[368465] Import Files -RSE - Cyclic Symbolic Reference problem

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteImportWizardPage1.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * 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
  * which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@
  * David McKnight   (IBM)        - [272708] [import/export] fix various bugs with the synchronization support
  * 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;
 
@@ -141,6 +142,7 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen
 		private Object _fileSystemObject;
 		private IImportStructureProvider _provider;
 		private MinimizedFileSystemElement _element;
+		private List _resultsQueried;
 		private volatile boolean _isActive = false;
 
 		public QueryAllJob(Object fileSystemObject, IImportStructureProvider provider, MinimizedFileSystemElement element){
@@ -148,6 +150,7 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen
 			_fileSystemObject = fileSystemObject;
 			_provider = provider;
 			_element = element;
+			_resultsQueried = new ArrayList();
 		}
 
 
@@ -186,14 +189,18 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen
 
 			while (childrenEnum.hasNext()) {
 				Object child = childrenEnum.next();
-				String elementLabel = _provider.getLabel(child);
+				if (!_resultsQueried.contains(child)){
-				//Create one level below
+					_resultsQueried.add(child);
-				MinimizedFileSystemElement result = new MinimizedFileSystemElement(elementLabel, element, _provider.isFolder(child));
+				
-				result.setFileSystemObject(child);
+					String elementLabel = _provider.getLabel(child);
-
+					//Create one level below
-				if (child instanceof UniFilePlus){
+					MinimizedFileSystemElement result = new MinimizedFileSystemElement(elementLabel, element, _provider.isFolder(child));
-					if (((UniFilePlus)child).isDirectory()){
+					result.setFileSystemObject(child);
-						resultsToQuery.add(result);
+	
+					if (child instanceof UniFilePlus){
+						if (((UniFilePlus)child).isDirectory()){
+							resultsToQuery.add(result);
+						}
 					}
 				}
 			}

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/UniFilePlus.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * 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
  * which accompanies this distribution, and is available at
@@ -13,6 +13,7 @@
  * David Dykstal (IBM) [230821] fix IRemoteFileSubSystem API to be consistent with IFileService
  * 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;
 
@@ -57,13 +58,13 @@ public class UniFilePlus extends File {
 	public boolean canWrite() {
 		return remoteFile.canWrite();
 	}
-
+	
 	public int compareTo(File pathname) {
-		if (pathname instanceof UniFilePlus) return remoteFile.compareTo(pathname);
+		if (pathname instanceof UniFilePlus) 
+			return remoteFile.compareTo(pathname);
 		return super.compareTo(pathname);
 	}
-
+/*
-	/*
 	 public int compareTo(Object o)
 	 {
 	 return remoteFile.compareTo(o);
@@ -118,7 +119,13 @@ public class UniFilePlus extends File {
 	}
 
 	public boolean equals(Object obj) {
-		return remoteFile.equals(obj);
+		if (obj instanceof UniFilePlus){
+			UniFilePlus uniF = (UniFilePlus)obj;
+			return remoteFile.getCanonicalPath().equals(uniF.remoteFile.getCanonicalPath());
+		}
+		else {
+			return remoteFile.equals(obj);
+		}
 	}
 
 	public boolean exists() {