Changeset 36147 in osm

Timestamp:

2023-09-20T17:59:32+02:00 (16 months ago)

Author:

taylor.smock

Message:

Rename geochat package to something much less likely to conflict with libraries

Location:

applications/editors/josm/plugins/geochat

Files:

• build.xml (modified) (1 diff)
• src/geochat (deleted)
• src/org (added)
• src/org/openstreetmap (added)
• src/org/openstreetmap/josm (added)
• src/org/openstreetmap/josm/plugins (added)
• src/org/openstreetmap/josm/plugins/geochat (added)
• src/org/openstreetmap/josm/plugins/geochat/ChatMessage.java (copied) (copied from applications/editors/josm/plugins/geochat/src/geochat/ChatMessage.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/geochat/ChatPaneManager.java (copied) (copied from applications/editors/josm/plugins/geochat/src/geochat/ChatPaneManager.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/geochat/ChatServerConnection.java (copied) (copied from applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnection.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/geochat/ChatServerConnectionListener.java (copied) (copied from applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnectionListener.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/geochat/GeoChatPanel.java (copied) (copied from applications/editors/josm/plugins/geochat/src/geochat/GeoChatPanel.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/geochat/GeoChatPlugin.java (copied) (copied from applications/editors/josm/plugins/geochat/src/geochat/GeoChatPlugin.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/geochat/GeoChatPopupAdapter.java (copied) (copied from applications/editors/josm/plugins/geochat/src/geochat/GeoChatPopupAdapter.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/geochat/JPanelTextField.java (copied) (copied from applications/editors/josm/plugins/geochat/src/geochat/JPanelTextField.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/geochat/JsonQueryCallback.java (copied) (copied from applications/editors/josm/plugins/geochat/src/geochat/JsonQueryCallback.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/geochat/JsonQueryUtil.java (copied) (copied from applications/editors/josm/plugins/geochat/src/geochat/JsonQueryUtil.java ) (1 diff)

applications/editors/josm/plugins/geochat/build.xml

@@ -8 +8 @@
 
     <property name="plugin.author" value="Ilya Zverev"/>
-    <property name="plugin.class" value="geochat.GeoChatPlugin"/>
+    <property name="plugin.class" value="org.openstreetmap.josm.plugins.geochat.GeoChatPlugin"/>
     <property name="plugin.description" value="Talk with users editing the map nearby, be notified when someone comes close."/>
     <property name="plugin.icon" value="images/dialogs/geochat.png"/>

applications/editors/josm/plugins/geochat/src/org/openstreetmap/josm/plugins/geochat/ChatMessage.java

@@ -1 +1 @@
 // License: WTFPL. For details, see LICENSE file.
-package geochat;
+package org.openstreetmap.josm.plugins.geochat;
 
 import java.time.Instant;

applications/editors/josm/plugins/geochat/src/org/openstreetmap/josm/plugins/geochat/ChatPaneManager.java

@@ -1 +1 @@
 // License: WTFPL. For details, see LICENSE file.
-package geochat;
+package org.openstreetmap.josm.plugins.geochat;
 
 import static org.openstreetmap.josm.tools.I18n.tr;

applications/editors/josm/plugins/geochat/src/org/openstreetmap/josm/plugins/geochat/ChatServerConnection.java

@@ -1 +1 @@
 // License: WTFPL. For details, see LICENSE file.
-package geochat;
+package org.openstreetmap.josm.plugins.geochat;
 
 import static org.openstreetmap.josm.tools.I18n.tr;

applications/editors/josm/plugins/geochat/src/org/openstreetmap/josm/plugins/geochat/ChatServerConnectionListener.java

@@ -1 +1 @@
 // License: WTFPL. For details, see LICENSE file.
-package geochat;
+package org.openstreetmap.josm.plugins.geochat;
 
 import java.util.List;

applications/editors/josm/plugins/geochat/src/org/openstreetmap/josm/plugins/geochat/GeoChatPanel.java

@@ -1 +1 @@
 // License: WTFPL. For details, see LICENSE file.
-package geochat;
+package org.openstreetmap.josm.plugins.geochat;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -68 +68 @@
      */
     public GeoChatPanel() {
-        super(tr("GeoChat"), "geochat", tr("Open GeoChat panel"), null, 200, true);
+        super(tr("GeoChat"), "org/openstreetmap/josm/plugins/geochat", tr("Open GeoChat panel"), null, 200, true);
 
         noData = new JLabel(tr("Zoom in to see messages"), SwingConstants.CENTER);

applications/editors/josm/plugins/geochat/src/org/openstreetmap/josm/plugins/geochat/GeoChatPlugin.java

@@ -1 +1 @@
 // License: WTFPL. For details, see LICENSE file.
-package geochat;
+package org.openstreetmap.josm.plugins.geochat;
 
 import org.openstreetmap.josm.gui.MapFrame;

applications/editors/josm/plugins/geochat/src/org/openstreetmap/josm/plugins/geochat/GeoChatPopupAdapter.java

@@ -1 +1 @@
 // License: WTFPL. For details, see LICENSE file.
-package geochat;
+package org.openstreetmap.josm.plugins.geochat;
 
 import static org.openstreetmap.josm.tools.I18n.tr;

applications/editors/josm/plugins/geochat/src/org/openstreetmap/josm/plugins/geochat/JPanelTextField.java

@@ -1 +1 @@
 // License: WTFPL. For details, see LICENSE file.
-package geochat;
+package org.openstreetmap.josm.plugins.geochat;
 
 import java.awt.KeyboardFocusManager;

applications/editors/josm/plugins/geochat/src/org/openstreetmap/josm/plugins/geochat/JsonQueryCallback.java

@@ -1 +1 @@
 // License: WTFPL. For details, see LICENSE file.
-package geochat;
+package org.openstreetmap.josm.plugins.geochat;
 
 import jakarta.json.JsonObject;

applications/editors/josm/plugins/geochat/src/org/openstreetmap/josm/plugins/geochat/JsonQueryUtil.java

@@ -1 +1 @@
 // License: WTFPL. For details, see LICENSE file.
-package geochat;
+package org.openstreetmap.josm.plugins.geochat;
 
 import java.awt.EventQueue;