mergedMap) {
CheckParameterUtil.ensureParameterNotNull(my, "my");
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 6070)
@@ -888,5 +888,5 @@
);
}
-
+
public void unlinkAsListener() {
myEntriesTable.unlinkAsListener();
@@ -1031,5 +1031,5 @@
}
}
-
+
protected final OsmDataLayer findLayerFor(P primitive) {
if (primitive != null) {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (revision 6070)
@@ -60,5 +60,5 @@
theirEntriesTable.setLayer(findLayerFor(theirWay));
}
-
+
public void deletePrimitive(boolean deleted) {
if (deleted) {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 6070)
@@ -463,10 +463,10 @@
/**
- * Replies the list of {@link Command commands} needed to resolve specified conflicts,
+ * Replies the list of {@link Command commands} needed to resolve specified conflicts,
* by displaying if necessary a {@link CombinePrimitiveResolverDialog} to the user.
* This dialog will allow the user to choose conflict resolution actions.
- *
+ *
* Non-expert users are informed first of the meaning of these operations, allowing them to cancel.
- *
+ *
* @param tagsOfPrimitives The tag collection of the primitives to be combined.
* Should generally be equal to {@code TagCollection.unionOfAllPrimitives(primitives)}
@@ -480,5 +480,5 @@
final Collection primitives,
final Collection targetPrimitives) throws UserCancelException {
-
+
CheckParameterUtil.ensureParameterNotNull(tagsOfPrimitives, "tagsOfPrimitives");
CheckParameterUtil.ensureParameterNotNull(primitives, "primitives");
@@ -511,5 +511,5 @@
dialog.getRelationMemberConflictResolverModel().populate(parentRelations, primitives);
dialog.prepareDefaultDecisions();
-
+
// Ensure a proper title is displayed instead of a previous target (fix #7925)
if (targetPrimitives.size() == 1) {
@@ -555,5 +555,5 @@
parentRelations.size(), parentRelations.size(), primitives.size(),
DefaultNameFormatter.getInstance().formatAsHtmlUnorderedList(parentRelations));
-
+
if (!ConditionalOptionPaneUtil.showConfirmationDialog(
"combine_tags",
@@ -596,5 +596,5 @@
+ "Do you want to continue?",
primitives.size(), conflicts);
-
+
if (!ConditionalOptionPaneUtil.showConfirmationDialog(
"combine_tags",
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 6070)
@@ -85,5 +85,5 @@
private CloseOpenChangesetsAction closeChangesetAction;
private LaunchChangesetManagerAction launchChangesetManagerAction;
-
+
private ChangesetDialogPopup popupMenu;
@@ -204,5 +204,5 @@
launchChangesetManagerAction = new LaunchChangesetManagerAction();
cbInSelectionOnly.addItemListener(launchChangesetManagerAction);
-
+
popupMenu = new ChangesetDialogPopup(lstInActiveDataLayer, lstInSelection);
@@ -210,5 +210,5 @@
lstInSelection.addMouseListener(popupMenuLauncher);
lstInActiveDataLayer.addMouseListener(popupMenuLauncher);
-
+
createLayout(pnl, false, Arrays.asList(new SideButton[] {
new SideButton(selectObjectsAction, false),
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 6070)
@@ -75,5 +75,5 @@
private SelectAction selectAction = new SelectAction();
private SelectAndZoomAction selectAndZoomAction = new SelectAndZoomAction();
-
+
public CommandStackDialog(final MapFrame mapFrame) {
super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."),
@@ -89,5 +89,5 @@
undoTree.getSelectionModel().addTreeSelectionListener(undoSelectionListener);
InputMapUtils.unassignCtrlShiftUpDown(undoTree, JComponent.WHEN_FOCUSED);
-
+
redoTree.addMouseListener(new MouseEventHandler());
redoTree.setRootVisible(false);
@@ -124,5 +124,5 @@
new SideButton(redoAction)
}));
-
+
InputMapUtils.addEnterAction(undoTree, selectAndZoomAction);
InputMapUtils.addEnterAction(redoTree, selectAndZoomAction);
@@ -303,9 +303,9 @@
return node;
}
-
+
/**
* Return primitives that are affected by some command
- * @param path GUI elements
- * @return collection of affected primitives, onluy usable ones
+ * @param path GUI elements
+ * @return collection of affected primitives, onluy usable ones
*/
protected static FilteredCollection getAffectedPrimitives(TreePath path) {
@@ -354,5 +354,5 @@
Main.map.mapView.getEditLayer().data.setSelected( getAffectedPrimitives(path));
}
-
+
@Override
public void updateEnabledState() {
@@ -377,5 +377,5 @@
}
}
-
+
/**
* undo / redo switch to reduce duplicate code
@@ -448,5 +448,5 @@
super(new CommandStackPopup());
}
-
+
@Override
public void mouseClicked(MouseEvent evt) {
@@ -456,5 +456,5 @@
}
}
-
+
private class CommandStackPopup extends JPopupMenu {
public CommandStackPopup(){
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 6070)
@@ -67,5 +67,5 @@
/**
* Replies the color used to paint conflicts.
- *
+ *
* @return the color used to paint conflicts
* @since 1221
@@ -83,5 +83,5 @@
/** the list widget for the list of conflicts */
private JList lstConflicts;
-
+
private final JPopupMenu popupMenu = new JPopupMenu();
private final PopupMenuHandler popupMenuHandler = new PopupMenuHandler(popupMenu);
@@ -115,5 +115,5 @@
btnResolve, btnSelect
}));
-
+
popupMenuHandler.addAction(Main.main.menu.autoScaleActions.get("conflict"));
}
@@ -143,5 +143,5 @@
DataSet.removeSelectionListener(this);
}
-
+
/**
* Add a list selection listener to the conflicts list.
@@ -152,5 +152,5 @@
lstConflicts.getSelectionModel().addListSelectionListener(listener);
}
-
+
/**
* Remove the given list selection listener from the conflicts list.
@@ -161,5 +161,5 @@
lstConflicts.getSelectionModel().removeListSelectionListener(listener);
}
-
+
/**
* Replies the popup menu handler.
@@ -218,5 +218,5 @@
/**
* Paints all conflicts that can be expressed on the main window.
- *
+ *
* @param g The {@code Graphics} used to paint
* @param nc The {@code NavigatableComponent} used to get screen coordinates of nodes
@@ -294,5 +294,5 @@
/**
* returns the first selected item of the conflicts list
- *
+ *
* @return Conflict
*/
@@ -331,5 +331,5 @@
return ht("/Dialog/ConflictList");
}
-
+
class MouseEventHandler extends PopupMenuLauncher {
public MouseEventHandler() {
@@ -438,5 +438,5 @@
}
DataSet ds = Main.main.getCurrentDataSet();
- if (ds != null) { // Can't see how it is possible but it happened in #7942
+ if (ds != null) { // Can't see how it is possible but it happened in #7942
ds.setSelected(sel);
}
@@ -450,5 +450,5 @@
}
}
-
+
/**
* Warns the user about the number of detected conflicts
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (revision 6070)
@@ -108,5 +108,5 @@
historyTable.getSelectionModel().addListSelectionListener(showHistoryAction);
historyTable.getSelectionModel().addListSelectionListener(reloadAction);
-
+
// Show history dialog on Enter/Spacebar
InputMapUtils.addEnterAction(historyTable, showHistoryAction);
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 6070)
@@ -92,5 +92,5 @@
private final NewAction newAction;
-
+
/** the popup menu and its handler */
private final JPopupMenu popupMenu = new JPopupMenu();
@@ -98,5 +98,5 @@
private final JosmTextField filter;
-
+
// Actions
/** the edit action */
@@ -114,5 +114,5 @@
/** add all selected primitives to the given relations */
private final AddSelectionToRelations addSelectionToRelations = new AddSelectionToRelations();
-
+
HighlightHelper highlightHelper = new HighlightHelper();
private boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
@@ -158,5 +158,5 @@
// Setup popup menu handler
setupPopupMenuHandler();
-
+
JPanel pane = new JPanel(new BorderLayout());
pane.add(filter, BorderLayout.NORTH);
@@ -175,5 +175,5 @@
InputMapUtils.unassignCtrlShiftUpDown(displaylist, JComponent.WHEN_FOCUSED);
-
+
// Select relation on Ctrl-Enter
InputMapUtils.addEnterAction(displaylist, selectRelationAction);
@@ -182,15 +182,15 @@
displaylist.getActionMap().put("edit", editAction);
displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.CTRL_MASK), "edit");
-
+
updateActionsRelationLists();
}
-
+
// inform all actions about list of relations they need
private void updateActionsRelationLists() {
List sel = model.getSelectedRelations();
popupMenuHandler.setPrimitives(sel);
-
+
Component focused = FocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
-
+
//update highlights
if (highlightEnabled && focused==displaylist && Main.isDisplayingMapView()) {
@@ -200,5 +200,5 @@
}
}
-
+
@Override public void showNotify() {
MapView.addLayerChangeListener(newAction);
@@ -214,5 +214,5 @@
DataSet.removeSelectionListener(addSelectionToRelations);
}
-
+
private void resetFilter() {
filter.setText(null);
@@ -309,5 +309,5 @@
class MouseEventHandler extends PopupMenuLauncher {
-
+
public MouseEventHandler() {
super(popupMenu);
@@ -318,5 +318,5 @@
if (highlightEnabled) highlightHelper.clear();
}
-
+
protected void setCurrentRelationAsSelection() {
Main.main.getCurrentDataSet().setSelected((Relation)displaylist.getSelectedValue());
@@ -326,5 +326,5 @@
EditRelationAction.launchEditor(getSelected());
}
-
+
@Override public void mouseClicked(MouseEvent e) {
if (Main.main.getEditLayer() == null) return;
@@ -338,5 +338,5 @@
}
}
-
+
/**
* The action for creating a new relation
@@ -493,5 +493,5 @@
}
}
-
+
private void updateFilteredRelations() {
if (filter != null) {
@@ -519,5 +519,5 @@
return filteredRelations == null ? relations : filteredRelations;
}
-
+
private Relation getVisibleRelation(int index) {
if (index < 0 || index >= getVisibleRelations().size()) return null;
@@ -584,5 +584,5 @@
return i;
}
-
+
private Integer getVisibleRelationIndex(Relation rel) {
int i = getVisibleRelations().indexOf(rel);
@@ -604,5 +604,5 @@
private final void setupPopupMenuHandler() {
-
+
// -- select action
popupMenuHandler.addAction(selectRelationAction);
@@ -624,8 +624,8 @@
popupMenuHandler.addAction(duplicateAction).setVisible(false);
popupMenuHandler.addAction(deleteRelationsAction).setVisible(false);
-
+
popupMenuHandler.addAction(addSelectionToRelations);
}
-
+
/* ---------------------------------------------------------------------------------- */
/* Methods that can be called from plugins */
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 6070)
@@ -155,5 +155,5 @@
}
});
-
+
lstPrimitives.addMouseListener(new MouseEventHandler());
@@ -192,5 +192,5 @@
super(popupMenu);
}
-
+
@Override
public void mouseClicked(MouseEvent e) {
@@ -727,5 +727,5 @@
text.append(tr("Unselectable now"));
this.sel=new ArrayList(); // empty selection
- }
+ }
if(ways + nodes + relations == 1)
{
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 6070)
@@ -144,5 +144,5 @@
*/
protected JCheckBoxMenuItem windowMenuItem;
-
+
/**
* The linked preferences class (optional). If set, accessible from the title bar with a dedicated button
@@ -152,5 +152,5 @@
/**
* Constructor
- *
+ *
* @param name the name of the dialog
* @param iconName the name of the icon to be displayed
@@ -493,5 +493,5 @@
add(buttonsHide);
}
-
+
// show the pref button if applicable
if (preferenceClass != null) {
@@ -558,5 +558,5 @@
return lblTitle.getText();
}
-
+
public class DialogPopupMenu extends JPopupMenu {
public final JMenu buttonHidingMenu = new JMenu(tr("Side buttons"));
@@ -589,9 +589,9 @@
}
}
-
+
public void registerMouseListener() {
addMouseListener(new MouseEventHandler());
}
-
+
class MouseEventHandler extends PopupMenuLauncher {
public MouseEventHandler() {
@@ -864,8 +864,8 @@
buttonsHide.setVisible(false);
}
-
+
// Register title bar mouse listener only after buttonActions has been initialized to have a complete popup menu
titleBar.registerMouseListener();
-
+
return data;
}
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 6070)
@@ -77,5 +77,5 @@
private final JPopupMenu popupMenu = new JPopupMenu();
private final PopupMenuHandler popupMenuHandler = new PopupMenuHandler(popupMenu);
-
+
/** Last selected element */
private DefaultMutableTreeNode lastSelectedNode = null;
@@ -417,5 +417,5 @@
tree.addTreeSelectionListener(listener);
}
-
+
/**
* Remove the given tree selection listener from the validator tree.
@@ -426,5 +426,5 @@
tree.removeTreeSelectionListener(listener);
}
-
+
/**
* Replies the popup menu handler.
@@ -435,5 +435,5 @@
return popupMenuHandler;
}
-
+
/**
* Replies the currently selected error, or {@code null}.
@@ -451,14 +451,14 @@
return null;
}
-
+
/**
* Watches for double clicks and launches the popup menu.
*/
class MouseEventHandler extends PopupMenuLauncher {
-
+
public MouseEventHandler() {
super(popupMenu);
}
-
+
@Override
public void mouseClicked(MouseEvent e) {
@@ -483,5 +483,5 @@
}
}
-
+
@Override public void launch(MouseEvent e) {
TreePath selPath = tree.getPathForLocation(e.getX(), e.getY());
@@ -585,5 +585,5 @@
// do nothing
}
-
+
protected void fixError(TestError error) throws InterruptedException, InvocationTargetException {
if (error.isFixable()) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java (revision 6070)
@@ -557,9 +557,9 @@
class MouseEventHandler extends PopupMenuLauncher {
-
+
public MouseEventHandler() {
super(new ChangesetTablePopupMenu());
}
-
+
@Override
public void mouseClicked(MouseEvent evt) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java (revision 6070)
@@ -51,6 +51,6 @@
tfChangesetId.getDocument().addDocumentListener(actDownload);
add(btn);
-
- if (Main.pref.getBoolean("downloadchangeset.autopaste", true)) {
+
+ if (Main.pref.getBoolean("downloadchangeset.autopaste", true)) {
tfChangesetId.tryToPasteFromClipboard();
}
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (revision 6070)
@@ -191,5 +191,5 @@
}
break;
-
+
case 2:
if (getChangesetQuery() == null) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 6070)
@@ -152,5 +152,5 @@
*/
private final TagEditHelper editHelper = new TagEditHelper(propertyData, valueCount);
-
+
private final DataSetListenerAdapter dataChangedAdapter = new DataSetListenerAdapter(this);
private final HelpAction helpAction = new HelpAction();
@@ -170,13 +170,13 @@
private final SelectRelationAction selectRelationAction = new SelectRelationAction(false);
private final SelectRelationAction addRelationToSelectionAction = new SelectRelationAction(true);
-
+
private final DownloadMembersAction downloadMembersAction = new DownloadMembersAction();
private final DownloadSelectedIncompleteMembersAction downloadSelectedIncompleteMembersAction = new DownloadSelectedIncompleteMembersAction();
-
+
private final SelectMembersAction selectMembersAction = new SelectMembersAction(false);
private final SelectMembersAction addMembersToSelectionAction = new SelectMembersAction(true);
-
+
private final HighlightHelper highlightHelper= new HighlightHelper();
-
+
/**
* The Add button (needed to be able to disable it)
@@ -195,5 +195,5 @@
*/
private final PresetListPanel presets = new PresetListPanel();
-
+
/**
* Text to display when nothing selected.
@@ -214,7 +214,7 @@
}
};
-
+
//
-
+
/**
* Create a new PropertiesDialog
@@ -231,5 +231,5 @@
setupMembershipMenu();
buildMembershipTable();
-
+
// combine both tables and wrap them in a scrollPane
JPanel bothTables = new JPanel();
@@ -249,5 +249,5 @@
bothTables.add(presets, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2));
}
-
+
setupKeyboardShortcuts();
@@ -257,6 +257,6 @@
propertyTable.getSelectionModel().addListSelectionListener(deleteAction);
membershipTable.getSelectionModel().addListSelectionListener(deleteAction);
-
-
+
+
JScrollPane scrollPane = (JScrollPane) createLayout(bothTables, true, Arrays.asList(new SideButton[] {
this.btnAdd, this.btnEdit, this.btnDel
@@ -273,5 +273,5 @@
editHelper.loadTagsIfNeeded();
}
-
+
private void buildPropertiesTable() {
// setting up the properties table
@@ -280,5 +280,5 @@
propertyTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
propertyTable.getTableHeader().setReorderingAllowed(false);
-
+
propertyTable.getColumnModel().getColumn(1).setCellRenderer(new DefaultTableCellRenderer(){
@Override public Component getTableCellRendererComponent(JTable table, Object value,
@@ -383,5 +383,5 @@
mod.getColumn(0).setPreferredWidth(200);
}
-
+
/**
* creates the popup menu @field membershipMenu and its launcher on membership table
@@ -432,7 +432,7 @@
});
}
-
- /**
- * creates the popup menu @field propertyMenu and its launcher on property table
+
+ /**
+ * creates the popup menu @field propertyMenu and its launcher on property table
*/
private void setupPropertiesMenu() {
@@ -448,10 +448,10 @@
propertyTable.addMouseListener(new PopupMenuLauncher(propertyMenu));
}
-
+
/**
* Assignas all needed keys like Enter and Spacebar to most important actions
*/
private void setupKeyboardShortcuts() {
-
+
// ENTER = editAction, open "edit" dialog
propertyTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
@@ -461,16 +461,16 @@
.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),"onTableEnter");
membershipTable.getActionMap().put("onTableEnter",editAction);
-
- // INSERT button = addAction, open "add property" dialog
+
+ // INSERT button = addAction, open "add property" dialog
propertyTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
.put(KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, 0),"onTableInsert");
propertyTable.getActionMap().put("onTableInsert",addAction);
-
+
// unassign some standard shortcuts for JTable to allow upload / download
InputMapUtils.unassignCtrlShiftUpDown(propertyTable, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
-
+
// unassign some standard shortcuts for correct copy-pasting, fix #8508
propertyTable.setTransferHandler(null);
-
+
propertyTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK),"onCopy");
@@ -479,5 +479,5 @@
// allow using enter to add tags for all look&feel configurations
InputMapUtils.enableEnter(this.btnAdd);
-
+
// DEL button = deleteAction
getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
@@ -485,5 +485,5 @@
);
getActionMap().put("delete", deleteAction);
-
+
// F1 button = custom help action
getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
@@ -491,5 +491,5 @@
getActionMap().put("onHelp", helpAction);
}
-
+
/**
* This simply fires up an {@link RelationEditor} for the relation shown; everything else
@@ -506,5 +506,5 @@
((MemberInfo) membershipData.getValueAt(row, 1)).role).setVisible(true);
}
-
+
private int findRow(TableModel model, Object value) {
for (int i=0; i
//
-
+
@Override
public void showNotify() {
@@ -558,5 +558,5 @@
}
}
-
+
@Override
public void destroy() {
@@ -625,5 +625,5 @@
? e.getValue().keySet().iterator().next() : tr(""));
}
-
+
membershipData.setRowCount(0);
@@ -698,5 +698,5 @@
}
}
-
+
/* ---------------------------------------------------------------------------------- */
/* EditLayerChangeListener */
@@ -721,5 +721,5 @@
//
-
+
/**
* Replies the property popup menu handler.
@@ -752,7 +752,7 @@
return row > -1 ? (IRelation) membershipData.getValueAt(row, 0) : null;
}
-
+
//
-
+
/**
* Class that watches for mouse clicks
@@ -852,5 +852,5 @@
}
};
-
+
/**
* Action handling delete button press in properties dialog.
@@ -940,5 +940,5 @@
} else if (membershipTable.getSelectedRowCount() > 0) {
int[] rows = membershipTable.getSelectedRows();
- // delete from last relation to convserve row numbers in the table
+ // delete from last relation to convserve row numbers in the table
for (int i=rows.length-1; i>=0; i--) {
deleteFromRelation(rows[i]);
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 6070)
@@ -415,9 +415,9 @@
refreshView(r);
}
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- Main.map.repaint();
- }
- });
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ Main.map.repaint();
+ }
+ });
} catch (Exception e) {
if (canceled) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 6070)
@@ -216,5 +216,5 @@
}
);
-
+
tagEditorPanel.setNextFocusComponent(memberTable);
selectionTable.setFocusable(false);
@@ -492,5 +492,5 @@
tb.add(moveDownAction);
memberTable.getActionMap().put("moveDown", moveDownAction);
-
+
tb.addSeparator();
@@ -499,5 +499,5 @@
memberTableModel.getSelectionModel().addListSelectionListener(editAction);
tb.add(editAction);
-
+
// -- delete action
RemoveAction removeSelectedAction = new RemoveAction();
@@ -505,5 +505,5 @@
tb.add(removeSelectedAction);
memberTable.getActionMap().put("removeSelected", removeSelectedAction);
-
+
tb.addSeparator();
// -- sort action
@@ -536,5 +536,5 @@
inputMap.put((KeyStroke) moveDownAction.getValue(AbstractAction.ACCELERATOR_KEY),"moveDown");
inputMap.put((KeyStroke) downloadIncompleteMembersAction.getValue(AbstractAction.ACCELERATOR_KEY),"downloadIncomplete");
-
+
return tb;
}
@@ -677,5 +677,5 @@
}
-
+
private void registerCopyPasteAction(AbstractAction action, Object actionName, KeyStroke shortcut) {
int mods = shortcut.getModifiers();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (revision 6070)
@@ -26,5 +26,5 @@
this.ds = ds;
editor = new AutoCompletingTextField();
- editor.setBorder(BorderFactory.createEmptyBorder(1,1,1,1));
+ editor.setBorder(BorderFactory.createEmptyBorder(1,1,1,1));
autoCompletionList = new AutoCompletionList();
editor.setAutoCompletionList(autoCompletionList);
@@ -57,5 +57,5 @@
return super.stopCellEditing();
}
-
+
/** Returns the edit field for this cell editor. */
public AutoCompletingTextField getEditor() {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (revision 6070)
@@ -63,5 +63,5 @@
*/
protected void init() {
- MemberRoleCellEditor ce = (MemberRoleCellEditor)getColumnModel().getColumn(0).getCellEditor();
+ MemberRoleCellEditor ce = (MemberRoleCellEditor)getColumnModel().getColumn(0).getCellEditor();
setRowHeight(ce.getEditor().getPreferredSize().height);
setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
@@ -75,5 +75,5 @@
initHighlighting();
-
+
// install custom navigation actions
//
@@ -81,10 +81,10 @@
getActionMap().put("selectPreviousColumnCell", new SelectPreviousColumnCellAction());
}
-
+
@Override
protected ZoomToAction buildZoomToAction() {
return new ZoomToAction(this);
}
-
+
@Override
protected JPopupMenu buildPopupMenu() {
@@ -99,5 +99,5 @@
return menu;
}
-
+
@Override
public Dimension getPreferredSize(){
@@ -140,5 +140,5 @@
}
}};
-
+
private void initHighlighting() {
highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
@@ -217,5 +217,5 @@
MapView.removeLayerChangeListener(zoomToGap);
}
-
+
public void stopHighlighting() {
if (highlighterListener == null) return;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java (revision 6070)
@@ -380,5 +380,5 @@
return updateCount;
}
-
+
private void clearErrors() {
if (errors != null) {
Index: trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 6070)
@@ -144,5 +144,5 @@
pnl.add(sizeCheck, GBC.eol().anchor(GBC.EAST).insets(5,5,5,2));
-
+
if (!ExpertToggleAction.isExpert()) {
JLabel infoLabel = new JLabel(tr("Use left click&drag to select area, arrows or right mouse button to scroll map, wheel or +/- to zoom."));
@@ -165,5 +165,5 @@
pnl.add(btnDownload = new SideButton(actDownload = new DownloadAction()));
InputMapUtils.enableEnter(btnDownload);
-
+
makeCheckBoxRespondToEnter(cbDownloadGpxData);
makeCheckBoxRespondToEnter(cbDownloadOsmData);
@@ -308,5 +308,5 @@
cbDownloadGpxData.setSelected(Main.pref.getBoolean("download.gps", false));
cbNewLayer.setSelected(Main.pref.getBoolean("download.newlayer", false));
- cbStartup.setSelected( isAutorunEnabled() );
+ cbStartup.setSelected( isAutorunEnabled() );
int idx = Main.pref.getInteger("download.tab", 0);
if (idx < 0 || idx > tpDownloadAreaSelectors.getTabCount()) {
Index: trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (revision 6070)
@@ -63,5 +63,5 @@
w = iScreenSize.width * 90 / 100;
h = iScreenSize.height * 90 / 100;
- iDownloadDialogDimension = iGui.getSize();
+ iDownloadDialogDimension = iGui.getSize();
}
// shrink
@@ -73,6 +73,6 @@
}
- // resize and center the DownloadDialog
- iGui.setBounds((iScreenSize.width - w) / 2, (iScreenSize.height - h) / 2, w, h);
+ // resize and center the DownloadDialog
+ iGui.setBounds((iScreenSize.width - w) / 2, (iScreenSize.height - h) / 2, w, h);
repaint();
}
Index: trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (revision 6070)
@@ -259,5 +259,5 @@
LatLon coord = node.getCoords();
LatLon oppositeCoord = oppositeNode.getCoords();
-
+
// display the coordinates
//
@@ -267,5 +267,5 @@
// update background color to reflect differences in the coordinates
//
- if (coord == oppositeCoord ||
+ if (coord == oppositeCoord ||
(coord != null && oppositeCoord != null && coord.lat() == oppositeCoord.lat())) {
lblLat.setBackground(Color.WHITE);
@@ -273,5 +273,5 @@
lblLat.setBackground(BGCOLOR_DIFFERENCE);
}
- if (coord == oppositeCoord ||
+ if (coord == oppositeCoord ||
(coord != null && oppositeCoord != null && coord.lon() == oppositeCoord.lon())) {
lblLon.setBackground(Color.WHITE);
@@ -285,9 +285,9 @@
}
}
-
+
private static class DistanceViewer extends LatLonViewer {
private JLabel lblDistance;
-
+
public DistanceViewer(HistoryBrowserModel model) {
super(model, PointInTimeType.REFERENCE_POINT_IN_TIME);
@@ -329,5 +329,5 @@
LatLon coord = node.getCoords();
LatLon oppositeCoord = oppositeNode.getCoords();
-
+
// update distance
//
Index: trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java (revision 6070)
@@ -28,5 +28,5 @@
* handles everything on its own, in other words it renders itself and also functions
* as editor so the checkboxes may be set by the user.
- *
+ *
* Intended usage is like this:
* ActionFlagsTableCell aftc = new ActionFlagsTableCell();
Index: trunk/src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java (revision 6070)
@@ -15,5 +15,5 @@
* Sets the current changeset comment and notifies observers if the comment
* has changed.
- *
+ *
* @param comment the new upload comment. Empty string assumed if null.
*/
@@ -29,5 +29,5 @@
/**
* Replies the current changeset comment in this model.
- *
+ *
* @return the current changeset comment in this model.
*/
Index: trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java (revision 6070)
@@ -49,6 +49,6 @@
this.mkdir = mkdir;
this.unpack = unpack;
- }
-
+ }
+
private static class DownloadException extends Exception {
public DownloadException(String msg) {
@@ -68,5 +68,5 @@
- @Override
+ @Override
protected void cancel() {
this.canceled = true;
@@ -74,5 +74,5 @@
}
- @Override
+ @Override
protected void finish() {}
@@ -91,5 +91,5 @@
}
}
-
+
URL url = new URL(address);
int size;
@@ -100,8 +100,8 @@
size = downloadConnection.getContentLength();
}
-
+
progressMonitor.setTicksCount(100);
progressMonitor.subTask(tr("Downloading File {0}: {1} bytes...", file.getName(),size));
-
+
in = downloadConnection.getInputStream();
out = new FileOutputStream(file);
@@ -112,5 +112,5 @@
out.write(buffer, 0, read);
count+=read;
- if (canceled) break;
+ if (canceled) break;
p2 = 100 * count / size;
if (p2!=p1) {
@@ -142,5 +142,5 @@
}
- @Override
+ @Override
protected void realRun() throws SAXException, IOException {
if (canceled) return;
@@ -160,5 +160,5 @@
return canceled;
}
-
+
/**
* Recursive unzipping function
@@ -166,5 +166,5 @@
* @param file
* @param dir
- * @throws IOException
+ * @throws IOException
*/
public static void unzipFileRecursively(File file, String dir) throws IOException {
Index: trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java (revision 6070)
@@ -95,5 +95,5 @@
if (osm == null) {
switch (id.getType()) {
- case NODE:
+ case NODE:
osm = new Node(id.getUniqueId());
break;
@@ -128,5 +128,5 @@
DataSetMerger merger = new DataSetMerger(ds, theirDataSet);
merger.merge();
-
+
// if incomplete relation members exist, download them too
for (Relation r : ds.getRelations()) {
@@ -165,5 +165,5 @@
}
}
-
+
} catch(Exception e) {
if (canceled) return;
@@ -171,5 +171,5 @@
}
}
-
+
/**
* replies the set of ids of all primitives for which a fetch request to the
Index: trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java (revision 6070)
@@ -49,5 +49,5 @@
});
}
-
+
private void rebuild() {
removeAll();
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 6070)
@@ -56,5 +56,5 @@
* This is a dialog for entering upload options like the parameters for
* the upload changeset and the strategy for opening/closing a changeset.
- *
+ *
*/
public class UploadDialog extends JDialog implements PropertyChangeListener, PreferenceChangedListener{
@@ -111,5 +111,5 @@
//
pnl.add(pnlUploadedObjects = new UploadedObjectsSummaryPanel(), GBC.eol().fill(GBC.BOTH));
-
+
// Custom components
for (Component c : customComponents) {
@@ -309,9 +309,9 @@
public void setDefaultChangesetTags(Map tags) {
pnlTagSettings.setDefaultTags(tags);
- for (String key: tags.keySet()) {
- if (key.equals("comment")) {
+ for (String key: tags.keySet()) {
+ if (key.equals("comment")) {
changesetCommentModel.setComment(tags.get(key));
- }
- }
+ }
+ }
}
@@ -370,7 +370,7 @@
super.setVisible(visible);
}
-
- /**
- * Adds a custom component to this dialog.
+
+ /**
+ * Adds a custom component to this dialog.
* Custom components added at JOSM startup are displayed between the objects list and the properties tab pane.
* @param c The custom component to add. If {@code null}, this method does nothing.
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 6070)
@@ -264,6 +264,6 @@
putValue(Action.NAME, tr("Cancel"));
putValue(Action.SMALL_ICON, ImageProvider.get("", "cancel"));
- getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
- .put(KeyStroke.getKeyStroke("ESCAPE"), "ESCAPE");
+ getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
+ .put(KeyStroke.getKeyStroke("ESCAPE"), "ESCAPE");
getRootPane().getActionMap().put("ESCAPE", this);
setEnabled(true);
Index: trunk/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java (revision 6070)
@@ -34,5 +34,5 @@
this();
layers = new LinkedList();
- layers.add(l);
+ layers.add(l);
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 6070)
@@ -113,5 +113,5 @@
return new Date[]{earliest.getTime(), latest.getTime()};
}
-
+
/**
* Returns minimum and maximum timestamps for all tracks
@@ -138,6 +138,6 @@
return new Date[]{new Date((long) (min * 1000)), new Date((long) (max * 1000)), };
}
-
-
+
+
/**
* returns a human readable string that shows the timespan of the given track
@@ -288,5 +288,5 @@
new LayerListPopup.InfoAction(this) };
}
-
+
public boolean isLocalFile() {
return isLocalFile;
@@ -335,5 +335,5 @@
return true;
}
-
+
public void filterTracksByDate(Date fromDate, Date toDate, boolean showWithoutDate) {
int i = 0;
@@ -342,5 +342,5 @@
for (GpxTrack trk : data.tracks) {
Date[] t = GpxLayer.getMinMaxTimeForTrack(trk);
-
+
if (t==null) continue;
long tm = t[1].getTime();
@@ -543,5 +543,5 @@
}
}
-
+
for (GpxTrack trk : data.tracks) {
for (GpxTrackSegment segment : trk.getSegments()) {
@@ -880,4 +880,4 @@
return SaveActionBase.createAndOpenSaveFileChooser(tr("Save GPX file"), GpxImporter.FILE_FILTER);
}
-
+
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (revision 6070)
@@ -130,5 +130,5 @@
String url = info.getUrl();
if (url != null) {
- panel.add(new JLabel(tr("URL: ")), GBC.std().insets(0, 5, 2, 0));
+ panel.add(new JLabel(tr("URL: ")), GBC.std().insets(0, 5, 2, 0));
panel.add(new UrlLabel(url), GBC.eol().insets(2, 5, 10, 0));
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/Layer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (revision 6070)
@@ -436,5 +436,5 @@
// To be overriden if needed
}
-
+
/**
* Replies the savable state of this layer (i.e if it can be saved through a "File->Save" dialog).
@@ -445,5 +445,5 @@
return false;
}
-
+
/**
* Checks whether it is ok to launch a save (whether we have data, there is no conflict etc.)
@@ -454,5 +454,5 @@
return true;
}
-
+
/**
* Creates a new "Save" dialog for this layer and makes it visible.
Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 6070)
@@ -163,5 +163,5 @@
void commandChanged(int queueSize, int redoSize);
}
-
+
/**
* Listener called when a state of this layer has changed.
@@ -175,7 +175,7 @@
void uploadDiscouragedChanged(OsmDataLayer layer, boolean newValue);
}
-
+
private final CopyOnWriteArrayList layerStateChangeListeners = new CopyOnWriteArrayList();
-
+
/**
* Adds a layer state change listener
@@ -189,5 +189,5 @@
}
}
-
+
/**
* Removes a layer property change listener
@@ -259,5 +259,5 @@
return ImageProvider.get("layer", "osmdata_small");
}
-
+
/**
* TODO: @return Return a dynamic drawn icon of the map data. The icon is
@@ -355,5 +355,5 @@
mergeFrom(from, null);
}
-
+
/**
* merges the primitives in dataset from into the dataset of
@@ -415,5 +415,5 @@
@Override public boolean isMergable(final Layer other) {
- // isUploadDiscouraged commented to allow merging between normal layers and discouraged layers with a warning (see #7684)
+ // isUploadDiscouraged commented to allow merging between normal layers and discouraged layers with a warning (see #7684)
return other instanceof OsmDataLayer;// && (isUploadDiscouraged() == ((OsmDataLayer)other).isUploadDiscouraged());
}
@@ -781,5 +781,5 @@
return true;
}
-
+
/**
* Check the data set if it would be empty on save. It is empty, if it contains
Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 6070)
@@ -128,5 +128,5 @@
protected TileSource tileSource;
protected OsmTileLoader tileLoader;
-
+
public static TileLoaderFactory loaderFactory = new TileLoaderFactory() {
@Override
@@ -144,5 +144,5 @@
}
};
-
+
/**
* Plugins that wish to set custom tile loader should call this method
@@ -151,5 +151,5 @@
TMSLayer.loaderFactory = loaderFactory;
}
-
+
HashSet tileRequestsOutstanding = new HashSet();
@Override
@@ -170,15 +170,15 @@
}*/
}
-
+
@Override
public TileCache getTileCache() {
return tileCache;
}
-
+
private class TmsTileClearController implements TileClearController, CancelListener {
private final ProgressMonitor monitor;
private boolean cancel = false;
-
+
public TmsTileClearController(ProgressMonitor monitor) {
this.monitor = monitor;
@@ -219,12 +219,12 @@
/**
* Clears the tile cache.
- *
- * If the current tileLoader is an instance of OsmTileLoader, a new
- * TmsTileClearController is created and passed to the according clearCache
+ *
+ * If the current tileLoader is an instance of OsmTileLoader, a new
+ * TmsTileClearController is created and passed to the according clearCache
* method.
- *
- * @param monitor
+ *
+ * @param monitor
* @see MemoryTileCache#clear()
- * @see OsmFileCacheTileLoader#clearCache(org.openstreetmap.gui.jmapviewer.interfaces.TileSource, org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader.TileClearController)
+ * @see OsmFileCacheTileLoader#clearCache(org.openstreetmap.gui.jmapviewer.interfaces.TileSource, org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader.TileClearController)
*/
void clearTileCache(ProgressMonitor monitor) {
@@ -257,7 +257,7 @@
/**
* Initiates a repaint of Main.map
- *
+ *
* @see Main#map
- * @see MapFrame#repaint()
+ * @see MapFrame#repaint()
*/
void redraw() {
@@ -360,12 +360,12 @@
* Creates and returns a new TileSource instance depending on the {@link ImageryType}
* of the passed ImageryInfo object.
- *
+ *
* If no appropriate TileSource is found, null is returned.
- * Currently supported ImageryType are {@link ImageryType#TMS},
+ * Currently supported ImageryType are {@link ImageryType#TMS},
* {@link ImageryType#BING}, {@link ImageryType#SCANEX}.
- *
+ *
* @param info
* @return a new TileSource instance or null if no TileSource for the ImageryInfo/ImageryType could be found.
- * @throws IllegalArgumentException
+ * @throws IllegalArgumentException
*/
public static TileSource getTileSource(ImageryInfo info) throws IllegalArgumentException {
@@ -706,5 +706,5 @@
return zia;
}
-
+
public boolean increaseZoomLevel() {
if (zoomIncreaseAllowed()) {
@@ -739,8 +739,8 @@
return currentZoomLevel > this.getMinZoomLvl();
}
-
+
/**
* Zoom out from map.
- *
+ *
* @return true, if zoom increasing was successfull, false othervise
*/
@@ -774,5 +774,5 @@
return new Tile(tileSource, x, y, zoom);
}
-
+
synchronized Tile getOrCreateTile(int x, int y, int zoom) {
Tile tile = getTile(x, y, zoom);
@@ -852,5 +852,5 @@
return !done;
}
-
+
boolean imageLoaded(Image i) {
if (i == null)
@@ -861,9 +861,9 @@
return false;
}
-
+
/**
- * Returns the image for the given tile if both tile and image are loaded.
+ * Returns the image for the given tile if both tile and image are loaded.
* Otherwise returns null.
- *
+ *
* @param tile the Tile for which the image should be returned
* @return the image of the tile or null.
@@ -953,5 +953,5 @@
}
}
-
+
// This function is called for several zoom levels, not just
// the current one. It should not trigger any tiles to be
@@ -1073,5 +1073,5 @@
return Main.map.mapView.getPoint(Main.getProjection().latlon2eastNorth(ll).add(getDx(), getDy()));
}
-
+
private Point pixelPos(Tile t) {
double lon = tileSource.tileXToLon(t.getXtile(), t.getZoom());
@@ -1079,9 +1079,9 @@
return pixelPos(tmpLL);
}
-
+
private LatLon getShiftedLatLon(EastNorth en) {
return Main.getProjection().eastNorth2latlon(en.add(-getDx(), -getDy()));
}
-
+
private Coordinate getShiftedCoord(EastNorth en) {
LatLon ll = getShiftedLatLon(en);
@@ -1138,17 +1138,17 @@
}
}
-
+
boolean tooSmall() {
return this.tilesSpanned() < 2.1;
}
-
+
boolean tooLarge() {
return this.tilesSpanned() > 10;
}
-
+
boolean insane() {
return this.tilesSpanned() > 100;
}
-
+
double tilesSpanned() {
return Math.sqrt(1.0 * this.size());
@@ -1168,9 +1168,9 @@
return this.__allTiles(false);
}
-
+
List allTilesCreate() {
return this.__allTiles(true);
}
-
+
private List __allTiles(boolean create) {
// Tileset is either empty or too large
@@ -1193,5 +1193,5 @@
return ret;
}
-
+
private List allLoadedTiles() {
List ret = new ArrayList();
Index: trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java (revision 6070)
@@ -64,5 +64,5 @@
if (root == null || root.getChildCount() == 0)
return;
-
+
PaintVisitor paintVisitor = new PaintVisitor(g, mv);
@@ -80,5 +80,5 @@
severity = severity.getPreviousSibling();
}
-
+
paintVisitor.clearPaintedObjects();
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 6070)
@@ -37,5 +37,5 @@
/** The image currently displayed */
private Image image = null;
-
+
/** The image currently displayed */
private boolean errorLoading = false;
@@ -99,8 +99,8 @@
ImageDisplay.this.image = img;
visibleRect = new Rectangle(0, 0, img.getWidth(null), img.getHeight(null));
-
+
final int w = (int) visibleRect.getWidth();
final int h = (int) visibleRect.getHeight();
-
+
outer: {
final int hh, ww, q;
@@ -131,5 +131,5 @@
break outer;
}
-
+
final BufferedImage rot = new BufferedImage(ww, hh, BufferedImage.TYPE_INT_RGB);
final AffineTransform xform = AffineTransform.getQuadrantRotateInstance(q, ax, ay);
@@ -137,5 +137,5 @@
g.drawImage(image, xform, null);
g.dispose();
-
+
visibleRect.setSize(ww, hh);
image.flush();
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java (revision 6070)
@@ -43,8 +43,8 @@
public class ChooseTrackVisibilityAction extends AbstractAction {
private final GpxLayer layer;
-
+
DateFilterPanel dateFilter;
JTable table;
-
+
public ChooseTrackVisibilityAction(final GpxLayer layer) {
super(tr("Choose visible tracks"), ImageProvider.get("dialogs/filter"));
@@ -124,7 +124,7 @@
return t;
}
-
+
boolean noUpdates=false;
-
+
/** selects all rows (=tracks) in the table that are currently visible on the layer*/
private void selectVisibleTracksInTable() {
@@ -154,5 +154,5 @@
});
}
-
+
private void updateVisibilityFromTable() {
ListSelectionModel s = (ListSelectionModel) table.getSelectionModel();
@@ -163,9 +163,9 @@
Main.map.repaint(100);
}
-
+
@Override
public void actionPerformed(ActionEvent arg0) {
final JPanel msg = new JPanel(new GridBagLayout());
-
+
dateFilter = new DateFilterPanel(layer, "gpx.traces", false);
dateFilter.setFilterAppliedListener(new ActionListener(){
@@ -179,5 +179,5 @@
});
dateFilter.loadFromPrefs();
-
+
final JToggleButton b = new JToggleButton(new AbstractAction(tr("Select by date")) {
@Override public void actionPerformed(ActionEvent e) {
@@ -193,5 +193,5 @@
msg.add(b, GBC.std().insets(0,0,5,0));
msg.add(dateFilter, GBC.eol().insets(0,0,10,0).fill(GBC.HORIZONTAL));
-
+
msg.add(new JLabel(tr("Select all tracks that you want to be displayed. You can drag select a " + "range of tracks or use CTRL+Click to select specific ones. The map is updated live in the " + "background. Open the URLs by double clicking them.")), GBC.eop().fill(GBC.HORIZONTAL));
// build table
@@ -236,4 +236,4 @@
Main.map.repaint();
}
-
+
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java (revision 6070)
@@ -68,4 +68,4 @@
Main.main.removeLayer(layer);
}
-
+
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/CustomizeDrawingAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/CustomizeDrawingAction.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/CustomizeDrawingAction.java (revision 6070)
@@ -101,4 +101,4 @@
Main.map.repaint();
}
-
+
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java (revision 6070)
@@ -25,42 +25,42 @@
*/
public class DownloadAlongPanel extends JPanel {
-
- // Preferences keys
- private final String prefOsm;
- private final String prefGps;
- private final String prefDist;
- private final String prefArea;
- private final String prefNear;
-
- // Data types to download
+
+ // Preferences keys
+ private final String prefOsm;
+ private final String prefGps;
+ private final String prefDist;
+ private final String prefArea;
+ private final String prefNear;
+
+ // Data types to download
private final JCheckBox cbDownloadOsmData;
private final JCheckBox cbDownloadGpxData;
// Legacy list of values
- private static final Integer dist[] = { 5000, 500, 50 };
- private static final Integer area[] = { 20, 10, 5, 1 };
-
- private final JList buffer;
- private final JList maxRect;
- private final JList downloadNear;
-
- /**
- * Constructs a new {@code DownloadPanel}.
- * @param prefOsm Preference key determining if OSM data should be downloaded
- * @param prefGps Preference key determining if GPS data should be downloaded
- * @param prefDist Preference key determining maximum distance
- * @param prefArea Preference key determining maximum area
- * @param prefNear Preference key determining "near" parameter. Can be {@code null}
- */
- public DownloadAlongPanel(String prefOsm, String prefGps, String prefDist, String prefArea, String prefNear) {
- super(new GridBagLayout());
-
- this.prefOsm = prefOsm;
- this.prefGps = prefGps;
- this.prefDist = prefDist;
- this.prefArea = prefArea;
- this.prefNear = prefNear;
-
- cbDownloadOsmData = new JCheckBox(tr("OpenStreetMap data"), Main.pref.getBoolean(prefOsm, true));
+ private static final Integer dist[] = { 5000, 500, 50 };
+ private static final Integer area[] = { 20, 10, 5, 1 };
+
+ private final JList buffer;
+ private final JList maxRect;
+ private final JList downloadNear;
+
+ /**
+ * Constructs a new {@code DownloadPanel}.
+ * @param prefOsm Preference key determining if OSM data should be downloaded
+ * @param prefGps Preference key determining if GPS data should be downloaded
+ * @param prefDist Preference key determining maximum distance
+ * @param prefArea Preference key determining maximum area
+ * @param prefNear Preference key determining "near" parameter. Can be {@code null}
+ */
+ public DownloadAlongPanel(String prefOsm, String prefGps, String prefDist, String prefArea, String prefNear) {
+ super(new GridBagLayout());
+
+ this.prefOsm = prefOsm;
+ this.prefGps = prefGps;
+ this.prefDist = prefDist;
+ this.prefArea = prefArea;
+ this.prefNear = prefNear;
+
+ cbDownloadOsmData = new JCheckBox(tr("OpenStreetMap data"), Main.pref.getBoolean(prefOsm, true));
cbDownloadOsmData.setToolTipText(tr("Select to download OSM data."));
add(cbDownloadOsmData, GBC.std().insets(1,5,1,5));
@@ -69,76 +69,76 @@
add(cbDownloadGpxData, GBC.eol().insets(5,5,1,5));
- add(new JLabel(tr("Download everything within:")), GBC.eol());
- String s[] = new String[dist.length];
- for (int i = 0; i < dist.length; ++i) {
- s[i] = tr("{0} meters", dist[i]);
- }
- buffer = new JList(s);
-
- double distanceValue = Main.pref.getDouble(prefDist, dist[0]);
- int distanceLegacyIndex = 0;
- for (int i = 0; i < dist.length; i++) {
- if (dist[i] == (int)distanceValue) {
- distanceLegacyIndex = i;
- break;
- }
- }
-
- buffer.setSelectedIndex(distanceLegacyIndex);
- add(buffer, GBC.eol());
-
- add(new JLabel(tr("Maximum area per request:")), GBC.eol());
- s = new String[area.length];
- for (int i = 0; i < area.length; ++i) {
- s[i] = tr("{0} sq km", area[i]);
- }
- maxRect = new JList(s);
-
- double areaValue = Main.pref.getDouble(prefArea, area[0]);
- int areaLegacyIndex = 0;
- for (int i = 0; i < area.length; i++) {
- if (area[i] == (int)areaValue) {
- areaLegacyIndex = i;
- break;
- }
- }
-
- maxRect.setSelectedIndex(areaLegacyIndex);
- add(maxRect, GBC.eol());
-
- if (prefNear != null) {
+ add(new JLabel(tr("Download everything within:")), GBC.eol());
+ String s[] = new String[dist.length];
+ for (int i = 0; i < dist.length; ++i) {
+ s[i] = tr("{0} meters", dist[i]);
+ }
+ buffer = new JList(s);
+
+ double distanceValue = Main.pref.getDouble(prefDist, dist[0]);
+ int distanceLegacyIndex = 0;
+ for (int i = 0; i < dist.length; i++) {
+ if (dist[i] == (int)distanceValue) {
+ distanceLegacyIndex = i;
+ break;
+ }
+ }
+
+ buffer.setSelectedIndex(distanceLegacyIndex);
+ add(buffer, GBC.eol());
+
+ add(new JLabel(tr("Maximum area per request:")), GBC.eol());
+ s = new String[area.length];
+ for (int i = 0; i < area.length; ++i) {
+ s[i] = tr("{0} sq km", area[i]);
+ }
+ maxRect = new JList(s);
+
+ double areaValue = Main.pref.getDouble(prefArea, area[0]);
+ int areaLegacyIndex = 0;
+ for (int i = 0; i < area.length; i++) {
+ if (area[i] == (int)areaValue) {
+ areaLegacyIndex = i;
+ break;
+ }
+ }
+
+ maxRect.setSelectedIndex(areaLegacyIndex);
+ add(maxRect, GBC.eol());
+
+ if (prefNear != null) {
add(new JLabel(tr("Download near:")), GBC.eol());
downloadNear = new JList(new String[]{tr("track only"), tr("waypoints only"), tr("track and waypoints")});
downloadNear.setSelectedIndex(Main.pref.getInteger(prefNear, 0));
add(downloadNear, GBC.eol());
- } else {
- downloadNear = null;
- }
- }
-
- /**
- * Gets the maximum distance in meters
- * @return The maximum distance, in meters
- */
- public final double getDistance() {
- return dist[buffer.getSelectedIndex()];
- }
-
- /**
- * Gets the maximum area in squared kilometers
- * @return The maximum distance, in squared kilometers
- */
- public final double getArea() {
- return area[maxRect.getSelectedIndex()];
- }
-
- /**
- * Gets the "download near" choosen value
- * @return the "download near" choosen value (0: track only, 1: waypoints only, 2: both)
- */
- public final int getNear() {
- return downloadNear.getSelectedIndex();
- }
-
+ } else {
+ downloadNear = null;
+ }
+ }
+
+ /**
+ * Gets the maximum distance in meters
+ * @return The maximum distance, in meters
+ */
+ public final double getDistance() {
+ return dist[buffer.getSelectedIndex()];
+ }
+
+ /**
+ * Gets the maximum area in squared kilometers
+ * @return The maximum distance, in squared kilometers
+ */
+ public final double getArea() {
+ return area[maxRect.getSelectedIndex()];
+ }
+
+ /**
+ * Gets the "download near" choosen value
+ * @return the "download near" choosen value (0: track only, 1: waypoints only, 2: both)
+ */
+ public final int getNear() {
+ return downloadNear.getSelectedIndex();
+ }
+
/**
* Replies true if the user selected to download OSM data
@@ -158,16 +158,16 @@
return cbDownloadGpxData.isSelected();
}
-
+
/**
* Remembers the current settings in the download panel
*/
protected final void rememberSettings() {
- Main.pref.put(prefOsm, isDownloadOsmData());
- Main.pref.put(prefGps, isDownloadGpxData());
- Main.pref.putDouble(prefDist, getDistance());
- Main.pref.putDouble(prefArea, getArea());
- if (prefNear != null) {
- Main.pref.putInteger(prefNear, getNear());
- }
+ Main.pref.put(prefOsm, isDownloadOsmData());
+ Main.pref.put(prefGps, isDownloadGpxData());
+ Main.pref.putDouble(prefDist, getDistance());
+ Main.pref.putDouble(prefArea, getArea());
+ if (prefNear != null) {
+ Main.pref.putInteger(prefNear, getNear());
+ }
}
@@ -177,6 +177,6 @@
*/
protected final void addChangeListener(ChangeListener listener) {
- cbDownloadGpxData.addChangeListener(listener);
- cbDownloadOsmData.addChangeListener(listener);
+ cbDownloadGpxData.addChangeListener(listener);
+ cbDownloadOsmData.addChangeListener(listener);
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java (revision 6070)
@@ -25,5 +25,5 @@
*/
public class DownloadAlongTrackAction extends DownloadAlongAction {
-
+
static final int NEAR_TRACK = 0;
static final int NEAR_WAYPOINTS = 1;
@@ -36,5 +36,5 @@
private static final String PREF_DOWNLOAD_ALONG_TRACK_AREA = "downloadAlongTrack.area";
private static final String PREF_DOWNLOAD_ALONG_TRACK_NEAR = "downloadAlongTrack.near";
-
+
private final GpxData data;
@@ -50,5 +50,5 @@
@Override
public void actionPerformed(ActionEvent e) {
-
+
final DownloadAlongPanel panel = new DownloadAlongPanel(
PREF_DOWNLOAD_ALONG_TRACK_OSM, PREF_DOWNLOAD_ALONG_TRACK_GPS,
@@ -58,5 +58,5 @@
return;
}
-
+
final int near = panel.getNear();
@@ -124,5 +124,5 @@
return;
}
- confirmAndDownloadAreas(a, max_area, panel.isDownloadOsmData(), panel.isDownloadGpxData(),
+ confirmAndDownloadAreas(a, max_area, panel.isDownloadOsmData(), panel.isDownloadGpxData(),
tr("Download from OSM along this track"), progressMonitor);
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java (revision 6070)
@@ -37,5 +37,5 @@
private final GpxData data;
-
+
public DownloadWmsAlongTrackAction(final GpxData data) {
super(tr("Precache imagery tiles along this track"), ImageProvider.get("downloadalongtrack"));
@@ -118,4 +118,4 @@
JOptionPane.showMessageDialog(Main.parent, tr("There are no imagery layers."), tr("No imagery layers"), JOptionPane.WARNING_MESSAGE);
}
-
+
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java (revision 6070)
@@ -39,5 +39,5 @@
public class ImportAudioAction extends AbstractAction {
private final GpxLayer layer;
-
+
private static class Markers {
public boolean timedMarkersOmitted = false;
@@ -114,5 +114,5 @@
}
}
-
+
/**
* Makes a new marker layer derived from this GpxLayer containing at least one audio marker
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java (revision 6070)
@@ -62,4 +62,4 @@
}
}
-
+
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java (revision 6070)
@@ -44,4 +44,4 @@
}
}
-
+
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 6070)
@@ -321,5 +321,5 @@
*
* Override in subclasses to add all necessary attributes.
- *
+ *
* @return the corresponding WayPoint with all relevant attributes
*/
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java (revision 6070)
@@ -18,5 +18,5 @@
*/
public class Cascade implements Cloneable {
-
+
public static final Cascade EMPTY_CASCADE = new Cascade();
@@ -28,5 +28,5 @@
return get(key, def, klass, false);
}
-
+
/**
* Get value for the given key
@@ -182,5 +182,5 @@
@Override
public Cascade clone() {
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked")
HashMap clonedProp = (HashMap) ((HashMap) this.prop).clone();
Cascade c = new Cascade();
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java (revision 6070)
@@ -51,5 +51,5 @@
/**
* Creates a clone of the environment {@code other}
- *
+ *
* @param other the other environment. Must not be null.
*/
@@ -112,5 +112,5 @@
/**
* Replies the current context.
- *
+ *
* @return the current context
*/
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java (revision 6070)
@@ -15,13 +15,13 @@
* strategies on how to compose the text label which can be rendered close to a node
* or within an area in an OSM map.
- *
+ *
* The three strategies below support three rules for composing a label:
*
* - {@link StaticLabelCompositionStrategy} - the label is given by a static text
* specified in the MapCSS style file
- *
+ *
* - {@link TagLookupCompositionStrategy} - the label is given by the content of a
* tag whose name specified in the MapCSS style file
- *
+ *
* - {@link DeriveLabelFromNameTagsCompositionStrategy} - the label is given by the value
* of one
@@ -167,9 +167,9 @@
/**
*
Creates the strategy and initializes its name tags from the preferences.
- *
+ *
* Note: If the list of name tags in the preferences changes, strategy instances
* are not notified. It's up to the client to listen to preference changes and
* invoke {@link #initNameTagsFromPreferences()} accordingly.
- *
+ *
*/
public DeriveLabelFromNameTagsCompositionStrategy() {
@@ -179,5 +179,5 @@
/**
* Sets the name tags to be looked up in order to build up the label
- *
+ *
* @param nameTags the name tags. null values are ignore.
*/
@@ -201,5 +201,5 @@
/**
* Replies an unmodifiable list of the name tags used to compose the label.
- *
+ *
* @return the list of name tags
*/
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 6070)
@@ -124,9 +124,9 @@
.setOptional(true).get();
}
-
+
public static ImageIcon getNodeIcon(Tag tag) {
return getNodeIcon(tag, true);
}
-
+
public static ImageIcon getNodeIcon(Tag tag, boolean includeDeprecatedIcon) {
if (tag != null) {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 6070)
@@ -28,5 +28,5 @@
public final static StyleCache EMPTY_STYLECACHE = (new StyleCache()).intern();
-
+
private StyleCache() {
bd = new ArrayList();
@@ -189,5 +189,5 @@
bd.add(i, lower);
data.add(i, sl);
-
+
// --|--|----|--------|--
// i-1 i i+1 i+2
@@ -200,5 +200,5 @@
}
}
-
+
public void consistencyTest() {
if (bd.size() < 2) throw new AssertionError();
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 6070)
@@ -36,5 +36,5 @@
/**
* Creates a new text element
- *
+ *
* @param strategy the strategy indicating how the text is composed for a specific {@link OsmPrimitive} to be rendered.
* If null, no label is rendered.
@@ -60,5 +60,5 @@
/**
* Copy constructor
- *
+ *
* @param other the other element.
*/
@@ -76,5 +76,5 @@
* Derives a suitable label composition strategy from the style properties in
* {@code c}.
- *
+ *
* @param c the style properties
* @return the label composition strategy
@@ -109,5 +109,5 @@
* Builds a text element from style properties in {@code c} and the
* default text color {@code defaultTextColor}
- *
+ *
* @param c the style properties
* @param defaultTextColor the default text color. Must not be null.
@@ -161,5 +161,5 @@
/**
* Replies the label to be rendered for the primitive {@code osm}.
- *
+ *
* @param osm the OSM object
* @return the label, or null, if {@code osm} is null or if no label can be
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (revision 6070)
@@ -136,5 +136,5 @@
/**
* Represents a key/value condition which is either applied to a primitive.
- *
+ *
*/
public static class KeyValueCondition extends Condition {
@@ -146,5 +146,5 @@
/**
* Creates a key/value-condition.
- *
+ *
* @param k the key
* @param v the value
@@ -208,5 +208,5 @@
* LINK: the parent is a relation and it has at least one member with the role
* "a label" referring to the child
- *
+ *
* [!"a label"] PRIMITIVE: the primitive doesn't have a tag "a label"
* LINK: the parent is a relation but doesn't have a member with the role
@@ -224,5 +224,5 @@
/**
- *
+ *
* @param label
* @param exclamationMarkPresent
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java (revision 6070)
@@ -38,8 +38,8 @@
if (key.equals(TEXT)) {
/* Special case for declaration 'text: ...'
- *
+ *
* - Treat the value 'auto' as keyword.
* - Treat any other literal value 'litval' as as reference to tag with key 'litval'
- *
+ *
* - Accept function expressions as is. This allows for
* tag(a_tag_name) value of a tag
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java (revision 6070)
@@ -7,5 +7,5 @@
protected Integer line;
protected Integer column;
-
+
public MapCSSException(String specialmessage) {
this.specialmessage = specialmessage;
@@ -19,5 +19,5 @@
this.line = line;
}
-
+
@Override
public String getMessage() {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSRule.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSRule.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSRule.java (revision 6070)
@@ -8,5 +8,5 @@
public class MapCSSRule {
-
+
public List selectors;
public List declaration;
@@ -19,5 +19,5 @@
/**
* Executes the instructions against the environment {@code env}
- *
+ *
* @param env the environment
*/
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 6070)
@@ -47,5 +47,5 @@
* Creates a new style source from the MapCSS styles supplied in
* {@code css}
- *
+ *
* @param css the MapCSS style declaration. Must not be null.
* @throws IllegalArgumentException thrown if {@code css} is null
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 6070)
@@ -34,5 +34,5 @@
/**
* Represents a child selector or a parent selector.
- *
+ *
* In addition to the standard CSS notation for child selectors, JOSM also supports
* an "inverse" notation:
@@ -40,5 +40,5 @@
* selector_a > selector_b { ... } // the standard notation (child selector)
* relation[type=route] > way { ... } // example (all ways of a route)
- *
+ *
* selector_a < selector_b { ... } // the inverse notation (parent selector)
* node[traffic_calming] < way { ... } // example (way that has a traffic calming node)
@@ -55,5 +55,5 @@
/**
- *
+ *
* @param a the first selector
* @param b the second selector
@@ -69,9 +69,9 @@
/**
* Finds the first referrer matching {@link #left}
- *
+ *
* The visitor works on an environment and it saves the matching
* referrer in {@code e.parent} and its relative position in the
* list referrers "child list" in {@code e.index}.
- *
+ *
* If after execution {@code e.parent} is null, no matching
* referrer was found.
@@ -196,5 +196,5 @@
}
}
-
+
/**
* Super class of {@link GeneralSelector} and {@link LinkSelector}
@@ -204,5 +204,5 @@
protected final List conds;
-
+
protected AbstractSelector(List conditions) {
if (conditions == null || conditions.isEmpty()) {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java (revision 6070)
@@ -6,5 +6,5 @@
public class IconPrototype extends Prototype {
-
+
public IconReference icon;
public Boolean annotate;
Index: trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 6070)
@@ -34,5 +34,5 @@
* - Access token URL
* - Authorize URL
- *
+ *
* @see OAuthParameters
* @since 2746
Index: trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 6070)
@@ -143,5 +143,5 @@
public void setApiUrl(String apiUrl) {
super.setApiUrl(apiUrl);
- if (pnlMessage != null) {
+ if (pnlMessage != null) {
pnlMessage.setText(tr(""
+ "Please enter an OAuth Access Token which is authorized to access the OSM server "
Index: trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 6070)
@@ -40,5 +40,5 @@
/**
- * An OAuth 1.0 authorization client.
+ * An OAuth 1.0 authorization client.
* @since 2746
*/
Index: trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java (revision 6070)
@@ -37,5 +37,5 @@
* In contrast to the fully-automatic procedure the user is dispatched to an
* external browser for login and authorisation.
- *
+ *
* @since 2746
*/
Index: trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java (revision 6070)
@@ -34,5 +34,5 @@
}
}
-
+
private AudioPreference() {
super("audio", tr("Audio Settings"), tr("Settings for the audio player and audio markers."));
@@ -57,5 +57,5 @@
public void addGui(PreferenceTabbedPane gui) {
JPanel audio = new JPanel(new GridBagLayout());
-
+
// audioMenuVisible
audioMenuVisible.setSelected(! Main.pref.getBoolean("audio.menuinvisible"));
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (revision 6070)
@@ -86,5 +86,5 @@
this.setMaximumSize( Toolkit.getDefaultToolkit().getScreenSize());
}
-
+
/**
* Replies the preferences tabbed pane.
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java (revision 6070)
@@ -3,5 +3,5 @@
/**
- * Base interface of Preferences settings, should not be directly implemented,
+ * Base interface of Preferences settings, should not be directly implemented,
* see {@link TabPreferenceSetting} and {@link SubPreferenceSetting}.
*/
@@ -18,5 +18,5 @@
*/
boolean ok();
-
+
/**
* Called to know if the preferences tab has only to be displayed in expert mode.
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 6070)
@@ -212,5 +212,5 @@
}}, clazz);
}
-
+
public boolean selectSubTabByPref(Class clazz) {
for (PreferenceSetting setting : settings) {
@@ -244,5 +244,5 @@
return getSetting(ImageryPreference.class);
}
-
+
public final ShortcutPreference getShortcutPreference() {
return getSetting(ShortcutPreference.class);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (revision 6070)
@@ -25,5 +25,5 @@
}
}
-
+
private ServerAccessPreference() {
super("connection", tr("Connection Settings"), tr("Connection Settings for the OSM server."), false, new JTabbedPane());
Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java (revision 6070)
@@ -9,5 +9,5 @@
/**
- * A source entry primarily used to save the user's selection of mappaint styles,
+ * A source entry primarily used to save the user's selection of mappaint styles,
* but also for preset sources.
*/
@@ -61,5 +61,5 @@
return false;
final SourceEntry other = (SourceEntry) obj;
- return equal(other.url, url) &&
+ return equal(other.url, url) &&
equal(other.name, name) &&
equal(other.title, title) &&
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 6070)
@@ -147,10 +147,10 @@
return new ActionDefinition(null);
}
-
+
public boolean hasParameters() {
if (!(getAction() instanceof ParameterizedAction)) return false;
for (Object o: parameters.values()) {
if (o!=null) return true;
- }
+ }
return false;
}
@@ -412,5 +412,5 @@
}
});
-
+
JMenuItem configure = new JMenuItem(new AbstractAction(tr("Configure toolbar")) {
@Override
@@ -430,5 +430,5 @@
p.setVisible(true);
// refresh toolbar to try using changed shortcuts without restart
- Main.toolbar.refreshToolbarControl();
+ Main.toolbar.refreshToolbarControl();
}
});
@@ -485,5 +485,5 @@
private final class Move implements ActionListener {
- @Override
+ @Override
public void actionPerformed(ActionEvent e) {
if (e.getActionCommand().equals("<") && actionsTree.getSelectionCount() > 0) {
@@ -1032,5 +1032,5 @@
final JButton b = addButtonAndShortcut(action);
buttonActions.put(b, action);
-
+
Icon i = action.getDisplayIcon();
if (i != null) {
@@ -1055,9 +1055,9 @@
control.setVisible(control.getComponentCount() != 0);
}
-
+
private JButton addButtonAndShortcut(ActionDefinition action) {
Action act = action.getParametrizedAction();
JButton b = control.add(act);
-
+
Shortcut sc = null;
if (action.getAction() instanceof JosmAction) {
@@ -1072,5 +1072,5 @@
paramCode = action.parameters.hashCode();
}
-
+
String tt = action.getDisplayTooltip();
if (tt==null) {
@@ -1091,5 +1091,5 @@
Main.unregisterShortcut(sc);
Main.registerActionShortcut(act, sc);
-
+
// add shortcut info to the tooltip if needed
if (sc.getAssignedUser()) {
@@ -1100,5 +1100,5 @@
}
}
-
+
if (!tt.isEmpty()) {
b.setToolTipText(tt);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java (revision 6070)
@@ -32,7 +32,7 @@
}
}
-
+
private ValidatorPreference() {
- super("validator", tr("Data validator"),
+ super("validator", tr("Data validator"),
tr("An OSM data validator that checks for common errors made by users and editor programs."));
}
Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (revision 6070)
@@ -95,5 +95,5 @@
});
readPreferences(Main.pref);
-
+
applyFilter();
table = new PreferencesTable(displayData);
@@ -140,5 +140,5 @@
}
});
-
+
JButton export = new JButton(tr("Export selected items"));
p.add(export, GBC.std().insets(5,5,0,0));
@@ -148,5 +148,5 @@
}
});
-
+
final JButton more = new JButton(tr("More..."));
p.add(more, GBC.std().insets(5,5,0,0));
@@ -178,5 +178,5 @@
allData = prepareData(loaded, orig, defaults);
}
-
+
private File[] askUserForCustomSettingsFiles(boolean saveFileFlag, String title) {
FileFilter filter = new FileFilter() {
@@ -195,12 +195,12 @@
if (sel.length==1 && !sel[0].getName().contains(".")) sel[0]=new File(sel[0].getAbsolutePath()+".xml");
return sel;
- }
+ }
return new File[0];
}
-
+
private void exportSelectedToXML() {
ArrayList keys = new ArrayList();
boolean hasLists = false;
-
+
for (PrefEntry p: table.getSelectedItems()) {
// preferences with default values are not saved
@@ -212,5 +212,5 @@
}
}
-
+
if (keys.isEmpty()) {
JOptionPane.showMessageDialog(Main.parent,
@@ -233,5 +233,5 @@
CustomConfigurator.exportPreferencesKeysToFile(files[0].getAbsolutePath(), answer == 0, keys);
}
-
+
private void readPreferencesFromXML() {
File[] files = askUserForCustomSettingsFiles(false, tr("Open JOSM customization file"));
@@ -262,5 +262,5 @@
applyFilter();
}
-
+
private Comparator customComparator = new Comparator() {
@Override
@@ -273,5 +273,5 @@
}
};
-
+
private List prepareData(Map loaded, Map orig, Map defaults) {
List data = new ArrayList();
@@ -306,7 +306,7 @@
return data;
}
-
+
Map profileTypes = new LinkedHashMap();
-
+
private JPopupMenu buildPopupMenu() {
JPopupMenu menu = new JPopupMenu();
@@ -315,9 +315,9 @@
profileTypes.put(marktr("toolbar"), "toolbar.*");
profileTypes.put(marktr("imagery"), "imagery.*");
-
+
for (Entry e: profileTypes.entrySet()) {
menu.add(new ExportProfileAction(Main.pref, e.getKey(), e.getValue()));
}
-
+
menu.addSeparator();
menu.add(getProfileMenu());
@@ -340,5 +340,5 @@
return menu;
}
-
+
private JMenu getProfileMenu() {
final JMenu p =new JMenu(tr("Load profile"));
@@ -372,9 +372,9 @@
return p;
}
-
+
private class ImportProfileAction extends AbstractAction {
private final File file;
private final String type;
-
+
public ImportProfileAction(String name, File file, String type) {
super(name);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java (revision 6070)
@@ -126,10 +126,10 @@
panel.add(onewayArrow, GBC.eop().insets(20,0,0,0));
panel.add(segmentOrderNumber, GBC.eop().insets(20,0,0,0));
-
+
panel.add(new JLabel(tr("Select and draw mode options")),
GBC.eop().insets(5,10,0,0));
panel.add(virtualNodes, GBC.eop().insets(20,0,0,0));
panel.add(drawHelperLine, GBC.eop().insets(20, 0, 0, 0));
-
+
panel.add(performanceLabel, GBC.eop().insets(5,10,0,0));
panel.add(useAntialiasing, GBC.eop().insets(20,0,0,0));
@@ -137,10 +137,10 @@
panel.add(useHighlighting, GBC.eop().insets(20,0,0,0));
panel.add(outlineOnly, GBC.eol().insets(20,0,0,0));
-
+
panel.add(new JLabel(tr("Other options")),
GBC.eop().insets(5,10,0,0));
panel.add(sourceBounds, GBC.eop().insets(20,0,0,0));
panel.add(inactive, GBC.eop().insets(20,0,0,0));
-
+
ExpertToggleAction.addVisibilitySwitcher(performanceLabel);
ExpertToggleAction.addVisibilitySwitcher(useAntialiasing);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (revision 6070)
@@ -43,5 +43,5 @@
model = new LanguageComboBoxModel();
// Selecting the language BEFORE the JComboBox listens to model changes speed up initialization by ~35ms (see #7386)
- // See http://stackoverflow.com/questions/3194958/fast-replacement-for-jcombobox-basiccomboboxui
+ // See http://stackoverflow.com/questions/3194958/fast-replacement-for-jcombobox-basiccomboboxui
model.selectLanguage(Main.pref.get("language"));
langCombo = new JosmComboBox(model);
@@ -54,5 +54,5 @@
panel.add(langCombo, GBC.eol().fill(GBC.HORIZONTAL));
panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
-
+
TabPreferenceSetting tabPref = lafPreference.getTabPreferenceSetting(gui);
tabPref.registerSubTab(this, tabPref.getSubTab(lafPreference));
Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java (revision 6070)
@@ -29,7 +29,7 @@
protected final JosmTextArea rawUrl = new JosmTextArea(3, 40);
protected final JosmTextField name = new JosmTextField();
-
+
protected final Collection listeners = new ArrayList();
-
+
/**
* A listener notified when the validation status of this panel change.
@@ -38,5 +38,5 @@
/**
* Called when the validation status of this panel changed
- * @param isValid true if the conditions required to close this panel are met
+ * @param isValid true if the conditions required to close this panel are met
*/
public void contentChanged(boolean isValid);
@@ -71,5 +71,5 @@
return s.replaceAll("[\r\n]+", "").trim();
}
-
+
protected final String getImageryName() {
return sanitize(name.getText());
@@ -79,5 +79,5 @@
return sanitize(rawUrl.getText());
}
-
+
protected abstract boolean isImageryValid();
Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java (revision 6070)
@@ -89,5 +89,5 @@
(int) Math.ceil(view.getPreferredSpan(View.Y_AXIS)));
}
-
+
protected final String getTmsUrl() {
return sanitize(tmsUrl.getText());
Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (revision 6070)
@@ -110,5 +110,5 @@
tree.getLayerTree().addPropertyChangeListener("selectedLayers", new PropertyChangeListener() {
@Override
- public void propertyChange(PropertyChangeEvent evt) {
+ public void propertyChange(PropertyChangeEvent evt) {
onLayerSelectionChanged();
}
@@ -135,10 +135,10 @@
}
});
-
+
registerValidableComponent(endpoint);
registerValidableComponent(rawUrl);
registerValidableComponent(wmsUrl);
}
-
+
protected final void onLayerSelectionChanged() {
if (wms.getServiceUrl() != null) {
@@ -161,9 +161,9 @@
return info;
}
-
+
protected final String getWmsUrl() {
return sanitize(wmsUrl.getText());
}
-
+
protected boolean isImageryValid() {
if (getImageryName().isEmpty()) {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 6070)
@@ -88,5 +88,5 @@
addSettingsSection(p, name, section, GBC.eol());
}
-
+
private void addSettingsSection(final JPanel p, String name, JPanel section, GBC gbc) {
final JLabel lbl = new JLabel(name);
@@ -436,8 +436,8 @@
throw new IllegalStateException("Type " + type + " not supported");
}
-
+
final AddImageryDialog addDialog = new AddImageryDialog(gui, p);
addDialog.showDialog();
-
+
if (addDialog.getValue() == 1) {
try {
@@ -455,5 +455,5 @@
}
}
-
+
private class RemoveEntryAction extends AbstractAction implements ListSelectionListener {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java (revision 6070)
@@ -88,5 +88,5 @@
add(hint, gbc);
}
-
+
/**
* A plugin checkbox.
@@ -102,5 +102,5 @@
}
}
-
+
/**
* Listener called when the user selects/unselects a plugin checkbox.
@@ -139,5 +139,5 @@
for (String s : pi.getRequiredPlugins()) {
if (s.equals(cb.pi.getName())) {
- otherPlugins.add(pi.getName());
+ otherPlugins.add(pi.getName());
break;
}
@@ -151,5 +151,5 @@
}
};
-
+
/**
Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (revision 6070)
@@ -295,5 +295,5 @@
return ret;
}
-
+
/**
* Replies the set of all available plugins.
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java (revision 6070)
@@ -7,5 +7,5 @@
abstract public class AbstractProjectionChoice implements ProjectionChoice {
-
+
protected String name;
protected String id;
@@ -52,5 +52,5 @@
abstract public String getCurrentCode();
-
+
abstract public String getProjectionName();
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java (revision 6070)
@@ -209,5 +209,5 @@
public String getCurrentCode() {
// not needed - getProjection() is overridden
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException();
}
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java (revision 6070)
@@ -53,5 +53,5 @@
return null;
}
-
+
@Override
public String getProjectionName() {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java (revision 6070)
@@ -77,5 +77,5 @@
return null;
}
-
+
@Override
protected String indexToZone(int index) {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionChoice.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionChoice.java (revision 6070)
@@ -20,5 +20,5 @@
*
* Will be used to save the user selection to the preference file.
- *
+ *
* @return the string identifier
*/
@@ -67,5 +67,5 @@
/**
* Get Preferences from projection code.
- *
+ *
* @return null when code is not part of this projection choice.
* An empty Collection as return value indicates, that the code is supported,
@@ -76,5 +76,5 @@
/**
* Short name of the projection choice as shown in the GUI (combo box).
- *
+ *
* @return the name
*/
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 6070)
@@ -90,7 +90,7 @@
* see http://www.epsg-registry.org/
*/
- mercator = registerProjectionChoice(tr("Mercator"), "core:mercator",
+ mercator = registerProjectionChoice(tr("Mercator"), "core:mercator",
3857);
-
+
/**
* UTM.
@@ -155,5 +155,5 @@
/**
* Lambert 93 projection.
- *
+ *
* As specified by the IGN in this document
* http://professionnels.ign.fr/DISPLAY/000/526/702/5267026/NTG_87.pdf
@@ -471,5 +471,5 @@
return gui.getMapPreference();
}
-
+
/**
* Selects the given projection.
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java (revision 6070)
@@ -25,5 +25,5 @@
private Hemisphere hemisphere;
-
+
private final static List cbEntries = new ArrayList();
static {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 6070)
@@ -161,5 +161,5 @@
this.name = name;
}
-
+
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean
@@ -186,5 +186,5 @@
}
}
-
+
private void initComponents() {
JPanel listPane = new JPanel();
Index: trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java (revision 6070)
@@ -19,5 +19,5 @@
private String defaultFilter;
-
+
public static class Factory implements PreferenceSettingFactory {
public PreferenceSetting createPreferenceSetting() {
@@ -25,5 +25,5 @@
}
}
-
+
private ShortcutPreference() {
// icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -35,5 +35,5 @@
super("shortcuts", tr("Keyboard Shortcuts"), tr("Changing keyboard shortcuts manually."));
}
-
+
@Override
public void addGui(PreferenceTabbedPane gui) {
@@ -49,5 +49,5 @@
return Shortcut.savePrefs();
}
-
+
public void setDefaultFilter(String substring) {
defaultFilter = substring;
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (revision 6070)
@@ -64,5 +64,5 @@
tagTable.setNextFocusComponent(nextFocusComponent);
}
-
+
/**
* builds the panel with the button row
@@ -123,5 +123,5 @@
});
}
-
+
addFocusListener(new FocusAdapter() {
@Override public void focusGained(FocusEvent e) {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 6070)
@@ -47,5 +47,5 @@
private final TagEditorModel model;
private Component nextFocusComponent;
-
+
/** a list of components to which focus can be transferred without stopping
* cell editing this table.
@@ -104,10 +104,10 @@
getCellEditor().stopCellEditing();
}
-
+
if (row==-1 && col==-1) {
requestFocusInCell(0, 0);
return;
}
-
+
if (col == 0) {
col++;
@@ -290,8 +290,8 @@
if (!key.trim().isEmpty()) {
model.appendNewTag();
- }
+ }
requestFocusInCell(model.getRowCount()-1, 0);
}
-
+
protected void updateEnabledState() {
setEnabled(TagTable.this.isEnabled());
@@ -435,5 +435,5 @@
this.nextFocusComponent = nextFocusComponent;
}
-
+
public TagCellEditor getTableCellEditor() {
return editor;
@@ -472,5 +472,5 @@
}
// there was a bug here - on older 1.6 Java versions Tab was not working
- // after such activation. In 1.7 it works OK,
+ // after such activation. In 1.7 it works OK,
// previous solution of usint awt.Robot was resetting mouse speed on Windows
}
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 6070)
@@ -75,5 +75,5 @@
public String locale_name;
public final static String OPTIONAL_TOOLTIP_TEXT = "Optional tooltip text";
-
+
/**
* The types as preparsed collection.
@@ -84,5 +84,5 @@
public TemplateEntry nameTemplate;
public Match nameTemplateFilter;
-
+
/**
* Create an empty tagging preset. This will not have any items and
@@ -239,5 +239,5 @@
if (roles != null && osm != null) {
for (Role i : roles.roles) {
- if (i.memberExpression != null && i.memberExpression.match(osm)
+ if (i.memberExpression != null && i.memberExpression.match(osm)
&& (i.types == null || i.types.isEmpty() || i.types.contains(TaggingPresetType.forPrimitive(osm)) )) {
return i.key;
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItem.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItem.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItem.java (revision 6070)
@@ -46,4 +46,4 @@
return null;
}
-
+
}
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java (revision 6070)
@@ -465,6 +465,6 @@
}
- public void setClickListener(ActionListener сlickListener) {
- this.clickListener = сlickListener;
+ public void setClickListener(ActionListener clickListener) {
+ this.clickListener = clickListener;
}
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetType.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetType.java (revision 6070)
@@ -47,4 +47,4 @@
return null;
}
-
+
}
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (revision 6070)
@@ -286,5 +286,5 @@
private static InputContext privateInputContext = InputContext.getInstance();
-
+
@Override
public InputContext getInputContext() {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java (revision 6070)
@@ -36,5 +36,5 @@
private Integer maxChars;
-
+
/**
* The document model for the editor
@@ -48,5 +48,5 @@
@Override
public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
-
+
// If a maximum number of characters is specified, avoid to exceed it
if (maxChars != null && str != null && getLength() + str.length() > maxChars) {
@@ -58,5 +58,5 @@
}
}
-
+
if (autoCompletionList == null) {
super.insertString(offs, str, a);
Index: trunk/src/org/openstreetmap/josm/gui/util/FileFilterAllFiles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/FileFilterAllFiles.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/util/FileFilterAllFiles.java (revision 6070)
@@ -12,5 +12,5 @@
*/
public class FileFilterAllFiles extends FileFilter {
-
+
private static FileFilterAllFiles INSTANCE;
Index: trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java (revision 6070)
@@ -52,9 +52,9 @@
}
}
-
+
public static void executeByMainWorkerInEDT(final Runnable task) {
Main.worker.submit(new Runnable() {
public void run() {
- runInEDTAndWait(task);
+ runInEDTAndWait(task);
}
});
@@ -82,5 +82,5 @@
}
}
-
+
/**
* returns true if the user wants to cancel, false if they
@@ -104,5 +104,5 @@
return dlg.showDialog().getValue() != 2;
}
-
+
/**
* Replies the disabled (grayed) version of the specified image.
@@ -125,5 +125,5 @@
return new ImageIcon(getDisabledImage(icon.getImage()));
}
-
+
/**
* Attaches a {@code HierarchyListener} to the specified {@code Component} that
@@ -154,5 +154,5 @@
return pane;
}
-
+
/**
* Schedules a new Timer to be run in the future (once or several times).
@@ -169,5 +169,5 @@
return timer;
}
-
+
/**
* Return s new BasicStroke object with given thickness and style
@@ -177,6 +177,6 @@
public static Stroke getCustomizedStroke(String code) {
String[] s = code.trim().split("[^\\.0-9]+");
-
- if (s.length==0) return new BasicStroke();
+
+ if (s.length==0) return new BasicStroke();
float w;
try {
@@ -215,5 +215,5 @@
}
}
-
+
/**
* Gets the font used to display JOSM title in about dialog and splash screen.
@@ -227,5 +227,5 @@
public static Font getTitleFont() {
List fonts = Arrays.asList(GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames());
- // Helvetica is the preferred choice but is not available by default on Windows
+ // Helvetica is the preferred choice but is not available by default on Windows
// (http://www.microsoft.com/typography/fonts/product.aspx?pid=161)
if (fonts.contains("Helvetica")) {
Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java (revision 6070)
@@ -21,5 +21,5 @@
* createDefaultModel method
* @param text the initial string to display, or null
- * @param columns the number of columns to use to calculate
+ * @param columns the number of columns to use to calculate
* the preferred width >= 0; if columns
* is set to zero, the preferred width will be whatever
@@ -37,5 +37,5 @@
*
* @param text the text to be displayed, or null
- * @param columns the number of columns to use to calculate
+ * @param columns the number of columns to use to calculate
* the preferred width; if columns is set to zero, the
* preferred width will be whatever naturally results from
@@ -63,9 +63,9 @@
* null.
*
- * @param columns the number of columns to use to calculate
+ * @param columns the number of columns to use to calculate
* the preferred width; if columns is set to zero, the
* preferred width will be whatever naturally results from
* the component implementation
- */
+ */
public JosmTextField(int columns) {
this(null, null, columns);
Index: trunk/src/org/openstreetmap/josm/gui/widgets/ListPopupMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/ListPopupMenu.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/ListPopupMenu.java (revision 6070)
@@ -13,5 +13,5 @@
*/
public class ListPopupMenu extends JPopupMenu {
-
+
private JList[] lists;
Index: trunk/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java (revision 6070)
@@ -30,6 +30,6 @@
* Sets the type of primitive object
* @param type The type of primitive object (
- * {@link OsmPrimitiveType#NODE NODE},
- * {@link OsmPrimitiveType#WAY WAY},
+ * {@link OsmPrimitiveType#NODE NODE},
+ * {@link OsmPrimitiveType#WAY WAY},
* {@link OsmPrimitiveType#RELATION RELATION})
*/
Index: trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java (revision 6070)
@@ -25,5 +25,5 @@
/**
- * Creates a new {@link PopupMenuLauncher} with no defined menu.
+ * Creates a new {@link PopupMenuLauncher} with no defined menu.
* It is then needed to override the {@link #launch} method.
* @see #launch(MouseEvent)
@@ -55,5 +55,5 @@
@Override public void mouseClicked(MouseEvent e) {}
@Override public void mouseReleased(MouseEvent e) { processEvent(e); }
-
+
private void processEvent(MouseEvent e) {
if (e.isPopupTrigger() && (!checkEnabled || e.getComponent().isEnabled())) {
@@ -75,5 +75,5 @@
}
}
-
+
protected boolean checkSelection(Component component, Point p) {
if (component instanceof JList) {
@@ -86,5 +86,5 @@
return true;
}
-
+
protected void checkFocusAndShowMenu(final Component component, final MouseEvent evt) {
if (component != null && component.isFocusable() && !component.hasFocus() && component.requestFocusInWindow()) {
@@ -100,5 +100,5 @@
}
}
-
+
protected void showMenu(MouseEvent evt) {
if (menu != null && evt != null) {
@@ -106,5 +106,5 @@
}
}
-
+
protected int checkListSelection(JList list, Point p) {
int idx = list.locationToIndex(p);
@@ -122,5 +122,5 @@
return row;
}
-
+
protected TreePath checkTreeSelection(JTree tree, Point p) {
TreePath path = tree.getPathForLocation(p.x, p.y);
@@ -130,9 +130,9 @@
return path;
}
-
+
protected static boolean isDoubleClick(MouseEvent e) {
return e != null && SwingUtilities.isLeftMouseButton(e) && e.getClickCount() == 2;
}
-
+
/**
* @return the popup menu if defined, {@code null} otherwise.
Index: trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (revision 6070)
@@ -59,5 +59,5 @@
return result;
}
-
+
/**
* Retrieve raw gps waypoints from the server API.
@@ -131,5 +131,5 @@
return null;
ds.mergeFrom(ds2);
-
+
} else {
// Simple request
Index: trunk/src/org/openstreetmap/josm/io/CacheFiles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/CacheFiles.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/CacheFiles.java (revision 6070)
@@ -65,5 +65,5 @@
*/
public CacheFiles(String ident, boolean isPlugin) {
- String pref = isPlugin ?
+ String pref = isPlugin ?
Main.pref.getPluginsDirectory().getPath() + File.separator + "cache" :
Main.pref.getCacheDirectory().getPath();
Index: trunk/src/org/openstreetmap/josm/io/Capabilities.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/Capabilities.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/Capabilities.java (revision 6070)
@@ -13,5 +13,5 @@
*
* Example capabilites document:
- *
+ *
*
*
@@ -32,5 +32,5 @@
*
*
- *
+ *
* This class is used in conjunction with a very primitive parser
* and simply stuffs the each tag and its attributes into a hash
Index: trunk/src/org/openstreetmap/josm/io/FileExporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/FileExporter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/FileExporter.java (revision 6070)
@@ -12,5 +12,5 @@
public abstract class FileExporter implements LayerChangeListener {
-
+
public final ExtensionFileFilter filter;
@@ -31,5 +31,5 @@
/**
- * Returns the enabled state of this {@code FileExporter}. When enabled, it is listed and usable in "File->Save" dialogs.
+ * Returns the enabled state of this {@code FileExporter}. When enabled, it is listed and usable in "File->Save" dialogs.
* @return true if this {@code FileExporter} is enabled
* @since 5459
Index: trunk/src/org/openstreetmap/josm/io/FileImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/FileImporter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/FileImporter.java (revision 6070)
@@ -24,5 +24,5 @@
public final ExtensionFileFilter filter;
-
+
private boolean enabled;
@@ -106,5 +106,5 @@
return (new Double(this.getPriority())).compareTo(other.getPriority());
}
-
+
public static CBZip2InputStream getBZip2InputStream(InputStream in) throws IOException {
if (in == null) {
@@ -129,5 +129,5 @@
/**
- * Returns the enabled state of this {@code FileImporter}. When enabled, it is listed and usable in "File->Open" dialog.
+ * Returns the enabled state of this {@code FileImporter}. When enabled, it is listed and usable in "File->Open" dialog.
* @return true if this {@code FileImporter} is enabled
* @since 5459
Index: trunk/src/org/openstreetmap/josm/io/GeoJSONExporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/GeoJSONExporter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/GeoJSONExporter.java (revision 6070)
@@ -20,5 +20,5 @@
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"json,geojson", "json", tr("GeoJSON Files") + " (*.json *.geojson)");
-
+
public GeoJSONExporter() {
super(FILE_FILTER);
Index: trunk/src/org/openstreetmap/josm/io/GpxImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/GpxImporter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/GpxImporter.java (revision 6070)
@@ -32,7 +32,7 @@
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"gpx,gpx.gz", "gpx", tr("GPX Files") + " (*.gpx *.gpx.gz)");
-
+
/**
- * Utility class containing imported GPX and marker layers, and a task to run after they are added to MapView.
+ * Utility class containing imported GPX and marker layers, and a task to run after they are added to MapView.
*/
public static class GpxImporterData {
@@ -85,5 +85,5 @@
}
String fileName = file.getName();
-
+
try {
GpxReader r = new GpxReader(is);
@@ -96,5 +96,5 @@
}
}
-
+
/**
* Adds the specified GPX and marker layers to Map.main
@@ -126,5 +126,5 @@
* @see #addLayers
*/
- public static GpxImporterData loadLayers(final GpxData data, final boolean parsedProperly,
+ public static GpxImporterData loadLayers(final GpxData data, final boolean parsedProperly,
final String gpxLayerName, String markerLayerName) {
GpxLayer gpxLayer = null;
Index: trunk/src/org/openstreetmap/josm/io/GpxReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/GpxReader.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/GpxReader.java (revision 6070)
@@ -34,5 +34,5 @@
/**
* Read a gpx file.
- *
+ *
* Bounds are not read, as we caluclate them. @see GpxData.recalculateBounds()
* Both GPX version 1.0 and 1.1 are supported.
Index: trunk/src/org/openstreetmap/josm/io/GpxWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/GpxWriter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/GpxWriter.java (revision 6070)
@@ -63,5 +63,5 @@
}
}
-
+
out.println("");
out.println(" missingPrimitives;
-
+
/**
* Constructs a {@code FetchResult}
@@ -443,5 +443,5 @@
}
}
-
+
/**
* The class that actually download data from OSM API. Several instances of this class are used by {@link MultiFetchServerObjectReader} (one per set of primitives to fetch).
@@ -472,10 +472,10 @@
return fetch(progressMonitor).dataSet;
}
-
+
@Override
public FetchResult call() throws Exception {
return fetch(progressMonitor);
}
-
+
/**
* fetches the requested primitives and updates the specified progress monitor.
@@ -496,5 +496,5 @@
}
}
-
+
/**
* invokes a Multi Get for a set of ids and a given {@link OsmPrimitiveType}.
Index: trunk/src/org/openstreetmap/josm/io/NMEAImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (revision 6070)
@@ -22,5 +22,5 @@
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"nmea,nme,nma,log,txt", "nmea", tr("NMEA-0183 Files") + " (*.nmea *.nme *.nma *.log *.txt)");
-
+
public NMEAImporter() {
super(FILE_FILTER);
Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 6070)
@@ -54,12 +54,12 @@
*/
public class OsmApi extends OsmConnection {
-
- /**
- * Maximum number of retries to send a request in case of HTTP 500 errors or timeouts
+
+ /**
+ * Maximum number of retries to send a request in case of HTTP 500 errors or timeouts
*/
static public final int DEFAULT_MAX_NUM_RETRIES = 5;
/**
- * Maximum number of concurrent download threads, imposed by
+ * Maximum number of concurrent download threads, imposed by
*
* OSM API usage policy.
@@ -67,7 +67,7 @@
*/
static public final int MAX_DOWNLOAD_THREADS = 2;
-
- /**
- * Default URL of the standard OSM API.
+
+ /**
+ * Default URL of the standard OSM API.
* @since 5422
*/
@@ -93,5 +93,5 @@
return api;
}
-
+
/**
* Replies the {@link OsmApi} for the URL given by the preference osm-server.url
@@ -187,5 +187,5 @@
this.fastFail = fastFail;
}
-
+
@Override
protected byte[] updateData() throws OsmTransferException {
@@ -196,5 +196,5 @@
/**
* Initializes this component by negotiating a protocol version with the server.
- *
+ *
* @param monitor the progress monitor
* @throws OsmTransferCanceledException If the initialisation has been cancelled by user.
@@ -204,7 +204,7 @@
initialize(monitor, false);
}
-
- /**
- * Initializes this component by negotiating a protocol version with the server, with the ability to control the timeout.
+
+ /**
+ * Initializes this component by negotiating a protocol version with the server, with the ability to control the timeout.
*
* @param monitor the progress monitor
@@ -269,5 +269,5 @@
}
}
-
+
private void initializeCapabilities(String xml) throws SAXException, IOException, ParserConfigurationException {
InputSource inputSource = new InputSource(new StringReader(xml));
@@ -734,5 +734,5 @@
throw new OsmTransferException(tr("ID of current changeset > 0 required. Current ID is {0}.", changeset.getId()));
}
-
+
/**
* Replies the changeset data uploads are currently directed to
Index: trunk/src/org/openstreetmap/josm/io/OsmApiException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApiException.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/OsmApiException.java (revision 6070)
@@ -28,5 +28,5 @@
this.accessedUrl = accessedUrl;
}
-
+
/**
* Constructs an {@code OsmApiException} with the specified response code, error header and error body
@@ -52,9 +52,9 @@
/**
- * Constructs an {@code OsmApiException} with the specified cause and a detail message of
- * (cause==null ? null : cause.toString())
+ * Constructs an {@code OsmApiException} with the specified cause and a detail message of
+ * (cause==null ? null : cause.toString())
* (which typically contains the class and detail message of cause).
*
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause} method).
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause} method).
* A null value is permitted, and indicates that the cause is nonexistent or unknown.
*/
@@ -66,5 +66,5 @@
* Constructs an {@code OsmApiException} with the specified detail message and cause.
*
- * Note that the detail message associated with {@code cause} is not automatically incorporated
+ *
Note that the detail message associated with {@code cause} is not automatically incorporated
* into this exception's detail message.
*
Index: trunk/src/org/openstreetmap/josm/io/OsmApiInitializationException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApiInitializationException.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/OsmApiInitializationException.java (revision 6070)
@@ -19,9 +19,9 @@
/**
- * Constructs an {@code OsmApiInitializationException} with the specified cause and a detail message of
- * (cause==null ? null : cause.toString())
+ * Constructs an {@code OsmApiInitializationException} with the specified cause and a detail message of
+ * (cause==null ? null : cause.toString())
* (which typically contains the class and detail message of cause).
*
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause} method).
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause} method).
* A null value is permitted, and indicates that the cause is nonexistent or unknown.
*/
@@ -33,5 +33,5 @@
* Constructs an {@code OsmApiInitializationException} with the specified detail message and cause.
*
- *
Note that the detail message associated with {@code cause} is not automatically incorporated
+ *
Note that the detail message associated with {@code cause} is not automatically incorporated
* into this exception's detail message.
*
Index: trunk/src/org/openstreetmap/josm/io/OsmBzip2Importer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmBzip2Importer.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/OsmBzip2Importer.java (revision 6070)
@@ -15,5 +15,5 @@
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"osm.bz2,osm.bz", "osm.bz2", tr("OSM Server Files bzip2 compressed") + " (*.osm.bz2 *.osm.bz)");
-
+
public OsmBzip2Importer() {
super(FILE_FILTER);
Index: trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java (revision 6070)
@@ -24,5 +24,5 @@
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"osc,osc.bz2,osc.bz,osc.gz", "osc", tr("OsmChange File") + " (*.osc *.osc.bz2 *.osc.bz *.osc.gz)");
-
+
public OsmChangeImporter() {
super(FILE_FILTER);
@@ -36,5 +36,5 @@
try {
FileInputStream in = new FileInputStream(file);
-
+
if (file.getName().endsWith(".osc")) {
importData(in, file, progressMonitor);
@@ -44,5 +44,5 @@
importData(getBZip2InputStream(in), file, progressMonitor);
}
-
+
} catch (FileNotFoundException e) {
e.printStackTrace();
@@ -54,12 +54,12 @@
importData(in, associatedFile, NullProgressMonitor.INSTANCE);
}
-
+
protected void importData(InputStream in, final File associatedFile, ProgressMonitor progressMonitor) throws IllegalDataException {
final DataSet dataSet = OsmChangeReader.parseDataSet(in, progressMonitor);
final OsmDataLayer layer = new OsmDataLayer(dataSet, associatedFile.getName(), associatedFile);
- addDataLayer(dataSet, layer, associatedFile.getPath());
+ addDataLayer(dataSet, layer, associatedFile.getPath());
}
-
- protected void addDataLayer(final DataSet dataSet, final OsmDataLayer layer, final String filePath) {
+
+ protected void addDataLayer(final DataSet dataSet, final OsmDataLayer layer, final String filePath) {
// FIXME: remove UI stuff from IO subsystem
//
Index: trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java (revision 6070)
@@ -44,5 +44,5 @@
private ChangesetDataSet data;
- // FIXME: this class has many similarities with OsmHistoryReader.Parser and should be merged
+ // FIXME: this class has many similarities with OsmHistoryReader.Parser and should be merged
private class Parser extends DefaultHandler {
@@ -143,5 +143,5 @@
long changesetId = getMandatoryAttributeLong(atts,"changeset");
boolean visible= getMandatoryAttributeBoolean(atts, "visible");
-
+
Long uid = getAttributeLong(atts, "uid");
String userStr = atts.getValue("user");
Index: trunk/src/org/openstreetmap/josm/io/OsmGzipImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmGzipImporter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/OsmGzipImporter.java (revision 6070)
@@ -15,5 +15,5 @@
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"osm.gz", "osm.gz", tr("OSM Server Files gzip compressed") + " (*.osm.gz)");
-
+
public OsmGzipImporter() {
super(FILE_FILTER);
Index: trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java (revision 6070)
@@ -42,5 +42,5 @@
private final HistoryDataSet data;
- // FIXME: this class has many similarities with OsmChangesetContentParser.Parser and should be merged
+ // FIXME: this class has many similarities with OsmChangesetContentParser.Parser and should be merged
private class Parser extends DefaultHandler {
Index: trunk/src/org/openstreetmap/josm/io/OsmImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmImporter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/OsmImporter.java (revision 6070)
@@ -25,5 +25,5 @@
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"osm,xml", "osm", tr("OSM Server Files") + " (*.osm *.xml)");
-
+
public static class OsmImporterData {
@@ -80,5 +80,5 @@
importData(in, associatedFile, NullProgressMonitor.INSTANCE);
}
-
+
/**
* Imports OSM data from stream
Index: trunk/src/org/openstreetmap/josm/io/OsmReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 6070)
@@ -130,10 +130,10 @@
while (true) {
int event = parser.next();
-
+
if (cancel) {
cancel = false;
throwException(tr("Reading was canceled"));
}
-
+
if (event == XMLStreamConstants.START_ELEMENT) {
if (parser.getLocalName().equals("bounds")) {
Index: trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java (revision 6070)
@@ -81,5 +81,5 @@
}, progressMonitor);
}
-
+
/**
* Method to download GZip-compressed OSM files from somewhere
@@ -117,5 +117,5 @@
}, progressMonitor);
}
-
+
/**
* Method to download BZip2-compressed OSM Change files from somewhere
@@ -135,5 +135,5 @@
}, progressMonitor);
}
-
+
/**
* Method to download GZip-compressed OSM Change files from somewhere
Index: trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 6070)
@@ -23,5 +23,5 @@
* It can either download the object including or not including its immediate children.
* The former case is called a "full download".
- *
+ *
* It can also download a specific version of the object (however, "full" download is not possible
* in that case).
Index: trunk/src/org/openstreetmap/josm/io/OsmServerReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (revision 6070)
@@ -209,5 +209,5 @@
this.doAuthenticate = doAuthenticate;
}
-
+
/**
* Determines if the GPX data has been parsed properly.
Index: trunk/src/org/openstreetmap/josm/io/OsmTransferException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmTransferException.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/OsmTransferException.java (revision 6070)
@@ -27,9 +27,9 @@
/**
- * Constructs an {@code OsmTransferException} with the specified cause and a detail message of
- * (cause==null ? null : cause.toString())
+ * Constructs an {@code OsmTransferException} with the specified cause and a detail message of
+ * (cause==null ? null : cause.toString())
* (which typically contains the class and detail message of cause).
*
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause} method).
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause} method).
* A null value is permitted, and indicates that the cause is nonexistent or unknown.
*/
@@ -41,5 +41,5 @@
* Constructs an {@code OsmTransferException} with the specified detail message and cause.
*
- *
Note that the detail message associated with {@code cause} is not automatically incorporated
+ *
Note that the detail message associated with {@code cause} is not automatically incorporated
* into this exception's detail message.
*
Index: trunk/src/org/openstreetmap/josm/io/OsmWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmWriter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/OsmWriter.java (revision 6070)
@@ -71,5 +71,5 @@
header(null);
}
-
+
public void header(Boolean upload) {
out.println("");
@@ -82,5 +82,5 @@
out.println("' generator='JOSM'>");
}
-
+
public void footer() {
out.println("");
@@ -99,5 +99,5 @@
return result;
}
-
+
public void writeLayer(OsmDataLayer layer) {
header(!layer.isUploadDiscouraged());
@@ -116,5 +116,5 @@
writeRelations(ds.getRelations());
}
-
+
/**
* Writes the given nodes sorted by id
@@ -129,5 +129,5 @@
}
}
-
+
/**
* Writes the given ways sorted by id
@@ -142,5 +142,5 @@
}
}
-
+
/**
* Writes the given relations sorted by id
Index: trunk/src/org/openstreetmap/josm/io/OsmWriterFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmWriterFactory.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/OsmWriterFactory.java (revision 6070)
@@ -7,9 +7,9 @@
* This factory is called by everyone who needs an OsmWriter object,
* instead of directly calling the OsmWriter constructor.
- *
+ *
* This enables plugins to substitute the original OsmWriter with
* their own version, altering the way JOSM writes objects to the
* server, and to disk.
- *
+ *
* @author Frederik Ramm
*
Index: trunk/src/org/openstreetmap/josm/io/WMSLayerExporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/WMSLayerExporter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/WMSLayerExporter.java (revision 6070)
@@ -13,6 +13,6 @@
/**
- * Export a WMS layer to a serialized binary file that can be imported later via {@link WMSLayerImporter}.
- *
+ * Export a WMS layer to a serialized binary file that can be imported later via {@link WMSLayerImporter}.
+ *
* @since 5457
*/
Index: trunk/src/org/openstreetmap/josm/io/WMSLayerImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/WMSLayerImporter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/WMSLayerImporter.java (revision 6070)
@@ -28,5 +28,5 @@
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"wms", "wms", tr("WMS Files (*.wms)"));
-
+
private final WMSLayer wmsLayer;
@@ -58,5 +58,5 @@
Utils.close(ois);
}
-
+
// FIXME: remove UI stuff from IO subsystem
GuiHelper.runInEDT(new Runnable() {
Index: trunk/src/org/openstreetmap/josm/io/XmlWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/XmlWriter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/XmlWriter.java (revision 6070)
@@ -76,5 +76,5 @@
encoding.put('\t', " ");
}
-
+
@Override
public void close() throws IOException {
Index: trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java (revision 6070)
@@ -52,5 +52,5 @@
if (requestorType.equals(RequestorType.PROXY))
dialog = CredentialDialog.getHttpProxyCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText());
- else
+ else
dialog = CredentialDialog.getOsmApiCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText());
dialog.setVisible(true);
Index: trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java (revision 6070)
@@ -18,5 +18,5 @@
*/
public class CredentialsManager implements CredentialsAgent {
-
+
private static CredentialsManager instance;
@@ -38,5 +38,5 @@
return instance;
}
-
+
private static CredentialsAgentFactory agentFactory;
@@ -44,5 +44,5 @@
CredentialsAgent getCredentialsAgent();
}
-
+
/**
* Plugins can register a CredentialsAgentFactory, thereby overriding
@@ -59,5 +59,5 @@
* non-static fields and methods
*/
-
+
private CredentialsAgent delegate;
Index: trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java (revision 6070)
@@ -145,9 +145,9 @@
return pnlMessage;
}
-
+
@Override
public String getSaveUsernameAndPasswordCheckboxText() {
return tr("Save user and password (unencrypted)");
}
-
+
}
Index: trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (revision 6070)
@@ -67,5 +67,5 @@
String buildRootUrl() {
if (serviceUrl == null) {
- return null;
+ return null;
}
StringBuilder a = new StringBuilder(serviceUrl.getProtocol());
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 6070)
@@ -40,7 +40,7 @@
/**
- *
+ *
* @author master
- *
+ *
* Dialog to add tags as part of the remotecontrol
* Existing Keys get grey color and unchecked selectboxes so they will not overwrite the old Key-Value-Pairs by default.
@@ -52,6 +52,6 @@
/** initially given tags **/
- String[][] tags;
-
+ String[][] tags;
+
private final JTable propertyTable;
private Collection sel;
@@ -60,5 +60,5 @@
String sender;
static Set trustedSenders = new HashSet();
-
+
/**
* Class for displaying "delete from ... objects" in the table
@@ -73,5 +73,5 @@
}
}
-
+
/**
* Class for displaying list of existing tag values in the table
@@ -83,5 +83,5 @@
this.tag=tag; valueCount=new HashMap();
}
-
+
int addValue(String val) {
Integer c = valueCount.get(val);
@@ -117,8 +117,8 @@
sb.append("");
return sb.toString();
-
- }
- }
-
+
+ }
+ }
+
public AddTagsDialog(String[][] tags, String senderName) {
super(Main.parent, tr("Add tags to selected objects"), new String[] { tr("Add selected tags"), tr("Add all tags"), tr("Cancel")},
@@ -128,5 +128,5 @@
this.sender = senderName;
-
+
DataSet.addSelectionListener(this);
@@ -142,5 +142,5 @@
sel = Main.main.getCurrentDataSet().getSelected();
count = new int[tags.length];
-
+
for (int i = 0; i headers = new HashMap();
int k=0, MAX_HEADERS=20;
@@ -178,10 +178,10 @@
} else break;
}
-
+
// Who sent the request: trying our best to detect
// not from localhost => sender = IP
// from localhost: sender = referer header, if exists
String sender = null;
-
+
if (!request.getInetAddress().isLoopbackAddress()) {
sender = request.getInetAddress().getHostAddress();
@@ -197,7 +197,7 @@
if (sender == null) {
sender = "localhost";
- }
- }
-
+ }
+ }
+
// find a handler for this command
Class handlerClass = handlers.get(command);
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java (revision 6070)
@@ -26,5 +26,5 @@
*/
public static final String command = "add_node";
-
+
private double lat;
private double lon;
@@ -69,5 +69,5 @@
Node nd = null;
-
+
if (Main.map != null && Main.map.mapView != null) {
Point p = Main.map.mapView.getPoint(ll);
@@ -83,5 +83,5 @@
Main.main.undoRedo.add(new AddCommand(nd));
}
-
+
Main.main.getCurrentDataSet().setSelected(nd);
if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {
@@ -91,5 +91,5 @@
}
// parse parameter addtags=tag1=value1|tag2=vlaue2
- AddTagsDialog.addTags(args, sender);
+ AddTagsDialog.addTags(args, sender);
}
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java (revision 6070)
@@ -34,5 +34,5 @@
*/
public static final String command = "add_way";
-
+
private final List allCoordinates = new ArrayList();
@@ -55,5 +55,5 @@
});
// parse parameter addtags=tag1=value1|tag2=value2
- AddTagsDialog.addTags(args, sender);
+ AddTagsDialog.addTags(args, sender);
}
@@ -94,12 +94,12 @@
}
}
-
+
/**
- * Find the node with almost the same ccords in dataset or in already added nodes
+ * Find the node with almost the same ccords in dataset or in already added nodes
* @since 5845
**/
Node findOrCreateNode(LatLon ll, List commands) {
- Node nd = null;
-
+ Node nd = null;
+
if (Main.map != null && Main.map.mapView != null) {
Point p = Main.map.mapView.getPoint(ll);
@@ -109,5 +109,5 @@
}
}
-
+
Node prev = null;
for (LatLon lOld: addedNodes.keySet()) {
@@ -128,5 +128,5 @@
return nd;
}
-
+
/*
* This function creates the way with given coordinates of nodes
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java (revision 6070)
@@ -23,5 +23,5 @@
*/
public static final String command = "import";
-
+
private URL url;
private Collection suitableDownloadTasks;
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (revision 6070)
@@ -38,5 +38,5 @@
*/
public static final String command = "load_and_zoom";
-
+
/**
* The remote control command name used to zoom.
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java (revision 6070)
@@ -26,5 +26,5 @@
*/
public static final String command = "load_object";
-
+
private final List ps = new LinkedList();
@@ -51,5 +51,5 @@
public void run() {
Main.main.getCurrentDataSet().setSelected(ps);
- AddTagsDialog.addTags(args, sender);
+ AddTagsDialog.addTags(args, sender);
ps.clear();
}
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 6070)
@@ -43,5 +43,5 @@
/** will be filled with the command assigned to the subclass */
protected String myCommand;
-
+
/**
* who send th request?
@@ -251,5 +251,5 @@
this.sender = sender;
}
-
+
public static class RequestHandlerException extends Exception {
Index: trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java (revision 6070)
@@ -68,5 +68,5 @@
for (ImageEntry entry : layer.getImages()) {
-
+
Element imgElem = support.createElement("geoimage");
Index: trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java (revision 6070)
@@ -86,5 +86,5 @@
}
}
-
+
return new GeoImageLayer(entries, gpxLayer);
}
Index: trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java (revision 6070)
@@ -31,5 +31,5 @@
private ImageryLayer layer;
private JCheckBox export;
-
+
public ImagerySessionExporter(ImageryLayer layer) {
this.layer = layer;
Index: trunk/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java (revision 6070)
@@ -48,4 +48,4 @@
return layer;
}
-
+
}
Index: trunk/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java (revision 6070)
@@ -57,5 +57,5 @@
MarkerLayer markerLayer = importData.getMarkerLayer();
markerLayer.fromLayer = gpxLayer;
-
+
return markerLayer;
Index: trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java (revision 6070)
@@ -68,5 +68,5 @@
public LayerSaveAction() {
putValue(SMALL_ICON, new ImageProvider("save").setWidth(16).get());
- putValue(SHORT_DESCRIPTION, layer.requiresSaveToFile() ?
+ putValue(SHORT_DESCRIPTION, layer.requiresSaveToFile() ?
tr("Layer contains unsaved data - save to file.") :
tr("Layer does not contain unsaved data."));
Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 6070)
@@ -151,5 +151,5 @@
final public static String [] UNMAINTAINED_PLUGINS = new String[] {"gpsbabelgui", "Intersect_way"};
-
+
/**
* Default time-based update interval, in days (pluginmanager.time-based-update.interval)
@@ -425,5 +425,5 @@
return false;
}
-
+
// Add all plugins already loaded (to include early plugins when checking late ones)
Collection allPlugins = new HashSet(plugins);
@@ -449,5 +449,5 @@
String requires = local ? plugin.localrequires : plugin.requires;
-
+
// make sure the dependencies to other plugins are not broken
//
@@ -483,5 +483,5 @@
List allPluginLibraries = new LinkedList();
File pluginDir = Main.pref.getPluginsDirectory();
-
+
// Add all plugins already loaded (to include early plugins in the classloader, allowing late plugins to rely on early ones)
Collection allPlugins = new HashSet(plugins);
@@ -489,5 +489,5 @@
allPlugins.add(proxy.getPluginInformation());
}
-
+
for (PluginInformation info : allPlugins) {
if (info.libraries == null) {
@@ -760,5 +760,5 @@
);
}
-
+
private static Set findRequiredPluginsToDownload(
Collection pluginsToUpdate, List allPlugins, Set pluginsToDownload) {
@@ -818,5 +818,5 @@
Future future = service.submit(task1);
List allPlugins = null;
-
+
try {
future.get();
@@ -841,9 +841,9 @@
}
}
-
+
if (!pluginsToUpdate.isEmpty()) {
-
+
Set pluginsToDownload = new HashSet(pluginsToUpdate);
-
+
if (allPlugins != null) {
// Updated plugins may need additional plugin dependencies currently not installed
@@ -851,5 +851,5 @@
Set additionalPlugins = findRequiredPluginsToDownload(pluginsToUpdate, allPlugins, pluginsToDownload);
pluginsToDownload.addAll(additionalPlugins);
-
+
// Iterate on required plugins, if they need themselves another plugins (i.e A needs B, but B needs C)
while (!additionalPlugins.isEmpty()) {
@@ -881,9 +881,9 @@
return plugins;
}
-
+
// Update Plugin info for downloaded plugins
//
refreshLocalUpdatedPluginInfo(task2.getDownloadedPlugins());
-
+
// notify user if downloading a locally installed plugin failed
//
@@ -1005,5 +1005,5 @@
return;
}
-
+
/**
* Determines if the specified file is a valid and accessible JAR file.
@@ -1023,5 +1023,5 @@
return false;
}
-
+
/**
* Replies the updated jar file for the given plugin name.
@@ -1043,5 +1043,5 @@
return downloadedPluginFile;
}
-
+
/**
* Refreshes the given PluginInformation objects with new contents read from their corresponding jar file.
Index: trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 6070)
@@ -58,5 +58,5 @@
public List libraries = new LinkedList();
public final Map attr = new TreeMap();
-
+
private static final ImageIcon emptyIcon = new ImageIcon(new BufferedImage(24, 24, BufferedImage.TYPE_INT_ARGB));
@@ -154,5 +154,5 @@
this.attr.putAll(other.attr);
}
-
+
/**
* Updates the plugin information of this plugin information object with the
@@ -173,5 +173,5 @@
this.stage = other.stage;
}
-
+
private void scanManifest(Manifest manifest, boolean oldcheck){
String lang = LanguageInfo.getLanguageCodeManifest();
@@ -495,7 +495,7 @@
return requiredPlugins;
}
-
- /**
- * Replies the list of plugins required by the up-to-date version of this plugin.
+
+ /**
+ * Replies the list of plugins required by the up-to-date version of this plugin.
* @return List of plugins required. Empty if no plugin is required.
* @since 5601
@@ -504,7 +504,7 @@
return getRequiredPlugins(requires);
}
-
- /**
- * Replies the list of plugins required by the local instance of this plugin.
+
+ /**
+ * Replies the list of plugins required by the local instance of this plugin.
* @return List of plugins required. Empty if no plugin is required.
* @since 5601
@@ -513,8 +513,8 @@
return getRequiredPlugins(localrequires);
}
-
- /**
- * Updates the local fields ({@link #localversion}, {@link #localmainversion}, {@link #localrequires})
- * to values contained in the up-to-date fields ({@link #version}, {@link #mainversion}, {@link #requires})
+
+ /**
+ * Updates the local fields ({@link #localversion}, {@link #localmainversion}, {@link #localrequires})
+ * to values contained in the up-to-date fields ({@link #version}, {@link #mainversion}, {@link #requires})
* of the given PluginInformation.
* @param info The plugin information to get the data from.
Index: trunk/src/org/openstreetmap/josm/tools/AlphanumComparator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/AlphanumComparator.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/AlphanumComparator.java (revision 6070)
@@ -31,5 +31,5 @@
*
* The Alphanum Algorithm is discussed at http://www.DaveKoelle.com
- *
+ *
* This is an updated version with enhancements made by Daniel Migowski, Andre
* Bogus, and David Koelle.
Index: trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 6070)
@@ -342,5 +342,5 @@
/**
- * Shows a popup audio error message for the given exception.
+ * Shows a popup audio error message for the given exception.
* @param ex The exception used as error reason. Cannot be {@code null}.
*/
Index: trunk/src/org/openstreetmap/josm/tools/AudioUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/AudioUtil.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/AudioUtil.java (revision 6070)
@@ -18,5 +18,5 @@
*/
public class AudioUtil {
-
+
/**
* Returns calibrated length of recording in seconds.
Index: trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 6070)
@@ -129,5 +129,5 @@
urltext += "......\n";
}
-
+
JPanel p = new JPanel(new GridBagLayout());
p.add(new JMultilineLabel(
@@ -173,5 +173,5 @@
}
}
-
+
/**
* Determines if an exception is currently being handled
@@ -181,5 +181,5 @@
return handlingInProgress;
}
-
+
/**
* Replies the URL to create a JOSM bug report with the given debug text
@@ -194,5 +194,5 @@
gzip.write(debugText.getBytes("UTF-8"));
Utils.close(gzip);
-
+
return new URL("http://josm.openstreetmap.de/josmticket?" +
"gdata="+Base64.encode(ByteBuffer.wrap(out.toByteArray()), true));
@@ -202,5 +202,5 @@
}
}
-
+
/**
* Replies the URL label to create a JOSM bug report with the given debug text
Index: trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (revision 6070)
@@ -279,5 +279,5 @@
msg = body;
}
-
+
if (msg != null && !msg.isEmpty()) {
return tr(""
@@ -546,8 +546,8 @@
return message;
}
-
+
/**
* Explains a {@link OsmApiException} which was thrown because of
- * bandwidth limit exceeded (HTTP error 509)
+ * bandwidth limit exceeded (HTTP error 509)
*
* @param e the exception
@@ -559,5 +559,5 @@
return message;
}
-
+
/**
@@ -694,5 +694,5 @@
return msg;
}
-
+
/**
* Replaces some HTML reserved characters (<, > and &) by their equivalent entity (<, > and &);
Index: trunk/src/org/openstreetmap/josm/tools/Geometry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 6070)
@@ -39,5 +39,5 @@
*
* Prerequisite: no two nodes have the same coordinates.
- *
+ *
* @param ways a list of ways to test
* @param test if false, do not build list of Commands, just return nodes
@@ -247,10 +247,10 @@
*/
public static EastNorth getSegmentSegmentIntersection(EastNorth p1, EastNorth p2, EastNorth p3, EastNorth p4) {
-
+
CheckParameterUtil.ensureValidCoordinates(p1, "p1");
CheckParameterUtil.ensureValidCoordinates(p2, "p2");
CheckParameterUtil.ensureValidCoordinates(p3, "p3");
CheckParameterUtil.ensureValidCoordinates(p4, "p4");
-
+
double x1 = p1.getX();
double y1 = p1.getY();
@@ -270,5 +270,5 @@
// (x2-x1,y2-y1)*u - (x4-x3,y4-y3)*v = (x3-x1,y3-y1)
// if 0<= u,v <=1, intersection exists at ( x1+ (x2-x1)*u, y1 + (y2-y1)*u )
-
+
double a1 = x2 - x1;
double b1 = x3 - x4;
@@ -281,9 +281,9 @@
// Solve the equations
double det = a1*b2 - a2*b1;
-
+
double uu = b2*c1 - b1*c2 ;
double vv = a1*c2 - a2*c1;
double mag = Math.abs(uu)+Math.abs(vv);
-
+
if (Math.abs(det) > 1e-12 * mag) {
double u = uu/det, v = vv/det;
@@ -298,5 +298,5 @@
// parallel lines
return null;
- }
+ }
}
@@ -312,7 +312,7 @@
CheckParameterUtil.ensureValidCoordinates(p3, "p3");
CheckParameterUtil.ensureValidCoordinates(p4, "p4");
-
+
if (!p1.isValid()) throw new IllegalArgumentException();
-
+
// Convert line from (point, point) form to ax+by=c
double a1 = p2.getY() - p1.getY();
@@ -376,5 +376,5 @@
return new EastNorth(p1.getX() + ldx * offset, p1.getY() + ldy * offset);
}
-
+
/**
* Calculates closest point to a line segment.
@@ -418,9 +418,9 @@
*/
public static boolean angleIsClockwise(EastNorth commonNode, EastNorth firstNode, EastNorth secondNode) {
-
+
CheckParameterUtil.ensureValidCoordinates(commonNode, "commonNode");
CheckParameterUtil.ensureValidCoordinates(firstNode, "firstNode");
CheckParameterUtil.ensureValidCoordinates(secondNode, "secondNode");
-
+
double dy1 = (firstNode.getY() - commonNode.getY());
double dy2 = (secondNode.getY() - commonNode.getY());
@@ -446,8 +446,8 @@
path.closePath();
}
-
+
return new Area(path);
}
-
+
/**
* Tests if two polygons intersect.
@@ -457,13 +457,13 @@
*/
public static PolygonIntersection polygonIntersection(List first, List second) {
-
+
Area a1 = getArea(first);
Area a2 = getArea(second);
-
+
Area inter = new Area(a1);
inter.intersect(a2);
-
+
Rectangle bounds = inter.getBounds();
-
+
if (inter.isEmpty() || bounds.getHeight()*bounds.getWidth() <= 1.0) {
return PolygonIntersection.OUTSIDE;
@@ -622,8 +622,8 @@
*/
public static double getSegmentAngle(EastNorth p1, EastNorth p2) {
-
+
CheckParameterUtil.ensureValidCoordinates(p1, "p1");
CheckParameterUtil.ensureValidCoordinates(p2, "p2");
-
+
return Math.atan2(p2.north() - p1.north(), p2.east() - p1.east());
}
@@ -638,9 +638,9 @@
*/
public static double getCornerAngle(EastNorth p1, EastNorth p2, EastNorth p3) {
-
+
CheckParameterUtil.ensureValidCoordinates(p1, "p1");
CheckParameterUtil.ensureValidCoordinates(p2, "p2");
CheckParameterUtil.ensureValidCoordinates(p3, "p3");
-
+
Double result = getSegmentAngle(p2, p1) - getSegmentAngle(p2, p3);
if (result <= -Math.PI) {
@@ -654,5 +654,5 @@
return result;
}
-
+
public static EastNorth getCentroid(List nodes) {
// Compute the centroid of nodes
@@ -672,7 +672,7 @@
BigDecimal x1 = new BigDecimal(n1.east());
BigDecimal y1 = new BigDecimal(n1.north());
-
+
BigDecimal k = x0.multiply(y1, MathContext.DECIMAL128).subtract(y0.multiply(x1, MathContext.DECIMAL128));
-
+
area = area.add(k, MathContext.DECIMAL128);
east = east.add(k.multiply(x0.add(x1, MathContext.DECIMAL128), MathContext.DECIMAL128));
@@ -702,5 +702,5 @@
*/
public static EastNorth getSegmentAltituteIntersection(EastNorth sp1, EastNorth sp2, EastNorth ap) {
-
+
CheckParameterUtil.ensureValidCoordinates(sp1, "sp1");
CheckParameterUtil.ensureValidCoordinates(sp2, "sp2");
Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 6070)
@@ -198,5 +198,5 @@
return this;
}
-
+
/**
* Convenience method, see {@link #setMaxSize(Dimension)}.
Index: trunk/src/org/openstreetmap/josm/tools/ImageResource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageResource.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/ImageResource.java (revision 6070)
@@ -13,10 +13,10 @@
* Holds data for one particular image.
* It can be backed by a svg or raster image.
- *
- * In the first case, 'svg' is not null and in the latter case, 'imgCache' has
+ *
+ * In the first case, 'svg' is not null and in the latter case, 'imgCache' has
* at least one entry for the key DEFAULT_DIMENSION.
*/
class ImageResource {
-
+
/**
* Caches the image data for resized versions of the same image.
@@ -25,5 +25,5 @@
private SVGDiagram svg;
public static final Dimension DEFAULT_DIMENSION = new Dimension(-1, -1);
-
+
public ImageResource(BufferedImage img) {
CheckParameterUtil.ensureParameterNotNull(img);
@@ -63,5 +63,5 @@
BufferedImage base = imgCache.get(DEFAULT_DIMENSION);
if (base == null) throw new AssertionError();
-
+
int width = dim.width;
int height = dim.height;
Index: trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java (revision 6070)
@@ -13,5 +13,5 @@
/**
- * Tools to work with Swing InputMap
+ * Tools to work with Swing InputMap
*
*/
@@ -25,6 +25,6 @@
SwingUtilities.replaceUIInputMap(cmp,JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT,inputMap);
}
-
-
+
+
/**
* Enable activating button on Enter (which is replaced with spacebar for certain Look-And-Feels)
@@ -35,14 +35,14 @@
b.getActionMap().put("enter",b.getAction());
}
-
+
public static void addEnterAction(JComponent c, Action a) {
c.getActionMap().put("enter", a);
c.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "enter");
}
-
+
public static void addSpacebarAction(JComponent c, Action a) {
c.getActionMap().put("spacebar", a);
c.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0), "spacebar");
}
-
+
}
Index: trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (revision 6070)
@@ -25,5 +25,5 @@
* case (or Xy_AB: for sub languages).
*
- * @param type the type
+ * @param type the type
* @return the wiki language prefix or {@code null} for {@link LocaleType#BASELANGUAGE}, when
* base language is identical to default or english
Index: trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java (revision 6070)
@@ -27,5 +27,5 @@
Main.platform.openUrl(uri.toString());
}
-
+
/**
* @return null for success or a string in case of an error.
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHook.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (revision 6070)
@@ -92,5 +92,5 @@
public boolean rename(File from, File to);
-
+
/**
* Returns a detailed OS description (at least family + version).
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (revision 6070)
@@ -250,5 +250,5 @@
return false;
}
-
+
/* (non-Javadoc)
* @see org.openstreetmap.josm.tools.PlatformHookUnixoid#getOSDescription()
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 6070)
@@ -21,7 +21,7 @@
*/
public class PlatformHookUnixoid implements PlatformHook {
-
+
private String osDescription;
-
+
@Override
public void preStartupHook(){
@@ -127,5 +127,5 @@
return osName;
}
-
+
@Override
public String getOSDescription() {
@@ -135,5 +135,5 @@
return osDescription;
}
-
+
protected static class LinuxReleaseInfo {
private final String path;
@@ -143,5 +143,5 @@
private final boolean plainText;
private final String prefix;
-
+
public LinuxReleaseInfo(String path, String descriptionField, String idField, String releaseField) {
this(path, descriptionField, idField, releaseField, false, null);
@@ -155,5 +155,5 @@
this(path, null, null, null, true, prefix);
}
-
+
private LinuxReleaseInfo(String path, String descriptionField, String idField, String releaseField, boolean plainText, String prefix) {
this.path = path;
@@ -166,8 +166,8 @@
@Override public String toString() {
- return "ReleaseInfo [path=" + path + ", descriptionField=" + descriptionField +
+ return "ReleaseInfo [path=" + path + ", descriptionField=" + descriptionField +
", idField=" + idField + ", releaseField=" + releaseField + "]";
}
-
+
/**
* Extracts OS detailed information from a Linux release file (/etc/xxx-release)
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 6070)
@@ -44,5 +44,5 @@
//Shortcut.registerSystemCut("system:menuexit", tr("reserved"), VK_Q, CTRL_DOWN_MASK);
Shortcut.registerSystemShortcut("system:duplicate", tr("reserved"), VK_D, CTRL_DOWN_MASK); // not really system, but to avoid odd results
-
+
// Windows 7 shortcuts: http://windows.microsoft.com/en-US/windows7/Keyboard-shortcuts
@@ -56,5 +56,5 @@
Shortcut.registerSystemShortcut("microsoft-reserved-02", tr("reserved"), VK_NUM_LOCK, ALT_DOWN_MASK | SHIFT_DOWN_MASK).setAutomatic(); // Turn Mouse Keys on or off
//Shortcut.registerSystemCut("microsoft-reserved-03", tr("reserved"), VK_U, );// Open the Ease of Access Center (TODO: Windows-U, how to handle it in Java ?)
-
+
// General keyboard shortcuts
//Shortcut.registerSystemShortcut("system:help", tr("reserved"), VK_F1, 0); // Display Help
@@ -129,5 +129,5 @@
@Override
public String getOSDescription() {
- return Utils.strip(System.getProperty("os.name")) + " " +
+ return Utils.strip(System.getProperty("os.name")) + " " +
((System.getenv("ProgramFiles(x86)") == null) ? "32" : "64") + "-Bit";
}
Index: trunk/src/org/openstreetmap/josm/tools/UrlLabel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/UrlLabel.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/UrlLabel.java (revision 6070)
@@ -28,5 +28,5 @@
this (url, url, 0);
}
-
+
public UrlLabel(String url, int fontPlus) {
this (url, url, fontPlus);
@@ -36,5 +36,5 @@
this (url, url, 0);
}
-
+
public UrlLabel(String url, String description, int fontPlus) {
this();
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 6070)
@@ -249,5 +249,5 @@
*/
public static void copyFile(File in, File out) throws IOException {
- // TODO: remove this function when we move to Java 7 (use Files.copy instead)
+ // TODO: remove this function when we move to Java 7 (use Files.copy instead)
FileInputStream inStream = null;
FileOutputStream outStream = null;
@@ -266,5 +266,5 @@
}
}
-
+
public static int copyStream(InputStream source, OutputStream destination) throws IOException {
int count = 0;
@@ -306,5 +306,5 @@
}
}
-
+
/**
* Utility method for closing a {@link ZipFile}.
@@ -357,5 +357,5 @@
try {
t = clipboard.getContents(null);
- } catch (IllegalStateException e) {
+ } catch (IllegalStateException e) {
// Clipboard currently unavailable. On some platforms, the system clipboard is unavailable while it is accessed by another application.
try {
@@ -561,5 +561,5 @@
return new Color(Integer.parseInt(clr, 16));
}
-
+
/**
* Opens a HTTP connection to the given URL and sets the User-Agent property to JOSM's one.
@@ -577,5 +577,5 @@
return connection;
}
-
+
/**
* Opens a connection to the given URL and sets the User-Agent property to JOSM's one.
@@ -618,5 +618,5 @@
* Opens a HTTP connection to the given URL, sets the User-Agent property to JOSM's one and optionnaly disables Keep-Alive.
* @param httpURL The HTTP url to open (must use http:// or https://)
- * @param keepAlive
+ * @param keepAlive
* @return An open HTTP connection to the given URL
* @throws IOException if an I/O exception occurs.
@@ -630,11 +630,11 @@
return connection;
}
-
+
/**
* An alternative to {@link String#trim()} to effectively remove all leading and trailing white characters, including Unicode ones.
* @see Java’s String.trim has a strange idea of whitespace
- * @see JDK bug 4080617
+ * @see JDK bug 4080617
* @param str The string to strip
- * @return str, without leading and trailing characters, according to
+ * @return str, without leading and trailing characters, according to
* {@link Character#isWhitespace(char)} and {@link Character#isSpaceChar(char)}.
* @since 5772
Index: trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (revision 6069)
+++ trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (revision 6070)
@@ -110,5 +110,5 @@
/**
* Creates a window geometry from a rectangle
- *
+ *
* @param rect the position
*/
@@ -286,5 +286,5 @@
* Applies this geometry to a window. Makes sure that the window is not
* placed outside of the coordinate range of all available screens.
- *
+ *
* @param window the window
*/
@@ -322,5 +322,5 @@
* Find the size and position of the screen for given coordinates. Use first screen,
* when no coordinates are stored or null is passed.
- *
+ *
* @param preferenceKey the key to get size and position from
* @return bounds of the screen
@@ -336,5 +336,5 @@
* Find the size and position of the screen for given coordinates. Use first screen,
* when no coordinates are stored or null is passed.
- *
+ *
* @param g coordinates to check
* @return bounds of the screen