Skip to content

Commit 9100fe2

Browse files
airbreatherairbreather
committed
Remove remaining mentions of PowerCollections
1 parent e70414d commit 9100fe2

File tree

10 files changed

+14
-56
lines changed

10 files changed

+14
-56
lines changed

‎NTS.nuspec

+1-19
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1212
<description>
1313
The NTS Topology Suite is an API for modelling and manipulating 2-dimensional linear geometry. It provides numerous geometric predicates and functions. NTS conforms to the Simple Features Specification.
14-
This package contains Wintellect's PowerCollections and references GeoAPI.
14+
This package references GeoAPI.
1515
</description>
1616
<summary>NTS Topology Suite is a direct-port of all the functionalities offered by JTS Topology Suite</summary>
1717
<tags>NTS Topology OGC SFS</tags>
@@ -30,46 +30,28 @@
3030
<file src="Release\v2.0\AnyCPU\NetTopologySuite.dll" target="lib\net20" />
3131
<file src="Release\v2.0\AnyCPU\NetTopologySuite.pdb" target="lib\net20" />
3232
<file src="Release\v2.0\AnyCPU\NetTopologySuite.xml" target="lib\net20" />
33-
<file src="Release\v2.0\AnyCPU\PowerCollections.dll" target="lib\net20" />
34-
<file src="Release\v2.0\AnyCPU\PowerCollections.pdb" target="lib\net20" />
35-
<file src="Release\v2.0\AnyCPU\PowerCollections.xml" target="lib\net20" />
3633

3734
<file src="Release\v3.5\AnyCPU\NetTopologySuite.dll" target="lib\net35-client" />
3835
<file src="Release\v3.5\AnyCPU\NetTopologySuite.pdb" target="lib\net35-client" />
3936
<file src="Release\v3.5\AnyCPU\NetTopologySuite.xml" target="lib\net35-client" />
40-
<file src="Release\v3.5\AnyCPU\PowerCollections.dll" target="lib\net35-client" />
41-
<file src="Release\v3.5\AnyCPU\PowerCollections.pdb" target="lib\net35-client" />
42-
<file src="Release\v3.5\AnyCPU\PowerCollections.xml" target="lib\net35-client" />
4337

4438
<file src="Release\v4.0\AnyCPU\NetTopologySuite.dll" target="lib\net40-client" />
4539
<file src="Release\v4.0\AnyCPU\NetTopologySuite.pdb" target="lib\net40-client" />
4640
<file src="Release\v4.0\AnyCPU\NetTopologySuite.xml" target="lib\net40-client" />
47-
<file src="Release\v4.0\AnyCPU\PowerCollections.dll" target="lib\net40-client" />
48-
<file src="Release\v4.0\AnyCPU\PowerCollections.pdb" target="lib\net40-client" />
49-
<file src="Release\v4.0\AnyCPU\PowerCollections.xml" target="lib\net40-client" />
5041

5142
<file src="Release\v4.0.3\AnyCPU\NetTopologySuite.dll" target="lib\net403-client" />
5243
<file src="Release\v4.0.3\AnyCPU\NetTopologySuite.pdb" target="lib\net403-client" />
5344
<file src="Release\v4.0.3\AnyCPU\NetTopologySuite.xml" target="lib\net403-client" />
54-
<file src="Release\v4.0.3\AnyCPU\PowerCollections.dll" target="lib\net403-client" />
55-
<file src="Release\v4.0.3\AnyCPU\PowerCollections.pdb" target="lib\net403-client" />
56-
<file src="Release\v4.0.3\AnyCPU\PowerCollections.xml" target="lib\net403-client" />
5745

5846
<file src="Release\v4.5\AnyCPU\NetTopologySuite.dll" target="lib\net45" />
5947
<file src="Release\v4.5\AnyCPU\NetTopologySuite.pdb" target="lib\net45" />
6048
<file src="Release\v4.5\AnyCPU\NetTopologySuite.xml" target="lib\net45" />
61-
<file src="Release\v4.5\AnyCPU\PowerCollections.dll" target="lib\net45" />
62-
<file src="Release\v4.5\AnyCPU\PowerCollections.pdb" target="lib\net45" />
63-
<file src="Release\v4.5\AnyCPU\PowerCollections.xml" target="lib\net45" />
6449

