git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Fri, 20 Oct 2017 12:34:14 +0000 (12:34 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Fri, 20 Oct 2017 12:34:14 +0000 (12:34 +0000)
14 files changed:
client/IntegrationTests/JobEngineIT.cs
client/Maestro/MaestroForm.Metadata.cs
client/Maestro/MaestroForm.Source.cs
client/Maestro/Metadata/IDTypes.cs
client/MediaCubeClient/Model/Model.cs
client/OctopusClient/OctopusAPI.cs
client/OctopusClient/OctopusIDSelector.Designer.cs
client/OctopusClient/OctopusIDSelector.cs
client/PlanAIRClient/TrafficAPI.cs
client/PlanAIRClient/TrafficIDSelector.Designer.cs
client/PlanAIRClient/TrafficIDSelector.cs
server/-configuration/run-mediacube-server-localhost.launch
server/user.jobengine.osgi.db/src/user/jobengine/db/JSONBase.java
server/user.jobengine.osgi.db/src/user/jobengine/db/MasterId.java

index 56794fc87760fb7e59cd683fd4eccf7e329db588..14e07d8c48fb72ebb6b82a29f7a16365f4f58e47 100644 (file)
@@ -30,6 +30,13 @@ namespace IntegrationTests {
             var actual = client.Create(item);\r
         }\r
 \r
+        [TestMethod]\r
+        public void TestCreateMasterId() {\r
+            MediaCubeApi client = new MediaCubeApi("http://localhost:8080/services/rest/jobengine/", null, null, 100);\r
+            MasterId masterId = client.Create(new MasterId()) as MasterId;\r
+            Assert.IsTrue(masterId.id > 0);\r
+        }\r
+\r
         [TestMethod]\r
         public void TestCreateMany() {\r
             MediaCubeApi client = new MediaCubeApi("http://localhost:8080/services/rest/jobengine/", null, null, 100);\r
index 14177048d51b73ee2e7c6be28123775565076efc..0e490c20175b1575091b7db99caf61817ff7afe6 100644 (file)
@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.ComponentModel;\r
 using System.Text.RegularExpressions;\r
 using JobEngineClient;\r
+using Model;\r
 \r
 namespace Maestro {\r
     public partial class MaestroForm {\r
@@ -80,7 +81,7 @@ namespace Maestro {
         }\r
 \r
         private SourceIDType GetSourceType(string id) {\r
-            SourceIDType result = SourceIDType.None;\r
+            SourceIDType result = SourceIDType.MediaCube;\r
             if (!String.IsNullOrEmpty(id)) {\r
                 Match match = Regex.Match(id, "[A-Z]{1}[0-9]{6}[A-Z]{1}");\r
                 if (match.Success)\r
@@ -134,32 +135,53 @@ namespace Maestro {
             ArchiveMetadata result = null;\r
             SourceIDType idType = GetSourceType(textSelectedMetadata.Text);\r
             Cursor.Current = Cursors.WaitCursor;\r
-            if (idType == SourceIDType.OctopusID)\r
-                result = GetOctopusMetadata();\r
-            if (idType == SourceIDType.TrafficID)\r
-                result = GetTrafficMetadata();\r
+            switch (idType) {\r
+                case SourceIDType.MediaCube:\r
+                    result = GetMediaCubeMetadata();\r
+                    break;\r
+                case SourceIDType.OctopusID:\r
+                    result = GetOctopusMetadata();\r
+                    break;\r
+                case SourceIDType.TrafficID:\r
+                    result = GetTrafficMetadata();\r
+                    break;\r
+            }\r
             Cursor.Current = Cursors.Default;\r
             return result;\r
         }\r
 \r
+        private ArchiveMetadata GetMediaCubeMetadata() {\r
+            MasterId masterId = mediaCubeApi.Create(new MasterId()) as MasterId;\r
+            if (masterId == null)\r
+                return null;\r
+            ArchiveMetadata result = new ArchiveMetadata();\r
+            result.itemHouseId = masterId.ToString();\r
+            result.mediaHouseId = masterId.ToString();\r
+            return result;\r
+        }\r
+\r
         private ArchiveMetadata GetTrafficMetadata() {\r
             string id = textSelectedMetadata.Text;\r
             if (String.IsNullOrEmpty(id))\r
                 return null;\r
             TrafficAPI api = trafficIDSelector.trafficAPI;\r
-            List<TrafficClient.TrafficItemMetadata> trafficResult = null;\r
+            List<TrafficItemMetadata> trafficResult = null;\r
             MetadataType metadataType = GetTrafficMetadataType(id);\r
-\r
-            if (id.StartsWith("M"))\r
-                trafficResult = api.GetBroadcastArchiveMetadata(id);\r
-            else if (id.StartsWith("P"))\r
-                trafficResult = api.GetPromotionalArchiveMetadata(id);\r
-            else if (id.StartsWith("R"))\r
-                trafficResult = api.GetAdvertisementArchiveMetadata(id);\r
+            switch (metadataType) {\r
+                case MetadataType.TrafficMaterial:\r
+                    trafficResult = api.GetMaterialMetadata(id);\r
+                    break;\r
+                case MetadataType.TrafficPromo:\r
+                    trafficResult = api.GetPromoMetadata(id);\r
+                    break;\r
+                case MetadataType.TrafficAD:\r
+                    trafficResult = api.GetADMetadata(id);\r
+                    break;\r
+            }\r
             if (trafficResult == null)\r
                 return null;\r
             ArchiveMetadata result = new ArchiveMetadata();\r
-            TrafficClient.TrafficItemMetadata actualResult = trafficResult[0];\r
+            TrafficItemMetadata actualResult = trafficResult[0];\r
             result.itemHouseId = actualResult.ProgID;\r
             result.itemTitle = actualResult.ProgTitle;\r
             result.itemDescription = actualResult.ProgDescription;\r
@@ -265,7 +287,7 @@ namespace Maestro {
         }\r
 \r
         private void UpdateEditArchiveMetadataEnabled() {\r
-            ctxiModifyArchiveMetadata.Enabled = selectedMetadata != null;\r
+            ctxiModifyArchiveMetadata.Enabled = !String.IsNullOrEmpty(textSelectedSource.Text);\r
         }\r
 \r
         private void UpdateDefineSegmentEnabled() {\r
index 3706b8bb420c7d3a35c3d8d4b5911a69195840b5..0212c6ee1f44f898bac021e2cbf919ba092af4fe 100644 (file)
@@ -29,6 +29,7 @@ namespace Maestro {
             set {\r
                 selectedSource = value;\r
                 textSelectedSource.Text = selectedSource.Name;\r
+                UpdateEditArchiveMetadataEnabled();\r
             }\r
         }\r
 \r
@@ -310,7 +311,7 @@ namespace Maestro {
         }\r
 \r
         private void UpdateDetectMetadataEnabled() {\r
-            buttonMetadata.Enabled = SourceIDType != SourceIDType.None;\r
+            buttonMetadata.Enabled = SourceIDType != SourceIDType.MediaCube;\r
         }\r
 \r
     }\r
index 83c38aff302a09bb41ba05adabf6b84f4029fd1d..cd21a3f7849f33fc8b2c5b6229c732b2b5f96366 100644 (file)
@@ -2,6 +2,6 @@
     public enum SourceIDType {\r
         TrafficID = 1,\r
         OctopusID = 2,\r
-        None = 0\r
+        MediaCube = 0\r
     }\r
 }\r
index aa5671ccb4396f498384341642b96925f9348d85..281e56427d3b79de8f97805ad1edbab5f0c7e889 100644 (file)
@@ -14,4 +14,9 @@ namespace Model {
         public String tag;\r
         public long size;\r
     }\r
+\r
+    public class MasterId {\r
+        public long id;\r
+        public DateTime? created;\r
+    }\r
 }\r
index 1c0cb6640df3846194db2f7b4e6af9327a72aaa0..3cf392d07e59b9419d8b278d00b046eb4d011a3d 100644 (file)
@@ -99,7 +99,7 @@ namespace OctopusClient {
                         Name = d["name"].ToString(),\r
                         Start = d["scheduledStart"].ToString()\r
                     };\r
-                    logger.Debug($"{r}");\r
+                    //logger.Debug($"{r}");\r
                     return r;\r
                 });\r
             }\r
index 02f186c8a68eccc968c9eeacb49d2db994bd4d6a..056baa0dc7babf6076f6367f18ce3fcbc9e1b430 100644 (file)
             this.dateScheduled = new System.Windows.Forms.DateTimePicker();\r
             this.comboRudowns = new System.Windows.Forms.ComboBox();\r
             this.bindingRundown = new System.Windows.Forms.BindingSource(this.components);\r
-            this.treeContent = new System.Windows.Forms.TreeView();\r
+            this.treeOctopus = new System.Windows.Forms.TreeView();\r
             this.tabControl1 = new System.Windows.Forms.TabControl();\r
-            this.tabPage1 = new System.Windows.Forms.TabPage();\r
-            this.tabPage2 = new System.Windows.Forms.TabPage();\r
+            this.tpRundown = new System.Windows.Forms.TabPage();\r
+            this.tpStoryFolder = new System.Windows.Forms.TabPage();\r
             this.comboStoryFolder = new System.Windows.Forms.ComboBox();\r
             this.bindingStoryFolder = new System.Windows.Forms.BindingSource(this.components);\r
             this.linkID = new System.Windows.Forms.LinkLabel();\r
             ((System.ComponentModel.ISupportInitialize)(this.bindingRundown)).BeginInit();\r
             this.tabControl1.SuspendLayout();\r
-            this.tabPage1.SuspendLayout();\r
-            this.tabPage2.SuspendLayout();\r
+            this.tpRundown.SuspendLayout();\r
+            this.tpStoryFolder.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.bindingStoryFolder)).BeginInit();\r
             this.SuspendLayout();\r
             // \r
             // \r
             // treeContent\r
             // \r
