From 3b2c08763597b818088df54bf12f2eccd3717695 Mon Sep 17 00:00:00 2001
From: Ricardo Gudwin <gudwin@dca.fee.unicamp.br>
Date: Fri, 28 Apr 2023 09:05:45 -0300
Subject: [PATCH] Changes in TreeElement and Icon comparisons

---
 build.gradle                                  |  2 +-
 .../unicamp/cst/util/viewer/MindRenderer.java | 99 +------------------
 .../unicamp/cst/util/viewer/TreeElement.java  | 35 +++++++
 .../idea/IdeaTreeNodeComparator.java          | 19 ++++
 4 files changed, 59 insertions(+), 96 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9cc15d8..a41b569 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ description = "CST-Desktop"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
-version = '1.0.5'
+version = '1.0.6'
 
 repositories {
     flatDir {
diff --git a/src/main/java/br/unicamp/cst/util/viewer/MindRenderer.java b/src/main/java/br/unicamp/cst/util/viewer/MindRenderer.java
index e7efd53..7f49a1d 100644
--- a/src/main/java/br/unicamp/cst/util/viewer/MindRenderer.java
+++ b/src/main/java/br/unicamp/cst/util/viewer/MindRenderer.java
@@ -51,101 +51,10 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
         DefaultMutableTreeNode dmtn = (DefaultMutableTreeNode) value;
         DefaultMutableTreeNode objectNode;
         TreeElement node = (TreeElement) dmtn.getUserObject();
-        switch (node.getIcon()) {
-            case TreeElement.ICON_COMPOSITE:
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("object.png"));
-                break;
-            case TreeElement.ICON_AGGREGATE:
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("object2.gif"));
-                break;    
-            case TreeElement.ICON_PROPERTY:
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("property.png"));
-                break;
-            case TreeElement.ICON_QUALITYDIM:
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("qualityDim.png"));
-                break;
-            case TreeElement.ICON_VALUE:
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("value.png"));
-                break;
-            default:
-            case TreeElement.ICON_MIND:
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("mind.png"));
-                break;
-            case TreeElement.ICON_CODELET:
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("codelet.png"));
-                break;
-            case TreeElement.ICON_CODELETS:
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("codelets.png"));
-                break;
-            case TreeElement.ICON_MEMORY:
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("memory.png"));
-                break;
-            case TreeElement.ICON_MEMORIES:
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("memories.png"));
-                break;
-            case TreeElement.ICON_CONTAINER:
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("container.png"));
-                break;
-            case TreeElement.ICON_MO:
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("mo.png"));
-                break;
-            case TreeElement.ICON_INPUT:
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("input.png"));
-                break;
-            case TreeElement.ICON_OUTPUT:
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("output.png"));
-                break;
-            case TreeElement.ICON_BROADCAST:    
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("broadcast.png"));
-                break;
-            case TreeElement.ICON_AFFORDANCE:    
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("codelet2.png"));
-                break;
-            case TreeElement.ICON_OBJECT2:
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("object2.png"));
-                break;     
-            case TreeElement.ICON_OBJECT3:    
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("object3.png"));
-                break;  
-            case TreeElement.ICON_CONFIGURATION:    
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("configuration.png"));
-                break;     
-            case TreeElement.ICON_TIME:    
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("time-machine.png"));
-                break;         
-            case TreeElement.ICON_PROPERTYCATEGORY:    
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("propertyCategory.png"));
-                break;
-            case TreeElement.ICON_OBJECTCATEGORY:    
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("objectCategory.png"));
-                break;
-            case TreeElement.ICON_EPISODECATEGORY:    
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("episodeCategory.png"));
-                break;
-            case TreeElement.ICON_PROPERTYPOSSIBILITY:    
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("property-p.png"));
-                break;
-            case TreeElement.ICON_OBJECTPOSSIBILITY:    
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("object-p.png"));
-                break;
-            case TreeElement.ICON_EPISODEPOSSIBILITY:    
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("episode-p.png"));
-                break;    
-            case TreeElement.ICON_OBJECTEXISTENCE:    
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("object-e.png"));
-                break;
-            case TreeElement.ICON_ACTIONPOSSIBILITY:    
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("action-p.png"));
-                break;
-            case TreeElement.ICON_ACTIONEXISTENCE:    
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("action-e.png"));
-                break;    
-            case TreeElement.ICON_ACTIONCATEGORY:    
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("action-l.png"));
-                break;
-            case TreeElement.ICON_GOAL:    
-                img = new ImageIcon(this.getClass().getClassLoader().getResource("goal.png"));
-                break;    
+        img = new ImageIcon(this.getClass().getClassLoader().getResource("mind.png")); // This is the default img if not found anyone else
+        for (int i=0;i<TreeElement.icon_table.length;i++) {
+            if (node.getIcon() == (int)TreeElement.icon_table[i][0])
+                img = new ImageIcon(this.getClass().getClassLoader().getResource((String)TreeElement.icon_table[i][1]));
         }
         setOpenIcon(img);
         setClosedIcon(img);
