Changeset 2222 for trunk/sources/HeuristicLab.Constraints

Timestamp:

08/03/09 12:26:42 (15 years ago)

Author:

gkronber

Message:

Merged changes from GP-refactoring branch back into the trunk #713.

Location:

trunk/sources/HeuristicLab.Constraints/3.2

Files:

• AllSubOperatorsTypeConstraint.cs (deleted)
• AllSubOperatorsTypeConstraintView.Designer.cs (deleted)
• AllSubOperatorsTypeConstraintView.cs (deleted)
• AllSubOperatorsTypeConstraintView.resx (deleted)
• HeuristicLab.Constraints-3.2.csproj (modified) (5 diffs)
• NumberOfSubOperatorsConstraint.cs (deleted)
• NumberOfSubOperatorsConstraintView.Designer.cs (deleted)
• NumberOfSubOperatorsConstraintView.cs (deleted)
• NumberOfSubOperatorsConstraintView.resx (deleted)
• SubOperatorsConstraintAnalyser.cs (deleted)
• SubOperatorsTypeConstraint.cs (deleted)
• SubOperatorsTypeConstraintView.Designer.cs (deleted)
• SubOperatorsTypeConstraintView.cs (deleted)
• SubOperatorsTypeConstraintView.resx (deleted)

trunk/sources/HeuristicLab.Constraints/3.2/HeuristicLab.Constraints-3.2.csproj

@@ -78 +78 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AllSubOperatorsTypeConstraint.cs" />
-    <Compile Include="AllSubOperatorsTypeConstraintView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="AllSubOperatorsTypeConstraintView.designer.cs">
-      <DependentUpon>AllSubOperatorsTypeConstraintView.cs</DependentUpon>
-    </Compile>
     <Compile Include="AndConstraint.cs" />
     <Compile Include="AndConstraintView.cs">
@@ -122 +115 @@
       <DependentUpon>NotConstraintView.cs</DependentUpon>
     </Compile>
-    <Compile Include="NumberOfSubOperatorsConstraint.cs" />
-    <Compile Include="NumberOfSubOperatorsConstraintView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="NumberOfSubOperatorsConstraintView.Designer.cs">
-      <DependentUpon>NumberOfSubOperatorsConstraintView.cs</DependentUpon>
-    </Compile>
     <Compile Include="OrConstraint.cs" />
     <Compile Include="OrConstraintView.cs">
@@ -135 +121 @@
     <Compile Include="OrConstraintView.Designer.cs">
       <DependentUpon>OrConstraintView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SubOperatorsConstraintAnalyser.cs" />
-    <Compile Include="SubOperatorsTypeConstraint.cs" />
-    <Compile Include="SubOperatorsTypeConstraintView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SubOperatorsTypeConstraintView.designer.cs">
-      <DependentUpon>SubOperatorsTypeConstraintView.cs</DependentUpon>
     </Compile>
     <Compile Include="HeuristicLabConstraintsPlugin.cs" />
@@ -173 +151 @@
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="AllSubOperatorsTypeConstraintView.resx">
-      <DependentUpon>AllSubOperatorsTypeConstraintView.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="AndConstraintView.resx">
       <SubType>Designer</SubType>
@@ -197 +171 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="NumberOfSubOperatorsConstraintView.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>NumberOfSubOperatorsConstraintView.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="OrConstraintView.resx">
       <SubType>Designer</SubType>
       <DependentUpon>OrConstraintView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SubOperatorsTypeConstraintView.resx">
-      <DependentUpon>SubOperatorsTypeConstraintView.cs</DependentUpon>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="VariableComparisonConstraintView.resx">