You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2018/09/07 16:48:57 UTC
svn commit: r1840311 - in /pivot/trunk: core/src/org/apache/pivot/util/
core/test/org/apache/pivot/functional/monad/test/
tests/src/org/apache/pivot/tests/
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
wtk/src/org/apache/pivot/wtk/content/
Author: rwhitcomb
Date: Fri Sep 7 16:48:56 2018
New Revision: 1840311
URL: http://svn.apache.org/viewvc?rev=1840311&view=rev
Log:
PIVOT-1039: Fix the deprecation warnings from "new Float", "new Long"
and so forth.
Modified:
pivot/trunk/core/src/org/apache/pivot/util/Version.java
pivot/trunk/core/test/org/apache/pivot/functional/monad/test/OptionTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java
Modified: pivot/trunk/core/src/org/apache/pivot/util/Version.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/Version.java?rev=1840311&r1=1840310&r2=1840311&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/Version.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/Version.java Fri Sep 7 16:48:56 2018
@@ -77,7 +77,7 @@ public class Version implements Comparab
@Override
public int compareTo(final Version version) {
- return new Long(getNumber()).compareTo(version.getNumber());
+ return Long.compare(getNumber(), version.getNumber());
}
@Override
@@ -87,7 +87,7 @@ public class Version implements Comparab
@Override
public int hashCode() {
- return new Long(getNumber()).hashCode();
+ return Long.valueOf(getNumber()).hashCode();
}
@Override
Modified: pivot/trunk/core/test/org/apache/pivot/functional/monad/test/OptionTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/functional/monad/test/OptionTest.java?rev=1840311&r1=1840310&r2=1840311&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/functional/monad/test/OptionTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/functional/monad/test/OptionTest.java Fri Sep 7 16:48:56 2018
@@ -57,12 +57,12 @@ public class OptionTest {
OptionCompanion<Object> o = OptionCompanion.getInstance();
assertNotNull(o);
- Option<Object> oo = o.fromValue(new String("Hello"));
+ Option<Object> oo = o.fromValue(new StringBuilder("Hello"));
assertNotNull(oo);
assertTrue(oo instanceof Some);
assertTrue(oo.hasValue());
Object ooValue = oo.getValue();
- assertTrue(ooValue instanceof String);
+ assertTrue(ooValue instanceof StringBuilder);
System.out.println("companionObjectTest(), value stored is " + ooValue);
}
@@ -85,7 +85,7 @@ public class OptionTest {
OptionCompanion<Number> o = OptionCompanion.getInstance();
assertNotNull(o);
- Option<Number> on = o.fromValue(new Double(Math.PI));
+ Option<Number> on = o.fromValue(Double.valueOf(Math.PI));
assertNotNull(on);
assertTrue(on instanceof Some);
assertTrue(on.hasValue());
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java?rev=1840311&r1=1840310&r2=1840311&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java Fri Sep 7 16:48:56 2018
@@ -133,7 +133,7 @@ public final class TextInputValidatorTes
// textinputFloat.setText("123456.789");
// new, show different ways to format decimal values in i18n format
- Double value = new Double(testValue);
+ Double value = Double.valueOf(testValue);
// textinputFloat.setText(value.toString());
// textinputFloat.setText(String.format(customDecimalFormat, value)); // sample using String.format
// formatter.format(customDecimalFormat, value); // sample using Formatter
@@ -146,7 +146,7 @@ public final class TextInputValidatorTes
// standard float range model
// note that float approximations could give errors,
// try to increment/decrement the initial value near a range end, to see problems ...
- textinputFloatRange.setText(nf.format(new Float(testValue)));
+ textinputFloatRange.setText(nf.format(Float.valueOf(testValue)));
textinputFloatRange.setValidator(new FloatRangeValidator(2.0f, 123456789f));
// test the listener by updating a label
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java?rev=1840311&r1=1840310&r2=1840311&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java Fri Sep 7 16:48:56 2018
@@ -852,7 +852,7 @@ public class TerraFrameSkin extends Wind
boolean active = window.isActive();
titleLabel.getStyles().put(Style.color, active ? titleBarColor : inactiveTitleBarColor);
- iconImageView.getStyles().put(Style.opacity, active ? new Float(1.0f) : new Float(INACTIVE_ICON_OPACITY));
+ iconImageView.getStyles().put(Style.opacity, Float.valueOf(active ? 1.0f : INACTIVE_ICON_OPACITY));
updateButtonStyles(minimizeButton, active);
updateButtonStyles(maximizeButton, active);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java?rev=1840311&r1=1840310&r2=1840311&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java Fri Sep 7 16:48:56 2018
@@ -77,7 +77,7 @@ public class LinkButtonDataRenderer exte
imageView.setVisible(true);
imageView.setImage(icon);
- imageView.getStyles().put(Style.opacity, button.isEnabled() ? new Float(1.0f) : new Float(0.5f));
+ imageView.getStyles().put(Style.opacity, Float.valueOf(button.isEnabled() ? 1.0f : 0.5f));
}
// Update the label
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java?rev=1840311&r1=1840310&r2=1840311&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java Fri Sep 7 16:48:56 2018
@@ -102,7 +102,7 @@ public class MenuItemDataRenderer extend
imageView.setImage(icon);
imageView.setPreferredWidth(margin - padding.left * 2);
- imageView.getStyles().put(Style.opacity, button.isEnabled() ? new Float(1.0f) : new Float(0.5f));
+ imageView.getStyles().put(Style.opacity, Float.valueOf(button.isEnabled() ? 1.0f : 0.5f));
// Update the labels
textLabel.setText(text != null ? text : "");