- Timestamp:
- 2013-04-13T12:04:29+02:00 (11 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/io/remotecontrol
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
r5790 r5844 13 13 import java.util.Collection; 14 14 import javax.swing.AbstractAction; 15 import javax.swing.DefaultCellEditor; 15 16 16 17 import javax.swing.JPanel; 17 18 import javax.swing.JTable; 19 import javax.swing.JTextField; 18 20 import javax.swing.KeyStroke; 19 21 import javax.swing.table.DefaultTableModel; 22 import javax.swing.table.TableCellEditor; 20 23 import javax.swing.table.TableCellRenderer; 21 24 import javax.swing.table.TableModel; … … 27 30 import org.openstreetmap.josm.data.osm.OsmPrimitive; 28 31 import org.openstreetmap.josm.gui.ExtendedDialog; 32 import org.openstreetmap.josm.gui.util.TableCellEditorSupport; 29 33 import org.openstreetmap.josm.gui.util.TableHelper; 30 34 import org.openstreetmap.josm.tools.GBC; … … 67 71 68 72 DefaultTableModel tm = new DefaultTableModel(new String[] {tr("Assume"), tr("Key"), tr("Value")}, tags.length) { 73 final Class<?> types[] = {Boolean.class, String.class, Object.class}; 69 74 @Override 70 75 public Class getColumnClass(int c) { 71 return getValueAt(0, c).getClass();76 return types[c]; 72 77 } 73 78 … … 97 102 98 103 private static final long serialVersionUID = 1L; 104 ///private final DefaultCellEditor textEditor = new DefaultCellEditor( new JTextField() ); 99 105 100 106 @Override … … 109 115 } 110 116 return c; 117 } 118 119 @Override 120 public TableCellEditor getCellEditor(int row, int column) { 121 Object value = getValueAt(row,column); 122 System.out.println(value); 123 if (value instanceof DeleteTagMarker) return null; 124 return getDefaultEditor(value.getClass()); 111 125 } 112 126 }; -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java
r5707 r5844 10 10 import org.openstreetmap.josm.data.coor.LatLon; 11 11 import org.openstreetmap.josm.data.osm.Node; 12 import org.openstreetmap.josm.gui.util.GuiHelper; 12 13 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; 13 14 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException; … … 28 29 @Override 29 30 protected void handleRequest() { 30 addNode(args); 31 GuiHelper.runInEDTAndWait(new Runnable() { 32 @Override public void run() { 33 addNode(args); 34 } 35 }); 31 36 } 32 37 -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
r5707 r5844 16 16 import org.openstreetmap.josm.data.osm.Node; 17 17 import org.openstreetmap.josm.data.osm.Way; 18 import org.openstreetmap.josm.gui.util.GuiHelper; 18 19 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; 19 20 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException; … … 38 39 @Override 39 40 protected void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException { 40 Way way = new Way(); 41 List<Command> commands = new LinkedList<Command>(); 42 for (LatLon ll : allCoordinates) { 43 Node node = new Node(ll); 44 way.addNode(node); 45 commands.add(new AddCommand(node)); 46 } 47 allCoordinates.clear(); 48 commands.add(new AddCommand(way)); 49 Main.main.undoRedo.add(new SequenceCommand(tr("Add way"), commands)); 50 Main.main.getCurrentDataSet().setSelected(way); 51 if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) { 52 AutoScaleAction.autoScale("selection"); 53 } else { 54 Main.map.mapView.repaint(); 55 } 56 // parse parameter addtags=tag1=value1|tag2=vlaue2 41 GuiHelper.runInEDTAndWait(new Runnable() { 42 @Override public void run() { 43 addWay(); 44 } 45 }); 46 // parse parameter addtags=tag1=value1|tag2=value2 57 47 LoadAndZoomHandler.addTags(args); 58 48 } … … 94 84 } 95 85 } 86 87 /* 88 * This function creates the way with given coordinates of nodes 89 */ 90 private void addWay() { 91 Way way = new Way(); 92 List<Command> commands = new LinkedList<Command>(); 93 for (LatLon ll : allCoordinates) { 94 Node node = new Node(ll); 95 way.addNode(node); 96 commands.add(new AddCommand(node)); 97 } 98 allCoordinates.clear(); 99 commands.add(new AddCommand(way)); 100 Main.main.undoRedo.add(new SequenceCommand(tr("Add way"), commands)); 101 Main.main.getCurrentDataSet().setSelected(way); 102 if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) { 103 AutoScaleAction.autoScale("selection"); 104 } else { 105 Main.map.mapView.repaint(); 106 } 107 } 96 108 } -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
r5837 r5844 9 9 import org.openstreetmap.josm.data.imagery.ImageryInfo; 10 10 import org.openstreetmap.josm.gui.layer.ImageryLayer; 11 import org.openstreetmap.josm.gui.util.GuiHelper; 11 12 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; 12 13 … … 47 48 } 48 49 String cookies = args.get("cookies"); 49 ImageryInfo imgInfo = new ImageryInfo(title, url, type, null, cookies);50 final ImageryInfo imgInfo = new ImageryInfo(title, url, type, null, cookies); 50 51 String min_zoom = args.get("min_zoom"); 51 52 if (min_zoom != null && !min_zoom.isEmpty()) { … … 64 65 } 65 66 } 66 Main.main.addLayer(ImageryLayer.create(imgInfo)); 67 GuiHelper.runInEDT(new Runnable() { 68 @Override public void run() { 69 Main.main.addLayer(ImageryLayer.create(imgInfo)); 70 } 71 }); 67 72 } 68 73 -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
r5680 r5844 9 9 import org.openstreetmap.josm.data.osm.PrimitiveId; 10 10 import org.openstreetmap.josm.data.osm.SimplePrimitiveId; 11 import org.openstreetmap.josm.gui.util.GuiHelper; 11 12 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; 12 13 … … 36 37 } 37 38 if (!ps.isEmpty()) { 38 boolean newLayer = isLoadInNewLayer(); 39 boolean relationMembers = Boolean.parseBoolean(args.get("relation_members")); 40 DownloadPrimitiveAction.processItems(newLayer, ps, true, relationMembers); 41 Main.worker.submit(new Runnable() { 42 39 final boolean newLayer = isLoadInNewLayer(); 40 final boolean relationMembers = Boolean.parseBoolean(args.get("relation_members")); 41 GuiHelper.runInEDTAndWait(new Runnable() { 42 @Override public void run() { 43 DownloadPrimitiveAction.processItems(newLayer, ps, true, relationMembers); 44 } 45 }); 46 GuiHelper.executeByMainWorkerInEDT(new Runnable() { 43 47 @Override 44 48 public void run() { -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenFileHandler.java
r5680 r5844 4 4 import java.util.Arrays; 5 5 import org.openstreetmap.josm.actions.OpenFileAction; 6 import org.openstreetmap.josm.gui.util.GuiHelper; 6 7 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; 7 8 import static org.openstreetmap.josm.tools.I18n.tr; … … 29 30 @Override 30 31 protected void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException { 31 OpenFileAction.openFiles(Arrays.asList(new File(args.get("filename")))); 32 GuiHelper.runInEDTAndWait(new Runnable() { 33 @Override public void run() { 34 OpenFileAction.openFiles(Arrays.asList(new File(args.get("filename")))); 35 } 36 }); 32 37 } 33 38
Note:
See TracChangeset
for help on using the changeset viewer.