From c4ebfcd735500713f91426a76e604ad99133e01f Mon Sep 17 00:00:00 2001 From: Lukasz Kozakiewicz Date: Wed, 31 Jan 2018 18:17:05 +0100 Subject: [PATCH] Re-saved all projects. --- .../AnalyticsCollection.java | 28 ++++++++++++++++--- .../DSPDemo/JuceLibraryCode/BinaryData.cpp | 8 +++--- examples/DSPDemo/JuceLibraryCode/BinaryData.h | 4 +-- .../main/java/com/roli/jucedemo/JuceDemo.java | 28 ++++++++++++++++--- .../InAppPurchase.java | 28 ++++++++++++++++--- .../com/yourcompany/miditest/MidiTest.java | 28 ++++++++++++++++--- .../JUCENetworkGraphicsDemo.java | 28 ++++++++++++++++--- .../yourcompany/oscreceiver/OSCReceiver.java | 28 ++++++++++++++++--- .../com/yourcompany/oscsender/OSCSender.java | 28 ++++++++++++++++--- .../PushNotificationsDemo.java | 28 ++++++++++++++++--- .../juce/jucedemoplugin/JuceDemoPlugin.java | 28 ++++++++++++++++--- .../AudioPerformanceTest.java | 28 ++++++++++++++++--- .../native/java/JuceAppActivity.java | 14 +++++----- 13 files changed, 253 insertions(+), 53 deletions(-) diff --git a/examples/AnalyticsCollection/Builds/Android/app/src/main/java/com/yourcompany/analyticscollection/AnalyticsCollection.java b/examples/AnalyticsCollection/Builds/Android/app/src/main/java/com/yourcompany/analyticscollection/AnalyticsCollection.java index d04e524b7f..91192aea8f 100644 --- a/examples/AnalyticsCollection/Builds/Android/app/src/main/java/com/yourcompany/analyticscollection/AnalyticsCollection.java +++ b/examples/AnalyticsCollection/Builds/Android/app/src/main/java/com/yourcompany/analyticscollection/AnalyticsCollection.java @@ -1037,15 +1037,29 @@ public class AnalyticsCollection extends Activity //============================================================================== public static class NativeInvocationHandler implements InvocationHandler { - public NativeInvocationHandler (long nativeContextRef) + public NativeInvocationHandler (Activity activityToUse, long nativeContextRef) { + activity = activityToUse; nativeContext = nativeContextRef; } + public void nativeContextDeleted() + { + nativeContext = 0; + } + @Override public void finalize() { - dispatchFinalize (nativeContext); + activity.runOnUiThread (new Runnable() + { + @Override + public void run() + { + if (nativeContext != 0) + dispatchFinalize (nativeContext); + } + }); } @Override @@ -1055,15 +1069,21 @@ public class AnalyticsCollection extends Activity } //============================================================================== + Activity activity; private long nativeContext = 0; private native void dispatchFinalize (long nativeContextRef); private native Object dispatchInvoke (long nativeContextRef, Object proxy, Method method, Object[] args); } - public static InvocationHandler createInvocationHandler (long nativeContextRef) + public InvocationHandler createInvocationHandler (long nativeContextRef) { - return new NativeInvocationHandler (nativeContextRef); + return new NativeInvocationHandler (this, nativeContextRef); + } + + public void invocationHandlerContextDeleted (InvocationHandler handler) + { + ((NativeInvocationHandler) handler).nativeContextDeleted(); } //============================================================================== diff --git a/examples/DSPDemo/JuceLibraryCode/BinaryData.cpp b/examples/DSPDemo/JuceLibraryCode/BinaryData.cpp index ae4d7cf2de..5e5c4711fc 100644 --- a/examples/DSPDemo/JuceLibraryCode/BinaryData.cpp +++ b/examples/DSPDemo/JuceLibraryCode/BinaryData.cpp @@ -1560,7 +1560,7 @@ static const unsigned char temp_binary_data_3[] = " {\r\n" " bypass = false;\r\n" "\r\n" -" auto maxSize = static_cast (roundDoubleToInt (8192.0 * sampleRate / 44100.0));\r\n" +" auto maxSize = static_cast (roundToInt (sampleRate * (8192.0 / 44100.0)));\r\n" "\r\n" " if (cabinetTypeParameter->getCurrentSelectedID() == 2)\r\n" " convolution.loadImpulseResponse (BinaryData::guitar_amp_wav,\r\n" @@ -2235,7 +2235,7 @@ static const unsigned char temp_binary_data_10[] = "\r\n" " ChoiceParameter typeParam {{ \"Low-pass\", \"Band-pass\", \"High-pass\"}, 1, \"Type\" };\r\n" " SliderParameter cutoffParam {{ 20.0, 20000.0 }, 0.5, 440.0f, \"Cutoff\", \"Hz\" };\r\n" -" SliderParameter qParam {{ 0.3, 20.0 }, 0.5, 1.0 / std::sqrt (2.0), \"Resonance\" };\r\n" +" SliderParameter qParam {{ 0.3, 20.0 }, 0.5, 1.0 / MathConstants::sqrt2, \"Resonance\" };\r\n" "\r\n" " std::vector parameters { &typeParam, &cutoffParam, &qParam };\r\n" " double sampleRate = 0;\r\n" @@ -2325,14 +2325,14 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw case 0x409ff6ec: numBytes = 37902; return cassette_recorder_wav; case 0x69523d16: numBytes = 628; return EditorColourScheme_xml; case 0x700ccf3c: numBytes = 90246; return guitar_amp_wav; - case 0x5922ccdf: numBytes = 3011; return ConvolutionDemo_cpp; + case 0x5922ccdf: numBytes = 3007; return ConvolutionDemo_cpp; case 0x14aa0aae: numBytes = 2674; return FIRFilterDemo_cpp; case 0xab621a06: numBytes = 1809; return GainDemo_cpp; case 0x06a7a4b1: numBytes = 2819; return IIRFilterDemo_cpp; case 0x6fc33e27: numBytes = 3986; return OscillatorDemo_cpp; case 0xdfdc547d: numBytes = 3039; return OverdriveDemo_cpp; case 0x3f21e597: numBytes = 4849; return SIMDRegisterDemo_cpp; - case 0x54e9f84c: numBytes = 2718; return StateVariableFilterDemo_cpp; + case 0x54e9f84c: numBytes = 2731; return StateVariableFilterDemo_cpp; case 0x5ce06dd8: numBytes = 2037; return WaveShaperTanhDemo_cpp; default: break; } diff --git a/examples/DSPDemo/JuceLibraryCode/BinaryData.h b/examples/DSPDemo/JuceLibraryCode/BinaryData.h index 09d3f2ba07..163b3ce0b2 100644 --- a/examples/DSPDemo/JuceLibraryCode/BinaryData.h +++ b/examples/DSPDemo/JuceLibraryCode/BinaryData.h @@ -18,7 +18,7 @@ namespace BinaryData const int guitar_amp_wavSize = 90246; extern const char* ConvolutionDemo_cpp; - const int ConvolutionDemo_cppSize = 3011; + const int ConvolutionDemo_cppSize = 3007; extern const char* FIRFilterDemo_cpp; const int FIRFilterDemo_cppSize = 2674; @@ -39,7 +39,7 @@ namespace BinaryData const int SIMDRegisterDemo_cppSize = 4849; extern const char* StateVariableFilterDemo_cpp; - const int StateVariableFilterDemo_cppSize = 2718; + const int StateVariableFilterDemo_cppSize = 2731; extern const char* WaveShaperTanhDemo_cpp; const int WaveShaperTanhDemo_cppSize = 2037; diff --git a/examples/Demo/Builds/Android/app/src/main/java/com/roli/jucedemo/JuceDemo.java b/examples/Demo/Builds/Android/app/src/main/java/com/roli/jucedemo/JuceDemo.java index 043e83167e..eb4ed1cc4b 100644 --- a/examples/Demo/Builds/Android/app/src/main/java/com/roli/jucedemo/JuceDemo.java +++ b/examples/Demo/Builds/Android/app/src/main/java/com/roli/jucedemo/JuceDemo.java @@ -1037,15 +1037,29 @@ public class JuceDemo extends Activity //============================================================================== public static class NativeInvocationHandler implements InvocationHandler { - public NativeInvocationHandler (long nativeContextRef) + public NativeInvocationHandler (Activity activityToUse, long nativeContextRef) { + activity = activityToUse; nativeContext = nativeContextRef; } + public void nativeContextDeleted() + { + nativeContext = 0; + } + @Override public void finalize() { - dispatchFinalize (nativeContext); + activity.runOnUiThread (new Runnable() + { + @Override + public void run() + { + if (nativeContext != 0) + dispatchFinalize (nativeContext); + } + }); } @Override @@ -1055,15 +1069,21 @@ public class JuceDemo extends Activity } //============================================================================== + Activity activity; private long nativeContext = 0; private native void dispatchFinalize (long nativeContextRef); private native Object dispatchInvoke (long nativeContextRef, Object proxy, Method method, Object[] args); } - public static InvocationHandler createInvocationHandler (long nativeContextRef) + public InvocationHandler createInvocationHandler (long nativeContextRef) { - return new NativeInvocationHandler (nativeContextRef); + return new NativeInvocationHandler (this, nativeContextRef); + } + + public void invocationHandlerContextDeleted (InvocationHandler handler) + { + ((NativeInvocationHandler) handler).nativeContextDeleted(); } //============================================================================== diff --git a/examples/InAppPurchase/Builds/Android/app/src/main/java/com/roli/juceinapppurchasesample/InAppPurchase.java b/examples/InAppPurchase/Builds/Android/app/src/main/java/com/roli/juceinapppurchasesample/InAppPurchase.java index 4cdc7787ce..4fa4675c69 100644 --- a/examples/InAppPurchase/Builds/Android/app/src/main/java/com/roli/juceinapppurchasesample/InAppPurchase.java +++ b/examples/InAppPurchase/Builds/Android/app/src/main/java/com/roli/juceinapppurchasesample/InAppPurchase.java @@ -1037,15 +1037,29 @@ public class InAppPurchase extends Activity //============================================================================== public static class NativeInvocationHandler implements InvocationHandler { - public NativeInvocationHandler (long nativeContextRef) + public NativeInvocationHandler (Activity activityToUse, long nativeContextRef) { + activity = activityToUse; nativeContext = nativeContextRef; } + public void nativeContextDeleted() + { + nativeContext = 0; + } + @Override public void finalize() { - dispatchFinalize (nativeContext); + activity.runOnUiThread (new Runnable() + { + @Override + public void run() + { + if (nativeContext != 0) + dispatchFinalize (nativeContext); + } + }); } @Override @@ -1055,15 +1069,21 @@ public class InAppPurchase extends Activity } //============================================================================== + Activity activity; private long nativeContext = 0; private native void dispatchFinalize (long nativeContextRef); private native Object dispatchInvoke (long nativeContextRef, Object proxy, Method method, Object[] args); } - public static InvocationHandler createInvocationHandler (long nativeContextRef) + public InvocationHandler createInvocationHandler (long nativeContextRef) { - return new NativeInvocationHandler (nativeContextRef); + return new NativeInvocationHandler (this, nativeContextRef); + } + + public void invocationHandlerContextDeleted (InvocationHandler handler) + { + ((NativeInvocationHandler) handler).nativeContextDeleted(); } //============================================================================== diff --git a/examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java b/examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java index cad3cc056b..3e01a9fae1 100644 --- a/examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java +++ b/examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java @@ -1969,15 +1969,29 @@ public class MidiTest extends Activity //============================================================================== public static class NativeInvocationHandler implements InvocationHandler { - public NativeInvocationHandler (long nativeContextRef) + public NativeInvocationHandler (Activity activityToUse, long nativeContextRef) { + activity = activityToUse; nativeContext = nativeContextRef; } + public void nativeContextDeleted() + { + nativeContext = 0; + } + @Override public void finalize() { - dispatchFinalize (nativeContext); + activity.runOnUiThread (new Runnable() + { + @Override + public void run() + { + if (nativeContext != 0) + dispatchFinalize (nativeContext); + } + }); } @Override @@ -1987,15 +2001,21 @@ public class MidiTest extends Activity } //============================================================================== + Activity activity; private long nativeContext = 0; private native void dispatchFinalize (long nativeContextRef); private native Object dispatchInvoke (long nativeContextRef, Object proxy, Method method, Object[] args); } - public static InvocationHandler createInvocationHandler (long nativeContextRef) + public InvocationHandler createInvocationHandler (long nativeContextRef) { - return new NativeInvocationHandler (nativeContextRef); + return new NativeInvocationHandler (this, nativeContextRef); + } + + public void invocationHandlerContextDeleted (InvocationHandler handler) + { + ((NativeInvocationHandler) handler).nativeContextDeleted(); } //============================================================================== diff --git a/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java b/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java index 248b43cfa3..a45e571573 100644 --- a/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java +++ b/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java @@ -1037,15 +1037,29 @@ public class JUCENetworkGraphicsDemo extends Activity //============================================================================== public static class NativeInvocationHandler implements InvocationHandler { - public NativeInvocationHandler (long nativeContextRef) + public NativeInvocationHandler (Activity activityToUse, long nativeContextRef) { + activity = activityToUse; nativeContext = nativeContextRef; } + public void nativeContextDeleted() + { + nativeContext = 0; + } + @Override public void finalize() { - dispatchFinalize (nativeContext); + activity.runOnUiThread (new Runnable() + { + @Override + public void run() + { + if (nativeContext != 0) + dispatchFinalize (nativeContext); + } + }); } @Override @@ -1055,15 +1069,21 @@ public class JUCENetworkGraphicsDemo extends Activity } //============================================================================== + Activity activity; private long nativeContext = 0; private native void dispatchFinalize (long nativeContextRef); private native Object dispatchInvoke (long nativeContextRef, Object proxy, Method method, Object[] args); } - public static InvocationHandler createInvocationHandler (long nativeContextRef) + public InvocationHandler createInvocationHandler (long nativeContextRef) { - return new NativeInvocationHandler (nativeContextRef); + return new NativeInvocationHandler (this, nativeContextRef); + } + + public void invocationHandlerContextDeleted (InvocationHandler handler) + { + ((NativeInvocationHandler) handler).nativeContextDeleted(); } //============================================================================== diff --git a/examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java b/examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java index 31e7c5033d..e6f4e9abe7 100644 --- a/examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java +++ b/examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java @@ -1037,15 +1037,29 @@ public class OSCReceiver extends Activity //============================================================================== public static class NativeInvocationHandler implements InvocationHandler { - public NativeInvocationHandler (long nativeContextRef) + public NativeInvocationHandler (Activity activityToUse, long nativeContextRef) { + activity = activityToUse; nativeContext = nativeContextRef; } + public void nativeContextDeleted() + { + nativeContext = 0; + } + @Override public void finalize() { - dispatchFinalize (nativeContext); + activity.runOnUiThread (new Runnable() + { + @Override + public void run() + { + if (nativeContext != 0) + dispatchFinalize (nativeContext); + } + }); } @Override @@ -1055,15 +1069,21 @@ public class OSCReceiver extends Activity } //============================================================================== + Activity activity; private long nativeContext = 0; private native void dispatchFinalize (long nativeContextRef); private native Object dispatchInvoke (long nativeContextRef, Object proxy, Method method, Object[] args); } - public static InvocationHandler createInvocationHandler (long nativeContextRef) + public InvocationHandler createInvocationHandler (long nativeContextRef) { - return new NativeInvocationHandler (nativeContextRef); + return new NativeInvocationHandler (this, nativeContextRef); + } + + public void invocationHandlerContextDeleted (InvocationHandler handler) + { + ((NativeInvocationHandler) handler).nativeContextDeleted(); } //============================================================================== diff --git a/examples/OSCSender/Builds/Android/app/src/main/java/com/yourcompany/oscsender/OSCSender.java b/examples/OSCSender/Builds/Android/app/src/main/java/com/yourcompany/oscsender/OSCSender.java index e2f87762fe..dd4c7b6e88 100644 --- a/examples/OSCSender/Builds/Android/app/src/main/java/com/yourcompany/oscsender/OSCSender.java +++ b/examples/OSCSender/Builds/Android/app/src/main/java/com/yourcompany/oscsender/OSCSender.java @@ -1037,15 +1037,29 @@ public class OSCSender extends Activity //============================================================================== public static class NativeInvocationHandler implements InvocationHandler { - public NativeInvocationHandler (long nativeContextRef) + public NativeInvocationHandler (Activity activityToUse, long nativeContextRef) { + activity = activityToUse; nativeContext = nativeContextRef; } + public void nativeContextDeleted() + { + nativeContext = 0; + } + @Override public void finalize() { - dispatchFinalize (nativeContext); + activity.runOnUiThread (new Runnable() + { + @Override + public void run() + { + if (nativeContext != 0) + dispatchFinalize (nativeContext); + } + }); } @Override @@ -1055,15 +1069,21 @@ public class OSCSender extends Activity } //============================================================================== + Activity activity; private long nativeContext = 0; private native void dispatchFinalize (long nativeContextRef); private native Object dispatchInvoke (long nativeContextRef, Object proxy, Method method, Object[] args); } - public static InvocationHandler createInvocationHandler (long nativeContextRef) + public InvocationHandler createInvocationHandler (long nativeContextRef) { - return new NativeInvocationHandler (nativeContextRef); + return new NativeInvocationHandler (this, nativeContextRef); + } + + public void invocationHandlerContextDeleted (InvocationHandler handler) + { + ((NativeInvocationHandler) handler).nativeContextDeleted(); } //============================================================================== diff --git a/examples/PushNotificationsDemo/Builds/Android/app/src/main/java/com/juce/pushnotificationsdemo/PushNotificationsDemo.java b/examples/PushNotificationsDemo/Builds/Android/app/src/main/java/com/juce/pushnotificationsdemo/PushNotificationsDemo.java index a2af8f0bc5..b86a27b15e 100644 --- a/examples/PushNotificationsDemo/Builds/Android/app/src/main/java/com/juce/pushnotificationsdemo/PushNotificationsDemo.java +++ b/examples/PushNotificationsDemo/Builds/Android/app/src/main/java/com/juce/pushnotificationsdemo/PushNotificationsDemo.java @@ -1969,15 +1969,29 @@ public class PushNotificationsDemo extends Activity //============================================================================== public static class NativeInvocationHandler implements InvocationHandler { - public NativeInvocationHandler (long nativeContextRef) + public NativeInvocationHandler (Activity activityToUse, long nativeContextRef) { + activity = activityToUse; nativeContext = nativeContextRef; } + public void nativeContextDeleted() + { + nativeContext = 0; + } + @Override public void finalize() { - dispatchFinalize (nativeContext); + activity.runOnUiThread (new Runnable() + { + @Override + public void run() + { + if (nativeContext != 0) + dispatchFinalize (nativeContext); + } + }); } @Override @@ -1987,15 +2001,21 @@ public class PushNotificationsDemo extends Activity } //============================================================================== + Activity activity; private long nativeContext = 0; private native void dispatchFinalize (long nativeContextRef); private native Object dispatchInvoke (long nativeContextRef, Object proxy, Method method, Object[] args); } - public static InvocationHandler createInvocationHandler (long nativeContextRef) + public InvocationHandler createInvocationHandler (long nativeContextRef) { - return new NativeInvocationHandler (nativeContextRef); + return new NativeInvocationHandler (this, nativeContextRef); + } + + public void invocationHandlerContextDeleted (InvocationHandler handler) + { + ((NativeInvocationHandler) handler).nativeContextDeleted(); } //============================================================================== diff --git a/examples/audio plugin demo/Builds/Android/app/src/main/java/com/juce/jucedemoplugin/JuceDemoPlugin.java b/examples/audio plugin demo/Builds/Android/app/src/main/java/com/juce/jucedemoplugin/JuceDemoPlugin.java index 0c4b921eb0..82186065cd 100644 --- a/examples/audio plugin demo/Builds/Android/app/src/main/java/com/juce/jucedemoplugin/JuceDemoPlugin.java +++ b/examples/audio plugin demo/Builds/Android/app/src/main/java/com/juce/jucedemoplugin/JuceDemoPlugin.java @@ -1969,15 +1969,29 @@ public class JuceDemoPlugin extends Activity //============================================================================== public static class NativeInvocationHandler implements InvocationHandler { - public NativeInvocationHandler (long nativeContextRef) + public NativeInvocationHandler (Activity activityToUse, long nativeContextRef) { + activity = activityToUse; nativeContext = nativeContextRef; } + public void nativeContextDeleted() + { + nativeContext = 0; + } + @Override public void finalize() { - dispatchFinalize (nativeContext); + activity.runOnUiThread (new Runnable() + { + @Override + public void run() + { + if (nativeContext != 0) + dispatchFinalize (nativeContext); + } + }); } @Override @@ -1987,15 +2001,21 @@ public class JuceDemoPlugin extends Activity } //============================================================================== + Activity activity; private long nativeContext = 0; private native void dispatchFinalize (long nativeContextRef); private native Object dispatchInvoke (long nativeContextRef, Object proxy, Method method, Object[] args); } - public static InvocationHandler createInvocationHandler (long nativeContextRef) + public InvocationHandler createInvocationHandler (long nativeContextRef) { - return new NativeInvocationHandler (nativeContextRef); + return new NativeInvocationHandler (this, nativeContextRef); + } + + public void invocationHandlerContextDeleted (InvocationHandler handler) + { + ((NativeInvocationHandler) handler).nativeContextDeleted(); } //============================================================================== diff --git a/extras/AudioPerformanceTest/Builds/Android/app/src/main/java/com/juce/audioperformancetest/AudioPerformanceTest.java b/extras/AudioPerformanceTest/Builds/Android/app/src/main/java/com/juce/audioperformancetest/AudioPerformanceTest.java index 0e4a290062..8af76acf90 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/src/main/java/com/juce/audioperformancetest/AudioPerformanceTest.java +++ b/extras/AudioPerformanceTest/Builds/Android/app/src/main/java/com/juce/audioperformancetest/AudioPerformanceTest.java @@ -1969,15 +1969,29 @@ public class AudioPerformanceTest extends Activity //============================================================================== public static class NativeInvocationHandler implements InvocationHandler { - public NativeInvocationHandler (long nativeContextRef) + public NativeInvocationHandler (Activity activityToUse, long nativeContextRef) { + activity = activityToUse; nativeContext = nativeContextRef; } + public void nativeContextDeleted() + { + nativeContext = 0; + } + @Override public void finalize() { - dispatchFinalize (nativeContext); + activity.runOnUiThread (new Runnable() + { + @Override + public void run() + { + if (nativeContext != 0) + dispatchFinalize (nativeContext); + } + }); } @Override @@ -1987,15 +2001,21 @@ public class AudioPerformanceTest extends Activity } //============================================================================== + Activity activity; private long nativeContext = 0; private native void dispatchFinalize (long nativeContextRef); private native Object dispatchInvoke (long nativeContextRef, Object proxy, Method method, Object[] args); } - public static InvocationHandler createInvocationHandler (long nativeContextRef) + public InvocationHandler createInvocationHandler (long nativeContextRef) { - return new NativeInvocationHandler (nativeContextRef); + return new NativeInvocationHandler (this, nativeContextRef); + } + + public void invocationHandlerContextDeleted (InvocationHandler handler) + { + ((NativeInvocationHandler) handler).nativeContextDeleted(); } //============================================================================== diff --git a/modules/juce_core/native/java/JuceAppActivity.java b/modules/juce_core/native/java/JuceAppActivity.java index 2aeb1b35d2..8f7181517d 100644 --- a/modules/juce_core/native/java/JuceAppActivity.java +++ b/modules/juce_core/native/java/JuceAppActivity.java @@ -956,7 +956,7 @@ public class JuceAppActivity extends Activity public static class NativeInvocationHandler implements InvocationHandler { public NativeInvocationHandler (Activity activityToUse, long nativeContextRef) - { + { activity = activityToUse; nativeContext = nativeContextRef; } @@ -986,7 +986,7 @@ public class JuceAppActivity extends Activity return dispatchInvoke (nativeContext, proxy, method, args); } - //============================================================================== + //============================================================================== Activity activity; private long nativeContext = 0; @@ -997,11 +997,11 @@ public class JuceAppActivity extends Activity public InvocationHandler createInvocationHandler (long nativeContextRef) { return new NativeInvocationHandler (this, nativeContextRef); - } - - public void invocationHandlerContextDeleted (InvocationHandler handler) - { - ((NativeInvocationHandler) handler).nativeContextDeleted(); + } + + public void invocationHandlerContextDeleted (InvocationHandler handler) + { + ((NativeInvocationHandler) handler).nativeContextDeleted(); } //==============================================================================