diff --git a/Launcher/runtime/dialog/offline/describe.html b/Launcher/runtime/dialog/offline/describe.html deleted file mode 100644 index b127b69e..00000000 --- a/Launcher/runtime/dialog/offline/describe.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - -
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent sodales blandit turpis et imperdiet. Nunc egestas ipsum vitae mauris euismod euismod. Curabitur ut posuere odio. Donec sagittis faucibus commodo. Aenean id nunc sem. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed id nunc lorem. Mauris iaculis, felis et sollicitudin faucibus, nisi nisl dapibus libero, ac venenatis tellus nibh sit amet ex. Duis sit amet nisi vitae mi venenatis mollis semper sollicitudin tortor. Interdum et malesuada fames ac ante ipsum primis in faucibus. Praesent et risus in quam ornare ullamcorper nec sed arcu. Cras eget libero augue. Duis nisl tellus, pulvinar non dolor at, scelerisque vestibulum erat. Quisque eu augue aliquet, rhoncus nunc non, pellentesque est. - - Vivamus ut ipsum lacinia erat faucibus interdum eget sed neque. Curabitur vestibulum quis ante ac euismod. Morbi consequat ante quam, ut hendrerit ligula sagittis nec. Fusce pretium in turpis vel aliquet. Duis malesuada nulla ut interdum maximus. Phasellus commodo enim a ligula aliquam, sed semper nisl posuere. Vestibulum gravida mi nisl, vel porta nisl sollicitudin a. Quisque dui massa, ullamcorper a dolor vel, viverra fermentum dolor. Mauris condimentum lacinia mauris at rhoncus. Nullam sed mollis ex. Sed magna purus, varius et imperdiet at, porta eu erat. Pellentesque eu ornare nibh. Quisque vel eros sit amet tellus elementum venenatis. Etiam id elit elit. Phasellus malesuada et augue sit amet consequat. - - Mauris viverra ipsum at laoreet porttitor. Maecenas interdum egestas risus eget aliquet. Sed vestibulum arcu ut odio bibendum consequat. Etiam ultrices dui vitae dolor dignissim, in accumsan erat aliquet. Vivamus eu justo vitae mauris molestie suscipit. Donec dui erat, posuere eget ipsum quis, consequat porta neque. Donec hendrerit mi ac consectetur lacinia. Nullam aliquet nisi at tincidunt venenatis. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque turpis nulla, consequat non volutpat id, vehicula vitae nulla. Aenean pulvinar aliquam felis, ut dictum sem pretium vel. Vestibulum eget sollicitudin justo. Fusce in erat massa. Donec imperdiet justo vitae imperdiet laoreet. Donec pretium, lacus non accumsan sollicitudin, ex nisl maximus risus, semper lacinia lectus leo vel metus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. - - Curabitur sit amet orci iaculis, venenatis sapien vel, dignissim arcu. Etiam tincidunt ac enim nec faucibus. Nullam fringilla ultrices sagittis. Quisque ac risus augue. Etiam neque ligula, convallis ut fermentum condimentum, mattis a libero. Aenean purus leo, semper vel hendrerit quis, ornare sit amet dui. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin nisl neque, tempor eu erat at, suscipit vulputate lacus. Quisque facilisis interdum posuere. Nam tortor metus, placerat at dapibus ac, tincidunt nec est. Pellentesque consequat risus vitae condimentum pulvinar. Aenean hendrerit, magna vitae ornare dignissim, lorem ipsum venenatis ex, et auctor mauris massa a eros. - - Mauris tellus augue, condimentum ut tempor eget, facilisis quis ipsum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Donec fermentum in purus imperdiet feugiat. Cras vitae felis nisi. Duis sed justo condimentum, efficitur enim ut, pretium velit. Sed ac vestibulum lorem. Nullam pharetra, neque id mollis lobortis, augue odio ullamcorper quam, et dignissim nunc arcu nec arcu. Integer ac purus semper, scelerisque est sed, posuere lorem. Vivamus metus ante, placerat eget scelerisque id, dapibus ut nisi. Interdum et malesuada fames ac ante ipsum primis in faucibus. -
- - \ No newline at end of file diff --git a/Launcher/runtime/engine/api.js b/Launcher/runtime/engine/api.js index c49876eb..743170c5 100644 --- a/Launcher/runtime/engine/api.js +++ b/Launcher/runtime/engine/api.js @@ -67,9 +67,13 @@ var EnvHelper = EnvHelperClass.static; var SecurityHelper = SecurityHelperClass.static; var DigestAlgorithm = DigestAlgorithmClass.static; var VerifyHelper = VerifyHelperClass.static; -var RingProgressIndicator = RingProgressIndicatorClass.static -var RingProgressIndicatorSkin = RingProgressIndicatorSkinClass.static -var LauncherSettings = LauncherSettingsClass.static +var CheckComboBox = CheckComboBoxClass.static; +var CheckModel = CheckModelClass.static; +var IndexedCheckModel = IndexedCheckModelClass.static; +var CheckComboBoxSkin = CheckComboBoxSkinClass.static; +var RingProgressIndicator = RingProgressIndicatorClass.static; +var RingProgressIndicatorSkin = RingProgressIndicatorSkinClass.static; +var LauncherSettings = LauncherSettingsClass.static; // Helper JS class API imports var JSApplication = null; diff --git a/Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java b/Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java index dfcc92af..883e7ad8 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java +++ b/Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java @@ -15,8 +15,12 @@ import javax.script.ScriptException; import ru.gravit.launcher.client.*; -import ru.gravit.launcher.gui.buttons.RingProgressIndicator; -import ru.gravit.launcher.gui.buttons.RingProgressIndicatorSkin; +import ru.gravit.launcher.gui.choosebox.CheckComboBox; +import ru.gravit.launcher.gui.choosebox.CheckComboBoxSkin; +import ru.gravit.launcher.gui.choosebox.CheckModel; +import ru.gravit.launcher.gui.choosebox.IndexedCheckModel; +import ru.gravit.launcher.gui.indicator.RingProgressIndicator; +import ru.gravit.launcher.gui.indicator.RingProgressIndicatorSkin; import ru.gravit.launcher.hasher.FileNameMatcher; import ru.gravit.launcher.hasher.HashedDir; import ru.gravit.launcher.hasher.HashedEntry; @@ -139,11 +143,15 @@ public static void addLauncherClassBindings(Map bindings) { bindings.put("LauncherSettingsClass", LauncherSettings.class); // Load JS API if available - bindings.put("RingProgressIndicatorClass", RingProgressIndicator.class); - bindings.put("RingProgressIndicatorSkinClass", RingProgressIndicatorSkin.class); try { Class.forName("javafx.application.Application"); bindings.put("JSApplicationClass", JSApplication.class); + bindings.put("RingProgressIndicatorClass", RingProgressIndicator.class); + bindings.put("RingProgressIndicatorSkinClass", RingProgressIndicatorSkin.class); + bindings.put("CheckComboBoxClass", CheckComboBox.class); + bindings.put("CheckModelClass", CheckModel.class); + bindings.put("IndexedCheckModelClass", IndexedCheckModel.class); + bindings.put("CheckComboBoxSkinClass", CheckComboBoxSkin.class); } catch (ClassNotFoundException ignored) { LogHelper.warning("JavaFX API isn't available"); } diff --git a/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/CheckBitSetModelBase.java b/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/CheckBitSetModelBase.java index b72a2eeb..84a5994c 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/CheckBitSetModelBase.java +++ b/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/CheckBitSetModelBase.java @@ -11,7 +11,6 @@ import javafx.beans.property.SimpleBooleanProperty; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; -import ru.gravit.launcher.LauncherAPI; abstract class CheckBitSetModelBase implements IndexedCheckModel { private final Map itemBooleanMap; @@ -104,7 +103,6 @@ public int size() { }); } - @LauncherAPI @Override public void check(int index) { if (index < 0 || index >= getItemCount()) @@ -121,21 +119,18 @@ public void check(T item) { check(index); } - @LauncherAPI @Override public void checkAll() { for (int i = 0; i < getItemCount(); i++) check(i); } - @LauncherAPI @Override public void checkIndices(int... indices) { for (int indice : indices) check(indice); } - @LauncherAPI @Override public void clearCheck(int index) { if (index < 0 || index >= getItemCount()) @@ -147,69 +142,57 @@ public void clearCheck(int index) { new NonIterableChange.SimpleRemovedChange<>(changeIndex, changeIndex, index, checkedIndicesList)); } - @LauncherAPI @Override public void clearCheck(T item) { int index = getItemIndex(item); clearCheck(index); } - @LauncherAPI @Override public void clearChecks() { for (int index = 0; index < checkedIndices.length(); index++) clearCheck(index); } - @LauncherAPI @Override public ObservableList getCheckedIndices() { return checkedIndicesList; } - @LauncherAPI @Override public ObservableList getCheckedItems() { return checkedItemsList; } - - @LauncherAPI + @Override public abstract T getItem(int index); - @LauncherAPI BooleanProperty getItemBooleanProperty(T item) { return itemBooleanMap.get(item); } - @LauncherAPI @Override public abstract int getItemCount(); - @LauncherAPI @Override public abstract int getItemIndex(T item); - @LauncherAPI @Override public boolean isChecked(int index) { return checkedIndices.get(index); } - @LauncherAPI @Override public boolean isChecked(T item) { int index = getItemIndex(item); return isChecked(index); } - @LauncherAPI @Override public boolean isEmpty() { return checkedIndices.isEmpty(); } - @LauncherAPI @Override public void toggleCheckState(int index) { if (isChecked(index)) @@ -218,14 +201,12 @@ public void toggleCheckState(int index) { check(index); } - @LauncherAPI @Override public void toggleCheckState(T item) { int index = getItemIndex(item); toggleCheckState(index); } - @LauncherAPI protected void updateMap() { itemBooleanMap.clear(); for (int i = 0; i < getItemCount(); i++) { diff --git a/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/CheckComboBox.java b/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/CheckComboBox.java index 9fc13278..febe246a 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/CheckComboBox.java +++ b/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/CheckComboBox.java @@ -13,16 +13,13 @@ import javafx.collections.ObservableList; import javafx.scene.control.Skin; import javafx.util.StringConverter; + import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.gui.choosebox.impl.CheckComboBoxSkin; public class CheckComboBox extends ControlsFXControl { - @LauncherAPI private static class CheckComboBoxBitSetCheckModel extends CheckBitSetModelBase { - @LauncherAPI private final ObservableList items; - - @LauncherAPI + CheckComboBoxBitSetCheckModel(final ObservableList items, final Map itemBooleanMap) { super(itemBooleanMap); @@ -32,19 +29,16 @@ private static class CheckComboBoxBitSetCheckModel extends CheckBitSetModelBa updateMap(); } - @LauncherAPI @Override public T getItem(int index) { return items.get(index); } - @LauncherAPI @Override public int getItemCount() { return items.size(); } - @LauncherAPI @Override public int getItemIndex(T item) { return items.indexOf(item); @@ -53,17 +47,10 @@ public int getItemIndex(T item) { private final ObservableList items; private final Map itemBooleanMap; - private CheckComboBoxSkin checkComboBoxSkin; - - @LauncherAPI private ObjectProperty> checkModel = new SimpleObjectProperty<>(this, "checkModel"); - - @LauncherAPI private ObjectProperty> converter = new SimpleObjectProperty<>(this, "converter"); - - @LauncherAPI private StringProperty title = new SimpleStringProperty(null); public CheckComboBox() { diff --git a/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/impl/CheckComboBoxSkin.java b/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/CheckComboBoxSkin.java similarity index 96% rename from Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/impl/CheckComboBoxSkin.java rename to Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/CheckComboBoxSkin.java index 89d2ea92..d1ebae12 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/impl/CheckComboBoxSkin.java +++ b/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/CheckComboBoxSkin.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.gui.choosebox.impl; +package ru.gravit.launcher.gui.choosebox; import java.util.Collections; @@ -16,8 +16,6 @@ import javafx.scene.control.cell.CheckBoxListCell; import javafx.scene.input.KeyCode; import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.gui.choosebox.CheckComboBox; -import ru.gravit.launcher.gui.choosebox.IndexedCheckModel; public class CheckComboBoxSkin extends BehaviorSkinBase, BehaviorBase>> { @@ -75,8 +73,7 @@ protected void updateItem(T item, boolean empty) { getChildren().add(comboBox); } - - @LauncherAPI + private String buildString() { final StringBuilder sb = new StringBuilder(); for (int i = 0, max = selectedItems.size(); i < max; i++) { @@ -133,7 +130,6 @@ protected double computePrefWidth(double height, double topInset, double rightIn return comboBox.prefWidth(height); } - @LauncherAPI private Skin createComboBoxListViewSkin(ComboBox comboBox) { final ComboBoxListViewSkin comboBoxListViewSkin = new ComboBoxListViewSkin(comboBox) { @Override diff --git a/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/ControlsFXControl.java b/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/ControlsFXControl.java index c75d4d4e..82353bba 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/ControlsFXControl.java +++ b/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/ControlsFXControl.java @@ -1,7 +1,6 @@ package ru.gravit.launcher.gui.choosebox; import javafx.scene.control.Control; -import ru.gravit.launcher.LauncherAPI; abstract class ControlsFXControl extends Control { @@ -11,7 +10,6 @@ public ControlsFXControl() { } - @LauncherAPI protected final String getUserAgentStylesheet(Class clazz, String fileName) { if (stylesheet == null) diff --git a/Launcher/src/main/java/ru/gravit/launcher/gui/buttons/ProgressCircleIndicator.java b/Launcher/src/main/java/ru/gravit/launcher/gui/indicator/ProgressCircleIndicator.java similarity index 93% rename from Launcher/src/main/java/ru/gravit/launcher/gui/buttons/ProgressCircleIndicator.java rename to Launcher/src/main/java/ru/gravit/launcher/gui/indicator/ProgressCircleIndicator.java index ffa781d7..7e3d63ff 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/gui/buttons/ProgressCircleIndicator.java +++ b/Launcher/src/main/java/ru/gravit/launcher/gui/indicator/ProgressCircleIndicator.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.gui.buttons; +package ru.gravit.launcher.gui.indicator; import java.util.ArrayList; import java.util.Collections; @@ -13,27 +13,17 @@ import com.sun.javafx.css.converters.SizeConverter; import javafx.scene.control.ProgressIndicator; -import ru.gravit.launcher.LauncherAPI; -@LauncherAPI abstract class ProgressCircleIndicator extends ProgressIndicator { - - @LauncherAPI public ProgressCircleIndicator() { this.getStylesheets().add(ProgressCircleIndicator.class.getResource("/runtime/launcher/overlay/update/circleprogress.css").toExternalForm()); } - - @LauncherAPI public final void setInnerCircleRadius(int value) { innerCircleRadiusProperty().set(value); } - - @LauncherAPI public final DoubleProperty innerCircleRadiusProperty() { return innerCircleRadius; } - - @LauncherAPI public final double getInnerCircleRadius() { return innerCircleRadiusProperty().get(); } @@ -82,13 +72,9 @@ public StyleableProperty getStyleableProperty(ProgressCircleIndicator n) STYLEABLES = Collections.unmodifiableList(styleables); } } - - @LauncherAPI public static List> getClassCssMetaData() { return StyleableProperties.STYLEABLES; } - - @LauncherAPI @Override public List> getControlCssMetaData() { return StyleableProperties.STYLEABLES; diff --git a/Launcher/src/main/java/ru/gravit/launcher/gui/buttons/RingProgressIndicator.java b/Launcher/src/main/java/ru/gravit/launcher/gui/indicator/RingProgressIndicator.java similarity index 97% rename from Launcher/src/main/java/ru/gravit/launcher/gui/buttons/RingProgressIndicator.java rename to Launcher/src/main/java/ru/gravit/launcher/gui/indicator/RingProgressIndicator.java index 66363fb7..887564ba 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/gui/buttons/RingProgressIndicator.java +++ b/Launcher/src/main/java/ru/gravit/launcher/gui/indicator/RingProgressIndicator.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.gui.buttons; +package ru.gravit.launcher.gui.indicator; import java.util.ArrayList; import java.util.Collections; @@ -16,7 +16,6 @@ import ru.gravit.launcher.LauncherAPI; import ru.gravit.utils.helper.LogHelper; -@LauncherAPI public class RingProgressIndicator extends ProgressCircleIndicator { public RingProgressIndicator() { LogHelper.debug("Setting JVM dir name"); @@ -24,7 +23,6 @@ public RingProgressIndicator() { this.getStyleClass().add("ringindicator"); } - @LauncherAPI @Override protected Skin createDefaultSkin() { return new RingProgressIndicatorSkin(this); @@ -91,7 +89,6 @@ public StyleableProperty getStyleableProperty(RingProgressIndicator n) { } } - @LauncherAPI @Override public List> getControlCssMetaData() { return StyleableProperties.STYLEABLES; diff --git a/Launcher/src/main/java/ru/gravit/launcher/gui/buttons/RingProgressIndicatorSkin.java b/Launcher/src/main/java/ru/gravit/launcher/gui/indicator/RingProgressIndicatorSkin.java similarity index 97% rename from Launcher/src/main/java/ru/gravit/launcher/gui/buttons/RingProgressIndicatorSkin.java rename to Launcher/src/main/java/ru/gravit/launcher/gui/indicator/RingProgressIndicatorSkin.java index 503a77ad..ffa3f07d 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/gui/buttons/RingProgressIndicatorSkin.java +++ b/Launcher/src/main/java/ru/gravit/launcher/gui/indicator/RingProgressIndicatorSkin.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.gui.buttons; +package ru.gravit.launcher.gui.indicator; import javafx.animation.Animation; import javafx.animation.Interpolator; @@ -18,7 +18,6 @@ * * @author Andrea Vacondio */ -@LauncherAPI public class RingProgressIndicatorSkin implements Skin { private final RingProgressIndicator indicator; @@ -29,7 +28,6 @@ public class RingProgressIndicatorSkin implements Skin { private final Arc fillerArc = new Arc(); private final RotateTransition transition = new RotateTransition(Duration.millis(2000), fillerArc); - @LauncherAPI public RingProgressIndicatorSkin(final RingProgressIndicator indicator) { this.indicator = indicator; initContainer(indicator); @@ -108,20 +106,14 @@ private void initIndeterminate(boolean newVal) { transition.stop(); } } - - @LauncherAPI @Override public RingProgressIndicator getSkinnable() { return indicator; } - - @LauncherAPI @Override public Node getNode() { return container; } - - @LauncherAPI @Override public void dispose() { transition.stop();