summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-02-03 15:34:26 +0200
committerNoel Grandin <noel@peralex.com>2015-04-20 11:18:22 +0200
commit14bc818895a5cc10054928b5cbb49eaff086e8f4 (patch)
tree25010ed72a1e982bde159671f012d0db2c47f7d6
parentb4adcc441d9c6396797321c055858f1e85807374 (diff)
java: some random small cleanups
Change-Id: I22a5b9fa29d465a21e682279e6e88d37bd8adf93
-rw-r--r--jurt/test/com/sun/star/uno/AnyConverter_Test.java2
-rw-r--r--qadevOOo/runner/helper/OfficeProvider.java1
-rw-r--r--qadevOOo/runner/helper/OfficeWatcher.java1
-rw-r--r--qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java7
-rw-r--r--wizards/com/sun/star/wizards/document/TimeStampControl.java6
-rw-r--r--wizards/com/sun/star/wizards/ui/WizardDialog.java1
6 files changed, 2 insertions, 16 deletions
diff --git a/jurt/test/com/sun/star/uno/AnyConverter_Test.java b/jurt/test/com/sun/star/uno/AnyConverter_Test.java
index eba78ace2c81..978e23a477ba 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 8b20a3cf99c2..d2dd45997764 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 ac35513953a9..50765a867ab0 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 b0b645a62552..8ab74dcda173 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 524f172db307..555e16492a5e 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 615429872884..915bf4446fc0 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
{