Ignore:
Timestamp:
2014-10-18T23:07:52+02:00 (10 years ago)
Author:
donvip
Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:
applications/editors/josm/plugins/smed/src
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/smed/src/panels/PanelChr.java

    r29894 r30737  
    3636        public JToggleButton morseButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/MorseButton.png")));
    3737        public JToggleButton alternatingButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/AlternatingButton.png")));
    38         private EnumMap<Chr, JToggleButton> buttons = new EnumMap<Chr, JToggleButton>(Chr.class);
     38        private EnumMap<Chr, JToggleButton> buttons = new EnumMap<>(Chr.class);
    3939        private ActionListener alCharButton = new ActionListener() {
    4040                public void actionPerformed(java.awt.event.ActionEvent e) {

  • applications/editors/josm/plugins/smed/src/panels/PanelCol.java

    r29894 r30737  
    3434        public JRadioButton magentaButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/MagentaButton.png")));
    3535        public JRadioButton pinkButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PinkButton.png")));
    36         public EnumMap<Col, JRadioButton> colours = new EnumMap<Col, JRadioButton>(Col.class);
     36        public EnumMap<Col, JRadioButton> colours = new EnumMap<>(Col.class);
    3737        private ActionListener alColour = new ActionListener() {
    3838                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    9494        private JPanel stack;
    9595        private ButtonGroup stackColours = new ButtonGroup();
    96         private ArrayList<JRadioButton> stackCol = new ArrayList<JRadioButton>();
     96        private ArrayList<JRadioButton> stackCol = new ArrayList<>();
    9797        private int stackIdx = 0;
    9898        private ActionListener alStack = new ActionListener() {

  • applications/editors/josm/plugins/smed/src/panels/PanelFog.java

    r29894 r30737  
    2424        public JRadioButton gongButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FogGongButton.png")));
    2525        public JRadioButton explosButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FogExplosButton.png")));
    26         private EnumMap<Fog, JRadioButton> fogs = new EnumMap<Fog, JRadioButton>(Fog.class);
     26        private EnumMap<Fog, JRadioButton> fogs = new EnumMap<>(Fog.class);
    2727        private ActionListener alFog = new ActionListener() {
    2828                public void actionPerformed(java.awt.event.ActionEvent e) {

  • applications/editors/josm/plugins/smed/src/panels/PanelHaz.java

    r29894 r30737  
    8282        public JRadioButton beaconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BeaconButton.png")));
    8383        public JRadioButton towerButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TowerButton.png")));
    84         public EnumMap<Shp, JRadioButton> shapes = new EnumMap<Shp, JRadioButton>(Shp.class);
    85         public EnumMap<Shp, Obj> carObjects = new EnumMap<Shp, Obj>(Shp.class);
    86         public EnumMap<Shp, Obj> isdObjects = new EnumMap<Shp, Obj>(Shp.class);
     84        public EnumMap<Shp, JRadioButton> shapes = new EnumMap<>(Shp.class);
     85        public EnumMap<Shp, Obj> carObjects = new EnumMap<>(Shp.class);
     86        public EnumMap<Shp, Obj> isdObjects = new EnumMap<>(Shp.class);
    8787        private ActionListener alShape = new ActionListener() {
    8888                public void actionPerformed(java.awt.event.ActionEvent e) {

  • applications/editors/josm/plugins/smed/src/panels/PanelLights.java

    r30532 r30737  
    1919
    2020        public JComboBox<String> landCatBox;
    21         public EnumMap<Cat, Integer> landCats = new EnumMap<Cat, Integer>(Cat.class);
     21        public EnumMap<Cat, Integer> landCats = new EnumMap<>(Cat.class);
    2222        private ActionListener alLandCatBox = new ActionListener() {
    2323                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    3232        };
    3333        public JComboBox<String> trafficCatBox;
    34         public EnumMap<Cat, Integer> trafficCats = new EnumMap<Cat, Integer>(Cat.class);
     34        public EnumMap<Cat, Integer> trafficCats = new EnumMap<>(Cat.class);
    3535        private ActionListener alTrafficCatBox = new ActionListener() {
    3636                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    4545        };
    4646        public JComboBox<String> warningCatBox;
    47         public EnumMap<Cat, Integer> warningCats = new EnumMap<Cat, Integer>(Cat.class);
     47        public EnumMap<Cat, Integer> warningCats = new EnumMap<>(Cat.class);
    4848        private ActionListener alWarningCatBox = new ActionListener() {
    4949                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    5858        };
    5959        public JComboBox<String> platformCatBox;
    60         public EnumMap<Cat, Integer> platformCats = new EnumMap<Cat, Integer>(Cat.class);
     60        public EnumMap<Cat, Integer> platformCats = new EnumMap<>(Cat.class);
    6161        private ActionListener alPlatformCatBox = new ActionListener() {
    6262                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    7171        };
    7272        public JComboBox<String> pilotCatBox;
    73         public EnumMap<Cat, Integer> pilotCats = new EnumMap<Cat, Integer>(Cat.class);
     73        public EnumMap<Cat, Integer> pilotCats = new EnumMap<>(Cat.class);
    7474        private ActionListener alPilotCatBox = new ActionListener() {
    7575                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    8484        };
    8585        public JComboBox<String> rescueCatBox;
    86         public EnumMap<Cat, Integer> rescueCats = new EnumMap<Cat, Integer>(Cat.class);
     86        public EnumMap<Cat, Integer> rescueCats = new EnumMap<>(Cat.class);
    8787        private ActionListener alRescueCatBox = new ActionListener() {
    8888                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    9797        };
    9898        public JComboBox<String> radioCatBox;
    99         public EnumMap<Cat, Integer> radioCats = new EnumMap<Cat, Integer>(Cat.class);
     99        public EnumMap<Cat, Integer> radioCats = new EnumMap<>(Cat.class);
    100100        private ActionListener alRadioCatBox = new ActionListener() {
    101101                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    110110        };
    111111        public JComboBox<String> radarCatBox;
    112         public EnumMap<Cat, Integer> radarCats = new EnumMap<Cat, Integer>(Cat.class);
     112        public EnumMap<Cat, Integer> radarCats = new EnumMap<>(Cat.class);
    113113        private ActionListener alRadarCatBox = new ActionListener() {
    114114                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    124124        public JLabel functionLabel;
    125125        public JComboBox<String> functionBox;
    126         public EnumMap<Fnc, Integer> functions = new EnumMap<Fnc, Integer>(Fnc.class);
     126        public EnumMap<Fnc, Integer> functions = new EnumMap<>(Fnc.class);
    127127        private ActionListener alfunctionBox = new ActionListener() {
    128128                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    151151        public JRadioButton radioButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RadioStationButton.png")));
    152152        public JRadioButton radarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RadarStationButton.png")));
    153         public EnumMap<Obj, JRadioButton> objects = new EnumMap<Obj, JRadioButton>(Obj.class);
     153        public EnumMap<Obj, JRadioButton> objects = new EnumMap<>(Obj.class);
    154154        private ActionListener alObj = new ActionListener() {
    155155                public void actionPerformed(java.awt.event.ActionEvent e) {

  • applications/editors/josm/plugins/smed/src/panels/PanelLit.java

    r30532 r30737  
    4040        public JLabel visibilityLabel;
    4141        public JComboBox<String> visibilityBox;
    42         public EnumMap<Vis, Integer> visibilities = new EnumMap<Vis, Integer>(Vis.class);
     42        public EnumMap<Vis, Integer> visibilities = new EnumMap<>(Vis.class);
    4343        private ActionListener alVisibility = new ActionListener() {
    4444                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    8080        public JLabel categoryLabel;
    8181        public JComboBox<String> categoryBox;
    82         public EnumMap<Lit, Integer> categories = new EnumMap<Lit, Integer>(Lit.class);
     82        public EnumMap<Lit, Integer> categories = new EnumMap<>(Lit.class);
    8383        private ActionListener alCategory = new ActionListener() {
    8484                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    116116        public JLabel exhibitionLabel;
    117117        public JComboBox<String> exhibitionBox;
    118         public EnumMap<Exh, Integer> exhibitions = new EnumMap<Exh, Integer>(Exh.class);
     118        public EnumMap<Exh, Integer> exhibitions = new EnumMap<>(Exh.class);
    119119        private ActionListener alExhibition = new ActionListener() {
    120120                public void actionPerformed(java.awt.event.ActionEvent e) {

  • applications/editors/josm/plugins/smed/src/panels/PanelMore.java

    r30532 r30737  
    4545        public JLabel statusLabel;
    4646        public JComboBox<String> statusBox;
    47         public EnumMap<Sts, Integer> statuses = new EnumMap<Sts, Integer>(Sts.class);
     47        public EnumMap<Sts, Integer> statuses = new EnumMap<>(Sts.class);
    4848        private ActionListener alStatus = new ActionListener() {
    4949                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    5757        public JLabel constrLabel;
    5858        public JComboBox<String> constrBox;
    59         public EnumMap<Cns, Integer> constructions = new EnumMap<Cns, Integer>(Cns.class);
     59        public EnumMap<Cns, Integer> constructions = new EnumMap<>(Cns.class);
    6060        private ActionListener alConstr = new ActionListener() {
    6161                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    6969        public JLabel conLabel;
    7070        public JComboBox<String> conBox;
    71         public EnumMap<Con, Integer> conspicuities = new EnumMap<Con, Integer>(Con.class);
     71        public EnumMap<Con, Integer> conspicuities = new EnumMap<>(Con.class);
    7272        private ActionListener alCon = new ActionListener() {
    7373                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    8181        public JLabel reflLabel;
    8282        public JComboBox<String> reflBox;
    83         public EnumMap<Con, Integer> reflectivities = new EnumMap<Con, Integer>(Con.class);
     83        public EnumMap<Con, Integer> reflectivities = new EnumMap<>(Con.class);
    8484        private ActionListener alRefl = new ActionListener() {
    8585                public void actionPerformed(java.awt.event.ActionEvent e) {

  • applications/editors/josm/plugins/smed/src/panels/PanelPat.java

    r29894 r30737  
    2525        public JRadioButton squareButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SquaredButton.png")));
    2626        public JRadioButton borderButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BorderButton.png")));
    27         public EnumMap<Pat, JRadioButton> patterns = new EnumMap<Pat, JRadioButton>(Pat.class);
     27        public EnumMap<Pat, JRadioButton> patterns = new EnumMap<>(Pat.class);
    2828        private ActionListener alPat = new ActionListener() {
    2929                public void actionPerformed(java.awt.event.ActionEvent e) {

  • applications/editors/josm/plugins/smed/src/panels/PanelPort.java

    r29894 r30737  
    2424        public JRadioButton perchButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PerchPButton.png")));
    2525        public JRadioButton stakeButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/StakeButton.png")));
    26         public EnumMap<Shp, JRadioButton> shapes = new EnumMap<Shp, JRadioButton>(Shp.class);
    27         public EnumMap<Shp, Obj> objects = new EnumMap<Shp, Obj>(Shp.class);
     26        public EnumMap<Shp, JRadioButton> shapes = new EnumMap<>(Shp.class);
     27        public EnumMap<Shp, Obj> objects = new EnumMap<>(Shp.class);
    2828        public ActionListener alShape = new ActionListener() {
    2929                public void actionPerformed(java.awt.event.ActionEvent e) {

  • applications/editors/josm/plugins/smed/src/panels/PanelRadar.java

    r30532 r30737  
    2929        };
    3030        private JComboBox<String> radioCatBox;
    31         private EnumMap<Cat, Integer> radioCats = new EnumMap<Cat, Integer>(Cat.class);
     31        private EnumMap<Cat, Integer> radioCats = new EnumMap<>(Cat.class);
    3232        private ActionListener alRadioCatBox = new ActionListener() {
    3333                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    4646        public JRadioButton raconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RaconButton.png")));
    4747        public JRadioButton leadingButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LeadingRaconButton.png")));
    48         private EnumMap<Rtb, JRadioButton> rads = new EnumMap<Rtb, JRadioButton>(Rtb.class);
     48        private EnumMap<Rtb, JRadioButton> rads = new EnumMap<>(Rtb.class);
    4949        private ActionListener alRad = new ActionListener() {
    5050                public void actionPerformed(java.awt.event.ActionEvent e) {

  • applications/editors/josm/plugins/smed/src/panels/PanelSaw.java

    r29894 r30737  
    2020        public JRadioButton floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FloatButton.png")));
    2121        public JRadioButton beaconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BeaconButton.png")));
    22         public EnumMap<Shp, JRadioButton> shapes = new EnumMap<Shp, JRadioButton>(Shp.class);
    23         public EnumMap<Shp, Obj> objects = new EnumMap<Shp, Obj>(Shp.class);
     22        public EnumMap<Shp, JRadioButton> shapes = new EnumMap<>(Shp.class);
     23        public EnumMap<Shp, Obj> objects = new EnumMap<>(Shp.class);
    2424        public ActionListener alShape = new ActionListener() {
    2525                public void actionPerformed(java.awt.event.ActionEvent e) {

  • applications/editors/josm/plugins/smed/src/panels/PanelSectors.java

    r30532 r30737  
    3737        };
    3838        public JComboBox<ImageIcon> colourBox;
    39         public EnumMap<Col, ImageIcon> colours = new EnumMap<Col, ImageIcon>(Col.class);
     39        public EnumMap<Col, ImageIcon> colours = new EnumMap<>(Col.class);
    4040        public JComboBox<String> visibilityBox;
    41         public EnumMap<Vis, String> visibilities = new EnumMap<Vis, String>(Vis.class);
     41        public EnumMap<Vis, String> visibilities = new EnumMap<>(Vis.class);
    4242        public JComboBox<String> exhibitionBox;
    43         public EnumMap<Exh, String> exhibitions = new EnumMap<Exh, String>(Exh.class);
     43        public EnumMap<Exh, String> exhibitions = new EnumMap<>(Exh.class);
    4444
    4545        public PanelSectors(SmedAction dia) {

  • applications/editors/josm/plugins/smed/src/panels/PanelSpec.java

    r30532 r30737  
    1818        public JLabel categoryLabel;
    1919        public JComboBox<String> categoryBox;
    20         public EnumMap<Cat, Integer> categories = new EnumMap<Cat, Integer>(Cat.class);
     20        public EnumMap<Cat, Integer> categories = new EnumMap<>(Cat.class);
    2121        private ActionListener alCategoryBox = new ActionListener() {
    2222                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    2929        };
    3030        public JComboBox<String> mooringBox;
    31         public EnumMap<Cat, Integer> moorings = new EnumMap<Cat, Integer>(Cat.class);
     31        public EnumMap<Cat, Integer> moorings = new EnumMap<>(Cat.class);
    3232        private ActionListener alMooringBox = new ActionListener() {
    3333                public void actionPerformed(java.awt.event.ActionEvent e) {
    … …  
    6262        public JRadioButton stakeButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/StakeButton.png")));
    6363        public JRadioButton cairnButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CairnButton.png")));
    64         public EnumMap<Shp, JRadioButton> shapes = new EnumMap<Shp, JRadioButton>(Shp.class);
    65         public EnumMap<Shp, Obj> objects = new EnumMap<Shp, Obj>(Shp.class);
     64        public EnumMap<Shp, JRadioButton> shapes = new EnumMap<>(Shp.class);
     65        public EnumMap<Shp, Obj> objects = new EnumMap<>(Shp.class);
    6666        public ActionListener alShape = new ActionListener() {
    6767                public void actionPerformed(java.awt.event.ActionEvent e) {

  • applications/editors/josm/plugins/smed/src/panels/PanelStbd.java

    r29894 r30737  
    2424        public JRadioButton perchButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PerchSButton.png")));
    2525        public JRadioButton stakeButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/StakeButton.png")));
    26         public EnumMap<Shp, JRadioButton> shapes = new EnumMap<Shp, JRadioButton>(Shp.class);
    27         public EnumMap<Shp, Obj> objects = new EnumMap<Shp, Obj>(Shp.class);
     26        public EnumMap<Shp, JRadioButton> shapes = new EnumMap<>(Shp.class);
     27        public EnumMap<Shp, Obj> objects = new EnumMap<>(Shp.class);
    2828        public ActionListener alShape = new ActionListener() {
    2929                public void actionPerformed(java.awt.event.ActionEvent e) {

  • applications/editors/josm/plugins/smed/src/panels/PanelTop.java

    r29894 r30737  
    3232        public JRadioButton squareDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SquareDayButton.png")));
    3333        public JRadioButton circleDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CircleDayButton.png")));
    34         private EnumMap<Top, JRadioButton> tops = new EnumMap<Top, JRadioButton>(Top.class);
     34        private EnumMap<Top, JRadioButton> tops = new EnumMap<>(Top.class);
    3535        private ActionListener alTop = new ActionListener() {
    3636                public void actionPerformed(java.awt.event.ActionEvent e) {

  • applications/editors/josm/plugins/smed/src/seamarks/SeaMark.java

    r30287 r30737  
    3030        }
    3131
    32         public static final EnumMap<Reg, String> RegSTR = new EnumMap<Reg, String>(Reg.class);
     32        public static final EnumMap<Reg, String> RegSTR = new EnumMap<>(Reg.class);
    3333        static {
    3434                RegSTR.put(Reg.A, "iala-a");
    … …  
    6969        }
    7070
    71         public static final EnumMap<Obj, String> ObjSTR = new EnumMap<Obj, String>(Obj.class);
     71        public static final EnumMap<Obj, String> ObjSTR = new EnumMap<>(Obj.class);
    7272        static {
    7373                ObjSTR.put(Obj.BCNCAR, "beacon_cardinal");
    … …  
    130130        }
    131131
    132         public static final EnumMap<Obj, Ent> EntMAP = new EnumMap<Obj, Ent>(Obj.class);
     132        public static final EnumMap<Obj, Ent> EntMAP = new EnumMap<>(Obj.class);
    133133        static {
    134134                EntMAP.put(Obj.BCNCAR, Ent.BEACON);
    … …  
    170170        }
    171171
    172         public static final EnumMap<Obj, Grp> GrpMAP = new EnumMap<Obj, Grp>(Obj.class);
     172        public static final EnumMap<Obj, Grp> GrpMAP = new EnumMap<>(Obj.class);
    173173        static {
    174174                GrpMAP.put(Obj.UNKOBJ, Grp.NUL);
    … …  
    229229        }
    230230                 
    231         public static final EnumMap<Cat, String> CatSTR = new EnumMap<Cat, String>(Cat.class);
     231        public static final EnumMap<Cat, String> CatSTR = new EnumMap<>(Cat.class);
    232232        static {
    233233                CatSTR.put(Cat.LAM_PORT, "port");
    … …  
    435435        }
    436436
    437         public static final EnumMap<Shp, String> ShpSTR = new EnumMap<Shp, String>(Shp.class);
     437        public static final EnumMap<Shp, String> ShpSTR = new EnumMap<>(Shp.class);
    438438        static {
    439439                ShpSTR.put(Shp.PILLAR, "pillar");
    … …  
    469469        }
    470470
    471         public static final EnumMap<Col, Color> ColMAP = new EnumMap<Col, Color>(Col.class);
     471        public static final EnumMap<Col, Color> ColMAP = new EnumMap<>(Col.class);
    472472        static {
    473473                ColMAP.put(Col.UNKCOL, new Color(0xc0c0c0));
    … …  
    487487        }
    488488
    489         public static final EnumMap<Col, String> ColSTR = new EnumMap<Col, String>(Col.class);
     489        public static final EnumMap<Col, String> ColSTR = new EnumMap<>(Col.class);
    490490        static {
    491491                ColSTR.put(Col.WHITE, "white");
    … …  
    539539        }
    540540
    541         private ArrayList<Col> bodyColour = new ArrayList<Col>();
     541        private ArrayList<Col> bodyColour = new ArrayList<>();
    542542
    543543        public Col getObjColour(int i) {
    … …  
    577577        }
    578578
    579         private ArrayList<Col> topmarkColour = new ArrayList<Col>();
     579        private ArrayList<Col> topmarkColour = new ArrayList<>();
    580580
    581581        public Col getTopColour(int i) {
    … …  
    619619        }
    620620
    621         public static final Map<EnumSet<Chr>, String> ChrMAP = new HashMap<EnumSet<Chr>, String>();
     621        public static final Map<EnumSet<Chr>, String> ChrMAP = new HashMap<>();
    622622        static {
    623623                ChrMAP.put(EnumSet.of(Chr.FIXED), "F");
    … …  
    654654        }
    655655
    656         public static final EnumMap<Vis, String> VisSTR = new EnumMap<Vis, String>(Vis.class);
     656        public static final EnumMap<Vis, String> VisSTR = new EnumMap<>(Vis.class);
    657657        static {
    658658                VisSTR.put(Vis.HIGH, "high");
    … …  
    670670        }
    671671
    672         public static final EnumMap<Lit, String> LitSTR = new EnumMap<Lit, String>(Lit.class);
     672        public static final EnumMap<Lit, String> LitSTR = new EnumMap<>(Lit.class);
    673673        static {
    674674                LitSTR.put(Lit.VERT, "vertical");
    … …  
    696696        }
    697697
    698         public static final EnumMap<Exh, String> ExhSTR = new EnumMap<Exh, String>(Exh.class);
     698        public static final EnumMap<Exh, String> ExhSTR = new EnumMap<>(Exh.class);
    699699        static {
    700700                ExhSTR.put(Exh.H24, "24h");
    … …  
    713713                        "", "", "", Vis.UNKVIS, Exh.UNKEXH, "", "", Col.UNKCOL };
    714714
    715         private ArrayList<Object[]> sectors = new ArrayList<Object[]>();
     715        private ArrayList<Object[]> sectors = new ArrayList<>();
    716716
    717717        public int getSectorCount() {
    … …  
    801801        }
    802802
    803         public static final EnumMap<Pat, String> PatSTR = new EnumMap<Pat, String>(Pat.class);
     803        public static final EnumMap<Pat, String> PatSTR = new EnumMap<>(Pat.class);
    804804        static {
    805805                PatSTR.put(Pat.HSTRP, "horizontal");
    … …  
    850850        }
    851851
    852         public static final EnumMap<Top, String> TopSTR = new EnumMap<Top, String>(Top.class);
     852        public static final EnumMap<Top, String> TopSTR = new EnumMap<>(Top.class);
    853853        static {
    854854                TopSTR.put(Top.CYL, "cylinder");
    … …  
    895895        }
    896896
    897         public static final EnumMap<Rtb, String> RtbSTR = new EnumMap<Rtb, String>(Rtb.class);
     897        public static final EnumMap<Rtb, String> RtbSTR = new EnumMap<>(Rtb.class);
    898898        static {
    899899                RtbSTR.put(Rtb.RACON, "racon");
    … …  
    991991        }
    992992
    993         public static final EnumMap<Fog, String> FogSTR = new EnumMap<Fog, String>(Fog.class);
     993        public static final EnumMap<Fog, String> FogSTR = new EnumMap<>(Fog.class);
    994994        static {
    995995                FogSTR.put(Fog.FOGSIG, "yes");
    … …  
    10681068        }
    10691069
    1070         public static final EnumMap<Sts, String> StsSTR = new EnumMap<Sts, String>(Sts.class);
     1070        public static final EnumMap<Sts, String> StsSTR = new EnumMap<>(Sts.class);
    10711071        static {
    10721072                StsSTR.put(Sts.PERM, "permanent");
    … …  
    11041104        }
    11051105
    1106         public static final EnumMap<Cns, String> CnsSTR = new EnumMap<Cns, String>(Cns.class);
     1106        public static final EnumMap<Cns, String> CnsSTR = new EnumMap<>(Cns.class);
    11071107        static {
    11081108                CnsSTR.put(Cns.BRICK, "masonry");
    … …  
    11311131        }
    11321132
    1133         public static final EnumMap<Con, String> ConSTR = new EnumMap<Con, String>(Con.class);
     1133        public static final EnumMap<Con, String> ConSTR = new EnumMap<>(Con.class);
    11341134        static {
    11351135                ConSTR.put(Con.CONSP, "conspicuous");
    … …  
    11641164        }
    11651165
    1166         public static final EnumMap<Fnc, String> FncSTR = new EnumMap<Fnc, String>(Fnc.class);
     1166        public static final EnumMap<Fnc, String> FncSTR = new EnumMap<>(Fnc.class);
    11671167        static {
    11681168                FncSTR.put(Fnc.UNKFNC, "");
Note: See TracChangeset for help on using the changeset viewer.