Changeset 11553 in josm for trunk/src/org/openstreetmap/josm/io/GpxExporter.java
- Timestamp:
- 2017-02-12T16:32:18+01:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/GpxExporter.java
r11035 r11553 13 13 import java.text.MessageFormat; 14 14 import java.time.Year; 15 import java.util.Optional; 15 16 16 17 import javax.swing.JButton; … … 223 224 if (enable) { 224 225 if (copyrightYear.getText().isEmpty()) { 225 String sCopyrightYear = data.getString(META_COPYRIGHT_YEAR); 226 if (sCopyrightYear == null) { 227 sCopyrightYear = Year.now().toString(); 228 } 229 copyrightYear.setText(sCopyrightYear); 226 copyrightYear.setText(Optional.ofNullable(data.getString(META_COPYRIGHT_YEAR)).orElseGet( 227 () -> Year.now().toString())); 230 228 } 231 229 if (copyright.getText().isEmpty()) { 232 String sCopyright = data.getString(META_COPYRIGHT_LICENSE); 233 if (sCopyright == null) { 234 sCopyright = Main.pref.get("lastCopyright", "https://creativecommons.org/licenses/by-sa/2.5"); 235 } 236 copyright.setText(sCopyright); 230 copyright.setText(Optional.ofNullable(data.getString(META_COPYRIGHT_LICENSE)).orElseGet( 231 () -> Main.pref.get("lastCopyright", "https://creativecommons.org/licenses/by-sa/2.5"))); 237 232 copyright.setCaretPosition(0); 238 233 } … … 282 277 emailLabel.setEnabled(b); 283 278 if (b) { 284 String sAuthorName = data.getString(META_AUTHOR_NAME); 285 if (sAuthorName == null) { 286 sAuthorName = Main.pref.get("lastAuthorName"); 287 } 288 authorName.setText(sAuthorName); 289 String sEmail = data.getString(META_AUTHOR_EMAIL); 290 if (sEmail == null) { 291 sEmail = Main.pref.get("lastAuthorEmail"); 292 } 293 email.setText(sEmail); 279 authorName.setText(Optional.ofNullable(data.getString(META_AUTHOR_NAME)).orElseGet(() -> Main.pref.get("lastAuthorName"))); 280 email.setText(Optional.ofNullable(data.getString(META_AUTHOR_EMAIL)).orElseGet(() -> Main.pref.get("lastAuthorEmail"))); 294 281 } else { 295 282 authorName.setText("");
Note:
See TracChangeset
for help on using the changeset viewer.