better handling of imports null case (fixes #3429)

This commit is contained in:
Ben Fry
2015-06-26 11:55:51 -04:00
parent 1a39e9913b
commit fcc03debcf
2 changed files with 6 additions and 17 deletions

View File

@@ -255,22 +255,7 @@ public class AvailableContribution extends Contribution {
category = sb.toString();
}
//String specifiedImport = "";
StringList importsList = parseImports(properties);
/*
if (importsList == null || importsList.isEmpty()) {
specifiedImport = getImportStr();
} else {
StringBuilder sbImport = new StringBuilder();
for (String it : imports) {
sbImport.append(it);
sbImport.append(',');
}
sbImport.deleteCharAt(sbImport.length() - 1);
specifiedImport = sbImport.toString();
}
*/
String importItem = importsList.join(",");
String authors = properties.get(AUTHORS_PROPERTY);
if (authors == null) {
@@ -358,8 +343,8 @@ public class AvailableContribution extends Contribution {
writer.println("lastUpdated=" + lastUpdated);
writer.println("minRevision=" + minRev);
writer.println("maxRevision=" + maxRev);
if (getType() == ContributionType.LIBRARY) {
writer.println("imports=" + importItem);
if (getType() == ContributionType.LIBRARY && importsList != null) {
writer.println("imports=" + importsList.join(","));
}
if (getType() == ContributionType.EXAMPLES) {
writer.println(MODES_PROPERTY + "=" + compatibleContribsList);

View File

@@ -52,6 +52,10 @@ X finish adding 'examples' contribs
X https://github.com/processing/processing/issues/2953
o don't return here, allow contrib types to fail:
o https://github.com/processing/processing/blob/master/app/src/processing/app/contrib/ContributionListing.java#L509
X StatusPanel created for Contribution Manager
X https://github.com/processing/processing/pull/3432
X Error during installation of any contribution
X https://github.com/processing/processing/issues/3429
cleaning
o libraries in java tabs (separate .java files) are reported missing