Changeset 29854 in osm for applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap

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/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions

Files:

• CreateOrEditTurnRestrictionAction.java (modified) (1 diff)
• dnd/PrimitiveIdListProvider.java (modified) (1 diff)
• dnd/PrimitiveIdListTransferHandler.java (modified) (1 diff)
• editor/AdvancedEditorPanel.java (modified) (2 diffs)
• editor/BasicEditorPanel.java (modified) (1 diff)
• editor/JosmSelectionListModel.java (modified) (2 diffs)
• editor/JosmSelectionPanel.java (modified) (1 diff)
• editor/MemberRoleCellEditor.java (modified) (2 diffs)
• editor/RelationMemberEditorModel.java (modified) (2 diffs)
• editor/RelationMemberTable.java (modified) (4 diffs)
• editor/TurnRestrictionComboBox.java (modified) (1 diff)
• editor/TurnRestrictionComboBoxModel.java (modified) (2 diffs)
• editor/TurnRestrictionEditor.java (modified) (3 diffs)
• editor/TurnRestrictionEditorManager.java (modified) (2 diffs)
• editor/TurnRestrictionEditorModel.java (modified) (4 diffs)
• editor/TurnRestrictionLegEditor.java (modified) (1 diff)
• editor/TurnRestrictionSelectionPopupPanel.java (modified) (2 diffs)
• editor/TurnRestrictionTypeRenderer.java (modified) (2 diffs)
• editor/VehicleExceptionEditor.java (modified) (2 diffs)
• editor/ViaList.java (modified) (2 diffs)
• editor/ViaListModel.java (modified) (4 diffs)
• list/TurnRestrictionCellRenderer.java (modified) (4 diffs)
• list/TurnRestrictionsInDatasetListModel.java (modified) (2 diffs)
• list/TurnRestrictionsInSelectionListModel.java (modified) (2 diffs)
• list/TurnRestrictionsInSelectionView.java (modified) (1 diff)
• list/TurnRestrictionsListDialog.java (modified) (3 diffs)
• preferences/PreferenceKeys.java (modified) (1 diff)
• preferences/PreferencesPanel.java (modified) (2 diffs)
• qa/IssuesView.java (modified) (2 diffs)
• qa/MissingTurnRestrictionLegError.java (modified) (2 diffs)
• qa/WrongTurnRestrictionLegTypeError.java (modified) (1 diff)

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.plugins.turnrestrictions.editor.TurnRestrictionEditor;
 import org.openstreetmap.josm.plugins.turnrestrictions.editor.TurnRestrictionEditorManager;
 import org.openstreetmap.josm.plugins.turnrestrictions.editor.TurnRestrictionSelectionPopupPanel;
-import org.openstreetmap.josm.plugins.turnrestrictions.preferences.PreferenceKeys;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdListProvider.java

@@ -3 +3 @@
 import java.util.List;
 
