From 3ba02e97b19e73143b291af70e69123c37396487 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Oct 2014 10:30:19 +0000
Subject: [PATCH] SortOrder.java: Used varargs for second constructor.
---
opendj3-server-dev/src/server/org/opends/server/types/SortOrder.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/SortOrder.java b/opendj3-server-dev/src/server/org/opends/server/types/SortOrder.java
index 73d15fc..825c07b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/SortOrder.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/SortOrder.java
@@ -22,10 +22,10 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
/**
* This class defines a data structure that defines a set of sort
* criteria that may be used to order entries in a set of search
@@ -49,11 +49,9 @@
mayInvoke=true)
public final class SortOrder
{
- // The set of sort keys in this sort order.
+ /** The set of sort keys in this sort order. */
private SortKey[] sortKeys;
-
-
/**
* Creates a new sort order with a single key.
*
@@ -72,7 +70,7 @@
* @param sortKeys The set of sort keys to use for this sort
* order.
*/
- public SortOrder(SortKey[] sortKeys)
+ public SortOrder(SortKey... sortKeys)
{
this.sortKeys = new SortKey[sortKeys.length];
System.arraycopy(sortKeys, 0, this.sortKeys, 0, sortKeys.length);
@@ -97,6 +95,7 @@
*
* @return A string representation of this sort order.
*/
+ @Override
public String toString()
{
StringBuilder buffer = new StringBuilder();
@@ -136,6 +135,7 @@
*
* @return The hash code for this sort order.
*/
+ @Override
public int hashCode()
{
int hashCode = 0;
@@ -143,7 +143,6 @@
{
hashCode += sortKey.hashCode();
}
-
return hashCode;
}
@@ -156,25 +155,23 @@
* @return <CODE>true</CODE> if the provide object is equal to this
* sort order, or <CODE>false</CODE> if it is not.
*/
+ @Override
public boolean equals(Object o)
{
if(o == null)
{
return false;
}
-
if (o == this)
{
return true;
}
-
if (! (o instanceof SortOrder))
{
return false;
}
SortOrder s = (SortOrder) o;
-
if(sortKeys.length != s.sortKeys.length)
{
return false;
@@ -187,7 +184,6 @@
return false;
}
}
-
return true;
}
}
--
Gitblit v1.10.0