commit 03bf965cb8e84d8c09b65ccc784e5d280e717276
author kchong <kchong> Tue Sep 05 18:46:04 2006 +0000
committer kchong <kchong> Tue Sep 05 18:46:04 2006 +0000
tree 7e09e079a51eb69c76c05bbbe72b8aa551b3777c
parent 3cd834af5ef1f160717b65e9ca8ea3bdde3c2c7d

[no bug] Model group hover help should show tag name

bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ModelGroupEditPart.java

diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ModelGroupEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ModelGroupEditPart.java
index 79103d7..9181f88 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ModelGroupEditPart.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ModelGroupEditPart.java
@@ -30,6 +30,7 @@
 import org.eclipse.xsd.XSDModelGroupDefinition;
 import org.eclipse.xsd.XSDParticle;
 import org.eclipse.xsd.XSDWildcard;
+import org.eclipse.xsd.util.XSDConstants;
 
 public class ModelGroupEditPart extends ConnectableEditPart
 {
@@ -69,21 +70,26 @@
     XSDModelGroupAdapter adapter = (XSDModelGroupAdapter) getModel();
     isReadOnly = adapter.isReadOnly();
     
+    String nodeName = "";
+    
     switch (getXSDModelGroup().getCompositor().getValue())
     {
       case XSDCompositor.ALL:
       {
         modelGroupFigure.getIconFigure().image = isReadOnly ? ModelGroupFigure.ALL_ICON_DISABLED_IMAGE :ModelGroupFigure.ALL_ICON_IMAGE;
+        nodeName = XSDConstants.ALL_ELEMENT_TAG;
         break;
       }
       case XSDCompositor.CHOICE:
       {
         modelGroupFigure.getIconFigure().image = isReadOnly ? ModelGroupFigure.CHOICE_ICON_DISABLED_IMAGE : ModelGroupFigure.CHOICE_ICON_IMAGE;
+        nodeName = XSDConstants.CHOICE_ELEMENT_TAG;
         break;
       }
       case XSDCompositor.SEQUENCE:
       {
         modelGroupFigure.getIconFigure().image = isReadOnly ? ModelGroupFigure.SEQUENCE_ICON_DISABLED_IMAGE : ModelGroupFigure.SEQUENCE_ICON_IMAGE;
+        nodeName = XSDConstants.SEQUENCE_ELEMENT_TAG;
         break;
       }
     }
@@ -100,24 +106,24 @@
     
     if (minOccurs == -3 && maxOccurs == -3)
     {
-      occurenceDescription = ""; //$NON-NLS-1$
+      occurenceDescription = nodeName;
       modelGroupFigure.setText(null);
     }
     else if (minOccurs == 0 && (maxOccurs == -2 || maxOccurs == 1))
     {
-      occurenceDescription = "[0..1]"; //$NON-NLS-1$
+      occurenceDescription = nodeName + " [0..1]"; //$NON-NLS-1$
       modelGroupFigure.setText("0..1");
     }
     else if ((minOccurs == 1 && maxOccurs == 1) ||
              (minOccurs == -2 && maxOccurs == 1) ||
              (minOccurs == 1 && maxOccurs == -2))
     {
-      occurenceDescription = "[1..1]"; //$NON-NLS-1$
+      occurenceDescription = nodeName + " [1..1]"; //$NON-NLS-1$
       modelGroupFigure.setText("1..1");
     }
     else if (minOccurs == -2 && maxOccurs == -2)
     {
-      occurenceDescription = ""; //$NON-NLS-1$
+      occurenceDescription = nodeName;
       modelGroupFigure.setText(null);
     }
     else
@@ -126,7 +132,7 @@
       String maxSymbol = maxOccurs == -1 ? "*" : "" + maxOccurs; //$NON-NLS-1$ //$NON-NLS-2$
       
       String minSymbol = minOccurs == -2 ? "1" : "" + minOccurs; //$NON-NLS-1$ //$NON-NLS-2$
-      occurenceDescription = "[" + minSymbol + ".." + maxSymbol + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+      occurenceDescription = nodeName + " [" + minSymbol + ".." + maxSymbol + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
       modelGroupFigure.setText(minSymbol + ".." + maxSymbol);
     }