Favorites on building blocks show up as "null"

diylc/diylc-swing/src/org/diylc/swing/plugins/tree/CustomTreeModel.java

@@ -40,6 +40,7 @@ import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.appframework.miscutils.IConfigListener;
 import org.diylc.common.ComponentType;
 import org.diylc.common.Favorite;
+import org.diylc.common.Favorite.FavoriteType;
 import org.diylc.common.IBlockProcessor.InvalidBlockException;
 import org.diylc.common.IPlugInPort;
 import org.diylc.core.IDIYComponent;
@@ -118,6 +119,7 @@ public class CustomTreeModel implements TreeModel {
 
     if (FAVORITES.equals(category)) {
       for (Favorite fav : this.favorites) {
+        if (fav.getType() == FavoriteType.Component) {
           ComponentType type = this.typesByClass.get(fav.getName());
           if (this.searchText == null || type.getName().toLowerCase().contains(this.searchText)) {
             visibleTypes.add(new TreeNode(type, new MouseAdapter() {
@@ -128,6 +130,28 @@ public class CustomTreeModel implements TreeModel {
               }
             }));
           }
+        } else {
+          // block
+          if (this.searchText == null || fav.getName().toLowerCase().contains(this.searchText)) {
+            visibleTypes.add(new TreeNode(fav.getName(), new MouseAdapter() {
+
+              long previousActionTime = 0;
+
+              @Override
+              public void mouseClicked(MouseEvent e) {
+                if (e == null || SwingUtilities.isLeftMouseButton(e)
+                    && System.currentTimeMillis() - previousActionTime > 100) {
+                  previousActionTime = System.currentTimeMillis();
+                  try {
+                    plugInPort.loadBlock(fav.getName());
+                  } catch (InvalidBlockException e1) {
+                    e1.printStackTrace();
+                  }
+                }
+              }
+            }, true));
+          }
+        }
       }
     }
 
@@ -155,7 +179,8 @@ public class CustomTreeModel implements TreeModel {
 
             @Override
             public void mouseClicked(MouseEvent e) {
-              if (e == null || SwingUtilities.isLeftMouseButton(e) && System.currentTimeMillis() - previousActionTime > 100) {
+              if (e == null || SwingUtilities.isLeftMouseButton(e)
+                  && System.currentTimeMillis() - previousActionTime > 100) {
                 previousActionTime = System.currentTimeMillis();
                 try {
                   plugInPort.loadBlock(block);