Context Navigation

← Previous Changeset
Next Changeset →

Changeset 31690 in osm

Timestamp:

2015-10-25T04:33:39+01:00 (10 years ago)

Author:

donvip

Message:

avoid potential conflict between imageryadjust and touchscreenhelper plugins because of exact same package/class

Location:

applications/editors/josm/plugins

Files:

: 4 added
: 2 deleted
: 4 edited
: 2 copied

. (modified) (1 prop)
imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java (modified) (1 diff)
imageryadjust/src/imageryadjust/TimedKeyReleaseListener.java (copied) (copied from applications/editors/josm/plugins/imageryadjust/src/utils/TimedKeyReleaseListener.java ) (1 diff)
imageryadjust/src/utils (deleted)
touchscreenhelper (modified) (1 prop)
touchscreenhelper/.classpath (added)
touchscreenhelper/.project (added)
touchscreenhelper/.settings (added)
touchscreenhelper/.settings/org.eclipse.jdt.core.prefs (added)
touchscreenhelper/src/touchscreenhelper/BrowseAction.java (modified) (1 diff)
touchscreenhelper/src/touchscreenhelper/TimedKeyReleaseListener.java (copied) (copied from applications/editors/josm/plugins/touchscreenhelper/src/utils/TimedKeyReleaseListener.java ) (1 diff)
touchscreenhelper/src/utils (deleted)

Legend:

: Unmodified
: Added
: Removed

applications/editors/josm/plugins

Property svn:ignore

old	new
1	1	rasterfilters/build
2	2	continuos-download
	3	Dxf-Import
	4	TombPlugin

applications/editors/josm/plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java

r30737	r31690
34	34	import org.openstreetmap.josm.tools.ImageProvider;
35	35	import org.openstreetmap.josm.tools.Shortcut;
36
37		~~import utils.TimedKeyReleaseListener;~~
38	36
39	37

applications/editors/josm/plugins/imageryadjust/src/imageryadjust/TimedKeyReleaseListener.java

r31689	r31690
1		package ~~utils~~;
	1	package imageryadjust;
2	2
3	3	import java.awt.AWTEvent;

applications/editors/josm/plugins/touchscreenhelper

Property svn:ignore

old	new
1	1	build
	2	bin

applications/editors/josm/plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java

r29259	r31690
14	14	import org.openstreetmap.josm.data.coor.EastNorth;
15	15	import org.openstreetmap.josm.tools.Shortcut;
16		~~import utils.TimedKeyReleaseListener;~~
17	16
18	17	public class BrowseAction extends MapMode implements MouseListener,

applications/editors/josm/plugins/touchscreenhelper/src/touchscreenhelper/TimedKeyReleaseListener.java

r31689	r31690
1		package ~~utils~~;
	1	package touchscreenhelper;
2	2
3	3	// Thanks to http://www.arco.in-berlin.de/keyevent.html

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: