Changeset 10938 in josm
- Timestamp:
- 2016-09-03T12:37:39+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
r10763 r10938 83 83 private List<Changeset> changesets; 84 84 private Exception lastException; 85 private UserInfo userInfo;86 85 87 86 private DownloadOpenChangesetsTask() { … … 121 120 protected void realRun() throws SAXException, IOException, OsmTransferException { 122 121 try { 123 userInfo = fetchUserInfo();122 UserInfo userInfo = fetchUserInfo(); 124 123 if (canceled) 125 124 return; -
trunk/src/org/openstreetmap/josm/data/AutosaveTask.java
r10621 r10938 94 94 private final Set<DataSet> changedDatasets = new HashSet<>(); 95 95 private final List<AutosaveLayerInfo> layersInfo = new ArrayList<>(); 96 private Timer timer;97 96 private final Object layersLock = new Object(); 98 97 private final Deque<File> deletedLayers = new LinkedList<>(); … … 132 131 } 133 132 134 timer = new Timer(true); 135 timer.schedule(this, 1000L, PROP_INTERVAL.get() * 1000L); 133 new Timer(true).schedule(this, 1000L, PROP_INTERVAL.get() * 1000L); 136 134 Main.getLayerManager().addLayerChangeListener(this, true); 137 135 } -
trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java
r10723 r10938 18 18 // transient to avoid serialization, volatile to avoid synchronization of whole getImage() method 19 19 private transient volatile BufferedImage img; 20 private transient volatile boolean writtenToDisk;21 20 // we need to have separate control variable, to know, if we already tried to load the image, as img might be null 22 21 // after we loaded image, as for example, when image file is malformed (eg. HTML file) … … 79 78 } 80 79 out.writeObject(this); 81 // ugly hack to wait till element will get to disk to clean the memory82 writtenToDisk = true;83 80 84 81 if (img != null) { -
trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
r10378 r10938 159 159 * Constants used in the transformation. 160 160 */ 161 private double b, a,e;162 163 /** 164 * Convenience value equal to {@ link #a} / {@link #b}.161 private double b, e; 162 163 /** 164 * Convenience value equal to {@code a} / {@link #b}. 165 165 */ 166 166 private double arb; 167 167 168 168 /** 169 * Convenience value equal to {@ link #a}×{@link #b}.169 * Convenience value equal to {@code a}×{@link #b}. 170 170 */ 171 171 private double ab; 172 172 173 173 /** 174 * Convenience value equal to {@link #b} / {@ link #a}.174 * Convenience value equal to {@link #b} / {@code a}. 175 175 */ 176 176 private double bra; … … 237 237 double temp = cosph0 * cosph0; 238 238 b = Math.sqrt(1.0 + e2 * (temp * temp) / (1.0 - e2)); 239 a = b * com / con;239 double a = b * com / con; 240 240 final double d = b * com / (cosph0 * Math.sqrt(con)); 241 241 double f = d * d - 1.0; -
trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
r10763 r10938 86 86 private ShowChangesetInfoAction showChangesetInfoAction; 87 87 private CloseOpenChangesetsAction closeChangesetAction; 88 private LaunchChangesetManagerAction launchChangesetManagerAction;89 88 90 89 private ChangesetDialogPopup popupMenu; … … 206 205 cbInSelectionOnly.addItemListener(showChangesetInfoAction); 207 206 208 // -- launch changeset manager action209 launchChangesetManagerAction = new LaunchChangesetManagerAction();210 211 207 popupMenu = new ChangesetDialogPopup(lstInActiveDataLayer, lstInSelection); 212 208 … … 220 216 new SideButton(closeChangesetAction, false), 221 217 new SideButton(showChangesetInfoAction, false), 222 new SideButton( launchChangesetManagerAction, false)218 new SideButton(new LaunchChangesetManagerAction(), false) 223 219 })); 224 220 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
r10680 r10938 59 59 private UserTableModel model; 60 60 private SelectUsersPrimitivesAction selectionUsersPrimitivesAction; 61 private ShowUserInfoAction showUserInfoAction;62 61 63 62 /** … … 95 94 // -- info action 96 95 // 97 showUserInfoAction = new ShowUserInfoAction();96 ShowUserInfoAction showUserInfoAction = new ShowUserInfoAction(); 98 97 userTable.getSelectionModel().addListSelectionListener(showUserInfoAction); 99 98 -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
r10717 r10938 400 400 private static class HeaderPanel extends JPanel { 401 401 402 private JMultilineLabel lblMessage;403 402 private transient Changeset current; 403 404 HeaderPanel() { 405 build(); 406 } 404 407 405 408 protected final void build() { 406 409 setLayout(new FlowLayout(FlowLayout.LEFT)); 407 lblMessage = new JMultilineLabel( 408 tr("The content of this changeset is not downloaded yet.") 409 ); 410 add(lblMessage); 410 add(new JMultilineLabel(tr("The content of this changeset is not downloaded yet."))); 411 411 add(new JButton(new DownloadAction())); 412 412 413 }414 415 HeaderPanel() {416 build();417 413 } 418 414 -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
r10647 r10938 342 342 */ 343 343 private class SetOffsetActionListener implements ActionListener { 344 private JPanel panel;345 private JLabel lbExifTime;346 private JosmTextField tfGpsTime;347 private JosmComboBox<String> cbTimezones;348 private ImageDisplay imgDisp;349 private JList<String> imgList;350 344 351 345 @Override … … 353 347 SimpleDateFormat dateFormat = (SimpleDateFormat) DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM); 354 348 355 panel = new JPanel(new BorderLayout());349 JPanel panel = new JPanel(new BorderLayout()); 356 350 panel.add(new JLabel(tr("<html>Take a photo of your GPS receiver while it displays the time.<br>" 357 351 + "Display that photo here.<br>" … … 359 353 BorderLayout.NORTH); 360 354 361 imgDisp = new ImageDisplay();355 ImageDisplay imgDisp = new ImageDisplay(); 362 356 imgDisp.setPreferredSize(new Dimension(300, 225)); 363 357 panel.add(imgDisp, BorderLayout.CENTER); … … 373 367 panelTf.add(new JLabel(tr("Photo time (from exif):")), gc); 374 368 375 lbExifTime = new JLabel();369 JLabel lbExifTime = new JLabel(); 376 370 gc.gridx = 1; 377 371 gc.weightx = 1.0; … … 388 382 panelTf.add(new JLabel(tr("Gps time (read from the above photo): ")), gc); 389 383 390 tfGpsTime = new JosmTextField(12);384 JosmTextField tfGpsTime = new JosmTextField(12); 391 385 tfGpsTime.setEnabled(false); 392 386 tfGpsTime.setMinimumSize(new Dimension(155, tfGpsTime.getMinimumSize().height)); … … 422 416 Collections.sort(vtTimezones); 423 417 424 cbTimezones = new JosmComboBox<>(vtTimezones.toArray(new String[0]));418 JosmComboBox<String> cbTimezones = new JosmComboBox<>(vtTimezones.toArray(new String[0])); 425 419 426 420 String tzId = Main.pref.get("geoimage.timezoneid", ""); … … 446 440 JPanel panelLst = new JPanel(new BorderLayout()); 447 441 448 imgList = new JList<>(new AbstractListModel<String>() {442 JList<String> imgList = new JList<>(new AbstractListModel<String>() { 449 443 @Override 450 444 public String getElementAt(int i) { -
trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
r10611 r10938 399 399 class FullyAutomaticAuthorisationTask extends PleaseWaitRunnable { 400 400 private boolean canceled; 401 private OsmOAuthAuthorizationClient authClient;402 401 403 402 FullyAutomaticAuthorisationTask(Component parent) { … … 480 479 try { 481 480 getProgressMonitor().setTicksCount(3); 482 authClient = new OsmOAuthAuthorizationClient(481 OsmOAuthAuthorizationClient authClient = new OsmOAuthAuthorizationClient( 483 482 getAdvancedPropertiesPanel().getAdvancedParameters() 484 483 );
Note:
See TracChangeset
for help on using the changeset viewer.