Changeset 34034 in osm for applications/editors/josm/plugins/eventbus

Timestamp:

2018-01-27T15:51:19+01:00 (6 years ago)

Author:

donvip

Message:

move new event classes outside of JOSM core packages to avoid SecurityException when running the plugin with signed version of JOSM jar

Location:

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm

Files:

• data (deleted)
• gui (deleted)
• plugins/eventbus/EventBusPlugin.java (modified) (5 diffs)
• plugins/eventbus/actions (moved) (moved from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/actions )
• plugins/eventbus/actions/ExpertModeChangedEvent.java (modified) (1 diff)
• plugins/eventbus/data (added)
• plugins/eventbus/data/CommandQueueEvent.java (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/data/CommandQueueEvent.java ) (1 diff)
• plugins/eventbus/data/SoMChangedEvent.java (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/data/SoMChangedEvent.java ) (1 diff)
• plugins/eventbus/data/conflict (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/data/conflict )
• plugins/eventbus/data/conflict/AbstractConflictsEvent.java (modified) (1 diff)
• plugins/eventbus/data/conflict/ConflictsAddedEvent.java (modified) (1 diff)
• plugins/eventbus/data/conflict/ConflictsRemovedEvent.java (modified) (1 diff)
• plugins/eventbus/data/osm (added)
• plugins/eventbus/data/osm/AbstractNoteDataEvent.java (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/data/osm/AbstractNoteDataEvent.java ) (1 diff)
• plugins/eventbus/data/osm/NoteDataUpdatedEvent.java (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/data/osm/NoteDataUpdatedEvent.java ) (1 diff)
• plugins/eventbus/data/osm/SelectedNoteChangedEvent.java (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/data/osm/SelectedNoteChangedEvent.java ) (1 diff)
• plugins/eventbus/data/osm/history (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/data/osm/history )
• plugins/eventbus/data/osm/history/AbstractHistoryEvent.java (modified) (1 diff)
• plugins/eventbus/data/osm/history/HistoryClearedEvent.java (modified) (1 diff)
• plugins/eventbus/data/osm/history/HistoryUpdatedEvent.java (modified) (1 diff)
• plugins/eventbus/data/projection (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/data/projection )
• plugins/eventbus/data/projection/ProjectionChangedEvent.java (modified) (1 diff)
• plugins/eventbus/gui (added)
• plugins/eventbus/gui/MapFrameInitializedEvent.java (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/gui/MapFrameInitializedEvent.java ) (1 diff)
• plugins/eventbus/gui/MapModeChangeEvent.java (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/gui/MapModeChangeEvent.java ) (1 diff)
• plugins/eventbus/gui/ZoomChangedEvent.java (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/gui/ZoomChangedEvent.java ) (1 diff)
• plugins/eventbus/gui/conflict (added)
• plugins/eventbus/gui/conflict/tags (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/gui/conflict/tags )
• plugins/eventbus/gui/conflict/tags/NextDecisionEvent.java (modified) (1 diff)
• plugins/eventbus/gui/conflict/tags/PreviousDecisionEvent.java (modified) (1 diff)
• plugins/eventbus/gui/dialogs (added)
• plugins/eventbus/gui/dialogs/LayerListRefreshedEvent.java (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/gui/dialogs/LayerListRefreshedEvent.java ) (1 diff)
• plugins/eventbus/gui/dialogs/LayerVisibleEvent.java (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/gui/dialogs/LayerVisibleEvent.java ) (1 diff)
• plugins/eventbus/gui/dialogs/relation (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/gui/dialogs/relation )
• plugins/eventbus/gui/dialogs/relation/MemberVisibleEvent.java (modified) (1 diff)
• plugins/eventbus/gui/download (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/gui/download )
• plugins/eventbus/gui/download/DownloadSourceAddedEvent.java (modified) (1 diff)
• plugins/eventbus/gui/layer (added)
• plugins/eventbus/gui/layer/LayerStateChangeEvent.java (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/gui/layer/LayerStateChangeEvent.java ) (1 diff)
• plugins/eventbus/gui/layer/imagery (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/gui/layer/imagery )
• plugins/eventbus/gui/layer/imagery/FilterChangedEvent.java (modified) (1 diff)
• plugins/eventbus/gui/mappaint (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/gui/mappaint )
• plugins/eventbus/gui/mappaint/MapPaintStyleEntryUpdatedEvent.java (modified) (1 diff)
• plugins/eventbus/gui/mappaint/MapPaintStylesUpdatedEvent.java (modified) (1 diff)
• plugins/eventbus/gui/preferences (added)
• plugins/eventbus/gui/preferences/imagery (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/gui/preferences/imagery )
• plugins/eventbus/gui/preferences/imagery/ContentValidationEvent.java (modified) (1 diff)
• plugins/eventbus/gui/preferences/server (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/gui/preferences/server )
• plugins/eventbus/gui/preferences/server/ProxyPreferenceChangedEvent.java (modified) (1 diff)
• plugins/eventbus/gui/progress (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/gui/progress )
• plugins/eventbus/gui/progress/OperationCancelledEvent.java (modified) (1 diff)
• plugins/eventbus/gui/tagging (added)
• plugins/eventbus/gui/tagging/presets (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/gui/tagging/presets )
• plugins/eventbus/gui/tagging/presets/TaggingPresetModifiedEvent.java (modified) (1 diff)
• plugins/eventbus/gui/util (copied) (copied from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/gui/util )
• plugins/eventbus/gui/util/KeyPressedEvent.java (modified) (1 diff)
• plugins/eventbus/gui/util/KeyReleasedEvent.java (modified) (1 diff)
• plugins/eventbus/gui/util/ModifierExChangedEvent.java (modified) (1 diff)
• plugins/eventbus/io (moved) (moved from applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/io )
• plugins/eventbus/io/OsmApiInitializedEvent.java (modified) (1 diff)

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/EventBusPlugin.java

