Merge pull request #165 from AnalyticalGraphicsInc/deletableProperty

Added new interfaces and reworked JSON schema.

Author: shunter

DotNet/CesiumLanguageWriter.sln

@@ -10,6 +10,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_CONSTRAINS/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_LIST/@EntryValue">True</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AFTER_BLOCK_STATEMENTS/@EntryValue">0</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_NAMESPACE/@EntryValue">0</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
@@ -26,7 +27,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_EXTENDS_COLON/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_EXTENDS_COLON/@EntryValue">False</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">150</s:Int64>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LINES/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
@@ -56,6 +57,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EFormat_002ESettingsUpgrade_002EAlignmentTabFillStyleMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Adaptor/@EntryIndexedValue">True</s:Boolean>
 
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=polyline/@EntryIndexedValue">True</s:Boolean>
 

DotNet/CesiumLanguageWriter.sln.DotSettings

@@ -123,4 +123,4 @@ public CacheItem([NotNull] string sourceUri, [NotNull] string resolvedUri)
             public readonly string ResolvedUri;
         }
     }
-}
+}

DotNet/CesiumLanguageWriter/Advanced/CachingCesiumUriResolver.cs

@@ -0,0 +1,26 @@
+using JetBrains.Annotations;
+
+namespace CesiumLanguageWriter.Advanced
+{
+    /// <summary>
+    /// Adapts a class that implements <see cref="ICesiumArcTypeValuePropertyWriter"/> to implement
+    /// <see cref="ICesiumPropertyWriter"/> for <see cref="CesiumArcType"/> values.
+    /// </summary>
+    /// <typeparam name="TFrom">The class that implements <see cref="ICesiumArcTypeValuePropertyWriter"/> to adapt.</typeparam>
+    public class CesiumArcTypeValuePropertyAdaptor<TFrom> : CesiumWriterAdaptor<TFrom, CesiumArcType>
+        where TFrom : class, ICesiumArcTypeValuePropertyWriter
+    {
+        /// <summary>
+        /// Initializes a new instance.
+        /// </summary>
+        /// <param name="parent">The instance to wrap.</param>
+        /// <param name="writeValueCallback">The callback to write values of type <see cref="CesiumArcType"/>.</param>
+        /// <param name="writeDeleteValueCallback">The callback to write an indication that the client should delete existing data.</param>
+        public CesiumArcTypeValuePropertyAdaptor([NotNull] TFrom parent,
+                                                 [NotNull] CesiumWriterAdaptorWriteCallback<TFrom, CesiumArcType> writeValueCallback,
+                                                 [NotNull] CesiumWriterAdaptorWriteDeleteCallback<TFrom> writeDeleteValueCallback)
+            : base(parent, writeValueCallback, writeDeleteValueCallback)
+        {
+        }
+    }
+}

DotNet/CesiumLanguageWriter/Advanced/CesiumArcTypeValuePropertyAdaptor.cs

@@ -0,0 +1,26 @@
+using JetBrains.Annotations;
+
+namespace CesiumLanguageWriter.Advanced
+{
+    /// <summary>
+    /// Adapts a class that implements <see cref="ICesiumBooleanValuePropertyWriter"/> to implement
+    /// <see cref="ICesiumPropertyWriter"/> for <see cref="bool"/> values.
+    /// </summary>
+    /// <typeparam name="TFrom">The class that implements <see cref="ICesiumBooleanValuePropertyWriter"/> to adapt.</typeparam>
+    public class CesiumBooleanValuePropertyAdaptor<TFrom> : CesiumWriterAdaptor<TFrom, bool>
+        where TFrom : class, ICesiumBooleanValuePropertyWriter
+    {
+        /// <summary>
+        /// Initializes a new instance.
+        /// </summary>
+        /// <param name="parent">The instance to wrap.</param>
+        /// <param name="writeValueCallback">The callback to write values of type <see cref="bool"/>.</param>
+        /// <param name="writeDeleteValueCallback">The callback to write an indication that the client should delete existing data.</param>
+        public CesiumBooleanValuePropertyAdaptor([NotNull] TFrom parent,
+                                                 [NotNull] CesiumWriterAdaptorWriteCallback<TFrom, bool> writeValueCallback,
+                                                 [NotNull] CesiumWriterAdaptorWriteDeleteCallback<TFrom> writeDeleteValueCallback)
+            : base(parent, writeValueCallback, writeDeleteValueCallback)
+        {
+        }
+    }
+}

DotNet/CesiumLanguageWriter/Advanced/CesiumBooleanValuePropertyAdaptor.cs

