OSDN Git Service

v1.1.5.1
authorAndouTomo <tomando.clar02@gmail.com>
Tue, 12 Aug 2014 16:41:07 +0000 (01:41 +0900)
committerAndouTomo <tomando.clar02@gmail.com>
Tue, 12 Aug 2014 16:41:07 +0000 (01:41 +0900)
構成再見直し(基本コマンドはExe本体に格納、プラグインの余地だけ残す。)
Duplicate、Repeat時にプロジェクトとタグを引き継ぎ
SVEnd追加
その他細かい修正

99 files changed:
StandardCommand/Properties/AssemblyInfo.cs [deleted file]
TaskControlCommand/AdditionalControlCommand.csproj [moved from StandardCommand/StandardCommand.csproj with 65% similarity]
TaskControlCommand/TaskControlCommand.csproj [deleted file]
TaskControlCommand/command/Control/EndCommand.cs [deleted file]
base/Basement.csproj
base/data/connection/DBConnection.cs
base/data/connection/SqlDictionary.Designer.cs
base/data/connection/SqlDictionary.resx
base/data/connection/TaskDBConnection.cs
base/view/BaseForm.cs
kybernetes2.sln
kybernetes2.suo
main/CmdDispatcher.cs
main/Kybernetes.csproj
main/Properties/AssemblyInfo.cs
main/bin/Debug/setting.db
main/bin/Debug/user.db
main/command/CRUD/AddCommand.cs [moved from StandardCommand/command/CRUD/AddCommand.cs with 100% similarity]
main/command/CRUD/AddCommandArg.cs [moved from StandardCommand/command/CRUD/AddCommandArg.cs with 100% similarity]
main/command/CRUD/DeleteCommand.cs [moved from StandardCommand/command/CRUD/DeleteCommand.cs with 100% similarity]
main/command/CRUD/DeleteCommandArg.cs [moved from StandardCommand/command/CRUD/DeleteCommandArg.cs with 100% similarity]
main/command/CRUD/EstimateCommand.cs [moved from StandardCommand/command/CRUD/EstimateCommand.cs with 100% similarity]
main/command/CRUD/EstimateCommandArg.cs [moved from StandardCommand/command/CRUD/EstimateCommandArg.cs with 100% similarity]
main/command/CRUD/ListAllCommandArg.cs [moved from StandardCommand/command/CRUD/ListAllCommandArg.cs with 100% similarity]
main/command/CRUD/ListCommand.cs [moved from StandardCommand/command/CRUD/ListCommand.cs with 100% similarity]
main/command/CRUD/ListCommandArg.cs [moved from StandardCommand/command/CRUD/ListCommandArg.cs with 100% similarity]
main/command/CRUD/ListGoingCommandArg.cs [moved from StandardCommand/command/CRUD/ListGoingCommandArg.cs with 100% similarity]
main/command/CRUD/ListRemainCommandArg.cs [moved from StandardCommand/command/CRUD/ListRemainCommandArg.cs with 100% similarity]
main/command/CRUD/LongListCommand.cs [moved from StandardCommand/command/CRUD/LongListCommand.cs with 100% similarity]
main/command/CRUD/RenumCommand.cs [moved from StandardCommand/command/CRUD/RenumCommand.cs with 100% similarity]
main/command/CRUD/UpdateCommand.cs [moved from StandardCommand/command/CRUD/UpdateCommand.cs with 100% similarity]
main/command/CRUD/UpdateCommandArg.cs [moved from StandardCommand/command/CRUD/UpdateCommandArg.cs with 100% similarity]
main/command/Control/AddProjectCommand.cs [moved from TaskControlCommand/command/Control/AddProjectCommand.cs with 100% similarity]
main/command/Control/AddProjectCommandArg.cs [moved from TaskControlCommand/command/Control/AddProjectCommandArg.cs with 100% similarity]
main/command/Control/AddTagCommand.cs [moved from TaskControlCommand/command/Control/AddTagCommand.cs with 100% similarity]
main/command/Control/AddTagCommandArg.cs [moved from TaskControlCommand/command/Control/AddTagCommandArg.cs with 100% similarity]
main/command/Control/ChAreaCommand.cs [moved from TaskControlCommand/command/Control/ChAreaCommand.cs with 100% similarity]
main/command/Control/ChAreaCommandArg.cs [moved from TaskControlCommand/command/Control/ChAreaCommandArg.cs with 100% similarity]
main/command/Control/CheckCommand.cs [moved from TaskControlCommand/command/Control/CheckCommand.cs with 64% similarity]
main/command/Control/CheckCommandArg.cs [moved from TaskControlCommand/command/Control/CheckCommandArg.cs with 100% similarity]
main/command/Control/ChnumCommand.cs [moved from TaskControlCommand/command/Control/ChnumCommand.cs with 100% similarity]
main/command/Control/ChnumCommandArg.cs [moved from TaskControlCommand/command/Control/ChnumCommandArg.cs with 100% similarity]
main/command/Control/ClearCommand.cs [moved from TaskControlCommand/command/Control/ClearCommand.cs with 100% similarity]
main/command/Control/ClearCommandArg.cs [moved from TaskControlCommand/command/Control/ClearCommandArg.cs with 100% similarity]
main/command/Control/ClearCommentCommand.cs [moved from TaskControlCommand/command/Control/ClearCommentCommand.cs with 100% similarity]
main/command/Control/ClearCommentCommandArg.cs [moved from TaskControlCommand/command/Control/ClearCommentCommandArg.cs with 100% similarity]
main/command/Control/ClearTagCommand.cs [moved from TaskControlCommand/command/Control/ClearTagCommand.cs with 100% similarity]
main/command/Control/ClearTagCommandArg.cs [moved from TaskControlCommand/command/Control/ClearTagCommandArg.cs with 100% similarity]
main/command/Control/CommentCommand.cs [moved from TaskControlCommand/command/Control/CommentCommand.cs with 100% similarity]
main/command/Control/CommentCommandArg.cs [moved from TaskControlCommand/command/Control/CommentCommandArg.cs with 100% similarity]
main/command/Control/DelayCommand.cs [moved from TaskControlCommand/command/Control/DelayCommand.cs with 100% similarity]
main/command/Control/DelayCommandArg.cs [moved from TaskControlCommand/command/Control/DelayCommandArg.cs with 100% similarity]
main/command/Control/DuplicateCommand.cs [moved from TaskControlCommand/command/Control/DuplicateCommand.cs with 86% similarity]
main/command/Control/DuplicateCommandArg.cs [moved from TaskControlCommand/command/Control/DuplicateCommandArg.cs with 100% similarity]
main/command/Control/EndCommand.cs [new file with mode: 0644]
main/command/Control/EndCommandArg.cs [moved from TaskControlCommand/command/Control/EndCommandArg.cs with 100% similarity]
main/command/Control/RepeatCommand.cs [moved from TaskControlCommand/command/Control/RepeatCommand.cs with 100% similarity]
main/command/Control/RepeatCommandArg.cs [moved from TaskControlCommand/command/Control/RepeatCommandArg.cs with 100% similarity]
main/command/Control/ReportCommand.cs [moved from TaskControlCommand/command/Control/ReportCommand.cs with 50% similarity]
main/command/Control/ReportCommandArg.cs [moved from TaskControlCommand/command/Control/ReportCommandArg.cs with 100% similarity]
main/command/Control/SVCallCommand.cs [moved from TaskControlCommand/command/Control/SVCallCommand.cs with 94% similarity]
main/command/Control/SVCallCommandArg.cs [moved from TaskControlCommand/command/Control/SVCallCommandArg.cs with 100% similarity]
main/command/Control/SVEndCallCommand.cs [new file with mode: 0644]
main/command/Control/StartCommand.cs [moved from TaskControlCommand/command/Control/StartCommand.cs with 100% similarity]
main/command/Control/StartCommandArg.cs [moved from TaskControlCommand/command/Control/StartCommandArg.cs with 100% similarity]
main/command/SYSTEM/AllCategInner.cs [moved from base/command/SYSTEM/AllCategInner.cs with 100% similarity]
main/command/SYSTEM/BGColorCommand.cs [moved from base/command/SYSTEM/BGColorCommand.cs with 100% similarity]
main/command/SYSTEM/ClsCommand.cs [moved from base/command/SYSTEM/ClsCommand.cs with 100% similarity]
main/command/SYSTEM/CreditCommand.cs [moved from base/command/SYSTEM/CreditCommand.cs with 100% similarity]
main/command/SYSTEM/DateCommand.cs [moved from base/command/SYSTEM/DateCommand.cs with 100% similarity]
main/command/SYSTEM/DateCommandArg.cs [moved from base/command/SYSTEM/DateCommandArg.cs with 100% similarity]
main/command/SYSTEM/DmpCommand.cs [moved from base/command/SYSTEM/DmpCommand.cs with 100% similarity]
main/command/SYSTEM/EchoCommand.cs [moved from base/command/SYSTEM/EchoCommand.cs with 100% similarity]
main/command/SYSTEM/EchoCommandArg.cs [moved from base/command/SYSTEM/EchoCommandArg.cs with 100% similarity]
main/command/SYSTEM/ExitCommand.cs [moved from base/command/SYSTEM/ExitCommand.cs with 100% similarity]
main/command/SYSTEM/ExpCommand.cs [moved from base/command/SYSTEM/ExpCommand.cs with 100% similarity]
main/command/SYSTEM/FrColorCommand.cs [moved from base/command/SYSTEM/FrColorCommand.cs with 100% similarity]
main/command/SYSTEM/HelpCommand.cs [moved from base/command/SYSTEM/HelpCommand.cs with 100% similarity]
main/command/SYSTEM/HelpCommandArg.cs [moved from base/command/SYSTEM/HelpCommandArg.cs with 100% similarity]
main/command/SYSTEM/LinkCommand.cs [moved from base/command/SYSTEM/LinkCommand.cs with 100% similarity]
main/command/SYSTEM/LinkCommandArg.cs [moved from base/command/SYSTEM/LinkCommandArg.cs with 100% similarity]
main/command/SYSTEM/LogModeCommand.cs [moved from base/command/SYSTEM/LogModeCommand.cs with 100% similarity]
main/command/SYSTEM/LogModeCommandArg.cs [moved from base/command/SYSTEM/LogModeCommandArg.cs with 100% similarity]
main/command/SYSTEM/TimeAreaSettingCommand.cs [moved from base/command/SYSTEM/TimeAreaSettingCommand.cs with 100% similarity]
main/command/SYSTEM/TimerCommand.cs [moved from base/command/SYSTEM/TimerCommand.cs with 100% similarity]
main/command/SYSTEM/TimerCommandArg.cs [moved from base/command/SYSTEM/TimerCommandArg.cs with 100% similarity]
main/command/SYSTEM/TodayCommand.cs [moved from base/command/SYSTEM/TodayCommand.cs with 100% similarity]
main/command/batch/BatchCommandArg.cs [moved from base/command/batch/BatchCommandArg.cs with 100% similarity]
main/command/batch/batchCommand.cs [moved from base/command/batch/batchCommand.cs with 100% similarity]
main/command/batch/beditCommand.cs [moved from base/command/batch/beditCommand.cs with 100% similarity]
main/command/reference/FindCommand.cs [moved from TaskControlCommand/command/reference/FindCommand.cs with 100% similarity]
main/command/reference/FindCommandArg.cs [moved from TaskControlCommand/command/reference/FindCommandArg.cs with 100% similarity]
main/command/reference/PwdCommand.cs [moved from TaskControlCommand/command/reference/PwdCommand.cs with 100% similarity]
main/command/reference/ShowCommand.cs [moved from TaskControlCommand/command/reference/ShowCommand.cs with 100% similarity]
main/command/reference/ShowCommandArg.cs [moved from TaskControlCommand/command/reference/ShowCommandArg.cs with 100% similarity]
main/command/reference/SimulateCommand.cs [moved from TaskControlCommand/command/reference/SimulateCommand.cs with 100% similarity]
main/command/reference/SimulateCommandArg.cs [moved from TaskControlCommand/command/reference/SimulateCommandArg.cs with 100% similarity]
main/command/reference/SumCommand.cs [moved from TaskControlCommand/command/reference/SumCommand.cs with 100% similarity]
main/command/reference/SumCommandArg.cs [moved from TaskControlCommand/command/reference/SumCommandArg.cs with 100% similarity]

