Changeset 2664 for trunk/sources/HeuristicLab.Operators

Timestamp:

01/21/10 02:04:44 (15 years ago)

Author:

swagner

Message:

Abandoned policy that the names of all abstract base classes have to end in "Base" (#95)

Location:

trunk/sources/HeuristicLab.Operators/3.3

Files:

• EmptyOperator.cs (modified) (1 diff)
• HeuristicLab.Operators-3.3.csproj (modified) (1 diff)
• Operator.cs (moved) (moved from trunk/sources/HeuristicLab.Operators/3.3/OperatorBase.cs) (3 diffs)
• StandardOperator.cs (moved) (moved from trunk/sources/HeuristicLab.Operators/3.3/StandardOperatorBase.cs) (1 diff)

trunk/sources/HeuristicLab.Operators/3.3/EmptyOperator.cs

@@ -34 +34 @@
   [Creatable("Test")]
   [EmptyStorableClass]
-  public sealed class EmptyOperator : StandardOperatorBase {
+  public sealed class EmptyOperator : StandardOperator {
     public EmptyOperator()
       : base() {

trunk/sources/HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj

@@ -89 +89 @@
     </Compile>
     <Compile Include="HeuristicLabOperatorsPlugin.cs" />
-    <Compile Include="OperatorBase.cs" />
+    <Compile Include="Operator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="StandardOperatorBase.cs" />
+    <Compile Include="StandardOperator.cs" />
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.Operators/3.3/Operator.cs

@@ -33 +33 @@
   /// The base class for all operators.
   /// </summary>
-  [Item("OperatorBase", "Base class for operators.")]
-  public abstract class OperatorBase : NamedItemBase, IOperator {
+  [Item("Operator", "Base class for operators.")]
+  public abstract class Operator : NamedItem, IOperator {
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Method; }
@@ -85 +85 @@
     /// the canceled flag to <c>false</c> and the name of the operator to the type name. 
     /// </summary>
-    protected OperatorBase() {
+    protected Operator() {
       name = ItemName;
       Parameters = new ParameterCollection();
@@ -100 +100 @@
     /// <returns>The cloned object as <see cref="OperatorBase"/>.</returns>
     public override IDeepCloneable Clone(Cloner cloner) {
-      OperatorBase clone = (OperatorBase)base.Clone(cloner);
+      Operator clone = (Operator)base.Clone(cloner);
       clone.Parameters = (ParameterCollection)cloner.Clone(parameters);
       clone.canceled = canceled;

trunk/sources/HeuristicLab.Operators/3.3/StandardOperator.cs

@@ -31 +31 @@
   /// A base class for operators which have only one successor.
   /// </summary>
-  [Item("StandardOperatorBase", "A base class for operators which have only one successor.")]
+  [Item("Standard Operator", "A base class for operators which have only one successor.")]
   [Creatable("Test")]
   [EmptyStorableClass]
-  public abstract class StandardOperatorBase : OperatorBase {
+  public abstract class StandardOperator : Operator {
     public OperatorParameter Successor {
       get { return (OperatorParameter)Parameters["Successor"]; }
     }
 
-    public StandardOperatorBase()
+    public StandardOperator()
       : base() {
       Parameters.Add(new OperatorParameter("Successor", "Operator which is executed next"));