Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLluis Sanchez Gual <lluis@xamarin.com>2015-04-22 12:19:39 +0300
committerLluis Sanchez Gual <lluis@xamarin.com>2015-04-22 12:19:39 +0300
commita8f962bb4f0ecf7c7e2e6c94eee3dc6be5bf78bf (patch)
treef894dc210d6bb092232e39136c104974b3415fbf
parent1046b3a85a32521e8ee07004defa4df9fcdefd49 (diff)
Remove unused ProjectParameters class
-rw-r--r--main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs36
-rw-r--r--main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs4
-rw-r--r--main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectParameters.cs72
3 files changed, 23 insertions, 89 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs
index c7dc654200..4afa373ee0 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs
@@ -28,12 +28,30 @@ using System;
using MonoDevelop.Core.Serialization;
using System.Collections.Generic;
using System.Linq;
+using MonoDevelop.Projects.Formats.MSBuild;
namespace MonoDevelop.Projects
{
- public abstract class DotNetCompilerParameters: ProjectParameters
+ public abstract class DotNetCompilerParameters
{
- DotNetProjectConfiguration configuration;
+ public DotNetProject ParentProject {
+ get { return ParentConfiguration.ParentItem; }
+ }
+
+ internal protected virtual void Read (IPropertySet pset, string toolsVersion)
+ {
+ pset.ReadObjectProperties (this, GetType (), true);
+ }
+
+ internal protected virtual void Write (IPropertySet pset, string toolsVersion)
+ {
+ pset.WriteObjectProperties (this, GetType (), true);
+ }
+
+ public virtual DotNetCompilerParameters Clone ()
+ {
+ return (DotNetCompilerParameters) MemberwiseClone ();
+ }
public virtual IEnumerable<string> GetDefineSymbols ()
{
@@ -56,19 +74,7 @@ namespace MonoDevelop.Projects
return GetDefineSymbols ().Any (s => s == symbol);
}
- public new DotNetCompilerParameters Clone ()
- {
- return (DotNetCompilerParameters) base.Clone ();
- }
-
- public DotNetProjectConfiguration ParentConfiguration {
- get { return configuration; }
- internal set {
- configuration = value;
- if (configuration != null)
- ParentProject = configuration.ParentItem;
- }
- }
+ public DotNetProjectConfiguration ParentConfiguration { get; internal set; }
public virtual bool NoStdLib { get; set; }
public virtual string DebugType { get { return ""; } set {} }
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs
index fe3728e230..0c168c0521 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs
@@ -71,7 +71,7 @@ namespace MonoDevelop.Projects
if (string.IsNullOrEmpty (assemblyKeyFile))
assemblyKeyFile = pset.GetPathValue ("AssemblyKeyFile");
if (compilationParameters != null)
- ((IMSBuildDataObject)compilationParameters).Read (pset, toolsVersion);
+ compilationParameters.Read (pset, toolsVersion);
}
internal protected override void Write (IPropertySet pset, string toolsVersion)
@@ -82,7 +82,7 @@ namespace MonoDevelop.Projects
pset.SetValue ("DelaySign", delaySign, defaultValue:false, mergeToMainGroup:true);
pset.SetValue ("AssemblyOriginatorKeyFile", assemblyKeyFile, mergeToMainGroup:true);
if (compilationParameters != null)
- ((IMSBuildDataObject)compilationParameters).Write (pset, toolsVersion);
+ compilationParameters.Write (pset, toolsVersion);
}
private bool signAssembly = false;
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectParameters.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectParameters.cs
deleted file mode 100644
index 9647849e52..0000000000
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectParameters.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// ProjectParameters.cs
-//
-// Author:
-// Lluis Sanchez Gual <lluis@novell.com>
-//
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using MonoDevelop.Core.Serialization;
-using MonoDevelop.Projects.Extensions;
-using MonoDevelop.Projects.Formats.MSBuild;
-
-namespace MonoDevelop.Projects
-{
- public class ProjectParameters: IMSBuildDataObject
- {
- DotNetProject parentProject;
-
- public ProjectParameters ()
- {
- }
-
- public virtual ProjectParameters Clone ()
- {
- return (ProjectParameters) MemberwiseClone ();
- }
-
- public DotNetProject ParentProject {
- get { return parentProject; }
- internal set { parentProject = value; }
- }
-
- void IMSBuildDataObject.Read (IPropertySet pset, string toolsVersion)
- {
- Read (pset, toolsVersion);
- }
-
- void IMSBuildDataObject.Write (IPropertySet pset, string toolsVersion)
- {
- Write (pset, toolsVersion);
- }
-
- protected virtual void Read (IPropertySet pset, string toolsVersion)
- {
- pset.ReadObjectProperties (this, GetType (), true);
- }
-
- protected virtual void Write (IPropertySet pset, string toolsVersion)
- {
- pset.WriteObjectProperties (this, GetType (), true);
- }
- }
-}