-            this.treeContent.BackColor = System.Drawing.Color.White;\r
-            this.treeContent.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
-            this.treeContent.CheckBoxes = true;\r
-            this.treeContent.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.treeContent.FullRowSelect = true;\r
-            this.treeContent.Location = new System.Drawing.Point(10, 70);\r
-            this.treeContent.Name = "treeContent";\r
-            this.treeContent.Size = new System.Drawing.Size(251, 273);\r
-            this.treeContent.TabIndex = 5;\r
-            this.treeContent.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeContent_KeyDown);\r
+            this.treeOctopus.BackColor = System.Drawing.Color.White;\r
+            this.treeOctopus.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
+            this.treeOctopus.CheckBoxes = true;\r
+            this.treeOctopus.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.treeOctopus.FullRowSelect = true;\r
+            this.treeOctopus.Location = new System.Drawing.Point(10, 70);\r
+            this.treeOctopus.Name = "treeContent";\r
+            this.treeOctopus.Size = new System.Drawing.Size(251, 273);\r
+            this.treeOctopus.TabIndex = 5;\r
+            this.treeOctopus.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeContent_KeyDown);\r
             // \r
             // tabControl1\r
             // \r
-            this.tabControl1.Controls.Add(this.tabPage1);\r
-            this.tabControl1.Controls.Add(this.tabPage2);\r
+            this.tabControl1.Controls.Add(this.tpRundown);\r
+            this.tabControl1.Controls.Add(this.tpStoryFolder);\r
             this.tabControl1.Dock = System.Windows.Forms.DockStyle.Top;\r
             this.tabControl1.Location = new System.Drawing.Point(10, 10);\r
             this.tabControl1.Name = "tabControl1";\r
             // \r
             // tabPage1\r
             // \r
