From 89aeae16e85ddfbd581cb86d0b0480b1e2d50e99 Mon Sep 17 00:00:00 2001 From: Adam Farley Date: Wed, 15 Mar 2023 14:11:17 +0000 Subject: [PATCH] 8304053: Revert os specific stubs for SystemMetrics Reviewed-by: sgehwolf, andrew --- jdk/make/CompileJavaClasses.gmk | 4 +++ .../jdk/internal/platform/SystemMetrics.java | 32 ------------------- .../jdk/internal/platform/SystemMetrics.java | 31 ------------------ .../jdk/internal/platform/SystemMetrics.java | 31 ------------------ 4 files changed, 4 insertions(+), 94 deletions(-) delete mode 100644 jdk/src/aix/classes/jdk/internal/platform/SystemMetrics.java delete mode 100644 jdk/src/macosx/classes/jdk/internal/platform/SystemMetrics.java delete mode 100644 jdk/src/unix/classes/jdk/internal/platform/SystemMetrics.java diff --git a/jdk/make/CompileJavaClasses.gmk b/jdk/make/CompileJavaClasses.gmk index 3ec63e87be9..0ef45555c9d 100644 --- a/jdk/make/CompileJavaClasses.gmk +++ b/jdk/make/CompileJavaClasses.gmk @@ -307,6 +307,10 @@ endif LINUX_SRC_DIRS := ifeq ($(OPENJDK_TARGET_OS),linux) LINUX_SRC_DIRS += $(JDK_TOPDIR)/src/linux/classes + + # Linux is the only OS with an actual implementation of SystemMetrics. + # Exclude the generic null-returning stub from solaris/classes for that reason. + EXFILES += $(JDK_TOPDIR)/src/solaris/classes/jdk/internal/platform/SystemMetrics.java endif # The exception handling of swing beaninfo diff --git a/jdk/src/aix/classes/jdk/internal/platform/SystemMetrics.java b/jdk/src/aix/classes/jdk/internal/platform/SystemMetrics.java deleted file mode 100644 index f8c648ff618..00000000000 --- a/jdk/src/aix/classes/jdk/internal/platform/SystemMetrics.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package jdk.internal.platform; - -public class SystemMetrics { - public static Metrics instance() { - return null; - } -} - diff --git a/jdk/src/macosx/classes/jdk/internal/platform/SystemMetrics.java b/jdk/src/macosx/classes/jdk/internal/platform/SystemMetrics.java deleted file mode 100644 index 68fce10c352..00000000000 --- a/jdk/src/macosx/classes/jdk/internal/platform/SystemMetrics.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package jdk.internal.platform; - -public class SystemMetrics { - public static Metrics instance() { - return null; - } -} diff --git a/jdk/src/unix/classes/jdk/internal/platform/SystemMetrics.java b/jdk/src/unix/classes/jdk/internal/platform/SystemMetrics.java deleted file mode 100644 index b14b7e51d6c..00000000000 --- a/jdk/src/unix/classes/jdk/internal/platform/SystemMetrics.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package jdk.internal.platform; - -public class SystemMetrics { - public static Metrics instance() { - return null; - } -}