Detection and warning when a brick has more than one version.

Each brick must have exactly one version.
virtualcell · Feb 14, 2020 · 7756c7a · 7756c7a
1 parent a49b433
commit 7756c7a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/vcell-client/src/main/java/cbit/vcell/desktop/BioModelCellRenderer.java b/vcell-client/src/main/java/cbit/vcell/desktop/BioModelCellRenderer.java
@@ -259,7 +259,13 @@ public java.awt.Component getTreeCellRendererComponent(JTree tree, Object value,
 							component.setText(modelName);
 							component.setToolTipText(toolTip);
 						} else {
-							component.setText(modelName);				// keep it simple for anything else
+							String str = modelName;
+							if(node.getChildCount() > 1) {
+								String prefix = sel ? "" : "<span style=\"color:#8B0000\">";
+								String suffix = sel ? "" : "</span>";
+								str += prefix + " (" + node.getChildCount() + ")" + suffix;
+							}
+							component.setText("<html>" + str + "</html>");
 							component.setToolTipText(toolTip);
 						}
 					} else {

diff --git a/vcell-client/src/main/java/cbit/vcell/desktop/VCDocumentDbCellRenderer.java b/vcell-client/src/main/java/cbit/vcell/desktop/VCDocumentDbCellRenderer.java
@@ -14,6 +14,7 @@
 import javax.swing.JLabel;
 import javax.swing.JTree;
 
+import org.omg.PortableInterceptor.USER_EXCEPTION;
 import org.vcell.util.document.GroupAccess;
 import org.vcell.util.document.User;
 import org.vcell.util.document.VCDocumentInfo;
@@ -201,6 +202,11 @@ else if(userObject instanceof VCDocumentInfoNode) {
 						}
 					}
 				}
+			} else if(sessionUser != null && nodeUser != null && VCDocumentDbTreeModel.USER_modelBricks.equals(nodeUser.getName())) {
+				// we warn if any brick has more than one version
+				if(node.getChildCount() != 1) {
+					setIcon(fieldFolderWarningIcon);
+				}
 			}
 		}
 	}