Free cookie consent management tool by TermsFeed Policy Generator

Changeset 2664


Ignore:
Timestamp:
01/21/10 02:04:44 (14 years ago)
Author:
swagner
Message:

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

Location:
trunk/sources
Files:
22 edited
3 copied
22 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Collections/3.3/HeuristicLab.Collections-3.3.csproj

    r2623 r2664  
    4949  </ItemGroup>
    5050  <ItemGroup>
     51    <Compile Include="ObservableKeyedCollection.cs" />
    5152    <Compile Include="ReadOnlyObservableSet.cs" />
    5253    <Compile Include="IObservableSet.cs" />
    … …  
    6465    <Compile Include="IObservableCollection.cs" />
    6566    <Compile Include="IObservableDictionary.cs" />
    66     <Compile Include="ObservableKeyedCollectionBase.cs" />
    6767    <Compile Include="ObservableCollection.cs" />
    6868    <Compile Include="IndexedItem.cs" />

  • trunk/sources/HeuristicLab.Collections/3.3/ObservableKeyedCollection.cs

    r2662 r2664  
    3131namespace HeuristicLab.Collections {
    3232  [Serializable]
    33   public abstract class ObservableKeyedCollectionBase<TKey, TItem> : IObservableKeyedCollection<TKey, TItem> {
     33  public abstract class ObservableKeyedCollection<TKey, TItem> : IObservableKeyedCollection<TKey, TItem> {
    3434    [Storable]
    3535    private Dictionary<TKey, TItem> dict;
    … …  
    5454
    5555    #region Constructors
    56     protected ObservableKeyedCollectionBase() {
     56    protected ObservableKeyedCollection() {
    5757      dict = new Dictionary<TKey, TItem>();
    5858    }
    59     protected ObservableKeyedCollectionBase(int capacity) {
     59    protected ObservableKeyedCollection(int capacity) {
    6060      dict = new Dictionary<TKey, TItem>(capacity);
    6161    }
    62     protected ObservableKeyedCollectionBase(IEqualityComparer<TKey> comparer) {
     62    protected ObservableKeyedCollection(IEqualityComparer<TKey> comparer) {
    6363      dict = new Dictionary<TKey, TItem>(comparer);
    6464    }
    65     protected ObservableKeyedCollectionBase(IEnumerable<TItem> collection) {
     65    protected ObservableKeyedCollection(IEnumerable<TItem> collection) {
    6666      if (collection == null) throw new ArgumentNullException();
    6767      dict = new Dictionary<TKey, TItem>();
    … …  
    7070      OnItemsAdded(collection);
    7171    }
    72     protected ObservableKeyedCollectionBase(int capacity, IEqualityComparer<TKey> comparer) {
     72    protected ObservableKeyedCollection(int capacity, IEqualityComparer<TKey> comparer) {
    7373      dict = new Dictionary<TKey, TItem>(capacity, comparer);
    7474    }
    75     protected ObservableKeyedCollectionBase(IEnumerable<TItem> collection, IEqualityComparer<TKey> comparer) {
     75    protected ObservableKeyedCollection(IEnumerable<TItem> collection, IEqualityComparer<TKey> comparer) {
    7676      if (collection == null) throw new ArgumentNullException();
    7777      dict = new Dictionary<TKey, TItem>(comparer);

  • trunk/sources/HeuristicLab.Core.Views/3.3/DefaultItemView.Designer.cs

    r2662 r2664  
    2121
    2222namespace HeuristicLab.Core.Views {
    23   partial class ItemBaseView {
     23  partial class DefaultItemView {
    2424    /// <summary>
    2525    /// Required designer variable.

  • trunk/sources/HeuristicLab.Core.Views/3.3/DefaultItemView.cs

    r2662 r2664  
    3333  /// The base class for visual representations of items.
    3434  /// </summary>
    35   [Content(typeof(ItemBase), true)]
    36   public partial class ItemBaseView : ItemViewBase {
     35  [Content(typeof(Item), true)]
     36  public partial class DefaultItemView : ItemView {
    3737    /// <summary>
    3838    /// Initializes a new instance of <see cref="ItemBaseView"/>.
    3939    /// </summary>
    40     public ItemBaseView() {
     40    public DefaultItemView() {
    4141      InitializeComponent();
    4242    }
    … …  
    4545    /// </summary>
    4646    /// <param name="item">The item that should be displayed.</param>
    47     public ItemBaseView(ItemBase item)
     47    public DefaultItemView(Item item)
    4848      : this() {
    4949      Item = item;

  • trunk/sources/HeuristicLab.Core.Views/3.3/EngineView.Designer.cs

    r2662 r2664  
    2121
    2222namespace HeuristicLab.Core.Views {
    23   partial class EngineBaseView {
     23  partial class EngineView {
    2424    /// <summary>
    2525    /// Required designer variable.

  • trunk/sources/HeuristicLab.Core.Views/3.3/EngineView.cs

    r2662 r2664  
    3535  /// Base class for editors of engines.
    3636  /// </summary>
    37   [Content(typeof(EngineBase), true)]
    38   public partial class EngineBaseView : ItemViewBase {
     37  [Content(typeof(Engine), true)]
     38  public partial class EngineView : ItemView {
    3939    private int executionTimeCounter;
    4040
    … …  
    4343    /// </summary>
    4444    /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="EditorBase"/>.</remarks>
    45     public EngineBase Engine {
    46       get { return (EngineBase)Item; }
     45    public Engine Engine {
     46      get { return (Engine)Item; }
    4747      set { base.Item = value; }
    4848    }
    … …  
    5151    /// Initializes a new instance of <see cref="EngineBaseEditor"/>.
    5252    /// </summary>
    53     public EngineBaseView() {
     53    public EngineView() {
    5454      InitializeComponent();
    5555    }
    56     public EngineBaseView(EngineBase engine)
     56    public EngineView(Engine engine)
    5757      : this() {
    5858      Engine = engine;

  • trunk/sources/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

    r2663 r2664  
    5959    </Compile>
    6060    <Compile Include="Auxiliary.cs" />
    61     <Compile Include="EngineBaseView.cs">
    62       <SubType>UserControl</SubType>
    63     </Compile>
    64     <Compile Include="EngineBaseView.Designer.cs">
    65       <DependentUpon>EngineBaseView.cs</DependentUpon>
     61    <Compile Include="DefaultItemView.cs">
     62      <SubType>UserControl</SubType>
     63    </Compile>
     64    <Compile Include="DefaultItemView.Designer.cs">
     65      <DependentUpon>DefaultItemView.cs</DependentUpon>
     66    </Compile>
     67    <Compile Include="EngineView.cs">
     68      <SubType>UserControl</SubType>
     69    </Compile>
     70    <Compile Include="EngineView.Designer.cs">
     71      <DependentUpon>EngineView.cs</DependentUpon>
     72    </Compile>
     73    <Compile Include="ItemParameterView.cs">
     74      <SubType>UserControl</SubType>
     75    </Compile>
     76    <Compile Include="ItemParameterView.Designer.cs">
     77      <DependentUpon>ItemParameterView.cs</DependentUpon>
     78    </Compile>
     79    <Compile Include="ItemView.cs">
     80      <SubType>UserControl</SubType>
     81    </Compile>
     82    <Compile Include="ItemView.Designer.cs">
     83      <DependentUpon>ItemView.cs</DependentUpon>
     84    </Compile>
     85    <Compile Include="NamedItemView.cs">
     86      <SubType>UserControl</SubType>
     87    </Compile>
     88    <Compile Include="NamedItemView.Designer.cs">
     89      <DependentUpon>NamedItemView.cs</DependentUpon>
     90    </Compile>
     91    <Compile Include="ObjectView.cs">
     92      <SubType>UserControl</SubType>
     93    </Compile>
     94    <Compile Include="ObjectView.Designer.cs">
     95      <DependentUpon>ObjectView.cs</DependentUpon>
    6696    </Compile>
    6797    <Compile Include="OperatorGraphView.cs">
    … …  
    101131      <DependentUpon>ViewHost.cs</DependentUpon>
    102132    </Compile>
    103     <Compile Include="ParameterBaseView.cs">
    104       <SubType>UserControl</SubType>
    105     </Compile>
    106     <Compile Include="ParameterBaseView.Designer.cs">
    107       <DependentUpon>ParameterBaseView.cs</DependentUpon>
    108     </Compile>
    109133    <Compile Include="OperatorCollectionView.cs">
    110134      <SubType>UserControl</SubType>
    … …  
    150174    </Compile>
    151175    <Compile Include="IObjectView.cs" />
    152     <Compile Include="ObjectViewBase.cs">
    153       <SubType>UserControl</SubType>
    154     </Compile>
    155     <Compile Include="ObjectViewBase.Designer.cs">
    156       <DependentUpon>ObjectViewBase.cs</DependentUpon>
    157     </Compile>
    158     <Compile Include="NamedItemBaseView.cs">
    159       <SubType>UserControl</SubType>
    160     </Compile>
    161     <Compile Include="NamedItemBaseView.Designer.cs">
    162       <DependentUpon>NamedItemBaseView.cs</DependentUpon>
    163     </Compile>
    164176    <Compile Include="ParameterView.cs">
    165177      <SubType>UserControl</SubType>
    … …  
    193205    </Compile>
    194206    <Compile Include="HeuristicLabCoreViewsPlugin.cs" />
    195     <Compile Include="ItemBaseView.cs">
    196       <SubType>UserControl</SubType>
    197     </Compile>
    198     <Compile Include="ItemBaseView.Designer.cs">
    199       <DependentUpon>ItemBaseView.cs</DependentUpon>
    200     </Compile>
    201     <Compile Include="ItemViewBase.cs">
    202       <SubType>UserControl</SubType>
    203     </Compile>
    204     <Compile Include="ItemViewBase.Designer.cs">
    205       <DependentUpon>ItemViewBase.cs</DependentUpon>
    206     </Compile>
    207207    <Compile Include="Properties\AssemblyInfo.cs" />
    208208    <Compile Include="VariableView.cs">

  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

    r2655 r2664  
    3232
    3333namespace HeuristicLab.Core.Views {
    34   public partial class ItemCollectionView<T> : ObjectViewBase where T : class, IItem {
     34  public partial class ItemCollectionView<T> : ObjectView where T : class, IItem {
    3535    public IObservableCollection<T> ItemCollection {
    3636      get { return (IObservableCollection<T>)Object; }

  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.cs

    r2655 r2664  
    3535  /// The visual representation of all variables in a specified scope.
    3636  /// </summary>
    37   public partial class ItemListView<T> : ObjectViewBase where T : class, IItem {
     37  public partial class ItemListView<T> : ObjectView where T : class, IItem {
    3838    /// <summary>
    3939    /// Gets or sets the scope whose variables to represent visually.

  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemParameterView.Designer.cs

    r2662 r2664  
    2121
    2222namespace HeuristicLab.Core.Views {
    23   partial class ParameterView {
     23  partial class ItemParameterView {
    2424    /// <summary>
    2525    /// Required designer variable.

  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemParameterView.cs

    r2662 r2664  
    3333  /// The visual representation of a <see cref="Parameter"/>.
    3434  /// </summary>
    35   [Content(typeof(Parameter), true)]
    36   public partial class ParameterView : ParameterBaseView {
     35  [Content(typeof(ItemParameter), true)]
     36  public partial class ItemParameterView : ParameterView {
    3737    private TypeSelectorDialog typeSelectorDialog;
    3838
    … …  
    4242    /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="ViewBase"/>.
    4343    /// No own data storage present.</remarks>
    44     public new Parameter Parameter {
    45       get { return (Parameter)Item; }
     44    public new ItemParameter Parameter {
     45      get { return (ItemParameter)Item; }
    4646      set { base.Item = value; }
    4747    }
    … …  
    5050    /// Initializes a new instance of <see cref="VariableView"/> with caption "Variable".
    5151    /// </summary>
    52     public ParameterView() {
     52    public ItemParameterView() {
    5353      InitializeComponent();
    5454      Caption = "Parameter";
    … …  
    5959    /// <remarks>Calls <see cref="VariableView()"/>.</remarks>
    6060    /// <param name="variable">The variable to represent visually.</param>
    61     public ParameterView(Parameter parameter)
     61    public ItemParameterView(ItemParameter parameter)
    6262      : this() {
    6363      Parameter = parameter;

  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemView.Designer.cs

    r2662 r2664  
    2323
    2424namespace HeuristicLab.Core.Views {
    25   partial class ItemViewBase {
     25  partial class ItemView {
    2626    /// <summary>
    2727    /// Required designer variable.

  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemView.cs

    r2662 r2664  
    3434  /// Base class for all visual representations.
    3535  /// </summary>
    36   public partial class ItemViewBase : ObjectViewBase {
     36  public partial class ItemView : ObjectView {
    3737    public IItem Item {
    3838      get { return (IItem)base.Object; }
    … …  
    4343    /// Initializes a new instance of <see cref="ViewBase"/> with the caption "View".
    4444    /// </summary>
    45     public ItemViewBase() {
     45    public ItemView() {
    4646      InitializeComponent();
    4747      Caption = "View";

  • trunk/sources/HeuristicLab.Core.Views/3.3/NamedItemView.Designer.cs

    r2662 r2664  
    2121
    2222namespace HeuristicLab.Core.Views {
    23   partial class NamedItemBaseView {
     23  partial class NamedItemView {
    2424    /// <summary>
    2525    /// Required designer variable.

  • trunk/sources/HeuristicLab.Core.Views/3.3/NamedItemView.cs

    r2662 r2664  
    3333  /// The visual representation of a <see cref="Variable"/>.
    3434  /// </summary>
    35   [Content(typeof(NamedItemBase), true)]
    36   public partial class NamedItemBaseView : ItemViewBase {
    37     public NamedItemBase NamedItemBase {
    38       get { return (NamedItemBase)Item; }
     35  [Content(typeof(NamedItem), true)]
     36  public partial class NamedItemView : ItemView {
     37    public NamedItem NamedItemBase {
     38      get { return (NamedItem)Item; }
    3939      set { base.Item = value; }
    4040    }
    4141
    42     public NamedItemBaseView() {
     42    public NamedItemView() {
    4343      InitializeComponent();
    4444      Caption = "NamedItem";
    4545    }
    46     public NamedItemBaseView(NamedItemBase namedItemBase)
     46    public NamedItemView(NamedItem namedItemBase)
    4747      : this() {
    4848      NamedItemBase = namedItemBase;

  • trunk/sources/HeuristicLab.Core.Views/3.3/ObjectView.Designer.cs

    r2662 r2664  
    2323
    2424namespace HeuristicLab.Core.Views {
    25   partial class ObjectViewBase {
     25  partial class ObjectView {
    2626    /// <summary>
    2727    /// Required designer variable.

  • trunk/sources/HeuristicLab.Core.Views/3.3/ObjectView.cs

    r2662 r2664  
    3434  /// Base class for all visual representations.
    3535  /// </summary>
    36   public partial class ObjectViewBase : ViewBase, IObjectView {
     36  public partial class ObjectView : ViewBase, IObjectView {
    3737    private object obj;
    3838    /// <summary>
    … …  
    6363    /// Initializes a new instance of <see cref="ViewBase"/> with the caption "View".
    6464    /// </summary>
    65     public ObjectViewBase() {
     65    public ObjectView() {
    6666      InitializeComponent();
    6767      Caption = "View";

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorGraphView.cs

    r2655 r2664  
    3737  /// </summary>
    3838  [Content(typeof(OperatorGraph), true)]
    39   public partial class OperatorGraphView : ItemViewBase {
     39  public partial class OperatorGraphView : ItemView {
    4040    /// <summary>
    4141    /// Gets or sets the operator graph to represent visually.

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorTreeView.cs

    r2655 r2664  
    3737  /// </summary>
    3838  [Content(typeof(IOperator), false)]
    39   public partial class OperatorTreeView : ItemViewBase {
     39  public partial class OperatorTreeView : ItemView {
    4040    private Dictionary<IOperatorParameter, List<TreeNode>> operatorParameterNodeTable;
    4141    private Dictionary<IOperator, List<TreeNode>> operatorNodeTable;

  • trunk/sources/HeuristicLab.Core.Views/3.3/ParameterView.Designer.cs

    r2662 r2664  
    2121
    2222namespace HeuristicLab.Core.Views {
    23   partial class ParameterBaseView {
     23  partial class ParameterView {
    2424    /// <summary>
    2525    /// Required designer variable.

  • trunk/sources/HeuristicLab.Core.Views/3.3/ParameterView.cs

    r2662 r2664  
    3434  /// </summary>
    3535  [Content(typeof(IParameter), true)]
    36   public partial class ParameterBaseView : NamedItemBaseView {
     36  public partial class ParameterView : NamedItemView {
    3737    /// <summary>
    3838    /// Gets or sets the variable to represent visually.
    … …  
    4848    /// Initializes a new instance of <see cref="VariableView"/> with caption "Variable".
    4949    /// </summary>
    50     public ParameterBaseView() {
     50    public ParameterView() {
    5151      InitializeComponent();
    5252      Caption = "Parameter";
    … …  
    5757    /// <remarks>Calls <see cref="VariableView()"/>.</remarks>
    5858    /// <param name="variable">The variable to represent visually.</param>
    59     public ParameterBaseView(IParameter parameter)
     59    public ParameterView(IParameter parameter)
    6060      : this() {
    6161      Parameter = parameter;

  • trunk/sources/HeuristicLab.Core.Views/3.3/ScopeView.cs

    r2655 r2664  
    3737  /// </summary>
    3838  [Content(typeof(Scope), true)]
    39   public partial class ScopeView : ItemViewBase {
     39  public partial class ScopeView : ItemView {
    4040    private Dictionary<Scope, TreeNode> scopeNodeTable;
    4141    private Dictionary<ScopeList, Scope> subScopesScopeTable;

  • trunk/sources/HeuristicLab.Core.Views/3.3/VariableView.cs

    r2655 r2664  
    3434  /// </summary>
    3535  [Content(typeof(Variable), true)]
    36   public partial class VariableView : NamedItemBaseView {
     36  public partial class VariableView : NamedItemView {
    3737    private TypeSelectorDialog typeSelectorDialog;
    3838

  • trunk/sources/HeuristicLab.Core/3.3/DeepCloneable.cs

    r2662 r2664  
    3131  /// </summary>
    3232  [EmptyStorableClass]
    33   public abstract class DeepCloneableBase : IDeepCloneable {
     33  public abstract class DeepCloneable : IDeepCloneable {
    3434    /// <summary>
    3535    /// Creates a deep clone of this instance.
    … …  
    5252    /// <returns>A clone of this instance.</returns>
    5353    public virtual IDeepCloneable Clone(Cloner cloner) {
    54       DeepCloneableBase clone = (DeepCloneableBase)Activator.CreateInstance(this.GetType());
     54      DeepCloneable clone = (DeepCloneable)Activator.CreateInstance(this.GetType());
    5555      cloner.RegisterClonedObject(this, clone);
    5656      return clone;

  • trunk/sources/HeuristicLab.Core/3.3/Engine.cs

    r2662 r2664  
    3535  /// one execution and can handle parallel executions.
    3636  /// </summary>
    37   [Item("EngineBase", "A base class for engines.")]
    38   public abstract class EngineBase : ItemBase, IEngine {
     37  [Item("Engine", "A base class for engines.")]
     38  public abstract class Engine : Item, IEngine {
    3939    public override Image ItemImage {
    4040      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event; }
    … …  
    133133    /// </summary>
    134134    /// <remarks>Calls <see cref="Reset"/>.</remarks>
    135     protected EngineBase() {
     135    protected Engine() {
    136136      globalScope = new Scope("Global");
    137137      executionStack = new Stack<ExecutionContext>();
    … …  
    147147    /// <returns>The cloned object as <see cref="EngineBase"/>.</returns>
    148148    public override IDeepCloneable Clone(Cloner cloner) {
    149       EngineBase clone = (EngineBase)base.Clone(cloner);
     149      Engine clone = (Engine)base.Clone(cloner);
    150150      clone.OperatorGraph = (OperatorGraph)cloner.Clone(operatorGraph);
    151151      clone.globalScope = (Scope)cloner.Clone(globalScope);

  • trunk/sources/HeuristicLab.Core/3.3/ExecutionContext.cs

    r2653 r2664  
    2626
    2727namespace HeuristicLab.Core {
    28   public class ExecutionContext : DeepCloneableBase {
     28  public class ExecutionContext : DeepCloneable {
    2929    [Storable]
    3030    private ExecutionContext parent;

  • trunk/sources/HeuristicLab.Core/3.3/ExecutionContextCollection.cs

    r2653 r2664  
    2727
    2828namespace HeuristicLab.Core {
    29   public class ExecutionContextCollection : DeepCloneableBase, IList<ExecutionContext> {
     29  public class ExecutionContextCollection : DeepCloneable, IList<ExecutionContext> {
    3030    [Storable]
    3131    private IList<ExecutionContext> contexts;

  • trunk/sources/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

    r2663 r2664  
    103103    <Compile Include="Attributes\CreatableAttribute.cs" />
    104104    <Compile Include="ChangedEventArgs.cs" />
     105    <Compile Include="DeepCloneable.cs" />
     106    <Compile Include="Engine.cs" />
    105107    <Compile Include="Interfaces\IOperatorParameter.cs" />
     108    <Compile Include="Item.cs" />
     109    <Compile Include="ItemParameter.cs" />
     110    <Compile Include="NamedItem.cs" />
    106111    <Compile Include="OperatorGraph.cs" />
    107112    <Compile Include="OperatorParameter.cs" />
    108     <Compile Include="ParameterBase.cs" />
    109113    <Compile Include="Interfaces\IParameter.cs" />
    110114    <Compile Include="OperatorCollection.cs" />
    … …  
    113117    <Compile Include="ItemSet.cs" />
    114118    <Compile Include="ItemList.cs" />
    115     <Compile Include="EngineBase.cs">
    116       <SubType>Code</SubType>
    117     </Compile>
    118119    <Compile Include="Interfaces\IEngine.cs">
    119120      <SubType>Code</SubType>
    … …  
    126127    <Compile Include="Parameter.cs" />
    127128    <Compile Include="ScopeList.cs" />
    128     <Compile Include="DeepCloneableBase.cs" />
    129129    <Compile Include="Interfaces\IDeepCloneable.cs" />
    130130    <Compile Include="NamedItemCollection.cs" />
    131131    <Compile Include="Interfaces\INamedItem.cs" />
    132     <Compile Include="NamedItemBase.cs" />
    133132    <Compile Include="Interfaces\IItem.cs" />
    134     <Compile Include="ItemBase.cs" />
    135133    <Compile Include="Interfaces\IRandom.cs" />
    136134    <Compile Include="Scope.cs" />

  • trunk/sources/HeuristicLab.Core/3.3/Item.cs

    r2662 r2664  
    3535  /// </summary>
    3636  [EmptyStorableClass]
    37   [Item("ItemBase", "Base class for all HeuristicLab items.")]
    38   public abstract class ItemBase : DeepCloneableBase, IItem {
     37  [Item("Item", "Base class for all HeuristicLab items.")]
     38  public abstract class Item : DeepCloneable, IItem {
    3939    public virtual string ItemName {
    4040      get { return ItemAttribute.GetName(this.GetType()); }

  • trunk/sources/HeuristicLab.Core/3.3/ItemParameter.cs

    r2662 r2664  
    3131  /// Represents a parameter.
    3232  /// </summary>
    33   [Item("Parameter", "A parameter which represents an IItem.")]
     33  [Item("Item Parameter", "A parameter which represents an IItem.")]
    3434  [Creatable("Test")]
    35   public class Parameter : ParameterBase {
     35  public class ItemParameter : Parameter {
    3636    [Storable]
    3737    private string actualName;
    … …  
    6262    }
    6363
    64     public Parameter()
     64    public ItemParameter()
    6565      : base("Anonymous", null, typeof(IItem)) {
    6666      actualName = Name;
    6767      Value = null;
    6868    }
    69     protected Parameter(string name, string description, Type dataType)
     69    protected ItemParameter(string name, string description, Type dataType)
    7070      : base(name, description, dataType) {
    7171      this.actualName = Name;
    7272      this.Value = null;
    7373    }
    74     public Parameter(string name, string description)
     74    public ItemParameter(string name, string description)
    7575      : base(name, description, typeof(IItem)) {
    7676      this.actualName = Name;
    7777      this.Value = null;
    7878    }
    79     public Parameter(string name, string description, IItem value)
     79    public ItemParameter(string name, string description, IItem value)
    8080      : base(name, description, typeof(IItem)) {
    8181      this.actualName = Name;
    … …  
    9898
    9999    public override IDeepCloneable Clone(Cloner cloner) {
    100       Parameter clone = (Parameter)base.Clone(cloner);
     100      ItemParameter clone = (ItemParameter)base.Clone(cloner);
    101101      clone.actualName = actualName;
    102102      clone.Value = (IItem)cloner.Clone(value);
    … …  
    128128  [Item("Parameter<T>", "A generic parameter which represents an instance of type T.")]
    129129  [EmptyStorableClass]
    130   public class Parameter<T> : Parameter where T : class, IItem {
     130  public class ItemParameter<T> : ItemParameter where T : class, IItem {
    131131    public new T Value {
    132132      get { return (T)base.Value; }
    … …  
    134134    }
    135135
    136     public Parameter()
     136    public ItemParameter()
    137137      : base("Anonymous", null, typeof(T)) {
    138138      Value = null;
    139139    }
    140     public Parameter(string name, string description)
     140    public ItemParameter(string name, string description)
    141141      : base(name, description, typeof(T)) {
    142142      this.Value = null;
    143143    }
    144     public Parameter(string name, string description, T value)
     144    public ItemParameter(string name, string description, T value)
    145145      : base(name, description, typeof(T)) {
    146146      this.Value = value;

  • trunk/sources/HeuristicLab.Core/3.3/NamedItem.cs

    r2662 r2664  
    2828
    2929namespace HeuristicLab.Core {
    30   [Item("NamedItemBase", "Base class for items which have a name and an optional description.")]
    31   public abstract class NamedItemBase : ItemBase, INamedItem {
     30  [Item("NamedItem", "Base class for items which have a name and an optional description.")]
     31  public abstract class NamedItem : Item, INamedItem {
    3232    [Storable]
    3333    protected string name;
    … …  
    7373    /// and value <c>null</c>.
    7474    /// </summary>
    75     protected NamedItemBase() {
     75    protected NamedItem() {
    7676      name = ItemName;
    7777      description = ItemDescription;
    … …  
    8383    /// <param name="name">The name of the current instance.</param>
    8484    /// <param name="value">The value of the current instance.</param>
    85     protected NamedItemBase(string name)
     85    protected NamedItem(string name)
    8686      : this() {
    8787      if (name == null) throw new ArgumentNullException();
    8888      this.name = name;
    8989    }
    90     protected NamedItemBase(string name, string description)
     90    protected NamedItem(string name, string description)
    9191      : this(name) {
    9292      this.description = description;
    … …  
    9999    /// <returns>The cloned object as <see cref="Variable"/>.</returns>
    100100    public override IDeepCloneable Clone(Cloner cloner) {
    101       NamedItemBase clone = (NamedItemBase)base.Clone(cloner);
     101      NamedItem clone = (NamedItem)base.Clone(cloner);
    102102      clone.name = name;
    103103      clone.description = description;

  • trunk/sources/HeuristicLab.Core/3.3/NamedItemCollection.cs

    r2653 r2664  
    3030
    3131namespace HeuristicLab.Core {
    32   public class NamedItemCollection<T> : ObservableKeyedCollectionBase<string, T>, IDeepCloneable where T : class, INamedItem {
     32  public class NamedItemCollection<T> : ObservableKeyedCollection<string, T>, IDeepCloneable where T : class, INamedItem {
    3333    [Storable(Name = "RestoreEvents")]
    3434    private object RestoreEvents {

  • trunk/sources/HeuristicLab.Core/3.3/OperatorGraph.cs

    r2653 r2664  
    3535  [Item("OperatorGraph", "Represents a graph of operators.")]
    3636  [Creatable("Test")]
    37   public class OperatorGraph : ItemBase {
     37  public class OperatorGraph : Item {
    3838    private OperatorSet operators;
    3939    /// <summary>

  • trunk/sources/HeuristicLab.Core/3.3/OperatorParameter.cs

    r2653 r2664  
    3434  [EmptyStorableClass]
    3535  [Creatable("Test")]
    36   public class OperatorParameter : Parameter<IOperator>, IOperatorParameter {
     36  public class OperatorParameter : ItemParameter<IOperator>, IOperatorParameter {
    3737    public OperatorParameter()
    3838      : base("Anonymous", null) {

  • trunk/sources/HeuristicLab.Core/3.3/Parameter.cs

    r2662 r2664  
    3131  /// Represents a parameter.
    3232  /// </summary>
    33   [Item("ParameterBase", "A base class for parameters.")]
    34   public abstract class ParameterBase : NamedItemBase, IParameter {
     33  [Item("Parameter", "A base class for parameters.")]
     34  public abstract class Parameter : NamedItem, IParameter {
    3535    public override bool CanChangeName {
    3636      get { return false; }
    … …  
    4646    }
    4747
    48     protected ParameterBase()
     48    protected Parameter()
    4949      : base("Anonymous") {
    5050      dataType = typeof(IItem);
    5151    }
    52     protected ParameterBase(string name, string description, Type dataType)
     52    protected Parameter(string name, string description, Type dataType)
    5353      : base(name, description) {
    5454      if (dataType == null) throw new ArgumentNullException();
    … …  
    5959
    6060    public override IDeepCloneable Clone(Cloner cloner) {
    61       ParameterBase clone = (ParameterBase)base.Clone(cloner);
     61      Parameter clone = (Parameter)base.Clone(cloner);
    6262      clone.dataType = dataType;
    6363      return clone;

  • trunk/sources/HeuristicLab.Core/3.3/Scope.cs

    r2653 r2664  
    3333  [Item("Scope", "A scope which contains variables and sub-scopes.")]
    3434  [Creatable("Test")]
    35   public class Scope : NamedItemBase {
     35  public class Scope : NamedItem {
    3636    [Storable]
    3737    private Scope parent;

  • trunk/sources/HeuristicLab.Core/3.3/Variable.cs

    r2653 r2664  
    3333  [Item("Variable", "A variable which has a name and holds an IItem.")]
    3434  [Creatable("Test")]
    35   public sealed class Variable : NamedItemBase {
     35  public sealed class Variable : NamedItem {
    3636    private IItem value;
    3737    /// <inheritdoc/>

  • trunk/sources/HeuristicLab.Data.Views/3.3/IntDataView.cs

    r2663 r2664  
    3535  /// </summary>
    3636  [Content(typeof(IntData), true)]
    37   public partial class IntDataView : ItemViewBase {
     37  public partial class IntDataView : ItemView {
    3838    public IntData IntData {
    3939      get { return (IntData)Item; }

  • trunk/sources/HeuristicLab.Data/3.3/ValueTypeData.cs

    r2663 r2664  
    2929namespace HeuristicLab.Data {
    3030  [Item("ValueTypeData<T>", "A base class for representing value types.")]
    31   public class ValueTypeData<T> : ItemBase where T : struct {
     31  public class ValueTypeData<T> : Item where T : struct {
    3232    [Storable]
    3333    protected T value;

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

    r2663 r2664  
    5252  <ItemGroup>
    5353    <Compile Include="HeuristicLabOperatorsViewsPlugin.cs" />
    54     <Compile Include="OperatorBaseView.cs">
     54    <Compile Include="OperatorView.cs">
    5555      <SubType>UserControl</SubType>
    5656    </Compile>
    57     <Compile Include="OperatorBaseView.Designer.cs">
    58       <DependentUpon>OperatorBaseView.cs</DependentUpon>
     57    <Compile Include="OperatorView.Designer.cs">
     58      <DependentUpon>OperatorView.cs</DependentUpon>
    5959    </Compile>
    6060    <Compile Include="Properties\AssemblyInfo.cs" />

  • trunk/sources/HeuristicLab.Operators.Views/3.3/OperatorView.Designer.cs

    r2663 r2664  
    2121
    2222namespace HeuristicLab.Operators.Views {
    23   partial class OperatorBaseView {
     23  partial class OperatorView {
    2424    /// <summary>
    2525    /// Required designer variable.

  • trunk/sources/HeuristicLab.Operators.Views/3.3/OperatorView.cs

    r2663 r2664  
    3535  /// The base class for visual representations of items.
    3636  /// </summary>
    37   [Content(typeof(OperatorBase), true)]
    38   public partial class OperatorBaseView : NamedItemBaseView {
    39     public OperatorBase OperatorBase {
    40       get { return (OperatorBase)base.Item; }
     37  [Content(typeof(Operator), true)]
     38  public partial class OperatorView : NamedItemView {
     39    public Operator OperatorBase {
     40      get { return (Operator)base.Item; }
    4141      set { base.Item = value; }
    4242    }
    … …  
    4545    /// Initializes a new instance of <see cref="ItemBaseView"/>.
    4646    /// </summary>
    47     public OperatorBaseView() {
     47    public OperatorView() {
    4848      InitializeComponent();
    4949    }
    … …  
    5252    /// </summary>
    5353    /// <param name="item">The item that should be displayed.</param>
    54     public OperatorBaseView(OperatorBase operatorBase)
     54    public OperatorView(Operator operatorBase)
    5555      : this() {
    5656      OperatorBase = operatorBase;

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

    r2663 r2664  
    3434  [Creatable("Test")]
    3535  [EmptyStorableClass]
    36   public sealed class EmptyOperator : StandardOperatorBase {
     36  public sealed class EmptyOperator : StandardOperator {
    3737    public EmptyOperator()
    3838      : base() {

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

    r2663 r2664  
    8989    </Compile>
    9090    <Compile Include="HeuristicLabOperatorsPlugin.cs" />
    91     <Compile Include="OperatorBase.cs" />
     91    <Compile Include="Operator.cs" />
    9292    <Compile Include="Properties\AssemblyInfo.cs" />
    93     <Compile Include="StandardOperatorBase.cs" />
     93    <Compile Include="StandardOperator.cs" />
    9494  </ItemGroup>
    9595  <ItemGroup>

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

    r2663 r2664  
    3333  /// The base class for all operators.
    3434  /// </summary>
    35   [Item("OperatorBase", "Base class for operators.")]
    36   public abstract class OperatorBase : NamedItemBase, IOperator {
     35  [Item("Operator", "Base class for operators.")]
     36  public abstract class Operator : NamedItem, IOperator {
    3737    public override Image ItemImage {
    3838      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Method; }
    … …  
    8585    /// the canceled flag to <c>false</c> and the name of the operator to the type name.
    8686    /// </summary>
    87     protected OperatorBase() {
     87    protected Operator() {
    8888      name = ItemName;
    8989      Parameters = new ParameterCollection();
    … …  
    100100    /// <returns>The cloned object as <see cref="OperatorBase"/>.</returns>
    101101    public override IDeepCloneable Clone(Cloner cloner) {
    102       OperatorBase clone = (OperatorBase)base.Clone(cloner);
     102      Operator clone = (Operator)base.Clone(cloner);
    103103      clone.Parameters = (ParameterCollection)cloner.Clone(parameters);
    104104      clone.canceled = canceled;

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

    r2663 r2664  
    3131  /// A base class for operators which have only one successor.
    3232  /// </summary>
    33   [Item("StandardOperatorBase", "A base class for operators which have only one successor.")]
     33  [Item("Standard Operator", "A base class for operators which have only one successor.")]
    3434  [Creatable("Test")]
    3535  [EmptyStorableClass]
    36   public abstract class StandardOperatorBase : OperatorBase {
     36  public abstract class StandardOperator : Operator {
    3737    public OperatorParameter Successor {
    3838      get { return (OperatorParameter)Parameters["Successor"]; }
    3939    }
    4040
    41     public StandardOperatorBase()
     41    public StandardOperator()
    4242      : base() {
    4343      Parameters.Add(new OperatorParameter("Successor", "Operator which is executed next"));

  • trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs

    r2656 r2664  
    3434  [Creatable("Engines")]
    3535  [Item("Sequential Engine", "Engine for sequential execution of algorithms.")]
    36   public class SequentialEngine : EngineBase {
     36  public class SequentialEngine : Engine {
    3737    private IOperator currentOperator;
    3838
Note: See TracChangeset for help on using the changeset viewer.