-            this.tabPage1.Controls.Add(this.dateScheduled);\r
-            this.tabPage1.Controls.Add(this.comboRudowns);\r
-            this.tabPage1.Location = new System.Drawing.Point(4, 22);\r
-            this.tabPage1.Name = "tabPage1";\r
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tabPage1.Size = new System.Drawing.Size(243, 34);\r
-            this.tabPage1.TabIndex = 0;\r
-            this.tabPage1.Text = "Rundown";\r
-            this.tabPage1.UseVisualStyleBackColor = true;\r
+            this.tpRundown.Controls.Add(this.dateScheduled);\r
+            this.tpRundown.Controls.Add(this.comboRudowns);\r
+            this.tpRundown.Location = new System.Drawing.Point(4, 22);\r
+            this.tpRundown.Name = "tabPage1";\r
+            this.tpRundown.Padding = new System.Windows.Forms.Padding(3);\r
+            this.tpRundown.Size = new System.Drawing.Size(243, 34);\r
+            this.tpRundown.TabIndex = 0;\r
+            this.tpRundown.Text = "Rundown";\r
+            this.tpRundown.UseVisualStyleBackColor = true;\r
             // \r
             // tabPage2\r
             // \r
-            this.tabPage2.Controls.Add(this.comboStoryFolder);\r
-            this.tabPage2.Location = new System.Drawing.Point(4, 22);\r
-            this.tabPage2.Name = "tabPage2";\r
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tabPage2.Size = new System.Drawing.Size(243, 34);\r
-            this.tabPage2.TabIndex = 1;\r
-            this.tabPage2.Text = "Story Folder";\r
-            this.tabPage2.UseVisualStyleBackColor = true;\r
+            this.tpStoryFolder.Controls.Add(this.comboStoryFolder);\r
+            this.tpStoryFolder.Location = new System.Drawing.Point(4, 22);\r
+            this.tpStoryFolder.Name = "tabPage2";\r
+            this.tpStoryFolder.Padding = new System.Windows.Forms.Padding(3);\r
+            this.tpStoryFolder.Size = new System.Drawing.Size(243, 34);\r
+            this.tpStoryFolder.TabIndex = 1;\r
+            this.tpStoryFolder.Text = "Story Folder";\r
+            this.tpStoryFolder.UseVisualStyleBackColor = true;\r
             // \r
             // comboStoryFolder\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.BackColor = System.Drawing.Color.White;\r
-            this.Controls.Add(this.treeContent);\r
+            this.Controls.Add(this.treeOctopus);\r
             this.Controls.Add(this.tabControl1);\r
             this.Controls.Add(this.linkID);\r
             this.Margin = new System.Windows.Forms.Padding(10);\r
             this.Load += new System.EventHandler(this.OctopusIDSelector_Load);\r
             ((System.ComponentModel.ISupportInitialize)(this.bindingRundown)).EndInit();\r
             this.tabControl1.ResumeLayout(false);\r
