modificaciones servicio SmellTool

src/main/java/es/uva/inf/tfg/ginquin/smellswisdom/controller/SmellsArticleDetailController.java

@@ -87,7 +87,7 @@ public class SmellsArticleDetailController extends SelectorComposer<Component> {
 			Tool tool = toolService.getTool(Integer.parseInt(param_tool_id));
 			
 			title= Labels.getLabel("smellsDetail.title1")+" "+tool.getName();
-			allSmells =  smellToolService.getToolsBySmell(tool);
+			allSmells =  smellToolService.getSmellsByTool(tool);
 			
 			bTools.setVisible(false);
 			bProjects.setVisible(false);

src/main/java/es/uva/inf/tfg/ginquin/smellswisdom/controller/ToolsArticleDetailController.java

@@ -27,7 +27,7 @@ import org.zkoss.zul.Listbox;
 import es.uva.inf.tfg.ginquin.smellswisdom.domain.Article;
 import es.uva.inf.tfg.ginquin.smellswisdom.domain.Articletool;
 import es.uva.inf.tfg.ginquin.smellswisdom.domain.Smell;
-import es.uva.inf.tfg.ginquin.smellswisdom.domain.Smelltool;
+import es.uva.inf.tfg.ginquin.smellswisdom.domain.Tool;
 import es.uva.inf.tfg.ginquin.smellswisdom.services.ArticleService;
 import es.uva.inf.tfg.ginquin.smellswisdom.services.ArticletoolService;
 import es.uva.inf.tfg.ginquin.smellswisdom.services.SmellService;
@@ -64,7 +64,7 @@ public class ToolsArticleDetailController extends SelectorComposer<Component> {
 	private Articletool selectedArticleTool;
 
 	private ListModelList<Articletool> articleToolsListModel;
-	private ListModelList<Smelltool> toolsListModel;
+	private ListModelList<Tool> toolsListModel;
 
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
@@ -85,8 +85,8 @@ public class ToolsArticleDetailController extends SelectorComposer<Component> {
 			articleToolsListBox.setVisible(false);
 			toolsListBox.setVisible(true);
 
-			Set<Smelltool> allSmelltools = new HashSet<>(smellToolService.getSmellToolBySmell(smell));
-			toolsListModel = new ListModelList<Smelltool>(allSmelltools);
+			Set<Tool> alltools = new HashSet<>(smellToolService.getToolsBySmell(smell));
+			toolsListModel = new ListModelList<Tool>(alltools);
 			toolsListBox.setModel(toolsListModel);
 
 		} else if (param_article_id!=null) {

src/main/java/es/uva/inf/tfg/ginquin/smellswisdom/repository/SmelltoolDao.java

@@ -57,7 +57,7 @@ public class SmelltoolDao {
 	}
 	
 	@Transactional(value="transactionManagerCopy", readOnly = true)
-	public List<Smell> getSmellsbyTool(Tool tool) {
+	public List<Smell> getSmellsByTool(Tool tool) {
 		TypedQuery<Smell> query = 
 					em.createQuery("select st.id.smell from Smelltool st WHERE st.id.tool=:tool",
 							Smell.class);
@@ -73,6 +73,23 @@ public class SmelltoolDao {
 		return smells;
 	}
 	
+	@Transactional(value="transactionManagerCopy", readOnly = true)
+	public List<Tool> getToolsBySmell(Smell smell) {
+		TypedQuery<Tool> query = 
+					em.createQuery("select st.id.tool from Smelltool st WHERE st.id.smell=:smell",
+							Tool.class);
+		query.setParameter("smell", smell);
+
+		List<Tool> tools = null;
+		try {
+			tools = query.getResultList();
+		} catch (Exception e) {
+			tools = null;
+			e.printStackTrace();
+		}
+		return tools;
+	}
+	
 	@PersistenceContext(unitName="jpaDataCopy")
 	@Qualifier(value="entityManagerFactoryCopy")
 	private EntityManager emCopy;

src/main/java/es/uva/inf/tfg/ginquin/smellswisdom/services/SmellToolService.java

@@ -16,11 +16,6 @@ public interface SmellToolService {
 	 */
 	List<Smelltool> getSmellToolBySmell(Smell smell);
 	
-	/**
-	 * Permite obtener los SmellTool de un smell de la bd principal.
-	 * @param smell smell del que se quiere saber los smelltool.
-	 * @return lista de smelltool
-	 */
 	/**
 	 *  Permite obtener los SmellTool de un smell de la bd principal.
 	 * @param tool tool del que se quiere saber los smelltool.
@@ -33,7 +28,14 @@ public interface SmellToolService {
 	 * @param tool tool del que queremos saber los smells que detecta.
 	 * @return lista de smells.
 	 */
-	List<Smell> getToolsBySmell(Tool tool);
+	List<Smell> getSmellsByTool(Tool tool);
+	
+	/**
+	 * Permite obtener todos los tools con las que puede ser detectada un smell.
+	 * @param smell smell del que queremos saber con que herramientas se detecta.
+	 * @return lista de tools.
+	 */
+	List<Tool> getToolsBySmell(Smell smell);
 	
 	
 	/**

src/main/java/es/uva/inf/tfg/ginquin/smellswisdom/services/impl/SmelltoolServiceImpl.java

@@ -26,15 +26,18 @@ public class SmelltoolServiceImpl implements SmellToolService {
 		return dao.findBySmell(smell);
 	}
 
-
 	@Override
 	public List<Smelltool> getSmellToolByTool(Tool tool) {
 		return dao.findByTool(tool);
 	}
 	
 	@Override
-	public List<Smell> getToolsBySmell(Tool tool) {
-		return dao.getSmellsbyTool(tool);
+	public List<Smell> getSmellsByTool(Tool tool) {
+		return dao.getSmellsByTool(tool);
+	}
+	@Override
+	public List<Tool> getToolsBySmell(Smell smell) {
+		return dao.getToolsBySmell(smell);
 	}
 
 	@Override
@@ -47,5 +50,4 @@ public class SmelltoolServiceImpl implements SmellToolService {
 		return dao.saveSmelltool(smelltool);
 	}
 
-
 }

src/main/webapp/pages/user/ToolsArticleDetail.zul

@@ -64,26 +64,26 @@
 			</listhead>
 			<template name="model">
 				<listitem>
-					<listcell label="${each.tool.name}" />
-					<listcell label="${each.tool.url}" />
-					<listcell label="${each.tool.yesOrNoFree}" />
-					<listcell label="${each.tool.yesOrNoOpenSource}" />
+					<listcell label="${each.name}" />
+					<listcell label="${each.url}" />
+					<listcell label="${each.yesOrNoFree}" />
+					<listcell label="${each.yesOrNoOpenSource}" />
 					<listcell
-						label="${each.tool.softwareRepresentationNamesRes}" popup="repre_${each.tool.toolId}"
-						tooltiptext="${each.tool.softwareRepresentationNames}">
-						<popup id="repre_${each.tool.toolId}"
+						label="${each.softwareRepresentationNamesRes}" popup="repre_${each.toolId}"
+						tooltiptext="${each.softwareRepresentationNames}">
+						<popup id="repre_${each.toolId}"
 							width="300px">
-							<label  multiline="true" value="${each.tool.softwareRepresentationNames}"/>
+							<label  multiline="true" value="${each.softwareRepresentationNames}"/>
 						</popup>
 					</listcell>
-					<listcell label="${each.tool.supportedLanguagesNamesRes}" popup="supp_${each.tool.toolId}"
-						tooltiptext="${each.tool.supportedLanguagesNames}">
-						<popup id="supp_${each.tool.toolId}"
+					<listcell label="${each.supportedLanguagesNamesRes}" popup="supp_${each.toolId}"
+						tooltiptext="${each.supportedLanguagesNames}">
+						<popup id="supp_${each.toolId}"
 							width="300px">
-							<label  multiline="true" value="${each.tool.supportedLanguagesNames}"/>
+							<label  multiline="true" value="${each.supportedLanguagesNames}"/>
 						</popup>
 					</listcell>
-					<listcell label="${each.tool.nameAutomation}" />
+					<listcell label="${each.nameAutomation}" />
 				</listitem>
 			</template>
 		</listbox>