Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 5104) +++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 5105) @@ -508,9 +508,9 @@ } - Class[] columnClasses = {Boolean.class, SourceEntry.class}; - @Override public Class getColumnClass(int column) { - return isMapPaint ? columnClasses[column] : SourceEntry.class; + if (isMapPaint && column == 0) + return Boolean.class; + else return SourceEntry.class; } @@ -615,5 +615,5 @@ } - public static class ExtendedSourceEntry extends SourceEntry { + public static class ExtendedSourceEntry extends SourceEntry implements Comparable { public String simpleFileName; public String version; @@ -635,24 +635,45 @@ } + private void appendRow(StringBuilder s, String th, String td) { + s.append("").append(th).append("").append(td).append(""); + } + public String getTooltip() { - String s = tr("Short Description: {0}", getDisplayName()) + "
" + tr("URL: {0}", url); + StringBuilder s = new StringBuilder(); + appendRow(s, tr("Short Description:"), getDisplayName()); + appendRow(s, tr("URL:"), url); if (author != null) { - s += "
" + tr("Author: {0}", author); + appendRow(s, tr("Author:"), author); } if (link != null) { - s += "
" + tr("Webpage: {0}", link); + appendRow(s, tr("Webpage:"), link); } if (description != null) { - s += "
" + tr("Description: {0}", description); + appendRow(s, tr("Description:"), description); } if (version != null) { - s += "
" + tr("Version: {0}", version); - } - return "" + s + ""; + appendRow(s, tr("Version:"), version); + } + return "" + + "" + s + "
"; } @Override public String toString() { - return "" + getDisplayName() + " (" + url + ")"; + return "" + getDisplayName() + "" + + (author == null ? "" : " " + tr("by {0}", author) + "") + + ""; + } + + @Override + public int compareTo(ExtendedSourceEntry o) { + if (url.startsWith("resource") && !o.url.startsWith("resource")) { + return -1; + } + if (o.url.startsWith("resource")) { + return 1; + } else { + return getDisplayName().compareToIgnoreCase(o.getDisplayName()); + } } } @@ -1228,4 +1249,5 @@ @Override protected void finish() { + Collections.sort(sources); availableSourcesModel.setSources(sources); } @@ -1248,9 +1270,9 @@ StringBuilder s = new StringBuilder(""); if (entry.title != null) { - s.append(entry.title).append(" ("); + s.append(entry.title).append(" "); } s.append(entry.url); if (entry.title != null) { - s.append(")"); + s.append(""); } s.append("");