From cb0d98643f60e31812e57785d157e8a719f0fae6 Mon Sep 17 00:00:00 2001 From: Taylor Smock Date: Thu, 26 Mar 2020 16:16:42 -0600 Subject: [PATCH] Refactor preferences location to match JOSM directories Signed-off-by: Taylor Smock --- .../josm/plugins/mapwithai/MapWithAIPlugin.java | 1 + .../{ => gui/preferences}/MapWithAIPreferences.java | 3 ++- .../{ => gui/preferences}/MapWithAIURLPreferenceTable.java | 3 ++- .../{ => gui/preferences}/ReplacementPreferenceTable.java | 2 +- .../josm/plugins/mapwithai/MapWithAIPluginTest.java | 1 + .../{ => gui/preferences}/MapWithAIPreferencesTest.java | 4 +--- .../preferences}/MapWithAIURLPreferenceTableTest.java | 5 +++-- 7 files changed, 11 insertions(+), 8 deletions(-) rename src/main/java/org/openstreetmap/josm/plugins/mapwithai/{ => gui/preferences}/MapWithAIPreferences.java (99%) rename src/main/java/org/openstreetmap/josm/plugins/mapwithai/{ => gui/preferences}/MapWithAIURLPreferenceTable.java (98%) rename src/main/java/org/openstreetmap/josm/plugins/mapwithai/{ => gui/preferences}/ReplacementPreferenceTable.java (97%) rename test/unit/org/openstreetmap/josm/plugins/mapwithai/{ => gui/preferences}/MapWithAIPreferencesTest.java (94%) rename test/unit/org/openstreetmap/josm/plugins/mapwithai/{ => gui/preferences}/MapWithAIURLPreferenceTableTest.java (95%) diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPlugin.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPlugin.java index 1dd8228..237cda3 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPlugin.java +++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPlugin.java @@ -42,6 +42,7 @@ import org.openstreetmap.josm.plugins.mapwithai.data.validation.tests.StreetAddr import org.openstreetmap.josm.plugins.mapwithai.data.validation.tests.StreetAddressTest; import org.openstreetmap.josm.plugins.mapwithai.data.validation.tests.StubEndsTest; import org.openstreetmap.josm.plugins.mapwithai.frontend.MapWithAIDownloadReader; +import org.openstreetmap.josm.plugins.mapwithai.gui.preferences.MapWithAIPreferences; import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.Destroyable; import org.openstreetmap.josm.tools.Logging; diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPreferences.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAIPreferences.java similarity index 99% rename from src/main/java/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPreferences.java rename to src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAIPreferences.java index 1ace7b5..6b78d0b 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPreferences.java +++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAIPreferences.java @@ -1,5 +1,5 @@ // License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.plugins.mapwithai; +package org.openstreetmap.josm.plugins.mapwithai.gui.preferences; import static org.openstreetmap.josm.tools.I18n.tr; @@ -36,6 +36,7 @@ import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting; import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting; import org.openstreetmap.josm.gui.preferences.advanced.PrefEntry; import org.openstreetmap.josm.gui.widgets.JosmTextField; +import org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin; import org.openstreetmap.josm.plugins.mapwithai.backend.DataAvailability; import org.openstreetmap.josm.plugins.mapwithai.backend.MapWithAIPreferenceHelper; import org.openstreetmap.josm.plugins.mapwithai.backend.commands.conflation.DataUrl; diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/MapWithAIURLPreferenceTable.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAIURLPreferenceTable.java similarity index 98% rename from src/main/java/org/openstreetmap/josm/plugins/mapwithai/MapWithAIURLPreferenceTable.java rename to src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAIURLPreferenceTable.java index 2b3dee0..22100e8 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/MapWithAIURLPreferenceTable.java +++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAIURLPreferenceTable.java @@ -1,5 +1,5 @@ // License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.plugins.mapwithai; +package org.openstreetmap.josm.plugins.mapwithai.gui.preferences; import static org.openstreetmap.josm.tools.I18n.tr; @@ -26,6 +26,7 @@ import javax.swing.table.DefaultTableModel; import org.openstreetmap.josm.gui.preferences.advanced.MapListEditor; import org.openstreetmap.josm.gui.preferences.advanced.PrefEntry; import org.openstreetmap.josm.gui.widgets.JosmTextField; +import org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin; import org.openstreetmap.josm.plugins.mapwithai.backend.commands.conflation.DataUrl; import org.openstreetmap.josm.spi.preferences.MapListSetting; import org.openstreetmap.josm.spi.preferences.Setting; diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/ReplacementPreferenceTable.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/ReplacementPreferenceTable.java similarity index 97% rename from src/main/java/org/openstreetmap/josm/plugins/mapwithai/ReplacementPreferenceTable.java rename to src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/ReplacementPreferenceTable.java index c1580bd..c7e5736 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/ReplacementPreferenceTable.java +++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/ReplacementPreferenceTable.java @@ -1,5 +1,5 @@ // License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.plugins.mapwithai; +package org.openstreetmap.josm.plugins.mapwithai.gui.preferences; import static org.openstreetmap.josm.tools.I18n.tr; diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPluginTest.java b/test/unit/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPluginTest.java index 50467b0..4d74587 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPluginTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPluginTest.java @@ -24,6 +24,7 @@ import org.openstreetmap.josm.gui.MainApplication; import org.openstreetmap.josm.gui.mappaint.MapPaintStyles; import org.openstreetmap.josm.plugins.PluginInformation; import org.openstreetmap.josm.plugins.mapwithai.backend.MapWithAIDataUtils; +import org.openstreetmap.josm.plugins.mapwithai.gui.preferences.MapWithAIPreferences; import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.testutils.JOSMTestRules; diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPreferencesTest.java b/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAIPreferencesTest.java similarity index 94% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPreferencesTest.java rename to test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAIPreferencesTest.java index 8f733ed..2b45d02 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPreferencesTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAIPreferencesTest.java @@ -1,5 +1,5 @@ // License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.plugins.mapwithai; +package org.openstreetmap.josm.plugins.mapwithai.gui.preferences; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -48,8 +48,6 @@ public class MapWithAIPreferencesTest { preferences.addGui(pane); assertEquals(tabs + 1, pane.getPluginPreference().getTabPane().getTabCount(), "Preferences wasn't added"); - assertEquals(pane.getPluginPreference(), preferences.getTabPreferenceSetting(pane), - "The expected parent of the settings panel was different"); final boolean switchLayers = MapWithAIPreferenceHelper.isSwitchLayers(); diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/MapWithAIURLPreferenceTableTest.java b/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAIURLPreferenceTableTest.java similarity index 95% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/MapWithAIURLPreferenceTableTest.java rename to test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAIURLPreferenceTableTest.java index 34476ec..fd4a373 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/MapWithAIURLPreferenceTableTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAIURLPreferenceTableTest.java @@ -1,5 +1,5 @@ // License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.plugins.mapwithai; +package org.openstreetmap.josm.plugins.mapwithai.gui.preferences; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -14,8 +14,9 @@ import java.util.TreeMap; import org.junit.Rule; import org.junit.Test; -import org.openstreetmap.josm.plugins.mapwithai.MapWithAIURLPreferenceTable.URLTableModel; import org.openstreetmap.josm.plugins.mapwithai.backend.commands.conflation.DataUrl; +import org.openstreetmap.josm.plugins.mapwithai.gui.preferences.MapWithAIURLPreferenceTable; +import org.openstreetmap.josm.plugins.mapwithai.gui.preferences.MapWithAIURLPreferenceTable.URLTableModel; import org.openstreetmap.josm.testutils.JOSMTestRules; /**