[mapguide-commits] r8123 - in trunk/Tools/Maestro: Maestro.Editors/LayerDefinition/Vector/GridEditor Maestro.Editors/LayerDefinition/Vector/Thematics OSGeo.MapGuide.MaestroAPI/ObjectModels
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat May 10 12:25:46 PDT 2014
Author: jng
Date: 2014-05-10 12:25:45 -0700 (Sat, 10 May 2014)
New Revision: 8123
Modified:
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleGridView.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleModel.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs
Log:
Remove ILayerElementFactory2. Move the new method introduced up to ILayerElementFactory
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleGridView.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleGridView.cs 2014-05-08 17:37:30 UTC (rev 8122)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleGridView.cs 2014-05-10 19:25:45 UTC (rev 8123)
@@ -971,7 +971,7 @@
{
Debug.Assert(_style.StyleType != StyleType.Composite);
//HACK: Only Maestro knows that all impls of ILayerDefinition also implements ILayerElementFactory2
- ILabeledRuleModel clone = lrm.CloneLabeledRuleModel((ILayerElementFactory2)_editedLayer);
+ ILabeledRuleModel clone = lrm.CloneLabeledRuleModel(_editedLayer);
switch (_style.StyleType)
{
case StyleType.Point:
@@ -993,7 +993,7 @@
{
Debug.Assert(_style.StyleType == StyleType.Composite);
//HACK: Only Maestro knows that all impls of ILayerDefinition also implements ILayerElementFactory2
- IRuleModel clone = rm.CloneRuleModel((ILayerElementFactory2)_editedLayer);
+ IRuleModel clone = rm.CloneRuleModel(_editedLayer);
((ICompositeTypeStyle)_style).AddCompositeRule((ICompositeRule)clone.UnwrapRule());
clone.SetIndex(_style.RuleCount - 1);
_rules.Add(clone);
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleModel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleModel.cs 2014-05-08 17:37:30 UTC (rev 8122)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleModel.cs 2014-05-10 19:25:45 UTC (rev 8123)
@@ -40,7 +40,7 @@
void SetIndex(int index);
object UnwrapRule();
- IRuleModel CloneRuleModel(ILayerElementFactory2 factory);
+ IRuleModel CloneRuleModel(ILayerElementFactory factory);
}
internal interface ILabeledRuleModel : INotifyPropertyChanged
@@ -55,7 +55,7 @@
void SetIndex(int index);
object UnwrapRule();
- ILabeledRuleModel CloneLabeledRuleModel(ILayerElementFactory2 factory);
+ ILabeledRuleModel CloneLabeledRuleModel(ILayerElementFactory factory);
}
internal abstract class RuleModel : IRuleModel
@@ -100,7 +100,7 @@
public abstract object UnwrapRule();
- public abstract IRuleModel CloneRuleModel(ILayerElementFactory2 factory);
+ public abstract IRuleModel CloneRuleModel(ILayerElementFactory factory);
}
internal abstract class BasicVectorRuleModel<TRuleType, TSymbolizationStyleType> : RuleModel, ILabeledRuleModel where TRuleType : IBasicVectorRule
@@ -241,12 +241,12 @@
m.Index = temp;
}
- public override IRuleModel CloneRuleModel(ILayerElementFactory2 factory)
+ public override IRuleModel CloneRuleModel(ILayerElementFactory factory)
{
throw new NotImplementedException();
}
- public abstract ILabeledRuleModel CloneLabeledRuleModel(ILayerElementFactory2 factory);
+ public abstract ILabeledRuleModel CloneLabeledRuleModel(ILayerElementFactory factory);
}
internal class PointRuleModel : BasicVectorRuleModel<IPointRule, IPointSymbolization2D>
@@ -268,7 +268,7 @@
this.HasStyle = (style != null);
}
- public override ILabeledRuleModel CloneLabeledRuleModel(ILayerElementFactory2 factory)
+ public override ILabeledRuleModel CloneLabeledRuleModel(ILayerElementFactory factory)
{
var clone = factory.CreateDefaultPointRule();
clone.Filter = _rule.Filter;
@@ -372,7 +372,7 @@
return new BasicLineSymbolizationAdapter(_rule);
}
- public override ILabeledRuleModel CloneLabeledRuleModel(ILayerElementFactory2 factory)
+ public override ILabeledRuleModel CloneLabeledRuleModel(ILayerElementFactory factory)
{
var clone = factory.CreateDefaultLineRule();
clone.Filter = _rule.Filter;
@@ -411,7 +411,7 @@
this.HasStyle = (style != null);
}
- public override ILabeledRuleModel CloneLabeledRuleModel(ILayerElementFactory2 factory)
+ public override ILabeledRuleModel CloneLabeledRuleModel(ILayerElementFactory factory)
{
var clone = factory.CreateDefaultAreaRule();
clone.Filter = _rule.Filter;
@@ -501,7 +501,7 @@
}
}
- public override IRuleModel CloneRuleModel(ILayerElementFactory2 factory)
+ public override IRuleModel CloneRuleModel(ILayerElementFactory factory)
{
var clone = factory.CreateDefaultCompositeRule();
clone.Filter = _rule.Filter;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs 2014-05-08 17:37:30 UTC (rev 8122)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs 2014-05-10 19:25:45 UTC (rev 8123)
@@ -96,7 +96,7 @@
NUMERIC_TYPES = new Type[] { typeof(byte), typeof(int), typeof(float), typeof(double) };
}
- private ILayerElementFactory2 _factory;
+ private ILayerElementFactory _factory;
enum ThemeSource
{
@@ -115,7 +115,7 @@
m_featureClass = classDef;
m_ruleCollection = style;
_themeSource = ThemeSource.LayerDefinition;
- _factory = (ILayerElementFactory2)editor.GetEditedResource();
+ _factory = (ILayerElementFactory)editor.GetEditedResource();
ColorBrewerColorSet.SetCustomRender(new CustomCombo.RenderCustomItem(DrawColorSetPreview));
}
@@ -912,7 +912,7 @@
return arule;
}
- private ICompositeRule CreateCompositeRule(ICompositeRule template, ILayerElementFactory2 factory)
+ private ICompositeRule CreateCompositeRule(ICompositeRule template, ILayerElementFactory factory)
{
var crule = factory.CreateDefaultCompositeRule();
if (template.CompositeSymbolization != null)
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs 2014-05-08 17:37:30 UTC (rev 8122)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs 2014-05-10 19:25:45 UTC (rev 8123)
@@ -100,7 +100,7 @@
}
}
- partial class LayerDefinition : ILayerElementFactory, ILayerElementFactory2
+ partial class LayerDefinition : ILayerElementFactory
{
public static ILayerDefinition CreateDefault(LayerType type)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs 2014-05-08 17:37:30 UTC (rev 8122)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs 2014-05-10 19:25:45 UTC (rev 8123)
@@ -362,14 +362,7 @@
/// </summary>
/// <returns></returns>
IAreaSymbolizationFill CreateDefaultAreaSymbolizationFill();
- }
- /// <summary>
- /// Factory interface to assist in creating common layer definition elements. Supports additional cases
- /// for Advanced Stylization
- /// </summary>
- public interface ILayerElementFactory2 : ILayerElementFactory
- {
/// <summary>
/// Clones the given symbolization
/// </summary>
More information about the mapguide-commits
mailing list