Index: /applications/editors/josm/plugins/public_transport/.settings/org.eclipse.jdt.core.prefs =================================================================== --- /applications/editors/josm/plugins/public_transport/.settings/org.eclipse.jdt.core.prefs (revision 34165) +++ /applications/editors/josm/plugins/public_transport/.settings/org.eclipse.jdt.core.prefs (revision 34166) @@ -14,4 +14,5 @@ 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 @@ -37,4 +38,9 @@ org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning @@ -43,4 +49,12 @@ 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=private org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled Index: /applications/editors/josm/plugins/public_transport/build.xml =================================================================== --- /applications/editors/josm/plugins/public_transport/build.xml (revision 34165) +++ /applications/editors/josm/plugins/public_transport/build.xml (revision 34166) @@ -5,5 +5,5 @@ - + Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/GTFSImporterAction.java =================================================================== --- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/GTFSImporterAction.java (revision 34165) +++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/GTFSImporterAction.java (revision 34166) @@ -40,4 +40,7 @@ import org.openstreetmap.josm.tools.Logging; +/** + * Create Stops from GTFS + */ public class GTFSImporterAction extends JosmAction { private static GTFSImporterDialog dialog = null; @@ -260,4 +263,6 @@ /** * returns a collection of all selected lines or a collection of all lines otherwise + * @param table table + * @return all selected lines or a collection of all lines otherwise */ public static Vector getConsideredLines(JTable table) { @@ -276,5 +281,9 @@ } - /** marks the table items whose nodes are marked on the map */ + /** + * marks the table items whose nodes are marked on the map + * @param table table + * @param nodes nodes + */ public static void findNodesInTable(JTable table, Vector nodes) { DataSet ds = MainApplication.getLayerManager().getEditDataSet(); @@ -293,4 +302,6 @@ * shows the nodes that correspond to the marked lines in the table. * If no lines are marked in the table, show all nodes from the vector + * @param table table + * @param nodes nodes */ public static void showNodesFromTable(JTable table, Vector nodes) { @@ -311,4 +322,6 @@ * marks the nodes that correspond to the marked lines in the table. * If no lines are marked in the table, mark all nodes from the vector + * @param table table + * @param nodes nodes */ public static void markNodesFromTable(JTable table, Vector nodes) { Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java =================================================================== --- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java (revision 34165) +++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java (revision 34166) @@ -51,4 +51,7 @@ import org.xml.sax.SAXException; +/** + * Create Stops from GPX + */ public class StopImporterAction extends JosmAction { private static StopImporterDialog dialog = null; @@ -270,5 +273,9 @@ } - /** sets the tags of the node according to the type */ + /** + * sets the tags of the node according to the type + * @param node node + * @param type type + */ public static void setTagsWrtType(Node node, String type) { node.remove("highway"); @@ -288,4 +295,6 @@ /** * returns a collection of all selected lines or a collection of all lines otherwise + * @param table table + * @return all selected lines or a collection of all lines otherwise */ public static Vector getConsideredLines(JTable table) { @@ -304,5 +313,9 @@ } - /** marks the table items whose nodes are marked on the map */ + /** + * marks the table items whose nodes are marked on the map + * @param table table + * @param nodes nodes + */ public static void findNodesInTable(JTable table, Vector nodes) { DataSet ds = MainApplication.getLayerManager().getEditDataSet(); @@ -320,4 +333,6 @@ /** * shows the nodes that correspond to the marked lines in the table. If no lines are marked in the table, show all nodes from the vector + * @param table table + * @param nodes nodes */ public static void showNodesFromTable(JTable table, Vector nodes) { @@ -337,4 +352,6 @@ /** * marks the nodes that correspond to the marked lines in the table. If no lines are marked in the table, mark all nodes from the vector + * @param table table + * @param nodes nodes */ public static void markNodesFromTable(JTable table, Vector nodes) { Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java =================================================================== --- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java (revision 34165) +++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java (revision 34166) @@ -7,6 +7,4 @@ import java.util.Vector; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableModel; @@ -18,6 +16,8 @@ import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction; -public class GTFSStopTableModel extends DefaultTableModel implements TableModelListener { - private GTFSImporterAction controller = null; +/** + * GTFS stop table model + */ +public class GTFSStopTableModel extends DefaultTableModel { public Vector nodes = new Vector<>(); @@ -71,9 +71,7 @@ lonCol = i; - this.controller = controller; addColumn(tr("Id")); addColumn(tr("Name")); addColumn(tr("State")); - addTableModelListener(this); } @@ -103,7 +101,8 @@ /** * tokenizes a line as follows: any comma outside a pair of double quotation marks is taken as field separator. - * In particular, neither \" nor \, have a special meaning. Returns the position of the next field separator, if any. - * Otherwise it returns -1. s - the string to tokenize. startPos - * - the position of the last field separator plus 1 or the value 0. + * In particular, neither \" nor \, have a special meaning. + * @param s the string to tokenize + * @param startPos the position of the last field separator plus 1 or the value 0 + * @return the position of the next field separator, if any. Otherwise it returns -1 */ private int tokenize(String s, int startPos) { @@ -214,7 +213,3 @@ super.setRowCount(0); } - - @Override - public void tableChanged(TableModelEvent e) { - } }