-            this.tabPage1.ResumeLayout(false);\r
-            this.tabPage2.ResumeLayout(false);\r
+            this.tpRundown.ResumeLayout(false);\r
+            this.tpStoryFolder.ResumeLayout(false);\r
             ((System.ComponentModel.ISupportInitialize)(this.bindingStoryFolder)).EndInit();\r
             this.ResumeLayout(false);\r
 \r
 \r
         private System.Windows.Forms.DateTimePicker dateScheduled;\r
         private System.Windows.Forms.ComboBox comboRudowns;\r
-        private System.Windows.Forms.TreeView treeContent;\r
+        private System.Windows.Forms.TreeView treeOctopus;\r
         private System.Windows.Forms.BindingSource bindingRundown;\r
         private System.Windows.Forms.TabControl tabControl1;\r
-        private System.Windows.Forms.TabPage tabPage1;\r
-        private System.Windows.Forms.TabPage tabPage2;\r
+        private System.Windows.Forms.TabPage tpRundown;\r
+        private System.Windows.Forms.TabPage tpStoryFolder;\r
         private System.Windows.Forms.LinkLabel linkID;\r
         private System.Windows.Forms.ComboBox comboStoryFolder;\r
         private System.Windows.Forms.BindingSource bindingStoryFolder;\r
