Updated to use cst-bindings 1.0.4 and cst 1.2.0

Author: rgudwin

README.md

@@ -32,7 +32,7 @@ Note: This library is still under development, and some concepts or features mig
 ```
 	dependencies {
             ...
-            implementation 'com.github.CST-Group:cst-desktop:1.0.2'
+            implementation 'com.github.CST-Group:cst-desktop:1.0.3'
 	}
 ```
 
@@ -57,7 +57,7 @@ Sometimes, the version number (tag) in this README gets out of date, as maintain
 	<dependency>
 	    <groupId>com.github.CST-Group</groupId>
 	    <artifactId>cst-desktop</artifactId>
-	    <version>1.0.2</version>
+	    <version>1.0.3</version>
 	</dependency>
 ```
 

build.gradle

@@ -10,7 +10,7 @@ description = "CST-Desktop"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
-version = '1.0.2'
+version = '1.0.3'
 
 repositories {
     flatDir {
@@ -35,7 +35,7 @@ configurations {
 
 dependencies {
     //api('com.github.CST-Group:cst:30fe97d')
-    api('com.github.CST-Group:cst-bindings:1.0.3')
+    api('com.github.CST-Group:cst-bindings:1.0.4')
 
     api group: 'org.jfree', name: 'jfreechart', version: '1.0.19'
     api 'com.soartech:jsoar-core:4.1.0'

src/main/java/br/unicamp/cst/util/viewer/MindRenderer.java

@@ -121,7 +121,19 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
                 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;        
         }
         setOpenIcon(img);
         setClosedIcon(img);

src/main/java/br/unicamp/cst/util/viewer/TreeElement.java

@@ -55,6 +55,11 @@ public class TreeElement {
     public static final int ICON_PROPERTYCATEGORY = 21;
     public static final int ICON_OBJECTCATEGORY = 22;
     public static final int ICON_EPISODECATEGORY = 23;
+    public static final int ICON_PROPERTYPOSSIBILITY = 24;
+    public static final int ICON_OBJECTPOSSIBILITY = 25;
+    public static final int ICON_EPISODEPOSSIBILITY = 26;
+    public static final int ICON_OBJECTEXISTENCE = 27;
+    
 
 
     public TreeElement(String name, int node_type, Object element, int typeIcon) {

src/main/java/br/unicamp/cst/util/viewer/representation/idea/IdeaEditor.form

@@ -43,9 +43,6 @@
       </SubComponents>
     </Menu>
   </NonVisualComponents>
-  <Properties>
-    <Property name="defaultCloseOperation" type="int" value="3"/>
-  </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="menuBar" type="java.lang.String" value="jMenuBar1"/>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
@@ -83,7 +80,6 @@
   <SubComponents>
     <Container class="javax.swing.JToolBar" name="jToolBar1">
       <Properties>
-        <Property name="floatable" type="boolean" value="false"/>
         <Property name="rollover" type="boolean" value="true"/>
       </Properties>
 

src/main/java/br/unicamp/cst/util/viewer/representation/idea/IdeaEditor.java

@@ -25,6 +25,7 @@ public class IdeaEditor extends javax.swing.JFrame {
     IdeaPanel wmp;
     Idea root;
     List<IdeaEditorListener> listeners;
+    public boolean finished = false;
 
     /**
      * Creates new form IdeaEditor
@@ -81,9 +82,6 @@ private void initComponents() {
         mClose = new javax.swing.JMenuItem();
         jMenu2 = new javax.swing.JMenu();
 
-        setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
-
-        jToolBar1.setFloatable(false);
         jToolBar1.setRollover(true);
 
         zoom_in.setIcon(new javax.swing.ImageIcon(getClass().getResource("/zoom-in-icon.png"))); // NOI18N
@@ -200,7 +198,10 @@ private void mSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:e
 
     private void mCloseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_mCloseActionPerformed
         // TODO add your handling code here:
-        this.dispose();
+        finished = true;
+        System.out.println("Setting finished to "+finished);
+        //this.dispose();
+        //this.setVisible(false);
     }//GEN-LAST:event_mCloseActionPerformed
 
     private void mLoadActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_mLoadActionPerformed

src/main/java/br/unicamp/cst/util/viewer/representation/idea/IdeaTreeNode.java

@@ -116,6 +116,15 @@ else if (category_type.equalsIgnoreCase("ObjectCategory")) {
             else if (category_type.equalsIgnoreCase("EpisodeCategory")) {
                 node.setType(11);
             }
+            else if (category_type.equalsIgnoreCase("PropertyPossibility")) {
+                node.setType(12);
+            }
+            else if (category_type.equalsIgnoreCase("ObjectPossibility")) {
+                node.setType(13);
+            }
+            else if (category_type.equalsIgnoreCase("EpisodePossibility")) {
+                node.setType(14);
+            }
         } 
     }
 
@@ -127,7 +136,7 @@ public void representIdea(Idea node) {
         switch(node.getType()) {
                case 0: // This type is for Idea objects
                        if (te.getIcon() != TreeElement.ICON_MIND) 
-                          te.setIcon(TreeElement.ICON_OBJECT3);
+                          te.setIcon(TreeElement.ICON_OBJECTEXISTENCE);
                        if (value.equalsIgnoreCase(""))
                            te.setName(node.getName()); 
                        else te.setName(node.getName()+" ["+value+"]"); 
@@ -208,7 +217,28 @@ public void representIdea(Idea node) {
                        if (value.equalsIgnoreCase(""))
                            te.setName(node.getName()); 
                        else te.setName(node.getName()+" ["+value+"]"); 
+                       break; 
+               case 12: // This type is for a PropertyCategory
+                       if (te.getIcon() != TreeElement.ICON_MIND) 
+                          te.setIcon(TreeElement.ICON_PROPERTYPOSSIBILITY);
+                       if (value.equalsIgnoreCase(""))
+                           te.setName(node.getName()); 
+                       else te.setName(node.getName()+": "+value); 
                        break;        
+               case 13: // This type is for a ObjectCategory
+                       if (te.getIcon() != TreeElement.ICON_MIND) 
+                          te.setIcon(TreeElement.ICON_OBJECTPOSSIBILITY);
+                       if (value.equalsIgnoreCase(""))
+                           te.setName(node.getName()); 
+                       else te.setName(node.getName()+" ["+value+"]"); 
+                       break;
+               case 14: // This type is for a EpisodeCategory
+                       if (te.getIcon() != TreeElement.ICON_MIND) 
+                          te.setIcon(TreeElement.ICON_EPISODEPOSSIBILITY);
+                       if (value.equalsIgnoreCase(""))
+                           te.setName(node.getName()); 
+                       else te.setName(node.getName()+" ["+value+"]"); 
+                       break;         
                default: if (te.getIcon() != TreeElement.ICON_MIND) 
                           te.setIcon(TreeElement.ICON_OBJECT3);
                         if (value.equalsIgnoreCase(""))