Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

override-Annotation ergänzt und Verweiskommentar entfernt in ../passports/ (Teil von #82) #111

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/de/willuhn/jameica/hbci/passport/PassportHandle.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
23 changes: 11 additions & 12 deletions src/de/willuhn/jameica/hbci/passports/ddv/Controller.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand All @@ -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"));

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -633,6 +631,7 @@ public void handleChangeBankData()
return;

Application.getController().start(new BackgroundTask() {
@Override
public void run(ProgressMonitor monitor) throws ApplicationException
{
HBCIPassportChipcard passport = null;
Expand Down Expand Up @@ -706,7 +705,9 @@ public void run(ProgressMonitor monitor) throws ApplicationException
}
}

@Override
public boolean isInterrupted(){return false;}
@Override
public void interrupt(){}
});
}
Expand All @@ -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 {
Expand Down
12 changes: 3 additions & 9 deletions src/de/willuhn/jameica/hbci/passports/ddv/DDVConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
13 changes: 7 additions & 6 deletions src/de/willuhn/jameica/hbci/passports/ddv/Detail.java
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down Expand Up @@ -76,34 +74,39 @@ 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();
}
},null,false,"document-properties.png");
buttonArea.addButton(i18n.tr("Synchronisieren"),new Action()
{
@Override
public void handleAction(Object context) throws ApplicationException
{
control.handleSync();
}
},null,false,"view-refresh.png");
buttonArea.addButton(i18n.tr("Konfiguration testen"), new Action()
{
@Override
public void handleAction(Object context) throws ApplicationException
{
control.handleTest();
}
},null,false,"dialog-information.png");
buttonArea.addButton(i18n.tr("Bankdaten �ndern"), new Action()
{
@Override
public void handleAction(Object context) throws ApplicationException
{
control.handleChangeBankData();
}
},null,false,"system-users.png");
buttonArea.addButton(i18n.tr("Speichern"),new Action()
{
@Override
public void handleAction(Object context) throws ApplicationException
{
control.handleStore();
Expand All @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/de/willuhn/jameica/hbci/passports/ddv/KontoList.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/de/willuhn/jameica/hbci/passports/ddv/View.java
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand All @@ -45,13 +43,15 @@ 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();
}
},null,false,"system-search.png");
buttons.addButton(i18n.tr("Kartenleser manuell anlegen"),new Action()
{
@Override
public void handleAction(Object context) throws ApplicationException
{
control.handleCreate();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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();
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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;
Expand Down
Loading