git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
index 7d7046e0d2b90e3f7770cddd84a820da6c21b3ea..81650684bde49b0db388b3384ee25ed1fab96c1c 100644 (file)
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
@@ -27,7 +27,7 @@ public class ItemDAOEx {
                return queryBuilder.getQuery();\r
        }\r
 \r
-       private String buildResultQuery(QueryObject queryObject, String innerQuery, ComplexSearchResult csr) {\r
+       private String buildResultQuery(QueryObject queryObject, String innerQuery, ComplexSearchResult<Item> csr) {\r
                StringBuilder resultQuery = new StringBuilder();\r
                Formatter qf = new Formatter(resultQuery, Locale.getDefault());\r
                RenderParameter rp = queryObject.getParameters();\r
@@ -61,9 +61,9 @@ public class ItemDAOEx {
                return resultQuery.toString();\r
        }\r
 \r
-       private List<ComplexSearchResult> getResultHeaders(Connection connection, QueryObject queryObject,\r
+       private List<ComplexSearchResult<Item>> getResultHeaders(Connection connection, QueryObject queryObject,\r
                        String innerQuery) {\r
-               List<ComplexSearchResult> results = new ArrayList<ComplexSearchResult>();\r
+               List<ComplexSearchResult<Item>> results = new ArrayList<ComplexSearchResult<Item>>();\r
                String typeQuery;\r
                if (queryObject.getParameters() == null)\r
                        typeQuery = String.format("SELECT CAST(COUNT(DISTINCT(ii.ID)) AS BIGINT) %s", innerQuery);\r
@@ -79,7 +79,7 @@ public class ItemDAOEx {
                        st = connection.prepareStatement(typeQuery);\r
                        rs = st.executeQuery();\r
                        while (rs.next()) {\r
-                               ComplexSearchResult sr = new ComplexSearchResult();\r
+                               ComplexSearchResult<Item> sr = new ComplexSearchResult<Item>();\r
                                if (queryObject.getParameters() == null) {\r
                                        sr.setItemCount(rs.getLong(1));\r
                                } else {\r
@@ -107,6 +107,7 @@ public class ItemDAOEx {
                                e1.printStackTrace();\r
                        }\r
                }\r
+\r
                return results;\r
        }\r
 \r
@@ -181,12 +182,12 @@ public class ItemDAOEx {
        }\r
 \r
        @SuppressWarnings("unchecked")\r
-       public List<ComplexSearchResult> search(QueryObject queryObject) {\r
+       public List<ComplexSearchResult<Item>> search(QueryObject queryObject) {\r
                manager.traceIn();\r
                if (queryObject == null || queryObject.getFilters() == null || queryObject.getFilters().size() == 0)\r
                        throw new IllegalArgumentException("QueryObject not specified.");\r
 \r
-               List<ComplexSearchResult> results = new ArrayList<ComplexSearchResult>();\r
+               List<ComplexSearchResult<Item>> results = new ArrayList<ComplexSearchResult<Item>>();\r
 \r
                ResultSet rs = null;\r
                PreparedStatement st = null;\r
@@ -203,7 +204,7 @@ public class ItemDAOEx {
                                // ItemType-onként többe\r
                                results = getResultHeaders(connection, queryObject, innerQuery);\r
                        } else {\r
-                               ComplexSearchResult sr = new ComplexSearchResult();\r
+                               ComplexSearchResult<Item> sr = new ComplexSearchResult<Item>();\r
                                ItemType itemType = (ItemType) manager.get(ItemType.class, queryObject.getActiveItemTypeId());\r
                                sr.setItemType(itemType);\r
                                // TODO\r
@@ -213,7 +214,7 @@ public class ItemDAOEx {
                        }\r
 \r
                        if (results.size() != 0) {\r
-                               ComplexSearchResult csr = results.get(0);\r
+                               ComplexSearchResult<Item> csr = results.get(0);\r
                                String resultQuery = buildResultQuery(queryObject, innerQuery, csr);\r
                                st = connection.prepareStatement(resultQuery);\r
 \r