Ignore:
Timestamp:
2013-08-21T03:47:16+02:00 (11 years ago)
Author:
donvip
Message:

[josm_plugins] fix #8987 - bump min JOSM version of nearly all plugins to r6162 + code update/cleanup, fix warnings

Location:
applications/editors/josm/plugins/globalsat
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

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

    r29435 r29854  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <!--
    3 ** This is the build file for the globalsat  plugin.
    4 **
    5 ** Maintaining versions
    6 ** ====================
    7 ** see README.template
    8 **
    9 ** Usage
    10 ** =====
    11 ** To build it run
    12 **
    13 **    > ant  dist
    14 **
    15 ** To install the generated plugin locally (in you default plugin directory) run
    16 **
    17 **    > ant  install
    18 **
    19 ** The generated plugin jar is not automatically available in JOSMs plugin configuration
    20 ** dialog. You have to check it in first.
    21 **
    22 ** Use the ant target 'publish' to check in the plugin and make it available to other
    23 ** JOSM users:
    24 **    set the properties commit.message and plugin.main.version
    25 ** and run
    26 **    > ant  publish
    27 **
    28 **
    29 -->
    302<project name="globalsat" default="dist" basedir=".">
    313    <!-- enter the SVN commit message -->
    324    <property name="commit.message" value="Changed constructor signature of plugin main class"/>
    335    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    34     <property name="plugin.main.version" value="5681"/>
     6    <property name="plugin.main.version" value="6162"/>
    357    <!--
    368      ************************************************
    … …  
    4113    <property name="plugin.build.dir" value="build"/>
    4214    <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    43     <property name="ant.build.javac.target" value="1.5"/>
     15    <property name="ant.build.javac.target" value="1.6"/>
    4416    <property name="RXTX" location="./libs/RXTXcomm.jar"/>
    4517    <target name="init">

  • applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/Dg100Config.java

    r13497 r29854  
    55package org.kaintoch.gps.globalsat.dg100;
    66
    7 import java.io.*;
     7import java.io.FileInputStream;
     8import java.io.FileOutputStream;
     9import java.io.InputStream;
     10import java.io.OutputStream;
    811import java.nio.ByteBuffer;
    912import java.util.Properties;

  • applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/GpsRec.java

    r20039 r29854  
    55package org.kaintoch.gps.globalsat.dg100;
    66
    7 import java.nio.*;
    8 import java.text.*;
    9 import java.util.*;
     7import java.nio.ByteBuffer;
     8import java.text.SimpleDateFormat;
     9import java.util.Calendar;
     10import java.util.GregorianCalendar;
    1011
    1112/**

  • applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/Response.java

    r13497 r29854  
    5656        {
    5757            int recType = 2;
    58             int ii = 0;
    5958            // read part 1
    6059            while (buf.position() <= len)
    … …  
    7069                }
    7170                recType = gpsRec.getDg100TypeOfNextRec();
    72                 ++ii;
    7371            }
    7472            // read part 2
    … …  
    8684                }
    8785                recType = gpsRec.getDg100TypeOfNextRec();
    88                 ++ii;
    8986            }
    9087        }

  • applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java

    r13497 r29854  
    55
    66import static org.openstreetmap.josm.tools.I18n.tr;
    7 
     7import gnu.io.CommPortIdentifier;
     8
     9import java.awt.Dimension;
     10import java.awt.GridBagConstraints;
    811import java.awt.GridBagLayout;
    912import java.awt.Insets;
    10 import java.awt.Dimension;
    11 import java.awt.GridBagConstraints;
    1213import java.awt.event.ActionListener;
    1314import java.awt.event.KeyEvent;
    14 import java.util.ArrayList;
     15import java.util.LinkedList;
    1516import java.util.List;
    16 import java.util.LinkedList;
    17 import java.util.Enumeration;
    18 
     17
     18import javax.swing.BoxLayout;
    1919import javax.swing.ButtonGroup;
    2020import javax.swing.JCheckBox;
    21 import javax.swing.JTextField;
     21import javax.swing.JComboBox;
    2222import javax.swing.JLabel;
    23 import javax.swing.JList;
    2423import javax.swing.JOptionPane;
    2524import javax.swing.JPanel;
    2625import javax.swing.JRadioButton;
    27 import javax.swing.JButton;
    28 import javax.swing.JTabbedPane;
    29 import javax.swing.JComboBox;
    30 import javax.swing.ListCellRenderer;
    31 import javax.swing.BoxLayout;
    32 
    33 
    34 import gnu.io.*;
     26import javax.swing.JTextField;
    3527
    3628import org.kaintoch.gps.globalsat.dg100.Dg100Config;
    37 
    3829import org.openstreetmap.josm.Main;
    39 import org.openstreetmap.josm.actions.DownloadAction;
    40 import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
    41 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
    42 import org.openstreetmap.josm.gui.MapView;
    43 import org.openstreetmap.josm.plugins.PluginProxy;
    44 import org.openstreetmap.josm.tools.GBC;
    45 import org.openstreetmap.josm.data.gpx.GpxData;
    46 import org.openstreetmap.josm.data.gpx.GpxTrack;
    47 import org.openstreetmap.josm.data.gpx.WayPoint;
    4830
    4931

  • applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java

    r13497 r29854  
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     5import gnu.io.CommPortIdentifier;
    56
     7import java.awt.GridBagConstraints;
    68import java.awt.GridBagLayout;
    79import java.awt.Insets;
    8 import java.awt.GridBagConstraints;
    910import java.awt.event.ActionListener;
    10 import java.util.ArrayList;
     11import java.util.Enumeration;
     12import java.util.LinkedList;
    1113import java.util.List;
    12 import java.util.LinkedList;
    13 import java.util.Enumeration;
    1414
     15import javax.swing.JButton;
    1516import javax.swing.JCheckBox;
     17import javax.swing.JComboBox;
     18import javax.swing.JDialog;
    1619import javax.swing.JLabel;
    1720import javax.swing.JList;
    1821import javax.swing.JOptionPane;
    1922import javax.swing.JPanel;
    20 import javax.swing.JButton;
    21 import javax.swing.JTabbedPane;
    22 import javax.swing.JComboBox;
    2323import javax.swing.ListCellRenderer;
    24 import javax.swing.JDialog;
    25 
    26 import gnu.io.*;
    2724
    2825import org.openstreetmap.josm.Main;
    29 import org.openstreetmap.josm.actions.DownloadAction;
    30 import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
    31 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
    32 import org.openstreetmap.josm.gui.MapView;
    33 import org.openstreetmap.josm.plugins.PluginProxy;
    34 import org.openstreetmap.josm.tools.GBC;
    35 import org.openstreetmap.josm.data.gpx.GpxData;
    36 import org.openstreetmap.josm.data.gpx.GpxTrack;
    37 import org.openstreetmap.josm.data.gpx.WayPoint;
    3826
    3927/**
Note: See TracChangeset for help on using the changeset viewer.