diff options
author | Einav Weiss Keidar <einavw@amdocs.com> | 2018-05-30 18:12:02 +0300 |
---|---|---|
committer | Vitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com> | 2018-07-08 08:58:48 +0000 |
commit | f2c47232959536b878b1db64a8a5ffb63a1d7f1f (patch) | |
tree | db73f6396a089bbc74ee7372180a01286bf3b3a0 /dox-sequence-diagram-ui/src | |
parent | d4cc2beaef58a4fc95bdc281efd879b1d1edf279 (diff) |
webpack 4 upgrade
Issue-ID: SDC-1388
Change-Id: I44d61491ef802187baa4beb3b4fc2c9f1e8405e5
Signed-off-by: Einav Weiss Keidar <einavw@amdocs.com>
Diffstat (limited to 'dox-sequence-diagram-ui/src')
26 files changed, 87 insertions, 205 deletions
diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/diagram/Diagram.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/diagram/Diagram.jsx index 129a1afc2b..bd5f78d85f 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/diagram/Diagram.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/diagram/Diagram.jsx @@ -18,7 +18,8 @@ import React from 'react'; import PropTypes from 'prop-types'; import _template from 'lodash/template'; import _merge from 'lodash/merge'; -import * as d3 from 'd3'; +import { select, event as d3event } from 'd3-selection'; +import { zoom as d3zoom } from 'd3-zoom'; import Common from '../../common/Common'; import Logger from '../../common/Logger'; @@ -220,7 +221,7 @@ class Diagram extends React.Component { if (!this.svg) { const svgparams = _merge({}, this.options.svg); this.wrapper.innerHTML = this.templates.diagram(svgparams); - this.svg = d3.select(this.wrapper).select('svg'); + this.svg = select(this.wrapper).select('svg'); } if (this.state.height === 0) { @@ -766,7 +767,7 @@ class Diagram extends React.Component { .on('mouseenter', function f() { timer = setTimeout(() => { self.application.selectLifeline( - d3.select(this.parentNode).attr('data-id') + select(this.parentNode).attr('data-id') ); }, 150); }) @@ -775,7 +776,7 @@ class Diagram extends React.Component { self.application.selectLifeline(); }) .on('click', function f() { - const id = d3.select(this.parentNode).attr('data-id'); + const id = select(this.parentNode).attr('data-id'); window.postMessage({ source, id, type: 'lifeline' }, origin); }); @@ -784,7 +785,7 @@ class Diagram extends React.Component { .on('mouseenter', function f() { timer = setTimeout(() => { self.application.selectLifeline( - d3.select(this.parentNode).attr('data-id') + select(this.parentNode).attr('data-id') ); }, 150); }) @@ -793,7 +794,7 @@ class Diagram extends React.Component { self.application.selectLifeline(); }) .on('click', function f() { - const id = d3.select(this.parentNode).attr('data-id'); + const id = select(this.parentNode).attr('data-id'); window.postMessage( { source, id, type: 'lifelineHeader' }, origin @@ -803,10 +804,10 @@ class Diagram extends React.Component { gCanvas .selectAll('.asdcs-diagram-message-selectable') .on('mouseenter', function f() { - self.events.message = { x: d3.event.pageX, y: d3.event.pageY }; + self.events.message = { x: d3event.pageX, y: d3event.pageY }; timer = setTimeout(() => { self.application.selectMessage( - d3.select(this.parentNode).attr('data-id') + select(this.parentNode).attr('data-id') ); }, 200); }) @@ -816,7 +817,7 @@ class Diagram extends React.Component { self.application.selectMessage(); }) .on('click', function f() { - const id = d3.select(this.parentNode).attr('data-id'); + const id = select(this.parentNode).attr('data-id'); window.postMessage({ source, id, type: 'message' }, origin); }); } @@ -870,16 +871,16 @@ class Diagram extends React.Component { _initZoom(gContent, width, height) { const zoomed = function zoomed() { if (!this.initialTransformX && !this.initialTransformY) { - this.initialTransformX = d3.event.transform.x; - this.initialTransformY = d3.event.transform.y; + this.initialTransformX = d3event.transform.x; + this.initialTransformY = d3event.transform.y; } gContent.attr( 'transform', - `translate(${d3.event.transform.x - - this.initialTransformX}, ${d3.event.transform.y - - this.initialTransformY})scale(${d3.event.transform.k}, ${ - d3.event.transform.k + `translate(${d3event.transform.x - + this.initialTransformX}, ${d3event.transform.y - + this.initialTransformY})scale(${d3event.transform.k}, ${ + d3event.transform.k })` ); }; @@ -922,7 +923,7 @@ class Diagram extends React.Component { gContent.attr('transform', `scale(${scale})`); } - const zoom = d3.zoom().on('zoom', zoomed); + const zoom = d3zoom().on('zoom', zoomed); this.svg.call(zoom); this.svg.call(zoom.scaleBy, scale); diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/icons/Icon.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/icons/Icon.jsx index 51849676e4..71c9e69286 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/icons/Icon.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/icons/Icon.jsx @@ -25,8 +25,8 @@ import PropTypes from 'prop-types'; */ const Icon = function Icon({ glyph, className }) { return ( - <svg viewBox="0 0 1000 1000" className={className}> - <use xlinkHref={glyph} className="asdcs-icon" /> + <svg className={className} viewBox={glyph.viewBox}> + <use xlinkHref={`#${glyph.id}`} /> </svg> ); }; @@ -34,7 +34,7 @@ const Icon = function Icon({ glyph, className }) { /** Declare properties. */ Icon.propTypes = { className: PropTypes.string, - glyph: PropTypes.string.isRequired + glyph: PropTypes.object.isRequired }; export default Icon; diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/arrow/request-async.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/arrow/request-async.svg index 11c5086198..bc5d60896f 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/arrow/request-async.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/arrow/request-async.svg @@ -2,58 +2,20 @@ <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1000" - height="1000" - id="svg2985" - version="1.1" - inkscape:version="0.48.5 r10040" - sodipodi:docname="request-async.svg"> - <metadata - id="metadata9"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs7" /> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1029" - id="namedview5" - showgrid="false" - inkscape:zoom="0.944" - inkscape:cx="297.24147" - inkscape:cy="436.65307" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="1" - inkscape:current-layer="layer1" /> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> - <path - d="M 480.40625 246.34375 L 480.40625 366.90625 L 480.40625 372.8125 L 532.90625 403.96875 L 610.59375 450 L 130.9375 450 L 100 450 L 100 480.9375 L 100 519.0625 L 100 550 L 130.9375 550 L 609.0625 550 L 532.90625 595.15625 L 480.40625 626.3125 L 480.40625 632.21875 L 480.40625 752.84375 L 583.0625 689.5625 L 798.40625 556.84375 L 891.4375 499.5 L 798.375 442.1875 L 583.0625 309.5625 L 480.40625 246.34375 z " - id="path3762" /> - </g> + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="1000" + height="1000" + id="svg3809" + version="1.1" + inkscape:version="0.48.5 r10040" + sodipodi:docname="handle.svg"> + <path + d="M 224.4375 150 A 74.815327 74.815327 0 1 0 224.4375 299.625 L 775.5625 299.625 A 74.815327 74.815327 0 1 0 775.5625 150 L 224.4375 150 z M 225.25 425.375 A 74.596181 74.815327 0 1 0 225.25 575 L 774.75 575 A 74.596181 74.815327 0 1 0 774.75 425.375 L 225.25 425.375 z M 225.25 700.375 A 74.596181 74.815327 0 1 0 225.25 850 L 774.75 850 A 74.596181 74.815327 0 1 0 774.75 700.375 L 225.25 700.375 z " + id="path2988" /> </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/close.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/close.svg index 2fd91dea94..4e20d9dd11 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/close.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/close.svg @@ -15,13 +15,9 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="delete.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="M 500,98.34375 C 278.76784,98.34375 98.34375,278.76784 98.34375,500 98.34375,721.23216 278.76784,901.65625 500,901.65625 721.23214,901.65625 901.65625,721.23216 901.65625,500 901.65625,278.76783 721.23215,98.34375 500,98.34375 z m 0,100 c 167.18813,0 301.65625,134.4681 301.65625,301.65625 C 801.65625,667.18814 667.18814,801.65625 500,801.65625 332.81184,801.65625 198.34375,667.18814 198.34375,500 198.34375,332.81184 332.81184,198.34375 500,198.34375 z m -154.4375,97.25 A 50.005,50.005 0 0 0 310.71875,381.4375 L 429.28125,500 310.71875,618.5625 a 50.005708,50.005708 0 1 0 70.71875,70.71875 L 500,570.71875 618.5625,689.28125 A 50.005708,50.005708 0 1 0 689.28125,618.5625 L 570.71875,500 689.28125,381.4375 A 50.005708,50.005708 0 1 0 618.5625,310.71875 L 500,429.28125 381.4375,310.71875 a 50.005,50.005 0 0 0 -35.875,-15.125 z" - id="path3789-6" - inkscape:connector-curvature="0" /> - </g> + id="path3789-6"/> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/collapsed.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/collapsed.svg index 2865518a49..ab75dbfcd3 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/collapsed.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/collapsed.svg @@ -16,13 +16,7 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="collapsed.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> <path d="m 500.5625,299.375 a 74.185358,74.185358 0 0 0 -2.65625,0.1875 A 74.185358,74.185358 0 0 0 451.25,315.875 L 128.59375,567.3125 a 74.185358,74.185358 0 1 0 91.1875,117.03125 L 500.125,465.84375 780.21875,684.125 a 74.185358,74.185358 0 1 0 91.1875,-117 L 548.75,315.65625 A 74.185358,74.185358 0 0 0 500.5625,299.375 z" - id="path2991-0" - inkscape:connector-curvature="0" /> - </g> + id="path2991-0"/> </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/delete.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/delete.svg index 2fd91dea94..285f3dc017 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/delete.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/delete.svg @@ -15,13 +15,8 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="delete.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> <path d="M 500,98.34375 C 278.76784,98.34375 98.34375,278.76784 98.34375,500 98.34375,721.23216 278.76784,901.65625 500,901.65625 721.23214,901.65625 901.65625,721.23216 901.65625,500 901.65625,278.76783 721.23215,98.34375 500,98.34375 z m 0,100 c 167.18813,0 301.65625,134.4681 301.65625,301.65625 C 801.65625,667.18814 667.18814,801.65625 500,801.65625 332.81184,801.65625 198.34375,667.18814 198.34375,500 198.34375,332.81184 332.81184,198.34375 500,198.34375 z m -154.4375,97.25 A 50.005,50.005 0 0 0 310.71875,381.4375 L 429.28125,500 310.71875,618.5625 a 50.005708,50.005708 0 1 0 70.71875,70.71875 L 500,570.71875 618.5625,689.28125 A 50.005708,50.005708 0 1 0 689.28125,618.5625 L 570.71875,500 689.28125,381.4375 A 50.005708,50.005708 0 1 0 618.5625,310.71875 L 500,429.28125 381.4375,310.71875 a 50.005,50.005 0 0 0 -35.875,-15.125 z" id="path3789-6" - inkscape:connector-curvature="0" /> - </g> + /> </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/download.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/download.svg index 1cc851b518..60b6f8c7a0 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/download.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/download.svg @@ -16,14 +16,10 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="download.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path style="fill:#000000;fill-opacity:1;stroke:none" d="M 500,100 C 279.0861,100 100,279.0861 100,500 100,720.91389 279.0861,900 500,900 720.9139,900 900,720.91389 900,500 900,279.0861 720.9139,100 500,100 z m -26.35714,243.53571 45.71428,0 c 6.33143,0 11.42857,5.09715 11.42857,11.42858 l 0,117.28571 91.42858,0 -63.25,92.57143 L 495.75,657.39286 432.5,564.82143 369.25,472.25 l 92.96429,0 0,-117.28571 c 0,-6.33143 5.09714,-11.42858 11.42857,-11.42858 z" - id="path2987" - inkscape:connector-curvature="0" /> - </g> + id="path2987"/> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/edit.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/edit.svg index f374e7c8d5..0a9e76e13b 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/edit.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/edit.svg @@ -16,13 +16,10 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="edit.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="M 644.35135,150 557.28154,255.56013 712.93019,388.42333 800,282.8632 644.35135,150 z M 528.25827,290.74684 267.04882,607.42725 422.69747,740.29045 683.90691,423.61005 528.25827,290.74684 z M 393.6742,775.47716 237.8623,642.81188 200,850 393.6742,775.47716 z" id="rect2986" - inkscape:connector-curvature="0" /> - </g> + /> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/exclaim.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/exclaim.svg index 8194d819b1..b331270acc 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/exclaim.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/exclaim.svg @@ -16,12 +16,9 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="exclaim.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="M 500 100 C 279.0861 100 100 279.08611 100 500 C 100 720.91389 279.0861 900 500 900 C 720.9139 900 900 720.91389 900 500 C 900 279.08611 720.9139 100 500 100 z M 445.53125 317.71875 L 554.375 317.71875 L 542.375 589.46875 L 457.5 589.46875 L 445.53125 317.71875 z M 447.34375 631.78125 L 552.53125 631.78125 L 552.53125 699.46875 L 447.34375 699.46875 L 447.34375 631.78125 z " id="path2991" /> - </g> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/expanded.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/expanded.svg index 0de9bffb93..77d9ea9868 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/expanded.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/expanded.svg @@ -15,13 +15,10 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="expanded.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="m 500.5625,700.74658 a 74.185358,74.185358 0 0 1 -2.65625,-0.1875 A 74.185358,74.185358 0 0 1 451.25,684.24658 L 128.59375,432.80908 a 74.185358,74.185358 0 1 1 91.1875,-117.03125 l 280.34375,218.5 280.09375,-218.28125 a 74.185358,74.185358 0 1 1 91.1875,117 L 548.75,684.46533 a 74.185358,74.185358 0 0 1 -48.1875,16.28125 z" id="path2991-0" - inkscape:connector-curvature="0" /> - </g> + /> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/fragment-default.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/fragment-default.svg index 5c7af09ea3..972f5b64e4 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/fragment-default.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/fragment-default.svg @@ -15,8 +15,5 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="fragment-default.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" /> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/fragment-start.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/fragment-start.svg index 6ea25b8c70..4d13ac3776 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/fragment-start.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/fragment-start.svg @@ -15,12 +15,9 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="fragment-start.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="M 100 100 L 100 250 L 100 550 L 100 700 L 100 900 L 250 900 L 250 700 L 700 700 L 700 550 L 700 250 L 900 250 L 900 100 L 250 100 L 100 100 z M 250 250 L 550 250 L 550 550 L 250 550 L 250 250 z " id="rect2984" /> - </g> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/fragment-stop.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/fragment-stop.svg index 47f055c873..b97db72ec5 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/fragment-stop.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/fragment-stop.svg @@ -15,13 +15,10 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="fragment-stop.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="m 900,900 0,-200 0,-600 -200,0 0,600 -600,0 0,200 600,0 200,0 z" id="rect2984" - inkscape:connector-curvature="0" /> - </g> + /> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/handle.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/handle.svg index c21a7dddb7..887c502216 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/handle.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/handle.svg @@ -15,12 +15,7 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="handle.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> <path d="M 224.4375 150 A 74.815327 74.815327 0 1 0 224.4375 299.625 L 775.5625 299.625 A 74.815327 74.815327 0 1 0 775.5625 150 L 224.4375 150 z M 225.25 425.375 A 74.596181 74.815327 0 1 0 225.25 575 L 774.75 575 A 74.596181 74.815327 0 1 0 774.75 425.375 L 225.25 425.375 z M 225.25 700.375 A 74.596181 74.815327 0 1 0 225.25 850 L 774.75 850 A 74.596181 74.815327 0 1 0 774.75 700.375 L 225.25 700.375 z " id="path2988" /> - </g> </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/info.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/info.svg index 04a8b2f205..9b81e13373 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/info.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/info.svg @@ -16,12 +16,9 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="info.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="M 500 100 C 279.0861 100 100 279.08611 100 500 C 100 720.91389 279.0861 900 500 900 C 720.9139 900 900 720.91389 900 500 C 900 279.08611 720.9139 100 500 100 z M 450.53125 300.53125 L 549.46875 300.53125 L 549.46875 370.53125 L 450.53125 370.53125 L 450.53125 300.53125 z M 453.125 411.53125 L 546.875 411.53125 L 546.875 699.46875 L 453.125 699.46875 L 453.125 411.53125 z " id="path2991" /> - </g> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/notes.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/notes.svg index 29a663f602..7fb20246a4 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/notes.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/notes.svg @@ -16,13 +16,10 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="notes.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="m 200,100 0,800 600,0 0,-457.14286 -300,0 L 500,100 200,100 z m 350,1.82143 0,283.89286 248.375,0 L 550,101.82143 z" id="rect4951" - inkscape:connector-curvature="0" /> - </g> + /> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/occurrence-default.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/occurrence-default.svg index a943b4acbc..c0c884f416 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/occurrence-default.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/occurrence-default.svg @@ -15,13 +15,10 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="occurrence-default.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="m 300,100 400,0 0,800 -400,0 z" id="rect2984" /> - </g> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/occurrence-start.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/occurrence-start.svg index df0e78377d..7a7e3aa11c 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/occurrence-start.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/occurrence-start.svg @@ -15,12 +15,9 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="occurrence-start.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="M 100 100 L 100 900 L 475 900 L 475 100 L 100 100 z M 525 500 L 525 900 L 900 900 L 900 500 L 525 500 z " id="rect2984" /> - </g> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/occurrence-stop.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/occurrence-stop.svg index 9b7aecc04e..f8a53ef254 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/occurrence-stop.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/occurrence-stop.svg @@ -15,12 +15,9 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="occurrence-end.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="M 100 100 L 100 900 L 475 900 L 475 100 L 100 100 z M 525 100 L 525 500 L 900 500 L 900 100 L 525 100 z " id="rect2984" /> - </g> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/open.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/open.svg index 779c20e471..11cad95adf 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/open.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/open.svg @@ -16,14 +16,11 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="open.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path style="fill:#000000;fill-opacity:1;stroke:none" d="m 100,200 0,459.1551 26.89847,0 118.05807,-359.58543 484.8614,0 0,-99.56967 L 100,200 z M 270.18206,340.8449 119.45219,800 749.27013,800 900,340.8449 l -629.81794,0 z" id="rect2986" - inkscape:connector-curvature="0" /> - </g> + /> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/plus.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/plus.svg index 7854624a97..2b4a5c9bf6 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/plus.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/plus.svg @@ -16,13 +16,9 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="plus.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="m 443.75,200 0,243.75 -243.75,0 0,112.5 243.75,0 0,243.75 112.5,0 0,-243.75 243.75,0 0,-112.5 -243.75,0 0,-243.75 -112.5,0 z" - id="rect2986" - inkscape:connector-curvature="0" /> - </g> + id="rect2986"/> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/question.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/question.svg index 9cd19eda9a..6050b890dd 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/question.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/question.svg @@ -16,12 +16,9 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="question.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="M 500 100 C 279.0861 100 100 279.08611 100 500 C 100 720.91389 279.0861 900 500 900 C 720.9139 900 900 720.91389 900 500 C 900 279.08611 720.9139 100 500 100 z M 490.625 300.53125 C 534.72949 300.53165 569.73333 310.07321 595.625 329.15625 C 621.51612 348.24003 634.46844 373.18672 634.46875 404 C 634.46844 421.68309 631.76279 437.37548 626.40625 451.03125 C 621.22767 464.51244 613.82953 476.23956 604.1875 486.21875 C 594.54491 496.19836 582.94543 505.12171 569.375 513 C 555.98266 520.87866 540.80688 528.05356 523.84375 534.53125 L 523.84375 594.40625 L 429.5625 594.40625 L 429.5625 505.90625 C 442.24025 502.57999 453.66561 499.15799 463.84375 495.65625 C 474.20016 492.1549 485.00046 486.47244 496.25 478.59375 C 506.78495 471.59089 515.01354 463.46683 520.90625 454.1875 C 526.97714 444.90866 529.9998 434.38669 530 422.65625 C 529.9998 405.14881 524.20006 392.72855 512.59375 385.375 C 501.16564 377.847 484.98529 374.06283 464.09375 374.0625 C 451.23719 374.06283 436.68648 376.79168 420.4375 382.21875 C 404.36687 387.64646 389.64205 394.64027 376.25 403.21875 L 365.53125 403.21875 L 365.53125 323.125 C 376.95914 318.39829 394.56375 313.48389 418.3125 308.40625 C 442.06106 303.15434 466.16192 300.53165 490.625 300.53125 z M 423.125 630.125 L 531.34375 630.125 L 531.34375 699.46875 L 423.125 699.46875 L 423.125 630.125 z " id="path2991" /> - </g> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/save.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/save.svg index e71a3a3cae..d1b68d83c0 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/save.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/save.svg @@ -16,12 +16,9 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="save.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="M 100 100 L 100 900 L 900 900 L 900 236.84375 C 879.41881 236.69254 862.78125 219.96058 862.78125 199.34375 C 862.78125 178.72692 879.41881 161.99496 900 161.84375 L 900 100 L 100 100 z M 500 400 C 555.22847 400 600 444.77152 600 500 C 600 555.22847 555.22847 600 500 600 C 444.77153 600 400 555.22847 400 500 C 400 444.77152 444.77153 400 500 400 z M 500 650 C 522.16 650 540 667.84 540 690 L 540 810 C 540 832.16 522.16 850 500 850 C 477.84 850 460 832.16 460 810 L 460 690 C 460 667.84 477.84 650 500 650 z " id="rect2987" /> - </g> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/settings.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/settings.svg index 255980690a..10107d0aec 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/settings.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/settings.svg @@ -15,15 +15,10 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="settings.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="m 442.85714,100 c -15.82857,-1.1e-5 -28.57144,12.74286 -28.57143,28.57143 l 0,78.03571 c -21.39083,6.29739 -41.83274,14.84225 -61.03571,25.42857 L 297.96429,176.75 c -11.1925,-11.19249 -29.20038,-11.19249 -40.39286,0 L 176.75,257.57143 c -11.19249,11.19248 -11.19249,29.20038 0,40.39286 l 55.17857,55.17857 c -10.65924,19.2368 -19.30642,39.7185 -25.64286,61.14285 l -77.71428,0 C 112.74286,414.2857 99.999989,427.02857 100,442.85714 l 0,114.28572 c -1.1e-5,15.82857 12.74286,28.57144 28.57143,28.57143 l 77.71428,0 c 6.33867,21.43243 14.97845,41.89934 25.64286,61.14285 L 176.75,702.03571 c -11.19249,11.19248 -11.19249,29.20038 0,40.39286 L 257.57143,823.25 c 11.19248,11.19249 29.20036,11.19249 40.39286,0 L 353.25,767.96429 c 19.20386,10.58763 39.64379,19.16626 61.03571,25.46428 l 0,78 c -10e-6,15.82857 12.74286,28.57144 28.57143,28.57143 l 114.28572,0 c 15.82857,10e-6 28.57144,-12.74286 28.57143,-28.57143 l 0,-78.03571 c 21.3803,-6.29801 41.80587,-14.88105 61,-25.46429 L 702.03571,823.25 c 11.19248,11.19249 29.20038,11.19249 40.39286,0 L 823.25,742.42857 c 11.19249,-11.19248 11.19249,-29.20038 0,-40.39286 l -55.17857,-55.17857 c 10.6655,-19.24547 19.30402,-39.70804 25.64286,-61.14285 l 77.71428,0 c 15.82857,10e-6 28.57144,-12.74286 28.57143,-28.57143 l 0,-114.28572 c 10e-6,-15.82857 -12.74286,-28.57144 -28.57143,-28.57143 l -77.71428,0 c -6.33662,-21.42673 -14.98253,-41.90409 -25.64286,-61.14285 L 823.25,297.96429 c 11.19249,-11.1925 11.19249,-29.20038 0,-40.39286 L 742.42857,176.75 c -11.19248,-11.19249 -29.20038,-11.19249 -40.39286,0 l -55.32142,55.32143 c -19.19616,-10.58354 -39.61723,-19.16664 -61,-25.46429 l 0,-78.03571 C 585.7143,112.74286 572.97143,99.999989 557.14286,100 l -114.28572,0 z M 500,365.28571 c 74.99435,0 134.32143,59.10773 134.32143,134.71429 0,75.60656 -59.32708,134.67857 -134.32143,134.67857 -74.99437,0 -134.32143,-59.07201 -134.32143,-134.67857 0,-75.60656 59.32708,-134.71429 134.32143,-134.71429 z" id="path3783" - inkscape:connector-curvature="0" /> - <g - id="g3951" /> - </g> + /> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/upload.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/upload.svg index 453f8418b9..89e0e5fbb9 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/upload.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/upload.svg @@ -16,13 +16,10 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="upload.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="M 500,900 C 279.0861,900 100,720.9139 100,500 100,279.08611 279.0861,100 500,100 c 220.9139,0 400,179.08611 400,400 0,220.9139 -179.0861,400 -400,400 z m -26.35714,-243.53571 45.71428,0 c 6.33143,0 11.42857,-5.09715 11.42857,-11.42858 l 0,-117.28571 91.42858,0 -63.25,-92.57143 L 495.75,342.60714 432.5,435.17857 369.25,527.75 l 92.96429,0 0,117.28571 c 0,6.33143 5.09714,11.42858 11.42857,11.42858 z" id="path2987" - inkscape:connector-curvature="0" /> - </g> + /> + </svg> diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/validate.svg b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/validate.svg index 35cc9fa418..9a6aeefd4d 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/validate.svg +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sprites/icons/validate.svg @@ -16,12 +16,9 @@ version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="validate.svg"> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> + <path d="M 500 100 C 279.08608 100 100 279.08609 100 500 C 100 720.91389 279.08608 900 500 900 C 720.91389 900 900 720.91389 900 500 C 900 279.08609 720.91389 100 500 100 z M 679.71875 300 C 687.77296 300.00048 693.09804 300.69955 695.6875 302.09375 C 698.56369 303.48895 699.99953 305.30021 700 307.53125 C 699.99953 311.15798 695.84187 317.86261 687.5 327.625 C 590.26844 440.87501 500.22263 560.54434 417.375 686.625 C 411.6215 695.55114 399.83514 700.00006 382 700 C 363.87689 700.00006 353.07688 699.17376 349.625 697.5 C 340.99491 693.87387 330.9128 675.18934 319.40625 641.4375 C 306.46119 604.05972 299.99993 580.60914 300 571.125 C 299.99993 561.08339 308.76478 551.32795 326.3125 541.84375 C 336.95605 535.70737 346.47007 532.62524 354.8125 532.625 C 364.59303 532.62524 372.07186 540.44209 377.25 556.0625 C 387.31816 585.63032 394.49734 600.40643 398.8125 600.40625 C 402.26433 600.40643 405.70408 597.8961 409.15625 592.875 C 479.63425 482.97293 545.08977 394.15781 605.5 326.375 C 621.03359 308.80222 645.77372 300.00048 679.71875 300 z " id="path2991" /> - </g> + </svg> |