lp:~danilovesky/workcraft/trunk-bug-1365553

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:workcraft at revision 543

Danil Sokolov: Approve on 2014-09-05

Diff: 1424 lines (+335/-288)

23 files modified

CircuitPlugin/src/org/workcraft/plugins/circuit/CircuitComponent.java (+0/-3)
CircuitPlugin/src/org/workcraft/plugins/circuit/CircuitModelDescriptor.java (+1/-3)
CircuitPlugin/src/org/workcraft/plugins/circuit/Contact.java (+0/-3)
CircuitPlugin/src/org/workcraft/plugins/circuit/FunctionComponent.java (+0/-3)
CircuitPlugin/src/org/workcraft/plugins/circuit/FunctionContact.java (+0/-4)
CircuitPlugin/src/org/workcraft/plugins/circuit/Joint.java (+0/-4)
CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuit.java (+3/-2)
CircuitPlugin/src/org/workcraft/plugins/circuit/VisualJoint.java (+0/-1)
DfsPlugin/src/org/workcraft/plugins/dfs/Dfs.java (+0/-1)
DfsPlugin/src/org/workcraft/plugins/dfs/VisualDfs.java (+3/-1)
GraphPlugin/src/org/workcraft/plugins/graph/VisualGraph.java (+2/-0)
PolicyNetPlugin/src/org/workcraft/plugins/policy/VisualPolicyNet.java (+3/-1)
WorkcraftCore/src/org/workcraft/annotations/DisplayName.java (+0/-7)
WorkcraftCore/src/org/workcraft/annotations/ShortName.java (+33/-0)
WorkcraftCore/src/org/workcraft/dom/AbstractModel.java (+26/-13)
WorkcraftCore/src/org/workcraft/dom/Model.java (+7/-2)
WorkcraftCore/src/org/workcraft/gui/CreateWorkDialog.java (+25/-25)
WorkcraftCore/src/org/workcraft/gui/DockableWindow.java (+44/-66)
WorkcraftCore/src/org/workcraft/gui/DockableWindowContentPanel.java (+48/-63)
WorkcraftCore/src/org/workcraft/gui/MainWindow.java (+72/-58)
WorkcraftCore/src/org/workcraft/gui/tabs/DockableTab.java (+19/-27)
WorkcraftCore/src/org/workcraft/plugins/shared/CommonEditorSettings.java (+46/-0)
XmasPlugin/src/org/workcraft/plugins/xmas/VisualXmas.java (+3/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1365553: Introduce short names for the model types

Wishlist

Fix Committed

Link a bug report

Related blueprints

543. By Danil Sokolov on 2014-09-05

Introduce short names for the model types.

542. By Danil Sokolov on 2014-09-04

Merge proposal for bug #1360339 approved.

541. By Danil Sokolov on 2014-08-22

Merge proposal for bug #1360299 approved.

540. By Danil Sokolov on 2014-08-06

Merge proposal for bug #1342059 approved.

539. By Danil Sokolov on 2014-08-06

Merge proposal for bug #1343266 approved.

538. By Danil Sokolov on 2014-08-06

Merge proposal for bug #1349754 approved.

537. By Danil Sokolov on 2014-08-04

Merge proposal for bugs 1351503 and 1351504 approved.

536. By Danil Sokolov on 2014-08-01

Merge proposal for the blueprint ui-std-clear approved.

535. By Danil Sokolov on 2014-08-01

Merge proposal for the blueprint ui-file-recent approved.

534. By Danil Sokolov on 2014-08-01

Merge proposal for blueprint ui-text-newline approved.