You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2013/02/21 18:39:32 UTC
svn commit: r1448741 - in
/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk: content/ effects/
Author: smartini
Date: Thu Feb 21 17:39:31 2013
New Revision: 1448741
URL: http://svn.apache.org/r1448741
Log:
PIVOT-893 (part 2): do not allow text == null in Label anymore
Modified:
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ListViewItemEditor.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuBarItemDataRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/SpinnerItemRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewCellRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewHeaderDataRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewMultiCellRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewTextAreaCellRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeEditor.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/effects/WatermarkDecorator.java
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java?rev=1448741&r1=1448740&r2=1448741&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java Thu Feb 21 17:39:31 2013
@@ -88,7 +88,7 @@ public class ButtonDataRenderer extends
}
// Update the label
- label.setText(text);
+ label.setText(text != null ? text : "");
if (text == null) {
label.setVisible(false);
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java?rev=1448741&r1=1448740&r2=1448741&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java Thu Feb 21 17:39:31 2013
@@ -85,7 +85,7 @@ public class LinkButtonDataRenderer exte
}
// Update the label
- label.setText(text);
+ label.setText(text != null ? text : "");
if (text == null) {
label.setVisible(false);
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ListViewItemEditor.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ListViewItemEditor.java?rev=1448741&r1=1448740&r2=1448741&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ListViewItemEditor.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ListViewItemEditor.java Thu Feb 21 17:39:31 2013
@@ -86,7 +86,8 @@ public class ListViewItemEditor extends
List<?> listData = listViewArgument.getListData();
ListItem listItem = (ListItem)listData.get(itemIndexArgument);
- textInput.setText(listItem.getText());
+ String text = listItem.getText();
+ textInput.setText(text != null ? text : "");
textInput.selectAll();
// Get the item bounds
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java?rev=1448741&r1=1448740&r2=1448741&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java Thu Feb 21 17:39:31 2013
@@ -83,11 +83,11 @@ public class ListViewItemRenderer extend
}
imageView.setImage(icon);
- label.setText(text);
+ label.setText(text != null ? text : "");
}
protected void renderStyles(ListView listView, boolean selected,
- boolean highlighted, boolean disabled) {
+ @SuppressWarnings("unused") boolean highlighted, boolean disabled) {
imageView.getStyles().put("opacity", listView.isEnabled() ? 1.0f : 0.5f);
Font font = (Font)listView.getStyles().get("font");
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuBarItemDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuBarItemDataRenderer.java?rev=1448741&r1=1448740&r2=1448741&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuBarItemDataRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuBarItemDataRenderer.java Thu Feb 21 17:39:31 2013
@@ -87,7 +87,7 @@ public class MenuBarItemDataRenderer ext
}
// Update the label
- label.setText(text);
+ label.setText(text != null ? text : "");
if (text == null) {
label.setVisible(false);
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java?rev=1448741&r1=1448740&r2=1448741&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java Thu Feb 21 17:39:31 2013
@@ -109,7 +109,7 @@ public class MenuItemDataRenderer extend
imageView.getStyles().put("opacity", button.isEnabled() ? 1.0f : 0.5f);
// Update the labels
- textLabel.setText(text);
+ textLabel.setText(text != null ? text : "");
Font font = (Font)menu.getStyles().get("font");
textLabel.getStyles().put("font", font);
@@ -136,8 +136,8 @@ public class MenuItemDataRenderer extend
if (showKeyboardShortcuts) {
keyboardShortcutLabel.setVisible(true);
- keyboardShortcutLabel.setText(keyboardShortcut == null ?
- null : keyboardShortcut.toString());
+ keyboardShortcutLabel.setText(
+ keyboardShortcut != null ? keyboardShortcut.toString() : "");
} else {
keyboardShortcutLabel.setVisible(false);
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/SpinnerItemRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/SpinnerItemRenderer.java?rev=1448741&r1=1448740&r2=1448741&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/SpinnerItemRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/SpinnerItemRenderer.java Thu Feb 21 17:39:31 2013
@@ -46,7 +46,7 @@ public class SpinnerItemRenderer extends
@Override
public void render(Object item, Spinner spinner) {
- setText(item == null ? null : item.toString());
+ setText(item != null ? item.toString() : "");
renderStyles(spinner);
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewCellRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewCellRenderer.java?rev=1448741&r1=1448740&r2=1448741&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewCellRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewCellRenderer.java Thu Feb 21 17:39:31 2013
@@ -57,7 +57,7 @@ public class TableViewCellRenderer exten
text = toString(row, columnName);
}
- setText(text);
+ setText(text != null ? text : "");
}
protected void renderStyles(TableView tableView, boolean rowSelected, boolean rowDisabled) {
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewHeaderDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewHeaderDataRenderer.java?rev=1448741&r1=1448740&r2=1448741&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewHeaderDataRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewHeaderDataRenderer.java Thu Feb 21 17:39:31 2013
@@ -85,7 +85,7 @@ public class TableViewHeaderDataRenderer
}
// Show/hide the label
- label.setText(text);
+ label.setText(text != null ? text : "");
if (text == null) {
label.setVisible(false);
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewMultiCellRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewMultiCellRenderer.java?rev=1448741&r1=1448740&r2=1448741&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewMultiCellRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewMultiCellRenderer.java Thu Feb 21 17:39:31 2013
@@ -357,7 +357,7 @@ public class TableViewMultiCellRenderer
&& valueClass != Object.class) {
cellRenderer = cellRenderers.get(valueClass);
- if (cellRenderer == null) {
+ if (cellRenderer == null && valueClass != null) {
valueClass = valueClass.getSuperclass();
}
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewTextAreaCellRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewTextAreaCellRenderer.java?rev=1448741&r1=1448740&r2=1448741&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewTextAreaCellRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewTextAreaCellRenderer.java Thu Feb 21 17:39:31 2013
@@ -55,7 +55,7 @@ public class TableViewTextAreaCellRender
text = toString(row, columnName);
}
- setText(text == null ? "" : text);
+ setText(text != null ? text : "");
}
protected void renderStyles(TableView tableView, boolean rowSelected, boolean rowDisabled) {
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeEditor.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeEditor.java?rev=1448741&r1=1448740&r2=1448741&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeEditor.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeEditor.java Thu Feb 21 17:39:31 2013
@@ -88,7 +88,8 @@ public class TreeViewNodeEditor extends
List<?> treeData = treeViewArgument.getTreeData();
TreeNode treeNode = (TreeNode)Sequence.Tree.get(treeData, pathArgument);
- textInput.setText(treeNode.getText());
+ String text = treeNode.getText();
+ textInput.setText(text != null ? text : "");
textInput.selectAll();
// Get the node bounds
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java?rev=1448741&r1=1448740&r2=1448741&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java Thu Feb 21 17:39:31 2013
@@ -100,7 +100,7 @@ public class TreeViewNodeRenderer extend
(treeView.isEnabled() && !disabled) ? 1.0f : 0.5f);
// Update the label
- label.setText(text);
+ label.setText(text != null ? text : "");
if (text == null) {
label.setVisible(false);
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/effects/WatermarkDecorator.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/effects/WatermarkDecorator.java?rev=1448741&r1=1448740&r2=1448741&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/effects/WatermarkDecorator.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/effects/WatermarkDecorator.java Thu Feb 21 17:39:31 2013
@@ -99,7 +99,7 @@ public class WatermarkDecorator implemen
Font font = (Font)label.getStyles().get("font");
label.getStyles().put("font", font.deriveFont(Font.BOLD, 60));
- label.setText(text);
+ label.setText(text != null ? text : "");
imageView.setImage(image);
validate();
@@ -122,7 +122,7 @@ public class WatermarkDecorator implemen
* This decorator's text
*/
public void setText(String text) {
- label.setText(text);
+ label.setText(text != null ? text : "");
validate();
}