Author: guixl
Date: Wed May 19 13:12:28 2010
New Revision: 946171
URL: http://svn.apache.org/viewvc?rev=946171&view=rev
Log:
add palette group for SCXML visual editor
Modified:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/messages.properties
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/part/Messages.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ModelingPaletteFactory.java
Modified:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/messages.properties
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/messages.properties?rev=946171&r1=946170&r2=946171&view=diff
==============================================================================
---
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/messages.properties
(original)
+++
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/messages.properties
Wed May 19 13:12:28 2010
@@ -44,7 +44,9 @@ ModelingDiagramEditor_SaveErrorMessage=C
ModelingElementChooserDialog_SelectModelElementTitle=Select model element
ModelElementSelectionPageMessage=Select model element:
ValidateActionMessage=Validate
-Scxml1Group_title=scxml
+ScxmlGroup_title_State=Scxml State Element
+ScxmlGroup_title_ExecuteContent=Execute Content
+ScxmlGroup_title_DataModel=Data Model Element
State1CreationTool_title=State
State1CreationTool_desc=Create new State
Translation2CreationTool_title=Translation
Modified:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/part/Messages.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/part/Messages.java?rev=946171&r1=946170&r2=946171&view=diff
==============================================================================
---
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/part/Messages.java
(original)
+++
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/part/Messages.java
Wed May 19 13:12:28 2010
@@ -243,7 +243,20 @@ public class Messages extends NLS {
/**
* @generated
*/
- public static String Scxml1Group_title;
+ public static String ScxmlGroup_title_State;
+
+ /**
+ * @author Gui Xun Long
+ *
+ * scxml palette tool execute content label
+ */
+ public static String ScxmlGroup_title_ExecuteContent;
+ /**
+ * @author Gui Xun Long
+ *
+ * scxml palette tool execute content label
+ */
+ public static String ScxmlGroup_title_DataModel;
/**
* @generated
Modified:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ModelingPaletteFactory.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ModelingPaletteFactory.java?rev=946171&r1=946170&r2=946171&view=diff
==============================================================================
---
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ModelingPaletteFactory.java
(original)
+++
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ModelingPaletteFactory.java
Wed May 19 13:12:28 2010
@@ -6,6 +6,7 @@ import java.util.List;
import
org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
import org.eclipse.gef.Tool;
import org.eclipse.gef.palette.PaletteContainer;
+import org.eclipse.gef.palette.PaletteDrawer;
import org.eclipse.gef.palette.PaletteGroup;
import org.eclipse.gef.palette.PaletteRoot;
import org.eclipse.gef.palette.ToolEntry;
@@ -22,6 +23,8 @@ public class ModelingPaletteFactory {
*/
public void fillPalette(PaletteRoot paletteRoot) {
paletteRoot.add(createScxml1Group());
+ paletteRoot.add(createExecuteGroup());
+ paletteRoot.add(createScxmlDataModelGroup());
}
/**
@@ -29,36 +32,64 @@ public class ModelingPaletteFactory {
* @generated
*/
private PaletteContainer createScxml1Group() {
- PaletteGroup paletteContainer = new PaletteGroup(
- Messages.Scxml1Group_title);
+ PaletteDrawer drawer = new
PaletteDrawer(Messages.ScxmlGroup_title_State);
+
+ List paletteContainer = new ArrayList();
+
+ //PaletteGroup paletteContainer = new
PaletteGroup(Messages.ScxmlGroup_title_State);
+ paletteContainer.add(createInitialState6CreationTool());
paletteContainer.add(createState1CreationTool());
+ paletteContainer.add(createParallel8CreationTool());
+ paletteContainer.add(createHistoryState9CreationTool());
+ paletteContainer.add(createFinalState7CreationTool());
paletteContainer.add(createTranslation2CreationTool());
- paletteContainer.add(createAssign3CreationTool());
paletteContainer.add(createOnEntry4CreationTool());
paletteContainer.add(createOnExit5CreationTool());
- paletteContainer.add(createInitialState6CreationTool());
- paletteContainer.add(createFinalState7CreationTool());
- paletteContainer.add(createParallel8CreationTool());
- paletteContainer.add(createHistoryState9CreationTool());
+ paletteContainer.add(createAnchor21CreationTool());
+ paletteContainer.add(createInvoke26CreationTool());
+ paletteContainer.add(createFinalize27CreationTool());
+ paletteContainer.add(createDonedata25CreationTool());
+ //return paletteContainer;
+ drawer.addAll(paletteContainer);
+ return drawer;
+ }
+
+ /**
+ * Creates "scxml" palette tool execute content group
+ * @generated
+ */
+ private PaletteContainer createExecuteGroup() {
+ //PaletteGroup paletteContainer = new
PaletteGroup(Messages.ScxmlGroup_title_ExecuteContent);
+ PaletteDrawer drawer = new
PaletteDrawer(Messages.ScxmlGroup_title_ExecuteContent);
+
+ List paletteContainer = new ArrayList();
+ paletteContainer.add(createAssign3CreationTool());
paletteContainer.add(createRaise10CreationTool());
paletteContainer.add(createIf11CreationTool());
paletteContainer.add(createElseIf12CreationTool());
paletteContainer.add(createElse13CreationTool());
paletteContainer.add(createLog14CreationTool());
- paletteContainer.add(createExtenExecContent15CreationTool());
- paletteContainer.add(createDataModel16CreationTool());
- paletteContainer.add(createData17CreationTool());
paletteContainer.add(createValidate18CreationTool());
paletteContainer.add(createParam19CreationTool());
- paletteContainer.add(createScript20CreationTool());
- paletteContainer.add(createAnchor21CreationTool());
paletteContainer.add(createSend22CreationTool());
paletteContainer.add(createCancel23CreationTool());
+ //return paletteContainer;
+ drawer.addAll(paletteContainer);
+ return drawer;
+ }
+
+ private PaletteContainer createScxmlDataModelGroup() {
+ //PaletteGroup paletteContainer = new
PaletteGroup(Messages.ScxmlGroup_title_DataModel);
+ PaletteDrawer drawer = new
PaletteDrawer(Messages.ScxmlGroup_title_DataModel);
+
+ List paletteContainer = new ArrayList();
+ paletteContainer.add(createDataModel16CreationTool());
+ paletteContainer.add(createData17CreationTool());
+ paletteContainer.add(createScript20CreationTool());
paletteContainer.add(createContent24CreationTool());
- paletteContainer.add(createDonedata25CreationTool());
- paletteContainer.add(createInvoke26CreationTool());
- paletteContainer.add(createFinalize27CreationTool());
- return paletteContainer;
+ drawer.addAll(paletteContainer);
+ return drawer;
+ //return paletteContainer;
}
/**
