Author: max.andersen(a)jboss.com Date: 2009-07-06 18:20:55 -0400 (Mon, 06 Jul 2009) New Revision: 16442 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java Log: https://jira.jboss.org/jira/browse/JBIDE-3883 fixed bad usage of com.sun.* that showed up when setting J2SE-1.5 exec environment. Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2009-07-06 21:36:41 UTC (rev 16441) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2009-07-06 22:20:55 UTC (rev 16442) @@ -17,6 +17,8 @@ import java.io.InputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.Arrays; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -52,9 +54,6 @@ import org.jboss.tools.hibernate.ui.diagram.UiPlugin; import org.jboss.tools.hibernate.ui.view.HibernateUtils; -import sun.misc.Compare; -import sun.misc.Sort; - public class OrmDiagram extends ModelElement { public static final String REFRESH = "refresh"; //$NON-NLS-1$ @@ -88,7 +87,7 @@ System.arraycopy(ioe, 0, ormElements, 0, ioe.length); // should sort elements - cause different sort order gives different file name // for the same thing - Sort.quicksort(ormElements, new OrmElCompare()); + Arrays.sort(ormElements, new OrmElCompare()); entityNames = new String[ioe.length]; for (int i = 0; i < ormElements.length; i++) { entityNames[i] = ormElements[i].getEntityName(); @@ -102,12 +101,10 @@ setDirty(false); } - protected class OrmElCompare implements Compare { + protected class OrmElCompare implements Comparator<RootClass> { - public int doCompare(Object arg0, Object arg1) { - RootClass rc0 = (RootClass)arg0; - RootClass rc1 = (RootClass)arg1; - return rc0.getNodeName().compareTo(rc1.getNodeName()); + public int compare(RootClass o1, RootClass o2) { + return o1.getNodeName().compareTo(o2.getNodeName()); } }