Skip to content

Commit

Permalink
supplier only in one place
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom-Ski committed Aug 31, 2023
1 parent 131e5ae commit 7424f13
Show file tree
Hide file tree
Showing 51 changed files with 51 additions and 51 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
import java.io.File;
import java.io.IOException;
import java.util.Random;
import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

import static com.talosvfx.talos.editor.utils.InputUtils.ctrlPressed;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;
import java.util.stream.Collectors;

import static com.talosvfx.talos.editor.addons.scene.utils.importers.AssetImporter.fromDirectoryView;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class ScenePreviewStage extends ViewportWidget implements Observer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import com.talosvfx.talos.runtime.scene.utils.propertyWrappers.PropertyWrapper;
import com.talosvfx.talos.editor.widgets.ui.common.zoomWidgets.LabelWithZoom;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class CustomAssetWidget extends ATypeWidget<GameAsset<?>> {
private GenericAssetSelectionWidget<?> assetWidget;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
import org.slf4j.Logger;

import java.util.Comparator;
import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

import static com.talosvfx.talos.editor.utils.InputUtils.ctrlPressed;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
import com.talosvfx.talos.runtime.scene.Scene;
import com.talosvfx.talos.runtime.scene.components.MapComponent;
import com.talosvfx.talos.runtime.scene.components.ScriptComponent;
import com.talosvfx.talos.runtime.utils.Supplier;
import com.talosvfx.talos.runtime.utils.TempHackUtil;
import com.talosvfx.talos.runtime.vfx.ParticleEffectDescriptor;
import com.talosvfx.talos.runtime.vfx.serialization.ExportData;
Expand All @@ -75,7 +76,6 @@
import java.util.Objects;
import java.util.UUID;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import java.io.File;
import java.net.Socket;
import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class SettingsDialog extends VisWindow {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.talosvfx.talos.editor.widgets.propertyWidgets.IPropertyProvider;
import com.talosvfx.talos.editor.widgets.propertyWidgets.PropertyWidget;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class MultiPropertyHolder<T extends IPropertyHolder> implements IPropertyHolder {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.talosvfx.talos.editor.widgets.propertyWidgets.PropertyWidget;
import com.talosvfx.talos.runtime.scene.components.CurveComponent;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class CurveComponentProvider extends AComponentProvider<CurveComponent> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.talosvfx.talos.editor.widgets.propertyWidgets.*;
import com.talosvfx.talos.runtime.scene.components.EdgeCollider2DComponent;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class EdgeCollider2DComponentProvider extends AComponentProvider<EdgeCollider2DComponent> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import com.talosvfx.talos.editor.widgets.propertyWidgets.WidgetFactory;
import com.talosvfx.talos.runtime.scene.GameObject;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class GameObjectPropertyProvider implements IPropertyProvider {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import com.talosvfx.talos.runtime.maps.TalosLayer;
import com.talosvfx.talos.runtime.scene.components.MapComponent;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class MapComponentProvider extends RendererComponentProvider<MapComponent> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.talosvfx.talos.runtime.scene.GameObjectContainer;
import com.talosvfx.talos.runtime.scene.components.PaintSurfaceComponent;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class PaintSurfaceComponentProvider extends AComponentProvider<PaintSurfaceComponent> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import com.talosvfx.talos.runtime.scene.components.ParticleComponent;
import com.talosvfx.talos.runtime.vfx.serialization.BaseVFXProjectData;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class ParticleComponentProvider<T extends BaseVFXProjectData> extends RendererComponentProvider<ParticleComponent<T>> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import com.talosvfx.talos.runtime.scene.GameObject;
import com.talosvfx.talos.runtime.scene.components.PathRendererComponent;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class PathRendererComponentProvider extends RendererComponentProvider<PathRendererComponent> {
public PathRendererComponentProvider(PathRendererComponent component) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.talosvfx.talos.runtime.scene.SceneLayer;
import com.talosvfx.talos.runtime.scene.components.RendererComponent;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public abstract class RendererComponentProvider<T extends RendererComponent> extends AComponentProvider<T> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import com.talosvfx.talos.runtime.scene.components.RoutineRendererComponent;
import com.talosvfx.talos.runtime.scene.utils.propertyWrappers.PropertyWrapper;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class RoutineRenderComponentProvider extends RendererComponentProvider<RoutineRendererComponent> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.talosvfx.talos.runtime.scene.SceneLayer;
import com.talosvfx.talos.runtime.scene.render.RenderStrategy;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class ScenePropertyProvider implements IPropertyProvider {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.talosvfx.talos.runtime.scene.components.ScriptComponent;
import com.talosvfx.talos.runtime.scene.utils.propertyWrappers.PropertyWrapper;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class ScriptComponentProvider extends AComponentProvider<ScriptComponent> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import com.talosvfx.talos.runtime.scene.GameObjectContainer;
import com.talosvfx.talos.runtime.scene.components.SpineRendererComponent;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class SpineComponentProvider extends RendererComponentProvider<SpineRendererComponent> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.talosvfx.talos.runtime.scene.GameObject;
import com.talosvfx.talos.runtime.scene.components.SpriteRendererComponent;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public final class SpriteRendererComponentProvider extends RendererComponentProvider<SpriteRendererComponent> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.talosvfx.talos.runtime.assets.GameAssetType;
import com.talosvfx.talos.runtime.assets.meta.SpineMetadata;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class SpineMetaDataProvider extends AMetaDataProvider<SpineMetadata> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.talosvfx.talos.editor.widgets.propertyWidgets.LabelWidget;
import com.talosvfx.talos.editor.widgets.propertyWidgets.PropertyWidget;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;
import java.util.regex.Pattern;

public class FilePropertyProvider implements IPropertyProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.talosvfx.talos.editor.project.FileTracker;
import com.talosvfx.talos.editor.project2.SharedResources;
import com.talosvfx.talos.runtime.utils.NamingUtils;
import com.talosvfx.talos.runtime.utils.Supplier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -30,7 +31,6 @@
import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.Collection;
import java.util.function.Supplier;

public class AssetImporter {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
import java.io.FileFilter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

import static com.talosvfx.talos.editor.utils.InputUtils.ctrlPressed;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

import static com.talosvfx.talos.editor.utils.InputUtils.ctrlPressed;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import com.talosvfx.talos.runtime.scene.components.TransformComponent;
import com.talosvfx.talos.runtime.scene.utils.TransformSettings;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public abstract class Gizmo extends Actor implements Pool.Poolable {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class GameObjectSelectWidget extends PropertyWidget<GameObject> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class PropertyPanelAssetSelectionWidget<T> extends PropertyWidget<GameAsset<T>> {

Expand Down
2 changes: 1 addition & 1 deletion editor/src/com/talosvfx/talos/editor/nodes/NodeWidget.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.talosvfx.talos.editor.widgets.ui.EditableLabel;
import com.talosvfx.talos.editor.widgets.ui.common.ColorLibrary;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public abstract class NodeWidget extends EmptyWindow implements Json.Serializable, IPropertyProvider {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import lombok.Getter;

import java.util.UUID;
import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class GameAssetWidget<T> extends AbstractWidget<GameAsset<T>> implements Observer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.talosvfx.talos.editor.widgets.ui.ViewportWidget;
import lombok.Getter;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class GenericStageWrappedViewportWidget extends ViewportWidget {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.talosvfx.talos.editor.addons.bvb.AttachmentPoint;
import com.talosvfx.talos.editor.project2.SharedResources;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class AttachmentPointWidget extends PropertyWidget<AttachmentPoint> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.talosvfx.talos.editor.widgets.ui.common.SquareButton;
import lombok.Setter;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class ButtonPropertyWidget<T> extends PropertyWidget<T> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.talosvfx.talos.editor.project2.SharedResources;
import com.talosvfx.talos.editor.widgets.ui.common.zoomWidgets.CheckboxWithZoom;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class CheckboxWidget extends PropertyWidget<Boolean> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import com.talosvfx.talos.editor.project2.SharedResources;
import com.talosvfx.talos.editor.widgets.ui.common.ColorLibrary;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class ColorPropertyWidget extends PropertyWidget<Color> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import com.talosvfx.talos.editor.widgets.ui.common.ColorLibrary;
import com.talosvfx.talos.editor.widgets.ui.common.SquareButton;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;


public class DynamicItemListWidget<T> extends PropertyWidget<Array<T>> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.talosvfx.talos.editor.project2.SharedResources;
import com.talosvfx.talos.editor.widgets.ui.EditableLabel;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class EditableLabelWidget extends PropertyWidget<String> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.talosvfx.talos.editor.widgets.ui.common.zoomWidgets.LabelWithZoom;
import com.talosvfx.talos.runtime.scene.ValueProperty;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class FloatPropertyWidget extends PropertyWidget<Float> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.talosvfx.talos.editor.addons.bvb.AttachmentPoint;
import com.talosvfx.talos.editor.project2.SharedResources;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class GlobalValuePointsWidget extends PropertyWidget<Array<AttachmentPoint>> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.talosvfx.talos.editor.project2.SharedResources;
import com.talosvfx.talos.editor.widgets.ui.common.zoomWidgets.TextFieldWithZoom;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class IntPropertyWidget extends PropertyWidget<Integer> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.talosvfx.talos.editor.project2.SharedResources;
import com.talosvfx.talos.editor.widgets.ui.common.zoomWidgets.LabelWithZoom;

import java.util.function.Supplier;
import com.talosvfx.talos.runtime.utils.Supplier;

public class LabelWidget extends PropertyWidget<String> {

Expand Down
Loading

0 comments on commit 7424f13

Please sign in to comment.