@@ -7 +7 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.ExpertModeChangedEvent;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.actions.ExpertToggleAction.ExpertModeChangeListener;
-import org.openstreetmap.josm.data.CommandQueueEvent;
 import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.SoMChangedEvent;
 import org.openstreetmap.josm.data.SystemOfMeasurement;
 import org.openstreetmap.josm.data.SystemOfMeasurement.SoMChangeListener;
 import org.openstreetmap.josm.data.UndoRedoHandler.CommandQueueListener;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
-import org.openstreetmap.josm.data.conflict.ConflictsAddedEvent;
-import org.openstreetmap.josm.data.conflict.ConflictsRemovedEvent;
 import org.openstreetmap.josm.data.conflict.IConflictListener;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -30 +25 @@
 import org.openstreetmap.josm.data.osm.NoteData;
 import org.openstreetmap.josm.data.osm.NoteData.NoteDataUpdateListener;
-import org.openstreetmap.josm.data.osm.NoteDataUpdatedEvent;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
-import org.openstreetmap.josm.data.osm.SelectedNoteChangedEvent;
 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
 import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
@@ -42 +35 @@
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
-import org.openstreetmap.josm.data.osm.history.HistoryClearedEvent;
 import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
 import org.openstreetmap.josm.data.osm.history.HistoryDataSetListener;
-import org.openstreetmap.josm.data.osm.history.HistoryUpdatedEvent;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
-import org.openstreetmap.josm.data.projection.ProjectionChangedEvent;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapFrame.MapModeChangeListener;
-import org.openstreetmap.josm.gui.MapFrameInitializedEvent;
-import org.openstreetmap.josm.gui.MapModeChangeEvent;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
-import org.openstreetmap.josm.gui.ZoomChangedEvent;
 import org.openstreetmap.josm.gui.conflict.tags.MultiValueCellEditor.NavigationListener;
-import org.openstreetmap.josm.gui.conflict.tags.NextDecisionEvent;
-import org.openstreetmap.josm.gui.conflict.tags.PreviousDecisionEvent;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModelListener;
-import org.openstreetmap.josm.gui.dialogs.LayerListRefreshedEvent;
-import org.openstreetmap.josm.gui.dialogs.LayerVisibleEvent;
 import org.openstreetmap.josm.gui.dialogs.relation.IMemberModelListener;
-import org.openstreetmap.josm.gui.dialogs.relation.MemberVisibleEvent;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -73 +55 @@
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
-import org.openstreetmap.josm.gui.layer.LayerStateChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.LayerAvailabilityEvent;
@@ -81 +62 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer.LayerStateChangeListener;
-import org.openstreetmap.josm.gui.layer.imagery.FilterChangedEvent;
 import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings.FilterChangeListener;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings.DisplaySettingsChangeListener;
-import org.openstreetmap.josm.gui.mappaint.MapPaintStyleEntryUpdatedEvent;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintSylesUpdateListener;
-import org.openstreetmap.josm.gui.mappaint.MapPaintStylesUpdatedEvent;
 import org.openstreetmap.josm.gui.preferences.imagery.AddImageryPanel.ContentValidationListener;
