Fisheye: Tag 36f21b76dcc0ac2f8d06ecfa4495faef04c59a84 refers to a dead (removed) revision in file `src/Common/DelftTools.Utils/Collections/Generic/EventedListView.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: src/Common/DelftTools.Utils/DelftTools.Utils.csproj
===================================================================
diff -u -r5f9327caaaca2d654839bcdcdcf70529e8263d17 -r36f21b76dcc0ac2f8d06ecfa4495faef04c59a84
--- src/Common/DelftTools.Utils/DelftTools.Utils.csproj (.../DelftTools.Utils.csproj) (revision 5f9327caaaca2d654839bcdcdcf70529e8263d17)
+++ src/Common/DelftTools.Utils/DelftTools.Utils.csproj (.../DelftTools.Utils.csproj) (revision 36f21b76dcc0ac2f8d06ecfa4495faef04c59a84)
@@ -247,7 +247,6 @@
-
Index: src/Common/SharpMap/Layers/GroupLayer.cs
===================================================================
diff -u -r8edbe5e2130c81b456385607891c6ef98928f88e -r36f21b76dcc0ac2f8d06ecfa4495faef04c59a84
--- src/Common/SharpMap/Layers/GroupLayer.cs (.../GroupLayer.cs) (revision 8edbe5e2130c81b456385607891c6ef98928f88e)
+++ src/Common/SharpMap/Layers/GroupLayer.cs (.../GroupLayer.cs) (revision 36f21b76dcc0ac2f8d06ecfa4495faef04c59a84)
@@ -79,7 +79,7 @@
switch (e.Action)
{
case NotifyCollectionChangeAction.Add: //set map property for layers being added
- SetMapInLayer((ILayer) e.Item);
+ ((ILayer) e.Item).Map = Map;
((ILayer) e.Item).RenderRequired = true;
break;
case NotifyCollectionChangeAction.Remove:
@@ -90,12 +90,6 @@
}
}
- [EditAction]
- private void SetMapInLayer(ILayer layer)
- {
- layer.Map = Map;
- }
-
void LayersCollectionChanging(object sender, NotifyCollectionChangingEventArgs e)
{
// performance
@@ -106,7 +100,10 @@
if (sender == layers) //only for own layer collection
{
- CheckIfLayersIsMutableOrThrow();
+ if (LayersReadOnly)
+ {
+ throw new InvalidOperationException("It is not allowed to add or remove layers from a grouplayer that has a read-only layers collection");
+ }
}
if (CollectionChanging != null)
@@ -115,16 +112,6 @@
}
}
- [EditAction] //a bit of a hack, not strictly an edit action
- private void CheckIfLayersIsMutableOrThrow()
- {
- if (LayersReadOnly)
- {
- throw new InvalidOperationException(
- "It is not allowed to add or remove layers from a grouplayer that has a read-only layers collection");
- }
- }
-
[NoNotifyPropertyChange]
public override bool RenderRequired
{
@@ -188,15 +175,6 @@
}
}
- [EditAction]
- private void AfterMapSet()
- {
- foreach (ILayer layer in Layers)
- {
- layer.Map = Map;
- }
- }
-
private IEventedList layers;
///
@@ -209,7 +187,10 @@
if (!isMapInitialized)
{
isMapInitialized = true;
- AfterMapSet();
+ foreach (ILayer layer in Layers)
+ {
+ layer.Map = Map;
+ }
}
return layers;
Index: src/Common/SharpMap/Layers/Layer.cs
===================================================================
diff -u -r8edbe5e2130c81b456385607891c6ef98928f88e -r36f21b76dcc0ac2f8d06ecfa4495faef04c59a84
--- src/Common/SharpMap/Layers/Layer.cs (.../Layer.cs) (revision 8edbe5e2130c81b456385607891c6ef98928f88e)
+++ src/Common/SharpMap/Layers/Layer.cs (.../Layer.cs) (revision 36f21b76dcc0ac2f8d06ecfa4495faef04c59a84)
@@ -735,7 +735,6 @@
UpdateCoordinateTransformation();
}
- [EditAction]
protected void UpdateCoordinateTransformation()
{
if (map == null)
@@ -1112,20 +1111,14 @@
{
labelLayer = value;
- AfterLabelLayerSet();
+ if (labelLayer != null)
+ {
+ labelLayer.Parent = this;
+ labelLayer.Map = map;
+ }
}
}
- [EditAction]
- private void AfterLabelLayerSet()
- {
- if (labelLayer != null)
- {
- labelLayer.Parent = this;
- labelLayer.Map = map;
- }
- }
-
#region IDisposable Members
///