6550
<file src="Release\PCL\AnyCPU\NetTopologySuite.dll" target="lib\portable-net403+sl5+netcore45+wpa81+wp8+MonoAndroid10+XamariniOS10+MonoTouch10" />
6651
<file src="Release\PCL\AnyCPU\NetTopologySuite.pdb" target="lib\portable-net403+sl5+netcore45+wpa81+wp8+MonoAndroid10+XamariniOS10+MonoTouch10" />
6752
<file src="Release\PCL\AnyCPU\NetTopologySuite.xml" target="lib\portable-net403+sl5+netcore45+wpa81+wp8+MonoAndroid10+XamariniOS10+MonoTouch10" />
6853
<file src="Release\PCL\AnyCPU\GeoAPI.Bootstrapper.NetTopologySuite.dll" target="lib\portable-net403+sl5+netcore45+wpa81+wp8+MonoAndroid10+XamariniOS10+MonoTouch10" />
6954
<file src="Release\PCL\AnyCPU\GeoAPI.Bootstrapper.NetTopologySuite.pdb" target="lib\portable-net403+sl5+netcore45+wpa81+wp8+MonoAndroid10+XamariniOS10+MonoTouch10" />
7055
<file src="Release\PCL\AnyCPU\GeoAPI.Bootstrapper.NetTopologySuite.xml" target="lib\portable-net403+sl5+netcore45+wpa81+wp8+MonoAndroid10+XamariniOS10+MonoTouch10" />
71-
<file src="Release\PCL\AnyCPU\PowerCollections.dll" target="lib\portable-net403+sl5+netcore45+wpa81+wp8+MonoAndroid10+XamariniOS10+MonoTouch10" />
72-
<file src="Release\PCL\AnyCPU\PowerCollections.pdb" target="lib\portable-net403+sl5+netcore45+wpa81+wp8+MonoAndroid10+XamariniOS10+MonoTouch10" />
73-
<file src="Release\PCL\AnyCPU\PowerCollections.xml" target="lib\portable-net403+sl5+netcore45+wpa81+wp8+MonoAndroid10+XamariniOS10+MonoTouch10" />
7456
</files>
7557
</package>

‎NetTopologySuite.IO/NetTopologySuite.IO.GeoTools/Handlers/PolygonHandler.cs

+1-9
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@
44
using GeoAPI.Geometries;
55
using NetTopologySuite.Algorithm;
66
using NetTopologySuite.Geometries;
7-
/*
8-
#if !NET35
9-
using HS = Wintellect.PowerCollections.Set<int>;
10-
#else
11-
using HS = System.Collections.Generic.HashSet<int>;
12-
#endif
13-
*/
14-
using HS = System.Collections.Generic.HashSet<int>;
157

