Remove debug print statements and turn off verbose logging

openjdk · Dec 3, 2020 · 3078e21 · 3078e21
1 parent 0f61cd3
commit 3078e21
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 16 deletions.
diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Application.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Application.java
@@ -221,31 +221,27 @@ public String getDataDirectory() {
     // Overridden methods need to call super.
 
     protected void notifyWillFinishLaunching() {
-        System.err.println("Application::notifyWillFinishLaunching");
         EventHandler handler = getEventHandler();
         if (handler != null) {
             handler.handleWillFinishLaunchingAction(this, System.nanoTime());
         }
     }
 
     protected void notifyDidFinishLaunching() {
-        System.err.println("Application::notifyDidFinishLaunching");
         EventHandler handler = getEventHandler();
         if (handler != null) {
             handler.handleDidFinishLaunchingAction(this, System.nanoTime());
         }
     }
 
     protected void notifyWillBecomeActive() {
-        System.err.println("Application::notifyWillBecomeActive");
         EventHandler handler = getEventHandler();
         if (handler != null) {
             handler.handleWillBecomeActiveAction(this, System.nanoTime());
         }
     }
 
     protected void notifyDidBecomeActive() {
-        System.err.println("Application::notifyDidBecomeActive");
         this.initialActiveEventReceived = true;
         EventHandler handler = getEventHandler();
         if (handler != null) {
@@ -254,7 +250,6 @@ protected void notifyDidBecomeActive() {
     }
 
     protected void notifyWillResignActive() {
-        System.err.println("Application::notifyWillResignActive");
         EventHandler handler = getEventHandler();
         if (handler != null) {
             handler.handleWillResignActiveAction(this, System.nanoTime());
@@ -270,7 +265,6 @@ protected boolean notifyThemeChanged(String themeName) {
     }
 
     protected void notifyDidResignActive() {
-        System.err.println("Application::notifyDidResignActive");
         EventHandler handler = getEventHandler();
         if (handler != null) {
             handler.handleDidResignActiveAction(this, System.nanoTime());
@@ -597,7 +591,6 @@ public final Window createWindow(Screen screen, int styleMask) {
     protected abstract Size staticCursor_getBestSize(int width, int height);
 
     public final Menu createMenu(String title) {
-        System.err.println("Application::createMenu title:" + title);
         return new Menu(title);
     }
 

diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java
@@ -82,8 +82,6 @@ protected void runLoop(final Runnable launchable) {
         final Runnable wrappedRunnable = () -> {
             if (isNormalTaskbarApp()) {
                 waitForReactivation();
-            } else {
-                System.err.println("KCR: no reactivation needed");
             }
             launchable.run();
         };
@@ -102,7 +100,6 @@ protected void runLoop(final Runnable launchable) {
 
     // Spin up a nested even loop waiting for the app reactivation event
     void waitForReactivation() {
-        System.err.println("KCR: waitForReactivation");
         final EventLoop eventLoop = createEventLoop();
         Thread thr = new Thread(() -> {
             try {
@@ -111,16 +108,13 @@ void waitForReactivation() {
                 ex.printStackTrace();
             }
             Application.invokeLater(() -> {
-                System.err.println("KCR: exit nested event loop");
                 eventLoop.leave(null);
             });
         });
         thr.setDaemon(true);
         thr.start();
 
-        System.err.println("KCR: enter nested event loop");
         eventLoop.enter();
-        System.err.println("KCR: nested event loop returns");
     }
 
     native private void _finishTerminating();

diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassApplication.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassApplication.m
@@ -40,7 +40,7 @@
 #import "ProcessInfo.h"
 #import <Security/SecRequirement.h>
 
-#define VERBOSE
+//#define VERBOSE
 #ifndef VERBOSE
     #define LOG(MSG, ...)
 #else

diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassMenu.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassMenu.m
@@ -33,7 +33,7 @@
 #import "GlassHelper.h"
 #import "GlassKey.h"
 
-#define VERBOSE
+//#define VERBOSE
 #ifndef VERBOSE
     #define LOG(MSG, ...)
 #else

diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow.m
@@ -76,7 +76,7 @@
 //    (*env)->DeleteLocalRef(env, theString);
 //}
 
-#define VERBOSE
+//#define VERBOSE
 #ifndef VERBOSE
     #define LOG(MSG, ...)
 #else