From 3bf803f0c91e899cf6fb218e4b96fcfa2b105a4d Mon Sep 17 00:00:00 2001 From: Amy Lu Date: Tue, 10 Feb 2015 12:28:02 -0500 Subject: [PATCH] 8069255: Suppress deprecation warnings in jdk.rmic module (jdk repo) Reviewed-by: rriggs --- .../jdk.rmic/share/classes/sun/rmi/rmic/BatchEnvironment.java | 3 ++- jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java | 4 ++-- .../jdk.rmic/share/classes/sun/tools/java/BinaryClass.java | 3 ++- .../share/classes/sun/tools/java/ClassDefinition.java | 3 ++- .../share/classes/sun/tools/java/MemberDefinition.java | 3 ++- jdk/src/jdk.rmic/share/classes/sun/tools/java/Scanner.java | 3 ++- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/BatchEnvironment.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/BatchEnvironment.java index 0a4e5435e5f..fff8bb02a0b 100644 --- a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/BatchEnvironment.java +++ b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/BatchEnvironment.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, 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 @@ -61,6 +61,7 @@ import sun.tools.java.ClassPath; * they are subject to change or removal without notice. */ +@SuppressWarnings("deprecation") public class BatchEnvironment extends sun.tools.javac.BatchEnvironment { /** instance of Main which created this environment */ diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java index de93258d7c8..288ad5270b8 100644 --- a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java +++ b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, 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 @@ -676,7 +676,7 @@ public class Main implements sun.rmi.rmic.Constants { * Compile a single class. * Fallthrough is intentional */ - @SuppressWarnings("fallthrough") + @SuppressWarnings({"fallthrough", "deprecation"}) public boolean compileClass (ClassDeclaration c, ByteArrayOutputStream buf, BatchEnvironment env) diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryClass.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryClass.java index b7d75e44799..6824a855a48 100644 --- a/jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryClass.java +++ b/jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryClass.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2015, 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 @@ -39,6 +39,7 @@ import java.util.Enumeration; * supported API. Code that depends on them does so at its own risk: * they are subject to change or removal without notice. */ +@SuppressWarnings("deprecation") public final class BinaryClass extends ClassDefinition implements Constants { BinaryConstantPool cpool; diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassDefinition.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassDefinition.java index f096205c0f4..039eaa139e0 100644 --- a/jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassDefinition.java +++ b/jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2015, 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 @@ -41,6 +41,7 @@ import sun.tools.tree.UplevelReference; * supported API. Code that depends on them does so at its own risk: * they are subject to change or removal without notice. */ +@SuppressWarnings("deprecation") public class ClassDefinition implements Constants { diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/MemberDefinition.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/MemberDefinition.java index c7060e729d0..c426e9e66ac 100644 --- a/jdk/src/jdk.rmic/share/classes/sun/tools/java/MemberDefinition.java +++ b/jdk/src/jdk.rmic/share/classes/sun/tools/java/MemberDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2015, 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 @@ -44,6 +44,7 @@ import java.util.HashMap; * supported API. Code that depends on them does so at its own risk: * they are subject to change or removal without notice. */ +@SuppressWarnings("deprecation") public class MemberDefinition implements Constants { protected long where; diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/Scanner.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/Scanner.java index 7dfa6ee37c8..e2112102ae8 100644 --- a/jdk/src/jdk.rmic/share/classes/sun/tools/java/Scanner.java +++ b/jdk/src/jdk.rmic/share/classes/sun/tools/java/Scanner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2015, 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 @@ -58,6 +58,7 @@ import java.util.Hashtable; * @author Arthur van Hoff */ +@SuppressWarnings("deprecation") public class Scanner implements Constants { /**