Merge remote-tracking branch 'origin/newhome'

This commit is contained in:
fmittag committed 2014-08-10 18:36:18 +02:00
commit ae19f0124e
8 files changed
+197 -1

No files matched your search

@@ -53,7 +53,10 @@ public enum BoatClassMasterdata {
X_99 ("X-99", true, 9.96, 2.95, BoatHullType.MONOHULL, "X99"),
CONTENDER ("Contender", true, 4.88, 1.42, BoatHullType.MONOHULL),
RC44 ("RC44", true, 13.35, 2.75, BoatHullType.MONOHULL),
FLYING_DUTCHMAN ("Flying Dutchman", true, 6.10, 1.80, BoatHullType.MONOHULL);
FLYING_DUTCHMAN ("Flying Dutchman", true, 6.10, 1.80, BoatHullType.MONOHULL),
DYAS("Dyas", true, 7.15, 1.95, BoatHullType.MONOHULL),
INTERNATIONAL_14("International 14", true, 4.27, 1.83, BoatHullType.MONOHULL, "I14"),
OPEN_BIC("O'pen BIC", true, 2.75, 1.14, BoatHullType.MONOHULL, "OpenBIC");
private final String displayName;
private final String[] alternativeNames;
@@ -60,6 +60,9 @@ public class BoatClassImageResolver {
boatClassIconsMap.put(BoatClassMasterdata.SWAN_45.getDisplayName(), imageResources.Swan45Icon());
boatClassIconsMap.put(BoatClassMasterdata.TORNADO.getDisplayName(), imageResources.TornadoIcon());
boatClassIconsMap.put(BoatClassMasterdata.X_99.getDisplayName(), imageResources.X99Icon());
boatClassIconsMap.put(BoatClassMasterdata.INTERNATIONAL_14.getDisplayName(), imageResources.International14Icon());
boatClassIconsMap.put(BoatClassMasterdata.DYAS.getDisplayName(), imageResources.DyasIcon());
boatClassIconsMap.put(BoatClassMasterdata.OPEN_BIC.getDisplayName(), imageResources.OpenBicIcon());
}
public static ImageResource getBoatClassIconResource(String displayName) {
@@ -136,4 +136,12 @@ public interface BoatClassImageResources extends ClientBundle {
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/X_99.png")
ImageResource X99Icon();
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/DYAS.png")
ImageResource DyasIcon();
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/INTERNATIONAL_14.png")
ImageResource International14Icon();
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/OPENBIC.png")
ImageResource OpenBicIcon();
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 10.0, SVG Export Plug-In . SVG Version: 3.0.0 Build 76) -->
<svg
xmlns:ns0="http://ns.adobe.com/SaveForWeb/1.0/"
xmlns:ns="http://ns.adobe.com/Variables/1.0/"
xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/"
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"
i:viewOrigin="157.6279 692.3721"
i:rulerOrigin="0 0"
i:pageBounds="0 850.3936 850.3936 0"
width="534.75"
height="534.75"
viewBox="0 0 534.75 534.75"
overflow="visible"
enable-background="new 0 0 534.75 534.75"
xml:space="preserve"
id="svg2"
version="1.1"
inkscape:version="0.48.4 r"
sodipodi:docname="Dyas.svg"><defs
id="defs23" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
id="namedview21"
showgrid="false"
inkscape:zoom="0.441"
inkscape:cx="267"
inkscape:cy="267"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" /><metadata
id="metadata4"><ns:variableSets><ns:variableSet
varSetName="binding1"
locked="none"><ns:variables /><ns:sampleDataSets /></ns:variableSet></ns:variableSets><ns0:sfw><ns0:slices /><ns0:sliceSourceBounds
y="157.622"
x="157.628"
width="534.75"
height="534.75"
bottomLeftOrigin="true" /></ns0:sfw><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
id="Ebene_1"
i:layer="yes"
i:dimmedPercent="50"
i:rgbTrio="#4F008000FFFF"><g
id="g7"><g
id="g9"><defs
id="defs11"><path
id="XMLID_1_"
d="M0,0h534.75v534.75H0V0z" /></defs><clipPath
id="XMLID_2_"><use
xlink:href="#XMLID_1_"
id="use15" /></clipPath><path
i:knockout="Off"
clip-path="url(#XMLID_2_)"
fill-rule="evenodd"
clip-rule="evenodd"
d="M78.75,101.25H472.5L117,432.75 L113.25,420l-4.5-18.75l204-219.75L78.75,101.25z"
id="path19" /></g></g></g></svg>

After

Width:  |  Height:  |  Size: 2.8 KiB

@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generator: Adobe Illustrator 10.0, SVG Export Plug-In . SVG Version: 3.0.0 Build 76) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
<!ENTITY ns_svg "http://www.w3.org/2000/svg">
<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
]>
<svg xmlns:x="http://ns.adobe.com/Extensibility/1.0/" xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" xmlns:graph="http://ns.adobe.com/Graphs/1.0/" i:viewOrigin="63.1279 813.3721" i:rulerOrigin="0 0" i:pageBounds="0 850.3936 850.3936 0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" width="741.75" height="792.75" viewBox="0 0 741.75 792.75" overflow="visible" enable-background="new 0 0 741.75 792.75" xml:space="preserve">
<metadata>
<variableSets xmlns="http://ns.adobe.com/Variables/1.0/">
<variableSet varSetName="binding1" locked="none">
<variables/>
<v:sampleDataSets xmlns="http://ns.adobe.com/GenericCustomNamespace/1.0/" xmlns:v="http://ns.adobe.com/Variables/1.0/">
</v:sampleDataSets>
</variableSet>
</variableSets>
<sfw xmlns="http://ns.adobe.com/SaveForWeb/1.0/">
<slices/>
<sliceSourceBounds y="20.622" x="63.128" width="741.75" height="792.75" bottomLeftOrigin="true"/>
</sfw>
</metadata>
<switch>
<foreignObject requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" x="0" y="0" width="1" height="1">
<i:pgfRef xlink:href="#adobe_illustrator_pgf">
</i:pgfRef>
</foreignObject>
<g i:extraneous="self">
<g id="Ebene_1" i:knockout="Off" i:layer="yes" i:dimmedPercent="50" i:rgbTrio="#4F008000FFFF">
<g>
<g>
<defs>
<path id="XMLID_1_" d="M0,0h741.75v792.75H0V0z"/>
</defs>
<clipPath id="XMLID_2_">
<use xlink:href="#XMLID_1_"/>
</clipPath>
<path i:knockout="Off" clip-path="url(#XMLID_2_)" fill-rule="evenodd" clip-rule="evenodd" d="M114,662.25H53.25V25.5H114 V662.25z"/>
<path i:knockout="Off" clip-path="url(#XMLID_2_)" fill-rule="evenodd" clip-rule="evenodd" d="M690.75,693v48.75H25.5V693 H690.75z"/>
<path i:knockout="Off" clip-path="url(#XMLID_2_)" fill-rule="evenodd" clip-rule="evenodd" d="M690.75,527.25h-84v135h-88.5 v-135H229.5v-112.5L527.25,25.5h79.5v417h84V527.25z M358.5,442.5V396l159.75-208.5v255H358.5z"/>
</g>
</g>
</g>
</g>
</switch>
<i:pgf id="adobe_illustrator_pgf">
<![CDATA[
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
]]>
</i:pgf>
</svg>

After

Width:  |  Height:  |  Size: 6.7 KiB