diff --git a/src/main/java/br/unicamp/cst/util/viewer/TreeElement.java b/src/main/java/br/unicamp/cst/util/viewer/TreeElement.java
index 5911705..3bccea4 100644
--- a/src/main/java/br/unicamp/cst/util/viewer/TreeElement.java
+++ b/src/main/java/br/unicamp/cst/util/viewer/TreeElement.java
@@ -12,6 +12,7 @@
 package br.unicamp.cst.util.viewer;
 
 import java.awt.Color;
+import javax.swing.ImageIcon;
 
 /**
  * @author Suelen Mapa
@@ -85,6 +86,40 @@ public class TreeElement {
         {ICON_ACTIONCATEGORY,0},       // 17 Action - Category
         {ICON_GOAL,0},                 // 18 Goal
     };
+    
+    public static Object[][] icon_table = {
+        {ICON_COMPOSITE, "object.png"},
+        {ICON_AGGREGATE, "object2.gif"},
+        {ICON_PROPERTY, "property.png"},
+        {ICON_QUALITYDIM, "qualityDim.png"},
+        {ICON_VALUE, "value.png"},
+        {ICON_MIND, "mind.png"},
+        {ICON_CODELET, "codelet.png"},
+        {ICON_CODELETS, "codelets.png"},
+        {ICON_MEMORY, "memory.png"},
+        {ICON_MEMORIES, "memories.png"},
+        {ICON_CONTAINER, "container.png"},
+        {ICON_MO, "mo.png"},
+        {ICON_INPUT, "input.png"},
+        {ICON_OUTPUT, "output.png"},
+        {ICON_BROADCAST, "broadcast.png"},
+        {ICON_AFFORDANCE, "codelet2.png"},
+        {ICON_OBJECT2, "object2.png"}, 
+        {ICON_OBJECT3, "object3.png"},
+        {ICON_CONFIGURATION, "configuration.png"},
+        {ICON_TIME, "time-machine.png"},
+        {ICON_PROPERTYCATEGORY, "propertyCategory.png"},
+        {ICON_OBJECTCATEGORY, "objectCategory.png"},
+        {ICON_EPISODECATEGORY, "episodeCategory.png"},
+        {ICON_PROPERTYPOSSIBILITY, "property-p.png"},
+        {ICON_OBJECTPOSSIBILITY, "object-p.png"},
+        {ICON_EPISODEPOSSIBILITY, "episode-p.png"},
+        {ICON_OBJECTEXISTENCE, "object-e.png"},
+        {ICON_ACTIONPOSSIBILITY, "action-p.png"},
+        {ICON_ACTIONEXISTENCE, "action-e.png"},
+        {ICON_ACTIONCATEGORY, "action-l.png"},
+        {ICON_GOAL, "goal.png"}
+    };
    
     public TreeElement(String name, int node_type, Object element, int typeIcon) {
         //this(name,node_type,element,typeIcon,0);
diff --git a/src/main/java/br/unicamp/cst/util/viewer/representation/idea/IdeaTreeNodeComparator.java b/src/main/java/br/unicamp/cst/util/viewer/representation/idea/IdeaTreeNodeComparator.java
index 3811df8..ecee4c9 100644
--- a/src/main/java/br/unicamp/cst/util/viewer/representation/idea/IdeaTreeNodeComparator.java
+++ b/src/main/java/br/unicamp/cst/util/viewer/representation/idea/IdeaTreeNodeComparator.java
@@ -67,6 +67,25 @@ public int compare(Object o1, Object o2)
             else if(!te1.getName().startsWith("operator") && te2.getName().startsWith("operator")) return(-1); 
             else if (te1.getIcon() == TreeElement.ICON_GOAL && te2.getIcon() != TreeElement.ICON_GOAL) return(-1);
             else if (te1.getIcon() != TreeElement.ICON_GOAL && te2.getIcon() == TreeElement.ICON_GOAL) return(1);
+            else if (te1.getIcon() == TreeElement.ICON_EPISODEPOSSIBILITY && te2.getIcon() != TreeElement.ICON_EPISODEPOSSIBILITY) return(-1);
+            else if (te1.getIcon() != TreeElement.ICON_EPISODEPOSSIBILITY && te2.getIcon() == TreeElement.ICON_EPISODEPOSSIBILITY) return(1);
+            else if (te1.getIcon() == TreeElement.ICON_AFFORDANCE && te2.getIcon() != TreeElement.ICON_AFFORDANCE) return(-1);
+            else if (te1.getIcon() != TreeElement.ICON_AFFORDANCE && te2.getIcon() == TreeElement.ICON_AFFORDANCE) return(1);
+            else if (te1.getIcon() == TreeElement.ICON_EPISODECATEGORY && te2.getIcon() != TreeElement.ICON_EPISODECATEGORY) return(-1);
+            else if (te1.getIcon() != TreeElement.ICON_EPISODECATEGORY && te2.getIcon() == TreeElement.ICON_EPISODECATEGORY) return(1);
+            else if (te1.getIcon() == TreeElement.ICON_OBJECTPOSSIBILITY && te2.getIcon() != TreeElement.ICON_OBJECTPOSSIBILITY) return(-1);
+            else if (te1.getIcon() != TreeElement.ICON_OBJECTPOSSIBILITY && te2.getIcon() == TreeElement.ICON_OBJECTPOSSIBILITY) return(1);
+            else if (te1.getIcon() == TreeElement.ICON_OBJECTEXISTENCE && te2.getIcon() != TreeElement.ICON_OBJECTEXISTENCE) return(-1);
+            else if (te1.getIcon() != TreeElement.ICON_OBJECTEXISTENCE && te2.getIcon() == TreeElement.ICON_OBJECTEXISTENCE) return(1);
+            else if (te1.getIcon() == TreeElement.ICON_OBJECTCATEGORY && te2.getIcon() != TreeElement.ICON_OBJECTCATEGORY) return(-1);
+            else if (te1.getIcon() != TreeElement.ICON_OBJECTCATEGORY && te2.getIcon() == TreeElement.ICON_OBJECTCATEGORY) return(1);
+            else if (te1.getIcon() == TreeElement.ICON_PROPERTYPOSSIBILITY && te2.getIcon() != TreeElement.ICON_PROPERTYPOSSIBILITY) return(-1);
+            else if (te1.getIcon() != TreeElement.ICON_PROPERTYPOSSIBILITY && te2.getIcon() == TreeElement.ICON_PROPERTYPOSSIBILITY) return(1);
+            else if (te1.getIcon() == TreeElement.ICON_PROPERTY && te2.getIcon() != TreeElement.ICON_PROPERTY) return(-1);
+            else if (te1.getIcon() != TreeElement.ICON_PROPERTY && te2.getIcon() == TreeElement.ICON_PROPERTY) return(1);
+            else if (te1.getIcon() == TreeElement.ICON_PROPERTYCATEGORY && te2.getIcon() != TreeElement.ICON_PROPERTYCATEGORY) return(-1);
+            else if (te1.getIcon() != TreeElement.ICON_PROPERTYCATEGORY && te2.getIcon() == TreeElement.ICON_PROPERTYCATEGORY) return(1);
+            
             else if (te1.getIcon() == te2.getIcon() || 
                     te1.getIcon() == TreeElement.ICON_OBJECT && te2.getIcon() == TreeElement.ICON_OBJECT2 ||
                     te1.getIcon() == TreeElement.ICON_OBJECT2 && te2.getIcon() == TreeElement.ICON_OBJECT) {