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

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java
index 4bee35967e202098425b07abd98feb6d9035312e..b1d62d874b3aaa52318cabd948a23cf2c461fbf4 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java
@@ -127,10 +127,6 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
                return ret;\r
        }\r
 \r
-       public IItemManager getItemManager() {\r
-               return itemManager;\r
-       }\r
-\r
        // ListModelList method felulirva\r
        // after 1. search ++++++++++\r
        @Override\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
index 9b1454cbe6d8a353913a2451e84c5cf24baeb5dc..2043af895b001f4f420e84e6f6e75847fc81c691 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
@@ -51,7 +51,7 @@ import user.commons.StoreUri;
 import user.commons.remotestore.RemoteStoreProtocol;\r
 import user.jobengine.db.ArchivedMedia;\r
 import user.jobengine.db.IItemManager;\r
-import user.jobengine.db.Media;\r
+import user.jobengine.db.ItemManager;\r
 import user.jobengine.db.MediaFile;\r
 import user.jobengine.db.Store;\r
 import user.jobengine.zk.util.SessionUtil;\r
@@ -84,6 +84,7 @@ public class SearchModel extends AsyncBaseModel {
        private boolean rowsExpanded = true;\r
        private boolean allSelected;\r
        private boolean itemSelected;\r
+       protected IItemManager itemManager = null;\r
        @Wire\r
        Timer timer;\r
        @Wire\r
@@ -105,6 +106,8 @@ public class SearchModel extends AsyncBaseModel {
        private ListModelList<String> searchHistory;\r
 \r
        public SearchModel() {\r
+               this.itemManager = ItemManager.getInstance();\r
+\r
                typeFilters = new LinkedHashMap<>();\r
                addTypeFilter(TypeFilter.as(NEWS_MATERIAL, "RED200", "ic_language_black_18dp.png"));\r
                addTypeFilter(TypeFilter.as(RAW_NEWS_MATERIAL, "RED100", "ic_perm_camera_mic_black_18dp.png"));\r
@@ -288,9 +291,8 @@ public class SearchModel extends AsyncBaseModel {
 \r
        public boolean getHasLowresMediaFile() {\r
                boolean ret = false;\r
-               Media media = getMedia();\r
-               if (media != null) {\r
-                       List<MediaFile> mediaFiles = media.getMediaFiles();\r
+               if (selectedObject != null) {\r
+                       List<MediaFile> mediaFiles = selectedObject.getMedia().getMediaFiles();\r
                        if (mediaFiles != null) {\r
                                for (MediaFile mf : mediaFiles) {\r
                                        if (mf.getStore().isLowres()) {\r
@@ -312,9 +314,8 @@ public class SearchModel extends AsyncBaseModel {
 \r
        public String getLowresMediaFilePath() throws Exception {\r
                String ret = PAGES_MEDIAPLAYER;\r
-               Media media = getMedia();\r
-               if (media != null) {\r
-                       List<MediaFile> mediaFiles = media.getMediaFiles();\r
+               if (selectedObject != null) {\r
+                       List<MediaFile> mediaFiles = selectedObject.getMedia().getMediaFiles();\r
                        if (mediaFiles != null) {\r
                                for (MediaFile mf : mediaFiles) {\r
                                        Store store = mf.getStore();\r
@@ -333,15 +334,6 @@ public class SearchModel extends AsyncBaseModel {
                return ret;\r
        }\r
 \r
-       private Media getMedia() {\r
-               Media result = null;\r
-               if (searchResult != null && selectedObject != null) {\r
-                       IItemManager manager = searchResult.getItemManager();\r
-                       result = manager.getMedia(selectedObject.getMedia().getId());\r
-               }\r
-               return result;\r
-       }\r
-\r
        public ListModelList<String> getSearchHistory() {\r
                return searchHistory;\r
        }\r
@@ -379,9 +371,8 @@ public class SearchModel extends AsyncBaseModel {
 \r
        public String getTSMMediaFilePath() throws Exception {\r
                String ret = "";\r
-               Media media = getMedia();\r
-               if (media != null) {\r
-                       List<MediaFile> mediaFiles = media.getMediaFiles();\r
+               if (selectedObject != null) {\r
+                       List<MediaFile> mediaFiles = selectedObject.getMedia().getMediaFiles();\r
                        for (MediaFile mf : mediaFiles) {\r
                                Store store = mf.getStore();\r
                                if (mf.getStore().isSystem())\r
@@ -547,6 +538,8 @@ public class SearchModel extends AsyncBaseModel {
 \r
        @NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" })\r
        public void setSelectedObject(ArchivedMedia selectedObject) {\r
+               selectedObject.setMedia(itemManager.getMedia(selectedObject.getMedia().getId()));\r
+               selectedObject.setItem(itemManager.getItem(selectedObject.getMedia().getItemId()));\r
                this.selectedObject = selectedObject;\r
        }\r
 \r