[Libreoffice-commits] core.git: 2 commits - framework/qa jurt/test qadevOOo/runner qadevOOo/tests sc/qa toolkit/test ucb/qa wizards/com wizards/Jar_commonwizards.mk
Noel Grandin
noel at peralex.com
Mon Apr 20 02:24:05 PDT 2015
framework/qa/complex/imageManager/_XComponent.java | 6 -
framework/qa/complex/imageManager/_XInitialization.java | 6 -
framework/qa/complex/imageManager/_XUIConfiguration.java | 5 -
jurt/test/com/sun/star/uno/AnyConverter_Test.java | 2
qadevOOo/runner/helper/OfficeProvider.java | 1
qadevOOo/runner/helper/OfficeWatcher.java | 1
qadevOOo/runner/helper/ProcessHandler.java | 8 -
qadevOOo/runner/helper/StringHelper.java | 20 ----
qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java | 7 -
sc/qa/complex/dataPilot/_XDataPilotTable.java | 16 ---
toolkit/test/accessibility/ov/ObjectView.java | 3
ucb/qa/complex/tdoc/_XComponent.java | 43 ----------
wizards/Jar_commonwizards.mk | 1
wizards/com/sun/star/wizards/document/TimeStampControl.java | 6 -
wizards/com/sun/star/wizards/ui/WizardDialog.java | 1
wizards/com/sun/star/wizards/ui/event/XWindowListenerAdapter.java | 41 ---------
16 files changed, 2 insertions(+), 165 deletions(-)
New commits:
commit 04cadb3191573dff59c79a7780a4139ed148f122
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 3 15:46:35 2015 +0200
java: remove some unused code
Change-Id: If1cdc67535b11d9309503b14ffad2aa3718661c6
diff --git a/framework/qa/complex/imageManager/_XComponent.java b/framework/qa/complex/imageManager/_XComponent.java
index c8c94d7..0d0a997 100644
--- a/framework/qa/complex/imageManager/_XComponent.java
+++ b/framework/qa/complex/imageManager/_XComponent.java
@@ -162,12 +162,6 @@ public class _XComponent {
} // finished _dispose()
- /**
- * Forces object recreation.
- */
- protected void after() {
- }
-
} // finished class _XComponent
diff --git a/framework/qa/complex/imageManager/_XInitialization.java b/framework/qa/complex/imageManager/_XInitialization.java
index 5a55657..74b97aa 100644
--- a/framework/qa/complex/imageManager/_XInitialization.java
+++ b/framework/qa/complex/imageManager/_XInitialization.java
@@ -73,12 +73,6 @@ public class _XInitialization {
return result ;
} // finished _initialize()
- /**
- * Disposes object environment.
- */
- public void after() {
- }
-
} // finished class _XInitialization
diff --git a/framework/qa/complex/imageManager/_XUIConfiguration.java b/framework/qa/complex/imageManager/_XUIConfiguration.java
index 4869895..f2e7be3 100644
--- a/framework/qa/complex/imageManager/_XUIConfiguration.java
+++ b/framework/qa/complex/imageManager/_XUIConfiguration.java
@@ -63,9 +63,4 @@ public class _XUIConfiguration {
return !xListener.actionWasTriggered();
}
- /**
- * Dispose because the UIConfigurationManager has to be recreated
- */
- public void after() {
- }
}
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index 8a25ab2..313a160 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -151,14 +151,6 @@ public class ProcessHandler
}
/**
- * Creates instance with specified external command and set the time out for the command.
- */
- public ProcessHandler(String cmdLine, int timeOut)
- {
- this(cmdLine, null, null, null, timeOut);
- }
-
- /**
* Creates instance with specified external command which
* will be executed in the some work directory and
*
diff --git a/qadevOOo/runner/helper/StringHelper.java b/qadevOOo/runner/helper/StringHelper.java
index 7c4943c..7e265d6 100644
--- a/qadevOOo/runner/helper/StringHelper.java
+++ b/qadevOOo/runner/helper/StringHelper.java
@@ -21,26 +21,6 @@ package helper;
public class StringHelper
{
- /**
- * removes quotes if both exists at start and at end
- */
- public static String removeSurroundQuoteIfExists(String _sPath)
- {
- String sNewPath = _sPath;
- if (
- (_sPath.startsWith("\"") && _sPath.endsWith("\"")) ||
- (_sPath.startsWith("'") && _sPath.endsWith("'"))
- )
- {
- // remove trailing quotes, if exists
- sNewPath = sNewPath.substring(1);
-
- // remove trailing quotes, if exists
- sNewPath = sNewPath.substring(0, sNewPath.length() - 1);
- }
- return sNewPath;
- }
-
public static String removeQuoteIfExists(String _sPath)
{
String sNewPath = _sPath;
diff --git a/sc/qa/complex/dataPilot/_XDataPilotTable.java b/sc/qa/complex/dataPilot/_XDataPilotTable.java
index bb68565..1856413 100644
--- a/sc/qa/complex/dataPilot/_XDataPilotTable.java
+++ b/sc/qa/complex/dataPilot/_XDataPilotTable.java
@@ -95,21 +95,5 @@ public class _XDataPilotTable {
return bResult;
}
- /**
- * Test sets new value of the cell obtained by object relation
- * 'CELLFORCHANGE', and checks value of the cell obtained by object
- * relation 'CELLFORCHECK'.<p>
- * Has <b>OK</b> status if value of the cell obtained by object relation
- * 'CELLFORCHECK' is changed. <p>
- */
- public boolean _refresh(){
- xCellForChange.setValue(changeValue);
- double oldData = xCellForCheck.getValue();
- oObj.refresh();
- double newData = xCellForCheck.getValue();
- System.out.println("Old data:" + oldData + "; new data:" + newData);
-
- return oldData != newData;
- }
}
diff --git a/toolkit/test/accessibility/ov/ObjectView.java b/toolkit/test/accessibility/ov/ObjectView.java
index 694a331..7e1570b 100644
--- a/toolkit/test/accessibility/ov/ObjectView.java
+++ b/toolkit/test/accessibility/ov/ObjectView.java
@@ -39,7 +39,6 @@ abstract public class ObjectView
{
public ObjectView (ObjectViewContainer aContainer)
{
- maContainer = aContainer;
mxContext = null;
}
@@ -78,6 +77,4 @@ abstract public class ObjectView
/// Reference to the current object to display information about.
protected XAccessibleContext mxContext;
-
- protected ObjectViewContainer maContainer;
}
diff --git a/ucb/qa/complex/tdoc/_XComponent.java b/ucb/qa/complex/tdoc/_XComponent.java
index 47e9201..1f86128 100644
--- a/ucb/qa/complex/tdoc/_XComponent.java
+++ b/ucb/qa/complex/tdoc/_XComponent.java
@@ -69,15 +69,6 @@ public class _XComponent {
private final XEventListener listener2 = new MyEventListener2();
/**
- * For the cfgmgr2.OSetElement tests: dispose the owner element.
- */
- protected void before() {
- // do not dispose this component, but parent instead
-// altDispose = (XComponent)tEnv.getObjRelation("XComponent.DisposeThis");
-
- }
-
- /**
* Adds two listeners. <p>
* Has OK status if then the first listener will receive an event
* on <code>dispose</code> method call.
@@ -112,40 +103,6 @@ public class _XComponent {
private boolean disposed = false;
- /**
- * Disposes the object and then check appropriate listeners were
- * called or not. <p>
- * Method tests to be completed successfully :
- * <ul>
- * <li> <code>removeEventListener</code> : method must remove one of two
- * listeners. </li>
- * </ul> <p>
- * Has OK status if liseter removed wasn't called and other listener
- * was.
- */
- public boolean _dispose() {
- disposed = false;
-
- log.println( "begin dispose" + Thread.currentThread());
- oObj.dispose();
-
- util.utils.pause(500);
- if (Loutput[0]!=null) log.println(Loutput[0]);
- if (Loutput[1]!=null) log.println(Loutput[1]);
- log.println( "end dispose" + Thread.currentThread());
- disposed = true;
-
- // check that dispose() works OK.
- return listenerDisposed[0] && !listenerDisposed[1];
-
- } // finished _dispose()
-
- /**
- * Forces object recreation.
- */
- protected void after() {
- }
-
} // finished class _XComponent
diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
index 07d8dd4..a9b1561 100644
--- a/wizards/Jar_commonwizards.mk
+++ b/wizards/Jar_commonwizards.mk
@@ -69,7 +69,6 @@ $(eval $(call gb_Jar_add_sourcefiles,commonwizards,\
wizards/com/sun/star/wizards/ui/event/XActionListenerAdapter \
wizards/com/sun/star/wizards/ui/event/XItemListenerAdapter \
wizards/com/sun/star/wizards/ui/event/XTextListenerAdapter \
- wizards/com/sun/star/wizards/ui/event/XWindowListenerAdapter \
wizards/com/sun/star/wizards/ui/AggregateComponent \
wizards/com/sun/star/wizards/ui/CommandFieldSelection \
wizards/com/sun/star/wizards/ui/ControlScroller \
diff --git a/wizards/com/sun/star/wizards/ui/event/XWindowListenerAdapter.java b/wizards/com/sun/star/wizards/ui/event/XWindowListenerAdapter.java
deleted file mode 100644
index 118569a..0000000
--- a/wizards/com/sun/star/wizards/ui/event/XWindowListenerAdapter.java
+++ /dev/null
@@ -1,41 +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 com.sun.star.wizards.ui.event;
-
-import com.sun.star.awt.WindowEvent;
-import com.sun.star.awt.XWindowListener;
-import com.sun.star.lang.EventObject;
-
-public class XWindowListenerAdapter implements XWindowListener {
-
- public void disposing(EventObject event) {
- }
-
- public void windowHidden(EventObject event) {
- }
-
- public void windowMoved(WindowEvent event) {
- }
-
- public void windowResized(WindowEvent event) {
- }
-
- public void windowShown(EventObject event) {
- }
-
-}
commit 14bc818895a5cc10054928b5cbb49eaff086e8f4
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 3 15:34:26 2015 +0200
java: some random small cleanups
Change-Id: I22a5b9fa29d465a21e682279e6e88d37bd8adf93
diff --git a/jurt/test/com/sun/star/uno/AnyConverter_Test.java b/jurt/test/com/sun/star/uno/AnyConverter_Test.java
index eba78ace..978e23a 100644
--- a/jurt/test/com/sun/star/uno/AnyConverter_Test.java
+++ b/jurt/test/com/sun/star/uno/AnyConverter_Test.java
@@ -52,7 +52,7 @@ public final class AnyConverter_Test {
byte[] arByte;
/** Class variables are initialized before each Test method */
- @Before public void setUp() throws Exception
+ @Before public void setUp()
{
aBool= Boolean.TRUE;
aChar= new Character('A');
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index 8b20a3c..d2dd459 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -31,7 +31,6 @@ import com.sun.star.util.XStringSubstitution;
import java.io.File;
import java.io.PrintWriter;
-import java.util.StringTokenizer;
import lib.TestParameters;
diff --git a/qadevOOo/runner/helper/OfficeWatcher.java b/qadevOOo/runner/helper/OfficeWatcher.java
index ac35513..50765a8 100644
--- a/qadevOOo/runner/helper/OfficeWatcher.java
+++ b/qadevOOo/runner/helper/OfficeWatcher.java
@@ -18,7 +18,6 @@
package helper;
import lib.TestParameters;
-import java.util.StringTokenizer;
import util.utils;
public class OfficeWatcher extends Thread implements share.Watcher {
diff --git a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
index b0b645a..8ab74dc 100644
--- a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
@@ -57,16 +57,11 @@ public class _XFastPropertySet extends MultiMethodTest {
public final int handle;
public final String name;
- public Prop() {
- handle = -1;
- name = null;
- }
-
public Prop(int handle, String name) {
this.handle = handle;
this.name = name;
}
- };
+ }
public XFastPropertySet oObj = null;
private final List<Prop> props = new ArrayList<Prop>();
diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java
index 524f172..555e164 100644
--- a/wizards/com/sun/star/wizards/document/TimeStampControl.java
+++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java
@@ -19,7 +19,6 @@ package com.sun.star.wizards.document;
import com.sun.star.awt.Point;
import com.sun.star.awt.Size;
-import com.sun.star.beans.PropertyVetoException;
import com.sun.star.beans.XPropertySet;
import com.sun.star.wizards.common.*;
import com.sun.star.wizards.db.FieldColumn;
@@ -29,7 +28,6 @@ import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.container.XNameContainer;
import com.sun.star.drawing.XControlShape;
-import com.sun.star.drawing.XShape;
import com.sun.star.drawing.XShapes;
public class TimeStampControl extends DatabaseControl
@@ -38,8 +36,6 @@ public class TimeStampControl extends DatabaseControl
private DatabaseControl oDateControl;
private DatabaseControl oTimeControl;
private Resource oResource;
- private double nreldatewidth;
- private double nreltimewidth;
private int nDBWidth;
public TimeStampControl(Resource _oResource, FormHandler _oFormHandler, XNameContainer _xFormName, String _curFieldName, Point _aPoint)
@@ -59,8 +55,6 @@ public class TimeStampControl extends DatabaseControl
xShapes.add(oTimeControl.xShape);
xShape = _oFormHandler.xShapeGrouper.group(xShapes);
xShapes = UnoRuntime.queryInterface(XShapes.class, xShape);
- nreldatewidth = 1.0 / ((double) getSize().Width / (double) nDateWidth);
- nreltimewidth = 1.0 - nreldatewidth;
}
public XPropertySet getControlofGroupShapeByIndex(int _i)
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index 6154298..915bf44 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -42,7 +42,6 @@ import com.sun.star.wizards.common.PropertyNames;
import com.sun.star.wizards.common.Resource;
import com.sun.star.wizards.ui.event.XActionListenerAdapter;
import com.sun.star.wizards.ui.event.XItemListenerAdapter;
-import com.sun.star.wizards.ui.event.XWindowListenerAdapter;
public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeListener, XTerminateListener
{
More information about the Libreoffice-commits
mailing list