diff options
author | Noel Grandin <noel@peralex.com> | 2014-11-18 14:13:55 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2014-11-25 05:05:24 +0000 |
commit | 1658c017a27ac2cccb2af89f88a4cde8ffdbe531 (patch) | |
tree | c0c660419993b5492ab012f1414455599fd0494a | |
parent | ee42495de1279f9966dd2305966ab96711403463 (diff) |
java,framework: remove unused vars and parameters
Change-Id: I7df5ff730436b95cb93af9f813d7bc572da2b951
Reviewed-on: https://gerrit.libreoffice.org/13098
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
8 files changed, 13 insertions, 30 deletions
diff --git a/forms/qa/integration/forms/CellBinding.java b/forms/qa/integration/forms/CellBinding.java index 3a981f18c0c8..e71975ae96e7 100644 --- a/forms/qa/integration/forms/CellBinding.java +++ b/forms/qa/integration/forms/CellBinding.java @@ -539,8 +539,7 @@ public class CellBinding extends complexlib.ComplexTestCase XAccessible accessible = UnoRuntime.queryInterface( XAccessible.class, m_document.getCurrentView().getControl( controlModel ) ); - XAccessibleContext context = accessible.getAccessibleContext(); - XServiceInfo si = UnoRuntime.queryInterface( XServiceInfo.class, + UnoRuntime.queryInterface( XServiceInfo.class, accessible.getAccessibleContext() ); XAccessibleEditableText textAccess = UnoRuntime.queryInterface( diff --git a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java index 2f96fe716191..2b361cdf33fc 100644 --- a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java +++ b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java @@ -275,8 +275,7 @@ public class CheckContextMenuInterceptor try { System.out.println("try to get first children of Help context..."); - XAccessible xHelpChild = xHelpCont.getAccessibleChild(0); - + xHelpCont.getAccessibleChild(0); } catch (IndexOutOfBoundsException e) { diff --git a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java index 8600c0248e31..418e2290667b 100644 --- a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java +++ b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java @@ -56,7 +56,7 @@ public class GetServiceWhileDisposingOffice xDesktop.terminate(); for (; step < 10000; step++) { - Object o = xMSF.createInstance("com.sun.star.frame.Desktop"); + xMSF.createInstance("com.sun.star.frame.Desktop"); } } catch (com.sun.star.lang.DisposedException e) diff --git a/framework/qa/complex/framework/recovery/KlickButtonThread.java b/framework/qa/complex/framework/recovery/KlickButtonThread.java index d2dceb439a28..90ecf68c4489 100644 --- a/framework/qa/complex/framework/recovery/KlickButtonThread.java +++ b/framework/qa/complex/framework/recovery/KlickButtonThread.java @@ -19,21 +19,18 @@ package complex.framework.recovery; import com.sun.star.awt.XWindow; -import com.sun.star.lang.XMultiServiceFactory; import util.UITools; /** * Thread to crash the office. This thread dies after the office process - * is nopt longer available. + * is no longer available. */ public class KlickButtonThread extends Thread { private final XWindow xWindow; - private final XMultiServiceFactory xMSF; private final String buttonName; - public KlickButtonThread(XMultiServiceFactory xMSF, XWindow xWindow, String buttonName) { + public KlickButtonThread(XWindow xWindow, String buttonName) { this.xWindow = xWindow; - this.xMSF = xMSF; this.buttonName = buttonName; } diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java index 746ff82a35b2..187b336d1b17 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTest.java +++ b/framework/qa/complex/framework/recovery/RecoveryTest.java @@ -280,7 +280,7 @@ public class RecoveryTest extends ComplexTestCase { if (cancel) { log.println("clicking 'Cancel' button..."); - rt.clickThreadButton(xMSF, xWindow, "Cancel"); + rt.clickThreadButton(xWindow, "Cancel"); } else { log.println("clicking 'Next' button..."); @@ -371,7 +371,7 @@ public class RecoveryTest extends ComplexTestCase { if (cancel) { log.println("clicking 'Cancel' button..."); - rt.clickThreadButton(xMSF, xWindow, "Cancel"); + rt.clickThreadButton(xWindow, "Cancel"); } else { @@ -384,7 +384,7 @@ public class RecoveryTest extends ComplexTestCase { } else { log.println("do not recover: clicking 'Cancel' button..."); - rt.clickThreadButton(xMSF, xWindow, "Cancel"); + rt.clickThreadButton(xWindow, "Cancel"); } } catch (Exception e){ diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java index 91faec0a07e2..b476ab09580e 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTools.java +++ b/framework/qa/complex/framework/recovery/RecoveryTools.java @@ -273,9 +273,9 @@ public class RecoveryTools { pause(); } - public void clickThreadButton(XMultiServiceFactory xMSF, XWindow xWindow, String buttonName) + public void clickThreadButton(XWindow xWindow, String buttonName) { - KlickButtonThread kbt = new KlickButtonThread(xMSF, xWindow, buttonName); + KlickButtonThread kbt = new KlickButtonThread(xWindow, buttonName); kbt.start(); pause(param.getInt(PropertyName.SHORT_WAIT) * 10); } diff --git a/framework/qa/complex/loadAllDocuments/InteractionHandler.java b/framework/qa/complex/loadAllDocuments/InteractionHandler.java index 36790cb95ebb..d8e5091de55e 100644 --- a/framework/qa/complex/loadAllDocuments/InteractionHandler.java +++ b/framework/qa/complex/loadAllDocuments/InteractionHandler.java @@ -39,13 +39,10 @@ public class InteractionHandler implements XInteractionHandler /** - * @member m_aRequest the original interaction request - * saved for later analyzing - * @member m_bWasUsed true if the interaction handler was used - * @member m_nTry count using of RETRY continuations + * count using of RETRY continuations */ - private Object m_aRequest ; private int m_nTry ; + /** true if the interaction handler was used */ private boolean m_bWasUsed ; @@ -57,7 +54,6 @@ public class InteractionHandler implements XInteractionHandler */ public InteractionHandler() { - m_aRequest = null ; m_nTry = 0 ; m_bWasUsed = false; } @@ -76,14 +72,6 @@ public class InteractionHandler implements XInteractionHandler { m_bWasUsed = true; - // first sav thje original request - // Our user can use this information later for some debug analyzing - Object aRequest = xRequest.getRequest(); - synchronized(this) - { - m_aRequest = aRequest; - } - // analyze the possible continuations. // We can abort all incoming interactions only. // But additional we can try to continue it several times too. diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java index 995d43084f3f..a34375806a34 100644 --- a/framework/qa/complex/path_settings/PathSettingsTest.java +++ b/framework/qa/complex/path_settings/PathSettingsTest.java @@ -242,7 +242,7 @@ public class PathSettingsTest try { - final String sValue = AnyConverter.toString(o); + AnyConverter.toString(o); } catch (com.sun.star.lang.IllegalArgumentException e) { |