From 4f50a15d9494059ed0360153af2c5297dc93dff4 Mon Sep 17 00:00:00 2001 From: Philipp Riemer Date: Fri, 23 Jul 2021 18:21:36 +0200 Subject: [PATCH] =?UTF-8?q?override-Annotation=20erg=C3=A4nzt=20und=20Verw?= =?UTF-8?q?eiskommentar=20entfernt=20in=20`../passports/`=20(Teil=20von=20?= =?UTF-8?q?#82)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jameica/hbci/passport/PassportHandle.java | 1 - .../hbci/passports/ddv/Controller.java | 23 +-- .../jameica/hbci/passports/ddv/DDVConfig.java | 12 +- .../jameica/hbci/passports/ddv/Detail.java | 13 +- .../jameica/hbci/passports/ddv/KontoList.java | 4 +- .../passports/ddv/SelectConfigDialog.java | 10 +- .../jameica/hbci/passports/ddv/View.java | 6 +- .../ddv/server/AbstractKaanReader.java | 12 +- .../passports/ddv/server/AbstractReader.java | 28 +-- .../ddv/server/CherrySmartboardReader.java | 12 +- .../ddv/server/ChipDriveMicroReader.java | 20 +- .../ddv/server/ChipDrivePinPad532Reader.java | 12 +- .../passports/ddv/server/CustomReader.java | 16 +- .../ddv/server/KaanStandardPlusReader.java | 4 +- .../ddv/server/KaanTriBankReader.java | 4 +- .../ddv/server/OmniKey4000Reader.java | 20 +- .../hbci/passports/ddv/server/PCSCReader.java | 40 +--- .../ddv/server/PCSCWrapperReader.java | 12 +- .../ddv/server/PassportHandleImpl.java | 20 +- .../passports/ddv/server/PassportImpl.java | 24 +-- .../hbci/passports/ddv/server/RDHReader.java | 12 +- .../ddv/server/ReinerSCTCyberJackReader.java | 12 +- .../hbci/passports/pintan/ChipTANDialog.java | 27 +-- .../hbci/passports/pintan/Controller.java | 4 + .../jameica/hbci/passports/pintan/Detail.java | 13 +- .../hbci/passports/pintan/KontoList.java | 4 +- .../hbci/passports/pintan/PhotoTANDialog.java | 18 +- .../hbci/passports/pintan/PtSecMech.java | 8 +- .../passports/pintan/PtSecMechDialog.java | 9 +- .../passports/pintan/SelectConfigDialog.java | 10 +- .../hbci/passports/pintan/TANDialog.java | 21 +- .../hbci/passports/pintan/TanMediaDialog.java | 10 +- .../jameica/hbci/passports/pintan/View.java | 5 +- .../pintan/server/PassportHandleImpl.java | 20 +- .../passports/pintan/server/PassportImpl.java | 24 +-- .../pintan/server/PinTanConfigImpl.java | 191 ++++-------------- .../hbci/passports/rdh/Controller.java | 11 +- .../jameica/hbci/passports/rdh/Detail.java | 14 +- .../hbci/passports/rdh/InsertKeyDialog.java | 12 +- .../hbci/passports/rdh/KeyFormatDialog.java | 10 +- .../passports/rdh/KeyPasswordLoadDialog.java | 9 +- .../passports/rdh/KeyPasswordSaveDialog.java | 3 - .../jameica/hbci/passports/rdh/KontoList.java | 4 +- .../hbci/passports/rdh/SelectKeyDialog.java | 37 ++-- .../passports/rdh/SelectSizEntryDialog.java | 11 +- .../jameica/hbci/passports/rdh/View.java | 6 +- .../rdh/keyformat/AbstractKeyFormat.java | 6 - .../rdh/keyformat/AbstractSizRdhFormat.java | 8 +- .../rdh/keyformat/HBCI4JavaFormat.java | 20 +- .../passports/rdh/keyformat/RAH10Format.java | 12 +- .../passports/rdh/keyformat/RDH2Format.java | 12 +- .../rdh/keyformat/SizRdhDirectFormat.java | 12 +- .../passports/rdh/keyformat/SizRdhFormat.java | 12 +- .../rdh/server/PassportHandleImpl.java | 20 +- .../passports/rdh/server/PassportImpl.java | 24 +-- .../hbci/passports/rdh/server/RDHKeyImpl.java | 76 ++----- 56 files changed, 279 insertions(+), 721 deletions(-) diff --git a/src/de/willuhn/jameica/hbci/passport/PassportHandle.java b/src/de/willuhn/jameica/hbci/passport/PassportHandle.java index 341cbf757..595b59a6e 100644 --- a/src/de/willuhn/jameica/hbci/passport/PassportHandle.java +++ b/src/de/willuhn/jameica/hbci/passport/PassportHandle.java @@ -101,7 +101,6 @@ public interface PassportHandle extends Remote * @param msg * @param datatype * @param retData - * @see org.kapott.hbci.callback.HBCICallback#callback(org.kapott.hbci.passport.HBCIPassport, int, java.lang.String, int, java.lang.StringBuffer) * @return true, wenn der Handler den Callback behandeln konnte. * @throws Exception */ diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/Controller.java b/src/de/willuhn/jameica/hbci/passports/ddv/Controller.java index 77ff7601e..b68178219 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/Controller.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/Controller.java @@ -115,6 +115,7 @@ public TablePart getConfigList() throws RemoteException this.configList = new TablePart(DDVConfigFactory.getConfigs(),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { GUI.startView(Detail.class,context); @@ -127,6 +128,7 @@ public void handleAction(Object context) throws ApplicationException ContextMenu ctx = new ContextMenu(); ctx.addItem(new CheckedContextMenuItem(i18n.tr("Öffnen"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { if (context == null) return; @@ -142,11 +144,13 @@ public void handleAction(Object context) throws ApplicationException { },"document-open.png")); ctx.addItem(new ContextMenuItem(i18n.tr("Neue Konfiguration..."),new Action() { + @Override public void handleAction(Object context) throws ApplicationException {handleCreate();} },"document-new.png")); ctx.addItem(ContextMenuItem.SEPARATOR); ctx.addItem(new CheckedContextMenuItem(i18n.tr("Löschen..."),new Action() { + @Override public void handleAction(Object context) throws ApplicationException {handleDelete((DDVConfig)context);} },"user-trash-full.png")); @@ -371,9 +375,7 @@ public void handleScan() { private boolean stop = false; - /** - * @see de.willuhn.jameica.system.BackgroundTask#run(de.willuhn.util.ProgressMonitor) - */ + @Override public void run(final ProgressMonitor monitor) throws ApplicationException { final DDVConfig config = DDVConfigFactory.scan(monitor,this); @@ -419,17 +421,13 @@ public void run() } } - /** - * @see de.willuhn.jameica.system.BackgroundTask#interrupt() - */ + @Override public void interrupt() { this.stop = true; } - /** - * @see de.willuhn.jameica.system.BackgroundTask#isInterrupted() - */ + @Override public boolean isInterrupted() { return this.stop; @@ -633,6 +631,7 @@ public void handleChangeBankData() return; Application.getController().start(new BackgroundTask() { + @Override public void run(ProgressMonitor monitor) throws ApplicationException { HBCIPassportChipcard passport = null; @@ -706,7 +705,9 @@ public void run(ProgressMonitor monitor) throws ApplicationException } } + @Override public boolean isInterrupted(){return false;} + @Override public void interrupt(){} }); } @@ -716,9 +717,7 @@ public void interrupt(){} */ private class PresetListener implements Listener { - /** - * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) - */ + @Override public void handleEvent(Event event) { try { diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/DDVConfig.java b/src/de/willuhn/jameica/hbci/passports/ddv/DDVConfig.java index 5cf1163c6..7d5b5285b 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/DDVConfig.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/DDVConfig.java @@ -56,17 +56,13 @@ public String getId() return this.id; } - /** - * @see de.willuhn.jameica.hbci.passport.Configuration#getDescription() - */ + @Override public String getDescription() { return this.getReaderPreset().getName() + " (" + this.getName() + ")"; } - /** - * @see de.willuhn.jameica.hbci.passport.Configuration#getConfigDialog() - */ + @Override public Class getConfigDialog() throws RemoteException { return Detail.class; @@ -367,9 +363,7 @@ void deleteProperties() settings.setAttribute(this.getPrefix() + "konto",(String[]) null); } - /** - * @see de.willuhn.jameica.hbci.passport.Configuration#delete() - */ + @Override public void delete() throws ApplicationException { DDVConfigFactory.delete(this); diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/Detail.java b/src/de/willuhn/jameica/hbci/passports/ddv/Detail.java index f3a0214c9..8438ac276 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/Detail.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/Detail.java @@ -28,9 +28,7 @@ public class Detail extends AbstractView { private final static I18N i18n = Application.getPluginLoader().getPlugin(HBCI.class).getResources().getI18N(); - /** - * @see de.willuhn.jameica.gui.AbstractView#bind() - */ + @Override public void bind() throws Exception { GUI.getView().setTitle(i18n.tr("Details der Kartenleser-Konfiguration")); @@ -76,6 +74,7 @@ public void bind() throws Exception ButtonArea buttonArea = new ButtonArea(); buttonArea.addButton(i18n.tr("BPD/UPD"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleDisplayProperties(); @@ -83,6 +82,7 @@ public void handleAction(Object context) throws ApplicationException },null,false,"document-properties.png"); buttonArea.addButton(i18n.tr("Synchronisieren"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleSync(); @@ -90,6 +90,7 @@ public void handleAction(Object context) throws ApplicationException },null,false,"view-refresh.png"); buttonArea.addButton(i18n.tr("Konfiguration testen"), new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleTest(); @@ -97,6 +98,7 @@ public void handleAction(Object context) throws ApplicationException },null,false,"dialog-information.png"); buttonArea.addButton(i18n.tr("Bankdaten ändern"), new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleChangeBankData(); @@ -104,6 +106,7 @@ public void handleAction(Object context) throws ApplicationException },null,false,"system-users.png"); buttonArea.addButton(i18n.tr("Speichern"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleStore(); @@ -113,9 +116,7 @@ public void handleAction(Object context) throws ApplicationException buttonArea.paint(getParent()); } - /** - * @see de.willuhn.jameica.gui.AbstractView#canBookmark() - */ + @Override public boolean canBookmark() { return false; diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/KontoList.java b/src/de/willuhn/jameica/hbci/passports/ddv/KontoList.java index 10777fbe3..90afb074b 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/KontoList.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/KontoList.java @@ -48,9 +48,7 @@ public KontoList(DDVConfig config) throws RemoteException this.myConfig = config; } - /** - * @see de.willuhn.jameica.gui.parts.TablePart#paint(org.eclipse.swt.widgets.Composite) - */ + @Override public synchronized void paint(Composite parent) throws RemoteException { // Erst das Parent zeichnen, damit wir anschliessend die diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/SelectConfigDialog.java b/src/de/willuhn/jameica/hbci/passports/ddv/SelectConfigDialog.java index 9d2877a3d..aa490c692 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/SelectConfigDialog.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/SelectConfigDialog.java @@ -43,9 +43,7 @@ public SelectConfigDialog(int position) setTitle(i18n.tr("Auswahl der Kartenleser-Konfiguration")); } - /** - * @see de.willuhn.jameica.gui.dialogs.AbstractDialog#paint(org.eclipse.swt.widgets.Composite) - */ + @Override protected void paint(Composite parent) throws Exception { LabelGroup group = new LabelGroup(parent,i18n.tr("Konfiguration")); @@ -69,6 +67,7 @@ public void handleAction(Object context) throws ApplicationException ButtonArea buttons = new ButtonArea(); buttons.addButton(i18n.tr("Übernehmen"), new Action() { + @Override public void handleAction(Object context) throws ApplicationException { selected = (DDVConfig) table.getSelection(); @@ -78,6 +77,7 @@ public void handleAction(Object context) throws ApplicationException } },null,true); buttons.addButton(i18n.tr("Abbrechen"), new Action() { + @Override public void handleAction(Object context) throws ApplicationException { throw new OperationCanceledException(); @@ -95,9 +95,7 @@ public void setText(String text) this.text = text; } - /** - * @see de.willuhn.jameica.gui.dialogs.AbstractDialog#getData() - */ + @Override protected Object getData() throws Exception { return selected; diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/View.java b/src/de/willuhn/jameica/hbci/passports/ddv/View.java index 2f2476620..42779694a 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/View.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/View.java @@ -28,9 +28,7 @@ public class View extends AbstractView { private final static I18N i18n = Application.getPluginLoader().getPlugin(HBCI.class).getResources().getI18N(); - /** - * @see de.willuhn.jameica.gui.AbstractView#bind() - */ + @Override public void bind() throws Exception { GUI.getView().setTitle(i18n.tr("Chipkarten-Konfigurationen")); @@ -45,6 +43,7 @@ public void bind() throws Exception ButtonArea buttons = new ButtonArea(); buttons.addButton(i18n.tr("Kartenleser suchen..."), new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleScan(); @@ -52,6 +51,7 @@ public void handleAction(Object context) throws ApplicationException },null,false,"system-search.png"); buttons.addButton(i18n.tr("Kartenleser manuell anlegen"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleCreate(); diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/server/AbstractKaanReader.java b/src/de/willuhn/jameica/hbci/passports/ddv/server/AbstractKaanReader.java index aef4c8bc1..d343f47d9 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/server/AbstractKaanReader.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/server/AbstractKaanReader.java @@ -19,9 +19,7 @@ */ public abstract class AbstractKaanReader extends AbstractReader { - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getCTAPIDriver() - */ + @Override public String getCTAPIDriver() { switch (Application.getPlatform().getOS()) @@ -49,9 +47,7 @@ public String getCTAPIDriver() } } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#isSupported() - */ + @Override public boolean isSupported() { int os = Application.getPlatform().getOS(); @@ -60,9 +56,7 @@ public boolean isSupported() os == Platform.OS_LINUX_64; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#useSoftPin() - */ + @Override public boolean useSoftPin() { return false; diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/server/AbstractReader.java b/src/de/willuhn/jameica/hbci/passports/ddv/server/AbstractReader.java index 6a4a70ef0..09747d78f 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/server/AbstractReader.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/server/AbstractReader.java @@ -99,57 +99,43 @@ File getCTAPIDriverPath() } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getPort() - */ + @Override public String getPort() { return "COM2/USB2"; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getCTNumber() - */ + @Override public int getCTNumber() { return 0; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#useSoftPin() - */ + @Override public boolean useSoftPin() { return false; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getType() - */ + @Override public Type getType() { return Type.DDV_CTAPI; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getDefaultHBCIVersion() - */ + @Override public String getDefaultHBCIVersion() { return HBCIVersion.HBCI_300.getId(); } - /** - * @see java.lang.Object#toString() - */ + @Override public String toString() { return this.getName(); } - /** - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object obj) { if (!(obj instanceof Reader)) diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/server/CherrySmartboardReader.java b/src/de/willuhn/jameica/hbci/passports/ddv/server/CherrySmartboardReader.java index 4ca8958a3..513e72703 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/server/CherrySmartboardReader.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/server/CherrySmartboardReader.java @@ -20,17 +20,13 @@ */ public class CherrySmartboardReader extends AbstractReader { - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getName() - */ + @Override public String getName() { return "CTAPI: Cherry Smartboard"; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getCTAPIDriver() - */ + @Override public String getCTAPIDriver() { switch (Application.getPlatform().getOS()) @@ -43,9 +39,7 @@ public String getCTAPIDriver() } } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#isSupported() - */ + @Override public boolean isSupported() { return Application.getPlatform().getOS() == Platform.OS_WINDOWS; diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/server/ChipDriveMicroReader.java b/src/de/willuhn/jameica/hbci/passports/ddv/server/ChipDriveMicroReader.java index 53be61884..3ce8483cc 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/server/ChipDriveMicroReader.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/server/ChipDriveMicroReader.java @@ -20,17 +20,13 @@ */ public class ChipDriveMicroReader extends AbstractReader { - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getName() - */ + @Override public String getName() { return "CTAPI: Chipdrive Micro / Towitoko Kartenzwerg"; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getCTAPIDriver() - */ + @Override public String getCTAPIDriver() { switch (Application.getPlatform().getOS()) @@ -49,9 +45,7 @@ public String getCTAPIDriver() } } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#isSupported() - */ + @Override public boolean isSupported() { int os = Application.getPlatform().getOS(); @@ -60,17 +54,13 @@ public boolean isSupported() os == Platform.OS_LINUX_64; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#useSoftPin() - */ + @Override public boolean useSoftPin() { return true; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.server.AbstractReader#getPort() - */ + @Override public String getPort() { return "COM/USB"; diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/server/ChipDrivePinPad532Reader.java b/src/de/willuhn/jameica/hbci/passports/ddv/server/ChipDrivePinPad532Reader.java index cb0cd4a6f..8c906dc59 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/server/ChipDrivePinPad532Reader.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/server/ChipDrivePinPad532Reader.java @@ -20,17 +20,13 @@ */ public class ChipDrivePinPad532Reader extends AbstractReader { - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getName() - */ + @Override public String getName() { return "CTAPI: Chipdrive Pinpad / SCM SPR 332"; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getCTAPIDriver() - */ + @Override public String getCTAPIDriver() { if (Application.getPlatform().getOS() == Platform.OS_WINDOWS) @@ -38,9 +34,7 @@ public String getCTAPIDriver() return ""; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#isSupported() - */ + @Override public boolean isSupported() { return Application.getPlatform().getOS() == Platform.OS_WINDOWS; diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/server/CustomReader.java b/src/de/willuhn/jameica/hbci/passports/ddv/server/CustomReader.java index 309c9aa4d..5628de3aa 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/server/CustomReader.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/server/CustomReader.java @@ -18,33 +18,25 @@ */ public class CustomReader extends AbstractReader { - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getName() - */ + @Override public String getName() { return Application.getPluginLoader().getPlugin(HBCI.class).getResources().getI18N().tr("Benutzerdefinierter CTAPI-Leser"); } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getCTAPIDriver() - */ + @Override public String getCTAPIDriver() { return ""; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#isSupported() - */ + @Override public boolean isSupported() { return true; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#useSoftPin() - */ + @Override public boolean useSoftPin() { return true; diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/server/KaanStandardPlusReader.java b/src/de/willuhn/jameica/hbci/passports/ddv/server/KaanStandardPlusReader.java index b534a200d..1771b7fcb 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/server/KaanStandardPlusReader.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/server/KaanStandardPlusReader.java @@ -16,9 +16,7 @@ */ public class KaanStandardPlusReader extends AbstractKaanReader { - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getName() - */ + @Override public String getName() { return "CTAPI: Kaan Standard Plus USB (Kobil)"; diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/server/KaanTriBankReader.java b/src/de/willuhn/jameica/hbci/passports/ddv/server/KaanTriBankReader.java index 2b763399d..e22e40e21 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/server/KaanTriBankReader.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/server/KaanTriBankReader.java @@ -16,9 +16,7 @@ */ public class KaanTriBankReader extends AbstractKaanReader { - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getName() - */ + @Override public String getName() { return "CTAPI: Kaan TriB@nk"; diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/server/OmniKey4000Reader.java b/src/de/willuhn/jameica/hbci/passports/ddv/server/OmniKey4000Reader.java index a02cc1ef6..9c3d9705b 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/server/OmniKey4000Reader.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/server/OmniKey4000Reader.java @@ -21,17 +21,13 @@ */ public class OmniKey4000Reader extends AbstractReader { - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getName() - */ + @Override public String getName() { return "CTAPI: Omnikey 4000 (PC-Card)"; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getCTAPIDriver() - */ + @Override public String getCTAPIDriver() { switch (Application.getPlatform().getOS()) @@ -44,25 +40,19 @@ public String getCTAPIDriver() } } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#isSupported() - */ + @Override public boolean isSupported() { return Application.getPlatform().getOS() == Platform.OS_WINDOWS; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#useSoftPin() - */ + @Override public boolean useSoftPin() { return true; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.server.AbstractReader#getCTNumber() - */ + @Override public int getCTNumber() { return 1; diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/server/PCSCReader.java b/src/de/willuhn/jameica/hbci/passports/ddv/server/PCSCReader.java index 9666a066e..c670b5f13 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/server/PCSCReader.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/server/PCSCReader.java @@ -22,41 +22,31 @@ */ public class PCSCReader implements Reader { - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getName() - */ + @Override public String getName() { return Application.getPluginLoader().getPlugin(HBCI.class).getResources().getI18N().tr("PC/SC-Kartenleser (Kobil, ReinerSCT und andere)"); } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getCTAPIDriver() - */ + @Override public String getCTAPIDriver() { return null; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getPort() - */ + @Override public String getPort() { return null; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getCTNumber() - */ + @Override public int getCTNumber() { return 0; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#isSupported() - */ + @Override public boolean isSupported() { int os = Application.getPlatform().getOS(); @@ -68,41 +58,31 @@ public boolean isSupported() os == Platform.OS_MAC; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#useSoftPin() - */ + @Override public boolean useSoftPin() { return false; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getType() - */ + @Override public Type getType() { return Type.DDV_PCSC; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getDefaultHBCIVersion() - */ + @Override public String getDefaultHBCIVersion() { return HBCIVersion.HBCI_300.getId(); } - /** - * @see java.lang.Object#toString() - */ + @Override public String toString() { return this.getName(); } - /** - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object obj) { if (!(obj instanceof Reader)) diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/server/PCSCWrapperReader.java b/src/de/willuhn/jameica/hbci/passports/ddv/server/PCSCWrapperReader.java index 656d10913..ad60bdcde 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/server/PCSCWrapperReader.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/server/PCSCWrapperReader.java @@ -49,17 +49,13 @@ public class PCSCWrapperReader extends AbstractReader ); } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getName() - */ + @Override public String getName() { return Application.getPluginLoader().getPlugin(HBCI.class).getResources().getI18N().tr("CTAPI: PC/SC-Kartenleser via pcsc-ctapi-wrapper"); } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getCTAPIDriver() - */ + @Override public String getCTAPIDriver() { int os = Application.getPlatform().getOS(); @@ -79,9 +75,7 @@ public String getCTAPIDriver() return ""; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#isSupported() - */ + @Override public boolean isSupported() { // Haben wir Locations fuer das OS? diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/server/PassportHandleImpl.java b/src/de/willuhn/jameica/hbci/passports/ddv/server/PassportHandleImpl.java index 70e2367c7..fae4593f7 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/server/PassportHandleImpl.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/server/PassportHandleImpl.java @@ -75,9 +75,7 @@ public PassportHandleImpl(DDVConfig config) throws RemoteException this.config = config; } - /** - * @see de.willuhn.jameica.hbci.passport.PassportHandle#open() - */ + @Override public HBCIHandler open() throws RemoteException, ApplicationException { @@ -165,16 +163,12 @@ public HBCIHandler open() throws RemoteException, ApplicationException } } - /** - * @see de.willuhn.jameica.hbci.passport.PassportHandle#isOpen() - */ + @Override public boolean isOpen() throws RemoteException { return handler != null && hbciPassport != null; } - /** - * @see de.willuhn.jameica.hbci.passport.PassportHandle#close() - */ + @Override public void close() throws RemoteException { if (hbciPassport == null && handler == null) return; @@ -194,9 +188,7 @@ public void close() throws RemoteException { Logger.info("ddv passport closed"); } - /** - * @see de.willuhn.jameica.hbci.passport.PassportHandle#getKonten() - */ + @Override public Konto[] getKonten() throws RemoteException, ApplicationException { Logger.info("reading accounts from ddv passport"); @@ -228,9 +220,7 @@ public Konto[] getKonten() throws RemoteException, ApplicationException } } - /** - * @see de.willuhn.jameica.hbci.passport.PassportHandle#callback(org.kapott.hbci.passport.HBCIPassport, int, java.lang.String, int, java.lang.StringBuffer) - */ + @Override public boolean callback(HBCIPassport passport, int reason, String msg, int datatype, StringBuffer retData) throws Exception { diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/server/PassportImpl.java b/src/de/willuhn/jameica/hbci/passports/ddv/server/PassportImpl.java index 4f0753dea..6c77025c2 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/server/PassportImpl.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/server/PassportImpl.java @@ -39,23 +39,17 @@ public PassportImpl() throws RemoteException { super(); } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#getHandle() - */ + @Override public PassportHandle getHandle() throws RemoteException { return new PassportHandleImpl(this.konto); } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#getName() - */ + @Override public String getName() throws RemoteException { return i18n.tr("Chipkartenleser"); } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#getInfo() - */ + @Override public String getInfo() throws RemoteException { List list = DDVConfigFactory.getConfigs(); @@ -70,24 +64,18 @@ public String getInfo() throws RemoteException return i18n.tr("vorhandene Kartenleser-Konfigurationen: {0}",Integer.toString(list.size())); } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#getConfigurations() - */ + @Override public List getConfigurations() throws RemoteException { return DDVConfigFactory.getConfigs(); } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#getConfigDialog() - */ + @Override public Class getConfigDialog() throws RemoteException { return View.class; } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#init(de.willuhn.jameica.hbci.rmi.Konto) - */ + @Override public void init(Konto konto) throws RemoteException { this.konto = konto; diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/server/RDHReader.java b/src/de/willuhn/jameica/hbci/passports/ddv/server/RDHReader.java index b03922970..16001b163 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/server/RDHReader.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/server/RDHReader.java @@ -20,25 +20,19 @@ */ public class RDHReader extends PCSCReader { - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getName() - */ + @Override public String getName() { return Application.getPluginLoader().getPlugin(HBCI.class).getResources().getI18N().tr("RDH-Karte via PC/SC-Kartenleser"); } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getType() - */ + @Override public Type getType() { return Type.RDH_PCSC; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getDefaultHBCIVersion() - */ + @Override public String getDefaultHBCIVersion() { return HBCIVersion.HBCI_300.getId(); diff --git a/src/de/willuhn/jameica/hbci/passports/ddv/server/ReinerSCTCyberJackReader.java b/src/de/willuhn/jameica/hbci/passports/ddv/server/ReinerSCTCyberJackReader.java index 4cf9c94fe..9cd3d3dd0 100644 --- a/src/de/willuhn/jameica/hbci/passports/ddv/server/ReinerSCTCyberJackReader.java +++ b/src/de/willuhn/jameica/hbci/passports/ddv/server/ReinerSCTCyberJackReader.java @@ -20,17 +20,13 @@ */ public class ReinerSCTCyberJackReader extends AbstractReader { - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getName() - */ + @Override public String getName() { return "CTAPI: ReinerSCT cyberjack"; } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#getCTAPIDriver() - */ + @Override public String getCTAPIDriver() { switch (Application.getPlatform().getOS()) @@ -52,9 +48,7 @@ public String getCTAPIDriver() } } - /** - * @see de.willuhn.jameica.hbci.passports.ddv.rmi.Reader#isSupported() - */ + @Override public boolean isSupported() { int os = Application.getPlatform().getOS(); diff --git a/src/de/willuhn/jameica/hbci/passports/pintan/ChipTANDialog.java b/src/de/willuhn/jameica/hbci/passports/pintan/ChipTANDialog.java index d368f44e2..ab1b55678 100644 --- a/src/de/willuhn/jameica/hbci/passports/pintan/ChipTANDialog.java +++ b/src/de/willuhn/jameica/hbci/passports/pintan/ChipTANDialog.java @@ -102,9 +102,6 @@ public ChipTANDialog(PinTanConfig config, String code) throws RemoteException, A this.setSideImage(null); // den Platz haben wir hier nicht. } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.TANDialog#setText(java.lang.String) - */ @Override public void setText(String text) { @@ -164,9 +161,6 @@ public void handleEvent(Event event) return this.autoContinue; } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.TANDialog#paint(org.eclipse.swt.widgets.Composite) - */ @Override protected void paint(Composite parent) throws Exception { @@ -253,9 +247,6 @@ private void checkUSB() throws RemoteException } } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.TANDialog#extendTop(de.willuhn.jameica.gui.util.Container) - */ @Override protected void extendTop(Container container) throws Exception { @@ -359,9 +350,6 @@ public void run() } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.TANDialog#extendBottom(org.eclipse.swt.widgets.Composite) - */ @Override protected void extendBottom(Container c) throws Exception { @@ -396,9 +384,7 @@ private FlickerPart(String code) throws ApplicationException setFrequency(SETTINGS.getInt("freq",FlickerRenderer.FREQUENCY_DEFAULT)); } - /** - * @see org.kapott.hbci.manager.FlickerRenderer#paint(boolean, boolean, boolean, boolean, boolean) - */ + @Override public void paint(boolean b1, boolean b2, boolean b3, boolean b4, boolean b5) { this.bits[0] = b1; @@ -425,9 +411,7 @@ public void run() }); } - /** - * @see de.willuhn.jameica.gui.Part#paint(org.eclipse.swt.widgets.Composite) - */ + @Override public void paint(final Composite parent) throws RemoteException { if (this.canvas != null) @@ -453,9 +437,7 @@ public void paint(final Composite parent) throws RemoteException smaller.setText(" - "); smaller.addSelectionListener(new SelectionAdapter() { - /** - * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetSelected(SelectionEvent e) { GridData gd = (GridData) comp.getLayoutData(); @@ -548,6 +530,7 @@ public void widgetSelected(SelectionEvent e) // Beim Disposen stoppen wir den Flicker-Thread. this.comp.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { // Wir merken uns die Groesse des Canvas. @@ -568,12 +551,14 @@ public void widgetDisposed(DisposeEvent e) // Bei jedem Paint-Event aktualisieren wir die Balken this.canvas.addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent e) { update(e.gc); } }); this.canvas.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { // Update-Thread stoppen diff --git a/src/de/willuhn/jameica/hbci/passports/pintan/Controller.java b/src/de/willuhn/jameica/hbci/passports/pintan/Controller.java index b9c928de4..167b80b0b 100644 --- a/src/de/willuhn/jameica/hbci/passports/pintan/Controller.java +++ b/src/de/willuhn/jameica/hbci/passports/pintan/Controller.java @@ -120,6 +120,7 @@ public TablePart getConfigList() throws RemoteException configList = new TablePart(PinTanConfigFactory.getConfigs(),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { GUI.startView(Detail.class,context); @@ -134,6 +135,7 @@ public void handleAction(Object context) throws ApplicationException ContextMenu ctx = new ContextMenu(); ctx.addItem(new CheckedContextMenuItem(i18n.tr("Öffnen"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { if (context == null) return; @@ -149,11 +151,13 @@ public void handleAction(Object context) throws ApplicationException { },"document-open.png")); ctx.addItem(new ContextMenuItem(i18n.tr("PIN/TAN-Zugang anlegen"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException {handleCreate();} },"document-new.png")); ctx.addItem(ContextMenuItem.SEPARATOR); ctx.addItem(new CheckedContextMenuItem(i18n.tr("Löschen..."),new Action() { + @Override public void handleAction(Object context) throws ApplicationException {handleDelete((PinTanConfig)context);} },"user-trash-full.png")); diff --git a/src/de/willuhn/jameica/hbci/passports/pintan/Detail.java b/src/de/willuhn/jameica/hbci/passports/pintan/Detail.java index 2526e4cea..3a03b1bf1 100644 --- a/src/de/willuhn/jameica/hbci/passports/pintan/Detail.java +++ b/src/de/willuhn/jameica/hbci/passports/pintan/Detail.java @@ -31,9 +31,7 @@ public class Detail extends AbstractView { private final static I18N i18n = Application.getPluginLoader().getPlugin(HBCI.class).getResources().getI18N(); - /** - * @see de.willuhn.jameica.gui.AbstractView#bind() - */ + @Override public void bind() throws Exception { @@ -92,6 +90,7 @@ public void bind() throws Exception ButtonArea buttons = new ButtonArea(); String tanMedia = control.getConfig().getTanMedia(); Button b = new Button(i18n.tr("TAN-Verfahren zurücksetzen"), new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleDeleteTanSettings(); @@ -112,6 +111,7 @@ public void handleAction(Object context) throws ApplicationException ButtonArea buttons = new ButtonArea(); buttons.addButton(i18n.tr("BPD/UPD"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleDisplayProperties(); @@ -119,6 +119,7 @@ public void handleAction(Object context) throws ApplicationException },null,false,"document-properties.png"); buttons.addButton(i18n.tr("Synchronisieren"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleSync(); @@ -126,6 +127,7 @@ public void handleAction(Object context) throws ApplicationException },null,false,"view-refresh.png"); buttons.addButton(i18n.tr("Konfiguration testen"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleTest(); @@ -133,6 +135,7 @@ public void handleAction(Object context) throws ApplicationException },null,false,"dialog-information.png"); buttons.addButton(i18n.tr("Speichern"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleStore(); @@ -141,9 +144,7 @@ public void handleAction(Object context) throws ApplicationException buttons.paint(getParent()); } - /** - * @see de.willuhn.jameica.gui.AbstractView#canBookmark() - */ + @Override public boolean canBookmark() { return false; diff --git a/src/de/willuhn/jameica/hbci/passports/pintan/KontoList.java b/src/de/willuhn/jameica/hbci/passports/pintan/KontoList.java index a254b9efa..234b0118c 100644 --- a/src/de/willuhn/jameica/hbci/passports/pintan/KontoList.java +++ b/src/de/willuhn/jameica/hbci/passports/pintan/KontoList.java @@ -49,9 +49,7 @@ public KontoList(PinTanConfig config) throws RemoteException this.myConfig = config; } - /** - * @see de.willuhn.jameica.gui.parts.TablePart#paint(org.eclipse.swt.widgets.Composite) - */ + @Override public synchronized void paint(Composite parent) throws RemoteException { diff --git a/src/de/willuhn/jameica/hbci/passports/pintan/PhotoTANDialog.java b/src/de/willuhn/jameica/hbci/passports/pintan/PhotoTANDialog.java index a598b2d50..fc1bf6b72 100644 --- a/src/de/willuhn/jameica/hbci/passports/pintan/PhotoTANDialog.java +++ b/src/de/willuhn/jameica/hbci/passports/pintan/PhotoTANDialog.java @@ -75,9 +75,6 @@ public PhotoTANDialog(PinTanConfig config, byte[] bytes) throws RemoteException, this.bytes = bytes; } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.TANDialog#extendTop(org.eclipse.swt.widgets.Composite) - */ @Override protected void extendTop(Container container) throws Exception { @@ -95,9 +92,7 @@ protected void extendTop(Container container) throws Exception this.smaller.setLayoutData(new GridData()); this.smaller.addSelectionListener(new SelectionAdapter() { - /** - * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetSelected(SelectionEvent e) { resize(currentSize - 30); @@ -111,9 +106,7 @@ public void widgetSelected(SelectionEvent e) reset.setLayoutData(new GridData()); reset.addSelectionListener(new SelectionAdapter() { - /** - * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetSelected(SelectionEvent e) { resize(initialSize); @@ -126,9 +119,7 @@ public void widgetSelected(SelectionEvent e) this.larger.setLayoutData(new GridData()); this.larger.addSelectionListener(new SelectionAdapter() { - /** - * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetSelected(SelectionEvent e) { resize(currentSize + 30); @@ -148,9 +139,6 @@ public void widgetSelected(SelectionEvent e) this.imageLabel.setImage(image); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.TANDialog#paint(org.eclipse.swt.widgets.Composite) - */ @Override protected void paint(Composite parent) throws Exception { diff --git a/src/de/willuhn/jameica/hbci/passports/pintan/PtSecMech.java b/src/de/willuhn/jameica/hbci/passports/pintan/PtSecMech.java index f68142222..cbb153ccb 100644 --- a/src/de/willuhn/jameica/hbci/passports/pintan/PtSecMech.java +++ b/src/de/willuhn/jameica/hbci/passports/pintan/PtSecMech.java @@ -161,9 +161,7 @@ public String getLongname() return "[" + this.id + "] " + this.name; } - /** - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object obj) { if (obj == null || !(obj instanceof PtSecMech)) @@ -191,9 +189,7 @@ public boolean isFlickerCode() s.contains("comfort"); } - /** - * @see java.lang.Object#toString() - */ + @Override public String toString() { return this.id + ":" + this.name; diff --git a/src/de/willuhn/jameica/hbci/passports/pintan/PtSecMechDialog.java b/src/de/willuhn/jameica/hbci/passports/pintan/PtSecMechDialog.java index 7baf4f8c6..57dc2f5f4 100644 --- a/src/de/willuhn/jameica/hbci/passports/pintan/PtSecMechDialog.java +++ b/src/de/willuhn/jameica/hbci/passports/pintan/PtSecMechDialog.java @@ -88,9 +88,7 @@ public PtSecMechDialog(PinTanConfig config, String options) else setTitle(i18n.tr("Auswahl des PIN/TAN-Verfahrens")); } - /** - * @see de.willuhn.jameica.gui.dialogs.AbstractDialog#paint(org.eclipse.swt.widgets.Composite) - */ + @Override protected void paint(Composite parent) throws Exception { Container group = new SimpleContainer(parent); @@ -102,6 +100,7 @@ protected void paint(Composite parent) throws Exception ButtonArea buttons = new ButtonArea(); buttons.addButton(i18n.tr("Übernehmen"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { try @@ -145,9 +144,7 @@ public void handleAction(Object context) throws ApplicationException group.addButtonArea(buttons); } - /** - * @see de.willuhn.jameica.gui.dialogs.AbstractDialog#getData() - */ + @Override protected Object getData() throws Exception { if (choosen == null) diff --git a/src/de/willuhn/jameica/hbci/passports/pintan/SelectConfigDialog.java b/src/de/willuhn/jameica/hbci/passports/pintan/SelectConfigDialog.java index 1f8f3e633..1e50a64da 100644 --- a/src/de/willuhn/jameica/hbci/passports/pintan/SelectConfigDialog.java +++ b/src/de/willuhn/jameica/hbci/passports/pintan/SelectConfigDialog.java @@ -53,9 +53,7 @@ public SelectConfigDialog(int position, GenericIterator list) setTitle(i18n.tr("Auswahl der PIN/TAN-Konfiguration")); } - /** - * @see de.willuhn.jameica.gui.dialogs.AbstractDialog#paint(org.eclipse.swt.widgets.Composite) - */ + @Override protected void paint(Composite parent) throws Exception { Container group = new SimpleContainer(parent,true); @@ -65,6 +63,7 @@ protected void paint(Composite parent) throws Exception list.begin(); final TablePart table = new TablePart(list != null && list.size() > 0 ? list : PinTanConfigFactory.getConfigs(), new Action() { + @Override public void handleAction(Object context) throws ApplicationException { if (context == null || !(context instanceof PinTanConfig)) @@ -83,6 +82,7 @@ public void handleAction(Object context) throws ApplicationException ButtonArea buttons = new ButtonArea(); buttons.addButton(i18n.tr("Übernehmen"), new Action() { + @Override public void handleAction(Object context) throws ApplicationException { selected = (PinTanConfig) table.getSelection(); @@ -105,9 +105,7 @@ public void setText(String text) this.text = text; } - /** - * @see de.willuhn.jameica.gui.dialogs.AbstractDialog#getData() - */ + @Override protected Object getData() throws Exception { return selected; diff --git a/src/de/willuhn/jameica/hbci/passports/pintan/TANDialog.java b/src/de/willuhn/jameica/hbci/passports/pintan/TANDialog.java index 1ef3df821..ca5c0a98b 100644 --- a/src/de/willuhn/jameica/hbci/passports/pintan/TANDialog.java +++ b/src/de/willuhn/jameica/hbci/passports/pintan/TANDialog.java @@ -187,6 +187,7 @@ private Button getOkButton() return this.okButton; this.okButton = new Button(" " + i18n.tr("OK") + " ",new Action() { + @Override public void handleAction(Object context) throws ApplicationException { tan = (String) getTANInput().getValue(); @@ -197,10 +198,7 @@ public void handleAction(Object context) throws ApplicationException return this.okButton; } - - /** - * @see de.willuhn.jameica.gui.dialogs.AbstractDialog#paint(org.eclipse.swt.widgets.Composite) - */ + @Override protected void paint(Composite parent) throws Exception { // Oberer Bereich @@ -240,9 +238,6 @@ protected void paint(Composite parent) throws Exception c.addInput(tan); tan.getControl().addKeyListener(new KeyAdapter() { - /** - * @see org.eclipse.swt.events.KeyAdapter#keyReleased(org.eclipse.swt.events.KeyEvent) - */ @Override public void keyReleased(KeyEvent e) { @@ -261,13 +256,14 @@ public void keyReleased(KeyEvent e) bottom.addButtonArea(buttons); addShellListener(new ShellListener() { + @Override public void shellClosed(ShellEvent e) { throw new OperationCanceledException("dialog cancelled via close button"); } - public void shellActivated(ShellEvent e) {} - public void shellDeactivated(ShellEvent e) {} - public void shellDeiconified(ShellEvent e) {} - public void shellIconified(ShellEvent e) {} + @Override public void shellActivated(ShellEvent e) {} + @Override public void shellDeactivated(ShellEvent e) {} + @Override public void shellDeiconified(ShellEvent e) {} + @Override public void shellIconified(ShellEvent e) {} }); this.getShell().setMinimumSize(getShell().computeSize(WINDOW_WIDTH,WINDOW_HEIGHT)); @@ -340,9 +336,6 @@ public HibiscusDBObject getContext() return context; } - /** - * @see de.willuhn.jameica.gui.dialogs.AbstractDialog#getData() - */ @Override protected Object getData() throws Exception { diff --git a/src/de/willuhn/jameica/hbci/passports/pintan/TanMediaDialog.java b/src/de/willuhn/jameica/hbci/passports/pintan/TanMediaDialog.java index 9dfa4cfd0..50e391401 100644 --- a/src/de/willuhn/jameica/hbci/passports/pintan/TanMediaDialog.java +++ b/src/de/willuhn/jameica/hbci/passports/pintan/TanMediaDialog.java @@ -89,9 +89,7 @@ public TanMediaDialog(PinTanConfig config, String options) else setTitle(i18n.tr("Auswahl des TAN-Mediums")); } - /** - * @see de.willuhn.jameica.gui.dialogs.AbstractDialog#paint(org.eclipse.swt.widgets.Composite) - */ + @Override protected void paint(Composite parent) throws Exception { Container group = new SimpleContainer(parent); @@ -106,6 +104,7 @@ protected void paint(Composite parent) throws Exception ButtonArea buttons = new ButtonArea(); buttons.addButton(i18n.tr("Übernehmen"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { try @@ -145,6 +144,7 @@ public void handleAction(Object context) throws ApplicationException } },null,true,"ok.png"); buttons.addButton(i18n.tr("Abbrechen"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { throw new OperationCanceledException(); @@ -153,9 +153,7 @@ public void handleAction(Object context) throws ApplicationException group.addButtonArea(buttons); } - /** - * @see de.willuhn.jameica.gui.dialogs.AbstractDialog#getData() - */ + @Override protected Object getData() throws Exception { return choosen; diff --git a/src/de/willuhn/jameica/hbci/passports/pintan/View.java b/src/de/willuhn/jameica/hbci/passports/pintan/View.java index e152b65d6..6a6827325 100644 --- a/src/de/willuhn/jameica/hbci/passports/pintan/View.java +++ b/src/de/willuhn/jameica/hbci/passports/pintan/View.java @@ -29,9 +29,7 @@ public class View extends AbstractView { private final static I18N i18n = Application.getPluginLoader().getPlugin(HBCI.class).getResources().getI18N(); - /** - * @see de.willuhn.jameica.gui.AbstractView#bind() - */ + @Override public void bind() throws Exception { GUI.getView().setTitle(i18n.tr("PIN/TAN-Konfigurationen")); @@ -43,6 +41,7 @@ public void bind() throws Exception ButtonArea buttons = new ButtonArea(); buttons.addButton(i18n.tr("PIN/TAN-Zugang anlegen"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleCreate(); diff --git a/src/de/willuhn/jameica/hbci/passports/pintan/server/PassportHandleImpl.java b/src/de/willuhn/jameica/hbci/passports/pintan/server/PassportHandleImpl.java index 8461b70b6..b9708509e 100644 --- a/src/de/willuhn/jameica/hbci/passports/pintan/server/PassportHandleImpl.java +++ b/src/de/willuhn/jameica/hbci/passports/pintan/server/PassportHandleImpl.java @@ -83,9 +83,7 @@ public PassportHandleImpl(PinTanConfig config) throws RemoteException { this.config = config; } - /** - * @see de.willuhn.jameica.hbci.passport.PassportHandle#open() - */ + @Override public HBCIHandler open() throws RemoteException, ApplicationException { @@ -195,16 +193,12 @@ public HBCIHandler open() throws RemoteException, ApplicationException } } - /** - * @see de.willuhn.jameica.hbci.passport.PassportHandle#isOpen() - */ + @Override public boolean isOpen() throws RemoteException { return handler != null && hbciPassport != null; } - /** - * @see de.willuhn.jameica.hbci.passport.PassportHandle#close() - */ + @Override public void close() throws RemoteException { if (hbciPassport == null && handler == null) return; @@ -284,9 +278,7 @@ private void handleCode3072() } } - /** - * @see de.willuhn.jameica.hbci.passport.PassportHandle#getKonten() - */ + @Override public Konto[] getKonten() throws RemoteException, ApplicationException { Logger.info("reading accounts from pin/tan passport"); @@ -318,9 +310,7 @@ public Konto[] getKonten() throws RemoteException, ApplicationException } } - /** - * @see de.willuhn.jameica.hbci.passport.PassportHandle#callback(org.kapott.hbci.passport.HBCIPassport, int, java.lang.String, int, java.lang.StringBuffer) - */ + @Override public boolean callback(HBCIPassport passport, int reason, String msg, int datatype, StringBuffer retData) throws Exception { switch (reason) diff --git a/src/de/willuhn/jameica/hbci/passports/pintan/server/PassportImpl.java b/src/de/willuhn/jameica/hbci/passports/pintan/server/PassportImpl.java index e20fd0e14..405c4568b 100644 --- a/src/de/willuhn/jameica/hbci/passports/pintan/server/PassportImpl.java +++ b/src/de/willuhn/jameica/hbci/passports/pintan/server/PassportImpl.java @@ -41,25 +41,19 @@ public PassportImpl() throws RemoteException { super(); } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#getName() - */ + @Override public String getName() throws RemoteException { return i18n.tr("PIN/TAN"); } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#getInfo() - */ + @Override public String getInfo() throws RemoteException { GenericIterator i = PinTanConfigFactory.getConfigs(); return i18n.tr("vorhandene PIN/TAN-Konfigurationen: {0}",Integer.toString(i.size())); } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#getConfigurations() - */ + @Override public List getConfigurations() throws RemoteException { GenericIterator i = PinTanConfigFactory.getConfigs(); @@ -69,24 +63,18 @@ public List getConfigurations() throws RemoteException return configs; } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#getConfigDialog() - */ + @Override public Class getConfigDialog() throws RemoteException { return View.class; } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#init(de.willuhn.jameica.hbci.rmi.Konto) - */ + @Override public void init(Konto konto) throws RemoteException { this.konto = konto; } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#getHandle() - */ + @Override public PassportHandle getHandle() throws RemoteException { return new PassportHandleImpl(this); diff --git a/src/de/willuhn/jameica/hbci/passports/pintan/server/PinTanConfigImpl.java b/src/de/willuhn/jameica/hbci/passports/pintan/server/PinTanConfigImpl.java index c39e88489..afcae18ec 100644 --- a/src/de/willuhn/jameica/hbci/passports/pintan/server/PinTanConfigImpl.java +++ b/src/de/willuhn/jameica/hbci/passports/pintan/server/PinTanConfigImpl.java @@ -56,9 +56,7 @@ public PinTanConfigImpl(PassportLoader loader, File file) throws RemoteException this.file = file; } - /** - * @see de.willuhn.datasource.GenericObject#getAttribute(java.lang.String) - */ + @Override public Object getAttribute(String attribute) throws RemoteException { if ("blz".equals(attribute)) @@ -88,9 +86,7 @@ public Object getAttribute(String attribute) throws RemoteException return null; } - /** - * @see de.willuhn.jameica.hbci.passport.Configuration#getDescription() - */ + @Override public String getDescription() { try @@ -131,49 +127,37 @@ public String getDescription() } } - /** - * @see de.willuhn.jameica.hbci.passport.Configuration#getConfigDialog() - */ + @Override public Class getConfigDialog() throws RemoteException { return Detail.class; } - /** - * @see de.willuhn.jameica.hbci.passport.Configuration#delete() - */ + @Override public void delete() throws ApplicationException { PinTanConfigFactory.delete(this); } - /** - * @see de.willuhn.datasource.GenericObject#getAttributeNames() - */ + @Override public String[] getAttributeNames() throws RemoteException { return new String[] {"blz","bank","url","port","filtertype","hbciversion"}; } - /** - * @see de.willuhn.datasource.GenericObject#getID() - */ + @Override public String getID() throws RemoteException { return PinTanConfigFactory.toRelativePath(getFilename()); } - /** - * @see de.willuhn.datasource.GenericObject#getPrimaryAttribute() - */ + @Override public String getPrimaryAttribute() throws RemoteException { return "url"; } - /** - * @see de.willuhn.datasource.GenericObject#equals(de.willuhn.datasource.GenericObject) - */ + @Override public boolean equals(GenericObject other) throws RemoteException { if (other == null) @@ -185,34 +169,26 @@ public boolean equals(GenericObject other) throws RemoteException return getID().equals(other.getID()); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getHBCIVersion() - */ + @Override public String getHBCIVersion() throws RemoteException { String ppVersion = StringUtils.trimToNull(this.getPassport().getHBCIVersion()); return settings.getString(getID() + ".hbciversion",ppVersion != null ? ppVersion : HBCIVersion.HBCI_300.getId()); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setHBCIVersion(java.lang.String) - */ + @Override public void setHBCIVersion(String version) throws RemoteException { settings.setAttribute(getID() + ".hbciversion",version); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getURL() - */ + @Override public String getURL() throws RemoteException { return this.getPassport().getHost(); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setURL(java.lang.String) - */ + @Override public void setURL(String url) throws RemoteException { if (url == null || url.length() == 0) @@ -229,113 +205,85 @@ public void setURL(String url) throws RemoteException this.getPassport().setHost(url); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getPort() - */ + @Override public int getPort() throws RemoteException { return this.getPassport().getPort().intValue(); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setPort(int) - */ + @Override public void setPort(int port) throws RemoteException { this.getPassport().setPort(Integer.valueOf(port)); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getFilterType() - */ + @Override public String getFilterType() throws RemoteException { return this.getPassport().getFilterType(); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setFilterType(java.lang.String) - */ + @Override public void setFilterType(String type) throws RemoteException { this.getPassport().setFilterType(type); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getBLZ() - */ + @Override public String getBLZ() throws RemoteException { return this.getPassport().getBLZ(); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getCustomerId() - */ + @Override public String getCustomerId() throws RemoteException { return this.getPassport().getCustomerId(); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setCustomerId(java.lang.String) - */ + @Override public void setCustomerId(String customer) throws RemoteException { this.getPassport().setCustomerId(customer); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getUserId() - */ + @Override public String getUserId() throws RemoteException { return this.getPassport().getUserId(); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setUserId(java.lang.String) - */ + @Override public void setUserId(String user) throws RemoteException { this.getPassport().setUserId(user); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getFilename() - */ + @Override public String getFilename() throws RemoteException { return file.getAbsolutePath(); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getPassport() - */ + @Override public HBCIPassport getPassport() throws RemoteException { return this.loader.load(); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getBezeichnung() - */ + @Override public String getBezeichnung() throws RemoteException { return settings.getString(getID() + ".bezeichnung",null); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setBezeichnung(java.lang.String) - */ + @Override public void setBezeichnung(String bezeichnung) throws RemoteException { settings.setAttribute(getID() + ".bezeichnung",bezeichnung); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getKonten() - */ + @Override public Konto[] getKonten() throws RemoteException { // Und jetzt laden wir die Liste neu @@ -365,9 +313,7 @@ public Konto[] getKonten() throws RemoteException return konten.toArray(new Konto[0]); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setKonten(de.willuhn.jameica.hbci.rmi.Konto[]) - */ + @Override public void setKonten(Konto[] k) throws RemoteException { if (k == null || k.length == 0) @@ -384,9 +330,7 @@ public void setKonten(Konto[] k) throws RemoteException settings.setAttribute(getID() + ".konto",ids); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getStoredSecMech() - */ + @Override public PtSecMech getStoredSecMech() throws RemoteException { // Wir haben migriert. Vorher wurde nur die ID des Verfahrens gespeichert. @@ -397,17 +341,12 @@ public PtSecMech getStoredSecMech() throws RemoteException return PtSecMech.create(settings.getString(getID() + ".secmech",null)); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setStoredSecMech(de.willuhn.jameica.hbci.passports.pintan.PtSecMech) - */ + @Override public void setStoredSecMech(PtSecMech mech) throws RemoteException { settings.setAttribute(getID() + ".secmech",mech != null ? mech.toString() : null); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getCurrentSecMech() - */ @Override public PtSecMech getCurrentSecMech() throws RemoteException { @@ -418,18 +357,12 @@ public PtSecMech getCurrentSecMech() throws RemoteException return mech != null ? mech : this.getStoredSecMech(); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setCurrentSecMech(de.willuhn.jameica.hbci.passports.pintan.PtSecMech) - */ @Override public void setCurrentSecMech(PtSecMech mech) throws RemoteException { settings.setAttribute(getID() + ".secmech.current",mech != null ? mech.toString() : null); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getAvailableSecMechs() - */ @Override public List getAvailableSecMechs() throws RemoteException { @@ -449,36 +382,24 @@ public List getAvailableSecMechs() throws RemoteException return result; } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setAvailableSecMechs(java.lang.String) - */ @Override public void setAvailableSecMechs(String list) throws RemoteException { settings.setAttribute(getID() + ".secmech.list",list); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getCardReader() - */ @Override public String getCardReader() throws RemoteException { return settings.getString(getID() + ".cardreader",null); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setCardReader(java.lang.String) - */ @Override public void setCardReader(String name) throws RemoteException { settings.setAttribute(getID() + ".cardreader",name); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#isChipTANUSB() - */ @Override public Boolean isChipTANUSB() throws RemoteException { @@ -486,52 +407,36 @@ public Boolean isChipTANUSB() throws RemoteException return s != null ? Boolean.valueOf(s) : null; } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setChipTANUSB(java.lang.Boolean) - */ @Override public void setChipTANUSB(Boolean b) throws RemoteException { settings.setAttribute(getID() + ".chiptan.usb.enabled",(String) (b != null ? b.toString() : null)); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#isConvertFlickerToQRCode() - */ @Override public boolean isConvertFlickerToQRCode() throws RemoteException { return settings.getBoolean(getID() + ".chiptan.flicker2qrcode.enabled",false); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setConvertFlickerToQRCode(boolean) - */ @Override public void setConvertFlickerToQRCode(boolean b) throws RemoteException { settings.setAttribute(getID() + ".chiptan.flicker2qrcode.enabled",b); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getTanMedias() - */ + @Override public String[] getTanMedias() throws RemoteException { return settings.getList(getID() + ".tanmedias",new String[0]); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setTanMedias(java.lang.String[]) - */ + @Override public void setTanMedias(String[] names) throws RemoteException { settings.setAttribute(getID() + ".tanmedias",names); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getAvailableTanMedias() - */ @Override public List getAvailableTanMedias() throws RemoteException { @@ -551,18 +456,13 @@ public List getAvailableTanMedias() throws RemoteException return result; } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setAvailableTanMedias(java.lang.String) - */ @Override public void setAvailableTanMedias(String list) throws RemoteException { settings.setAttribute(getID() + ".tanmedias.list",list); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#addTanMedia(java.lang.String) - */ + @Override public void addTanMedia(String name) throws RemoteException { if (name == null || name.length() == 0) @@ -589,41 +489,31 @@ public void addTanMedia(String name) throws RemoteException this.setTanMedias(list.toArray(new String[0])); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getTanMedia() - */ + @Override public String getTanMedia() throws RemoteException { return settings.getString(getID() + ".tanmedia",null); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setTanMedia(java.lang.String) - */ + @Override public void setTanMedia(String name) throws RemoteException { settings.setAttribute(getID() + ".tanmedia",name); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getShowTan() - */ + @Override public boolean getShowTan() throws RemoteException { return settings.getBoolean(getID() + ".showtan",true); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setShowTan(boolean) - */ + @Override public void setShowTan(boolean show) throws RemoteException { settings.setAttribute(getID() + ".showtan",show); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#getCustomProperty(java.lang.String) - */ + @Override public String getCustomProperty(String name) throws RemoteException { if (name == null) @@ -631,9 +521,7 @@ public String getCustomProperty(String name) throws RemoteException return settings.getString(getID() + "." + name,null); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#setCustomProperty(java.lang.String, java.lang.String) - */ + @Override public void setCustomProperty(String name, String value) throws RemoteException { if (name == null) @@ -642,9 +530,6 @@ public void setCustomProperty(String name, String value) throws RemoteException settings.setAttribute(getID() + "." + name,value); } - /** - * @see de.willuhn.jameica.hbci.passports.pintan.rmi.PinTanConfig#reload() - */ @Override public void reload() throws RemoteException { diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/Controller.java b/src/de/willuhn/jameica/hbci/passports/rdh/Controller.java index 5d676baac..34437d143 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/Controller.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/Controller.java @@ -285,6 +285,7 @@ public TablePart getKeyList() throws RemoteException keyList = new TablePart(RDHKeyFactory.getKeys(),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { GUI.startView(Detail.class,context); @@ -304,6 +305,7 @@ public void handleAction(Object context) throws ApplicationException // Kontext: Details. ctx.addItem(new CheckedContextMenuItem(i18n.tr("Öffnen"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { if (context == null) @@ -320,10 +322,12 @@ public void handleAction(Object context) throws ApplicationException },"document-open.png")); ctx.addItem(new ContextMenuItem(i18n.tr("Neuer Schlüssel..."),new Action() { + @Override public void handleAction(Object context) throws ApplicationException {startCreate();} },"document-new.png")); ctx.addItem(new ContextMenuItem(i18n.tr("Schlüssel importieren..."),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { startImport(); @@ -336,6 +340,7 @@ public void handleAction(Object context) throws ApplicationException ctx.addItem(new ActivateKey(false)); ctx.addItem(ContextMenuItem.SEPARATOR); ctx.addItem(new CheckedContextMenuItem(i18n.tr("Löschen..."), new Action() { + @Override public void handleAction(Object context) throws ApplicationException { try @@ -375,6 +380,7 @@ public void handleAction(Object context) throws ApplicationException // Format fuer aktiv/inaktiv keyList.setFormatter(new TableFormatter() { + @Override public void format(TableItem item) { try @@ -701,6 +707,7 @@ public ActivateKey(final boolean activate) super((activate ? i18n.tr("Schlüssel aktivieren") : i18n.tr("Schlüssel deaktivieren")), new Action() { + @Override public void handleAction(Object context) throws ApplicationException { if (context == null) @@ -719,9 +726,7 @@ public void handleAction(Object context) throws ApplicationException this.activate = activate; } - /** - * @see de.willuhn.jameica.gui.parts.ContextMenuItem#isEnabledFor(java.lang.Object) - */ + @Override public boolean isEnabledFor(Object o) { if (o == null) diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/Detail.java b/src/de/willuhn/jameica/hbci/passports/rdh/Detail.java index b5cb61ff6..c90b05c04 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/Detail.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/Detail.java @@ -32,9 +32,7 @@ public class Detail extends AbstractView { private final static I18N i18n = Application.getPluginLoader().getPlugin(HBCI.class).getResources().getI18N(); - /** - * @see de.willuhn.jameica.gui.AbstractView#bind() - */ + @Override public void bind() throws Exception { try @@ -72,6 +70,7 @@ public void bind() throws Exception ButtonArea buttons = new ButtonArea(); buttons.addButton(i18n.tr("Passwort ändern"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.changePassword(); @@ -79,6 +78,7 @@ public void handleAction(Object context) throws ApplicationException },null,false,"stock_keyring.png"); buttons.addButton(i18n.tr("INI-Brief anzeigen/erzeugen"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.startIniLetter(); @@ -98,6 +98,7 @@ public void handleAction(Object context) throws ApplicationException ButtonArea buttons = new ButtonArea(); buttons.addButton(i18n.tr("BPD/UPD"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleDisplayProperties(); @@ -105,6 +106,7 @@ public void handleAction(Object context) throws ApplicationException },null,false,"document-properties.png"); buttons.addButton(i18n.tr("Synchronisieren"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleSync(); @@ -112,6 +114,7 @@ public void handleAction(Object context) throws ApplicationException },null,false,"view-refresh.png"); buttons.addButton(i18n.tr("Konfiguration testen"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleTest(); @@ -119,6 +122,7 @@ public void handleAction(Object context) throws ApplicationException },null,false,"dialog-information.png"); buttons.addButton(i18n.tr("Speichern"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.handleStore(); @@ -153,9 +157,7 @@ else if (ae != null) } } - /** - * @see de.willuhn.jameica.gui.AbstractView#canBookmark() - */ + @Override public boolean canBookmark() { return false; diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/InsertKeyDialog.java b/src/de/willuhn/jameica/hbci/passports/rdh/InsertKeyDialog.java index 660b9e320..88d91d812 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/InsertKeyDialog.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/InsertKeyDialog.java @@ -35,9 +35,7 @@ public InsertKeyDialog(File f) setTitle(i18n.tr("Schlüsseldatei/USB-Stick einlegen")); } - /** - * @see de.willuhn.jameica.gui.dialogs.WaitDialog#check() - */ + @Override protected boolean check() { if (file.exists() && file.canRead() && file.canWrite()) @@ -56,17 +54,13 @@ protected boolean check() return false; } - /** - * @see de.willuhn.jameica.gui.dialogs.WaitDialog#getData() - */ + @Override protected Object getData() throws Exception { return Boolean.valueOf(file.exists() && file.canRead() && file.canWrite()); } - /** - * @see de.willuhn.jameica.gui.dialogs.WaitDialog#getText() - */ + @Override public String getText() { return i18n.tr("Die Schlüsseldatei wurde nicht gefunden.\n" + diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/KeyFormatDialog.java b/src/de/willuhn/jameica/hbci/passports/rdh/KeyFormatDialog.java index ae519d19a..2de3ce1b3 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/KeyFormatDialog.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/KeyFormatDialog.java @@ -59,9 +59,7 @@ public KeyFormatDialog(int position, int feature) setSize(WINDOW_WIDTH,WINDOW_HEIGHT); } - /** - * @see de.willuhn.jameica.gui.dialogs.AbstractDialog#paint(org.eclipse.swt.widgets.Composite) - */ + @Override protected void paint(Composite parent) throws Exception { this.warn = new LabelInput(""); @@ -69,6 +67,7 @@ protected void paint(Composite parent) throws Exception this.warn.setColor(Color.ERROR); final Action action = new Action() { + @Override public void handleAction(Object context) throws ApplicationException { Object o = table.getSelection(); @@ -100,6 +99,7 @@ public void handleAction(Object context) throws ApplicationException ButtonArea buttons = new ButtonArea(); buttons.addButton(i18n.tr("Übernehmen"), action,null,false,"ok.png"); buttons.addButton(i18n.tr("Abbrechen"), new Action() { + @Override public void handleAction(Object context) throws ApplicationException { throw new OperationCanceledException("cancelled in key format dialog"); @@ -111,9 +111,7 @@ public void handleAction(Object context) throws ApplicationException getShell().setMinimumSize(getShell().computeSize(WINDOW_WIDTH,WINDOW_HEIGHT)); } - /** - * @see de.willuhn.jameica.gui.dialogs.AbstractDialog#getData() - */ + @Override protected Object getData() throws Exception { return this.choosen; diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/KeyPasswordLoadDialog.java b/src/de/willuhn/jameica/hbci/passports/rdh/KeyPasswordLoadDialog.java index df1609dae..5d9614005 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/KeyPasswordLoadDialog.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/KeyPasswordLoadDialog.java @@ -104,15 +104,14 @@ public KeyPasswordLoadDialog(HBCIPassport passport, String password) setLabelText(i18n.tr("Ihr Passwort")); } - /** - * @see de.willuhn.jameica.gui.dialogs.PasswordDialog#extend(de.willuhn.jameica.gui.util.Container) - */ + @Override protected void extend(Container container) throws Exception { if (this.filename == null) return; Part p = new Part() { + @Override public void paint(Composite parent) throws RemoteException { String text = i18n.tr("Schlüsseldatei: {0}",filename); @@ -134,9 +133,7 @@ public void controlResized(ControlEvent e) container.addPart(p); } - /** - * @see de.willuhn.jameica.gui.dialogs.PasswordDialog#checkPassword(java.lang.String) - */ + @Override protected boolean checkPassword(String password) { if (password == null || password.length() == 0) diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/KeyPasswordSaveDialog.java b/src/de/willuhn/jameica/hbci/passports/rdh/KeyPasswordSaveDialog.java index 2bf1af0c8..e7e535127 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/KeyPasswordSaveDialog.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/KeyPasswordSaveDialog.java @@ -60,9 +60,6 @@ public KeyPasswordSaveDialog(int position, HBCIPassport passport) setText(text + "\n"); } - /** - * @see de.willuhn.jameica.gui.dialogs.NewPasswordDialog#checkPassword(java.lang.String, java.lang.String) - */ @Override protected boolean checkPassword(String password, String password2) { diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/KontoList.java b/src/de/willuhn/jameica/hbci/passports/rdh/KontoList.java index 1b6ea7b46..0cb4ba407 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/KontoList.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/KontoList.java @@ -49,9 +49,7 @@ public KontoList(RDHKey key) throws RemoteException this.myKey = key; } - /** - * @see de.willuhn.jameica.gui.parts.TablePart#paint(org.eclipse.swt.widgets.Composite) - */ + @Override public synchronized void paint(Composite parent) throws RemoteException { // Erst das Parent zeichnen, damit wir anschliessend die diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/SelectKeyDialog.java b/src/de/willuhn/jameica/hbci/passports/rdh/SelectKeyDialog.java index 3216f1125..09ecda381 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/SelectKeyDialog.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/SelectKeyDialog.java @@ -59,15 +59,14 @@ public SelectKeyDialog(int position) this.setTitle(i18n.tr("Schlüsselauswahl")); } - /** - * @see de.willuhn.jameica.gui.dialogs.AbstractDialog#paint(org.eclipse.swt.widgets.Composite) - */ + @Override protected void paint(Composite parent) throws Exception { Container container = new SimpleContainer(parent); container.addText(i18n.tr("Bitte wählen Sie den zu verwendenden Schlüssel aus"),true); final Button apply = new Button(i18n.tr("Übernehmen"), new Action() { + @Override public void handleAction(Object context) throws ApplicationException { new Apply().handleAction(table.getSelection()); @@ -84,12 +83,14 @@ public void handleAction(Object context) throws ApplicationException } this.table = new TablePart(l, new Action() { + @Override public void handleAction(Object context) throws ApplicationException { new Apply().handleAction(context); } }); table.setFormatter(new TableFormatter() { + @Override public void format(TableItem item) { if (item == null || item.getData() == null) @@ -108,6 +109,7 @@ public void format(TableItem item) }); table.addSelectionListener(new Listener() { + @Override public void handleEvent(Event event) { apply.setEnabled(table.getSelection() != null); @@ -123,6 +125,7 @@ public void handleEvent(Event event) ButtonArea buttons = new ButtonArea(); buttons.addButton(apply); buttons.addButton(i18n.tr("Abbrechen"), new Action() { + @Override public void handleAction(Object context) throws ApplicationException { throw new OperationCanceledException(); @@ -136,9 +139,7 @@ public void handleAction(Object context) throws ApplicationException */ private class Apply implements Action { - /** - * @see de.willuhn.jameica.gui.Action#handleAction(java.lang.Object) - */ + @Override public void handleAction(Object context) throws ApplicationException { if (context == null || !(context instanceof KeyObject)) @@ -165,9 +166,7 @@ public void handleAction(Object context) throws ApplicationException } } - /** - * @see de.willuhn.jameica.gui.dialogs.AbstractDialog#getData() - */ + @Override protected Object getData() throws Exception { return selected; @@ -183,9 +182,7 @@ private KeyObject(RDHKey key) this.key = key; } - /** - * @see de.willuhn.datasource.GenericObject#getAttribute(java.lang.String) - */ + @Override public Object getAttribute(String attribute) throws RemoteException { if ("filename".equals(attribute)) @@ -195,33 +192,25 @@ public Object getAttribute(String attribute) throws RemoteException return null; } - /** - * @see de.willuhn.datasource.GenericObject#getAttributeNames() - */ + @Override public String[] getAttributeNames() throws RemoteException { return new String[] {"filename","alias"}; } - /** - * @see de.willuhn.datasource.GenericObject#getID() - */ + @Override public String getID() throws RemoteException { return key.getFilename(); } - /** - * @see de.willuhn.datasource.GenericObject#getPrimaryAttribute() - */ + @Override public String getPrimaryAttribute() throws RemoteException { return "filename"; } - /** - * @see de.willuhn.datasource.GenericObject#equals(de.willuhn.datasource.GenericObject) - */ + @Override public boolean equals(GenericObject arg0) throws RemoteException { if (arg0 == null) diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/SelectSizEntryDialog.java b/src/de/willuhn/jameica/hbci/passports/rdh/SelectSizEntryDialog.java index dc6f32327..2cba57466 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/SelectSizEntryDialog.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/SelectSizEntryDialog.java @@ -51,9 +51,7 @@ public SelectSizEntryDialog(int position, String data) setTitle(i18n.tr("Schlüsselauswahl")); } - /** - * @see de.willuhn.jameica.gui.dialogs.AbstractDialog#paint(org.eclipse.swt.widgets.Composite) - */ + @Override protected void paint(Composite parent) throws Exception { Container group = new SimpleContainer(parent); @@ -69,6 +67,7 @@ protected void paint(Composite parent) throws Exception } final TablePart table = new TablePart(list, new Action() { + @Override public void handleAction(Object context) throws ApplicationException { if (context == null || !(context instanceof Entry)) @@ -86,6 +85,7 @@ public void handleAction(Object context) throws ApplicationException ButtonArea buttons = new ButtonArea(); buttons.addButton(i18n.tr("Übernehmen"), new Action() { + @Override public void handleAction(Object context) throws ApplicationException { Object o = table.getSelection(); @@ -98,6 +98,7 @@ public void handleAction(Object context) throws ApplicationException } },null,false,"ok.png"); buttons.addButton(i18n.tr("Abbrechen"), new Action() { + @Override public void handleAction(Object context) throws ApplicationException { throw new OperationCanceledException(); @@ -106,9 +107,7 @@ public void handleAction(Object context) throws ApplicationException buttons.paint(parent); } - /** - * @see de.willuhn.jameica.gui.dialogs.AbstractDialog#getData() - */ + @Override protected Object getData() throws Exception { return selected.getId(); diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/View.java b/src/de/willuhn/jameica/hbci/passports/rdh/View.java index bd6d68c42..fd75d57e6 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/View.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/View.java @@ -27,9 +27,7 @@ public class View extends AbstractView { private final static I18N i18n = Application.getPluginLoader().getPlugin(HBCI.class).getResources().getI18N(); - /** - * @see de.willuhn.jameica.gui.AbstractView#bind() - */ + @Override public void bind() throws Exception { GUI.getView().setTitle(i18n.tr("Schlüsseldateien")); @@ -44,6 +42,7 @@ public void bind() throws Exception ButtonArea buttons = new ButtonArea(); buttons.addButton(i18n.tr("Schlüssel importieren..."),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.startImport(); @@ -51,6 +50,7 @@ public void handleAction(Object context) throws ApplicationException },null,false,"document-open.png"); buttons.addButton(i18n.tr("Neuen Schlüssel (INI-Brief) erstellen"),new Action() { + @Override public void handleAction(Object context) throws ApplicationException { control.startCreate(); diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/AbstractKeyFormat.java b/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/AbstractKeyFormat.java index 3e1ac5a31..0fa095c7b 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/AbstractKeyFormat.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/AbstractKeyFormat.java @@ -15,18 +15,12 @@ */ public abstract class AbstractKeyFormat implements KeyFormat { - /** - * @see java.lang.Comparable#compareTo(java.lang.Object) - */ @Override public int compareTo(KeyFormat o) { return Integer.compare(this.getOrder(),o.getOrder()); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.KeyFormat#getOrder() - */ @Override public int getOrder() { diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/AbstractSizRdhFormat.java b/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/AbstractSizRdhFormat.java index 98818be0e..41bba7c70 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/AbstractSizRdhFormat.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/AbstractSizRdhFormat.java @@ -33,17 +33,13 @@ public abstract class AbstractSizRdhFormat extends AbstractKeyFormat { protected static I18N i18n = Application.getPluginLoader().getPlugin(HBCI.class).getResources().getI18N(); - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.KeyFormat#createKey(java.io.File) - */ + @Override public RDHKey createKey(File file) throws ApplicationException, OperationCanceledException { throw new ApplicationException(i18n.tr("Das Erstellen von neuen Schlüsseln wird für dieses Format nicht unterstützt")); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.KeyFormat#hasFeature(int) - */ + @Override public boolean hasFeature(int feature) { switch (feature) diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/HBCI4JavaFormat.java b/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/HBCI4JavaFormat.java index 6bd365059..d5dc44ca0 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/HBCI4JavaFormat.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/HBCI4JavaFormat.java @@ -46,17 +46,13 @@ public class HBCI4JavaFormat extends AbstractKeyFormat { protected static I18N i18n = Application.getPluginLoader().getPlugin(HBCI.class).getResources().getI18N(); - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.KeyFormat#getName() - */ + @Override public String getName() { return i18n.tr("HBCI4Java/Hibiscus-Format"); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.KeyFormat#hasFeature(int) - */ + @Override public boolean hasFeature(int feature) { switch (feature) @@ -70,9 +66,7 @@ public boolean hasFeature(int feature) return false; } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.KeyFormat#importKey(java.io.File) - */ + @Override public RDHKey importKey(File file) throws ApplicationException, OperationCanceledException { // Checken, ob die Datei lesbar ist. @@ -96,9 +90,7 @@ public RDHKey importKey(File file) throws ApplicationException, OperationCancele } } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.KeyFormat#createKey(java.io.File) - */ + @Override public RDHKey createKey(File file) throws ApplicationException, OperationCanceledException { HBCIHandler handler = null; @@ -182,9 +174,7 @@ public RDHKey createKey(File file) throws ApplicationException, OperationCancele } } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.KeyFormat#load(de.willuhn.jameica.hbci.passports.rdh.rmi.RDHKey) - */ + @Override public HBCIPassport load(RDHKey key) throws ApplicationException, OperationCanceledException { return load(key,false); diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/RAH10Format.java b/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/RAH10Format.java index 6f250f2d8..ce2bfd938 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/RAH10Format.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/RAH10Format.java @@ -15,26 +15,18 @@ */ public class RAH10Format extends HBCI4JavaFormat { - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.HBCI4JavaFormat#getName() - */ + @Override public String getName() { return i18n.tr("RAH10-Format (experimentell - derzeit ungetestet)"); } - /** - * Liefert den Passport-Typ gemaess HBCI4Java. - * @return Passport-Typ. - */ + @Override String getPassportType() { return "RAH10"; } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.AbstractKeyFormat#getOrder() - */ @Override public int getOrder() { diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/RDH2Format.java b/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/RDH2Format.java index 4636d19c4..5de64fbc4 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/RDH2Format.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/RDH2Format.java @@ -24,17 +24,13 @@ public class RDH2Format extends HBCI4JavaFormat { private static I18N i18n = Application.getPluginLoader().getPlugin(HBCI.class).getResources().getI18N(); - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.KeyFormat#getName() - */ + @Override public String getName() { return i18n.tr("RDH-Format (StarMoney, ProfiCash, VR-NetWorld, Sfirm)"); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.KeyFormat#hasFeature(int) - */ + @Override public boolean hasFeature(int feature) { switch (feature) @@ -49,9 +45,7 @@ public boolean hasFeature(int feature) } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.HBCI4JavaFormat#getPassportType() - */ + @Override String getPassportType() { return "RDHXFile"; diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/SizRdhDirectFormat.java b/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/SizRdhDirectFormat.java index fe01d777e..09f9edbd9 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/SizRdhDirectFormat.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/SizRdhDirectFormat.java @@ -35,17 +35,13 @@ */ public class SizRdhDirectFormat extends AbstractSizRdhFormat { - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.KeyFormat#getName() - */ + @Override public String getName() { return i18n.tr("SizRDH-Format, parallele Nutzung"); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.KeyFormat#importKey(java.io.File) - */ + @Override public RDHKey importKey(File file) throws ApplicationException, OperationCanceledException { // Checken, ob die Datei lesbar ist. @@ -69,9 +65,7 @@ public RDHKey importKey(File file) throws ApplicationException, OperationCancele } } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.KeyFormat#load(de.willuhn.jameica.hbci.passports.rdh.rmi.RDHKey) - */ + @Override public HBCIPassport load(RDHKey key) throws ApplicationException, OperationCanceledException { HBCICallback callback = null; diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/SizRdhFormat.java b/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/SizRdhFormat.java index aaca90f33..54ce48fc7 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/SizRdhFormat.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/keyformat/SizRdhFormat.java @@ -41,17 +41,13 @@ */ public class SizRdhFormat extends AbstractSizRdhFormat { - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.KeyFormat#getName() - */ + @Override public String getName() { return i18n.tr("SizRDH-Format, Import und Konvertierung in Hibiscus-Format"); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.KeyFormat#importKey(java.io.File) - */ + @Override public RDHKey importKey(File file) throws ApplicationException, OperationCanceledException { // Checken, ob die Datei lesbar ist. @@ -160,9 +156,7 @@ public RDHKey importKey(File file) throws ApplicationException, OperationCancele } } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.keyformat.KeyFormat#load(de.willuhn.jameica.hbci.passports.rdh.rmi.RDHKey) - */ + @Override public HBCIPassport load(RDHKey key) throws ApplicationException, OperationCanceledException { // Hihi - nach dem Import ist das ja dann unser Format ;) diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/server/PassportHandleImpl.java b/src/de/willuhn/jameica/hbci/passports/rdh/server/PassportHandleImpl.java index 50f520e1c..c932198a7 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/server/PassportHandleImpl.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/server/PassportHandleImpl.java @@ -79,9 +79,7 @@ public PassportHandleImpl() throws RemoteException super(); } - /** - * @see de.willuhn.jameica.hbci.passport.PassportHandle#open() - */ + @Override public HBCIHandler open() throws RemoteException, ApplicationException { if (isOpen()) @@ -156,9 +154,7 @@ public HBCIHandler open() throws RemoteException, ApplicationException } } - /** - * @see de.willuhn.jameica.hbci.passport.PassportHandle#close() - */ + @Override public void close() throws RemoteException { if (hbciPassport == null && handler == null) @@ -206,17 +202,13 @@ private void handleCode3072() } } - /** - * @see de.willuhn.jameica.hbci.passport.PassportHandle#isOpen() - */ + @Override public boolean isOpen() throws RemoteException { return handler != null && hbciPassport != null; } - /** - * @see de.willuhn.jameica.hbci.passport.PassportHandle#getKonten() - */ + @Override public Konto[] getKonten() throws RemoteException, ApplicationException { Logger.info("reading accounts from rdh passport"); @@ -248,9 +240,7 @@ public Konto[] getKonten() throws RemoteException, ApplicationException } } - /** - * @see de.willuhn.jameica.hbci.passport.PassportHandle#callback(org.kapott.hbci.passport.HBCIPassport, int, java.lang.String, int, java.lang.StringBuffer) - */ + @Override public boolean callback(HBCIPassport p, int reason, String msg, int datatype, StringBuffer retData) throws Exception { switch (reason) diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/server/PassportImpl.java b/src/de/willuhn/jameica/hbci/passports/rdh/server/PassportImpl.java index ddeb1e007..a711b91bc 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/server/PassportImpl.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/server/PassportImpl.java @@ -43,26 +43,20 @@ public PassportImpl() throws RemoteException super(); } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#getName() - */ + @Override public String getName() throws RemoteException { return i18n.tr("Schlüsseldatei"); } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#getInfo() - */ + @Override public String getInfo() throws RemoteException { GenericIterator i = RDHKeyFactory.getKeys(); return i18n.tr("vorhandene Schlüsseldateien: {0}",Integer.toString(i.size())); } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#getConfigurations() - */ + @Override public List getConfigurations() throws RemoteException { GenericIterator i = RDHKeyFactory.getKeys(); @@ -72,25 +66,19 @@ public List getConfigurations() throws RemoteException return configs; } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#getHandle() - */ + @Override public PassportHandle getHandle() throws RemoteException { return new PassportHandleImpl(this); } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#getConfigDialog() - */ + @Override public Class getConfigDialog() throws RemoteException { return View.class; } - /** - * @see de.willuhn.jameica.hbci.passport.Passport#init(de.willuhn.jameica.hbci.rmi.Konto) - */ + @Override public void init(Konto konto) throws RemoteException { this.konto = konto; diff --git a/src/de/willuhn/jameica/hbci/passports/rdh/server/RDHKeyImpl.java b/src/de/willuhn/jameica/hbci/passports/rdh/server/RDHKeyImpl.java index 296d923af..53e4adc97 100644 --- a/src/de/willuhn/jameica/hbci/passports/rdh/server/RDHKeyImpl.java +++ b/src/de/willuhn/jameica/hbci/passports/rdh/server/RDHKeyImpl.java @@ -52,9 +52,7 @@ public RDHKeyImpl(File file) throws RemoteException this.file = file; } - /** - * @see de.willuhn.datasource.GenericObject#getAttribute(java.lang.String) - */ + @Override public Object getAttribute(String attribute) throws RemoteException { if ("file".equals(attribute)) @@ -68,9 +66,7 @@ public Object getAttribute(String attribute) throws RemoteException return null; } - /** - * @see de.willuhn.jameica.hbci.passport.Configuration#getDescription() - */ + @Override public String getDescription() { try @@ -87,49 +83,37 @@ public String getDescription() } } - /** - * @see de.willuhn.jameica.hbci.passport.Configuration#getConfigDialog() - */ + @Override public Class getConfigDialog() throws RemoteException { return Detail.class; } - /** - * @see de.willuhn.jameica.hbci.passport.Configuration#delete() - */ + @Override public void delete() throws ApplicationException { RDHKeyFactory.removeKey(this); } - /** - * @see de.willuhn.datasource.GenericObject#getAttributeNames() - */ + @Override public String[] getAttributeNames() throws RemoteException { return new String[] {"file","enabled","hbciversion","alias","shared"}; } - /** - * @see de.willuhn.datasource.GenericObject#getID() - */ + @Override public String getID() throws RemoteException { return getFilename(); } - /** - * @see de.willuhn.datasource.GenericObject#getPrimaryAttribute() - */ + @Override public String getPrimaryAttribute() throws RemoteException { return "file"; } - /** - * @see de.willuhn.datasource.GenericObject#equals(de.willuhn.datasource.GenericObject) - */ + @Override public boolean equals(GenericObject other) throws RemoteException { if (other == null) @@ -137,73 +121,55 @@ public boolean equals(GenericObject other) throws RemoteException return getID().equals(other.getID()); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.rmi.RDHKey#getFilename() - */ + @Override public String getFilename() throws RemoteException { return file.getAbsolutePath(); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.rmi.RDHKey#getHBCIVersion() - */ + @Override public String getHBCIVersion() throws RemoteException { return settings.getString(getID() + ".hbciversion",null); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.rmi.RDHKey#setHBCIVersion(java.lang.String) - */ + @Override public void setHBCIVersion(String version) throws RemoteException { settings.setAttribute(getID() + ".hbciversion",version); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.rmi.RDHKey#isEnabled() - */ + @Override public boolean isEnabled() throws RemoteException { return settings.getBoolean(getID() + ".enabled",true); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.rmi.RDHKey#setEnabled(boolean) - */ + @Override public void setEnabled(boolean enabled) throws RemoteException { settings.setAttribute(getID() + ".enabled",enabled); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.rmi.RDHKey#setFilename(java.lang.String) - */ + @Override public void setFilename(String filename) throws RemoteException { this.file = new File(filename); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.rmi.RDHKey#getAlias() - */ + @Override public String getAlias() throws RemoteException { return settings.getString(getID() + ".alias",null); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.rmi.RDHKey#setAlias(java.lang.String) - */ + @Override public void setAlias(String alias) throws RemoteException { settings.setAttribute(getID() + ".alias",alias); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.rmi.RDHKey#getKonten() - */ + @Override public Konto[] getKonten() throws RemoteException { String[] ids = settings.getList(getID() + ".konto",null); @@ -225,9 +191,7 @@ public Konto[] getKonten() throws RemoteException return (Konto[])konten.toArray(new Konto[0]); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.rmi.RDHKey#setKonten(de.willuhn.jameica.hbci.rmi.Konto[]) - */ + @Override public void setKonten(Konto[] k) throws RemoteException { if (k == null || k.length == 0) @@ -244,9 +208,7 @@ public void setKonten(Konto[] k) throws RemoteException settings.setAttribute(getID() + ".konto",ids); } - /** - * @see de.willuhn.jameica.hbci.passports.rdh.rmi.RDHKey#load() - */ + @Override public HBCIPassport load() throws RemoteException, ApplicationException, OperationCanceledException { return getFormat().load(this);