[132036] JS LoadStrategy.getFiles(String)

3 files changed, 34 insertions, 3 deletions

diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryLoadStrategyImpl.java
index e9c47553a..474788c74 100644
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryLoadStrategyImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryLoadStrategyImpl.java
@@ -165,6 +165,14 @@ public abstract class DirectoryLoadStrategyImpl extends LoadStrategyImpl impleme
 		addFiles(directory, list);
 		return list;
 	}
+	
+	public java.util.List getFiles(String subfolderPath) {
+		List list = new ArrayList();
+		java.io.File containerDirectory = getDirectoryForList();
+		java.io.File subfolder = new java.io.File(containerDirectory, subfolderPath);
+		addFiles(subfolder, list);
+		return list;
+	}
 
 	/**
 	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategy.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategy.java
index 09eab45e0..015dcb192 100644
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategy.java
+++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategy.java
@@ -136,7 +136,9 @@ public interface LoadStrategy {
 	public LooseArchive getLooseArchive();
 
 	public void setLooseArchive(LooseArchive aLooseArchive);
-
+	
+	public java.util.List getFiles(String subfolderPath);
+	
 	public boolean isReadOnly();
 
 	public void setReadOnly(boolean readOnly);
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java
index 33dcf6bf8..b810eb8c9 100644
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java
@@ -71,7 +71,7 @@ public abstract class LoadStrategyImpl extends AdapterImpl implements LoadStrate
 
 	protected LooseArchive looseArchive;
 
-	protected Map collectedLooseArchiveFiles;
+	protected Map collectedLooseArchiveFiles = Collections.EMPTY_MAP;
 
 	protected boolean readOnly = false;
 
@@ -140,6 +140,16 @@ public abstract class LoadStrategyImpl extends AdapterImpl implements LoadStrate
 		return LooseConfigRegister.singleton().findFirstLooseChild(uri, loose) != null;
 	}
 
+	protected File createDirectory(String uri){
+		File aFile = null;
+		aFile = getArchiveFactory().createFile();
+		aFile.setDirectoryEntry(true);
+		aFile.setURI(uri);
+		aFile.setOriginalURI(uri);
+		aFile.setLoadingContainer(getContainer());
+		return aFile;
+	}
+	
 	protected File createFile(String uri) {
 		File aFile = null;
 		if (isArchive(uri))
@@ -273,7 +283,7 @@ public abstract class LoadStrategyImpl extends AdapterImpl implements LoadStrate
 		collectFilesFromLooseArchives();
 		List files = getFiles();
 		files.addAll(collectedLooseArchiveFiles.values());
-		collectedLooseArchiveFiles = null;
+		collectedLooseArchiveFiles = Collections.EMPTY_MAP;
 		return files;
 	}
 
@@ -554,4 +564,15 @@ public abstract class LoadStrategyImpl extends AdapterImpl implements LoadStrate
 	public void setRendererType(int rendererType) {
 		this.rendererType = rendererType;
 	}
+	
+	public java.util.List getFiles(String subfolderPath) {
+		List subset = new ArrayList();
+		List theFiles = getFiles();
+		for (int i = 0; i < theFiles.size(); i++) {
+			File aFile = (File)theFiles.get(i);
+			if (aFile.getURI().startsWith(subfolderPath))	
+				subset.add(aFile);
+		}
+		return subset;
+	}
 }