diff --git a/StandardCommand/Properties/AssemblyInfo.cs b/StandardCommand/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index 38aa640..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;\r
-using System.Runtime.CompilerServices;\r
-using System.Runtime.InteropServices;\r
-\r
-// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。\r
-// アセンブリに関連付けられている情報を変更するには、\r
-// これらの属性値を変更してください。\r
-[assembly: AssemblyTitle("StandardCommand")]\r
-[assembly: AssemblyDescription("")]\r
-[assembly: AssemblyConfiguration("")]\r
-[assembly: AssemblyCompany("")]\r
-[assembly: AssemblyProduct("StandardCommand")]\r
-[assembly: AssemblyCopyright("Copyright © AndouTomo 2014")]\r
-[assembly: AssemblyTrademark("")]\r
-[assembly: AssemblyCulture("")]\r
-\r
-// ComVisible を false に設定すると、その型はこのアセンブリ内で COM コンポーネントから \r
-// 参照不可能になります。COM からこのアセンブリ内の型にアクセスする場合は、\r
-// その型の ComVisible 属性を true に設定してください。\r
-[assembly: ComVisible(false)]\r
-\r
-// 次の GUID は、このプロジェクトが COM に公開される場合の、typelib の ID です\r
-[assembly: Guid("1e24b709-7a51-431a-aae1-b9f9531c075f")]\r
-\r
-// アセンブリのバージョン情報は、以下の 4 つの値で構成されています:\r
-//\r
-//      Major Version\r
-//      Minor Version \r
-//      Build Number\r
-//      Revision\r
-//\r
-// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を \r
-// 既定値にすることができます:\r
-// [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.0.0.0")]\r
-[assembly: AssemblyFileVersion("1.0.0.0")]\r
similarity index 65%
rename from StandardCommand/StandardCommand.csproj
rename to TaskControlCommand/AdditionalControlCommand.csproj
index 206c7c5..3370ec8 100644 (file)
@@ -5,16 +5,16 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
     <ProductVersion>8.0.30703</ProductVersion>\r
     <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6EC5F291-3274-4AF5-8264-2432D21FEB34}</ProjectGuid>\r
+    <ProjectGuid>{0136D2C6-B362-4591-A6F5-CF9E873960F9}</ProjectGuid>\r
     <OutputType>Library</OutputType>\r
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
     <RootNamespace>com.andoutomo.kybernetes.command</RootNamespace>\r
-    <AssemblyName>kybernetes.standardcommand</AssemblyName>\r
+    <AssemblyName>kybernetes.additionalCommand</AssemblyName>\r
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>false</DebugSymbols>\r
+    <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
     <Optimize>false</Optimize>\r
     <OutputPath>bin\Debug\</OutputPath>\r
@@ -23,9 +23,9 @@
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>none</DebugType>\r
+    <DebugType>pdbonly</DebugType>\r
     <Optimize>true</Optimize>\r
-    <OutputPath>..\main\bin\Release\</OutputPath>\r
+    <OutputPath>D:\bin\Release\</OutputPath>\r
     <DefineConstants>TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
     <Reference Include="System.Xml" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <Compile Include="command\CRUD\AddCommand.cs" />\r
-    <Compile Include="command\CRUD\AddCommandArg.cs" />\r
-    <Compile Include="command\CRUD\DeleteCommand.cs" />\r
-    <Compile Include="command\CRUD\DeleteCommandArg.cs" />\r
-    <Compile Include="command\CRUD\EstimateCommand.cs" />\r
-    <Compile Include="command\CRUD\EstimateCommandArg.cs" />\r
-    <Compile Include="command\CRUD\ListAllCommandArg.cs" />\r
-    <Compile Include="command\CRUD\ListCommand.cs" />\r
-    <Compile Include="command\CRUD\ListCommandArg.cs" />\r
-    <Compile Include="command\CRUD\ListGoingCommandArg.cs" />\r
-    <Compile Include="command\CRUD\ListRemainCommandArg.cs" />\r
-    <Compile Include="command\CRUD\LongListCommand.cs" />\r
-    <Compile Include="command\CRUD\RenumCommand.cs" />\r
-    <Compile Include="command\CRUD\UpdateCommand.cs" />\r
-    <Compile Include="command\CRUD\UpdateCommandArg.cs" />\r
     <Compile Include="Properties\AssemblyInfo.cs" />\r
   </ItemGroup>\r
   <ItemGroup>\r
@@ -64,6 +49,9 @@
       <Name>Basement</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <Folder Include="command\function\" />\r
+  </ItemGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
diff --git a/TaskControlCommand/TaskControlCommand.csproj b/TaskControlCommand/TaskControlCommand.csproj
deleted file mode 100644 (file)
index 7765ce3..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>8.0.30703</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{0136D2C6-B362-4591-A6F5-CF9E873960F9}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>com.andoutomo.kybernetes.command</RootNamespace>\r
-    <AssemblyName>kybernetes.taskcontrolcommand</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <Optimize>false</Optimize>\r
-    <OutputPath>bin\Debug\</OutputPath>\r
-    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <Optimize>true</Optimize>\r
-    <OutputPath>..\main\bin\Release\</OutputPath>\r
-    <DefineConstants>TRACE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="System" />\r
-    <Reference Include="System.Core" />\r
-    <Reference Include="System.Windows.Forms" />\r
-    <Reference Include="System.Xml.Linq" />\r
-    <Reference Include="System.Data.DataSetExtensions" />\r
-    <Reference Include="Microsoft.CSharp" />\r
-    <Reference Include="System.Data" />\r
-    <Reference Include="System.Xml" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Compile Include="command\Control\AddProjectCommand.cs" />\r
-    <Compile Include="command\Control\AddProjectCommandArg.cs" />\r
-    <Compile Include="command\Control\AddTagCommand.cs" />\r
-    <Compile Include="command\Control\AddTagCommandArg.cs" />\r
-    <Compile Include="command\Control\ChAreaCommand.cs" />\r
-    <Compile Include="command\Control\ChAreaCommandArg.cs" />\r
-    <Compile Include="command\Control\CheckCommand.cs" />\r
-    <Compile Include="command\Control\CheckCommandArg.cs" />\r
-    <Compile Include="command\Control\ChnumCommand.cs" />\r
-    <Compile Include="command\Control\ChnumCommandArg.cs" />\r
-    <Compile Include="command\Control\ClearCommand.cs" />\r
-    <Compile Include="command\Control\ClearCommandArg.cs" />\r
-    <Compile Include="command\Control\ClearCommentCommand.cs" />\r
-    <Compile Include="command\Control\ClearCommentCommandArg.cs" />\r
-    <Compile Include="command\Control\ClearTagCommand.cs" />\r
-    <Compile Include="command\Control\ClearTagCommandArg.cs" />\r
-    <Compile Include="command\Control\CommentCommand.cs" />\r
-    <Compile Include="command\Control\CommentCommandArg.cs" />\r
-    <Compile Include="command\Control\DelayCommand.cs" />\r
-    <Compile Include="command\Control\DelayCommandArg.cs" />\r
-    <Compile Include="command\Control\DuplicateCommand.cs" />\r
-    <Compile Include="command\Control\DuplicateCommandArg.cs" />\r
-    <Compile Include="command\Control\EndCommand.cs" />\r
-    <Compile Include="command\Control\EndCommandArg.cs" />\r
-    <Compile Include="command\Control\RepeatCommand.cs" />\r
-    <Compile Include="command\Control\RepeatCommandArg.cs" />\r
-    <Compile Include="command\Control\ReportCommand.cs" />\r
-    <Compile Include="command\Control\ReportCommandArg.cs" />\r
-    <Compile Include="command\Control\StartCommand.cs" />\r
-    <Compile Include="command\Control\StartCommandArg.cs" />\r
-    <Compile Include="command\Control\SVCallCommand.cs" />\r
-    <Compile Include="command\Control\SVCallCommandArg.cs" />\r
-    <Compile Include="command\reference\FindCommand.cs" />\r
-    <Compile Include="command\reference\FindCommandArg.cs" />\r
-    <Compile Include="command\reference\PwdCommand.cs" />\r
-    <Compile Include="command\reference\ShowCommand.cs" />\r
-    <Compile Include="command\reference\ShowCommandArg.cs" />\r
-    <Compile Include="command\reference\SimulateCommand.cs" />\r
-    <Compile Include="command\reference\SimulateCommandArg.cs" />\r
-    <Compile Include="command\reference\SumCommand.cs" />\r
-    <Compile Include="command\reference\SumCommandArg.cs" />\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\base\Basement.csproj">\r
-      <Project>{0E6CEAEE-475E-4DD0-9568-B25C23D6CCE7}</Project>\r
-      <Name>Basement</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-</Project>
\ No newline at end of file
diff --git a/TaskControlCommand/command/Control/EndCommand.cs b/TaskControlCommand/command/Control/EndCommand.cs
deleted file mode 100644 (file)
index 5cf2ff5..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-using com.andoutomo.kybernetes.data.accessor;\r
-using com.andoutomo.kybernetes.data.DAO;\r
-using com.andoutomo.kybernetes.view;\r
-using System.Windows.Forms;\r
-\r
-namespace com.andoutomo.kybernetes.command\r
-{\r
-    class EndCommand:AbCommand\r
-    {\r
-        string message;\r
-        EndCommandArg param;\r
-        protected override bool execute()\r
-        {\r
-            param = (EndCommandArg)argument;\r
-\r
-            TaskData _newData = TaskDataAccessor.getObject.getTask(param.sortID);\r
-            if (_newData == null)\r
-            {\r
-                base.errorType = ErrorType.DataNotFound;\r
-                return false;\r
-            }\r
-            if (_newData.StartTime == null || _newData.StartTime.IsValid == false)\r
-            {\r
-                message = "このタスクは開始されていません。startコマンドで開始してから終了してください。";\r
-                return true;\r
-\r
-            }\r
-            if(_newData.EndTime != null && _newData.EndTime.IsValid == true){\r
-                if (!YesNoDialog.show("本タスクは既に終了しています。終了時間を更新しますか?"))\r
-                {\r
-                    message = "処理を中断しました。";\r
-                    return true;\r
-                }\r
-            }\r
-            if (TaskDataAccessor.getObject.endTask(param.sortID, param.EndTime))\r
-            {\r
-                string endingComment = form.showInputBox("お疲れ様でした。本タスクへのコメントをどうぞ。", ImeMode.Hiragana);\r
-                if (!string.IsNullOrEmpty(endingComment))\r
-                {\r
-                    CommentData data = new CommentData();\r
-                    data.TaskID = _newData.TaskID;\r
-                    data.Comment = endingComment;\r
-\r
-                    CommentDataAccessor.getObject.insertComment(data);\r
-                }\r
-\r
-                if (TaskDataAccessor.getObject.isRepeatTask(param.sortID))\r
-                {\r
-                    string nextDay = form.showInputBox("次回は何日後ですか?0の場合は繰り返しません。","1");\r
-                    if (nextDay != "0")\r
-                    {\r
-                        _newData.DoDate.addDate(int.Parse(nextDay));\r
-                        _newData.TaskID = TaskDataAccessor.getObject.getMaxTaskID();\r
-                        _newData.SortID = TaskDataAccessor.getObject.getMaxSortID();\r
-\r
-\r
-                        //_newData.CategID = CategoryDataAccessor.getObject.getCategoryFromName(_newData.Category).CategId;\r
-\r
-                        TaskDataAccessor.getObject.insertTask(_newData);\r
-\r
-                        //リピート対象としたタスクは複製後もリピート対象とする。\r
-                        TaskDataAccessor.getObject.setRepeatTask(_newData.SortID, true);\r
-\r
-                        message = "タスク " + param.sortID + " を終了します。次回は" + _newData.DoDate.getDateString() + "です。";\r
-                        return true;\r
-                    }\r
-                }\r
-                message = "タスク " + param.sortID + " を終了します。";\r
-                return true;\r
-            }\r
-            return false;\r
-        }\r
-\r
-        protected override string turnMessage()\r
-        {\r
-            return message;\r
-        }\r
-\r
-        protected override string turnErrorMessage()\r
-        {\r
-            return base.DefaultErrorMessage;\r
-        }\r
-\r
-        protected override string turnSplitErrorMessage()\r
-        {\r
-            return base.DefaultSplitErrorMessage;\r
-        }\r
-    }\r
-}\r
index d9e6277..d1f8498 100644 (file)
     <Reference Include="System.Xml" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <Compile Include="command\batch\batchCommand.cs" />\r
-    <Compile Include="command\batch\BatchCommandArg.cs" />\r
-    <Compile Include="command\batch\beditCommand.cs" />\r
-    <Compile Include="command\SYSTEM\TimerCommand.cs" />\r
-    <Compile Include="command\SYSTEM\TimerCommandArg.cs" />\r
-    <Compile Include="command\SYSTEM\AllCategInner.cs" />\r
-    <Compile Include="command\SYSTEM\BGColorCommand.cs" />\r
-    <Compile Include="command\SYSTEM\ClsCommand.cs" />\r
-    <Compile Include="command\SYSTEM\CreditCommand.cs" />\r
-    <Compile Include="command\SYSTEM\DateCommand.cs" />\r
-    <Compile Include="command\SYSTEM\DateCommandArg.cs" />\r
-    <Compile Include="command\SYSTEM\DmpCommand.cs" />\r
-    <Compile Include="command\SYSTEM\EchoCommand.cs" />\r
-    <Compile Include="command\SYSTEM\EchoCommandArg.cs" />\r
-    <Compile Include="command\SYSTEM\ExitCommand.cs" />\r
-    <Compile Include="command\SYSTEM\ExpCommand.cs" />\r
-    <Compile Include="command\SYSTEM\FrColorCommand.cs" />\r
-    <Compile Include="command\SYSTEM\HelpCommand.cs" />\r
-    <Compile Include="command\SYSTEM\HelpCommandArg.cs" />\r
-    <Compile Include="command\SYSTEM\LinkCommand.cs" />\r
-    <Compile Include="command\SYSTEM\LinkCommandArg.cs" />\r
-    <Compile Include="command\SYSTEM\LogModeCommand.cs" />\r
-    <Compile Include="command\SYSTEM\LogModeCommandArg.cs" />\r
-    <Compile Include="command\SYSTEM\TimeAreaSettingCommand.cs" />\r
-    <Compile Include="command\SYSTEM\TodayCommand.cs" />\r
     <Compile Include="command\template\abCommand.cs" />\r
     <Compile Include="command\template\commandArgs.cs" />\r
     <Compile Include="command\template\NoArgsDummy.cs" />\r
