Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdListTransferHandler.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdListTransferHandler.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdListTransferHandler.java	(revision 30454)
@@ -3,5 +3,4 @@
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
-import java.util.logging.Logger;
 
 import javax.swing.JComponent;
@@ -21,5 +20,5 @@
  */
 public class PrimitiveIdListTransferHandler extends TransferHandler {
-    static private final Logger logger = Logger.getLogger(PrimitiveIdListTransferHandler.class.getName());
+    //static private final Logger logger = Logger.getLogger(PrimitiveIdListTransferHandler.class.getName());
     private PrimitiveIdListProvider provider;
     
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java	(revision 30454)
@@ -26,5 +26,4 @@
     private TurnRestrictionEditorModel model;
     private TagEditorPanel pnlTagEditor;
-    private JPanel pnlRelationMemberEditor;
     private JTable tblRelationMemberEditor;
     private JSplitPane spEditors;
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModel.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModel.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModel.java	(revision 30454)
@@ -34,5 +34,5 @@
  * 
  */
-public class JosmSelectionListModel extends AbstractListModel implements EditLayerChangeListener, SelectionChangedListener, DataSetListener, PrimitiveIdListProvider{
+public class JosmSelectionListModel extends AbstractListModel<OsmPrimitive> implements EditLayerChangeListener, SelectionChangedListener, DataSetListener, PrimitiveIdListProvider{
     //static private final Logger logger = Logger.getLogger(JosmSelectionListModel.class.getName());
     
@@ -54,5 +54,5 @@
     }
 
-    public Object getElementAt(int index) {
+    public OsmPrimitive getElementAt(int index) {
         return selection.get(index);
     }
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java	(revision 30454)
@@ -21,4 +21,5 @@
 import javax.swing.TransferHandler;
 
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
@@ -41,5 +42,5 @@
 public class JosmSelectionPanel extends JPanel {
     /**  the list view */
-    private JList lstSelection;
+    private JList<OsmPrimitive> lstSelection;
     /** the model managing the selection */
     private JosmSelectionListModel model;
@@ -53,5 +54,5 @@
     protected void build(OsmDataLayer layer) {
         setLayout(new BorderLayout());
-        lstSelection = new JList(model);
+        lstSelection = new JList<>(model);
         lstSelection.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         lstSelection.setSelectionModel(model.getListSelectionModel());
@@ -136,6 +137,5 @@
         @Override
         public boolean canImport(JComponent comp, DataFlavor[] transferFlavors) {
-            // the JOSM selection list is read-only. Don't allow to drop or paste
-            // data on it
+            // the JOSM selection list is read-only. Don't allow to drop or paste data on it
             return false;
         }
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBox.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBox.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBox.java	(revision 30454)
@@ -8,5 +8,5 @@
  * A combo box for selecting a turn restriction type.
  */
-public class TurnRestrictionComboBox extends JComboBox{
+public class TurnRestrictionComboBox extends JComboBox<Object> {
     
     /**
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBoxModel.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBoxModel.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBoxModel.java	(revision 30454)
@@ -19,5 +19,5 @@
  *
  */
-public class TurnRestrictionComboBoxModel implements ComboBoxModel, Observer{
+public class TurnRestrictionComboBoxModel implements ComboBoxModel<Object>, Observer{
     //static private final Logger logger = Logger.getLogger(TurnRestrictionComboBoxModel.class.getName());
     
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java	(revision 30454)
@@ -19,5 +19,5 @@
 
 
-public class TurnRestrictionTypeRenderer extends JLabel implements ListCellRenderer{
+public class TurnRestrictionTypeRenderer extends JLabel implements ListCellRenderer<Object> {
  
     final private Map<TurnRestrictionType, ImageIcon> icons = new HashMap<TurnRestrictionType, ImageIcon>();
@@ -69,5 +69,5 @@
     }
     
-    public Component getListCellRendererComponent(JList list, Object value,
+    public Component getListCellRendererComponent(JList<? extends Object> list, Object value,
             int index, boolean isSelected, boolean cellHasFocus) {
         
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java	(revision 30454)
@@ -29,4 +29,5 @@
 import javax.swing.event.ListSelectionListener;
 
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
@@ -45,5 +46,5 @@
  * 
  */
-public class ViaList extends JList{
+public class ViaList extends JList<OsmPrimitive> {
     
     //static private final Logger logger = Logger.getLogger(ViaList.class.getName());
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListModel.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListModel.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListModel.java	(revision 30454)
@@ -22,5 +22,5 @@
  * 
  */
-public class ViaListModel extends AbstractListModel implements PrimitiveIdListProvider, Observer{
+public class ViaListModel extends AbstractListModel<OsmPrimitive> implements PrimitiveIdListProvider, Observer{
     //static private final Logger logger = Logger.getLogger(ViaListModel.class.getName());
     
@@ -102,5 +102,5 @@
     }
     
-    protected List<Integer>  moveDown(List<Integer> rows, int targetRow) {
+    protected List<Integer> moveDown(List<Integer> rows, int targetRow) {
         List<Integer> ret = new ArrayList<Integer>(rows.size());
         int delta = targetRow - rows.get(0);
@@ -218,5 +218,5 @@
     }
 
-    public Object getElementAt(int index) {
+    public OsmPrimitive getElementAt(int index) {
         return vias.get(index);
     }
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/AbstractTurnRestrictionsListView.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/AbstractTurnRestrictionsListView.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/AbstractTurnRestrictionsListView.java	(revision 30454)
@@ -6,4 +6,5 @@
 
 import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.osm.Relation;
 
 /**
@@ -16,5 +17,5 @@
 abstract class AbstractTurnRestrictionsListView extends JPanel {
     protected TurnRestrictionsListModel model;
-    protected JList lstTurnRestrictions;
+    protected JList<Relation> lstTurnRestrictions;
     
     public TurnRestrictionsListModel getModel(){
@@ -22,5 +23,5 @@
     }
     
-    public JList getList() {
+    public JList<Relation> getList() {
         return lstTurnRestrictions;
     }
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java	(revision 30454)
@@ -39,5 +39,5 @@
  * 
  */
-public class TurnRestrictionCellRenderer extends JPanel implements ListCellRenderer, TableCellRenderer{
+public class TurnRestrictionCellRenderer extends JPanel implements ListCellRenderer<Relation>, TableCellRenderer{
     //static private final Logger logger = Logger.getLogger(TurnRestrictionCellRenderer.class.getName());
     
@@ -232,5 +232,5 @@
     /* interface ListCellRenderer                                                         */
     /* ---------------------------------------------------------------------------------- */
-    public Component getListCellRendererComponent(JList list, Object value,
+    public Component getListCellRendererComponent(JList<? extends Relation> list, Relation value,
             int index, boolean isSelected, boolean cellHasFocus) {
 
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInDatasetView.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInDatasetView.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInDatasetView.java	(revision 30454)
@@ -18,9 +18,9 @@
  * This is the view for the list of turn restrictions in the current data set.
  */
-public class TurnRestrictionsInDatasetView extends AbstractTurnRestrictionsListView{    
+public class TurnRestrictionsInDatasetView extends AbstractTurnRestrictionsListView {    
     protected void build() {
         DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
         model = new TurnRestrictionsInDatasetListModel(selectionModel);
-        lstTurnRestrictions = new JList(model);
+        lstTurnRestrictions = new JList<>(model);
         lstTurnRestrictions.setSelectionModel(selectionModel);
         lstTurnRestrictions.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInSelectionView.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInSelectionView.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInSelectionView.java	(revision 30454)
@@ -27,5 +27,5 @@
         DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
         model = new TurnRestrictionsInSelectionListModel(selectionModel);
-        lstTurnRestrictions = new JList(model);
+        lstTurnRestrictions = new JList<>(model);
         lstTurnRestrictions.setSelectionModel(selectionModel);
         lstTurnRestrictions.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java	(revision 30454)
@@ -399,5 +399,5 @@
         @Override
         public void launch(MouseEvent evt) {
-            JList lst = currentListView.getList();
+            JList<Relation> lst = currentListView.getList();
             if (lst.getSelectedIndices().length == 0) {
                 int idx = lst.locationToIndex(evt.getPoint());
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListModel.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListModel.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListModel.java	(revision 30454)
@@ -21,5 +21,5 @@
  * 
  */
-public class TurnRestrictionsListModel extends AbstractListModel {
+public class TurnRestrictionsListModel extends AbstractListModel<Relation> {
     private final ArrayList<Relation> turnrestrictions = new ArrayList<Relation>();
     private DefaultListSelectionModel selectionModel;
@@ -157,5 +157,5 @@
     }
 
-    public Object getElementAt(int index) {
+    public Relation getElementAt(int index) {
         return turnrestrictions.get(index);
     }
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssueView.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssueView.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssueView.java	(revision 30454)
@@ -30,5 +30,4 @@
     private Issue issue;
     private JLabel lblIcon;
-    private StyleSheet styleSheet;
     
      /**
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java	(revision 30454)
@@ -4,5 +4,4 @@
 
 import java.awt.event.ActionEvent;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
@@ -15,5 +14,5 @@
  */
 public class RequiredTagMissingError extends Issue {
-    static private final Logger logger = Logger.getLogger(RequiredTagMissingError.class.getName());
+    //static private final Logger logger = Logger.getLogger(RequiredTagMissingError.class.getName());
     private String tagKey;
     private String tagValue;
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java	(revision 30454)
@@ -6,5 +6,4 @@
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
@@ -28,5 +27,5 @@
  */
 public class TurnRestrictionLegSplitRequiredError extends Issue{
-    static private final Logger logger = Logger.getLogger(TurnRestrictionLegSplitRequiredError.class.getName());
+    //static private final Logger logger = Logger.getLogger(TurnRestrictionLegSplitRequiredError.class.getName());
     
     private TurnRestrictionLegRole role;
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java	(revision 30453)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java	(revision 30454)
@@ -54,4 +54,6 @@
                 );              
             break;          
+        default:
+            throw new AssertionError("Unexpected type for leg: "+leg.getType());
         }
         return msg + " " + tr("A way is required instead.");