From 1e814b1df1670f0a19a77d55848fe6f836fa4e6b Mon Sep 17 00:00:00 2001
From: "Brian S. O'Neill" <bronee@gmail.com>
Date: Mon, 4 Sep 2006 23:02:22 +0000
Subject: OrderingScore supports automatic ordering direction when unspecified.

---
 .../com/amazon/carbonado/info/OrderedProperty.java   | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'src/main/java/com/amazon/carbonado/info')

diff --git a/src/main/java/com/amazon/carbonado/info/OrderedProperty.java b/src/main/java/com/amazon/carbonado/info/OrderedProperty.java
index 7de07c0..fe53c60 100644
--- a/src/main/java/com/amazon/carbonado/info/OrderedProperty.java
+++ b/src/main/java/com/amazon/carbonado/info/OrderedProperty.java
@@ -56,8 +56,8 @@ public class OrderedProperty<S extends Storable> implements Appender {
 
     /**
      * Parses an ordering property, which may start with a '+' or '-' to
-     * indicate direction. If ordering prefix not specified, default direction
-     * is ascending.
+     * indicate direction. Prefix of '~' indicates unspecified direction. If
+     * ordering prefix not specified, default direction is ascending.
      *
      * @param info Info for Storable type containing property
      * @param str string to parse
@@ -73,7 +73,7 @@ public class OrderedProperty<S extends Storable> implements Appender {
 
     /**
      * Parses an ordering property, which may start with a '+' or '-' to
-     * indicate direction.
+     * indicate direction. Prefix of '~' indicates unspecified direction.
      *
      * @param info Info for Storable type containing property
      * @param str string to parse
@@ -98,6 +98,9 @@ public class OrderedProperty<S extends Storable> implements Appender {
             } else if (str.charAt(0) == '-') {
                 direction = Direction.DESCENDING;
                 str = str.substring(1);
+            } else if (str.charAt(0) == '~') {
+                direction = Direction.UNSPECIFIED;
+                str = str.substring(1);
             }
         }
         if (direction == null) {
@@ -158,9 +161,6 @@ public class OrderedProperty<S extends Storable> implements Appender {
      */
     @Override
     public String toString() {
-        if (mDirection == Direction.UNSPECIFIED) {
-            return mProperty.toString();
-        }
         StringBuilder buf = new StringBuilder();
         buf.append(mDirection.toCharacter());
         try {
@@ -172,11 +172,7 @@ public class OrderedProperty<S extends Storable> implements Appender {
     }
 
     public void appendTo(Appendable app) throws IOException {
-        if (mDirection == Direction.UNSPECIFIED) {
-            mProperty.appendTo(app);
-        } else {
-            app.append(mDirection.toCharacter());
-            mProperty.appendTo(app);
-        }
+        app.append(mDirection.toCharacter());
+        mProperty.appendTo(app);
     }
 }
-- 
cgit v1.2.3