• R/O
  • SSH
  • HTTPS

chaki: Commit


Commit MetaInfo

Revision618 (tree)
Time2018-07-31 22:14:41
Authortomorita

Log Message

MWE Linkの付け替えにおいて、Link Tagがnullの場合をチェック

Change Summary

Incremental Difference

--- trunk/ChaKi.NET/src/Service/DependencyEdit/OperationCreateMWEAnnotation.cs (revision 617)
+++ trunk/ChaKi.NET/src/Service/DependencyEdit/OperationCreateMWEAnnotation.cs (revision 618)
@@ -173,6 +173,10 @@
173173 if (cli.OldLinkTagName != cli.NewLinkTagName
174174 && (string.IsNullOrEmpty(cli.NewLinkTagName) || cli.NewLinkTagName != "_"))
175175 {
176+ if (cli.NewLinkTagName == null)
177+ {
178+ cli.NewLinkTagName = string.Empty;
179+ }
176180 var newlinktag = ctx.Proj.FindTag(Tag.LINK, cli.NewLinkTagName);
177181 if (newlinktag == null)
178182 {
--- trunk/ChaKi.NET/src/ImportWordRelation/Properties/AssemblyInfo.cs (revision 617)
+++ trunk/ChaKi.NET/src/ImportWordRelation/Properties/AssemblyInfo.cs (revision 618)
@@ -7,10 +7,10 @@
77 [assembly: AssemblyConfiguration("")]
88 [assembly: AssemblyCompany("NAIST/Sowa Research Co.,Ltd.")]
99 [assembly: AssemblyProduct("ImportWordRelation")]
10-[assembly: AssemblyCopyright("(C) 2011-2017")]
10+[assembly: AssemblyCopyright("(C) 2011-2018")]
1111 [assembly: AssemblyTrademark("")]
1212 [assembly: AssemblyCulture("")]
1313 [assembly: ComVisible(false)]
1414 [assembly: Guid("6a95808a-d1e3-47de-bb62-7ed7a281ac0b")]
15-[assembly: AssemblyVersion("3.11.616.0")]
16-[assembly: AssemblyFileVersion("3.11.616.0")]
15+[assembly: AssemblyVersion("3.12.617.0")]
16+[assembly: AssemblyFileVersion("3.12.617.0")]
--- trunk/ChaKi.NET/src/DepEditSLA/Widgets/LexemeSelectionGrid.cs (revision 617)
+++ trunk/ChaKi.NET/src/DepEditSLA/Widgets/LexemeSelectionGrid.cs (revision 618)
@@ -119,7 +119,7 @@
119119 {
120120 if (i < this.dataGridView1.Columns.Count)
121121 {
122- this.dataGridView1.Columns[i].Width = Math.Min(100, Settings.ColumnWidths[i]);
122+ this.dataGridView1.Columns[i].Width = Math.Max(10, Settings.ColumnWidths[i]);
123123 }
124124 }
125125 Rectangle maxRect = Screen.GetWorkingArea(this);
--- trunk/ChaKi.NET/src/Text2Corpus/Properties/AssemblyInfo.cs (revision 617)
+++ trunk/ChaKi.NET/src/Text2Corpus/Properties/AssemblyInfo.cs (revision 618)
@@ -7,10 +7,10 @@
77 [assembly: AssemblyConfiguration("")]
88 [assembly: AssemblyCompany("NAIST/Sowa Research Co.,Ltd.")]
99 [assembly: AssemblyProduct("Text2Corpus")]
10-[assembly: AssemblyCopyright("(C) 2011-2017")]
10+[assembly: AssemblyCopyright("(C) 2011-2018")]
1111 [assembly: AssemblyTrademark("")]
1212 [assembly: AssemblyCulture("")]
1313 [assembly: ComVisible(false)]
1414 [assembly: Guid("a8cf8403-eb88-418f-bf54-56aeaef39268")]
15-[assembly: AssemblyVersion("3.11.616.0")]
16-[assembly: AssemblyFileVersion("3.11.616.0")]
15+[assembly: AssemblyVersion("3.12.617.0")]
16+[assembly: AssemblyFileVersion("3.12.617.0")]
--- trunk/ChaKi.NET/src/CreateAssemblyInfo.vbs (revision 617)
+++ trunk/ChaKi.NET/src/CreateAssemblyInfo.vbs (revision 618)
@@ -14,8 +14,8 @@
1414
1515 '=============================================================
1616 Const CompanyStr = "NAIST/Sowa Research Co.,Ltd."
17-Const CopyrightStr = "(C) 2011-2017"
18-Const CurrentVersion = "3.11"
17+Const CopyrightStr = "(C) 2011-2018"
18+Const CurrentVersion = "3.12"
1919 '=============================================================
2020 Set AssemblyList(0) = New AssemblyInfo
2121 With AssemblyList(0)
--- trunk/ChaKi.NET/src/Timings/Properties/AssemblyInfo.cs (revision 617)
+++ trunk/ChaKi.NET/src/Timings/Properties/AssemblyInfo.cs (revision 618)
@@ -7,10 +7,10 @@
77 [assembly: AssemblyConfiguration("")]
88 [assembly: AssemblyCompany("NAIST/Sowa Research Co.,Ltd.")]
99 [assembly: AssemblyProduct("Timings")]
10-[assembly: AssemblyCopyright("(C) 2011-2017")]
10+[assembly: AssemblyCopyright("(C) 2011-2018")]
1111 [assembly: AssemblyTrademark("")]
1212 [assembly: AssemblyCulture("")]
1313 [assembly: ComVisible(false)]
1414 [assembly: Guid("ff6652ed-b932-466b-944b-ce88d698979b")]
15-[assembly: AssemblyVersion("3.11.616.0")]
16-[assembly: AssemblyFileVersion("3.11.616.0")]
15+[assembly: AssemblyVersion("3.12.617.0")]
16+[assembly: AssemblyFileVersion("3.12.617.0")]
Show on old repository browser