-import org.openstreetmap.josm.gui.preferences.imagery.ContentValidationEvent;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreference;
-import org.openstreetmap.josm.gui.preferences.server.ProxyPreferenceChangedEvent;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreferenceListener;
-import org.openstreetmap.josm.gui.progress.OperationCancelledEvent;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor.CancelListener;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetListener;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetModifiedEvent;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 import org.openstreetmap.josm.gui.util.KeyPressReleaseListener;
-import org.openstreetmap.josm.gui.util.KeyPressedEvent;
-import org.openstreetmap.josm.gui.util.KeyReleasedEvent;
-import org.openstreetmap.josm.gui.util.ModifierExChangedEvent;
 import org.openstreetmap.josm.gui.util.ModifierExListener;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmApi.OsmApiInitializationListener;
-import org.openstreetmap.josm.io.OsmApiInitializedEvent;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.plugins.eventbus.actions.ExpertModeChangedEvent;
+import org.openstreetmap.josm.plugins.eventbus.data.CommandQueueEvent;
+import org.openstreetmap.josm.plugins.eventbus.data.SoMChangedEvent;
+import org.openstreetmap.josm.plugins.eventbus.data.conflict.ConflictsAddedEvent;
+import org.openstreetmap.josm.plugins.eventbus.data.conflict.ConflictsRemovedEvent;
+import org.openstreetmap.josm.plugins.eventbus.data.osm.NoteDataUpdatedEvent;
+import org.openstreetmap.josm.plugins.eventbus.data.osm.SelectedNoteChangedEvent;
+import org.openstreetmap.josm.plugins.eventbus.data.osm.history.HistoryClearedEvent;
+import org.openstreetmap.josm.plugins.eventbus.data.osm.history.HistoryUpdatedEvent;
+import org.openstreetmap.josm.plugins.eventbus.data.projection.ProjectionChangedEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.MapFrameInitializedEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.MapModeChangeEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.ZoomChangedEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.conflict.tags.NextDecisionEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.conflict.tags.PreviousDecisionEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.dialogs.LayerListRefreshedEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.dialogs.LayerVisibleEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.dialogs.relation.MemberVisibleEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.layer.LayerStateChangeEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.layer.imagery.FilterChangedEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.mappaint.MapPaintStyleEntryUpdatedEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.mappaint.MapPaintStylesUpdatedEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.preferences.imagery.ContentValidationEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.preferences.server.ProxyPreferenceChangedEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.progress.OperationCancelledEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.tagging.presets.TaggingPresetModifiedEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.util.KeyPressedEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.util.KeyReleasedEvent;
+import org.openstreetmap.josm.plugins.eventbus.gui.util.ModifierExChangedEvent;
+import org.openstreetmap.josm.plugins.eventbus.io.OsmApiInitializedEvent;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/actions/ExpertModeChangedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.actions;
+package org.openstreetmap.josm.plugins.eventbus.actions;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/data/CommandQueueEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data;
+package org.openstreetmap.josm.plugins.eventbus.data;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/data/SoMChangedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data;
+package org.openstreetmap.josm.plugins.eventbus.data;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/data/conflict/AbstractConflictsEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.conflict;
+package org.openstreetmap.josm.plugins.eventbus.data.conflict;
 
 import java.util.EventObject;
 import java.util.Objects;
