salata

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java
index 2af80fe11a099943ede7b74877d64d9951aa2737..31f89526aa4bbafd6921cf0140ddcfd3c37ea7ef 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java
@@ -41,8 +41,7 @@ public class OctopusAPI implements IOctopusAPI {
                }\r
        }\r
 \r
-       private List<DBObject> getReferencedObjects(List<DBObject> stories, String referenceCollectionName,\r
-                       String referenceField) {\r
+       private List<DBObject> getReferencedObjects(List<DBObject> stories, String referenceCollectionName, String referenceField) {\r
                List<Long> ids = null;\r
                for (DBObject story : stories) {\r
                        if (story == null)\r
@@ -129,8 +128,8 @@ public class OctopusAPI implements IOctopusAPI {
 \r
        @Override\r
        public String getRundownContent(long id) {\r
-               BasicDBObject fields = new BasicDBObject(ID, 1).append(PARENT_STORY_ID, 1).append(NAME, 1).append(MODIFIED, 1)\r
-                               .append(REF_RUNDOWN, 1).append(FORMAT, 1).append(MOS_OBJECTS, 1).append(SCRIPT_CONTENT, 1);\r
+               BasicDBObject fields = new BasicDBObject(ID, 1).append(PARENT_STORY_ID, 1).append(NAME, 1).append(MODIFIED, 1).append(REF_RUNDOWN, 1).append(FORMAT, 1)\r
+                               .append(MOS_OBJECTS, 1).append(SCRIPT_CONTENT, 1);\r
                List<DBObject> stories = getRundownStories(id, fields);\r
                return getRundownContent(stories);\r
        }\r
@@ -140,8 +139,7 @@ public class OctopusAPI implements IOctopusAPI {
                List<DBObject> result = null;\r
                DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(STORY_COLLECTION);\r
-               DBCursor find = collection\r
-                               .find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id))))\r
+               DBCursor find = collection.find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id))))\r
                                .sort(new BasicDBObject("name", 1));\r
                if (find.hasNext()) {\r
                        result = find.toArray();\r
@@ -206,8 +204,7 @@ public class OctopusAPI implements IOctopusAPI {
                // "OCTOPUS-ECHOTV-2429902"}}})\r
                DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection storyCollection = db.getCollection(STORY_COLLECTION);\r
-               BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS,\r
-                               new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id)));\r
+               BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id)));\r
                DBCursor find = storyCollection.find(criteria, new BasicDBObject(REF_RUNDOWN, 1));\r
                // List<DBObject> rundowns = NoSQLUtils.asList(find);\r
                if (!find.hasNext()) {\r
@@ -227,9 +224,8 @@ public class OctopusAPI implements IOctopusAPI {
                DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(STORY_COLLECTION);\r
                DBCursor find = collection\r
-                               .find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id))),\r
-                                               new BasicDBObject(ID, 1).append(PARENT_STORY_ID, 1).append(NAME, 1).append(MODIFIED, 1)\r
-                                                               .append(REF_RUNDOWN, 1).append(FORMAT, 1).append(MOS_OBJECTS, 1))\r
+                               .find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id))), new BasicDBObject(ID, 1)\r
+                                               .append(PARENT_STORY_ID, 1).append(NAME, 1).append(MODIFIED, 1).append(REF_RUNDOWN, 1).append(FORMAT, 1).append(MOS_OBJECTS, 1))\r
                                .sort(new BasicDBObject("name", 1));\r
                if (find.hasNext())\r
                        result = find.toArray();\r
@@ -242,8 +238,7 @@ public class OctopusAPI implements IOctopusAPI {
                List<DBObject> result = null;\r
                DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(STORY_COLLECTION);\r
-               DBCursor find = collection\r
-                               .find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id))))\r
+               DBCursor find = collection.find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id))))\r
                                .sort(new BasicDBObject("name", 1));\r
                if (find.hasNext())\r
                        result = find.toArray();\r
@@ -262,13 +257,14 @@ public class OctopusAPI implements IOctopusAPI {
                                        }\r
                                }\r
                        });\r
+\r
+                       Collections.sort(result, (o1, o2) -> {\r
+                               long pos1 = NoSQLUtils.asLong((BasicDBObject) o1, POSITION);\r
+                               long pos2 = NoSQLUtils.asLong((BasicDBObject) o2, POSITION);\r
+                               return (pos1 < pos2 ? -1 : (pos1 == pos2 ? 0 : 1));\r
+                       });\r
                }\r
 \r
-               Collections.sort(result, (o1, o2) -> {\r
-                       long pos1 = NoSQLUtils.asLong((BasicDBObject) o1, POSITION);\r
-                       long pos2 = NoSQLUtils.asLong((BasicDBObject) o2, POSITION);\r
-                       return (pos1 < pos2 ? -1 : (pos1 == pos2 ? 0 : 1));\r
-               });\r
                return result;\r
        }\r
 \r
