Bug 565945: add skill images and improve character sheet
skill images get displayed on the character sheet
Change-Id: Ia7e102cac11986ab9c10dd5870104499a34a364e
diff --git a/developers/Skills Developer Assets/images/skill_agility.svg b/developers/Skills Developer Assets/images/skill_agility.svg
new file mode 100644
index 0000000..dd9e43e
--- /dev/null
+++ b/developers/Skills Developer Assets/images/skill_agility.svg
@@ -0,0 +1,393 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 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:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="skill_agility.svg"
+ inkscape:export-filename="/home/christian/Eclipse/skills-2020-09/git/skills/plugins/org.eclipse.skills/icons/full/obj32/agility.png"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient4789">
+ <stop
+ style="stop-color:#4e8fbd;stop-opacity:1;"
+ offset="0"
+ id="stop4791" />
+ <stop
+ style="stop-color:#30495a;stop-opacity:1;"
+ offset="1"
+ id="stop4793" />
+ </linearGradient>
+ <linearGradient
+ y2="1045.3622"
+ x2="-11"
+ y1="1042.3622"
+ x1="-11"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4975-2-1-1"
+ xlink:href="#linearGradient4994-4-7-4"
+ inkscape:collect="always"
+ gradientTransform="translate(18.5,-2.5)" />
+ <linearGradient
+ id="linearGradient4994-4-7-4"
+ inkscape:collect="always">
+ <stop
+ id="stop4996-5-4-2"
+ offset="0"
+ style="stop-color:#c3e9ff;stop-opacity:1" />
+ <stop
+ id="stop4998-5-0-3"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ y2="1047.3622"
+ x2="-15"
+ y1="1047.3622"
+ x1="-12"
+ gradientTransform="translate(18.5,-2.5)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient5062-9-5"
+ xlink:href="#linearGradient4910-4-4-2"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4910-4-4-2">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop4912-8-8-7" />
+ <stop
+ style="stop-color:#c3e9ff;stop-opacity:1"
+ offset="1"
+ id="stop4914-8-8-6" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4883-4-7"
+ id="linearGradient4889-2-1"
+ x1="28"
+ y1="1039.3622"
+ x2="28"
+ y2="1049.3622"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9,0,0,0.9,-17.2,104.43622)" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4883-4-7">
+ <stop
+ style="stop-color:#ebf9ff;stop-opacity:1"
+ offset="0"
+ id="stop4885-5-1" />
+ <stop
+ style="stop-color:#fcffff;stop-opacity:1"
+ offset="1"
+ id="stop4887-5-1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient7584-9-3-2">
+ <stop
+ style="stop-color:#f9cd5f;stop-opacity:1;"
+ offset="0"
+ id="stop7586-6-3-6" />
+ <stop
+ style="stop-color:#ffebb7;stop-opacity:1;"
+ offset="1"
+ id="stop7588-9-9-0" />
+ </linearGradient>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="21.363196"
+ inkscape:cx="8.1068352"
+ inkscape:cy="5.0152451"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="1043"
+ inkscape:window-x="1920"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:snap-global="false"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-nodes="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3999" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline"
+ transform="translate(0,-1036.3622)">
+ <path
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#646464;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+ d="m 2.0260777,1038.3883 v 13.9739 H 16 v -13.9739 z m 1.2703561,1.2703 H 14.729644 v 11.4332 H 3.2964338 Z"
+ id="rect3997-9-1-2-3-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <g
+ id="g1544"
+ transform="matrix(1.2868606,0,0,1.2758275,-2.2948848,-288.06381)">
+ <path
+ inkscape:connector-curvature="0"
+ id="rect3997-9-1-1-2"
+ d="m 3.5,1039.8622 h 8.971875 l 0.02812,9 H 3.52812 Z"
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4889-2-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="rect4853-82-7-1"
+ d="m 5.5,1041.8622 v 7 h -2 v -9 z"
+ style="display:inline;fill:url(#linearGradient5062-9-5);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="rect4853-82-0-6"
+ d="m 5.5,1041.8622 h 7 v -2 h -9 z"
+ style="display:inline;fill:url(#linearGradient4975-2-1-1);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
+ </g>
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g31"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g33"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g35"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g37"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g39"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g41"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g43"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g45"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g47"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g49"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g51"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g53"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g55"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g57"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g59"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ id="g5123"
+ transform="matrix(1.4232775,0,0,1.4232775,-1.9389503,-465.55644)">
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g6"
+ style="fill:#b97f15;fill-opacity:1">
+ <path
+ inkscape:connector-curvature="0"
+ d="m 343.159,159.834 c -0.825,14.209 1.693,36.713 -7.555,49.04 -7.94,10.584 -27.844,37.532 -35.827,30.604 -1.944,-1.687 10.65,-22.946 15.316,-37.946 3.578,-11.502 -6.514,-15.909 -11.104,-11.318 -4.563,4.563 -27.558,33.657 -36.349,46.733 -4.141,6.16 -11.538,23.149 -15.042,31.418 -1.201,2.832 -2.262,4.414 0.095,6.124 10.955,7.946 33.392,24.14 45.091,32.632 0.247,0.179 3.941,2.006 3.304,-2.394 -0.697,-4.815 -0.889,-11.074 2.593,-14.556 5.463,-5.463 54.088,-51.593 59.248,-59.248 5.187,-7.701 -0.418,-58.506 -2.371,-67.989 -3.027,-14.699 -16.799,-13.436 -17.399,-3.1 z"
+ id="path2-1"
+ style="fill:#b97f15;fill-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m 218.742,317.945 c -1.516,2.161 -1.271,5.499 0.544,7.416 l 38.747,40.938 c 1.814,1.917 4.521,1.705 6.013,-0.473 l 25.812,-37.65 c 1.493,-2.178 0.979,-5.247 -1.14,-6.82 l -43.737,-32.474 c -2.12,-1.574 -5.094,-1.093 -6.609,1.068 z"
+ id="path4"
+ style="fill:#b97f15;fill-opacity:1" />
+ </g>
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g12"
+ style="fill:#b97f15;fill-opacity:1">
+ <path
+ inkscape:connector-curvature="0"
+ d="m 7.05,162.934 c -1.953,9.482 -7.558,60.288 -2.371,67.989 5.16,7.655 53.785,53.785 59.248,59.248 3.482,3.482 3.29,9.741 2.593,14.556 -0.637,4.399 3.057,2.573 3.304,2.394 11.699,-8.493 34.136,-24.687 45.091,-32.632 2.357,-1.709 1.296,-3.292 0.095,-6.124 -3.504,-8.269 -10.901,-25.258 -15.042,-31.418 -8.791,-13.076 -31.786,-42.17 -36.349,-46.733 -4.59,-4.59 -14.682,-0.184 -11.104,11.318 4.666,15 17.26,36.259 15.316,37.946 -7.983,6.928 -27.887,-20.02 -35.827,-30.604 -9.248,-12.327 -6.73,-34.83 -7.555,-49.04 -0.6,-10.336 -14.372,-11.599 -17.399,3.1 z"
+ id="path8"
+ style="fill:#b97f15;fill-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m 129.236,289.95 c -1.516,-2.161 -4.49,-2.642 -6.609,-1.068 L 78.89,321.356 c -2.119,1.574 -2.632,4.643 -1.14,6.82 l 25.812,37.65 c 1.493,2.177 4.199,2.39 6.013,0.473 l 38.747,-40.938 c 1.814,-1.917 2.06,-5.255 0.544,-7.416 z"
+ id="path10"
+ style="fill:#b97f15;fill-opacity:1" />
+ </g>
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g16"
+ style="fill:#b97f15;fill-opacity:1">
+ <path
+ inkscape:connector-curvature="0"
+ d="m 79.908,165.67 c -22.5,0 -40.805,-18.305 -40.805,-40.805 0,-22.5 18.305,-40.806 40.805,-40.806 22.5,0 40.806,18.306 40.806,40.806 0,22.5 -18.306,40.805 -40.806,40.805 z m 0,-64.678 c -13.163,0 -23.872,10.709 -23.872,23.872 0,13.163 10.708,23.872 23.872,23.872 13.164,0 23.872,-10.708 23.872,-23.872 0,-13.164 -10.709,-23.872 -23.872,-23.872 z"
+ id="path14"
+ style="fill:#b97f15;fill-opacity:1" />
+ </g>
+ <path
+ transform="translate(0,1036.3622)"
+ inkscape:connector-curvature="0"
+ id="path5028"
+ d="m 4.7129325,23.76634 c -0.288323,-0.248005 -0.097512,-0.730515 0.2888851,-0.730515 0.3863976,0 0.5772081,0.48251 0.2888851,0.730515 -0.081989,0.07052 -0.1890594,0.112056 -0.2888851,0.112056 -0.099826,0 -0.2068958,-0.04153 -0.2888851,-0.112056 z"
+ style="opacity:0.96000001;fill:#fad16b;fill-opacity:0.96078431;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.96078431" />
+ <g
+ id="g5080">
+ <g
+ style="fill:#b97f15;fill-opacity:1"
+ id="g20"
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)">
+ <path
+ style="fill:#b97f15;fill-opacity:1"
+ id="path18"
+ d="m 282.678,165.67 c -22.5,0 -40.805,-18.305 -40.805,-40.805 0,-22.5 18.305,-40.806 40.805,-40.806 22.5,0 40.805,18.306 40.805,40.806 0,22.5 -18.305,40.805 -40.805,40.805 z m 0,-64.678 c -13.163,0 -23.872,10.709 -23.872,23.872 0,13.163 10.708,23.872 23.872,23.872 13.164,0 23.872,-10.708 23.872,-23.872 0,-13.164 -10.709,-23.872 -23.872,-23.872 z"
+ inkscape:connector-curvature="0" />
+ </g>
+ <path
+ style="opacity:0.96000001;fill:#fad16b;fill-opacity:0.96078431;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.96078431"
+ d="M 8.5791418,23.741568 C 8.404707,23.567133 8.3993542,23.37492 8.5634989,23.179845 c 0.09772,-0.116134 0.1570448,-0.14402 0.3063892,-0.14402 0.2568381,0 0.4149966,0.160555 0.4149966,0.421286 0,0.398708 -0.4215726,0.568627 -0.7057429,0.284457 z"
+ id="path5030"
+ inkscape:connector-curvature="0"
+ transform="translate(0,1036.3622)" />
+ </g>
+ <g
+ id="g5080-2"
+ style="display:inline"
+ transform="translate(-1.8728087,-1.741568)">
+ <g
+ style="fill:#b97f15;fill-opacity:1"
+ id="g20-9"
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)">
+ <path
+ style="fill:#b97f15;fill-opacity:1"
+ id="path18-3"
+ d="m 282.678,165.67 c -22.5,0 -40.805,-18.305 -40.805,-40.805 0,-22.5 18.305,-40.806 40.805,-40.806 22.5,0 40.805,18.306 40.805,40.806 0,22.5 -18.305,40.805 -40.805,40.805 z m 0,-64.678 c -13.163,0 -23.872,10.709 -23.872,23.872 0,13.163 10.708,23.872 23.872,23.872 13.164,0 23.872,-10.708 23.872,-23.872 0,-13.164 -10.709,-23.872 -23.872,-23.872 z"
+ inkscape:connector-curvature="0" />
+ </g>
+ <path
+ style="opacity:0.96000001;fill:#fad16b;fill-opacity:0.96078431;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.96078431"
+ d="M 8.5791418,23.741568 C 8.404707,23.567133 8.3993542,23.37492 8.5634989,23.179845 c 0.09772,-0.116134 0.1570448,-0.14402 0.3063892,-0.14402 0.2568381,0 0.4149966,0.160555 0.4149966,0.421286 0,0.398708 -0.4215726,0.568627 -0.7057429,0.284457 z"
+ id="path5030-1"
+ inkscape:connector-curvature="0"
+ transform="translate(0,1036.3622)" />
+ </g>
+ </g>
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g14" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g16-5" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g18" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g20-0" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g22" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g24" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g26" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g28" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g30" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g32" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g34" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g36" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g38" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g40" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g42" />
+ <path
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#8b96ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+ d="m 1.0130386,1037.3753 v 13.9739 H 14.986961 v -13.9739 z m 1.2703561,1.2703 H 13.716605 v 11.4332 H 2.2833947 Z"
+ id="rect3997-9-1-2-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ </g>
+</svg>
diff --git a/developers/Skills Developer Assets/images/skill_experience.svg b/developers/Skills Developer Assets/images/skill_experience.svg
new file mode 100644
index 0000000..7970561
--- /dev/null
+++ b/developers/Skills Developer Assets/images/skill_experience.svg
@@ -0,0 +1,668 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 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:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="skill_experience.svg"
+ inkscape:export-filename="/home/christian/Eclipse/skills-2020-09/git/skills/plugins/org.eclipse.skills/icons/full/obj32/skills/wisdom.png"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient4789">
+ <stop
+ style="stop-color:#4e8fbd;stop-opacity:1;"
+ offset="0"
+ id="stop4791" />
+ <stop
+ style="stop-color:#30495a;stop-opacity:1;"
+ offset="1"
+ id="stop4793" />
+ </linearGradient>
+ <linearGradient
+ y2="1045.3622"
+ x2="-11"
+ y1="1042.3622"
+ x1="-11"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4975-2-1-1"
+ xlink:href="#linearGradient4994-4-7-4"
+ inkscape:collect="always"
+ gradientTransform="translate(18.5,-2.5)" />
+ <linearGradient
+ id="linearGradient4994-4-7-4"
+ inkscape:collect="always">
+ <stop
+ id="stop4996-5-4-2"
+ offset="0"
+ style="stop-color:#c3e9ff;stop-opacity:1" />
+ <stop
+ id="stop4998-5-0-3"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ y2="1047.3622"
+ x2="-15"
+ y1="1047.3622"
+ x1="-12"
+ gradientTransform="translate(18.5,-2.5)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient5062-9-5"
+ xlink:href="#linearGradient4910-4-4-2"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4910-4-4-2">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop4912-8-8-7" />
+ <stop
+ style="stop-color:#c3e9ff;stop-opacity:1"
+ offset="1"
+ id="stop4914-8-8-6" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4883-4-7"
+ id="linearGradient4889-2-1"
+ x1="28"
+ y1="1039.3622"
+ x2="28"
+ y2="1049.3622"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9,0,0,0.9,-17.2,104.43622)" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4883-4-7">
+ <stop
+ style="stop-color:#ebf9ff;stop-opacity:1"
+ offset="0"
+ id="stop4885-5-1" />
+ <stop
+ style="stop-color:#fcffff;stop-opacity:1"
+ offset="1"
+ id="stop4887-5-1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient7584-9-3-2">
+ <stop
+ style="stop-color:#f9cd5f;stop-opacity:1;"
+ offset="0"
+ id="stop7586-6-3-6" />
+ <stop
+ style="stop-color:#ffebb7;stop-opacity:1;"
+ offset="1"
+ id="stop7588-9-9-0" />
+ </linearGradient>
+ <linearGradient
+ id="SVGID_1_"
+ y2="-67.744003"
+ gradientUnits="userSpaceOnUse"
+ x2="364.01999"
+ gradientTransform="matrix(0.9613,0.2754,-0.2754,0.9613,-365.78,12.853)"
+ y1="316.20999"
+ x1="1181.8">
+ <stop
+ id="stop20"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop22"
+ style="stop-color:#DCDBDC"
+ offset=".4774" />
+ <stop
+ id="stop24"
+ style="stop-color:#999999"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="SVGID_2_"
+ y2="484.54999"
+ gradientUnits="userSpaceOnUse"
+ x2="1250.7"
+ gradientTransform="matrix(0.9613,0.2754,-0.2754,0.9613,-365.78,12.853)"
+ y1="50.397999"
+ x1="782.78003">
+ <stop
+ id="stop29"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop31"
+ style="stop-color:#DCDBDC"
+ offset=".4774" />
+ <stop
+ id="stop33"
+ style="stop-color:#D0D1D1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="SVGID_3_"
+ y2="526.63"
+ gradientUnits="userSpaceOnUse"
+ x2="345.45999"
+ gradientTransform="matrix(0.9613,0.2754,-0.2754,0.9613,-365.78,12.853)"
+ y1="-0.77539998"
+ x1="964.82001">
+ <stop
+ id="stop38"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop40"
+ style="stop-color:#DCDBDC"
+ offset=".4774" />
+ <stop
+ id="stop42"
+ style="stop-color:#D0D1D1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="SVGID_4_"
+ y2="573.71002"
+ gradientUnits="userSpaceOnUse"
+ x2="736.67999"
+ gradientTransform="matrix(0.9613,0.2754,-0.2754,0.9613,-365.78,12.853)"
+ y1="11.163"
+ x1="747.5">
+ <stop
+ id="stop47"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop49"
+ style="stop-color:#DCDBDC"
+ offset=".4774" />
+ <stop
+ id="stop51"
+ style="stop-color:#D0D1D1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="SVGID_5_"
+ y2="-30.815001"
+ gradientUnits="userSpaceOnUse"
+ x2="1070.9"
+ gradientTransform="matrix(0.9613,0.2754,-0.2754,0.9613,-365.78,12.853)"
+ y1="472.14001"
+ x1="378.89999">
+ <stop
+ id="stop56"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop58"
+ style="stop-color:#DCDBDC"
+ offset=".4774" />
+ <stop
+ id="stop60"
+ style="stop-color:#999999"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="SVGID_6_"
+ y2="268.76999"
+ gradientUnits="userSpaceOnUse"
+ x2="780.28998"
+ gradientTransform="matrix(0.9613,0.2754,-0.2754,0.9613,-365.78,12.853)"
+ y1="-27.795"
+ x1="559.44">
+ <stop
+ id="stop65"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop67"
+ style="stop-color:#DCDBDC"
+ offset=".4774" />
+ <stop
+ id="stop69"
+ style="stop-color:#D0D1D1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="SVGID_7_"
+ y2="319.82999"
+ gradientUnits="userSpaceOnUse"
+ x2="234.53"
+ y1="319.82999"
+ x1="208.21001">
+ <stop
+ id="stop100"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop102"
+ style="stop-color:#DCDBDC"
+ offset=".4774" />
+ <stop
+ id="stop104"
+ style="stop-color:#999999"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="SVGID_8_"
+ y2="424.31"
+ gradientUnits="userSpaceOnUse"
+ x2="269.17999"
+ y1="424.31"
+ x1="240.8">
+ <stop
+ id="stop111"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop113"
+ style="stop-color:#DCDBDC"
+ offset=".4774" />
+ <stop
+ id="stop115"
+ style="stop-color:#999999"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="SVGID_9_"
+ y2="530.41998"
+ gradientUnits="userSpaceOnUse"
+ x2="304.89999"
+ y1="530.41998"
+ x1="273.73999">
+ <stop
+ id="stop120"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop122"
+ style="stop-color:#DCDBDC"
+ offset=".4774" />
+ <stop
+ id="stop124"
+ style="stop-color:#999999"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="SVGID_10_"
+ y2="397.42999"
+ gradientUnits="userSpaceOnUse"
+ x2="569.46997"
+ y1="397.42999"
+ x1="520.46002">
+ <stop
+ id="stop131"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop133"
+ style="stop-color:#DCDBDC"
+ offset=".4774" />
+ <stop
+ id="stop135"
+ style="stop-color:#999999"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="SVGID_11_"
+ y2="546.98999"
+ gradientUnits="userSpaceOnUse"
+ x2="451.01001"
+ y1="546.98999"
+ x1="402.01001">
+ <stop
+ id="stop140"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop142"
+ style="stop-color:#DCDBDC"
+ offset=".4774" />
+ <stop
+ id="stop144"
+ style="stop-color:#999999"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="SVGID_12_"
+ y2="232.27"
+ gradientUnits="userSpaceOnUse"
+ x2="335.01001"
+ y1="232.27"
+ x1="270.29001">
+ <stop
+ id="stop151"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop153"
+ style="stop-color:#DCDBDC"
+ offset=".4774" />
+ <stop
+ id="stop155"
+ style="stop-color:#999999"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="SVGID_13_"
+ y2="276.87"
+ gradientUnits="userSpaceOnUse"
+ x2="555.16998"
+ y1="276.87"
+ x1="490.94">
+ <stop
+ id="stop160"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop162"
+ style="stop-color:#DCDBDC"
+ offset=".4774" />
+ <stop
+ id="stop164"
+ style="stop-color:#999999"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="SVGID_14_"
+ y2="204.67"
+ gradientUnits="userSpaceOnUse"
+ x2="453.35001"
+ y1="204.67"
+ x1="390.64999">
+ <stop
+ id="stop169"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop171"
+ style="stop-color:#DCDBDC"
+ offset=".4774" />
+ <stop
+ id="stop173"
+ style="stop-color:#999999"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="SVGID_15_"
+ y2="307.20001"
+ gradientUnits="userSpaceOnUse"
+ x2="436.17001"
+ y1="307.20001"
+ x1="370.07999">
+ <stop
+ id="stop178"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop180"
+ style="stop-color:#DCDBDC"
+ offset=".4774" />
+ <stop
+ id="stop182"
+ style="stop-color:#999999"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="SVGID_16_"
+ y2="230.53"
+ gradientUnits="userSpaceOnUse"
+ x2="311.42001"
+ y1="230.53"
+ x1="271">
+ <stop
+ id="stop187"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop189"
+ style="stop-color:#DCDBDC"
+ offset=".4774" />
+ <stop
+ id="stop191"
+ style="stop-color:#999999"
+ offset="1" />
+ </linearGradient>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="7.5530304"
+ inkscape:cx="-3.1390195"
+ inkscape:cy="-21.606507"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1920"
+ inkscape:window-height="1043"
+ inkscape:window-x="1920"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ showguides="false"
+ inkscape:guide-bbox="true"
+ inkscape:snap-global="false"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-nodes="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3999" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline"
+ transform="translate(0,-1036.3622)">
+ <path
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#646464;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+ d="m 2.0260777,1038.3883 v 13.9739 H 16 v -13.9739 z m 1.2703561,1.2703 H 14.729644 v 11.4332 H 3.2964338 Z"
+ id="rect3997-9-1-2-3-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <g
+ id="g1544"
+ transform="matrix(1.2868606,0,0,1.2758275,-2.2948848,-288.06381)">
+ <path
+ inkscape:connector-curvature="0"
+ id="rect3997-9-1-1-2"
+ d="m 3.5,1039.8622 h 8.971875 l 0.02812,9 H 3.52812 Z"
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4889-2-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="rect4853-82-7-1"
+ d="m 5.5,1041.8622 v 7 h -2 v -9 z"
+ style="display:inline;fill:url(#linearGradient5062-9-5);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="rect4853-82-0-6"
+ d="m 5.5,1041.8622 h 7 v -2 h -9 z"
+ style="display:inline;fill:url(#linearGradient4975-2-1-1);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
+ </g>
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g31"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g33"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g35"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g37"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g39"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g41"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g43"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g45"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g47"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g49"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g51"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g53"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g55"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g57"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g59"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g14" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g16-5" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g18" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g20-0" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g22" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g24" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g26" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g28" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g30" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g32" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g34" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g36" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g38" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g40" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g42" />
+ <path
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#8b96ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+ d="m 1.0130386,1037.3753 v 13.9739 H 14.986961 v -13.9739 z m 1.2703561,1.2703 H 13.716605 v 11.4332 H 2.2833947 Z"
+ id="rect3997-9-1-2-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <g
+ id="g3602"
+ transform="matrix(0.37773086,0,0,0.37773086,8.4876077,644.06198)">
+ <path
+ d="m -5.5502527,1047.3379 c -0.0394,9e-4 -0.0798,0 -0.11684,0.012 -0.39684,0.063 -0.59813,0.4696 -0.88794,0.8529 -0.32768,4.4782 -0.79051,8.5785 -1.11871,13.0621 1.37332,-0.1028 3.2608,-0.082 5.19913,-0.1081 2.10882005,-0.029 4.16379,-0.1729 5.16988,-0.5374 2.07348,-0.7512 3.67318,-2.6533 5.0093,-5.4795 -4.10706,-2.5005 -8.52797995,-5.4725 -12.31996,-7.5008 -0.32958,-0.1374 -0.65872,-0.3067 -0.93468,-0.3008 z m -1.78757,1.8314 c -2.45614,4.6439 -4.6286103,8.4442 -7.1064303,13.1705 -0.0481,1.2697 0.20242,2.0006 0.52284,2.4652 0.32116,0.4657 0.61221,0.5861 1.04272,0.5579 0.62096,-0.2059 1.40136,-0.7589 2.20817,-1.4576 0.30594,-0.2725 2.2652803,-1.9725 2.4330603,-2.3483 0.30746,-4.202 0.58995,-8.1611 0.89962,-12.3873 z m 7.01296005,0.2219 c 2.98955995,1.8549 5.84761995,3.7204 8.45002995,5.2605 0.77782,0.4603 2.2526597,1.0063 3.3677297,1.3377 -1.06132,-1.0748 -2.2725697,-1.9985 -3.6218697,-2.6638 l -8.19597995,-3.9344 z m -1.90440005,1.7321 c 0.30185,-0.01 0.60113,0.077 0.89671,0.2512 0.59218005,0.3442 1.14208005,1.0359 1.65027005,2.0767 0.47461,0.972 0.65346,1.8715 0.53743,2.6989 -0.11499,0.8232 -0.5096,1.4426 -1.18292,1.8577 -0.18083,0.1115 -0.37258,0.2044 -0.57833,0.2775 l -0.66887005,0.1694 -0.37096,-0.7594 c 0.22923,-0.012 0.44898,-0.049 0.66012,-0.111 0.21113,-0.062 0.40572005,-0.15 0.58417005,-0.26 0.47586,-0.2934 0.74818,-0.7009 0.81784,-1.2239 0.0707,-0.5272 -0.0587,-1.1776 -0.3914,-1.954 -0.0224,0.3219 -0.11004,0.6103 -0.25995,0.8675 -0.14991,0.2572 -0.35349,0.4637 -0.61045005,0.6221 -0.53297,0.3286 -1.04609,0.4045 -1.53932,0.225 -0.49217,-0.1838 -0.89619,-0.6002 -1.21218,-1.2473 -0.30925,-0.6333 -0.39665,-1.2404 -0.25995,-1.8226 0.13669,-0.5822 0.47581,-1.0383 1.01356,-1.3699 0.30812,-0.1899 0.61238,-0.29 0.91422,-0.2979 z m -0.0672,0.7857 c -0.17427,0.01 -0.34879,0.063 -0.52575,0.1723 -0.32359,0.1995 -0.5173,0.4885 -0.58126,0.8646 -0.0629,0.372 0.0143,0.7776 0.23076,1.2209 0.21781,0.446 0.48438,0.739 0.79739,0.8792 l 0.95804,-0.091 c 0.32358,-0.1995 0.51541005,-0.4838 0.57833005,-0.8558 0.0653,-0.3734 -0.01,-0.7836 -0.22783005,-1.2297 -0.21647,-0.4432 -0.48201,-0.7346 -0.79739,-0.8733 -0.11788,-0.054 -0.23716,-0.082 -0.35634,-0.088 -0.0248,0 -0.0511,-10e-4 -0.076,0 z m -6.38205,2.3396 c 0.0622,0 0.1129,0.015 0.15188,0.053 0.12554,0.1186 0.11717,0.4297 -0.0292,0.9346 -0.10197,0.3519 -0.24681,0.6966 -0.42937,1.034 -0.18174,0.3346 -0.38867,0.6365 -0.62214,0.9025 0.2029,-0.1029 0.32979,-0.069 0.37679,0.1023 0.0486,0.17 0.0133,0.4589 -0.10515,0.8675 -0.18175,0.627 -0.44387,1.212 -0.7827903,1.7554 -0.33894,0.5434 -0.72731,0.9983 -1.16835,1.3669 -0.14806,0.1238 -0.29332,0.2261 -0.4352,0.3038 -0.14114,0.079 -0.28115,0.1348 -0.41769,0.1694 l 0.24244,-0.8295 c 0.092,0.028 0.20478,0.014 0.34173,-0.047 0.13695,-0.061 0.29273,-0.1632 0.46442,-0.3067 0.29928,-0.2502 0.55642,-0.5478 0.77403,-0.8909 0.21919,-0.3444 0.3877003,-0.7188 0.5053003,-1.1245 0.10855,-0.3745 0.12068,-0.6047 0.035,-0.6922 -0.0832,-0.092 -0.2541703,-0.03 -0.5140703,0.1869 l -0.41184,0.3446 0.20446,-0.7068 0.42938,-0.3593 c 0.2346803,-0.1961 0.4404103,-0.4296 0.6133803,-0.701 0.17377,-0.2742 0.30512,-0.5702 0.39723,-0.8879 0.0946,-0.3263 0.10236,-0.522 0.0234,-0.5871 -0.0766,-0.069 -0.23376,0 -0.47318,0.1957 -0.13074,0.1093 -0.27953,0.2503 -0.44397,0.4264 -0.1644503,0.1762 -0.3499903,0.3935 -0.5608103,0.6514 l 0.22199,-0.7653 c 0.20745,-0.2422 0.3959803,-0.4509 0.5666503,-0.628 0.17224,-0.1783 0.32714,-0.3268 0.46733,-0.4439 0.24907,-0.2082 0.44155,-0.3166 0.57834,-0.3242 z m 17.03726,1.2209 c -1.32079,2.7917 -3.0033,4.9166 -5.15829,5.8008 l 0.32714,10.6347 c 0.56327,-0.3145 0.6697,-0.5028 0.91715,-1.0983 l 7.3488897,-13.4854 c 0.1025,-0.2627 0.11193,-0.4328 -0.0497,-0.5433 -1.2118,-0.3391 -2.2529397,-0.7532 -3.3852997,-1.3086 z m -5.54674,1.8605 0.25704,0.5229 -4.26156,2.0942 -0.25995,-0.5228 4.26445,-2.0943 z m 6.25065,1.9629 -0.29209,0.7652 c -0.32456,0.4337 -0.76415,1.0175 -1.31733,1.7496 -0.55594,0.7358 -0.91029,1.2057 -1.0603,1.4137 -0.28373,0.3918 -0.49993,0.7135 -0.64843,0.9639 -0.15127,0.2541 -0.26902,0.4905 -0.35342,0.7097 -0.13757,0.3573 -0.1813,0.6222 -0.13143,0.7916 0.0482,0.17 0.18229,0.2088 0.40015,0.1197 0.15447,-0.063 0.33571,-0.178 0.54621,-0.3475 0.20887,-0.1689 0.4518,-0.3938 0.72437,-0.6748 l -0.35635,0.9172 c -0.255,0.2282 -0.48222,0.4153 -0.68348,0.5608 -0.20124,0.1455 -0.3739,0.2482 -0.51698,0.3067 -0.37721,0.1542 -0.61074,0.1018 -0.70101,-0.1548 -0.0903,-0.2566 -0.0227,-0.6764 0.20153,-1.2589 0.10637,-0.2763 0.23562,-0.5483 0.38847,-0.8208 0.15009,-0.2688 0.36515,-0.6022 0.64259,-0.9989 0.0742,-0.1037 0.29907,-0.4078 0.67764,-0.9142 l 1.59475,-2.1206 -1.72037,0.701 0.295,-0.7653 2.31043,-0.9434 z m -6.44347,2.1877 c -1.18881,0.3565 -3.09966995,0.4315 -5.08819,0.4585 -1.68755,0.016 -3.99789,-0.1168 -5.3598,0.1285 -0.79524,0.7663 -1.65139,1.5855 -2.4885803,2.3105 -0.74544,0.6243 -1.50884,1.2728 -2.45062,1.5713 -0.11583,0.01 -0.13465,0 -0.2512,-0.018 0.34911,0.3143 0.7162,0.5047 1.11283,0.7302 l 13.4069903,5.3686 c 0.0704,0.014 0.81305,0.2889 1.41958,0 l -0.30085,-10.5534 z m -6.44048,2.9647 c 0.0599,0 0.11926,0 0.17817,0 0.0673,0 0.13254,0.01 0.19862,0.015 0.52862,0.056 0.94907,0.2565 1.26181,0.6046 0.22366,0.2489 0.31553,0.502 0.27164,0.7594 -0.0412,0.2562 -0.21179,0.4899 -0.50823,0.701 0.4582,-0.1024 0.8851,-0.102 1.27938,0 0.39697005,0.098 0.71985005,0.2857 0.96973005,0.5637 0.37917,0.422 0.48772,0.8214 0.32713,1.2005 -0.1578600031,0.378 -0.57253,0.7109 -1.24723005,0.996 -0.67467,0.2852 -1.29462,0.3904 -1.86056,0.3184 -0.56325,-0.073 -1.0345,-0.3199 -1.4137,-0.7419 -0.24987,-0.2781 -0.34892,-0.5599 -0.29793,-0.8471 0.051,-0.2871 0.24479,-0.5481 0.58418,-0.7827 v 0 c -0.41101,0.088 -0.79299,0.089 -1.14788,0 -0.35218,-0.09 -0.64092,-0.2594 -0.86457,-0.5083 -0.31278,-0.348 -0.38717,-0.6968 -0.22199,-1.0456 0.16791,-0.35 0.55611,-0.6521 1.16255,-0.9084 0.46636,-0.1971 0.90969,-0.3044 1.32901,-0.3184 z m -0.14604,0.6075 c -0.24262,0 -0.49895,0.066 -0.76526,0.1782 -0.35783,0.1512 -0.57722,0.3297 -0.66305,0.5403 -0.0831,0.2096 -0.0245,0.4287 0.17817,0.6543 0.2027,0.2256 0.45795,0.3598 0.76819,0.4031 0.31298,0.042 0.64988,-0.012 1.00768,-0.1636 0.35509,-0.1501 0.57429,-0.3297 0.66011,-0.5404 0.0885,-0.2118 0.0333,-0.4316 -0.16941,-0.6572 -0.20269,-0.2255 -0.46417,-0.3591 -0.77987,-0.4001 -0.0783,-0.011 -0.15572,-0.016 -0.23659,-0.015 z m 1.80215,1.8868 c -0.27594,0 -0.56169,0.064 -0.85873,0.1899 -0.39333,0.1662 -0.63805,0.3708 -0.73022,0.6163 -0.0894,0.2444 -0.0168,0.4969 0.21907,0.7594 0.23589,0.2625 0.53526,0.424 0.89378,0.479 0.36126,0.054 0.73704,0 1.1304,-0.1694 0.39333,-0.1662 0.63805005,-0.3737 0.73022005,-0.6192 0.0904,-0.2475 0.018,-0.5018 -0.21615,-0.7623 -0.23589005,-0.2626 -0.53545005,-0.4193 -0.89671005,-0.4732 -0.0896,-0.014 -0.17966,-0.021 -0.27163,-0.02 z"
+ style="fill:#fad16b;fill-opacity:1;stroke-width:0.09346756"
+ id="rect4823"
+ inkscape:connector-curvature="0" />
+ <path
+ transform="translate(0,1036.3622)"
+ inkscape:connector-curvature="0"
+ id="path3580"
+ d="m -1.7398335,21.728207 c -0.081938,-0.183251 -0.1393853,-0.342778 -0.1276597,-0.354503 0.011726,-0.01173 0.1746852,-0.05306 0.3621326,-0.09186 0.66507598,-0.137653 1.23457443,-0.537054 1.47945563,-1.037573 0.24268789,-0.496036 0.19522018,-1.376128 -0.11636939,-2.157588 l -0.11968331,-0.300163 -0.0863421,0.31519 c -0.17840359,0.651259 -0.46739776,1.001474 -1.05819703,1.282367 -0.3214528,0.152833 -0.401587,0.171587 -0.7360459,0.172256 -0.330559,6.6e-4 -0.4126285,-0.01761 -0.6881438,-0.153184 -0.4008716,-0.19726 -0.7620874,-0.589732 -1.0158998,-1.103804 -0.2694285,-0.545702 -0.3450067,-0.885619 -0.3233725,-1.454385 0.015579,-0.40958 0.037202,-0.51198 0.1660009,-0.78613 0.1932071,-0.411244 0.382154,-0.640862 0.7255807,-0.881762 0.3980736,-0.279233 0.6948519,-0.383113 1.1001901,-0.385096 0.2985375,-0.0015 0.3798078,0.01901 0.6962953,0.175432 0.6401734,0.316391 1.18553454,0.957296 1.72214812,2.023858 0.3005577,0.597382 0.47260499,1.095592 0.56876522,1.647015 0.28725896,1.647264 -0.45250017,2.912944 -1.94413954,3.326299 -0.1921511,0.05325 -0.3732991,0.09681 -0.4025511,0.09681 -0.029252,0 -0.120226,-0.149933 -0.2021644,-0.333185 z M -1.4539914,18.5931 c 0.3532143,-0.09107 0.64636346,-0.609211 0.64636346,-1.142441 0,-0.674872 -0.49298566,-1.553624 -1.01274996,-1.805237 -0.51614,-0.249859 -1.1442736,-0.02032 -1.4489002,0.529476 -0.1240117,0.223818 -0.1361751,0.285972 -0.1351582,0.690642 9.4e-4,0.37401 0.020684,0.49071 0.1242202,0.734231 0.1736966,0.408538 0.4341085,0.783224 0.6623621,0.953018 0.1926397,0.143302 0.2007172,0.144869 0.5931797,0.115073 0.2188343,-0.01661 0.4756416,-0.05026 0.5706829,-0.07476 z"
+ style="opacity:0.96000001;fill:#b97f15;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ transform="translate(0,1036.3622)"
+ inkscape:connector-curvature="0"
+ id="path3582"
+ d="m -1.3025749,23.318444 c -0.065929,-0.130104 -0.1126396,-0.243783 -0.1038018,-0.252621 0.00884,-0.0088 0.95840852,-0.479471 2.11015712,-1.045851 l 2.09408838,-1.029783 0.1164401,0.229784 c 0.064042,0.126381 0.1164402,0.240144 0.1164402,0.252806 0,0.02199 -1.0582222,0.547489 -3.21845187,1.598242 l -0.99500163,0.483976 z"
+ style="opacity:0.96000001;fill:#b97f15;fill-opacity:0.96078431;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ transform="translate(0,1036.3622)"
+ inkscape:connector-curvature="0"
+ id="path3590"
+ d="m 4.7338089,30.134223 c -0.1175691,-0.179433 -0.064654,-0.73818 0.1167221,-1.232506 0.3098933,-0.844589 0.6490259,-1.373553 2.2225101,-3.466574 0.6082373,-0.809067 1.0988882,-1.478028 1.0903355,-1.486581 -0.00855,-0.0086 -0.3769403,0.132071 -0.818639,0.312496 -0.4416988,0.180425 -0.8134824,0.328046 -0.8261858,0.328046 -0.038051,0 0.2096888,-0.62753 0.2707338,-0.685775 0.053953,-0.05148 2.2330763,-0.954881 2.2330763,-0.92577 0,0.0077 -0.060791,0.171932 -0.1350916,0.364887 -0.1127661,0.29285 -0.3319507,0.612444 -1.3262884,1.933873 -1.3691021,1.819472 -1.7443948,2.356917 -1.9979279,2.861169 -0.4015755,0.798694 -0.4402248,1.366611 -0.093004,1.366611 0.2140616,0 0.6759226,-0.306998 1.1533262,-0.766613 0.1351624,-0.130126 0.2457497,-0.225581 0.2457497,-0.212122 0,0.01346 -0.070811,0.202319 -0.1573569,0.419687 -0.1505442,0.378104 -0.1743571,0.409068 -0.5500114,0.715196 -0.4966505,0.404731 -0.8580693,0.592803 -1.139192,0.592803 -0.1741583,0 -0.2244619,-0.0207 -0.2887567,-0.118827 z"
+ style="opacity:0.96000001;fill:#b97f15;fill-opacity:0.96078431;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ transform="translate(0,1036.3622)"
+ inkscape:connector-curvature="0"
+ id="path3592"
+ d="m -3.2055528,33.179216 c -0.3800686,-0.09659 -0.6849474,-0.26296 -0.9858209,-0.537942 -0.5688065,-0.519857 -0.6094976,-1.074914 -0.1140982,-1.556387 l 0.205691,-0.199909 h -0.5656713 c -0.5147025,0 -0.5896071,-0.01122 -0.8313218,-0.124532 -0.5015003,-0.235095 -0.8811815,-0.698157 -0.8811815,-1.074698 0,-0.264635 0.2131572,-0.631188 0.4852981,-0.834535 0.7665723,-0.572792 1.9364935,-0.869157 2.7104467,-0.686613 0.5501699,0.129763 0.9732644,0.420534 1.1534213,0.792689 0.1772913,0.366235 0.118801,0.681216 -0.184116,0.9915 l -0.1827927,0.187237 0.5950948,0.0017 c 0.4574394,0.0013 0.6492337,0.02155 0.8291422,0.0875 0.76422788,0.280154 1.29877009,1.00828 1.14887725,1.56494 -0.14731363,0.54708 -0.89071504,1.058199 -1.95644085,1.345132 -0.3902355,0.105066 -1.0999538,0.126915 -1.4265281,0.04392 z m 1.4181323,-0.61426 c 0.3449119,-0.102259 0.5742648,-0.224479 0.79432499,-0.42329 0.38779872,-0.350353 0.34527606,-0.754195 -0.12463439,-1.183667 -0.3009883,-0.275086 -0.5846953,-0.377283 -1.0473728,-0.377283 -0.5447888,0 -1.2480194,0.284029 -1.4905688,0.602027 -0.1803906,0.236505 -0.1749889,0.573369 0.013557,0.84544 0.1520367,0.21939 0.4471275,0.442182 0.7169476,0.541292 0.2419665,0.08888 0.8306021,0.08654 1.1377464,-0.0045 z m -1.8814319,-2.166047 c 0.5713794,-0.177834 0.942036,-0.502951 0.942036,-0.826298 0,-0.20878 -0.2386426,-0.554731 -0.4803907,-0.696405 -0.4543998,-0.266296 -0.9932489,-0.260877 -1.6019212,0.01611 -0.7296946,0.332059 -0.8301588,0.859818 -0.2521939,1.324827 0.3453183,0.277831 0.8656028,0.345746 1.3924698,0.181767 z"
+ style="opacity:0.96000001;fill:#b97f15;fill-opacity:0.96078431;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ transform="translate(0,1036.3622)"
+ inkscape:connector-curvature="0"
+ id="path3594"
+ d="m -12.067411,25.209329 c 0.112457,-0.460299 0.177187,-0.620252 0.251175,-0.620683 0.161104,-9.36e-4 0.555442,-0.226705 0.822292,-0.470782 0.555383,-0.507986 0.9948184,-1.228649 1.1963061,-1.961912 0.1146026,-0.417067 0.1206639,-0.578323 0.025322,-0.673665 -0.098259,-0.09826 -0.2666811,-0.03263 -0.5837891,0.227496 -0.139438,0.11438 -0.261441,0.200046 -0.271118,0.190368 -0.0097,-0.0097 0.01817,-0.145057 0.06188,-0.300843 0.07312,-0.260587 0.107568,-0.30677 0.430622,-0.577267 0.5417813,-0.45364 0.9376763,-1.075512 1.1102269,-1.743945 0.089624,-0.347187 0.089981,-0.420188 0.00241,-0.492863 -0.1382138,-0.114707 -0.3215291,0.0028 -0.8766955,0.561806 -0.3033804,0.305498 -0.5516014,0.548412 -0.5516014,0.53981 0,-0.0086 0.0446,-0.160028 0.0991,-0.3365 0.09456,-0.306161 0.126191,-0.34775 0.6904399,-0.907909 0.7606976,-0.755183 1.0562859,-0.899327 1.1795203,-0.575196 0.062538,0.164487 -0.050019,0.739925 -0.2422139,1.238304 -0.1467772,0.380606 -0.5113184,1.020637 -0.7538244,1.323503 l -0.1461973,0.182585 0.1215095,-0.0305 c 0.083602,-0.02098 0.1463442,-0.0057 0.2011147,0.04911 0.2617266,0.261726 -0.2751282,1.867154 -0.9749668,2.915571 -0.327165,0.490122 -1.153912,1.30035 -1.493906,1.464057 -0.146414,0.0705 -0.280349,0.128179 -0.297634,0.128179 -0.01728,0 -0.01727,-0.05793 2.4e-5,-0.128726 z"
+ style="opacity:0.96000001;fill:#b97f15;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+</svg>
diff --git a/developers/Skills Developer Assets/images/skill_strength.svg b/developers/Skills Developer Assets/images/skill_strength.svg
new file mode 100644
index 0000000..efb77ac
--- /dev/null
+++ b/developers/Skills Developer Assets/images/skill_strength.svg
@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 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:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="skill_strength.svg"
+ inkscape:export-filename="/home/christian/Eclipse/skills-2020-09/git/skills/plugins/org.eclipse.skills/icons/full/obj32/strength.png"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient4789">
+ <stop
+ style="stop-color:#4e8fbd;stop-opacity:1;"
+ offset="0"
+ id="stop4791" />
+ <stop
+ style="stop-color:#30495a;stop-opacity:1;"
+ offset="1"
+ id="stop4793" />
+ </linearGradient>
+ <linearGradient
+ y2="1045.3622"
+ x2="-11"
+ y1="1042.3622"
+ x1="-11"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4975-2-1-1"
+ xlink:href="#linearGradient4994-4-7-4"
+ inkscape:collect="always"
+ gradientTransform="translate(18.5,-2.5)" />
+ <linearGradient
+ id="linearGradient4994-4-7-4"
+ inkscape:collect="always">
+ <stop
+ id="stop4996-5-4-2"
+ offset="0"
+ style="stop-color:#c3e9ff;stop-opacity:1" />
+ <stop
+ id="stop4998-5-0-3"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ y2="1047.3622"
+ x2="-15"
+ y1="1047.3622"
+ x1="-12"
+ gradientTransform="translate(18.5,-2.5)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient5062-9-5"
+ xlink:href="#linearGradient4910-4-4-2"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4910-4-4-2">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop4912-8-8-7" />
+ <stop
+ style="stop-color:#c3e9ff;stop-opacity:1"
+ offset="1"
+ id="stop4914-8-8-6" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4883-4-7"
+ id="linearGradient4889-2-1"
+ x1="28"
+ y1="1039.3622"
+ x2="28"
+ y2="1049.3622"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9,0,0,0.9,-17.2,104.43622)" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4883-4-7">
+ <stop
+ style="stop-color:#ebf9ff;stop-opacity:1"
+ offset="0"
+ id="stop4885-5-1" />
+ <stop
+ style="stop-color:#fcffff;stop-opacity:1"
+ offset="1"
+ id="stop4887-5-1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient7584-9-3-2">
+ <stop
+ style="stop-color:#f9cd5f;stop-opacity:1;"
+ offset="0"
+ id="stop7586-6-3-6" />
+ <stop
+ style="stop-color:#ffebb7;stop-opacity:1;"
+ offset="1"
+ id="stop7588-9-9-0" />
+ </linearGradient>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="30.212121"
+ inkscape:cx="9.6639519"
+ inkscape:cy="6.5405545"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="1043"
+ inkscape:window-x="1920"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:snap-global="false"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-nodes="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3999" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline"
+ transform="translate(0,-1036.3622)">
+ <path
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#646464;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+ d="m 2.0260777,1038.3883 v 13.9739 H 16 v -13.9739 z m 1.2703561,1.2703 H 14.729644 v 11.4332 H 3.2964338 Z"
+ id="rect3997-9-1-2-3-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <g
+ id="g1544"
+ transform="matrix(1.2868606,0,0,1.2758275,-2.2948848,-288.06381)">
+ <path
+ inkscape:connector-curvature="0"
+ id="rect3997-9-1-1-2"
+ d="m 3.5,1039.8622 h 8.971875 l 0.02812,9 H 3.52812 Z"
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4889-2-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="rect4853-82-7-1"
+ d="m 5.5,1041.8622 v 7 h -2 v -9 z"
+ style="display:inline;fill:url(#linearGradient5062-9-5);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="rect4853-82-0-6"
+ d="m 5.5,1041.8622 h 7 v -2 h -9 z"
+ style="display:inline;fill:url(#linearGradient4975-2-1-1);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
+ </g>
+ <g
+ id="g4962"
+ transform="matrix(-0.24018696,1.4611033,-1.4611033,-0.24018696,1563.1758,1289.0358)">
+ <path
+ style="fill:#b97f15;fill-opacity:1;stroke:#b97f15;stroke-width:0.09536923;stroke-opacity:1"
+ sodipodi:nodetypes="cccccccccccccccccccccsccccccccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccccc"
+ d="m 8.8135651,1064.1239 c 0.2327009,-0.2899 0.4215323,-0.6218 0.5617246,-0.9957 l 0.2431919,0.2318 c 0.02289,0.3452 -0.025751,0.4902 -0.268941,0.8335 -0.085832,0.1211 -0.1802486,0.2422 -0.2822932,0.3643 -0.1945537,0.1621 -0.2203028,0.3176 -0.057222,0.4645 l 0.079156,0.081 c 0.1392387,0.078 0.2899219,0.089 0.4816145,-0.1449 l 0.2832467,-0.3911 c 0.1277946,-0.1754 0.2956444,-0.3461 0.2994594,-0.575 9.47e-4,-0.042 -0.0028,-0.087 -0.01049,-0.1317 l 0.136378,0.1307 c 0.04483,0.053 0.08106,0.1068 0.107767,0.163 0.0267,0.056 0.04387,0.1126 0.04959,0.1728 0.01907,0.1993 -0.165942,0.5149 -0.413902,0.8144 -0.3023204,0.3643 -0.6876121,0.6924 -0.9222206,0.7696 -0.370986,0.123 -0.8039618,-0.3396 -1.166365,-0.7277 -0.049592,-0.053 -0.09823,-0.1049 -0.145915,-0.1545 0.3786158,-0.2288 0.6981026,-0.5045 0.9622754,-0.8259 0.020983,-0.025 0.042915,-0.053 0.062943,-0.079 z m -2.6121628,-2.4568 c 0.034332,-0.067 0.00859,-0.1487 -0.058175,-0.183 -0.066759,-0.035 -0.1487762,-0.01 -0.1831091,0.058 -0.082018,0.1583 -0.1754798,0.3033 -0.2832466,0.4321 -0.1068136,0.1268 -0.2279325,0.2374 -0.3662181,0.3299 -0.062944,0.042 -0.079156,0.1259 -0.038148,0.1888 0.041962,0.063 0.1258876,0.079 0.1888314,0.038 0.1611741,-0.1068 0.3013667,-0.2356 0.4234392,-0.3815 0.1211188,-0.1439 0.2250715,-0.3061 0.3166259,-0.4825 z m 0.5407436,0.4999 c 0.034332,-0.067 0.00858,-0.1489 -0.058176,-0.1832 -0.066758,-0.034 -0.1487757,-0.01 -0.183109,0.058 -0.082018,0.1583 -0.1754791,0.3033 -0.2832463,0.432 -0.1068136,0.1269 -0.2279324,0.2375 -0.3662178,0.33 -0.062944,0.042 -0.079157,0.1259 -0.038149,0.1889 0.041962,0.063 0.1258877,0.079 0.1888315,0.037 0.1611738,-0.1068 0.3013667,-0.2355 0.4234391,-0.3814 0.1211189,-0.1441 0.2260253,-0.3061 0.316626,-0.4826 z m 1.0872093,-0.6401 c -0.1468686,-0.245 -0.2956448,-0.4548 -0.4453745,-0.6303 l -0.017164,-0.02 c -0.1840631,-0.2909 -0.3166259,-0.5819 -0.1802479,-0.6848 v 0 c 0.087739,-0.066 0.2193492,-0.074 0.3585881,-0.048 0.2069512,0.036 0.4196248,0.1421 0.5493269,0.2385 0.1688034,0.1268 0.322348,0.2909 0.4539573,0.4673 0.1573589,0.2097 0.283246,0.4358 0.3700324,0.6351 0.087739,0.2041 0.1535443,0.4235 0.1964608,0.659 0.041007,0.2299 0.059129,0.475 0.053406,0.7373 -0.136378,0.4062 -0.3271161,0.7686 -0.5750761,1.0852 -0.018118,0.023 -0.037194,0.046 -0.056268,0.068 -0.2861071,0.3328 -0.6408808,0.6037 -1.0585983,0.8172 v 0 l -0.014306,0.01 c -0.051499,-0.01 -0.1039527,-0.01 -0.1573594,-0.01 -0.091554,-0.01 -0.1812015,-0.018 -0.268941,-0.032 -0.2880151,-0.047 -0.5331143,-0.124 -0.7658152,-0.2308 -0.2355617,-0.1078 -0.4596797,-0.2451 -0.7057322,-0.412 -0.1201652,-0.081 -0.2393765,-0.1697 -0.3576341,-0.2651 -0.1182581,-0.094 -0.2307941,-0.1936 -0.3385612,-0.2966 v 0 c -0.2346082,-0.2451 -0.3976895,-0.4836 -0.4930591,-0.7162 -0.092508,-0.226 -0.1201652,-0.4473 -0.085832,-0.6647 0.032424,-0.2023 0.152591,-0.4445 0.3089963,-0.6772 0.199322,-0.2985 0.453004,-0.5779 0.6542333,-0.7496 0.086786,-0.074 0.1716645,-0.1364 0.2555893,-0.186 0.2727562,-0.163 0.5483728,-0.2145 0.8201754,-0.1458 0.2775242,0.069 0.5588637,0.2641 0.8392494,0.5893 0.1182577,0.1889 0.250821,0.3653 0.3500049,0.4998 0.027658,0.036 0.051499,0.068 0.088693,0.1201 0.04387,0.061 0.1287484,0.075 0.189785,0.031 0.057221,-0.044 0.072481,-0.1249 0.031471,-0.186 z m -0.9460628,-1.0909 c -0.1621277,-0.1107 -0.3252091,-0.1861 -0.4901978,-0.227 -0.3452368,-0.087 -0.688566,-0.025 -1.026173,0.1774 -0.1001375,0.06 -0.1974143,0.1306 -0.2937374,0.2126 -0.216488,0.185 -0.4901979,0.4864 -0.703825,0.8059 -0.1754791,0.2622 -0.3128108,0.5408 -0.3519121,0.7868 -0.041963,0.2661 -0.00858,0.5351 0.1039524,0.8087 0.1087208,0.2661 0.2918298,0.5341 0.552188,0.806 l 0.00381,0.01 v 0 c 0.1173044,0.1115 0.2355621,0.2155 0.3566809,0.3127 0.1192116,0.096 0.2450989,0.1889 0.3757549,0.2775 0.2584507,0.1755 0.4949663,0.3205 0.7457876,0.435 0.2536818,0.1154 0.519762,0.1993 0.8344806,0.2518 0.1001377,0.017 0.1974141,0.029 0.2918296,0.036 0.073434,0.01 0.1487761,0.01 0.2250716,0.011 0.071527,0.071 0.1478222,0.1526 0.2269788,0.2375 0.4167633,0.4453 0.9145906,0.9766 1.4505655,0.7992 0.279432,-0.093 0.7171766,-0.4559 1.047155,-0.8546 0.288968,-0.3491 0.502596,-0.7343 0.475893,-1.0127 -0.0095,-0.093 -0.03433,-0.1813 -0.07439,-0.2642 -0.03815,-0.08 -0.08965,-0.1555 -0.151637,-0.227 v 0 c -0.0029,-0.01 -0.0057,-0.01 -0.0086,-0.01 l -1.0338028,-0.988 c 0.00189,-0.2518 -0.018117,-0.4902 -0.058175,-0.7163 -0.045775,-0.2546 -0.1173043,-0.4939 -0.2145806,-0.7181 -0.094416,-0.2184 -0.2317474,-0.4645 -0.4015045,-0.6924 -0.145915,-0.1955 -0.3175791,-0.3786 -0.5083178,-0.5217 -0.1564054,-0.1172 -0.414856,-0.2451 -0.6647233,-0.2889 -0.2059979,-0.036 -0.4119955,-0.018 -0.5693545,0.1002 v 0 0 c -0.1468685,0.1077 -0.176433,0.2727 -0.1392389,0.4587 z"
+ id="path2-6"
+ inkscape:connector-curvature="0" />
+ <path
+ transform="translate(0,1036.3622)"
+ inkscape:connector-curvature="0"
+ id="path4955"
+ d="M 6.8851075,28.356664 C 6.0205961,28.167325 4.8416454,27.311353 4.4979131,26.623453 4.2355806,26.098456 4.3258393,25.658999 4.8310027,25.001689 c 0.6455903,-0.840031 1.2629799,-1.044407 1.8779976,-0.62168 0.1477804,0.101576 0.3426493,0.287256 0.433042,0.412622 0.4127387,0.572429 0.450581,0.613939 0.5727761,0.628283 0.08733,0.01025 0.139118,-0.01451 0.1765284,-0.08441 0.059952,-0.112022 -0.029107,-0.291527 -0.3692497,-0.744246 -0.2494274,-0.331979 -0.3753697,-0.650368 -0.2821234,-0.713223 0.093372,-0.06294 0.4312571,-0.01269 0.6438014,0.09574 0.4819323,0.245863 1.029387,1.102098 1.1548136,1.806162 0.1059776,0.594888 0.093886,0.695419 -0.1419474,1.180203 -0.250394,0.514714 -0.6655714,0.985415 -1.1252407,1.275722 -0.3282,0.207277 -0.4263351,0.220543 -0.8862931,0.119806 z M 6.2327244,26.576731 c 0.2407225,-0.197253 0.5821689,-0.693641 0.5821689,-0.846345 0,-0.12179 -0.140664,-0.22189 -0.2518509,-0.179223 -0.039267,0.01507 -0.1378119,0.130899 -0.2189883,0.257401 -0.081176,0.126502 -0.2506851,0.322693 -0.3766861,0.435978 -0.2157999,0.194023 -0.2912948,0.37132 -0.1978863,0.464728 0.076258,0.07626 0.2793432,0.01815 0.4632427,-0.132539 z M 5.6265175,26.128775 c 0.2164395,-0.170809 0.4607757,-0.467535 0.5857381,-0.711331 0.1083183,-0.211325 0.057179,-0.362108 -0.122812,-0.362108 -0.085879,0 -0.1583961,0.06574 -0.2969115,0.269154 -0.1008035,0.148035 -0.2806346,0.357447 -0.3996248,0.46536 -0.2363682,0.214363 -0.2552521,0.268336 -0.1388766,0.39693 0.1060227,0.117153 0.161477,0.108518 0.3724868,-0.058 z"
+ style="opacity:0.96000001;fill:#fad16b;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.96078431" />
+ <path
+ transform="translate(0,1036.3622)"
+ inkscape:connector-curvature="0"
+ id="path4957"
+ d="M 8.8378189,29.494383 C 8.638341,29.428623 8.4152855,29.25199 8.0621638,28.880159 L 7.8716272,28.679528 7.9860984,28.602023 C 8.4408418,28.294129 8.8279578,27.888701 9.1177247,27.416866 9.1830017,27.310573 9.3140203,27.054203 9.368711,26.92575 l 0.026684,-0.06267 0.031325,0.02728 c 0.017229,0.015 0.056339,0.05091 0.086911,0.07979 l 0.055586,0.05251 -2.036e-4,0.111612 c -3.674e-4,0.201871 -0.045885,0.338568 -0.1825504,0.548231 -0.098482,0.151085 -0.2952915,0.406229 -0.3898305,0.505376 -0.1061887,0.111366 -0.1412976,0.179624 -0.1411506,0.274424 1.419e-4,0.09157 0.038097,0.159523 0.1484184,0.265714 0.063082,0.06072 0.094728,0.08196 0.1438334,0.09654 0.1980136,0.0588 0.3425649,-0.02525 0.557731,-0.324319 0.056441,-0.07845 0.1637316,-0.224509 0.2384244,-0.324578 0.074693,-0.10007 0.1521599,-0.210657 0.1721499,-0.24575 0.04622,-0.08113 0.08511,-0.19673 0.08511,-0.252969 v -0.04362 l 0.04166,0.04033 c 0.05344,0.05173 0.129026,0.202446 0.139417,0.278 0.01043,0.07586 -0.01469,0.176048 -0.07684,0.306488 -0.118947,0.24963 -0.312275,0.499874 -0.6150445,0.796114 -0.1939765,0.189794 -0.3793769,0.335 -0.5158882,0.404047 -0.081936,0.04144 -0.1006788,0.04624 -0.1903547,0.04875 -0.058552,0.0016 -0.118726,-0.0036 -0.1462796,-0.01265 z"
+ style="opacity:0.96000001;fill:#fad16b;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.96078431" />
+ </g>
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g31"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g33"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g35"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g37"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g39"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g41"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g43"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g45"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g47"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g49"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g51"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g53"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g55"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g57"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g59"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g14" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g16-5" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g18" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g20-0" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g22" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g24" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g26" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g28" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g30" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g32" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g34" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g36" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g38" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g40" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g42" />
+ <path
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#8b96ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+ d="m 1.0130386,1037.3753 v 13.9739 H 14.986961 v -13.9739 z m 1.2703561,1.2703 H 13.716605 v 11.4332 H 2.2833947 Z"
+ id="rect3997-9-1-2-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ </g>
+</svg>
diff --git a/developers/Skills Developer Assets/images/skill_wisdom.svg b/developers/Skills Developer Assets/images/skill_wisdom.svg
new file mode 100644
index 0000000..4ddc208
--- /dev/null
+++ b/developers/Skills Developer Assets/images/skill_wisdom.svg
@@ -0,0 +1,340 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 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:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="skill_wisdom.svg"
+ inkscape:export-filename="/home/christian/Eclipse/skills-2020-09/git/skills/plugins/org.eclipse.skills/icons/full/obj32/skills/wisdom.png"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient4789">
+ <stop
+ style="stop-color:#4e8fbd;stop-opacity:1;"
+ offset="0"
+ id="stop4791" />
+ <stop
+ style="stop-color:#30495a;stop-opacity:1;"
+ offset="1"
+ id="stop4793" />
+ </linearGradient>
+ <linearGradient
+ y2="1045.3622"
+ x2="-11"
+ y1="1042.3622"
+ x1="-11"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4975-2-1-1"
+ xlink:href="#linearGradient4994-4-7-4"
+ inkscape:collect="always"
+ gradientTransform="translate(18.5,-2.5)" />
+ <linearGradient
+ id="linearGradient4994-4-7-4"
+ inkscape:collect="always">
+ <stop
+ id="stop4996-5-4-2"
+ offset="0"
+ style="stop-color:#c3e9ff;stop-opacity:1" />
+ <stop
+ id="stop4998-5-0-3"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ y2="1047.3622"
+ x2="-15"
+ y1="1047.3622"
+ x1="-12"
+ gradientTransform="translate(18.5,-2.5)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient5062-9-5"
+ xlink:href="#linearGradient4910-4-4-2"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4910-4-4-2">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop4912-8-8-7" />
+ <stop
+ style="stop-color:#c3e9ff;stop-opacity:1"
+ offset="1"
+ id="stop4914-8-8-6" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4883-4-7"
+ id="linearGradient4889-2-1"
+ x1="28"
+ y1="1039.3622"
+ x2="28"
+ y2="1049.3622"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9,0,0,0.9,-17.2,104.43622)" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4883-4-7">
+ <stop
+ style="stop-color:#ebf9ff;stop-opacity:1"
+ offset="0"
+ id="stop4885-5-1" />
+ <stop
+ style="stop-color:#fcffff;stop-opacity:1"
+ offset="1"
+ id="stop4887-5-1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient7584-9-3-2">
+ <stop
+ style="stop-color:#f9cd5f;stop-opacity:1;"
+ offset="0"
+ id="stop7586-6-3-6" />
+ <stop
+ style="stop-color:#ffebb7;stop-opacity:1;"
+ offset="1"
+ id="stop7588-9-9-0" />
+ </linearGradient>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="21.363196"
+ inkscape:cx="7.9054097"
+ inkscape:cy="5.10782"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="1043"
+ inkscape:window-x="1920"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:snap-global="false"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-nodes="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3999" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline"
+ transform="translate(0,-1036.3622)">
+ <path
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#646464;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+ d="m 2.0260777,1038.3883 v 13.9739 H 16 v -13.9739 z m 1.2703561,1.2703 H 14.729644 v 11.4332 H 3.2964338 Z"
+ id="rect3997-9-1-2-3-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <g
+ id="g1544"
+ transform="matrix(1.2868606,0,0,1.2758275,-2.2948848,-288.06381)">
+ <path
+ inkscape:connector-curvature="0"
+ id="rect3997-9-1-1-2"
+ d="m 3.5,1039.8622 h 8.971875 l 0.02812,9 H 3.52812 Z"
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4889-2-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="rect4853-82-7-1"
+ d="m 5.5,1041.8622 v 7 h -2 v -9 z"
+ style="display:inline;fill:url(#linearGradient5062-9-5);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="rect4853-82-0-6"
+ d="m 5.5,1041.8622 h 7 v -2 h -9 z"
+ style="display:inline;fill:url(#linearGradient4975-2-1-1);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
+ </g>
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g31"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g33"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g35"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g37"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g39"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g41"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g43"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g45"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g47"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g49"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g51"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g53"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g55"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g57"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01908777,0,0,0.01908777,3.4747345,1057.4345)"
+ id="g59"
+ style="fill:#b97f15;fill-opacity:1" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g14" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g16-5" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g18" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g20-0" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g22" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g24" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g26" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g28" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g30" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g32" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g34" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g36" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g38" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g40" />
+ <g
+ transform="matrix(0.01650164,0,0,0.01650164,-5.6239738,1020.9134)"
+ id="g42" />
+ <path
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#8b96ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+ d="m 1.0130386,1037.3753 v 13.9739 H 14.986961 v -13.9739 z m 1.2703561,1.2703 H 13.716605 v 11.4332 H 2.2833947 Z"
+ id="rect3997-9-1-2-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <g
+ id="g4918"
+ transform="matrix(1.2027763,0,0,1.2027763,23.161579,-206.53581)">
+ <g
+ transform="translate(-1.239132,0.07111372)"
+ id="g4889">
+ <path
+ inkscape:connector-curvature="0"
+ id="path2"
+ d="m -11.760868,1036.8218 c 0.120458,0.209 0.202941,0.7271 0.246258,1.4129 0.01807,0.2048 0.0117,0.2019 0.02018,0.4095 0.0071,0.1952 0.01187,0.4005 0.01365,0.6124 -0.0042,0.2683 -6.57e-4,0.2711 5.83e-4,0.4076 -0.0017,0.2315 -0.0065,0.4682 -0.01425,0.7091 -0.01429,0.3624 -0.01421,0.3638 -0.01602,0.4089 -0.0089,0.1922 -0.01958,0.3851 -0.03263,0.5773 -0.0095,0.2346 -0.0091,0.2533 -0.0248,0.4307 -0.0065,0.082 -0.0028,0.1736 -0.0099,0.2543 -0.0095,0.1044 -0.03137,0.401 -0.03109,0.4965 -0.0018,-0.048 -0.181699,0.8811 -0.853418,1.0218 -0.331112,0.069 -0.673499,-0.032 -0.931625,-0.2344 -0.2065,-0.1608 -0.361375,-0.3868 -0.417153,-0.6426 -0.107999,-0.012 -0.217776,-0.026 -0.324585,-0.062 -0.236171,-0.079 -0.46344,-0.2345 -0.640864,-0.4398 -0.178611,-0.2059 -0.30797,-0.4646 -0.348914,-0.7524 -0.02077,-0.15 -0.0178,-0.3067 0.01543,-0.4682 -0.115711,-0.1044 -0.2154,-0.2231 -0.294322,-0.3518 -0.137667,-0.2202 -0.213027,-0.4682 -0.21006,-0.7234 0.003,-0.2569 0.08485,-0.5174 0.262279,-0.7595 0.10325,-0.1406 0.239137,-0.2747 0.41122,-0.3976 -0.0018,-0.047 -0.0018,-0.094 -5.84e-4,-0.14 0.01365,-0.375 0.151909,-0.7049 0.353662,-0.9512 0.208874,-0.2552 0.488361,-0.4219 0.775563,-0.4629 h 0.0011 c 0.01009,-0.042 0.02195,-0.084 0.03738,-0.124 0.09257,-0.251 0.283048,-0.4646 0.516251,-0.6005 0.234982,-0.1365 0.516843,-0.197 0.791583,-0.1401 0.264059,0.056 0.515658,0.2137 0.70495,0.5092 z m -2.027618,5.3578 c 0.09732,-0.3062 0.354254,-0.6118 0.839055,-0.8592 0.121053,-0.061 0.268214,-0.014 0.33052,0.1067 0.06112,0.121 0.01365,0.2682 -0.106807,0.3304 -0.449197,0.2298 -0.618313,0.4931 -0.618313,0.7229 0,0.1791 0.102057,0.3465 0.250411,0.4628 0.150721,0.1168 0.345353,0.178 0.529304,0.14 0.229049,-0.047 0.449791,-0.2593 0.564316,-0.721 v -4.854 c -0.114525,-0.4579 -0.335267,-0.6686 -0.563722,-0.7161 -0.150722,-0.031 -0.310937,0.011 -0.447417,0.084 -0.138261,0.08 -0.249224,0.2035 -0.302037,0.3459 -0.07002,0.1899 -0.02848,0.4232 0.208874,0.6427 0.0985,0.092 0.105028,0.2457 0.01305,0.3442 -0.09198,0.099 -0.245664,0.1055 -0.344167,0.013 -0.184545,-0.1709 -0.298476,-0.3526 -0.355441,-0.5336 -0.145381,0.034 -0.288982,0.1312 -0.405287,0.2724 -0.135886,0.1657 -0.229049,0.3899 -0.238543,0.6475 -0.0024,0.068 0.0011,0.1405 0.01124,0.2147 h -5.84e-4 c 0.01305,0.096 -0.02967,0.1959 -0.117491,0.2498 -0.178018,0.109 -0.309157,0.2297 -0.401133,0.3549 -0.111554,0.152 -0.16259,0.3115 -0.16437,0.4652 -0.0018,0.1561 0.04628,0.3115 0.132326,0.451 0.07299,0.1181 0.172678,0.2261 0.294323,0.3162 0.09138,0.063 0.134106,0.1806 0.09672,0.2902 -0.04807,0.1425 -0.05875,0.2807 -0.04035,0.4095 0.02611,0.1851 0.112151,0.3543 0.229642,0.4901 0.118085,0.1366 0.267619,0.2387 0.420715,0.2907 0.06172,0.024 0.124018,0.036 0.185138,0.039 z m 0.05578,-3.4482 c 0.09613,-0.094 0.250411,-0.093 0.345353,0 0.09435,0.096 0.09316,0.2505 -0.003,0.3453 -0.209467,0.2066 -0.318651,0.4724 -0.33052,0.7442 -0.01124,0.2801 0.07952,0.5684 0.270589,0.8053 0.08485,0.1044 0.06765,0.2586 -0.03738,0.3435 -0.105028,0.085 -0.258718,0.068 -0.343574,-0.038 -0.267619,-0.3317 -0.394605,-0.7352 -0.378584,-1.131 0.01721,-0.3927 0.175051,-0.7761 0.477087,-1.0727 z"
+ sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccsccccccccscccccccccccccccccccccsccc"
+ style="fill:#b97f15;fill-opacity:1;stroke-width:0.05933915" />
+ <path
+ transform="translate(0,1036.3622)"
+ style="opacity:0.96000001;fill:#f9cd5f;fill-opacity:0.96078431;stroke:#b97f15;stroke-width:0.09361895;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m -12.837282,6.6960245 c -0.225357,-0.062969 -0.436236,-0.2699058 -0.478901,-0.4699482 -0.06234,-0.2923057 0.107723,-0.5307532 0.584906,-0.8200898 0.17394,-0.1054674 0.192576,-0.3379176 0.03481,-0.4341176 -0.103708,-0.063235 -0.18705,-0.057147 -0.340508,0.024873 -0.327445,0.1750119 -0.600702,0.4420277 -0.710897,0.6946603 -0.06138,0.1407252 -0.07009,0.1415109 -0.317859,0.028678 -0.372879,-0.1698098 -0.610503,-0.6011907 -0.537227,-0.9752773 0.0145,-0.074017 0.02705,-0.1840703 0.02789,-0.2445617 0.0015,-0.1072772 -0.0029,-0.1142299 -0.178956,-0.2824516 -0.241692,-0.2309596 -0.334206,-0.4172387 -0.333983,-0.6724795 1.23e-4,-0.1410884 0.01243,-0.2017985 0.06273,-0.3093655 0.07138,-0.1526663 0.230516,-0.3326513 0.403634,-0.4565138 0.193935,-0.1387562 0.19941,-0.1501909 0.200001,-0.4176632 7.86e-4,-0.3557434 0.09572,-0.6214367 0.292283,-0.817998 0.09147,-0.091466 0.259448,-0.1985049 0.311525,-0.1985049 0.01102,0 0.05093,0.065185 0.0887,0.1448552 0.03914,0.082564 0.129242,0.2083718 0.209532,0.2925593 0.130581,0.1369195 0.148267,0.147704 0.242239,0.147704 0.08408,0 0.114948,-0.013574 0.18095,-0.079576 0.123088,-0.123088 0.108613,-0.2432592 -0.04962,-0.4119234 -0.125156,-0.1334092 -0.175097,-0.2502973 -0.174849,-0.4092363 6.57e-4,-0.42093687 0.503664,-0.72637307 0.884055,-0.53681618 0.142555,0.0710383 0.234574,0.17957929 0.338788,0.39961796 l 0.0759,0.16025632 0.0065,2.4809022 0.0065,2.4809023 -0.05013,0.1404284 c -0.156803,0.4392075 -0.439394,0.635723 -0.778086,0.5410864 z m -0.633621,-2.1068634 c 0.108836,-0.108836 0.109224,-0.2182417 0.0013,-0.3700209 -0.330168,-0.4643882 -0.314694,-1.0312603 0.03944,-1.4447879 0.05997,-0.07003 0.110708,-0.1490209 0.112747,-0.1755355 0.01151,-0.149565 -0.02863,-0.2314299 -0.139189,-0.2838927 -0.163364,-0.077521 -0.345509,0.047866 -0.539062,0.3710876 -0.140166,0.2340688 -0.197878,0.4400174 -0.209923,0.7491292 -0.01213,0.3113605 0.02322,0.5081255 0.136292,0.7586199 0.20109,0.4454741 0.41016,0.5836238 0.598384,0.3954003 z"
+ id="path4885"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g4889-2"
+ style="display:inline"
+ transform="matrix(-1,0,0,1,-23.971838,0.07111372)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path2-8"
+ d="m -11.760868,1036.8218 c 0.120458,0.209 0.202941,0.7271 0.246258,1.4129 0.01807,0.2048 0.0117,0.2019 0.02018,0.4095 0.0071,0.1952 0.01187,0.4005 0.01365,0.6124 -0.0042,0.2683 -6.57e-4,0.2711 5.83e-4,0.4076 -0.0017,0.2315 -0.0065,0.4682 -0.01425,0.7091 -0.01429,0.3624 -0.01421,0.3638 -0.01602,0.4089 -0.0089,0.1922 -0.01958,0.3851 -0.03263,0.5773 -0.0095,0.2346 -0.0091,0.2533 -0.0248,0.4307 -0.0065,0.082 -0.0028,0.1736 -0.0099,0.2543 -0.0095,0.1044 -0.03137,0.401 -0.03109,0.4965 -0.0018,-0.048 -0.181699,0.8811 -0.853418,1.0218 -0.331112,0.069 -0.673499,-0.032 -0.931625,-0.2344 -0.2065,-0.1608 -0.361375,-0.3868 -0.417153,-0.6426 -0.107999,-0.012 -0.217776,-0.026 -0.324585,-0.062 -0.236171,-0.079 -0.46344,-0.2345 -0.640864,-0.4398 -0.178611,-0.2059 -0.30797,-0.4646 -0.348914,-0.7524 -0.02077,-0.15 -0.0178,-0.3067 0.01543,-0.4682 -0.115711,-0.1044 -0.2154,-0.2231 -0.294322,-0.3518 -0.137667,-0.2202 -0.213027,-0.4682 -0.21006,-0.7234 0.003,-0.2569 0.08485,-0.5174 0.262279,-0.7595 0.10325,-0.1406 0.239137,-0.2747 0.41122,-0.3976 -0.0018,-0.047 -0.0018,-0.094 -5.84e-4,-0.14 0.01365,-0.375 0.151909,-0.7049 0.353662,-0.9512 0.208874,-0.2552 0.488361,-0.4219 0.775563,-0.4629 h 0.0011 c 0.01009,-0.042 0.02195,-0.084 0.03738,-0.124 0.09257,-0.251 0.283048,-0.4646 0.516251,-0.6005 0.234982,-0.1365 0.516843,-0.197 0.791583,-0.1401 0.264059,0.056 0.515658,0.2137 0.70495,0.5092 z m -2.027618,5.3578 c 0.09732,-0.3062 0.354254,-0.6118 0.839055,-0.8592 0.121053,-0.061 0.268214,-0.014 0.33052,0.1067 0.06112,0.121 0.01365,0.2682 -0.106807,0.3304 -0.449197,0.2298 -0.618313,0.4931 -0.618313,0.7229 0,0.1791 0.102057,0.3465 0.250411,0.4628 0.150721,0.1168 0.345353,0.178 0.529304,0.14 0.229049,-0.047 0.449791,-0.2593 0.564316,-0.721 v -4.854 c -0.114525,-0.4579 -0.335267,-0.6686 -0.563722,-0.7161 -0.150722,-0.031 -0.310937,0.011 -0.447417,0.084 -0.138261,0.08 -0.249224,0.2035 -0.302037,0.3459 -0.07002,0.1899 -0.02848,0.4232 0.208874,0.6427 0.0985,0.092 0.105028,0.2457 0.01305,0.3442 -0.09198,0.099 -0.245664,0.1055 -0.344167,0.013 -0.184545,-0.1709 -0.298476,-0.3526 -0.355441,-0.5336 -0.145381,0.034 -0.288982,0.1312 -0.405287,0.2724 -0.135886,0.1657 -0.229049,0.3899 -0.238543,0.6475 -0.0024,0.068 0.0011,0.1405 0.01124,0.2147 h -5.84e-4 c 0.01305,0.096 -0.02967,0.1959 -0.117491,0.2498 -0.178018,0.109 -0.309157,0.2297 -0.401133,0.3549 -0.111554,0.152 -0.16259,0.3115 -0.16437,0.4652 -0.0018,0.1561 0.04628,0.3115 0.132326,0.451 0.07299,0.1181 0.172678,0.2261 0.294323,0.3162 0.09138,0.063 0.134106,0.1806 0.09672,0.2902 -0.04807,0.1425 -0.05875,0.2807 -0.04035,0.4095 0.02611,0.1851 0.112151,0.3543 0.229642,0.4901 0.118085,0.1366 0.267619,0.2387 0.420715,0.2907 0.06172,0.024 0.124018,0.036 0.185138,0.039 z m 0.05578,-3.4482 c 0.09613,-0.094 0.250411,-0.093 0.345353,0 0.09435,0.096 0.09316,0.2505 -0.003,0.3453 -0.209467,0.2066 -0.318651,0.4724 -0.33052,0.7442 -0.01124,0.2801 0.07952,0.5684 0.270589,0.8053 0.08485,0.1044 0.06765,0.2586 -0.03738,0.3435 -0.105028,0.085 -0.258718,0.068 -0.343574,-0.038 -0.267619,-0.3317 -0.394605,-0.7352 -0.378584,-1.131 0.01721,-0.3927 0.175051,-0.7761 0.477087,-1.0727 z"
+ sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccsccccccccscccccccccccccccccccccsccc"
+ style="fill:#b97f15;fill-opacity:1;stroke-width:0.05933915" />
+ <path
+ style="opacity:0.96000001;fill:#f9cd5f;fill-opacity:0.96078431;stroke:#b97f15;stroke-width:0.09361895;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m -12.837282,6.6960245 c -0.225357,-0.062969 -0.436236,-0.2699058 -0.478901,-0.4699482 -0.06234,-0.2923057 0.107723,-0.5307532 0.584906,-0.8200898 0.17394,-0.1054674 0.192576,-0.3379176 0.03481,-0.4341176 -0.103708,-0.063235 -0.18705,-0.057147 -0.340508,0.024873 -0.327445,0.1750119 -0.600702,0.4420277 -0.710897,0.6946603 -0.06138,0.1407252 -0.07009,0.1415109 -0.317859,0.028678 -0.372879,-0.1698098 -0.610503,-0.6011907 -0.537227,-0.9752773 0.0145,-0.074017 0.02705,-0.1840703 0.02789,-0.2445617 0.0015,-0.1072772 -0.0029,-0.1142299 -0.178956,-0.2824516 -0.241692,-0.2309596 -0.334206,-0.4172387 -0.333983,-0.6724795 1.23e-4,-0.1410884 0.01243,-0.2017985 0.06273,-0.3093655 0.07138,-0.1526663 0.230516,-0.3326513 0.403634,-0.4565138 0.193935,-0.1387562 0.19941,-0.1501909 0.200001,-0.4176632 7.86e-4,-0.3557434 0.09572,-0.6214367 0.292283,-0.817998 0.09147,-0.091466 0.259448,-0.1985049 0.311525,-0.1985049 0.01102,0 0.05093,0.065185 0.0887,0.1448552 0.03914,0.082564 0.129242,0.2083718 0.209532,0.2925593 0.130581,0.1369195 0.148267,0.147704 0.242239,0.147704 0.08408,0 0.114948,-0.013574 0.18095,-0.079576 0.123088,-0.123088 0.108613,-0.2432592 -0.04962,-0.4119234 -0.125156,-0.1334092 -0.175097,-0.2502973 -0.174849,-0.4092363 6.57e-4,-0.42093687 0.503664,-0.72637307 0.884055,-0.53681618 0.142555,0.0710383 0.234574,0.17957929 0.338788,0.39961796 l 0.0759,0.16025632 0.0065,2.4809022 0.0065,2.4809023 -0.05013,0.1404284 c -0.156803,0.4392075 -0.439394,0.635723 -0.778086,0.5410864 z m -0.633621,-2.1068634 c 0.108836,-0.108836 0.109224,-0.2182417 0.0013,-0.3700209 -0.330168,-0.4643882 -0.314694,-1.0312603 0.03944,-1.4447879 0.05997,-0.07003 0.110708,-0.1490209 0.112747,-0.1755355 0.01151,-0.149565 -0.02863,-0.2314299 -0.139189,-0.2838927 -0.163364,-0.077521 -0.345509,0.047866 -0.539062,0.3710876 -0.140166,0.2340688 -0.197878,0.4400174 -0.209923,0.7491292 -0.01213,0.3113605 0.02322,0.5081255 0.136292,0.7586199 0.20109,0.4454741 0.41016,0.5836238 0.598384,0.3954003 z"
+ id="path4885-9"
+ inkscape:connector-curvature="0"
+ transform="translate(0,1036.3622)" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/plugins/org.eclipse.skills/icons/full/obj32/skills/dextery.png b/plugins/org.eclipse.skills/icons/full/obj32/skills/dextery.png
new file mode 100644
index 0000000..5a3cee0
--- /dev/null
+++ b/plugins/org.eclipse.skills/icons/full/obj32/skills/dextery.png
Binary files differ
diff --git a/plugins/org.eclipse.skills/icons/full/obj32/skills/experience.png b/plugins/org.eclipse.skills/icons/full/obj32/skills/experience.png
new file mode 100644
index 0000000..c440499
--- /dev/null
+++ b/plugins/org.eclipse.skills/icons/full/obj32/skills/experience.png
Binary files differ
diff --git a/plugins/org.eclipse.skills/icons/full/obj32/skills/strength.png b/plugins/org.eclipse.skills/icons/full/obj32/skills/strength.png
new file mode 100644
index 0000000..31071c1
--- /dev/null
+++ b/plugins/org.eclipse.skills/icons/full/obj32/skills/strength.png
Binary files differ
diff --git a/plugins/org.eclipse.skills/icons/full/obj32/skills/wisdom.png b/plugins/org.eclipse.skills/icons/full/obj32/skills/wisdom.png
new file mode 100644
index 0000000..d91e543
--- /dev/null
+++ b/plugins/org.eclipse.skills/icons/full/obj32/skills/wisdom.png
Binary files differ
diff --git a/plugins/org.eclipse.skills/model/Skills.ecore b/plugins/org.eclipse.skills/model/Skills.ecore
index 4821ea8..15ef967 100644
--- a/plugins/org.eclipse.skills/model/Skills.ecore
+++ b/plugins/org.eclipse.skills/model/Skills.ecore
@@ -71,6 +71,7 @@
<eOperations name="addExperience">
<eParameters name="amount" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
</eOperations>
+ <eOperations name="getImageDescriptor" eType="#//ImageDescriptor"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
defaultValueLiteral="<unnamed>" iD="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="description" lowerBound="1"
@@ -80,6 +81,7 @@
eType="#//LevelProgression" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="baseSkill" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
defaultValueLiteral="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="imageURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="UserTask">
<eOperations name="isCompleted" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
diff --git a/plugins/org.eclipse.skills/model/Skills.genmodel b/plugins/org.eclipse.skills/model/Skills.genmodel
index 43cd964..144f37d 100644
--- a/plugins/org.eclipse.skills/model/Skills.genmodel
+++ b/plugins/org.eclipse.skills/model/Skills.genmodel
@@ -76,9 +76,11 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Skills.ecore#//Skill/experience"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Skills.ecore#//Skill/progression"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Skills.ecore#//Skill/baseSkill"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Skills.ecore#//Skill/imageURI"/>
<genOperations ecoreOperation="Skills.ecore#//Skill/addExperience">
<genParameters ecoreParameter="Skills.ecore#//Skill/addExperience/amount"/>
</genOperations>
+ <genOperations ecoreOperation="Skills.ecore#//Skill/getImageDescriptor"/>
</genClasses>
<genClasses ecoreClass="Skills.ecore#//UserTask">
<genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference Skills.ecore#//UserTask/task"/>
diff --git a/plugins/org.eclipse.skills/model/model.aird b/plugins/org.eclipse.skills/model/model.aird
index 4004d1f..91a5d08 100644
--- a/plugins/org.eclipse.skills/model/model.aird
+++ b/plugins/org.eclipse.skills/model/model.aird
@@ -5,7 +5,7 @@
<semanticResources>http://eclipse.org/skills/1.0.0</semanticResources>
<ownedViews xmi:type="viewpoint:DView" uid="_m68ZsEwrEeqwHIzbUoB2lQ">
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
- <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_n6l40EwrEeqwHIzbUoB2lQ" name="Skills Model" repPath="#_n4mUwEwrEeqwHIzbUoB2lQ" changeId="81b72874-5cd2-4495-8f09-33c59b878780">
+ <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_n6l40EwrEeqwHIzbUoB2lQ" name="Skills Model" repPath="#_n4mUwEwrEeqwHIzbUoB2lQ" changeId="414b82bf-177c-4336-87ba-a5ccea204c5f">
<description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
<target xmi:type="ecore:EPackage" href="Skills.ecore#/"/>
</ownedRepresentationDescriptors>
@@ -222,15 +222,23 @@
<styles xmi:type="notation:FontStyle" xmi:id="_LxbTQQhrEeuvnuckpM_LRQ" fontColor="2697711" fontName="Cantarell" fontHeight="8"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_LxbTQghrEeuvnuckpM_LRQ"/>
</children>
+ <children xmi:type="notation:Node" xmi:id="_8-PkcBnREeux45g2rF1zvg" type="3010" element="_89eIYBnREeux45g2rF1zvg">
+ <styles xmi:type="notation:FontStyle" xmi:id="_8-PkcRnREeux45g2rF1zvg" fontColor="2697711" fontName="Cantarell" fontHeight="8"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8-PkchnREeux45g2rF1zvg"/>
+ </children>
<children xmi:type="notation:Node" xmi:id="_rIogdtrpEeq_CZJuNlb8eA" type="3010" element="_rHc0sNrpEeq_CZJuNlb8eA">
<styles xmi:type="notation:FontStyle" xmi:id="_rIogd9rpEeq_CZJuNlb8eA" fontName="Cantarell" fontHeight="8"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_rIogeNrpEeq_CZJuNlb8eA"/>
</children>
+ <children xmi:type="notation:Node" xmi:id="_Ct-HYBnSEeux45g2rF1zvg" type="3010" element="_CtZfoBnSEeux45g2rF1zvg">
+ <styles xmi:type="notation:FontStyle" xmi:id="_Ct-HYRnSEeux45g2rF1zvg" fontName="Cantarell" fontHeight="8"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Ct-HYhnSEeux45g2rF1zvg"/>
+ </children>
<styles xmi:type="notation:SortingStyle" xmi:id="_rIdhUdrpEeq_CZJuNlb8eA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_rIdhUtrpEeq_CZJuNlb8eA"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_rIc6RNrpEeq_CZJuNlb8eA" fontName="Cantarell" fontHeight="8"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rIc6RdrpEeq_CZJuNlb8eA" x="180" y="225"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rIc6RdrpEeq_CZJuNlb8eA" x="135" y="230"/>
</children>
<children xmi:type="notation:Node" xmi:id="_rIeIZNrpEeq_CZJuNlb8eA" type="2003" element="_rGsmwNrpEeq_CZJuNlb8eA">
<children xmi:type="notation:Node" xmi:id="_rIeIZ9rpEeq_CZJuNlb8eA" type="5007"/>
@@ -693,18 +701,18 @@
</edges>
<edges xmi:type="notation:Edge" xmi:id="_rI8pgtrpEeq_CZJuNlb8eA" type="4001" element="_rH5goNrpEeq_CZJuNlb8eA" source="_rIcTN9rpEeq_CZJuNlb8eA" target="_rIc6Q9rpEeq_CZJuNlb8eA">
<children xmi:type="notation:Node" xmi:id="_rI8phtrpEeq_CZJuNlb8eA" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI8ph9rpEeq_CZJuNlb8eA" x="22" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI8ph9rpEeq_CZJuNlb8eA" x="-1" y="-10"/>
</children>
<children xmi:type="notation:Node" xmi:id="_rI8piNrpEeq_CZJuNlb8eA" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI8pidrpEeq_CZJuNlb8eA" x="75"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI8pidrpEeq_CZJuNlb8eA" x="69"/>
</children>
<children xmi:type="notation:Node" xmi:id="_rI8pitrpEeq_CZJuNlb8eA" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI8pi9rpEeq_CZJuNlb8eA" x="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI8pi9rpEeq_CZJuNlb8eA" x="11"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_rI8pg9rpEeq_CZJuNlb8eA" routing="Rectilinear"/>
<styles xmi:type="notation:FontStyle" xmi:id="_rI8phNrpEeq_CZJuNlb8eA" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rI8phdrpEeq_CZJuNlb8eA" points="[0, 109, -17, -194]$[0, 205, -17, -98]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rI9QkNrpEeq_CZJuNlb8eA" id="(0.5033557046979866,0.0)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rI8phdrpEeq_CZJuNlb8eA" points="[-39, 1, 26, -178]$[-39, 25, 26, -154]$[-79, 25, -14, -154]$[-79, 54, -14, -125]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rI9QkNrpEeq_CZJuNlb8eA" id="(0.8333333333333334,0.9936305732484076)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rI9QkdrpEeq_CZJuNlb8eA" id="(0.5061728395061729,1.0)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_rI9QktrpEeq_CZJuNlb8eA" type="4001" element="_rH6Hs9rpEeq_CZJuNlb8eA" source="_rIcTN9rpEeq_CZJuNlb8eA" target="_rIeIZNrpEeq_CZJuNlb8eA">
@@ -725,33 +733,33 @@
</edges>
<edges xmi:type="notation:Edge" xmi:id="_rI93rNrpEeq_CZJuNlb8eA" type="4001" element="_rH7V1trpEeq_CZJuNlb8eA" source="_rIcTN9rpEeq_CZJuNlb8eA" target="_rIc6Q9rpEeq_CZJuNlb8eA">
<children xmi:type="notation:Node" xmi:id="_rI-esNrpEeq_CZJuNlb8eA" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI-esdrpEeq_CZJuNlb8eA" x="3"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI-esdrpEeq_CZJuNlb8eA" x="11"/>
</children>
<children xmi:type="notation:Node" xmi:id="_rI-estrpEeq_CZJuNlb8eA" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI-es9rpEeq_CZJuNlb8eA" x="30" y="-10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI-es9rpEeq_CZJuNlb8eA" x="26" y="-31"/>
</children>
<children xmi:type="notation:Node" xmi:id="_rI-etNrpEeq_CZJuNlb8eA" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI-etdrpEeq_CZJuNlb8eA" x="-10" y="-10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI-etdrpEeq_CZJuNlb8eA" x="-11" y="7"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_rI93rdrpEeq_CZJuNlb8eA" routing="Rectilinear"/>
<styles xmi:type="notation:FontStyle" xmi:id="_rI93rtrpEeq_CZJuNlb8eA" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rI93r9rpEeq_CZJuNlb8eA" points="[55, 109, 38, -194]$[55, 205, 38, -98]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rI93r9rpEeq_CZJuNlb8eA" points="[-49, 157, -40, -178]$[-49, 181, -40, -154]$[-23, 181, -14, -154]$[-23, 210, -14, -125]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rI-ettrpEeq_CZJuNlb8eA" id="(0.5033557046979866,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rI-et9rpEeq_CZJuNlb8eA" id="(0.5061728395061729,1.0)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_rI-euNrpEeq_CZJuNlb8eA" type="4001" element="_rH785trpEeq_CZJuNlb8eA" source="_rIc6Q9rpEeq_CZJuNlb8eA" target="_rIaeANrpEeq_CZJuNlb8eA">
<children xmi:type="notation:Node" xmi:id="_rI-evNrpEeq_CZJuNlb8eA" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI-evdrpEeq_CZJuNlb8eA" x="30" y="-10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI-evdrpEeq_CZJuNlb8eA" x="50" y="-10"/>
</children>
<children xmi:type="notation:Node" xmi:id="_rI-evtrpEeq_CZJuNlb8eA" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI-ev9rpEeq_CZJuNlb8eA" x="3" y="-10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI-ev9rpEeq_CZJuNlb8eA" x="50" y="-3"/>
</children>
<children xmi:type="notation:Node" xmi:id="_rI-ewNrpEeq_CZJuNlb8eA" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI-ewdrpEeq_CZJuNlb8eA" x="-30" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rI-ewdrpEeq_CZJuNlb8eA" x="-24" y="10"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_rI-eudrpEeq_CZJuNlb8eA" routing="Rectilinear"/>
<styles xmi:type="notation:FontStyle" xmi:id="_rI-eutrpEeq_CZJuNlb8eA" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rI-eu9rpEeq_CZJuNlb8eA" points="[63, 49, -203, -41]$[63, 96, -203, 6]$[207, 96, -59, 6]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rI-eu9rpEeq_CZJuNlb8eA" points="[67, 63, -253, -9]$[67, 84, -253, 12]$[224, 84, -96, 12]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rI_FwNrpEeq_CZJuNlb8eA" id="(0.5,0.5)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rI_FwdrpEeq_CZJuNlb8eA" id="(0.5,0.5)"/>
</edges>
@@ -789,17 +797,17 @@
</edges>
<edges xmi:type="notation:Edge" xmi:id="_rJA68trpEeq_CZJuNlb8eA" type="4001" element="_rH_AM9rpEeq_CZJuNlb8eA" source="_rIevcNrpEeq_CZJuNlb8eA" target="_rIc6Q9rpEeq_CZJuNlb8eA">
<children xmi:type="notation:Node" xmi:id="_rJA69trpEeq_CZJuNlb8eA" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJA699rpEeq_CZJuNlb8eA" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJA699rpEeq_CZJuNlb8eA" x="-3" y="7"/>
</children>
<children xmi:type="notation:Node" xmi:id="_rJA6-NrpEeq_CZJuNlb8eA" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJA6-drpEeq_CZJuNlb8eA" y="-10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJA6-drpEeq_CZJuNlb8eA" x="-7" y="-10"/>
</children>
<children xmi:type="notation:Node" xmi:id="_rJA6-trpEeq_CZJuNlb8eA" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJA6-9rpEeq_CZJuNlb8eA" x="-255" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJA6-9rpEeq_CZJuNlb8eA" x="-292" y="15"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_rJA689rpEeq_CZJuNlb8eA" routing="Rectilinear"/>
<styles xmi:type="notation:FontStyle" xmi:id="_rJA69NrpEeq_CZJuNlb8eA" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rJA69drpEeq_CZJuNlb8eA" points="[-59, -1, 404, -8]$[-382, -1, 81, -8]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rJA69drpEeq_CZJuNlb8eA" points="[-59, 2, 421, -23]$[-193, 2, 287, -23]$[-193, 20, 287, -5]$[-371, 20, 109, -5]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rJA6_NrpEeq_CZJuNlb8eA" id="(0.5,0.5)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rJA6_drpEeq_CZJuNlb8eA" id="(0.5,0.5)"/>
</edges>
@@ -821,17 +829,17 @@
</edges>
<edges xmi:type="notation:Edge" xmi:id="_rJCJENrpEeq_CZJuNlb8eA" type="4001" element="_rIA1YNrpEeq_CZJuNlb8eA" source="_rIf9lNrpEeq_CZJuNlb8eA" target="_rIc6Q9rpEeq_CZJuNlb8eA">
<children xmi:type="notation:Node" xmi:id="_rJCwINrpEeq_CZJuNlb8eA" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJCwIdrpEeq_CZJuNlb8eA" x="-61" y="153"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJCwIdrpEeq_CZJuNlb8eA" x="-36" y="198"/>
</children>
<children xmi:type="notation:Node" xmi:id="_rJCwItrpEeq_CZJuNlb8eA" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJCwI9rpEeq_CZJuNlb8eA" x="96" y="-10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJCwI9rpEeq_CZJuNlb8eA" x="90" y="-10"/>
</children>
<children xmi:type="notation:Node" xmi:id="_rJDXMNrpEeq_CZJuNlb8eA" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJDXMdrpEeq_CZJuNlb8eA" x="-188"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJDXMdrpEeq_CZJuNlb8eA" x="-177"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_rJCJEdrpEeq_CZJuNlb8eA" routing="Rectilinear"/>
<styles xmi:type="notation:FontStyle" xmi:id="_rJCJEtrpEeq_CZJuNlb8eA" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rJCJE9rpEeq_CZJuNlb8eA" points="[-59, -24, 391, 533]$[-384, -24, 66, 533]$[-384, -508, 66, 49]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rJCJE9rpEeq_CZJuNlb8eA" points="[-59, -18, 411, 521]$[-417, -18, 53, 521]$[-417, -476, 53, 63]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rJDXMtrpEeq_CZJuNlb8eA" id="(0.5,0.5)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rJDXM9rpEeq_CZJuNlb8eA" id="(0.5,0.5)"/>
</edges>
@@ -1109,17 +1117,17 @@
</edges>
<edges xmi:type="notation:Edge" xmi:id="_2UufINyOEeq6k6a2XVHNwA" type="4001" element="_2Tg-MNyOEeq6k6a2XVHNwA" source="_S_lQQNr-Eeq_nvF5tuZorw" target="_rIc6Q9rpEeq_CZJuNlb8eA">
<children xmi:type="notation:Node" xmi:id="_2U2a8NyOEeq6k6a2XVHNwA" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2U2a8dyOEeq6k6a2XVHNwA" x="-442" y="-10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2U2a8dyOEeq6k6a2XVHNwA" x="-462" y="-10"/>
</children>
<children xmi:type="notation:Node" xmi:id="_2U3CANyOEeq6k6a2XVHNwA" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2U3CAdyOEeq6k6a2XVHNwA" x="-208" y="114"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2U3CAdyOEeq6k6a2XVHNwA" x="-214" y="114"/>
</children>
<children xmi:type="notation:Node" xmi:id="_2U4QINyOEeq6k6a2XVHNwA" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2U4QIdyOEeq6k6a2XVHNwA" x="-8"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2U4QIdyOEeq6k6a2XVHNwA" x="3"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_2UvGMNyOEeq6k6a2XVHNwA" routing="Rectilinear"/>
<styles xmi:type="notation:FontStyle" xmi:id="_2UvGMdyOEeq6k6a2XVHNwA" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2UvGMtyOEeq6k6a2XVHNwA" points="[20, 98, 1862, 683]$[20, 348, 1862, 933]$[-1880, 348, -38, 933]$[-1880, -497, -38, 88]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2UvGMtyOEeq6k6a2XVHNwA" points="[36, 98, 1873, 676]$[36, 348, 1873, 926]$[-1892, 348, -55, 926]$[-1892, -465, -55, 113]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2U7TcNyOEeq6k6a2XVHNwA" id="(0.4807692307692308,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2U7TcdyOEeq6k6a2XVHNwA" id="(1.0,0.10204081632653061)"/>
</edges>
@@ -1205,17 +1213,17 @@
</edges>
<edges xmi:type="notation:Edge" xmi:id="_f_4DgAIeEeuURJHBrP3sSA" type="4001" element="_f_dz6AIeEeuURJHBrP3sSA" source="_rIc6Q9rpEeq_CZJuNlb8eA" target="_7eNdYAIdEeuURJHBrP3sSA">
<children xmi:type="notation:Node" xmi:id="_f_4qkAIeEeuURJHBrP3sSA" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f_4qkQIeEeuURJHBrP3sSA" x="23" y="-10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f_4qkQIeEeuURJHBrP3sSA" x="-2" y="10"/>
</children>
<children xmi:type="notation:Node" xmi:id="_f_4qkgIeEeuURJHBrP3sSA" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f_4qkwIeEeuURJHBrP3sSA" x="6" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f_4qkwIeEeuURJHBrP3sSA" y="10"/>
</children>
<children xmi:type="notation:Node" xmi:id="_f_5RoAIeEeuURJHBrP3sSA" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f_5RoQIeEeuURJHBrP3sSA" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f_5RoQIeEeuURJHBrP3sSA" x="1" y="10"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_f_4DgQIeEeuURJHBrP3sSA" routing="Rectilinear"/>
<styles xmi:type="notation:FontStyle" xmi:id="_f_4DggIeEeuURJHBrP3sSA" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f_4DgwIeEeuURJHBrP3sSA" points="[-10, 0, 0, -147]$[-10, 147, 0, 0]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f_4DgwIeEeuURJHBrP3sSA" points="[0, 0, -28, -115]$[0, 55, -28, -60]$[28, 55, 0, -60]$[28, 115, 0, 0]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f_7G0AIeEeuURJHBrP3sSA" id="(0.1488095238095238,1.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f_7G0QIeEeuURJHBrP3sSA" id="(0.5612244897959183,0.0)"/>
</edges>
@@ -1243,13 +1251,13 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jw-ecxSgEeubdpURgF_Ofg" x="4" y="10"/>
</children>
<children xmi:type="notation:Node" xmi:id="_Jw-edBSgEeubdpURgF_Ofg" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jw-edRSgEeubdpURgF_Ofg" x="-11" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jw-edRSgEeubdpURgF_Ofg" x="-16" y="10"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_Jw93YRSgEeubdpURgF_Ofg" routing="Rectilinear"/>
<styles xmi:type="notation:FontStyle" xmi:id="_Jw93YhSgEeubdpURgF_Ofg" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Jw93YxSgEeubdpURgF_Ofg" points="[0, 22, 99, -33]$[-84, 22, 15, -33]$[-84, 55, 15, 0]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Jw93YxSgEeubdpURgF_Ofg" points="[0, 22, 62, -40]$[-62, 22, 0, -40]$[-62, 60, 0, -2]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Jw-edhSgEeubdpURgF_Ofg" id="(0.0,0.21739130434782608)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Jw-edxSgEeubdpURgF_Ofg" id="(0.7142857142857143,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Jw-edxSgEeubdpURgF_Ofg" id="(0.926605504587156,0.016)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_NZ8JMBSgEeubdpURgF_Ofg" type="4001" element="_NZe2MBSgEeubdpURgF_Ofg" source="_rIevcNrpEeq_CZJuNlb8eA" target="_nmEUIBR6EeuFZNgytReO9g">
<children xmi:type="notation:Node" xmi:id="_NZ8JNBSgEeubdpURgF_Ofg" type="6001">
@@ -1512,7 +1520,7 @@
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
- <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_Oh0XQQhrEeuvnuckpM_LRQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+ <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_A72piRnSEeux45g2rF1zvg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
@@ -1540,6 +1548,14 @@
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
</ownedElements>
+ <ownedElements xmi:type="diagram:DNodeListElement" uid="_89eIYBnREeux45g2rF1zvg" name="imageURI : EString" tooltipText="">
+ <target xmi:type="ecore:EAttribute" href="Skills.ecore#//Skill/imageURI"/>
+ <semanticElements xmi:type="ecore:EAttribute" href="Skills.ecore#//Skill/imageURI"/>
+ <ownedStyle xmi:type="diagram:BundledImage" uid="_A79XMhnSEeux45g2rF1zvg" labelAlignment="LEFT">
+ <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+ </ownedStyle>
+ <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+ </ownedElements>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_rHc0sNrpEeq_CZJuNlb8eA" name="addExperience(amount EInt)" tooltipText="addExperience(amount)">
<target xmi:type="ecore:EOperation" href="Skills.ecore#//Skill/addExperience"/>
<semanticElements xmi:type="ecore:EOperation" href="Skills.ecore#//Skill/addExperience"/>
@@ -1549,6 +1565,14 @@
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
</ownedElements>
+ <ownedElements xmi:type="diagram:DNodeListElement" uid="_CtZfoBnSEeux45g2rF1zvg" name="getImageDescriptor() : ImageDescriptor" tooltipText="getImageDescriptor() : ImageDescriptor">
+ <target xmi:type="ecore:EOperation" href="Skills.ecore#//Skill/getImageDescriptor"/>
+ <semanticElements xmi:type="ecore:EOperation" href="Skills.ecore#//Skill/getImageDescriptor"/>
+ <ownedStyle xmi:type="diagram:BundledImage" uid="_CtaGsBnSEeux45g2rF1zvg" labelAlignment="LEFT">
+ <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']/@style"/>
+ </ownedStyle>
+ <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
+ </ownedElements>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DNodeList" uid="_rGsmwNrpEeq_CZJuNlb8eA" name="UserTask" tooltipText="" outgoingEdges="_rH9LBtrpEeq_CZJuNlb8eA" incomingEdges="_rH6Hs9rpEeq_CZJuNlb8eA" width="12" height="10">
<target xmi:type="ecore:EClass" href="Skills.ecore#//UserTask"/>
diff --git a/plugins/org.eclipse.skills/resources/default.skills b/plugins/org.eclipse.skills/resources/default.skills
index 8db9c34..8d78cec 100644
--- a/plugins/org.eclipse.skills/resources/default.skills
+++ b/plugins/org.eclipse.skills/resources/default.skills
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<skills:Quest xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:skills="http://eclipse.org/skills/1.0.0" title="Default User Skills">
- <skills name="Dextery" baseSkill="true">
+ <skills name="Dextery" baseSkill="true" imageURI="platform:/plugin/org.eclipse.skills/icons/full/obj32/skills/dextery.png">
<description text="Your ability to use the application in an efficient way."/>
- <progression xsi:type="skills:FactorProgression"/>
+ <progression xsi:type="skills:FactorProgression" xpFactor="1.0"/>
</skills>
- <skills name="Strength" baseSkill="true">
+ <skills name="Strength" baseSkill="true" imageURI="platform:/plugin/org.eclipse.skills/icons/full/obj32/skills/strength.png">
<description text="Your ability to accomplish complex tasks."/>
- <progression xsi:type="skills:FactorProgression"/>
+ <progression xsi:type="skills:FactorProgression" xpFactor="1.0"/>
</skills>
- <skills name="Wisdom" baseSkill="true">
+ <skills name="Wisdom" baseSkill="true" imageURI="platform:/plugin/org.eclipse.skills/icons/full/obj32/skills/wisdom.png">
<description text="Your knowledge about features of the application."/>
- <progression xsi:type="skills:FactorProgression"/>
+ <progression xsi:type="skills:FactorProgression" xpFactor="1.0"/>
</skills>
<userTitles minLevel="1" displayString="the dreadful"/>
<userTitles minLevel="3" displayString="untrained user"/>
diff --git a/plugins/org.eclipse.skills/src-gen/org/eclipse/skills/model/ISkill.java b/plugins/org.eclipse.skills/src-gen/org/eclipse/skills/model/ISkill.java
index 02b89f2..f315b08 100644
--- a/plugins/org.eclipse.skills/src-gen/org/eclipse/skills/model/ISkill.java
+++ b/plugins/org.eclipse.skills/src-gen/org/eclipse/skills/model/ISkill.java
@@ -3,6 +3,7 @@
package org.eclipse.skills.model;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.resource.ImageDescriptor;
/**
* <!-- begin-user-doc -->
@@ -18,6 +19,7 @@
* <li>{@link org.eclipse.skills.model.ISkill#getExperience <em>Experience</em>}</li>
* <li>{@link org.eclipse.skills.model.ISkill#getProgression <em>Progression</em>}</li>
* <li>{@link org.eclipse.skills.model.ISkill#isBaseSkill <em>Base Skill</em>}</li>
+ * <li>{@link org.eclipse.skills.model.ISkill#getImageURI <em>Image URI</em>}</li>
* </ul>
*
* @see org.eclipse.skills.model.ISkillsPackage#getSkill()
@@ -138,6 +140,28 @@
void setBaseSkill(boolean value);
/**
+ * Returns the value of the '<em><b>Image URI</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Image URI</em>' attribute.
+ * @see #setImageURI(String)
+ * @see org.eclipse.skills.model.ISkillsPackage#getSkill_ImageURI()
+ * @model
+ * @generated
+ */
+ String getImageURI();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.skills.model.ISkill#getImageURI <em>Image URI</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Image URI</em>' attribute.
+ * @see #getImageURI()
+ * @generated
+ */
+ void setImageURI(String value);
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model
@@ -145,4 +169,12 @@
*/
void addExperience(int amount);
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model kind="operation" dataType="org.eclipse.skills.model.ImageDescriptor"
+ * @generated
+ */
+ ImageDescriptor getImageDescriptor();
+
} // ISkill
diff --git a/plugins/org.eclipse.skills/src-gen/org/eclipse/skills/model/ISkillsPackage.java b/plugins/org.eclipse.skills/src-gen/org/eclipse/skills/model/ISkillsPackage.java
index 0991d24..3b18e94 100644
--- a/plugins/org.eclipse.skills/src-gen/org/eclipse/skills/model/ISkillsPackage.java
+++ b/plugins/org.eclipse.skills/src-gen/org/eclipse/skills/model/ISkillsPackage.java
@@ -516,13 +516,22 @@
int SKILL__BASE_SKILL = 4;
/**
+ * The feature id for the '<em><b>Image URI</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int SKILL__IMAGE_URI = 5;
+
+ /**
* The number of structural features of the '<em>Skill</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int SKILL_FEATURE_COUNT = 5;
+ int SKILL_FEATURE_COUNT = 6;
/**
* The operation id for the '<em>Add Experience</em>' operation.
@@ -534,13 +543,22 @@
int SKILL___ADD_EXPERIENCE__INT = 0;
/**
+ * The operation id for the '<em>Get Image Descriptor</em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int SKILL___GET_IMAGE_DESCRIPTOR = 1;
+
+ /**
* The number of operations of the '<em>Skill</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int SKILL_OPERATION_COUNT = 1;
+ int SKILL_OPERATION_COUNT = 2;
/**
* The meta object id for the '{@link org.eclipse.skills.model.impl.MUserTask <em>User Task</em>}' class.
@@ -2528,6 +2546,17 @@
EAttribute getSkill_BaseSkill();
/**
+ * Returns the meta object for the attribute '{@link org.eclipse.skills.model.ISkill#getImageURI <em>Image URI</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Image URI</em>'.
+ * @see org.eclipse.skills.model.ISkill#getImageURI()
+ * @see #getSkill()
+ * @generated
+ */
+ EAttribute getSkill_ImageURI();
+
+ /**
* Returns the meta object for the '{@link org.eclipse.skills.model.ISkill#addExperience(int) <em>Add Experience</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -2538,6 +2567,16 @@
EOperation getSkill__AddExperience__int();
/**
+ * Returns the meta object for the '{@link org.eclipse.skills.model.ISkill#getImageDescriptor() <em>Get Image Descriptor</em>}' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the '<em>Get Image Descriptor</em>' operation.
+ * @see org.eclipse.skills.model.ISkill#getImageDescriptor()
+ * @generated
+ */
+ EOperation getSkill__GetImageDescriptor();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.skills.model.IUserTask <em>User Task</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3629,6 +3668,14 @@
EAttribute SKILL__BASE_SKILL = eINSTANCE.getSkill_BaseSkill();
/**
+ * The meta object literal for the '<em><b>Image URI</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute SKILL__IMAGE_URI = eINSTANCE.getSkill_ImageURI();
+
+ /**
* The meta object literal for the '<em><b>Add Experience</b></em>' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3637,6 +3684,14 @@
EOperation SKILL___ADD_EXPERIENCE__INT = eINSTANCE.getSkill__AddExperience__int();
/**
+ * The meta object literal for the '<em><b>Get Image Descriptor</b></em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EOperation SKILL___GET_IMAGE_DESCRIPTOR = eINSTANCE.getSkill__GetImageDescriptor();
+
+ /**
* The meta object literal for the '{@link org.eclipse.skills.model.impl.MUserTask <em>User Task</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.skills/src-gen/org/eclipse/skills/model/impl/MSkill.java b/plugins/org.eclipse.skills/src-gen/org/eclipse/skills/model/impl/MSkill.java
index 8bc8f4a..8ce9a21 100644
--- a/plugins/org.eclipse.skills/src-gen/org/eclipse/skills/model/impl/MSkill.java
+++ b/plugins/org.eclipse.skills/src-gen/org/eclipse/skills/model/impl/MSkill.java
@@ -3,6 +3,8 @@
package org.eclipse.skills.model.impl;
import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
+import java.net.URL;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -11,6 +13,9 @@
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.skills.Activator;
+import org.eclipse.skills.Logger;
import org.eclipse.skills.model.IDescription;
import org.eclipse.skills.model.ILevelProgression;
import org.eclipse.skills.model.ISkill;
@@ -23,19 +28,20 @@
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link org.eclipse.skills.model.impl.MSkill#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.skills.model.impl.MSkill#getDescription <em>Description</em>}</li>
- * <li>{@link org.eclipse.skills.model.impl.MSkill#getExperience <em>Experience</em>}</li>
- * <li>{@link org.eclipse.skills.model.impl.MSkill#getProgression <em>Progression</em>}</li>
- * <li>{@link org.eclipse.skills.model.impl.MSkill#isBaseSkill <em>Base Skill</em>}</li>
+ * <li>{@link org.eclipse.skills.model.impl.MSkill#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.skills.model.impl.MSkill#getDescription <em>Description</em>}</li>
+ * <li>{@link org.eclipse.skills.model.impl.MSkill#getExperience <em>Experience</em>}</li>
+ * <li>{@link org.eclipse.skills.model.impl.MSkill#getProgression <em>Progression</em>}</li>
+ * <li>{@link org.eclipse.skills.model.impl.MSkill#isBaseSkill <em>Base Skill</em>}</li>
+ * <li>{@link org.eclipse.skills.model.impl.MSkill#getImageURI <em>Image URI</em>}</li>
* </ul>
*
* @generated
*/
public class MSkill extends MinimalEObjectImpl.Container implements ISkill {
/**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getName()
* @generated
* @ordered
@@ -43,8 +49,8 @@
protected static final String NAME_EDEFAULT = "<unnamed>";
/**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getName()
* @generated
* @ordered
@@ -52,8 +58,8 @@
protected String name = NAME_EDEFAULT;
/**
- * The cached value of the '{@link #getDescription() <em>Description</em>}' containment reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The cached value of the '{@link #getDescription() <em>Description</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getDescription()
* @generated
* @ordered
@@ -61,8 +67,8 @@
protected IDescription description;
/**
- * The default value of the '{@link #getExperience() <em>Experience</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The default value of the '{@link #getExperience() <em>Experience</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getExperience()
* @generated
* @ordered
@@ -70,8 +76,8 @@
protected static final int EXPERIENCE_EDEFAULT = 0;
/**
- * The cached value of the '{@link #getExperience() <em>Experience</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The cached value of the '{@link #getExperience() <em>Experience</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getExperience()
* @generated
* @ordered
@@ -79,8 +85,8 @@
protected int experience = EXPERIENCE_EDEFAULT;
/**
- * The cached value of the '{@link #getProgression() <em>Progression</em>}' containment reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The cached value of the '{@link #getProgression() <em>Progression</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getProgression()
* @generated
* @ordered
@@ -88,9 +94,8 @@
protected ILevelProgression progression;
/**
- * The default value of the '{@link #isBaseSkill() <em>Base Skill</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The default value of the '{@link #isBaseSkill() <em>Base Skill</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #isBaseSkill()
* @generated
* @ordered
@@ -98,9 +103,8 @@
protected static final boolean BASE_SKILL_EDEFAULT = false;
/**
- * The cached value of the '{@link #isBaseSkill() <em>Base Skill</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The cached value of the '{@link #isBaseSkill() <em>Base Skill</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #isBaseSkill()
* @generated
* @ordered
@@ -108,7 +112,26 @@
protected boolean baseSkill = BASE_SKILL_EDEFAULT;
/**
+ * The default value of the '{@link #getImageURI() <em>Image URI</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see #getImageURI()
+ * @generated
+ * @ordered
+ */
+ protected static final String IMAGE_URI_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getImageURI() <em>Image URI</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see #getImageURI()
+ * @generated
+ * @ordered
+ */
+ protected String imageURI = IMAGE_URI_EDEFAULT;
+
+ /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected MSkill() {
@@ -117,6 +140,7 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -126,6 +150,7 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -135,11 +160,12 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public void setName(String newName) {
- String oldName = name;
+ final String oldName = name;
name = newName;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ISkillsPackage.SKILL__NAME, oldName, name));
@@ -147,6 +173,7 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -156,20 +183,26 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public NotificationChain basicSetDescription(IDescription newDescription, NotificationChain msgs) {
- IDescription oldDescription = description;
+ final IDescription oldDescription = description;
description = newDescription;
if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ISkillsPackage.SKILL__DESCRIPTION, oldDescription, newDescription);
- if (msgs == null) msgs = notification; else msgs.add(notification);
+ final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ISkillsPackage.SKILL__DESCRIPTION, oldDescription,
+ newDescription);
+ if (msgs == null)
+ msgs = notification;
+ else
+ msgs.add(notification);
}
return msgs;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -177,18 +210,19 @@
if (newDescription != description) {
NotificationChain msgs = null;
if (description != null)
- msgs = ((InternalEObject)description).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ISkillsPackage.SKILL__DESCRIPTION, null, msgs);
+ msgs = ((InternalEObject) description).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ISkillsPackage.SKILL__DESCRIPTION, null, msgs);
if (newDescription != null)
- msgs = ((InternalEObject)newDescription).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ISkillsPackage.SKILL__DESCRIPTION, null, msgs);
+ msgs = ((InternalEObject) newDescription).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ISkillsPackage.SKILL__DESCRIPTION, null, msgs);
msgs = basicSetDescription(newDescription, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
+ if (msgs != null)
+ msgs.dispatch();
+ } else if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ISkillsPackage.SKILL__DESCRIPTION, newDescription, newDescription));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -198,11 +232,12 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public void setExperience(int newExperience) {
- int oldExperience = experience;
+ final int oldExperience = experience;
experience = newExperience;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ISkillsPackage.SKILL__EXPERIENCE, oldExperience, experience));
@@ -210,6 +245,7 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public ILevelProgression getProgressionGen() {
@@ -231,20 +267,26 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public NotificationChain basicSetProgression(ILevelProgression newProgression, NotificationChain msgs) {
- ILevelProgression oldProgression = progression;
+ final ILevelProgression oldProgression = progression;
progression = newProgression;
if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ISkillsPackage.SKILL__PROGRESSION, oldProgression, newProgression);
- if (msgs == null) msgs = notification; else msgs.add(notification);
+ final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ISkillsPackage.SKILL__PROGRESSION, oldProgression,
+ newProgression);
+ if (msgs == null)
+ msgs = notification;
+ else
+ msgs.add(notification);
}
return msgs;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -252,19 +294,19 @@
if (newProgression != progression) {
NotificationChain msgs = null;
if (progression != null)
- msgs = ((InternalEObject)progression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ISkillsPackage.SKILL__PROGRESSION, null, msgs);
+ msgs = ((InternalEObject) progression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ISkillsPackage.SKILL__PROGRESSION, null, msgs);
if (newProgression != null)
- msgs = ((InternalEObject)newProgression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ISkillsPackage.SKILL__PROGRESSION, null, msgs);
+ msgs = ((InternalEObject) newProgression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ISkillsPackage.SKILL__PROGRESSION, null, msgs);
msgs = basicSetProgression(newProgression, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
+ if (msgs != null)
+ msgs.dispatch();
+ } else if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ISkillsPackage.SKILL__PROGRESSION, newProgression, newProgression));
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -273,13 +315,13 @@
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public void setBaseSkill(boolean newBaseSkill) {
- boolean oldBaseSkill = baseSkill;
+ final boolean oldBaseSkill = baseSkill;
baseSkill = newBaseSkill;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ISkillsPackage.SKILL__BASE_SKILL, oldBaseSkill, baseSkill));
@@ -288,6 +330,29 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
+ * @generated
+ */
+ @Override
+ public String getImageURI() {
+ return imageURI;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setImageURI(String newImageURI) {
+ final String oldImageURI = imageURI;
+ imageURI = newImageURI;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ISkillsPackage.SKILL__IMAGE_URI, oldImageURI, imageURI));
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated NOT
*/
@Override
@@ -297,142 +362,183 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated NOT
+ */
+ @Override
+ public ImageDescriptor getImageDescriptor() {
+ if ((getImageURI() != null) && (!getImageURI().isEmpty())) {
+ try {
+ return ImageDescriptor.createFromURL(new URL(getImageURI()));
+ } catch (final MalformedURLException e) {
+ Logger.error(Activator.PLUGIN_ID, "Could not load skill image from" + getImageURI());
+ return ImageDescriptor.getMissingImageDescriptor();
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
- case ISkillsPackage.SKILL__DESCRIPTION:
- return basicSetDescription(null, msgs);
- case ISkillsPackage.SKILL__PROGRESSION:
- return basicSetProgression(null, msgs);
+ case ISkillsPackage.SKILL__DESCRIPTION:
+ return basicSetDescription(null, msgs);
+ case ISkillsPackage.SKILL__PROGRESSION:
+ return basicSetProgression(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case ISkillsPackage.SKILL__NAME:
- return getName();
- case ISkillsPackage.SKILL__DESCRIPTION:
- return getDescription();
- case ISkillsPackage.SKILL__EXPERIENCE:
- return getExperience();
- case ISkillsPackage.SKILL__PROGRESSION:
- return getProgression();
- case ISkillsPackage.SKILL__BASE_SKILL:
- return isBaseSkill();
+ case ISkillsPackage.SKILL__NAME:
+ return getName();
+ case ISkillsPackage.SKILL__DESCRIPTION:
+ return getDescription();
+ case ISkillsPackage.SKILL__EXPERIENCE:
+ return getExperience();
+ case ISkillsPackage.SKILL__PROGRESSION:
+ return getProgression();
+ case ISkillsPackage.SKILL__BASE_SKILL:
+ return isBaseSkill();
+ case ISkillsPackage.SKILL__IMAGE_URI:
+ return getImageURI();
}
return super.eGet(featureID, resolve, coreType);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case ISkillsPackage.SKILL__NAME:
- setName((String)newValue);
- return;
- case ISkillsPackage.SKILL__DESCRIPTION:
- setDescription((IDescription)newValue);
- return;
- case ISkillsPackage.SKILL__EXPERIENCE:
- setExperience((Integer)newValue);
- return;
- case ISkillsPackage.SKILL__PROGRESSION:
- setProgression((ILevelProgression)newValue);
- return;
- case ISkillsPackage.SKILL__BASE_SKILL:
- setBaseSkill((Boolean)newValue);
- return;
+ case ISkillsPackage.SKILL__NAME:
+ setName((String) newValue);
+ return;
+ case ISkillsPackage.SKILL__DESCRIPTION:
+ setDescription((IDescription) newValue);
+ return;
+ case ISkillsPackage.SKILL__EXPERIENCE:
+ setExperience((Integer) newValue);
+ return;
+ case ISkillsPackage.SKILL__PROGRESSION:
+ setProgression((ILevelProgression) newValue);
+ return;
+ case ISkillsPackage.SKILL__BASE_SKILL:
+ setBaseSkill((Boolean) newValue);
+ return;
+ case ISkillsPackage.SKILL__IMAGE_URI:
+ setImageURI((String) newValue);
+ return;
}
super.eSet(featureID, newValue);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case ISkillsPackage.SKILL__NAME:
- setName(NAME_EDEFAULT);
- return;
- case ISkillsPackage.SKILL__DESCRIPTION:
- setDescription((IDescription)null);
- return;
- case ISkillsPackage.SKILL__EXPERIENCE:
- setExperience(EXPERIENCE_EDEFAULT);
- return;
- case ISkillsPackage.SKILL__PROGRESSION:
- setProgression((ILevelProgression)null);
- return;
- case ISkillsPackage.SKILL__BASE_SKILL:
- setBaseSkill(BASE_SKILL_EDEFAULT);
- return;
+ case ISkillsPackage.SKILL__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case ISkillsPackage.SKILL__DESCRIPTION:
+ setDescription((IDescription) null);
+ return;
+ case ISkillsPackage.SKILL__EXPERIENCE:
+ setExperience(EXPERIENCE_EDEFAULT);
+ return;
+ case ISkillsPackage.SKILL__PROGRESSION:
+ setProgression((ILevelProgression) null);
+ return;
+ case ISkillsPackage.SKILL__BASE_SKILL:
+ setBaseSkill(BASE_SKILL_EDEFAULT);
+ return;
+ case ISkillsPackage.SKILL__IMAGE_URI:
+ setImageURI(IMAGE_URI_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case ISkillsPackage.SKILL__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case ISkillsPackage.SKILL__DESCRIPTION:
- return description != null;
- case ISkillsPackage.SKILL__EXPERIENCE:
- return experience != EXPERIENCE_EDEFAULT;
- case ISkillsPackage.SKILL__PROGRESSION:
- return progression != null;
- case ISkillsPackage.SKILL__BASE_SKILL:
- return baseSkill != BASE_SKILL_EDEFAULT;
+ case ISkillsPackage.SKILL__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case ISkillsPackage.SKILL__DESCRIPTION:
+ return description != null;
+ case ISkillsPackage.SKILL__EXPERIENCE:
+ return experience != EXPERIENCE_EDEFAULT;
+ case ISkillsPackage.SKILL__PROGRESSION:
+ return progression != null;
+ case ISkillsPackage.SKILL__BASE_SKILL:
+ return baseSkill != BASE_SKILL_EDEFAULT;
+ case ISkillsPackage.SKILL__IMAGE_URI:
+ return IMAGE_URI_EDEFAULT == null ? imageURI != null : !IMAGE_URI_EDEFAULT.equals(imageURI);
}
return super.eIsSet(featureID);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
switch (operationID) {
- case ISkillsPackage.SKILL___ADD_EXPERIENCE__INT:
- addExperience((Integer)arguments.get(0));
- return null;
+ case ISkillsPackage.SKILL___ADD_EXPERIENCE__INT:
+ addExperience((Integer) arguments.get(0));
+ return null;
+ case ISkillsPackage.SKILL___GET_IMAGE_DESCRIPTOR:
+ return getImageDescriptor();
}
return super.eInvoke(operationID, arguments);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String toString() {
- if (eIsProxy()) return super.toString();
+ if (eIsProxy())
+ return super.toString();
- StringBuilder result = new StringBuilder(super.toString());
+ final StringBuilder result = new StringBuilder(super.toString());
result.append(" (name: ");
result.append(name);
result.append(", experience: ");
result.append(experience);
result.append(", baseSkill: ");
result.append(baseSkill);
+ result.append(", imageURI: ");
+ result.append(imageURI);
result.append(')');
return result.toString();
}
diff --git a/plugins/org.eclipse.skills/src-gen/org/eclipse/skills/model/impl/MSkillsPackage.java b/plugins/org.eclipse.skills/src-gen/org/eclipse/skills/model/impl/MSkillsPackage.java
index 44b4d48..21cd68a 100644
--- a/plugins/org.eclipse.skills/src-gen/org/eclipse/skills/model/impl/MSkillsPackage.java
+++ b/plugins/org.eclipse.skills/src-gen/org/eclipse/skills/model/impl/MSkillsPackage.java
@@ -754,6 +754,16 @@
* @generated
*/
@Override
+ public EAttribute getSkill_ImageURI() {
+ return (EAttribute)skillEClass.getEStructuralFeatures().get(5);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
public EOperation getSkill__AddExperience__int() {
return skillEClass.getEOperations().get(0);
}
@@ -764,6 +774,16 @@
* @generated
*/
@Override
+ public EOperation getSkill__GetImageDescriptor() {
+ return skillEClass.getEOperations().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
public EClass getUserTask() {
return userTaskEClass;
}
@@ -1532,7 +1552,9 @@
createEAttribute(skillEClass, SKILL__EXPERIENCE);
createEReference(skillEClass, SKILL__PROGRESSION);
createEAttribute(skillEClass, SKILL__BASE_SKILL);
+ createEAttribute(skillEClass, SKILL__IMAGE_URI);
createEOperation(skillEClass, SKILL___ADD_EXPERIENCE__INT);
+ createEOperation(skillEClass, SKILL___GET_IMAGE_DESCRIPTOR);
userTaskEClass = createEClass(USER_TASK);
createEReference(userTaskEClass, USER_TASK__TASK);
@@ -1738,10 +1760,13 @@
initEAttribute(getSkill_Experience(), ecorePackage.getEInt(), "experience", null, 0, 1, ISkill.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getSkill_Progression(), this.getLevelProgression(), null, "progression", null, 1, 1, ISkill.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSkill_BaseSkill(), ecorePackage.getEBoolean(), "baseSkill", "false", 0, 1, ISkill.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getSkill_ImageURI(), ecorePackage.getEString(), "imageURI", null, 0, 1, ISkill.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
op = initEOperation(getSkill__AddExperience__int(), null, "addExperience", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, ecorePackage.getEInt(), "amount", 0, 1, IS_UNIQUE, IS_ORDERED);
+ initEOperation(getSkill__GetImageDescriptor(), this.getImageDescriptor(), "getImageDescriptor", 0, 1, IS_UNIQUE, IS_ORDERED);
+
initEClass(userTaskEClass, IUserTask.class, "UserTask", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getUserTask_Task(), this.getTask(), null, "task", null, 1, 1, IUserTask.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getUserTask_Started(), this.getDate(), "started", null, 0, 1, IUserTask.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.skills/src/org/eclipse/skills/service/UserFactory.java b/plugins/org.eclipse.skills/src/org/eclipse/skills/service/UserFactory.java
index aaa1bee..d9b789e 100644
--- a/plugins/org.eclipse.skills/src/org/eclipse/skills/service/UserFactory.java
+++ b/plugins/org.eclipse.skills/src/org/eclipse/skills/service/UserFactory.java
@@ -65,7 +65,10 @@
user.setName(capitalizeFirstLetter(System.getProperty("user.name")));
- user.setExperience(createSkill("Experience"));
+ final ISkill experience = createSkill("Experience");
+ experience.setImageURI("platform:/plugin/org.eclipse.skills/icons/full/obj32/skills/experience.png");
+ user.setExperience(experience);
+
user.getExperience().getDescription().setText("Your overall progress");
for (final ISkill skill : getDefaultSkills())
diff --git a/plugins/org.eclipse.skills/src/org/eclipse/skills/ui/views/character/SkillsComposite.java b/plugins/org.eclipse.skills/src/org/eclipse/skills/ui/views/character/SkillsComposite.java
index 415040f..28938e8 100644
--- a/plugins/org.eclipse.skills/src/org/eclipse/skills/ui/views/character/SkillsComposite.java
+++ b/plugins/org.eclipse.skills/src/org/eclipse/skills/ui/views/character/SkillsComposite.java
@@ -21,11 +21,13 @@
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.ResourceManager;
import org.eclipse.jface.util.Throttler;
import org.eclipse.skills.model.IDescription;
import org.eclipse.skills.model.ISkill;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -37,18 +39,18 @@
private static final String FLAG_WITH_PROGRESSBAR = "hasProgressbar";
- private final boolean fShowProgress;
-
private final Throttler fUiUpdateThrottler = new Throttler(Display.getDefault(), Duration.ofMillis(500), this::updateControls);
private final Adapter fSkillAdapter = new SkillAdapter();
- public SkillsComposite(Composite parent, int style, List<ISkill> skills, boolean showProgress) {
+ private final ResourceManager fResourceManager;
+
+ public SkillsComposite(Composite parent, int style, ResourceManager resourceManager, List<ISkill> skills) {
super(parent, style);
- fShowProgress = showProgress;
+ fResourceManager = resourceManager;
- setLayout(new GridLayout(showProgress ? 3 : 2, false));
+ setLayout(new GridLayout(3, false));
setSkills(skills);
}
@@ -65,30 +67,58 @@
}
private void createSkillElement(ISkill skill) {
+
+ final Label lblImage = createImageLabel(skill);
+ lblImage.setLayoutData(GridDataFactory.fillDefaults().span(1, 2).align(SWT.FILL, SWT.DOWN).indent(0, 6).create());
+
+ final Label lblTitle = createSkillNameLabel(skill);
+ lblTitle.setLayoutData(GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.DOWN).grab(true, true).indent(10, 0).create());
+
+ final Label lblLevel = createSkillLevelLabel(skill);
+ lblLevel.setLayoutData(GridDataFactory.fillDefaults().span(1, 2).align(SWT.RIGHT, SWT.DOWN).grab(false, true).indent(10, 0).create());
+
+ final ProgressBar progressBar = createProgressBar(skill);
+ progressBar.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.FILL).indent(10, 0).create());
+ }
+
+ private ProgressBar createProgressBar(ISkill skill) {
+ final ProgressBar progressBar = new ProgressBar(this, SWT.NONE);
+ progressBar.setData(skill);
+ updateControl(progressBar, skill);
+
+ return progressBar;
+ }
+
+ private Label createSkillLevelLabel(ISkill skill) {
+ final Label lblLevel = new Label(this, SWT.NONE);
+ lblLevel.setData(skill);
+ lblLevel.setFont(fResourceManager.createFont(JFaceResources.getDefaultFontDescriptor().setHeight(12)));
+
+ updateControl(lblLevel, skill);
+
+ return lblLevel;
+ }
+
+ private Label createSkillNameLabel(ISkill skill) {
final Label lblTitle = new Label(this, SWT.NONE);
- lblTitle.setText(skill.getName());
+ lblTitle.setFont(fResourceManager.createFont(JFaceResources.getTextFontDescriptor()));
+ lblTitle.setText(skill.getName().toUpperCase());
lblTitle.setToolTipText(getSkillDescription(skill));
- lblTitle.setLayoutData(GridDataFactory.fillDefaults().create());
- if (fShowProgress) {
- final ProgressBar progressBar = new ProgressBar(this, SWT.NONE);
- progressBar.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
- progressBar.setData(skill);
- updateControl(progressBar, skill);
+ return lblTitle;
+ }
- final Label lblLevel = new Label(this, SWT.NONE);
- lblLevel.setData(skill);
- lblLevel.setData(FLAG_WITH_PROGRESSBAR, true);
- updateControl(lblLevel, skill);
+ private Label createImageLabel(ISkill skill) {
+ final Label lblImage = new Label(this, SWT.NONE);
+ lblImage.setToolTipText(getSkillDescription(skill));
- } else {
+ final ImageDescriptor imageDescriptor = skill.getImageDescriptor();
+ if (imageDescriptor != null)
+ lblImage.setImage(fResourceManager.createImage(imageDescriptor));
+ else
+ lblImage.setImage(fResourceManager.createImage(ImageDescriptor.getMissingImageDescriptor()));
- final Label lblLevel = new Label(this, SWT.NONE);
- lblLevel.setData(skill);
- lblLevel.setData(FLAG_WITH_PROGRESSBAR, false);
- lblLevel.setLayoutData(GridDataFactory.fillDefaults().indent(20, 0).create());
- updateControl(lblLevel, skill);
- }
+ return lblImage;
}
private String getSkillDescription(ISkill skill) {
@@ -107,6 +137,8 @@
if (control.getData() instanceof ISkill)
updateControl(control, (ISkill) control.getData());
}
+
+ layout();
}
public void updateControl(Control control, ISkill skill) {
@@ -115,16 +147,9 @@
final int nextLevelMinXP = skill.getProgression().getMinimumXpForLevel(level + 1);
if (control instanceof Label) {
- if (hasProgressbar(control)) {
- ((Label) control).setText(String.format("Level %d", level));
- ((Label) control).setToolTipText(
- String.format("Earn %d more %s to reach level %d", (nextLevelMinXP - skill.getExperience()), skill.getName(), level + 1));
-
- } else {
- ((Label) control).setText(String.format("%d", level));
- ((Label) control).setToolTipText(
- String.format("Earn %d more %s points to reach level %d", (nextLevelMinXP - skill.getExperience()), skill.getName(), level + 1));
- }
+ ((Label) control).setText(String.format("Lvl %d", level));
+ ((Label) control)
+ .setToolTipText(String.format("Earn %d more %s to reach level %d", (nextLevelMinXP - skill.getExperience()), skill.getName(), level + 1));
} else if (control instanceof ProgressBar) {
((ProgressBar) control).setMinimum(currentLevelMinXP);
@@ -134,11 +159,6 @@
}
}
- private boolean hasProgressbar(Control control) {
- final Object hasProgressbar = control.getData(FLAG_WITH_PROGRESSBAR);
- return (hasProgressbar instanceof Boolean) ? (Boolean) hasProgressbar : true;
- }
-
private class SkillAdapter extends AdapterImpl {
@Override
public void notifyChanged(Notification msg) {
diff --git a/plugins/org.eclipse.skills/src/org/eclipse/skills/ui/views/character/StatsComposite.java b/plugins/org.eclipse.skills/src/org/eclipse/skills/ui/views/character/StatsComposite.java
index 66fdb0e..0e2d3ea 100644
--- a/plugins/org.eclipse.skills/src/org/eclipse/skills/ui/views/character/StatsComposite.java
+++ b/plugins/org.eclipse.skills/src/org/eclipse/skills/ui/views/character/StatsComposite.java
@@ -19,7 +19,6 @@
import java.util.List;
import java.util.stream.Collectors;
-import org.eclipse.emf.common.util.EList;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.resource.ResourceManager;
import org.eclipse.skills.model.ISkill;
@@ -55,7 +54,7 @@
setLayout(new GridLayout());
- final SkillsComposite xp = new SkillsComposite(this, SWT.NONE, Arrays.asList(CharacterView.getUser().getExperience()), true);
+ final SkillsComposite xp = new SkillsComposite(this, SWT.NONE, resourceManager, Arrays.asList(CharacterView.getUser().getExperience()));
xp.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.FILL).create());
addSeparator();
@@ -64,7 +63,7 @@
lblPrimarySkills.setText("Your Stats:");
final List<ISkill> primarySkills = getPrimarySkills(CharacterView.getUser().getSkills());
- final SkillsComposite primary = new SkillsComposite(this, SWT.NONE, primarySkills, false);
+ final SkillsComposite primary = new SkillsComposite(this, SWT.NONE, resourceManager, primarySkills);
primary.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).indent(INDENTATION, 0).create());
addSeparator();
@@ -73,7 +72,7 @@
lblSecondarySkills.setText("Your Skills:");
final List<ISkill> secondarySkills = getSecondarySkills(CharacterView.getUser().getSkills());
- final SkillsComposite secondary = new SkillsComposite(this, SWT.NONE, secondarySkills, true);
+ final SkillsComposite secondary = new SkillsComposite(this, SWT.NONE, resourceManager, secondarySkills);
secondary.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).indent(INDENTATION, 0).create());
final BadgesComposite badgesComposite = new BadgesComposite(this, SWT.H_SCROLL, resourceManager);
@@ -82,12 +81,6 @@
private void addSeparator() {
final Label separator = new Label(this, SWT.SEPARATOR | SWT.HORIZONTAL);
- separator.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.FILL).create());
+ separator.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.FILL).indent(0, 6).create());
}
-
- public void setSkills(EList<ISkill> skills) {
- // TODO Auto-generated method stub
-
- }
-
}
diff --git a/plugins/org.eclipse.skills/src/org/eclipse/wb/swt/SWTResourceManager.java b/plugins/org.eclipse.skills/src/org/eclipse/wb/swt/SWTResourceManager.java
deleted file mode 100644
index d8a2858..0000000
--- a/plugins/org.eclipse.skills/src/org/eclipse/wb/swt/SWTResourceManager.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Google, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wb.swt;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Utility class for managing OS resources associated with SWT controls such as colors, fonts, images, etc.
- * <p>
- * !!! IMPORTANT !!! Application code must explicitly invoke the <code>dispose()</code> method to release the
- * operating system resources managed by cached objects when those objects and OS resources are no longer
- * needed (e.g. on application shutdown)
- * <p>
- * This class may be freely distributed as part of any application or plugin.
- * <p>
- * @author scheglov_ke
- * @author Dan Rubel
- */
-public class SWTResourceManager {
- ////////////////////////////////////////////////////////////////////////////
- //
- // Color
- //
- ////////////////////////////////////////////////////////////////////////////
- private static Map<RGB, Color> m_colorMap = new HashMap<RGB, Color>();
- /**
- * Returns the system {@link Color} matching the specific ID.
- *
- * @param systemColorID
- * the ID value for the color
- * @return the system {@link Color} matching the specific ID
- */
- public static Color getColor(int systemColorID) {
- Display display = Display.getCurrent();
- return display.getSystemColor(systemColorID);
- }
- /**
- * Returns a {@link Color} given its red, green and blue component values.
- *
- * @param r
- * the red component of the color
- * @param g
- * the green component of the color
- * @param b
- * the blue component of the color
- * @return the {@link Color} matching the given red, green and blue component values
- */
- public static Color getColor(int r, int g, int b) {
- return getColor(new RGB(r, g, b));
- }
- /**
- * Returns a {@link Color} given its RGB value.
- *
- * @param rgb
- * the {@link RGB} value of the color
- * @return the {@link Color} matching the RGB value
- */
- public static Color getColor(RGB rgb) {
- Color color = m_colorMap.get(rgb);
- if (color == null) {
- Display display = Display.getCurrent();
- color = new Color(display, rgb);
- m_colorMap.put(rgb, color);
- }
- return color;
- }
- /**
- * Dispose of all the cached {@link Color}'s.
- */
- public static void disposeColors() {
- for (Color color : m_colorMap.values()) {
- color.dispose();
- }
- m_colorMap.clear();
- }
- ////////////////////////////////////////////////////////////////////////////
- //
- // Image
- //
- ////////////////////////////////////////////////////////////////////////////
- /**
- * Maps image paths to images.
- */
- private static Map<String, Image> m_imageMap = new HashMap<String, Image>();
- /**
- * Returns an {@link Image} encoded by the specified {@link InputStream}.
- *
- * @param stream
- * the {@link InputStream} encoding the image data
- * @return the {@link Image} encoded by the specified input stream
- */
- protected static Image getImage(InputStream stream) throws IOException {
- try {
- Display display = Display.getCurrent();
- ImageData data = new ImageData(stream);
- if (data.transparentPixel > 0) {
- return new Image(display, data, data.getTransparencyMask());
- }
- return new Image(display, data);
- } finally {
- stream.close();
- }
- }
- /**
- * Returns an {@link Image} stored in the file at the specified path.
- *
- * @param path
- * the path to the image file
- * @return the {@link Image} stored in the file at the specified path
- */
- public static Image getImage(String path) {
- Image image = m_imageMap.get(path);
- if (image == null) {
- try {
- image = getImage(new FileInputStream(path));
- m_imageMap.put(path, image);
- } catch (Exception e) {
- image = getMissingImage();
- m_imageMap.put(path, image);
- }
- }
- return image;
- }
- /**
- * Returns an {@link Image} stored in the file at the specified path relative to the specified class.
- *
- * @param clazz
- * the {@link Class} relative to which to find the image
- * @param path
- * the path to the image file, if starts with <code>'/'</code>
- * @return the {@link Image} stored in the file at the specified path
- */
- public static Image getImage(Class<?> clazz, String path) {
- String key = clazz.getName() + '|' + path;
- Image image = m_imageMap.get(key);
- if (image == null) {
- try {
- image = getImage(clazz.getResourceAsStream(path));
- m_imageMap.put(key, image);
- } catch (Exception e) {
- image = getMissingImage();
- m_imageMap.put(key, image);
- }
- }
- return image;
- }
- private static final int MISSING_IMAGE_SIZE = 10;
- /**
- * @return the small {@link Image} that can be used as placeholder for missing image.
- */
- private static Image getMissingImage() {
- Image image = new Image(Display.getCurrent(), MISSING_IMAGE_SIZE, MISSING_IMAGE_SIZE);
- //
- GC gc = new GC(image);
- gc.setBackground(getColor(SWT.COLOR_RED));
- gc.fillRectangle(0, 0, MISSING_IMAGE_SIZE, MISSING_IMAGE_SIZE);
- gc.dispose();
- //
- return image;
- }
- /**
- * Style constant for placing decorator image in top left corner of base image.
- */
- public static final int TOP_LEFT = 1;
- /**
- * Style constant for placing decorator image in top right corner of base image.
- */
- public static final int TOP_RIGHT = 2;
- /**
- * Style constant for placing decorator image in bottom left corner of base image.
- */
- public static final int BOTTOM_LEFT = 3;
- /**
- * Style constant for placing decorator image in bottom right corner of base image.
- */
- public static final int BOTTOM_RIGHT = 4;
- /**
- * Internal value.
- */
- protected static final int LAST_CORNER_KEY = 5;
- /**
- * Maps images to decorated images.
- */
- @SuppressWarnings("unchecked")
- private static Map<Image, Map<Image, Image>>[] m_decoratedImageMap = new Map[LAST_CORNER_KEY];
- /**
- * Returns an {@link Image} composed of a base image decorated by another image.
- *
- * @param baseImage
- * the base {@link Image} that should be decorated
- * @param decorator
- * the {@link Image} to decorate the base image
- * @return {@link Image} The resulting decorated image
- */
- public static Image decorateImage(Image baseImage, Image decorator) {
- return decorateImage(baseImage, decorator, BOTTOM_RIGHT);
- }
- /**
- * Returns an {@link Image} composed of a base image decorated by another image.
- *
- * @param baseImage
- * the base {@link Image} that should be decorated
- * @param decorator
- * the {@link Image} to decorate the base image
- * @param corner
- * the corner to place decorator image
- * @return the resulting decorated {@link Image}
- */
- public static Image decorateImage(final Image baseImage, final Image decorator, final int corner) {
- if (corner <= 0 || corner >= LAST_CORNER_KEY) {
- throw new IllegalArgumentException("Wrong decorate corner");
- }
- Map<Image, Map<Image, Image>> cornerDecoratedImageMap = m_decoratedImageMap[corner];
- if (cornerDecoratedImageMap == null) {
- cornerDecoratedImageMap = new HashMap<Image, Map<Image, Image>>();
- m_decoratedImageMap[corner] = cornerDecoratedImageMap;
- }
- Map<Image, Image> decoratedMap = cornerDecoratedImageMap.get(baseImage);
- if (decoratedMap == null) {
- decoratedMap = new HashMap<Image, Image>();
- cornerDecoratedImageMap.put(baseImage, decoratedMap);
- }
- //
- Image result = decoratedMap.get(decorator);
- if (result == null) {
- Rectangle bib = baseImage.getBounds();
- Rectangle dib = decorator.getBounds();
- //
- result = new Image(Display.getCurrent(), bib.width, bib.height);
- //
- GC gc = new GC(result);
- gc.drawImage(baseImage, 0, 0);
- if (corner == TOP_LEFT) {
- gc.drawImage(decorator, 0, 0);
- } else if (corner == TOP_RIGHT) {
- gc.drawImage(decorator, bib.width - dib.width, 0);
- } else if (corner == BOTTOM_LEFT) {
- gc.drawImage(decorator, 0, bib.height - dib.height);
- } else if (corner == BOTTOM_RIGHT) {
- gc.drawImage(decorator, bib.width - dib.width, bib.height - dib.height);
- }
- gc.dispose();
- //
- decoratedMap.put(decorator, result);
- }
- return result;
- }
- /**
- * Dispose all of the cached {@link Image}'s.
- */
- public static void disposeImages() {
- // dispose loaded images
- {
- for (Image image : m_imageMap.values()) {
- image.dispose();
- }
- m_imageMap.clear();
- }
- // dispose decorated images
- for (int i = 0; i < m_decoratedImageMap.length; i++) {
- Map<Image, Map<Image, Image>> cornerDecoratedImageMap = m_decoratedImageMap[i];
- if (cornerDecoratedImageMap != null) {
- for (Map<Image, Image> decoratedMap : cornerDecoratedImageMap.values()) {
- for (Image image : decoratedMap.values()) {
- image.dispose();
- }
- decoratedMap.clear();
- }
- cornerDecoratedImageMap.clear();
- }
- }
- }
- ////////////////////////////////////////////////////////////////////////////
- //
- // Font
- //
- ////////////////////////////////////////////////////////////////////////////
- /**
- * Maps font names to fonts.
- */
- private static Map<String, Font> m_fontMap = new HashMap<String, Font>();
- /**
- * Maps fonts to their bold versions.
- */
- private static Map<Font, Font> m_fontToBoldFontMap = new HashMap<Font, Font>();
- /**
- * Returns a {@link Font} based on its name, height and style.
- *
- * @param name
- * the name of the font
- * @param height
- * the height of the font
- * @param style
- * the style of the font
- * @return {@link Font} The font matching the name, height and style
- */
- public static Font getFont(String name, int height, int style) {
- return getFont(name, height, style, false, false);
- }
- /**
- * Returns a {@link Font} based on its name, height and style. Windows-specific strikeout and underline
- * flags are also supported.
- *
- * @param name
- * the name of the font
- * @param size
- * the size of the font
- * @param style
- * the style of the font
- * @param strikeout
- * the strikeout flag (warning: Windows only)
- * @param underline
- * the underline flag (warning: Windows only)
- * @return {@link Font} The font matching the name, height, style, strikeout and underline
- */
- public static Font getFont(String name, int size, int style, boolean strikeout, boolean underline) {
- String fontName = name + '|' + size + '|' + style + '|' + strikeout + '|' + underline;
- Font font = m_fontMap.get(fontName);
- if (font == null) {
- FontData fontData = new FontData(name, size, style);
- if (strikeout || underline) {
- try {
- Class<?> logFontClass = Class.forName("org.eclipse.swt.internal.win32.LOGFONT"); //$NON-NLS-1$
- Object logFont = FontData.class.getField("data").get(fontData); //$NON-NLS-1$
- if (logFont != null && logFontClass != null) {
- if (strikeout) {
- logFontClass.getField("lfStrikeOut").set(logFont, Byte.valueOf((byte) 1)); //$NON-NLS-1$
- }
- if (underline) {
- logFontClass.getField("lfUnderline").set(logFont, Byte.valueOf((byte) 1)); //$NON-NLS-1$
- }
- }
- } catch (Throwable e) {
- System.err.println("Unable to set underline or strikeout" + " (probably on a non-Windows platform). " + e); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- font = new Font(Display.getCurrent(), fontData);
- m_fontMap.put(fontName, font);
- }
- return font;
- }
- /**
- * Returns a bold version of the given {@link Font}.
- *
- * @param baseFont
- * the {@link Font} for which a bold version is desired
- * @return the bold version of the given {@link Font}
- */
- public static Font getBoldFont(Font baseFont) {
- Font font = m_fontToBoldFontMap.get(baseFont);
- if (font == null) {
- FontData fontDatas[] = baseFont.getFontData();
- FontData data = fontDatas[0];
- font = new Font(Display.getCurrent(), data.getName(), data.getHeight(), SWT.BOLD);
- m_fontToBoldFontMap.put(baseFont, font);
- }
- return font;
- }
- /**
- * Dispose all of the cached {@link Font}'s.
- */
- public static void disposeFonts() {
- // clear fonts
- for (Font font : m_fontMap.values()) {
- font.dispose();
- }
- m_fontMap.clear();
- // clear bold fonts
- for (Font font : m_fontToBoldFontMap.values()) {
- font.dispose();
- }
- m_fontToBoldFontMap.clear();
- }
- ////////////////////////////////////////////////////////////////////////////
- //
- // Cursor
- //
- ////////////////////////////////////////////////////////////////////////////
- /**
- * Maps IDs to cursors.
- */
- private static Map<Integer, Cursor> m_idToCursorMap = new HashMap<Integer, Cursor>();
- /**
- * Returns the system cursor matching the specific ID.
- *
- * @param id
- * int The ID value for the cursor
- * @return Cursor The system cursor matching the specific ID
- */
- public static Cursor getCursor(int id) {
- Integer key = Integer.valueOf(id);
- Cursor cursor = m_idToCursorMap.get(key);
- if (cursor == null) {
- cursor = new Cursor(Display.getDefault(), id);
- m_idToCursorMap.put(key, cursor);
- }
- return cursor;
- }
- /**
- * Dispose all of the cached cursors.
- */
- public static void disposeCursors() {
- for (Cursor cursor : m_idToCursorMap.values()) {
- cursor.dispose();
- }
- m_idToCursorMap.clear();
- }
- ////////////////////////////////////////////////////////////////////////////
- //
- // General
- //
- ////////////////////////////////////////////////////////////////////////////
- /**
- * Dispose of cached objects and their underlying OS resources. This should only be called when the cached
- * objects are no longer needed (e.g. on application shutdown).
- */
- public static void dispose() {
- disposeColors();
- disposeImages();
- disposeFonts();
- disposeCursors();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.skills.test/build.properties b/tests/org.eclipse.skills.test/build.properties
index 5ebbdd9..df6ba0e 100644
--- a/tests/org.eclipse.skills.test/build.properties
+++ b/tests/org.eclipse.skills.test/build.properties
@@ -3,4 +3,5 @@
bin.includes = META-INF/,\
.,\
fragment.xml,\
- resources/
+ resources/,\
+ icons/
diff --git a/tests/org.eclipse.skills.test/icons/test_skill_image.png b/tests/org.eclipse.skills.test/icons/test_skill_image.png
new file mode 100644
index 0000000..c040619
--- /dev/null
+++ b/tests/org.eclipse.skills.test/icons/test_skill_image.png
Binary files differ
diff --git a/tests/org.eclipse.skills.test/src/org/eclipse/skills/model/SkillTest.java b/tests/org.eclipse.skills.test/src/org/eclipse/skills/model/SkillTest.java
new file mode 100644
index 0000000..3fb9912
--- /dev/null
+++ b/tests/org.eclipse.skills.test/src/org/eclipse/skills/model/SkillTest.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2020 Christian Pontesegger and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Christian Pontesegger - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.skills.model;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+public class SkillTest {
+ private ISkill fSkill;
+
+ @BeforeEach
+ public void setupFixture() {
+ fSkill = ISkillsFactory.eINSTANCE.createSkill();
+ }
+
+ @Test
+ @DisplayName("Default skill can be created")
+ public void createSkill() {
+ assertNotNull(fSkill);
+ }
+
+ @Test
+ @DisplayName("getImageDescriptor() == null when imageLocation == null")
+ public void noImageDescriptorWhenLocationIsNull() {
+ fSkill.setImageURI(null);
+ assertNull(fSkill.getImageDescriptor());
+ }
+
+ @Test
+ @DisplayName("getImageDescriptor() == null when imageLocation is empty")
+ public void noImageDescriptorWhenLocationIsEmpty() {
+ fSkill.setImageURI("");
+ assertNull(fSkill.getImageDescriptor());
+ }
+
+ @Test
+ @DisplayName("getImageDescriptor() == missingDescriptor when imageLocation is invalid")
+ public void missingImageDescriptorWhenLocationIsInvalid() {
+ fSkill.setImageURI("not there");
+ assertEquals(ImageDescriptor.getMissingImageDescriptor(), fSkill.getImageDescriptor());
+ }
+
+ @Test
+ @DisplayName("getImageDescriptor() == valid when imageLocation is valid")
+ public void getImageDescriptorWhenLocationIsValid() {
+ fSkill.setImageURI("platform:/plugin/org.eclipse.skills.test/icons/test_skill_image.png");
+
+ assertNotNull(fSkill.getImageDescriptor());
+ assertNotEquals(ImageDescriptor.getMissingImageDescriptor(), fSkill.getImageDescriptor());
+ }
+}
