Separate codecompl dep on fieldprefix

This commit is contained in:
2015-03-31 16:50:15 +02:00
parent 369a7a638e
commit 5b90d12efd
3 changed files with 42 additions and 13 deletions

View File

@ -51,6 +51,14 @@ namespace CobXmlSupport
public readonly string NOMOVE = "NoMove";
private readonly bool MOVEFROM = true;
public string FldPref
{
get
{
return txtPrefix.Text;
}
}
public List<CobRow> RowList
{
get { return rowList; }
@ -165,7 +173,7 @@ namespace CobXmlSupport
private void showRows()
{
codeCompleter Cc = new codeCompleter(cmbLastFile.Text);
codeCompleter Cc = new codeCompleter(cmbLastFile.Text,txtPrefix.Text);
Cc.TryFill_In_Dic();
Cc.TryFill_Out_Dic();
string fieldInCompl="", fieldOutCompl="";
@ -1475,13 +1483,20 @@ namespace CobXmlSupport
fromMoves.CodeShower.Text += "( " + occParRows + " )";
}
fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "TO ";
if (cr.FieldDef.ToUpper().IndexOf("X") > -1)
if (cr.MoveFromCode.Length > 0)
{
fromMoves.CodeShower.Text += "MoveToStringVar ";
fromMoves.CodeShower.Text += cr.MoveFromCode;
}
else
{
fromMoves.CodeShower.Text += "MoveToNumVar ";
if (cr.FieldDef.ToUpper().IndexOf("X") > -1)
{
fromMoves.CodeShower.Text += "MoveToStringVar ";
}
else
{
fromMoves.CodeShower.Text += "MoveToNumVar ";
}
}
fromMoves.CodeShower.Text += " *> #" + cr.FieldName + "#";
if (chkDisplays.Checked)