From 3af4156afd187a5d7c709bd5baa276dca1996dd6 Mon Sep 17 00:00:00 2001 From: klime Date: Sun, 28 Aug 2016 12:36:07 +0200 Subject: [PATCH 01/12] some methods are changed to public --- .idea/artifacts/processing_core_jar.xml | 14 ++++++++++++++ core/src/META-INF/MANIFEST.MF | 4 ++++ 2 files changed, 18 insertions(+) create mode 100644 .idea/artifacts/processing_core_jar.xml create mode 100644 core/src/META-INF/MANIFEST.MF diff --git a/.idea/artifacts/processing_core_jar.xml b/.idea/artifacts/processing_core_jar.xml new file mode 100644 index 0000000000..26bb93a942 --- /dev/null +++ b/.idea/artifacts/processing_core_jar.xml @@ -0,0 +1,14 @@ + + + $PROJECT_DIR$/out/artifacts/processing_core_jar + + + + + + + + + + + \ No newline at end of file diff --git a/core/src/META-INF/MANIFEST.MF b/core/src/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..7762ae0251 --- /dev/null +++ b/core/src/META-INF/MANIFEST.MF @@ -0,0 +1,4 @@ +Manifest-Version: 1.0 +Class-Path: ant.jar jogl-all.jar gluegen-rt.jar apple.jar +Main-Class: + From 6a04f0210837c5c8c7ac5accd0fc8a18a6f5f64c Mon Sep 17 00:00:00 2001 From: klime Date: Sun, 28 Aug 2016 12:45:05 +0200 Subject: [PATCH 02/12] second commit --- core/src/processing/core/PApplet.java | 8 ++++---- core/src/processing/event/MouseEvent.java | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java index 3db2a2262b..879079a2d5 100644 --- a/core/src/processing/core/PApplet.java +++ b/core/src/processing/core/PApplet.java @@ -2547,10 +2547,10 @@ public boolean isLooping() { ////////////////////////////////////////////////////////////// - InternalEventQueue eventQueue = new InternalEventQueue(); + public InternalEventQueue eventQueue = new InternalEventQueue(); - static class InternalEventQueue { + public static class InternalEventQueue { protected Event queue[] = new Event[10]; protected int offset; protected int count; @@ -2562,7 +2562,7 @@ synchronized void add(Event e) { queue[count++] = e; } - synchronized Event remove() { + synchronized public Event remove() { if (offset == count) { throw new RuntimeException("Nothing left on the event queue."); } @@ -2575,7 +2575,7 @@ synchronized Event remove() { return outgoing; } - synchronized boolean available() { + synchronized public boolean available() { return count != 0; } } diff --git a/core/src/processing/event/MouseEvent.java b/core/src/processing/event/MouseEvent.java index bde328ff33..a464e884be 100644 --- a/core/src/processing/event/MouseEvent.java +++ b/core/src/processing/event/MouseEvent.java @@ -66,12 +66,19 @@ public MouseEvent(Object nativeObject, public int getX() { return x; } + public void setX(int x){ + this.x = x; + } public int getY() { return y; } + public void setY(int y){ + this.y=y; + } + /** Which button was pressed, either LEFT, CENTER, or RIGHT. */ public int getButton() { From d7542629169762b5b69a4ebb00eb7349895340f8 Mon Sep 17 00:00:00 2001 From: klime Date: Sun, 28 Aug 2016 12:45:27 +0200 Subject: [PATCH 03/12] git ignore --- .gitignore | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 528a5fbbbc..a5f261dc5b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,13 @@ .AppleDouble ._* *~ -/build/shared/reference.zip +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip +.idea +*.iml From 6a30c696270f6a7584ed69ca2ade0a69f1166c05 Mon Sep 17 00:00:00 2001 From: simoncev Date: Sun, 28 Aug 2016 12:59:41 +0200 Subject: [PATCH 04/12] Revert "some methods are changed to public" This reverts commit 3af4156afd187a5d7c709bd5baa276dca1996dd6. --- .idea/artifacts/processing_core_jar.xml | 14 -------------- core/src/META-INF/MANIFEST.MF | 4 ---- 2 files changed, 18 deletions(-) delete mode 100644 .idea/artifacts/processing_core_jar.xml delete mode 100644 core/src/META-INF/MANIFEST.MF diff --git a/.idea/artifacts/processing_core_jar.xml b/.idea/artifacts/processing_core_jar.xml deleted file mode 100644 index 26bb93a942..0000000000 --- a/.idea/artifacts/processing_core_jar.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - $PROJECT_DIR$/out/artifacts/processing_core_jar - - - - - - - - - - - \ No newline at end of file diff --git a/core/src/META-INF/MANIFEST.MF b/core/src/META-INF/MANIFEST.MF deleted file mode 100644 index 7762ae0251..0000000000 --- a/core/src/META-INF/MANIFEST.MF +++ /dev/null @@ -1,4 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: ant.jar jogl-all.jar gluegen-rt.jar apple.jar -Main-Class: - From e67b37c04831e810e65c2e3bcd6e7132e70272e6 Mon Sep 17 00:00:00 2001 From: simoncev Date: Sun, 28 Aug 2016 13:06:44 +0200 Subject: [PATCH 05/12] git ignore .idea/ --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a5f261dc5b..9f7c516e45 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,5 @@ *.rar *.tar *.zip -.idea +.idea/ *.iml From 121eb95856cbd63d6421b49f8e0b74be555202d8 Mon Sep 17 00:00:00 2001 From: simoncev Date: Sun, 28 Aug 2016 13:19:46 +0200 Subject: [PATCH 06/12] git ignore idea out dir --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9f7c516e45..35b6c62675 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ *.tar *.zip .idea/ +out/ *.iml From 0a1d0a715d9e6e7844f6dbbb83aab144c31eafa7 Mon Sep 17 00:00:00 2001 From: klime Date: Sun, 28 Aug 2016 12:36:07 +0200 Subject: [PATCH 07/12] some methods are changed to public --- .idea/artifacts/processing_core_jar.xml | 14 ++++++++++++++ core/src/META-INF/MANIFEST.MF | 4 ++++ 2 files changed, 18 insertions(+) create mode 100644 .idea/artifacts/processing_core_jar.xml create mode 100644 core/src/META-INF/MANIFEST.MF diff --git a/.idea/artifacts/processing_core_jar.xml b/.idea/artifacts/processing_core_jar.xml new file mode 100644 index 0000000000..26bb93a942 --- /dev/null +++ b/.idea/artifacts/processing_core_jar.xml @@ -0,0 +1,14 @@ + + + $PROJECT_DIR$/out/artifacts/processing_core_jar + + + + + + + + + + + \ No newline at end of file diff --git a/core/src/META-INF/MANIFEST.MF b/core/src/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..7762ae0251 --- /dev/null +++ b/core/src/META-INF/MANIFEST.MF @@ -0,0 +1,4 @@ +Manifest-Version: 1.0 +Class-Path: ant.jar jogl-all.jar gluegen-rt.jar apple.jar +Main-Class: + From 7d9bdc354e51402c2d52bee692cbecd773a96ff7 Mon Sep 17 00:00:00 2001 From: klime Date: Sun, 28 Aug 2016 12:45:05 +0200 Subject: [PATCH 08/12] second commit --- core/src/processing/core/PApplet.java | 8 ++++---- core/src/processing/event/MouseEvent.java | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java index 048276d8a1..e559bf951a 100644 --- a/core/src/processing/core/PApplet.java +++ b/core/src/processing/core/PApplet.java @@ -2556,10 +2556,10 @@ public boolean isLooping() { ////////////////////////////////////////////////////////////// - InternalEventQueue eventQueue = new InternalEventQueue(); + public InternalEventQueue eventQueue = new InternalEventQueue(); - static class InternalEventQueue { + public static class InternalEventQueue { protected Event queue[] = new Event[10]; protected int offset; protected int count; @@ -2571,7 +2571,7 @@ synchronized void add(Event e) { queue[count++] = e; } - synchronized Event remove() { + synchronized public Event remove() { if (offset == count) { throw new RuntimeException("Nothing left on the event queue."); } @@ -2584,7 +2584,7 @@ synchronized Event remove() { return outgoing; } - synchronized boolean available() { + synchronized public boolean available() { return count != 0; } } diff --git a/core/src/processing/event/MouseEvent.java b/core/src/processing/event/MouseEvent.java index bde328ff33..a464e884be 100644 --- a/core/src/processing/event/MouseEvent.java +++ b/core/src/processing/event/MouseEvent.java @@ -66,12 +66,19 @@ public MouseEvent(Object nativeObject, public int getX() { return x; } + public void setX(int x){ + this.x = x; + } public int getY() { return y; } + public void setY(int y){ + this.y=y; + } + /** Which button was pressed, either LEFT, CENTER, or RIGHT. */ public int getButton() { From 0273ea0d3f78c1f384ad0ca7cdaf781acd733739 Mon Sep 17 00:00:00 2001 From: klime Date: Sun, 28 Aug 2016 12:45:27 +0200 Subject: [PATCH 09/12] git ignore --- .gitignore | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 528a5fbbbc..a5f261dc5b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,13 @@ .AppleDouble ._* *~ -/build/shared/reference.zip +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip +.idea +*.iml From 9c562acaebaaff9bbf5ccf784de8094078d3a447 Mon Sep 17 00:00:00 2001 From: simoncev Date: Sun, 28 Aug 2016 12:59:41 +0200 Subject: [PATCH 10/12] Revert "some methods are changed to public" This reverts commit 3af4156afd187a5d7c709bd5baa276dca1996dd6. --- .idea/artifacts/processing_core_jar.xml | 14 -------------- core/src/META-INF/MANIFEST.MF | 4 ---- 2 files changed, 18 deletions(-) delete mode 100644 .idea/artifacts/processing_core_jar.xml delete mode 100644 core/src/META-INF/MANIFEST.MF diff --git a/.idea/artifacts/processing_core_jar.xml b/.idea/artifacts/processing_core_jar.xml deleted file mode 100644 index 26bb93a942..0000000000 --- a/.idea/artifacts/processing_core_jar.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - $PROJECT_DIR$/out/artifacts/processing_core_jar - - - - - - - - - - - \ No newline at end of file diff --git a/core/src/META-INF/MANIFEST.MF b/core/src/META-INF/MANIFEST.MF deleted file mode 100644 index 7762ae0251..0000000000 --- a/core/src/META-INF/MANIFEST.MF +++ /dev/null @@ -1,4 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: ant.jar jogl-all.jar gluegen-rt.jar apple.jar -Main-Class: - From 545fb9a62bfa24f703f0184bc8ef75a1cf7dcae2 Mon Sep 17 00:00:00 2001 From: simoncev Date: Sun, 28 Aug 2016 13:06:44 +0200 Subject: [PATCH 11/12] git ignore .idea/ --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a5f261dc5b..9f7c516e45 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,5 @@ *.rar *.tar *.zip -.idea +.idea/ *.iml From c4e95f3b63296a91c6b6dd5fb398125646327941 Mon Sep 17 00:00:00 2001 From: simoncev Date: Sun, 28 Aug 2016 13:19:46 +0200 Subject: [PATCH 12/12] git ignore idea out dir --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9f7c516e45..35b6c62675 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ *.tar *.zip .idea/ +out/ *.iml