Index: /applications/editors/josm/plugins/josm-tofix-plugin/.git/logs/HEAD =================================================================== --- /applications/editors/josm/plugins/josm-tofix-plugin/.git/logs/HEAD (revision 31628) +++ /applications/editors/josm/plugins/josm-tofix-plugin/.git/logs/HEAD (revision 31629) @@ -1,1 +1,5 @@ 0000000000000000000000000000000000000000 e339a37900cdebb9743385da60e206774b0e400e Rub21 1444684541 -0500 clone: from git@github.com:osmlab/josm-tofix-plugin.git +e339a37900cdebb9743385da60e206774b0e400e 7c440a8912e9881421f9fb8aef706e2097fad698 Rub21 1444745676 -0500 commit: remove jar file +7c440a8912e9881421f9fb8aef706e2097fad698 34e89c358544a0291cd106a43b0da87a5499ed58 Rub21 1444747957 -0500 commit: update readme +34e89c358544a0291cd106a43b0da87a5499ed58 f6d92882dab7bfe0c3eabb95874a1f98d132a4bc Rub21 1444752978 -0500 pull: Fast-forward +f6d92882dab7bfe0c3eabb95874a1f98d132a4bc d6c530b931aec6fc4174adfd200e744514a9f4b7 Rub21 1444834196 -0500 pull: Fast-forward Index: /applications/editors/josm/plugins/josm-tofix-plugin/.git/logs/refs/heads/master =================================================================== --- /applications/editors/josm/plugins/josm-tofix-plugin/.git/logs/refs/heads/master (revision 31628) +++ /applications/editors/josm/plugins/josm-tofix-plugin/.git/logs/refs/heads/master (revision 31629) @@ -1,1 +1,5 @@ 0000000000000000000000000000000000000000 e339a37900cdebb9743385da60e206774b0e400e Rub21 1444684541 -0500 clone: from git@github.com:osmlab/josm-tofix-plugin.git +e339a37900cdebb9743385da60e206774b0e400e 7c440a8912e9881421f9fb8aef706e2097fad698 Rub21 1444745676 -0500 commit: remove jar file +7c440a8912e9881421f9fb8aef706e2097fad698 34e89c358544a0291cd106a43b0da87a5499ed58 Rub21 1444747957 -0500 commit: update readme +34e89c358544a0291cd106a43b0da87a5499ed58 f6d92882dab7bfe0c3eabb95874a1f98d132a4bc Rub21 1444752978 -0500 pull: Fast-forward +f6d92882dab7bfe0c3eabb95874a1f98d132a4bc d6c530b931aec6fc4174adfd200e744514a9f4b7 Rub21 1444834196 -0500 pull: Fast-forward Index: /applications/editors/josm/plugins/josm-tofix-plugin/.git/refs/heads/master =================================================================== --- /applications/editors/josm/plugins/josm-tofix-plugin/.git/refs/heads/master (revision 31628) +++ /applications/editors/josm/plugins/josm-tofix-plugin/.git/refs/heads/master (revision 31629) @@ -1,1 +1,1 @@ -e339a37900cdebb9743385da60e206774b0e400e +d6c530b931aec6fc4174adfd200e744514a9f4b7 Index: /applications/editors/josm/plugins/josm-tofix-plugin/README.md =================================================================== --- /applications/editors/josm/plugins/josm-tofix-plugin/README.md (revision 31628) +++ /applications/editors/josm/plugins/josm-tofix-plugin/README.md (revision 31629) @@ -3,25 +3,10 @@ Make [To-Fix](http://osmlab.github.io/to-fix) OpenStreetMap microtasking challenges available in [JOSM](http://josm.openstreetmap.de/) editor. - -![josm](https://cloud.githubusercontent.com/assets/1152236/8237989/9c48c41a-15b8-11e5-8fd5-a35735db43c9.gif) +![image](https://cloud.githubusercontent.com/assets/1152236/10458022/6a816f7c-718e-11e5-999b-c741b682c86a.png) ## Installation -*Download* +![tofix](https://cloud.githubusercontent.com/assets/1152236/10457988/417882b4-718e-11e5-94b5-6ecf4a30eb43.gif) -- Download: https://github.com/osmlab/josm-tofix-plugin/blob/master/dist/tofix.jar?raw=true -- or clone from GitHub: `git clone https://github.com/Rub21/josm-tofix-plugin.git` - -*Copy to plugins directory* - -- Ubuntu: `cp tofix.jar ~/.josm/plugins/` -- Mac OSX: `cp tofix.jar ~/Library/JOSM/plugins` -- Windows : Copy in `C:\Users\(Windows user)\AppData\Roaming\JOSM\plugins` - -*Activate plugin* - -![image](https://cloud.githubusercontent.com/assets/1152236/8236632/3e4e4352-15af-11e5-88d3-e348b78b62d2.png) - -![screenshot from 2015-10-12 11 33 04](https://cloud.githubusercontent.com/assets/1152236/10433104/2f8df796-70d5-11e5-8f77-43b18a01d96e.png) ## Configuration Index: /applications/editors/josm/plugins/josm-tofix-plugin/src/org/openstreetmap/josm/plugins/tofix/TofixDialog.java =================================================================== --- /applications/editors/josm/plugins/josm-tofix-plugin/src/org/openstreetmap/josm/plugins/tofix/TofixDialog.java (revision 31628) +++ /applications/editors/josm/plugins/josm-tofix-plugin/src/org/openstreetmap/josm/plugins/tofix/TofixDialog.java (revision 31629) @@ -144,5 +144,5 @@ //add tittle for To-fix task JLabel title_tasks = new javax.swing.JLabel(); - title_tasks.setText("List of To-fix tasks"); + title_tasks.setText("List of tasks"); title_tasks.setCursor(new Cursor(Cursor.HAND_CURSOR)); title_tasks.addMouseListener(new MouseAdapter() { @@ -170,5 +170,5 @@ //add title to download - jcontenConfig.add(new Label(tr("Size to download in Sq.m"))); + jcontenConfig.add(new Label(tr("Set download area (m²)"))); //Add Slider to download @@ -335,5 +335,5 @@ mainAccessToTask.setAccess(false); JLabel text = new javax.swing.JLabel(); - text.setText(tr("Somethig went wrong, please update Tofix plugin or open a ticket in josm-tofix-plugin/issues")); + text.setText(tr("Something went wrong, please update the plugin or report an issue at josm-tofix-plugin/issues")); text.setCursor(new Cursor(Cursor.HAND_CURSOR)); text.addMouseListener(new MouseAdapter() { @@ -347,5 +347,5 @@ default: mainAccessToTask.setAccess(false); - JOptionPane.showMessageDialog(Main.panel, tr("Somethig went wrong, try to again.,"), tr("Warning"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(Main.panel, tr("Something went wrong, try again"), tr("Warning"), JOptionPane.WARNING_MESSAGE); } } Index: /applications/editors/josm/plugins/josm-tofix-plugin/src/org/openstreetmap/josm/plugins/tofix/TofixTask.java =================================================================== --- /applications/editors/josm/plugins/josm-tofix-plugin/src/org/openstreetmap/josm/plugins/tofix/TofixTask.java (revision 31628) +++ /applications/editors/josm/plugins/josm-tofix-plugin/src/org/openstreetmap/josm/plugins/tofix/TofixTask.java (revision 31629) @@ -133,6 +133,6 @@ DecimalFormat myFormatter = new DecimalFormat("#,###"); String num = myFormatter.format(item.getTaskCompleteBean().getTotal()); - String message = "Task : " + accessToTask.getTask_name() + " was completed\n" - + "Total items : " + num; + String message = "Task " + accessToTask.getTask_name() + " is complete\n" + + num + " issues fixed"; JOptionPane.showMessageDialog(Main.panel, tr(message)); } Index: /applications/editors/josm/plugins/josm-tofix-plugin/src/org/openstreetmap/josm/plugins/tofix/controller/ListTaskController.java =================================================================== --- /applications/editors/josm/plugins/josm-tofix-plugin/src/org/openstreetmap/josm/plugins/tofix/controller/ListTaskController.java (revision 31628) +++ /applications/editors/josm/plugins/josm-tofix-plugin/src/org/openstreetmap/josm/plugins/tofix/controller/ListTaskController.java (revision 31629) @@ -5,5 +5,4 @@ import java.util.logging.Logger; import org.openstreetmap.josm.plugins.tofix.bean.ListTaskBean; -import org.openstreetmap.josm.plugins.tofix.bean.TrackBean; import org.openstreetmap.josm.plugins.tofix.util.Config; import org.openstreetmap.josm.plugins.tofix.util.Request;