You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2015/08/24 06:22:52 UTC
svn commit: r1697312 - in /openoffice/trunk/main:
javaunohelper/com/sun/star/comp/helper/
javaunohelper/com/sun/star/lib/uno/helper/ ridljar/com/sun/star/uno/
Author: damjan
Date: Mon Aug 24 04:22:52 2015
New Revision: 1697312
URL: http://svn.apache.org/r1697312
Log:
Fix all remaining javadoc errors that break the build with Java 8.
Modified:
openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
openoffice/trunk/main/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
openoffice/trunk/main/ridljar/com/sun/star/uno/IEnvironment.java
openoffice/trunk/main/ridljar/com/sun/star/uno/ITypeDescription.java
Modified: openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/Bootstrap.java?rev=1697312&r1=1697311&r2=1697312&view=diff
==============================================================================
--- openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/Bootstrap.java (original)
+++ openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/Bootstrap.java Mon Aug 24 04:22:52 2015
@@ -149,7 +149,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"
* @throws java.lang.Exception
*/
static public XMultiServiceFactory createSimpleServiceManager() throws Exception
@@ -163,7 +163,7 @@ public class Bootstrap {
* Bootstraps the initial component context from a native UNO installation.
* <p>
* @return
- * @see cppuhelper/defaultBootstrap_InitialComponentContext()
+ * @see defaultBootstrap_InitialComponentContext()
*/
static public final XComponentContext defaultBootstrap_InitialComponentContext()
throws Exception
@@ -177,7 +177,7 @@ public class Bootstrap {
@param bootstrap_parameters
bootstrap parameters (maybe null)
- @see cppuhelper/defaultBootstrap_InitialComponentContext()
+ @see defaultBootstrap_InitialComponentContext()
*/
static public final XComponentContext defaultBootstrap_InitialComponentContext(
String ini_file, Hashtable bootstrap_parameters )
Modified: openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java?rev=1697312&r1=1697311&r2=1697312&view=diff
==============================================================================
--- openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java (original)
+++ openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java Mon Aug 24 04:22:52 2015
@@ -29,7 +29,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
Modified: openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java?rev=1697312&r1=1697311&r2=1697312&view=diff
==============================================================================
--- openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java (original)
+++ openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java Mon Aug 24 04:22:52 2015
@@ -34,9 +34,9 @@ import com.sun.star.registry.XRegistryKe
* The <code>SharedLibraryLoader</code> class provides the functionality of the <code>com.sun.star.loader.SharedLibrary</code>
* service.
* <p>
- * @see com.sun.star.loader.SharedLibrary
+ * @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 {
/**
@@ -70,9 +70,9 @@ public class SharedLibraryLoader {
* @return the factory for the "com.sun.star.comp.stoc.DLLComponentLoader" component.
* @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.loader.SharedLibrary"
+ * @see "com.sun.star.lang.ServiceManager"
+ * @see "com.sun.star.registry.RegistryKey"
*/
public static XSingleServiceFactory getServiceFactory(
XMultiServiceFactory smgr,
@@ -93,9 +93,9 @@ public class SharedLibraryLoader {
* @param impName the implementation name of the component
* @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.loader.SharedLibrary"
+ * @see "com.sun.star.lang.ServiceManager"
+ * @see "com.sun.star.registry.RegistryKey"
*/
public static XSingleServiceFactory getServiceFactory(
String libName,
@@ -116,9 +116,9 @@ public class SharedLibraryLoader {
* @return true if the registration was successful - otherwise false
* @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.loader.SharedLibrary"
+ * @see "com.sun.star.lang.ServiceManager"
+ * @see "com.sun.star.registry.RegistryKey"
*/
public static boolean writeRegistryServiceInfo(
com.sun.star.lang.XMultiServiceFactory smgr,
@@ -136,9 +136,9 @@ public class SharedLibraryLoader {
* @param libName name of the shared library
* @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.loader.SharedLibrary"
+ * @see "com.sun.star.lang.ServiceManager"
+ * @see "com.sun.star.registry.RegistryKey"
*/
public static boolean writeRegistryServiceInfo(
String libName,
Modified: openoffice/trunk/main/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/javaunohelper/com/sun/star/lib/uno/helper/Factory.java?rev=1697312&r1=1697311&r2=1697312&view=diff
==============================================================================
--- openoffice/trunk/main/javaunohelper/com/sun/star/lib/uno/helper/Factory.java (original)
+++ openoffice/trunk/main/javaunohelper/com/sun/star/lib/uno/helper/Factory.java Mon Aug 24 04:22:52 2015
@@ -34,7 +34,8 @@ import com.sun.star.uno.UnoRuntime;
/** Factory helper class supporting com.sun.star.lang.XServiceInfo and
com.sun.star.lang.XSingleComponentFactory.
- @attention
+ Attention:
+ <br>
This factory implementation does not support lang.XSingleServiceFactory.
*/
public class Factory
Modified: openoffice/trunk/main/ridljar/com/sun/star/uno/IEnvironment.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ridljar/com/sun/star/uno/IEnvironment.java?rev=1697312&r1=1697311&r2=1697312&view=diff
==============================================================================
--- openoffice/trunk/main/ridljar/com/sun/star/uno/IEnvironment.java (original)
+++ openoffice/trunk/main/ridljar/com/sun/star/uno/IEnvironment.java Mon Aug 24 04:22:52 2015
@@ -63,7 +63,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
Modified: openoffice/trunk/main/ridljar/com/sun/star/uno/ITypeDescription.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ridljar/com/sun/star/uno/ITypeDescription.java?rev=1697312&r1=1697311&r2=1697312&view=diff
==============================================================================
--- openoffice/trunk/main/ridljar/com/sun/star/uno/ITypeDescription.java (original)
+++ openoffice/trunk/main/ridljar/com/sun/star/uno/ITypeDescription.java Mon Aug 24 04:22:52 2015
@@ -103,8 +103,8 @@ public interface ITypeDescription {
/**
* Gets the (UNO) type name.
*
- * <p>The following table lists how UNO types map to type names:</p>
* <table>
+ * <caption>The following table lists how UNO types map to type names:</caption>
* <thead>
* <tr><th>UNO type</th><th>type name</th></tr>
* </thead>
@@ -119,15 +119,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><code>"hyper"</code></td></tr>
* <tr>
- * <td>UNSIGNED HYPER</td><td></td><code>"unsigned hyper"</code>
+ * <td>UNSIGNED HYPER</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><code>"float"</code></td></tr>
+ * <tr><td>DOUBLE</td><td><code>"double"</code></td></tr>
+ * <tr><td>STRING</td><td><code>"string"</code></td></tr>
+ * <tr><td>TYPE</td><td><code>"type"</code></td></tr>
+ * <tr><td>ANY</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>
@@ -148,7 +148,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