Index: applications/editors/josm/plugins/smed/src/panels/PanelLights.java =================================================================== --- applications/editors/josm/plugins/smed/src/panels/PanelLights.java (revision 30295) +++ applications/editors/josm/plugins/smed/src/panels/PanelLights.java (revision 30532) @@ -18,5 +18,5 @@ public JLabel categoryLabel; - public JComboBox landCatBox; + public JComboBox landCatBox; public EnumMap landCats = new EnumMap(Cat.class); private ActionListener alLandCatBox = new ActionListener() { @@ -31,5 +31,5 @@ } }; - public JComboBox trafficCatBox; + public JComboBox trafficCatBox; public EnumMap trafficCats = new EnumMap(Cat.class); private ActionListener alTrafficCatBox = new ActionListener() { @@ -44,5 +44,5 @@ } }; - public JComboBox warningCatBox; + public JComboBox warningCatBox; public EnumMap warningCats = new EnumMap(Cat.class); private ActionListener alWarningCatBox = new ActionListener() { @@ -57,5 +57,5 @@ } }; - public JComboBox platformCatBox; + public JComboBox platformCatBox; public EnumMap platformCats = new EnumMap(Cat.class); private ActionListener alPlatformCatBox = new ActionListener() { @@ -70,5 +70,5 @@ } }; - public JComboBox pilotCatBox; + public JComboBox pilotCatBox; public EnumMap pilotCats = new EnumMap(Cat.class); private ActionListener alPilotCatBox = new ActionListener() { @@ -83,5 +83,5 @@ } }; - public JComboBox rescueCatBox; + public JComboBox rescueCatBox; public EnumMap rescueCats = new EnumMap(Cat.class); private ActionListener alRescueCatBox = new ActionListener() { @@ -96,5 +96,5 @@ } }; - public JComboBox radioCatBox; + public JComboBox radioCatBox; public EnumMap radioCats = new EnumMap(Cat.class); private ActionListener alRadioCatBox = new ActionListener() { @@ -109,5 +109,5 @@ } }; - public JComboBox radarCatBox; + public JComboBox radarCatBox; public EnumMap radarCats = new EnumMap(Cat.class); private ActionListener alRadarCatBox = new ActionListener() { @@ -123,5 +123,5 @@ }; public JLabel functionLabel; - public JComboBox functionBox; + public JComboBox functionBox; public EnumMap functions = new EnumMap(Fnc.class); private ActionListener alfunctionBox = new ActionListener() { @@ -261,5 +261,5 @@ functionLabel.setVisible(false); - functionBox = new JComboBox(); + functionBox = new JComboBox<>(); functionBox.setBounds(new Rectangle(5, 110, 160, 18)); add(functionBox); @@ -281,5 +281,5 @@ categoryLabel.setVisible(false); - landCatBox = new JComboBox(); + landCatBox = new JComboBox<>(); landCatBox.setBounds(new Rectangle(5, 142, 160, 18)); add(landCatBox); @@ -308,5 +308,5 @@ landCatBox.setVisible(false); - trafficCatBox = new JComboBox(); + trafficCatBox = new JComboBox<>(); trafficCatBox.setBounds(new Rectangle(5, 140, 160, 20)); add(trafficCatBox); @@ -325,5 +325,5 @@ trafficCatBox.setVisible(false); - warningCatBox = new JComboBox(); + warningCatBox = new JComboBox<>(); warningCatBox.setBounds(new Rectangle(5, 140, 160, 20)); add(warningCatBox); @@ -347,5 +347,5 @@ warningCatBox.setVisible(false); - platformCatBox = new JComboBox(); + platformCatBox = new JComboBox<>(); platformCatBox.setBounds(new Rectangle(5, 140, 160, 20)); add(platformCatBox); @@ -364,5 +364,5 @@ platformCatBox.setVisible(false); - pilotCatBox = new JComboBox(); + pilotCatBox = new JComboBox<>(); pilotCatBox.setBounds(new Rectangle(5, 140, 160, 20)); add(pilotCatBox); @@ -374,5 +374,5 @@ pilotCatBox.setVisible(false); - rescueCatBox = new JComboBox(); + rescueCatBox = new JComboBox<>(); rescueCatBox.setBounds(new Rectangle(5, 140, 160, 20)); add(rescueCatBox); @@ -391,5 +391,5 @@ rescueCatBox.setVisible(false); - radioCatBox = new JComboBox(); + radioCatBox = new JComboBox<>(); radioCatBox.setBounds(new Rectangle(5, 140, 160, 20)); add(radioCatBox); @@ -429,5 +429,5 @@ radioCatBox.setVisible(false); - radarCatBox = new JComboBox(); + radarCatBox = new JComboBox<>(); radarCatBox.setBounds(new Rectangle(5, 140, 160, 20)); add(radarCatBox); Index: applications/editors/josm/plugins/smed/src/panels/PanelLit.java =================================================================== --- applications/editors/josm/plugins/smed/src/panels/PanelLit.java (revision 30295) +++ applications/editors/josm/plugins/smed/src/panels/PanelLit.java (revision 30532) @@ -39,5 +39,5 @@ }; public JLabel visibilityLabel; - public JComboBox visibilityBox; + public JComboBox visibilityBox; public EnumMap visibilities = new EnumMap(Vis.class); private ActionListener alVisibility = new ActionListener() { @@ -79,5 +79,5 @@ }; public JLabel categoryLabel; - public JComboBox categoryBox; + public JComboBox categoryBox; public EnumMap categories = new EnumMap(Lit.class); private ActionListener alCategory = new ActionListener() { @@ -115,5 +115,5 @@ }; public JLabel exhibitionLabel; - public JComboBox exhibitionBox; + public JComboBox exhibitionBox; public EnumMap exhibitions = new EnumMap(Exh.class); private ActionListener alExhibition = new ActionListener() { @@ -209,5 +209,5 @@ categoryLabel.setBounds(new Rectangle(185, 0, 165, 20)); add(categoryLabel); - categoryBox = new JComboBox(); + categoryBox = new JComboBox<>(); categoryBox.setBounds(new Rectangle(185, 20, 165, 20)); add(categoryBox); @@ -235,5 +235,5 @@ visibilityLabel.setBounds(new Rectangle(185, 40, 165, 20)); add(visibilityLabel); - visibilityBox = new JComboBox(); + visibilityBox = new JComboBox<>(); visibilityBox.setBounds(new Rectangle(185, 60, 165, 20)); add(visibilityBox); @@ -247,5 +247,5 @@ exhibitionLabel.setBounds(new Rectangle(280, 80, 70, 20)); add(exhibitionLabel); - exhibitionBox = new JComboBox(); + exhibitionBox = new JComboBox<>(); exhibitionBox.setBounds(new Rectangle(280, 100, 70, 20)); add(exhibitionBox); Index: applications/editors/josm/plugins/smed/src/panels/PanelMore.java =================================================================== --- applications/editors/josm/plugins/smed/src/panels/PanelMore.java (revision 30295) +++ applications/editors/josm/plugins/smed/src/panels/PanelMore.java (revision 30532) @@ -44,5 +44,5 @@ }; public JLabel statusLabel; - public JComboBox statusBox; + public JComboBox statusBox; public EnumMap statuses = new EnumMap(Sts.class); private ActionListener alStatus = new ActionListener() { @@ -56,5 +56,5 @@ }; public JLabel constrLabel; - public JComboBox constrBox; + public JComboBox constrBox; public EnumMap constructions = new EnumMap(Cns.class); private ActionListener alConstr = new ActionListener() { @@ -68,5 +68,5 @@ }; public JLabel conLabel; - public JComboBox conBox; + public JComboBox conBox; public EnumMap conspicuities = new EnumMap(Con.class); private ActionListener alCon = new ActionListener() { @@ -80,5 +80,5 @@ }; public JLabel reflLabel; - public JComboBox reflBox; + public JComboBox reflBox; public EnumMap reflectivities = new EnumMap(Con.class); private ActionListener alRefl = new ActionListener() { @@ -235,5 +235,5 @@ statusLabel.setBounds(new Rectangle(250, 0, 100, 20)); add(statusLabel); - statusBox = new JComboBox(); + statusBox = new JComboBox<>(); statusBox.setBounds(new Rectangle(250, 20, 100, 20)); addStsItem("", Sts.UNKSTS); @@ -262,5 +262,5 @@ constrLabel.setBounds(new Rectangle(250, 40, 100, 20)); add(constrLabel); - constrBox = new JComboBox(); + constrBox = new JComboBox<>(); constrBox.setBounds(new Rectangle(250, 60, 100, 20)); addCnsItem("", Cns.UNKCNS); @@ -280,5 +280,5 @@ conLabel.setBounds(new Rectangle(250, 80, 100, 20)); add(conLabel); - conBox = new JComboBox(); + conBox = new JComboBox<>(); conBox.setBounds(new Rectangle(250, 100, 100, 20)); addConItem("", Con.UNKCON); @@ -291,5 +291,5 @@ reflLabel.setBounds(new Rectangle(250, 120, 100, 20)); add(reflLabel); - reflBox = new JComboBox(); + reflBox = new JComboBox<>(); reflBox.setBounds(new Rectangle(250, 140, 100, 20)); addReflItem("", Con.UNKCON); @@ -361,4 +361,3 @@ return button; } - } Index: applications/editors/josm/plugins/smed/src/panels/PanelRadar.java =================================================================== --- applications/editors/josm/plugins/smed/src/panels/PanelRadar.java (revision 30295) +++ applications/editors/josm/plugins/smed/src/panels/PanelRadar.java (revision 30532) @@ -28,5 +28,5 @@ } }; - private JComboBox radioCatBox; + private JComboBox radioCatBox; private EnumMap radioCats = new EnumMap(Cat.class); private ActionListener alRadioCatBox = new ActionListener() { @@ -175,5 +175,5 @@ add(aisButton); - radioCatBox = new JComboBox(); + radioCatBox = new JComboBox<>(); radioCatBox.setBounds(new Rectangle(210, 40, 150, 20)); add(radioCatBox); Index: applications/editors/josm/plugins/smed/src/panels/PanelSectors.java =================================================================== --- applications/editors/josm/plugins/smed/src/panels/PanelSectors.java (revision 30295) +++ applications/editors/josm/plugins/smed/src/panels/PanelSectors.java (revision 30532) @@ -36,9 +36,9 @@ } }; - public JComboBox colourBox; + public JComboBox colourBox; public EnumMap colours = new EnumMap(Col.class); - public JComboBox visibilityBox; + public JComboBox visibilityBox; public EnumMap visibilities = new EnumMap(Vis.class); - public JComboBox exhibitionBox; + public JComboBox exhibitionBox; public EnumMap exhibitions = new EnumMap(Exh.class); @@ -74,5 +74,5 @@ TableColumn colColumn = table.getColumnModel().getColumn(1); - colourBox = new JComboBox(); + colourBox = new JComboBox<>(); addColItem(new ImageIcon(getClass().getResource("/images/DelButton.png")), Col.UNKCOL); addColItem(new ImageIcon(getClass().getResource("/images/WhiteButton.png")), Col.WHITE); @@ -87,5 +87,5 @@ TableColumn visColumn = table.getColumnModel().getColumn(12); - visibilityBox = new JComboBox(); + visibilityBox = new JComboBox<>(); addVisibItem("", Vis.UNKVIS); addVisibItem(Messages.getString("Intensified"), Vis.INTEN); @@ -95,5 +95,5 @@ TableColumn exhColumn = table.getColumnModel().getColumn(13); - exhibitionBox = new JComboBox(); + exhibitionBox = new JComboBox<>(); addExhibItem("", Exh.UNKEXH); addExhibItem(Messages.getString("24h"), Exh.H24); Index: applications/editors/josm/plugins/smed/src/panels/PanelSpec.java =================================================================== --- applications/editors/josm/plugins/smed/src/panels/PanelSpec.java (revision 30295) +++ applications/editors/josm/plugins/smed/src/panels/PanelSpec.java (revision 30532) @@ -17,5 +17,5 @@ private SmedAction dlg; public JLabel categoryLabel; - public JComboBox categoryBox; + public JComboBox categoryBox; public EnumMap categories = new EnumMap(Cat.class); private ActionListener alCategoryBox = new ActionListener() { @@ -28,5 +28,5 @@ } }; - public JComboBox mooringBox; + public JComboBox mooringBox; public EnumMap moorings = new EnumMap(Cat.class); private ActionListener alMooringBox = new ActionListener() { @@ -173,5 +173,5 @@ categoryLabel.setBounds(new Rectangle(5, 125, 160, 18)); add(categoryLabel); - categoryBox = new JComboBox(); + categoryBox = new JComboBox<>(); categoryBox.setBounds(new Rectangle(5, 142, 160, 18)); add(categoryBox); @@ -196,5 +196,5 @@ addCatItem(Messages.getString("FerryCross"), Cat.SPM_FRRY); addCatItem(Messages.getString("Anchorage"), Cat.SPM_ANCH); - mooringBox = new JComboBox(); + mooringBox = new JComboBox<>(); mooringBox.setBounds(new Rectangle(5, 142, 160, 18)); add(mooringBox);