From 83b91ab8fc0f98f121206118c911cc8a3e5c5438 Mon Sep 17 00:00:00 2001 From: tfoman Date: Tue, 28 Apr 2015 09:59:58 +0200 Subject: [PATCH] JsonFiles to sublib --- CobXmlSupport/GenCobCode.Designer.cs | 190 ++++++++++++++++----------- CobXmlSupport/GenCobCode.cs | 34 +++-- CobXmlSupport/codeCompleter.cs | 40 ++++-- 3 files changed, 163 insertions(+), 101 deletions(-) diff --git a/CobXmlSupport/GenCobCode.Designer.cs b/CobXmlSupport/GenCobCode.Designer.cs index 8c9b3d3..cadf0db 100644 --- a/CobXmlSupport/GenCobCode.Designer.cs +++ b/CobXmlSupport/GenCobCode.Designer.cs @@ -70,9 +70,10 @@ // // button1 // - this.button1.Location = new System.Drawing.Point(20, 47); + this.button1.Location = new System.Drawing.Point(27, 58); + this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.Size = new System.Drawing.Size(100, 28); this.button1.TabIndex = 0; this.button1.Text = "Start"; this.button1.UseVisualStyleBackColor = true; @@ -83,11 +84,12 @@ this.outText.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.outText.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.outText.Location = new System.Drawing.Point(20, 121); + this.outText.Location = new System.Drawing.Point(27, 149); + this.outText.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.outText.Multiline = true; this.outText.Name = "outText"; this.outText.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.outText.Size = new System.Drawing.Size(380, 480); + this.outText.Size = new System.Drawing.Size(505, 590); this.outText.TabIndex = 1; this.outText.WordWrap = false; // @@ -97,11 +99,12 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.outCob.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.outCob.Location = new System.Drawing.Point(406, 121); + this.outCob.Location = new System.Drawing.Point(541, 149); + this.outCob.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.outCob.Multiline = true; this.outCob.Name = "outCob"; this.outCob.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.outCob.Size = new System.Drawing.Size(533, 480); + this.outCob.Size = new System.Drawing.Size(709, 590); this.outCob.TabIndex = 2; this.outCob.WordWrap = false; this.outCob.KeyDown += new System.Windows.Forms.KeyEventHandler(this.outCob_KeyDown); @@ -110,9 +113,10 @@ // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(17, 105); + this.label1.Location = new System.Drawing.Point(23, 129); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(89, 15); + this.label1.Size = new System.Drawing.Size(106, 18); this.label1.TabIndex = 4; this.label1.Text = "XML-struktur"; // @@ -120,18 +124,20 @@ // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(406, 105); + this.label2.Location = new System.Drawing.Point(541, 129); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(167, 15); + this.label2.Size = new System.Drawing.Size(205, 18); this.label2.TabIndex = 5; this.label2.Text = "Försök till COB-copybook"; // // btnClose // this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnClose.Location = new System.Drawing.Point(864, 639); + this.btnClose.Location = new System.Drawing.Point(1152, 786); + this.btnClose.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnClose.Name = "btnClose"; - this.btnClose.Size = new System.Drawing.Size(75, 23); + this.btnClose.Size = new System.Drawing.Size(100, 28); this.btnClose.TabIndex = 6; this.btnClose.Text = "Close"; this.btnClose.UseVisualStyleBackColor = true; @@ -140,9 +146,10 @@ // chkAnaTag // this.chkAnaTag.AutoSize = true; - this.chkAnaTag.Location = new System.Drawing.Point(118, 51); + this.chkAnaTag.Location = new System.Drawing.Point(157, 63); + this.chkAnaTag.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkAnaTag.Name = "chkAnaTag"; - this.chkAnaTag.Size = new System.Drawing.Size(118, 17); + this.chkAnaTag.Size = new System.Drawing.Size(155, 21); this.chkAnaTag.TabIndex = 7; this.chkAnaTag.Text = "analysera tag-value"; this.chkAnaTag.UseVisualStyleBackColor = true; @@ -151,9 +158,10 @@ // chkValues // this.chkValues.AutoSize = true; - this.chkValues.Location = new System.Drawing.Point(118, 75); + this.chkValues.Location = new System.Drawing.Point(157, 92); + this.chkValues.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkValues.Name = "chkValues"; - this.chkValues.Size = new System.Drawing.Size(92, 17); + this.chkValues.Size = new System.Drawing.Size(119, 21); this.chkValues.TabIndex = 8; this.chkValues.Text = "lägg till values"; this.chkValues.UseVisualStyleBackColor = true; @@ -162,27 +170,29 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(273, 52); + this.label3.Location = new System.Drawing.Point(364, 64); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(38, 13); + this.label3.Size = new System.Drawing.Size(50, 17); this.label3.TabIndex = 9; this.label3.Text = "prefix :"; // // txtPrefix // - this.txtPrefix.Location = new System.Drawing.Point(317, 49); + this.txtPrefix.Location = new System.Drawing.Point(423, 60); + this.txtPrefix.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtPrefix.Name = "txtPrefix"; - this.txtPrefix.Size = new System.Drawing.Size(57, 20); + this.txtPrefix.Size = new System.Drawing.Size(75, 22); this.txtPrefix.TabIndex = 10; this.txtPrefix.Text = "GWM_"; // // chkWrap // this.chkWrap.AutoSize = true; - this.chkWrap.Location = new System.Drawing.Point(389, 73); - this.chkWrap.Margin = new System.Windows.Forms.Padding(2); + this.chkWrap.Location = new System.Drawing.Point(519, 90); + this.chkWrap.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.chkWrap.Name = "chkWrap"; - this.chkWrap.Size = new System.Drawing.Size(79, 17); + this.chkWrap.Size = new System.Drawing.Size(102, 21); this.chkWrap.TabIndex = 11; this.chkWrap.Text = "radbryt kod"; this.chkWrap.UseVisualStyleBackColor = true; @@ -192,10 +202,10 @@ // this.btnGenICode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnGenICode.Enabled = false; - this.btnGenICode.Location = new System.Drawing.Point(410, 616); - this.btnGenICode.Margin = new System.Windows.Forms.Padding(2); + this.btnGenICode.Location = new System.Drawing.Point(547, 758); + this.btnGenICode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnGenICode.Name = "btnGenICode"; - this.btnGenICode.Size = new System.Drawing.Size(81, 23); + this.btnGenICode.Size = new System.Drawing.Size(108, 28); this.btnGenICode.TabIndex = 12; this.btnGenICode.Text = "Gen Init kod"; this.btnGenICode.UseVisualStyleBackColor = true; @@ -204,10 +214,10 @@ // chkUnique // this.chkUnique.AutoSize = true; - this.chkUnique.Location = new System.Drawing.Point(503, 74); - this.chkUnique.Margin = new System.Windows.Forms.Padding(2); + this.chkUnique.Location = new System.Drawing.Point(671, 91); + this.chkUnique.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.chkUnique.Name = "chkUnique"; - this.chkUnique.Size = new System.Drawing.Size(95, 17); + this.chkUnique.Size = new System.Drawing.Size(123, 21); this.chkUnique.TabIndex = 13; this.chkUnique.Text = "unika X-pather"; this.chkUnique.UseVisualStyleBackColor = true; @@ -217,10 +227,10 @@ // this.btnMoves.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnMoves.Enabled = false; - this.btnMoves.Location = new System.Drawing.Point(495, 616); - this.btnMoves.Margin = new System.Windows.Forms.Padding(2); + this.btnMoves.Location = new System.Drawing.Point(660, 758); + this.btnMoves.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnMoves.Name = "btnMoves"; - this.btnMoves.Size = new System.Drawing.Size(93, 23); + this.btnMoves.Size = new System.Drawing.Size(124, 28); this.btnMoves.TabIndex = 14; this.btnMoves.Text = "Gen Move kod"; this.btnMoves.UseVisualStyleBackColor = true; @@ -228,9 +238,10 @@ // // btnChooseFile // - this.btnChooseFile.Location = new System.Drawing.Point(20, 17); + this.btnChooseFile.Location = new System.Drawing.Point(27, 21); + this.btnChooseFile.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnChooseFile.Name = "btnChooseFile"; - this.btnChooseFile.Size = new System.Drawing.Size(75, 23); + this.btnChooseFile.Size = new System.Drawing.Size(100, 28); this.btnChooseFile.TabIndex = 15; this.btnChooseFile.Text = "Välj fil"; this.btnChooseFile.UseVisualStyleBackColor = true; @@ -244,9 +255,10 @@ // this.btnMoveFrom.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnMoveFrom.Enabled = false; - this.btnMoveFrom.Location = new System.Drawing.Point(672, 616); + this.btnMoveFrom.Location = new System.Drawing.Point(896, 758); + this.btnMoveFrom.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnMoveFrom.Name = "btnMoveFrom"; - this.btnMoveFrom.Size = new System.Drawing.Size(92, 23); + this.btnMoveFrom.Size = new System.Drawing.Size(123, 28); this.btnMoveFrom.TabIndex = 16; this.btnMoveFrom.Text = "Gen Move från"; this.btnMoveFrom.UseVisualStyleBackColor = true; @@ -255,18 +267,20 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(614, 73); + this.label4.Location = new System.Drawing.Point(819, 90); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(51, 13); + this.label4.Size = new System.Drawing.Size(66, 17); this.label4.TabIndex = 17; this.label4.Text = "max OCC"; // // txtMaxOcc // - this.txtMaxOcc.Location = new System.Drawing.Point(672, 72); + this.txtMaxOcc.Location = new System.Drawing.Point(896, 89); + this.txtMaxOcc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtMaxOcc.Name = "txtMaxOcc"; this.txtMaxOcc.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.txtMaxOcc.Size = new System.Drawing.Size(37, 20); + this.txtMaxOcc.Size = new System.Drawing.Size(48, 22); this.txtMaxOcc.TabIndex = 18; this.txtMaxOcc.Text = "25"; this.txtMaxOcc.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -274,9 +288,10 @@ // chkUniqueAttrVars // this.chkUniqueAttrVars.AutoSize = true; - this.chkUniqueAttrVars.Location = new System.Drawing.Point(389, 51); + this.chkUniqueAttrVars.Location = new System.Drawing.Point(519, 63); + this.chkUniqueAttrVars.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkUniqueAttrVars.Name = "chkUniqueAttrVars"; - this.chkUniqueAttrVars.Size = new System.Drawing.Size(93, 17); + this.chkUniqueAttrVars.Size = new System.Drawing.Size(120, 21); this.chkUniqueAttrVars.TabIndex = 19; this.chkUniqueAttrVars.Text = "unika attr.vars"; this.chkUniqueAttrVars.UseVisualStyleBackColor = true; @@ -285,9 +300,10 @@ // chkUniqueVars // this.chkUniqueVars.AutoSize = true; - this.chkUniqueVars.Location = new System.Drawing.Point(503, 52); + this.chkUniqueVars.Location = new System.Drawing.Point(671, 64); + this.chkUniqueVars.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkUniqueVars.Name = "chkUniqueVars"; - this.chkUniqueVars.Size = new System.Drawing.Size(104, 17); + this.chkUniqueVars.Size = new System.Drawing.Size(133, 21); this.chkUniqueVars.TabIndex = 20; this.chkUniqueVars.Text = "unika cobol vars"; this.chkUniqueVars.UseVisualStyleBackColor = true; @@ -298,9 +314,10 @@ this.chkDisplays.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.chkDisplays.AutoSize = true; this.chkDisplays.Enabled = false; - this.chkDisplays.Location = new System.Drawing.Point(770, 628); + this.chkDisplays.Location = new System.Drawing.Point(1029, 773); + this.chkDisplays.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkDisplays.Name = "chkDisplays"; - this.chkDisplays.Size = new System.Drawing.Size(71, 17); + this.chkDisplays.Size = new System.Drawing.Size(93, 21); this.chkDisplays.TabIndex = 21; this.chkDisplays.Text = "(Displays)"; this.chkDisplays.UseVisualStyleBackColor = true; @@ -308,9 +325,10 @@ // chkNoNsRef // this.chkNoNsRef.AutoSize = true; - this.chkNoNsRef.Location = new System.Drawing.Point(737, 51); + this.chkNoNsRef.Location = new System.Drawing.Point(983, 63); + this.chkNoNsRef.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkNoNsRef.Name = "chkNoNsRef"; - this.chkNoNsRef.Size = new System.Drawing.Size(129, 17); + this.chkNoNsRef.Size = new System.Drawing.Size(167, 21); this.chkNoNsRef.TabIndex = 22; this.chkNoNsRef.Text = "utan NameSpace refs"; this.chkNoNsRef.UseVisualStyleBackColor = true; @@ -319,17 +337,19 @@ // cmbLastFile // this.cmbLastFile.FormattingEnabled = true; - this.cmbLastFile.Location = new System.Drawing.Point(120, 19); + this.cmbLastFile.Location = new System.Drawing.Point(160, 23); + this.cmbLastFile.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cmbLastFile.Name = "cmbLastFile"; - this.cmbLastFile.Size = new System.Drawing.Size(735, 21); + this.cmbLastFile.Size = new System.Drawing.Size(979, 24); this.cmbLastFile.TabIndex = 23; this.cmbLastFile.SelectedIndexChanged += new System.EventHandler(this.cmbLastFile_SelectedIndexChanged); // // btnClearSettings // - this.btnClearSettings.Location = new System.Drawing.Point(861, 19); + this.btnClearSettings.Location = new System.Drawing.Point(1148, 23); + this.btnClearSettings.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnClearSettings.Name = "btnClearSettings"; - this.btnClearSettings.Size = new System.Drawing.Size(75, 23); + this.btnClearSettings.Size = new System.Drawing.Size(100, 28); this.btnClearSettings.TabIndex = 24; this.btnClearSettings.Text = "Rensa"; this.btnClearSettings.UseVisualStyleBackColor = true; @@ -338,9 +358,10 @@ // chkCountVars // this.chkCountVars.AutoSize = true; - this.chkCountVars.Location = new System.Drawing.Point(737, 74); + this.chkCountVars.Location = new System.Drawing.Point(983, 91); + this.chkCountVars.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkCountVars.Name = "chkCountVars"; - this.chkCountVars.Size = new System.Drawing.Size(106, 17); + this.chkCountVars.Size = new System.Drawing.Size(134, 21); this.chkCountVars.TabIndex = 25; this.chkCountVars.Text = "\"count\" variabler"; this.chkCountVars.UseVisualStyleBackColor = true; @@ -349,10 +370,10 @@ // btnSettings // this.btnSettings.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btnSettings.Location = new System.Drawing.Point(20, 616); - this.btnSettings.Margin = new System.Windows.Forms.Padding(2); + this.btnSettings.Location = new System.Drawing.Point(27, 758); + this.btnSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnSettings.Name = "btnSettings"; - this.btnSettings.Size = new System.Drawing.Size(81, 23); + this.btnSettings.Size = new System.Drawing.Size(108, 28); this.btnSettings.TabIndex = 26; this.btnSettings.Text = "Inställningar"; this.btnSettings.UseVisualStyleBackColor = true; @@ -362,9 +383,10 @@ // this.chkPerform.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.chkPerform.AutoSize = true; - this.chkPerform.Location = new System.Drawing.Point(593, 611); + this.chkPerform.Location = new System.Drawing.Point(794, 752); + this.chkPerform.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkPerform.Name = "chkPerform"; - this.chkPerform.Size = new System.Drawing.Size(62, 17); + this.chkPerform.Size = new System.Drawing.Size(80, 21); this.chkPerform.TabIndex = 27; this.chkPerform.Text = "Perform"; this.chkPerform.UseVisualStyleBackColor = true; @@ -373,9 +395,10 @@ // this.chkMvToDisp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.chkMvToDisp.AutoSize = true; - this.chkMvToDisp.Location = new System.Drawing.Point(593, 628); + this.chkMvToDisp.Location = new System.Drawing.Point(793, 773); + this.chkMvToDisp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkMvToDisp.Name = "chkMvToDisp"; - this.chkMvToDisp.Size = new System.Drawing.Size(71, 17); + this.chkMvToDisp.Size = new System.Drawing.Size(93, 21); this.chkMvToDisp.TabIndex = 28; this.chkMvToDisp.Text = "(Displays)"; this.chkMvToDisp.UseVisualStyleBackColor = true; @@ -384,9 +407,10 @@ // this.chkNewArea.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.chkNewArea.AutoSize = true; - this.chkNewArea.Location = new System.Drawing.Point(770, 611); + this.chkNewArea.Location = new System.Drawing.Point(1029, 752); + this.chkNewArea.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkNewArea.Name = "chkNewArea"; - this.chkNewArea.Size = new System.Drawing.Size(64, 17); + this.chkNewArea.Size = new System.Drawing.Size(82, 21); this.chkNewArea.TabIndex = 29; this.chkNewArea.Text = "Till Area"; this.chkNewArea.UseVisualStyleBackColor = true; @@ -396,17 +420,19 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(241, 76); + this.label5.Location = new System.Drawing.Point(321, 94); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(70, 13); + this.label5.Size = new System.Drawing.Size(93, 17); this.label5.TabIndex = 30; this.label5.Text = "export prefix :"; // // txtExpPrefix // - this.txtExpPrefix.Location = new System.Drawing.Point(317, 75); + this.txtExpPrefix.Location = new System.Drawing.Point(423, 92); + this.txtExpPrefix.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtExpPrefix.Name = "txtExpPrefix"; - this.txtExpPrefix.Size = new System.Drawing.Size(57, 20); + this.txtExpPrefix.Size = new System.Drawing.Size(75, 22); this.txtExpPrefix.TabIndex = 31; this.txtExpPrefix.Text = "GWX_"; // @@ -414,9 +440,10 @@ // this.chkAttribs.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.chkAttribs.AutoSize = true; - this.chkAttribs.Location = new System.Drawing.Point(770, 644); + this.chkAttribs.Location = new System.Drawing.Point(1029, 793); + this.chkAttribs.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkAttribs.Name = "chkAttribs"; - this.chkAttribs.Size = new System.Drawing.Size(85, 17); + this.chkAttribs.Size = new System.Drawing.Size(108, 21); this.chkAttribs.TabIndex = 32; this.chkAttribs.Text = "Move Attribs"; this.chkAttribs.UseVisualStyleBackColor = true; @@ -425,9 +452,10 @@ // btnTestThings // this.btnTestThings.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btnTestThings.Location = new System.Drawing.Point(21, 639); + this.btnTestThings.Location = new System.Drawing.Point(28, 786); + this.btnTestThings.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnTestThings.Name = "btnTestThings"; - this.btnTestThings.Size = new System.Drawing.Size(81, 23); + this.btnTestThings.Size = new System.Drawing.Size(108, 28); this.btnTestThings.TabIndex = 33; this.btnTestThings.Text = "run test"; this.btnTestThings.UseVisualStyleBackColor = true; @@ -436,9 +464,10 @@ // btnFrXMLTo // this.btnFrXMLTo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnFrXMLTo.Location = new System.Drawing.Point(672, 639); + this.btnFrXMLTo.Location = new System.Drawing.Point(896, 786); + this.btnFrXMLTo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnFrXMLTo.Name = "btnFrXMLTo"; - this.btnFrXMLTo.Size = new System.Drawing.Size(92, 22); + this.btnFrXMLTo.Size = new System.Drawing.Size(123, 27); this.btnFrXMLTo.TabIndex = 34; this.btnFrXMLTo.Text = "Kopiera XML"; this.btnFrXMLTo.UseVisualStyleBackColor = true; @@ -447,9 +476,10 @@ // btnCrossref // this.btnCrossref.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btnCrossref.Location = new System.Drawing.Point(191, 616); + this.btnCrossref.Location = new System.Drawing.Point(255, 758); + this.btnCrossref.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnCrossref.Name = "btnCrossref"; - this.btnCrossref.Size = new System.Drawing.Size(81, 23); + this.btnCrossref.Size = new System.Drawing.Size(108, 28); this.btnCrossref.TabIndex = 35; this.btnCrossref.Text = "CrossRef"; this.btnCrossref.UseVisualStyleBackColor = true; @@ -459,18 +489,19 @@ // this.chkBackupVars.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.chkBackupVars.AutoSize = true; - this.chkBackupVars.Location = new System.Drawing.Point(278, 620); + this.chkBackupVars.Location = new System.Drawing.Point(371, 763); + this.chkBackupVars.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkBackupVars.Name = "chkBackupVars"; - this.chkBackupVars.Size = new System.Drawing.Size(87, 17); + this.chkBackupVars.Size = new System.Drawing.Size(110, 21); this.chkBackupVars.TabIndex = 36; this.chkBackupVars.Text = "Backup Vars"; this.chkBackupVars.UseVisualStyleBackColor = true; // // GenCobCode // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(951, 693); + this.ClientSize = new System.Drawing.Size(1268, 853); this.Controls.Add(this.chkBackupVars); this.Controls.Add(this.btnCrossref); this.Controls.Add(this.btnFrXMLTo); @@ -508,6 +539,7 @@ this.Controls.Add(this.outText); this.Controls.Add(this.button1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "GenCobCode"; this.Text = "X M L to C O B"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.GenCobCode_FormClosing); diff --git a/CobXmlSupport/GenCobCode.cs b/CobXmlSupport/GenCobCode.cs index 651e006..8c4c47e 100644 --- a/CobXmlSupport/GenCobCode.cs +++ b/CobXmlSupport/GenCobCode.cs @@ -173,10 +173,10 @@ namespace CobXmlSupport private void showRows() { - codeCompleter Cc = new codeCompleter(cmbLastFile.Text,txtPrefix.Text); + codeCompleter Cc = new codeCompleter(cmbLastFile.Text, txtPrefix.Text); Cc.TryFill_In_Dic(); Cc.TryFill_Out_Dic(); - string fieldInCompl="", fieldOutCompl=""; + string fieldInCompl = "", fieldOutCompl = ""; foreach (CobRow rw in rowList) { @@ -195,16 +195,18 @@ namespace CobXmlSupport if (Cc.WorkDicIn.TryGetValue(rw.FieldName, out fieldInCompl)) { rw.MoveCode = fieldInCompl; + //Debug.WriteLine("Existerarnde fält: " + rw.FieldName + " Kod : " + fieldInCompl); } else { Cc.WorkDicIn.Add(rw.FieldName, ""); + //Debug.WriteLine("Upplagt fält: " + rw.FieldName); } } if (rw.MoveCode == null) { rw.MoveCode = " "; } Cc.WorkDicIn[rw.FieldName] = rw.MoveCode; - if (Cc.WorkDicOut != null && Cc.WorkDicOut.Count > 0) + if (Cc.WorkDicOut != null && Cc.WorkDicOut.Count > 0) { if (Cc.WorkDicOut.TryGetValue(rw.FieldName, out fieldOutCompl)) { @@ -1239,10 +1241,10 @@ namespace CobXmlSupport genExtMoves.CodeShower.Text += "\r\n MOVE "; if (cr.MoveCode == null || cr.MoveCode.Trim().Length < 1) - genExtMoves.CodeShower.Text += "0"; + genExtMoves.CodeShower.Text += "0"; else - genExtMoves.CodeShower.Text += "1"; - + genExtMoves.CodeShower.Text += "1"; + genExtMoves.CodeShower.Text += " TO " + cr.CountIn; if (occParRows.Length > 0) @@ -1267,7 +1269,7 @@ namespace CobXmlSupport //---------------- Changed //if (cr.MoveCode.Length > 1 && cr.MoveCode != " ") - if (cr.MoveCode==null || cr.MoveCode.Trim() == "") + if (cr.MoveCode == null || cr.MoveCode.Trim() == "") { if (cr.FieldDef.ToUpper().IndexOf("X") > -1) { @@ -1483,7 +1485,7 @@ namespace CobXmlSupport fromMoves.CodeShower.Text += "( " + occParRows + " )"; } fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "TO "; - if (cr.MoveFromCode.Length > 0) + if (cr.MoveFromCode.Trim().Length > 0) { fromMoves.CodeShower.Text += cr.MoveFromCode; } @@ -1503,13 +1505,23 @@ namespace CobXmlSupport { occParRows = ""; CobRow crTmpx = cr; + fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "Move space to " + S.ettingLogVarName + " "; fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "String "; - if (cr.FieldDef.ToUpper().IndexOf("X") > -1) + + if (cr.MoveFromCode.Trim().Length > 0) { - fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "MoveToStringVar delimited by \" \" "; + fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + cr.MoveFromCode +" delimited by \" \" "; } - else fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "MoveToNumVar delimited by size"; + else + { + if (cr.FieldDef.ToUpper().IndexOf("X") > -1) + { + fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "MoveToStringVar delimited by \" \" "; + } + else fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "MoveToNumVar delimited by size"; + } + fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "\" <= \" delimited by size "; fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "\"" + cr.FieldName + "\" delimited by size "; while (crTmpx.LevelParent != null) diff --git a/CobXmlSupport/codeCompleter.cs b/CobXmlSupport/codeCompleter.cs index 40ee19b..19790f9 100644 --- a/CobXmlSupport/codeCompleter.cs +++ b/CobXmlSupport/codeCompleter.cs @@ -15,6 +15,7 @@ namespace CobXmlSupport private string __filePathId; private string __fileId; private string __pathId; + private string __jsonPathId; private string __ccFileInId; private string __ccFileOutId; private string __ccFileInIdNoSuff; @@ -27,13 +28,14 @@ namespace CobXmlSupport __filePathId = ""; __fileId = ""; __pathId = ""; + __jsonPathId = ""; __ccFileInId = ""; __ccFileOutId = ""; __ccFileInIdNoSuff = ""; __ccFileOutIdNoSuff = ""; } - public codeCompleter(string pathFileId,string fpref) + public codeCompleter(string pathFileId, string fpref) { __FieldPrefix = fpref; __filePathId = pathFileId; @@ -42,6 +44,15 @@ namespace CobXmlSupport __wrkDicOut = new Dictionary(); } + public string jsonPathId + { + get + { + return __jsonPathId; + } + + } + public string FilePathId { set @@ -85,8 +96,15 @@ namespace CobXmlSupport private void nameCreator(string inPathFname) { string gPrefix = "." + __FieldPrefix.Replace("_", "").Trim(); + __fileId = inPathFname.Substring(inPathFname.LastIndexOf("\\") + 1); __pathId = inPathFname.Substring(0, inPathFname.LastIndexOf("\\") + 1); + if (Directory.Exists(__pathId + @"JsonExt\")) { } + else + { + Directory.CreateDirectory(__pathId + @"JsonExt\"); + } + __jsonPathId = __pathId + @"JsonExt\"; __ccFileInId = __fileId.Substring(0, __fileId.LastIndexOf(".")) + ".In" + gPrefix + JSON; __ccFileOutId = __fileId.Substring(0, __fileId.LastIndexOf(".")) + ".Out" + gPrefix + JSON; __ccFileInIdNoSuff = __fileId.Substring(0, __fileId.LastIndexOf(".")) + ".In" + gPrefix; @@ -116,7 +134,7 @@ namespace CobXmlSupport public void TryFill_In_Dic() { - string ccFileInId = __pathId + __ccFileInId; + string ccFileInId = __jsonPathId + __ccFileInId; if (__filePathId.Trim() == "") { } else { @@ -130,7 +148,7 @@ namespace CobXmlSupport public void TryFill_Out_Dic() { - string ccFileOutId = __pathId + __ccFileOutId; + string ccFileOutId = __jsonPathId + __ccFileOutId; if (__filePathId.Trim() == "") { } else { @@ -152,13 +170,13 @@ namespace CobXmlSupport public void Save_In_Dic() { - string ccFileInId = __pathId + __ccFileInId; - if (Directory.Exists(__pathId + @"\JsonBackup\")) { } + string ccFileInId = __jsonPathId + __ccFileInId; + if (Directory.Exists(__jsonPathId + @"\JsonBackup\")) { } else { - Directory.CreateDirectory(__pathId + @"\JsonBackup\"); + Directory.CreateDirectory(__jsonPathId + @"\JsonBackup\"); } - string ccFileInBackup = __pathId +@"\JsonBackup\"+ __ccFileInIdNoSuff + backupSuffix(); + string ccFileInBackup = __jsonPathId + @"\JsonBackup\" + __ccFileInIdNoSuff + backupSuffix(); if (__filePathId.Trim() == "") { } else @@ -177,13 +195,13 @@ namespace CobXmlSupport public void Save_Out_Dic() { - string ccFileOutId = __pathId + __ccFileOutId; - if (Directory.Exists(__pathId + @"\JsonBackup\")) { } + string ccFileOutId = __jsonPathId + __ccFileOutId; + if (Directory.Exists(__jsonPathId + @"\JsonBackup\")) { } else { - Directory.CreateDirectory(__pathId + @"\JsonBackup\"); + Directory.CreateDirectory(__jsonPathId + @"\JsonBackup\"); } - string ccFileOutBackup = __pathId + @"\JsonBackup\" + __ccFileOutIdNoSuff + backupSuffix(); + string ccFileOutBackup = __jsonPathId + @"\JsonBackup\" + __ccFileOutIdNoSuff + backupSuffix(); if (__filePathId.Trim() == "") { } else