From 24a2a946b35279605e645349bd6b82e9e60aac88 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 14 Aug 2019 23:35:34 -0400
Subject: [PATCH] Fix textures in jar.

---
 GroupEditor.java |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/GroupEditor.java b/GroupEditor.java
index b32dee9..651e8a8 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -928,7 +928,7 @@
 	
         JTabbedPane resourcecontainer;
         cGridBag currenttab;
-        boolean added; // patch for jar
+        //boolean added; // patch for jar
                 
         int tabcount = 0;
         int colcount = 0;
@@ -940,17 +940,19 @@
         
     public void ResourceCallBack(String[] path)
     {
-        for (int i = 0; i < path.length; i++)
-            System.out.print(path[i] + "/");
-        System.out.println();
+//        for (int i = 0; i < path.length; i++)
+//            System.out.print(path[i] + "/");
+//        System.out.println();
         
         if (//rowcount == 0 ||
-                path.length == 1)
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
         {
             currenttab = new cGridBag();
-            added = false;
             String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
             currenttab.setName(tabname);
+            //added = false;
+            resourcecontainer.add(currenttab);
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
             rowcount = 1;
             colcount = 0;
             texturecount = 0;
@@ -958,12 +960,11 @@
         
         if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
         {
-            if (!added)
+            //if (!added)
             {
-                added = true;
-                resourcecontainer.add(currenttab);
+                //added = true;
                 String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
-                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
             }
             
             AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);

--
Gitblit v1.6.2