index 4ea6e690e9a7192560c62145c002019b09dc722d..1091e9e6435a3dd63230cfa9af2366a64e8264f4 100644 (file)
@@ -33,12 +33,12 @@ namespace OctopusClient {
         public OctopusIDSelector() {\r
             InitializeComponent();\r
             InitializeControlTexts();\r
-            treeContent.AfterCheck += OnTreeAfterCheck;\r
+            treeOctopus.AfterCheck += OnTreeAfterCheck;\r
         }\r
 \r
         private void InitializeControlTexts() {\r
-            tabPage1.Text = Resources.ADASTUKOR;\r
-            tabPage2.Text = Resources.MAPPA;\r
+            tpRundown.Text = Resources.ADASTUKOR;\r
+            tpStoryFolder.Text = Resources.MAPPA;\r
             linkID.Text = Resources.KERESES;\r
             bindingRundown.Add(Resources.VALASSZON_ELEMET);\r
             bindingStoryFolder.Add(Resources.VALASSZON_ELEMET);\r
@@ -53,7 +53,7 @@ namespace OctopusClient {
 \r
         private void comboRudowns_SelectedValueChanged(object sender, EventArgs e) {\r
             Rundown rundown = comboRudowns.SelectedValue as Rundown;\r
-            treeContent.Nodes.Clear();\r
+            treeOctopus.Nodes.Clear();\r
             if (rundown == null)\r
                 return;\r
             logger.Info("Selected rundown {0} {1}", rundown.ID, rundown.Name);\r
@@ -61,7 +61,7 @@ namespace OctopusClient {
             if (stories != null)\r
                 foreach (var story in stories) {\r
                     string name = story.Name == null ? "<UnNamed>" : story.Name;\r
-                    TreeNode actualNode = treeContent.Nodes.Add(story.ID, String.Format($"{story.ID} {story.Name}"));\r
+                    TreeNode actualNode = treeOctopus.Nodes.Add(story.ID, String.Format($"{story.ID} {story.Name}"));\r
                     MosObject[] mosObjects = story.MosObjects;\r
                     foreach (MosObject mosObject in mosObjects)\r
                         actualNode.Nodes.Add(mosObject.ID, mosObject.ID);\r
@@ -73,7 +73,7 @@ namespace OctopusClient {
             StoryFolder storyFolder = comboStoryFolder.SelectedValue as StoryFolder;\r
             if (storyFolder == null)\r
                 return;\r
-            treeContent.Nodes.Clear();\r
+            treeOctopus.Nodes.Clear();\r
             logger.Info("Selected StoryFolder {0} {1}", storyFolder.ID, storyFolder.Name);\r
             if (storyFolder.ID.Equals("0"))\r
                 return;\r
@@ -81,7 +81,7 @@ namespace OctopusClient {
             if (stories == null)\r
                 return;\r
             foreach (var story in stories) {\r
-                TreeNode actualNode = treeContent.Nodes.Add(story.ID, String.Format($"{story.ID} {story.Name}"));\r
+                TreeNode actualNode = treeOctopus.Nodes.Add(story.ID, String.Format($"{story.ID} {story.Name}"));\r
                 MosObject[] mosObjects = story.MosObjects;\r
                 foreach (MosObject mosObject in mosObjects)\r
                     actualNode.Nodes.Add(mosObject.ID, mosObject.ID);\r
@@ -108,7 +108,7 @@ namespace OctopusClient {
                 bindingRundowns.Add(actualRundown);\r
             bindingRundown.DataSource = bindingRundowns;\r
             comboRudowns.SelectedIndex = selectedRundownIndex == -1 ? 0 : selectedRundownIndex;\r
-            InitCheckID(treeContent.Nodes);\r
+            InitCheckID(treeOctopus.Nodes);\r
             Cursor.Current = Cursors.Default;\r
         }\r
 \r
@@ -126,7 +126,7 @@ namespace OctopusClient {
                 bindingStoryFolders.Add(actualStoryFolder);\r
             bindingStoryFolder.DataSource = bindingStoryFolders;\r
             comboStoryFolder.SelectedIndex = selectedStoryFolderIndex == -1 ? 0 : selectedStoryFolderIndex;\r
-            InitCheckID(treeContent.Nodes);   \r
+            InitCheckID(treeOctopus.Nodes);   \r
         }\r
 \r
         private void InitCheckID(TreeNodeCollection collection) {\r
@@ -145,14 +145,14 @@ namespace OctopusClient {
         public void ClearSelection() {\r
             if (selectedNode == null)\r
                 return;\r
-            treeContent.AfterCheck -= OnTreeAfterCheck;\r
+            treeOctopus.AfterCheck -= OnTreeAfterCheck;\r
             selectedNode.Checked = false;\r
-            treeContent.AfterCheck += OnTreeAfterCheck;\r
+            treeOctopus.AfterCheck += OnTreeAfterCheck;\r
             selectedNode = null;\r
         }\r
 \r
         private void tabControl1_Selected(object sender, TabControlEventArgs e) {\r
-            treeContent.Nodes.Clear();\r
+            treeOctopus.Nodes.Clear();\r
             if (e.TabPageIndex == 0)\r
                 refreshRundowns();\r
             else\r
@@ -169,13 +169,13 @@ namespace OctopusClient {
         }\r
 \r
         private void RefreshPlaceHolderIDS(String ID) {\r
-            treeContent.Nodes.Clear();\r
+            treeOctopus.Nodes.Clear();\r
 \r
             var stories = client.GetStoriesByStoryFolderID(ID);\r
             if (stories == null)\r
                 return;\r
             foreach (var story in stories)\r
-                treeContent.Nodes.Add(story.ID, String.Format($"{story.ID} {story.Name}"));\r
+                treeOctopus.Nodes.Add(story.ID, String.Format($"{story.ID} {story.Name}"));\r
         }\r
 \r
         private void tabControl1_KeyDown(object sender, KeyEventArgs e) {\r
@@ -191,7 +191,7 @@ namespace OctopusClient {
             if (!e.Node.Equals(selectedNode)) {\r
                 ClearSelection();\r
                 selectedNode = e.Node;\r
-                treeContent.SelectedNode = selectedNode;\r
+                treeOctopus.SelectedNode = selectedNode;\r
             }\r
             id = selectedNode.Checked ? selectedNode.Name : null;\r
             IDChangedEvent?.Invoke(id);\r
@@ -206,33 +206,7 @@ namespace OctopusClient {
                 refreshRundowns();\r
                 refreshStoryFolders();\r
             }\r
-            //InitCheckID(treeContent.Nodes);\r
-        }\r
-\r
-        //private void HandleCheck(TreeNode node) {\r
-        //    string text = node.Name;\r
-        //    checkFromCode = false;\r
-        //    //ClearCheckBox?.Invoke();\r
-        //    ClearSelectionSource(node, treeContent.Nodes);\r
-        //    id = node.Checked ? text : null;\r
-        //    IDChangedEvent?.Invoke(id);\r
-        //    checkFromCode = false;\r
-        //}\r
-\r
-        //private void ClearSelectionSource(TreeNode actualNode, TreeNodeCollection nodes) {\r
-        //    foreach (TreeNode actual in nodes) {\r
-        //        if (!actual.Equals(actualNode)) {\r
-        //            checkFromCode = true;\r
-        //            actual.Checked = false;\r
-        //            ClearSelectionSource(actualNode, actual.Nodes);\r
-        //        }\r
-        //    }\r
-        //    checkFromCode = false;\r
-        //}\r
-\r
-        //public void ClearEveryCheckBox() {\r
-        //    ClearSelectionSource(null, treeContent.Nodes);\r
-        //}\r
+        }\r
 \r
         public OctopusAPI GetClient() {\r
             return client;\r
index 1a13c3ef0ed8e8b62fbe5eac7ec8401749ce6c61..102053abcafc94baf203f1d1475ec88dd889aa33 100644 (file)
@@ -31,7 +31,7 @@ namespace TrafficClient {
             return broadvastWorker.GetBroadcasts(strParam, from, to, missingCopia);\r
         }\r
 \r
-        public List<TrafficItemMetadata> GetBroadcastArchiveMetadata(string strParam) {\r
+        public List<TrafficItemMetadata> GetMaterialMetadata(string strParam) {\r
             return broadvastWorker.GetBroadcastArchiveMetadata(strParam);\r
         }\r
 \r
@@ -43,7 +43,7 @@ namespace TrafficClient {
             return promoWorker.GetPromotionals(strParam);\r
         }\r
 \r
-        public List<TrafficItemMetadata> GetPromotionalArchiveMetadata(string strParam) {\r
+        public List<TrafficItemMetadata> GetPromoMetadata(string strParam) {\r
             return promoWorker.GetPromotionalArchiveMetadata(strParam);\r
         }\r
 \r
@@ -59,7 +59,7 @@ namespace TrafficClient {
             adWorker.SetAdvertisementToOkForAir(spotID, ok);\r
         }\r
 \r
-        public List<TrafficItemMetadata> GetAdvertisementArchiveMetadata(string strParam) {\r
+        public List<TrafficItemMetadata> GetADMetadata(string strParam) {\r
             return adWorker.GetAdvertisementArchiveMetadata(strParam);\r
         }\r
 \r
index 6870887def983d1e888b00845a85b50045bd43b1..c8aa2be7732cbc19df9e1a6ef15f8f0ccd6277f1 100644 (file)
@@ -38,7 +38,7 @@
             this.backgroundWorker3 = new System.ComponentModel.BackgroundWorker();\r
             this.backgroundWorker4 = new System.ComponentModel.BackgroundWorker();\r
             this.panel1 = new System.Windows.Forms.Panel();\r
-            this.dataGridView1 = new TrafficClient.CustomDataGridView();\r
+            this.dgTraffic = new TrafficClient.CustomDataGridView();\r
             this.scheduledDate = new System.Windows.Forms.DateTimePicker();\r
             this.textBox1 = new System.Windows.Forms.TextBox();\r
             this.searchButton = new System.Windows.Forms.Button();\r
@@ -51,7 +51,7 @@
             this.panel2 = new System.Windows.Forms.Panel();\r
             ((System.ComponentModel.ISupportInitialize)(this.trafficAPIBindingSource)).BeginInit();\r
             this.panel1.SuspendLayout();\r
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();\r
+            ((System.ComponentModel.ISupportInitialize)(this.dgTraffic)).BeginInit();\r
             this.flowLayoutPanel1.SuspendLayout();\r
             this.tableLayoutPanelSearch.SuspendLayout();\r
             this.panel2.SuspendLayout();\r
@@ -59,7 +59,7 @@
             // \r
             // panel1\r
             // \r
-            this.panel1.Controls.Add(this.dataGridView1);\r
+            this.panel1.Controls.Add(this.dgTraffic);\r
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.panel1.Location = new System.Drawing.Point(0, 62);\r
             this.panel1.Name = "panel1";\r
             // \r
             // dataGridView1\r
             // \r
-            this.dataGridView1.AllowUserToAddRows = false;\r
-            this.dataGridView1.AllowUserToDeleteRows = false;\r
-            this.dataGridView1.AllowUserToResizeRows = false;\r
-            this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;\r
-            this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;\r
-            this.dataGridView1.BackgroundColor = System.Drawing.Color.White;\r
-            this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
-            this.dataGridView1.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;\r
+            this.dgTraffic.AllowUserToAddRows = false;\r
+            this.dgTraffic.AllowUserToDeleteRows = false;\r
+            this.dgTraffic.AllowUserToResizeRows = false;\r
+            this.dgTraffic.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;\r
+            this.dgTraffic.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;\r
+            this.dgTraffic.BackgroundColor = System.Drawing.Color.White;\r
+            this.dgTraffic.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
+            this.dgTraffic.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;\r
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
             dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;\r
             dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
@@ -83,7 +83,7 @@
             dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
             dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
             dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;\r
+            this.dgTraffic.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;\r
             dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
             dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;\r
             dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
             dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
             dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black;\r
             dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2;\r
-            this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
-            this.dataGridView1.Location = new System.Drawing.Point(0, 0);\r
-            this.dataGridView1.MultiSelect = false;\r
-            this.dataGridView1.Name = "dataGridView1";\r
-            this.dataGridView1.RowHeadersVisible = false;\r
+            this.dgTraffic.DefaultCellStyle = dataGridViewCellStyle2;\r
+            this.dgTraffic.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.dgTraffic.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
+            this.dgTraffic.Location = new System.Drawing.Point(0, 0);\r
+            this.dgTraffic.MultiSelect = false;\r
+            this.dgTraffic.Name = "dataGridView1";\r
+            this.dgTraffic.RowHeadersVisible = false;\r
             dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
-            this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle3;\r
-            this.dataGridView1.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
-            this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
-            this.dataGridView1.Size = new System.Drawing.Size(263, 217);\r
-            this.dataGridView1.TabIndex = 0;\r
-            this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);\r
-            this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);\r
-            this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnDataGridKeyDown);\r
+            this.dgTraffic.RowsDefaultCellStyle = dataGridViewCellStyle3;\r
+            this.dgTraffic.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
+            this.dgTraffic.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
+            this.dgTraffic.Size = new System.Drawing.Size(263, 217);\r
+            this.dgTraffic.TabIndex = 0;\r
+            this.dgTraffic.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);\r
+            this.dgTraffic.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);\r
+            this.dgTraffic.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnDataGridKeyDown);\r
             // \r
             // scheduledDate\r
             // \r
             this.Size = new System.Drawing.Size(263, 279);\r
             ((System.ComponentModel.ISupportInitialize)(this.trafficAPIBindingSource)).EndInit();\r
             this.panel1.ResumeLayout(false);\r
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();\r
+            ((System.ComponentModel.ISupportInitialize)(this.dgTraffic)).EndInit();\r
             this.flowLayoutPanel1.ResumeLayout(false);\r
             this.flowLayoutPanel1.PerformLayout();\r
             this.tableLayoutPanelSearch.ResumeLayout(false);\r
         private System.Windows.Forms.RadioButton radioButtonPromo;\r
         private System.Windows.Forms.RadioButton radioButtonAD;\r
         private System.Windows.Forms.Panel panel2;\r
-        private CustomDataGridView dataGridView1;\r
+        private CustomDataGridView dgTraffic;\r
     }\r
 }\r
index 2defe2e03250239e40b33d32b69e950c5fcfb382..9a20e9b054574b403dcd498de7f8d654223e04a1 100644 (file)
@@ -6,7 +6,6 @@ using System.Diagnostics;
 \r
 namespace TrafficClient {\r
     public delegate void OnSelectedIDChanged(string ID, int variantID);\r
-    //public delegate void ClearCheckBox();\r
     public delegate void TrafficErrorReporterDelegate(DateTime time, String level, String message, Color color);\r
 \r
     public partial class TrafficIDSelector : UserControl {\r
@@ -15,9 +14,6 @@ namespace TrafficClient {
         private DataGridViewCheckBoxCell selectedCell;\r
         public TrafficErrorReporterDelegate ErrorReporter { get; set; }\r
 \r
-        //TODO\r
-        //public ClearCheckBox clearCheckBox { get; set; }\r
-\r
         public TrafficIDSelector() {\r
             InitializeComponent();\r
             InitializeTexts();\r
@@ -25,7 +21,7 @@ namespace TrafficClient {
         }\r
 \r
         private void SetColumnsToResizeable() {\r
-            foreach (DataGridViewColumn actualColumn in dataGridView1.Columns) {\r
+            foreach (DataGridViewColumn actualColumn in dgTraffic.Columns) {\r
                 int width = actualColumn.Width;\r
                 actualColumn.AutoSizeMode = DataGridViewAutoSizeColumnMode.None;\r
                 actualColumn.Width = width;\r
@@ -36,8 +32,8 @@ namespace TrafficClient {
             searchButton.Text = Resources.KERESES;\r
             copiaCheckBox.Text = Resources.HIANYZO_KOPIA;\r
 \r
-            dataGridView1.AutoGenerateColumns = false;\r
-            dataGridView1.Columns.AddRange(\r
+            dgTraffic.AutoGenerateColumns = false;\r
+            dgTraffic.Columns.AddRange(\r
                 new DataGridViewColumn[] {\r
                     new DataGridViewCheckBoxColumn(){\r
                         AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCells,\r
@@ -99,7 +95,7 @@ namespace TrafficClient {
             else if (radioButtonPromo.Checked)\r
                 result = trafficAPI.GetPromotionals(searchText)?.ToArray();\r
             if (result == null) {\r
-                dataGridView1.DataSource = null;\r
+                dgTraffic.DataSource = null;\r
                 Cursor.Current = Cursors.Default;\r
                 return;\r
             }\r
@@ -108,7 +104,7 @@ namespace TrafficClient {
                 list.Add(actual);\r
             if (CanSort(list))\r
                 list.Sort((x, y) => DateTime.Compare(x.NextBroadcastDate.Value, y.NextBroadcastDate.Value));\r
-            dataGridView1.DataSource = list;\r
+            dgTraffic.DataSource = list;\r
             SetColumnsToResizeable();\r
             Cursor.Current = Cursors.Default;\r
         }\r
@@ -127,7 +123,7 @@ namespace TrafficClient {
         }\r
 \r
         private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) {\r
-            OnSelectionChanged(dataGridView1.SelectedRows[0]);\r
+            OnSelectionChanged(dgTraffic.SelectedRows[0]);\r
         }\r
 \r
         private void searchButton_Click(object sender, EventArgs e) {\r
@@ -146,7 +142,7 @@ namespace TrafficClient {
             DataGridView gridView = sender as DataGridView;\r
             if (gridView == null)\r
                 return;\r
-            OnSelectionChanged(dataGridView1.SelectedRows[0]);\r
+            OnSelectionChanged(dgTraffic.SelectedRows[0]);\r
         }\r
 \r
         private void OnSelectionChanged(DataGridViewRow actualRow) {\r
@@ -162,13 +158,6 @@ namespace TrafficClient {
             selectedCell.Value = !(bool)selectedCell.Value;\r
             bool selected = (bool)selectedCell.Value;\r
             Debug.WriteLine("Selection {0}", selected);\r
-            //DataGridViewCheckBoxCell checkBoxCell = actualRow.Cells[0] as DataGridViewCheckBoxCell;\r
-            //selectedCell = actualRow.Cells[0] as DataGridViewCheckBoxCell;\r
-            //bool beforeClear = checkBoxCell.Value.Equals(true);\r
-            //ClearSelectionSource();\r
-            //checkBoxCell.Value = !beforeClear;\r
-            //bool selected = checkBoxCell.Value.Equals(true);\r
-            //clearCheckBox?.Invoke();\r
             if (selected) {\r
                 IDChangedEvent?.Invoke(res.MediaID, res.VariantID);\r
             } else\r
@@ -180,15 +169,11 @@ namespace TrafficClient {
                 return;\r
             selectedCell.Value = false;\r
             selectedCell = null;\r
-            //foreach (DataGridViewRow row in dataGridView1.Rows) {\r
-            //    DataGridViewCheckBoxCell actual = row.Cells[0] as DataGridViewCheckBoxCell;\r
-            //    actual.Value = false;\r
-            //}\r
         }\r
 \r
         private void OnDataGridKeyDown(object sender, KeyEventArgs e) {\r
-            if (e.KeyCode == Keys.Space && dataGridView1.CurrentCell.GetType() != typeof(DataGridViewCheckBoxCell))\r
-                OnSelectionChanged(dataGridView1.SelectedRows[0]);\r
+            if (e.KeyCode == Keys.Space && dgTraffic.CurrentCell.GetType() != typeof(DataGridViewCheckBoxCell))\r
+                OnSelectionChanged(dgTraffic.SelectedRows[0]);\r
         }\r
     }\r
 \r
index 62c83bb5763c5a6a599c4ef7c8522f8914f7ae1d..551a58e4c5f45e2523a2b02b1813eb5703a3b891 100644 (file)
@@ -19,7 +19,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.equinox.http.jetty.http.port=8080&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=salabakter&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.transcoder.source=c:\_Movie\hires\&#13;&#10;-Djetty.home=&quot;${workspace_loc:-configuration}/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.21/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=salabakter&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Dnexio.host=10.10.1.56"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.equinox.http.jetty.http.port=8080&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=salabakter&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.transcoder.source=c:\_Movie\hires\&#13;&#10;-Djetty.home=&quot;${workspace_loc:-configuration}/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.21/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=salabakter&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Dnexio.host=10.10.1.565"/>\r
 <stringAttribute key="pde.version" value="3.3"/>\r
 <booleanAttribute key="show_selected_only" value="false"/>\r
 <stringAttribute key="target_bundles" value="cglib@default:default,com.auth0.java-jwt@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.google.guava@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.el.javax.el@default:default,commons-logging@default:default,javassist@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.servlet.jsp-api@default:default,javax.validation.api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,org.apache.aries.spifly.dynamic.bundle@default:default,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.logging.log4j.api@1:true,org.apache.logging.log4j.core@default:default,org.apache.logging.log4j.slf4j-impl@default:default,org.apache.servicemix.bundles.quartz@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jsp@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.schemas@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jaxrs@default:true,org.jmock.junit4@default:default,org.jmock@default:default,org.junit@default:default,org.jvnet.mimepull@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.reflections@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
index 811d6ed4edd1f22573e96711ec1c0e07e5edaf7d..93b4da48e45ce1d1e7aae321f52234010ae34241 100644 (file)
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import user.commons.EntityBase;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$type")
-@JsonSubTypes({ @Type(WorkflowAction.class) })
+@JsonSubTypes({ @Type(WorkflowAction.class), @Type(MasterId.class) })
 public class JSONBase extends EntityBase {
 
 }
\ No newline at end of file
index 37270990aba7293539cfc00eb3234b021ecc3cb0..24226baf333cfc8410118015bbdc89f109998a2f 100644 (file)
@@ -2,9 +2,7 @@ package user.jobengine.db;
 
 import java.sql.Timestamp;
 
-import user.commons.EntityBase;
-
-public class MasterId extends EntityBase {
+public class MasterId extends JSONBase {
        private Timestamp created = null;
 
        public Timestamp getCreated() {