Fix some deprecated

This commit is contained in:
fgnm
2021-11-06 09:01:00 +01:00
parent 512896ebd5
commit e4ab5081cd
7 changed files with 11 additions and 23 deletions
-12
View File
@@ -215,18 +215,6 @@
knobBefore: progressbar-filled-vertical
}
},
com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle: {
default-horizontal: {
background: slider,
knob: slider-knob,
disabledKnob: slider-knob-disabled
},
default-vertical: {
background: slider-vertical,
knob: slider-knob,
disabledKnob: slider-knob-disabled
}
},
com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: {
default: {
font: default-font,
@@ -113,7 +113,7 @@ public class ItemChildrenTransformCommand extends EntityModifyRevertibleCommand
}
}
private class PositionSize {
private static class PositionSize {
Vector2 position;
Vector2 size;
@@ -22,7 +22,7 @@ public class EntityClickListener implements InputListener {
private int button;
private boolean pressed, over, cancelled;
private long visualPressedTime;
private long tapCountInterval = (long)(0.4f * 1000000000l);
private long tapCountInterval = (long)(0.4f * 1000000000L);
private int tapCount;
private long lastTapTime;
@@ -153,7 +153,7 @@ public class EntityClickListener implements InputListener {
/** @param tapCountInterval time in seconds that must pass for two touch down/up sequences to be detected as consecutive taps. */
public void setTapCountInterval (float tapCountInterval) {
this.tapCountInterval = (long)(tapCountInterval * 1000000000l);
this.tapCountInterval = (long)(tapCountInterval * 1000000000L);
}
/** Returns the number of taps within the tap count interval for the most recent click event. */
@@ -96,7 +96,7 @@ public class UIAlignBox extends UICollapsibleBox {
return visImageButton;
}
private class AlignmentButtonClickListener extends ClickListener {
private static class AlignmentButtonClickListener extends ClickListener {
private final int alignment;
@@ -72,7 +72,7 @@ public class UIToolBox extends VisTable {
return visImageButton;
}
private class ToolboxButtonClickListener extends ClickListener {
private static class ToolboxButtonClickListener extends ClickListener {
private final String toolId;
@@ -103,7 +103,7 @@ public class SettingsDialog extends H2DDialog {
}
private void applyAllSettings() {
for (SettingsNode node : settingsTree.getNodes()) {
for (SettingsNode node : settingsTree.getRootNodes()) {
if (node.getValue().validateSettings()) {
node.getValue().translateViewToSettings();
}
@@ -120,8 +120,8 @@ public class SettingsDialog extends H2DDialog {
@Override
public VisDialog show(Stage stage) {
super.show(stage);
if (settingsTree.getSelection().size() == 0 && settingsTree.getNodes().size > 0) {
settingsTree.getSelection().add(settingsTree.getNodes().first());
if (settingsTree.getSelection().size() == 0 && settingsTree.getRootNodes().size > 0) {
settingsTree.getSelection().add(settingsTree.getRootNodes().first());
}
if (settingsTree.getSelection().size() > 0) {
@@ -142,12 +142,12 @@ public class SettingsDialog extends H2DDialog {
public SettingsNode addSettingsNode(SettingsNodeValue<?> nodeValue) {
SettingsNode node = new SettingsNode(nodeValue.getName());
int existingIndex = settingsTree.getNodes().indexOf(node, false);
int existingIndex = settingsTree.getRootNodes().indexOf(node, false);
if (existingIndex == -1) {
node.setValue(nodeValue);
settingsTree.add(node);
} else {
settingsTree.getNodes().get(existingIndex).setValue(nodeValue);
settingsTree.getRootNodes().get(existingIndex).setValue(nodeValue);
}
return node;
}