/**
 * Copyright Notice
 *
 * This is a work of the U.S. Government and is not subject to copyright 
 * protection in the United States. Foreign copyrights may apply.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package gov.va.isaac.gui;

import java.util.Comparator;

/**
 * {@link SimpleDisplayConceptComparator}
 *
 * @author <a href="mailto:daniel.armbrust.list@gmail.com">Dan Armbrust</a> 
 */
public class SimpleDisplayConceptComparator implements Comparator<SimpleDisplayConcept>
{
	/**
	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
	 */
	@Override
	public int compare(SimpleDisplayConcept o1, SimpleDisplayConcept o2)
	{
		if (o1 == null && o2 == null)
		{
			return 0;
		}
		else if (o1 == null)
		{
			return 1;
		}
		else if (o2 ==  null)
		{
			return -1;
		}
		else if (o1.getDescription() == null && o2.getDescription() == null)
		{
			return 0;
		}
		else if (o1.getDescription() == null)
		{
			return -1;
		}
		else if (o2.getDescription() == null)
		{
			return 1;
		}
		else
		{
			return o1.getDescription().compareTo(o2.getDescription());
		}
	}
}

@@ -750,16 +750,61 @@
 c.gui;%0A%0A
+import gov.va.isaac.util.AlphanumComparator;%0A
 import j
@@ -1045,16 +1045,86 @@
 cept%3E%0A%7B%0A
+%09private static AlphanumComparator ac = new AlphanumComparator(true);%0A
 %09/**%0A%09 *
@@ -1298,66 +1298,8 @@
 1 ==
- null && o2 == null)%0A%09%09%7B%0A%09%09%09return 0;%0A%09%09%7D%0A%09%09else if (o1 ==
  nul
@@ -1378,223 +1378,8 @@
 else
- if (o1.getDescription() == null && o2.getDescription() == null)%0A%09%09%7B%0A%09%09%09return 0;%0A%09%09%7D%0A%09%09else if (o1.getDescription() == null)%0A%09%09%7B%0A%09%09%09return -1;%0A%09%09%7D%0A%09%09else if (o2.getDescription() == null)%0A%09%09%7B%0A%09%09%09return 1;%0A%09%09%7D%0A%09%09else
 %0A%09%09%7B
@@ -1389,16 +1389,27 @@
 %09return 
+ac.compare(
 o1.getDe
@@ -1423,19 +1423,10 @@
 on()
-.compareTo(
+, 
 o2.g

use better comparator