Changeset 13496 in josm


Ignore:
Timestamp:
2018-03-04T14:19:16+01:00 (14 months ago)
Author:
Don-vip
Message:

minor fixes

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

    r13490 r13496  
    495495            if (!sel.isEmpty()) {
    496496                DataSet ds = sel.iterator().next().getDataSet();
    497                 if (ds != null) {
    498                     disableApply = ds.isLocked();
    499                 }
     497                disableApply = ds != null && ds.isLocked();
    500498            }
    501499            answer = new PresetDialog(p, title, preset_name_label ? null : (ImageIcon) getValue(Action.SMALL_ICON),
  • trunk/test/unit/org/openstreetmap/josm/actions/upload/ValidateUploadHookTest.java

    r12571 r13496  
    2121    @Rule
    2222    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    23     public JOSMTestRules test = new JOSMTestRules().platform().fakeAPI().timeout(20000);
     23    public JOSMTestRules test = new JOSMTestRules().platform().fakeAPI().timeout(30000);
    2424
    2525    /**
Note: See TracChangeset for help on using the changeset viewer.