From c79f333d2470d06a0362fff3c482767fe2b47717 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Thu, 14 May 2015 01:01:28 -0500
Subject: [PATCH 1/4] Adding new visiblity icons

---
 .../src/main/resources/images/not_visible.png     | Bin 0 -> 890 bytes
 .../src/main/resources/images/visible.png         | Bin 0 -> 659 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 OutlawEditor/src/main/resources/images/not_visible.png
 create mode 100644 OutlawEditor/src/main/resources/images/visible.png

diff --git a/OutlawEditor/src/main/resources/images/not_visible.png b/OutlawEditor/src/main/resources/images/not_visible.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad256a20414de8a3ecd20a7cad5d37f01ef7cd17
GIT binary patch
literal 890
zcmV-=1BLvFP)<h;3K|Lk000e1NJLTq001BW0015c1^@s6O$r<-0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#97#k$RCwBA{Qv(y1HC|LX=w!y56_qS
z`uZtwL68IJfs2catAN%$1mUKprYx8^MTS0j@PO^sty?@KSpFZ1A9i$fq>$`@-Me=i
zq^72}D<~)&h4}`C`T6-TMn^|aT)%$34FSvlGchsU-M@do7SRq^wQ7}<y1M#)bc3+q
zhhAP@3t{@ofB>82yLRm|ASwz#LG0}8yqpM&!Is<E*{z1@1;sPEK1N2y`|H-NvqQE6
zZ*cSS@?OSe83==X1H`w<wH&7dmM&fD2GW4dVry&bwab?;cR^PF`0-;VaxBN{fJKWI
zd0`83R#w)VD_5>`!WU(vT8`lWP_Se3ISUKR%@Ze1DB!cawY4<^pXH$Rq^PKP7&!r=
zH~^HN+1c5zV+;0q^XB>CvwYH|Nl{or?cst23w&T|pt<Nj2M5R1+qZA?U^u|Y$Y?9J
z1gEX7y_-sw!_^oY8*fE%0I+P%!<E%Q7Esf2n3~4M#vHH%E?&GSh9{ptymaZ37`c|8
zJ$qILm)W57arNp|AqFQWr{(wx7i^YKojNswkmc|o##4y7xw$PR*#RI+uvv~Pst7uO
zP!xcIkzC6`(TC6M%a<>UfECu&)nQA74?zitT+2at;>3wDxGb-&tt~*whK7cQ+o@?e
z2!paPHV5eH>h8oS2X5ZH$p<TlkS$-lc(DgLmd~9#Hvn7kv$3&Vzj5ORAJ(FH=gyr*
zpyKk;qem<tKBySQQZzqoZf?%PXZi8t$CW_EH@2YPwr!gUQPnXn%aPl2*zk%KD_lSo
z7qLY;*_J<i_>cuz&$4C9+(1<|j#U3})~s1UL{-PcSZ;4`zZ$7Qau=y>_#a!GZ`iQG
zim2)sq>zy1pf(?|O*Atzv(3N+Cx9=?;0#bb4fPF*A)r<*OpT9^&wOGUrV<hor)STe
z9Yjon7fgVf$b>8h;jLS@nk6MAb%QKGZ<Y%Q37roQ51$H*LK{+=`e357voi&~<A82C
zHhlN)U9LNK?r>4kxxv<+Bg%4WVHQ{)5m+`)1JNHpeiZ2G>1m@^hZP{e0P2`C_r{hd
Q!T<mO07*qoM6N<$f}n_>JOBUy

literal 0
HcmV?d00001

diff --git a/OutlawEditor/src/main/resources/images/visible.png b/OutlawEditor/src/main/resources/images/visible.png
new file mode 100644
index 0000000000000000000000000000000000000000..58154fee06464f66aa2c66b6a2a9416280ed92a8
GIT binary patch
literal 659
zcmV;E0&M+>P)<h;3K|Lk000e1NJLTq001HY000;W1^@s6pQbMf0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!HAzH4RCwBA{Qv(y11aF>(W7cRcI@yv
zcI=q>g$oxn-oJk@05pS%mzVdGwzl>?OH0es9v&Xs+}zyGkz_E)A;jPrGiHP+C@35S
zYIz9KMgTwL=jXrJ)zy_mtoZ~LY~8xmOioUYSO;J@NJvQN{E8JTTqtr#W@ctHnGV2k
zP;_+kM6w)WZf?F2mm}=#?EcT5J^TN)YuEn2dGiL0L2Qs1NDh}{bai!iK79C)g(!zS
zc<_KtQBm<QHb(%X=>Oimd;b#xAT=Ph*c>D)D|`Ijy?Y!49Rf{|7zP*_8U26#`t^Te
z0Z1)K4=%?%e*BmTr$Y=347Otn31HUz|Lobb|D*zt9*|yaj?vN4*^Sj9QBhG7aixh_
zvu0sfa`^D!|1K^r|CyMW{yRB2{r~*=GgimUoH-L`nh6UFn~LI)xpU_R;Bo{D3(Nnn
zU%#RlzJC3B6g9v&#~CUhy&yAiIR==(gTM~CbLS2h&{wx{Wxb%FAQXdt{`~o0P*4y>
z4bTj@{GUI6z-o{I$P8TOgX{*oAtxti=D&acRB)BNz#N3azkK;J1F%>}5lc@`XSjLu
zCc}#tFBpo8i@|E}nSl&Ic4ud2&tzes0sv-L1`Q1jI6p2fj&wt)5jDsdBu7rvP$jV<
z;|&`&ke67gk$piJ#0H5`lzk~F(13}Jx&_*xD&px?>D|A7pJTwA0goO%Vi}qZqe0bF
tq-W!qkrv$vPfyP+uCA^ZNHG^6zyK+*I=!J~bU*+A002ovPDHLkV1k}nAnX7D

literal 0
HcmV?d00001


From f4b45003bd603936213fab20cb69a79e2dfb67b3 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Thu, 14 May 2015 01:01:58 -0500
Subject: [PATCH 2/4] Switched to JFX 1.8 packaging and added visibility
 controls for scripts (still a work in progress though)

---
 OutlawEditor/pom.xml                          |  2 +-
 .../org/badvision/outlaweditor/MapEditor.java | 44 +++++++++++++++----
 .../badvision/outlaweditor/ui/UIAction.java   |  2 +-
 .../ui/impl/MapEditorTabControllerImpl.java   | 32 ++++++++++++++
 4 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/OutlawEditor/pom.xml b/OutlawEditor/pom.xml
index 5b01c937..2a897ef9 100644
--- a/OutlawEditor/pom.xml
+++ b/OutlawEditor/pom.xml
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>javafx-packager</groupId>
             <artifactId>javafx-packager</artifactId>
-            <version>1.7</version>
+            <version>1.8</version>
             <systemPath>${java.home}/../lib/ant-javafx.jar</systemPath>
             <scope>system</scope>
         </dependency>
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MapEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MapEditor.java
index 21514c1c..225e3388 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MapEditor.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MapEditor.java
@@ -1,9 +1,12 @@
 package org.badvision.outlaweditor;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 import javafx.application.Platform;
 import javafx.beans.value.ObservableValue;
 import javafx.event.EventHandler;
@@ -247,50 +250,75 @@ public class MapEditor extends Editor<Map, MapEditor.DrawMode> implements EventH
 
     private static final int dashLength = 3;
 
+    private final Set<Script> invisibleScripts = new HashSet<>();
+
+    public boolean isScriptVisible(Script script) {
+        return !invisibleScripts.contains(script);
+    }
+
+    public void setScriptVisible(Script script, boolean visible) {
+        setScriptVisible(script, visible, true);
+    }
+
+    public void setScriptVisible(Script script, boolean visible, boolean redraw) {
+        if (visible) {
+            invisibleScripts.remove(script);
+        } else {
+            invisibleScripts.add(script);
+        }
+        if (redraw) {
+            redraw();
+        }
+    }
+
     private void highlightScripts(int x, int y, List<Script> scripts) {
         if (scripts == null || scripts.isEmpty()) {
             return;
         }
+        List<Script> visibleScripts = scripts.stream().filter(this::isScriptVisible).collect(Collectors.toList());
+        if (visibleScripts.isEmpty()) {
+            return;
+        }
         GraphicsContext gc = drawCanvas.getGraphicsContext2D();
         int idx = 0;
         double xx = x * tileWidth;
         double yy = y * tileHeight;
         gc.setLineWidth(4);
         for (int i = 0; i < tileWidth - 2; i += dashLength) {
-            idx = (idx + 1) % scripts.size();
+            idx = (idx + 1) % visibleScripts.size();
             gc.beginPath();
             gc.moveTo(xx, yy);
-            currentMap.getScriptColor(scripts.get(idx)).ifPresent(gc::setStroke);
+            currentMap.getScriptColor(visibleScripts.get(idx)).ifPresent(gc::setStroke);
             xx += dashLength;
             gc.lineTo(xx, yy);
             gc.setEffect(new DropShadow(2, Color.BLACK));
             gc.stroke();
         }
         for (int i = 0; i < tileHeight - 2; i += dashLength) {
-            idx = (idx + 1) % scripts.size();
+            idx = (idx + 1) % visibleScripts.size();
             gc.beginPath();
             gc.moveTo(xx, yy);
-            currentMap.getScriptColor(scripts.get(idx)).ifPresent(gc::setStroke);
+            currentMap.getScriptColor(visibleScripts.get(idx)).ifPresent(gc::setStroke);
             yy += dashLength;
             gc.lineTo(xx, yy);
             gc.setEffect(new DropShadow(2, Color.BLACK));
             gc.stroke();
         }
         for (int i = 0; i < tileWidth - 2; i += dashLength) {
-            idx = (idx + 1) % scripts.size();
+            idx = (idx + 1) % visibleScripts.size();
             gc.beginPath();
             gc.moveTo(xx, yy);
-            currentMap.getScriptColor(scripts.get(idx)).ifPresent(gc::setStroke);
+            currentMap.getScriptColor(visibleScripts.get(idx)).ifPresent(gc::setStroke);
             xx -= dashLength;
             gc.lineTo(xx, yy);
             gc.setEffect(new DropShadow(2, Color.BLACK));
             gc.stroke();
         }
         for (int i = 0; i < tileHeight - 2; i += dashLength) {
-            idx = (idx + 1) % scripts.size();
+            idx = (idx + 1) % visibleScripts.size();
             gc.beginPath();
             gc.moveTo(xx, yy);
-            currentMap.getScriptColor(scripts.get(idx)).ifPresent(gc::setStroke);
+            currentMap.getScriptColor(visibleScripts.get(idx)).ifPresent(gc::setStroke);
             yy -= dashLength;
             gc.lineTo(xx, yy);
             gc.setEffect(new DropShadow(2, Color.BLACK));
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/UIAction.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/UIAction.java
index cbf3d57d..3836b6be 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/UIAction.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/UIAction.java
@@ -150,7 +150,7 @@ public class UIAction {
 
     public static WritableImage getBadImage(int width, int height) {
         if (badImage == null) {
-            badImage = new Image("/images/icon_brokenLink.png");
+            badImage = new Image("images/icon_brokenLink.png");
         }
         WritableImage img = new WritableImage(width, height);
         img.getPixelWriter().setPixels(0, 0, (int) badImage.getWidth(), (int) badImage.getHeight(), badImage.getPixelReader(), 0, 0);
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 0903e2bb..fce3a833 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
@@ -1,5 +1,7 @@
 package org.badvision.outlaweditor.ui.impl;
 
+import java.util.HashSet;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javafx.event.ActionEvent;
@@ -7,6 +9,7 @@ import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.cell.ComboBoxListCell;
+import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.image.WritableImage;
 import javafx.util.Callback;
@@ -310,9 +313,16 @@ public class MapEditorTabControllerImpl extends MapEditorTabController {
                         if (empty || item == null) {
                             setText("");
                         } else {
+                            ImageView visibleIcon = getVisibleIcon(item);
+                            visibleIcon.setOnMouseClicked((e)->{
+                                toggleVisibility(visibleIcon, item);
+                                mapScriptsList.getSelectionModel().clearSelection();
+                            });
+                            setGraphic(visibleIcon);
                             getCurrentEditor().getCurrentMap().getScriptColor(item).ifPresent(this::setTextFill);
                             setText(item.getName());
                             scriptDragDrop.registerDragSupport(this, item);
+                            visibleIcon.setMouseTransparent(false);
                         }
                     }
                 };
@@ -329,4 +339,26 @@ public class MapEditorTabControllerImpl extends MapEditorTabController {
             }
         }
     }
+    
+    public static final Image VISIBLE_IMAGE = new Image("images/visible.png");
+    public static final Image INVISIBLE_IMAGE = new Image("images/not_visible.png");
+    
+    private ImageView getVisibleIcon(Script script) {
+        if (getCurrentEditor().isScriptVisible(script)) {
+            return new ImageView(VISIBLE_IMAGE);
+        } else {
+            return new ImageView(INVISIBLE_IMAGE);
+        }
+    }
+    
+    private void toggleVisibility(ImageView visibilityIcon, Script script) {
+        if (script.getName() == null) return;
+        if (getCurrentEditor().isScriptVisible(script)) {
+            getCurrentEditor().setScriptVisible(script, false);
+            visibilityIcon.setImage(INVISIBLE_IMAGE);
+        } else {
+            getCurrentEditor().setScriptVisible(script, true);
+            visibilityIcon.setImage(VISIBLE_IMAGE);
+        }
+    }
 }

From 1c7b1159bedc81b417b93597d7368cf9580aa058 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Fri, 15 May 2015 00:07:51 -0500
Subject: [PATCH 3/4] Tiles are now presented in category-based submenus and
 current tile is retained when switching maps

---
 .../ui/impl/MapEditorTabControllerImpl.java   | 47 +++++++++++++++----
 1 file changed, 37 insertions(+), 10 deletions(-)

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 fce3a833..dcbc1cc3 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
@@ -1,13 +1,14 @@
 package org.badvision.outlaweditor.ui.impl;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.HashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javafx.event.ActionEvent;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
-import javafx.scene.control.MenuItem;
+import javafx.scene.control.Menu;
+import javafx.scene.control.RadioMenuItem;
+import javafx.scene.control.ToggleGroup;
 import javafx.scene.control.cell.ComboBoxListCell;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
@@ -200,8 +201,10 @@ public class MapEditorTabControllerImpl extends MapEditorTabController {
         if (getCurrentMap() != null && getCurrentMap().equals(m)) {
             return;
         }
+        Tile currentTile = null;
 //        mapEditorAnchorPane.getChildren().clear();
         if (getCurrentEditor() != null) {
+            currentTile = getCurrentEditor().getCurrentTile();
             getCurrentEditor().unregister();
         }
         if (m == null) {
@@ -241,6 +244,9 @@ public class MapEditorTabControllerImpl extends MapEditorTabController {
             e.buildEditorUI(mapEditorAnchorPane);
             setCurrentEditor(e);
             e.setupDragDrop(scriptDragDrop, toolDragDrop);
+            if (currentTile != null) {
+                e.setCurrentTile(currentTile);
+            }
         }
         redrawMapScripts();
     }
@@ -282,19 +288,40 @@ public class MapEditorTabControllerImpl extends MapEditorTabController {
     @Override
     public void rebuildTileSelectors() {
         mapSelectTile.getItems().clear();
-        Application.gameData.getTile().stream().map((Tile t) -> {
+        
+        ToggleGroup tileGroup = new ToggleGroup();
+        HashMap<String,Menu> submenus = new HashMap<>();
+        Application.gameData.getTile().stream().forEach((Tile t) -> {
             WritableImage img = TileUtils.getImage(t, currentPlatform);
             ImageView iv = new ImageView(img);
-            MenuItem mapSelectItem = new MenuItem(String.valueOf(t.getCategory())+"/"+String.valueOf(t.getName()), iv);
-            mapSelectItem.setGraphic(new ImageView(TileUtils.getImage(t, currentPlatform)));
-            mapSelectItem.setOnAction((event) -> {
+            String category = String.valueOf(t.getCategory());
+            Menu categoryMenu = submenus.get(category);
+            if (categoryMenu == null) {
+                categoryMenu = new Menu(category);
+                submenus.put(category, categoryMenu);
+            }
+            final Menu theMenu = categoryMenu;
+            RadioMenuItem tileSelection = new RadioMenuItem(String.valueOf(t.getName()), iv);
+            tileSelection.setToggleGroup(tileGroup);
+            if (getCurrentEditor() != null && getCurrentEditor().getCurrentTile() == t) {
+                tileGroup.selectToggle(tileSelection);
+                theMenu.setStyle("-fx-font-weight:bold; -fx-text-fill:blue");
+            }
+            tileSelection.setGraphic(new ImageView(TileUtils.getImage(t, currentPlatform)));
+            tileSelection.setOnAction((event) -> {
                 if (getCurrentEditor() != null) {
                     getCurrentEditor().setCurrentTile(t);
                 }
+                tileGroup.selectToggle(tileSelection);
+                submenus.values().stream().forEach((menu) -> {
+                    menu.setStyle(null);
+                });
+                theMenu.setStyle("-fx-font-weight:bold; -fx-text-fill:blue");
             });
-            return mapSelectItem;
-        }).forEach((mapSelectItem) -> {
-            mapSelectTile.getItems().add(mapSelectItem);
+            categoryMenu.getItems().add(tileSelection);
+        });
+        submenus.values().stream().forEach((menu) -> {
+            mapSelectTile.getItems().add(menu);
         });
     }
 

From 2049cb0756b0909fbfe6ee73cd82b7a3d8990d22 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Fri, 15 May 2015 00:08:13 -0500
Subject: [PATCH 4/4] Fixed annoying bug that would cause current tile to be
 disselected when editing name/category

---
 .../outlaweditor/ui/impl/TileEditorTabControllerImpl.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/TileEditorTabControllerImpl.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/TileEditorTabControllerImpl.java
index 3a1dfea9..27cc1ec6 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/TileEditorTabControllerImpl.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/TileEditorTabControllerImpl.java
@@ -229,6 +229,7 @@ public class TileEditorTabControllerImpl extends TileEditorTabController {
 
     @Override
     public void rebuildTileSelectors() {
+        Tile t = getCurrentTile();
         tileSelector.getItems().clear();
         List<Tile> allTiles = Application.gameData.getTile();
         allTiles.sort((Tile o1, Tile o2) -> {
@@ -240,5 +241,6 @@ public class TileEditorTabControllerImpl extends TileEditorTabController {
         });
         tileSelector.getItems().addAll(allTiles);
         tileSelector.getSelectionModel().select(allTiles.indexOf(getCurrentTile()));
+        setCurrentTile(t);
     }
 }