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.

Sign up for GitHub

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

Jump to bottom

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 13 additions & 39 deletions src/de/willuhn/jameica/hbci/server/AbstractBaseDauerauftragImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,25 @@ public AbstractBaseDauerauftragImpl() throws RemoteException
super();
}

/**
* @see de.willuhn.datasource.db.AbstractDBObject#getPrimaryAttribute()
*/
@Override
public String getPrimaryAttribute() throws RemoteException
{
return "zweck";
}

/**
* @see de.willuhn.jameica.hbci.rmi.BaseDauerauftrag#getErsteZahlung()
*/
@Override
public Date getErsteZahlung() throws RemoteException
{
return (Date) getAttribute("erste_zahlung");
}

/**
* @see de.willuhn.jameica.hbci.rmi.BaseDauerauftrag#getLetzteZahlung()
*/
@Override
public Date getLetzteZahlung() throws RemoteException
{
return (Date) getAttribute("letzte_zahlung");
}

/**
* @see de.willuhn.jameica.hbci.rmi.BaseDauerauftrag#getTurnus()
*/
@Override
public Turnus getTurnus() throws RemoteException
{
// Zwischen Dauerauftrag und Turnus existiert kein Constraint.
Expand All @@ -83,33 +75,25 @@ public Turnus getTurnus() throws RemoteException
return t;
}

/**
* @see de.willuhn.jameica.hbci.rmi.BaseDauerauftrag#isActive()
*/
@Override
public boolean isActive() throws RemoteException
{
return getOrderID() != null && getOrderID().length() > 0;
}

/**
* @see de.willuhn.jameica.hbci.rmi.BaseDauerauftrag#setErsteZahlung(java.util.Date)
*/
@Override
public void setErsteZahlung(Date datum) throws RemoteException
{
setAttribute("erste_zahlung",datum);
}

/**
* @see de.willuhn.jameica.hbci.rmi.BaseDauerauftrag#setLetzteZahlung(java.util.Date)
*/
@Override
public void setLetzteZahlung(Date datum) throws RemoteException
{
setAttribute("letzte_zahlung",datum);
}

/**
* @see de.willuhn.jameica.hbci.rmi.BaseDauerauftrag#setTurnus(de.willuhn.jameica.hbci.rmi.Turnus)
*/
@Override
public void setTurnus(Turnus turnus) throws RemoteException
{
if (turnus == null)
Expand All @@ -120,9 +104,7 @@ public void setTurnus(Turnus turnus) throws RemoteException
setAttribute("tag", new Integer(turnus.getTag()));
}

/**
* @see de.willuhn.datasource.db.AbstractDBObject#equals(de.willuhn.datasource.GenericObject)
*/
@Override
public boolean equals(GenericObject o) throws RemoteException
{
if (o == null || !(o instanceof BaseDauerauftrag))
Expand All @@ -149,17 +131,13 @@ public boolean equals(GenericObject o) throws RemoteException
}
}

/**
* @see de.willuhn.jameica.hbci.rmi.BaseDauerauftrag#getOrderID()
*/
@Override
public String getOrderID() throws RemoteException
{
return (String) getAttribute("orderid");
}

