From 9cc83b97378c48bae3792064f2d01b2f954c0e01 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Thu, 05 Sep 2019 21:51:51 -0400
Subject: [PATCH] Fix cone.
---
cFileSystemModel.java | 88 ++++++++++++++++++++++++++++++++------------
1 files changed, 64 insertions(+), 24 deletions(-)
diff --git a/cFileSystemModel.java b/cFileSystemModel.java
index 631ad57..acb8318 100644
--- a/cFileSystemModel.java
+++ b/cFileSystemModel.java
@@ -110,38 +110,78 @@
hasFocus);
String valueString = value.toString();
+ String lcString = valueString.toLowerCase();
- if (valueString.toLowerCase().endsWith(".gfd") || valueString.toLowerCase().endsWith(".obj") || valueString.toLowerCase().endsWith(".3ds"))
+ if (lcString.endsWith(".gfd") || lcString.endsWith(".obj") || lcString.endsWith(".3ds"))
{
- String valueTruncated = valueString.substring(0, valueString.length()-4);
-
- System.out.println(valueTruncated);
-
- javax.swing.ImageIcon rendererIcon = icons.get(valueTruncated);
-
- if (rendererIcon == null)
+ if (true)
{
- if (new File(valueTruncated + ".jpg").exists())
- {
- rendererIcon = new javax.swing.ImageIcon(valueTruncated + ".jpg");
- }
- else
- {
- if (new File(valueTruncated + ".png").exists())
- {
- rendererIcon = new javax.swing.ImageIcon(valueTruncated + ".png");
- }
- }
-
+ // Small icons
+ String valueTruncated = valueString.substring(0, valueString.length()-4);
+
+ //System.out.println("valueTruncated = " + valueTruncated);
+
+ javax.swing.ImageIcon rendererIcon = icons.get(valueTruncated);
+
if (rendererIcon == null)
{
- rendererIcon = new javax.swing.ImageIcon();
+ if (new File(valueTruncated + ".jpg").exists())
+ {
+ rendererIcon = new javax.swing.ImageIcon(valueTruncated + ".jpg");
+ }
+ else
+ {
+ if (new File(valueTruncated + ".png").exists())
+ {
+ rendererIcon = new javax.swing.ImageIcon(valueTruncated + ".png");
+ }
+ }
+
+ if (rendererIcon == null)
+ {
+ rendererIcon = ObjEditor.GetIcon("icons/primitives.png");
+ }
+
+ icons.put(valueTruncated, rendererIcon);
+ }
+
+ setIcon(rendererIcon);
+ }
+ else
+ {
+ // Large icons
+ String[] split = valueString.split("/");
+
+ String valueTruncated = "";
+
+ for (int i=1; i<split.length-1; i++)
+ {
+ valueTruncated += "/" + split[i];
}
- icons.put(valueTruncated, rendererIcon);
+ valueTruncated += "/icon.jpg";
+
+ System.out.println(valueTruncated);
+
+ javax.swing.ImageIcon rendererIcon = icons.get(valueTruncated);
+
+ if (rendererIcon == null)
+ {
+ if (new File(valueTruncated).exists())
+ {
+ rendererIcon = new javax.swing.ImageIcon(valueTruncated);
+ }
+
+ if (rendererIcon == null)
+ {
+ rendererIcon = new javax.swing.ImageIcon();
+ }
+
+ icons.put(valueTruncated, rendererIcon);
+ }
+
+ setIcon(rendererIcon);
}
-
- setIcon(rendererIcon);
}
else
{
--
Gitblit v1.6.2