Bug 528116 - [osgi R7] update the latest R7 OSGi APIS4_8_0_M4I20171212-2000I20171211-2000I20171210-2000I20171209-1500I20171209-1020I20171208-2000I20171206-2000I20171206-0800I20171205-2000I20171205-0800I20171205-0250I20171205-0030I20171204-2000

2 files changed, 19 insertions, 19 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 863d1404f..3424a62fd 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
@@ -106,11 +106,11 @@ public interface Logger {
 	void trace(String format, Object... arguments);
 
 	/**
-	 * Call the specified function if logging enabled for the
+	 * Perform the specified operation if logging enabled for the
 	 * {@link LogLevel#TRACE} level.
 	 * 
-	 * @param consumer The function to call passing this Logger.
-	 * @throws E An exception thrown by the function.
+	 * @param consumer The operation to perform on this Logger.
+	 * @throws E An exception thrown by the operation.
 	 */
 	<E extends Exception> void trace(LoggerConsumer<E> consumer) throws E;
 
@@ -155,11 +155,11 @@ public interface Logger {
 	void debug(String format, Object... arguments);
 
 	/**
-	 * Call the specified function if logging enabled for the
+	 * Perform the specified operation if logging enabled for the
 	 * {@link LogLevel#DEBUG} level.
 	 * 
-	 * @param consumer The function to call passing this Logger.
-	 * @throws E An exception thrown by the function.
+	 * @param consumer The operation to perform on this Logger.
+	 * @throws E An exception thrown by the operation.
 	 */
 	<E extends Exception> void debug(LoggerConsumer<E> consumer) throws E;
 
@@ -204,11 +204,11 @@ public interface Logger {
 	void info(String format, Object... arguments);
 
 	/**
-	 * Call the specified function if logging enabled for the
+	 * Perform the specified operation if logging enabled for the
 	 * {@link LogLevel#INFO} level.
 	 * 
-	 * @param consumer The function to call passing this Logger.
-	 * @throws E An exception thrown by the function.
+	 * @param consumer The operation to perform on this Logger.
+	 * @throws E An exception thrown by the operation.
 	 */
 	<E extends Exception> void info(LoggerConsumer<E> consumer) throws E;
 
@@ -253,11 +253,11 @@ public interface Logger {
 	void warn(String format, Object... arguments);
 
 	/**
-	 * Call the specified function if logging enabled for the
+	 * Perform the specified operation if logging enabled for the
 	 * {@link LogLevel#WARN} level.
 	 * 
-	 * @param consumer The function to call passing this Logger.
-	 * @throws E An exception thrown by the function.
+	 * @param consumer The operation to perform on this Logger.
+	 * @throws E An exception thrown by the operation.
 	 */
 	<E extends Exception> void warn(LoggerConsumer<E> consumer) throws E;
 
@@ -302,11 +302,11 @@ public interface Logger {
 	void error(String format, Object... arguments);
 
 	/**
-	 * Call the specified function if logging enabled for the
+	 * Perform the specified operation if logging enabled for the
 	 * {@link LogLevel#ERROR} level.
 	 * 
-	 * @param consumer The function to call passing this Logger.
-	 * @throws E An exception thrown by the function.
+	 * @param consumer The operation to perform on this Logger.
+	 * @throws E An exception thrown by the operation.
 	 */
 	<E extends Exception> void error(LoggerConsumer<E> consumer) throws E;
 
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/LoggerConsumer.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/LoggerConsumer.java
index 82201dc52..332fa18a8 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/LoggerConsumer.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/LoggerConsumer.java
@@ -19,7 +19,7 @@ package org.osgi.service.log;
 import org.osgi.annotation.versioning.ConsumerType;
 
 /**
- * A function that accepts a {@link Logger} argument and produces no result.
+ * An operation that accepts a {@link Logger} argument and produces no result.
  * <p>
  * This is a functional interface and can be used as the assignment target for a
  * lambda expression or method reference.
@@ -33,10 +33,10 @@ import org.osgi.annotation.versioning.ConsumerType;
 @FunctionalInterface
 public interface LoggerConsumer<E extends Exception> {
 	/**
-	 * Applies this function to the specified {@link Logger}.
+	 * Perform this operation on the specified {@link Logger}.
 	 * 
-	 * @param l The {@link Logger} input to this function.
-	 * @throws E An exception thrown by the method.
+	 * @param l The {@link Logger} input to this operation.
+	 * @throws E An exception thrown by the operation.
 	 */
 	void accept(Logger l) throws E;
 }