From 1e708bfbf1071d24c732a1c091010821deffecd8 Mon Sep 17 00:00:00 2001 From: Martin Goik <goik@hdm-stuttgart.de> Date: Sat, 19 Apr 2014 00:50:56 +0200 Subject: [PATCH] Javadoc is much pickier now --- Doc/Makefile | 6 +- ws/eclipse/Company/pom.xml | 4 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- ws/eclipse/HibIntro/pom.xml | 4 +- .../main/java/entity/company1/Employee.java | 2 +- .../main/java/entity/company2/Employee.java | 2 +- .../main/java/entity/company3/Employee.java | 2 +- .../main/java/entity/company4/Employee.java | 2 +- .../java/entity/company5/model/Employee.java | 2 +- .../java/entity/company6/model/Employee.java | 2 +- .../java/entity/company7/model/Employee.java | 2 +- .../java/hibintro/v1/run/RetrieveAll.java | 2 +- .../v1/run/RetrieveAllByCriteria.java | 2 +- .../src/main/java/hibintro/v5/User.java | 7 +- .../src/main/java/hibintro/v7/User.java | 7 +- .../src/main/java/hibintro/v8/User.java | 7 +- .../java/inherit/joined/v1/CreditCard.java | 2 +- .../main/java/inherit/joined/v1/Persist.java | 2 +- .../main/java/inherit/joined/v2/Circle.java | 4 +- .../main/java/inherit/joined/v2/Persist.java | 5 +- .../src/main/java/inherit/v1/CreditCard.java | 2 +- .../src/main/java/inherit/v1/Persist.java | 2 +- .../src/main/java/inherit/v2/CreditCard.java | 2 +- .../src/main/java/inherit/v2/Persist.java | 2 +- .../src/main/java/inherit/v3/Circle.java | 4 +- .../src/main/java/inherit/v3/Persist.java | 7 +- .../HibIntro/src/main/java/session1/User.java | 7 +- .../HibIntro/src/main/java/session2/User.java | 7 +- .../Jdbc/.settings/org.eclipse.jdt.core.prefs | 108 +++++++++++++++++- ws/eclipse/Jdbc/pom.xml | 4 +- .../Jdbc/src/main/java/dom/ArticleOrder.java | 8 +- .../src/main/java/dom/ArticleOrderDriver.java | 4 +- .../Jdbc/src/main/java/dom/CreateDoc.java | 6 +- .../src/main/java/dom/CreateExtended.java | 6 +- .../src/main/java/dom/MySaxErrorHandler.java | 2 +- .../main/java/dom/xpath/CheckExtImage.java | 6 +- .../java/dom/xpath/CheckExtImageDriver.java | 6 +- .../src/main/java/dom/xpath/DomXpath.java | 6 +- .../main/java/dom/xpath/DomXpathDriver.java | 8 +- .../Jdbc/src/main/java/dom/xsl/DbAccess.java | 6 +- .../src/main/java/dom/xsl/DbAccessDriver.java | 2 +- .../Jdbc/src/main/java/dom/xsl/Xml2Html.java | 4 +- .../src/main/java/dom/xsl/Xml2HtmlDriver.java | 2 +- .../src/main/java/dom/xsl/XmlRdbms2Html.java | 4 +- .../java/dom/xsl/XmlRdbms2HtmlDriver.java | 2 +- .../Jdbc/src/main/java/sax/Namespace.java | 12 +- .../Jdbc/src/main/java/sax/ReadAttrib.java | 14 ++- .../Jdbc/src/main/java/sax/Validate.java | 18 +-- .../main/java/sax/context/Catalog2Sql.java | 12 +- .../java/sax/context/Catalog2SqlDriver.java | 1 - .../Jdbc/src/main/java/sax/count/Driver.java | 5 +- .../main/java/sax/htmlcreate/Memo2Html.java | 13 ++- .../src/main/java/sax/mixed/MixedCount.java | 17 ++- .../java/sax/ns/stat/ElementFrequency.java | 15 ++- .../src/main/java/sax/rdbms/RdbmsAccess.java | 11 +- .../src/main/java/sax/rdbms/XmlRdbms.java | 20 ++-- .../main/java/sax/stat/v2/ElementCount.java | 17 ++- .../main/java/sax/stat/v2/MyEventHandler.java | 4 +- .../Jdbc/src/main/java/sax/view/Driver.java | 5 +- .../jdbc/intro/auth/PersistenceHandler.java | 50 ++++---- .../intro/sqlinject/PersistenceHandler.java | 34 +++--- .../sda/jdbc/intro/v1/PersistenceHandler.java | 40 ++++--- .../intro/v1/prepare/PersistenceHandler.java | 39 ++++--- .../src/main/java/solve/dom/Article2Html.java | 13 +-- .../java/solve/dom/Article2HtmlDriver.java | 3 +- .../src/main/java/solve/dom/HtmlTree.java | 12 +- ws/eclipse/Sda1PreExam/pom.xml | 6 +- ws/eclipse/Xmlparse/pom.xml | 4 +- 68 files changed, 394 insertions(+), 260 deletions(-) diff --git a/Doc/Makefile b/Doc/Makefile index ce0850fff..f955028f5 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -25,9 +25,9 @@ all::${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf jdoc: cd ../ws/eclipse;javadoc \ -classpath ${HIBDEPS}:${JDBCDEPS} -d ${BUILDNAVI}/Ref/api -linksource \ - -link http://docs.oracle.com/javase/7/docs/api -link http://testng.org/javadocs -link http://docs.oracle.com/javaee/6/api \ - -link http://www.jdom.org/docs/apidocs -link http://docs.jboss.org/hibernate/orm/4.1/javadocs \ - `find Jdbc -name \*.java|grep -v \.metadata` `find Hibintro -name \*.java|grep -v \.metadata` + -link http://docs.oracle.com/javase/8/docs/api/ -link http://testng.org/javadocs/ -link http://docs.oracle.com/javaee/6/api/ \ + -link http://www.jdom.org/docs/apidocs/ -link http://docs.jboss.org/hibernate/orm/4.1/javadocs/ \ + `find Jdbc -name \*.java|grep -v \.metadata` `find HibIntro -name \*.java|grep -v \.metadata` ${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf:${SCRIPTBASENAME}.xml lastAnswerId.xml diff --git a/ws/eclipse/Company/pom.xml b/ws/eclipse/Company/pom.xml index 61e62a760..842679e2b 100644 --- a/ws/eclipse/Company/pom.xml +++ b/ws/eclipse/Company/pom.xml @@ -22,8 +22,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.3.2</version> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> </plugins> diff --git a/ws/eclipse/HibIntro/.settings/org.eclipse.jdt.core.prefs b/ws/eclipse/HibIntro/.settings/org.eclipse.jdt.core.prefs index ec4300d5d..714351aec 100644 --- a/ws/eclipse/HibIntro/.settings/org.eclipse.jdt.core.prefs +++ b/ws/eclipse/HibIntro/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/ws/eclipse/HibIntro/pom.xml b/ws/eclipse/HibIntro/pom.xml index c00c4e1de..119143baa 100644 --- a/ws/eclipse/HibIntro/pom.xml +++ b/ws/eclipse/HibIntro/pom.xml @@ -62,8 +62,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.3.2</version> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> </plugins> diff --git a/ws/eclipse/HibIntro/src/main/java/entity/company1/Employee.java b/ws/eclipse/HibIntro/src/main/java/entity/company1/Employee.java index 572119a0b..229f41adb 100644 --- a/ws/eclipse/HibIntro/src/main/java/entity/company1/Employee.java +++ b/ws/eclipse/HibIntro/src/main/java/entity/company1/Employee.java @@ -9,7 +9,7 @@ import javax.persistence.UniqueConstraint; /** * - * {@link Employee} instances related to {@link Department} + * Representing employees * */ @Entity diff --git a/ws/eclipse/HibIntro/src/main/java/entity/company2/Employee.java b/ws/eclipse/HibIntro/src/main/java/entity/company2/Employee.java index 2233ddf43..a2d849672 100644 --- a/ws/eclipse/HibIntro/src/main/java/entity/company2/Employee.java +++ b/ws/eclipse/HibIntro/src/main/java/entity/company2/Employee.java @@ -10,7 +10,7 @@ import javax.persistence.UniqueConstraint; /** * - * {@link Employee} instances related to {@link Department} + * {@link Employee} instances * */ @Entity diff --git a/ws/eclipse/HibIntro/src/main/java/entity/company3/Employee.java b/ws/eclipse/HibIntro/src/main/java/entity/company3/Employee.java index c7bd76914..8fe60dbdf 100644 --- a/ws/eclipse/HibIntro/src/main/java/entity/company3/Employee.java +++ b/ws/eclipse/HibIntro/src/main/java/entity/company3/Employee.java @@ -10,7 +10,7 @@ import javax.persistence.UniqueConstraint; /** * - * {@link Employee} instances related to {@link Department} + * {@link Employee} instances * */ @Entity diff --git a/ws/eclipse/HibIntro/src/main/java/entity/company4/Employee.java b/ws/eclipse/HibIntro/src/main/java/entity/company4/Employee.java index 208d8537e..525c93176 100644 --- a/ws/eclipse/HibIntro/src/main/java/entity/company4/Employee.java +++ b/ws/eclipse/HibIntro/src/main/java/entity/company4/Employee.java @@ -10,7 +10,7 @@ import javax.persistence.UniqueConstraint; /** * - * {@link Employee} instances related to {@link Department} + * {@link Employee} instances * */ @Entity diff --git a/ws/eclipse/HibIntro/src/main/java/entity/company5/model/Employee.java b/ws/eclipse/HibIntro/src/main/java/entity/company5/model/Employee.java index 4d0744658..5778c0d04 100644 --- a/ws/eclipse/HibIntro/src/main/java/entity/company5/model/Employee.java +++ b/ws/eclipse/HibIntro/src/main/java/entity/company5/model/Employee.java @@ -11,7 +11,7 @@ import javax.persistence.UniqueConstraint; /** * - * {@link Employee} instances related to {@link Department} + * {@link Employee} instances * */ @Entity diff --git a/ws/eclipse/HibIntro/src/main/java/entity/company6/model/Employee.java b/ws/eclipse/HibIntro/src/main/java/entity/company6/model/Employee.java index b4ef6c0b7..38eb94a33 100644 --- a/ws/eclipse/HibIntro/src/main/java/entity/company6/model/Employee.java +++ b/ws/eclipse/HibIntro/src/main/java/entity/company6/model/Employee.java @@ -11,7 +11,7 @@ import javax.persistence.UniqueConstraint; /** * - * {@link Employee} instances related to {@link Department} + * {@link Employee} instances. * */ @Entity diff --git a/ws/eclipse/HibIntro/src/main/java/entity/company7/model/Employee.java b/ws/eclipse/HibIntro/src/main/java/entity/company7/model/Employee.java index 92270b9a5..ef7aefd54 100644 --- a/ws/eclipse/HibIntro/src/main/java/entity/company7/model/Employee.java +++ b/ws/eclipse/HibIntro/src/main/java/entity/company7/model/Employee.java @@ -14,7 +14,7 @@ import javax.persistence.UniqueConstraint; /** * - * {@link Employee} instances related to {@link Department} + * {@link Employee} instances * */ @Entity diff --git a/ws/eclipse/HibIntro/src/main/java/hibintro/v1/run/RetrieveAll.java b/ws/eclipse/HibIntro/src/main/java/hibintro/v1/run/RetrieveAll.java index e103b59ee..b211a573b 100644 --- a/ws/eclipse/HibIntro/src/main/java/hibintro/v1/run/RetrieveAll.java +++ b/ws/eclipse/HibIntro/src/main/java/hibintro/v1/run/RetrieveAll.java @@ -25,7 +25,7 @@ public class RetrieveAll { * Retrieving users containing the letter <code>r</code> in * {@link User#getCname()}. * - * @param args + * @param args unused */ public static void main(String[] args) { final Session session = HibernateUtil.createSessionFactory("hibernate.cfg.xml").openSession(); diff --git a/ws/eclipse/HibIntro/src/main/java/hibintro/v1/run/RetrieveAllByCriteria.java b/ws/eclipse/HibIntro/src/main/java/hibintro/v1/run/RetrieveAllByCriteria.java index f5b07823a..43a36a873 100644 --- a/ws/eclipse/HibIntro/src/main/java/hibintro/v1/run/RetrieveAllByCriteria.java +++ b/ws/eclipse/HibIntro/src/main/java/hibintro/v1/run/RetrieveAllByCriteria.java @@ -25,7 +25,7 @@ public class RetrieveAllByCriteria { * Retrieving users containing the letter <code>r</code> in * {@link User#getCname()}. * - * @param args + * @param args unused */ public static void main(String[] args) { final Session session = HibernateUtil.createSessionFactory("hibernate.cfg.xml").openSession(); diff --git a/ws/eclipse/HibIntro/src/main/java/hibintro/v5/User.java b/ws/eclipse/HibIntro/src/main/java/hibintro/v5/User.java index d437d3b7b..849d298b4 100644 --- a/ws/eclipse/HibIntro/src/main/java/hibintro/v5/User.java +++ b/ws/eclipse/HibIntro/src/main/java/hibintro/v5/User.java @@ -69,10 +69,9 @@ public class User { } /** - * @param uid - * See {@link #getUid()}. - * @param cname - * See {@link #getCname()}. + * @param uidNumber See {@link #getUidNumber()}. + * @param uid See {@link #getUid()}. + * @param cname See {@link #getCname()}. */ public User(int uidNumber, String uid, String cname) { setUidNumber(uidNumber); diff --git a/ws/eclipse/HibIntro/src/main/java/hibintro/v7/User.java b/ws/eclipse/HibIntro/src/main/java/hibintro/v7/User.java index 51b94a6bc..0b1836802 100644 --- a/ws/eclipse/HibIntro/src/main/java/hibintro/v7/User.java +++ b/ws/eclipse/HibIntro/src/main/java/hibintro/v7/User.java @@ -74,10 +74,9 @@ public class User { } /** - * @param uid - * See {@link #getUid()}. - * @param cname - * See {@link #getCname()}. + * @param uidNumber See {@link #getUidNumber()}. + * @param uid See {@link #getUid()}. + * @param cname See {@link #getCname()}. */ public User(int uidNumber, String uid, String cname) { setUidNumber(uidNumber); diff --git a/ws/eclipse/HibIntro/src/main/java/hibintro/v8/User.java b/ws/eclipse/HibIntro/src/main/java/hibintro/v8/User.java index ae0f87e0b..2d7d94f29 100644 --- a/ws/eclipse/HibIntro/src/main/java/hibintro/v8/User.java +++ b/ws/eclipse/HibIntro/src/main/java/hibintro/v8/User.java @@ -66,10 +66,9 @@ public class User { } /** - * @param uid - * See {@link #getUid()}. - * @param cname - * See {@link #getCname()}. + * @param uidNumber See {@link #getUidNumber()}. + * @param uid See {@link #getUid()}. + * @param cname See {@link #getCname()}. */ public User(int uidNumber, String uid, String cname) { setUidNumber(uidNumber); diff --git a/ws/eclipse/HibIntro/src/main/java/inherit/joined/v1/CreditCard.java b/ws/eclipse/HibIntro/src/main/java/inherit/joined/v1/CreditCard.java index 29a222eeb..da37f2354 100644 --- a/ws/eclipse/HibIntro/src/main/java/inherit/joined/v1/CreditCard.java +++ b/ws/eclipse/HibIntro/src/main/java/inherit/joined/v1/CreditCard.java @@ -28,7 +28,7 @@ public class CreditCard extends BillingDetails { * Convenience method on top of {@link #setExpiration(Date)} * * @param expiration Expiration date provided as "MM/dd/yy" - * @throws ParseException + * @throws ParseException Expiration may be ill-defined */ public void setExpiration(String expiration) throws ParseException { setExpiration(new SimpleDateFormat("MM/dd/yy").parse(expiration));} diff --git a/ws/eclipse/HibIntro/src/main/java/inherit/joined/v1/Persist.java b/ws/eclipse/HibIntro/src/main/java/inherit/joined/v1/Persist.java index 8db5d2c1b..e84d14862 100644 --- a/ws/eclipse/HibIntro/src/main/java/inherit/joined/v1/Persist.java +++ b/ws/eclipse/HibIntro/src/main/java/inherit/joined/v1/Persist.java @@ -17,7 +17,7 @@ public class Persist { /** * @param args not used. - * @throws ParseException + * @throws ParseException Expiration may be mis-spelled */ public static void main(String[] args) throws ParseException { final Session session = HibernateUtil.createSessionFactory("inherit/joined/v1/hibernate.cfg.xml").openSession(); diff --git a/ws/eclipse/HibIntro/src/main/java/inherit/joined/v2/Circle.java b/ws/eclipse/HibIntro/src/main/java/inherit/joined/v2/Circle.java index f1c66ca4d..8911c0a1e 100644 --- a/ws/eclipse/HibIntro/src/main/java/inherit/joined/v2/Circle.java +++ b/ws/eclipse/HibIntro/src/main/java/inherit/joined/v2/Circle.java @@ -1,7 +1,5 @@ package inherit.joined.v2; -import java.text.ParseException; - import javax.persistence.Entity; import javax.persistence.PrimaryKeyJoinColumn; @@ -23,7 +21,7 @@ public class Circle extends Figure { public Circle(){super();} - public Circle(final double xCoord, final double yCoord, final double radius) throws ParseException { + public Circle(final double xCoord, final double yCoord, final double radius) { super(xCoord, yCoord); setRadius(radius); } diff --git a/ws/eclipse/HibIntro/src/main/java/inherit/joined/v2/Persist.java b/ws/eclipse/HibIntro/src/main/java/inherit/joined/v2/Persist.java index a74f23ccb..7f65655f8 100644 --- a/ws/eclipse/HibIntro/src/main/java/inherit/joined/v2/Persist.java +++ b/ws/eclipse/HibIntro/src/main/java/inherit/joined/v2/Persist.java @@ -2,8 +2,6 @@ package inherit.joined.v2; import hibintro.util.HibernateUtil; -import java.text.ParseException; - import org.hibernate.Session; import org.hibernate.Transaction; @@ -17,9 +15,8 @@ public class Persist { /** * @param args not used. - * @throws ParseException */ - public static void main(String[] args) throws ParseException { + public static void main(String[] args) { final Session session = HibernateUtil.createSessionFactory("inherit/joined/v2/hibernate.cfg.xml").openSession(); final Transaction transaction = session.beginTransaction(); diff --git a/ws/eclipse/HibIntro/src/main/java/inherit/v1/CreditCard.java b/ws/eclipse/HibIntro/src/main/java/inherit/v1/CreditCard.java index f10689899..268931f82 100644 --- a/ws/eclipse/HibIntro/src/main/java/inherit/v1/CreditCard.java +++ b/ws/eclipse/HibIntro/src/main/java/inherit/v1/CreditCard.java @@ -25,7 +25,7 @@ public class CreditCard extends BillingDetails { * Convenience method on top of {@link #setExpiration(Date)} * * @param expiration Expiration date provided as "MM/dd/yy" - * @throws ParseException + * @throws ParseException Date string may be misspelled. */ public void setExpiration(String expiration) throws ParseException { setExpiration(new SimpleDateFormat("MM/dd/yy").parse(expiration));} diff --git a/ws/eclipse/HibIntro/src/main/java/inherit/v1/Persist.java b/ws/eclipse/HibIntro/src/main/java/inherit/v1/Persist.java index fd953b3b0..5b55e8511 100644 --- a/ws/eclipse/HibIntro/src/main/java/inherit/v1/Persist.java +++ b/ws/eclipse/HibIntro/src/main/java/inherit/v1/Persist.java @@ -17,7 +17,7 @@ public class Persist { /** * @param args not used. - * @throws ParseException + * @throws ParseException Credit card expiration may be mis-spelled. */ public static void main(String[] args) throws ParseException { final Session session = HibernateUtil.createSessionFactory("inherit/v1/hibernate.cfg.xml").openSession(); diff --git a/ws/eclipse/HibIntro/src/main/java/inherit/v2/CreditCard.java b/ws/eclipse/HibIntro/src/main/java/inherit/v2/CreditCard.java index 405d7a536..de330096d 100644 --- a/ws/eclipse/HibIntro/src/main/java/inherit/v2/CreditCard.java +++ b/ws/eclipse/HibIntro/src/main/java/inherit/v2/CreditCard.java @@ -25,7 +25,7 @@ public class CreditCard extends BillingDetails { * Convenience method on top of {@link #setExpiration(Date)} * * @param expiration Expiration date provided as "MM/dd/yy" - * @throws ParseException + * @throws ParseException Expiration may be mis-spelled. */ public void setExpiration(String expiration) throws ParseException { setExpiration(new SimpleDateFormat("MM/dd/yy").parse(expiration));} diff --git a/ws/eclipse/HibIntro/src/main/java/inherit/v2/Persist.java b/ws/eclipse/HibIntro/src/main/java/inherit/v2/Persist.java index 732d0d332..9f67cd016 100644 --- a/ws/eclipse/HibIntro/src/main/java/inherit/v2/Persist.java +++ b/ws/eclipse/HibIntro/src/main/java/inherit/v2/Persist.java @@ -17,7 +17,7 @@ public class Persist { /** * @param args not used. - * @throws ParseException + * @throws ParseException Expiration may be mis-spelled. */ public static void main(String[] args) throws ParseException { final Session session = HibernateUtil.createSessionFactory("inherit/v2/hibernate.cfg.xml").openSession(); diff --git a/ws/eclipse/HibIntro/src/main/java/inherit/v3/Circle.java b/ws/eclipse/HibIntro/src/main/java/inherit/v3/Circle.java index ac7ff7c00..4c6f009b3 100644 --- a/ws/eclipse/HibIntro/src/main/java/inherit/v3/Circle.java +++ b/ws/eclipse/HibIntro/src/main/java/inherit/v3/Circle.java @@ -1,7 +1,5 @@ package inherit.v3; -import java.text.ParseException; - import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; import javax.persistence.Transient; @@ -28,7 +26,7 @@ public class Circle extends Figure { } public Circle(){super();} - public Circle(final double xCoord, final double yCoord, final double radius) throws ParseException { + public Circle(final double xCoord, final double yCoord, final double radius) { super(xCoord, yCoord); setRadius(radius); } diff --git a/ws/eclipse/HibIntro/src/main/java/inherit/v3/Persist.java b/ws/eclipse/HibIntro/src/main/java/inherit/v3/Persist.java index cf0aad85c..0ce90db28 100644 --- a/ws/eclipse/HibIntro/src/main/java/inherit/v3/Persist.java +++ b/ws/eclipse/HibIntro/src/main/java/inherit/v3/Persist.java @@ -2,24 +2,21 @@ package inherit.v3; import hibintro.util.HibernateUtil; -import java.text.ParseException; - import org.hibernate.Session; import org.hibernate.Transaction; /** * @author goik * - * Persisting a simple instance of {@link Figure} + * Persisting simple instances of {@link Figure} * */ public class Persist { /** * @param args not used. - * @throws ParseException */ - public static void main(String[] args) throws ParseException { + public static void main(String[] args) { final Session session = HibernateUtil.createSessionFactory("inherit/v3/hibernate.cfg.xml").openSession(); final Transaction transaction = session.beginTransaction(); diff --git a/ws/eclipse/HibIntro/src/main/java/session1/User.java b/ws/eclipse/HibIntro/src/main/java/session1/User.java index 040c65dfd..a0c140e97 100644 --- a/ws/eclipse/HibIntro/src/main/java/session1/User.java +++ b/ws/eclipse/HibIntro/src/main/java/session1/User.java @@ -52,10 +52,9 @@ public class User { public User() {} /** - * @param uid - * See {@link #getUid()}. - * @param cname - * See {@link #getCname()}. + * @param uidNumber See {@link #getUidNumber()}. + * @param uid See {@link #getUid()}. + * @param cname See {@link #getCname()}. */ public User(int uidNumber, String uid, String cname) { setUidNumber(uidNumber); diff --git a/ws/eclipse/HibIntro/src/main/java/session2/User.java b/ws/eclipse/HibIntro/src/main/java/session2/User.java index 453b2a8e9..d5046299d 100644 --- a/ws/eclipse/HibIntro/src/main/java/session2/User.java +++ b/ws/eclipse/HibIntro/src/main/java/session2/User.java @@ -52,10 +52,9 @@ public class User { public User() {} /** - * @param uid - * See {@link #getUid()}. - * @param cname - * See {@link #getCname()}. + * @param uidNumber See {@link #getUidNumber()}. + * @param uid See {@link #getUid()}. + * @param cname See {@link #getCname()}. */ public User(int uidNumber, String uid, String cname) { setUidNumber(uidNumber); diff --git a/ws/eclipse/Jdbc/.settings/org.eclipse.jdt.core.prefs b/ws/eclipse/Jdbc/.settings/org.eclipse.jdt.core.prefs index 62492222a..3d41aaa59 100644 --- a/ws/eclipse/Jdbc/.settings/org.eclipse.jdt.core.prefs +++ b/ws/eclipse/Jdbc/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,114 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/ws/eclipse/Jdbc/pom.xml b/ws/eclipse/Jdbc/pom.xml index 9c80918cd..f24da6ed2 100644 --- a/ws/eclipse/Jdbc/pom.xml +++ b/ws/eclipse/Jdbc/pom.xml @@ -22,8 +22,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.3.2</version> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> </plugins> diff --git a/ws/eclipse/Jdbc/src/main/java/dom/ArticleOrder.java b/ws/eclipse/Jdbc/src/main/java/dom/ArticleOrder.java index 04dd28575..ff761bd3b 100644 --- a/ws/eclipse/Jdbc/src/main/java/dom/ArticleOrder.java +++ b/ws/eclipse/Jdbc/src/main/java/dom/ArticleOrder.java @@ -24,11 +24,11 @@ public class ArticleOrder { builder.setErrorHandler(new MySaxErrorHandler(System.out)); } - /** Descending a catalog till its <item> elements. For each product + /** Descending a catalog till its <item> elements. For each product * its name and order number are being written to the output. - * @param filename - * @throws JDOMException - * @throws IOException + * @param filename . + * @throws JDOMException General parsing fault + * @throws IOException file access problem */ public void process(final String filename) throws JDOMException, IOException { diff --git a/ws/eclipse/Jdbc/src/main/java/dom/ArticleOrderDriver.java b/ws/eclipse/Jdbc/src/main/java/dom/ArticleOrderDriver.java index 652c7b1bb..f2d55a915 100644 --- a/ws/eclipse/Jdbc/src/main/java/dom/ArticleOrderDriver.java +++ b/ws/eclipse/Jdbc/src/main/java/dom/ArticleOrderDriver.java @@ -6,8 +6,8 @@ package dom; */ public class ArticleOrderDriver { /** - * @param argv Unused cmd argset - * @throws Exception + * @param argv Unused command arguments + * @throws Exception File access problem or corrupt content. */ public static void main(String[] argv) throws Exception { final ArticleOrder ao = new ArticleOrder(); diff --git a/ws/eclipse/Jdbc/src/main/java/dom/CreateDoc.java b/ws/eclipse/Jdbc/src/main/java/dom/CreateDoc.java index 7b52c4e03..bb33e2766 100644 --- a/ws/eclipse/Jdbc/src/main/java/dom/CreateDoc.java +++ b/ws/eclipse/Jdbc/src/main/java/dom/CreateDoc.java @@ -15,10 +15,10 @@ import org.jdom2.output.XMLOutputter; */ public class CreateDoc { /** - * @param args - * @throws IOException + * @param argv Unused cmd argset + * @throws IOException File acces problem or corrupt content. */ - public static void main(String[] args) throws IOException { + public static void main(String[] argv) throws IOException { // Create the root element final Element titel = new Element("titel"); diff --git a/ws/eclipse/Jdbc/src/main/java/dom/CreateExtended.java b/ws/eclipse/Jdbc/src/main/java/dom/CreateExtended.java index d534c5da1..ccd7febee 100644 --- a/ws/eclipse/Jdbc/src/main/java/dom/CreateExtended.java +++ b/ws/eclipse/Jdbc/src/main/java/dom/CreateExtended.java @@ -14,10 +14,10 @@ import org.jdom2.output.XMLOutputter; */ public class CreateExtended { /** - * @param args - * @throws IOException + * @param argv Unused cmd argset + * @throws IOException File acces problem or corrupt content. */ - public static void main(String[] args) throws IOException { + public static void main(String[] argv) throws IOException { final Element titel = new Element("titel"), tLong = new Element("long"), diff --git a/ws/eclipse/Jdbc/src/main/java/dom/MySaxErrorHandler.java b/ws/eclipse/Jdbc/src/main/java/dom/MySaxErrorHandler.java index b6f6ea869..e9b64e5a0 100644 --- a/ws/eclipse/Jdbc/src/main/java/dom/MySaxErrorHandler.java +++ b/ws/eclipse/Jdbc/src/main/java/dom/MySaxErrorHandler.java @@ -24,7 +24,7 @@ public class MySaxErrorHandler implements ErrorHandler { } /** - * @param out + * @param out Report's destination */ public MySaxErrorHandler(final PrintStream out) { this.out = out; diff --git a/ws/eclipse/Jdbc/src/main/java/dom/xpath/CheckExtImage.java b/ws/eclipse/Jdbc/src/main/java/dom/xpath/CheckExtImage.java index bbd439a8d..6168a511d 100644 --- a/ws/eclipse/Jdbc/src/main/java/dom/xpath/CheckExtImage.java +++ b/ws/eclipse/Jdbc/src/main/java/dom/xpath/CheckExtImage.java @@ -13,7 +13,7 @@ import org.jdom2.xpath.XPathFactory; import dom.MySaxErrorHandler; /** - * How to use XPath expressions to search for <img> + * How to use XPath expressions to search for <img> * elements in XHTML document instances. * * @author goik @@ -32,8 +32,8 @@ public class CheckExtImage { * Read an XHTML document and search for images. The image filenames will be * written to standard out. * @param xhtmlFilename The XHTML's filename to be examined. - * @throws JDOMException - * @throws IOException + * @throws JDOMException General parsing fault + * @throws IOException file access problem */ public void process(final String xhtmlFilename) throws JDOMException, IOException { diff --git a/ws/eclipse/Jdbc/src/main/java/dom/xpath/CheckExtImageDriver.java b/ws/eclipse/Jdbc/src/main/java/dom/xpath/CheckExtImageDriver.java index 293ee4ea8..dbcf3deb9 100644 --- a/ws/eclipse/Jdbc/src/main/java/dom/xpath/CheckExtImageDriver.java +++ b/ws/eclipse/Jdbc/src/main/java/dom/xpath/CheckExtImageDriver.java @@ -7,10 +7,10 @@ package dom.xpath; public class CheckExtImageDriver { /** - * @param args - * @throws Exception + * @param argv Unused cmd argset + * @throws Exception File acces problem or corrupt content. */ - public static void main(String[] args) throws Exception { + public static void main(String[] argv) throws Exception { final CheckExtImage ao = new CheckExtImage(); ao.process("Input/Dom/fileextref.html"); } diff --git a/ws/eclipse/Jdbc/src/main/java/dom/xpath/DomXpath.java b/ws/eclipse/Jdbc/src/main/java/dom/xpath/DomXpath.java index b7ec5a352..3b919e7e1 100644 --- a/ws/eclipse/Jdbc/src/main/java/dom/xpath/DomXpath.java +++ b/ws/eclipse/Jdbc/src/main/java/dom/xpath/DomXpath.java @@ -13,7 +13,7 @@ import org.jdom2.xpath.XPathFactory; import dom.MySaxErrorHandler; /** - * How to use XPath expressions to search for <img> + * How to use XPath expressions to search for <img> * elements in XHTML document instances. * * @author goik @@ -31,8 +31,8 @@ public class DomXpath { * Read an XHTML document and search for images. The image filenames will be * written to standard out. * @param xhtmlFilename The XHTML's filename to be examined. - * @throws JDOMException - * @throws IOException + * @throws JDOMException General parsing fault + * @throws IOException file access problem */ public void process(final String xhtmlFilename) throws JDOMException, IOException { diff --git a/ws/eclipse/Jdbc/src/main/java/dom/xpath/DomXpathDriver.java b/ws/eclipse/Jdbc/src/main/java/dom/xpath/DomXpathDriver.java index 8f0e4aea8..71dc70125 100644 --- a/ws/eclipse/Jdbc/src/main/java/dom/xpath/DomXpathDriver.java +++ b/ws/eclipse/Jdbc/src/main/java/dom/xpath/DomXpathDriver.java @@ -1,17 +1,17 @@ package dom.xpath; /** - * Driver to test XPath based searching of <img> elements + * Driver to test XPath based searching of <img> elements * within a given HTML document. * */ public class DomXpathDriver { /** - * @param args - * @throws Exception + * @param argv Unused command arguments + * @throws Exception File access problem or corrupt content. */ - public static void main(String[] args) throws Exception { + public static void main(String[] argv) throws Exception { final DomXpath ao = new DomXpath(); // The following HTML document is being searched // for <img> elements. diff --git a/ws/eclipse/Jdbc/src/main/java/dom/xsl/DbAccess.java b/ws/eclipse/Jdbc/src/main/java/dom/xsl/DbAccess.java index 29a65ca42..fa185a5a3 100644 --- a/ws/eclipse/Jdbc/src/main/java/dom/xsl/DbAccess.java +++ b/ws/eclipse/Jdbc/src/main/java/dom/xsl/DbAccess.java @@ -10,9 +10,9 @@ import java.sql.*; public class DbAccess { /** Open a connection to a RDBMS. - * @param jdbcUrl - * @param userName - * @param password + * @param jdbcUrl The database server's address + * @param userName The user's name + * @param password The user's password */ public void connect(final String jdbcUrl, final String userName, final String password) { diff --git a/ws/eclipse/Jdbc/src/main/java/dom/xsl/DbAccessDriver.java b/ws/eclipse/Jdbc/src/main/java/dom/xsl/DbAccessDriver.java index 3849cec9f..4556c4ae5 100644 --- a/ws/eclipse/Jdbc/src/main/java/dom/xsl/DbAccessDriver.java +++ b/ws/eclipse/Jdbc/src/main/java/dom/xsl/DbAccessDriver.java @@ -6,7 +6,7 @@ package dom.xsl; public class DbAccessDriver { /** - * @param args + * @param args Unused command arguments */ public static void main(String[] args) { final DbAccess dbaccess = new DbAccess(); diff --git a/ws/eclipse/Jdbc/src/main/java/dom/xsl/Xml2Html.java b/ws/eclipse/Jdbc/src/main/java/dom/xsl/Xml2Html.java index 4bc37efe0..3b13bc9a2 100644 --- a/ws/eclipse/Jdbc/src/main/java/dom/xsl/Xml2Html.java +++ b/ws/eclipse/Jdbc/src/main/java/dom/xsl/Xml2Html.java @@ -29,7 +29,7 @@ public class Xml2Html { * @param xslFilename the stylesheet being used for subsequent * transformations by {@link #transform(String, String)}. * - * @throws XSLTransformException + * @throws XSLTransformException XSL script may be ill-defined */ public Xml2Html(final String xslFilename) throws XSLTransformException { builder.setErrorHandler(new MySaxErrorHandler(System.err)); @@ -41,7 +41,7 @@ public class Xml2Html { * @param xmlInFilename input file to be transformed * @param resultFilename the result file holding the generated HTML document * @throws JDOMException The transformation may fail for various reasons. - * @throws IOException + * @throws IOException File access problem or corrupt content. */ public void transform(final String xmlInFilename, final String resultFilename) throws JDOMException, IOException { diff --git a/ws/eclipse/Jdbc/src/main/java/dom/xsl/Xml2HtmlDriver.java b/ws/eclipse/Jdbc/src/main/java/dom/xsl/Xml2HtmlDriver.java index 382e0f002..9de3ada07 100644 --- a/ws/eclipse/Jdbc/src/main/java/dom/xsl/Xml2HtmlDriver.java +++ b/ws/eclipse/Jdbc/src/main/java/dom/xsl/Xml2HtmlDriver.java @@ -8,7 +8,7 @@ package dom.xsl; */ public class Xml2HtmlDriver { /** - * @param args + * @param args Unused */ public static void main(String[] args) { final String diff --git a/ws/eclipse/Jdbc/src/main/java/dom/xsl/XmlRdbms2Html.java b/ws/eclipse/Jdbc/src/main/java/dom/xsl/XmlRdbms2Html.java index 3972fe4db..9bf8c236a 100644 --- a/ws/eclipse/Jdbc/src/main/java/dom/xsl/XmlRdbms2Html.java +++ b/ws/eclipse/Jdbc/src/main/java/dom/xsl/XmlRdbms2Html.java @@ -37,7 +37,7 @@ public class XmlRdbms2Html { * @param xslFilename the stylesheet being used for subsequent * transformations by {@link #transform(String, String)}. * - * @throws XSLTransformException + * @throws XSLTransformException XSL script may be ill-defined */ public XmlRdbms2Html(final String xslFilename) throws XSLTransformException { builder.setErrorHandler(new MySaxErrorHandler(System.err)); @@ -51,7 +51,7 @@ public class XmlRdbms2Html { * @param xmlInFilename input file to be transformed * @param resultFilename the result file holding the generated HTML document * @throws JDOMException The transformation may fail for various reasons. - * @throws IOException + * @throws IOException Access problem or invalid content */ public void transform(final String xmlInFilename, final String resultFilename) throws JDOMException, IOException { diff --git a/ws/eclipse/Jdbc/src/main/java/dom/xsl/XmlRdbms2HtmlDriver.java b/ws/eclipse/Jdbc/src/main/java/dom/xsl/XmlRdbms2HtmlDriver.java index d44ce7f7c..c1c300ef5 100644 --- a/ws/eclipse/Jdbc/src/main/java/dom/xsl/XmlRdbms2HtmlDriver.java +++ b/ws/eclipse/Jdbc/src/main/java/dom/xsl/XmlRdbms2HtmlDriver.java @@ -2,7 +2,7 @@ package dom.xsl; /** Driver */ public class XmlRdbms2HtmlDriver { - /** @param args */ + /** @param args unused */ public static void main(String[] args) { final String inFilename = "Input/Dom/climbing.xml", xslFilename = "Input/Dom/catalog2html.xsl", htmlOutputFilename = "Input/Dom/climbingprice.html"; diff --git a/ws/eclipse/Jdbc/src/main/java/sax/Namespace.java b/ws/eclipse/Jdbc/src/main/java/sax/Namespace.java index 123d6ad0c..67d578261 100644 --- a/ws/eclipse/Jdbc/src/main/java/sax/Namespace.java +++ b/ws/eclipse/Jdbc/src/main/java/sax/Namespace.java @@ -1,7 +1,9 @@ package sax; import java.io.IOException; + import javax.xml.parsers.*; + import org.xml.sax.*; import sax.stat.v2.MyErrorHandler; @@ -17,8 +19,8 @@ public class Namespace { val.parse("Input/Sax/trans.xsl"); } /** Set up parser with namespace awareness - * @throws SAXException - * @throws ParserConfigurationException + * @throws SAXException Parsing may fail. + * @throws ParserConfigurationException Unable to instantiate parser. */ public Namespace() throws SAXException, ParserConfigurationException{ @@ -33,9 +35,9 @@ public class Namespace { xmlReader.setErrorHandler(errorHandler); } /** Parse a given document - * @param uri - * @throws IOException - * @throws SAXException + * @param uri The resource to be parsed + * @throws IOException Access related problems + * @throws SAXException Parsing may fail */ public void parse(final String uri) throws IOException, SAXException{ diff --git a/ws/eclipse/Jdbc/src/main/java/sax/ReadAttrib.java b/ws/eclipse/Jdbc/src/main/java/sax/ReadAttrib.java index 06e8294bb..d919c4786 100644 --- a/ws/eclipse/Jdbc/src/main/java/sax/ReadAttrib.java +++ b/ws/eclipse/Jdbc/src/main/java/sax/ReadAttrib.java @@ -15,14 +15,15 @@ import sax.stat.v2.MyErrorHandler; public class ReadAttrib { /** @param argv unused - * @throws Exception */ + * @throws Exception Access problem or invalid content */ public static void main(String argv[]) throws Exception{ final ReadAttrib rAtt = new ReadAttrib(); rAtt.parse("Input/Sax/catalog.xml"); } /** Set up parser and error handler - * @throws SAXException - * @throws ParserConfigurationException */ + * @throws SAXException Parsing may fail. + * @throws ParserConfigurationException Unable to instantiate parser. + */ public ReadAttrib() throws SAXException, ParserConfigurationException{ final SAXParserFactory saxPf = SAXParserFactory.newInstance(); @@ -32,9 +33,10 @@ public class ReadAttrib { xmlReader.setErrorHandler(errorHandler); } /** Initiate parsing - * @param uri - * @throws IOException - * @throws SAXException */ + * @param uri The resource to be parsed + * @throws IOException Access related problems + * @throws SAXException Parsing may fail + */ public void parse(final String uri) throws IOException, SAXException{ xmlReader.parse(uri); diff --git a/ws/eclipse/Jdbc/src/main/java/sax/Validate.java b/ws/eclipse/Jdbc/src/main/java/sax/Validate.java index 63d93129a..5aa7598cf 100644 --- a/ws/eclipse/Jdbc/src/main/java/sax/Validate.java +++ b/ws/eclipse/Jdbc/src/main/java/sax/Validate.java @@ -15,15 +15,18 @@ import sax.stat.v2.MyEventHandler; /** A validating SAX parser */ public class Validate { - /** @param argv - * @throws Exception */ + /** + * @param argv Unused command arguments + * @throws Exception File access problem or corrupt content. + */ public static void main(String argv[]) throws Exception{ final Validate val = new Validate(); val.parse("Input/Sax/catvalid.xml"); } /** Set up validation - * @throws SAXException - * @throws ParserConfigurationException */ + * @throws SAXException Parsing may fail. + * @throws ParserConfigurationException Unable to instantiate parser. + */ public Validate() throws SAXException, ParserConfigurationException{ final SAXParserFactory saxPf = SAXParserFactory.newInstance(); @@ -35,9 +38,10 @@ public class Validate { xmlReader.setErrorHandler(errorHandler); } /** Initiate parsing - * @param uri - * @throws IOException - * @throws SAXException */ + * @param uri The resource to be parsed + * @throws IOException Access related problems + * @throws SAXException Parsing may fail + */ public void parse(final String uri) throws IOException, SAXException{ xmlReader.parse(uri); diff --git a/ws/eclipse/Jdbc/src/main/java/sax/context/Catalog2Sql.java b/ws/eclipse/Jdbc/src/main/java/sax/context/Catalog2Sql.java index 46e251e07..9e6bb174a 100644 --- a/ws/eclipse/Jdbc/src/main/java/sax/context/Catalog2Sql.java +++ b/ws/eclipse/Jdbc/src/main/java/sax/context/Catalog2Sql.java @@ -16,8 +16,9 @@ public class Catalog2Sql { /** Set up a validating parser instance. * - * @throws SAXException - * @throws ParserConfigurationException */ + * @throws SAXException Parsing may fail. + * @throws ParserConfigurationException Unable to instantiate parser. + */ public Catalog2Sql() throws SAXException, ParserConfigurationException { @@ -29,9 +30,10 @@ public class Catalog2Sql { xmlReader.setErrorHandler(new MySaxErrorHandler(System.out)); } /** Initiate parsing - * @param uri - * @throws IOException - * @throws SAXException */ + * @param uri The resource to be parsed + * @throws IOException file access problem + * @throws SAXException Parsing may fail. + */ public void parse(final String uri) throws IOException, SAXException{ xmlReader.parse(uri); diff --git a/ws/eclipse/Jdbc/src/main/java/sax/context/Catalog2SqlDriver.java b/ws/eclipse/Jdbc/src/main/java/sax/context/Catalog2SqlDriver.java index 824cee237..e751827f4 100644 --- a/ws/eclipse/Jdbc/src/main/java/sax/context/Catalog2SqlDriver.java +++ b/ws/eclipse/Jdbc/src/main/java/sax/context/Catalog2SqlDriver.java @@ -2,7 +2,6 @@ package sax.context; public class Catalog2SqlDriver { - public static void main(String argv[]) throws Exception{ final Catalog2Sql importer = new Catalog2Sql(); importer.parse("src/main/java/sax/context/products.xml"); diff --git a/ws/eclipse/Jdbc/src/main/java/sax/count/Driver.java b/ws/eclipse/Jdbc/src/main/java/sax/count/Driver.java index e09282ff6..4ff49d7e5 100644 --- a/ws/eclipse/Jdbc/src/main/java/sax/count/Driver.java +++ b/ws/eclipse/Jdbc/src/main/java/sax/count/Driver.java @@ -11,9 +11,8 @@ import sax.stat.v2.MyErrorHandler; public class Driver { /** - * @param argv - * unused - * @throws Exception + * @param argv unused + * @throws Exception Exception File access problem or corrupt content. */ public static void main(String argv[]) throws Exception { diff --git a/ws/eclipse/Jdbc/src/main/java/sax/htmlcreate/Memo2Html.java b/ws/eclipse/Jdbc/src/main/java/sax/htmlcreate/Memo2Html.java index b1f8ad80a..f1c87a33d 100644 --- a/ws/eclipse/Jdbc/src/main/java/sax/htmlcreate/Memo2Html.java +++ b/ws/eclipse/Jdbc/src/main/java/sax/htmlcreate/Memo2Html.java @@ -11,8 +11,10 @@ import org.xml.sax.XMLReader; /** Parser, content- and errorhandler assembly */ public class Memo2Html { - /** @throws SAXException - * @throws ParserConfigurationException */ + /** + * @throws SAXException Parsing may fail. + * @throws ParserConfigurationException Unable to instantiate parser. + */ public Memo2Html() throws SAXException, ParserConfigurationException{ final SAXParserFactory saxPf = SAXParserFactory.newInstance(); @@ -22,9 +24,10 @@ public class Memo2Html { xmlReader.setErrorHandler(errorHandler); } /** @see sax.stat.v1.ElementCount - * @param uri - * @throws IOException - * @throws SAXException */ + * @param uri The resource to be parsed + * @throws IOException Access related problems + * @throws SAXException Parsing may fail + */ public void parse(final String uri) throws IOException, SAXException{ xmlReader.parse(uri); diff --git a/ws/eclipse/Jdbc/src/main/java/sax/mixed/MixedCount.java b/ws/eclipse/Jdbc/src/main/java/sax/mixed/MixedCount.java index 07506b583..d8a0abf1a 100644 --- a/ws/eclipse/Jdbc/src/main/java/sax/mixed/MixedCount.java +++ b/ws/eclipse/Jdbc/src/main/java/sax/mixed/MixedCount.java @@ -11,8 +11,10 @@ import org.xml.sax.XMLReader; /** Parser, content- and errorhandler assembly */ public class MixedCount { - /** @throws SAXException - * @throws ParserConfigurationException */ + /** + * @throws SAXException Parsing may fail. + * @throws ParserConfigurationException Unable to instantiate parser. + */ public MixedCount() throws SAXException, ParserConfigurationException{ final SAXParserFactory saxPf = SAXParserFactory.newInstance(); @@ -22,14 +24,17 @@ public class MixedCount { xmlReader.setErrorHandler(errorHandler); } /** @see sax.stat.v1.ElementCount - * @param uri - * @throws IOException - * @throws SAXException */ + * @param uri The resource to be parsed + * @throws IOException Access related problems + * @throws SAXException Parsing may fail + */ public void parse(final String uri) throws IOException, SAXException{ xmlReader.parse(uri); } - /** @return @see sax.stat.v1.ElementCount#getElementCount() */ + /** + * @return See {@link sax.stat.v1.ElementCount#getElementCount()} + */ public int getElementCount() { return eventHandler.getMixedElementCount(); } diff --git a/ws/eclipse/Jdbc/src/main/java/sax/ns/stat/ElementFrequency.java b/ws/eclipse/Jdbc/src/main/java/sax/ns/stat/ElementFrequency.java index cc77e561a..51fd439f8 100644 --- a/ws/eclipse/Jdbc/src/main/java/sax/ns/stat/ElementFrequency.java +++ b/ws/eclipse/Jdbc/src/main/java/sax/ns/stat/ElementFrequency.java @@ -18,8 +18,9 @@ public class ElementFrequency { /** Set up a validating parser instance. * - * @throws SAXException - * @throws ParserConfigurationException */ + * @throws SAXException Parsing may fail. + * @throws ParserConfigurationException Unable to instantiate parser. + */ public ElementFrequency() throws SAXException, ParserConfigurationException { @@ -40,13 +41,17 @@ public class ElementFrequency { xmlReader.setErrorHandler(new MySaxErrorHandler(System.out)); } /** Initiate parsing - * @param uri - * @throws IOException - * @throws SAXException */ + * @param uri The resource to be parsed + * @throws IOException Access related problems + * @throws SAXException Parsing may fail + */ public void parse(final String uri) throws IOException, SAXException { xmlReader.parse(uri); } + /** + * See {@link FrequencyGatherer#printStatistics()} + */ public void printStatistics () { frequencyGatherer.printStatistics(); } diff --git a/ws/eclipse/Jdbc/src/main/java/sax/rdbms/RdbmsAccess.java b/ws/eclipse/Jdbc/src/main/java/sax/rdbms/RdbmsAccess.java index 0429664b8..5746510dd 100644 --- a/ws/eclipse/Jdbc/src/main/java/sax/rdbms/RdbmsAccess.java +++ b/ws/eclipse/Jdbc/src/main/java/sax/rdbms/RdbmsAccess.java @@ -3,14 +3,15 @@ package sax.rdbms; /** Dummy implementation for testing */ public class RdbmsAccess { /** Open connection to database - * @param host - * @param port - * @param userName - * @param password */ + * @param host The database server's hostname or IP + * @param port The Jdbc service's port number + * @param userName The user's name + * @param password The user's password + */ public void connect(final String host, final int port, final String userName, final String password) {} - /** @param articleNumber + /** @param articleNumber The article's order number * @return Dummy price value */ public String readPrice(final String articleNumber) { return "123.45"; diff --git a/ws/eclipse/Jdbc/src/main/java/sax/rdbms/XmlRdbms.java b/ws/eclipse/Jdbc/src/main/java/sax/rdbms/XmlRdbms.java index 1e0610330..a865eeacc 100644 --- a/ws/eclipse/Jdbc/src/main/java/sax/rdbms/XmlRdbms.java +++ b/ws/eclipse/Jdbc/src/main/java/sax/rdbms/XmlRdbms.java @@ -1,7 +1,9 @@ package sax.rdbms; import java.io.IOException; + import javax.xml.parsers.*; + import org.xml.sax.*; import sax.stat.v2.MyErrorHandler; @@ -14,14 +16,17 @@ public class XmlRdbms { private final MyErrorHandler errorHandler = new MyErrorHandler(); /** @param argv unused - * @throws Exception */ - public static void main(String argv[]) throws Exception{ + * @throws Exception File access problem or corrupt content. + * + */ + public static void main(String argv[]) throws Exception { final XmlRdbms val = new XmlRdbms(); val.parse("Input/Sax/catalog.xml"); } /** Setup for document processing - * @throws SAXException - * @throws ParserConfigurationException */ + * @throws SAXException Parsing may fail. + * @throws ParserConfigurationException Unable to instantiate parser. + * */ public XmlRdbms() throws SAXException, ParserConfigurationException{ final SAXParserFactory saxPf = SAXParserFactory.newInstance(); @@ -31,9 +36,10 @@ public class XmlRdbms { xmlReader.setErrorHandler(errorHandler); } /** Start the conversion - * @param uri - * @throws IOException - * @throws SAXException */ + * @param uri The resource to be parsed + * @throws IOException Access related problems + * @throws SAXException Parsing may fail + */ public void parse(final String uri) throws IOException, SAXException{ xmlReader.parse(uri); diff --git a/ws/eclipse/Jdbc/src/main/java/sax/stat/v2/ElementCount.java b/ws/eclipse/Jdbc/src/main/java/sax/stat/v2/ElementCount.java index 88031ca14..982894a0c 100644 --- a/ws/eclipse/Jdbc/src/main/java/sax/stat/v2/ElementCount.java +++ b/ws/eclipse/Jdbc/src/main/java/sax/stat/v2/ElementCount.java @@ -11,8 +11,10 @@ import org.xml.sax.XMLReader; /** Parser, content- and errorhandler assembly */ public class ElementCount { - /** @throws SAXException - * @throws ParserConfigurationException */ + /** + * @throws SAXException Parsing may fail. + * @throws ParserConfigurationException Unable to instantiate parser. + */ public ElementCount() throws SAXException, ParserConfigurationException{ final SAXParserFactory saxPf = SAXParserFactory.newInstance(); @@ -22,14 +24,17 @@ public class ElementCount { xmlReader.setErrorHandler(errorHandler); } /** @see sax.stat.v1.ElementCount - * @param uri - * @throws IOException - * @throws SAXException */ + * @param uri The resource to be parsed + * @throws IOException Access related problems + * @throws SAXException Parsing may fail + */ public void parse(final String uri) throws IOException, SAXException{ xmlReader.parse(uri); } - /** @return @see sax.stat.v1.ElementCount#getElementCount() */ + /** + * @return See {@link sax.stat.v1.ElementCount#getElementCount()} + */ public int getElementCount() { return eventHandler.getElementCount(); } diff --git a/ws/eclipse/Jdbc/src/main/java/sax/stat/v2/MyEventHandler.java b/ws/eclipse/Jdbc/src/main/java/sax/stat/v2/MyEventHandler.java index 4c9382612..be2f5b74e 100644 --- a/ws/eclipse/Jdbc/src/main/java/sax/stat/v2/MyEventHandler.java +++ b/ws/eclipse/Jdbc/src/main/java/sax/stat/v2/MyEventHandler.java @@ -32,7 +32,9 @@ public class MyEventHandler extends DefaultHandler { System.out.println("Content \"" + new String(ch, start, length) + '"'); } - /** @return @see sax.stat.v1.MyEventHandler#getElementCount() */ + /** + * @return See {@link sax.stat.v1.MyEventHandler#getElementCount()} + * */ public int getElementCount() { return elementCount; } diff --git a/ws/eclipse/Jdbc/src/main/java/sax/view/Driver.java b/ws/eclipse/Jdbc/src/main/java/sax/view/Driver.java index 0fce15d0f..bb7241523 100644 --- a/ws/eclipse/Jdbc/src/main/java/sax/view/Driver.java +++ b/ws/eclipse/Jdbc/src/main/java/sax/view/Driver.java @@ -11,9 +11,8 @@ import sax.stat.v2.MyErrorHandler; public class Driver { /** - * @param argv - * unused - * @throws Exception + * @param argv unused + * @throws Exception Exception File access problem or corrupt content. */ public static void main(String argv[]) throws Exception { diff --git a/ws/eclipse/Jdbc/src/main/java/sda/jdbc/intro/auth/PersistenceHandler.java b/ws/eclipse/Jdbc/src/main/java/sda/jdbc/intro/auth/PersistenceHandler.java index 30148e2ac..de2b0016c 100644 --- a/ws/eclipse/Jdbc/src/main/java/sda/jdbc/intro/auth/PersistenceHandler.java +++ b/ws/eclipse/Jdbc/src/main/java/sda/jdbc/intro/auth/PersistenceHandler.java @@ -10,7 +10,7 @@ import sda.jdbc.intro.v1.DbProps; /** * Handle database communication. There are two - * distinct internal states <q>disconnected</q> and <q>connected</q>, see + * distinct internal states <strong>disconnected</strong> and <strong>connected</strong>, see * {@link #isConnected()}. These two states may be toggled by invoking * {@link #connect()} and {@link #disconnect()} respectively. * @@ -45,11 +45,11 @@ public class PersistenceHandler { * This method needs to be adjusted whenever the SQL string in {@link PrepareUserInsert} * changes. * - * @param name - * @param email - * @param login - * @param password - * @throws SQLException + * @param name User's name e.g. Frank Horton + * @param email User's email adress + * @param login User's login name e.g. horton + * @param password User's password + * @throws SQLException A lot may be wrong here ... */ public void setParameter( final String name, @@ -82,7 +82,7 @@ public class PersistenceHandler { String errorMessage = null; /** - * New instances are in <q>disconnected</q> state. See {@link #isConnected()} + * New instances are in <strong>disconnected</strong> state. See {@link #isConnected()} */ public PersistenceHandler() {/* only present here to supply javadoc comment */} @@ -91,13 +91,13 @@ public class PersistenceHandler { * errors corresponding messages may subsequently be retrieved by calling * {@link #getErrorMessage()}. * - * <dt><b>Precondition:</b></dt> <dd>must be in - * <q>connected</q> state, see {@link #isConnected()}</dd> + * <dl><dt><b>Precondition:</b></dt> <dd>must be in + * <strong>connected</strong> state, see {@link #isConnected()}</dd></dl> * - * @param name - * A person's name - * @param email - * A person's email address + * @param name A person's name e.g. Eve Hunt + * @param email A person's email address + * @param login A person's login name e.g. hunt + * @param password A person's password * * @return true if the current data record has been successfully inserted * into the database server. false in case of error(s). @@ -130,16 +130,18 @@ public class PersistenceHandler { /** * Open a connection to a database server. * - * <dt><b>Precondition:</b><dd> - * <dd>must be in <q>disconnected</q> state, see {@link #isConnected()}</dd> + * <dl> + * <dt><b>Precondition:</b></dt> + * <dd>must be in <strong>disconnected</strong> state, see {@link #isConnected()}</dd> * - * <dt><b>Precondition:</b><dd> + * <dt><b>Precondition:</b></dt> * <dd>The following properties must be set: * <pre>PersistenceHandler.jdbcUrl=jdbc:mysql://localhost:3306/hdm PersistenceHandler.password=XYZ PersistenceHandler.username=foo</pre> * </dd> - * + * </dl> + * * @return true if connecting was successful */ public boolean connect () { @@ -174,8 +176,10 @@ PersistenceHandler.username=foo</pre> * Error messages in case of failure may subsequently be retrieved by * calling {@link #getErrorMessage()}. * - * <dt><b>Precondition:</b></dt> - * <dd>must be in <q>connected</q> state, see {@link #isConnected()}</dd> + * <dl> + * <dt><b>Precondition:</b></dt> + * <dd>must be in <strong>connected</strong> state, see {@link #isConnected()}</dd> + * </dl> * * @return true if disconnecting was successful, false in case error(s) occur. */ @@ -196,7 +200,7 @@ PersistenceHandler.username=foo</pre> } /** - * An instance can either be in <q>connected</q> or <q>disconnected</q> state. The + * An instance can either be in <strong>connected</strong> or <strong>disconnected</strong> state. The * state can be toggled by invoking {@link #connect()} or * {@link #disconnect()} respectively. * @@ -210,8 +214,10 @@ PersistenceHandler.username=foo</pre> * must match the attribute values (login,password) in * the relation Person. * - * <dt><b>Precondition:</b></dt> - * <dd>must be in <q>connected</q> state, see {@link #isConnected()}</dd> + * <dl> + * <dt><b>Precondition:</b></dt> + * <dd>must be in <strong>connected</strong> state, see {@link #isConnected()}</dd> + * </dl> * * @param login The user's login name entered in GUI * @param guiPassword The user's password entered in GUI diff --git a/ws/eclipse/Jdbc/src/main/java/sda/jdbc/intro/sqlinject/PersistenceHandler.java b/ws/eclipse/Jdbc/src/main/java/sda/jdbc/intro/sqlinject/PersistenceHandler.java index cfb15c4b3..be3b16c3e 100644 --- a/ws/eclipse/Jdbc/src/main/java/sda/jdbc/intro/sqlinject/PersistenceHandler.java +++ b/ws/eclipse/Jdbc/src/main/java/sda/jdbc/intro/sqlinject/PersistenceHandler.java @@ -7,7 +7,7 @@ import java.sql.Statement; /** * Handle database communication. There are two - * distinct internal states <q>disconnected</q> and <q>connected</q>, see + * distinct internal states <strong>disconnected</strong> and <strong>connected</strong>, see * {@link #isConnected()}. These two states may be toggled by invoking * {@link #connect()} and {@link #disconnect()} respectively. * @@ -33,7 +33,7 @@ public class PersistenceHandler { String errorMessage = null; /** - * New instances are in <q>disconnected</q> state. See {@link #isConnected()} + * New instances are in <strong>disconnected</strong> state. See {@link #isConnected()} */ public PersistenceHandler() {/* only present here to supply javadoc comment */} @@ -42,13 +42,13 @@ public class PersistenceHandler { * errors corresponding messages may subsequently be retrieved by calling * {@link #getErrorMessage()}. * - * <dt><b>Precondition:</b></dt> <dd>must be in - * <q>connected</q> state, see {@link #isConnected()}</dd> + * <dl> + * <dt><b>Precondition:</b></dt> + * <dd>must be in <strong>connected</strong> state, see {@link #isConnected()}</dd> + * </dl> * - * @param name - * A person's name - * @param email - * A person's email address + * @param name A person's name + * @param email A person's email address * * @return true if the current data record has been successfully inserted * into the database server. false in case of error(s). @@ -79,15 +79,17 @@ public class PersistenceHandler { /** * Open a connection to a database server. * - * <dt><b>Precondition:</b><dd> - * <dd>must be in <q>disconnected</q> state, see {@link #isConnected()}</dd> + * <dl> + * <dt><b>Precondition:</b></dt> + * <dd>must be in <strong>disconnected</strong> state, see {@link #isConnected()}</dd> * - * <dt><b>Precondition:</b><dd> + * <dt><strong>Precondition:</strong></dt> * <dd>The following properties must be set: - * <pre>PersistenceHandler.jdbcUrl=jdbc:mysql://localhost:3306/hdm + * <pre>PersistenceHandler.jdbcUrl=jdbc:mysql://localhost:3306/hdm PersistenceHandler.password=XYZ PersistenceHandler.username=foo</pre> * </dd> + * </dl> * * @return true if connecting was successful */ @@ -122,8 +124,10 @@ PersistenceHandler.username=foo</pre> * Error messages in case of failure may subsequently be retrieved by * calling {@link #getErrorMessage()}. * - * <dt><b>Precondition:</b></dt> - * <dd>must be in <q>connected</q> state, see {@link #isConnected()}</dd> + * <dl> + * <dt><b>Precondition:</b></dt> + * <dd>must be in <strong>connected</strong> state, see {@link #isConnected()}</dd> + * </dl> * * @return true if disconnecting was successful, false in case error(s) occur. */ @@ -151,7 +155,7 @@ PersistenceHandler.username=foo</pre> } /** - * An instance can either be in <q>connected</q> or <q>disconnected</q> state. The + * An instance can either be in <strong>connected</strong> or <strong>disconnected</strong> state. The * state can be toggled by invoking {@link #connect()} or * {@link #disconnect()} respectively. * diff --git a/ws/eclipse/Jdbc/src/main/java/sda/jdbc/intro/v1/PersistenceHandler.java b/ws/eclipse/Jdbc/src/main/java/sda/jdbc/intro/v1/PersistenceHandler.java index 264a1b187..1132ecb14 100644 --- a/ws/eclipse/Jdbc/src/main/java/sda/jdbc/intro/v1/PersistenceHandler.java +++ b/ws/eclipse/Jdbc/src/main/java/sda/jdbc/intro/v1/PersistenceHandler.java @@ -7,7 +7,7 @@ import java.sql.Statement; /** * Handle database communication. There are two - * distinct internal states <q>disconnected</q> and <q>connected</q>, see + * distinct internal states <strong>disconnected</strong> and <strong>connected</strong>, see * {@link #isConnected()}. These two states may be toggled by invoking * {@link #connect()} and {@link #disconnect()} respectively. * @@ -33,7 +33,7 @@ public class PersistenceHandler { String errorMessage = null; /** - * New instances are in <q>disconnected</q> state. See {@link #isConnected()} + * New instances are in <strong>disconnected</strong> state. See {@link #isConnected()} */ public PersistenceHandler() {/* only present here to supply javadoc comment */} @@ -42,13 +42,13 @@ public class PersistenceHandler { * errors corresponding messages may subsequently be retrieved by calling * {@link #getErrorMessage()}. * - * <dt><b>Precondition:</b></dt> <dd>must be in - * <q>connected</q> state, see {@link #isConnected()}</dd> + * <dl> + * <dt><b>Precondition:</b></dt> + * <dd>must be in <strong>connected</strong> state, see {@link #isConnected()}</dd> + * </dl> * - * @param name - * A person's name - * @param email - * A person's email address + * @param name A person's name + * @param email A person's email address * * @return true if the current data record has been successfully inserted * into the database server. false in case of error(s). @@ -79,15 +79,17 @@ public class PersistenceHandler { /** * Open a connection to a database server. * - * <dt><b>Precondition:</b><dd> - * <dd>must be in <q>disconnected</q> state, see {@link #isConnected()}</dd> - * - * <dt><b>Precondition:</b><dd> - * <dd>The following properties must be set: - * <pre>PersistenceHandler.jdbcUrl=jdbc:mysql://localhost:3306/hdm + * <dl> + * <dt><b>Precondition:</b></dt> + * <dd>must be in <strong>disconnected</strong> state, see {@link #isConnected()}</dd> + * + * <dt><b>Precondition:</b></dt> + * <dd>The following properties must be set: + * <pre>PersistenceHandler.jdbcUrl=jdbc:mysql://localhost:3306/hdm PersistenceHandler.password=XYZ PersistenceHandler.username=foo</pre> - * </dd> + * </dd> + * </dl> * * @return true if connecting was successful */ @@ -122,8 +124,10 @@ PersistenceHandler.username=foo</pre> * Error messages in case of failure may subsequently be retrieved by * calling {@link #getErrorMessage()}. * - * <dt><b>Precondition:</b></dt> - * <dd>must be in <q>connected</q> state, see {@link #isConnected()}</dd> + * <dl> + * <dt><b>Precondition:</b></dt> + * <dd>must be in <strong>connected</strong> state, see {@link #isConnected()}</dd> + * </dl> * * @return true if disconnecting was successful, false in case error(s) occur. */ @@ -151,7 +155,7 @@ PersistenceHandler.username=foo</pre> } /** - * An instance can either be in <q>connected</q> or <q>disconnected</q> state. The + * An instance can either be in <strong>connected</strong> or <strong>disconnected</strong> state. The * state can be toggled by invoking {@link #connect()} or * {@link #disconnect()} respectively. * diff --git a/ws/eclipse/Jdbc/src/main/java/sda/jdbc/intro/v1/prepare/PersistenceHandler.java b/ws/eclipse/Jdbc/src/main/java/sda/jdbc/intro/v1/prepare/PersistenceHandler.java index ba43f7e09..fd18ecb53 100644 --- a/ws/eclipse/Jdbc/src/main/java/sda/jdbc/intro/v1/prepare/PersistenceHandler.java +++ b/ws/eclipse/Jdbc/src/main/java/sda/jdbc/intro/v1/prepare/PersistenceHandler.java @@ -9,7 +9,7 @@ import sda.jdbc.intro.v1.DbProps; /** * Handle database communication. There are two - * distinct internal states <q>disconnected</q> and <q>connected</q>, see + * distinct internal states <strong>disconnected</strong> and <strong>connected</strong>, see * {@link #isConnected()}. These two states may be toggled by invoking * {@link #connect()} and {@link #disconnect()} respectively. * @@ -35,7 +35,7 @@ public class PersistenceHandler { String errorMessage = null; /** - * New instances are in <q>disconnected</q> state. See {@link #isConnected()} + * New instances are in <strong>disconnected</strong> state. See {@link #isConnected()} */ public PersistenceHandler() {/* only present here to supply javadoc comment */} @@ -44,13 +44,12 @@ public class PersistenceHandler { * errors corresponding messages may subsequently be retrieved by calling * {@link #getErrorMessage()}. * - * <dt><b>Precondition:</b></dt> <dd>must be in - * <q>connected</q> state, see {@link #isConnected()}</dd> - * - * @param name - * A person's name - * @param email - * A person's email address + * <dl> + * <dt><b>Precondition:</b></dt> + * <dd>must be in <strong>connected</strong> state, see {@link #isConnected()}</dd> + * </dl> + * @param name A person's name + * @param email A person's email address * * @return true if the current data record has been successfully inserted * into the database server. false in case of error(s). @@ -81,15 +80,17 @@ public class PersistenceHandler { /** * Open a connection to a database server. * - * <dt><b>Precondition:</b><dd> - * <dd>must be in <q>disconnected</q> state, see {@link #isConnected()}</dd> + * <dl> + * <dt><b>Precondition:</b></dt> + * <dd>must be in <strong>disconnected</strong> state, see {@link #isConnected()}</dd> * - * <dt><b>Precondition:</b><dd> - * <dd>The following properties must be set: - * <pre>PersistenceHandler.jdbcUrl=jdbc:mysql://localhost:3306/hdm + * <dt><b>Precondition:</b></dt> + * <dd>The following properties must be set: + * <pre>PersistenceHandler.jdbcUrl=jdbc:mysql://localhost:3306/hdm PersistenceHandler.password=XYZ PersistenceHandler.username=foo</pre> - * </dd> + * </dd> + * </dl> * * @return true if connecting was successful */ @@ -124,8 +125,10 @@ PersistenceHandler.username=foo</pre> * Error messages in case of failure may subsequently be retrieved by * calling {@link #getErrorMessage()}. * - * <dt><b>Precondition:</b></dt> - * <dd>must be in <q>connected</q> state, see {@link #isConnected()}</dd> + * <dl> + * <dt><b>Precondition:</b></dt> + * <dd>must be in <strong>connected</strong> state, see {@link #isConnected()}</dd> + * </dl> * * @return true if disconnecting was successful, false in case error(s) occur. */ @@ -153,7 +156,7 @@ PersistenceHandler.username=foo</pre> } /** - * An instance can either be in <q>connected</q> or <q>disconnected</q> state. The + * An instance can either be in <strong>connected</strong> or <strong>disconnected</strong> state. The * state can be toggled by invoking {@link #connect()} or * {@link #disconnect()} respectively. * diff --git a/ws/eclipse/Jdbc/src/main/java/solve/dom/Article2Html.java b/ws/eclipse/Jdbc/src/main/java/solve/dom/Article2Html.java index 13268697d..27da1c459 100644 --- a/ws/eclipse/Jdbc/src/main/java/solve/dom/Article2Html.java +++ b/ws/eclipse/Jdbc/src/main/java/solve/dom/Article2Html.java @@ -4,8 +4,6 @@ import java.io.IOException; import java.io.PrintStream; import java.util.List; -import javax.xml.parsers.ParserConfigurationException; - import org.jdom2.Element; import org.jdom2.JDOMException; import org.jdom2.input.SAXBuilder; @@ -28,11 +26,6 @@ public class Article2Html { * Instances of this class allow to read an XML catalog and delegate the * transformation to HTML to a {@link HtmlTree} object, * see {@link #process(String, PrintStream)}. - * @throws ParserConfigurationException - * @throws ClassCastException - * @throws ClassNotFoundException - * @throws InstantiationException - * @throws IllegalAccessException */ public Article2Html() { @@ -49,8 +42,10 @@ public class Article2Html { * filename of the Xml source. * @param out * The output stream for HTML serialization. - * @throws IOException - * @throws JDOMException */ + * @throws IOException In case filename cannot be opened + * @throws JDOMException Parseing error + * + */ public void process(final String filename, final PrintStream out) throws JDOMException, IOException{ final List<Element> items = builder.build(filename).getRootElement().getChildren(); diff --git a/ws/eclipse/Jdbc/src/main/java/solve/dom/Article2HtmlDriver.java b/ws/eclipse/Jdbc/src/main/java/solve/dom/Article2HtmlDriver.java index 962da198c..37b080c91 100644 --- a/ws/eclipse/Jdbc/src/main/java/solve/dom/Article2HtmlDriver.java +++ b/ws/eclipse/Jdbc/src/main/java/solve/dom/Article2HtmlDriver.java @@ -10,7 +10,8 @@ package solve.dom; */ public class Article2HtmlDriver { /** @param argv unused - * @throws Exception */ + * @throws Exception Inaccessible file or corrupt content + */ public static void main(String[] argv) throws Exception { final Article2Html a2h = new Article2Html(); a2h.process("Input/Sax/catalog.xml", System.out); diff --git a/ws/eclipse/Jdbc/src/main/java/solve/dom/HtmlTree.java b/ws/eclipse/Jdbc/src/main/java/solve/dom/HtmlTree.java index 175683c7e..1ed8ea24b 100644 --- a/ws/eclipse/Jdbc/src/main/java/solve/dom/HtmlTree.java +++ b/ws/eclipse/Jdbc/src/main/java/solve/dom/HtmlTree.java @@ -20,7 +20,7 @@ public class HtmlTree { private Element tableBody; /** - * Create a HTML skeleton (<html><head>...<body> ...</body></head> + * Create a HTML skeleton (<html><head>...<body> ...</body></head> * to be filled in later by calling {@link #appendItem(String, String)}. * * @param titleText @@ -65,10 +65,10 @@ public class HtmlTree { } /** - * Inserting an <item> as a new table row with two <td> elements. + * Inserting an <item> as a new table row with two <td> elements. * - * @param itemName - * @param orderNo + * @param itemName The item's name (e.g. Tennis racket) + * @param orderNo The item's order number */ public void appendItem(final String itemName, final String orderNo) { final Element tr = new Element("tr"); @@ -78,7 +78,7 @@ public class HtmlTree { } /** * Serialize the HTML DOM to a stream - * @param out + * @param out Output destination. */ public void serialize(PrintStream out){ @@ -95,7 +95,7 @@ public class HtmlTree { } } /** - * @return the table's <tbody> element + * @return the table's <tbody> element */ public Element getTable() { return tableBody; diff --git a/ws/eclipse/Sda1PreExam/pom.xml b/ws/eclipse/Sda1PreExam/pom.xml index 9ae2f0dde..4505408e2 100644 --- a/ws/eclipse/Sda1PreExam/pom.xml +++ b/ws/eclipse/Sda1PreExam/pom.xml @@ -10,8 +10,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.1</version> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> </plugins> @@ -51,4 +51,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/ws/eclipse/Xmlparse/pom.xml b/ws/eclipse/Xmlparse/pom.xml index 7e920b5be..c7679ee33 100644 --- a/ws/eclipse/Xmlparse/pom.xml +++ b/ws/eclipse/Xmlparse/pom.xml @@ -40,8 +40,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.3.2</version> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>1.8</source> + <target>1.8</target> <optimize>true</optimize> </configuration> </plugin> -- GitLab