From a45bb4b4b3f6ce4067fc94acbfc546637fb30b06 Mon Sep 17 00:00:00 2001 From: kiramt Date: Mon, 12 Dec 2016 13:48:11 +0000 Subject: [PATCH] JAL-2316 Added jalview.urls.* packages --- src/jalview/appletgui/IdPanel.java | 6 +++--- src/jalview/gui/Preferences.java | 6 +++--- src/jalview/urls/UrlLinkTableModel.java | 1 + src/jalview/urls/UrlProvider.java | 2 ++ src/jalview/urls/UrlProviderImpl.java | 1 + src/jalview/urls/{ => api}/UrlProviderFactoryI.java | 3 ++- src/jalview/urls/{ => api}/UrlProviderI.java | 4 +++- src/jalview/urls/{ => applet}/AppletUrlProviderFactory.java | 7 ++++++- src/jalview/urls/{ => desktop}/DesktopUrlProviderFactory.java | 8 +++++++- test/jalview/urls/AppletUrlProviderFactoryTest.java | 3 +++ test/jalview/urls/CustomUrlProviderTest.java | 1 + test/jalview/urls/DesktopUrlProviderFactoryTest.java | 3 +++ test/jalview/urls/IdentifiersUrlProviderTest.java | 2 ++ test/jalview/urls/UrlLinkTableModelTest.java | 1 + test/jalview/urls/UrlProviderTest.java | 2 ++ 15 files changed, 40 insertions(+), 10 deletions(-) rename src/jalview/urls/{ => api}/UrlProviderFactoryI.java (97%) rename src/jalview/urls/{ => api}/UrlProviderI.java (97%) rename src/jalview/urls/{ => applet}/AppletUrlProviderFactory.java (90%) rename src/jalview/urls/{ => desktop}/DesktopUrlProviderFactory.java (89%) diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java index f9f1676..4e7c9cd 100755 --- a/src/jalview/appletgui/IdPanel.java +++ b/src/jalview/appletgui/IdPanel.java @@ -24,9 +24,9 @@ import jalview.datamodel.Sequence; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; -import jalview.urls.AppletUrlProviderFactory; -import jalview.urls.UrlProviderFactoryI; -import jalview.urls.UrlProviderI; +import jalview.urls.api.UrlProviderFactoryI; +import jalview.urls.api.UrlProviderI; +import jalview.urls.applet.AppletUrlProviderFactory; import jalview.viewmodel.AlignmentViewport; import java.awt.BorderLayout; diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java index 8048efe..1c40ea1 100755 --- a/src/jalview/gui/Preferences.java +++ b/src/jalview/gui/Preferences.java @@ -29,10 +29,10 @@ import jalview.io.JalviewFileView; import jalview.jbgui.GPreferences; import jalview.jbgui.GSequenceLink; import jalview.schemes.ColourSchemeProperty; -import jalview.urls.DesktopUrlProviderFactory; import jalview.urls.UrlLinkTableModel; -import jalview.urls.UrlProviderFactoryI; -import jalview.urls.UrlProviderI; +import jalview.urls.api.UrlProviderFactoryI; +import jalview.urls.api.UrlProviderI; +import jalview.urls.desktop.DesktopUrlProviderFactory; import jalview.util.MessageManager; import jalview.util.Platform; import jalview.util.UrlConstants; diff --git a/src/jalview/urls/UrlLinkTableModel.java b/src/jalview/urls/UrlLinkTableModel.java index a647d9e..bbb227b 100644 --- a/src/jalview/urls/UrlLinkTableModel.java +++ b/src/jalview/urls/UrlLinkTableModel.java @@ -22,6 +22,7 @@ package jalview.urls; import jalview.bin.Cache; +import jalview.urls.api.UrlProviderI; import jalview.util.UrlLink; import java.util.Iterator; diff --git a/src/jalview/urls/UrlProvider.java b/src/jalview/urls/UrlProvider.java index 383c5d1..19fa196 100644 --- a/src/jalview/urls/UrlProvider.java +++ b/src/jalview/urls/UrlProvider.java @@ -22,6 +22,8 @@ package jalview.urls; import static jalview.util.UrlConstants.SEP; +import jalview.urls.api.UrlProviderI; + import java.util.ArrayList; import java.util.List; import java.util.Vector; diff --git a/src/jalview/urls/UrlProviderImpl.java b/src/jalview/urls/UrlProviderImpl.java index 5e85062..87e40c6 100644 --- a/src/jalview/urls/UrlProviderImpl.java +++ b/src/jalview/urls/UrlProviderImpl.java @@ -20,6 +20,7 @@ */ package jalview.urls; +import jalview.urls.api.UrlProviderI; import jalview.util.UrlLink; import java.util.ArrayList; diff --git a/src/jalview/urls/UrlProviderFactoryI.java b/src/jalview/urls/api/UrlProviderFactoryI.java similarity index 97% rename from src/jalview/urls/UrlProviderFactoryI.java rename to src/jalview/urls/api/UrlProviderFactoryI.java index 69e5a80..b96113e 100644 --- a/src/jalview/urls/UrlProviderFactoryI.java +++ b/src/jalview/urls/api/UrlProviderFactoryI.java @@ -18,7 +18,8 @@ * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ -package jalview.urls; +package jalview.urls.api; + /** * Interface to UrlProvider factories diff --git a/src/jalview/urls/UrlProviderI.java b/src/jalview/urls/api/UrlProviderI.java similarity index 97% rename from src/jalview/urls/UrlProviderI.java rename to src/jalview/urls/api/UrlProviderI.java index de52391..50e2b78 100644 --- a/src/jalview/urls/UrlProviderI.java +++ b/src/jalview/urls/api/UrlProviderI.java @@ -18,7 +18,9 @@ * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ -package jalview.urls; +package jalview.urls.api; + +import jalview.urls.UrlLinkDisplay; import java.util.List; import java.util.Vector; diff --git a/src/jalview/urls/AppletUrlProviderFactory.java b/src/jalview/urls/applet/AppletUrlProviderFactory.java similarity index 90% rename from src/jalview/urls/AppletUrlProviderFactory.java rename to src/jalview/urls/applet/AppletUrlProviderFactory.java index db1206c..fcedaa4 100644 --- a/src/jalview/urls/AppletUrlProviderFactory.java +++ b/src/jalview/urls/applet/AppletUrlProviderFactory.java @@ -18,7 +18,12 @@ * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ -package jalview.urls; +package jalview.urls.applet; + +import jalview.urls.CustomUrlProvider; +import jalview.urls.UrlProvider; +import jalview.urls.api.UrlProviderFactoryI; +import jalview.urls.api.UrlProviderI; import java.util.ArrayList; import java.util.List; diff --git a/src/jalview/urls/DesktopUrlProviderFactory.java b/src/jalview/urls/desktop/DesktopUrlProviderFactory.java similarity index 89% rename from src/jalview/urls/DesktopUrlProviderFactory.java rename to src/jalview/urls/desktop/DesktopUrlProviderFactory.java index 0c5cefc..ce933c2 100644 --- a/src/jalview/urls/DesktopUrlProviderFactory.java +++ b/src/jalview/urls/desktop/DesktopUrlProviderFactory.java @@ -18,7 +18,13 @@ * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ -package jalview.urls; +package jalview.urls.desktop; + +import jalview.urls.CustomUrlProvider; +import jalview.urls.IdentifiersUrlProvider; +import jalview.urls.UrlProvider; +import jalview.urls.api.UrlProviderFactoryI; +import jalview.urls.api.UrlProviderI; import java.util.ArrayList; import java.util.List; diff --git a/test/jalview/urls/AppletUrlProviderFactoryTest.java b/test/jalview/urls/AppletUrlProviderFactoryTest.java index baf9c63..f679490 100644 --- a/test/jalview/urls/AppletUrlProviderFactoryTest.java +++ b/test/jalview/urls/AppletUrlProviderFactoryTest.java @@ -20,6 +20,9 @@ */ package jalview.urls; +import jalview.urls.api.UrlProviderFactoryI; +import jalview.urls.api.UrlProviderI; +import jalview.urls.applet.AppletUrlProviderFactory; import jalview.util.UrlConstants; import java.util.HashMap; diff --git a/test/jalview/urls/CustomUrlProviderTest.java b/test/jalview/urls/CustomUrlProviderTest.java index 52b3fcd..853167b 100644 --- a/test/jalview/urls/CustomUrlProviderTest.java +++ b/test/jalview/urls/CustomUrlProviderTest.java @@ -24,6 +24,7 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertFalse; import static org.testng.AssertJUnit.assertTrue; +import jalview.urls.api.UrlProviderI; import jalview.util.UrlConstants; import java.util.Arrays; diff --git a/test/jalview/urls/DesktopUrlProviderFactoryTest.java b/test/jalview/urls/DesktopUrlProviderFactoryTest.java index d224c2e..a114f68 100644 --- a/test/jalview/urls/DesktopUrlProviderFactoryTest.java +++ b/test/jalview/urls/DesktopUrlProviderFactoryTest.java @@ -20,6 +20,9 @@ */ package jalview.urls; +import jalview.urls.api.UrlProviderI; +import jalview.urls.desktop.DesktopUrlProviderFactory; + import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; diff --git a/test/jalview/urls/IdentifiersUrlProviderTest.java b/test/jalview/urls/IdentifiersUrlProviderTest.java index 2e1387c..3010ea2 100644 --- a/test/jalview/urls/IdentifiersUrlProviderTest.java +++ b/test/jalview/urls/IdentifiersUrlProviderTest.java @@ -25,6 +25,8 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertFalse; import static org.testng.AssertJUnit.assertTrue; +import jalview.urls.api.UrlProviderI; + import java.io.File; import java.io.FileWriter; import java.util.Arrays; diff --git a/test/jalview/urls/UrlLinkTableModelTest.java b/test/jalview/urls/UrlLinkTableModelTest.java index 1304d1a..ca4b658 100644 --- a/test/jalview/urls/UrlLinkTableModelTest.java +++ b/test/jalview/urls/UrlLinkTableModelTest.java @@ -25,6 +25,7 @@ import static jalview.util.UrlConstants.DELIM; import static jalview.util.UrlConstants.SEP; import static jalview.util.UrlConstants.SEQUENCE_ID; +import jalview.urls.api.UrlProviderI; import jalview.util.MessageManager; import java.io.BufferedWriter; diff --git a/test/jalview/urls/UrlProviderTest.java b/test/jalview/urls/UrlProviderTest.java index c7717c9..3b52c03 100644 --- a/test/jalview/urls/UrlProviderTest.java +++ b/test/jalview/urls/UrlProviderTest.java @@ -1,5 +1,7 @@ package jalview.urls; +import jalview.urls.api.UrlProviderI; +import jalview.urls.desktop.DesktopUrlProviderFactory; import jalview.util.UrlConstants; import java.io.BufferedWriter; -- 1.7.10.2