Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2019-01-14 15:09:18 -0500
committerThomas Watson2019-01-16 08:54:01 -0500
commitfee68c5ccedbb11974ece1025e8b56200eb986e0 (patch)
tree0a0dee732b3d7fd8106bd6830871a2367db580c1
parent7f14d56daa4a62009312101adfc5548aaa3574f5 (diff)
downloadrt.equinox.framework-fee68c5ccedbb11974ece1025e8b56200eb986e0.tar.gz
rt.equinox.framework-fee68c5ccedbb11974ece1025e8b56200eb986e0.tar.xz
rt.equinox.framework-fee68c5ccedbb11974ece1025e8b56200eb986e0.zip
Bug 538717 - Update to the correct javadoc for OSGi R7Y20190116-2200I20190116-1800
Change-Id: Ie8ca87567c2347a832cdd928435dbb54b752ef38 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
-rw-r--r--bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.osgi.services/pom.xml2
-rw-r--r--bundles/org.eclipse.osgi.services/src/org/osgi/service/log/Logger.java18
-rw-r--r--bundles/org.eclipse.osgi.services/src/org/osgi/service/log/LoggerFactory.java24
-rw-r--r--bundles/org.eclipse.osgi.services/src/org/osgi/service/upnp/UPnPLocalStateVariable.java9
-rw-r--r--bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireAdminEvent.java4
-rw-r--r--bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireAdminListener.java4
-rw-r--r--bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireConstants.java6
8 files changed, 37 insertions, 32 deletions
diff --git a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
index 70773e5e4..41fa4d1d3 100644
--- a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %osgiServices
Bundle-SymbolicName: org.eclipse.osgi.services
-Bundle-Version: 3.7.100.qualifier
+Bundle-Version: 3.7.200.qualifier
Bundle-Description: %osgiServicesDes
Bundle-Localization: plugin
Bundle-Vendor: %eclipse.org
diff --git a/bundles/org.eclipse.osgi.services/pom.xml b/bundles/org.eclipse.osgi.services/pom.xml
index 00062b24d..1589d9c59 100644
--- a/bundles/org.eclipse.osgi.services/pom.xml
+++ b/bundles/org.eclipse.osgi.services/pom.xml
@@ -19,7 +19,7 @@
</parent>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
- <version>3.7.100-SNAPSHOT</version>
+ <version>3.7.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/log/Logger.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/log/Logger.java
index 3424a62fd..df0972be1 100644
--- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/log/Logger.java
+++ b/bundles/org.eclipse.osgi.services/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.services/src/org/osgi/service/log/LoggerFactory.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/log/LoggerFactory.java
index 61d256f03..756540e45 100644
--- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/log/LoggerFactory.java
+++ b/bundles/org.eclipse.osgi.services/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
diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/upnp/UPnPLocalStateVariable.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/upnp/UPnPLocalStateVariable.java
index 351a0315b..25d3d7544 100644
--- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/upnp/UPnPLocalStateVariable.java
+++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/upnp/UPnPLocalStateVariable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2005, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2005, 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.
@@ -37,12 +37,11 @@ public interface UPnPLocalStateVariable extends UPnPStateVariable {
* UPnPDevice whenever UPnPStateVariable's value is changed , this method
* must be called.
*
- * @return {@code Object} current value of UPnPStateVariable. if the current
+ * @return {@code Object} current value of UPnPStateVariable. If the current
* value is initialized with the default value defined UPnP service
* description.
- *
- * @throws IllegalStateException if the UPnP state variable has been
- * removed.
+ * @throws IllegalStateException If the UPnP state variable has been
+ * removed.
*/
public Object getCurrentValue();
}
diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireAdminEvent.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireAdminEvent.java
index 9b407189c..7654b4f8a 100644
--- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireAdminEvent.java
+++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireAdminEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2002, 2015). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2002, 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.
@@ -46,7 +46,7 @@ import org.osgi.framework.ServiceReference;
*
* <p>
* Event type values must be unique and disjoint bit values. Event types must be
- * defined as a bit in a 32 bit integer and can thus be bitwise OR'ed together.
+ * defined as a bit in a 32 bit integer and can thus be bitwise ORed together.
* <p>
* Security Considerations. {@code WireAdminEvent} objects contain {@code Wire}
* objects. Care must be taken in the sharing of {@code Wire} objects with other
diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireAdminListener.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireAdminListener.java
index 0a0f329f6..73968c8d1 100644
--- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireAdminListener.java
+++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireAdminListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2002, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2002, 2017). 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.
@@ -37,7 +37,7 @@ package org.osgi.service.wireadmin;
* For example:
*
* <pre>
- * Integer mask = new Integer(WIRE_TRACE | WIRE_CONNECTED | WIRE_DISCONNECTED);
+ * Integer mask = Integer.valueOf(WIRE_TRACE | WIRE_CONNECTED | WIRE_DISCONNECTED);
* Hashtable ht = new Hashtable();
* ht.put(WIREADMIN_EVENTS, mask);
* context.registerService(WireAdminListener.class.getName(), this, ht);
diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireConstants.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireConstants.java
index 6c5f7a39c..be86390d1 100644
--- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireConstants.java
+++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireConstants.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2002, 2015). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2002, 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.
@@ -42,7 +42,7 @@ public interface WireConstants {
/**
* A service registration property for a Producer service that is composite.
* It contains the names of the composite Consumer services it can
- * inter-operate with. Inter-operability exists when any name in this array
+ * interoperate with. Interoperability exists when any name in this array
* matches any name in the array set by the Consumer service. The type of
* this property must be {@code String[]}.
*/
@@ -50,7 +50,7 @@ public interface WireConstants {
/**
* A service registration property for a Consumer service that is composite.
* It contains the names of the composite Producer services it can cooperate
- * with. Inter-operability exists when any name in this array matches any
+ * with. Interoperability exists when any name in this array matches any
* name in the array set by the Producer service. The type of this property
* must be {@code String[]}.
*/

Back to the top