From 2af2f56adeb271b4848a43562921719d282619fb Mon Sep 17 00:00:00 2001 From: Andreas Billmann Date: Sat, 17 May 2014 07:18:37 +0200 Subject: [PATCH] changed the package name to the domain name --- build.gradle | 4 +-- plugins/BasicListStatisticsPlugin.groovy | 2 +- plugins/OwnStatisticsPlugin.groovy | 2 +- plugins/Project81Plugin.groovy | 2 +- resources/META-INF/persistence.xml | 14 +++++------ .../application/ProgressEvent.java | 2 +- .../application/ProgressListener.java | 2 +- .../application/ServiceManager.java | 18 ++++++------- .../application/SessionContext.java | 2 +- .../application/SessionContextListener.java | 2 +- .../fx/GeoFroggerFXMain.java | 6 ++--- .../cachedetails/CacheDetailsController.java | 14 +++++------ .../fx/cachedetails/cache_details.fxml | 4 +-- .../fx/cachelist/CacheListController.java | 24 +++++++++--------- .../fx/cachelist/cache_list.fxml | 2 +- .../fx/components/CacheListCell.java | 8 +++--- .../fx/components/GeocachingIcons.java | 5 ++-- .../fx/components/IconManager.java | 2 +- .../fx/components/MapPaneWrapper.java | 4 +-- .../fx/components/SortingMenuItem.java | 10 ++++---- .../fx/geofrogger.css | 0 .../fx/geofrogger/GeofroggerController.java | 25 ++++++++----------- .../fx/geofrogger/geofrogger.fxml | 2 +- .../fx/geofrogger_de.properties | 0 .../fx/geofrogger_en.properties | 0 .../fx/settings/settings.fxml | 0 .../fx/utils/JavaFXUtils.java | 2 +- .../gpx/GPXReader.java | 6 ++--- .../gpx/GroundspeakGPXReader.java | 10 ++++---- .../model/Attribute.java | 4 +-- .../model/Cache.java | 2 +- .../model/CacheUtils.java | 2 +- .../model/Log.java | 2 +- .../model/Settings.java | 2 +- .../model/TravelBug.java | 3 +-- .../model/Type.java | 2 +- .../model/User.java | 4 +-- .../model/Waypoint.java | 4 +-- .../plugins/Plugin.java | 2 +- .../plugins/PluginService.java | 2 +- .../plugins/PluginServiceImpl.java | 6 ++--- .../service/CacheService.java | 6 ++--- .../service/CacheServiceImpl.java | 18 ++++++------- .../service/CacheSortField.java | 2 +- .../service/SortDirection.java | 2 +- .../service/UserService.java | 2 +- .../sql/DatabaseService.java | 2 +- .../sql/DatabaseServiceImpl.java | 2 +- 48 files changed, 116 insertions(+), 127 deletions(-) rename src/de/{frosch95/geofrogger => geofroggerfx}/application/ProgressEvent.java (98%) rename src/de/{frosch95/geofrogger => geofroggerfx}/application/ProgressListener.java (97%) rename src/de/{frosch95/geofrogger => geofroggerfx}/application/ServiceManager.java (84%) rename src/de/{frosch95/geofrogger => geofroggerfx}/application/SessionContext.java (98%) rename src/de/{frosch95/geofrogger => geofroggerfx}/application/SessionContextListener.java (97%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/GeoFroggerFXMain.java (95%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/cachedetails/CacheDetailsController.java (95%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/cachedetails/cache_details.fxml (98%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/cachelist/CacheListController.java (87%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/cachelist/cache_list.fxml (96%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/components/CacheListCell.java (95%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/components/GeocachingIcons.java (95%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/components/IconManager.java (97%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/components/MapPaneWrapper.java (96%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/components/SortingMenuItem.java (84%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/geofrogger.css (100%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/geofrogger/GeofroggerController.java (92%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/geofrogger/geofrogger.fxml (96%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/geofrogger_de.properties (100%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/geofrogger_en.properties (100%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/settings/settings.fxml (100%) rename src/de/{frosch95/geofrogger => geofroggerfx}/fx/utils/JavaFXUtils.java (98%) rename src/de/{frosch95/geofrogger => geofroggerfx}/gpx/GPXReader.java (92%) rename src/de/{frosch95/geofrogger => geofroggerfx}/gpx/GroundspeakGPXReader.java (98%) rename src/de/{frosch95/geofrogger => geofroggerfx}/model/Attribute.java (94%) rename src/de/{frosch95/geofrogger => geofroggerfx}/model/Cache.java (99%) rename src/de/{frosch95/geofrogger => geofroggerfx}/model/CacheUtils.java (98%) rename src/de/{frosch95/geofrogger => geofroggerfx}/model/Log.java (98%) rename src/de/{frosch95/geofrogger => geofroggerfx}/model/Settings.java (92%) rename src/de/{frosch95/geofrogger => geofroggerfx}/model/TravelBug.java (96%) rename src/de/{frosch95/geofrogger => geofroggerfx}/model/Type.java (96%) rename src/de/{frosch95/geofrogger => geofroggerfx}/model/User.java (94%) rename src/de/{frosch95/geofrogger => geofroggerfx}/model/Waypoint.java (96%) rename src/de/{frosch95/geofrogger => geofroggerfx}/plugins/Plugin.java (93%) rename src/de/{frosch95/geofrogger => geofroggerfx}/plugins/PluginService.java (82%) rename src/de/{frosch95/geofrogger => geofroggerfx}/plugins/PluginServiceImpl.java (91%) rename src/de/{frosch95/geofrogger => geofroggerfx}/service/CacheService.java (92%) rename src/de/{frosch95/geofrogger => geofroggerfx}/service/CacheServiceImpl.java (87%) rename src/de/{frosch95/geofrogger => geofroggerfx}/service/CacheSortField.java (90%) rename src/de/{frosch95/geofrogger => geofroggerfx}/service/SortDirection.java (70%) rename src/de/{frosch95/geofrogger => geofroggerfx}/service/UserService.java (97%) rename src/de/{frosch95/geofrogger => geofroggerfx}/sql/DatabaseService.java (97%) rename src/de/{frosch95/geofrogger => geofroggerfx}/sql/DatabaseServiceImpl.java (98%) diff --git a/build.gradle b/build.gradle index 25aefaa..7ca74a8 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ apply plugin: 'idea' /////////////////////////////////////////////////////////////////////////////////// version = 0.3 sourceCompatibility = 1.8 -mainClassName = 'de.frosch95.geofrogger.fx.GeoFroggerFXMain' +mainClassName = 'de.geofroggerfx.fx.GeoFroggerFXMain' /////////////////////////////////////////////////////////////////////////////////// // add main class to MANIFEST.FM // @@ -52,7 +52,7 @@ dependencies { //compile group: 'org.jfxtras', name: 'jfxtras-labs', version: '8.0-r1-SNAPSHOT' this is not an actual version and the map part is missing compile files('lib/JFXtras/jfxtras-labs-8.0-r1-SNAPSHOT.jar', 'lib/ScenicView/ScenicView.jar') compile group: 'org.jdom', name: 'jdom2', version: '2.0.5' - compile group: 'org.controlsfx', name: 'controlsfx', version: '8.0.3' + compile group: 'org.controlsfx', name: 'controlsfx', version: '8.0.5' compile group: 'com.h2database', name: 'h2', version: '1.3.173' compile group: 'org.eclipse.persistence', name: 'eclipselink', version: '2.5.0' compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.2.1' diff --git a/plugins/BasicListStatisticsPlugin.groovy b/plugins/BasicListStatisticsPlugin.groovy index bcdbe01..257ca62 100644 --- a/plugins/BasicListStatisticsPlugin.groovy +++ b/plugins/BasicListStatisticsPlugin.groovy @@ -1,4 +1,4 @@ -import de.frosch95.geofrogger.plugins.Plugin +import de.geofroggerfx.plugins.Plugin import javafx.collections.FXCollections import javafx.scene.chart.PieChart import javafx.scene.control.Label diff --git a/plugins/OwnStatisticsPlugin.groovy b/plugins/OwnStatisticsPlugin.groovy index b37b736..110a705 100644 --- a/plugins/OwnStatisticsPlugin.groovy +++ b/plugins/OwnStatisticsPlugin.groovy @@ -1,4 +1,4 @@ -import de.frosch95.geofrogger.plugins.Plugin +import de.geofroggerfx.plugins.Plugin import javafx.collections.FXCollections import javafx.concurrent.Service import javafx.concurrent.Task diff --git a/plugins/Project81Plugin.groovy b/plugins/Project81Plugin.groovy index 8a12598..9d21d82 100644 --- a/plugins/Project81Plugin.groovy +++ b/plugins/Project81Plugin.groovy @@ -1,4 +1,4 @@ -import de.frosch95.geofrogger.plugins.Plugin +import de.geofroggerfx.plugins.Plugin import javafx.concurrent.Service import javafx.concurrent.Task import javafx.concurrent.WorkerStateEvent diff --git a/resources/META-INF/persistence.xml b/resources/META-INF/persistence.xml index 0ae9aba..b52add1 100644 --- a/resources/META-INF/persistence.xml +++ b/resources/META-INF/persistence.xml @@ -4,13 +4,13 @@ org.eclipse.persistence.jpa.PersistenceProvider - de.frosch95.geofrogger.model.Attribute - de.frosch95.geofrogger.model.Cache - de.frosch95.geofrogger.model.Log - de.frosch95.geofrogger.model.TravelBug - de.frosch95.geofrogger.model.Type - de.frosch95.geofrogger.model.User - de.frosch95.geofrogger.model.Waypoint + de.geofroggerfx.model.Attribute + de.geofroggerfx.model.Cache + de.geofroggerfx.model.Log + de.geofroggerfx.model.TravelBug + de.geofroggerfx.model.Type + de.geofroggerfx.model.User + de.geofroggerfx.model.Waypoint diff --git a/src/de/frosch95/geofrogger/application/ProgressEvent.java b/src/de/geofroggerfx/application/ProgressEvent.java similarity index 98% rename from src/de/frosch95/geofrogger/application/ProgressEvent.java rename to src/de/geofroggerfx/application/ProgressEvent.java index 3166fb8..4baf349 100644 --- a/src/de/frosch95/geofrogger/application/ProgressEvent.java +++ b/src/de/geofroggerfx/application/ProgressEvent.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.application; +package de.geofroggerfx.application; /** * @author Andreas diff --git a/src/de/frosch95/geofrogger/application/ProgressListener.java b/src/de/geofroggerfx/application/ProgressListener.java similarity index 97% rename from src/de/frosch95/geofrogger/application/ProgressListener.java rename to src/de/geofroggerfx/application/ProgressListener.java index 067ad00..1dae581 100644 --- a/src/de/frosch95/geofrogger/application/ProgressListener.java +++ b/src/de/geofroggerfx/application/ProgressListener.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.application; +package de.geofroggerfx.application; /** * @author Andreas diff --git a/src/de/frosch95/geofrogger/application/ServiceManager.java b/src/de/geofroggerfx/application/ServiceManager.java similarity index 84% rename from src/de/frosch95/geofrogger/application/ServiceManager.java rename to src/de/geofroggerfx/application/ServiceManager.java index aab7e52..58f2154 100644 --- a/src/de/frosch95/geofrogger/application/ServiceManager.java +++ b/src/de/geofroggerfx/application/ServiceManager.java @@ -23,16 +23,16 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.application; +package de.geofroggerfx.application; -import de.frosch95.geofrogger.gpx.GPXReader; -import de.frosch95.geofrogger.gpx.GroundspeakGPXReader; -import de.frosch95.geofrogger.plugins.PluginService; -import de.frosch95.geofrogger.plugins.PluginServiceImpl; -import de.frosch95.geofrogger.service.CacheService; -import de.frosch95.geofrogger.service.CacheServiceImpl; -import de.frosch95.geofrogger.sql.DatabaseService; -import de.frosch95.geofrogger.sql.DatabaseServiceImpl; +import de.geofroggerfx.gpx.GPXReader; +import de.geofroggerfx.gpx.GroundspeakGPXReader; +import de.geofroggerfx.plugins.PluginService; +import de.geofroggerfx.plugins.PluginServiceImpl; +import de.geofroggerfx.service.CacheService; +import de.geofroggerfx.service.CacheServiceImpl; +import de.geofroggerfx.sql.DatabaseService; +import de.geofroggerfx.sql.DatabaseServiceImpl; /** * @author Andreas diff --git a/src/de/frosch95/geofrogger/application/SessionContext.java b/src/de/geofroggerfx/application/SessionContext.java similarity index 98% rename from src/de/frosch95/geofrogger/application/SessionContext.java rename to src/de/geofroggerfx/application/SessionContext.java index 33f97e7..c82e871 100644 --- a/src/de/frosch95/geofrogger/application/SessionContext.java +++ b/src/de/geofroggerfx/application/SessionContext.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.application; +package de.geofroggerfx.application; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/de/frosch95/geofrogger/application/SessionContextListener.java b/src/de/geofroggerfx/application/SessionContextListener.java similarity index 97% rename from src/de/frosch95/geofrogger/application/SessionContextListener.java rename to src/de/geofroggerfx/application/SessionContextListener.java index 551069b..409e607 100644 --- a/src/de/frosch95/geofrogger/application/SessionContextListener.java +++ b/src/de/geofroggerfx/application/SessionContextListener.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.application; +package de.geofroggerfx.application; /** * @author Andreas diff --git a/src/de/frosch95/geofrogger/fx/GeoFroggerFXMain.java b/src/de/geofroggerfx/fx/GeoFroggerFXMain.java similarity index 95% rename from src/de/frosch95/geofrogger/fx/GeoFroggerFXMain.java rename to src/de/geofroggerfx/fx/GeoFroggerFXMain.java index b1bddc0..8c54a73 100644 --- a/src/de/frosch95/geofrogger/fx/GeoFroggerFXMain.java +++ b/src/de/geofroggerfx/fx/GeoFroggerFXMain.java @@ -23,9 +23,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.fx; +package de.geofroggerfx.fx; -import de.frosch95.geofrogger.application.ServiceManager; +import de.geofroggerfx.application.ServiceManager; import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; @@ -46,7 +46,7 @@ public class GeoFroggerFXMain extends Application { @Override public void start(Stage stage) throws Exception { loadCustomFonts(); - FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("geofrogger/geofrogger.fxml"), ResourceBundle.getBundle("de.frosch95.geofrogger.fx.geofrogger")); + FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("geofrogger/geofrogger.fxml"), ResourceBundle.getBundle("de.geofroggerfx.fx.geofrogger")); Parent root = (Parent)fxmlLoader.load(); Scene scene = new Scene(root); stage.setScene(scene); diff --git a/src/de/frosch95/geofrogger/fx/cachedetails/CacheDetailsController.java b/src/de/geofroggerfx/fx/cachedetails/CacheDetailsController.java similarity index 95% rename from src/de/frosch95/geofrogger/fx/cachedetails/CacheDetailsController.java rename to src/de/geofroggerfx/fx/cachedetails/CacheDetailsController.java index 5b1f139..7327ae2 100644 --- a/src/de/frosch95/geofrogger/fx/cachedetails/CacheDetailsController.java +++ b/src/de/geofroggerfx/fx/cachedetails/CacheDetailsController.java @@ -23,14 +23,14 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.fx.cachedetails; +package de.geofroggerfx.fx.cachedetails; -import de.frosch95.geofrogger.application.SessionContext; -import de.frosch95.geofrogger.application.SessionContextListener; -import de.frosch95.geofrogger.fx.components.MapPaneWrapper; -import de.frosch95.geofrogger.fx.components.GeocachingIcons; -import de.frosch95.geofrogger.fx.components.IconManager; -import de.frosch95.geofrogger.model.Cache; +import de.geofroggerfx.application.SessionContext; +import de.geofroggerfx.application.SessionContextListener; +import de.geofroggerfx.fx.components.MapPaneWrapper; +import de.geofroggerfx.fx.components.GeocachingIcons; +import de.geofroggerfx.fx.components.IconManager; +import de.geofroggerfx.model.Cache; import javafx.animation.FadeTransition; import javafx.fxml.FXML; import javafx.fxml.Initializable; diff --git a/src/de/frosch95/geofrogger/fx/cachedetails/cache_details.fxml b/src/de/geofroggerfx/fx/cachedetails/cache_details.fxml similarity index 98% rename from src/de/frosch95/geofrogger/fx/cachedetails/cache_details.fxml rename to src/de/geofroggerfx/fx/cachedetails/cache_details.fxml index 8f2d846..085db1a 100644 --- a/src/de/frosch95/geofrogger/fx/cachedetails/cache_details.fxml +++ b/src/de/geofroggerfx/fx/cachedetails/cache_details.fxml @@ -1,13 +1,13 @@ - + + fx:controller="de.geofroggerfx.fx.cachedetails.CacheDetailsController"> diff --git a/src/de/frosch95/geofrogger/fx/cachelist/CacheListController.java b/src/de/geofroggerfx/fx/cachelist/CacheListController.java similarity index 87% rename from src/de/frosch95/geofrogger/fx/cachelist/CacheListController.java rename to src/de/geofroggerfx/fx/cachelist/CacheListController.java index 26a2826..dc57abb 100644 --- a/src/de/frosch95/geofrogger/fx/cachelist/CacheListController.java +++ b/src/de/geofroggerfx/fx/cachelist/CacheListController.java @@ -23,17 +23,17 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.fx.cachelist; +package de.geofroggerfx.fx.cachelist; -import de.frosch95.geofrogger.application.ServiceManager; -import de.frosch95.geofrogger.application.SessionContext; -import de.frosch95.geofrogger.application.SessionContextListener; -import de.frosch95.geofrogger.fx.components.CacheListCell; -import de.frosch95.geofrogger.fx.components.IconManager; -import de.frosch95.geofrogger.fx.components.SortingMenuItem; -import de.frosch95.geofrogger.model.Cache; -import de.frosch95.geofrogger.service.CacheService; -import de.frosch95.geofrogger.service.CacheSortField; +import de.geofroggerfx.application.ServiceManager; +import de.geofroggerfx.application.SessionContext; +import de.geofroggerfx.application.SessionContextListener; +import de.geofroggerfx.fx.components.CacheListCell; +import de.geofroggerfx.fx.components.IconManager; +import de.geofroggerfx.fx.components.SortingMenuItem; +import de.geofroggerfx.model.Cache; +import de.geofroggerfx.service.CacheService; +import de.geofroggerfx.service.CacheSortField; import javafx.application.Platform; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; @@ -47,8 +47,8 @@ import java.net.URL; import java.util.List; import java.util.ResourceBundle; -import static de.frosch95.geofrogger.fx.utils.JavaFXUtils.addClasses; -import static de.frosch95.geofrogger.service.CacheSortField.*; +import static de.geofroggerfx.fx.utils.JavaFXUtils.addClasses; +import static de.geofroggerfx.service.CacheSortField.*; /** * FXML Controller class diff --git a/src/de/frosch95/geofrogger/fx/cachelist/cache_list.fxml b/src/de/geofroggerfx/fx/cachelist/cache_list.fxml similarity index 96% rename from src/de/frosch95/geofrogger/fx/cachelist/cache_list.fxml rename to src/de/geofroggerfx/fx/cachelist/cache_list.fxml index 92ad7d3..f54c3ca 100644 --- a/src/de/frosch95/geofrogger/fx/cachelist/cache_list.fxml +++ b/src/de/geofroggerfx/fx/cachelist/cache_list.fxml @@ -5,7 +5,7 @@ - + diff --git a/src/de/frosch95/geofrogger/fx/components/CacheListCell.java b/src/de/geofroggerfx/fx/components/CacheListCell.java similarity index 95% rename from src/de/frosch95/geofrogger/fx/components/CacheListCell.java rename to src/de/geofroggerfx/fx/components/CacheListCell.java index 99d9147..63a27df 100644 --- a/src/de/frosch95/geofrogger/fx/components/CacheListCell.java +++ b/src/de/geofroggerfx/fx/components/CacheListCell.java @@ -23,9 +23,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.fx.components; +package de.geofroggerfx.fx.components; -import de.frosch95.geofrogger.model.Cache; +import de.geofroggerfx.model.Cache; import javafx.geometry.Insets; import javafx.scene.control.Label; import javafx.scene.control.ListCell; @@ -34,8 +34,8 @@ import javafx.scene.layout.ColumnConstraints; import javafx.scene.layout.GridPane; import javafx.scene.layout.Priority; -import static de.frosch95.geofrogger.fx.utils.JavaFXUtils.addClasses; -import static de.frosch95.geofrogger.fx.utils.JavaFXUtils.removeClasses; +import static de.geofroggerfx.fx.utils.JavaFXUtils.addClasses; +import static de.geofroggerfx.fx.utils.JavaFXUtils.removeClasses; /** * Multi-Column-Row list cell to shows the most important data in a list. diff --git a/src/de/frosch95/geofrogger/fx/components/GeocachingIcons.java b/src/de/geofroggerfx/fx/components/GeocachingIcons.java similarity index 95% rename from src/de/frosch95/geofrogger/fx/components/GeocachingIcons.java rename to src/de/geofroggerfx/fx/components/GeocachingIcons.java index 8200170..f6c8713 100644 --- a/src/de/frosch95/geofrogger/fx/components/GeocachingIcons.java +++ b/src/de/geofroggerfx/fx/components/GeocachingIcons.java @@ -23,10 +23,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.fx.components; +package de.geofroggerfx.fx.components; -import de.frosch95.geofrogger.model.Cache; -import de.frosch95.geofrogger.model.Type; +import de.geofroggerfx.model.Cache; import javafx.scene.image.Image; /** diff --git a/src/de/frosch95/geofrogger/fx/components/IconManager.java b/src/de/geofroggerfx/fx/components/IconManager.java similarity index 97% rename from src/de/frosch95/geofrogger/fx/components/IconManager.java rename to src/de/geofroggerfx/fx/components/IconManager.java index c595a5b..38d5312 100644 --- a/src/de/frosch95/geofrogger/fx/components/IconManager.java +++ b/src/de/geofroggerfx/fx/components/IconManager.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.fx.components; +package de.geofroggerfx.fx.components; import javafx.scene.image.Image; diff --git a/src/de/frosch95/geofrogger/fx/components/MapPaneWrapper.java b/src/de/geofroggerfx/fx/components/MapPaneWrapper.java similarity index 96% rename from src/de/frosch95/geofrogger/fx/components/MapPaneWrapper.java rename to src/de/geofroggerfx/fx/components/MapPaneWrapper.java index 721e546..92b5ade 100644 --- a/src/de/frosch95/geofrogger/fx/components/MapPaneWrapper.java +++ b/src/de/geofroggerfx/fx/components/MapPaneWrapper.java @@ -23,9 +23,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.fx.components; +package de.geofroggerfx.fx.components; -import de.frosch95.geofrogger.fx.utils.JavaFXUtils; +import de.geofroggerfx.fx.utils.JavaFXUtils; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; import javafx.scene.layout.Pane; diff --git a/src/de/frosch95/geofrogger/fx/components/SortingMenuItem.java b/src/de/geofroggerfx/fx/components/SortingMenuItem.java similarity index 84% rename from src/de/frosch95/geofrogger/fx/components/SortingMenuItem.java rename to src/de/geofroggerfx/fx/components/SortingMenuItem.java index f36b4c1..a395e51 100644 --- a/src/de/frosch95/geofrogger/fx/components/SortingMenuItem.java +++ b/src/de/geofroggerfx/fx/components/SortingMenuItem.java @@ -1,13 +1,13 @@ -package de.frosch95.geofrogger.fx.components; +package de.geofroggerfx.fx.components; -import de.frosch95.geofrogger.service.CacheSortField; -import de.frosch95.geofrogger.service.SortDirection; +import de.geofroggerfx.service.CacheSortField; +import de.geofroggerfx.service.SortDirection; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.scene.control.MenuItem; -import static de.frosch95.geofrogger.service.SortDirection.ASC; -import static de.frosch95.geofrogger.service.SortDirection.DESC; +import static de.geofroggerfx.service.SortDirection.ASC; +import static de.geofroggerfx.service.SortDirection.DESC; /** * MenuItem with a ASC and DESC arrow when selected diff --git a/src/de/frosch95/geofrogger/fx/geofrogger.css b/src/de/geofroggerfx/fx/geofrogger.css similarity index 100% rename from src/de/frosch95/geofrogger/fx/geofrogger.css rename to src/de/geofroggerfx/fx/geofrogger.css diff --git a/src/de/frosch95/geofrogger/fx/geofrogger/GeofroggerController.java b/src/de/geofroggerfx/fx/geofrogger/GeofroggerController.java similarity index 92% rename from src/de/frosch95/geofrogger/fx/geofrogger/GeofroggerController.java rename to src/de/geofroggerfx/fx/geofrogger/GeofroggerController.java index 187b18f..be8397e 100644 --- a/src/de/frosch95/geofrogger/fx/geofrogger/GeofroggerController.java +++ b/src/de/geofroggerfx/fx/geofrogger/GeofroggerController.java @@ -23,25 +23,22 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.fx.geofrogger; +package de.geofroggerfx.fx.geofrogger; -import de.frosch95.geofrogger.application.ProgressEvent; -import de.frosch95.geofrogger.application.ServiceManager; -import de.frosch95.geofrogger.application.SessionContext; -import de.frosch95.geofrogger.gpx.GPXReader; -import de.frosch95.geofrogger.model.Cache; -import de.frosch95.geofrogger.plugins.Plugin; -import de.frosch95.geofrogger.plugins.PluginService; -import de.frosch95.geofrogger.service.CacheService; -import de.frosch95.geofrogger.service.CacheSortField; -import de.frosch95.geofrogger.service.SortDirection; +import de.geofroggerfx.application.ProgressEvent; +import de.geofroggerfx.application.ServiceManager; +import de.geofroggerfx.application.SessionContext; +import de.geofroggerfx.gpx.GPXReader; +import de.geofroggerfx.model.Cache; +import de.geofroggerfx.plugins.Plugin; +import de.geofroggerfx.plugins.PluginService; +import de.geofroggerfx.service.CacheService; import javafx.application.Platform; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.concurrent.Service; import javafx.concurrent.Task; import javafx.event.ActionEvent; -import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.*; @@ -56,8 +53,8 @@ import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; -import static de.frosch95.geofrogger.service.CacheSortField.*; -import static de.frosch95.geofrogger.service.SortDirection.*; +import static de.geofroggerfx.service.CacheSortField.*; +import static de.geofroggerfx.service.SortDirection.*; /** * FXML Controller class diff --git a/src/de/frosch95/geofrogger/fx/geofrogger/geofrogger.fxml b/src/de/geofroggerfx/fx/geofrogger/geofrogger.fxml similarity index 96% rename from src/de/frosch95/geofrogger/fx/geofrogger/geofrogger.fxml rename to src/de/geofroggerfx/fx/geofrogger/geofrogger.fxml index d803399..d74d292 100644 --- a/src/de/frosch95/geofrogger/fx/geofrogger/geofrogger.fxml +++ b/src/de/geofroggerfx/fx/geofrogger/geofrogger.fxml @@ -7,7 +7,7 @@ + fx:controller="de.geofroggerfx.fx.geofrogger.GeofroggerController"> diff --git a/src/de/frosch95/geofrogger/fx/geofrogger_de.properties b/src/de/geofroggerfx/fx/geofrogger_de.properties similarity index 100% rename from src/de/frosch95/geofrogger/fx/geofrogger_de.properties rename to src/de/geofroggerfx/fx/geofrogger_de.properties diff --git a/src/de/frosch95/geofrogger/fx/geofrogger_en.properties b/src/de/geofroggerfx/fx/geofrogger_en.properties similarity index 100% rename from src/de/frosch95/geofrogger/fx/geofrogger_en.properties rename to src/de/geofroggerfx/fx/geofrogger_en.properties diff --git a/src/de/frosch95/geofrogger/fx/settings/settings.fxml b/src/de/geofroggerfx/fx/settings/settings.fxml similarity index 100% rename from src/de/frosch95/geofrogger/fx/settings/settings.fxml rename to src/de/geofroggerfx/fx/settings/settings.fxml diff --git a/src/de/frosch95/geofrogger/fx/utils/JavaFXUtils.java b/src/de/geofroggerfx/fx/utils/JavaFXUtils.java similarity index 98% rename from src/de/frosch95/geofrogger/fx/utils/JavaFXUtils.java rename to src/de/geofroggerfx/fx/utils/JavaFXUtils.java index 053f70e..a69e955 100644 --- a/src/de/frosch95/geofrogger/fx/utils/JavaFXUtils.java +++ b/src/de/geofroggerfx/fx/utils/JavaFXUtils.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.fx.utils; +package de.geofroggerfx.fx.utils; import javafx.scene.Node; diff --git a/src/de/frosch95/geofrogger/gpx/GPXReader.java b/src/de/geofroggerfx/gpx/GPXReader.java similarity index 92% rename from src/de/frosch95/geofrogger/gpx/GPXReader.java rename to src/de/geofroggerfx/gpx/GPXReader.java index a979dc7..5b940b6 100644 --- a/src/de/frosch95/geofrogger/gpx/GPXReader.java +++ b/src/de/geofroggerfx/gpx/GPXReader.java @@ -23,10 +23,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.gpx; +package de.geofroggerfx.gpx; -import de.frosch95.geofrogger.application.ProgressListener; -import de.frosch95.geofrogger.model.Cache; +import de.geofroggerfx.application.ProgressListener; +import de.geofroggerfx.model.Cache; import java.io.IOException; import java.util.List; diff --git a/src/de/frosch95/geofrogger/gpx/GroundspeakGPXReader.java b/src/de/geofroggerfx/gpx/GroundspeakGPXReader.java similarity index 98% rename from src/de/frosch95/geofrogger/gpx/GroundspeakGPXReader.java rename to src/de/geofroggerfx/gpx/GroundspeakGPXReader.java index ec87eca..4ad6983 100644 --- a/src/de/frosch95/geofrogger/gpx/GroundspeakGPXReader.java +++ b/src/de/geofroggerfx/gpx/GroundspeakGPXReader.java @@ -23,12 +23,12 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.gpx; +package de.geofroggerfx.gpx; -import de.frosch95.geofrogger.application.ProgressEvent; -import de.frosch95.geofrogger.application.ProgressListener; -import de.frosch95.geofrogger.model.Attribute; -import de.frosch95.geofrogger.model.*; +import de.geofroggerfx.application.ProgressEvent; +import de.geofroggerfx.application.ProgressListener; +import de.geofroggerfx.model.Attribute; +import de.geofroggerfx.model.*; import org.jdom2.*; import org.jdom2.input.SAXBuilder; diff --git a/src/de/frosch95/geofrogger/model/Attribute.java b/src/de/geofroggerfx/model/Attribute.java similarity index 94% rename from src/de/frosch95/geofrogger/model/Attribute.java rename to src/de/geofroggerfx/model/Attribute.java index 32be889..54f606f 100644 --- a/src/de/frosch95/geofrogger/model/Attribute.java +++ b/src/de/geofroggerfx/model/Attribute.java @@ -23,12 +23,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.model; +package de.geofroggerfx.model; import javax.persistence.Entity; -import javax.persistence.EntityListeners; import javax.persistence.Id; -import javax.persistence.Table; /** * @author Andreas Billmann diff --git a/src/de/frosch95/geofrogger/model/Cache.java b/src/de/geofroggerfx/model/Cache.java similarity index 99% rename from src/de/frosch95/geofrogger/model/Cache.java rename to src/de/geofroggerfx/model/Cache.java index d8e62b5..7165121 100644 --- a/src/de/frosch95/geofrogger/model/Cache.java +++ b/src/de/geofroggerfx/model/Cache.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.model; +package de.geofroggerfx.model; import javax.persistence.*; import java.util.List; diff --git a/src/de/frosch95/geofrogger/model/CacheUtils.java b/src/de/geofroggerfx/model/CacheUtils.java similarity index 98% rename from src/de/frosch95/geofrogger/model/CacheUtils.java rename to src/de/geofroggerfx/model/CacheUtils.java index fdf8777..ca08626 100644 --- a/src/de/frosch95/geofrogger/model/CacheUtils.java +++ b/src/de/geofroggerfx/model/CacheUtils.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.model; +package de.geofroggerfx.model; import java.util.List; diff --git a/src/de/frosch95/geofrogger/model/Log.java b/src/de/geofroggerfx/model/Log.java similarity index 98% rename from src/de/frosch95/geofrogger/model/Log.java rename to src/de/geofroggerfx/model/Log.java index 33b4b91..aed96d0 100644 --- a/src/de/frosch95/geofrogger/model/Log.java +++ b/src/de/geofroggerfx/model/Log.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.model; +package de.geofroggerfx.model; import javax.persistence.*; import java.time.LocalDateTime; diff --git a/src/de/frosch95/geofrogger/model/Settings.java b/src/de/geofroggerfx/model/Settings.java similarity index 92% rename from src/de/frosch95/geofrogger/model/Settings.java rename to src/de/geofroggerfx/model/Settings.java index d7c4eb9..172c2c9 100644 --- a/src/de/frosch95/geofrogger/model/Settings.java +++ b/src/de/geofroggerfx/model/Settings.java @@ -1,4 +1,4 @@ -package de.frosch95.geofrogger.model; +package de.geofroggerfx.model; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/de/frosch95/geofrogger/model/TravelBug.java b/src/de/geofroggerfx/model/TravelBug.java similarity index 96% rename from src/de/frosch95/geofrogger/model/TravelBug.java rename to src/de/geofroggerfx/model/TravelBug.java index 16b4289..c144186 100644 --- a/src/de/frosch95/geofrogger/model/TravelBug.java +++ b/src/de/geofroggerfx/model/TravelBug.java @@ -23,11 +23,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.model; +package de.geofroggerfx.model; import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.Table; /** * @author Andreas Billmann diff --git a/src/de/frosch95/geofrogger/model/Type.java b/src/de/geofroggerfx/model/Type.java similarity index 96% rename from src/de/frosch95/geofrogger/model/Type.java rename to src/de/geofroggerfx/model/Type.java index eb309c8..e4a09dd 100644 --- a/src/de/frosch95/geofrogger/model/Type.java +++ b/src/de/geofroggerfx/model/Type.java @@ -1,4 +1,4 @@ -package de.frosch95.geofrogger.model; +package de.geofroggerfx.model; /** * This enum represents the different cache types diff --git a/src/de/frosch95/geofrogger/model/User.java b/src/de/geofroggerfx/model/User.java similarity index 94% rename from src/de/frosch95/geofrogger/model/User.java rename to src/de/geofroggerfx/model/User.java index 3f58766..60596fd 100644 --- a/src/de/frosch95/geofrogger/model/User.java +++ b/src/de/geofroggerfx/model/User.java @@ -23,12 +23,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.model; +package de.geofroggerfx.model; -import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.Table; /** * @author Andreas Billmann diff --git a/src/de/frosch95/geofrogger/model/Waypoint.java b/src/de/geofroggerfx/model/Waypoint.java similarity index 96% rename from src/de/frosch95/geofrogger/model/Waypoint.java rename to src/de/geofroggerfx/model/Waypoint.java index b10e9c2..28a0df4 100644 --- a/src/de/frosch95/geofrogger/model/Waypoint.java +++ b/src/de/geofroggerfx/model/Waypoint.java @@ -23,12 +23,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.model; +package de.geofroggerfx.model; -import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.Table; import java.net.URL; import java.time.LocalDateTime; diff --git a/src/de/frosch95/geofrogger/plugins/Plugin.java b/src/de/geofroggerfx/plugins/Plugin.java similarity index 93% rename from src/de/frosch95/geofrogger/plugins/Plugin.java rename to src/de/geofroggerfx/plugins/Plugin.java index e05ad86..93751ef 100644 --- a/src/de/frosch95/geofrogger/plugins/Plugin.java +++ b/src/de/geofroggerfx/plugins/Plugin.java @@ -1,4 +1,4 @@ -package de.frosch95.geofrogger.plugins; +package de.geofroggerfx.plugins; import java.util.Map; diff --git a/src/de/frosch95/geofrogger/plugins/PluginService.java b/src/de/geofroggerfx/plugins/PluginService.java similarity index 82% rename from src/de/frosch95/geofrogger/plugins/PluginService.java rename to src/de/geofroggerfx/plugins/PluginService.java index 01c3d5c..7fab945 100644 --- a/src/de/frosch95/geofrogger/plugins/PluginService.java +++ b/src/de/geofroggerfx/plugins/PluginService.java @@ -1,4 +1,4 @@ -package de.frosch95.geofrogger.plugins; +package de.geofroggerfx.plugins; import java.util.List; diff --git a/src/de/frosch95/geofrogger/plugins/PluginServiceImpl.java b/src/de/geofroggerfx/plugins/PluginServiceImpl.java similarity index 91% rename from src/de/frosch95/geofrogger/plugins/PluginServiceImpl.java rename to src/de/geofroggerfx/plugins/PluginServiceImpl.java index 5d7d18d..c2a75c9 100644 --- a/src/de/frosch95/geofrogger/plugins/PluginServiceImpl.java +++ b/src/de/geofroggerfx/plugins/PluginServiceImpl.java @@ -1,7 +1,7 @@ -package de.frosch95.geofrogger.plugins; +package de.geofroggerfx.plugins; -import de.frosch95.geofrogger.application.ServiceManager; -import de.frosch95.geofrogger.application.SessionContext; +import de.geofroggerfx.application.ServiceManager; +import de.geofroggerfx.application.SessionContext; import groovy.lang.GroovyClassLoader; import java.io.File; diff --git a/src/de/frosch95/geofrogger/service/CacheService.java b/src/de/geofroggerfx/service/CacheService.java similarity index 92% rename from src/de/frosch95/geofrogger/service/CacheService.java rename to src/de/geofroggerfx/service/CacheService.java index c57fdfc..761f68b 100644 --- a/src/de/frosch95/geofrogger/service/CacheService.java +++ b/src/de/geofroggerfx/service/CacheService.java @@ -23,10 +23,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.service; +package de.geofroggerfx.service; -import de.frosch95.geofrogger.application.ProgressListener; -import de.frosch95.geofrogger.model.Cache; +import de.geofroggerfx.application.ProgressListener; +import de.geofroggerfx.model.Cache; import java.util.List; diff --git a/src/de/frosch95/geofrogger/service/CacheServiceImpl.java b/src/de/geofroggerfx/service/CacheServiceImpl.java similarity index 87% rename from src/de/frosch95/geofrogger/service/CacheServiceImpl.java rename to src/de/geofroggerfx/service/CacheServiceImpl.java index c5823f3..92a1324 100644 --- a/src/de/frosch95/geofrogger/service/CacheServiceImpl.java +++ b/src/de/geofroggerfx/service/CacheServiceImpl.java @@ -3,16 +3,16 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package de.frosch95.geofrogger.service; +package de.geofroggerfx.service; -import de.frosch95.geofrogger.application.ProgressEvent; -import de.frosch95.geofrogger.application.ProgressListener; -import de.frosch95.geofrogger.application.ServiceManager; -import de.frosch95.geofrogger.model.Attribute; -import de.frosch95.geofrogger.model.Cache; -import de.frosch95.geofrogger.model.Log; -import de.frosch95.geofrogger.model.TravelBug; -import de.frosch95.geofrogger.sql.DatabaseService; +import de.geofroggerfx.application.ProgressEvent; +import de.geofroggerfx.application.ProgressListener; +import de.geofroggerfx.application.ServiceManager; +import de.geofroggerfx.model.Attribute; +import de.geofroggerfx.model.Cache; +import de.geofroggerfx.model.Log; +import de.geofroggerfx.model.TravelBug; +import de.geofroggerfx.sql.DatabaseService; import javax.persistence.EntityManager; import java.util.ArrayList; diff --git a/src/de/frosch95/geofrogger/service/CacheSortField.java b/src/de/geofroggerfx/service/CacheSortField.java similarity index 90% rename from src/de/frosch95/geofrogger/service/CacheSortField.java rename to src/de/geofroggerfx/service/CacheSortField.java index da3d03e..dceaf94 100644 --- a/src/de/frosch95/geofrogger/service/CacheSortField.java +++ b/src/de/geofroggerfx/service/CacheSortField.java @@ -1,4 +1,4 @@ -package de.frosch95.geofrogger.service; +package de.geofroggerfx.service; /** * Sort fields on cache object diff --git a/src/de/frosch95/geofrogger/service/SortDirection.java b/src/de/geofroggerfx/service/SortDirection.java similarity index 70% rename from src/de/frosch95/geofrogger/service/SortDirection.java rename to src/de/geofroggerfx/service/SortDirection.java index 97977b7..ac5b3d6 100644 --- a/src/de/frosch95/geofrogger/service/SortDirection.java +++ b/src/de/geofroggerfx/service/SortDirection.java @@ -1,4 +1,4 @@ -package de.frosch95.geofrogger.service; +package de.geofroggerfx.service; /** * direction of sorting diff --git a/src/de/frosch95/geofrogger/service/UserService.java b/src/de/geofroggerfx/service/UserService.java similarity index 97% rename from src/de/frosch95/geofrogger/service/UserService.java rename to src/de/geofroggerfx/service/UserService.java index d3310fc..a3c5fc5 100644 --- a/src/de/frosch95/geofrogger/service/UserService.java +++ b/src/de/geofroggerfx/service/UserService.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.service; +package de.geofroggerfx.service; /** * @author Andreas diff --git a/src/de/frosch95/geofrogger/sql/DatabaseService.java b/src/de/geofroggerfx/sql/DatabaseService.java similarity index 97% rename from src/de/frosch95/geofrogger/sql/DatabaseService.java rename to src/de/geofroggerfx/sql/DatabaseService.java index 45fde14..0c4eb0f 100644 --- a/src/de/frosch95/geofrogger/sql/DatabaseService.java +++ b/src/de/geofroggerfx/sql/DatabaseService.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.sql; +package de.geofroggerfx.sql; import javax.persistence.EntityManager; diff --git a/src/de/frosch95/geofrogger/sql/DatabaseServiceImpl.java b/src/de/geofroggerfx/sql/DatabaseServiceImpl.java similarity index 98% rename from src/de/frosch95/geofrogger/sql/DatabaseServiceImpl.java rename to src/de/geofroggerfx/sql/DatabaseServiceImpl.java index cfbc026..c371c84 100644 --- a/src/de/frosch95/geofrogger/sql/DatabaseServiceImpl.java +++ b/src/de/geofroggerfx/sql/DatabaseServiceImpl.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package de.frosch95.geofrogger.sql; +package de.geofroggerfx.sql; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory;