Fixed Bug from release #2

IamIpanda · Aug 1, 2014 · b657f16 · b657f16
1 parent 265cf8e
commit b657f16
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 53 deletions.
diff --git a/DataEditor.Control.Prototype/ProtoTroopMember.Designer.cs b/DataEditor.Control.Prototype/ProtoTroopMember.Designer.cs
diff --git a/DataEditor.Control.Wrapper/DataEditor.Control.Wrapper.csproj b/DataEditor.Control.Wrapper/DataEditor.Control.Wrapper.csproj
@@ -127,6 +127,7 @@
     <ProjectReference Include="..\DataEditor.FuzzyData.Extra\DataEditor.FuzzyData.Extra.csproj">
       <Project>{3332a025-6e2b-4d9f-8a46-9f2350b39750}</Project>
       <Name>DataEditor.FuzzyData.Extra</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\DataEditor.FuzzyData\DataEditor.FuzzyData.csproj">
       <Project>{3516d3c7-f112-4763-9f2d-0b17991c12ff}</Project>

diff --git a/DataEditor.Control/DataEditor.Control.csproj b/DataEditor.Control/DataEditor.Control.csproj
@@ -30,9 +30,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DataEditor.FuzzyData">
-      <HintPath>..\..\DataEditor\DataEditor.FuzzyData\bin\Debug\DataEditor.FuzzyData.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -61,6 +58,10 @@
       <Project>{d7dfc2b5-bb85-4037-b052-c4f1e3c1bde0}</Project>
       <Name>DataEditor.Contract</Name>
     </ProjectReference>
+    <ProjectReference Include="..\DataEditor.FuzzyData\DataEditor.FuzzyData.csproj">
+      <Project>{3516d3c7-f112-4763-9f2d-0b17991c12ff}</Project>
+      <Name>DataEditor.FuzzyData</Name>
+    </ProjectReference>
     <ProjectReference Include="..\DataEditor.Help\DataEditor.Help.csproj">
       <Project>{aafc4019-7092-4e66-9f1d-8a3ea4ba75a0}</Project>
       <Name>DataEditor.Help</Name>

diff --git a/DataEditor.Control/WrapBaseEditor.cs b/DataEditor.Control/WrapBaseEditor.cs
@@ -93,6 +93,7 @@ public virtual FuzzyData.FuzzyObject Parent
                 FuzzyData.FuzzyObject origin = GetValueFromChild(value);
                 TValue ans = ConvertToValue(origin);
                 if (ans == null)
+                    //this.value = parent;
                     EnableData = SetDefault() ? DataState.Disable : DataState.Default;
                 else
                 {

diff --git a/DataEditor.Control/obj/Debug/DataEditor.Control.csproj.FileListAbsolute.txt b/DataEditor.Control/obj/Debug/DataEditor.Control.csproj.FileListAbsolute.txt
@@ -48,3 +48,5 @@ E:\VS Projects\DataEditor.Ruby\DataEditor.Control\bin\Debug\DataEditor.FuzzyData
 E:\VS Projects\DataEditor.Ruby\DataEditor.Control\obj\Debug\DataEditor.Control.csprojResolveAssemblyReference.cache
 E:\VS Projects\DataEditor.Ruby\DataEditor.Control\obj\Debug\DataEditor.Control.dll
 E:\VS Projects\DataEditor.Ruby\DataEditor.Control\obj\Debug\DataEditor.Control.pdb
+E:\VS Projects\DataEditor.Ruby\DataEditor.Control\bin\Debug\DataEditor.FuzzyData.dll
+E:\VS Projects\DataEditor.Ruby\DataEditor.Control\bin\Debug\DataEditor.FuzzyData.pdb
diff --git a/DataEditor.Help/DataEditor.Help.csproj b/DataEditor.Help/DataEditor.Help.csproj
@@ -31,9 +31,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DataEditor.FuzzyData">
-      <HintPath>..\..\DataEditor\DataEditor.FuzzyData\bin\Debug\DataEditor.FuzzyData.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -85,6 +82,10 @@
       <Project>{a9c0dc50-cec6-401b-92e3-65787c9bedc9}</Project>
       <Name>DataEditor.FuzzyData.Serialization.RubyMarshal</Name>
     </ProjectReference>
+    <ProjectReference Include="..\DataEditor.FuzzyData\DataEditor.FuzzyData.csproj">
+      <Project>{3516d3c7-f112-4763-9f2d-0b17991c12ff}</Project>
+      <Name>DataEditor.FuzzyData</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="OutLink\LoadingForm.resx">

diff --git a/DataEditor.Help/obj/Debug/DataEditor.Help.csproj.FileListAbsolute.txt b/DataEditor.Help/obj/Debug/DataEditor.Help.csproj.FileListAbsolute.txt
@@ -50,3 +50,5 @@ E:\VS Projects\DataEditor.Ruby\DataEditor.Help\obj\Debug\DataEditor.Control.Wind
 E:\VS Projects\DataEditor.Ruby\DataEditor.Help\obj\Debug\DataEditor.Help.csproj.GenerateResource.Cache
 E:\VS Projects\DataEditor.Ruby\DataEditor.Help\obj\Debug\DataEditor.Help.dll
 E:\VS Projects\DataEditor.Ruby\DataEditor.Help\obj\Debug\DataEditor.Help.pdb
+E:\VS Projects\DataEditor.Ruby\DataEditor.Help\bin\Debug\DataEditor.FuzzyData.dll
+E:\VS Projects\DataEditor.Ruby\DataEditor.Help\bin\Debug\DataEditor.FuzzyData.pdb
diff --git a/DataEditor.Ruby/DataEditor.Ruby.csproj b/DataEditor.Ruby/DataEditor.Ruby.csproj
@@ -59,7 +59,7 @@
       <HintPath>W:\IronRuby 1.0v4\bin\Microsoft.Scripting.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Scripting.Debugging">
-      <HintPath>W:\IronRuby 1.0v4\bin\Microsoft.Scripting.Debugging.dll</HintPath>
+      <HintPath>..\..\..\IronRuby 1.0v4\bin\Microsoft.Scripting.Debugging.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/DataEditor.Ruby/obj/Debug/DataEditor.Ruby.csproj.FileListAbsolute.txt b/DataEditor.Ruby/obj/Debug/DataEditor.Ruby.csproj.FileListAbsolute.txt
@@ -85,3 +85,4 @@ E:\VS Projects\DataEditor.Ruby\DataEditor.Ruby\bin\Debug\DataEditor.Control.pdb
 E:\VS Projects\DataEditor.Ruby\DataEditor.Ruby\bin\Debug\DataEditor.Help.pdb
 E:\VS Projects\DataEditor.Ruby\DataEditor.Ruby\bin\Debug\DataEditor.FuzzyData.Serialization.RubyMarshal.pdb
 E:\VS Projects\DataEditor.Ruby\DataEditor.Ruby\obj\Debug\DataEditor.Ruby.dll
+E:\VS Projects\DataEditor.Ruby\DataEditor.Ruby\bin\Debug\Microsoft.Scripting.Debugging.dll