-import org.openstreetmap.josm.data.osm.PrimitiveId;;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 public interface PrimitiveIdListProvider {
     /**

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdListTransferHandler.java

@@ -8 +8 @@
 import javax.swing.TransferHandler;
 
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java

@@ -6 +6 @@
 import java.awt.event.HierarchyEvent;
 import java.awt.event.HierarchyListener;
-import java.util.logging.Logger;
 
 import javax.swing.JPanel;
@@ -23 +22 @@
  */
 public class AdvancedEditorPanel extends JPanel {
-    private static final Logger logger = Logger.getLogger(AdvancedEditorPanel.class.getName());
+    //private static final Logger logger = Logger.getLogger(AdvancedEditorPanel.class.getName());
 
     private TurnRestrictionEditorModel model;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModel.java

@@ -6 +6 @@
 import java.util.List;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractListModel;
@@ -36 +35 @@
  */
 public class JosmSelectionListModel extends AbstractListModel implements EditLayerChangeListener, SelectionChangedListener, DataSetListener, PrimitiveIdListProvider{
-    static private final Logger logger = Logger.getLogger(JosmSelectionListModel.class.getName());
+    //static private final Logger logger = Logger.getLogger(JosmSelectionListModel.class.getName());
     
     private final List<OsmPrimitive> selection = new ArrayList<OsmPrimitive>();

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java

@@ -11 +11 @@
 import javax.swing.Action;
 import javax.swing.BorderFactory;
-import javax.swing.DefaultListSelectionModel;
 import javax.swing.JComponent;
 import javax.swing.JLabel;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/MemberRoleCellEditor.java

@@ -3 +3 @@
 
 import java.awt.Component;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractCellEditor;
@@ -19 +18 @@
  */
 public class MemberRoleCellEditor extends AbstractCellEditor implements TableCellEditor {
-    static private Logger logger = Logger.getLogger(MemberRoleCellEditor.class.getName());
+    //static private Logger logger = Logger.getLogger(MemberRoleCellEditor.class.getName());
 
     private AutoCompletingTextField editor = null;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java

@@ -11 +11 @@
 import java.util.List;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import javax.swing.DefaultListSelectionModel;
@@ -25 +24 @@
 
 public class RelationMemberEditorModel extends AbstractTableModel{  
-    static private final Logger logger = Logger.getLogger(RelationMemberEditorModel.class.getName());
+    //static private final Logger logger = Logger.getLogger(RelationMemberEditorModel.class.getName());
     private final ArrayList<RelationMemberModel> members = new ArrayList<RelationMemberModel>();
     private OsmDataLayer layer;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java

@@ -18 +18 @@
 import java.io.IOException;
 import java.util.List;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
@@ -134 +133 @@
         }
 
+        @SuppressWarnings("unchecked")
         public void actionPerformed(ActionEvent evt) {
             // tried to delegate to 'paste' action in the action map of the
@@ -247 +247 @@
         }
 
+        @SuppressWarnings("unchecked")
         @Override
         public boolean importData(JComponent comp, Transferable t) {
@@ -323 +324 @@
         }
 
+        @SuppressWarnings("unchecked")
         public synchronized void drop(DropTargetDropEvent dtde) {
             try {

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBox.java

@@ -4 +4 @@
 
 import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.plugins.turnrestrictions.preferences.PreferenceKeys;
 /**
  * A combo box for selecting a turn restriction type.

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBoxModel.java

@@ -5 +5 @@
 import java.util.Observable;
 import java.util.Observer;
-import java.util.logging.Logger;
 
 import javax.swing.ComboBoxModel;
@@ -21 +20 @@
  */
 public class TurnRestrictionComboBoxModel implements ComboBoxModel, Observer{
-    static private final Logger logger = Logger.getLogger(TurnRestrictionComboBoxModel.class.getName());
+    //static private final Logger logger = Logger.getLogger(TurnRestrictionComboBoxModel.class.getName());
     
     private TurnRestrictionEditorModel model;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java

@@ -21 +21 @@
 import java.util.Observable;
 import java.util.Observer;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
@@ -46 +45 @@
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.gui.SideButton;
-import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
@@ -58 +57 @@
 
 public class TurnRestrictionEditor extends JDialog implements NavigationControler{
-    final private static Logger logger = Logger.getLogger(TurnRestrictionEditor.class.getName());
+    //final private static Logger logger = Logger.getLogger(TurnRestrictionEditor.class.getName());
     
     /** the property name for the current turn restriction

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorManager.java

@@ -10 +10 @@
 import java.util.Iterator;
 import java.util.Map.Entry;
-import java.util.logging.Logger;
 
 import org.openstreetmap.josm.data.osm.PrimitiveId;
@@ -23 +22 @@
  */
 public class TurnRestrictionEditorManager extends WindowAdapter implements MapView.LayerChangeListener{
-    static private final Logger logger = Logger.getLogger(TurnRestrictionEditorManager.class.getName());
+    //static private final Logger logger = Logger.getLogger(TurnRestrictionEditorManager.class.getName());
 
     /** keeps track of open relation editors */

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorModel.java

@@ -5 +5 @@
 import java.util.Observable;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import javax.swing.event.TableModelEvent;
@@ -21 +20 @@
 import org.openstreetmap.josm.data.osm.event.DataSetListener;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
 import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent;
@@ -27 +27 @@
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
-import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.TagEditorModel;
@@ -40 +39 @@
  */
 public class TurnRestrictionEditorModel extends Observable implements DataSetListener{
-    static private final Logger logger = Logger.getLogger(TurnRestrictionEditorModel.class.getName());
+    //static private final Logger logger = Logger.getLogger(TurnRestrictionEditorModel.class.getName());
     
     /**

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java

@@ -59 +59 @@
  */
 public class TurnRestrictionLegEditor extends JPanel implements Observer, PrimitiveIdListProvider {
-    static private final Logger logger = Logger.getLogger(TurnRestrictionLegEditor.class.getName());
+    //static private final Logger logger = Logger.getLogger(TurnRestrictionLegEditor.class.getName());
  
     private JLabel lblOsmObject;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java

@@ -17 +17 @@
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
@@ -50 +49 @@
  */
 public class TurnRestrictionSelectionPopupPanel extends JPanel{
-    static private final Logger logger = Logger.getLogger(TurnRestrictionSelectionPopupPanel.class.getName());
+    //static private final Logger logger = Logger.getLogger(TurnRestrictionSelectionPopupPanel.class.getName());
 
     /** the parent popup */

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.editor;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Component;
@@ -15 +17 @@
 import org.openstreetmap.josm.plugins.turnrestrictions.preferences.PreferenceKeys;
 import org.openstreetmap.josm.tools.ImageProvider;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java

@@ -16 +16 @@
 import java.util.Observable;
 import java.util.Observer;
-import java.util.logging.Logger;
 
 import javax.swing.ButtonGroup;
@@ -36 +35 @@
  */
 public class VehicleExceptionEditor extends JPanel implements Observer{
-    static private final Logger logger = Logger.getLogger(VehicleExceptionEditor.class.getName());
+    //static private final Logger logger = Logger.getLogger(VehicleExceptionEditor.class.getName());
     
     private TurnRestrictionEditorModel model;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Dimension;
 import java.awt.Toolkit;
 import java.awt.datatransfer.Clipboard;
@@ -48 +47 @@
 public class ViaList extends JList{
     
-    static private final Logger logger = Logger.getLogger(ViaList.class.getName());
+    //static private final Logger logger = Logger.getLogger(ViaList.class.getName());
 
     private ViaListModel model;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListModel.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.editor;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.ArrayList;
@@ -6 +8 @@
 import java.util.Observable;
 import java.util.Observer;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractListModel;
@@ -16 +17 @@
 import org.openstreetmap.josm.plugins.turnrestrictions.dnd.PrimitiveIdListProvider;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -23 +23 @@
  */
 public class ViaListModel extends AbstractListModel implements PrimitiveIdListProvider, Observer{
-    static private final Logger logger = Logger.getLogger(ViaListModel.class.getName());
+    //static private final Logger logger = Logger.getLogger(ViaListModel.class.getName());
     
     private DefaultListSelectionModel selectionModel;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trc;
 
 import java.awt.Color;
@@ -11 +12 @@
 import java.util.HashSet;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import javax.swing.ImageIcon;
@@ -31 +31 @@
 import org.openstreetmap.josm.plugins.turnrestrictions.preferences.PreferenceKeys;
 import org.openstreetmap.josm.tools.ImageProvider;
-import static org.openstreetmap.josm.tools.I18n.trc;
 
 /**
@@ -41 +40 @@
  */
 public class TurnRestrictionCellRenderer extends JPanel implements ListCellRenderer, TableCellRenderer{
-    static private final Logger logger = Logger.getLogger(TurnRestrictionCellRenderer.class.getName());
+    //static private final Logger logger = Logger.getLogger(TurnRestrictionCellRenderer.class.getName());
     
     /** the names of restriction types */

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInDatasetListModel.java

@@ -4 +4 @@
 import java.util.LinkedList;
 import java.util.List;
-import java.util.logging.Logger;
 
 import javax.swing.DefaultListSelectionModel;
@@ -34 +33 @@
  */
 public class TurnRestrictionsInDatasetListModel extends TurnRestrictionsListModel implements EditLayerChangeListener, DataSetListener {
-    private static final Logger logger = Logger.getLogger(TurnRestrictionsInDatasetListModel.class.getName());
+    //private static final Logger logger = Logger.getLogger(TurnRestrictionsInDatasetListModel.class.getName());
     
     public TurnRestrictionsInDatasetListModel(

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInSelectionListModel.java

@@ -4 +4 @@
 import java.util.HashSet;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import javax.swing.DefaultListSelectionModel;
@@ -19 +18 @@
  */
 public class TurnRestrictionsInSelectionListModel extends TurnRestrictionsListModel implements EditLayerChangeListener, SelectionChangedListener {
-    private static final Logger logger = Logger.getLogger(TurnRestrictionsInSelectionListModel.class.getName());
+    //private static final Logger logger = Logger.getLogger(TurnRestrictionsInSelectionListModel.class.getName());
     
     public TurnRestrictionsInSelectionListModel(

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInSelectionView.java

@@ -12 +12 @@
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
-import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java

@@ -13 +13 @@
 import java.util.HashSet;
 import java.util.List;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
@@ -31 +30 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
 import org.openstreetmap.josm.gui.SideButton;
-import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -53 +52 @@
  */
 public class TurnRestrictionsListDialog extends ToggleDialog{
-    private static final Logger logger = Logger.getLogger(TurnRestrictionsListDialog.class.getName());
+    //private static final Logger logger = Logger.getLogger(TurnRestrictionsListDialog.class.getName());
 
     /** checkbox for switching between the two list views */

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceKeys.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.preferences;
+
+import javax.swing.KeyStroke;
 
 

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java

@@ -7 +7 @@
 import java.awt.GridBagLayout;
 import java.awt.Insets;
-import java.util.logging.Logger;
-
 
 import javax.swing.BorderFactory;
@@ -30 +28 @@
  */
 public class PreferencesPanel extends VerticallyScrollablePanel {
-    private static final Logger logger = Logger.getLogger(PreferencesPanel.class.getName());
+    //private static final Logger logger = Logger.getLogger(PreferencesPanel.class.getName());
     private JRadioButton rbSetA;
     private JRadioButton rbSetB;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssuesView.java

@@ -5 +5 @@
 import java.util.Observable;
 import java.util.Observer;
-import java.util.logging.Logger;
 
 import javax.swing.JPanel;
@@ -17 +16 @@
  */
 public class IssuesView extends VerticallyScrollablePanel implements Observer{
-    static private final Logger logger = Logger.getLogger(IssuesView.class.getName());
+    //static private final Logger logger = Logger.getLogger(IssuesView.class.getName());
     
     /** the issues model */

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.qa;
+
+import static org.openstreetmap.josm.plugins.turnrestrictions.editor.NavigationControler.BasicEditorFokusTargets.FROM;
+import static org.openstreetmap.josm.plugins.turnrestrictions.editor.NavigationControler.BasicEditorFokusTargets.TO;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -6 +10 @@
 
 import org.openstreetmap.josm.plugins.turnrestrictions.editor.TurnRestrictionLegRole;
-import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.plugins.turnrestrictions.editor.NavigationControler.BasicEditorFokusTargets.*;
 
 /**

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java

@@ -10 +10 @@
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.plugins.turnrestrictions.editor.NavigationControler;
+import org.openstreetmap.josm.plugins.turnrestrictions.editor.NavigationControler.BasicEditorFokusTargets;
 import org.openstreetmap.josm.plugins.turnrestrictions.editor.RelationMemberEditorModel;
 import org.openstreetmap.josm.plugins.turnrestrictions.editor.TurnRestrictionLegRole;
-import org.openstreetmap.josm.plugins.turnrestrictions.editor.NavigationControler.BasicEditorFokusTargets;
 
 /**