@@ -0,0 +1,28 @@
+using JetBrains.Annotations;
+
+namespace CesiumLanguageWriter.Advanced
+{
+    /// <summary>
+    /// Adapts a class that implements <see cref="ICesiumBoundingRectangleValuePropertyWriter"/> to implement
+    /// <see cref="ICesiumInterpolatableValuePropertyWriter{TValue}"/> for <see cref="BoundingRectangle"/> values.
+    /// </summary>
+    /// <typeparam name="TFrom">The class that implements <see cref="ICesiumBoundingRectangleValuePropertyWriter"/> to adapt.</typeparam>
+    public class CesiumBoundingRectangleValuePropertyAdaptor<TFrom> : CesiumInterpolatableWriterAdaptor<TFrom, BoundingRectangle>
+        where TFrom : class, ICesiumBoundingRectangleValuePropertyWriter
+    {
+        /// <summary>
+        /// Initializes a new instance.
+        /// </summary>
+        /// <param name="parent">The instance to wrap.</param>
+        /// <param name="writeValueCallback">The callback to write values of type <see cref="BoundingRectangle"/>.</param>
+        /// <param name="writeSamplesCallback">The callback to write samples of type <see cref="BoundingRectangle"/>.</param>
+        /// <param name="writeDeleteValueCallback">The callback to write an indication that the client should delete existing data.</param>
+        public CesiumBoundingRectangleValuePropertyAdaptor([NotNull] TFrom parent,
+                                                           [NotNull] CesiumWriterAdaptorWriteCallback<TFrom, BoundingRectangle> writeValueCallback,
+                                                           [NotNull] CesiumWriterAdaptorWriteSamplesCallback<TFrom, BoundingRectangle> writeSamplesCallback,
+                                                           [NotNull] CesiumWriterAdaptorWriteDeleteCallback<TFrom> writeDeleteValueCallback)
+            : base(parent, writeValueCallback, writeSamplesCallback, writeDeleteValueCallback)
+        {
+        }
+    }
+}

DotNet/CesiumLanguageWriter/Advanced/CesiumBoundingRectangleValuePropertyAdaptor.cs

@@ -0,0 +1,28 @@
+using JetBrains.Annotations;
+
+namespace CesiumLanguageWriter.Advanced
+{
+    /// <summary>
+    /// Adapts a class that implements <see cref="ICesiumCartesian2ValuePropertyWriter"/> to implement
+    /// <see cref="ICesiumInterpolatableValuePropertyWriter{TValue}"/> for <see cref="Rectangular"/> values.
+    /// </summary>
+    /// <typeparam name="TFrom">The class that implements <see cref="ICesiumCartesian2ValuePropertyWriter"/> to adapt.</typeparam>
+    public class CesiumCartesian2ValuePropertyAdaptor<TFrom> : CesiumInterpolatableWriterAdaptor<TFrom, Rectangular>
+        where TFrom : class, ICesiumCartesian2ValuePropertyWriter
+    {
+        /// <summary>
+        /// Initializes a new instance.
+        /// </summary>
+        /// <param name="parent">The instance to wrap.</param>
+        /// <param name="writeValueCallback">The callback to write values of type <see cref="Rectangular"/>.</param>
+        /// <param name="writeSamplesCallback">The callback to write samples of type <see cref="Rectangular"/>.</param>
+        /// <param name="writeDeleteValueCallback">The callback to write an indication that the client should delete existing data.</param>
+        public CesiumCartesian2ValuePropertyAdaptor([NotNull] TFrom parent,
+                                                    [NotNull] CesiumWriterAdaptorWriteCallback<TFrom, Rectangular> writeValueCallback,
+                                                    [NotNull] CesiumWriterAdaptorWriteSamplesCallback<TFrom, Rectangular> writeSamplesCallback,
+                                                    [NotNull] CesiumWriterAdaptorWriteDeleteCallback<TFrom> writeDeleteValueCallback)
+            : base(parent, writeValueCallback, writeSamplesCallback, writeDeleteValueCallback)
+        {
+        }
+    }
+}

