From dffceffd8f38e941dcce41428a4f83c23b5e3bfd Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Sun, 29 Jan 2017 10:36:25 -0500 Subject: [PATCH] adding fix from #4843 manually --- .../processing/app/contrib/Contribution.java | 21 +++++++++++++++++++ core/todo.txt | 4 ++++ todo.txt | 7 +++++++ 3 files changed, 32 insertions(+) diff --git a/app/src/processing/app/contrib/Contribution.java b/app/src/processing/app/contrib/Contribution.java index 0e26380de..aa401375e 100644 --- a/app/src/processing/app/contrib/Contribution.java +++ b/app/src/processing/app/contrib/Contribution.java @@ -367,6 +367,27 @@ abstract public class Contribution { // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + @Override + public boolean equals(Object o) { + if (this == o) return true; + + if (o instanceof Contribution) { + Contribution that = (Contribution) o; + return name.toLowerCase().equals(that.name.toLowerCase()); + } + return false; + } + + + @Override + public int hashCode() { + return name.toLowerCase().hashCode(); + } + + + // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + public interface Filter { boolean matches(Contribution contrib); } diff --git a/core/todo.txt b/core/todo.txt index 76796b999..5f429c710 100644 --- a/core/todo.txt +++ b/core/todo.txt @@ -51,6 +51,10 @@ X https://github.com/processing/processing/pull/4797 X Fix typo in GLSL preprocessor X https://github.com/processing/processing/issues/4810 X https://github.com/processing/processing/pull/4816 +X Keep Windows timer resolution high for OpenGL sketches +X prevents frame rate in OpenGL hovering around 30 instead of 60 +X https://github.com/processing/processing/pull/4847 +X https://github.com/processing/processing/issues/4846 _ no prompt shows with selectInput() on 10.11 and 10.12 diff --git a/todo.txt b/todo.txt index 149bf70a5..0ec90691b 100755 --- a/todo.txt +++ b/todo.txt @@ -25,6 +25,7 @@ _ https://github.com/processing/processing/issues/3933 _ this may be fixed (removed invokeLater() on startup), unconfirmed _ "error during export" message, but no error message contents come through _ e.g. https://github.com/processing/processing/issues/4792 +_ 'run sketches on display' message shows up on clean install _ Mode, requiring update, appears in Updates tab but not in Modes tab _ https://github.com/processing/processing/issues/4822 @@ -75,6 +76,12 @@ X https://github.com/processing/processing/issues/3965 X https://github.com/processing/processing/pull/4762 X Report missing brace in correct tab, suppress other errors until fixed X https://github.com/processing/processing/pull/4777 +X Improvements to sketch launching and stopping +X https://github.com/processing/processing/pull/4848 +X several Contribution Manager fixes +X https://github.com/processing/processing/pull/4844 +X Add missing equals() and hashCode() to Contribution +X _ did we lose settings.path because it was too buggy?