JAL-2316 Moved url providers into own package

diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index f8ea522..d2947e4 100755 (executable)
--- a/src/jalview/appletgui/IdPanel.java
+++ b/src/jalview/appletgui/IdPanel.java
@@ -24,8 +24,8 @@ import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceFeature;
 import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
-import jalview.util.UrlProvider;
-import jalview.util.UrlProviderI;
+import jalview.urls.UrlProvider;
+import jalview.urls.UrlProviderI;
 import jalview.viewmodel.AlignmentViewport;
 
 import java.awt.BorderLayout;

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 63f797d..92e5019 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -34,10 +34,10 @@ import jalview.io.JalviewFileView;
 import jalview.jbgui.GSplitFrame;
 import jalview.jbgui.GStructureViewer;
 import jalview.structure.StructureSelectionManager;
+import jalview.urls.UrlProviderI;
 import jalview.util.ImageMaker;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
-import jalview.util.UrlProviderI;
 import jalview.viewmodel.AlignmentViewport;
 import jalview.ws.params.ParamManager;
 

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 69dc9fe..56e076e 100755 (executable)
--- 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.UrlProvider;
+import jalview.urls.UrlProviderI;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
-import jalview.util.UrlProvider;
-import jalview.util.UrlProviderI;
 import jalview.ws.sifts.SiftsSettings;
 
 import java.awt.BorderLayout;

diff --git a/src/jalview/util/CustomUrlProvider.java b/src/jalview/urls/CustomUrlProvider.java
similarity index 97%
rename from src/jalview/util/CustomUrlProvider.java
rename to src/jalview/urls/CustomUrlProvider.java
index e6f19fb..50037b6 100644 (file)
--- a/src/jalview/util/CustomUrlProvider.java
+++ b/src/jalview/urls/CustomUrlProvider.java
@@ -19,15 +19,20 @@
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 
-package jalview.util;
+package jalview.urls;
 
-import static jalview.util.UrlConstants.DB_ACCESSION;
-import static jalview.util.UrlConstants.DELIM;
 //import static jalview.util.UrlConstants.EMBLEBI_LABEL;
 //import static jalview.util.UrlConstants.EMBLEBI_STRING;
+//import static jalview.util.UrlConstants.SRS_LABEL;
+
+
+import static jalview.util.UrlConstants.DB_ACCESSION;
+import static jalview.util.UrlConstants.DELIM;
 import static jalview.util.UrlConstants.SEP;
 import static jalview.util.UrlConstants.SEQUENCE_ID;
-//import static jalview.util.UrlConstants.SRS_LABEL;
+
+import jalview.util.MessageManager;
+import jalview.util.UrlLink;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -120,6 +125,9 @@ public class CustomUrlProvider extends UrlProviderImpl
     upgradeOldLinks();
   }
 
+  /*
+   * Upgrade any legacy links which may have been left lying around
+   */
   private void upgradeOldLinks()
   {
     // upgrade old SRS link

diff --git a/src/jalview/util/IdentifiersUrlProvider.java b/src/jalview/urls/IdentifiersUrlProvider.java
similarity index 99%
rename from src/jalview/util/IdentifiersUrlProvider.java
rename to src/jalview/urls/IdentifiersUrlProvider.java
index 6faf72d..1c72ff9 100644 (file)
--- a/src/jalview/util/IdentifiersUrlProvider.java
+++ b/src/jalview/urls/IdentifiersUrlProvider.java
@@ -19,7 +19,7 @@
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 
-package jalview.util;
+package jalview.urls;
 
 import java.util.Map;
 import java.util.Vector;

diff --git a/src/jalview/util/UrlProvider.java b/src/jalview/urls/UrlProvider.java
similarity index 99%
rename from src/jalview/util/UrlProvider.java
rename to src/jalview/urls/UrlProvider.java
index f66e3fd..17b179b 100644 (file)
--- a/src/jalview/util/UrlProvider.java
+++ b/src/jalview/urls/UrlProvider.java
@@ -18,7 +18,7 @@
  * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
-package jalview.util;
+package jalview.urls;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/jalview/util/UrlProviderI.java b/src/jalview/urls/UrlProviderI.java
similarity index 99%
rename from src/jalview/util/UrlProviderI.java
rename to src/jalview/urls/UrlProviderI.java
index a0289e5..9ecb28a 100644 (file)
--- a/src/jalview/util/UrlProviderI.java
+++ b/src/jalview/urls/UrlProviderI.java
@@ -18,7 +18,7 @@
  * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
-package jalview.util;
+package jalview.urls;
 
 import java.util.Vector;
 

diff --git a/src/jalview/util/UrlProviderImpl.java b/src/jalview/urls/UrlProviderImpl.java
similarity index 98%
rename from src/jalview/util/UrlProviderImpl.java
rename to src/jalview/urls/UrlProviderImpl.java
index 99f876c..554145d 100644 (file)
--- a/src/jalview/util/UrlProviderImpl.java
+++ b/src/jalview/urls/UrlProviderImpl.java
@@ -18,7 +18,7 @@
  * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
-package jalview.util;
+package jalview.urls;
 
 import java.util.Vector;
 import java.util.regex.Pattern;