summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-06-29 14:08:55 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-06-29 14:09:01 +0200
commiteb45cb33344a74add43fe216d0a18c1ca8bef8ef (patch)
tree4d1ecde4c1ddf9c6079ed9c107cb4ca99929271a
parentd4ada70fd7fde805b852c6ba50d841a31da2c21b (diff)
Silence javadoc 8 errors
Just the minimal amount of changes to fix the build. Change-Id: I307f4df108caa96ec489ec151bfa47837480b92d
-rw-r--r--javaunohelper/com/sun/star/comp/helper/Bootstrap.java2
-rw-r--r--javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java2
-rw-r--r--javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java18
-rw-r--r--javaunohelper/com/sun/star/lib/uno/helper/Factory.java1
-rw-r--r--javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java17
-rw-r--r--javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java2
-rw-r--r--ridljar/com/sun/star/uno/IEnvironment.java2
-rw-r--r--ridljar/com/sun/star/uno/IMethodDescription.java4
-rw-r--r--ridljar/com/sun/star/uno/ITypeDescription.java18
-rw-r--r--ridljar/com/sun/star/uno/Type.java2
-rw-r--r--ridljar/com/sun/star/uno/Union.java2
11 files changed, 34 insertions, 36 deletions
diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index 2087aeca5689..5cdf92ba02c1 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -145,7 +145,7 @@ public class Bootstrap {
* Bootstraps a servicemanager with the jurt base components registered.
* <p>
* @return a freshly boostrapped service manager
- * @see com.sun.star.lang.ServiceManager
+ * @see "com.sun.star.lang.ServiceManager"
*/
static public XMultiServiceFactory createSimpleServiceManager() throws Exception
{
diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java b/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
index ea1c57ec9ea1..c68e65c72aab 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
@@ -24,7 +24,7 @@ package com.sun.star.comp.helper;
The first one is commonly used for singleton objects of the component
context, that are raised on first-time retrieval of the key.
You have to pass a com.sun.star.lang.XSingleComponentFactory
- or string (=> service name) object for this.
+ or string (service name) object for this.
</p>
*/
public class ComponentContextEntry
diff --git a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
index a9cfe46e7d8f..b30f120d5418 100644
--- a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
+++ b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
@@ -32,7 +32,7 @@ import com.sun.star.registry.XRegistryKey;
* <p>
* @see com.sun.star.loader.SharedLibrary
* @see "com.sun.star.comp.servicemanager.ServiceManager"
- * @see com.sun.star.lang.ServiceManager
+ * @see "com.sun.star.lang.ServiceManager"
*/
public class SharedLibraryLoader {
/**
@@ -82,8 +82,8 @@ public class SharedLibraryLoader {
* @param smgr the ServiceManager
* @param regKey the root registry key
* @see com.sun.star.loader.SharedLibrary
- * @see com.sun.star.lang.ServiceManager
- * @see com.sun.star.registry.RegistryKey
+ * @see "com.sun.star.lang.ServiceManager"
+ * @see "com.sun.star.registry.RegistryKey"
*/
public static XSingleServiceFactory getServiceFactory(
XMultiServiceFactory smgr,
@@ -105,8 +105,8 @@ public class SharedLibraryLoader {
* @param smgr the ServiceManager
* @param regKey the root registry key
* @see com.sun.star.loader.SharedLibrary
- * @see com.sun.star.lang.ServiceManager
- * @see com.sun.star.registry.RegistryKey
+ * @see "com.sun.star.lang.ServiceManager"
+ * @see "com.sun.star.registry.RegistryKey"
*/
public static XSingleServiceFactory getServiceFactory(
String libName,
@@ -128,8 +128,8 @@ public class SharedLibraryLoader {
* @param smgr the ServiceManager
* @param regKey the root key under that the component should be registered
* @see com.sun.star.loader.SharedLibrary
- * @see com.sun.star.lang.ServiceManager
- * @see com.sun.star.registry.RegistryKey
+ * @see "com.sun.star.lang.ServiceManager"
+ * @see "com.sun.star.registry.RegistryKey"
*/
public static boolean writeRegistryServiceInfo(
com.sun.star.lang.XMultiServiceFactory smgr,
@@ -148,8 +148,8 @@ public class SharedLibraryLoader {
* @param smgr the ServiceManager
* @param regKey the root key under that the component should be registered
* @see com.sun.star.loader.SharedLibrary
- * @see com.sun.star.lang.ServiceManager
- * @see com.sun.star.registry.RegistryKey
+ * @see "com.sun.star.lang.ServiceManager"
+ * @see "com.sun.star.registry.RegistryKey"
*/
public static boolean writeRegistryServiceInfo(
String libName,
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
index 586498cde844..b9c5a00da6dc 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
@@ -29,7 +29,6 @@ import com.sun.star.uno.UnoRuntime;
/** Factory helper class supporting com.sun.star.lang.XServiceInfo and
com.sun.star.lang.XSingleComponentFactory.
- @attention
This factory implementation does not support lang.XSingleServiceFactory.
*/
public class Factory
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
index b2571813f34e..ed2ee2cd6528 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
@@ -117,7 +117,7 @@ XMultiPropertySet
* initialization of the inheriting class (i.e. within the contructor)
* @param name The property's name (Property.Name).
* @param handle The property's handle (Property.Handle).
- * @param Type The property's type (Property.Type).
+ * @param type The property's type (Property.Type).
* @param attributes The property's attributes (Property.Attributes).
* @param id Identifies the property's storage.
*/
@@ -135,8 +135,7 @@ XMultiPropertySet
* Registration has to occur during
* initialization of the inheriting class (i.e. within the contructor).
* @param name The property's name (Property.Name).
- * @param handle The property's handle (Property.Handle).
- * @param Type The property's type (Property.Type).
+ * @param type The property's type (Property.Type).
* @param attributes The property's attributes (Property.Attributes).
* @param id Identifies the property's storage.
*/
@@ -558,11 +557,11 @@ XMultiPropertySet
* {@link #setFastPropertyValue XFastPropertySet.setFastPropertyValue}
* and {@link #setPropertyValues XMultiPropertySet.setPropertyValues}.
* If this method fails, that is, it returns false or throws an exception, then no listeners are notified and the
- * property value, that was intended to be changed, remains untouched.<br /> This method does not have to deal with property attributes, such as
+ * property value, that was intended to be changed, remains untouched.<p> This method does not have to deal with property attributes, such as
* PropertyAttribute.READONLY or PropertyAttribute.MAYBEVOID. The processing of these attributes occurs
- * in the calling methods.<br />
+ * in the calling methods.<p>
* Only if this method returns successfully further processing, such
- * as listener notification and finally the modifiction of the property's value, will occur.<br />
+ * as listener notification and finally the modifiction of the property's value, will occur.<p>
*
* The actual modification of a property's value is done by {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast}
* which is called subsequent to convertPropertyValue.
@@ -588,10 +587,10 @@ XMultiPropertySet
* Then, no conversion is necessary, since they can hold all possible values. However, if
* the member is an Object and <em>setVal</em> is an Any then the object contained in the any is assigned to
* the member. The extra type information which exists as Type object in the Any will get lost. If this is not
- * intended then use an Any variable rather then an Object.<br />
+ * intended then use an Any variable rather then an Object.<p>
* If a member is an Object or Any and the argument <em>setVal</em> is an Object, other than String or array,
* then it is presumed to be an UNO object and queried for XInterface. If successful, the out-param <em>newVal</em>
- * returns the XInterface.<br />
+ * returns the XInterface.<p>
* If a member is an UNO interface, then <em>setVal</em> is queried for this interface and the result is returned.
* If <em>setVal</em> is null then <em>newVal</em> will be null too after return.
* <p>
@@ -788,7 +787,7 @@ XMultiPropertySet
* If a property has the READONLY attribute set, and one of the setter methods, such as setPropertyValue, has been
* called, then this method is not going to be called.
* @param property the property for which the new value is set
- * @param value the new value for the property.
+ * @param newVal the new value for the property.
* @throws com.sun.star.lang.WrappedTargetException An exception, which has to be made known to the caller,
* occurred during the setting of the value.
*/
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
index cd57c6357330..9844ccb07fca 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
@@ -186,7 +186,7 @@ public final class PropertySetMixin {
@param newValue the property value corresponding to the new
attribute value. This is only used as
<code>com.sun.star.beans.PropertyChangeEvent.NewValue</code>, which is
- rather useless, anyway (see &ldquo;Using the Observer Pattern&rdquo: in
+ rather useless, anyway (see &ldquo;Using the Observer Pattern&rdquo;: in
<a href="http://tools.openoffice.org/CodingGuidelines.sxw">
<cite>OpenOffice.org Coding Guidelines</cite></a>), <em>unless</em> the
attribute that is going to be set is constrained. If the attribute
diff --git a/ridljar/com/sun/star/uno/IEnvironment.java b/ridljar/com/sun/star/uno/IEnvironment.java
index 34435ecff328..dc963414ef58 100644
--- a/ridljar/com/sun/star/uno/IEnvironment.java
+++ b/ridljar/com/sun/star/uno/IEnvironment.java
@@ -58,7 +58,7 @@ public interface IEnvironment {
* given bridge <var>B2</var>.</li>
* <li>A proxy object, created as a remote object is mapped into this
* environment via a given bridge.</li>
- * </ul></p>
+ * </ul>
*
* <p>The object actually registered may differ from the specified
* <code>object</code> that is passed as an argument. This enables an
diff --git a/ridljar/com/sun/star/uno/IMethodDescription.java b/ridljar/com/sun/star/uno/IMethodDescription.java
index ffc9833e0500..cb2625a7327e 100644
--- a/ridljar/com/sun/star/uno/IMethodDescription.java
+++ b/ridljar/com/sun/star/uno/IMethodDescription.java
@@ -47,7 +47,7 @@ public interface IMethodDescription extends IMemberDescription {
boolean isConst();
/**
- * Gives any array of <code>ITypeDescription> of
+ * Gives any array of <code>ITypeDescription</code> of
* the [in] parameters.
* <p>
* @return the in parameters
@@ -55,7 +55,7 @@ public interface IMethodDescription extends IMemberDescription {
ITypeDescription[] getInSignature();
/**
- * Gives any array of <code>ITypeDescription> of
+ * Gives any array of <code>ITypeDescription</code> of
* the [out] parameters.
* <p>
* @return the out parameters
diff --git a/ridljar/com/sun/star/uno/ITypeDescription.java b/ridljar/com/sun/star/uno/ITypeDescription.java
index 85014454e253..2d6c2bf0a3d7 100644
--- a/ridljar/com/sun/star/uno/ITypeDescription.java
+++ b/ridljar/com/sun/star/uno/ITypeDescription.java
@@ -98,8 +98,8 @@ public interface ITypeDescription {
/**
* Gets the (UNO) type name.
*
- * <p>The following table lists how UNO types map to type names:</p>
* <table>
+ * <caption>Mapping from UNO types to type names</caption>
* <thead>
* <tr><th>UNO type</th><th>type name</th></tr>
* </thead>
@@ -114,15 +114,15 @@ public interface ITypeDescription {
* </tr>
* <tr><td>LONG</td><td><code>"long"</code></td></tr>
* <tr><td>UNSIGNED LONG</td><td><code>"unsigned long"</code></td></tr>
- * <tr><td>HYPER</td><td></td><code>"hyper"</code></tr>
+ * <tr><td>HYPER</td><td></td><td><code>"hyper"</code></td></tr>
* <tr>
- * <td>UNSIGNED HYPER</td><td></td><code>"unsigned hyper"</code>
+ * <td>UNSIGNED HYPER</td><td></td><td><code>"unsigned hyper"</code></td>
* </tr>
- * <tr><td>FLOAT</td><td></td><code>"float"</code></tr>
- * <tr><td>DOUBLE</td><td></td><code>"double"</code></tr>
- * <tr><td>STRING</td><td></td><code>"string"</code></tr>
- * <tr><td>TYPE</td><td></td><code>"type"</code></tr>
- * <tr><td>ANY</td><td></td><code>"any"</code></tr>
+ * <tr><td>FLOAT</td><td></td><td><code>"float"</code></td></tr>
+ * <tr><td>DOUBLE</td><td></td><td><code>"double"</code></td></tr>
+ * <tr><td>STRING</td><td></td><td><code>"string"</code></td></tr>
+ * <tr><td>TYPE</td><td></td><td><code>"type"</code></td></tr>
+ * <tr><td>ANY</td><td></td><td><code>"any"</code></td></tr>
* <tr>
* <td>sequence type of base type <var>T</var></td>
* <td><code>"[]"</code> followed by type name for <var>T</var></td>
@@ -143,7 +143,7 @@ public interface ITypeDescription {
* <td>interface type named <var>N</var></td>
* <td><var>N</var> (see below)</td>
* </tr>
- * <tbody>
+ * </tbody>
* </table>
* <p>For a UNO type named <var>N</var>, consisting of a sequence of module
* names <var>M<sub>1</sub></var>, ..., <var>M<sub>n</sub></var> followed by
diff --git a/ridljar/com/sun/star/uno/Type.java b/ridljar/com/sun/star/uno/Type.java
index 539c6ebd6a77..c43664bec5e2 100644
--- a/ridljar/com/sun/star/uno/Type.java
+++ b/ridljar/com/sun/star/uno/Type.java
@@ -199,7 +199,7 @@ public class Type {
*
* <p>In certain cases, one Java class corresponds to two UNO types (e.g.,
* the Java class <code>short[].class</code> corresponds to both a sequence
- * of <codde>SHORT</code> and a sequence of <code>UNSIGNED SHORT</code> in
+ * of <code>SHORT</code> and a sequence of <code>UNSIGNED SHORT</code> in
* UNO). In such ambiguous cases, the parameter <code>alternative</code>
* controls which UNO type is chosen:</p>
* <ul>
diff --git a/ridljar/com/sun/star/uno/Union.java b/ridljar/com/sun/star/uno/Union.java
index 8daabbd4a6f9..0ea82930b2a1 100644
--- a/ridljar/com/sun/star/uno/Union.java
+++ b/ridljar/com/sun/star/uno/Union.java
@@ -22,7 +22,7 @@ package com.sun.star.uno;
* The Union class is the base class for all classes generated
* as java binding for the IDL type union.
* <p>
- * Note: The idl type <code>union<code> is currently not fully
+ * Note: The idl type <code>union</code> is currently not fully
* integrated into the UNO framework, so don't use it.
*/
public class Union {