summaryrefslogtreecommitdiff
path: root/qadevOOo/tests/java/ifc/container/_XContainer.java
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:21:07 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:21:07 +0200
commite076213c4e1a1708e70c3ac65180c6a3ceb04349 (patch)
treef951731fcd4f0c17dd7a55b154be238cb2b71bae /qadevOOo/tests/java/ifc/container/_XContainer.java
parentb9bff9906e94ef3b1c8d6da779269122d39d8354 (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 51b472e78a48fc214cb73929bc1e7fc273838d57 (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:46 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit 4a7775fc7f2f9f18063e5c137deb1e3edb0c1caf Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:30 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit 5c1062b2bb1697eeca47e551eef913813efd0eaa Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:58 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit 5874d96a88795f941f8a900d9834e2704e8884ae Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:09 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: testing_libreoffice-3.3.1.1 split repo tag: testing_libreoffice-3.3.1.2
Diffstat (limited to 'qadevOOo/tests/java/ifc/container/_XContainer.java')
-rw-r--r--qadevOOo/tests/java/ifc/container/_XContainer.java56
1 files changed, 28 insertions, 28 deletions
diff --git a/qadevOOo/tests/java/ifc/container/_XContainer.java b/qadevOOo/tests/java/ifc/container/_XContainer.java
index e3122bc28f66..f4e016100e73 100644
--- a/qadevOOo/tests/java/ifc/container/_XContainer.java
+++ b/qadevOOo/tests/java/ifc/container/_XContainer.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -108,12 +108,12 @@ public class _XContainer extends MultiMethodTest {
if (NC == null) {
container = tEnv.getObjRelation("XContainer.Container") ;
}
-
+
if (container != null) {
if (container instanceof com.sun.star.awt.XControlContainer) {
CC = (XControlContainer) container;
} else if (container instanceof com.sun.star.uno.XNamingService) {
- NV = (XNamingService) container;
+ NV = (XNamingService) container;
} else if (container instanceof com.sun.star.container.XNameReplace) {
NR = (XNameReplace) container;
inst2 = tEnv.getObjRelation("XContainer.NewValue");
@@ -122,7 +122,7 @@ public class _XContainer extends MultiMethodTest {
NC = (XNameContainer) container;
}
}
-
+
if (NC == null && CC == null && NV == null && NR == null)
throw new StatusException(
Status.failed("Neither object implements XNameContainer" +
@@ -178,14 +178,14 @@ public class _XContainer extends MultiMethodTest {
if (NR == null) bResult &= bElementInserted;
if (!bResult) {
- log.println("inserted was " + (bElementInserted ? "" : "NOT")
+ log.println("inserted was " + (bElementInserted ? "" : "NOT")
+ " called.");
-
+
if (NC != null) {
- log.println("replaced was " + (bElementReplaced ? "" : "NOT")
+ log.println("replaced was " + (bElementReplaced ? "" : "NOT")
+ " called.");
}
- log.println("removed was " + (bElementRemoved ? "" : "NOT")
+ log.println("removed was " + (bElementRemoved ? "" : "NOT")
+ " called.");
}
@@ -260,14 +260,14 @@ public class _XContainer extends MultiMethodTest {
return bResult;
}
-
+
/**
* In case no XNameContainer is available, but a XControlContainer
- * instead.
+ * instead.
* the XControl instance is inserted
* Method returns true if the count of Controls is changed afterwards
*/
- protected boolean performChanges2() {
+ protected boolean performChanges2() {
int precount = CC.getControls().length;
CC.addControl("NewControl",(XControl) inst);
shortWait();
@@ -276,25 +276,25 @@ public class _XContainer extends MultiMethodTest {
shortWait();
return count>precount;
}
-
+
/**
* In case no XNameContainer is available, but a XNamingService
- * instead.
+ * instead.
* the instance is registered and revoked again
* Method return true if getRegisteredObject() works after
* registering and doesn't after revoke
*/
- protected boolean performChanges3() {
+ protected boolean performChanges3() {
boolean res = true;
Object reg = null;
-
+
try {
reg = NV.getRegisteredObject("MyFactory");
- NV.revokeObject("MyFactory");
+ NV.revokeObject("MyFactory");
} catch (Exception e) {
-
+
}
-
+
try {
NV.registerObject("MyFactory", inst);
reg = NV.getRegisteredObject("MyFactory");
@@ -304,7 +304,7 @@ public class _XContainer extends MultiMethodTest {
log.println("registerObject failed");
res &= false;
}
-
+
try {
NV.revokeObject("MyFactory");
reg = NV.getRegisteredObject("MyFactory");
@@ -313,20 +313,20 @@ public class _XContainer extends MultiMethodTest {
} catch (Exception e) {
res &= true;
}
-
+
return res;
- }
-
+ }
+
/**
* In case no XNameContainer is available, but a XNamingReplace
- * instead.
+ * instead.
*/
- protected boolean performChanges4() {
+ protected boolean performChanges4() {
boolean res = true;
Object newValue = inst2;
Object originalValue = null;
String name = null;
-
+
try {
name = (String)inst;
}
@@ -335,7 +335,7 @@ public class _XContainer extends MultiMethodTest {
e.printStackTrace(log);
return false;
}
-
+
try {
originalValue = NR.getByName(name);
NR.replaceByName(name, newValue);
@@ -352,7 +352,7 @@ public class _XContainer extends MultiMethodTest {
}
return res;
- }
+ }
/**
* Sleeps for 0.5 sec. to allow StarOffice to react on <code>
@@ -364,7 +364,7 @@ public class _XContainer extends MultiMethodTest {
} catch (InterruptedException e) {
log.println("While waiting :" + e) ;
}
- }
+ }
}