index 87e1131..ab27e52 100644 (file)
@@ -4,9 +4,9 @@ using com.andoutomo.kybernetes.control;
 \r
 namespace com.andoutomo.kybernetes.data.connection\r
 {\r
-    delegate void TransitData(SQLiteDataReader reader);\r
+    public delegate void TransitData(SQLiteDataReader reader);\r
 \r
-    abstract class DBConnection\r
+    public abstract class DBConnection\r
     {\r
         public abstract string targetDbFile();\r
 \r
index 51ef7c2..c83d9f1 100644 (file)
@@ -22,21 +22,21 @@ namespace com.andoutomo.kybernetes.data.connection {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]\r
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
-    public class SqlDictionary {\r
+    internal class SqlDictionary {\r
         \r
         private static global::System.Resources.ResourceManager resourceMan;\r
         \r
         private static global::System.Globalization.CultureInfo resourceCulture;\r
         \r
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]\r
-        public SqlDictionary() {\r
+        internal SqlDictionary() {\r
         }\r
         \r
         /// <summary>\r
         ///   このクラスで使用されているキャッシュされた ResourceManager インスタンスを返します。\r
         /// </summary>\r
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]\r
-        public static global::System.Resources.ResourceManager ResourceManager {\r
+        internal static global::System.Resources.ResourceManager ResourceManager {\r
             get {\r
                 if (object.ReferenceEquals(resourceMan, null)) {\r
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("com.andoutomo.kybernetes.data.connection.SqlDictionary", typeof(SqlDictionary).Assembly);\r
@@ -51,7 +51,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         ///   現在のスレッドの CurrentUICulture プロパティをオーバーライドします。\r
         /// </summary>\r
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]\r
-        public static global::System.Globalization.CultureInfo Culture {\r
+        internal static global::System.Globalization.CultureInfo Culture {\r
             get {\r
                 return resourceCulture;\r
             }\r
@@ -63,7 +63,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   update tbl_tasks set tags=(case when tags is null then ? else (case when tags like ? then tags else tags||&apos;,&apos;||? end ) end) where sortid=? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string addTag {\r
+        internal static string addTag {\r
             get {\r
                 return ResourceManager.GetString("addTag", resourceCulture);\r
             }\r
@@ -72,7 +72,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   update tbl_tasks set timearea=? where sortid=? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string changeAreaOfTask {\r
+        internal static string changeAreaOfTask {\r
             get {\r
                 return ResourceManager.GetString("changeAreaOfTask", resourceCulture);\r
             }\r
@@ -81,7 +81,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   UPDATE TBL_SETTING SET LOGMODE=&apos;DEBUG&apos; に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string changeDebugMode {\r
+        internal static string changeDebugMode {\r
             get {\r
                 return ResourceManager.GetString("changeDebugMode", resourceCulture);\r
             }\r
@@ -90,7 +90,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   UPDATE TBL_SETTING SET LOGMODE=&apos;ERROR&apos; に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string changeErrorMode {\r
+        internal static string changeErrorMode {\r
             get {\r
                 return ResourceManager.GetString("changeErrorMode", resourceCulture);\r
             }\r
@@ -99,7 +99,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   update tbl_tasks set sortid = ? where taskid=? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string changeTaskNo {\r
+        internal static string changeTaskNo {\r
             get {\r
                 return ResourceManager.GetString("changeTaskNo", resourceCulture);\r
             }\r
@@ -108,7 +108,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   UPDATE TBL_SETTING SET LOGMODE=&apos;TRACE&apos; に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string changeTraceMode {\r
+        internal static string changeTraceMode {\r
             get {\r
                 return ResourceManager.GetString("changeTraceMode", resourceCulture);\r
             }\r
@@ -117,7 +117,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   delete from tbl_category に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string clearCategory {\r
+        internal static string clearCategory {\r
             get {\r
                 return ResourceManager.GetString("clearCategory", resourceCulture);\r
             }\r
@@ -126,7 +126,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   DELETE FROM TBL_COMMENT WHERE TASKID IS NULL AND DATE(CREATETIME) = DATE(?) に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string clearMetaComment {\r
+        internal static string clearMetaComment {\r
             get {\r
                 return ResourceManager.GetString("clearMetaComment", resourceCulture);\r
             }\r
@@ -135,7 +135,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   update tbl_tasks set tags=null where sortid=? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string clearTags {\r
+        internal static string clearTags {\r
             get {\r
                 return ResourceManager.GetString("clearTags", resourceCulture);\r
             }\r
@@ -144,7 +144,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   DELETE FROM TBL_COMMENT WHERE TASKID=? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string clearTaskComment {\r
+        internal static string clearTaskComment {\r
             get {\r
                 return ResourceManager.GetString("clearTaskComment", resourceCulture);\r
             }\r
@@ -153,7 +153,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   update tbl_tasks set starttime=null,endtime=null where sortid=? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string clearTime {\r
+        internal static string clearTime {\r
             get {\r
                 return ResourceManager.GetString("clearTime", resourceCulture);\r
             }\r
@@ -162,7 +162,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   delete from tbl_timearea に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string clearTimeArea {\r
+        internal static string clearTimeArea {\r
             get {\r
                 return ResourceManager.GetString("clearTimeArea", resourceCulture);\r
             }\r
@@ -171,7 +171,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   DELETE FROM TBL_COMMENT WHERE TASKID IS NOT NULL AND TASKID NOT IN(SELECT TASKID FROM TBL_TASKS) に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string clearZombieComment {\r
+        internal static string clearZombieComment {\r
             get {\r
                 return ResourceManager.GetString("clearZombieComment", resourceCulture);\r
             }\r
@@ -180,7 +180,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT COUNT(taskID) as COUNT FROM tbl_tasks where sortid between ? and ? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string countBeforeDelete {\r
+        internal static string countBeforeDelete {\r
             get {\r
                 return ResourceManager.GetString("countBeforeDelete", resourceCulture);\r
             }\r
@@ -189,7 +189,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   update tbl_tasks set DoDate =date(?) where sortid=? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string delayTask {\r
+        internal static string delayTask {\r
             get {\r
                 return ResourceManager.GetString("delayTask", resourceCulture);\r
             }\r
@@ -198,7 +198,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   DELETE FROM tbl_tasks where sortid between ? and ? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string deleteTasks {\r
+        internal static string deleteTasks {\r
             get {\r
                 return ResourceManager.GetString("deleteTasks", resourceCulture);\r
             }\r
@@ -207,16 +207,16 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   UPDATE TBL_TASKS SET ENDTIME=? WHERE SORTID=? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string endTask {\r
+        internal static string endTask {\r
             get {\r
                 return ResourceManager.GetString("endTask", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   SELECT DISTINCT PROJECT FROM TBL_TASKS に類似しているローカライズされた文字列を検索します。\r
+        ///   SELECT DISTINCT PROJECT FROM TBL_TASKS ORDER by PROJECT に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string findProject {\r
+        internal static string findProject {\r
             get {\r
                 return ResourceManager.GetString("findProject", resourceCulture);\r
             }\r
@@ -225,7 +225,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT DISTINCT TAGS FROM TBL_TASKS に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string findTags {\r
+        internal static string findTags {\r
             get {\r
                 return ResourceManager.GetString("findTags", resourceCulture);\r
             }\r
@@ -234,7 +234,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT CategID,Category,BGColor,FRColor FROM tbl_category ORDER BY CategID に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getALLCategory {\r
+        internal static string getALLCategory {\r
             get {\r
                 return ResourceManager.GetString("getALLCategory", resourceCulture);\r
             }\r
@@ -243,7 +243,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT  TASKID  , SORTID  , DODATE  , TIMEAREA  , CATEGORY  , CONTENTS  , FORCASTMIN  , STARTTIME  , ENDTIME  , BGCOLOR  , FRCOLOR  , REPEATFLG  , HASCOMMENT , PROJECT , TAGS ,COMMENT FROM VW_TASKS_SORT ORDER BY DATESORT,DODATE,STARTNULLSORT,STARTTIMESORT,ENDTIMESORT,TIMEAREA,SORTID に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getAllList {\r
+        internal static string getAllList {\r
             get {\r
                 return ResourceManager.GetString("getAllList", resourceCulture);\r
             }\r
@@ -252,7 +252,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT TIMEAREA,START,END FROM tbl_timearea に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getAllTimeArea {\r
+        internal static string getAllTimeArea {\r
             get {\r
                 return ResourceManager.GetString("getAllTimeArea", resourceCulture);\r
             }\r
@@ -261,7 +261,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT CategID,Category,BGColor,FRColor FROM tbl_category WHERE CategID = ? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getCategoryFromCategId {\r
+        internal static string getCategoryFromCategId {\r
             get {\r
                 return ResourceManager.GetString("getCategoryFromCategId", resourceCulture);\r
             }\r
@@ -270,7 +270,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT CategID,BGColor,FRColor FROM tbl_category WHERE Category = ? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getCategoryFromCategName {\r
+        internal static string getCategoryFromCategName {\r
             get {\r
                 return ResourceManager.GetString("getCategoryFromCategName", resourceCulture);\r
             }\r
@@ -279,7 +279,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT ID,TASKID,CREATETIME,COMMENT FROM TBL_COMMENT WHERE TASKID=? ORDER BY ID に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getComments {\r
+        internal static string getComments {\r
             get {\r
                 return ResourceManager.GetString("getComments", resourceCulture);\r
             }\r
@@ -288,7 +288,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT  TASKID  , SORTID  , DODATE  , TIMEAREA  , CATEGORY  , CONTENTS  , FORCASTMIN  , STARTTIME  , ENDTIME  , BGCOLOR  , FRCOLOR  , REPEATFLG  , HASCOMMENT , PROJECT ,TAGS ,COMMENT FROM VW_TASKS_SORT WHERE DATE (DODATE) = DATE (? ) ORDER BY DATESORT,DODATE,STARTNULLSORT,STARTTIMESORT,ENDTIMESORT,TIMEAREA,SORTID に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getDailyList {\r
+        internal static string getDailyList {\r
             get {\r
                 return ResourceManager.GetString("getDailyList", resourceCulture);\r
             }\r
@@ -297,7 +297,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT TIMEAREA FROM TBL_TIMEAREA WHERE TIME(START)&lt;=TIME(?) AND TIME(?)&lt;TIME(END) に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getDefaultTimeArea {\r
+        internal static string getDefaultTimeArea {\r
             get {\r
                 return ResourceManager.GetString("getDefaultTimeArea", resourceCulture);\r
             }\r
@@ -306,7 +306,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT  TASKID  , SORTID  , DODATE  , TIMEAREA  , CATEGORY  , CONTENTS  , FORCASTMIN  , STARTTIME  , ENDTIME  , BGCOLOR  , FRCOLOR  , REPEATFLG  , HASCOMMENT, PROJECT , TAGS ,COMMENT FROM VW_TASKS_SORT  , TBL_SETTING S WHERE DATE (DODATE) &gt;= DATE (S.TODAY) ORDER BY DATESORT,DODATE,STARTNULLSORT,STARTTIMESORT,ENDTIMESORT,TIMEAREA,SORTID に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getGoingList {\r
+        internal static string getGoingList {\r
             get {\r
                 return ResourceManager.GetString("getGoingList", resourceCulture);\r
             }\r
@@ -315,7 +315,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT LOGMODE FROM TBL_SETTING に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getLogMode {\r
+        internal static string getLogMode {\r
             get {\r
                 return ResourceManager.GetString("getLogMode", resourceCulture);\r
             }\r
@@ -324,7 +324,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT ((MAX(TASKID)) + 1) AS NEXTID FROM TBL_TASKS に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getMaxIDofTask {\r
+        internal static string getMaxIDofTask {\r
             get {\r
                 return ResourceManager.GetString("getMaxIDofTask", resourceCulture);\r
             }\r
@@ -333,7 +333,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT MAX(SORTID) + 10 AS NEXTSORTID FROM TBL_TASKS に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getMaxSortID {\r
+        internal static string getMaxSortID {\r
             get {\r
                 return ResourceManager.GetString("getMaxSortID", resourceCulture);\r
             }\r
@@ -342,7 +342,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT C.ID,C.TASKID,C.CREATETIME,C.COMMENT FROM TBL_COMMENT C WHERE date(CREATETIME) = (SELECT TODAY FROM TBL_SETTING) or exists(SELECT TASKID FROM TBL_TASKS T WHERE T.TASKID = C.TASKID AND date(T.DODATE) =(SELECT TODAY FROM TBL_SETTING) ) ORDER BY ID に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getMetaComment {\r
+        internal static string getMetaComment {\r
             get {\r
                 return ResourceManager.GetString("getMetaComment", resourceCulture);\r
             }\r
@@ -351,7 +351,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT MAX(TIME(ENDTIME)) AS MAXENDTIME FROM TBL_TASKS WHERE DODATE=date(?); に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getNextStartTime {\r
+        internal static string getNextStartTime {\r
             get {\r
                 return ResourceManager.GetString("getNextStartTime", resourceCulture);\r
             }\r
@@ -360,7 +360,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT T.TASKID,T.SORTID,T.DODATE,T.TIMEAREA,T.CATEGID,C.CATEGORY,T.CONTENTS,T.FORCASTMIN,T.STARTTIME,T.ENDTIME,T.REPEATFLG, T.PROJECT , T.TAGS FROM TBL_TASKS T LEFT OUTER JOIN tbl_category C ON C.CATEGID=T.CATEGID where T.SORTID = ? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getOneTask {\r
+        internal static string getOneTask {\r
             get {\r
                 return ResourceManager.GetString("getOneTask", resourceCulture);\r
             }\r
@@ -372,7 +372,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         ///  AND ENDTIME IS NULL \r
         ///  AND STARTTIME IS NOT NULL ORDER BY DATESORT,DODATE,STARTNULLSORT,STARTTIMESORT,ENDTIMESORT,TIMEAREA,SORTID に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getPwdList {\r
+        internal static string getPwdList {\r
             get {\r
                 return ResourceManager.GetString("getPwdList", resourceCulture);\r
             }\r
@@ -381,7 +381,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT  TASKID  , SORTID  , DODATE  , TIMEAREA  , CATEGORY  , CONTENTS  , FORCASTMIN  , STARTTIME  , ENDTIME  , BGCOLOR  , FRCOLOR  , REPEATFLG  , HASCOMMENT, PROJECT , TAGS ,COMMENT FROM VW_TASKS_SORT WHERE ENDTIME IS NULL ORDER BY DATESORT,DODATE,STARTNULLSORT,STARTTIMESORT,ENDTIMESORT,TIMEAREA,SORTID に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getRemainList {\r
+        internal static string getRemainList {\r
             get {\r
                 return ResourceManager.GetString("getRemainList", resourceCulture);\r
             }\r
@@ -390,7 +390,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT SORTID FROM TBL_TASKS WHERE TASKID = ? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getSortIDFromTaskID {\r
+        internal static string getSortIDFromTaskID {\r
             get {\r
                 return ResourceManager.GetString("getSortIDFromTaskID", resourceCulture);\r
             }\r
@@ -399,7 +399,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT TODAY FROM TBL_SETTING に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getToday {\r
+        internal static string getToday {\r
             get {\r
                 return ResourceManager.GetString("getToday", resourceCulture);\r
             }\r
@@ -408,7 +408,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT  TASKID  , SORTID  , DODATE  , TIMEAREA  , CATEGORY  , CONTENTS  , FORCASTMIN  , STARTTIME  , ENDTIME  , BGCOLOR  , FRCOLOR  , REPEATFLG  , HASCOMMENT, PROJECT , TAGS ,COMMENT FROM VW_TASKS_SORT  , TBL_SETTING S WHERE DATE (DODATE) = DATE (S.TODAY) ORDER BY DATESORT,DODATE,STARTNULLSORT,STARTTIMESORT,ENDTIMESORT,TIMEAREA,SORTID に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string getTodayList {\r
+        internal static string getTodayList {\r
             get {\r
                 return ResourceManager.GetString("getTodayList", resourceCulture);\r
             }\r
@@ -417,7 +417,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   INSERT into tbl_category (CATEGID,CATEGORY,FRCOLOR,BGCOLOR) values(?,?,?,?) に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string insertCategory {\r
+        internal static string insertCategory {\r
             get {\r
                 return ResourceManager.GetString("insertCategory", resourceCulture);\r
             }\r
@@ -426,7 +426,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   INSERT INTO TBL_COMMENT (TASKID,CREATETIME,COMMENT) VALUES(?,datetime(&apos;now&apos;,&apos;localtime&apos;),?) に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string insertComment {\r
+        internal static string insertComment {\r
             get {\r
                 return ResourceManager.GetString("insertComment", resourceCulture);\r
             }\r
@@ -435,7 +435,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   INSERT INTO TBL_COMMENT (TASKID,CREATETIME,COMMENT) VALUES(null,datetime(&apos;now&apos;,&apos;localtime&apos;),?) に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string insertMetaComment {\r
+        internal static string insertMetaComment {\r
             get {\r
                 return ResourceManager.GetString("insertMetaComment", resourceCulture);\r
             }\r
@@ -444,7 +444,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   insert into tbl_tasks(TASKID,SORTID,DODATE,TIMEAREA,CATEGID,CONTENTS,FORCASTMIN,STARTTIME,ENDTIME) values(?,?,date(?),?,?,?,?,null,null) に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string insertTask {\r
+        internal static string insertTask {\r
             get {\r
                 return ResourceManager.GetString("insertTask", resourceCulture);\r
             }\r
@@ -453,7 +453,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   INSERT INTO tbl_timearea (TIMEAREA,START,END) values(?,?,?) に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string insertTimeArea {\r
+        internal static string insertTimeArea {\r
             get {\r
                 return ResourceManager.GetString("insertTimeArea", resourceCulture);\r
             }\r
@@ -462,7 +462,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT REPEATFLG FROM TBL_TASKS WHERE SORTID=? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string isRepeatTask {\r
+        internal static string isRepeatTask {\r
             get {\r
                 return ResourceManager.GetString("isRepeatTask", resourceCulture);\r
             }\r
@@ -471,7 +471,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   SELECT  TASKID  , SORTID  , DODATE  , TIMEAREA  , CATEGORY  , CONTENTS  , FORCASTMIN  , STARTTIME  , ENDTIME  , BGCOLOR  , FRCOLOR  , REPEATFLG  , HASCOMMENT , PROJECT , TAGS ,COMMENT FROM VW_TASKS_SORT  where CONTENTS LIKE ? OR Category LIKE ? OR PROJECT LIKE ? OR TAGS LIKE ? ORDER BY DATESORT,DODATE,STARTNULLSORT,STARTTIMESORT,ENDTIMESORT,TIMEAREA,SORTID に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string searchTasks {\r
+        internal static string searchTasks {\r
             get {\r
                 return ResourceManager.GetString("searchTasks", resourceCulture);\r
             }\r
@@ -480,7 +480,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   UPDATE TBL_TASKS SET REPEATFLG=? WHERE SORTID=? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string setRepeatTask {\r
+        internal static string setRepeatTask {\r
             get {\r
                 return ResourceManager.GetString("setRepeatTask", resourceCulture);\r
             }\r
@@ -489,7 +489,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   UPDATE TBL_TASKS SET STARTTIME=? WHERE SORTID=? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string startTask {\r
+        internal static string startTask {\r
             get {\r
                 return ResourceManager.GetString("startTask", resourceCulture);\r
             }\r
@@ -498,7 +498,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   UPDATE TBL_TASKS SET SORTID = SORTID * -1 WHERE DATE(DODATE) &lt; (SELECT TODAY FROM TBL_SETTING) AND ENDTIME IS NOT NULL に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string suppressCompleteTask {\r
+        internal static string suppressCompleteTask {\r
             get {\r
                 return ResourceManager.GetString("suppressCompleteTask", resourceCulture);\r
             }\r
@@ -507,7 +507,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   UPDATE TBL_TASKS SET PROJECT = ? WHERE SORTID= ? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string updateProject {\r
+        internal static string updateProject {\r
             get {\r
                 return ResourceManager.GetString("updateProject", resourceCulture);\r
             }\r
@@ -516,7 +516,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   update tbl_tasks set DODATE=date(?),TIMEAREA=?,CATEGID=?,CONTENTS=?,FORCASTMIN=? WHERE SORTID=? に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string updateTask {\r
+        internal static string updateTask {\r
             get {\r
                 return ResourceManager.GetString("updateTask", resourceCulture);\r
             }\r
@@ -525,7 +525,7 @@ namespace com.andoutomo.kybernetes.data.connection {
         /// <summary>\r
         ///   UPDATE TBL_SETTING SET TODAY = ?  に類似しているローカライズされた文字列を検索します。\r
         /// </summary>\r
-        public static string updateToday {\r
+        internal static string updateToday {\r
             get {\r
                 return ResourceManager.GetString("updateToday", resourceCulture);\r
             }\r
index b34147b..c79481d 100644 (file)
     <comment>タグをクリアします。</comment>\r
   </data>\r
   <data name="findProject" xml:space="preserve">\r
-    <value>SELECT DISTINCT PROJECT FROM TBL_TASKS</value>\r
+    <value>SELECT DISTINCT PROJECT FROM TBL_TASKS ORDER by PROJECT</value>\r
     <comment>全プロジェクトを取得します。</comment>\r
   </data>\r
   <data name="findTags" xml:space="preserve">\r
index a82e0a5..7294754 100644 (file)
@@ -5,7 +5,7 @@ using System.Text;
 \r
 namespace com.andoutomo.kybernetes.data.connection\r
 {\r
-    class TaskDBConnection:DBConnection\r
+    public class TaskDBConnection:DBConnection\r
     {\r
         public override string targetDbFile()\r
         {\r
index 0e60b9b..c6164e4 100644 (file)
@@ -583,7 +583,7 @@ namespace com.andoutomo.kybernetes.view
         }\r
         #endregion\r
 \r
-        internal void cmdForBatch(string command)\r
+        public void cmdForBatch(string command)\r
         {\r
             this.addText( wkOnCmdDispatch(command));\r
         }\r
index 427f3c8..838ea9b 100644 (file)
@@ -5,9 +5,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basement", "base\Basement.c
 EndProject\r
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kybernetes", "main\Kybernetes.csproj", "{764A64C6-C6EB-4DB0-A346-F7C01C56DAA0}"\r
 EndProject\r
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandardCommand", "StandardCommand\StandardCommand.csproj", "{6EC5F291-3274-4AF5-8264-2432D21FEB34}"\r
-EndProject\r
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TaskControlCommand", "TaskControlCommand\TaskControlCommand.csproj", "{0136D2C6-B362-4591-A6F5-CF9E873960F9}"\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdditionalControlCommand", "TaskControlCommand\AdditionalControlCommand.csproj", "{0136D2C6-B362-4591-A6F5-CF9E873960F9}"\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
@@ -43,16 +41,6 @@ Global
                {764A64C6-C6EB-4DB0-A346-F7C01C56DAA0}.Release|Mixed Platforms.Build.0 = Release|x86\r
                {764A64C6-C6EB-4DB0-A346-F7C01C56DAA0}.Release|x86.ActiveCfg = Release|x86\r
                {764A64C6-C6EB-4DB0-A346-F7C01C56DAA0}.Release|x86.Build.0 = Release|x86\r
-               {6EC5F291-3274-4AF5-8264-2432D21FEB34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {6EC5F291-3274-4AF5-8264-2432D21FEB34}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {6EC5F291-3274-4AF5-8264-2432D21FEB34}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU\r
-               {6EC5F291-3274-4AF5-8264-2432D21FEB34}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU\r
-               {6EC5F291-3274-4AF5-8264-2432D21FEB34}.Debug|x86.ActiveCfg = Debug|Any CPU\r
-               {6EC5F291-3274-4AF5-8264-2432D21FEB34}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {6EC5F291-3274-4AF5-8264-2432D21FEB34}.Release|Any CPU.Build.0 = Release|Any CPU\r
-               {6EC5F291-3274-4AF5-8264-2432D21FEB34}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU\r
-               {6EC5F291-3274-4AF5-8264-2432D21FEB34}.Release|Mixed Platforms.Build.0 = Release|Any CPU\r
-               {6EC5F291-3274-4AF5-8264-2432D21FEB34}.Release|x86.ActiveCfg = Release|Any CPU\r
                {0136D2C6-B362-4591-A6F5-CF9E873960F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {0136D2C6-B362-4591-A6F5-CF9E873960F9}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {0136D2C6-B362-4591-A6F5-CF9E873960F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU\r
index d3311cf..dea73a5 100644 (file)
Binary files a/kybernetes2.suo and b/kybernetes2.suo differ
index 3d52a03..efb8afd 100644 (file)
@@ -69,6 +69,12 @@ namespace com.andoutomo.kybernetes.control
                     Assembly asm;\r
                     Type argsType = null;\r
                     Type commandType = null;\r
+                    \r
+                    //まず先に自プロジェクトから探す\r
+                    argsType = Type.GetType(data.ArgClass);\r
+                    commandType = Type.GetType(data.TargetClass);\r
+\r
+                    //なければプラグインから探す\r
                     foreach (SimpleDataBean bean in dllList)\r
                     {\r
                         asm = Assembly.LoadFrom(bean.Val);\r
@@ -86,6 +92,7 @@ namespace com.andoutomo.kybernetes.control
                             break;\r
                         }\r
                     }\r
+\r
                     if (argsType == null || commandType == null)\r
                     {\r
                         return "コマンドが見つかりません。";\r
index 07573c6..cbcf65e 100644 (file)
   </ItemGroup>\r
   <ItemGroup>\r
     <Compile Include="CmdDispatcher.cs" />\r
+    <Compile Include="command\batch\batchCommand.cs" />\r
+    <Compile Include="command\batch\BatchCommandArg.cs" />\r
+    <Compile Include="command\batch\beditCommand.cs" />\r
+    <Compile Include="command\Control\AddProjectCommand.cs" />\r
+    <Compile Include="command\Control\AddProjectCommandArg.cs" />\r
+    <Compile Include="command\Control\AddTagCommand.cs" />\r
+    <Compile Include="command\Control\AddTagCommandArg.cs" />\r
+    <Compile Include="command\Control\ChAreaCommand.cs" />\r
+    <Compile Include="command\Control\ChAreaCommandArg.cs" />\r
+    <Compile Include="command\Control\CheckCommand.cs" />\r
+    <Compile Include="command\Control\CheckCommandArg.cs" />\r
+    <Compile Include="command\Control\ChnumCommand.cs" />\r
+    <Compile Include="command\Control\ChnumCommandArg.cs" />\r
+    <Compile Include="command\Control\ClearCommand.cs" />\r
+    <Compile Include="command\Control\ClearCommandArg.cs" />\r
+    <Compile Include="command\Control\ClearCommentCommand.cs" />\r
+    <Compile Include="command\Control\ClearCommentCommandArg.cs" />\r
+    <Compile Include="command\Control\ClearTagCommand.cs" />\r
+    <Compile Include="command\Control\ClearTagCommandArg.cs" />\r
+    <Compile Include="command\Control\CommentCommand.cs" />\r
+    <Compile Include="command\Control\CommentCommandArg.cs" />\r
+    <Compile Include="command\Control\DelayCommand.cs" />\r
+    <Compile Include="command\Control\DelayCommandArg.cs" />\r
+    <Compile Include="command\Control\DuplicateCommand.cs" />\r
+    <Compile Include="command\Control\DuplicateCommandArg.cs" />\r
+    <Compile Include="command\Control\EndCommand.cs" />\r
+    <Compile Include="command\Control\EndCommandArg.cs" />\r
+    <Compile Include="command\Control\RepeatCommand.cs" />\r
+    <Compile Include="command\Control\RepeatCommandArg.cs" />\r
+    <Compile Include="command\Control\ReportCommand.cs" />\r
+    <Compile Include="command\Control\ReportCommandArg.cs" />\r
+    <Compile Include="command\Control\StartCommand.cs" />\r
+    <Compile Include="command\Control\StartCommandArg.cs" />\r
+    <Compile Include="command\Control\SVCallCommand.cs" />\r
+    <Compile Include="command\Control\SVCallCommandArg.cs" />\r
+    <Compile Include="command\Control\SVEndCallCommand.cs" />\r
+    <Compile Include="command\CRUD\AddCommand.cs" />\r
+    <Compile Include="command\CRUD\AddCommandArg.cs" />\r
+    <Compile Include="command\CRUD\DeleteCommand.cs" />\r
+    <Compile Include="command\CRUD\DeleteCommandArg.cs" />\r
+    <Compile Include="command\CRUD\EstimateCommand.cs" />\r
+    <Compile Include="command\CRUD\EstimateCommandArg.cs" />\r
+    <Compile Include="command\CRUD\ListAllCommandArg.cs" />\r
+    <Compile Include="command\CRUD\ListCommand.cs" />\r
+    <Compile Include="command\CRUD\ListCommandArg.cs" />\r
+    <Compile Include="command\CRUD\ListGoingCommandArg.cs" />\r
+    <Compile Include="command\CRUD\ListRemainCommandArg.cs" />\r
+    <Compile Include="command\CRUD\LongListCommand.cs" />\r
+    <Compile Include="command\CRUD\RenumCommand.cs" />\r
+    <Compile Include="command\CRUD\UpdateCommand.cs" />\r
+    <Compile Include="command\CRUD\UpdateCommandArg.cs" />\r
+    <Compile Include="command\reference\FindCommand.cs" />\r
+    <Compile Include="command\reference\FindCommandArg.cs" />\r
+    <Compile Include="command\reference\PwdCommand.cs" />\r
+    <Compile Include="command\reference\ShowCommand.cs" />\r
+    <Compile Include="command\reference\ShowCommandArg.cs" />\r
+    <Compile Include="command\reference\SimulateCommand.cs" />\r
+    <Compile Include="command\reference\SimulateCommandArg.cs" />\r
+    <Compile Include="command\reference\SumCommand.cs" />\r
+    <Compile Include="command\reference\SumCommandArg.cs" />\r
+    <Compile Include="command\SYSTEM\AllCategInner.cs" />\r
+    <Compile Include="command\SYSTEM\BGColorCommand.cs" />\r
+    <Compile Include="command\SYSTEM\ClsCommand.cs" />\r
+    <Compile Include="command\SYSTEM\CreditCommand.cs" />\r
+    <Compile Include="command\SYSTEM\DateCommand.cs" />\r
+    <Compile Include="command\SYSTEM\DateCommandArg.cs" />\r
+    <Compile Include="command\SYSTEM\DmpCommand.cs" />\r
+    <Compile Include="command\SYSTEM\EchoCommand.cs" />\r
+    <Compile Include="command\SYSTEM\EchoCommandArg.cs" />\r
+    <Compile Include="command\SYSTEM\ExitCommand.cs" />\r
+    <Compile Include="command\SYSTEM\ExpCommand.cs" />\r
+    <Compile Include="command\SYSTEM\FrColorCommand.cs" />\r
+    <Compile Include="command\SYSTEM\HelpCommand.cs" />\r
+    <Compile Include="command\SYSTEM\HelpCommandArg.cs" />\r
+    <Compile Include="command\SYSTEM\LinkCommand.cs" />\r
+    <Compile Include="command\SYSTEM\LinkCommandArg.cs" />\r
+    <Compile Include="command\SYSTEM\LogModeCommand.cs" />\r
+    <Compile Include="command\SYSTEM\LogModeCommandArg.cs" />\r
+    <Compile Include="command\SYSTEM\TimeAreaSettingCommand.cs" />\r
+    <Compile Include="command\SYSTEM\TimerCommand.cs" />\r
+    <Compile Include="command\SYSTEM\TimerCommandArg.cs" />\r
+    <Compile Include="command\SYSTEM\TodayCommand.cs" />\r
     <Compile Include="Program.cs" />\r
     <Compile Include="Properties\AssemblyInfo.cs" />\r
     <EmbeddedResource Include="Properties\Resources.resx">\r
index 7b7b96a..f11b622 100644 (file)
@@ -33,6 +33,6 @@ using System.Resources;
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を \r
 // 既定値にすることができます:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.1.5.0")]\r
-[assembly: AssemblyFileVersion("1.1.5.0")]\r
+[assembly: AssemblyVersion("1.1.5.1")]\r
+[assembly: AssemblyFileVersion("1.1.5.1")]\r
 [assembly: NeutralResourcesLanguageAttribute("ja")]\r
index 529f98d..11bf670 100644 (file)
Binary files a/main/bin/Debug/setting.db and b/main/bin/Debug/setting.db differ
index 700825f..fa404e7 100644 (file)
Binary files a/main/bin/Debug/user.db and b/main/bin/Debug/user.db differ
similarity index 64%
rename from TaskControlCommand/command/Control/CheckCommand.cs
rename to main/command/Control/CheckCommand.cs
index cdafbf7..95c54ec 100644 (file)
@@ -9,7 +9,7 @@ using System.Windows.Forms;
 \r
 namespace com.andoutomo.kybernetes.command.Control\r
 {\r
-    class CheckCommand:AbCommand\r
+    class CheckCommand : EndCommand\r
     {\r
         CheckCommandArg param;\r
         protected override bool execute()\r
@@ -39,7 +39,7 @@ namespace com.andoutomo.kybernetes.command.Control
 \r
                                     CommentDataAccessor.getObject.insertComment(data);\r
                                 }\r
-                                return repeatCheck(target);\r
+                                return repeatCheck(target, param.sortID);\r
                             }\r
                             else\r
                             {\r
@@ -78,7 +78,7 @@ namespace com.andoutomo.kybernetes.command.Control
 \r
                             CommentDataAccessor.getObject.insertComment(data);\r
                         }\r
-                        return repeatCheck(target);\r
+                        return repeatCheck(target, param.sortID);\r
                     }\r
                     else\r
                     {\r
@@ -91,7 +91,7 @@ namespace com.andoutomo.kybernetes.command.Control
                 }\r
             }\r
         }\r
-        string message;\r
+        \r
 \r
         protected override string turnMessage()\r
         {\r
@@ -106,50 +106,5 @@ namespace com.andoutomo.kybernetes.command.Control
             }\r
             return message;\r
         }\r
-\r
-        protected override string turnSplitErrorMessage()\r
-        {\r
-            return base.DefaultSplitErrorMessage;\r
-        }\r
-        /// <summary>\r
-        /// \r
-        /// </summary>\r
-        /// <param name="_newData"></param>\r
-        /// <returns></returns>\r
-        private bool repeatCheck(TaskData _newData)\r
-        {\r
-            if (TaskDataAccessor.getObject.isRepeatTask(param.sortID))\r
-            {\r
-                string nextDay = form.showInputBox("次回は何日後ですか?0の場合は繰り返しません。", "1");\r
-                if (nextDay != "0")\r
-                {\r
-                    _newData.DoDate.addDate(int.Parse(nextDay));\r
-                    _newData.TaskID = TaskDataAccessor.getObject.getMaxTaskID();\r
-                    _newData.SortID = TaskDataAccessor.getObject.getMaxSortID();\r
-\r
-\r
-                    //_newData.CategID = CategoryDataAccessor.getObject.getCategoryFromName(_newData.Category).CategId;\r
-\r
-                    TaskDataAccessor.getObject.insertTask(_newData);\r
-\r
-                    //リピート対象としたタスクは複製後もリピート対象とする。\r
-                    TaskDataAccessor.getObject.setRepeatTask(_newData.SortID, true);\r
-\r
-                    message = "タスク " + param.sortID + " を終了します。次回は" + _newData.DoDate.getDateString() + "です。";\r
-                    return true;\r
-                }\r
-                else\r
-                {\r
-                    //リピートしないと判断したならそこで終了。\r
-                    return true;\r
-                }\r
-            }\r
-            else\r
-            {\r
-                //リピート対象でないなら何もしない\r
-                return true;\r
-            }\r
-        }\r
-        \r
     }\r
 }\r
@@ -26,7 +26,9 @@ namespace com.andoutomo.kybernetes.command.Control
 \r
 \r
             //データをインサート\r
-            if (accessor.insertTask(data))\r
+            if (accessor.insertTask(data) \r
+                && accessor.updateProjectofTask(data.SortID,data.Project) \r
+                && accessor.updateTagofTask(data.SortID,data.Tags))\r
             {\r
                 message = "タスク「" + data.Contents + "」を番号" + data.SortID + "で複製しました。";\r
                 return true;\r
diff --git a/main/command/Control/EndCommand.cs b/main/command/Control/EndCommand.cs
new file mode 100644 (file)
index 0000000..b5a4f0c
--- /dev/null
@@ -0,0 +1,118 @@
+using com.andoutomo.kybernetes.data.accessor;\r
+using com.andoutomo.kybernetes.data.DAO;\r
+using com.andoutomo.kybernetes.view;\r
+using System.Windows.Forms;\r
+\r
+namespace com.andoutomo.kybernetes.command\r
+{\r
+    class EndCommand:AbCommand\r
+    {\r
+        protected string message;\r
+        EndCommandArg param;\r
+        protected override bool execute()\r
+        {\r
+            param = (EndCommandArg)argument;\r
+            TaskDataAccessor accessor = TaskDataAccessor.getObject;\r
+\r
+            TaskData _newData = accessor.getTask(param.sortID);\r
+            \r
+\r
+            if (_newData == null)\r
+            {\r
+                base.errorType = ErrorType.DataNotFound;\r
+                return false;\r
+            }\r
+            if (_newData.StartTime == null || _newData.StartTime.IsValid == false)\r
+            {\r
+                message = "このタスクは開始されていません。startコマンドで開始してから終了してください。";\r
+                return true;\r
+\r
+            }\r
+            if(_newData.EndTime != null && _newData.EndTime.IsValid == true){\r
+                if (!YesNoDialog.show("本タスクは既に終了しています。終了時間を更新しますか?"))\r
+                {\r
+                    message = "処理を中断しました。";\r
+                    return true;\r
+                }\r
+            }\r
+            if (accessor.endTask(param.sortID, param.EndTime))\r
+            {\r
+                string endingComment = form.showInputBox("お疲れ様でした。本タスクへのコメントをどうぞ。", ImeMode.Hiragana);\r
+                if (!string.IsNullOrEmpty(endingComment))\r
+                {\r
+                    CommentData data = new CommentData();\r
+                    data.TaskID = _newData.TaskID;\r
+                    data.Comment = endingComment;\r
+\r
+                    CommentDataAccessor.getObject.insertComment(data);\r
+                }\r
+\r
+                if (accessor.isRepeatTask(param.sortID))\r
+                {\r
+                    return repeatCheck(_newData,param.sortID);\r
+\r
+                }\r
+                message = "タスク " + param.sortID + " を終了します。";\r
+                return true;\r
+            }\r
+            return false;\r
+        }\r
+\r
+        protected override string turnMessage()\r
+        {\r
+            return message;\r
+        }\r
+\r
+        protected override string turnErrorMessage()\r
+        {\r
+            return base.DefaultErrorMessage;\r
+        }\r
+\r
+        protected override string turnSplitErrorMessage()\r
+        {\r
+            return base.DefaultSplitErrorMessage;\r
+        }\r
+\r
+        /// <summary>\r
+        /// リピート処理を実施します。\r
+        /// </summary>\r
+        /// <param name="_newData"></param>\r
+        /// <returns></returns>\r
+        protected bool repeatCheck(TaskData _newData,int prevSortID)\r
+        {\r
+            TaskDataAccessor accessor = TaskDataAccessor.getObject;\r
+            if (accessor.isRepeatTask(prevSortID))\r
+            {\r
+                string nextDay = form.showInputBox("次回は何日後ですか?0の場合は繰り返しません。", "1");\r
+                if (nextDay != "0")\r
+                {\r
+                    _newData.DoDate.addDate(int.Parse(nextDay));\r
+                    _newData.TaskID = accessor.getMaxTaskID();\r
+                    _newData.SortID = accessor.getMaxSortID();\r
+\r
+                    accessor.insertTask(_newData);\r
+                    //付随情報もコピーする\r
+                    accessor.updateProjectofTask(_newData.SortID, _newData.Project);\r
+                    accessor.updateTagofTask(_newData.SortID, _newData.Tags);\r
+\r
+\r
+                    //リピート対象としたタスクは複製後もリピート対象とする。\r
+                    accessor.setRepeatTask(_newData.SortID, true);\r
+\r
+                    message = "タスク " + prevSortID + " を終了します。次回は" + _newData.DoDate.getDateString() + "です。";\r
+                    return true;\r
+                }\r
+                else\r
+                {\r
+                    //リピートしないと判断したならそこで終了。\r
+                    return true;\r
+                }\r
+            }\r
+            else\r
+            {\r
+                //リピート対象でないなら何もしない\r
+                return true;\r
+            }\r
+        }\r
+    }\r
+}\r
similarity index 50%
rename from TaskControlCommand/command/Control/ReportCommand.cs
rename to main/command/Control/ReportCommand.cs
index 47b54fe..d1c0264 100644 (file)
@@ -10,15 +10,16 @@ using System.Windows.Forms;
 \r
 namespace com.andoutomo.kybernetes.command.Control\r
 {\r
-    class ReportCommand:AbCommand\r
+    class ReportCommand : EndCommand\r
     {\r
-        string message;\r
+        \r
         ReportCommandArg param;\r
         protected override bool execute()\r
         {\r
             param = (ReportCommandArg)argument;\r
+            TaskDataAccessor accessor = TaskDataAccessor.getObject;\r
 \r
-            TaskData _newData = TaskDataAccessor.getObject.getTask(param.sortID);\r
+            TaskData _newData = accessor.getTask(param.sortID);\r
             if (_newData == null)\r
             {\r
                 base.errorType = ErrorType.DataNotFound;\r
@@ -26,7 +27,7 @@ namespace com.andoutomo.kybernetes.command.Control
             }\r
             if (_newData.StartTime == null || _newData.StartTime.IsValid == false)\r
             {\r
-                TaskDataAccessor.getObject.startTask(_newData.SortID, TaskDataAccessor.getObject.getNextStartTime(_newData.DoDate));\r
+                accessor.startTask(_newData.SortID, accessor.getNextStartTime(_newData.DoDate));\r
             }\r
             if(_newData.EndTime != null && _newData.EndTime.IsValid == true){\r
                 if (!YesNoDialog.show("本タスクは既に終了しています。終了時間を更新しますか?"))\r
@@ -35,7 +36,7 @@ namespace com.andoutomo.kybernetes.command.Control
                     return true;\r
                 }\r
             }\r
-            if (TaskDataAccessor.getObject.endTask(param.sortID, param.reportTime))\r
+            if (accessor.endTask(param.sortID, param.reportTime))\r
             {\r
                 string endingComment = form.showInputBox("お疲れ様でした。本タスクへのコメントをどうぞ。", ImeMode.Hiragana);\r
                 if (!string.IsNullOrEmpty(endingComment))\r
@@ -46,26 +47,10 @@ namespace com.andoutomo.kybernetes.command.Control
 \r
                     CommentDataAccessor.getObject.insertComment(data);\r
                 }\r
-                if (TaskDataAccessor.getObject.isRepeatTask(param.sortID))\r
+                if (accessor.isRepeatTask(param.sortID))\r
                 {\r
-                    string nextDay = form.showInputBox("次回は何日後ですか?0の場合は繰り返しません。","1");\r
-                    if (nextDay != "0")\r
-                    {\r
-                        _newData.DoDate.addDate(int.Parse(nextDay));\r
-                        _newData.TaskID = TaskDataAccessor.getObject.getMaxTaskID();\r
-                        _newData.SortID = TaskDataAccessor.getObject.getMaxSortID();\r
+                    return repeatCheck(_newData, param.sortID);\r
 \r
-\r
-                        //_newData.CategID = CategoryDataAccessor.getObject.getCategoryFromName(_newData.Category).CategId;\r
-\r
-                        TaskDataAccessor.getObject.insertTask(_newData);\r
-\r
-                        //リピート対象としたタスクは複製後もリピート対象とする。\r
-                        TaskDataAccessor.getObject.setRepeatTask(_newData.SortID, true);\r
-\r
-                        message = "タスク " + param.sortID + " を終了します。次回は" + _newData.DoDate.getDateString() + "です。";\r
-                        return true;\r
-                    }\r
                 }\r
                 message = "タスク " + param.sortID + " を終了します。";\r
                 return true;\r
@@ -77,15 +62,5 @@ namespace com.andoutomo.kybernetes.command.Control
         {\r
             return message;\r
         }\r
-\r
-        protected override string turnErrorMessage()\r
-        {\r
-            return base.DefaultErrorMessage;\r
-        }\r
-\r
-        protected override string turnSplitErrorMessage()\r
-        {\r
-            return base.DefaultSplitErrorMessage;\r
-        }\r
     }\r
 }\r
similarity index 94%
rename from TaskControlCommand/command/Control/SVCallCommand.cs
rename to main/command/Control/SVCallCommand.cs
index cd6043a..59514d2 100644 (file)
@@ -52,7 +52,7 @@ namespace com.andoutomo.kybernetes.command.Control
 \r
         protected override string  turnSplitErrorMessage()\r
         {\r
-               return base.DefaultSplitErrorMessage;\r
+            return base.DefaultSplitErrorMessage;\r
         }\r
     }\r
 }\r
diff --git a/main/command/Control/SVEndCallCommand.cs b/main/command/Control/SVEndCallCommand.cs
new file mode 100644 (file)
index 0000000..566998e
--- /dev/null
@@ -0,0 +1,60 @@
+using System;\r
+using System.Collections.Generic;\r
+using System.Linq;\r
+using System.Text;\r
+using com.andoutomo.kybernetes.data.DAO;\r
+using com.andoutomo.kybernetes.data.accessor;\r
+using com.andoutomo.kybernetes.data;\r
+\r
+namespace com.andoutomo.kybernetes.command.Control\r
+{\r
+    class SVEndCallCommand:AbCommand\r
+    {\r
+        private int sortID;\r
+\r
+        protected override bool execute()\r
+        {\r
+            SVCallCommandArg param = (SVCallCommandArg)argument;\r
+            TaskData data = new TaskData();\r
+            TaskDataAccessor accessor = TaskDataAccessor.getObject;\r
+\r
+            data.Contents = string.IsNullOrEmpty(param.TaskTitle) ? "- 割り込み作業 -" : "- " + param.TaskTitle;\r
+\r
+            data.DoDate = SettingDataAccessor.getObject.getToday();\r
+            data.TimeArea = TimeAreaDataAccessor.getObject.getDefaultTimeArea(TimeComponent.justNow()).ToUpper();\r
+            if (string.IsNullOrEmpty(data.TimeArea))\r
+            {\r
+                data.TimeArea = "Z";\r
+            }\r
+            data.CategID = 0;\r
+            data.ForecastMin = 0;\r
+\r
+\r
+            data.TaskID = accessor.getMaxTaskID();\r
+            data.SortID = accessor.getMaxSortID();\r
+            sortID = data.SortID;\r
+\r
+            accessor.insertTask(data);\r
+\r
+            accessor.startTask(data.SortID, TaskDataAccessor.getObject.getNextStartTime(data.DoDate));\r
+            accessor.endTask(data.SortID, TimeComponent.justNow());\r
+            accessor.updateTagofTask(data.SortID, "!!");\r
+            return true;\r
+        }\r
+\r
+        protected override string turnMessage()\r
+        {\r
+            return "割り込みタスク " + sortID + " を追加しました。";\r
+        }\r
+\r
+        protected override string turnErrorMessage()\r
+        {\r
+            return base.DefaultErrorMessage;\r
+        }\r
+\r
+        protected override string turnSplitErrorMessage()\r
+        {\r
+            return base.DefaultSplitErrorMessage;\r
+        }\r
+    }\r
+}\r