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/turnrestrictions
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionBuilder.java

    r30365 r30737  
    7777     */
    7878    static public Node getUniqueCommonNode(Way w1, Way w2) throws IllegalArgumentException{
    79         Set<Node> w1Nodes = new HashSet<Node>(w1.getNodes());
     79        Set<Node> w1Nodes = new HashSet<>(w1.getNodes());
    8080        w1Nodes.retainAll(w2.getNodes());
    8181        if (w1Nodes.size() != 1) return null;
    … …  
    295295    public synchronized Relation buildFromSelection(OsmDataLayer layer) {
    296296        CheckParameterUtil.ensureParameterNotNull(layer, "layer");
    297         List<OsmPrimitive> selection = new ArrayList<OsmPrimitive>(layer.data.getSelected());
     297        List<OsmPrimitive> selection = new ArrayList<>(layer.data.getSelected());
    298298        return build(selection);
    299299    }

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

    r23510 r30737  
    3535
    3636   
    37     private List<PrimitiveId> ids = new ArrayList<PrimitiveId>();
     37    private List<PrimitiveId> ids = new ArrayList<>();
    3838   
    3939    /**

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

    r30651 r30737  
    2020    static public final Set<String> STANDARD_VEHICLE_EXCEPTION_VALUES;
    2121    static {
    22         HashSet<String> s = new HashSet<String>();
     22        HashSet<String> s = new HashSet<>();
    2323        s.add("psv");
    2424        s.add("hgv");
    … …  
    4444    private String value = "";
    4545    private boolean isStandard = true;
    46     private final Set<String> vehicleExceptions = new HashSet<String>();
     46    private final Set<String> vehicleExceptions = new HashSet<>();
    4747   
    4848    protected void parseValue(String value) {
    … …  
    9191            // is based on getValue()
    9292            //
    93             List<String> values = new ArrayList<String>(vehicleExceptions);
     93            List<String> values = new ArrayList<>(vehicleExceptions);
    9494            Collections.sort(values);
    9595            for (String v: values){

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

    r30454 r30737  
    3737    //static private final Logger logger = Logger.getLogger(JosmSelectionListModel.class.getName());
    3838   
    39     private final List<OsmPrimitive> selection = new ArrayList<OsmPrimitive>();
     39    private final List<OsmPrimitive> selection = new ArrayList<>();
    4040    private final DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
    4141    private OsmDataLayer layer;
    … …  
    6969     */
    7070    public Collection<OsmPrimitive> getSelected() {
    71         Set<OsmPrimitive> sel = new HashSet<OsmPrimitive>();
     71        Set<OsmPrimitive> sel = new HashSet<>();
    7272        for(int i=0; i< getSize();i++) {
    7373            if (selectionModel.isSelectedIndex(i)) {
    … …  
    219219    /* ------------------------------------------------------------------------ */
    220220    public List<PrimitiveId> getSelectedPrimitiveIds() {
    221         List<PrimitiveId> ret = new ArrayList<PrimitiveId>(getSelected().size());
     221        List<PrimitiveId> ret = new ArrayList<>(getSelected().size());
    222222        for(int i=0; i< selection.size(); i++) {
    223223            if (selectionModel.isSelectedIndex(i)) {

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

    r30365 r30737  
    2525public class RelationMemberEditorModel extends AbstractTableModel{ 
    2626    //static private final Logger logger = Logger.getLogger(RelationMemberEditorModel.class.getName());
    27     private final ArrayList<RelationMemberModel> members = new ArrayList<RelationMemberModel>();
     27    private final ArrayList<RelationMemberModel> members = new ArrayList<>();
    2828    private OsmDataLayer layer;
    2929    private DefaultListSelectionModel rowSelectionModel;
    … …  
    8989     */
    9090    protected Set<OsmPrimitive> getPrimitivesWithRole(String role) {
    91         HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
     91        HashSet<OsmPrimitive> ret = new HashSet<>();
    9292        for (RelationMemberModel rm: members){
    9393            if (rm.getRole().equals(role)){
    … …  
    108108     */
    109109    protected List<RelationMemberModel> getRelationMembersWithRole(String role) {
    110         ArrayList<RelationMemberModel> ret = new ArrayList<RelationMemberModel>();
     110        ArrayList<RelationMemberModel> ret = new ArrayList<>();
    111111        for (RelationMemberModel rm: members){
    112112            if (rm.getRole().equals(role)){
    … …  
    163163     */
    164164    public List<OsmPrimitive> getVias() {
    165         ArrayList<OsmPrimitive> ret = new ArrayList<OsmPrimitive>();
     165        ArrayList<OsmPrimitive> ret = new ArrayList<>();
    166166        for (RelationMemberModel rm: getRelationMembersWithRole("via")){
    167167            ret.add(layer.data.getPrimitiveById(rm.getTarget()));
    … …  
    268268     */
    269269    public Set<OsmPrimitive> getMemberPrimitives() {
    270         Set<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
     270        Set<OsmPrimitive> ret = new HashSet<>();
    271271        for (RelationMemberModel rm: members){
    272272            OsmPrimitive p = layer.data.getPrimitiveById(rm.getTarget());
    … …  
    302302    public void applyTo(Relation tr){
    303303        if (tr == null) return;
    304         List<RelationMember> newMembers = new ArrayList<RelationMember>();
     304        List<RelationMember> newMembers = new ArrayList<>();
    305305        for(RelationMemberModel model: members){
    306306            RelationMember rm = new RelationMember(model.getRole(), layer.data.getPrimitiveById(model.getTarget()));
    … …  
    351351   
    352352    protected List<Integer> getSelectedIndices() {
    353         ArrayList<Integer> ret = new ArrayList<Integer>();
     353        ArrayList<Integer> ret = new ArrayList<>();
    354354        for(int i =0; i < members.size(); i++){
    355355            if (rowSelectionModel.isSelectedIndex(i))
    … …  
    416416    public void insertMembers(Collection<PrimitiveId> ids) throws IllegalArgumentException {
    417417        if (ids == null) return;   
    418         ArrayList<RelationMemberModel> newMembers = new ArrayList<RelationMemberModel>();
     418        ArrayList<RelationMemberModel> newMembers = new ArrayList<>();
    419419        for (PrimitiveId id: ids){
    420420            OsmPrimitive p = layer.data.getPrimitiveById(id);

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

    r30454 r30737  
    2323   
    2424    private TurnRestrictionEditorModel model;
    25     final private List<Object> values = new ArrayList<Object>();
     25    final private List<Object> values = new ArrayList<>();
    2626    private String selectedTagValue = null;
    2727    private final transient EventListenerList listeners = new EventListenerList();

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

    r30307 r30737  
    441441         */
    442442        protected List<RelationMember> getDeletedRelationMembers(Relation r) {
    443             List<RelationMember> ret = new ArrayList<RelationMember>();
     443            List<RelationMember> ret = new ArrayList<>();
    444444            for(RelationMember rm: r.getMembers()) {
    445445                if (rm.getMember().isDeleted() || !rm.getMember().isVisible()) {
    … …  
    567567            Relation toUpdate = new Relation(getTurnRestriction());
    568568            editorModel.apply(toUpdate);
    569             Conflict<Relation> conflict = new Conflict<Relation>(getTurnRestriction(), toUpdate);
     569            Conflict<Relation> conflict = new Conflict<>(getTurnRestriction(), toUpdate);
    570570            Main.main.undoRedo.add(new ConflictAddCommand(getLayer(),conflict));
    571571        }

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

    r29854 r30737  
    9797
    9898    /** the map of open dialogs */
    99     private final HashMap<DialogContext, TurnRestrictionEditor> openDialogs =  new HashMap<DialogContext, TurnRestrictionEditor>();
     99    private final HashMap<DialogContext, TurnRestrictionEditor> openDialogs =  new HashMap<>();
    100100
    101101    /**

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

    r30365 r30737  
    6262 
    6363    private JLabel lblOsmObject;
    64     private final Set<OsmPrimitive> legs = new HashSet<OsmPrimitive>();
     64    private final Set<OsmPrimitive> legs = new HashSet<>();
    6565    private TurnRestrictionEditorModel model;
    6666    private TurnRestrictionLegRole role;

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

    r29854 r30737  
    6767     */
    6868    static public Collection<Relation> getTurnRestrictionsParticipatingIn(Collection<OsmPrimitive> primitives){
    69         HashSet<Relation> ret = new HashSet<Relation>();
     69        HashSet<Relation> ret = new HashSet<>();
    7070        if (primitives == null) return ret;
    7171        for (OsmPrimitive p: primitives){
    … …  
    296296   
    297297    private static class TurnRestrictionTableModel extends AbstractTableModel {
    298         private final ArrayList<Relation> turnrestrictions = new ArrayList<Relation>();
     298        private final ArrayList<Relation> turnrestrictions = new ArrayList<>();
    299299
    300300        public TurnRestrictionTableModel(Collection<Relation> turnrestrictions){

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

    r30454 r30737  
    2121public class TurnRestrictionTypeRenderer extends JLabel implements ListCellRenderer<Object> {
    2222 
    23     final private Map<TurnRestrictionType, ImageIcon> icons = new HashMap<TurnRestrictionType, ImageIcon>();
     23    final private Map<TurnRestrictionType, ImageIcon> icons = new HashMap<>();
    2424    private String iconSet = "set-a";
    2525   

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

    r30454 r30737  
    2626   
    2727    private DefaultListSelectionModel selectionModel;
    28     private final ArrayList<OsmPrimitive> vias = new ArrayList<OsmPrimitive>();
     28    private final ArrayList<OsmPrimitive> vias = new ArrayList<>();
    2929    private TurnRestrictionEditorModel model;
    3030   
    … …  
    5252     */
    5353    public List<OsmPrimitive> getSelectedVias() {
    54         ArrayList<OsmPrimitive> ret = new ArrayList<OsmPrimitive>();
     54        ArrayList<OsmPrimitive> ret = new ArrayList<>();
    5555        for (int i=0; i < getSize(); i++) {
    5656            if (selectionModel.isSelectedIndex(i)) {
    … …  
    8282     */
    8383    public List<Integer> getSelectedRows() {
    84         ArrayList<Integer> ret = new ArrayList<Integer>();
     84        ArrayList<Integer> ret = new ArrayList<>();
    8585        for (int i=0; i < getSize(); i++) {
    8686            if (selectionModel.isSelectedIndex(i)) {
    … …  
    9292   
    9393    protected List<Integer> moveUp(List<Integer> rows, int targetRow) {
    94         List<Integer> ret = new ArrayList<Integer>(rows.size());
     94        List<Integer> ret = new ArrayList<>(rows.size());
    9595        int delta = rows.get(0) - targetRow;
    9696        for(int row: rows) {
    … …  
    103103   
    104104    protected List<Integer> moveDown(List<Integer> rows, int targetRow) {
    105         List<Integer> ret = new ArrayList<Integer>(rows.size());
     105        List<Integer> ret = new ArrayList<>(rows.size());
    106106        int delta = targetRow - rows.get(0);
    107107        for(int i = rows.size()-1; i >=0; i--) {
    … …  
    170170    public void insertVias(List<PrimitiveId> idsToInsert) {
    171171        if (idsToInsert == null) return;
    172         List<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>(idsToInsert.size());
     172        List<OsmPrimitive> primitives = new ArrayList<>(idsToInsert.size());
    173173        DataSet ds = model.getLayer().data;
    174174        for(PrimitiveId id: idsToInsert){
    … …  
    181181        }
    182182        int targetRow = Math.max(selectionModel.getMinSelectionIndex(),0);
    183         List<OsmPrimitive> newVias = new ArrayList<OsmPrimitive>(vias);
     183        List<OsmPrimitive> newVias = new ArrayList<>(vias);
    184184        newVias.addAll(targetRow, primitives);
    185185        model.setVias(newVias);
    … …  
    195195     */
    196196    public void removeSelectedVias() {
    197         ArrayList<OsmPrimitive> newVias = new ArrayList<OsmPrimitive>(vias);
     197        ArrayList<OsmPrimitive> newVias = new ArrayList<>(vias);
    198198        int j = 0;
    199199        for(int i=0; i< getSize();i++){
    … …  
    230230    /* ----------------------------------------------------------------------- */
    231231    public List<PrimitiveId> getSelectedPrimitiveIds() {
    232         ArrayList<PrimitiveId> ids = new ArrayList<PrimitiveId>();
     232        ArrayList<PrimitiveId> ids = new ArrayList<>();
    233233        for (OsmPrimitive p: getSelectedVias()) {
    234234            ids.add(p.getPrimitiveId());

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

    r30454 r30737  
    4343   
    4444    /** the names of restriction types */
    45     static private Set<String> RESTRICTION_TYPES = new HashSet<String>(
     45    static private Set<String> RESTRICTION_TYPES = new HashSet<>(
    4646            Arrays.asList(new String[] {
    4747                    "no_left_turn",

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

    r30145 r30737  
    4747     */
    4848    protected List<Relation> filterTurnRestrictions(Collection<? extends OsmPrimitive> primitives) {
    49         List<Relation> ret = new LinkedList<Relation>();
     49        List<Relation> ret = new LinkedList<>();
    5050        if (primitives == null) return ret;
    5151        for(OsmPrimitive p: primitives){
    … …  
    6464            return;
    6565        }
    66         List<Relation> turnRestrictions = new LinkedList<Relation>();
     66        List<Relation> turnRestrictions = new LinkedList<>();
    6767        for (Relation r: newLayer.data.getRelations()) {
    6868            if (isValid(r) && isTurnRestriction(r)) {

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

    r29854 r30737  
    3232     */
    3333    public void initFromSelection(Collection<? extends OsmPrimitive> selection) {
    34         Set<Relation> turnRestrictions = new HashSet<Relation>();
     34        Set<Relation> turnRestrictions = new HashSet<>();
    3535        if (selection == null) return;
    3636        for (OsmPrimitive p: selection) {

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

    r30454 r30737  
    204204        }
    205205        protected Collection<RelationMember> getMembersForCurrentSelection(Relation r) {
    206             Collection<RelationMember> members = new HashSet<RelationMember>();
     206            Collection<RelationMember> members = new HashSet<>();
    207207            Collection<OsmPrimitive> selection = Main.main.getEditLayer().data.getSelected();
    208208            for (RelationMember member: r.getMembers()) {

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

    r30454 r30737  
    2222 */
    2323public class TurnRestrictionsListModel extends AbstractListModel<Relation> {
    24     private final ArrayList<Relation> turnrestrictions = new ArrayList<Relation>();
     24    private final ArrayList<Relation> turnrestrictions = new ArrayList<>();
    2525    private DefaultListSelectionModel selectionModel;
    2626
    … …  
    141141    public void removeTurnRestrictions(Collection<? extends OsmPrimitive> removedPrimitives) {
    142142        if (removedPrimitives == null) return;
    143         Set<Relation> removedTurnRestrictions = new HashSet<Relation>();
     143        Set<Relation> removedTurnRestrictions = new HashSet<>();
    144144        for (OsmPrimitive p: removedPrimitives) {
    145145            if (!isTurnRestriction(p)) continue;
    … …  
    172172     */
    173173    public List<Relation> getSelectedNonNewRelations() {
    174         ArrayList<Relation> ret = new ArrayList<Relation>();
     174        ArrayList<Relation> ret = new ArrayList<>();
    175175        for (int i=0; i<getSize();i++) {
    176176            if (!selectionModel.isSelectedIndex(i)) {
    … …  
    192192     */
    193193    public List<Relation> getSelectedTurnRestrictions() {
    194         ArrayList<Relation> ret = new ArrayList<Relation>();
     194        ArrayList<Relation> ret = new ArrayList<>();
    195195        for (int i=0; i<getSize();i++) {
    196196            if (!selectionModel.isSelectedIndex(i)) {

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

    r26509 r30737  
    2121    protected IssuesModel parent;
    2222    protected Severity severity;
    23     protected final ArrayList<Action> actions = new ArrayList<Action>();
     23    protected final ArrayList<Action> actions = new ArrayList<>();
    2424   
    2525    /**

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

    r30365 r30737  
    3333 */
    3434public class IssuesModel extends Observable implements Observer{
    35     private final ArrayList<Issue> issues = new ArrayList<Issue>();
     35    private final ArrayList<Issue> issues = new ArrayList<>();
    3636    private TurnRestrictionEditorModel editorModel;
    3737   

  • applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditorTest.java

    r30557 r30737  
    8181        PrimitiveIdListProvider provider = new PrimitiveIdListProvider() {         
    8282            public List<PrimitiveId> getSelectedPrimitiveIds() {
    83                 List<PrimitiveId> ret = new ArrayList<PrimitiveId>();
     83                List<PrimitiveId> ret = new ArrayList<>();
    8484                int [] sel = lstObjects.getSelectedIndices();
    8585                for (int i: sel){

  • applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssuesViewTest.java

    r30557 r30737  
    5050        c.add(pane, gc);
    5151       
    52         List<Issue> issues = new ArrayList<Issue>();
     52        List<Issue> issues = new ArrayList<>();
    5353        issues.add(new RequiredTagMissingError(model, "type", "restriction"));
    5454        issues.add(new MissingRestrictionTypeError(model));
Note: See TracChangeset for help on using the changeset viewer.