Index: src/Common/DelftTools.Utils/AlphanumComparator.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/DelftTools.Utils/AlphanumComparator.cs (.../AlphanumComparator.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/DelftTools.Utils/AlphanumComparator.cs (.../AlphanumComparator.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -63,15 +63,15 @@
{
return -1;
}
- else if (thatMarker >= s2.Length)
+ if (thatMarker >= s2.Length)
{
return 1;
}
char thisCh = s1[thisMarker];
char thatCh = s2[thatMarker];
- StringBuilder thisChunk = new StringBuilder();
- StringBuilder thatChunk = new StringBuilder();
+ var thisChunk = new StringBuilder();
+ var thatChunk = new StringBuilder();
while ((thisMarker < s1.Length) && (thisChunk.Length == 0 || InChunk(thisCh, thisChunk[0])))
{
Index: src/Common/DelftTools.Utils/Reflection/TypeUtils.cs
===================================================================
diff -u -rfbe5d1ac043ae74461b82b0ab71c5388bfbbc58b -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/DelftTools.Utils/Reflection/TypeUtils.cs (.../TypeUtils.cs) (revision fbe5d1ac043ae74461b82b0ab71c5388bfbbc58b)
+++ src/Common/DelftTools.Utils/Reflection/TypeUtils.cs (.../TypeUtils.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -106,7 +106,7 @@
{
var key = declaringType + "_" + genericType + "_" + methodName;
- MethodInfo methodInfo = null;
+ MethodInfo methodInfo;
CachedMethods.TryGetValue(key, out methodInfo);
Index: src/Common/DelftTools.Utils/TimeNavigatableLabelFormatProvider.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/DelftTools.Utils/TimeNavigatableLabelFormatProvider.cs (.../TimeNavigatableLabelFormatProvider.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/DelftTools.Utils/TimeNavigatableLabelFormatProvider.cs (.../TimeNavigatableLabelFormatProvider.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -60,7 +60,7 @@
///
public virtual string GetUnits(TimeSpan duration)
{
- string format = "";
+ string format;
if (duration.TotalHours < 1)
{
Index: src/Common/NetTopologySuite/Algorithm/LineIntersector.cs
===================================================================
diff -u -r98a7464aa2f9a8163979b8a9d5ac617e412ba3a0 -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/Algorithm/LineIntersector.cs (.../LineIntersector.cs) (revision 98a7464aa2f9a8163979b8a9d5ac617e412ba3a0)
+++ src/Common/NetTopologySuite/Algorithm/LineIntersector.cs (.../LineIntersector.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -170,7 +170,7 @@
double dx = Math.Abs(p1.X - p0.X);
double dy = Math.Abs(p1.Y - p0.Y);
- double dist = -1.0; // sentinel value
+ double dist;
if (p.Equals(p0))
{
dist = 0.0;
Index: src/Common/NetTopologySuite/Algorithm/MinimumDiameter.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/Algorithm/MinimumDiameter.cs (.../MinimumDiameter.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/NetTopologySuite/Algorithm/MinimumDiameter.cs (.../MinimumDiameter.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -145,7 +145,7 @@
///
private void ComputeWidthConvex(IGeometry geom)
{
- ICoordinate[] pts = null;
+ ICoordinate[] pts;
if (geom is IPolygon)
{
pts = ((IPolygon) geom).ExteriorRing.Coordinates;
Index: src/Common/NetTopologySuite/Geometries/Geometry.cs
===================================================================
diff -u -r631af07ec7055b19b558173a2a80b991a10b363f -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/Geometries/Geometry.cs (.../Geometry.cs) (revision 631af07ec7055b19b558173a2a80b991a10b363f)
+++ src/Common/NetTopologySuite/Geometries/Geometry.cs (.../Geometry.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -340,7 +340,7 @@
return null;
}
- ICoordinate centPt = null;
+ ICoordinate centPt;
Dimensions dim = Dimension;
if (dim == Dimensions.Point)
{
Index: src/Common/NetTopologySuite/GeometriesGraph/Edge.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/GeometriesGraph/Edge.cs (.../Edge.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/NetTopologySuite/GeometriesGraph/Edge.cs (.../Edge.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -263,7 +263,7 @@
catch (Exception ex)
{
Console.WriteLine(ex);
- throw ex;
+ throw;
}
}
Index: src/Common/NetTopologySuite/GeometriesGraph/EdgeEndStar.cs
===================================================================
diff -u -r948479c1e06982dac3087d9346d8e3fbda36c2d3 -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/GeometriesGraph/EdgeEndStar.cs (.../EdgeEndStar.cs) (revision 948479c1e06982dac3087d9346d8e3fbda36c2d3)
+++ src/Common/NetTopologySuite/GeometriesGraph/EdgeEndStar.cs (.../EdgeEndStar.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -190,7 +190,7 @@
{
if (label.IsAnyNull(geomi))
{
- Locations loc = Locations.Null;
+ Locations loc;
if (hasDimensionalCollapseEdge[geomi])
{
loc = Locations.Exterior;
Index: src/Common/NetTopologySuite/GeometriesGraph/Node.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/GeometriesGraph/Node.cs (.../Node.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/NetTopologySuite/GeometriesGraph/Node.cs (.../Node.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -161,8 +161,7 @@
///
public Locations ComputeMergedLocation(Label label2, int eltIndex)
{
- Locations loc = Locations.Null;
- loc = label.GetLocation(eltIndex);
+ var loc = label.GetLocation(eltIndex);
if (!label2.IsNull(eltIndex))
{
Locations nLoc = label2.GetLocation(eltIndex);
Index: src/Common/NetTopologySuite/IO/GeoTools/Dbase/DbaseFileWriter.cs
===================================================================
diff -u -r98a7464aa2f9a8163979b8a9d5ac617e412ba3a0 -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/IO/GeoTools/Dbase/DbaseFileWriter.cs (.../DbaseFileWriter.cs) (revision 98a7464aa2f9a8163979b8a9d5ac617e412ba3a0)
+++ src/Common/NetTopologySuite/IO/GeoTools/Dbase/DbaseFileWriter.cs (.../DbaseFileWriter.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -126,7 +126,7 @@
/// The number of decimal places in the column.
public void Write(decimal number, int length, int decimalCount)
{
- string outString = string.Empty;
+ string outString;
int wholeLength = length;
if (decimalCount > 0)
Index: src/Common/NetTopologySuite/IO/ShapeReader.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/IO/ShapeReader.cs (.../ShapeReader.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/NetTopologySuite/IO/ShapeReader.cs (.../ShapeReader.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -155,7 +155,7 @@
{
// Support vars
ILineString[] strings = new ILineString[indexParts.Length];
- ICoordinate[] destCoords = null;
+ ICoordinate[] destCoords;
int index = 0;
int length = 0;
int partIndex = 1;
@@ -201,7 +201,7 @@
int i = 0;
int index = 0;
int shellLength = 0;
- ICoordinate[] shellCoords = null;
+ ICoordinate[] shellCoords;
ILinearRing[] shells = new ILinearRing[indexParts.Length];
ArrayList polygonIndex = new ArrayList();
@@ -254,8 +254,8 @@
int start = 0;
int end = 0;
int length = 0;
- ILinearRing shell = null; // Contains Polygon Shell
- ILinearRing[] holes = null; // Contains Polygon Holes
+ ILinearRing shell; // Contains Polygon Shell
+ ILinearRing[] holes; // Contains Polygon Holes
IPolygon[] polygons = new IPolygon[polygonIndex.Count]; // Array containing all Polygons
// Building procedure
Index: src/Common/NetTopologySuite/IO/WKTReader.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/IO/WKTReader.cs (.../WKTReader.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/NetTopologySuite/IO/WKTReader.cs (.../WKTReader.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -360,7 +360,7 @@
* A new different implementation by Marc Jacquin:
* this code manages also SRID values.
*/
- IGeometry returned = null;
+ IGeometry returned;
string sridValue = null;
string type = tokens[0].ToString();
Index: src/Common/NetTopologySuite/LinearReferencing/LinearGeometryBuilder.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/LinearReferencing/LinearGeometryBuilder.cs (.../LinearGeometryBuilder.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/NetTopologySuite/LinearReferencing/LinearGeometryBuilder.cs (.../LinearGeometryBuilder.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -97,13 +97,13 @@
{
line = geomFact.CreateLineString(pts);
}
- catch (ArgumentException ex)
+ catch (ArgumentException)
{
// exception is due to too few points in line.
// only propagate if not ignoring short lines
if (!IgnoreInvalidLines)
{
- throw ex;
+ throw;
}
}
Index: src/Common/NetTopologySuite/Operation/Linemerge/LineSequencer.cs
===================================================================
diff -u -r948479c1e06982dac3087d9346d8e3fbda36c2d3 -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/Operation/Linemerge/LineSequencer.cs (.../LineSequencer.cs) (revision 948479c1e06982dac3087d9346d8e3fbda36c2d3)
+++ src/Common/NetTopologySuite/Operation/Linemerge/LineSequencer.cs (.../LineSequencer.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -341,7 +341,7 @@
{
// trace an unvisited path *backwards* from this de
Node endNode = de.ToNode;
- Node fromNode = null;
+ Node fromNode;
while (true)
{
pos = pos == null ? list.AddLast(de.Sym) : list.AddAfter(pos, de.Sym);
Index: src/Common/NetTopologySuite/Operation/Relate/EdgeEndBundle.cs
===================================================================
diff -u -r98a7464aa2f9a8163979b8a9d5ac617e412ba3a0 -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/Operation/Relate/EdgeEndBundle.cs (.../EdgeEndBundle.cs) (revision 98a7464aa2f9a8163979b8a9d5ac617e412ba3a0)
+++ src/Common/NetTopologySuite/Operation/Relate/EdgeEndBundle.cs (.../EdgeEndBundle.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -133,7 +133,7 @@
// compute the On location value
int boundaryCount = 0;
bool foundInterior = false;
- Locations loc = Locations.Null;
+ Locations loc;
for (IEnumerator it = GetEnumerator(); it.MoveNext();)
{
Index: src/Common/NetTopologySuite/Triangulate/ConformingDelaunayTriangulator.cs
===================================================================
diff -u -r98a7464aa2f9a8163979b8a9d5ac617e412ba3a0 -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/Triangulate/ConformingDelaunayTriangulator.cs (.../ConformingDelaunayTriangulator.cs) (revision 98a7464aa2f9a8163979b8a9d5ac617e412ba3a0)
+++ src/Common/NetTopologySuite/Triangulate/ConformingDelaunayTriangulator.cs (.../ConformingDelaunayTriangulator.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -306,8 +306,7 @@
private ConstraintVertex CreateVertex(ICoordinate p)
{
- ConstraintVertex v = null;
- v = VertexFactory != null ? VertexFactory.CreateVertex(p, null) : new ConstraintVertex(p);
+ var v = VertexFactory != null ? VertexFactory.CreateVertex(p, null) : new ConstraintVertex(p);
return v;
}
Index: src/Common/NetTopologySuite/Utilities/RToolsUtil/Opts.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/Utilities/RToolsUtil/Opts.cs (.../Opts.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/NetTopologySuite/Utilities/RToolsUtil/Opts.cs (.../Opts.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -112,7 +112,7 @@
"-number",
"-3.2"
};
- string errorMessage = null;
+ string errorMessage;
Opts opts = new Opts();
opts.ParseSpec = parseSpec;
Index: src/Common/NetTopologySuite/Utilities/RToolsUtil/ParseUtil.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/Utilities/RToolsUtil/ParseUtil.cs (.../ParseUtil.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/NetTopologySuite/Utilities/RToolsUtil/ParseUtil.cs (.../ParseUtil.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -66,7 +66,7 @@
endToken = new EofToken();
}
- Token token = null;
+ Token token;
token = (Token) tokens[i++];
int arrayLength = 0;
Index: src/Common/NetTopologySuite/Utilities/RToolsUtil/SoftwarePackage.cs
===================================================================
diff -u -r2ac736f597049cb6e036d52b604d259c010d8b35 -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/Utilities/RToolsUtil/SoftwarePackage.cs (.../SoftwarePackage.cs) (revision 2ac736f597049cb6e036d52b604d259c010d8b35)
+++ src/Common/NetTopologySuite/Utilities/RToolsUtil/SoftwarePackage.cs (.../SoftwarePackage.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -51,7 +51,7 @@
/// bool - true for success, false for failure
public bool Uninstall(bool interactive)
{
- Process p = null;
+ Process p;
ProcessStartInfo psi = null;
// build process start info
Index: src/Common/NetTopologySuite/Utilities/RToolsUtil/StreamTokenizer.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/NetTopologySuite/Utilities/RToolsUtil/StreamTokenizer.cs (.../StreamTokenizer.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/NetTopologySuite/Utilities/RToolsUtil/StreamTokenizer.cs (.../StreamTokenizer.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -1747,7 +1747,7 @@
{
fr.Close();
}
- throw e;
+ throw;
}
if (TextReader != null)
Index: src/Common/SharpMap.Extensions/CoordinateSystems/OgrCoordinateSystem.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/SharpMap.Extensions/CoordinateSystems/OgrCoordinateSystem.cs (.../OgrCoordinateSystem.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/SharpMap.Extensions/CoordinateSystems/OgrCoordinateSystem.cs (.../OgrCoordinateSystem.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -70,7 +70,7 @@
{
Load();
- var s = "";
+ string s;
ExportToPrettyWkt(out s, 0);
return s;
}
@@ -82,7 +82,7 @@
{
Load();
- var xml = "";
+ string xml;
ExportToXML(out xml, string.Empty);
return xml;
}
@@ -94,7 +94,7 @@
{
Load();
- var proj4 = "";
+ string proj4;
ExportToProj4(out proj4);
return proj4;
}
@@ -115,7 +115,7 @@
return null;
}
- var wkt = "";
+ string wkt;
ogrCoordinateSystem.ExportToPrettyWkt(out wkt, 1);
return wkt;
}
Index: src/Common/SharpMap.Extensions/CoordinateSystems/OgrCoordinateSystemFactory.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/SharpMap.Extensions/CoordinateSystems/OgrCoordinateSystemFactory.cs (.../OgrCoordinateSystemFactory.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/SharpMap.Extensions/CoordinateSystems/OgrCoordinateSystemFactory.cs (.../OgrCoordinateSystemFactory.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -54,7 +54,7 @@
return null;
}
- var wkt = "";
+ string wkt;
ogrCoordinateSystem.ExportToPrettyWkt(out wkt, 1);
return wkt;
}
Index: src/Common/SharpMap.Extensions/Layers/AsyncTileHandler.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/SharpMap.Extensions/Layers/AsyncTileHandler.cs (.../AsyncTileHandler.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/SharpMap.Extensions/Layers/AsyncTileHandler.cs (.../AsyncTileHandler.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -47,7 +47,7 @@
foreach (var tileInfo in tileInfos)
{
- byte[] bytes = null;
+ byte[] bytes;
lock (cache)
{
Index: src/Common/SharpMap/Data/Providers/EGIS.ShapeFileLib/QuadTree.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/SharpMap/Data/Providers/EGIS.ShapeFileLib/QuadTree.cs (.../QuadTree.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/SharpMap/Data/Providers/EGIS.ShapeFileLib/QuadTree.cs (.../QuadTree.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -160,25 +160,20 @@
{
CreateChildren();
}
- int c = 0;
if (Children[TL].Bounds.IntersectsWith(bounds))
{
- c++;
Children[TL].Insert(recordIndex, bounds);
}
if (Children[TR].Bounds.IntersectsWith(bounds))
{
- c++;
Children[TR].Insert(recordIndex, bounds);
}
if (Children[BL].Bounds.IntersectsWith(bounds))
{
- c++;
Children[BL].Insert(recordIndex, bounds);
}
if (Children[BR].Bounds.IntersectsWith(bounds))
{
- c++;
Children[BR].Insert(recordIndex, bounds);
}
}
@@ -201,25 +196,20 @@
{
CreateChildren();
}
- int c = 0;
if (Children[TL].Bounds.IntersectsWith(recBounds))
{
- c++;
Children[TL].Insert(recordIndex, ref recBounds);
}
if (Children[TR].Bounds.IntersectsWith(recBounds))
{
- c++;
Children[TR].Insert(recordIndex, ref recBounds);
}
if (Children[BL].Bounds.IntersectsWith(recBounds))
{
- c++;
Children[BL].Insert(recordIndex, ref recBounds);
}
if (Children[BR].Bounds.IntersectsWith(recBounds))
{
- c++;
Children[BR].Insert(recordIndex, ref recBounds);
}
}
Index: src/Common/SharpMap/Data/Providers/ShapeFile.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/SharpMap/Data/Providers/ShapeFile.cs (.../ShapeFile.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/SharpMap/Data/Providers/ShapeFile.cs (.../ShapeFile.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -428,7 +428,7 @@
{
Trace.TraceWarning("Coordinate system file '" + projfile +
"' found, but could not be parsed. WKT parser returned:" + ex.Message);
- throw (ex);
+ throw;
}
}
}
Index: src/Common/SharpMap/Editors/FeatureEditor.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/SharpMap/Editors/FeatureEditor.cs (.../FeatureEditor.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/SharpMap/Editors/FeatureEditor.cs (.../FeatureEditor.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -51,7 +51,7 @@
}
addingNewFeature = true;
- IFeature newFeature = null;
+ IFeature newFeature;
try
{
Index: src/Common/SharpMap/Layers/LayerAttribute.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/SharpMap/Layers/LayerAttribute.cs (.../LayerAttribute.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/SharpMap/Layers/LayerAttribute.cs (.../LayerAttribute.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -93,7 +93,7 @@
{
var uniqueValues = new HashSet();
- IEnumerable values = null;
+ IEnumerable values;
if (layer is VectorLayer)
{
Index: src/Common/SharpMap/Web/Wms/Capabilities.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/Common/SharpMap/Web/Wms/Capabilities.cs (.../Capabilities.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/SharpMap/Web/Wms/Capabilities.cs (.../Capabilities.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -148,8 +148,7 @@
private static XmlNode GenerateCapabilityNode(Map map, XmlDocument capabilities)
{
- string OnlineResource = "";
- OnlineResource = HttpContext.Current.Server.HtmlEncode("http://" + HttpContext.Current.Request.Url.Host + HttpContext.Current.Request.Url.AbsolutePath);
+ var OnlineResource = HttpContext.Current.Server.HtmlEncode("http://" + HttpContext.Current.Request.Url.Host + HttpContext.Current.Request.Url.AbsolutePath);
XmlNode CapabilityNode = capabilities.CreateNode(XmlNodeType.Element, "Capability", wmsNamespaceURI);
XmlNode RequestNode = capabilities.CreateNode(XmlNodeType.Element, "Request", wmsNamespaceURI);
XmlNode GetCapabilitiesNode = capabilities.CreateNode(XmlNodeType.Element, "GetCapabilities", wmsNamespaceURI);
Index: src/DeltaShell/DeltaShell.Gui/CustomSettingsProvider.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/DeltaShell/DeltaShell.Gui/CustomSettingsProvider.cs (.../CustomSettingsProvider.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/DeltaShell/DeltaShell.Gui/CustomSettingsProvider.cs (.../CustomSettingsProvider.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -117,7 +117,7 @@
XmlDeclaration dec = m_SettingsXML.CreateXmlDeclaration("1.0", "utf-8", string.Empty);
m_SettingsXML.AppendChild(dec);
- XmlNode nodeRoot = null;
+ XmlNode nodeRoot;
nodeRoot = m_SettingsXML.CreateNode(XmlNodeType.Element, SETTINGSROOT, "");
m_SettingsXML.AppendChild(nodeRoot);
Index: src/DeltaShell/DeltaShell.Gui/Forms/OptionsDialog/GeneralOptionsControl.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/DeltaShell/DeltaShell.Gui/Forms/OptionsDialog/GeneralOptionsControl.cs (.../GeneralOptionsControl.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/DeltaShell/DeltaShell.Gui/Forms/OptionsDialog/GeneralOptionsControl.cs (.../GeneralOptionsControl.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -118,7 +118,7 @@
private string GetRealNumberFormatFromControls()
{
- string format = "";
+ string format;
var numDecimals = (int) upDownNumberOfDecimals.Value;
if (radioButtonCompactNotation.Checked)
Index: src/DeltaShell/DeltaShell.Gui/Forms/ProgressDialog/ActivityInfo.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r4c09f28891546d714fa6a15d36b70d8a6b9a4aa7
--- src/DeltaShell/DeltaShell.Gui/Forms/ProgressDialog/ActivityInfo.cs (.../ActivityInfo.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/DeltaShell/DeltaShell.Gui/Forms/ProgressDialog/ActivityInfo.cs (.../ActivityInfo.cs) (revision 4c09f28891546d714fa6a15d36b70d8a6b9a4aa7)
@@ -31,7 +31,7 @@
{
get
{
- string progressText = "";
+ string progressText;
try
{
progressText = activity.ProgressText;