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-2071 added unit tests for FTSRestClient
[jalview.git]
/
src
/
jalview
/
fts
/
core
/
FTSRestClient.java
diff --git
a/src/jalview/fts/core/FTSRestClient.java
b/src/jalview/fts/core/FTSRestClient.java
index
eeb7ec6
..
8ac740c
100644
(file)
--- a/
src/jalview/fts/core/FTSRestClient.java
+++ b/
src/jalview/fts/core/FTSRestClient.java
@@
-239,6
+239,13
@@
public abstract class FTSRestClient implements FTSRestClientI
e.printStackTrace();
}
}
e.printStackTrace();
}
}
+ try
+ {
+ this.primaryKeyColumn = getDataColumnByNameOrCode(primaryKeyColumnCode);
+ } catch (Exception e)
+ {
+ e.printStackTrace();
+ }
} catch (IOException e)
{
e.printStackTrace();
} catch (IOException e)
{
e.printStackTrace();
@@
-344,6
+351,11
@@
public abstract class FTSRestClient implements FTSRestClientI
@Override
public FTSDataColumnI getPrimaryKeyColumn()
{
@Override
public FTSDataColumnI getPrimaryKeyColumn()
{
+ if (defaulDisplayedDataColumns == null
+ || defaulDisplayedDataColumns.isEmpty())
+ {
+ parseDataColumnsConfigFile();
+ }
return primaryKeyColumn;
}
return primaryKeyColumn;
}