remove some unused Java code
found by UCDetector Change-Id: Ic0295a24b26e206eb53eda2da540755477df86df
This commit is contained in:
@@ -55,12 +55,12 @@ public class MethodHandler implements XPropertyHandler
|
|||||||
|
|
||||||
public void addEventListener(com.sun.star.lang.XEventListener _eventListener)
|
public void addEventListener(com.sun.star.lang.XEventListener _eventListener)
|
||||||
{
|
{
|
||||||
// ingnoring this
|
// ignoring this
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addPropertyChangeListener(com.sun.star.beans.XPropertyChangeListener _propertyChangeListener) throws com.sun.star.lang.NullPointerException
|
public void addPropertyChangeListener(com.sun.star.beans.XPropertyChangeListener _propertyChangeListener) throws com.sun.star.lang.NullPointerException
|
||||||
{
|
{
|
||||||
// ingnoring this
|
// ignoring this
|
||||||
}
|
}
|
||||||
|
|
||||||
public Object convertToControlValue(String _propertyName, Object _propertyValue, com.sun.star.uno.Type type) throws com.sun.star.beans.UnknownPropertyException
|
public Object convertToControlValue(String _propertyName, Object _propertyValue, com.sun.star.uno.Type type) throws com.sun.star.beans.UnknownPropertyException
|
||||||
|
@@ -158,7 +158,7 @@ public class Interceptor implements XDispatch,
|
|||||||
* solar mutex. If this hangs - you can see a beautiful deadlock
|
* solar mutex. If this hangs - you can see a beautiful deadlock
|
||||||
* when you attach your debugger to the main process.
|
* when you attach your debugger to the main process.
|
||||||
*/
|
*/
|
||||||
public void checkNoSolarMutexHeld()
|
private void checkNoSolarMutexHeld()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@@ -58,7 +58,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
|
|||||||
qadevOOo/runner/graphical/FileHelper \
|
qadevOOo/runner/graphical/FileHelper \
|
||||||
qadevOOo/runner/helper/APIDescGetter \
|
qadevOOo/runner/helper/APIDescGetter \
|
||||||
qadevOOo/runner/helper/AppProvider \
|
qadevOOo/runner/helper/AppProvider \
|
||||||
qadevOOo/runner/helper/BuildEnvTools \
|
|
||||||
qadevOOo/runner/helper/CfgParser \
|
qadevOOo/runner/helper/CfgParser \
|
||||||
qadevOOo/runner/helper/ClParser \
|
qadevOOo/runner/helper/ClParser \
|
||||||
qadevOOo/runner/helper/ComplexDescGetter \
|
qadevOOo/runner/helper/ComplexDescGetter \
|
||||||
@@ -70,7 +69,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
|
|||||||
qadevOOo/runner/helper/OfficeProvider \
|
qadevOOo/runner/helper/OfficeProvider \
|
||||||
qadevOOo/runner/helper/OfficeWatcher \
|
qadevOOo/runner/helper/OfficeWatcher \
|
||||||
qadevOOo/runner/helper/OSHelper \
|
qadevOOo/runner/helper/OSHelper \
|
||||||
qadevOOo/runner/helper/ParameterNotFoundException \
|
|
||||||
qadevOOo/runner/helper/ProcessHandler \
|
qadevOOo/runner/helper/ProcessHandler \
|
||||||
qadevOOo/runner/helper/PropertyHandlerFactroy \
|
qadevOOo/runner/helper/PropertyHandlerFactroy \
|
||||||
qadevOOo/runner/helper/PropertyHandlerImpl \
|
qadevOOo/runner/helper/PropertyHandlerImpl \
|
||||||
@@ -78,7 +76,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
|
|||||||
qadevOOo/runner/helper/StringHelper \
|
qadevOOo/runner/helper/StringHelper \
|
||||||
qadevOOo/runner/helper/UnoProvider \
|
qadevOOo/runner/helper/UnoProvider \
|
||||||
qadevOOo/runner/helper/URLHelper \
|
qadevOOo/runner/helper/URLHelper \
|
||||||
qadevOOo/runner/helper/WindowListener \
|
|
||||||
qadevOOo/runner/lib/DynamicClassLoader \
|
qadevOOo/runner/lib/DynamicClassLoader \
|
||||||
qadevOOo/runner/lib/ExceptionStatus \
|
qadevOOo/runner/lib/ExceptionStatus \
|
||||||
qadevOOo/runner/lib/MultiMethodTest \
|
qadevOOo/runner/lib/MultiMethodTest \
|
||||||
|
@@ -1,182 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
*
|
|
||||||
* This file incorporates work covered by the following license notice:
|
|
||||||
*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed
|
|
||||||
* with this work for additional information regarding copyright
|
|
||||||
* ownership. The ASF licenses this file to you under the Apache
|
|
||||||
* License, Version 2.0 (the "License"); you may not use this file
|
|
||||||
* except in compliance with the License. You may obtain a copy of
|
|
||||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
||||||
*/
|
|
||||||
package helper;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.PrintWriter;
|
|
||||||
import lib.TestParameters;
|
|
||||||
import share.LogWriter;
|
|
||||||
import util.*;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This class support you to execute some shell commands in a build environment. At every call of commands
|
|
||||||
* a build environment was created and the commands will be executed.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class BuildEnvTools {
|
|
||||||
|
|
||||||
private final TestParameters param;
|
|
||||||
private final LogWriter log;
|
|
||||||
private final boolean mDebug;
|
|
||||||
private final String mPlatform;
|
|
||||||
private final String mShell;
|
|
||||||
private final boolean mCygwin;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This constructor creates an instance of BuildEncTools. It is verifying for all neccesarry
|
|
||||||
* parameters in <CODE>TestParameters</CODE> This must be:
|
|
||||||
* <ul>
|
|
||||||
* <li>OperatingSystem: Fill this parameter with an operating system like unxsols, unxsoli, unxlngi or wntmsci.
|
|
||||||
* </li>
|
|
||||||
* <li> Shell: Fill this parameter with a shell f.e '/bin/tcsh'
|
|
||||||
* or 'c:\\myShell\\myShell.exe'
|
|
||||||
* </li>
|
|
||||||
*/
|
|
||||||
public BuildEnvTools(TestParameters param, LogWriter log) throws ParameterNotFoundException {
|
|
||||||
this.param = param;
|
|
||||||
this.log = log;
|
|
||||||
mDebug = param.getBool(PropertyName.DEBUG_IS_ACTIVE);
|
|
||||||
|
|
||||||
boolean error = false;
|
|
||||||
|
|
||||||
String msg = "\nERROR: the following parameter must be set before executing the test:\n\n";
|
|
||||||
|
|
||||||
mPlatform = (String) param.get(PropertyName.OPERATING_SYSTEM);
|
|
||||||
if (mDebug) {
|
|
||||||
log.println("### " + mPlatform);
|
|
||||||
}
|
|
||||||
if (mPlatform == null){
|
|
||||||
msg += PropertyName.OPERATING_SYSTEM + "\nFill this parameter with an operating system like unxsols," +
|
|
||||||
" unxsoli, unxlngi, unxmacxi or wntmsci. \n\n";
|
|
||||||
}
|
|
||||||
if (mPlatform != null &&
|
|
||||||
(!mPlatform.equalsIgnoreCase(PropertyName.UNXSOLS)) &&
|
|
||||||
(!mPlatform.equalsIgnoreCase(PropertyName.UNXSOLI)) &&
|
|
||||||
(!mPlatform.equalsIgnoreCase(PropertyName.UNXLNGI)) &&
|
|
||||||
(!mPlatform.equalsIgnoreCase(PropertyName.UNXMACXI))&&
|
|
||||||
(!mPlatform.equalsIgnoreCase(PropertyName.WNTMSCI)) ){
|
|
||||||
|
|
||||||
msg += PropertyName.OPERATING_SYSTEM + ":" + mPlatform + "\nFill this parameter with an operating system like unxsols," +
|
|
||||||
" unxsoli, unxlngi, unxmacxi or wntmsci. \n\n";
|
|
||||||
error = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
mShell = (String) param.get(PropertyName.SHELL);
|
|
||||||
if (mShell == null) {
|
|
||||||
msg += PropertyName.SHELL + "\nFill this parameter with a shell" +
|
|
||||||
"\n\t/bin/tcsh c:\\myShell\\myShell.exe\n\n";
|
|
||||||
error = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
mCygwin = param.getBool(PropertyName.CYGWIN);
|
|
||||||
|
|
||||||
if (error) {
|
|
||||||
throw new ParameterNotFoundException(msg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Executes the given commands in OOo-Environment shell.
|
|
||||||
* @return the processHandler of the commands
|
|
||||||
* @see helper.ProcessHandler
|
|
||||||
*/
|
|
||||||
public ProcessHandler runCommandsInEnvironmentShell(String[] commands, File workDir, int shortWait) {
|
|
||||||
|
|
||||||
final String[] cmdLines = getCmdLinesWithCommand(commands);
|
|
||||||
final ProcessHandler pHdl = new ProcessHandler(cmdLines, (PrintWriter) log, workDir, shortWait, param);
|
|
||||||
pHdl.runCommand();
|
|
||||||
return pHdl;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getSrcRoot() {
|
|
||||||
|
|
||||||
String sSrcRoot = (String) param.get(PropertyName.SRC_ROOT);
|
|
||||||
|
|
||||||
if (sSrcRoot == null) {
|
|
||||||
String[] cmdLines = null;
|
|
||||||
if (mPlatform.equals(PropertyName.WNTMSCI) && ! mCygwin) {
|
|
||||||
cmdLines = new String[]{mShell, "/C", "echo SRC_ROOT=%SRC_ROOT"};
|
|
||||||
} else {
|
|
||||||
cmdLines = new String[]{mShell, "--login ", "-c ", "echo \"SRC_ROOT=$SRC_ROOT\""};
|
|
||||||
}
|
|
||||||
|
|
||||||
final ProcessHandler procHdl = new ProcessHandler(cmdLines, (PrintWriter) log, null, 5000, param);
|
|
||||||
procHdl.runCommand();
|
|
||||||
|
|
||||||
if (mDebug) {
|
|
||||||
log.println("---> Output of command:");
|
|
||||||
log.println(procHdl.getOutputText());
|
|
||||||
log.println("<--- Output of command:");
|
|
||||||
log.println("---> Error output of command");
|
|
||||||
log.println(procHdl.getErrorText());
|
|
||||||
log.println("<--- Error output of command");
|
|
||||||
}
|
|
||||||
final String output = procHdl.getOutputText();
|
|
||||||
final String[] outs = output.split("\n");
|
|
||||||
|
|
||||||
for (int i = 0; i < outs.length; i++) {
|
|
||||||
final String line = outs[i];
|
|
||||||
if (line.startsWith("SRC_ROOT")) {
|
|
||||||
sSrcRoot = getEnvValue(line);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return sSrcRoot;
|
|
||||||
}
|
|
||||||
|
|
||||||
private String[] getCmdLinesWithCommand(String[] commands) {
|
|
||||||
String[] cmdLines = null;
|
|
||||||
log.println("prepare command for platform " + mPlatform);
|
|
||||||
|
|
||||||
String separator = "";
|
|
||||||
if (mPlatform.equals(PropertyName.WNTMSCI)) {
|
|
||||||
separator = mCygwin ? ";" : "^";
|
|
||||||
} else {
|
|
||||||
separator = ";";
|
|
||||||
}
|
|
||||||
|
|
||||||
StringBuilder sb = new StringBuilder();
|
|
||||||
for (int i = 0; i < commands.length; i++) {
|
|
||||||
if (i != 0) {
|
|
||||||
sb.append(separator);
|
|
||||||
}
|
|
||||||
sb.append(commands[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
String command = sb.toString();
|
|
||||||
|
|
||||||
if (mPlatform.equals(PropertyName.WNTMSCI)){
|
|
||||||
if (mCygwin){
|
|
||||||
String srcRoot = (String) param.get(PropertyName.SRC_ROOT);
|
|
||||||
String envSet = "export cyg_src_root=`cygpath '" + srcRoot.replaceAll("\\\\", "\\\\\\\\")+ "'`; source $cyg_src_root/winenv.set.sh;";
|
|
||||||
command = envSet + command;
|
|
||||||
cmdLines = new String[]{mShell, "--login", "-c", "\"" + command + "\""};
|
|
||||||
} else {
|
|
||||||
cmdLines = new String[]{mShell, "/C", "\"" + command + "\""};
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
cmdLines = new String[]{mShell, "-c", command};
|
|
||||||
}
|
|
||||||
return cmdLines;
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getEnvValue(String line) {
|
|
||||||
final String[] split = line.split("=");
|
|
||||||
return split[1];
|
|
||||||
}
|
|
||||||
}
|
|
@@ -147,7 +147,7 @@ public class ComplexDescGetter extends DescGetter
|
|||||||
* @param testMethodNames list of all methods to test
|
* @param testMethodNames list of all methods to test
|
||||||
* @return filled description entry
|
* @return filled description entry
|
||||||
*/
|
*/
|
||||||
public DescEntry createTestDesc(String testObjectName, String className, String[] testMethodNames, LogWriter log)
|
private DescEntry createTestDesc(String testObjectName, String className, String[] testMethodNames, LogWriter log)
|
||||||
{
|
{
|
||||||
|
|
||||||
DescEntry dEntry = new DescEntry();
|
DescEntry dEntry = new DescEntry();
|
||||||
|
@@ -1,30 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
*
|
|
||||||
* This file incorporates work covered by the following license notice:
|
|
||||||
*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed
|
|
||||||
* with this work for additional information regarding copyright
|
|
||||||
* ownership. The ASF licenses this file to you under the Apache
|
|
||||||
* License, Version 2.0 (the "License"); you may not use this file
|
|
||||||
* except in compliance with the License. You may obtain a copy of
|
|
||||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
||||||
*/
|
|
||||||
|
|
||||||
package helper;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This exception is thrown when a parameter could not be found.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class ParameterNotFoundException extends Exception {
|
|
||||||
public ParameterNotFoundException(String message){
|
|
||||||
super (message);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@@ -120,10 +120,8 @@ public class ProcessHandler
|
|||||||
private boolean isStarted = false;
|
private boolean isStarted = false;
|
||||||
private long mTimeOut = 0;
|
private long mTimeOut = 0;
|
||||||
private Pump stdout = null;
|
private Pump stdout = null;
|
||||||
private Pump stderr = null;
|
|
||||||
private PrintStream stdIn = null;
|
private PrintStream stdIn = null;
|
||||||
private Process m_aProcess = null;
|
private Process m_aProcess = null;
|
||||||
private TestParameters param = null;
|
|
||||||
private boolean debug = false;
|
private boolean debug = false;
|
||||||
private boolean bUseOutput = true;
|
private boolean bUseOutput = true;
|
||||||
|
|
||||||
@@ -212,7 +210,6 @@ public class ProcessHandler
|
|||||||
{
|
{
|
||||||
this(null, log, workDir, null, 0);
|
this(null, log, workDir, null, 0);
|
||||||
this.cmdLineArray = commands;
|
this.cmdLineArray = commands;
|
||||||
this.param = param;
|
|
||||||
if (shortWait != 0)
|
if (shortWait != 0)
|
||||||
{
|
{
|
||||||
this.mTimeOut = shortWait;
|
this.mTimeOut = shortWait;
|
||||||
@@ -225,62 +222,6 @@ public class ProcessHandler
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method do an asynchronous execution of the commands. To avoid a interruption on long running processes
|
|
||||||
* caused by <CODE>OfficeWatcher</CODE>, the OfficeWatcher get frequently a ping.
|
|
||||||
* @see helper.OfficeWatcher
|
|
||||||
*/
|
|
||||||
public void runCommand()
|
|
||||||
{
|
|
||||||
|
|
||||||
boolean changedText = true;
|
|
||||||
String memText = "";
|
|
||||||
|
|
||||||
this.executeAsynchronously();
|
|
||||||
|
|
||||||
OfficeWatcher ow = null;
|
|
||||||
if (param != null)
|
|
||||||
{
|
|
||||||
ow = (OfficeWatcher) param.get(PropertyName.OFFICE_WATCHER);
|
|
||||||
}
|
|
||||||
if (ow != null)
|
|
||||||
{
|
|
||||||
ow.ping();
|
|
||||||
}
|
|
||||||
|
|
||||||
int hangcheck = 10;
|
|
||||||
while (!this.isFinished() && changedText)
|
|
||||||
{
|
|
||||||
waitFor(2000, false); // wait but don't kill
|
|
||||||
|
|
||||||
if (ow != null)
|
|
||||||
{
|
|
||||||
ow.ping();
|
|
||||||
}
|
|
||||||
// check for changes in the output stream. If there are no changes, the process maybe hangs
|
|
||||||
if (!this.isFinished())
|
|
||||||
{
|
|
||||||
hangcheck--;
|
|
||||||
if (hangcheck < 0)
|
|
||||||
{
|
|
||||||
String sOutputText = getOutputText();
|
|
||||||
if (sOutputText.length() == memText.length())
|
|
||||||
{
|
|
||||||
changedText = false;
|
|
||||||
}
|
|
||||||
hangcheck = 10;
|
|
||||||
memText = this.getOutputText();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!this.isFinished())
|
|
||||||
{
|
|
||||||
dbg("runCommand Process is not finished but there are no changes in output stream.");
|
|
||||||
this.kill();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Executes the command and returns only when the process
|
* Executes the command and returns only when the process
|
||||||
* exits.
|
* exits.
|
||||||
@@ -417,7 +358,7 @@ public class ProcessHandler
|
|||||||
}
|
}
|
||||||
dbg("execute: pump io-streams");
|
dbg("execute: pump io-streams");
|
||||||
stdout = new Pump(m_aProcess.getInputStream(), log, "out > ", bUseOutput);
|
stdout = new Pump(m_aProcess.getInputStream(), log, "out > ", bUseOutput);
|
||||||
stderr = new Pump(m_aProcess.getErrorStream(), log, "err > ", bUseOutput);
|
new Pump(m_aProcess.getErrorStream(), log, "err > ", bUseOutput);
|
||||||
stdIn = new PrintStream(m_aProcess.getOutputStream());
|
stdIn = new PrintStream(m_aProcess.getOutputStream());
|
||||||
|
|
||||||
dbg("execute: flush io-streams");
|
dbg("execute: flush io-streams");
|
||||||
@@ -548,24 +489,6 @@ public class ProcessHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the text output by external command to stderr.
|
|
||||||
* @return the text output by external command to stderr
|
|
||||||
*/
|
|
||||||
public String getErrorText()
|
|
||||||
{
|
|
||||||
if (stderr == null)
|
|
||||||
{
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return stderr.getStringBuffer();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns information about was the command started or
|
* Returns information about was the command started or
|
||||||
* not.
|
* not.
|
||||||
|
@@ -1,55 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
*
|
|
||||||
* This file incorporates work covered by the following license notice:
|
|
||||||
*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed
|
|
||||||
* with this work for additional information regarding copyright
|
|
||||||
* ownership. The ASF licenses this file to you under the Apache
|
|
||||||
* License, Version 2.0 (the "License"); you may not use this file
|
|
||||||
* except in compliance with the License. You may obtain a copy of
|
|
||||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
||||||
*/
|
|
||||||
package helper;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An own implementation of a XWindowListener
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class WindowListener implements com.sun.star.awt.XWindowListener {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The window hidden event
|
|
||||||
*/
|
|
||||||
public void windowHidden(com.sun.star.lang.EventObject eventObject) {
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The window move event
|
|
||||||
*/
|
|
||||||
public void windowMoved(com.sun.star.awt.WindowEvent windowEvent) {
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The window resize event
|
|
||||||
*/
|
|
||||||
public void windowResized(com.sun.star.awt.WindowEvent windowEvent) {
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The window show event
|
|
||||||
*/
|
|
||||||
public void windowShown(com.sun.star.lang.EventObject eventObject) {
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The dispose event
|
|
||||||
*/
|
|
||||||
public void disposing(com.sun.star.lang.EventObject eventObject) {
|
|
||||||
}
|
|
||||||
}
|
|
@@ -37,10 +37,6 @@ import util.ValueChanger;
|
|||||||
import util.ValueComparer;
|
import util.ValueComparer;
|
||||||
import util.utils;
|
import util.utils;
|
||||||
|
|
||||||
import com.sun.star.uno.Any;
|
|
||||||
import com.sun.star.uno.AnyConverter;
|
|
||||||
import com.sun.star.uno.Type;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* MultiPropertyTest extends the functionality of MultiMethodTest to support
|
* MultiPropertyTest extends the functionality of MultiMethodTest to support
|
||||||
* services testing. Since, in most cases, service tests has one method testing
|
* services testing. Since, in most cases, service tests has one method testing
|
||||||
|
@@ -120,25 +120,7 @@ public interface PropertyName {
|
|||||||
* path to the source root of OpenOffice.org
|
* path to the source root of OpenOffice.org
|
||||||
*/
|
*/
|
||||||
String SRC_ROOT = "SRC_ROOT";
|
String SRC_ROOT = "SRC_ROOT";
|
||||||
/**
|
|
||||||
* parameter name: "Version"<p>
|
|
||||||
* the name of the version to test
|
|
||||||
*/
|
|
||||||
String VERSION = "Version";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* parameter name "Shell"<p>
|
|
||||||
* Path to a shell.
|
|
||||||
* This shell is used to run some commands outside of Java
|
|
||||||
* example: /bin/tcsh c:\\myShell\\myShell.exe
|
|
||||||
*/
|
|
||||||
String SHELL = "Shell";
|
|
||||||
/**
|
|
||||||
* parameter name "Cygwin"<p>
|
|
||||||
* If Cygwin is set to TRUE it indicates if the runner runs in a Cygwin
|
|
||||||
* environment
|
|
||||||
*/
|
|
||||||
String CYGWIN = "Cygwin";
|
|
||||||
/**
|
/**
|
||||||
* internal only, no parameter
|
* internal only, no parameter
|
||||||
*/
|
*/
|
||||||
|
@@ -18,8 +18,6 @@
|
|||||||
|
|
||||||
package ifc.connection;
|
package ifc.connection;
|
||||||
|
|
||||||
import java.io.PrintWriter;
|
|
||||||
|
|
||||||
import lib.MultiMethodTest;
|
import lib.MultiMethodTest;
|
||||||
import lib.StatusException;
|
import lib.StatusException;
|
||||||
|
|
||||||
|
@@ -22,7 +22,6 @@ import lib.MultiMethodTest;
|
|||||||
|
|
||||||
import com.sun.star.container.NoSuchElementException;
|
import com.sun.star.container.NoSuchElementException;
|
||||||
import com.sun.star.container.XEnumeration;
|
import com.sun.star.container.XEnumeration;
|
||||||
import com.sun.star.container.XEnumerationAccess;
|
|
||||||
import com.sun.star.lang.WrappedTargetException;
|
import com.sun.star.lang.WrappedTargetException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -22,7 +22,6 @@ package ifc.document;
|
|||||||
import lib.MultiMethodTest;
|
import lib.MultiMethodTest;
|
||||||
|
|
||||||
import com.sun.star.document.XMimeTypeInfo;
|
import com.sun.star.document.XMimeTypeInfo;
|
||||||
import com.sun.star.lang.XComponent;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Testing <code>com.sun.star.document.XMimeTypeInfo</code>
|
* Testing <code>com.sun.star.document.XMimeTypeInfo</code>
|
||||||
|
@@ -22,7 +22,6 @@ import lib.MultiPropertyTest;
|
|||||||
|
|
||||||
import com.sun.star.awt.XBitmap;
|
import com.sun.star.awt.XBitmap;
|
||||||
import com.sun.star.container.XIndexContainer;
|
import com.sun.star.container.XIndexContainer;
|
||||||
import com.sun.star.uno.Any;
|
|
||||||
import com.sun.star.uno.UnoRuntime;
|
import com.sun.star.uno.UnoRuntime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -21,7 +21,6 @@ package ifc.sheet;
|
|||||||
import lib.MultiMethodTest;
|
import lib.MultiMethodTest;
|
||||||
|
|
||||||
import com.sun.star.sheet.XCellRangeAddressable;
|
import com.sun.star.sheet.XCellRangeAddressable;
|
||||||
import com.sun.star.sheet.XSheetCellCursor;
|
|
||||||
import com.sun.star.sheet.XUsedAreaCursor;
|
import com.sun.star.sheet.XUsedAreaCursor;
|
||||||
import com.sun.star.table.CellRangeAddress;
|
import com.sun.star.table.CellRangeAddress;
|
||||||
import com.sun.star.uno.UnoRuntime;
|
import com.sun.star.uno.UnoRuntime;
|
||||||
|
@@ -19,8 +19,6 @@
|
|||||||
package ifc.text;
|
package ifc.text;
|
||||||
|
|
||||||
import lib.MultiMethodTest;
|
import lib.MultiMethodTest;
|
||||||
import util.XInstCreator;
|
|
||||||
|
|
||||||
import com.sun.star.text.XFootnote;
|
import com.sun.star.text.XFootnote;
|
||||||
|
|
||||||
|
|
||||||
|
@@ -19,8 +19,6 @@
|
|||||||
package ifc.text;
|
package ifc.text;
|
||||||
|
|
||||||
import lib.MultiMethodTest;
|
import lib.MultiMethodTest;
|
||||||
import util.XInstCreator;
|
|
||||||
|
|
||||||
import com.sun.star.text.XParagraphCursor;
|
import com.sun.star.text.XParagraphCursor;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -25,7 +25,6 @@ import lib.StatusException;
|
|||||||
import com.sun.star.text.XText;
|
import com.sun.star.text.XText;
|
||||||
import com.sun.star.text.XTextCursor;
|
import com.sun.star.text.XTextCursor;
|
||||||
import com.sun.star.text.XTextDocument;
|
import com.sun.star.text.XTextDocument;
|
||||||
import com.sun.star.text.XTextRange;
|
|
||||||
import com.sun.star.text.XTextRangeCompare;
|
import com.sun.star.text.XTextRangeCompare;
|
||||||
import com.sun.star.uno.UnoRuntime;
|
import com.sun.star.uno.UnoRuntime;
|
||||||
import com.sun.star.uno.XInterface;
|
import com.sun.star.uno.XInterface;
|
||||||
|
@@ -20,7 +20,6 @@ package ifc.text;
|
|||||||
|
|
||||||
import lib.MultiMethodTest;
|
import lib.MultiMethodTest;
|
||||||
|
|
||||||
import com.sun.star.table.XCell;
|
|
||||||
import com.sun.star.text.XTextTableCursor;
|
import com.sun.star.text.XTextTableCursor;
|
||||||
|
|
||||||
|
|
||||||
|
@@ -23,7 +23,6 @@ import java.io.PrintWriter;
|
|||||||
import lib.TestCase;
|
import lib.TestCase;
|
||||||
import lib.TestEnvironment;
|
import lib.TestEnvironment;
|
||||||
import lib.TestParameters;
|
import lib.TestParameters;
|
||||||
import util.DBTools;
|
|
||||||
import util.utils;
|
import util.utils;
|
||||||
|
|
||||||
import com.sun.star.beans.XPropertySet;
|
import com.sun.star.beans.XPropertySet;
|
||||||
@@ -32,7 +31,6 @@ import com.sun.star.lang.XMultiServiceFactory;
|
|||||||
import com.sun.star.sdb.CommandType;
|
import com.sun.star.sdb.CommandType;
|
||||||
import com.sun.star.sdb.XSingleSelectQueryAnalyzer;
|
import com.sun.star.sdb.XSingleSelectQueryAnalyzer;
|
||||||
import com.sun.star.sdb.XSingleSelectQueryComposer;
|
import com.sun.star.sdb.XSingleSelectQueryComposer;
|
||||||
import com.sun.star.sdbc.XConnection;
|
|
||||||
import com.sun.star.sdbc.XDataSource;
|
import com.sun.star.sdbc.XDataSource;
|
||||||
import com.sun.star.sdbc.XResultSet;
|
import com.sun.star.sdbc.XResultSet;
|
||||||
import com.sun.star.sdbcx.XColumnsSupplier;
|
import com.sun.star.sdbcx.XColumnsSupplier;
|
||||||
|
@@ -19,7 +19,6 @@
|
|||||||
package mod._fwk;
|
package mod._fwk;
|
||||||
|
|
||||||
import com.sun.star.lang.XMultiServiceFactory;
|
import com.sun.star.lang.XMultiServiceFactory;
|
||||||
import com.sun.star.text.XTextDocument;
|
|
||||||
import com.sun.star.uno.XInterface;
|
import com.sun.star.uno.XInterface;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import lib.TestCase;
|
import lib.TestCase;
|
||||||
|
@@ -49,7 +49,6 @@ public class _XDataPilotTable {
|
|||||||
private XCell xCellForChange = null;
|
private XCell xCellForChange = null;
|
||||||
private XCell xCellForCheck = null;
|
private XCell xCellForCheck = null;
|
||||||
private CellAddress OutputRange = null;
|
private CellAddress OutputRange = null;
|
||||||
private int changeValue = 0;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The test parameters
|
* The test parameters
|
||||||
@@ -72,7 +71,6 @@ public class _XDataPilotTable {
|
|||||||
xCellForChange = (XCell)param.get("CELLFORCHANGE");
|
xCellForChange = (XCell)param.get("CELLFORCHANGE");
|
||||||
xCellForCheck = (XCell)param.get("CELLFORCHECK");
|
xCellForCheck = (XCell)param.get("CELLFORCHECK");
|
||||||
OutputRange = (CellAddress)param.get("OUTPUTRANGE");
|
OutputRange = (CellAddress)param.get("OUTPUTRANGE");
|
||||||
changeValue = ((Integer)param.get("CHANGEVALUE")).intValue();
|
|
||||||
|
|
||||||
if (xCellForChange == null || OutputRange == null ||
|
if (xCellForChange == null || OutputRange == null ||
|
||||||
xCellForCheck == null) {
|
xCellForCheck == null) {
|
||||||
|
@@ -20,11 +20,7 @@ package com.sun.star.script.framework.browse;
|
|||||||
|
|
||||||
import com.sun.star.beans.XIntrospectionAccess;
|
import com.sun.star.beans.XIntrospectionAccess;
|
||||||
|
|
||||||
import com.sun.star.container.NoSuchElementException;
|
|
||||||
|
|
||||||
import com.sun.star.lang.XMultiComponentFactory;
|
import com.sun.star.lang.XMultiComponentFactory;
|
||||||
import com.sun.star.lang.WrappedTargetException;
|
|
||||||
|
|
||||||
import com.sun.star.lib.uno.helper.PropertySet;
|
import com.sun.star.lib.uno.helper.PropertySet;
|
||||||
|
|
||||||
import com.sun.star.script.XInvocation;
|
import com.sun.star.script.XInvocation;
|
||||||
|
@@ -29,10 +29,6 @@ import com.sun.star.embed.XTransactedObject;
|
|||||||
|
|
||||||
import com.sun.star.frame.XModel;
|
import com.sun.star.frame.XModel;
|
||||||
|
|
||||||
import com.sun.star.io.XInputStream;
|
|
||||||
import com.sun.star.io.XOutputStream;
|
|
||||||
import com.sun.star.io.XStream;
|
|
||||||
|
|
||||||
import com.sun.star.lang.EventObject;
|
import com.sun.star.lang.EventObject;
|
||||||
import com.sun.star.lang.XComponent;
|
import com.sun.star.lang.XComponent;
|
||||||
import com.sun.star.lang.XEventListener;
|
import com.sun.star.lang.XEventListener;
|
||||||
|
@@ -171,8 +171,6 @@ class WikiProtocolSocketFactory extends SSLSocketFactory
|
|||||||
// to stderr - useful for debugging encrypted TLS connections
|
// to stderr - useful for debugging encrypted TLS connections
|
||||||
class LoggingProtocolSocketFactory extends SSLSocketFactory
|
class LoggingProtocolSocketFactory extends SSLSocketFactory
|
||||||
{
|
{
|
||||||
private SSLContext m_aSSLContext;
|
|
||||||
|
|
||||||
private static class LogSocket extends SSLSocket
|
private static class LogSocket extends SSLSocket
|
||||||
{
|
{
|
||||||
private final SSLSocket m_Socket;
|
private final SSLSocket m_Socket;
|
||||||
|
@@ -18,8 +18,6 @@
|
|||||||
package complex.persistent_window_states;
|
package complex.persistent_window_states;
|
||||||
|
|
||||||
|
|
||||||
import helper.WindowListener;
|
|
||||||
|
|
||||||
import com.sun.star.awt.PosSize;
|
import com.sun.star.awt.PosSize;
|
||||||
import com.sun.star.awt.Rectangle;
|
import com.sun.star.awt.Rectangle;
|
||||||
import com.sun.star.awt.WindowEvent;
|
import com.sun.star.awt.WindowEvent;
|
||||||
|
@@ -28,13 +28,11 @@ import java.util.Vector;
|
|||||||
import com.sun.star.io.XActiveDataSink;
|
import com.sun.star.io.XActiveDataSink;
|
||||||
import com.sun.star.io.XInputStream;
|
import com.sun.star.io.XInputStream;
|
||||||
import com.sun.star.io.XTextInputStream;
|
import com.sun.star.io.XTextInputStream;
|
||||||
import com.sun.star.lang.Locale;
|
|
||||||
import com.sun.star.lang.XMultiServiceFactory;
|
import com.sun.star.lang.XMultiServiceFactory;
|
||||||
import com.sun.star.ucb.CommandAbortedException;
|
import com.sun.star.ucb.CommandAbortedException;
|
||||||
import com.sun.star.ucb.XFileIdentifierConverter;
|
import com.sun.star.ucb.XFileIdentifierConverter;
|
||||||
import com.sun.star.ucb.XSimpleFileAccess;
|
import com.sun.star.ucb.XSimpleFileAccess;
|
||||||
import com.sun.star.ucb.XSimpleFileAccess2;
|
import com.sun.star.ucb.XSimpleFileAccess2;
|
||||||
import com.sun.star.uno.Exception;
|
|
||||||
import com.sun.star.uno.UnoRuntime;
|
import com.sun.star.uno.UnoRuntime;
|
||||||
import com.sun.star.uno.XInterface;
|
import com.sun.star.uno.XInterface;
|
||||||
import com.sun.star.beans.PropertyValue;
|
import com.sun.star.beans.PropertyValue;
|
||||||
|
@@ -31,7 +31,7 @@ class ParaStyled
|
|||||||
paraStyle = paraStyle_;
|
paraStyle = paraStyle_;
|
||||||
}
|
}
|
||||||
|
|
||||||
void format(Object textRange)
|
private void format(Object textRange)
|
||||||
{
|
{
|
||||||
XText o;
|
XText o;
|
||||||
o = UnoRuntime.queryInterface(XText.class, textRange);
|
o = UnoRuntime.queryInterface(XText.class, textRange);
|
||||||
|
@@ -17,7 +17,6 @@
|
|||||||
*/
|
*/
|
||||||
package com.sun.star.wizards.document;
|
package com.sun.star.wizards.document;
|
||||||
|
|
||||||
import com.sun.star.lang.IllegalArgumentException;
|
|
||||||
import com.sun.star.lang.XComponent;
|
import com.sun.star.lang.XComponent;
|
||||||
import com.sun.star.lang.XMultiServiceFactory;
|
import com.sun.star.lang.XMultiServiceFactory;
|
||||||
import com.sun.star.wizards.common.*;
|
import com.sun.star.wizards.common.*;
|
||||||
|
@@ -45,7 +45,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
|
|||||||
private FieldFormatter curFieldFormatter;
|
private FieldFormatter curFieldFormatter;
|
||||||
private PrimaryKeyHandler curPrimaryKeyHandler;
|
private PrimaryKeyHandler curPrimaryKeyHandler;
|
||||||
HashMap<String, FieldDescription> fielditems;
|
HashMap<String, FieldDescription> fielditems;
|
||||||
int wizardmode;
|
private int wizardmode;
|
||||||
private String tablename;
|
private String tablename;
|
||||||
private String serrToManyFields;
|
private String serrToManyFields;
|
||||||
private String serrTableNameexists;
|
private String serrTableNameexists;
|
||||||
@@ -127,7 +127,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public boolean iscompleted(int _ndialogpage)
|
private boolean iscompleted(int _ndialogpage)
|
||||||
{
|
{
|
||||||
switch (_ndialogpage)
|
switch (_ndialogpage)
|
||||||
{
|
{
|
||||||
|
@@ -24,7 +24,6 @@ import java.util.Iterator;
|
|||||||
|
|
||||||
import org.openoffice.xmerge.ConvertData;
|
import org.openoffice.xmerge.ConvertData;
|
||||||
import org.openoffice.xmerge.ConvertException;
|
import org.openoffice.xmerge.ConvertException;
|
||||||
import org.openoffice.xmerge.Document;
|
|
||||||
import org.openoffice.xmerge.DocumentSerializer;
|
import org.openoffice.xmerge.DocumentSerializer;
|
||||||
import org.openoffice.xmerge.converter.xml.OfficeConstants;
|
import org.openoffice.xmerge.converter.xml.OfficeConstants;
|
||||||
import org.openoffice.xmerge.converter.xml.StyleCatalog;
|
import org.openoffice.xmerge.converter.xml.StyleCatalog;
|
||||||
|
Reference in New Issue
Block a user