Bug 538717 - Update to the correct javadoc for OSGi R7

Change-Id: I2005e6a6c213875f85da54d2dcf1164e41dece0e
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>

2 files changed, 24 insertions, 18 deletions

diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/Logger.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/Logger.java
index 3424a62fd..df0972be1 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/Logger.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/Logger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) OSGi Alliance (2016, 2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2016, 2018). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -117,8 +117,8 @@ public interface Logger {
 	/**
 	 * Is logging enabled for the {@link LogLevel#DEBUG} level?
 	 * 
-	 * @return {@code true} if logging is enabled for the {@link LogLevel#DEBUG
-	 *         trace} level.
+	 * @return {@code true} if logging is enabled for the {@link LogLevel#DEBUG}
+	 *         level.
 	 */
 	boolean isDebugEnabled();
 
@@ -166,8 +166,8 @@ public interface Logger {
 	/**
 	 * Is logging enabled for the {@link LogLevel#INFO} level?
 	 * 
-	 * @return {@code true} if logging is enabled for the {@link LogLevel#INFO
-	 *         trace} level.
+	 * @return {@code true} if logging is enabled for the {@link LogLevel#INFO}
+	 *         level.
 	 */
 	boolean isInfoEnabled();
 
@@ -215,8 +215,8 @@ public interface Logger {
 	/**
 	 * Is logging enabled for the {@link LogLevel#WARN} level?
 	 * 
-	 * @return {@code true} if logging is enabled for the {@link LogLevel#WARN
-	 *         trace} level.
+	 * @return {@code true} if logging is enabled for the {@link LogLevel#WARN}
+	 *         level.
 	 */
 	boolean isWarnEnabled();
 
@@ -264,8 +264,8 @@ public interface Logger {
 	/**
 	 * Is logging enabled for the {@link LogLevel#ERROR} level?
 	 * 
-	 * @return {@code true} if logging is enabled for the {@link LogLevel#ERROR
-	 *         trace} level.
+	 * @return {@code true} if logging is enabled for the {@link LogLevel#ERROR}
+	 *         level.
 	 */
 	boolean isErrorEnabled();
 
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/LoggerFactory.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/LoggerFactory.java
index 61d256f03..756540e45 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/LoggerFactory.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/LoggerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) OSGi Alliance (2016). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2016, 2018). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,8 @@ public interface LoggerFactory {
 	/**
 	 * Return the {@link Logger} named with the specified name.
 	 * 
-	 * @param name The name to use for the logger name.
+	 * @param name The name to use for the logger name. Must not be
+	 *            {@code null}.
 	 * @return The {@link Logger} named with the specified name. If the name
 	 *         parameter is equal to {@link Logger#ROOT_LOGGER_NAME}, then the
 	 *         root logger is returned.
@@ -65,7 +66,8 @@ public interface LoggerFactory {
 	/**
 	 * Return the {@link Logger} named with the specified class.
 	 * 
-	 * @param clazz The class to use for the logger name.
+	 * @param clazz The class to use for the logger name. Must not be
+	 *            {@code null}.
 	 * @return The {@link Logger} named with the name of the specified class.
 	 */
 	Logger getLogger(Class< ? > clazz);
@@ -75,7 +77,8 @@ public interface LoggerFactory {
 	 * name.
 	 * 
 	 * @param <L> The Logger type.
-	 * @param name The name to use for the logger name.
+	 * @param name The name to use for the logger name. Must not be
+	 *            {@code null}.
 	 * @param loggerType The type of Logger. Can be {@link Logger} or
 	 *            {@link FormatterLogger}.
 	 * @return The {@link Logger} or {@link FormatterLogger} named with the
@@ -92,9 +95,10 @@ public interface LoggerFactory {
 	 * class.
 	 * 
 	 * @param <L> A Logger type.
-	 * @param clazz The class to use for the logger name.
+	 * @param clazz The class to use for the logger name. Must not be
+	 *            {@code null}.
 	 * @param loggerType The type of Logger. Can be {@link Logger} or
-	 *            {@link FormatterLogger}.
+	 *            {@link FormatterLogger}. Must not be {@code null}.
 	 * @return The {@link Logger} or {@link FormatterLogger} named with the name
 	 *         of the specified class.
 	 * @throws IllegalArgumentException If the specified type is not a supported
@@ -113,10 +117,12 @@ public interface LoggerFactory {
 	 * behalf of another bundle.
 	 * 
 	 * @param <L> The Logger type.
-	 * @param bundle The bundle associated with the Logger.
-	 * @param name The name to use for the logger name.
+	 * @param bundle The bundle associated with the Logger. Must not be
+	 *            {@code null}.
+	 * @param name The name to use for the logger name. Must not be
+	 *            {@code null}.
 	 * @param loggerType The type of Logger. Can be {@link Logger} or
-	 *            {@link FormatterLogger}.
+	 *            {@link FormatterLogger}. Must not be {@code null}.
 	 * @return The {@link Logger} or {@link FormatterLogger} named with the
 	 *         specified name for the specified bundle. If the name parameter is
 	 *         equal to {@link Logger#ROOT_LOGGER_NAME}, then the root logger is