summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-12-11 08:10:33 +0200
committerNoel Grandin <noelgrandin@gmail.com>2014-12-11 08:00:52 +0000
commit373affe59c9646d65c744ff7e3ed00425ccf9eb8 (patch)
tree99f9ae8845d08b2760aff0bf4c6751114f86abca /wizards
parent3dee6c74c37d1667c1d56767896e9578e2836e29 (diff)
java: remove some unnecessary interfaces
Change-Id: Ie2da7cbbd1733881ff2da6fa095c37c21cf19fe8 Reviewed-on: https://gerrit.libreoffice.org/13435 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'wizards')
-rw-r--r--wizards/Jar_commonwizards.mk2
-rw-r--r--wizards/com/sun/star/wizards/common/ParaStyled.java2
-rw-r--r--wizards/com/sun/star/wizards/common/TemplateElement.java24
-rw-r--r--wizards/com/sun/star/wizards/table/TableWizard.java6
-rw-r--r--wizards/com/sun/star/wizards/ui/WizardDialog.java24
-rw-r--r--wizards/com/sun/star/wizards/ui/XCompletion.java30
-rw-r--r--wizards/com/sun/star/wizards/ui/event/DataAware.java4
7 files changed, 2 insertions, 90 deletions
diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
index 0e5ac5f08cc5..098a96d1172d 100644
--- a/wizards/Jar_commonwizards.mk
+++ b/wizards/Jar_commonwizards.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_Jar_add_sourcefiles,commonwizards,\
wizards/com/sun/star/wizards/common/NamedValueCollection \
wizards/com/sun/star/wizards/common/ParaStyled \
wizards/com/sun/star/wizards/common/PlaceholderTextElement \
- wizards/com/sun/star/wizards/common/TemplateElement \
wizards/com/sun/star/wizards/common/TextElement \
wizards/com/sun/star/wizards/db/DBMetaData \
wizards/com/sun/star/wizards/db/CommandMetaData \
@@ -89,7 +88,6 @@ $(eval $(call gb_Jar_add_sourcefiles,commonwizards,\
wizards/com/sun/star/wizards/ui/UnoDialog \
wizards/com/sun/star/wizards/ui/UnoDialog2 \
wizards/com/sun/star/wizards/ui/XFieldSelectionListener \
- wizards/com/sun/star/wizards/ui/XCompletion \
wizards/com/sun/star/wizards/document/Control \
wizards/com/sun/star/wizards/document/DatabaseControl \
wizards/com/sun/star/wizards/document/FormHandler \
diff --git a/wizards/com/sun/star/wizards/common/ParaStyled.java b/wizards/com/sun/star/wizards/common/ParaStyled.java
index 495423bfcb66..492a75bbe74f 100644
--- a/wizards/com/sun/star/wizards/common/ParaStyled.java
+++ b/wizards/com/sun/star/wizards/common/ParaStyled.java
@@ -21,7 +21,7 @@ package com.sun.star.wizards.common;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.text.*;
-class ParaStyled implements TemplateElement
+class ParaStyled
{
private String paraStyle;
diff --git a/wizards/com/sun/star/wizards/common/TemplateElement.java b/wizards/com/sun/star/wizards/common/TemplateElement.java
deleted file mode 100644
index 07fc84f41fdd..000000000000
--- a/wizards/com/sun/star/wizards/common/TemplateElement.java
+++ /dev/null
@@ -1,24 +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.common;
-
-interface TemplateElement
-{
-
-}
diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java
index 20af479290c6..a5456c6fee40 100644
--- a/wizards/com/sun/star/wizards/table/TableWizard.java
+++ b/wizards/com/sun/star/wizards/table/TableWizard.java
@@ -125,9 +125,6 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
}
- /* (non-Javadoc)
- * @see com.sun.star.wizards.ui.XCompletion#iscompleted(int)
- */
public boolean iscompleted(int _ndialogpage)
{
switch (_ndialogpage)
@@ -149,9 +146,6 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
}
- /* (non-Javadoc)
- * @see com.sun.star.wizards.ui.XCompletion#setcompleted(int, boolean)
- */
public void setcompleted(int _ndialogpage, boolean _biscompleted)
{
boolean bScenarioiscompleted = _biscompleted;
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index 3218daed72d1..4e10c13556a1 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -44,7 +44,7 @@ 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, XCompletion
+public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeListener, XTerminateListener
{
private static final int iButtonWidth = 50;
@@ -359,28 +359,6 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
}
- /* (non-Javadoc)
- * @see com.sun.star.wizards.ui.XCompletion#iscompleted(int)
- */
- public boolean iscompleted(int _ndialogpage)
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see com.sun.star.wizards.ui.XCompletion#setcompleted(int, boolean)
- */
- public void setcompleted(int _ndialogpage, boolean _biscompleted)
- {
- }
-
- /* (non-Javadoc)
- * @see com.sun.star.wizards.ui.XCompletion#setmodified(int, java.lang.Object, java.lang.Object)
- */
- public void setmodified(int _ndialogpage, Object ooldValue, Object onewValue)
- {
- }
-
public void drawNaviBar()
{
diff --git a/wizards/com/sun/star/wizards/ui/XCompletion.java b/wizards/com/sun/star/wizards/ui/XCompletion.java
deleted file mode 100644
index f51f096a81ef..000000000000
--- a/wizards/com/sun/star/wizards/ui/XCompletion.java
+++ /dev/null
@@ -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 com.sun.star.wizards.ui;
-
-public interface XCompletion
-{
-
- void setcompleted(int _ndialogpage, boolean _biscompleted);
-
- boolean iscompleted(int _ndialogpage);
-
-
-
-
-}
diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java b/wizards/com/sun/star/wizards/ui/event/DataAware.java
index cc34373f04ee..001f24537322 100644
--- a/wizards/com/sun/star/wizards/ui/event/DataAware.java
+++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java
@@ -114,10 +114,6 @@ public abstract class DataAware {
enableControls(ui);
}
- public interface Listener {
- void eventPerformed(Object event);
- }
-
/**
* compares the two given objects.
* This method is null safe and returns true also if both are null...