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

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 0d0514aa57c2f9074f90f30dc937d75b06772260..2bd2393d5a974d203b8b432bef58f3e33da69cb2 100644 (file)
--- 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 {
        // }\r
 \r
        public void activate() {\r
-               //logger.info("ItemManager activated.");\r
+               // logger.info("ItemManager activated.");\r
        }\r
 \r
        @Override\r
@@ -391,7 +391,7 @@ public class ItemManager extends MemoryCache implements IItemManager {
        }\r
 \r
        public void deactivate() {\r
-               //logger.info("ItemManager deactivated.");\r
+               // logger.info("ItemManager deactivated.");\r
        }\r
 \r
        /**\r
@@ -563,25 +563,25 @@ public class ItemManager extends MemoryCache implements IItemManager {
                return result;\r
        }\r
 \r
-       //      @Override\r
-       //      public long getExistingRundownMedia(String houseid) {\r
-       //              final long[] result = { 0 };\r
-       //              StringBuilder query = new StringBuilder();\r
-       //              query.append("select itemid, mediaid, replace(mediafilehouseid, concat('-', concat(itemhouseid,'.MXF')), '') filename");\r
-       //              query.append(" ");\r
-       //              query.append("from vw_items where replace(mediafilehouseid, concat('-', itemhouseid), '') != mediafilehouseid");\r
-       //              query.append(" ");\r
-       //              query.append("and replace(mediafilehouseid, concat('-', concat(itemhouseid,'.MXF')), '') = ?");\r
-       //              IStatementDecorator decorator = st -> {\r
-       //                      st.setString(1, houseid);\r
-       //              };\r
-       //              IResultSetConsumer consumer = rs -> {\r
-       //                      result[0] = rs.getLong("mediaid");\r
-       //                      return false;\r
-       //              };\r
-       //              executeQuery(query.toString(), consumer, decorator);\r
-       //              return result[0];\r
-       //      }\r
+       // @Override\r
+       // public long getExistingRundownMedia(String houseid) {\r
+       // final long[] result = { 0 };\r
+       // StringBuilder query = new StringBuilder();\r
+       // query.append("select itemid, mediaid, replace(mediafilehouseid, concat('-', concat(itemhouseid,'.MXF')), '') filename");\r
+       // query.append(" ");\r
+       // query.append("from vw_items where replace(mediafilehouseid, concat('-', itemhouseid), '') != mediafilehouseid");\r
+       // query.append(" ");\r
+       // query.append("and replace(mediafilehouseid, concat('-', concat(itemhouseid,'.MXF')), '') = ?");\r
+       // IStatementDecorator decorator = st -> {\r
+       // st.setString(1, houseid);\r
+       // };\r
+       // IResultSetConsumer consumer = rs -> {\r
+       // result[0] = rs.getLong("mediaid");\r
+       // return false;\r
+       // };\r
+       // executeQuery(query.toString(), consumer, decorator);\r
+       // return result[0];\r
+       // }\r
 \r
        @Override\r
        public FileType getFileType(String name) {\r

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 5266da778d4afb2b0ec0d41c11c93827033e5b6e..78cfb9442d542426acb23006db9fa244597b088e 100644 (file)
--- 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