浏览代码

Merge branch 'master' of https://github.com/Yakindu/statecharts.git

Andreas Muelder 9 年之前
父节点
当前提交
361f7bb246
共有 21 个文件被更改,包括 26 次插入24 次删除
  1. 2 1
      examples/org.yakindu.sct.standalone/META-INF/MANIFEST.MF
  2. 22 21
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/40_editing statecharts.textile
  3. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_010_overview.png
  4. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_020_symbol_select.png
  5. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_030_symbol_zoom_in.png
  6. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_040_symbol_zoom_out.png
  7. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_070_symbol_note.png
  8. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_210_tool_transition.png
  9. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_220_tool_state.png
  10. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_230_tool_composite_state.png
  11. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_240_tool_orthogonal_state.png
  12. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_250_tool_region.png
  13. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_260_tool_entry.png
  14. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_270_tool_shallow_history.png
  15. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_280_tool_deep_history.png
  16. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_290_tool_final_state.png
  17. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_300_tool_exit_node.png
  18. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_310_tool_choice.png
  19. 二进制
      plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_320_tool_synchronization.png
  20. 1 1
      plugins/org.yakindu.sct.generator.csharp/META-INF/MANIFEST.MF
  21. 1 1
      test-plugins/org.yakindu.sct.generator.csharp.test/META-INF/MANIFEST.MF

+ 2 - 1
examples/org.yakindu.sct.standalone/META-INF/MANIFEST.MF

@@ -2,7 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Standalone
 Bundle-SymbolicName: org.yakindu.sct.standalone
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.9.0.qualifier
+Bundle-Vendor: itemis AG
 Export-Package: com.yakindu.sct.standalone
 Require-Bundle: org.yakindu.sct.model.sgen,
  org.yakindu.sct.generator.genmodel,

+ 22 - 21
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/40_editing statecharts.textile

@@ -70,33 +70,34 @@ The editor palette provides you with a set of various actions and statechart edi
 
 You can hide the palette by clicking at the small triangle in the palette's title bar. Click at the triangle again to make the palette reappear.
 
+!(standard-image)images/editor-palette_010_overview.png(Editor palette)!
+
+p=. Editor palette
+
 h4(#oss-editing-action-tools). Editing action tools
 
 Below its title bar, the palette contains a toolbar with the following editing action tools (from left to right):
-| [SYMBOL] | Select | |
-| [SYMBOL] | Zoom in | Left-click to zoom in. Press @[Shift]@ and left-click to zoom out. Drag to zoom to selection. |
-| [SYMBOL] | Zoom out | Left-click to zoom out. Press @[Shift]@ and left-click to zoom in. |
-| [SYMBOL] | Rectangle selection | Click and drag to select everything completely included in the selection rectangle. Submenus allow to restrict the selected objects to nodes, labels or transitions, respectively. |
-| [SYMBOL] | Intersection selection | Click and drag to select everything included in or touched by the selection rectangle. Submenus allow to restrict the selected objects to nodes, labels or transitions, respectively. |
-| [SYMBOL] | Note | Create a note, a text or a note attachment. |
+| !images/editor-palette_020_symbol_select.png(Editor palette symbol "Select")! | Select | |
+| !images/editor-palette_030_symbol_zoom_in.png(Editor palette symbol "Zoom in")! | Zoom in | Left-click to zoom in. Press @[Shift]@ and left-click to zoom out. Drag to zoom to selection. |
+| !images/editor-palette_040_symbol_zoom_out.png(Editor palette symbol "Zoom out")! | Zoom out | Left-click to zoom out. Press @[Shift]@ and left-click to zoom in. |
+| !images/editor-palette_070_symbol_note.png(Editor palette symbol "Note")! | Note | Create a note, a text or a note attachment. |
 
 h4(#oss-statechart-elements-tools). Statechart elements tools
 
-The palette comprises a couple of tools serving to add statechart elements to the diagram:
-
-Below its title bar, the palette contains a toolbar with the following editing action tools (from left to right):
-| [SYMBOL] | Transition |  |
-| [SYMBOL] | State |  |
-| [SYMBOL] | Composite state |  |
-| [SYMBOL] | Orthogonal state |  |
-| [SYMBOL] | Region |  |
-| [SYMBOL] | Entry |  |
-| [SYMBOL] | Shallow history |  |
-| [SYMBOL] | Deep history |  |
-| [SYMBOL] | Final state |  |
-| [SYMBOL] | Exit node |  |
-| [SYMBOL] | Choice |  |
-| [SYMBOL] | Synchronization |  |
+The palette comprises a couple of tools serving to add statechart elements to the diagram (from top to bottom):
+
+| !images/editor-palette_210_tool_transition.png(Editor palette element tool "Transition")! | Transition |  |
+| !images/editor-palette_220_tool_state.png(Editor palette element tool "State")! | State |  |
+| !images/editor-palette_230_tool_composite_state.png(Editor palette element tool "Composite state")! | Composite state |  |
+| !images/editor-palette_240_tool_orthogonal_state.png(Editor palette element tool "Orthogonal state")! | Orthogonal state |  |
+| !images/editor-palette_250_tool_region.png(Editor palette element tool "Region")! | Region |  |
+| !images/editor-palette_260_tool_entry.png(Editor palette element tool "Entry")! | Entry |  |
+| !images/editor-palette_270_tool_shallow_history.png(Editor palette element tool "Shallow history")! | Shallow history |  |
+| !images/editor-palette_280_tool_deep_history.png(Editor palette element tool "Deep history")! | Deep history |  |
+| !images/editor-palette_290_tool_final_state.png(Editor palette element tool "Final state")! | Final state |  |
+| !images/editor-palette_300_tool_exit_node.png(Editor palette element tool "Exit node")! | Exit node |  |
+| !images/editor-palette_310_tool_choice.png(Editor palette element tool "Choice")! | Choice |  |
+| !images/editor-palette_320_tool_synchronization.png(Editor palette element tool "Synchronization")! | Synchronization |  |
 
 h3(#outline-view). Outline view
 

二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_010_overview.png


二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_020_symbol_select.png


二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_030_symbol_zoom_in.png


二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_040_symbol_zoom_out.png


二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_070_symbol_note.png


二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_210_tool_transition.png


二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_220_tool_state.png


二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_230_tool_composite_state.png


二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_240_tool_orthogonal_state.png


二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_250_tool_region.png


二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_260_tool_entry.png


二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_270_tool_shallow_history.png


二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_280_tool_deep_history.png


二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_290_tool_final_state.png


二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_300_tool_exit_node.png


二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_310_tool_choice.png


二进制
plugins/org.yakindu.sct.doc.user/src/Part2-User-Guide/images/editor-palette_320_tool_synchronization.png


+ 1 - 1
plugins/org.yakindu.sct.generator.csharp/META-INF/MANIFEST.MF

@@ -28,5 +28,5 @@ Bundle-Vendor: statecharts.org
 Export-Package: org.yakindu.sct.generator.csharp,
  org.yakindu.sct.generator.csharp.features
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 

+ 1 - 1
test-plugins/org.yakindu.sct.generator.csharp.test/META-INF/MANIFEST.MF

@@ -12,5 +12,5 @@ Require-Bundle: org.yakindu.sct.test.models;bundle-version="1.0.0",
  org.yakindu.sct.generator.genmodel;bundle-version="1.0.0",
  org.eclipse.jdt.core;bundle-version="3.7.3",
  org.eclipse.ui;bundle-version="3.7.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: statecharts.org