Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up usage of obsolete library members, set warnings as error to all projects, fix accordingly

Browse Source
This commit is contained in:
Marko Lahma
2013-12-06 13:05:53 +02:00
parent 1b73368826
commit 1105bb351b
82 changed files with 539 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

268
src/Spring/Spring.Core/Objects/Factory/Xml/ParserContext.cs
View File

@@ -1,52 +1,52 @@
#region License
/*
* Copyright 2002-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#endregion
#region License
/*
* Copyright 2002-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#endregion
using System;
using System.Collections;
using Spring.Objects.Factory.Config;
using Spring.Objects.Factory.Support;
namespace Spring.Objects.Factory.Xml
{
/// <summary>
/// Context that gets passed along an object definition parsing process, encapsulating
/// all relevant configuraiton as well as state.
/// </summary>
public class ParserContext
{
private readonly XmlReaderContext readerContext;
private readonly ObjectDefinitionParserHelper parserHelper;
private readonly IObjectDefinition containingObjectDefinition;
// private Stack containingComponents = new Stack();
/// <summary>
/// Initializes a new instance of the <see cref="ParserContext"/> class.
/// </summary>
/// <param name="parserHelper">The parser helper.</param>
public ParserContext(ObjectDefinitionParserHelper parserHelper)
{
this.readerContext = parserHelper.ReaderContext;
this.parserHelper = parserHelper;
using System.Collections;
using Spring.Objects.Factory.Config;
using Spring.Objects.Factory.Support;
namespace Spring.Objects.Factory.Xml
{
/// <summary>
/// Context that gets passed along an object definition parsing process, encapsulating
/// all relevant configuraiton as well as state.
/// </summary>
public class ParserContext
{
private readonly XmlReaderContext readerContext;
private readonly ObjectDefinitionParserHelper parserHelper;
private readonly IObjectDefinition containingObjectDefinition;
// private Stack containingComponents = new Stack();
/// <summary>
/// Initializes a new instance of the <see cref="ParserContext"/> class.
/// </summary>
/// <param name="parserHelper">The parser helper.</param>
public ParserContext(ObjectDefinitionParserHelper parserHelper)
{
this.readerContext = parserHelper.ReaderContext;
this.parserHelper = parserHelper;
}
@@ -62,92 +62,92 @@ namespace Spring.Objects.Factory.Xml
this.containingObjectDefinition = containingObjectDefinition;
}
/// <summary>
/// Initializes a new instance of the <see cref="ParserContext"/> class.
/// </summary>
/// <param name="readerContext">The reader context.</param>
/// <summary>
/// Initializes a new instance of the <see cref="ParserContext"/> class.
/// </summary>
/// <param name="readerContext">The reader context.</param>
/// <param name="parserHelper">The parser helper.</param>
[Obsolete("consider using ParserContext(ObjectDefinitionParserHelper) instead", false)]
public ParserContext(XmlReaderContext readerContext, ObjectDefinitionParserHelper parserHelper)
{
this.readerContext = readerContext;
this.parserHelper = parserHelper;
}
/// <summary>
/// Initializes a new instance of the <see cref="ParserContext"/> class.
/// </summary>
/// <param name="readerContext">The reader context.</param>
/// <param name="parserHelper">The parser helper.</param>
[Obsolete("consider using ParserContext(ObjectDefinitionParserHelper) instead", false)]
public ParserContext(XmlReaderContext readerContext, ObjectDefinitionParserHelper parserHelper)
{
this.readerContext = readerContext;
this.parserHelper = parserHelper;
}
/// <summary>
/// Initializes a new instance of the <see cref="ParserContext"/> class.
/// </summary>
/// <param name="readerContext">The reader context.</param>
/// <param name="parserHelper">The parser helper.</param>
/// <param name="containingObjectDefinition">The containing object definition.</param>
[Obsolete("consider using ParserContext(ObjectDefinitionParserHelper, IObjectDefinition) instead", false)]
public ParserContext(XmlReaderContext readerContext, ObjectDefinitionParserHelper parserHelper, IObjectDefinition containingObjectDefinition)
{
this.readerContext = readerContext;
this.parserHelper = parserHelper;
this.containingObjectDefinition = containingObjectDefinition;
}
/// <summary>
/// Gets the reader context.
/// </summary>
/// <value>The reader context.</value>
public XmlReaderContext ReaderContext
{
get { return readerContext; }
}
/// <summary>
/// Gets the registry.
/// </summary>
/// <value>The registry.</value>
public IObjectDefinitionRegistry Registry
{
get { return readerContext.Registry; }
}
/// <summary>
/// Gets the parser helper.
/// </summary>
/// <value>The parser helper.</value>
public ObjectDefinitionParserHelper ParserHelper
{
get { return parserHelper; }
}
/// <summary>
/// Gets the containing object definition.
/// </summary>
/// <value>The containing object definition.</value>
public IObjectDefinition ContainingObjectDefinition
{
get { return containingObjectDefinition; }
}
/// <summary>
/// Gets a value indicating whether this instance is nested.
/// </summary>
/// <value><c>true</c> if this instance is nested; otherwise, <c>false</c>.</value>
public bool IsNested
{
get { return containingObjectDefinition != null; }
}
/// <summary>
/// Gets a value indicating whether this instance is default lazy init.
/// </summary>
/// <value>
/// <c>true</c> if this instance is default lazy init; otherwise, <c>false</c>.
/// </value>
public bool IsDefaultLazyInit
{
get { return ObjectDefinitionConstants.TrueValue.Equals(ParserHelper.Defaults.LazyInit); }
}
}
}
public ParserContext(XmlReaderContext readerContext, ObjectDefinitionParserHelper parserHelper, IObjectDefinition containingObjectDefinition)
{
this.readerContext = readerContext;
this.parserHelper = parserHelper;
this.containingObjectDefinition = containingObjectDefinition;
}
/// <summary>
/// Gets the reader context.
/// </summary>
/// <value>The reader context.</value>
public XmlReaderContext ReaderContext
{
get { return readerContext; }
}
/// <summary>
/// Gets the registry.
/// </summary>
/// <value>The registry.</value>
public IObjectDefinitionRegistry Registry
{
get { return readerContext.Registry; }
}
/// <summary>
/// Gets the parser helper.
/// </summary>
/// <value>The parser helper.</value>
public ObjectDefinitionParserHelper ParserHelper
{
get { return parserHelper; }
}
/// <summary>
/// Gets the containing object definition.
/// </summary>
/// <value>The containing object definition.</value>
public IObjectDefinition ContainingObjectDefinition
{
get { return containingObjectDefinition; }
}
/// <summary>
/// Gets a value indicating whether this instance is nested.
/// </summary>
/// <value><c>true</c> if this instance is nested; otherwise, <c>false</c>.</value>
public bool IsNested
{
get { return containingObjectDefinition != null; }
}
/// <summary>
/// Gets a value indicating whether this instance is default lazy init.
/// </summary>
/// <value>
/// <c>true</c> if this instance is default lazy init; otherwise, <c>false</c>.
/// </value>
public bool IsDefaultLazyInit
{
get { return ObjectDefinitionConstants.TrueValue.Equals(ParserHelper.Defaults.LazyInit); }
}
}
}

6
src/Spring/Spring.Web/Spring.Web.2010.csproj
View File

@@ -43,7 +43,8 @@
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>618</NoWarn>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
@@ -65,7 +66,8 @@
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>618</NoWarn>
<NoWarn>
</NoWarn>
<Optimize>true</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>

2
src/Spring/Spring.Web/Util/SecurityCritical.cs
View File

@@ -32,7 +32,9 @@ namespace Spring.Util
{
internal delegate void PrivilegedCallback();
#pragma warning disable 618
[SecurityCritical, SecurityTreatAsSafe]
#pragma warning restore 618
[MethodImpl(MethodImplOptions.NoInlining)]
internal static void ExecutePrivileged(IStackWalk permission, PrivilegedCallback callback)
{