168
namespace NetTopologySuite.IO.Handlers
179
{
@@ -59,7 +51,7 @@ public override IGeometry Read(BigEndianBinaryReader file, int totalRecordLength
5951
for (var i = 0; i < numParts; i++)
6052
partOffsets[i] = ReadInt32(file, totalRecordLength, ref totalRead);
6153

62-
var skippedList = new HS();
54+
var skippedList = new HashSet<int>();
6355

6456
//var allPoints = new List<Coordinate>();
6557
var buffer = new CoordinateBuffer(numPoints, NoDataBorderValue, true);

‎NetTopologySuite.IO/NetTopologySuite.IO.GeoTools/Handlers/ShapeHandler.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#if NET35
55
using System.Linq;
66
#endif
7-
using HS = System.Collections.Generic.HashSet<int>;
87
using GeoAPI.Geometries;
98

109
namespace NetTopologySuite.IO.Handlers
@@ -443,10 +442,10 @@ protected double GetMValue(BigEndianBinaryReader file)
443442
/// <param name="currentlyReadBytes">How many bytes are read from this record</param>
444443
/// <param name="buffer">The coordinate buffer</param>
445444
/// <param name="skippedList">A list of indices which have not been added to the buffer</param>
446-
protected void GetZMValues(BigEndianBinaryReader file, int totalRecordLength, ref int currentlyReadBytes, ICoordinateBuffer buffer, HS skippedList = null)
445+
protected void GetZMValues(BigEndianBinaryReader file, int totalRecordLength, ref int currentlyReadBytes, ICoordinateBuffer buffer, HashSet<int> skippedList = null)
447446
{
448447
if (skippedList == null)
449-
skippedList = new HS();
448+
skippedList = new HashSet<int>();
450449

451450
var numPoints = buffer.Capacity;
452451

‎NetTopologySuite.IO/NetTopologySuite.IO.GeoTools/NetTopologySuite.IO.GeoTools.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1818
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1919
<RestorePackages>true</RestorePackages>
20-
<NeedsPowerCollections Condition=" '$(NeedsPowerCollections)' == '' ">False</NeedsPowerCollections>
2120
</PropertyGroup>
2221
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2322
<DebugSymbols>true</DebugSymbols>

‎NetTopologySuite.Samples.Console/NetTopologySuite.Samples.Console.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
4646
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
4747
<RestorePackages>true</RestorePackages>
48-
<NeedsPowerCollections Condition=" '$(NeedsPowerCollections)' == '' ">False</NeedsPowerCollections>
4948
</PropertyGroup>
5049
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
5150
<DebugSymbols>true</DebugSymbols>

‎NetTopologySuite.Samples.Console/Tests/Various/Issue174TestFixture.cs

-8
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,6 @@ public void ensure_ProjNet_assembly_is_strongly_named()
3232
AssertStronglyNamedAssembly(typeof(Datum));
3333
}
3434

35-
#if !NET35
36-
[Test, Category("Issue174")]
37-
public void ensure_PowerCollections_assembly_is_strongly_named()
38-
{
39-
AssertStronglyNamedAssembly(typeof(Wintellect.PowerCollections.OrderedSet<object>));
40-
}
41-
#endif
42-
4335
[Test, Category("Issue174")]
4436
public void ensure_NetTopologySuite_assembly_is_strongly_named()
4537
{

‎NetTopologySuite/NetTopologySuite.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
<BootstrapperEnabled>false</BootstrapperEnabled>
4747
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
4848
<RestorePackages>true</RestorePackages>
49-
<NeedsPowerCollections Condition=" '$(NeedsPowerCollections)' == '' ">False</NeedsPowerCollections>
5049
</PropertyGroup>
5150
<PropertyGroup Condition=" '$(TargetFrameworkVersion)' == 'v2.0' ">
5251
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎NetTopologySuite/Triangulate/QuadEdge/QuadEdgeSubdivision.cs

+5-8
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
using NetTopologySuite.IO;
77
using NetTopologySuite.Utilities;
88

9-
using HashSetQ = System.Collections.Generic.HashSet<NetTopologySuite.Triangulate.QuadEdge.QuadEdge>;
10-
using HashSetV = System.Collections.Generic.HashSet<NetTopologySuite.Triangulate.QuadEdge.Vertex>;
11-
129
namespace NetTopologySuite.Triangulate.QuadEdge
1310
{
1411
/// <summary>
@@ -494,7 +491,7 @@ public bool IsVertexOfEdge(QuadEdge e, Vertex v)
494491
/// <see cref="GetVertexUniqueEdges"/>
495492
public IEnumerable<Vertex> GetVertices(bool includeFrame)
496493
{
497-
var vertices = new HashSetV();
494+
var vertices = new HashSet<Vertex>();
498495

499496
foreach (var qe in _quadEdges)
500497
{
@@ -536,7 +533,7 @@ public IEnumerable<Vertex> GetVertices(bool includeFrame)
536533
public IList<QuadEdge> GetVertexUniqueEdges(bool includeFrame)
537534
{
538535
var edges = new List<QuadEdge>();
539-
var visitedVertices = new HashSetV();
536+
var visitedVertices = new HashSet<Vertex>();
540537

541538
foreach (var qe in _quadEdges)
542539
{
@@ -587,7 +584,7 @@ public IList<QuadEdge> GetPrimaryEdges(bool includeFrame)
587584
var edgeStack = new Stack<QuadEdge>();
588585
edgeStack.Push(_startingEdge);
589586

590-
var visitedEdges = new HashSetQ();
587+
var visitedEdges = new HashSet<QuadEdge>();
591588

592589
while (edgeStack.Count > 0)
593590
{
@@ -648,7 +645,7 @@ public void VisitTriangles(ITriangleVisitor triVisitor,
648645
var edgeStack = new Stack<QuadEdge>();
649646
edgeStack.Push(_startingEdge);
650647

651-
var visitedEdges = new HashSetQ();
648+
var visitedEdges = new HashSet<QuadEdge>();
652649

653650
while (edgeStack.Count > 0)
654651
{
@@ -683,7 +680,7 @@ public void VisitTriangles(ITriangleVisitor triVisitor,
683680
/// or <value>null</value> if the triangle should not be visited (for instance, if it is outer)
684681
/// </returns>
685682
private QuadEdge[] FetchTriangleToVisit(QuadEdge edge, Stack<QuadEdge> edgeStack, bool includeFrame,
686-
HashSetQ visitedEdges)
683+
HashSet<QuadEdge> visitedEdges)
687684
{
688685
QuadEdge curr = edge;
689686
int edgeCount = 0;

‎Sandcastle/NetTopologySuite.shfbproj

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<DocumentationSource sourceFile="..\GeoAPI\GeoAPI\GeoAPI.csproj" configuration="Release" platform="AnyCPU" />
2525
<DocumentationSource sourceFile="..\NetTopologySuite\Geometries\Geometries.xml" />
2626
<DocumentationSource sourceFile="..\NetTopologySuite\NetTopologySuite.csproj" configuration="Release" platform="AnyCPU" />
27-
<DocumentationSource sourceFile="..\PowerCollections\PowerCollections\PowerCollections.csproj" configuration="Release" platform="AnyCPU" />
2827
<DocumentationSource sourceFile="..\NetTopologySuite\Triangulate\QuadEdge\QuadEdgeSummary.xml" />
2928
<DocumentationSource sourceFile="..\NetTopologySuite\Triangulate\TriangulateSummary.xml" />
3029
</DocumentationSources>

‎TeamCity.targets

+5-5
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<RemoveDir Directories="$(MSBuildProjectDirectory)\obj\v2.0" ContinueOnError="true"/>
6565
<MSBuild Projects="$(SolutionFile)"
6666
Targets="NetTopologySuite;NetTopologySuite_IO\NetTopologySuite_IO_GeoJSON;NetTopologySuite_IO\NetTopologySuite_IO_ShapeFile;NetTopologySuite_IO\NetTopologySuite_IO_GDB;NetTopologySuite_IO\NetTopologySuite_IO_GeoTools;NetTopologySuite_IO\NetTopologySuite_IO_MsSqlSpatial;NetTopologySuite_IO\NetTopologySuite_IO_PostGis;NetTopologySuite_IO\NetTopologySuite_IO_SpatiaLite;NetTopologySuite_IO\NetTopologySuite_IO_SqlServer2008"
67-
Properties="fwVersion=$(fwVersion);Configuration=Release;TargetFrameworkVersion=v2.0;TargetFrameworkProfile=;DefineConstants=TRACE,NET20;BaseIntermediateOutputPath=$(MSBuildProjectDirectory)\obj\v2.0\;NeedsPowerCollections=True;"
67+
Properties="fwVersion=$(fwVersion);Configuration=Release;TargetFrameworkVersion=v2.0;TargetFrameworkProfile=;DefineConstants=TRACE,NET20;BaseIntermediateOutputPath=$(MSBuildProjectDirectory)\obj\v2.0\;"
6868
RunEachTargetSeparately="true"
6969
ContinueOnError="true"
7070
/>
@@ -76,7 +76,7 @@
7676
<RemoveDir Directories="$(MSBuildProjectDirectory)\obj\v3.5" ContinueOnError="true"/>
7777
<MSBuild Projects="$(SolutionFile)"
7878
Targets="NetTopologySuite;NetTopologySuite_IO\NetTopologySuite_IO_GeoJSON;NetTopologySuite_IO\NetTopologySuite_IO_ShapeFile;NetTopologySuite_IO\NetTopologySuite_IO_GDB;NetTopologySuite_IO\NetTopologySuite_IO_GeoTools;NetTopologySuite_IO\NetTopologySuite_IO_MsSqlSpatial;NetTopologySuite_IO\NetTopologySuite_IO_PostGis;NetTopologySuite_IO\NetTopologySuite_IO_SpatiaLite;NetTopologySuite_IO\NetTopologySuite_IO_SqlServer2008"
79-
Properties="fwVersion=$(fwVersion);Configuration=Release;TargetFrameworkVersion=v3.5;TargetFrameworkProfile=Client;DefineConstants=TRACE,NET20,NET35;BaseIntermediateOutputPath=$(MSBuildProjectDirectory)\obj\v3.5\;NeedsPowerCollections=False;"
79+
Properties="fwVersion=$(fwVersion);Configuration=Release;TargetFrameworkVersion=v3.5;TargetFrameworkProfile=Client;DefineConstants=TRACE,NET20,NET35;BaseIntermediateOutputPath=$(MSBuildProjectDirectory)\obj\v3.5\;"
8080
RunEachTargetSeparately="true"
8181
ContinueOnError="true" />
8282
</Target>
@@ -87,7 +87,7 @@
8787
<RemoveDir Directories="$(MSBuildProjectDirectory)\obj\v4.0" ContinueOnError="true"/>
8888
<MSBuild Projects="$(SolutionFile)"
8989
Targets="NetTopologySuite;NetTopologySuite_IO\NetTopologySuite_IO_GeoJSON;NetTopologySuite_IO\NetTopologySuite_IO_ShapeFile;NetTopologySuite_IO\NetTopologySuite_IO_ShapeFile_Extended;NetTopologySuite_IO\NetTopologySuite_IO_GDB;NetTopologySuite_IO\NetTopologySuite_IO_GeoTools;NetTopologySuite_IO\NetTopologySuite_IO_MsSqlSpatial;NetTopologySuite_IO\NetTopologySuite_IO_PostGis;NetTopologySuite_IO\NetTopologySuite_IO_SpatiaLite;NetTopologySuite_IO\NetTopologySuite_IO_SqlServer2008"
90-
Properties="fwVersion=$(fwVersion);Configuration=Release;TargetFrameworkVersion=v4.0;TargetFrameworkProfile=Client;DefineConstants=TRACE,NET20,NET35,NET40;BaseIntermediateOutputPath=$(MSBuildProjectDirectory)\obj\v4.0\;NeedsPowerCollections=False;"
90+
Properties="fwVersion=$(fwVersion);Configuration=Release;TargetFrameworkVersion=v4.0;TargetFrameworkProfile=Client;DefineConstants=TRACE,NET20,NET35,NET40;BaseIntermediateOutputPath=$(MSBuildProjectDirectory)\obj\v4.0\;"
9191
RunEachTargetSeparately="true"
9292
ContinueOnError="true"
9393
/>
@@ -99,7 +99,7 @@
9999
<RemoveDir Directories="$(MSBuildProjectDirectory)\obj\v4.0.3" ContinueOnError="true"/>
100100
<MSBuild Projects="$(SolutionFile)"
101101
Targets="NetTopologySuite;NetTopologySuite_IO\NetTopologySuite_IO_GeoJSON;NetTopologySuite_IO\NetTopologySuite_IO_ShapeFile;NetTopologySuite_IO\NetTopologySuite_IO_ShapeFile_Extended;NetTopologySuite_IO\NetTopologySuite_IO_GDB;NetTopologySuite_IO\NetTopologySuite_IO_GeoTools;NetTopologySuite_IO\NetTopologySuite_IO_MsSqlSpatial;NetTopologySuite_IO\NetTopologySuite_IO_PostGis;NetTopologySuite_IO\NetTopologySuite_IO_SpatiaLite;NetTopologySuite_IO\NetTopologySuite_IO_SqlServer2008"
102-
Properties="fwVersion=$(fwVersion);Configuration=Release;TargetFrameworkVersion=v4.0.3;TargetFrameworkProfile=Client;DefineConstants=TRACE,NET20,NET35,NET40;BaseIntermediateOutputPath=$(MSBuildProjectDirectory)\obj\v4.0.3\;NeedsPowerCollections=False;"
102+
Properties="fwVersion=$(fwVersion);Configuration=Release;TargetFrameworkVersion=v4.0.3;TargetFrameworkProfile=Client;DefineConstants=TRACE,NET20,NET35,NET40;BaseIntermediateOutputPath=$(MSBuildProjectDirectory)\obj\v4.0.3\;"
103103
RunEachTargetSeparately="true"
104104
ContinueOnError="true"
105105
/>
@@ -111,7 +111,7 @@
111111
<RemoveDir Directories="$(MSBuildProjectDirectory)\obj\v4.5" ContinueOnError="true"/>
112112
<MSBuild Projects="$(SolutionFile)"
113113
Targets="NetTopologySuite;NetTopologySuite_IO\NetTopologySuite_IO_GeoJSON;NetTopologySuite_IO\NetTopologySuite_IO_ShapeFile;NetTopologySuite_IO\NetTopologySuite_IO_ShapeFile_Extended;NetTopologySuite_IO\NetTopologySuite_IO_GDB;NetTopologySuite_IO\NetTopologySuite_IO_GeoTools;NetTopologySuite_IO\NetTopologySuite_IO_MsSqlSpatial;NetTopologySuite_IO\NetTopologySuite_IO_PostGis;NetTopologySuite_IO\NetTopologySuite_IO_SpatiaLite;NetTopologySuite_IO\NetTopologySuite_IO_SqlServer2008"
114-
Properties="fwVersion=$(fwVersion);Configuration=Release;TargetFrameworkVersion=v4.5;TargetFrameworkProfile=;DefineConstants=TRACE,NET20,NET35,NET40;BaseIntermediateOutputPath=$(MSBuildProjectDirectory)\obj\v4.5\;NeedsPowerCollections=False;"
114+
Properties="fwVersion=$(fwVersion);Configuration=Release;TargetFrameworkVersion=v4.5;TargetFrameworkProfile=;DefineConstants=TRACE,NET20,NET35,NET40;BaseIntermediateOutputPath=$(MSBuildProjectDirectory)\obj\v4.5\;"
115115
RunEachTargetSeparately="true"
116116
ContinueOnError="true"
117117
/>

0 commit comments

Comments
 (0)