DotNet/CesiumLanguageWriter/Advanced/CesiumCartesian2ValuePropertyAdaptor.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace CesiumLanguageWriter.Advanced
+{
+    /// <summary>
+    /// Adapts a class that implements <see cref="ICesiumCartesian3ListValuePropertyWriter"/> to implement
+    /// <see cref="ICesiumPropertyWriter"/> for a list of <see cref="Cartesian"/> values.
+    /// </summary>
+    /// <typeparam name="TFrom">The class that implements <see cref="ICesiumCartesian3ListValuePropertyWriter"/> to adapt.</typeparam>
+    public class CesiumCartesian3ListValuePropertyAdaptor<TFrom> : CesiumWriterAdaptor<TFrom, IEnumerable<Cartesian>>
+        where TFrom : class, ICesiumCartesian3ListValuePropertyWriter
+    {
+        /// <summary>
+        /// Initializes a new instance.
+        /// </summary>
+        /// <param name="parent">The instance to wrap.</param>
+        /// <param name="writeValueCallback">The callback to write a list of <see cref="Cartesian"/> values.</param>
+        /// <param name="writeDeleteValueCallback">The callback to write an indication that the client should delete existing data.</param>
+        public CesiumCartesian3ListValuePropertyAdaptor([NotNull] TFrom parent,
+                                                        [NotNull] CesiumWriterAdaptorWriteCallback<TFrom, IEnumerable<Cartesian>> writeValueCallback,
+                                                        [NotNull] CesiumWriterAdaptorWriteDeleteCallback<TFrom> writeDeleteValueCallback)
+            : base(parent, writeValueCallback, writeDeleteValueCallback)
+        {
+        }
+    }
+}

DotNet/CesiumLanguageWriter/Advanced/CesiumCartesian3ListValuePropertyAdaptor.cs

@@ -0,0 +1,28 @@
+using JetBrains.Annotations;
+
+namespace CesiumLanguageWriter.Advanced
+{
+    /// <summary>
+    /// Adapts a class that implements <see cref="ICesiumCartesian3ValuePropertyWriter"/> to implement
+    /// <see cref="ICesiumInterpolatableValuePropertyWriter{TValue}"/> for <see cref="Cartesian"/> values.
+    /// </summary>
+    /// <typeparam name="TFrom">The class that implements <see cref="ICesiumCartesian3ValuePropertyWriter"/> to adapt.</typeparam>
+    public class CesiumCartesian3ValuePropertyAdaptor<TFrom> : CesiumInterpolatableWriterAdaptor<TFrom, Cartesian>
+        where TFrom : class, ICesiumCartesian3ValuePropertyWriter
+    {
+        /// <summary>
+        /// Initializes a new instance.
+        /// </summary>
+        /// <param name="parent">The instance to wrap.</param>
+        /// <param name="writeValueCallback">The callback to write values of type <see cref="Cartesian"/>.</param>
+        /// <param name="writeSamplesCallback">The callback to write samples of type <see cref="Cartesian"/>.</param>
+        /// <param name="writeDeleteValueCallback">The callback to write an indication that the client should delete existing data.</param>
+        public CesiumCartesian3ValuePropertyAdaptor([NotNull] TFrom parent,
+                                                    [NotNull] CesiumWriterAdaptorWriteCallback<TFrom, Cartesian> writeValueCallback,
+                                                    [NotNull] CesiumWriterAdaptorWriteSamplesCallback<TFrom, Cartesian> writeSamplesCallback,
+                                                    [NotNull] CesiumWriterAdaptorWriteDeleteCallback<TFrom> writeDeleteValueCallback)
+            : base(parent, writeValueCallback, writeSamplesCallback, writeDeleteValueCallback)
+        {
+        }
+    }
+}

DotNet/CesiumLanguageWriter/Advanced/CesiumCartesian3ValuePropertyAdaptor.cs

@@ -0,0 +1,28 @@
+using JetBrains.Annotations;
+
+namespace CesiumLanguageWriter.Advanced
+{
+    /// <summary>
+    /// Adapts a class that implements <see cref="ICesiumCartesian3VelocityValuePropertyWriter"/> to implement
+    /// <see cref="ICesiumInterpolatableValuePropertyWriter{TValue}"/> for <see cref="Motion{Cartesian}"/> values.
+    /// </summary>
+    /// <typeparam name="TFrom">The class that implements <see cref="ICesiumCartesian3VelocityValuePropertyWriter"/> to adapt.</typeparam>
+    public class CesiumCartesian3VelocityValuePropertyAdaptor<TFrom> : CesiumInterpolatableWriterAdaptor<TFrom, Motion<Cartesian>>
+        where TFrom : class, ICesiumCartesian3VelocityValuePropertyWriter
+    {
+        /// <summary>
+        /// Initializes a new instance.
+        /// </summary>
+        /// <param name="parent">The instance to wrap.</param>
+        /// <param name="writeValueCallback">The callback to write values of type <see cref="Motion{Cartesian}"/>.</param>
+        /// <param name="writeSamplesCallback">The callback to write samples of type <see cref="Motion{Cartesian}"/>.</param>
+        /// <param name="writeDeleteValueCallback">The callback to write an indication that the client should delete existing data.</param>
+        public CesiumCartesian3VelocityValuePropertyAdaptor([NotNull] TFrom parent,
+                                                            [NotNull] CesiumWriterAdaptorWriteCallback<TFrom, Motion<Cartesian>> writeValueCallback,
+                                                            [NotNull] CesiumWriterAdaptorWriteSamplesCallback<TFrom, Motion<Cartesian>> writeSamplesCallback,
+                                                            [NotNull] CesiumWriterAdaptorWriteDeleteCallback<TFrom> writeDeleteValueCallback)
+            : base(parent, writeValueCallback, writeSamplesCallback, writeDeleteValueCallback)
+        {
+        }
+    }
+}

