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-1620 version bump and release notes
[jalview.git]
/
src
/
jalview
/
ws
/
dbsources
/
das
/
datamodel
/
DasSequenceSource.java
diff --git
a/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java
b/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java
index
c3916e7
..
3ad3573
100644
(file)
--- a/
src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java
+++ b/
src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java
@@
-1,5
+1,5
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
@@
-39,6
+39,7
@@
import org.biodas.jdas.schema.sources.VERSION;
import com.stevesoft.pat.Regex;
import com.stevesoft.pat.Regex;
+import jalview.util.MessageManager;
import jalview.ws.dbsources.das.api.jalviewSourceI;
import jalview.ws.seqfetcher.*;
import jalview.bin.Cache;
import jalview.ws.dbsources.das.api.jalviewSourceI;
import jalview.ws.seqfetcher.*;
import jalview.bin.Cache;
@@
-73,9
+74,10
@@
public class DasSequenceSource extends DbSourceProxyImpl implements
protected MultipleConnectionPropertyProviderI connprops = null;
/**
protected MultipleConnectionPropertyProviderI connprops = null;
/**
- * DAS sources are tier 1 - if we have a direct DB connection then we should prefer it
+ * DAS sources are tier 1 - if we have a direct DB connection then we should
+ * prefer it
*/
*/
- private int tier=1;
+ private int tier = 1;
/**
* create a new DbSource proxy for a DAS 1 source
/**
* create a new DbSource proxy for a DAS 1 source
@@
-99,10
+101,9
@@
public class DasSequenceSource extends DbSourceProxyImpl implements
if (!(jsrc = new JalviewSource(source, connprops, false))
.isSequenceSource())
{
if (!(jsrc = new JalviewSource(source, connprops, false))
.isSequenceSource())
{
- throw new Exception("Source " + source.getTitle()
- + " does not support the sequence command.");
+ throw new Exception(MessageManager.formatMessage("exception.das_source_doesnt_support_sequence_command", new String[]{source.getTitle()}));
}
}
- this.tier = 1+((jsrc.isLocal() || jsrc.isReferenceSource()) ? 0 : 1);
+ this.tier = 1 + ((jsrc.isLocal() || jsrc.isReferenceSource()) ? 0 : 1);
this.source = source;
this.dbname = dbname;
this.dbrefname = dbrefname.toUpperCase();
this.source = source;
this.dbname = dbname;
this.dbrefname = dbrefname.toUpperCase();