fix deprecation and some warnings

Author: stoecker

src/org/openstreetmap/josm/plugins/conflation/MatchesComputation.java

@@ -55,7 +55,7 @@ public static Collection<SimpleMatch> generateMatches(SimpleMatchSettings settin
         allPrimitives.addAll(subPrimitives);
 
         AbstractMap.SimpleEntry<FeatureCollection,HashMap<OsmPrimitive, Throwable>>
-            allFeaturesAndErrors = createFeatureCollection(allPrimitives, monitor);
+            allFeaturesAndErrors = createFeatureCollection(allPrimitives/*, monitor*/);
 
         FeatureCollection allFeatures = allFeaturesAndErrors.getKey();
         HashMap<OsmPrimitive, Throwable> allErrors = allFeaturesAndErrors.getValue();
@@ -141,7 +141,7 @@ private static FeatureSchema createSchema(Collection<OsmPrimitive> prims) {
     }
 
     private static AbstractMap.SimpleEntry<FeatureCollection,HashMap<OsmPrimitive, Throwable>>
-        createFeatureCollection(Collection<OsmPrimitive> prims, ProgressMonitor monitor)
+        createFeatureCollection(Collection<OsmPrimitive> prims/*, ProgressMonitor monitor*/)
     {
         FeatureDataset dataset = new FeatureDataset(createSchema(prims));
         HashMap<OsmPrimitive, Throwable> errorset = new HashMap<OsmPrimitive, Throwable>();

src/org/openstreetmap/josm/plugins/conflation/SimpleMatchList.java

@@ -15,7 +15,7 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
 /**
- *  Holds a list of {@see Match}es and provides convenience functions.
+ *  Holds a list of {@link SimpleMatch}es and provides convenience functions.
  */
 public class SimpleMatchList implements Iterable<SimpleMatch> {
     private final CopyOnWriteArrayList<SimpleMatchListListener> listeners = new CopyOnWriteArrayList<>();

src/org/openstreetmap/josm/plugins/conflation/SimpleMatchSettings.java

@@ -14,7 +14,7 @@
 import com.vividsolutions.jcs.conflate.polygonmatch.FCMatchFinder;
 
 /**
- * Result of the configuration {@Link SettingsDialog}.
+ * Result of the configuration {@link org.openstreetmap.josm.plugins.conflation.config.SettingsDialog}.
  * @author joshdoe
  */
 public class SimpleMatchSettings {

src/org/openstreetmap/josm/plugins/conflation/SimpleMatchesTableModel.java

@@ -78,13 +78,15 @@ public Class<?> getColumnClass(int c) {
     }
 
     /**
+     * Return list of matches
      * @return the matches
      */
     public SimpleMatchList getMatches() {
         return matches;
     }
 
     /**
+     * Set matches
      * @param matches the matches to set
      */
     public void setMatches(SimpleMatchList matches, SimpleMatchSettings settings) {

src/org/openstreetmap/josm/plugins/conflation/UnmatchedObjectListModel.java

@@ -114,6 +114,7 @@ public void beginUpdate() {
     }
 
     /**
+     * Begin update process
      * @see DataSet#beginUpdate()
      */
     public void endUpdate() {

src/org/openstreetmap/josm/plugins/conflation/config/parser/ParsedTextArea.java

@@ -12,6 +12,7 @@
 import java.awt.event.ComponentListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
+import java.awt.geom.Rectangle2D;
 import java.util.List;
 
 import javax.swing.JMenuItem;
@@ -159,20 +160,20 @@ private void updatePopup(JMenuItem popupMenuItem, String text, int position, boo
         JPopupMenu popup = (JPopupMenu) popupMenuItem.getParent();
         if ((text != null) && !text.isEmpty()) {
             Point textArealocation = getLocationOnScreen();
-            Rectangle positionRect;
+            Rectangle2D positionRect;
             try {
-                positionRect = modelToView(position);
+                positionRect = modelToView2D(position);
             } catch (BadLocationException e) {
                 positionRect = new Rectangle(0, 0, getSize().width, getSize().height);
             }
             popupMenuItem.setText(text);
             repackPopupMenuWithoutFlicker(popup);
             if (above) {
-                popup.setLocation(textArealocation.x + positionRect.x,
-                        textArealocation.y + positionRect.y - positionRect.height - popup.getHeight());
+                popup.setLocation(textArealocation.x + (int)positionRect.getX(),
+                        textArealocation.y + (int)positionRect.getY() - (int)positionRect.getHeight() - popup.getHeight());
             } else {
-                popup.setLocation(textArealocation.x + positionRect.x,
-                        textArealocation.y + positionRect.y + positionRect.height + 10);
+                popup.setLocation(textArealocation.x + (int)positionRect.getX(),
+                        textArealocation.y + (int)positionRect.getY() + (int)positionRect.getHeight() + 10);
             }
             popup.setVisible(true);
         } else {