/**
* @see de.willuhn.jameica.hbci.rmi.BaseDauerauftrag#setOrderID(java.lang.String)
*/
@Override
public void setOrderID(String id) throws RemoteException
{
setAttribute("orderid",id);
Expand All @@ -168,10 +146,8 @@ public void setOrderID(String id) throws RemoteException
/**
* Ueberschreiben wir, um beim synthetischen Attribut "turnus_id" ein
* Turnus-Objekt liefern zu koennen.
* @see de.willuhn.jameica.hbci.server.AbstractHibiscusTransferImpl#getAttribute(java.lang.String)
*/
/**
*/
@Override
public Object getAttribute(String arg0) throws RemoteException
{
if ("turnus_id".equals(arg0))
Expand All @@ -181,9 +157,7 @@ public Object getAttribute(String arg0) throws RemoteException
return super.getAttribute(arg0);
}

/**
* @see de.willuhn.jameica.hbci.rmi.BaseDauerauftrag#getNaechsteZahlung()
*/
@Override
public Date getNaechsteZahlung() throws RemoteException
{
return TurnusHelper.getNaechsteZahlung(this.getErsteZahlung(),
Expand Down
48 changes: 12 additions & 36 deletions src/de/willuhn/jameica/hbci/server/AbstractBaseUeberweisungImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,13 @@ public AbstractBaseUeberweisungImpl() throws RemoteException {
super();
}

/**
* @see de.willuhn.datasource.GenericObject#getPrimaryAttribute()
*/
@Override
public String getPrimaryAttribute() throws RemoteException {
return "zweck";
}


/**
* @see de.willuhn.jameica.hbci.server.AbstractHibiscusTransferImpl#insertCheck()
*/
@Override
protected void insertCheck() throws ApplicationException
{
try
Expand All @@ -72,9 +68,7 @@ protected void insertCheck() throws ApplicationException
}
}

/**
* @see de.willuhn.datasource.db.AbstractDBObject#updateCheck()
*/
@Override
protected void updateCheck() throws ApplicationException
{
try
Expand All @@ -90,51 +84,39 @@ protected void updateCheck() throws ApplicationException
super.updateCheck();
}

/**
* @see de.willuhn.datasource.db.AbstractDBObject#insert()
*/
@Override
public void insert() throws RemoteException, ApplicationException
{
if (getAttribute("ausgefuehrt") == null) // Status noch nicht definiert
setAttribute("ausgefuehrt",new Integer(0));
super.insert();
}

/**
* @see de.willuhn.jameica.hbci.rmi.Terminable#getTermin()
*/
@Override
public Date getTermin() throws RemoteException {
return (Date) getAttribute("termin");
}

/**
* @see de.willuhn.jameica.hbci.rmi.Terminable#getAusfuehrungsdatum()
*/
@Override
public Date getAusfuehrungsdatum() throws RemoteException
{
return (Date) getAttribute("ausgefuehrt_am");
}

/**
* @see de.willuhn.jameica.hbci.rmi.Terminable#ausgefuehrt()
*/
@Override
public boolean ausgefuehrt() throws RemoteException {
Integer i = (Integer) getAttribute("ausgefuehrt");
if (i == null)
return false;
return i.intValue() == 1;
}

/**
* @see de.willuhn.jameica.hbci.rmi.Terminable#setTermin(java.util.Date)
*/
@Override
public void setTermin(Date termin) throws RemoteException {
setAttribute("termin",termin);
}

/**
* @see de.willuhn.jameica.hbci.rmi.Terminable#ueberfaellig()
*/
@Override
public boolean ueberfaellig() throws RemoteException {
if (ausgefuehrt())
return false;
Expand All @@ -157,9 +139,7 @@ protected boolean markingExecuted()
return this.markingExecuted;
}

/**
* @see de.willuhn.jameica.hbci.rmi.Terminable#setAusgefuehrt(boolean)
*/
@Override
public void setAusgefuehrt(boolean b) throws RemoteException, ApplicationException
{
try
Expand All @@ -176,17 +156,13 @@ public void setAusgefuehrt(boolean b) throws RemoteException, ApplicationExcepti
}
}

/**
* @see de.willuhn.jameica.hbci.rmi.BaseUeberweisung#getTextSchluessel()
*/
@Override
public String getTextSchluessel() throws RemoteException
{
return (String) getAttribute("typ");
}

/**
* @see de.willuhn.jameica.hbci.rmi.BaseUeberweisung#setTextSchluessel(java.lang.String)
*/
@Override
public void setTextSchluessel(String schluessel) throws RemoteException
{
setAttribute("typ",schluessel);
Expand Down
12 changes: 3 additions & 9 deletions src/de/willuhn/jameica/hbci/server/AbstractDBSupportImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ public abstract class AbstractDBSupportImpl implements DBSupport
{
private final static String PREFIX_ENC = "encrypted:";

/**
* @see de.willuhn.jameica.hbci.rmi.DBSupport#execute(java.sql.Connection, java.io.File)
*/
@Override
public void execute(Connection conn, File sqlScript) throws RemoteException
{
if (sqlScript == null)
Expand Down Expand Up @@ -87,19 +85,15 @@ public void execute(Connection conn, File sqlScript) throws RemoteException
}
}

/**
* @see de.willuhn.jameica.hbci.rmi.DBSupport#getTransactionIsolationLevel()
*/
@Override
public int getTransactionIsolationLevel() throws RemoteException
{
return -1;
}

private long lastCheck = 0;

/**
* @see de.willuhn.jameica.hbci.rmi.DBSupport#checkConnection(java.sql.Connection)
*/
@Override
public void checkConnection(Connection conn) throws RemoteException
{
long newCheck = System.currentTimeMillis();
Expand Down
15 changes: 3 additions & 12 deletions src/de/willuhn/jameica/hbci/server/AbstractHibiscusDBObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ public AbstractHibiscusDBObject() throws RemoteException
super();
}

/**
* @see de.willuhn.jameica.hbci.rmi.HibiscusDBObject#getMeta(java.lang.String, java.lang.String)
*/
@Override
public String getMeta(String name, String defaultValue) throws RemoteException
{
if (name == null || name.length() == 0)
Expand All @@ -47,9 +45,7 @@ public String getMeta(String name, String defaultValue) throws RemoteException
return DBPropertyUtil.get(DBPropertyUtil.Prefix.META,this.getTableName(),id,name,defaultValue);
}

/**
* @see de.willuhn.jameica.hbci.rmi.HibiscusDBObject#setMeta(java.lang.String, java.lang.String)
*/
@Override
public void setMeta(String name, String value) throws RemoteException
{
if (name == null || name.length() == 0)
Expand All @@ -62,9 +58,7 @@ public void setMeta(String name, String value) throws RemoteException
DBPropertyUtil.set(DBPropertyUtil.Prefix.META,this.getTableName(),id,name,value);
}

/**
* @see de.willuhn.datasource.db.AbstractDBObject#delete()
*/
@Override
public void delete() throws RemoteException, ApplicationException
{
if (this.isNewObject())
Expand Down Expand Up @@ -95,9 +89,6 @@ public void delete() throws RemoteException, ApplicationException
}
}

/**
* @see de.willuhn.datasource.db.AbstractDBObject#store()
*/
@Override
public void store() throws RemoteException, ApplicationException
{
Expand Down
Loading