JAL-1807 explicit imports (jalview.ws.*)

[jalview.git] / src / jalview / ws / dbsources / das / datamodel / JalviewSource.java

diff --git a/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java b/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java
index d260b9e..9f171fe 100644 (file)
--- a/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java
+++ b/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,6 +20,11 @@
  */
 package jalview.ws.dbsources.das.datamodel;
 
+import jalview.util.MessageManager;
+import jalview.util.QuickSort;
+import jalview.ws.dbsources.das.api.jalviewSourceI;
+import jalview.ws.seqfetcher.DbSourceProxy;
+
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -37,9 +42,6 @@ import org.biodas.jdas.schema.sources.PROP;
 import org.biodas.jdas.schema.sources.SOURCE;
 import org.biodas.jdas.schema.sources.VERSION;
 
-import jalview.ws.dbsources.das.api.jalviewSourceI;
-import jalview.ws.seqfetcher.DbSourceProxy;
-
 public class JalviewSource implements jalviewSourceI
 {
   SOURCE source;
@@ -318,7 +320,7 @@ public class JalviewSource implements jalviewSourceI
       {
         nm[i] = tsort[i].getDbName().toLowerCase();
       }
-      jalview.util.QuickSort.sort(nm, tsort);
+      QuickSort.sort(nm, tsort);
       seqsources.clear();
       for (DbSourceProxy ssrc : tsort)
       {
@@ -346,7 +348,7 @@ public class JalviewSource implements jalviewSourceI
         int p = cap.getQueryUri().lastIndexOf(capname);
         if (p < -1)
         {
-          throw new Exception("Invalid das source: " + source.getUri());
+          throw new Exception(MessageManager.formatMessage("exception.invalid_das_source", new String[]{source.getUri()}));
         }
         if (cap.getQueryUri().charAt(p) == '/')
         {