svn commit: r1697228 - in /openoffice/trunk/main: javaunohelper/com/sun/star/comp/helper/ ridljar/com/sun/star/uno/ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ xm
Author: damjan
Date: Sun Aug 23 17:26:31 2015
New Revision: 1697228
URL: http://svn.apache.org/r1697228
Log:
Fix some of the many javadoc 8 errors.
Modified:
openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
openoffice/trunk/main/ridljar/com/sun/star/uno/IMethodDescription.java
openoffice/trunk/main/ridljar/com/sun/star/uno/Type.java
openoffice/trunk/main/ridljar/com/sun/star/uno/Union.java
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.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=1697228r1=1697227r2=1697228view=diff
==
--- openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
(original)
+++ openoffice/trunk/main/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
Sun Aug 23 17:26:31 2015
@@ -97,6 +97,7 @@ public class Bootstrap {
@param context_entries the hash table contains mappings of
entry names (type string) to
context entries (type class ComponentContextEntry).
@return a new context.
+ @throws java.lang.Exception
*/
static public XComponentContext createInitialComponentContext(
Hashtable context_entries )
throws Exception
@@ -149,6 +150,7 @@ public class Bootstrap {
* p
* @return a freshly boostrapped service manager
* @seecom.sun.star.lang.ServiceManager
+* @throws java.lang.Exception
*/
static public XMultiServiceFactory createSimpleServiceManager() throws
Exception
{
@@ -157,10 +159,12 @@ public class Bootstrap {
}
-/** Bootstraps the initial component context from a native UNO
installation.
-
-@see cppuhelper/defaultBootstrap_InitialComponentContext()
-*/
+/**
+ * Bootstraps the initial component context from a native UNO installation.
+ * p
+ * @return
+ * @see cppuhelper/defaultBootstrap_InitialComponentContext()
+ */
static public final XComponentContext
defaultBootstrap_InitialComponentContext()
throws Exception
{
Modified: openoffice/trunk/main/ridljar/com/sun/star/uno/IMethodDescription.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ridljar/com/sun/star/uno/IMethodDescription.java?rev=1697228r1=1697227r2=1697228view=diff
==
--- openoffice/trunk/main/ridljar/com/sun/star/uno/IMethodDescription.java
(original)
+++ openoffice/trunk/main/ridljar/com/sun/star/uno/IMethodDescription.java Sun
Aug 23 17:26:31 2015
@@ -52,7 +52,7 @@ public interface IMethodDescription exte
boolean isConst();
/**
-* Gives any array of codeITypeDescription of
+* Gives any array of codeITypeDescription/code of
* the [in] parameters.
* p
* @return the in parameters
@@ -60,7 +60,7 @@ public interface IMethodDescription exte
ITypeDescription[] getInSignature();
/**
-* Gives any array of codeITypeDescription of
+* Gives any array of codeITypeDescription/code of
* the [out] parameters.
* p
* @return the out parameters
Modified: openoffice/trunk/main/ridljar/com/sun/star/uno/Type.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ridljar/com/sun/star/uno/Type.java?rev=1697228r1=1697227r2=1697228view=diff
==
--- openoffice/trunk/main/ridljar/com/sun/star/uno/Type.java (original)
+++ openoffice/trunk/main/ridljar/com/sun/star/uno/Type.java Sun Aug 23
17:26:31 2015
@@ -33,7 +33,7 @@ import java.util.HashMap;
* SHORT/code) do not have a matching Java class. For another, it can be
* necessary to describe a type which is unknown to the Java runtime system
* (for example, for delaying the need of a class, so that it is possible to
- * generate it on the fly.)/p
+ * generate it on the fly.)
*
buildbot success in ASF Buildbot on openoffice-linux64-nightly
The Buildbot has detected a passing build on builder openoffice-linux64-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/57 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
svn commit: r1697237 [1/2] - in /openoffice/trunk/main: javaunohelper/com/sun/star/lib/uno/helper/ xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/ xmerge/source/pexce
Author: damjan Date: Sun Aug 23 19:26:16 2015 New Revision: 1697237 URL: http://svn.apache.org/r1697237 Log: More javadoc fixes for building with Java 8. Modified: openoffice/trunk/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java openoffice/trunk/main/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java openoffice/trunk/main/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java openoffice/trunk/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
svn commit: r1697237 [2/2] - in /openoffice/trunk/main: javaunohelper/com/sun/star/lib/uno/helper/ xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/ xmerge/source/pexce
Modified:
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java?rev=1697237r1=1697236r2=1697237view=diff
==
---
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
(original)
+++
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
Sun Aug 23 19:26:16 2015
@@ -39,7 +39,7 @@ import java.util.Properties;
/**
* This class is used for logging debug messages.
* Currently, there are three types of logging: {@link #INFO},
- * {@link #TRACE} {@link #ERROR}. Use the Debug.properties
+ * {@link #TRACE} amp; {@link #ERROR}. Use the Debug.properties
* file to set or unset each type. Also use Debug.properties
* to set the writer to either codeSystem.out/code,
* codeSystem.err/code, or to a file.
@@ -265,7 +265,7 @@ public final class Debug {
* pThis logs the message during runtime if debug.info or debug.trace
* in the properties file is set to true./p
*
- * @param int Log type, one of the Debug constants
+ * @param flag Log type, one of the Debug constants
* {@link #INFO}, {@link #TRACE}, {@link #ERROR}
* or a combination of which or'ed together.
* @param msg The message.
@@ -287,7 +287,7 @@ public final class Debug {
* of the exception passed in. Refer to the other log method
* for description.
*
- * @param int Log type, one of the Debug constants
+ * @param flag Log type, one of the Debug constants
* {@link #INFO}, {@link #TRACE}, {@link #ERROR}
* or a combination of which or'ed together.
* @param msg The message.
Modified:
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java?rev=1697237r1=1697236r2=1697237view=diff
==
---
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
(original)
+++
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
Sun Aug 23 19:26:16 2015
@@ -53,7 +53,7 @@ public final class ConverterInfoMgr {
* and must have non-null values for DisplayName, ClassImpl,
* OfficeMime, and DeviceMime.
*
-* @param ConverterInfo A codeConverterInfo/code object
+* @param ci A codeConverterInfo/code object
* describing a plug-in.
*
* @throws RegistryException If the codeConverterInfo/code
@@ -109,16 +109,16 @@ public final class ConverterInfoMgr {
/**
-* Adds a codeVector/code of converter plug-ins to the registry.
-* Each codeConverterInfo/code in the codeVector/code must have
+* Adds an codeEnumeration/code of converter plug-ins to the registry.
+* Each codeConverterInfo/code in the codeEnumeration/code must
have
* a unique DisplayName and must have non-null values for DisplayName,
* ClassImpl, OfficeMime, and DeviceMime.
*
-* @param ciVectory A codeVector/code of codeConverterInfo/code
+* @param jarEnum An codeEnumeration/code of
codeConverterInfo/code
* objects describing one or more plug-in(s).
*
* @throws RegistryException If a codeConverterInfo/code in the
-* codeVector/code is not valid.
+* codeEnumeration/code is not valid.
*/
public static void addPlugIn(Enumeration jarEnum) throws RegistryException
{
@@ -257,8 +257,8 @@ public final class ConverterInfoMgr {
* If there are multiple codeConverterInfo/code objects that
* support this conversion, only the first is returned.
*
-* @param deviceMimeFrom The device from mime.
-* @param deviceMimeToThe device to mime.
+* @param deviceFromMime The device from mime.
+* @param deviceToMimeThe device to mime.
*
* @return An array of two codeConverterInfo/code objects
* that can be chained to perform the specified
buildbot success in ASF Buildbot on openoffice-linux64-rat
The Buildbot has detected a passing build on builder openoffice-linux64-rat while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-rat/builds/47 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-rat' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
svn commit: r1697247 - in /openoffice/trunk/main/xmerge/source: pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ xmerge/java/org/openoffice/xmerge/converter/dom/ xmerge/java/org/ope
Author: damjan
Date: Sun Aug 23 20:37:20 2015
New Revision: 1697247
URL: http://svn.apache.org/r1697247
Log:
Fix bad @return javadocs in main/xmerge.
Modified:
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
Modified:
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java?rev=1697247r1=1697246r2=1697247view=diff
==
---
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
(original)
+++
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
Sun Aug 23 20:37:20 2015
@@ -126,7 +126,7 @@ public class LabelCell extends CellValue
/**
* Sets the codeString/code representing the cells contents
*
-* @return the codeString/code representing the cells contents
+* @param cellContents the codeString/code representing the cells
contents
*/
private void setLabel(String cellContents) throws IOException {
rgch = cellContents.getBytes(UTF-16LE);
Modified:
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java?rev=1697247r1=1697246r2=1697247view=diff
==
---
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
(original)
+++
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
Sun Aug 23 20:37:20 2015
@@ -120,9 +120,11 @@ public class Pane implements BIFFRecord
}
/**
-* Get the hex code for this particular codeBIFFRecord/code
+* Set the pane number of the active pane
+ * 0 - bottom right, 1 - top right
+ * 2 - bottom left, 3 - top left
*
-* @return the hex code for codePane/code
+* @param paneNumber the pane number of the active pane
*/
public void setPaneNumber(int paneNumber) {
pnnAcct = (byte) paneNumber;
Modified:
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java?rev=1697247r1=1697246r2=1697247view=diff
==
---
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
(original)
+++
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
Sun Aug 23 20:37:20 2015
@@ -76,21 +76,11 @@ public class Selection implements BIFFRe
return PocketExcelConstants.CURRENT_SELECTION;
}
-/**
-* Get the hex code for this particular codeBIFFRecord/code
-*
-* @return the hex code for codeSelection/code
-*/
public Point getActiveCell() {
Point p = new Point(colActive,
EndianConverter.readShort(rwActive));
return p;
}
-/**
-* Get the hex code for this particular codeBIFFRecord/code
-*
-* @return the hex code for codeSelection/code
-*/
public void setActiveCell(Point p) {
colActive = (byte)
buildbot failure in ASF Buildbot on openoffice-linux64-rat-aoo410
The Buildbot has detected a failed build on builder openoffice-linux64-rat-aoo410 while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-rat-aoo410/builds/43 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-rat-aoo410' triggered this build Build Source Stamp: [branch openoffice/branches/AOO410] HEAD Blamelist: BUILD FAILED: failed Sincerely, -The Buildbot
buildbot success in ASF Buildbot on openoffice-linux32-nightly
The Buildbot has detected a passing build on builder openoffice-linux32-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux32-nightly/builds/63 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm2_ubuntu_32bit Build Reason: The Nightly scheduler named 'openoffice-linux32-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in ASF Buildbot on openoffice-fbsd-nightly
The Buildbot has detected a failed build on builder openoffice-fbsd-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/46 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-fbsd2_64bit Build Reason: The Nightly scheduler named 'openoffice-fbsd-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: BUILD FAILED: failed configure bootstrap Sincerely, -The Buildbot
buildbot exception in ASF Buildbot on aoo-win7
The Buildbot has detected a build exception on builder aoo-win7 while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/aoo-win7/builds/61 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-win7 Build Reason: The Nightly scheduler named 'aoo-win7-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: BUILD FAILED: exception svn info autoconf configure bootstrap build.pl --all copy log index upload logs Sincerely, -The Buildbot
svn commit: r1697306 - in /openoffice/trunk/main/xmerge/source: bridge/java/ pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/ xmerge/java/org/openoffice/xmerge/converter/xml
Author: damjan
Date: Mon Aug 24 03:07:26 2015
New Revision: 1697306
URL: http://svn.apache.org/r1697306
Log:
Fix all xmerge javadoc errors.
Modified:
openoffice/trunk/main/xmerge/source/bridge/java/XMergeBridge.java
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
Modified: openoffice/trunk/main/xmerge/source/bridge/java/XMergeBridge.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/bridge/java/XMergeBridge.java?rev=1697306r1=1697305r2=1697306view=diff
==
--- openoffice/trunk/main/xmerge/source/bridge/java/XMergeBridge.java (original)
+++ openoffice/trunk/main/xmerge/source/bridge/java/XMergeBridge.java Mon Aug
24 03:07:26 2015
@@ -92,7 +92,6 @@ public class XMergeBridge {
/** This inner class provides the component as a concrete implementation
* of the service description. It implements the needed interfaces.
- * @implements XTypeProvider
*/
static public class _XMergeBridge implements
XImportFilter,
Modified:
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java?rev=1697306r1=1697305r2=1697306view=diff
==
---
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
(original)
+++
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
Mon Aug 24 03:07:26 2015
@@ -33,7 +33,7 @@ import org.openoffice.xmerge.converter.x
/**
* This Helper class provides a simplified interface to conversion between
PocketXL formula representation
* and Calc formula representation.p
- * The class is used by {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.Formula}
+ * The class is used by {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Formula}
*/
public class FormulaHelper {
Modified:
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java?rev=1697306r1=1697305r2=1697306view=diff
==
---
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
(original)
+++
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
Mon Aug 24 03:07:26 2015
@@ -27,7 +27,7 @@ import java.util.HashMap;
/**
* This class defines the precedence applied to each operator when performing
a conversion
- * {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.formula.FormulaCompiler.infix2
from infix to RPN.}.
+ * {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula.FormulaCompiler#infix2RPN
from infix to RPN.}.
*/
public class PrecedenceTable {
public static final int DEFAULT_PRECEDENCE = 0;
Modified:
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java?rev=1697306r1=1697305r2=1697306view=diff
==
---
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
(original)
+++
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
Mon Aug 24 03:07:26 2015
@@ -123,26 +123,21 @@ class alignment extends conversionAlgori
/**
* pThis class represents a paragraph codeStyle/code./p
*
- * ptable border=1 cellpadding=1trtd
- * Attribute/tdtdValue
- * /td/trtrtd
- * MARGIN_LEFT /tdtdmm * 100
- * /td/trtrtd
- * MARGIN_RIGHT /tdtdmm * 100
- * /td/trtrtd
- * MARGIN_TOP /tdtdmm * 100 (space on top of paragraph)
- * /td/trtrtd
- * MARGIN_BOTTOM/tdtdmm * 100
- * /td/trtrtd
- * TEXT_INDENT /tdtdmm * 100 (first line
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=1697312r1=1697311r2=1697312view=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
-* @seecom.sun.star.lang.ServiceManager
+* @seecom.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=1697312r1=1697311r2=1697312view=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 (=gt; 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=1697312r1=1697311r2=1697312view=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 codeSharedLibraryLoader/code class provides the functionality of
the codecom.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
- * @seecom.sun.star.lang.ServiceManager
+ * @seecom.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 smgrthe 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
