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-629 Set Metal as default LAF for build server tests
[jalview.git]
/
src
/
jalview
/
urls
/
UrlLinkDisplay.java
diff --git
a/src/jalview/urls/UrlLinkDisplay.java
b/src/jalview/urls/UrlLinkDisplay.java
index
0eabff7
..
39d6b35
100644
(file)
--- a/
src/jalview/urls/UrlLinkDisplay.java
+++ b/
src/jalview/urls/UrlLinkDisplay.java
@@
-36,17
+36,22
@@
import java.util.List;
public class UrlLinkDisplay
{
public class UrlLinkDisplay
{
- private String id; // id is not supplied to display, but used to identify
- // entries when saved
+ // column positions
+ public static final int DATABASE = 0;
- private boolean isPrimary;
+ public static final int NAME = 1;
- private boolean isSelected;
+ public static final int URL = 2;
- private UrlLink link;
+ public static final int SELECTED = 3;
+
+ public static final int PRIMARY = 4;
+
+ public static final int ID = 5;
// Headers for columns in table
// Headers for columns in table
- private final static List<String> colNames = new ArrayList<String>()
+ @SuppressWarnings("serial")
+ private static final List<String> COLNAMES = new ArrayList<String>()
{
{
add(MessageManager.formatMessage("label.database"));
{
{
add(MessageManager.formatMessage("label.database"));
@@
-58,21
+63,17
@@
public class UrlLinkDisplay
}
};
}
};
- // column positions
- public final static int DATABASE = 0;
-
- public final static int NAME = 1;
-
- public final static int URL = 2;
+ private String id; // id is not supplied to display, but used to identify
+ // entries when saved
- public final static int SELECTED = 3;
+ private boolean isPrimary;
- public final static int PRIMARY = 4;
+ private boolean isSelected;
- public final static int ID = 5;
+ private UrlLink link;
- public UrlLinkDisplay(String rowId, UrlLink rowLink,
- boolean rowSelected, boolean rowDefault)
+ public UrlLinkDisplay(String rowId, UrlLink rowLink, boolean rowSelected,
+ boolean rowDefault)
{
id = rowId;
isPrimary = rowDefault;
{
id = rowId;
isPrimary = rowDefault;
@@
-176,6
+177,7
@@
public class UrlLinkDisplay
break;
case NAME:
setDescription((String) value);
break;
case NAME:
setDescription((String) value);
+ // deliberate fall through
case DATABASE:
setDBName((String) value);
break;
case DATABASE:
setDBName((String) value);
break;
@@
-199,13
+201,9
@@
public class UrlLinkDisplay
// so only allow editing if it is not
return (!link.usesDBAccession());
}
// so only allow editing if it is not
return (!link.usesDBAccession());
}
- else if (index == SELECTED)
- {
- return true;
- }
else
{
else
{
- return false;
+ return index == SELECTED;
}
}
}
}
@@
-217,6
+215,6
@@
public class UrlLinkDisplay
public static List<String> getDisplayColumnNames()
{
// Display names between DESCRIPTION and ID (excludes ID)
public static List<String> getDisplayColumnNames()
{
// Display names between DESCRIPTION and ID (excludes ID)
- return colNames.subList(DATABASE, ID);
+ return COLNAMES.subList(DATABASE, ID);
}
}
}
}