From: Márk Mérész <USER\mark.meresz>
Date: Fri, 13 Jul 2018 06:36: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=21cbb75664801dc68a9a30706d82bf3657dd575c;p=mediacube.git

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

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
index 0d0514aa..2bd2393d 100644
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
@@ -82,7 +82,7 @@ public class ItemManager extends MemoryCache implements IItemManager {
 	// }
 
 	public void activate() {
-		//logger.info("ItemManager activated.");
+		// logger.info("ItemManager activated.");
 	}
 
 	@Override
@@ -391,7 +391,7 @@ public class ItemManager extends MemoryCache implements IItemManager {
 	}
 
 	public void deactivate() {
-		//logger.info("ItemManager deactivated.");
+		// logger.info("ItemManager deactivated.");
 	}
 
 	/**
@@ -563,25 +563,25 @@ public class ItemManager extends MemoryCache implements IItemManager {
 		return result;
 	}
 
-	//	@Override
-	//	public long getExistingRundownMedia(String houseid) {
-	//		final long[] result = { 0 };
-	//		StringBuilder query = new StringBuilder();
-	//		query.append("select itemid, mediaid, replace(mediafilehouseid, concat('-', concat(itemhouseid,'.MXF')), '') filename");
-	//		query.append(" ");
-	//		query.append("from vw_items where replace(mediafilehouseid, concat('-', itemhouseid), '') != mediafilehouseid");
-	//		query.append(" ");
-	//		query.append("and replace(mediafilehouseid, concat('-', concat(itemhouseid,'.MXF')), '') = ?");
-	//		IStatementDecorator decorator = st -> {
-	//			st.setString(1, houseid);
-	//		};
-	//		IResultSetConsumer consumer = rs -> {
-	//			result[0] = rs.getLong("mediaid");
-	//			return false;
-	//		};
-	//		executeQuery(query.toString(), consumer, decorator);
-	//		return result[0];
-	//	}
+	// @Override
+	// public long getExistingRundownMedia(String houseid) {
+	// final long[] result = { 0 };
+	// StringBuilder query = new StringBuilder();
+	// query.append("select itemid, mediaid, replace(mediafilehouseid, concat('-', concat(itemhouseid,'.MXF')), '') filename");
+	// query.append(" ");
+	// query.append("from vw_items where replace(mediafilehouseid, concat('-', itemhouseid), '') != mediafilehouseid");
+	// query.append(" ");
+	// query.append("and replace(mediafilehouseid, concat('-', concat(itemhouseid,'.MXF')), '') = ?");
+	// IStatementDecorator decorator = st -> {
+	// st.setString(1, houseid);
+	// };
+	// IResultSetConsumer consumer = rs -> {
+	// result[0] = rs.getLong("mediaid");
+	// return false;
+	// };
+	// executeQuery(query.toString(), consumer, decorator);
+	// return result[0];
+	// }
 
 	@Override
 	public FileType getFileType(String name) {
diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemType.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemType.java
index 5266da77..78cfb944 100644
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemType.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemType.java
@@ -11,10 +11,10 @@ import java.util.List;
 import user.commons.EntityBase;
 
 /**
- * Anyag típus Pojo osztály.
- * 
+ * Anyag t�pus Pojo oszt�ly.
+ *
  * @author User
- * 
+ *
  */
 public class ItemType extends EntityBase implements Serializable {
 	private static final long serialVersionUID = 1L;
@@ -32,76 +32,19 @@ public class ItemType extends EntityBase implements Serializable {
 			String oldName = m.getMetadataElement().getName();
 			String newName = md.getMetadataElement().getName();
 			if (oldName.equals(newName))
-				throw new ItemManagerException(
-						"Metadata with this name already added: " + oldName);
+				throw new ItemManagerException("Metadata with this name already added: " + oldName);
 		}
 		this.metadatas.add(md);
 	}
 
-	public String getDescription() {
-		return this.description;
-	}
-
-	@SuppressWarnings("unchecked")
-	public List<Metadata> getMetadatas() {
-		if (metadatas == null && getId() != 0) {
-			ItemManager manager = ItemManager.getInstance();
-			if (manager != null) {
-				IEntityBaseDAO dao = manager.getBaseDAO(Metadata.class);
-				if (dao != null)
-					this.metadatas = (List<Metadata>) (List<?>) dao
-							.getAll(getId());
-			}
-		}
-		return this.metadatas;
-	}
-
-	public String getName() {
-		return this.name;
-	}
-
-	String getTableName() {
-		return tablePrefix + getTableId();
-	}
-
-	String getTableId() {
-		return String.format("%04d", getId());
-	}
-
-	public void setDescription(String description) {
-		checkParameter("Description", description);
-		this.description = description;
-	}
-
-	public void setMetadatas(List<Metadata> metadatas) {
-		this.metadatas = metadatas;
-	}
-
-	public void setName(String name) {
-		checkParameter("Name", name);
-		this.name = name;
-	}
-
-	String getFieldList(String prefix) {
-		String ret = "";
-		for (int i = 0; i < getMetadatas().size(); i++) {
-			Metadata md = getMetadatas().get(i);
-			ret += String.format("%s.\"%s\"", prefix, md.getMetadataElement()
-					.getName());
-			if (i < getMetadatas().size() - 1)
-				ret += ", ";
-		}
-		return ret;
-	}
-
 	/**
-	 * Serializációs technikával másolatot készít egy ItemType objektumról.
-	 * 
-	 * @deprecated Az ItemType objektum másolási technikára nincs szükség. Az
-	 *             objektum kliens oldalon bõvítendõ a megjelenítéshez szükséges
-	 *             statikus Metadata objektumokkal.
-	 * @return ItemType objektum másolata.
+	 * Serializ�ci�s technik�val m�solatot k�sz�t egy ItemType objektumr�l.
+	 *
+	 * @deprecated Az ItemType objektum m�sol�si technik�ra nincs sz�ks�g. Az objektum kliens oldalon b�v�tend� a megjelen�t�shez sz�ks�ges statikus Metadata
+	 *             objektumokkal.
+	 * @return ItemType objektum m�solata.
 	 */
+	@Deprecated
 	ItemType copy() {
 		Object obj = null;
 		try {
@@ -114,8 +57,7 @@ public class ItemType extends EntityBase implements Serializable {
 
 			// Make an input stream from the byte array and read
 			// a copy of the object back in.
-			ObjectInputStream in = new ObjectInputStream(
-					new ByteArrayInputStream(bos.toByteArray()));
+			ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bos.toByteArray()));
 			obj = in.readObject();
 		} catch (Exception e) {
 			throw new ItemManagerException(e.getMessage());
@@ -123,8 +65,19 @@ public class ItemType extends EntityBase implements Serializable {
 		return (ItemType) obj;
 	}
 
-	public void setIsStatic(boolean isStatic) {
-		this.isStatic = isStatic;
+	public String getDescription() {
+		return this.description;
+	}
+
+	String getFieldList(String prefix) {
+		String ret = "";
+		for (int i = 0; i < getMetadatas().size(); i++) {
+			Metadata md = getMetadatas().get(i);
+			ret += String.format("%s.\"%s\"", prefix, md.getMetadataElement().getName());
+			if (i < getMetadatas().size() - 1)
+				ret += ", ";
+		}
+		return ret;
 	}
 
 	public boolean getIsStatic() {
@@ -136,8 +89,7 @@ public class ItemType extends EntityBase implements Serializable {
 		if (getMetadatas() != null) {
 			for (Metadata metadata : metadatas) {
 				MetadataElement metadataElement = metadata.getMetadataElement();
-				if (metadataElement != null
-						&& metadataElement.getName().equals(name)) {
+				if (metadataElement != null && metadataElement.getName().equals(name)) {
 					result = metadata;
 					break;
 				}
@@ -147,4 +99,52 @@ public class ItemType extends EntityBase implements Serializable {
 			throw new ItemManagerException("Metadata name not exists: " + name);
 		return result;
 	}
+
+	@SuppressWarnings("unchecked")
+	public List<Metadata> getMetadatas() {
+		if (metadatas == null && getId() != 0) {
+			ItemManager manager = ItemManager.getInstance();
+			if (manager != null) {
+				IEntityBaseDAO dao = manager.getBaseDAO(Metadata.class);
+				if (dao != null)
+					this.metadatas = (List<Metadata>) (List<?>) dao.getAll(getId());
+			}
+		}
+		return this.metadatas;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	String getTableId() {
+		return String.format("%04d", getId());
+	}
+
+	String getTableName() {
+		return tablePrefix + getTableId();
+	}
+
+	public void setDescription(String description) {
+		checkParameter("Description", description);
+		this.description = description;
+	}
+
+	public void setIsStatic(boolean isStatic) {
+		this.isStatic = isStatic;
+	}
+
+	public void setMetadatas(List<Metadata> metadatas) {
+		this.metadatas = metadatas;
+	}
+
+	public void setName(String name) {
+		checkParameter("Name", name);
+		this.name = name;
+	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
 }
\ No newline at end of file