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-1551 spotlessApply
[jalview.git]
/
src
/
jalview
/
datamodel
/
ContactMatrixI.java
diff --git
a/src/jalview/datamodel/ContactMatrixI.java
b/src/jalview/datamodel/ContactMatrixI.java
index
256d43d
..
546e979
100644
(file)
--- a/
src/jalview/datamodel/ContactMatrixI.java
+++ b/
src/jalview/datamodel/ContactMatrixI.java
@@
-19,69
+19,80
@@
public interface ContactMatrixI
String getAnnotLabel();
/**
String getAnnotLabel();
/**
- * string indicating how the contactMatrix should be rendered - stored in calcId
- * @return
+ * string indicating how the contactMatrix should be rendered - stored in
+ * calcId
+ *
+ * @return
*/
String getType();
int getWidth();
*/
String getType();
int getWidth();
+
int getHeight();
int getHeight();
-
+
public GroupSetI getGroupSet();
public GroupSetI getGroupSet();
-
+
/// proxy methods to simplify use of the interface
/// Mappable contact matrices can override these to perform mapping
/// proxy methods to simplify use of the interface
/// Mappable contact matrices can override these to perform mapping
-
+
default public boolean hasGroupSet()
{
default public boolean hasGroupSet()
{
- return getGroupSet()!=null;
+ return getGroupSet() != null;
}
}
- default boolean hasGroups() {
+ default boolean hasGroups()
+ {
return hasGroupSet() && getGroupSet().hasGroups();
}
return hasGroupSet() && getGroupSet().hasGroups();
}
-
- default BitSet getGroupsFor(int column) {
+ default BitSet getGroupsFor(int column)
+ {
if (!hasGroupSet())
{
if (!hasGroupSet())
{
- BitSet colbitset = new BitSet();
- colbitset.set(column);
- return colbitset;
+ BitSet colbitset = new BitSet();
+ colbitset.set(column);
+ return colbitset;
}
return getGroupSet().getGroupsFor(column);
}
}
return getGroupSet().getGroupsFor(column);
}
- default List<BitSet> getGroups() {
+ default List<BitSet> getGroups()
+ {
if (!hasGroupSet())
{
if (!hasGroupSet())
{
- return Arrays.asList();
- }
+ return Arrays.asList();
+ }
return getGroupSet().getGroups();
}
return getGroupSet().getGroups();
}
- default boolean hasTree() {
+ default boolean hasTree()
+ {
return hasGroupSet() ? getGroupSet().hasTree() : false;
}
/**
* Newick representation of clustered matrix
return hasGroupSet() ? getGroupSet().hasTree() : false;
}
/**
* Newick representation of clustered matrix
+ *
* @return null unless hasTree is true
*/
* @return null unless hasTree is true
*/
- default String getNewick() {
- return hasGroupSet() ? getGroupSet().getNewick(): null;
+ default String getNewick()
+ {
+ return hasGroupSet() ? getGroupSet().getNewick() : null;
}
}
- default String getTreeMethod() {
- return hasGroupSet() ? getGroupSet().getTreeMethod() :null;
+ default String getTreeMethod()
+ {
+ return hasGroupSet() ? getGroupSet().getTreeMethod() : null;
}
}
- default boolean hasCutHeight() {
+ default boolean hasCutHeight()
+ {
return hasGroupSet() ? getGroupSet().hasCutHeight() : false;
}
return hasGroupSet() ? getGroupSet().hasCutHeight() : false;
}
- default double getCutHeight() {
- return hasGroupSet() ? getGroupSet().getCutHeight():0;
+ default double getCutHeight()
+ {
+ return hasGroupSet() ? getGroupSet().getCutHeight() : 0;
}
default void updateGroups(List<BitSet> colGroups)
}
default void updateGroups(List<BitSet> colGroups)