@@ -277,8 +273,7 @@ public class OctopusAPI implements IOctopusAPI {
                List<DBObject> result = null;\r
                DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(STORY_COLLECTION);\r
-               DBCursor find = collection.find(new BasicDBObject(), new BasicDBObject("mosObjects", 1).append("_id", 0))\r
-                               .limit(1000);\r
+               DBCursor find = collection.find(new BasicDBObject(), new BasicDBObject("mosObjects", 1).append("_id", 0)).limit(1000);\r
                if (find.hasNext())\r
                        result = find.toArray();\r
                return result;\r
@@ -317,8 +312,7 @@ public class OctopusAPI implements IOctopusAPI {
                List<DBObject> result = new ArrayList<>();\r
                DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection storyCollection = db.getCollection(STORY_COLLECTION);\r
-               BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS,\r
-                               new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id)));\r
+               BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id)));\r
                DBCursor find = storyCollection.find(criteria);\r
                if (find.hasNext()) {\r
                        result = find.toArray();\r
@@ -342,8 +336,7 @@ public class OctopusAPI implements IOctopusAPI {
        public List<DBObject> getStoryFoldersByParentStoryID(String id) {\r
                DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection storyCollection = db.getCollection(STORY_COLLECTION);\r
-               DBCursor find = storyCollection.find(new BasicDBObject(PARENT_STORY_ID, id),\r
-                               new BasicDBObject(REF_STORYFOLDER, 1));\r
+               DBCursor find = storyCollection.find(new BasicDBObject(PARENT_STORY_ID, id), new BasicDBObject(REF_STORYFOLDER, 1));\r
                if (!find.hasNext())\r
                        return null;\r
                return getReferencedObjects(find.toArray(), FOLDER_COLLECTION, REF_STORYFOLDER);\r
@@ -353,8 +346,7 @@ public class OctopusAPI implements IOctopusAPI {
        public List<DBObject> getStoryFoldersByPlaceHolderID(String id) {\r
                DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection storyCollection = db.getCollection(STORY_COLLECTION);\r
-               BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS,\r
-                               new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id)));\r
+               BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id)));\r
                DBCursor find = storyCollection.find(criteria, new BasicDBObject(REF_STORYFOLDER, 1));\r
                if (!find.hasNext())\r
                        return null;\r
@@ -366,10 +358,9 @@ public class OctopusAPI implements IOctopusAPI {
                List<DBObject> result = null;\r
                DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(STORY_COLLECTION);\r
-               DBCursor find = collection.find(\r
-                               new BasicDBObject(REF_STORYFOLDER, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, storyFolderId))),\r
-                               new BasicDBObject(ID, 1).append(PARENT_STORY_ID, 1).append(NAME, 1).append(MODIFIED, 1)\r
-                                               .append(REF_STORYFOLDER, 1).append(FORMAT, 1).append(MOS_OBJECTS, 1))\r
+               DBCursor find = collection\r
+                               .find(new BasicDBObject(REF_STORYFOLDER, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, storyFolderId))), new BasicDBObject(ID, 1)\r
+                                               .append(PARENT_STORY_ID, 1).append(NAME, 1).append(MODIFIED, 1).append(REF_STORYFOLDER, 1).append(FORMAT, 1).append(MOS_OBJECTS, 1))\r
                                .sort(new BasicDBObject(NAME, 1));\r
                if (find.hasNext())\r
                        result = find.toArray();\r
@@ -381,9 +372,7 @@ public class OctopusAPI implements IOctopusAPI {
                List<DBObject> result = null;\r
                DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(STORY_COLLECTION);\r
-               DBCursor find = collection\r
-                               .find(new BasicDBObject(REF_STORYFOLDER,\r
-                                               new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, storyFolderId))), fields)\r
+               DBCursor find = collection.find(new BasicDBObject(REF_STORYFOLDER, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, storyFolderId))), fields)\r
                                .sort(new BasicDBObject(NAME, 1));\r
                if (find.hasNext())\r
                        result = find.toArray();\r

diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/CachedListModel.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/CachedListModel.class
deleted file mode 100644 (file)
index ed73424..0000000
Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/CachedListModel.class and /dev/null differ

diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel$1.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel$1.class
deleted file mode 100644 (file)
index 5904514..0000000
Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel$1.class and /dev/null differ

diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel$2.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel$2.class
deleted file mode 100644 (file)
index f29cca7..0000000
Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel$2.class and /dev/null differ

diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel.class
deleted file mode 100644 (file)
index fcb8ad3..0000000
Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel.class and /dev/null differ

diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/IndexModel.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/IndexModel.class
deleted file mode 100644 (file)
index c82e813..0000000
Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/IndexModel.class and /dev/null differ

diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/MissingMaterialsModel.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/MissingMaterialsModel.class
deleted file mode 100644 (file)
index 1e53170..0000000
Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/MissingMaterialsModel.class and /dev/null differ

diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel$1.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel$1.class
deleted file mode 100644 (file)
index fa54029..0000000
Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel$1.class and /dev/null differ

diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel$2.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel$2.class
deleted file mode 100644 (file)
index 29f36da..0000000
Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel$2.class and /dev/null differ

diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel.class
deleted file mode 100644 (file)
index 8abad00..0000000
Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel.class and /dev/null differ