Changeset 34166 in osm for applications/editors/josm


Ignore:
Timestamp:
2018-04-24T02:20:27+02:00 (7 years ago)
Author:
donvip
Message:

update to JOSM 13665 + javadoc

Location:
applications/editors/josm/plugins/public_transport
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/public_transport/.settings/org.eclipse.jdt.core.prefs

    r32699 r34166  
    1414org.eclipse.jdt.core.compiler.debug.localVariable=generate
    1515org.eclipse.jdt.core.compiler.debug.sourceFile=generate
     16org.eclipse.jdt.core.compiler.doc.comment.support=enabled
    1617org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
    1718org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
    … …  
    3738org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
    3839org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
     40org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
     41org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
     42org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
     43org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
     44org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
    3945org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
    4046org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
    … …  
    4349org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
    4450org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
     51org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
     52org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
     53org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
     54org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
     55org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
     56org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
     57org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
     58org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
    4559org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
    4660org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled

  • applications/editors/josm/plugins/public_transport/build.xml

    r33765 r34166  
    55    <property name="commit.message" value="Commit message"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="12643"/>
     7    <property name="plugin.main.version" value="13665"/>
    88
    99    <property name="plugin.author" value="Roland M. Olbricht"/>

  • applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/GTFSImporterAction.java

    r33765 r34166  
    4040import org.openstreetmap.josm.tools.Logging;
    4141
     42/**
     43 * Create Stops from GTFS
     44 */
    4245public class GTFSImporterAction extends JosmAction {
    4346    private static GTFSImporterDialog dialog = null;
    … …  
    260263    /**
    261264     * returns a collection of all selected lines or a collection of all lines otherwise
     265     * @param table table
     266     * @return all selected lines or a collection of all lines otherwise
    262267     */
    263268    public static Vector<Integer> getConsideredLines(JTable table) {
    … …  
    276281    }
    277282
    278     /** marks the table items whose nodes are marked on the map */
     283    /**
     284     * marks the table items whose nodes are marked on the map
     285     * @param table table
     286     * @param nodes nodes
     287     */
    279288    public static void findNodesInTable(JTable table, Vector<Node> nodes) {
    280289        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
    … …  
    293302     * shows the nodes that correspond to the marked lines in the table.
    294303     * If no lines are marked in the table, show all nodes from the vector
     304     * @param table table
     305     * @param nodes nodes
    295306     */
    296307    public static void showNodesFromTable(JTable table, Vector<Node> nodes) {
    … …  
    311322     * marks the nodes that correspond to the marked lines in the table.
    312323     * If no lines are marked in the table, mark all nodes from the vector
     324     * @param table table
     325     * @param nodes nodes
    313326     */
    314327    public static void markNodesFromTable(JTable table, Vector<Node> nodes) {

  • applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java

    r33765 r34166  
    5151import org.xml.sax.SAXException;
    5252
     53/**
     54 * Create Stops from GPX
     55 */
    5356public class StopImporterAction extends JosmAction {
    5457    private static StopImporterDialog dialog = null;
    … …  
    270273    }
    271274
    272     /** sets the tags of the node according to the type */
     275    /**
     276     * sets the tags of the node according to the type
     277     * @param node node
     278     * @param type type
     279     */
    273280    public static void setTagsWrtType(Node node, String type) {
    274281        node.remove("highway");
    … …  
    288295    /**
    289296     * returns a collection of all selected lines or a collection of all lines otherwise
     297     * @param table table
     298     * @return all selected lines or a collection of all lines otherwise
    290299     */
    291300    public static Vector<Integer> getConsideredLines(JTable table) {
    … …  
    304313    }
    305314
    306     /** marks the table items whose nodes are marked on the map */
     315    /**
     316     * marks the table items whose nodes are marked on the map
     317     * @param table table
     318     * @param nodes nodes
     319     */
    307320    public static void findNodesInTable(JTable table, Vector<Node> nodes) {
    308321        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
    … …  
    320333    /**
    321334     * 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
     335     * @param table table
     336     * @param nodes nodes
    322337     */
    323338    public static void showNodesFromTable(JTable table, Vector<Node> nodes) {
    … …  
    337352    /**
    338353     * 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
     354     * @param table table
     355     * @param nodes nodes
    339356     */
    340357    public static void markNodesFromTable(JTable table, Vector<Node> nodes) {

  • applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java

    r33765 r34166  
    77import java.util.Vector;
    88
    9 import javax.swing.event.TableModelEvent;
    10 import javax.swing.event.TableModelListener;
    119import javax.swing.table.DefaultTableModel;
    1210
    … …  
    1816import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
    1917
    20 public class GTFSStopTableModel extends DefaultTableModel implements TableModelListener {
    21     private GTFSImporterAction controller = null;
     18/**
     19 * GTFS stop table model
     20 */
     21public class GTFSStopTableModel extends DefaultTableModel {
    2222
    2323    public Vector<Node> nodes = new Vector<>();
    … …  
    7171            lonCol = i;
    7272
    73         this.controller = controller;
    7473        addColumn(tr("Id"));
    7574        addColumn(tr("Name"));
    7675        addColumn(tr("State"));
    77         addTableModelListener(this);
    7876    }
    7977
    … …  
    103101    /**
    104102     * tokenizes a line as follows: any comma outside a pair of double quotation marks is taken as field separator.
    105      * In particular, neither \" nor \, have a special meaning. Returns the position of the next field separator, if any.
    106      * Otherwise it returns -1. s - the string to tokenize. startPos
    107      * - the position of the last field separator plus 1 or the value 0.
     103     * In particular, neither \" nor \, have a special meaning.
     104     * @param s the string to tokenize
     105     * @param startPos  the position of the last field separator plus 1 or the value 0
     106     * @return the position of the next field separator, if any. Otherwise it returns -1
    108107     */
    109108    private int tokenize(String s, int startPos) {
    … …  
    214213        super.setRowCount(0);
    215214    }
    216 
    217     @Override
    218     public void tableChanged(TableModelEvent e) {
    219     }
    220215}
Note: See TracChangeset for help on using the changeset viewer.