Copyright fixes, plus jemmy retry for disconnects

thegreystone · aptmac · commit efde2e1d356a · 2026-03-05T09:56:38.000-05:00
diff --git a/application/org.openjdk.jmc.flightrecorder.flamegraph/plugin.properties b/application/org.openjdk.jmc.flightrecorder.flamegraph/plugin.properties
@@ -1,6 +1,6 @@
 #
-#  Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
-#  Copyright (c) 2023, 2025, Datadog, Inc. All rights reserved.
+#  Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2023, 2026, Datadog, Inc. All rights reserved.
 #
 #  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
diff --git a/application/org.openjdk.jmc.flightrecorder.flamegraph/plugin.xml b/application/org.openjdk.jmc.flightrecorder.flamegraph/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
-   Copyright (c) 2023, Datadog, Inc. All rights reserved.
+   Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2023, 2026, Datadog, Inc. All rights reserved.
 
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
diff --git a/application/org.openjdk.jmc.flightrecorder.flamegraph/src/main/java/org/openjdk/jmc/flightrecorder/flamegraph/Messages.java b/application/org.openjdk.jmc.flightrecorder.flamegraph/src/main/java/org/openjdk/jmc/flightrecorder/flamegraph/Messages.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, 2025, Datadog, Inc. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Datadog, Inc. All rights reserved.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/application/org.openjdk.jmc.flightrecorder.flamegraph/src/main/resources/org/openjdk/jmc/flightrecorder/flamegraph/messages.properties b/application/org.openjdk.jmc.flightrecorder.flamegraph/src/main/resources/org/openjdk/jmc/flightrecorder/flamegraph/messages.properties
@@ -1,6 +1,6 @@
 #
-#  Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
-#  Copyright (c) 2023, 2025, Datadog, Inc. All rights reserved.
+#  Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2023, 2026, Datadog, Inc. All rights reserved.
 #
 #  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
diff --git a/application/org.openjdk.jmc.flightrecorder.flamegraph/src/main/resources/org/openjdk/jmc/flightrecorder/flamegraph/messages_ja.properties b/application/org.openjdk.jmc.flightrecorder.flamegraph/src/main/resources/org/openjdk/jmc/flightrecorder/flamegraph/messages_ja.properties
@@ -1,6 +1,6 @@
 #
-#  Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
-#  Copyright (c) 2023, 2025, Datadog, Inc. All rights reserved.
+#  Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2023, 2026, Datadog, Inc. All rights reserved.
 #
 #  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
diff --git a/application/org.openjdk.jmc.flightrecorder.flamegraph/src/main/resources/org/openjdk/jmc/flightrecorder/flamegraph/messages_zh.properties b/application/org.openjdk.jmc.flightrecorder.flamegraph/src/main/resources/org/openjdk/jmc/flightrecorder/flamegraph/messages_zh.properties
@@ -1,6 +1,6 @@
 #
-#  Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
-#  Copyright (c) 2023, 2025, Datadog, Inc. All rights reserved.
+#  Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2023, 2026, Datadog, Inc. All rights reserved.
 #
 #  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
diff --git a/application/org.openjdk.jmc.flightrecorder.ui/plugin.xml b/application/org.openjdk.jmc.flightrecorder.ui/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--   
-   Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
    
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    
diff --git a/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/MethodProfilingPage.java b/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/MethodProfilingPage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/ThreadsPageLayoutUI.java b/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/ThreadsPageLayoutUI.java
@@ -96,7 +96,6 @@ abstract class ThreadsPageLayoutUI extends ChartAndTableUI {
 	private static final int Y_OFFSET = 0;
 	protected ChartControlBar controlBar;
 	protected ChartTextCanvas textCanvas;
-	protected IPageContainer pageContainer;
 	private Composite zoomPanContainer;
 	private ChartButtonGroup buttonGroup;
 	private IItemCollection selectionItems;
diff --git a/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/selection/StacktraceFrameSelection.java b/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/selection/StacktraceFrameSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/application/uitests/org.openjdk.jmc.test.jemmy/src/main/java/org/openjdk/jmc/test/jemmy/misc/wrappers/JvmBrowser.java b/application/uitests/org.openjdk.jmc.test.jemmy/src/main/java/org/openjdk/jmc/test/jemmy/misc/wrappers/JvmBrowser.java
@@ -41,6 +41,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.jemmy.JemmyException;
 import org.jemmy.TimeoutExpiredException;
 import org.junit.Assert;
 
@@ -365,7 +366,18 @@ public void disconnect() {
 	 *            the name of the connection
 	 */
 	public void disconnect(String ... path) {
-		selectContextOption(ACTION_DISCONNECT_TEXT, path);
+		int maxRetries = 5;
+		for (int i = 0; i < maxRetries; i++) {
+			try {
+				selectContextOption(ACTION_DISCONNECT_TEXT, path);
+				break;
+			} catch (JemmyException e) {
+				if (i == maxRetries - 1) {
+					throw e;
+				}
+				sleep(1000);
+			}
+		}
 		MCDialog disconnectDialog = new MCDialog(ACTION_DISCONNECT_TEXT);
 		disconnectDialog.clickButton(MCButton.Labels.OK);
 	}
diff --git a/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/IMCFrame.java b/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/IMCFrame.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2022, 2025, Datadog, Inc. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Datadog, Inc. All rights reserved.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/core/org.openjdk.jmc.flightrecorder/src/main/java/org/openjdk/jmc/flightrecorder/stacktrace/tree/AggregatableFrame.java b/core/org.openjdk.jmc.flightrecorder/src/main/java/org/openjdk/jmc/flightrecorder/stacktrace/tree/AggregatableFrame.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2019, 2025, Datadog, Inc. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Datadog, Inc. All rights reserved.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/core/org.openjdk.jmc.flightrecorder/src/main/java/org/openjdk/jmc/flightrecorder/stacktrace/tree/Node.java b/core/org.openjdk.jmc.flightrecorder/src/main/java/org/openjdk/jmc/flightrecorder/stacktrace/tree/Node.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2021, 2025, Datadog, Inc. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Datadog, Inc. All rights reserved.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/core/org.openjdk.jmc.flightrecorder/src/main/java/org/openjdk/jmc/flightrecorder/stacktrace/tree/StacktraceTreeModel.java b/core/org.openjdk.jmc.flightrecorder/src/main/java/org/openjdk/jmc/flightrecorder/stacktrace/tree/StacktraceTreeModel.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2021, 2025, Datadog, Inc. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Datadog, Inc. All rights reserved.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#`
`2`		`-# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.`
`3`		`-# Copyright (c) 2023, 2025, Datadog, Inc. All rights reserved.`
	`2`	`+# Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.`
	`3`	`+# Copyright (c) 2023, 2026, Datadog, Inc. All rights reserved.`
`4`	`4`	`#`
`5`	`5`	`# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`6`	`6`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.`
`3`		`- * Copyright (c) 2023, 2025, Datadog, Inc. All rights reserved.`
	`2`	`+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.`
	`3`	`+ * Copyright (c) 2023, 2026, Datadog, Inc. All rights reserved.`
`4`	`4`	`*`
`5`	`5`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`6`	`6`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`*`
`4`	`4`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`5`	`5`	`*`