+
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 
 /**

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/data/conflict/ConflictsAddedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.conflict;
+package org.openstreetmap.josm.plugins.eventbus.data.conflict;
 
 import java.util.Collection;
+
+import org.openstreetmap.josm.data.conflict.Conflict;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 
 /**

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/data/conflict/ConflictsRemovedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.conflict;
+package org.openstreetmap.josm.plugins.eventbus.data.conflict;
 
 import java.util.Collection;
+
+import org.openstreetmap.josm.data.conflict.Conflict;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 
 /**

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/data/osm/AbstractNoteDataEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.osm;
+package org.openstreetmap.josm.plugins.eventbus.data.osm;
 
 import java.util.EventObject;
 import java.util.Objects;
+
+import org.openstreetmap.josm.data.osm.NoteData;
 
 /**

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/data/osm/NoteDataUpdatedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.osm;
+package org.openstreetmap.josm.plugins.eventbus.data.osm;
+
+import org.openstreetmap.josm.data.osm.NoteData;
 
 /**

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/data/osm/SelectedNoteChangedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.osm;
+package org.openstreetmap.josm.plugins.eventbus.data.osm;
+
+import org.openstreetmap.josm.data.osm.NoteData;
 
 /**

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/data/osm/history/AbstractHistoryEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.osm.history;
+package org.openstreetmap.josm.plugins.eventbus.data.osm.history;
 
 import java.util.EventObject;
 import java.util.Objects;
+
+import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
 
 /**

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/data/osm/history/HistoryClearedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.osm.history;
+package org.openstreetmap.josm.plugins.eventbus.data.osm.history;
+
+import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
 
 /**

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/data/osm/history/HistoryUpdatedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.osm.history;
+package org.openstreetmap.josm.plugins.eventbus.data.osm.history;
 
 import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
 
 /**

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/data/projection/ProjectionChangedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.projection;
+package org.openstreetmap.josm.plugins.eventbus.data.projection;
 
 import java.util.EventObject;
 import java.util.Objects;
+
+import org.openstreetmap.josm.data.projection.Projection;
 
 /**

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/MapFrameInitializedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui;
+package org.openstreetmap.josm.plugins.eventbus.gui;
 
 import java.util.EventObject;
+
+import org.openstreetmap.josm.gui.MapFrame;
 
 /**

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/MapModeChangeEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui;
+package org.openstreetmap.josm.plugins.eventbus.gui;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/ZoomChangedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui;
+package org.openstreetmap.josm.plugins.eventbus.gui;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/conflict/tags/NextDecisionEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.conflict.tags;
+package org.openstreetmap.josm.plugins.eventbus.gui.conflict.tags;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/conflict/tags/PreviousDecisionEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.conflict.tags;
+package org.openstreetmap.josm.plugins.eventbus.gui.conflict.tags;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/dialogs/LayerListRefreshedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.dialogs;
+package org.openstreetmap.josm.plugins.eventbus.gui.dialogs;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/dialogs/LayerVisibleEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.dialogs;
+package org.openstreetmap.josm.plugins.eventbus.gui.dialogs;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/dialogs/relation/MemberVisibleEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.dialogs.relation;
+package org.openstreetmap.josm.plugins.eventbus.gui.dialogs.relation;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/download/DownloadSourceAddedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.download;
+package org.openstreetmap.josm.plugins.eventbus.gui.download;
 
 import java.util.EventObject;
 import java.util.Objects;
+
+import org.openstreetmap.josm.gui.download.DownloadSource;
 
 /**

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/layer/LayerStateChangeEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.layer;
+package org.openstreetmap.josm.plugins.eventbus.gui.layer;
 
 import java.util.EventObject;
 import java.util.Objects;
+
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
 /**

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/layer/imagery/FilterChangedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.layer.imagery;
+package org.openstreetmap.josm.plugins.eventbus.gui.layer.imagery;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/mappaint/MapPaintStyleEntryUpdatedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.mappaint;
+package org.openstreetmap.josm.plugins.eventbus.gui.mappaint;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/mappaint/MapPaintStylesUpdatedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.mappaint;
+package org.openstreetmap.josm.plugins.eventbus.gui.mappaint;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/preferences/imagery/ContentValidationEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.preferences.imagery;
+package org.openstreetmap.josm.plugins.eventbus.gui.preferences.imagery;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/preferences/server/ProxyPreferenceChangedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.preferences.server;
+package org.openstreetmap.josm.plugins.eventbus.gui.preferences.server;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/progress/OperationCancelledEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.progress;
+package org.openstreetmap.josm.plugins.eventbus.gui.progress;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/tagging/presets/TaggingPresetModifiedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.tagging.presets;
+package org.openstreetmap.josm.plugins.eventbus.gui.tagging.presets;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/util/KeyPressedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.util;
+package org.openstreetmap.josm.plugins.eventbus.gui.util;
 
 import java.awt.event.KeyEvent;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/util/KeyReleasedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.util;
+package org.openstreetmap.josm.plugins.eventbus.gui.util;
 
 import java.awt.event.KeyEvent;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/gui/util/ModifierExChangedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.util;
+package org.openstreetmap.josm.plugins.eventbus.gui.util;
 
 import java.util.EventObject;

applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/io/OsmApiInitializedEvent.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io;
+package org.openstreetmap.josm.plugins.eventbus.io;
 
 import java.util.EventObject;
+
+import org.openstreetmap.josm.io.OsmApi;
 
 /**