From 71f20dcf1be7bad1c5a915cdc029a78b6c7e5895 Mon Sep 17 00:00:00 2001 From: Brendan Robert Date: Wed, 20 May 2015 23:15:31 -0500 Subject: [PATCH] Sort scripts alphabetically now --- .../java/org/badvision/outlaweditor/MapEditor.java | 1 - .../ui/impl/MapEditorTabControllerImpl.java | 13 +++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MapEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MapEditor.java index e81d66f8..3ed7aed8 100644 --- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MapEditor.java +++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MapEditor.java @@ -28,7 +28,6 @@ import javafx.scene.input.ScrollEvent; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.Pane; import javafx.scene.paint.Color; -import javafx.scene.shape.FillRule; import javafx.scene.shape.Rectangle; import javafx.stage.Stage; import static org.badvision.outlaweditor.Application.currentPlatform; diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/MapEditorTabControllerImpl.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/MapEditorTabControllerImpl.java index 212b89fd..1f1d83b4 100644 --- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/MapEditorTabControllerImpl.java +++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/MapEditorTabControllerImpl.java @@ -225,6 +225,7 @@ public class MapEditorTabControllerImpl extends MapEditorTabController { mapWrapAround.setDisable(true); setCurrentEditor(null); } else { + sortScripts(m); if (m.getHeight() == null) { m.setHeight(512); } @@ -367,6 +368,7 @@ public class MapEditorTabControllerImpl extends MapEditorTabController { mapScriptsList.getItems().clear(); } else { if (mapScriptsList.getItems() != null && getCurrentMap().getScripts() != null) { + sortScripts(getCurrentMap()); mapScriptsList.getItems().setAll(getCurrentMap().getScripts().getScript()); } else { mapScriptsList.getItems().clear(); @@ -395,4 +397,15 @@ public class MapEditorTabControllerImpl extends MapEditorTabController { visibilityIcon.setImage(VISIBLE_IMAGE); } } + + private void sortScripts(Map m) { + m.getScripts().getScript().sort((a,b)-> { + if (a.getName().equalsIgnoreCase("init")) { + return -1; + } else if (b.getName().equalsIgnoreCase("init")) { + return 1; + } + return a.getName().compareTo(b.getName()); + }); + } }