Add generic type parameter in the interface IComplexPropertyChangedDelegate

vbauer · vbauer · commit ee006d52b1a3 · 2015-05-31T19:47:02.000+06:00
diff --git a/src/main/java/microsoft/exchange/webservices/data/property/complex/ComplexPropertyCollection.java b/src/main/java/microsoft/exchange/webservices/data/property/complex/ComplexPropertyCollection.java
@@ -48,7 +48,7 @@
 public abstract class ComplexPropertyCollection
     <TComplexProperty extends ComplexProperty>
     extends ComplexProperty implements ICustomXmlUpdateSerializer,
-    Iterable<TComplexProperty>, IComplexPropertyChangedDelegate {
+    Iterable<TComplexProperty>, IComplexPropertyChangedDelegate<TComplexProperty> {
 
   /**
    * The item.
@@ -101,12 +101,11 @@ protected ComplexPropertyCollection() {
   /**
    * Item changed.
    *
-   * @param complexProperty The complex property.
+   * @param property The complex property.
    */
-  protected void itemChanged(final ComplexProperty complexProperty) {
-    final TComplexProperty property = (TComplexProperty) complexProperty;
+  protected void itemChanged(final TComplexProperty property) {
     EwsUtilities.ewsAssert(
-      complexProperty != null, "ComplexPropertyCollection.ItemChanged",
+      property != null, "ComplexPropertyCollection.ItemChanged",
       "The complexProperty argument must be not null"
     );
 
@@ -332,7 +331,7 @@ private void internalAdd(TComplexProperty complexProperty,
    * @param complexProperty accepts ComplexProperty
    */
   @Override
-  public void complexPropertyChanged(ComplexProperty complexProperty) {
+  public void complexPropertyChanged(final TComplexProperty complexProperty) {
     this.itemChanged(complexProperty);
   }
 
diff --git a/src/main/java/microsoft/exchange/webservices/data/property/complex/DictionaryProperty.java b/src/main/java/microsoft/exchange/webservices/data/property/complex/DictionaryProperty.java
@@ -50,7 +50,7 @@
 @EditorBrowsable(state = EditorBrowsableState.Never)
 public abstract class DictionaryProperty
     <TKey, TEntry extends DictionaryEntryProperty<TKey>>
-    extends ComplexProperty implements ICustomXmlUpdateSerializer, IComplexPropertyChangedDelegate {
+    extends ComplexProperty implements ICustomXmlUpdateSerializer, IComplexPropertyChangedDelegate<TEntry> {
 
   /**
    * The entries.
@@ -77,8 +77,8 @@ public abstract class DictionaryProperty
    *
    * @param complexProperty the complex property
    */
-  private void entryChanged(ComplexProperty complexProperty) {
-    TKey key = ((TEntry) complexProperty).getKey();
+  private void entryChanged(final TEntry complexProperty) {
+    TKey key = complexProperty.getKey();
 
     if (!this.addedEntries.contains(key) && !this.modifiedEntries.contains(key)) {
       this.modifiedEntries.add(key);
@@ -188,8 +188,8 @@ protected void internalAdd(TEntry entry) {
    * @param complexProperty accepts ComplexProperty
    */
   @Override
-  public void complexPropertyChanged(ComplexProperty complexProperty) {
-    this.entryChanged(complexProperty);
+  public void complexPropertyChanged(final TEntry complexProperty) {
+    entryChanged(complexProperty);
   }
 
   /**
diff --git a/src/main/java/microsoft/exchange/webservices/data/property/complex/IComplexPropertyChangedDelegate.java b/src/main/java/microsoft/exchange/webservices/data/property/complex/IComplexPropertyChangedDelegate.java
@@ -26,12 +26,13 @@
 /**
  * The Interface ComplexPropertyChangedDelegateInterface.
  */
-public interface IComplexPropertyChangedDelegate {
+public interface IComplexPropertyChangedDelegate<TComplexProperty extends ComplexProperty> {
 
   /**
    * Complex property changed.
    *
    * @param complexProperty the complex property
    */
-  void complexPropertyChanged(ComplexProperty complexProperty);
+  void complexPropertyChanged(TComplexProperty complexProperty);
+
 }
