private final String myPackageId;\r
private final String myVersion;\r
\r
- public PackageInfo(@Nullable final String source,\r
++
+ public SourcePackageInfo(@Nullable final String source,\r
@NotNull final String packageId,\r
@NotNull final String version) {\r
mySource = source;\r
return null;\r
}\r
\r
- private String serializeHashcode(@NotNull final Collection<PackageInfo> _packages) {\r
- List<PackageInfo> sorted = new ArrayList<PackageInfo>(_packages);\r
- Collections.sort(sorted, new Comparator<PackageInfo>() {\r
- public int compare(PackageInfo o1, PackageInfo o2) {\r
+ private String serializeHashcode(@NotNull final Collection<SourcePackageInfo> _packages) {\r
+ List<SourcePackageInfo> sorted = new ArrayList<SourcePackageInfo>(_packages);\r
+ Collections.sort(sorted, new Comparator<SourcePackageInfo>() {\r
+ public int compare(SourcePackageInfo o1, SourcePackageInfo o2) {\r
int i;\r
- if (0 != (i = o1.getSource().compareTo(o2.getSource()))) return i;\r
+ String s1 = o1.getSource();\r
+ String s2 = o2.getSource();\r
+ if (s1 != null && s2 != null && 0 != (i = s1.compareTo(s2))) return i;\r
if (0 != (i = o1.getPackageId().compareTo(o2.getPackageId()))) return i;\r
if (0 != (i = o1.getVersion().compareTo(o2.getVersion()))) return i;\r
return 0;\r