Merge lp://staging/~danilovesky/workcraft/trunk-bug-1321714 into lp://staging/workcraft
Proposed by
Danil Sokolov
Status: | Merged |
---|---|
Merged at revision: | 520 |
Proposed branch: | lp://staging/~danilovesky/workcraft/trunk-bug-1321714 |
Merge into: | lp://staging/workcraft |
Diff against target: |
568 lines (+121/-83) 19 files modified
CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuitComponent.java (+6/-0) GraphPlugin/src/org/workcraft/plugins/graph/ToolsProvider.java (+0/-3) SONPlugin/src/org/workcraft/plugins/son/SONToolProvider.java (+0/-3) WorkcraftCore/src/org/workcraft/Framework.java (+6/-10) WorkcraftCore/src/org/workcraft/dom/AbstractGroup.java (+50/-41) WorkcraftCore/src/org/workcraft/dom/DefaultHangingConnectionRemover.java (+1/-1) WorkcraftCore/src/org/workcraft/dom/math/MathConnection.java (+2/-1) WorkcraftCore/src/org/workcraft/dom/math/MathGroup.java (+13/-9) WorkcraftCore/src/org/workcraft/dom/visual/AbstractVisualModel.java (+1/-5) WorkcraftCore/src/org/workcraft/dom/visual/VisualGroup.java (+4/-0) WorkcraftCore/src/org/workcraft/dom/visual/VisualPage.java (+4/-0) WorkcraftCore/src/org/workcraft/dom/visual/connections/Polyline.java (+5/-1) WorkcraftCore/src/org/workcraft/dom/visual/connections/VisualConnection.java (+6/-0) WorkcraftCore/src/org/workcraft/gui/graph/tools/PageGeneratorTool.java (+1/-3) WorkcraftCore/src/org/workcraft/observation/ObservableHierarchy.java (+1/-0) WorkcraftCore/src/org/workcraft/observation/ObservableHierarchyImpl.java (+4/-0) WorkcraftCore/src/org/workcraft/workspace/WorkspaceEntry.java (+6/-6) XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualXmasComponent.java (+6/-0) XmasPlugin/src/org/workcraft/plugins/xmas/components/XmasComponent.java (+5/-0) |
To merge this branch: | bzr merge lp://staging/~danilovesky/workcraft/trunk-bug-1321714 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Danil Sokolov | Approve | ||
Review via email:
|
To post a comment you must log in.