changed keyword dao method to recieve boolean to specify whether deleted/inactivated keywords should be included in the result or not

src/main/java/se/su/dsv/scipro/match/dao/interfaces/KeywordDao.java

@@ -9,7 +9,7 @@ import se.su.dsv.scipro.match.dataobject.KeywordType;
 
 public interface KeywordDao extends LazyDeleteDao<Keyword>{
 
-    Set<Keyword> getKeywords(KeywordType type);
+    Set<Keyword> getKeywords(KeywordType type, boolean includeDeleted);
     
     public List<Keyword> findAllFromType(KeywordType kt, boolean includeDeleted);
     

src/main/java/se/su/dsv/scipro/match/dao/jpa/KeywordDaoJPAImp.java

@@ -30,9 +30,15 @@ public class KeywordDaoJPAImp extends LazyDeleteAbstractDaoJPAImp<Keyword> imple
     }
     
     @Override
-    public Set<Keyword> getKeywords(KeywordType type) {
-        return new HashSet<Keyword>(getJpaTemplate().execute(
-            new QuerySet().type(type).fetchCallback()));
+    public Set<Keyword> getKeywords(KeywordType type, boolean includeDeleted) {
+        if (includeDeleted){
+        	return new HashSet<Keyword>(getJpaTemplate().execute(
+                    new QuerySet().type(type).fetchCallback()));
+        }
+        else {
+        	return new HashSet<Keyword>(getJpaTemplate().execute(
+                    new QuerySet().type(type).noDeleted().fetchCallback()));
+        }
     }
 
     private static class QuerySet extends AbstractSortableQuerySet<Keyword> {
@@ -48,6 +54,12 @@ public class KeywordDaoJPAImp extends LazyDeleteAbstractDaoJPAImp<Keyword> imple
             }
             return this;
         }
+        
+        public QuerySet noDeleted() {
+        	getQuery().combine(
+        		new Query().where("k.deleted = false"));
+            return this;
+        }
 
         @Override
         public Query initQuery() {