eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

a bit of cleaning

Browse Source
This commit is contained in:
Ben Fry
2022-03-12 12:46:10 -05:00
parent 1dcf1a0ed5
commit e378b25649
2 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/contrib/Contribution.java
+3 -15
View File
@@ -40,7 +40,7 @@ abstract public class Contribution {
static final String SPECIAL_CATEGORY = "Starred";
static final String UNKNOWN_CATEGORY = "Unknown";
static final List validCategories =
static final List<String> validCategories =
Arrays.asList("3D", "Animation", "Data", "Geometry", "GUI", "Hardware",
"I/O", "Math", "Simulation", "Sound", SPECIAL_CATEGORY,
"Typography", "Utilities", "Video & Vision", "Other");
@@ -95,20 +95,6 @@ abstract public class Contribution {
return imports;
}
/*
protected String getImportStr() {
if (imports == null || imports.isEmpty()) {
return "";
}
StringBuilder sb = new StringBuilder();
for (String importName : imports) {
sb.append(importName);
sb.append(',');
}
sb.deleteCharAt(sb.length() - 1); // delete last comma
return sb.toString();
}
*/
protected boolean hasImport(String importName) {
if (imports != null && importName != null) {
@@ -263,9 +249,11 @@ abstract public class Contribution {
}
/*
public StringDict loadProperties(File contribFolder) {
return loadProperties(contribFolder, getType());
}
*/
static public StringDict loadProperties(File contribFolder,
app/src/processing/app/contrib/ContributionListing.java
+7 -9
View File
@@ -353,7 +353,11 @@ public class ContributionListing {
try {
URL url = new URL(LISTING_URL);
File tempContribFile = Base.getSettingsFile("contribs.tmp");
tempContribFile.setWritable(true, false);
if (tempContribFile.exists() && !tempContribFile.canWrite()) {
if (!tempContribFile.setWritable(true, false)) {
System.err.println("Could not set " + tempContribFile + " writable");
}
}
ContributionManager.download(url, base.getInstalledContribsInfo(),
tempContribFile, progress);
if (!progress.isCanceled() && !progress.isError()) {
@@ -421,13 +425,6 @@ public class ContributionListing {
}
/*
protected boolean listDownloadSuccessful() {
return !listDownloadFailed;
}
*/
private List<AvailableContribution> parseContribList(File file) {
List<AvailableContribution> outgoing = new ArrayList<>();
@@ -515,7 +512,8 @@ public class ContributionListing {
}
static public Comparator<Contribution> COMPARATOR = Comparator.comparing(o -> o.getName().toLowerCase());
static public Comparator<Contribution> COMPARATOR =
Comparator.comparing(o -> o.getName().toLowerCase());
public interface ChangeListener {