returning IFile instead of set

Author: geetikabatra

plugins/com.redhat.fabric8analytics.lsp.eclipse.core/src/com/redhat/fabric8analytics/lsp/eclipse/core/RecommenderAPIProvider.java

@@ -11,15 +11,10 @@
 
 package com.redhat.fabric8analytics.lsp.eclipse.core;
 
-import java.io.BufferedReader;
+
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.Map;
-import java.util.Set;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
@@ -32,7 +27,6 @@
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -75,7 +69,7 @@ public RecommenderAPIProvider(AnalyticsAuthData analyticsAuthData) {
 	 * @param pomFiles
 	 * @return jobID
 	 */
-	public String requestAnalyses(Map<String, String> files, Set<IFile> license) throws RecommenderAPIException {
+	public String requestAnalyses(Map<String, String> files, IFile license) throws RecommenderAPIException {
 
 		checkFiles(files);// check if this is none
 		HttpPost post = new HttpPost(
@@ -90,8 +84,8 @@ public String requestAnalyses(Map<String, String> files, Set<IFile> license) thr
 			builder.addPart("manifest[]", new PomContentBody(fileObject.getValue())).addTextBody("filePath[]",
 					fileObject.getKey());
 		}
-		if(!license.isEmpty()) {
-			IPath licenseFile = license.iterator().next().getLocation();
+		if(license!=null) {
+			IPath licenseFile = license.getLocation();
 
 			FileBody licenseBody = new FileBody(new File(licenseFile.toString()));
 			builder.addPart("license[]", licenseBody);

plugins/com.redhat.fabric8analytics.lsp.eclipse.core/src/com/redhat/fabric8analytics/lsp/eclipse/core/job/SendToFabric8AnalysisJob.java

@@ -34,9 +34,9 @@ public class SendToFabric8AnalysisJob extends Job {
 		private String jobID;
 		private Set<IFile> pomFiles;
 		private RecommenderAPIProvider provider;
-		private Set<IFile> license;
+		private IFile license;
 
-		public SendToFabric8AnalysisJob(RecommenderAPIProvider provider, Set<IFile> pomFiles, Set<IFile> license) {
+		public SendToFabric8AnalysisJob(RecommenderAPIProvider provider, Set<IFile> pomFiles, IFile license) {
 			super("Send poms to fabric8-analysis");
 			this.pomFiles = pomFiles;
 			this.provider = provider;

plugins/com.redhat.fabric8analytics.lsp.eclipse.ui/src/com/redhat/fabric8analytics/lsp/eclipse/ui/EditorComposite.java

@@ -85,7 +85,7 @@ public void done(IJobChangeEvent event) {
 						AnalyticsAuthData analyticsAuthData = getAuthDataJob.getAuthData();
 						if(analyticsAuthData != null) {
 							RecommenderAPIProvider provider = new RecommenderAPIProvider(analyticsAuthData);
-							new AnalysesJobHandler(provider, Collections.singleton(currentPomFile), Collections.EMPTY_SET, EditorComposite.this).analyze();
+							new AnalysesJobHandler(provider, Collections.singleton(currentPomFile), null , EditorComposite.this).analyze();
 						}
 					}
 				});

plugins/com.redhat.fabric8analytics.lsp.eclipse.ui/src/com/redhat/fabric8analytics/lsp/eclipse/ui/ExitHandler.java

@@ -40,7 +40,7 @@ public class ExitHandler extends AbstractHandler {
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		final Set<IFile> pomFiles;
-		final Set<IFile> license;
+		final IFile license;
 		try {
 			pomFiles = WorkspaceFilesFinder.getInstance().findPOMs();
 			license = WorkspaceFilesFinder.getInstance().findLicense();

plugins/com.redhat.fabric8analytics.lsp.eclipse.ui/src/com/redhat/fabric8analytics/lsp/eclipse/ui/internal/AnalysesJobHandler.java

@@ -41,9 +41,9 @@ public class AnalysesJobHandler {
 
 	private EditorComposite editorComposite;
 
-	private Set<IFile> license;
+	private IFile license;
 
-	public AnalysesJobHandler(RecommenderAPIProvider provider, Set<IFile> pomFiles, Set<IFile> license, EditorComposite editorComposite) {
+	public AnalysesJobHandler(RecommenderAPIProvider provider, Set<IFile> pomFiles, IFile license, EditorComposite editorComposite) {
 		this.provider = provider;
 		this.pomFiles = pomFiles;
 		this.editorComposite = editorComposite;

plugins/com.redhat.fabric8analytics.lsp.eclipse.ui/src/com/redhat/fabric8analytics/lsp/eclipse/ui/internal/WorkspaceFilesFinder.java

@@ -133,15 +133,15 @@ public Set<IFile> getCurrentPom() throws CoreException
 	 * @return
 	 * @throws CoreException 
 	 */
-	public Set<IFile> findLicense() throws CoreException {
+	public IFile findLicense() throws CoreException {
 		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 		if (window == null) {
-			return Collections.emptySet(); 
+			return null;
 		}
 
 		IStructuredSelection selection = (IStructuredSelection) window.getSelectionService().getSelection();
 		if (selection == null) {
-			return Collections.emptySet();
+			return null;
 		}
 		return findLicense(selection);
 	}
@@ -152,7 +152,7 @@ public Set<IFile> findLicense() throws CoreException {
 	 * @return
 	 * @throws CoreException 
 	 */
-	public Set<IFile> findLicense(IStructuredSelection selection) throws CoreException {
+	public IFile findLicense(IStructuredSelection selection) throws CoreException {
 		Set<IFile> files = new HashSet<IFile>();
 		if(selection instanceof IStructuredSelection) {
 			IStructuredSelection structurredSelection = (IStructuredSelection)selection;
@@ -164,42 +164,43 @@ public Set<IFile> findLicense(IStructuredSelection selection) throws CoreExcepti
 				//				selectedProject = (IProject) firstSeleciton;
 				for (Object o : selection.toList()) {
 					if (o instanceof IAdaptable) {
-						findLicense(files, (IAdaptable) o);
+						return findLicense((IAdaptable) o);
 					}
 				}
 
-				return files;
+				return null;
 			}
 
 		}
-		return files;
+		return null;
 	}
 	/**
 	 * Finds the license file in the the project.
 	 * @param adaptable
 	 * @return
 	 * @throws CoreException 
 	 */
-	private void findLicense(Set<IFile> files, IAdaptable adaptable) throws CoreException {
+	private IFile findLicense(IAdaptable adaptable) throws CoreException {
 
 		IContainer container = (IContainer) adaptable.getAdapter(IContainer.class);
 		if (container == null || !container.isAccessible()) {
-			return;
+			return null;
 		}
 		for (IResource member : container.members()) {
 			if (member instanceof IFile && member.getName().toLowerCase().equals("license")) {
 				IFile file = (IFile) member.getAdapter(IFile.class);
 				if (file != null) {
 					if (file.isAccessible()) {
-						files.add(file);
+						return file;
 					} else {
-						return;
+						return null;
 					}
 				}
 
 			}
 
 		}
+		return null;
 
 
 	}