git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1645 source formatting and organise imports
[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
bb3d4c2
..
9cc4239
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.
*
*
* This file is part of Jalview.
*
@@
-20,6
+20,10
@@
*/
package jalview.ws.dbsources.das.datamodel;
*/
package jalview.ws.dbsources.das.datamodel;
+import jalview.util.MessageManager;
+import jalview.ws.dbsources.das.api.jalviewSourceI;
+import jalview.ws.seqfetcher.DbSourceProxy;
+
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
@@
-37,9
+41,6
@@
import org.biodas.jdas.schema.sources.PROP;
import org.biodas.jdas.schema.sources.SOURCE;
import org.biodas.jdas.schema.sources.VERSION;
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;
public class JalviewSource implements jalviewSourceI
{
SOURCE source;
@@
-346,7
+347,9
@@
public class JalviewSource implements jalviewSourceI
int p = cap.getQueryUri().lastIndexOf(capname);
if (p < -1)
{
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) == '/')
{
}
if (cap.getQueryUri().charAt(p) == '/')
{
@@
-373,7
+376,8
@@
public class JalviewSource implements jalviewSourceI
@Override
public boolean isReferenceSource()
{
@Override
public boolean isReferenceSource()
{
- // TODO check source object for indication that we are the primary for a DAS coordinate system
+ // TODO check source object for indication that we are the primary for a DAS
+ // coordinate system
return false;
}
}
return false;
}
}