[Libreoffice-commits] core.git: javaunohelper/test qadevOOo/testdocs qadevOOo/tests ridljar/com ridljar/test testtools/com wizards/com
javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java |
34
qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java |
2
qadevOOo/tests/java/mod/_stm/DataInputStream.java|
2
qadevOOo/tests/java/mod/_stm/DataOutputStream.java |
2
qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java |
2
qadevOOo/tests/java/mod/_stm/ObjectInputStream.java |
2
qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java |
2
qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java|
2
qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java |
2
qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java |
2
qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java |
2
qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java |
2
ridljar/com/sun/star/lib/uno/helper/PropertySet.java |
4 -
ridljar/com/sun/star/lib/uno/protocols/urp/Unmarshal.java|
2
ridljar/com/sun/star/uno/UnoRuntime.java |
2
ridljar/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java |
2
ridljar/test/com/sun/star/uno/AnyConverter_Test.java |
2
testtools/com/sun/star/comp/bridge/TestComponent.java|
40 +-
wizards/com/sun/star/wizards/common/NumericalHelper.java |
2
19 files changed, 55 insertions(+), 55 deletions(-)
New commits:
commit 00e1ac51e6d6185cba0b677587b03e1a94b26a87
Author: Noel Grandin
AuthorDate: Thu Nov 2 09:54:28 2023 +0200
Commit: Noel Grandin
CommitDate: Thu Nov 2 14:47:25 2023 +0100
'new Character' is deprecated in Java
replace with Character.valueOf
Change-Id: I9938db0fce6490eba6f4900efc3c139a1b71d120
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158786
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git
a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
index 7cb1af74c7e3..83245c5530b1 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
@@ -76,7 +76,7 @@ public class PropertySet_Test
cl.setPropertyValue("PropBoolA", value);
assertEquals(cl.getPropertyValue("PropBoolA"), value);
-value= new Character('A');
+value= Character.valueOf('A');
cl.setPropertyValue("PropCharA",value);
assertEquals(cl.getPropertyValue("PropCharA"), value);
@@ -149,7 +149,7 @@ public class PropertySet_Test
cl.setPropertyValue("PropObjectA", value);
assertEquals(cl.getPropertyValue("PropObjectA"), value);
-value= new Character('A');
+value= Character.valueOf('A');
cl.setPropertyValue("PropObjectA",value);
assertEquals(cl.getPropertyValue("PropObjectA"), value);
@@ -208,7 +208,7 @@ public class PropertySet_Test
assertTrue(ret instanceof Any);
assertTrue(util.anyEquals(value, ret));
-value= new Character('A');
+value= Character.valueOf('A');
cl.setPropertyValue("PropAnyA",value);
ret= cl.getPropertyValue("PropAnyA");
assertTrue(ret instanceof Any);
@@ -288,7 +288,7 @@ public class PropertySet_Test
assertTrue(ret instanceof Boolean);
assertTrue(util.anyEquals(value, ret));
-value= new Any (new Type(char.class), new Character('A'));
+value= new Any (new Type(char.class), Character.valueOf('A'));
cl.setPropertyValue("PropCharA",value);
ret= cl.getPropertyValue("PropCharA");
assertTrue(ret instanceof Character);
@@ -368,7 +368,7 @@ public class PropertySet_Test
assertTrue(ret instanceof Any);
assertTrue(util.anyEquals(value, ret));
-value= new Any (new Type(char.class), new Character('A'));
+value= new Any (new Type(char.class), Character.valueOf('A'));
cl.setPropertyValue("PropAnyA",value);
ret= cl.getPropertyValue("PropAnyA");
assertTrue(ret instanceof Any);
@@ -446,7 +446,7 @@ public class PropertySet_Test
cl.setPropertyValue("PropBoolClass", value);
assertEquals(cl.getPropertyValue("PropBoolClass"), value);
-value= new Character('A');
+value= Character.valueOf('A');
cl.setPropertyValue("PropCharClass",value);
assertEquals(cl.getPropertyValue("PropCharClass"), value);
@@ -484,7 +484,7 @@ public class PropertySet_Test
assertTrue(ret instanceof Boolean);
assertTrue(util.anyEquals(value, ret));
-value= new Any (new Type(char.class), new Character('A'));
+value= new Any (new Type(
[Libreoffice-commits] core.git: javaunohelper/test lotuswordpro/inc lotuswordpro/source ridljar/com sd/source winaccessibility/inc
javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java |
4 ++--
lotuswordpro/inc/lwpfoundry.hxx |
2 +-
lotuswordpro/source/filter/lwpcharacterstyle.cxx |
2 +-
lotuswordpro/source/filter/lwpfrib.cxx|
6 +++---
lotuswordpro/source/filter/lwpparastyle.cxx |
2 +-
lotuswordpro/source/filter/lwpsilverbullet.cxx|
2 +-
ridljar/com/sun/star/comp/loader/JavaLoader.java |
2 +-
sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx |
2 +-
winaccessibility/inc/AccObjectManagerAgent.hxx|
2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 262ab496955582341e1f383c6eff9a0bb37dd9d7
Author: Andrea Gelmini
AuthorDate: Mon Aug 31 16:22:12 2020 +0200
Commit: Julien Nabet
CommitDate: Tue Sep 1 10:02:05 2020 +0200
Fix typo in code
It passed "make check" on Linux
Change-Id: I4733e6609ee99bef49c2771c83b450ee89d955b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101804
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git
a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
index b9c67e68be74..03daa113aaad 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
@@ -85,12 +85,12 @@ public class SharedLibraryLoader_Test {
if ( sharedLibraryLoader == null && !
test_instantiateSharedLibraryLoader() )
return false;
-System.err.println("- get the native ServiceManger factory");
+System.err.println("- get the native ServiceManager factory");
XSingleServiceFactory aSMgrFac =
UnoRuntime.queryInterface( XSingleServiceFactory.class,
sharedLibraryLoader.activate(NATIVE_SERVICE_MANAGER_IMP_NAME, null,
NATIVE_SERVICE_MANAGER_LIB_NAME, null));
-System.err.println("- instantiate the native ServiceManger");
+System.err.println("- instantiate the native ServiceManager");
nativeServiceManager = UnoRuntime.queryInterface(
XMultiServiceFactory.class, aSMgrFac.createInstance() );
System.out.print("Test - ");
diff --git a/lotuswordpro/inc/lwpfoundry.hxx b/lotuswordpro/inc/lwpfoundry.hxx
index 36919dd9da4e..fc9989107639 100644
--- a/lotuswordpro/inc/lwpfoundry.hxx
+++ b/lotuswordpro/inc/lwpfoundry.hxx
@@ -248,7 +248,7 @@ private:
public:
LwpContentManager& GetContentManager() { return m_ContentMgr; }
LwpObjectID& GetGraphicListHead() { return
m_ContentMgr.GetGraphicListHead(); }
-LwpFontManager& GetFontManger() { return m_FontMgr;}
+LwpFontManager& GetFontManager() { return m_FontMgr;}
LwpObjectID& GetTextStyleHead() { return m_TextStyle;}
LwpObjectID& GetLayout() {return m_Layout;}
LwpObjectID& GetBulletManagerID() { return m_BulMgr.GetHeadID();}
diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.cxx
b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
index 07034de5381b..eb94bb0c1840 100644
--- a/lotuswordpro/source/filter/lwpcharacterstyle.cxx
+++ b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
@@ -151,7 +151,7 @@ void LwpTextStyle::RegisterStyle()
pStyle->SetStyleName(styleName);
//Create font
-LwpFontManager& rFontMgr = m_pFoundry->GetFontManger();
+LwpFontManager& rFontMgr = m_pFoundry->GetFontManager();
rtl::Reference pFont = rFontMgr.CreateFont(m_nFinalFontID);
pStyle->SetFont(pFont);
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx
b/lotuswordpro/source/filter/lwpfrib.cxx
index bc9450fd17bc..95875aaedaa1 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -259,7 +259,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
*pNewStyle = *pNamedStyle;
pNewStyle->SetStyleName("");
-pFont =
pFoundry->GetFontManger().CreateOverrideFont(pCharStyle->GetFinalFontID(),m_pModifiers->FontID);
+pFont =
pFoundry->GetFontManager().CreateOverrideFont(pCharStyle->GetFinalFontID(),m_pModifiers->FontID);
pNewStyle->SetFont(pFont);
IXFStyleRet aNewStyle =
pXFStyleManager->AddStyle(std::move(pNewStyle));
m_StyleName = aNewStyle.m_pStyle->GetStyleName();
@@ -275,7 +275,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
if (m_pModifiers->FontID && pFoundry)
{
std::unique_ptr pNewStyle(new XFTextStyle());
-pFont = pFoundry->GetFontManger().CreateFont(m_pModifiers->FontID);
+pFont =
pFoundry->GetFontManager().CreateFont(m_pModifiers->FontID);
pNewStyle->SetFont(pFont);
[Libreoffice-commits] core.git: javaunohelper/test scripting/source
javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java |2 -
scripting/source/dlgprov/dlgevtatt.cxx | 14
+-
scripting/source/dlgprov/dlgevtatt.hxx |2 -
3 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 98397a48f1f33be3405b0f462fc20422f6363b68
Author: Julien Nabet
Date: Mon Jan 16 22:28:50 2017 +0100
Typo: listerner->listener
Change-Id: Ib2cb62477630641f0302769eacdd0dd00f4e760c
Reviewed-on: https://gerrit.libreoffice.org/33192
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git
a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
index 44cfcb95..bd3ce46 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
@@ -83,7 +83,7 @@ public class ComponentBase_Test
assertEquals(obj2.nDisposingCalled, 1);
assertEquals(obj3.nDisposingCalled, 1);
-logger.log(Level.FINE, "Adding a listener after dispose, causes a
immediate call to the listerner.");
+logger.log(Level.FINE, "Adding a listener after dispose, causes a
immediate call to the listener.");
obj1.nDisposingCalled= 0;
comp.addEventListener(obj1);
assertEquals(obj1.nDisposingCalled, 1);
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx
b/scripting/source/dlgprov/dlgevtatt.cxx
index 633ec64..ca25c14 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -156,12 +156,12 @@ namespace dlgprov
// key listeners by protocol when ScriptType = 'Script'
// otherwise key is the ScriptType e.g. StarBasic
if ( rxRTLListener.is() ) // set up handler for RTL_BASIC
-listernersForTypes[ OUString("StarBasic") ] = rxRTLListener;
+listenersForTypes[ OUString("StarBasic") ] = rxRTLListener;
else
-listernersForTypes[ OUString("StarBasic") ] = new
DialogLegacyScriptListenerImpl( rxContext, rxModel );
+listenersForTypes[ OUString("StarBasic") ] = new
DialogLegacyScriptListenerImpl( rxContext, rxModel );
// handler for Script & OUString("vnd.sun.star.UNO:")
-listernersForTypes[ OUString("vnd.sun.star.UNO") ] = new
DialogUnoScriptListenerImpl( rxContext, rxModel, rxControl, rxHandler,
rxIntrospect, bProviderMode );
-listernersForTypes[ OUString("vnd.sun.star.script") ] = new
DialogSFScriptListenerImpl( rxContext, rxModel );
+listenersForTypes[ OUString("vnd.sun.star.UNO") ] = new
DialogUnoScriptListenerImpl( rxContext, rxModel, rxControl, rxHandler,
rxIntrospect, bProviderMode );
+listenersForTypes[ OUString("vnd.sun.star.script") ] = new
DialogSFScriptListenerImpl( rxContext, rxModel );
// determine the VBA compatibility mode from the Basic library
container
try
@@ -175,7 +175,7 @@ namespace dlgprov
{
}
if ( mbUseFakeVBAEvents )
-listernersForTypes[ OUString("VBAInterop") ] = new
DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel, sDialogLibName );
+listenersForTypes[ OUString("VBAInterop") ] = new
DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel, sDialogLibName );
}
@@ -187,8 +187,8 @@ namespace dlgprov
Reference< script::XScriptListener >
DialogEventsAttacherImpl::getScriptListenerForKey( const OUString& sKey )
throw ( RuntimeException )
{
-ListenerHash::iterator it = listernersForTypes.find( sKey );
-if ( it == listernersForTypes.end() )
+ListenerHash::iterator it = listenersForTypes.find( sKey );
+if ( it == listenersForTypes.end() )
throw RuntimeException(); // more text info here please
return it->second;
}
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx
b/scripting/source/dlgprov/dlgevtatt.hxx
index 033f258..46cef14 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -49,7 +49,7 @@ namespace dlgprov
{
private:
bool mbUseFakeVBAEvents;
-ListenerHash listernersForTypes;
+ListenerHash listenersForTypes;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::script::XEventAttacher > m_xEventAttacher;
css::uno::Reference< css::script::XScriptListener >
getScriptListenerForKey( const OUString& sScriptName ) throw (
css::uno::RuntimeException );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/test qadevOOo/Jar_OOoRunnerLight.mk qadevOOo/Jar_OOoRunner.mk qadevOOo/runner toolkit/test wizards/com wizards/Jar_commonwizards.mk
javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java |5 -
qadevOOo/Jar_OOoRunner.mk |2
qadevOOo/Jar_OOoRunnerLight.mk|2
qadevOOo/runner/convwatch/FilenameHelper.java | 25 +-
qadevOOo/runner/graphical/EnhancedComplexTestCase.java|7 +
qadevOOo/runner/graphical/IDocument.java | 27 --
qadevOOo/runner/helper/CwsDataExchangeImpl.java | 15 ++-
qadevOOo/runner/share/CwsDataExchange.java| 40
--
toolkit/test/accessibility/MessageInterface.java |5 -
toolkit/test/accessibility/Print.java |5 -
wizards/Jar_commonwizards.mk |2
wizards/com/sun/star/wizards/common/ParaStyled.java |2
wizards/com/sun/star/wizards/common/TemplateElement.java | 24 --
wizards/com/sun/star/wizards/table/TableWizard.java |6 -
wizards/com/sun/star/wizards/ui/WizardDialog.java | 24 --
wizards/com/sun/star/wizards/ui/XCompletion.java | 30
---
wizards/com/sun/star/wizards/ui/event/DataAware.java |4 -
17 files changed, 26 insertions(+), 199 deletions(-)
New commits:
commit 373affe59c9646d65c744ff7e3ed00425ccf9eb8
Author: Noel Grandin
Date: Thu Dec 11 08:10:33 2014 +0200
java: remove some unnecessary interfaces
Change-Id: Ie2da7cbbd1733881ff2da6fa095c37c21cf19fe8
Reviewed-on: https://gerrit.libreoffice.org/13435
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
index 07200b6..8e07a2b 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
@@ -108,9 +108,6 @@ public class WeakBase_Test
}
}
-interface Aint
-{
-}
class OtherClass extends WeakBase implements XBridgeSupplier2
{
@@ -120,7 +117,7 @@ class OtherClass extends WeakBase implements
XBridgeSupplier2
}
}
-class SomeClass extends OtherClass implements Aint,XReference
+class SomeClass extends OtherClass implements XReference
{
public void dispose()
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index e7709e5..1dd5fbe 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -100,7 +100,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/runner/graphical/GlobalLogWriter \
qadevOOo/runner/graphical/GraphicalComparator \
qadevOOo/runner/graphical/HTMLResult \
-qadevOOo/runner/graphical/IDocument \
qadevOOo/runner/graphical/ImageHelper \
qadevOOo/runner/graphical/IniFile \
qadevOOo/runner/graphical/IOffice \
@@ -164,7 +163,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/runner/org/openoffice/Runner \
qadevOOo/runner/org/openoffice/RunnerService \
qadevOOo/runner/share/ComplexTest \
-qadevOOo/runner/share/CwsDataExchange \
qadevOOo/runner/share/DescEntry \
qadevOOo/runner/share/DescGetter \
qadevOOo/runner/share/LogWriter \
diff --git a/qadevOOo/Jar_OOoRunnerLight.mk b/qadevOOo/Jar_OOoRunnerLight.mk
index 17220c8..ec35391 100644
--- a/qadevOOo/Jar_OOoRunnerLight.mk
+++ b/qadevOOo/Jar_OOoRunnerLight.mk
@@ -97,7 +97,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunnerLight,\
qadevOOo/runner/graphical/GlobalLogWriter \
qadevOOo/runner/graphical/GraphicalComparator \
qadevOOo/runner/graphical/HTMLResult \
-qadevOOo/runner/graphical/IDocument \
qadevOOo/runner/graphical/ImageHelper \
qadevOOo/runner/graphical/IniFile \
qadevOOo/runner/graphical/IOffice \
@@ -161,7 +160,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunnerLight,\
qadevOOo/runner/org/openoffice/Runner \
qadevOOo/runner/org/openoffice/RunnerService \
qadevOOo/runner/share/ComplexTest \
-qadevOOo/runner/share/CwsDataExchange \
qadevOOo/runner/share/DescEntry \
qadevOOo/runner/share/DescGetter \
qadevOOo/runner/share/LogWriter \
diff --git a/qadevOOo/runner/convwatch/FilenameHelper.java
b/qadevOOo/runner/convwatch/FilenameHelper.java
index 56a3b5dd..ffe4622 100644
--- a/qadevOOo/runner/convwatch/FilenameHelper.java
+++ b/qadevOOo/runner/convwatch/FilenameHelper.java
@@ -16,30 +16,17 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-/**
- * Helper class to hold a Filename or a FileURL
- * Something like File in Java,
- * with some more extensions direct to ConvWatch and its name conventions
- *
- *
- */
package convwatch;
import helper.URLHelper;
import helper.StringHelper;
-interface Filenamer
-{
-String getSuffix();
-String getFileURL();
-String getAbsoluteSyste
[Libreoffice-commits] core.git: javaunohelper/test jurt/com qadevOOo/runner wizards/com xmerge/source
javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java |
1 -
jurt/com/sun/star/uno/WeakReference.java |
5 -
qadevOOo/runner/lib/TestCase.java |
1 -
qadevOOo/runner/util/InstCreator.java |
2 --
wizards/com/sun/star/wizards/common/ParaStyled.java|
1 -
wizards/com/sun/star/wizards/common/PlaceholderTextElement.java|
2 --
wizards/com/sun/star/wizards/common/TextElement.java |
2 --
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java |
2 --
8 files changed, 16 deletions(-)
New commits:
commit f6388e15bf95326d2a712453dc2c17b010801533
Author: Robert Antoni Buj i Gelonch
Date: Mon Oct 13 16:36:02 2014 +0200
java: import from the same package
Change-Id: I1bb0999783f365e20b682c3707e73c65724265c9
Reviewed-on: https://gerrit.libreoffice.org/11955
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
index 092c9fc..bb0a605 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
@@ -30,7 +30,6 @@ import com.sun.star.registry.XSimpleRegistry;
import com.sun.star.registry.XImplementationRegistration;
import com.sun.star.container.XSet;
-import com.sun.star.lib.uno.helper.Factory;
import com.sun.star.comp.helper.RegistryServiceFactory;
import com.sun.star.uno.UnoRuntime;
diff --git a/jurt/com/sun/star/uno/WeakReference.java
b/jurt/com/sun/star/uno/WeakReference.java
index 3691c0f..261bc1a 100644
--- a/jurt/com/sun/star/uno/WeakReference.java
+++ b/jurt/com/sun/star/uno/WeakReference.java
@@ -18,11 +18,6 @@
package com.sun.star.uno;
-import com.sun.star.uno.XWeak;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XAdapter;
-import com.sun.star.uno.XReference;
-
/**
* This class holds weak reference to an object.
*
diff --git a/qadevOOo/runner/lib/TestCase.java
b/qadevOOo/runner/lib/TestCase.java
index a4895f1..ebe175d 100644
--- a/qadevOOo/runner/lib/TestCase.java
+++ b/qadevOOo/runner/lib/TestCase.java
@@ -19,7 +19,6 @@
package lib;
import java.io.PrintWriter;
-import lib.TestParameters;
/**
* TestCase represent a factory for TestEnvironments
diff --git a/qadevOOo/runner/util/InstCreator.java
b/qadevOOo/runner/util/InstCreator.java
index 5259b43..e1eb8c8 100644
--- a/qadevOOo/runner/util/InstCreator.java
+++ b/qadevOOo/runner/util/InstCreator.java
@@ -18,8 +18,6 @@
package util;
-import util.XInstCreator;
-
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
diff --git a/wizards/com/sun/star/wizards/common/ParaStyled.java
b/wizards/com/sun/star/wizards/common/ParaStyled.java
index e1eedfd..0a80f45 100644
--- a/wizards/com/sun/star/wizards/common/ParaStyled.java
+++ b/wizards/com/sun/star/wizards/common/ParaStyled.java
@@ -17,7 +17,6 @@
*/
package com.sun.star.wizards.common;
-import com.sun.star.wizards.common.TemplateElement;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.text.*;
diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
index a6e69da..3b943e0 100644
--- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
+++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
@@ -17,14 +17,12 @@
*/
package com.sun.star.wizards.common;
-import com.sun.star.wizards.common.TextElement;
import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.text.*;
import com.sun.star.wizards.text.*;
-import com.sun.star.wizards.common.PlaceholderTextElement;
public class PlaceholderTextElement extends TextElement
{
diff --git a/wizards/com/sun/star/wizards/common/TextElement.java
b/wizards/com/sun/star/wizards/common/TextElement.java
index 3830891..4549a9f 100644
--- a/wizards/com/sun/star/wizards/common/TextElement.java
+++ b/wizards/com/sun/star/wizards/common/TextElement.java
@@ -17,11 +17,9 @@
*/
package com.sun.star.wizards.common;
-import com.sun.star.wizards.common.ParaStyled;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.text.*;
-import com.sun.star.wizards.common.TextElement;
public class TextElement extends ParaStyled
{
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
index f74a999..11e337b 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merge
[Libreoffice-commits] core.git: javaunohelper/test
javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java | 14
+++---
1 file changed, 5 insertions(+), 9 deletions(-)
New commits:
commit 18ceb207ddd8e9065a8e0bd4a64163a3a2a0a0ce
Author: Robert Antoni Buj i Gelonch
Date: Thu Oct 2 11:19:12 2014 +0200
javaunohelper: More robust way to wait for finalization
Change-Id: I09fa2462d8131381f380574b8a9aeaf080211b2b
Reviewed-on: https://gerrit.libreoffice.org/11759
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
index ef9fdbf..07200b6 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
@@ -34,6 +34,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
+import util.WaitUnreachable;
public class WeakBase_Test
{
@@ -81,12 +82,9 @@ public class WeakBase_Test
adapter.addReference(aRef2);
assertSame(adapter.queryAdapted(), comp);
+WaitUnreachable u = new WaitUnreachable(comp);
comp= null;
-logger.log(Level.FINE, "Wait 51ms (-XX:MaxGCPauseMillis=50)");
-System.gc();
-System.runFinalization();
-Thread.sleep(51);
-
+u.waitUnreachable();
assertEquals(aRef1.nDisposeCalled, 1);
assertEquals(aRef2.nDisposeCalled, 1);
assertNull(adapter.queryAdapted());
@@ -102,11 +100,9 @@ public class WeakBase_Test
adapter.addReference(aRef2);
adapter.removeReference(aRef1);
-logger.log(Level.FINE, "Wait 51ms (-XX:MaxGCPauseMillis=50)");
+u = new WaitUnreachable(comp);
comp= null;
-System.gc();
-System.runFinalization();
-Thread.sleep(51);
+u.waitUnreachable();
assertEquals(aRef1.nDisposeCalled, 0);
assertEquals(aRef2.nDisposeCalled, 1);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/test
javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
| 21 -
javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
| 40 --
javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
| 197 +++---
javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
| 69 +--
javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
| 104 +
javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
| 38 -
6 files changed, 168 insertions(+), 301 deletions(-)
New commits:
commit 6c87571125fbddf4215160f07894b7063f834b34
Author: Robert Antoni Buj i Gelonch
Date: Sun Sep 21 13:50:27 2014 +0200
javaunohelper: use java.util.logging in tests
Change-Id: Icdc61dc88a11afae5257bcddda32adb691cb5883
Reviewed-on: https://gerrit.libreoffice.org/11564
Reviewed-by: Chris Sherlock
Tested-by: Chris Sherlock
diff --git a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
index 57724be..184515d 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
@@ -25,18 +25,19 @@ import com.sun.star.uno.XComponentContext;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiServiceFactory;
+import java.util.logging.Logger;
+import java.util.logging.Level;
import java.util.Map;
public class Bootstrap_Test {
+private static final Logger logger =
Logger.getLogger(Bootstrap_Test.class.getName());
+
static public boolean test( String ini_file, Map
bootstrap_parameters )
throws java.lang.Exception
{
boolean passed = false;
-System.err.println();
-
System.out.println("***");
-System.err.println("Bootstrap - doing tests...");
-System.err.println();
+logger.log(Level.INFO, "Bootstrap - doing tests...");
try {
XComponentContext xContext =
@@ -54,14 +55,13 @@ public class Bootstrap_Test {
XMultiServiceFactory msf = UnoRuntime.queryInterface(
XMultiServiceFactory.class, xContext.getServiceManager() );
String services[] = msf.getAvailableServiceNames();
-System.out.println("Available services are:");
-System.err.println();
+logger.log(Level.FINE, "Available services are:");
if (services.length == 0)
-System.out.println("No services avialable!");
+logger.log(Level.FINE, "No services avialable!");
else
for ( int i=0; ihttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/test
javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java | 12
++
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 43cda91057c2e5aeb361c9a5fde216023de37713
Author: rbuj
Date: Mon Aug 11 12:14:50 2014 +0200
javaunohelper: Fix Bootstrap_Test.java & add warning messages
Accept bootstrap parameters that contained more than one =
Reject empty key
Change-Id: Ie04364867d56d5687cbbc2c142ea73be90bbafdf
Signed-off-by: Stephan Bergmann
diff --git a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
index f52ce28..0031e1a 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
@@ -94,13 +94,17 @@ public class Bootstrap_Test {
java.util.HashMap bootstrap_parameters = new
java.util.HashMap();
for ( int nPos = 1; nPos < args.length; ++nPos ) {
if (args[nPos].contains("=")) {
-String bootstrap_parameter[] = args[nPos].split("=");
-if (bootstrap_parameter.length == 2){
+String bootstrap_parameter[] = args[nPos].split("=",2);
+if (bootstrap_parameter[0].length() > 0) {
bootstrap_parameters.put( bootstrap_parameter[0],
bootstrap_parameter[1] );
-} else{
+} else {
+System.out.println();
+System.out.println("The 1st argument in a bootstrap
parameter is the key of a HashMap element and can't be null : '" + args[nPos] +
"'");
usage();
}
-} else{
+} else {
+System.out.println();
+System.out.println("Missing '=' in bootstrap parameter : '" +
args[nPos] + "'");
usage();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/test
javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java | 17
+-
1 file changed, 10 insertions(+), 7 deletions(-)
New commits:
commit aa0e3701aad1a8a955773e869d9a6b59eac51e72
Author: rbuj
Date: Sat Aug 9 17:56:48 2014 +0200
javaunohelper: Enhancement loading bootstrap_parameters in
Bootstrap_Test.java
Change-Id: I685fc278ec812d766ff83993d234ca3261a71dba
Reviewed-on: https://gerrit.libreoffice.org/10850
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
index 8e8032f..f52ce28 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
@@ -92,13 +92,16 @@ public class Bootstrap_Test {
usage();
java.util.HashMap bootstrap_parameters = new
java.util.HashMap();
-for ( int nPos = 1; nPos < args.length; ++nPos )
-{
-String arg = args[ nPos ];
-int n = arg.indexOf( '=' );
-if (n > 0)
-{
-bootstrap_parameters.put( arg.substring( 0, n ),
arg.substring( n +1 ) );
+for ( int nPos = 1; nPos < args.length; ++nPos ) {
+if (args[nPos].contains("=")) {
+String bootstrap_parameter[] = args[nPos].split("=");
+if (bootstrap_parameter.length == 2){
+bootstrap_parameters.put( bootstrap_parameter[0],
bootstrap_parameter[1] );
+} else{
+usage();
+}
+} else{
+usage();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
