Author: rozagh
Date: 2012-07-27 12:01:05 -0700 (Fri, 27 Jul 2012)
New Revision: 30022
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableCellRenderer.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CustomHeaderRenderer.java
Log:
fixes #1314 1,2 and 4 are fixed
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
2012-07-27 19:00:08 UTC (rev 30021)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
2012-07-27 19:01:05 UTC (rev 30022)
@@ -560,7 +560,7 @@
selectButton.setBorder(null);
selectButton.setMargin(new Insets(0, 0, 0, 0));
selectButton.setIcon(new
ImageIcon(getClass().getClassLoader().getResource("images/table-select-column-icon.png")));
- selectButton.setToolTipText("Select Column");
+ selectButton.setToolTipText("Show Column");
selectButton.setBorder(null);
selectButton.setEnabled(false);
@@ -684,7 +684,7 @@
selectAllAttributesButton.setBorder(null);
selectAllAttributesButton.setMargin(new Insets(0, 0, 0,
0));
selectAllAttributesButton.setIcon(new
ImageIcon(getClass().getClassLoader().getResource("images/select_all.png")));
- selectAllAttributesButton.setToolTipText("Select All
Columns");
+ selectAllAttributesButton.setToolTipText("Show All
Columns");
selectAllAttributesButton.setBorder(null);
selectAllAttributesButton.setEnabled(false);
@@ -715,7 +715,7 @@
unselectAllAttributesButton.setBorder(null);
unselectAllAttributesButton.setMargin(new Insets(0, 0,
0, 0));
unselectAllAttributesButton.setIcon(new
ImageIcon(getClass().getClassLoader().getResource("images/unselect_all.png")));
- unselectAllAttributesButton.setToolTipText("Unselect
All Columns");
+ unselectAllAttributesButton.setToolTipText("Hide All
Columns");
unselectAllAttributesButton.setBorder(null);
unselectAllAttributesButton.setEnabled(false);
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableCellRenderer.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableCellRenderer.java
2012-07-27 19:00:08 UTC (rev 30021)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableCellRenderer.java
2012-07-27 19:01:05 UTC (rev 30022)
@@ -49,6 +49,11 @@
? objectAndEditString.getErrorText()
:
objectAndEditString.getValidatedObject().toString();
setText(displayText);
+ String tooltipText = displayText;
+ if (tooltipText.length() > 100 )
+ setToolTipText(tooltipText.substring(0, 100) +
"...");
+ else
+ setToolTipText(tooltipText);
}
// If selected, return
@@ -64,7 +69,7 @@
setForeground(table.getForeground());
setFont(normalFont);
setBackground(table.getBackground());
-
+
// If ID, return default.
//if (((BrowserTableModel)
table.getModel()).getDataTable().getPrimaryKey(). )
if (table.getModel() instanceof BrowserTableModel){
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CustomHeaderRenderer.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CustomHeaderRenderer.java
2012-07-27 19:00:08 UTC (rev 30021)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CustomHeaderRenderer.java
2012-07-27 19:01:05 UTC (rev 30022)
@@ -109,6 +109,7 @@
return this;
+
// Set datatype icon if available
this.setIcon(getIcon(col.getType(), col));
@@ -116,9 +117,9 @@
if(col.getType() == List.class) {
- toolTip = "<html>Name: " + col.getName() + "<br />
Type: List "+ getMinimizedType( col.getListElementType().getName()) + "</html>";
+ toolTip = "<html>Name: " + col.getName() + "<br />
Type: List of "+ getMinimizedType( col.getListElementType().getName()) +
"s</html>";
} else if(text.equals(CyIdentifiable.SUID))
- toolTip = "Session-Unique ID (Primary Key). This is
column is immutable.";
+ toolTip = "Session-Unique ID (Primary Key).<br /> This
column is immutable.";
else
toolTip = "<html>Name: " + col.getName()+ "<br /> Type:
" + getMinimizedType(col.getType().getName());
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
