From b7f67f24bbe9ced0dfefda674d96fa1d41cdf062 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 18 Nov 2014 13:01:29 +0200 Subject: the getGuiEventListener method is unnecessary Change-Id: I1c8b0ea28b6dbc2b6825f5f30ae0d234b7362d64 Reviewed-on: https://gerrit.libreoffice.org/13093 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- wizards/com/sun/star/wizards/ui/UnoDialog.java | 5 ----- wizards/com/sun/star/wizards/ui/WizardDialog.java | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'wizards') diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index f23eda97319e..d5a0d8e6abec 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -57,11 +57,6 @@ public class UnoDialog implements EventNames private PeerConfig m_oPeerConfig; protected final AbstractListener guiEventListener = new CommonListener(); - public AbstractListener getGuiEventListener() - { - return guiEventListener; - } - public UnoDialog(XMultiServiceFactory xMSF) { try diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index abc15222fddd..3b8d74f0fbc5 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -243,10 +243,10 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL xIndexContRoadmap = UnoRuntime.queryInterface(XIndexContainer.class, oRoadmap); MethodInvocation mi = new MethodInvocation("itemStateChanged", this, com.sun.star.awt.ItemEvent.class); - getGuiEventListener().add("rdmNavi", EventNames.EVENT_ITEM_CHANGED, mi); + guiEventListener.add("rdmNavi", EventNames.EVENT_ITEM_CHANGED, mi); xRoadmapControl = this.xDlgContainer.getControl("rdmNavi"); xRoadmapBroadcaster = UnoRuntime.queryInterface(XItemEventBroadcaster.class, xRoadmapControl); - xRoadmapBroadcaster.addItemListener((XItemListener) getGuiEventListener()); + xRoadmapBroadcaster.addItemListener((XItemListener) guiEventListener); Helper.setUnoPropertyValue(oRoadmap, "Text", oWizardResource.getResText(UIConsts.RID_COMMON + 16)); } @@ -483,9 +483,9 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL // if the user used "escape" key to // close the dialog. MethodInvocation windowHidden = new MethodInvocation("windowHidden", this); - xWindow.addWindowListener((CommonListener) getGuiEventListener()); + xWindow.addWindowListener((CommonListener) guiEventListener); String dialogName = (String) Helper.getUnoPropertyValue(xDialogModel, PropertyNames.PROPERTY_NAME); - getGuiEventListener().add(dialogName, EVENT_ACTION_PERFORMED, windowHidden); + guiEventListener.add(dialogName, EVENT_ACTION_PERFORMED, windowHidden); } catch (java.lang.Exception jexception) -- cgit