From 90a6ab6c63699343acf3adcd4346bce2f5665bdd Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Jul 2015 15:12:28 +0000
Subject: [PATCH] AutoRefactor'ed Use Diamond Operator
---
opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java | 34 ++++++++--------------------------
1 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
index dce5e1f..a91a57f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
@@ -80,45 +80,34 @@
Collection<T> activeValues) {
this.d = pd;
- SortedSet<T> sortedDefaultValues = new TreeSet<T>(pd);
+ SortedSet<T> sortedDefaultValues = new TreeSet<>(pd);
sortedDefaultValues.addAll(defaultValues);
this.defaultValues = Collections
.unmodifiableSortedSet(sortedDefaultValues);
- this.activeValues = new TreeSet<T>(pd);
+ this.activeValues = new TreeSet<>(pd);
this.activeValues.addAll(activeValues);
- // Initially the pending values is the same as the active
- // values.
- this.pendingValues = new TreeSet<T>(this.activeValues);
+ // Initially the pending values is the same as the active values.
+ this.pendingValues = new TreeSet<>(this.activeValues);
}
-
-
- /**
- * Makes the pending values active.
- */
+ /** Makes the pending values active. */
public void commit() {
activeValues.clear();
activeValues.addAll(pendingValues);
}
-
-
/** {@inheritDoc} */
public SortedSet<T> getActiveValues() {
return Collections.unmodifiableSortedSet(activeValues);
}
-
-
/** {@inheritDoc} */
public SortedSet<T> getDefaultValues() {
return defaultValues;
}
-
-
/** {@inheritDoc} */
public SortedSet<T> getEffectiveValues() {
SortedSet<T> values = getPendingValues();
@@ -190,19 +179,12 @@
}
/** The properties. */
- private final Map<PropertyDefinition<?>, MyProperty<?>> properties;
+ private final Map<PropertyDefinition<?>, MyProperty<?>> properties = new HashMap<>();
-
-
- /**
- * Creates a new empty property set.
- */
+ /** Creates a new empty property set. */
public PropertySet() {
- this.properties = new HashMap<PropertyDefinition<?>, MyProperty<?>>();
}
-
-
/**
* Creates a property with the provided sets of pre-validated
* default and active values.
@@ -218,7 +200,7 @@
*/
public <T> void addProperty(PropertyDefinition<T> pd,
Collection<T> defaultValues, Collection<T> activeValues) {
- MyProperty<T> p = new MyProperty<T>(pd, defaultValues, activeValues);
+ MyProperty<T> p = new MyProperty<>(pd, defaultValues, activeValues);
properties.put(pd, p);
}
--
Gitblit v1.10.0