DotNet/CesiumLanguageWriter/Advanced/CesiumCartesian3VelocityValuePropertyAdaptor.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace CesiumLanguageWriter.Advanced
+{
+    /// <summary>
+    /// Adapts a class that implements <see cref="ICesiumCartographicDegreesListValuePropertyWriter"/> to implement
+    /// <see cref="ICesiumPropertyWriter"/> for a list of <see cref="Cartographic"/> values.
+    /// </summary>
+    /// <typeparam name="TFrom">The class that implements <see cref="ICesiumCartographicDegreesValuePropertyWriter"/> to adapt.</typeparam>
+    public class CesiumCartographicDegreesListValuePropertyAdaptor<TFrom> : CesiumWriterAdaptor<TFrom, IEnumerable<Cartographic>>
+        where TFrom : class, ICesiumCartographicDegreesListValuePropertyWriter
+    {
+        /// <summary>
+        /// Initializes a new instance.
+        /// </summary>
+        /// <param name="parent">The instance to wrap.</param>
+        /// <param name="writeValueCallback">The callback to write a list of <see cref="Cartographic"/> values.</param>
+        /// <param name="writeDeleteValueCallback">The callback to write an indication that the client should delete existing data.</param>
+        public CesiumCartographicDegreesListValuePropertyAdaptor([NotNull] TFrom parent,
+                                                                 [NotNull] CesiumWriterAdaptorWriteCallback<TFrom, IEnumerable<Cartographic>> writeValueCallback,
+                                                                 [NotNull] CesiumWriterAdaptorWriteDeleteCallback<TFrom> writeDeleteValueCallback)
+            : base(parent, writeValueCallback, writeDeleteValueCallback)
+        {
+        }
+    }
+}

DotNet/CesiumLanguageWriter/Advanced/CesiumCartographicDegreesListValuePropertyAdaptor.cs

@@ -0,0 +1,28 @@
+using JetBrains.Annotations;
+
+namespace CesiumLanguageWriter.Advanced
+{
+    /// <summary>
+    /// Adapts a class that implements <see cref="ICesiumCartographicDegreesValuePropertyWriter"/> to implement
+    /// <see cref="ICesiumInterpolatableValuePropertyWriter{TValue}"/> for <see cref="Cartographic"/> values.
+    /// </summary>
+    /// <typeparam name="TFrom">The class that implements <see cref="ICesiumCartographicDegreesValuePropertyWriter"/> to adapt.</typeparam>
+    public class CesiumCartographicDegreesValuePropertyAdaptor<TFrom> : CesiumInterpolatableWriterAdaptor<TFrom, Cartographic>
+        where TFrom : class, ICesiumCartographicDegreesValuePropertyWriter
+    {
+        /// <summary>
+        /// Initializes a new instance.
+        /// </summary>
+        /// <param name="parent">The instance to wrap.</param>
+        /// <param name="writeValueCallback">The callback to write values of type <see cref="Cartographic"/>.</param>
+        /// <param name="writeSamplesCallback">The callback to write samples of type <see cref="Cartographic"/>.</param>
+        /// <param name="writeDeleteValueCallback">The callback to write an indication that the client should delete existing data.</param>
+        public CesiumCartographicDegreesValuePropertyAdaptor([NotNull] TFrom parent,
+                                                             [NotNull] CesiumWriterAdaptorWriteCallback<TFrom, Cartographic> writeValueCallback,
+                                                             [NotNull] CesiumWriterAdaptorWriteSamplesCallback<TFrom, Cartographic> writeSamplesCallback,
+                                                             [NotNull] CesiumWriterAdaptorWriteDeleteCallback<TFrom> writeDeleteValueCallback)
+            : base(parent, writeValueCallback, writeSamplesCallback, writeDeleteValueCallback)
+        {
+        }
+    }
+}