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-2416 allow space in score matrix name
[jalview.git]
/
src
/
jalview
/
urls
/
UrlLinkDisplay.java
diff --git
a/src/jalview/urls/UrlLinkDisplay.java
b/src/jalview/urls/UrlLinkDisplay.java
index
5991d76
..
0eabff7
100644
(file)
--- a/
src/jalview/urls/UrlLinkDisplay.java
+++ b/
src/jalview/urls/UrlLinkDisplay.java
@@
-49,6
+49,7
@@
public class UrlLinkDisplay
private final static List<String> colNames = new ArrayList<String>()
{
{
private final static List<String> colNames = new ArrayList<String>()
{
{
+ add(MessageManager.formatMessage("label.database"));
add(MessageManager.formatMessage("label.name"));
add(MessageManager.formatMessage("label.url"));
add(MessageManager.formatMessage("label.inmenu"));
add(MessageManager.formatMessage("label.name"));
add(MessageManager.formatMessage("label.url"));
add(MessageManager.formatMessage("label.inmenu"));
@@
-58,15
+59,17
@@
public class UrlLinkDisplay
};
// column positions
};
// column positions
- public final static int NAME = 0;
+ public final static int DATABASE = 0;
- public final static int URL = 1;
+ public final static int NAME = 1;
- public final static int SELECTED = 2;
+ public final static int URL = 2;
- public final static int PRIMARY = 3;
+ public final static int SELECTED = 3;
- public final static int ID = 4;
+ public final static int PRIMARY = 4;
+
+ public final static int ID = 5;
public UrlLinkDisplay(String rowId, UrlLink rowLink,
boolean rowSelected, boolean rowDefault)
public UrlLinkDisplay(String rowId, UrlLink rowLink,
boolean rowSelected, boolean rowDefault)
@@
-84,11
+87,16
@@
public class UrlLinkDisplay
return id;
}
return id;
}
- public String getName()
+ public String getDescription()
{
return link.getLabel();
}
{
return link.getLabel();
}
+ public String getDBName()
+ {
+ return link.getTarget();
+ }
+
public String getUrl()
{
return link.getUrlWithToken();
public String getUrl()
{
return link.getUrlWithToken();
@@
-104,14
+112,19
@@
public class UrlLinkDisplay
return isSelected;
}
return isSelected;
}
- public void setName(String name)
+ public void setDBName(String name)
{
{
- link.setLabel(name);
+ link.setTarget(name);
}
public void setUrl(String rowUrl)
{
}
public void setUrl(String rowUrl)
{
- link = new UrlLink(getName(), rowUrl);
+ link = new UrlLink(getDescription(), rowUrl, getDBName());
+ }
+
+ public void setDescription(String desc)
+ {
+ link.setLabel(desc);
}
public void setIsDefault(boolean rowDefault)
}
public void setIsDefault(boolean rowDefault)
@@
-137,7
+150,9
@@
public class UrlLinkDisplay
case SELECTED:
return isSelected;
case NAME:
case SELECTED:
return isSelected;
case NAME:
- return getName();
+ return getDescription();
+ case DATABASE:
+ return getDBName();
default:
return null;
}
default:
return null;
}
@@
-160,7
+175,9
@@
public class UrlLinkDisplay
isSelected = (boolean) value;
break;
case NAME:
isSelected = (boolean) value;
break;
case NAME:
- setName((String) value);
+ setDescription((String) value);
+ case DATABASE:
+ setDBName((String) value);
break;
default:
// do nothing
break;
default:
// do nothing
@@
-199,7
+216,7
@@
public class UrlLinkDisplay
*/
public static List<String> getDisplayColumnNames()
{
*/
public static List<String> getDisplayColumnNames()
{
- // Display names between NAME and ID (excludes ID)
- return colNames.subList(NAME, ID);
+ // Display names between DESCRIPTION and ID (excludes ID)
+ return colNames.subList(DATABASE, ID);
}
}
}
}