From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Thu, 19 Jul 2018 14:27:40 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=ea85b4dc986a8b191e205d0447ed6331d8f10b60;p=mediacube.git

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

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 4bee3596..b1d62d87 100644
--- 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;
 	}
 
-	public IItemManager getItemManager() {
-		return itemManager;
-	}
-
 	// ListModelList method felulirva
 	// after 1. search ++++++++++
 	@Override
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 9b1454cb..2043af89 100644
--- 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;
 import user.jobengine.db.ArchivedMedia;
 import user.jobengine.db.IItemManager;
-import user.jobengine.db.Media;
+import user.jobengine.db.ItemManager;
 import user.jobengine.db.MediaFile;
 import user.jobengine.db.Store;
 import user.jobengine.zk.util.SessionUtil;
@@ -84,6 +84,7 @@ public class SearchModel extends AsyncBaseModel {
 	private boolean rowsExpanded = true;
 	private boolean allSelected;
 	private boolean itemSelected;
+	protected IItemManager itemManager = null;
 	@Wire
 	Timer timer;
 	@Wire
@@ -105,6 +106,8 @@ public class SearchModel extends AsyncBaseModel {
 	private ListModelList<String> searchHistory;
 
 	public SearchModel() {
+		this.itemManager = ItemManager.getInstance();
+
 		typeFilters = new LinkedHashMap<>();
 		addTypeFilter(TypeFilter.as(NEWS_MATERIAL, "RED200", "ic_language_black_18dp.png"));
 		addTypeFilter(TypeFilter.as(RAW_NEWS_MATERIAL, "RED100", "ic_perm_camera_mic_black_18dp.png"));
@@ -288,9 +291,8 @@ public class SearchModel extends AsyncBaseModel {
 
 	public boolean getHasLowresMediaFile() {
 		boolean ret = false;
-		Media media = getMedia();
-		if (media != null) {
-			List<MediaFile> mediaFiles = media.getMediaFiles();
+		if (selectedObject != null) {
+			List<MediaFile> mediaFiles = selectedObject.getMedia().getMediaFiles();
 			if (mediaFiles != null) {
 				for (MediaFile mf : mediaFiles) {
 					if (mf.getStore().isLowres()) {
@@ -312,9 +314,8 @@ public class SearchModel extends AsyncBaseModel {
 
 	public String getLowresMediaFilePath() throws Exception {
 		String ret = PAGES_MEDIAPLAYER;
-		Media media = getMedia();
-		if (media != null) {
-			List<MediaFile> mediaFiles = media.getMediaFiles();
+		if (selectedObject != null) {
+			List<MediaFile> mediaFiles = selectedObject.getMedia().getMediaFiles();
 			if (mediaFiles != null) {
 				for (MediaFile mf : mediaFiles) {
 					Store store = mf.getStore();
@@ -333,15 +334,6 @@ public class SearchModel extends AsyncBaseModel {
 		return ret;
 	}
 
-	private Media getMedia() {
-		Media result = null;
-		if (searchResult != null && selectedObject != null) {
-			IItemManager manager = searchResult.getItemManager();
-			result = manager.getMedia(selectedObject.getMedia().getId());
-		}
-		return result;
-	}
-
 	public ListModelList<String> getSearchHistory() {
 		return searchHistory;
 	}
@@ -379,9 +371,8 @@ public class SearchModel extends AsyncBaseModel {
 
 	public String getTSMMediaFilePath() throws Exception {
 		String ret = "";
-		Media media = getMedia();
-		if (media != null) {
-			List<MediaFile> mediaFiles = media.getMediaFiles();
+		if (selectedObject != null) {
+			List<MediaFile> mediaFiles = selectedObject.getMedia().getMediaFiles();
 			for (MediaFile mf : mediaFiles) {
 				Store store = mf.getStore();
 				if (mf.getStore().isSystem())
@@ -547,6 +538,8 @@ public class SearchModel extends AsyncBaseModel {
 
 	@NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" })
 	public void setSelectedObject(ArchivedMedia selectedObject) {
+		selectedObject.setMedia(itemManager.getMedia(selectedObject.getMedia().getId()));
+		selectedObject.setItem(itemManager.getItem(selectedObject.getMedia().getItemId()));
 		this.selectedObject = selectedObject;
 	}