Index: /applications/editors/josm/plugins/DirectUpload/build.xml
===================================================================
--- /applications/editors/josm/plugins/DirectUpload/build.xml (revision 29777)
+++ /applications/editors/josm/plugins/DirectUpload/build.xml (revision 29778)
@@ -5,5 +5,5 @@
-
+
-
-
-
+
+
+
+
+ FixAddresses
+
+
+
+
+ java
+ src
+ UTF-8
+
+
+
+ .
+ UTF-8
+
+
+
+
+ compile
+
+
+ clean
+
+
+ runjosm
+
+
+ clean
+ compile
+
+
+
+
+
+
+ src
+
+
+ build.xml
+
+
+
+
+
+
+
+
+
+
+
+
+ src
+ ../../core/src
+ 1.6
+
+
+
+
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java (revision 29777)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java (revision 29778)
@@ -14,6 +14,8 @@
package org.openstreetmap.josm.plugins.fixAddresses;
+import javax.swing.JMenu;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.IconToggleButton;
+import org.openstreetmap.josm.gui.MainMenu;
import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
@@ -41,7 +43,6 @@
// ... and add them to the tools menu in main
- Main.main.menu.toolsMenu.addSeparator();
- Main.main.menu.toolsMenu.add(action);
- Main.main.menu.toolsMenu.add(incAddrAction);
+ MainMenu.add(Main.main.menu.dataMenu, action, false, 0);
+ MainMenu.add(Main.main.menu.selectionMenu, incAddrAction);
// create preferences instance
Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml
===================================================================
--- /applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml (revision 29777)
+++ /applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml (revision 29778)
@@ -32,202 +32,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/HouseNumberTaggingTool/nbproject/project.xml (revision 29778)
+++ /applications/editors/josm/plugins/HouseNumberTaggingTool/nbproject/project.xml (revision 29778)
@@ -0,0 +1,67 @@
+
+
+ org.netbeans.modules.ant.freeform
+
+
+ HouseNumberTaggingTool
+
+
+
+ HouseNumberTaggingTool
+
+
+
+
+ .
+ UTF-8
+
+
+
+ java
+ src
+ UTF-8
+
+
+
+
+ compile
+
+
+ clean
+
+
+ runjosm
+
+
+ clean
+ compile
+
+
+
+
+
+
+ src
+
+
+ build.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+ src
+ ../../core/src
+ 1.6
+
+
+
+
Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberTaggingToolPlugin.java
===================================================================
--- /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberTaggingToolPlugin.java (revision 29777)
+++ /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberTaggingToolPlugin.java (revision 29778)
@@ -6,6 +6,5 @@
import org.openstreetmap.josm.plugins.PluginInformation;
-public class HouseNumberTaggingToolPlugin extends Plugin
-{
+public class HouseNumberTaggingToolPlugin extends Plugin {
LaunchAction action;
@@ -13,9 +12,8 @@
* constructor
*/
- public HouseNumberTaggingToolPlugin(PluginInformation info)
- {
+ public HouseNumberTaggingToolPlugin(PluginInformation info) {
super(info);
action = new LaunchAction(getPluginDir());
- MainMenu.add(Main.main.menu.editMenu, action);
+ MainMenu.add(Main.main.menu.dataMenu, action, false,0);
}
}
Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java
===================================================================
--- /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java (revision 29777)
+++ /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java (revision 29778)
@@ -48,4 +48,5 @@
}
+ @Override
public void actionPerformed(ActionEvent e)
{
@@ -53,4 +54,5 @@
}
+ @Override
public void selectionChanged(Collection newSelection)
{
Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java
===================================================================
--- /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java (revision 29777)
+++ /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java (revision 29778)
@@ -102,8 +102,7 @@
setLocationRelativeTo(null);
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
housnumber.requestFocus();
housnumber.selectAll();
@@ -112,6 +111,5 @@
}
- private JPanel createContentPane()
- {
+ private JPanel createContentPane() {
acm = selection.getDataSet().getAutoCompletionManager();
@@ -267,13 +265,9 @@
int number = 0;
- try
- {
+ try {
number = Integer.valueOf(dto.getHousenumber()) + dto.getHousenumberChangeValue();
}
- catch (NumberFormatException e)
- {
- }
- if (number > 0)
- {
+ catch (NumberFormatException e) { }
+ if (number > 0) {
housnumber.setText(String.valueOf(number));
}
@@ -310,6 +304,5 @@
protected void buttonAction(int buttonIndex, ActionEvent evt)
{
- if (buttonIndex == 0)
- {
+ if (buttonIndex == 0) {
Dto dto = new Dto();
dto.setSaveBuilding(buildingEnabled.isSelected());
@@ -339,18 +332,13 @@
{
Object item = box.getSelectedItem();
- if (item != null)
- {
- if (item instanceof String)
- {
+ if (item != null) {
+ if (item instanceof String) {
return (String) item;
}
- if (item instanceof AutoCompletionListItem)
- {
+ if (item instanceof AutoCompletionListItem) {
return ((AutoCompletionListItem) item).getValue();
}
return item.toString();
- }
- else
- {
+ } else {
return "";
}
@@ -362,6 +350,5 @@
File fileName = new File(pluginDir + TagDialog.TEMPLATE_DATA);
- try
- {
+ try {
path.mkdirs();
@@ -370,13 +357,7 @@
o.writeObject(dto);
o.close();
- }
- catch (Exception ex)
- {
+ } catch (Exception ex) {
logger.log(Level.SEVERE, ex.getMessage());
-
- if (fileName != null)
- {
- fileName.delete();
- }
+ fileName.delete();
}
}
@@ -386,9 +367,7 @@
ArrayList commands = new ArrayList();
- if (dto.isSaveBuilding())
- {
+ if (dto.isSaveBuilding()) {
String value = selection.get(TagDialog.TAG_BUILDING);
- if (value == null || (value != null && !value.equals(dto.getBuilding())))
- {
+ if (value == null || (value != null && !value.equals(dto.getBuilding()))) {
ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_BUILDING, dto.getBuilding());
commands.add(command);
@@ -396,9 +375,7 @@
}
- if (dto.isSaveCity())
- {
+ if (dto.isSaveCity()) {
String value = selection.get(TagDialog.TAG_ADDR_CITY);
- if (value == null || (value != null && !value.equals(dto.getCity())))
- {
+ if (value == null || (value != null && !value.equals(dto.getCity()))) {
ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_ADDR_CITY, dto.getCity());
commands.add(command);
@@ -406,6 +383,5 @@
}
- if (dto.isSaveCountry())
- {
+ if (dto.isSaveCountry()) {
String value = selection.get(TagDialog.TAG_ADDR_COUNTRY);
if (value == null || (value != null && !value.equals(dto.getCountry())))
@@ -416,9 +392,7 @@
}
- if (dto.isSaveHousenumber())
- {
+ if (dto.isSaveHousenumber()) {
String value = selection.get(TagDialog.TAG_ADDR_HOUSENUMBER);
- if (value == null || (value != null && !value.equals(dto.getHousenumber())))
- {
+ if (value == null || (value != null && !value.equals(dto.getHousenumber()))) {
ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_ADDR_HOUSENUMBER, dto.getHousenumber());
commands.add(command);
@@ -426,9 +400,7 @@
}
- if (dto.isSavePostcode())
- {
+ if (dto.isSavePostcode()) {
String value = selection.get(TagDialog.TAG_ADDR_POSTCODE);
- if (value == null || (value != null && !value.equals(dto.getPostcode())))
- {
+ if (value == null || (value != null && !value.equals(dto.getPostcode()))) {
ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_ADDR_POSTCODE, dto.getPostcode());
commands.add(command);
@@ -436,6 +408,5 @@
}
- if (dto.isSaveStreet())
- {
+ if (dto.isSaveStreet()) {
String value = selection.get(TagDialog.TAG_ADDR_STREET);
if (value == null || (value != null && !value.equals(dto.getStreet())))
@@ -446,9 +417,7 @@
}
- if (dto.isSaveState())
- {
+ if (dto.isSaveState()) {
String value = selection.get(TagDialog.TAG_ADDR_STATE);
- if (value == null || (value != null && !value.equals(dto.getState())))
- {
+ if (value == null || (value != null && !value.equals(dto.getState()))) {
ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_ADDR_STATE, dto.getState());
commands.add(command);
@@ -456,6 +425,5 @@
}
- if (commands.size() > 0)
- {
+ if (commands.size() > 0) {
SequenceCommand sequenceCommand = new SequenceCommand(trn("Updating properties of up to {0} object", "Updating properties of up to {0} objects", commands.size(), commands.size()), commands);
@@ -465,6 +433,5 @@
}
- private Collection getPossibleStreets()
- {
+ private Collection getPossibleStreets() {
/**
* Generates a list of all visible names of highways in order to do autocompletion on the road name.
@@ -481,14 +448,11 @@
}
- private Dto loadDto()
- {
+ private Dto loadDto() {
Dto dto = new Dto();
File fileName = new File(pluginDir + TagDialog.TEMPLATE_DATA);
- try
- {
-
- if (fileName.exists())
- {
+ try {
+
+ if (fileName.exists()) {
FileInputStream file = new FileInputStream(fileName);
ObjectInputStream o = new ObjectInputStream(file);
@@ -496,7 +460,5 @@
dto = (Dto) o.readObject();
o.close();
- }
- else
- {
+ } else {
dto.setCity(selection.get(TagDialog.TAG_ADDR_CITY));
dto.setCountry(selection.get(TagDialog.TAG_ADDR_COUNTRY));
@@ -506,15 +468,8 @@
dto.setState(selection.get(TagDialog.TAG_ADDR_STATE));
}
-
- }
- catch (Exception ex)
- {
- logger.log(Level.SEVERE, ex.getMessage());
- if (fileName != null)
- {
+ } catch (Exception ex) {
+ logger.log(Level.SEVERE, ex.getMessage());
fileName.delete();
- }
- }
-
+ }
return dto;
Index: /applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java
===================================================================
--- /applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java (revision 29777)
+++ /applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java (revision 29778)
@@ -73,5 +73,5 @@
public OhePlugin(PluginInformation info) {
super(info);
- MainMenu.add(Main.main.menu.dataMenu, new OheMenuAction());
+ MainMenu.add(Main.main.menu.dataMenu, new OheMenuAction(), false, 0);
}
Index: /applications/editors/josm/plugins/addrinterpolation/build.xml
===================================================================
--- /applications/editors/josm/plugins/addrinterpolation/build.xml (revision 29777)
+++ /applications/editors/josm/plugins/addrinterpolation/build.xml (revision 29778)
@@ -22,213 +22,19 @@
-->
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-***** Properties of published ${plugin.jar} *****
-Commit message : '${commit.message}'
-Plugin-Mainversion: ${plugin.main.version}
-JOSM build version: ${coreversion.info.entry.revision}
-Plugin-Version : ${version.entry.commit.revision}
-***** / Properties of published ${plugin.jar} *****
-
-Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
Index: /applications/editors/josm/plugins/addrinterpolation/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/addrinterpolation/nbproject/project.xml (revision 29778)
+++ /applications/editors/josm/plugins/addrinterpolation/nbproject/project.xml (revision 29778)
@@ -0,0 +1,67 @@
+
+
+ org.netbeans.modules.ant.freeform
+
+
+ AddrInterpolation
+
+
+
+ AddrInterpolation
+
+
+
+
+ .
+ UTF-8
+
+
+
+ java
+ src
+ UTF-8
+
+
+
+
+ compile
+
+
+ clean
+
+
+ runjosm
+
+
+ clean
+ compile
+
+
+
+
+
+
+ src
+
+
+ build.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+ src
+ ../../core/src
+ 1.6
+
+
+
+
Index: /applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationPlugin.java
===================================================================
--- /applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationPlugin.java (revision 29777)
+++ /applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationPlugin.java (revision 29778)
@@ -4,4 +4,5 @@
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainMenu;
import org.openstreetmap.josm.plugins.Plugin;
import org.openstreetmap.josm.plugins.PluginInformation;
@@ -17,5 +18,5 @@
super(info);
action = new AddrInterpolationAction();
- Main.main.menu.toolsMenu.add(action);
+ MainMenu.add(Main.main.menu.dataMenu, action, false, 0);
}
}
Index: /applications/editors/josm/plugins/czechaddress/build.xml
===================================================================
--- /applications/editors/josm/plugins/czechaddress/build.xml (revision 29777)
+++ /applications/editors/josm/plugins/czechaddress/build.xml (revision 29778)
@@ -33,5 +33,5 @@
-
+
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java (revision 29777)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java (revision 29778)
@@ -99,5 +99,5 @@
if (assertionsEnabled) initLoggers();
- MainMenu.add(Main.main.menu.toolsMenu, new SplitAreaByEmptyWayAction());
+ MainMenu.add(Main.main.menu.moreToolsMenu, new SplitAreaByEmptyWayAction());
// Prepare for filling the database.
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java (revision 29777)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java (revision 29778)
@@ -64,5 +64,5 @@
if (prim2.equals(area)) continue;
Way border = (Way) prim2;
- if (border.getNodes().size() == 0) continue;
+ if (border.getNodes().isEmpty()) continue;
if (border.keySet().size() > 0) continue;
if (!area.getNodes().contains(border.firstNode())) continue;
Index: /applications/editors/josm/plugins/download_along/build.xml
===================================================================
--- /applications/editors/josm/plugins/download_along/build.xml (revision 29777)
+++ /applications/editors/josm/plugins/download_along/build.xml (revision 29778)
@@ -4,5 +4,5 @@
-
+
+ download_along
+
+
+
+
+ java
+ src
+ UTF-8
+
+
+
+ .
+ UTF-8
+
+
+
+
+ compile
+
+
+ clean
+
+
+ runjosm
+
+
+ clean
+ compile
+
+
+
+
+
+
+ src
+
+
+ build.xml
+
+
+
+
+
+
+
+
+
+
+
+
+ src
+ ../../core/src
+ 1.6
+
+
+
+
Index: /applications/editors/josm/plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java
===================================================================
--- /applications/editors/josm/plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java (revision 29777)
+++ /applications/editors/josm/plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java (revision 29778)
@@ -10,5 +10,5 @@
public DownloadAlong(PluginInformation info) {
super(info);
- MainMenu.add(Main.main.menu.toolsMenu, new DownloadAlongWayAction());
+ MainMenu.add(Main.main.menu.moreToolsMenu, new DownloadAlongWayAction());
}
}
Index: /applications/editors/josm/plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlongWayAction.java
===================================================================
--- /applications/editors/josm/plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlongWayAction.java (revision 29777)
+++ /applications/editors/josm/plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlongWayAction.java (revision 29778)
@@ -39,4 +39,5 @@
}
+ @Override
public void actionPerformed(ActionEvent e) {
Set selectedWays = OsmPrimitive.getFilteredSet(Main.main.getCurrentDataSet().getSelected(), Way.class);
Index: /applications/editors/josm/plugins/geochat/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/geochat/nbproject/project.xml (revision 29778)
+++ /applications/editors/josm/plugins/geochat/nbproject/project.xml (revision 29778)
@@ -0,0 +1,66 @@
+
+
+ org.netbeans.modules.ant.freeform
+
+
+ geochat
+
+
+
+ geochat
+
+
+
+
+ java
+ src
+ UTF-8
+
+
+
+ .
+ UTF-8
+
+
+
+
+ compile
+
+
+ clean
+
+
+ runjosm
+
+
+ clean
+ compile
+
+
+
+
+
+
+ src
+
+
+ build.xml
+
+
+
+
+
+
+
+
+
+
+
+
+ src
+ ../../core/src
+ 1.6
+
+
+
+
Index: /applications/editors/josm/plugins/gpxfilter/build.xml
===================================================================
--- /applications/editors/josm/plugins/gpxfilter/build.xml (revision 29777)
+++ /applications/editors/josm/plugins/gpxfilter/build.xml (revision 29778)
@@ -32,211 +32,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
+
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
Index: /applications/editors/josm/plugins/gpxfilter/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/gpxfilter/nbproject/project.xml (revision 29778)
+++ /applications/editors/josm/plugins/gpxfilter/nbproject/project.xml (revision 29778)
@@ -0,0 +1,67 @@
+
+
+ org.netbeans.modules.ant.freeform
+
+
+ gpxfilter
+
+
+
+ gpxfilter
+
+
+
+
+ .
+ UTF-8
+
+
+
+ java
+ src
+ UTF-8
+
+
+
+
+ compile
+
+
+ clean
+
+
+ runjosm
+
+
+ clean
+ compile
+
+
+
+
+
+
+ src
+
+
+ build.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+ src
+ ../../core/src
+ 1.6
+
+
+
+
Index: /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java
===================================================================
--- /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java (revision 29777)
+++ /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java (revision 29778)
@@ -10,5 +10,5 @@
public GpxFilterPlugin(PluginInformation info) {
super(info);
- MainMenu.add(Main.main.menu.toolsMenu, new AddEGpxLayerAction());
+ MainMenu.add(Main.main.menu.gpsMenu, new AddEGpxLayerAction(), false, 0);
}
Index: /applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java
===================================================================
--- /applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java (revision 29777)
+++ /applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java (revision 29778)
@@ -125,10 +125,8 @@
lgpsmenu.add(lgpscapture);
lgpscapture.setAccelerator(captureAction.getShortcut().getKeyStroke());
-
+
JosmAction centerAction = new CenterAction();
- JMenuItem centerMenu = new JMenuItem(centerAction);
- lgpsmenu.add(centerMenu);
- centerMenu.setAccelerator(centerAction.getShortcut().getKeyStroke());
-
+ MainMenu.add(lgpsmenu, centerAction);
+
JosmAction autoCenterAction = new AutoCenterAction();
lgpsautocenter = new JCheckBoxMenuItem(autoCenterAction);
Index: /applications/editors/josm/plugins/merge-overlap/build.xml
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/build.xml (revision 29777)
+++ /applications/editors/josm/plugins/merge-overlap/build.xml (revision 29778)
@@ -4,5 +4,5 @@
-
+
+ merge-overlap
+
+
+
+
+ java
+ src
+ UTF-8
+
+
+
+ .
+ UTF-8
+
+
+
+
+ compile
+
+
+ clean
+
+
+ runjosm
+
+
+ clean
+ compile
+
+
+
+
+
+
+ src
+
+
+ build.xml
+
+
+
+
+
+
+
+
+
+
+
+
+ src
+ ../../core/src
+ 1.6
+
+
+
+
Index: /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java (revision 29777)
+++ /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java (revision 29778)
@@ -70,4 +70,5 @@
* Action Event
*/
+ @Override
public void actionPerformed(ActionEvent e) {
@@ -261,4 +262,5 @@
}
+ @Override
public String toString() {
return "NodePos: " + pos + ", " + opositPos + ", " + node;
Index: /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java (revision 29777)
+++ /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java (revision 29778)
@@ -3,8 +3,6 @@
import static org.openstreetmap.josm.tools.I18n.tr;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainMenu;
import org.openstreetmap.josm.plugins.Plugin;
import org.openstreetmap.josm.plugins.PluginInformation;
@@ -17,24 +15,8 @@
protected String name;
- public MergeOverlapPlugin(PluginInformation info) {
+ public MergeOverlapPlugin(PluginInformation info) {
super(info);
- name = tr("Merge overlap", null);
- JMenu toolsMenu = null;
- for (int i = 0; i < Main.main.menu.getMenuCount() && toolsMenu == null; i++) {
- JMenu menu = Main.main.menu.getMenu(i);
- String name = menu.getText();
- if (name != null && name.equals(tr("Tools", null))) {
- toolsMenu = menu;
- }
- }
-
- if (toolsMenu == null) {
- toolsMenu = new JMenu(name);
- toolsMenu.add(new JMenuItem(new MergeOverlapAction()));
- Main.main.menu.add(toolsMenu, 2);
- } else {
- toolsMenu.addSeparator();
- toolsMenu.add(new JMenuItem(new MergeOverlapAction()));
- }
+ name = tr("Merge overlap");
+ MainMenu.add(Main.main.menu.moreToolsMenu, new MergeOverlapAction());
}
}
Index: /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java (revision 29777)
+++ /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java (revision 29778)
@@ -324,5 +324,5 @@
JPanel pnl = new JPanel();
pnl.setLayout(new BorderLayout());
- pnl.add(new JLabel(tr("No conflicts to resolve", null)));
+ pnl.add(new JLabel(tr("No conflicts to resolve")));
return pnl;
}
@@ -386,10 +386,11 @@
public CancelAction() {
- putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution", null));
- putValue(Action.NAME, tr("Cancel", null));
+ putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution"));
+ putValue(Action.NAME, tr("Cancel"));
putValue(Action.SMALL_ICON, ImageProvider.get("", "cancel"));
setEnabled(true);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
setCancelled(true);
@@ -401,10 +402,11 @@
public ApplyAction() {
- putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts", null));
- putValue(Action.NAME, tr("Apply", null));
+ putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts"));
+ putValue(Action.NAME, tr("Apply"));
putValue(Action.SMALL_ICON, ImageProvider.get("ok"));
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
setVisible(false);
@@ -417,4 +419,5 @@
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(MyTagConflictResolverModel.NUM_CONFLICTS_PROP)) {
@@ -447,12 +450,15 @@
}
+ @Override
public void ancestorResized(HierarchyEvent e) {
setDividerLocation((int) (dividerLocation * getHeight()));
}
+ @Override
public void ancestorMoved(HierarchyEvent e) {
// do nothing
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(JSplitPane.DIVIDER_LOCATION_PROPERTY)) {
@@ -800,7 +806,7 @@
JPanel pnl = new JPanel();
pnl.setLayout(new FlowLayout(FlowLayout.LEFT));
- pnl.add(new JLabel(tr("Role:", null)));
+ pnl.add(new JLabel(tr("Role:")));
pnl.add(tfRole = new AutoCompletingTextField(10));
- tfRole.setToolTipText(tr("Enter a role for all relation memberships", null));
+ tfRole.setToolTipText(tr("Enter a role for all relation memberships"));
pnl.add(new JButton(new ApplyRoleAction()));
tfRole.addActionListener(new ApplyRoleAction());
@@ -819,16 +825,16 @@
JPanel pnl = new JPanel();
pnl.setLayout(new FlowLayout(FlowLayout.LEFT));
- cbTagRelations = new JCheckBox(tr("Tag modified relations with ", null));
+ cbTagRelations = new JCheckBox(tr("Tag modified relations with "));
cbTagRelations.addChangeListener(new ToggleTagRelationsAction());
cbTagRelations.setToolTipText(
tr("Select to enable entering a tag which will be applied
"
- + "to all modified relations.", null));
+ + "to all modified relations.